From d14e6a7ed50d03d7f470182de0b8ce7f1c5a702c Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Mon, 22 Aug 2022 11:10:12 +0200
Subject: [PATCH 001/287] Inital version of react query keys

---
 .../Factory.react-query.ts                    | 126 +++++++++
 .../factory-query-keys/Factory.react-query.ts | 114 ++++++++
 .../ts-codegen/__tests__/ts-codegen.test.ts   |  15 +
 packages/ts-codegen/src/commands/generate.ts  |  13 +-
 .../wasm-ast-types/src/context/context.ts     |   6 +-
 .../src/react-query/react-query.ts            | 264 +++++++++++++++---
 .../wasm-ast-types/types/context/context.d.ts |   1 +
 7 files changed, 489 insertions(+), 50 deletions(-)
 create mode 100644 __output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
 create mode 100644 __output__/vectis/factory-query-keys/Factory.react-query.ts

diff --git a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
new file mode 100644
index 00000000..4b292ea0
--- /dev/null
+++ b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
@@ -0,0 +1,126 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+export const factoryQueryKeys = {
+  contract: ([{
+    contract: "factory"
+  }] as const),
+  address: (contractAddress: string | undefined) => ([{ ...factoryQueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  wallets: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets",
+    args
+  }] as const),
+  walletsOf: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets_of",
+    args
+  }] as const),
+  codeId: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "code_id",
+    args
+  }] as const),
+  fee: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "fee",
+    args
+  }] as const),
+  govecAddr: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "govec_addr",
+    args
+  }] as const),
+  adminAddr: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "admin_addr",
+    args
+  }] as const)
+};
+export interface FactoryReactQuery<TResponse> {
+  client: FactoryQueryClient | undefined;
+  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+}
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
+export function useFactoryAdminAddrQuery({
+  client,
+  options
+}: FactoryAdminAddrQuery) {
+  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
+export function useFactoryGovecAddrQuery({
+  client,
+  options
+}: FactoryGovecAddrQuery) {
+  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
+export function useFactoryFeeQuery({
+  client,
+  options
+}: FactoryFeeQuery) {
+  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+  args: {
+    ty: CodeIdType;
+  };
+}
+export function useFactoryCodeIdQuery({
+  client,
+  args,
+  options
+}: FactoryCodeIdQuery) {
+  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
+    ty: args.ty
+  }) : Promise.reject(new Error("Invalid client")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  };
+}
+export function useFactoryWalletsOfQuery({
+  client,
+  args,
+  options
+}: FactoryWalletsOfQuery) {
+  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
+    limit: args.limit,
+    startAfter: args.startAfter,
+    user: args.user
+  }) : Promise.reject(new Error("Invalid client")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+  args: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  };
+}
+export function useFactoryWalletsQuery({
+  client,
+  args,
+  options
+}: FactoryWalletsQuery) {
+  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }) : Promise.reject(new Error("Invalid client")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
new file mode 100644
index 00000000..41c30fb5
--- /dev/null
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -0,0 +1,114 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+export const factoryQueryKeys = {
+  contract: ([{
+    contract: "factory"
+  }] as const),
+  address: (contractAddress: string) => ([{ ...factoryQueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  wallets: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets",
+    args
+  }] as const),
+  walletsOf: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets_of",
+    args
+  }] as const),
+  codeId: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "code_id",
+    args
+  }] as const),
+  fee: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "fee",
+    args
+  }] as const),
+  govecAddr: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "govec_addr",
+    args
+  }] as const),
+  adminAddr: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "admin_addr",
+    args
+  }] as const)
+};
+export interface FactoryReactQuery<TResponse> {
+  client: FactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+}
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
+export function useFactoryAdminAddrQuery({
+  client,
+  options
+}: FactoryAdminAddrQuery) {
+  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
+export function useFactoryGovecAddrQuery({
+  client,
+  options
+}: FactoryGovecAddrQuery) {
+  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
+export function useFactoryFeeQuery({
+  client,
+  options
+}: FactoryFeeQuery) {
+  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+  args: {
+    ty: CodeIdType;
+  };
+}
+export function useFactoryCodeIdQuery({
+  client,
+  args,
+  options
+}: FactoryCodeIdQuery) {
+  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+    ty: args.ty
+  }), options);
+}
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  };
+}
+export function useFactoryWalletsOfQuery({
+  client,
+  args,
+  options
+}: FactoryWalletsOfQuery) {
+  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+    limit: args.limit,
+    startAfter: args.startAfter,
+    user: args.user
+  }), options);
+}
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+  args: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  };
+}
+export function useFactoryWalletsQuery({
+  client,
+  args,
+  options
+}: FactoryWalletsQuery) {
+  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index d2874bde..6977bd3d 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -22,6 +22,21 @@ it('v4Query', async () => {
     await generateReactQuery('Factory', schemas, outopt, { version: 'v4' });
 })
 
+it('queryKeys', async () => {
+  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+  await generateReactQuery('Factory', schemas, outopt, { queryKeys: true });
+})
+
+
+it('queryKeysOptionalClient', async () => {
+  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+  await generateReactQuery('Factory', schemas, outopt, { queryKeys: true, optionalClient: true });
+})
+
 it('useMutations', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index 15f79484..c7343bc7 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -65,10 +65,16 @@ export default async (argv) => {
                 message: 'which react-query version?',
                 default: 'v3',
                 choices: ['v3', 'v4']
-            }
+            },
+            {
+              type: 'confirm',
+              name: 'queryKeys',
+              message: 'queryKeys?',
+              default: false
+            },
         ])
     };
-    const { optionalClient, version } = await prompt(questions2, argv);
+    const { optionalClient, version, queryKeys } = await prompt(questions2, argv);
     const questions3 = [];
     if (version === 'v4') {
         [].push.apply(questions3, [
@@ -120,6 +126,7 @@ export default async (argv) => {
         reactQuery: {
             enabled: plugin.includes('react-query'),
             optionalClient,
+            queryKeys,
             version,
             mutations
         },
@@ -146,4 +153,4 @@ export default async (argv) => {
         outPath: out,
         options
     })
-};
\ No newline at end of file
+};
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index ac6b270a..6d81dd74 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -9,6 +9,7 @@ export interface ReactQueryOptions {
     version?: 'v3' | 'v4';
     mutations?: boolean;
     camelize?: boolean;
+    queryKeys?: boolean
 }
 
 export interface TSClientOptions {
@@ -58,7 +59,8 @@ export const defaultOptions: RenderOptions = {
         optionalClient: false,
         version: 'v3',
         mutations: false,
-        camelize: true
+        camelize: true,
+        queryKeys: false
     }
 };
 
@@ -87,4 +89,4 @@ export class RenderContext implements RenderContext {
             )
         );
     }
-}
\ No newline at end of file
+}
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 22981e73..548b8fea 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -11,15 +11,17 @@ import {
     typeRefOrUnionWithUndefined
 } from '../utils/babel';
 import { getParamsTypeAnnotation, getPropertyType } from '../utils/types';
-import { RenderContext } from '../context';
+import { ReactQueryOptions, RenderContext } from '../context';
 import { JSONSchema } from '../types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
+import { ArgumentPlaceholder, JSXNamespacedName, SpreadElement } from '@babel/types';
 
 interface ReactQueryHookQuery {
     context: RenderContext,
     hookName: string;
     hookParamsTypeName: string;
     hookKeyName: string;
+    queryKeysName: string
     responseType: string;
     methodName: string;
     jsonschema: any;
@@ -40,23 +42,42 @@ export const createReactQueryHooks = ({
 }: ReactQueryHooks) => {
     const options = context.options.reactQuery;
 
-    const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
+  const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
+  const underscoreNames: string[] = getMessageProperties(queryMsg).map((schema) => (Object.keys(schema.properties)[0]))
 
-    const body = [
-        createReactQueryHookGenericInterface({
-            context,
-            QueryClient,
-            genericQueryInterfaceName,
-        })
-    ]
+  const body = []
+
+  const queryKeysName = `${camel(contractName)}QueryKeys`
+  if (options.queryKeys) {
+    body.push(
+      createReactQueryKeys({
+        context,
+        queryKeysName,
+        camelContractName: camel(contractName),
+        underscoreNames,
+      }))
+  }
+
+  body.push(
+      createReactQueryHookGenericInterface({
+        context,
+        QueryClient,
+        genericQueryInterfaceName,
+      }))
 
     body.push(...getMessageProperties(queryMsg)
         .reduce((m, schema) => {
+            // list_voters
             const underscoreName = Object.keys(schema.properties)[0];
+            // listVoters
             const methodName = camel(underscoreName);
+            // Cw3FlexMultisigListVotersQuery
             const hookParamsTypeName = `${pascal(contractName)}${pascal(methodName)}Query`;
+            // useCw3FlexMultisigListVotersQuery
             const hookName = `use${hookParamsTypeName}`;
+            // listVotersResponse
             const responseType = pascal(`${methodName}Response`);
+            // cw3FlexMultisigListVoters
             const getterKey = camel(`${contractName}${pascal(methodName)}`);
             const jsonschema = schema.properties[underscoreName];
             return [
@@ -73,6 +94,7 @@ export const createReactQueryHooks = ({
                     methodName,
                     hookName,
                     hookParamsTypeName,
+                    queryKeysName,
                     responseType,
                     hookKeyName: getterKey,
                     jsonschema
@@ -92,6 +114,7 @@ export const createReactQueryHook = ({
     hookParamsTypeName,
     responseType,
     hookKeyName,
+    queryKeysName,
     methodName,
     jsonschema
 }: ReactQueryHookQuery) => {
@@ -150,9 +173,7 @@ export const createReactQueryHook = ({
                         callExpression(
                             t.identifier('useQuery'),
                             [
-                                t.arrayExpression(
-                                    generateUseQueryQueryKey(hookKeyName, props, options.optionalClient)
-                                ),
+                                    generateUseQueryQueryKey({hookKeyName, queryKeysName, methodName, props, options }),
                                 t.arrowFunctionExpression(
                                     [],
                                     optionalConditionalExpression(
@@ -226,16 +247,6 @@ export const createReactQueryHook = ({
                                     ),
                                     t.tsTypeReference(
                                         t.identifier(responseType)
-                                    ),
-                                    t.tsArrayType(
-                                        t.tsParenthesizedType(
-                                            t.tsUnionType(
-                                                [
-                                                    t.tsStringKeyword(),
-                                                    t.tsUndefinedKeyword()
-                                                ]
-                                            )
-                                        )
                                     )
                                 ]
                             )
@@ -521,6 +532,145 @@ export const createReactQueryMutationHook = ({
 
 };
 
+function createReactQueryKeys({
+  context,
+  queryKeysName,
+  camelContractName,
+  underscoreNames
+}: {
+  context: RenderContext;
+  queryKeysName: string,
+  camelContractName: string;
+  underscoreNames: string[];
+}) {
+  const options = context.options.reactQuery
+
+  const contractAddressTypeAnnotation = t.tsTypeAnnotation(
+    options.optionalClient
+      ? t.tsUnionType([
+        t.tsStringKeyword(),
+        t.tsUndefinedKeyword()
+      ])
+      : t.tSStringKeyword()
+  )
+
+  return t.exportNamedDeclaration(
+    t.variableDeclaration('const', [
+      t.variableDeclarator(
+        t.identifier(queryKeysName),
+        t.objectExpression([
+          // 1: contract
+          t.objectProperty(
+            t.identifier('contract'),
+            t.tSAsExpression(
+              t.arrayExpression([
+                t.objectExpression([
+                  t.objectProperty(
+                    t.identifier('contract'),
+                    t.stringLiteral(camelContractName)
+                  )
+                ])
+              ]),
+              t.tSTypeReference(t.identifier('const'))
+            )
+          ),
+          // 2: address
+          t.objectProperty(
+            t.identifier('address'),
+            t.arrowFunctionExpression(
+              [
+                identifier(
+                  'contractAddress',
+                  contractAddressTypeAnnotation
+                )
+              ],
+              t.tSAsExpression(
+                t.arrayExpression([
+                  t.objectExpression([
+                    // 1
+                    t.spreadElement(
+                      t.memberExpression(
+                        t.memberExpression(
+                          t.identifier(queryKeysName),
+                          t.identifier('contract')
+                        ),
+                        t.numericLiteral(0),
+                        true // computed
+                      )
+                    ),
+                    t.objectProperty(
+                      t.identifier('address'),
+                      t.identifier('contractAddress')
+                    )
+                  ])
+                ]),
+                t.tSTypeReference(t.identifier('const'))
+              )
+            )
+          ),
+          // 3: methods
+          ...underscoreNames.map((underscoreMethodName) =>
+            t.objectProperty(
+              // key id is the camel method name
+              t.identifier(camel(underscoreMethodName)),
+              t.arrowFunctionExpression(
+                [
+                  identifier(
+                    'contractAddress',
+                    contractAddressTypeAnnotation
+                  ),
+                  identifier(
+                    'args',
+                    // Record<string, unknown>
+                    t.tSTypeAnnotation(
+                      t.tsTypeReference(
+                        t.identifier('Record'),
+                        t.tsTypeParameterInstantiation([
+                          t.tsStringKeyword(),
+                          t.tsUnknownKeyword()
+                        ])
+                      )
+                    ),
+                    true // optional
+                  )
+                ],
+                t.tSAsExpression(
+                  t.arrayExpression([
+                    t.objectExpression([
+                      //...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
+                      t.spreadElement(
+                        t.memberExpression(
+                          t.callExpression(
+                            t.memberExpression(
+                              t.identifier(queryKeysName),
+                              t.identifier('address')
+                            ),
+                            [t.identifier('contractAddress')]
+                          ),
+                          t.numericLiteral(0),
+                          true // computed
+                        )
+                      ),
+                      // method: list_voters
+                      t.objectProperty(
+                        t.identifier('method'),
+                        t.stringLiteral(underscoreMethodName)
+                      ),
+                      // args
+                      shorthandProperty('args')
+                    ])
+                  ]),
+                  t.tSTypeReference(t.identifier('const'))
+                )
+              )
+            )
+          )
+        ])
+      )
+    ])
+  )
+}
+
 interface ReactQueryHookGenericInterface {
     context: RenderContext,
     QueryClient: string,
@@ -548,15 +698,7 @@ function createReactQueryHookGenericInterface({
             t.tsTypeReference(t.identifier('Error')),
             t.tsTypeReference(
                 t.identifier(genericTypeName)
-            ),
-            t.tsArrayType(
-                t.tsParenthesizedType(
-                    t.tsUnionType([
-                        t.tsStringKeyword(),
-                        t.tsUndefinedKeyword()
-                    ])
-                )
-            ),
+            )
         ])
     )
 
@@ -682,22 +824,54 @@ const getProps = (
     });
 }
 
-const generateUseQueryQueryKey = (
-    hookKeyName: string,
-    props: string[],
-    optionalClient: boolean
-): Array<Expression> => {
+interface GenerateUseQueryQueryKeyParams {
+  hookKeyName: string;
+  queryKeysName: string;
+  methodName: string;
+  props: string[];
+  options: ReactQueryOptions;
+}
+
+const generateUseQueryQueryKey = ({
+    hookKeyName,
+    queryKeysName,
+    methodName,
+    props,
+    options,
+  }: GenerateUseQueryQueryKeyParams): t.ArrayExpression | t.CallExpression => {
+  const { optionalClient, queryKeys } = options
+
+  const hasArgs = props.includes('args')
+
+  const contractAddressExpression =
+    t.optionalMemberExpression(
+      t.identifier('client'),
+      t.identifier('contractAddress'),
+      false,
+      optionalClient
+    )
+
+  if (queryKeys) {
+
+    const callArgs: Array<Expression> = [contractAddressExpression]
+
+    if (hasArgs) callArgs.push(t.identifier('args'))
+
+    return t.callExpression(
+      t.memberExpression(
+        t.identifier(queryKeysName),
+        t.identifier(camel(methodName))
+      ),
+      callArgs
+    )
+  }
+
     const queryKey: Array<Expression> = [
-        t.stringLiteral(hookKeyName),
-        t.optionalMemberExpression(
-            t.identifier('client'),
-            t.identifier('contractAddress'),
-            false,
-            optionalClient
-        )
+      t.stringLiteral(hookKeyName),
+      contractAddressExpression
     ];
 
-    if (props.includes('args')) {
+    if (hasArgs) {
         queryKey.push(t.callExpression(
             t.memberExpression(
                 t.identifier('JSON'),
@@ -708,5 +882,5 @@ const generateUseQueryQueryKey = (
             ]
         ))
     }
-    return queryKey
+    return t.arrayExpression(queryKey)
 }
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index a0103512..8dd73001 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -5,6 +5,7 @@ export interface ReactQueryOptions {
     version?: 'v3' | 'v4';
     mutations?: boolean;
     camelize?: boolean;
+    queryKeys?: boolean;
 }
 export interface TSClientOptions {
     enabled?: boolean;

From 7b9d75882865c64947f7efb668cbff936126912c Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Mon, 22 Aug 2022 12:19:28 +0200
Subject: [PATCH 002/287] Update readme

---
 README.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c2397866..412d556a 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,8 @@ codegen({
       enabled: true,
       optionalClient: true,
       version: 'v4',
-      mutations: true
+      mutations: true,
+      queryKeys: true,
     },
     recoil: {
       enabled: false
@@ -161,13 +162,14 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 
 #### React Query Options
 
-  | option                         | description                                                         |
-  | ------------------------------ | ------------------------------------------------------------------- |
-  | `reactQuery.enabled`           | enable the react-query plugin                                       |
-  | `reactQuery.optionalClient`    | allows contract client to be undefined as the component renders     |
-  | `reactQuery.version`           | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`       |
-  | `reactQuery.mutations`         | also generate mutations                                             |
-  | `reactQuery.camelize`          | use camelCase style for property names                              |
+  | option                      | description                                                         |
+-----------------------------| ------------------------------ | ------------------------------------------------------------------- |
+  | `reactQuery.enabled`        | enable the react-query plugin                                       |
+  | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders     |
+  | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values      |
+  | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`       |
+  | `reactQuery.mutations`      | also generate mutations                                             |
+  | `reactQuery.camelize`       | use camelCase style for property names                              |
 
 
 #### React Query via CLI 

From 50dd957f8e9053ba1093bef0d9db586de9621e02 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Mon, 22 Aug 2022 12:36:59 +0200
Subject: [PATCH 003/287] Update snapshot tests

---
 .../__snapshots__/react-query.spec.ts.snap    | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index 83513e76..e8beaab1 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -3,21 +3,21 @@
 exports[`createReactQueryHooks 1`] = `
 "export interface Sg721ReactQuery<TResponse> {
   client: Sg721QueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TResponse>;
 }
 export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
 export function useSg721CollectionInfoQuery({
   client,
   options
 }: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse, (string | undefined)[]>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
+  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
 }
 export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
 export function useSg721MinterQuery({
   client,
   options
 }: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse, (string | undefined)[]>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
+  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
 }
 export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
   args: {
@@ -30,7 +30,7 @@ export function useSg721AllTokensQuery({
   args,
   options
 }: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse, (string | undefined)[]>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
@@ -47,7 +47,7 @@ export function useSg721TokensQuery({
   args,
   options
 }: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse, (string | undefined)[]>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -64,7 +64,7 @@ export function useSg721AllNftInfoQuery({
   args,
   options
 }: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse, (string | undefined)[]>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -79,7 +79,7 @@ export function useSg721NftInfoQuery({
   args,
   options
 }: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse, (string | undefined)[]>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
@@ -88,14 +88,14 @@ export function useSg721ContractInfoQuery({
   client,
   options
 }: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse, (string | undefined)[]>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
+  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
 }
 export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
 export function useSg721NumTokensQuery({
   client,
   options
 }: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse, (string | undefined)[]>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
+  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
 }
 export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
   args: {
@@ -110,7 +110,7 @@ export function useSg721AllOperatorsQuery({
   args,
   options
 }: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse, (string | undefined)[]>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -128,7 +128,7 @@ export function useSg721ApprovalsQuery({
   args,
   options
 }: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse, (string | undefined)[]>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -145,7 +145,7 @@ export function useSg721ApprovalQuery({
   args,
   options
 }: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse, (string | undefined)[]>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
+  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -162,7 +162,7 @@ export function useSg721OwnerOfQuery({
   args,
   options
 }: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse, (string | undefined)[]>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -172,14 +172,14 @@ export function useSg721OwnerOfQuery({
 exports[`createReactQueryHooks 2`] = `
 "export interface Sg721ReactQuery<TResponse> {
   client: Sg721QueryClient | undefined;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TResponse>;
 }
 export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
 export function useSg721CollectionInfoQuery({
   client,
   options
 }: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse, (string | undefined)[]>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -188,7 +188,7 @@ export function useSg721MinterQuery({
   client,
   options
 }: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse, (string | undefined)[]>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -203,7 +203,7 @@ export function useSg721AllTokensQuery({
   args,
   options
 }: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse, (string | undefined)[]>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
+  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -222,7 +222,7 @@ export function useSg721TokensQuery({
   args,
   options
 }: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse, (string | undefined)[]>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
+  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -241,7 +241,7 @@ export function useSg721AllNftInfoQuery({
   args,
   options
 }: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse, (string | undefined)[]>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -258,7 +258,7 @@ export function useSg721NftInfoQuery({
   args,
   options
 }: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse, (string | undefined)[]>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
+  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
@@ -269,7 +269,7 @@ export function useSg721ContractInfoQuery({
   client,
   options
 }: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse, (string | undefined)[]>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -278,7 +278,7 @@ export function useSg721NumTokensQuery({
   client,
   options
 }: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse, (string | undefined)[]>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -295,7 +295,7 @@ export function useSg721AllOperatorsQuery({
   args,
   options
 }: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse, (string | undefined)[]>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -315,7 +315,7 @@ export function useSg721ApprovalsQuery({
   args,
   options
 }: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse, (string | undefined)[]>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
+  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -334,7 +334,7 @@ export function useSg721ApprovalQuery({
   args,
   options
 }: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse, (string | undefined)[]>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
+  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -353,7 +353,7 @@ export function useSg721OwnerOfQuery({
   args,
   options
 }: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse, (string | undefined)[]>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -365,7 +365,7 @@ export function useSg721OwnerOfQuery({
 exports[`createReactQueryHooks 3`] = `
 "export interface Sg721ReactQuery<TResponse> {
   client: Sg721QueryClient;
-  options?: Omit<UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TResponse>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
     initialData?: undefined;
   };
 }
@@ -374,14 +374,14 @@ export function useSg721CollectionInfoQuery({
   client,
   options
 }: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse, (string | undefined)[]>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
+  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
 }
 export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
 export function useSg721MinterQuery({
   client,
   options
 }: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse, (string | undefined)[]>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
+  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
 }
 export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
   args: {
@@ -394,7 +394,7 @@ export function useSg721AllTokensQuery({
   args,
   options
 }: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse, (string | undefined)[]>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
@@ -411,7 +411,7 @@ export function useSg721TokensQuery({
   args,
   options
 }: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse, (string | undefined)[]>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -428,7 +428,7 @@ export function useSg721AllNftInfoQuery({
   args,
   options
 }: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse, (string | undefined)[]>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -443,7 +443,7 @@ export function useSg721NftInfoQuery({
   args,
   options
 }: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse, (string | undefined)[]>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
@@ -452,14 +452,14 @@ export function useSg721ContractInfoQuery({
   client,
   options
 }: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse, (string | undefined)[]>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
+  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
 }
 export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
 export function useSg721NumTokensQuery({
   client,
   options
 }: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse, (string | undefined)[]>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
+  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
 }
 export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
   args: {
@@ -474,7 +474,7 @@ export function useSg721AllOperatorsQuery({
   args,
   options
 }: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse, (string | undefined)[]>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -492,7 +492,7 @@ export function useSg721ApprovalsQuery({
   args,
   options
 }: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse, (string | undefined)[]>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -509,7 +509,7 @@ export function useSg721ApprovalQuery({
   args,
   options
 }: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse, (string | undefined)[]>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
+  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -526,7 +526,7 @@ export function useSg721OwnerOfQuery({
   args,
   options
 }: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse, (string | undefined)[]>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -536,7 +536,7 @@ export function useSg721OwnerOfQuery({
 exports[`createReactQueryHooks 4`] = `
 "export interface Sg721ReactQuery<TResponse> {
   client: Sg721QueryClient | undefined;
-  options?: Omit<UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TResponse>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
     initialData?: undefined;
   };
 }
@@ -545,7 +545,7 @@ export function useSg721CollectionInfoQuery({
   client,
   options
 }: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse, (string | undefined)[]>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -554,7 +554,7 @@ export function useSg721MinterQuery({
   client,
   options
 }: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse, (string | undefined)[]>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -569,7 +569,7 @@ export function useSg721AllTokensQuery({
   args,
   options
 }: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse, (string | undefined)[]>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
+  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -588,7 +588,7 @@ export function useSg721TokensQuery({
   args,
   options
 }: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse, (string | undefined)[]>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
+  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -607,7 +607,7 @@ export function useSg721AllNftInfoQuery({
   args,
   options
 }: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse, (string | undefined)[]>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -624,7 +624,7 @@ export function useSg721NftInfoQuery({
   args,
   options
 }: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse, (string | undefined)[]>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
+  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
@@ -635,7 +635,7 @@ export function useSg721ContractInfoQuery({
   client,
   options
 }: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse, (string | undefined)[]>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -644,7 +644,7 @@ export function useSg721NumTokensQuery({
   client,
   options
 }: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse, (string | undefined)[]>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -661,7 +661,7 @@ export function useSg721AllOperatorsQuery({
   args,
   options
 }: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse, (string | undefined)[]>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -681,7 +681,7 @@ export function useSg721ApprovalsQuery({
   args,
   options
 }: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse, (string | undefined)[]>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
+  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -700,7 +700,7 @@ export function useSg721ApprovalQuery({
   args,
   options
 }: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse, (string | undefined)[]>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
+  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -719,7 +719,7 @@ export function useSg721OwnerOfQuery({
   args,
   options
 }: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse, (string | undefined)[]>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,

From 9004a00ac4375e615fe2cd4a6863b3dc462e76ea Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Mon, 22 Aug 2022 12:44:46 +0200
Subject: [PATCH 004/287] Allow use of select in reactquery by introducing
 generic param

---
 .../default/CwAdminFactory.react-query.ts     |   4 +-
 .../default/CwCodeIdRegistry.react-query.ts   |  36 +-
 .../builder/default/CwSingle.react-query.ts   |  84 ++--
 .../builder/default/Factory.react-query.ts    |  52 +--
 .../builder/default/Minter.react-query.ts     |  44 +-
 .../invoke/CwAdminFactory.react-query.ts      |   4 +-
 .../invoke/CwCodeIdRegistry.react-query.ts    |  36 +-
 .../builder/invoke/CwSingle.react-query.ts    |  84 ++--
 .../builder/invoke/Factory.react-query.ts     |  52 +--
 .../builder/invoke/Minter.react-query.ts      |  44 +-
 __output__/cosmwasm/CW4Group.react-query.ts   |  44 +-
 .../CwAdminFactory.react-query.ts             |   4 +-
 .../CwCodeIdRegistry.react-query.ts           |  36 +-
 .../CwNamedGroups.react-query.ts              |  36 +-
 .../CwProposalSingle.react-query.ts           |  84 ++--
 __output__/minter/Minter.react-query.ts       |  44 +-
 __output__/sg721/Sg721.react-query.ts         | 100 ++---
 .../Factory.react-query.ts                    |  52 +--
 .../factory-v4-query/Factory.react-query.ts   |  52 +--
 .../Factory.react-query.ts                    |  52 +--
 .../vectis/factory/Factory.react-query.ts     |  52 +--
 __output__/vectis/govec/Govec.react-query.ts  |  20 +-
 __output__/vectis/proxy/Proxy.react-query.ts  |  20 +-
 .../__snapshots__/react-query.spec.ts.snap    | 400 +++++++++---------
 .../src/react-query/react-query.ts            |  53 ++-
 25 files changed, 759 insertions(+), 730 deletions(-)

diff --git a/__output__/builder/default/CwAdminFactory.react-query.ts b/__output__/builder/default/CwAdminFactory.react-query.ts
index 731fdfc3..be2aa1b7 100644
--- a/__output__/builder/default/CwAdminFactory.react-query.ts
+++ b/__output__/builder/default/CwAdminFactory.react-query.ts
@@ -7,7 +7,7 @@
 import { UseQueryOptions } from "react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
-export interface CwAdminFactoryReactQuery<TResponse> {
+export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.react-query.ts b/__output__/builder/default/CwCodeIdRegistry.react-query.ts
index d30fda59..f219bfd3 100644
--- a/__output__/builder/default/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.react-query.ts
@@ -7,64 +7,64 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
-export interface CwCodeIdRegistryReactQuery<TResponse> {
+export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse> {
+export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
     chainId: string;
     name: string;
   };
 }
-export function useCwCodeIdRegistryListRegistrationsQuery({
+export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrationsResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryListRegistrationsQuery) {
-  return useQuery<ListRegistrationsResponse, Error, ListRegistrationsResponse, (string | undefined)[]>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
+}: CwCodeIdRegistryListRegistrationsQuery<TData>) {
+  return useQuery<ListRegistrationsResponse, Error, TData>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
     chainId: args.chainId,
     name: args.name
   }), options);
 }
-export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse> {
+export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
   args: {
     chainId: string;
     codeId: number;
   };
 }
-export function useCwCodeIdRegistryInfoForCodeIdQuery({
+export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryInfoForCodeIdQuery) {
-  return useQuery<InfoForCodeIdResponse, Error, InfoForCodeIdResponse, (string | undefined)[]>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
+}: CwCodeIdRegistryInfoForCodeIdQuery<TData>) {
+  return useQuery<InfoForCodeIdResponse, Error, TData>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
     chainId: args.chainId,
     codeId: args.codeId
   }), options);
 }
-export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse> {
+export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
   args: {
     chainId: string;
     name: string;
     version?: string;
   };
 }
-export function useCwCodeIdRegistryGetRegistrationQuery({
+export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryGetRegistrationQuery) {
-  return useQuery<GetRegistrationResponse, Error, GetRegistrationResponse, (string | undefined)[]>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
+}: CwCodeIdRegistryGetRegistrationQuery<TData>) {
+  return useQuery<GetRegistrationResponse, Error, TData>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
     chainId: args.chainId,
     name: args.name,
     version: args.version
   }), options);
 }
-export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse> {}
-export function useCwCodeIdRegistryConfigQuery({
+export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: CwCodeIdRegistryConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
+}: CwCodeIdRegistryConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.react-query.ts b/__output__/builder/default/CwSingle.react-query.ts
index bdf7f3ee..c3f26272 100644
--- a/__output__/builder/default/CwSingle.react-query.ts
+++ b/__output__/builder/default/CwSingle.react-query.ts
@@ -7,122 +7,122 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CwSingleQueryClient } from "./CwSingle.client";
-export interface CwSingleReactQuery<TResponse> {
+export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwSingleInfoQuery extends CwSingleReactQuery<InfoResponse> {}
-export function useCwSingleInfoQuery({
+export interface CwSingleInfoQuery extends CwSingleReactQuery<InfoResponse, TData> {}
+export function useCwSingleInfoQuery<TData = InfoResponse>({
   client,
   options
-}: CwSingleInfoQuery) {
-  return useQuery<InfoResponse, Error, InfoResponse, (string | undefined)[]>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
+}: CwSingleInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
 }
-export interface CwSingleVoteHooksQuery extends CwSingleReactQuery<VoteHooksResponse> {}
-export function useCwSingleVoteHooksQuery({
+export interface CwSingleVoteHooksQuery extends CwSingleReactQuery<VoteHooksResponse, TData> {}
+export function useCwSingleVoteHooksQuery<TData = VoteHooksResponse>({
   client,
   options
-}: CwSingleVoteHooksQuery) {
-  return useQuery<VoteHooksResponse, Error, VoteHooksResponse, (string | undefined)[]>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
+}: CwSingleVoteHooksQuery<TData>) {
+  return useQuery<VoteHooksResponse, Error, TData>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
 }
-export interface CwSingleProposalHooksQuery extends CwSingleReactQuery<ProposalHooksResponse> {}
-export function useCwSingleProposalHooksQuery({
+export interface CwSingleProposalHooksQuery extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
+export function useCwSingleProposalHooksQuery<TData = ProposalHooksResponse>({
   client,
   options
-}: CwSingleProposalHooksQuery) {
-  return useQuery<ProposalHooksResponse, Error, ProposalHooksResponse, (string | undefined)[]>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
+}: CwSingleProposalHooksQuery<TData>) {
+  return useQuery<ProposalHooksResponse, Error, TData>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
 }
-export interface CwSingleListVotesQuery extends CwSingleReactQuery<ListVotesResponse> {
+export interface CwSingleListVotesQuery extends CwSingleReactQuery<ListVotesResponse, TData> {
   args: {
     limit?: number;
     proposalId: number;
     startAfter?: string;
   };
 }
-export function useCwSingleListVotesQuery({
+export function useCwSingleListVotesQuery<TData = ListVotesResponse>({
   client,
   args,
   options
-}: CwSingleListVotesQuery) {
-  return useQuery<ListVotesResponse, Error, ListVotesResponse, (string | undefined)[]>(["cwSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
+}: CwSingleListVotesQuery<TData>) {
+  return useQuery<ListVotesResponse, Error, TData>(["cwSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
     limit: args.limit,
     proposalId: args.proposalId,
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleVoteQuery extends CwSingleReactQuery<VoteResponse> {
+export interface CwSingleVoteQuery extends CwSingleReactQuery<VoteResponse, TData> {
   args: {
     proposalId: number;
     voter: string;
   };
 }
-export function useCwSingleVoteQuery({
+export function useCwSingleVoteQuery<TData = VoteResponse>({
   client,
   args,
   options
-}: CwSingleVoteQuery) {
-  return useQuery<VoteResponse, Error, VoteResponse, (string | undefined)[]>(["cwSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
+}: CwSingleVoteQuery<TData>) {
+  return useQuery<VoteResponse, Error, TData>(["cwSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
     proposalId: args.proposalId,
     voter: args.voter
   }), options);
 }
-export interface CwSingleProposalCountQuery extends CwSingleReactQuery<ProposalCountResponse> {}
-export function useCwSingleProposalCountQuery({
+export interface CwSingleProposalCountQuery extends CwSingleReactQuery<ProposalCountResponse, TData> {}
+export function useCwSingleProposalCountQuery<TData = ProposalCountResponse>({
   client,
   options
-}: CwSingleProposalCountQuery) {
-  return useQuery<ProposalCountResponse, Error, ProposalCountResponse, (string | undefined)[]>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
+}: CwSingleProposalCountQuery<TData>) {
+  return useQuery<ProposalCountResponse, Error, TData>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
 }
-export interface CwSingleReverseProposalsQuery extends CwSingleReactQuery<ReverseProposalsResponse> {
+export interface CwSingleReverseProposalsQuery extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
   args: {
     limit?: number;
     startBefore?: number;
   };
 }
-export function useCwSingleReverseProposalsQuery({
+export function useCwSingleReverseProposalsQuery<TData = ReverseProposalsResponse>({
   client,
   args,
   options
-}: CwSingleReverseProposalsQuery) {
-  return useQuery<ReverseProposalsResponse, Error, ReverseProposalsResponse, (string | undefined)[]>(["cwSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
+}: CwSingleReverseProposalsQuery<TData>) {
+  return useQuery<ReverseProposalsResponse, Error, TData>(["cwSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
     limit: args.limit,
     startBefore: args.startBefore
   }), options);
 }
-export interface CwSingleListProposalsQuery extends CwSingleReactQuery<ListProposalsResponse> {
+export interface CwSingleListProposalsQuery extends CwSingleReactQuery<ListProposalsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: number;
   };
 }
-export function useCwSingleListProposalsQuery({
+export function useCwSingleListProposalsQuery<TData = ListProposalsResponse>({
   client,
   args,
   options
-}: CwSingleListProposalsQuery) {
-  return useQuery<ListProposalsResponse, Error, ListProposalsResponse, (string | undefined)[]>(["cwSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
+}: CwSingleListProposalsQuery<TData>) {
+  return useQuery<ListProposalsResponse, Error, TData>(["cwSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleProposalQuery extends CwSingleReactQuery<ProposalResponse> {
+export interface CwSingleProposalQuery extends CwSingleReactQuery<ProposalResponse, TData> {
   args: {
     proposalId: number;
   };
 }
-export function useCwSingleProposalQuery({
+export function useCwSingleProposalQuery<TData = ProposalResponse>({
   client,
   args,
   options
-}: CwSingleProposalQuery) {
-  return useQuery<ProposalResponse, Error, ProposalResponse, (string | undefined)[]>(["cwSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
+}: CwSingleProposalQuery<TData>) {
+  return useQuery<ProposalResponse, Error, TData>(["cwSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
     proposalId: args.proposalId
   }), options);
 }
-export interface CwSingleConfigQuery extends CwSingleReactQuery<ConfigResponse> {}
-export function useCwSingleConfigQuery({
+export interface CwSingleConfigQuery extends CwSingleReactQuery<ConfigResponse, TData> {}
+export function useCwSingleConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: CwSingleConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["cwSingleConfig", client.contractAddress], () => client.config(), options);
+}: CwSingleConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwSingleConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.react-query.ts b/__output__/builder/default/Factory.react-query.ts
index 1e9481eb..41b88b79 100644
--- a/__output__/builder/default/Factory.react-query.ts
+++ b/__output__/builder/default/Factory.react-query.ts
@@ -7,75 +7,75 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/builder/default/Minter.react-query.ts b/__output__/builder/default/Minter.react-query.ts
index f97b612d..28483c5b 100644
--- a/__output__/builder/default/Minter.react-query.ts
+++ b/__output__/builder/default/Minter.react-query.ts
@@ -7,49 +7,49 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
-export interface MinterReactQuery<TResponse> {
+export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse> {
+export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse, TData> {
   args: {
     address: string;
   };
 }
-export function useMinterMintCountQuery({
+export function useMinterMintCountQuery<TData = MintCountResponse>({
   client,
   args,
   options
-}: MinterMintCountQuery) {
-  return useQuery<MintCountResponse, Error, MintCountResponse, (string | undefined)[]>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
+}: MinterMintCountQuery<TData>) {
+  return useQuery<MintCountResponse, Error, TData>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
     address: args.address
   }), options);
 }
-export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse> {}
-export function useMinterMintPriceQuery({
+export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse, TData> {}
+export function useMinterMintPriceQuery<TData = MintPriceResponse>({
   client,
   options
-}: MinterMintPriceQuery) {
-  return useQuery<MintPriceResponse, Error, MintPriceResponse, (string | undefined)[]>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
+}: MinterMintPriceQuery<TData>) {
+  return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
 }
-export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse> {}
-export function useMinterStartTimeQuery({
+export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse, TData> {}
+export function useMinterStartTimeQuery<TData = StartTimeResponse>({
   client,
   options
-}: MinterStartTimeQuery) {
-  return useQuery<StartTimeResponse, Error, StartTimeResponse, (string | undefined)[]>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
+}: MinterStartTimeQuery<TData>) {
+  return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
 }
-export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse> {}
-export function useMinterMintableNumTokensQuery({
+export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
   client,
   options
-}: MinterMintableNumTokensQuery) {
-  return useQuery<MintableNumTokensResponse, Error, MintableNumTokensResponse, (string | undefined)[]>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
+}: MinterMintableNumTokensQuery<TData>) {
+  return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
 }
-export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse> {}
-export function useMinterConfigQuery({
+export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse, TData> {}
+export function useMinterConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: MinterConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["minterConfig", client.contractAddress], () => client.config(), options);
+}: MinterConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["minterConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwAdminFactory.react-query.ts b/__output__/builder/invoke/CwAdminFactory.react-query.ts
index 731fdfc3..be2aa1b7 100644
--- a/__output__/builder/invoke/CwAdminFactory.react-query.ts
+++ b/__output__/builder/invoke/CwAdminFactory.react-query.ts
@@ -7,7 +7,7 @@
 import { UseQueryOptions } from "react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
-export interface CwAdminFactoryReactQuery<TResponse> {
+export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts b/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
index d30fda59..f219bfd3 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
@@ -7,64 +7,64 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
-export interface CwCodeIdRegistryReactQuery<TResponse> {
+export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse> {
+export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
     chainId: string;
     name: string;
   };
 }
-export function useCwCodeIdRegistryListRegistrationsQuery({
+export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrationsResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryListRegistrationsQuery) {
-  return useQuery<ListRegistrationsResponse, Error, ListRegistrationsResponse, (string | undefined)[]>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
+}: CwCodeIdRegistryListRegistrationsQuery<TData>) {
+  return useQuery<ListRegistrationsResponse, Error, TData>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
     chainId: args.chainId,
     name: args.name
   }), options);
 }
-export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse> {
+export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
   args: {
     chainId: string;
     codeId: number;
   };
 }
-export function useCwCodeIdRegistryInfoForCodeIdQuery({
+export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryInfoForCodeIdQuery) {
-  return useQuery<InfoForCodeIdResponse, Error, InfoForCodeIdResponse, (string | undefined)[]>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
+}: CwCodeIdRegistryInfoForCodeIdQuery<TData>) {
+  return useQuery<InfoForCodeIdResponse, Error, TData>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
     chainId: args.chainId,
     codeId: args.codeId
   }), options);
 }
-export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse> {
+export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
   args: {
     chainId: string;
     name: string;
     version?: string;
   };
 }
-export function useCwCodeIdRegistryGetRegistrationQuery({
+export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryGetRegistrationQuery) {
-  return useQuery<GetRegistrationResponse, Error, GetRegistrationResponse, (string | undefined)[]>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
+}: CwCodeIdRegistryGetRegistrationQuery<TData>) {
+  return useQuery<GetRegistrationResponse, Error, TData>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
     chainId: args.chainId,
     name: args.name,
     version: args.version
   }), options);
 }
-export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse> {}
-export function useCwCodeIdRegistryConfigQuery({
+export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: CwCodeIdRegistryConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
+}: CwCodeIdRegistryConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwSingle.react-query.ts b/__output__/builder/invoke/CwSingle.react-query.ts
index bdf7f3ee..c3f26272 100644
--- a/__output__/builder/invoke/CwSingle.react-query.ts
+++ b/__output__/builder/invoke/CwSingle.react-query.ts
@@ -7,122 +7,122 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CwSingleQueryClient } from "./CwSingle.client";
-export interface CwSingleReactQuery<TResponse> {
+export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwSingleInfoQuery extends CwSingleReactQuery<InfoResponse> {}
-export function useCwSingleInfoQuery({
+export interface CwSingleInfoQuery extends CwSingleReactQuery<InfoResponse, TData> {}
+export function useCwSingleInfoQuery<TData = InfoResponse>({
   client,
   options
-}: CwSingleInfoQuery) {
-  return useQuery<InfoResponse, Error, InfoResponse, (string | undefined)[]>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
+}: CwSingleInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
 }
-export interface CwSingleVoteHooksQuery extends CwSingleReactQuery<VoteHooksResponse> {}
-export function useCwSingleVoteHooksQuery({
+export interface CwSingleVoteHooksQuery extends CwSingleReactQuery<VoteHooksResponse, TData> {}
+export function useCwSingleVoteHooksQuery<TData = VoteHooksResponse>({
   client,
   options
-}: CwSingleVoteHooksQuery) {
-  return useQuery<VoteHooksResponse, Error, VoteHooksResponse, (string | undefined)[]>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
+}: CwSingleVoteHooksQuery<TData>) {
+  return useQuery<VoteHooksResponse, Error, TData>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
 }
-export interface CwSingleProposalHooksQuery extends CwSingleReactQuery<ProposalHooksResponse> {}
-export function useCwSingleProposalHooksQuery({
+export interface CwSingleProposalHooksQuery extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
+export function useCwSingleProposalHooksQuery<TData = ProposalHooksResponse>({
   client,
   options
-}: CwSingleProposalHooksQuery) {
-  return useQuery<ProposalHooksResponse, Error, ProposalHooksResponse, (string | undefined)[]>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
+}: CwSingleProposalHooksQuery<TData>) {
+  return useQuery<ProposalHooksResponse, Error, TData>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
 }
-export interface CwSingleListVotesQuery extends CwSingleReactQuery<ListVotesResponse> {
+export interface CwSingleListVotesQuery extends CwSingleReactQuery<ListVotesResponse, TData> {
   args: {
     limit?: number;
     proposalId: number;
     startAfter?: string;
   };
 }
-export function useCwSingleListVotesQuery({
+export function useCwSingleListVotesQuery<TData = ListVotesResponse>({
   client,
   args,
   options
-}: CwSingleListVotesQuery) {
-  return useQuery<ListVotesResponse, Error, ListVotesResponse, (string | undefined)[]>(["cwSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
+}: CwSingleListVotesQuery<TData>) {
+  return useQuery<ListVotesResponse, Error, TData>(["cwSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
     limit: args.limit,
     proposalId: args.proposalId,
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleVoteQuery extends CwSingleReactQuery<VoteResponse> {
+export interface CwSingleVoteQuery extends CwSingleReactQuery<VoteResponse, TData> {
   args: {
     proposalId: number;
     voter: string;
   };
 }
-export function useCwSingleVoteQuery({
+export function useCwSingleVoteQuery<TData = VoteResponse>({
   client,
   args,
   options
-}: CwSingleVoteQuery) {
-  return useQuery<VoteResponse, Error, VoteResponse, (string | undefined)[]>(["cwSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
+}: CwSingleVoteQuery<TData>) {
+  return useQuery<VoteResponse, Error, TData>(["cwSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
     proposalId: args.proposalId,
     voter: args.voter
   }), options);
 }
-export interface CwSingleProposalCountQuery extends CwSingleReactQuery<ProposalCountResponse> {}
-export function useCwSingleProposalCountQuery({
+export interface CwSingleProposalCountQuery extends CwSingleReactQuery<ProposalCountResponse, TData> {}
+export function useCwSingleProposalCountQuery<TData = ProposalCountResponse>({
   client,
   options
-}: CwSingleProposalCountQuery) {
-  return useQuery<ProposalCountResponse, Error, ProposalCountResponse, (string | undefined)[]>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
+}: CwSingleProposalCountQuery<TData>) {
+  return useQuery<ProposalCountResponse, Error, TData>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
 }
-export interface CwSingleReverseProposalsQuery extends CwSingleReactQuery<ReverseProposalsResponse> {
+export interface CwSingleReverseProposalsQuery extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
   args: {
     limit?: number;
     startBefore?: number;
   };
 }
-export function useCwSingleReverseProposalsQuery({
+export function useCwSingleReverseProposalsQuery<TData = ReverseProposalsResponse>({
   client,
   args,
   options
-}: CwSingleReverseProposalsQuery) {
-  return useQuery<ReverseProposalsResponse, Error, ReverseProposalsResponse, (string | undefined)[]>(["cwSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
+}: CwSingleReverseProposalsQuery<TData>) {
+  return useQuery<ReverseProposalsResponse, Error, TData>(["cwSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
     limit: args.limit,
     startBefore: args.startBefore
   }), options);
 }
-export interface CwSingleListProposalsQuery extends CwSingleReactQuery<ListProposalsResponse> {
+export interface CwSingleListProposalsQuery extends CwSingleReactQuery<ListProposalsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: number;
   };
 }
-export function useCwSingleListProposalsQuery({
+export function useCwSingleListProposalsQuery<TData = ListProposalsResponse>({
   client,
   args,
   options
-}: CwSingleListProposalsQuery) {
-  return useQuery<ListProposalsResponse, Error, ListProposalsResponse, (string | undefined)[]>(["cwSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
+}: CwSingleListProposalsQuery<TData>) {
+  return useQuery<ListProposalsResponse, Error, TData>(["cwSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleProposalQuery extends CwSingleReactQuery<ProposalResponse> {
+export interface CwSingleProposalQuery extends CwSingleReactQuery<ProposalResponse, TData> {
   args: {
     proposalId: number;
   };
 }
-export function useCwSingleProposalQuery({
+export function useCwSingleProposalQuery<TData = ProposalResponse>({
   client,
   args,
   options
-}: CwSingleProposalQuery) {
-  return useQuery<ProposalResponse, Error, ProposalResponse, (string | undefined)[]>(["cwSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
+}: CwSingleProposalQuery<TData>) {
+  return useQuery<ProposalResponse, Error, TData>(["cwSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
     proposalId: args.proposalId
   }), options);
 }
-export interface CwSingleConfigQuery extends CwSingleReactQuery<ConfigResponse> {}
-export function useCwSingleConfigQuery({
+export interface CwSingleConfigQuery extends CwSingleReactQuery<ConfigResponse, TData> {}
+export function useCwSingleConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: CwSingleConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["cwSingleConfig", client.contractAddress], () => client.config(), options);
+}: CwSingleConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwSingleConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/Factory.react-query.ts b/__output__/builder/invoke/Factory.react-query.ts
index 1e9481eb..41b88b79 100644
--- a/__output__/builder/invoke/Factory.react-query.ts
+++ b/__output__/builder/invoke/Factory.react-query.ts
@@ -7,75 +7,75 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/builder/invoke/Minter.react-query.ts b/__output__/builder/invoke/Minter.react-query.ts
index f97b612d..28483c5b 100644
--- a/__output__/builder/invoke/Minter.react-query.ts
+++ b/__output__/builder/invoke/Minter.react-query.ts
@@ -7,49 +7,49 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
-export interface MinterReactQuery<TResponse> {
+export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse> {
+export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse, TData> {
   args: {
     address: string;
   };
 }
-export function useMinterMintCountQuery({
+export function useMinterMintCountQuery<TData = MintCountResponse>({
   client,
   args,
   options
-}: MinterMintCountQuery) {
-  return useQuery<MintCountResponse, Error, MintCountResponse, (string | undefined)[]>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
+}: MinterMintCountQuery<TData>) {
+  return useQuery<MintCountResponse, Error, TData>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
     address: args.address
   }), options);
 }
-export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse> {}
-export function useMinterMintPriceQuery({
+export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse, TData> {}
+export function useMinterMintPriceQuery<TData = MintPriceResponse>({
   client,
   options
-}: MinterMintPriceQuery) {
-  return useQuery<MintPriceResponse, Error, MintPriceResponse, (string | undefined)[]>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
+}: MinterMintPriceQuery<TData>) {
+  return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
 }
-export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse> {}
-export function useMinterStartTimeQuery({
+export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse, TData> {}
+export function useMinterStartTimeQuery<TData = StartTimeResponse>({
   client,
   options
-}: MinterStartTimeQuery) {
-  return useQuery<StartTimeResponse, Error, StartTimeResponse, (string | undefined)[]>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
+}: MinterStartTimeQuery<TData>) {
+  return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
 }
-export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse> {}
-export function useMinterMintableNumTokensQuery({
+export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
   client,
   options
-}: MinterMintableNumTokensQuery) {
-  return useQuery<MintableNumTokensResponse, Error, MintableNumTokensResponse, (string | undefined)[]>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
+}: MinterMintableNumTokensQuery<TData>) {
+  return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
 }
-export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse> {}
-export function useMinterConfigQuery({
+export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse, TData> {}
+export function useMinterConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: MinterConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["minterConfig", client.contractAddress], () => client.config(), options);
+}: MinterConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["minterConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/cosmwasm/CW4Group.react-query.ts b/__output__/cosmwasm/CW4Group.react-query.ts
index 044bd4b9..5ee0ff4a 100644
--- a/__output__/cosmwasm/CW4Group.react-query.ts
+++ b/__output__/cosmwasm/CW4Group.react-query.ts
@@ -7,60 +7,60 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, QueryResponse, AdminResponse, TotalWeightResponse, MemberListResponse, MemberResponse, HooksResponse } from "./CW4Group.types";
 import { CW4GroupQueryClient } from "./CW4Group.client";
-export interface CW4GroupReactQuery<TResponse> {
+export interface CW4GroupReactQuery<TResponse, TData = TResponse> {
   client: CW4GroupQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CW4GroupHooksQuery extends CW4GroupReactQuery<HooksResponse> {}
-export function useCW4GroupHooksQuery({
+export interface CW4GroupHooksQuery extends CW4GroupReactQuery<HooksResponse, TData> {}
+export function useCW4GroupHooksQuery<TData = HooksResponse>({
   client,
   options
-}: CW4GroupHooksQuery) {
-  return useQuery<HooksResponse, Error, HooksResponse, (string | undefined)[]>(["cW4GroupHooks", client.contractAddress], () => client.hooks(), options);
+}: CW4GroupHooksQuery<TData>) {
+  return useQuery<HooksResponse, Error, TData>(["cW4GroupHooks", client.contractAddress], () => client.hooks(), options);
 }
-export interface CW4GroupMemberQuery extends CW4GroupReactQuery<MemberResponse> {
+export interface CW4GroupMemberQuery extends CW4GroupReactQuery<MemberResponse, TData> {
   args: {
     addr: string;
     atHeight?: number;
   };
 }
-export function useCW4GroupMemberQuery({
+export function useCW4GroupMemberQuery<TData = MemberResponse>({
   client,
   args,
   options
-}: CW4GroupMemberQuery) {
-  return useQuery<MemberResponse, Error, MemberResponse, (string | undefined)[]>(["cW4GroupMember", client.contractAddress, JSON.stringify(args)], () => client.member({
+}: CW4GroupMemberQuery<TData>) {
+  return useQuery<MemberResponse, Error, TData>(["cW4GroupMember", client.contractAddress, JSON.stringify(args)], () => client.member({
     addr: args.addr,
     atHeight: args.atHeight
   }), options);
 }
-export interface CW4GroupListMembersQuery extends CW4GroupReactQuery<ListMembersResponse> {
+export interface CW4GroupListMembersQuery extends CW4GroupReactQuery<ListMembersResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
   };
 }
-export function useCW4GroupListMembersQuery({
+export function useCW4GroupListMembersQuery<TData = ListMembersResponse>({
   client,
   args,
   options
-}: CW4GroupListMembersQuery) {
-  return useQuery<ListMembersResponse, Error, ListMembersResponse, (string | undefined)[]>(["cW4GroupListMembers", client.contractAddress, JSON.stringify(args)], () => client.listMembers({
+}: CW4GroupListMembersQuery<TData>) {
+  return useQuery<ListMembersResponse, Error, TData>(["cW4GroupListMembers", client.contractAddress, JSON.stringify(args)], () => client.listMembers({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface CW4GroupTotalWeightQuery extends CW4GroupReactQuery<TotalWeightResponse> {}
-export function useCW4GroupTotalWeightQuery({
+export interface CW4GroupTotalWeightQuery extends CW4GroupReactQuery<TotalWeightResponse, TData> {}
+export function useCW4GroupTotalWeightQuery<TData = TotalWeightResponse>({
   client,
   options
-}: CW4GroupTotalWeightQuery) {
-  return useQuery<TotalWeightResponse, Error, TotalWeightResponse, (string | undefined)[]>(["cW4GroupTotalWeight", client.contractAddress], () => client.totalWeight(), options);
+}: CW4GroupTotalWeightQuery<TData>) {
+  return useQuery<TotalWeightResponse, Error, TData>(["cW4GroupTotalWeight", client.contractAddress], () => client.totalWeight(), options);
 }
-export interface CW4GroupAdminQuery extends CW4GroupReactQuery<AdminResponse> {}
-export function useCW4GroupAdminQuery({
+export interface CW4GroupAdminQuery extends CW4GroupReactQuery<AdminResponse, TData> {}
+export function useCW4GroupAdminQuery<TData = AdminResponse>({
   client,
   options
-}: CW4GroupAdminQuery) {
-  return useQuery<AdminResponse, Error, AdminResponse, (string | undefined)[]>(["cW4GroupAdmin", client.contractAddress], () => client.admin(), options);
+}: CW4GroupAdminQuery<TData>) {
+  return useQuery<AdminResponse, Error, TData>(["cW4GroupAdmin", client.contractAddress], () => client.admin(), options);
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts
index 731fdfc3..be2aa1b7 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts
@@ -7,7 +7,7 @@
 import { UseQueryOptions } from "react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
-export interface CwAdminFactoryReactQuery<TResponse> {
+export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
index d30fda59..f219bfd3 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
@@ -7,64 +7,64 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
-export interface CwCodeIdRegistryReactQuery<TResponse> {
+export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse> {
+export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
     chainId: string;
     name: string;
   };
 }
-export function useCwCodeIdRegistryListRegistrationsQuery({
+export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrationsResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryListRegistrationsQuery) {
-  return useQuery<ListRegistrationsResponse, Error, ListRegistrationsResponse, (string | undefined)[]>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
+}: CwCodeIdRegistryListRegistrationsQuery<TData>) {
+  return useQuery<ListRegistrationsResponse, Error, TData>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
     chainId: args.chainId,
     name: args.name
   }), options);
 }
-export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse> {
+export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
   args: {
     chainId: string;
     codeId: number;
   };
 }
-export function useCwCodeIdRegistryInfoForCodeIdQuery({
+export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryInfoForCodeIdQuery) {
-  return useQuery<InfoForCodeIdResponse, Error, InfoForCodeIdResponse, (string | undefined)[]>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
+}: CwCodeIdRegistryInfoForCodeIdQuery<TData>) {
+  return useQuery<InfoForCodeIdResponse, Error, TData>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
     chainId: args.chainId,
     codeId: args.codeId
   }), options);
 }
-export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse> {
+export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
   args: {
     chainId: string;
     name: string;
     version?: string;
   };
 }
-export function useCwCodeIdRegistryGetRegistrationQuery({
+export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationResponse>({
   client,
   args,
   options
-}: CwCodeIdRegistryGetRegistrationQuery) {
-  return useQuery<GetRegistrationResponse, Error, GetRegistrationResponse, (string | undefined)[]>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
+}: CwCodeIdRegistryGetRegistrationQuery<TData>) {
+  return useQuery<GetRegistrationResponse, Error, TData>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
     chainId: args.chainId,
     name: args.name,
     version: args.version
   }), options);
 }
-export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse> {}
-export function useCwCodeIdRegistryConfigQuery({
+export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: CwCodeIdRegistryConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
+}: CwCodeIdRegistryConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
index d53e040b..5451d8c7 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
@@ -7,66 +7,66 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types";
 import { CwNamedGroupsQueryClient } from "./CwNamedGroups.client";
-export interface CwNamedGroupsReactQuery<TResponse> {
+export interface CwNamedGroupsReactQuery<TResponse, TData = TResponse> {
   client: CwNamedGroupsQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwNamedGroupsIsAddressInGroupQuery extends CwNamedGroupsReactQuery<IsAddressInGroupResponse> {
+export interface CwNamedGroupsIsAddressInGroupQuery extends CwNamedGroupsReactQuery<IsAddressInGroupResponse, TData> {
   args: {
     address: string;
     group: string;
   };
 }
-export function useCwNamedGroupsIsAddressInGroupQuery({
+export function useCwNamedGroupsIsAddressInGroupQuery<TData = IsAddressInGroupResponse>({
   client,
   args,
   options
-}: CwNamedGroupsIsAddressInGroupQuery) {
-  return useQuery<IsAddressInGroupResponse, Error, IsAddressInGroupResponse, (string | undefined)[]>(["cwNamedGroupsIsAddressInGroup", client.contractAddress, JSON.stringify(args)], () => client.isAddressInGroup({
+}: CwNamedGroupsIsAddressInGroupQuery<TData>) {
+  return useQuery<IsAddressInGroupResponse, Error, TData>(["cwNamedGroupsIsAddressInGroup", client.contractAddress, JSON.stringify(args)], () => client.isAddressInGroup({
     address: args.address,
     group: args.group
   }), options);
 }
-export interface CwNamedGroupsListAddressesQuery extends CwNamedGroupsReactQuery<ListAddressesResponse> {
+export interface CwNamedGroupsListAddressesQuery extends CwNamedGroupsReactQuery<ListAddressesResponse, TData> {
   args: {
     group: string;
     limit?: number;
     offset?: number;
   };
 }
-export function useCwNamedGroupsListAddressesQuery({
+export function useCwNamedGroupsListAddressesQuery<TData = ListAddressesResponse>({
   client,
   args,
   options
-}: CwNamedGroupsListAddressesQuery) {
-  return useQuery<ListAddressesResponse, Error, ListAddressesResponse, (string | undefined)[]>(["cwNamedGroupsListAddresses", client.contractAddress, JSON.stringify(args)], () => client.listAddresses({
+}: CwNamedGroupsListAddressesQuery<TData>) {
+  return useQuery<ListAddressesResponse, Error, TData>(["cwNamedGroupsListAddresses", client.contractAddress, JSON.stringify(args)], () => client.listAddresses({
     group: args.group,
     limit: args.limit,
     offset: args.offset
   }), options);
 }
-export interface CwNamedGroupsListGroupsQuery extends CwNamedGroupsReactQuery<ListGroupsResponse> {
+export interface CwNamedGroupsListGroupsQuery extends CwNamedGroupsReactQuery<ListGroupsResponse, TData> {
   args: {
     address: string;
     limit?: number;
     offset?: number;
   };
 }
-export function useCwNamedGroupsListGroupsQuery({
+export function useCwNamedGroupsListGroupsQuery<TData = ListGroupsResponse>({
   client,
   args,
   options
-}: CwNamedGroupsListGroupsQuery) {
-  return useQuery<ListGroupsResponse, Error, ListGroupsResponse, (string | undefined)[]>(["cwNamedGroupsListGroups", client.contractAddress, JSON.stringify(args)], () => client.listGroups({
+}: CwNamedGroupsListGroupsQuery<TData>) {
+  return useQuery<ListGroupsResponse, Error, TData>(["cwNamedGroupsListGroups", client.contractAddress, JSON.stringify(args)], () => client.listGroups({
     address: args.address,
     limit: args.limit,
     offset: args.offset
   }), options);
 }
-export interface CwNamedGroupsDumpQuery extends CwNamedGroupsReactQuery<DumpResponse> {}
-export function useCwNamedGroupsDumpQuery({
+export interface CwNamedGroupsDumpQuery extends CwNamedGroupsReactQuery<DumpResponse, TData> {}
+export function useCwNamedGroupsDumpQuery<TData = DumpResponse>({
   client,
   options
-}: CwNamedGroupsDumpQuery) {
-  return useQuery<DumpResponse, Error, DumpResponse, (string | undefined)[]>(["cwNamedGroupsDump", client.contractAddress], () => client.dump(), options);
+}: CwNamedGroupsDumpQuery<TData>) {
+  return useQuery<DumpResponse, Error, TData>(["cwNamedGroupsDump", client.contractAddress], () => client.dump(), options);
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
index 03e35352..4ad925ce 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
@@ -7,122 +7,122 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types";
 import { CwProposalSingleQueryClient } from "./CwProposalSingle.client";
-export interface CwProposalSingleReactQuery<TResponse> {
+export interface CwProposalSingleReactQuery<TResponse, TData = TResponse> {
   client: CwProposalSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwProposalSingleInfoQuery extends CwProposalSingleReactQuery<InfoResponse> {}
-export function useCwProposalSingleInfoQuery({
+export interface CwProposalSingleInfoQuery extends CwProposalSingleReactQuery<InfoResponse, TData> {}
+export function useCwProposalSingleInfoQuery<TData = InfoResponse>({
   client,
   options
-}: CwProposalSingleInfoQuery) {
-  return useQuery<InfoResponse, Error, InfoResponse, (string | undefined)[]>(["cwProposalSingleInfo", client.contractAddress], () => client.info(), options);
+}: CwProposalSingleInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["cwProposalSingleInfo", client.contractAddress], () => client.info(), options);
 }
-export interface CwProposalSingleVoteHooksQuery extends CwProposalSingleReactQuery<VoteHooksResponse> {}
-export function useCwProposalSingleVoteHooksQuery({
+export interface CwProposalSingleVoteHooksQuery extends CwProposalSingleReactQuery<VoteHooksResponse, TData> {}
+export function useCwProposalSingleVoteHooksQuery<TData = VoteHooksResponse>({
   client,
   options
-}: CwProposalSingleVoteHooksQuery) {
-  return useQuery<VoteHooksResponse, Error, VoteHooksResponse, (string | undefined)[]>(["cwProposalSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
+}: CwProposalSingleVoteHooksQuery<TData>) {
+  return useQuery<VoteHooksResponse, Error, TData>(["cwProposalSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
 }
-export interface CwProposalSingleProposalHooksQuery extends CwProposalSingleReactQuery<ProposalHooksResponse> {}
-export function useCwProposalSingleProposalHooksQuery({
+export interface CwProposalSingleProposalHooksQuery extends CwProposalSingleReactQuery<ProposalHooksResponse, TData> {}
+export function useCwProposalSingleProposalHooksQuery<TData = ProposalHooksResponse>({
   client,
   options
-}: CwProposalSingleProposalHooksQuery) {
-  return useQuery<ProposalHooksResponse, Error, ProposalHooksResponse, (string | undefined)[]>(["cwProposalSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
+}: CwProposalSingleProposalHooksQuery<TData>) {
+  return useQuery<ProposalHooksResponse, Error, TData>(["cwProposalSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
 }
-export interface CwProposalSingleListVotesQuery extends CwProposalSingleReactQuery<ListVotesResponse> {
+export interface CwProposalSingleListVotesQuery extends CwProposalSingleReactQuery<ListVotesResponse, TData> {
   args: {
     limit?: number;
     proposalId: number;
     startAfter?: string;
   };
 }
-export function useCwProposalSingleListVotesQuery({
+export function useCwProposalSingleListVotesQuery<TData = ListVotesResponse>({
   client,
   args,
   options
-}: CwProposalSingleListVotesQuery) {
-  return useQuery<ListVotesResponse, Error, ListVotesResponse, (string | undefined)[]>(["cwProposalSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
+}: CwProposalSingleListVotesQuery<TData>) {
+  return useQuery<ListVotesResponse, Error, TData>(["cwProposalSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
     limit: args.limit,
     proposalId: args.proposalId,
     startAfter: args.startAfter
   }), options);
 }
-export interface CwProposalSingleVoteQuery extends CwProposalSingleReactQuery<VoteResponse> {
+export interface CwProposalSingleVoteQuery extends CwProposalSingleReactQuery<VoteResponse, TData> {
   args: {
     proposalId: number;
     voter: string;
   };
 }
-export function useCwProposalSingleVoteQuery({
+export function useCwProposalSingleVoteQuery<TData = VoteResponse>({
   client,
   args,
   options
-}: CwProposalSingleVoteQuery) {
-  return useQuery<VoteResponse, Error, VoteResponse, (string | undefined)[]>(["cwProposalSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
+}: CwProposalSingleVoteQuery<TData>) {
+  return useQuery<VoteResponse, Error, TData>(["cwProposalSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
     proposalId: args.proposalId,
     voter: args.voter
   }), options);
 }
-export interface CwProposalSingleProposalCountQuery extends CwProposalSingleReactQuery<ProposalCountResponse> {}
-export function useCwProposalSingleProposalCountQuery({
+export interface CwProposalSingleProposalCountQuery extends CwProposalSingleReactQuery<ProposalCountResponse, TData> {}
+export function useCwProposalSingleProposalCountQuery<TData = ProposalCountResponse>({
   client,
   options
-}: CwProposalSingleProposalCountQuery) {
-  return useQuery<ProposalCountResponse, Error, ProposalCountResponse, (string | undefined)[]>(["cwProposalSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
+}: CwProposalSingleProposalCountQuery<TData>) {
+  return useQuery<ProposalCountResponse, Error, TData>(["cwProposalSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
 }
-export interface CwProposalSingleReverseProposalsQuery extends CwProposalSingleReactQuery<ReverseProposalsResponse> {
+export interface CwProposalSingleReverseProposalsQuery extends CwProposalSingleReactQuery<ReverseProposalsResponse, TData> {
   args: {
     limit?: number;
     startBefore?: number;
   };
 }
-export function useCwProposalSingleReverseProposalsQuery({
+export function useCwProposalSingleReverseProposalsQuery<TData = ReverseProposalsResponse>({
   client,
   args,
   options
-}: CwProposalSingleReverseProposalsQuery) {
-  return useQuery<ReverseProposalsResponse, Error, ReverseProposalsResponse, (string | undefined)[]>(["cwProposalSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
+}: CwProposalSingleReverseProposalsQuery<TData>) {
+  return useQuery<ReverseProposalsResponse, Error, TData>(["cwProposalSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
     limit: args.limit,
     startBefore: args.startBefore
   }), options);
 }
-export interface CwProposalSingleListProposalsQuery extends CwProposalSingleReactQuery<ListProposalsResponse> {
+export interface CwProposalSingleListProposalsQuery extends CwProposalSingleReactQuery<ListProposalsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: number;
   };
 }
-export function useCwProposalSingleListProposalsQuery({
+export function useCwProposalSingleListProposalsQuery<TData = ListProposalsResponse>({
   client,
   args,
   options
-}: CwProposalSingleListProposalsQuery) {
-  return useQuery<ListProposalsResponse, Error, ListProposalsResponse, (string | undefined)[]>(["cwProposalSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
+}: CwProposalSingleListProposalsQuery<TData>) {
+  return useQuery<ListProposalsResponse, Error, TData>(["cwProposalSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface CwProposalSingleProposalQuery extends CwProposalSingleReactQuery<ProposalResponse> {
+export interface CwProposalSingleProposalQuery extends CwProposalSingleReactQuery<ProposalResponse, TData> {
   args: {
     proposalId: number;
   };
 }
-export function useCwProposalSingleProposalQuery({
+export function useCwProposalSingleProposalQuery<TData = ProposalResponse>({
   client,
   args,
   options
-}: CwProposalSingleProposalQuery) {
-  return useQuery<ProposalResponse, Error, ProposalResponse, (string | undefined)[]>(["cwProposalSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
+}: CwProposalSingleProposalQuery<TData>) {
+  return useQuery<ProposalResponse, Error, TData>(["cwProposalSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
     proposalId: args.proposalId
   }), options);
 }
-export interface CwProposalSingleConfigQuery extends CwProposalSingleReactQuery<ConfigResponse> {}
-export function useCwProposalSingleConfigQuery({
+export interface CwProposalSingleConfigQuery extends CwProposalSingleReactQuery<ConfigResponse, TData> {}
+export function useCwProposalSingleConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: CwProposalSingleConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["cwProposalSingleConfig", client.contractAddress], () => client.config(), options);
+}: CwProposalSingleConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwProposalSingleConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/minter/Minter.react-query.ts b/__output__/minter/Minter.react-query.ts
index f97b612d..28483c5b 100644
--- a/__output__/minter/Minter.react-query.ts
+++ b/__output__/minter/Minter.react-query.ts
@@ -7,49 +7,49 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
-export interface MinterReactQuery<TResponse> {
+export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse> {
+export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse, TData> {
   args: {
     address: string;
   };
 }
-export function useMinterMintCountQuery({
+export function useMinterMintCountQuery<TData = MintCountResponse>({
   client,
   args,
   options
-}: MinterMintCountQuery) {
-  return useQuery<MintCountResponse, Error, MintCountResponse, (string | undefined)[]>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
+}: MinterMintCountQuery<TData>) {
+  return useQuery<MintCountResponse, Error, TData>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
     address: args.address
   }), options);
 }
-export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse> {}
-export function useMinterMintPriceQuery({
+export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse, TData> {}
+export function useMinterMintPriceQuery<TData = MintPriceResponse>({
   client,
   options
-}: MinterMintPriceQuery) {
-  return useQuery<MintPriceResponse, Error, MintPriceResponse, (string | undefined)[]>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
+}: MinterMintPriceQuery<TData>) {
+  return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
 }
-export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse> {}
-export function useMinterStartTimeQuery({
+export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse, TData> {}
+export function useMinterStartTimeQuery<TData = StartTimeResponse>({
   client,
   options
-}: MinterStartTimeQuery) {
-  return useQuery<StartTimeResponse, Error, StartTimeResponse, (string | undefined)[]>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
+}: MinterStartTimeQuery<TData>) {
+  return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
 }
-export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse> {}
-export function useMinterMintableNumTokensQuery({
+export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
   client,
   options
-}: MinterMintableNumTokensQuery) {
-  return useQuery<MintableNumTokensResponse, Error, MintableNumTokensResponse, (string | undefined)[]>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
+}: MinterMintableNumTokensQuery<TData>) {
+  return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
 }
-export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse> {}
-export function useMinterConfigQuery({
+export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse, TData> {}
+export function useMinterConfigQuery<TData = ConfigResponse>({
   client,
   options
-}: MinterConfigQuery) {
-  return useQuery<ConfigResponse, Error, ConfigResponse, (string | undefined)[]>(["minterConfig", client.contractAddress], () => client.config(), options);
+}: MinterConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["minterConfig", client.contractAddress], () => client.config(), options);
 }
\ No newline at end of file
diff --git a/__output__/sg721/Sg721.react-query.ts b/__output__/sg721/Sg721.react-query.ts
index dba7c0be..c4ba9cfa 100644
--- a/__output__/sg721/Sg721.react-query.ts
+++ b/__output__/sg721/Sg721.react-query.ts
@@ -7,103 +7,103 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
 import { Sg721QueryClient } from "./Sg721.client";
-export interface Sg721ReactQuery<TResponse> {
+export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
-export function useSg721CollectionInfoQuery({
+export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
-}: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse, (string | undefined)[]>(["sg721CollectionInfo", client.contractAddress], () => client.collectionInfo(), options);
+}: Sg721CollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>(["sg721CollectionInfo", client.contractAddress], () => client.collectionInfo(), options);
 }
-export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
-export function useSg721MinterQuery({
+export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse, TData> {}
+export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
-}: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse, (string | undefined)[]>(["sg721Minter", client.contractAddress], () => client.minter(), options);
+}: Sg721MinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>(["sg721Minter", client.contractAddress], () => client.minter(), options);
 }
-export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
+export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
   };
 }
-export function useSg721AllTokensQuery({
+export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   client,
   args,
   options
-}: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse, (string | undefined)[]>(["sg721AllTokens", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+}: Sg721AllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>(["sg721AllTokens", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse> {
+export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse, TData> {
   args: {
     limit?: number;
     owner: string;
     startAfter?: string;
   };
 }
-export function useSg721TokensQuery({
+export function useSg721TokensQuery<TData = TokensResponse>({
   client,
   args,
   options
-}: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse, (string | undefined)[]>(["sg721Tokens", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+}: Sg721TokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>(["sg721Tokens", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse> {
+export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721AllNftInfoQuery({
+export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   client,
   args,
   options
-}: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse, (string | undefined)[]>(["sg721AllNftInfo", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+}: Sg721AllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>(["sg721AllNftInfo", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse> {
+export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse, TData> {
   args: {
     tokenId: string;
   };
 }
-export function useSg721NftInfoQuery({
+export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   client,
   args,
   options
-}: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse, (string | undefined)[]>(["sg721NftInfo", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+}: Sg721NftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>(["sg721NftInfo", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse> {}
-export function useSg721ContractInfoQuery({
+export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
-}: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse, (string | undefined)[]>(["sg721ContractInfo", client.contractAddress], () => client.contractInfo(), options);
+}: Sg721ContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>(["sg721ContractInfo", client.contractAddress], () => client.contractInfo(), options);
 }
-export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
-export function useSg721NumTokensQuery({
+export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
-}: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse, (string | undefined)[]>(["sg721NumTokens", client.contractAddress], () => client.numTokens(), options);
+}: Sg721NumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>(["sg721NumTokens", client.contractAddress], () => client.numTokens(), options);
 }
-export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
+export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
     includeExpired?: boolean;
     limit?: number;
@@ -111,64 +111,64 @@ export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResp
     startAfter?: string;
   };
 }
-export function useSg721AllOperatorsQuery({
+export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   client,
   args,
   options
-}: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse, (string | undefined)[]>(["sg721AllOperators", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+}: Sg721AllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>(["sg721AllOperators", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse> {
+export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721ApprovalsQuery({
+export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   client,
   args,
   options
-}: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse, (string | undefined)[]>(["sg721Approvals", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+}: Sg721ApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>(["sg721Approvals", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse> {
+export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse, TData> {
   args: {
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
   };
 }
-export function useSg721ApprovalQuery({
+export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   client,
   args,
   options
-}: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse, (string | undefined)[]>(["sg721Approval", client.contractAddress, JSON.stringify(args)], () => client.approval({
+}: Sg721ApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>(["sg721Approval", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse> {
+export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721OwnerOfQuery({
+export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   client,
   args,
   options
-}: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse, (string | undefined)[]>(["sg721OwnerOf", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+}: Sg721OwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>(["sg721OwnerOf", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
diff --git a/__output__/vectis/factory-optional-client/Factory.react-query.ts b/__output__/vectis/factory-optional-client/Factory.react-query.ts
index 9288c29c..0514312c 100644
--- a/__output__/vectis/factory-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-optional-client/Factory.react-query.ts
@@ -7,66 +7,66 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient | undefined;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
     ty: args.ty
   }) : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
@@ -74,18 +74,18 @@ export function useFactoryWalletsOfQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }) : Promise.reject(new Error("Invalid client")), { ...options,
diff --git a/__output__/vectis/factory-v4-query/Factory.react-query.ts b/__output__/vectis/factory-v4-query/Factory.react-query.ts
index 74af8235..fc74f99f 100644
--- a/__output__/vectis/factory-v4-query/Factory.react-query.ts
+++ b/__output__/vectis/factory-v4-query/Factory.react-query.ts
@@ -7,77 +7,77 @@
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: Omit<UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index b85d1eb4..d1fa2ce2 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -9,77 +9,77 @@ import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient, FactoryClient } from "./Factory.client";
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: Omit<UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/vectis/factory/Factory.react-query.ts b/__output__/vectis/factory/Factory.react-query.ts
index 1e9481eb..41b88b79 100644
--- a/__output__/vectis/factory/Factory.react-query.ts
+++ b/__output__/vectis/factory/Factory.react-query.ts
@@ -7,75 +7,75 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/vectis/govec/Govec.react-query.ts b/__output__/vectis/govec/Govec.react-query.ts
index b58e53c2..638b2bd1 100644
--- a/__output__/vectis/govec/Govec.react-query.ts
+++ b/__output__/vectis/govec/Govec.react-query.ts
@@ -7,28 +7,28 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types";
 import { GovecQueryClient } from "./Govec.client";
-export interface GovecReactQuery<TResponse> {
+export interface GovecReactQuery<TResponse, TData = TResponse> {
   client: GovecQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface GovecCanExecuteRelayQuery extends GovecReactQuery<CanExecuteRelayResponse> {
+export interface GovecCanExecuteRelayQuery extends GovecReactQuery<CanExecuteRelayResponse, TData> {
   args: {
     sender: string;
   };
 }
-export function useGovecCanExecuteRelayQuery({
+export function useGovecCanExecuteRelayQuery<TData = CanExecuteRelayResponse>({
   client,
   args,
   options
-}: GovecCanExecuteRelayQuery) {
-  return useQuery<CanExecuteRelayResponse, Error, CanExecuteRelayResponse, (string | undefined)[]>(["govecCanExecuteRelay", client.contractAddress, JSON.stringify(args)], () => client.canExecuteRelay({
+}: GovecCanExecuteRelayQuery<TData>) {
+  return useQuery<CanExecuteRelayResponse, Error, TData>(["govecCanExecuteRelay", client.contractAddress, JSON.stringify(args)], () => client.canExecuteRelay({
     sender: args.sender
   }), options);
 }
-export interface GovecInfoQuery extends GovecReactQuery<InfoResponse> {}
-export function useGovecInfoQuery({
+export interface GovecInfoQuery extends GovecReactQuery<InfoResponse, TData> {}
+export function useGovecInfoQuery<TData = InfoResponse>({
   client,
   options
-}: GovecInfoQuery) {
-  return useQuery<InfoResponse, Error, InfoResponse, (string | undefined)[]>(["govecInfo", client.contractAddress], () => client.info(), options);
+}: GovecInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["govecInfo", client.contractAddress], () => client.info(), options);
 }
\ No newline at end of file
diff --git a/__output__/vectis/proxy/Proxy.react-query.ts b/__output__/vectis/proxy/Proxy.react-query.ts
index e69c96e7..1bcb2754 100644
--- a/__output__/vectis/proxy/Proxy.react-query.ts
+++ b/__output__/vectis/proxy/Proxy.react-query.ts
@@ -7,28 +7,28 @@
 import { UseQueryOptions, useQuery } from "react-query";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types";
 import { ProxyQueryClient } from "./Proxy.client";
-export interface ProxyReactQuery<TResponse> {
+export interface ProxyReactQuery<TResponse, TData = TResponse> {
   client: ProxyQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface ProxyCanExecuteRelayQuery extends ProxyReactQuery<CanExecuteRelayResponse> {
+export interface ProxyCanExecuteRelayQuery extends ProxyReactQuery<CanExecuteRelayResponse, TData> {
   args: {
     sender: string;
   };
 }
-export function useProxyCanExecuteRelayQuery({
+export function useProxyCanExecuteRelayQuery<TData = CanExecuteRelayResponse>({
   client,
   args,
   options
-}: ProxyCanExecuteRelayQuery) {
-  return useQuery<CanExecuteRelayResponse, Error, CanExecuteRelayResponse, (string | undefined)[]>(["proxyCanExecuteRelay", client.contractAddress, JSON.stringify(args)], () => client.canExecuteRelay({
+}: ProxyCanExecuteRelayQuery<TData>) {
+  return useQuery<CanExecuteRelayResponse, Error, TData>(["proxyCanExecuteRelay", client.contractAddress, JSON.stringify(args)], () => client.canExecuteRelay({
     sender: args.sender
   }), options);
 }
-export interface ProxyInfoQuery extends ProxyReactQuery<InfoResponse> {}
-export function useProxyInfoQuery({
+export interface ProxyInfoQuery extends ProxyReactQuery<InfoResponse, TData> {}
+export function useProxyInfoQuery<TData = InfoResponse>({
   client,
   options
-}: ProxyInfoQuery) {
-  return useQuery<InfoResponse, Error, InfoResponse, (string | undefined)[]>(["proxyInfo", client.contractAddress], () => client.info(), options);
+}: ProxyInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["proxyInfo", client.contractAddress], () => client.info(), options);
 }
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index e8beaab1..afd93450 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -1,103 +1,103 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`createReactQueryHooks 1`] = `
-"export interface Sg721ReactQuery<TResponse> {
+"export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
-export function useSg721CollectionInfoQuery({
+export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
-}: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
+}: Sg721CollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
 }
-export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
-export function useSg721MinterQuery({
+export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
+export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
-}: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
+}: Sg721MinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
 }
-export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
+export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
   };
 }
-export function useSg721AllTokensQuery({
+export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   client,
   args,
   options
-}: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+}: Sg721AllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse> {
+export interface Sg721TokensQuery<TData> extends Sg721ReactQuery<TokensResponse, TData> {
   args: {
     limit?: number;
     owner: string;
     startAfter?: string;
   };
 }
-export function useSg721TokensQuery({
+export function useSg721TokensQuery<TData = TokensResponse>({
   client,
   args,
   options
-}: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+}: Sg721TokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse> {
+export interface Sg721AllNftInfoQuery<TData> extends Sg721ReactQuery<AllNftInfoResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721AllNftInfoQuery({
+export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   client,
   args,
   options
-}: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+}: Sg721AllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse> {
+export interface Sg721NftInfoQuery<TData> extends Sg721ReactQuery<NftInfoResponse, TData> {
   args: {
     tokenId: string;
   };
 }
-export function useSg721NftInfoQuery({
+export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   client,
   args,
   options
-}: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+}: Sg721NftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse> {}
-export function useSg721ContractInfoQuery({
+export interface Sg721ContractInfoQuery<TData> extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
-}: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
+}: Sg721ContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
 }
-export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
-export function useSg721NumTokensQuery({
+export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
-}: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
+}: Sg721NumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
 }
-export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
+export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
     includeExpired?: boolean;
     limit?: number;
@@ -105,64 +105,64 @@ export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResp
     startAfter?: string;
   };
 }
-export function useSg721AllOperatorsQuery({
+export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   client,
   args,
   options
-}: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+}: Sg721AllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse> {
+export interface Sg721ApprovalsQuery<TData> extends Sg721ReactQuery<ApprovalsResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721ApprovalsQuery({
+export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   client,
   args,
   options
-}: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+}: Sg721ApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse> {
+export interface Sg721ApprovalQuery<TData> extends Sg721ReactQuery<ApprovalResponse, TData> {
   args: {
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
   };
 }
-export function useSg721ApprovalQuery({
+export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   client,
   args,
   options
-}: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
+}: Sg721ApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse> {
+export interface Sg721OwnerOfQuery<TData> extends Sg721ReactQuery<OwnerOfResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721OwnerOfQuery({
+export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   client,
   args,
   options
-}: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+}: Sg721OwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -170,59 +170,59 @@ export function useSg721OwnerOfQuery({
 `;
 
 exports[`createReactQueryHooks 2`] = `
-"export interface Sg721ReactQuery<TResponse> {
+"export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient | undefined;
-  options?: UseQueryOptions<TResponse, Error, TResponse>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
-export function useSg721CollectionInfoQuery({
+export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
-}: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721CollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
-export function useSg721MinterQuery({
+export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
+export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
-}: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721MinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
+export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
   };
 }
-export function useSg721AllTokensQuery({
+export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   client,
   args,
   options
-}: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
+}: Sg721AllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse> {
+export interface Sg721TokensQuery<TData> extends Sg721ReactQuery<TokensResponse, TData> {
   args: {
     limit?: number;
     owner: string;
     startAfter?: string;
   };
 }
-export function useSg721TokensQuery({
+export function useSg721TokensQuery<TData = TokensResponse>({
   client,
   args,
   options
-}: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
+}: Sg721TokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -230,59 +230,59 @@ export function useSg721TokensQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse> {
+export interface Sg721AllNftInfoQuery<TData> extends Sg721ReactQuery<AllNftInfoResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721AllNftInfoQuery({
+export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   client,
   args,
   options
-}: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
+}: Sg721AllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse> {
+export interface Sg721NftInfoQuery<TData> extends Sg721ReactQuery<NftInfoResponse, TData> {
   args: {
     tokenId: string;
   };
 }
-export function useSg721NftInfoQuery({
+export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   client,
   args,
   options
-}: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
+}: Sg721NftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse> {}
-export function useSg721ContractInfoQuery({
+export interface Sg721ContractInfoQuery<TData> extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
-}: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721ContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
-export function useSg721NumTokensQuery({
+export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
-}: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721NumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
+export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
     includeExpired?: boolean;
     limit?: number;
@@ -290,12 +290,12 @@ export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResp
     startAfter?: string;
   };
 }
-export function useSg721AllOperatorsQuery({
+export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   client,
   args,
   options
-}: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
+}: Sg721AllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -304,37 +304,37 @@ export function useSg721AllOperatorsQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse> {
+export interface Sg721ApprovalsQuery<TData> extends Sg721ReactQuery<ApprovalsResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721ApprovalsQuery({
+export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   client,
   args,
   options
-}: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
+}: Sg721ApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse> {
+export interface Sg721ApprovalQuery<TData> extends Sg721ReactQuery<ApprovalResponse, TData> {
   args: {
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
   };
 }
-export function useSg721ApprovalQuery({
+export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   client,
   args,
   options
-}: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
+}: Sg721ApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -342,18 +342,18 @@ export function useSg721ApprovalQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse> {
+export interface Sg721OwnerOfQuery<TData> extends Sg721ReactQuery<OwnerOfResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721OwnerOfQuery({
+export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   client,
   args,
   options
-}: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
+}: Sg721OwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
@@ -363,105 +363,105 @@ export function useSg721OwnerOfQuery({
 `;
 
 exports[`createReactQueryHooks 3`] = `
-"export interface Sg721ReactQuery<TResponse> {
+"export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient;
-  options?: Omit<UseQueryOptions<TResponse, Error, TResponse>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
     initialData?: undefined;
   };
 }
-export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
-export function useSg721CollectionInfoQuery({
+export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
-}: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
+}: Sg721CollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
 }
-export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
-export function useSg721MinterQuery({
+export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
+export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
-}: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
+}: Sg721MinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
 }
-export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
+export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
   };
 }
-export function useSg721AllTokensQuery({
+export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   client,
   args,
   options
-}: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+}: Sg721AllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse> {
+export interface Sg721TokensQuery<TData> extends Sg721ReactQuery<TokensResponse, TData> {
   args: {
     limit?: number;
     owner: string;
     startAfter?: string;
   };
 }
-export function useSg721TokensQuery({
+export function useSg721TokensQuery<TData = TokensResponse>({
   client,
   args,
   options
-}: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+}: Sg721TokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse> {
+export interface Sg721AllNftInfoQuery<TData> extends Sg721ReactQuery<AllNftInfoResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721AllNftInfoQuery({
+export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   client,
   args,
   options
-}: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+}: Sg721AllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse> {
+export interface Sg721NftInfoQuery<TData> extends Sg721ReactQuery<NftInfoResponse, TData> {
   args: {
     tokenId: string;
   };
 }
-export function useSg721NftInfoQuery({
+export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   client,
   args,
   options
-}: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+}: Sg721NftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse> {}
-export function useSg721ContractInfoQuery({
+export interface Sg721ContractInfoQuery<TData> extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
-}: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
+}: Sg721ContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
 }
-export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
-export function useSg721NumTokensQuery({
+export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
-}: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
+}: Sg721NumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
 }
-export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
+export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
     includeExpired?: boolean;
     limit?: number;
@@ -469,64 +469,64 @@ export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResp
     startAfter?: string;
   };
 }
-export function useSg721AllOperatorsQuery({
+export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   client,
   args,
   options
-}: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+}: Sg721AllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse> {
+export interface Sg721ApprovalsQuery<TData> extends Sg721ReactQuery<ApprovalsResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721ApprovalsQuery({
+export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   client,
   args,
   options
-}: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+}: Sg721ApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse> {
+export interface Sg721ApprovalQuery<TData> extends Sg721ReactQuery<ApprovalResponse, TData> {
   args: {
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
   };
 }
-export function useSg721ApprovalQuery({
+export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   client,
   args,
   options
-}: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
+}: Sg721ApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse> {
+export interface Sg721OwnerOfQuery<TData> extends Sg721ReactQuery<OwnerOfResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721OwnerOfQuery({
+export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   client,
   args,
   options
-}: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+}: Sg721OwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -534,61 +534,61 @@ export function useSg721OwnerOfQuery({
 `;
 
 exports[`createReactQueryHooks 4`] = `
-"export interface Sg721ReactQuery<TResponse> {
+"export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient | undefined;
-  options?: Omit<UseQueryOptions<TResponse, Error, TResponse>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
     initialData?: undefined;
   };
 }
-export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse> {}
-export function useSg721CollectionInfoQuery({
+export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
-}: Sg721CollectionInfoQuery) {
-  return useQuery<CollectionInfoResponse, Error, CollectionInfoResponse>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721CollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse> {}
-export function useSg721MinterQuery({
+export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
+export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
-}: Sg721MinterQuery) {
-  return useQuery<MinterResponse, Error, MinterResponse>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721MinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse> {
+export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
   };
 }
-export function useSg721AllTokensQuery({
+export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   client,
   args,
   options
-}: Sg721AllTokensQuery) {
-  return useQuery<AllTokensResponse, Error, AllTokensResponse>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
+}: Sg721AllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse> {
+export interface Sg721TokensQuery<TData> extends Sg721ReactQuery<TokensResponse, TData> {
   args: {
     limit?: number;
     owner: string;
     startAfter?: string;
   };
 }
-export function useSg721TokensQuery({
+export function useSg721TokensQuery<TData = TokensResponse>({
   client,
   args,
   options
-}: Sg721TokensQuery) {
-  return useQuery<TokensResponse, Error, TokensResponse>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
+}: Sg721TokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -596,59 +596,59 @@ export function useSg721TokensQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse> {
+export interface Sg721AllNftInfoQuery<TData> extends Sg721ReactQuery<AllNftInfoResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721AllNftInfoQuery({
+export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   client,
   args,
   options
-}: Sg721AllNftInfoQuery) {
-  return useQuery<AllNftInfoResponse, Error, AllNftInfoResponse>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
+}: Sg721AllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse> {
+export interface Sg721NftInfoQuery<TData> extends Sg721ReactQuery<NftInfoResponse, TData> {
   args: {
     tokenId: string;
   };
 }
-export function useSg721NftInfoQuery({
+export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   client,
   args,
   options
-}: Sg721NftInfoQuery) {
-  return useQuery<NftInfoResponse, Error, NftInfoResponse>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
+}: Sg721NftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse> {}
-export function useSg721ContractInfoQuery({
+export interface Sg721ContractInfoQuery<TData> extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
-}: Sg721ContractInfoQuery) {
-  return useQuery<ContractInfoResponse, Error, ContractInfoResponse>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721ContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse> {}
-export function useSg721NumTokensQuery({
+export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
-}: Sg721NumTokensQuery) {
-  return useQuery<NumTokensResponse, Error, NumTokensResponse>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+}: Sg721NumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse> {
+export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
     includeExpired?: boolean;
     limit?: number;
@@ -656,12 +656,12 @@ export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResp
     startAfter?: string;
   };
 }
-export function useSg721AllOperatorsQuery({
+export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   client,
   args,
   options
-}: Sg721AllOperatorsQuery) {
-  return useQuery<AllOperatorsResponse, Error, AllOperatorsResponse>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
+}: Sg721AllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -670,37 +670,37 @@ export function useSg721AllOperatorsQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse> {
+export interface Sg721ApprovalsQuery<TData> extends Sg721ReactQuery<ApprovalsResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721ApprovalsQuery({
+export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   client,
   args,
   options
-}: Sg721ApprovalsQuery) {
-  return useQuery<ApprovalsResponse, Error, ApprovalsResponse>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
+}: Sg721ApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse> {
+export interface Sg721ApprovalQuery<TData> extends Sg721ReactQuery<ApprovalResponse, TData> {
   args: {
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
   };
 }
-export function useSg721ApprovalQuery({
+export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   client,
   args,
   options
-}: Sg721ApprovalQuery) {
-  return useQuery<ApprovalResponse, Error, ApprovalResponse>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
+}: Sg721ApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -708,18 +708,18 @@ export function useSg721ApprovalQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse> {
+export interface Sg721OwnerOfQuery<TData> extends Sg721ReactQuery<OwnerOfResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
   };
 }
-export function useSg721OwnerOfQuery({
+export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   client,
   args,
   options
-}: Sg721OwnerOfQuery) {
-  return useQuery<OwnerOfResponse, Error, OwnerOfResponse>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
+}: Sg721OwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 548b8fea..b482934f 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -146,7 +146,9 @@ export const createReactQueryHook = ({
         props = ['client', 'args', 'options'];
     }
 
-    return t.exportNamedDeclaration(
+  const selectResponseGenericTypeName = 'TData';
+
+  const queryFunctionDeclaration =
         t.functionDeclaration(
             t.identifier(hookName),
             [
@@ -162,7 +164,10 @@ export const createReactQueryHook = ({
                         })
                     ],
                     t.tsTypeAnnotation(t.tsTypeReference(
-                        t.identifier(hookParamsTypeName)
+                        t.identifier(hookParamsTypeName),
+                        t.tsTypeParameterInstantiation([
+                          t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
+                        ])
                     ))
                 )
             ],
@@ -246,7 +251,7 @@ export const createReactQueryHook = ({
                                         t.identifier('Error')
                                     ),
                                     t.tsTypeReference(
-                                        t.identifier(responseType)
+                                        t.identifier(selectResponseGenericTypeName)
                                     )
                                 ]
                             )
@@ -255,9 +260,18 @@ export const createReactQueryHook = ({
 
                 ]
             ),
+      )
 
-        )
-    )
+  // Add the TData type parameters
+  queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([
+      t.tsTypeParameter(
+        undefined,
+        t.tSTypeReference(t.identifier(responseType)),
+        selectResponseGenericTypeName
+      )
+    ])
+
+  return  t.exportNamedDeclaration(queryFunctionDeclaration)
 
 };
 
@@ -685,19 +699,22 @@ function createReactQueryHookGenericInterface({
 
     const options = context.options.reactQuery;
 
-    const genericTypeName = 'TResponse'
+    const genericResponseTypeName = 'TResponse'
+    const genericSelectResponseTypeName = 'TData'
 
     context.addUtil('UseQueryOptions');
 
+    // UseQueryOptions<TResponse, Error, TData>,
     const typedUseQueryOptions = t.tsTypeReference(
         t.identifier('UseQueryOptions'),
-        t.tsTypeParameterInstantiation([
+        t.tsTypeParameterInstantiation(
+          [
             t.tsTypeReference(
-                t.identifier(genericTypeName)
+                t.identifier(genericResponseTypeName)
             ),
             t.tsTypeReference(t.identifier('Error')),
             t.tsTypeReference(
-                t.identifier(genericTypeName)
+                t.identifier(genericSelectResponseTypeName)
             )
         ])
     )
@@ -744,7 +761,14 @@ function createReactQueryHookGenericInterface({
         t.tsInterfaceDeclaration(
             t.identifier(genericQueryInterfaceName),
             t.tsTypeParameterDeclaration([
-                t.tsTypeParameter(undefined, undefined, genericTypeName)
+              // 1: TResponse
+              t.tsTypeParameter(undefined, undefined, genericResponseTypeName),
+              // 2: TData
+              t.tsTypeParameter(
+                undefined,
+                t.tSTypeReference(t.identifier(genericResponseTypeName)),
+                genericSelectResponseTypeName
+              )
             ]),
             [],
             t.tSInterfaceBody(body)
@@ -789,12 +813,17 @@ export const createReactQueryHookInterface = ({
     return t.exportNamedDeclaration(
         t.tsInterfaceDeclaration(
             t.identifier(hookParamsTypeName),
-            null,
+            t.tsTypeParameterDeclaration([
+              t.tSTypeParameter(undefined, undefined, 'TData')
+            ]),
             [
                 t.tSExpressionWithTypeArguments(
                     t.identifier(queryInterfaceName),
                     t.tsTypeParameterInstantiation([
-                        t.tsTypeReference(t.identifier(responseType))
+                        // 1: response
+                        t.tsTypeReference(t.identifier(responseType)),
+                        // 2: select generic
+                        t.tSTypeReference(t.identifier('TData'))
                     ])
                 )
             ],

From d61fc1e1e347ca93c1f4fcb7a861a0690a3eb58c Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Mon, 22 Aug 2022 12:55:09 +0200
Subject: [PATCH 005/287] Update the tests for select in queries

---
 .../default/CwCodeIdRegistry.react-query.ts   |  8 +--
 .../builder/default/CwSingle.react-query.ts   | 20 +++---
 .../builder/default/Factory.react-query.ts    | 12 ++--
 .../builder/default/Minter.react-query.ts     | 10 +--
 .../invoke/CwCodeIdRegistry.react-query.ts    |  8 +--
 .../builder/invoke/CwSingle.react-query.ts    | 20 +++---
 .../builder/invoke/Factory.react-query.ts     | 12 ++--
 .../builder/invoke/Minter.react-query.ts      | 10 +--
 __output__/cosmwasm/CW4Group.react-query.ts   | 10 +--
 .../CwCodeIdRegistry.react-query.ts           |  8 +--
 .../CwNamedGroups.react-query.ts              |  8 +--
 .../CwProposalSingle.react-query.ts           | 20 +++---
 __output__/minter/Minter.react-query.ts       | 10 +--
 __output__/sg721/Sg721.react-query.ts         | 24 +++----
 .../Factory.react-query.ts                    | 12 ++--
 .../Factory.react-query.ts                    | 64 +++++++++----------
 .../factory-query-keys/Factory.react-query.ts | 64 +++++++++----------
 .../factory-v4-query/Factory.react-query.ts   | 12 ++--
 .../Factory.react-query.ts                    | 12 ++--
 .../vectis/factory/Factory.react-query.ts     | 12 ++--
 __output__/vectis/govec/Govec.react-query.ts  |  4 +-
 __output__/vectis/proxy/Proxy.react-query.ts  |  4 +-
 .../__snapshots__/builder.test.ts.snap        |  2 +
 23 files changed, 184 insertions(+), 182 deletions(-)

diff --git a/__output__/builder/default/CwCodeIdRegistry.react-query.ts b/__output__/builder/default/CwCodeIdRegistry.react-query.ts
index f219bfd3..d2bcdc8f 100644
--- a/__output__/builder/default/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.react-query.ts
@@ -11,7 +11,7 @@ export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
+export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
     chainId: string;
     name: string;
@@ -27,7 +27,7 @@ export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrati
     name: args.name
   }), options);
 }
-export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
+export interface CwCodeIdRegistryInfoForCodeIdQuery<TData> extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
   args: {
     chainId: string;
     codeId: number;
@@ -43,7 +43,7 @@ export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdRespo
     codeId: args.codeId
   }), options);
 }
-export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
+export interface CwCodeIdRegistryGetRegistrationQuery<TData> extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
   args: {
     chainId: string;
     name: string;
@@ -61,7 +61,7 @@ export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationR
     version: args.version
   }), options);
 }
-export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export interface CwCodeIdRegistryConfigQuery<TData> extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
 export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/builder/default/CwSingle.react-query.ts b/__output__/builder/default/CwSingle.react-query.ts
index c3f26272..874561b4 100644
--- a/__output__/builder/default/CwSingle.react-query.ts
+++ b/__output__/builder/default/CwSingle.react-query.ts
@@ -11,28 +11,28 @@ export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwSingleInfoQuery extends CwSingleReactQuery<InfoResponse, TData> {}
+export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
 export function useCwSingleInfoQuery<TData = InfoResponse>({
   client,
   options
 }: CwSingleInfoQuery<TData>) {
   return useQuery<InfoResponse, Error, TData>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
 }
-export interface CwSingleVoteHooksQuery extends CwSingleReactQuery<VoteHooksResponse, TData> {}
+export interface CwSingleVoteHooksQuery<TData> extends CwSingleReactQuery<VoteHooksResponse, TData> {}
 export function useCwSingleVoteHooksQuery<TData = VoteHooksResponse>({
   client,
   options
 }: CwSingleVoteHooksQuery<TData>) {
   return useQuery<VoteHooksResponse, Error, TData>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
 }
-export interface CwSingleProposalHooksQuery extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
+export interface CwSingleProposalHooksQuery<TData> extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
 export function useCwSingleProposalHooksQuery<TData = ProposalHooksResponse>({
   client,
   options
 }: CwSingleProposalHooksQuery<TData>) {
   return useQuery<ProposalHooksResponse, Error, TData>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
 }
-export interface CwSingleListVotesQuery extends CwSingleReactQuery<ListVotesResponse, TData> {
+export interface CwSingleListVotesQuery<TData> extends CwSingleReactQuery<ListVotesResponse, TData> {
   args: {
     limit?: number;
     proposalId: number;
@@ -50,7 +50,7 @@ export function useCwSingleListVotesQuery<TData = ListVotesResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleVoteQuery extends CwSingleReactQuery<VoteResponse, TData> {
+export interface CwSingleVoteQuery<TData> extends CwSingleReactQuery<VoteResponse, TData> {
   args: {
     proposalId: number;
     voter: string;
@@ -66,14 +66,14 @@ export function useCwSingleVoteQuery<TData = VoteResponse>({
     voter: args.voter
   }), options);
 }
-export interface CwSingleProposalCountQuery extends CwSingleReactQuery<ProposalCountResponse, TData> {}
+export interface CwSingleProposalCountQuery<TData> extends CwSingleReactQuery<ProposalCountResponse, TData> {}
 export function useCwSingleProposalCountQuery<TData = ProposalCountResponse>({
   client,
   options
 }: CwSingleProposalCountQuery<TData>) {
   return useQuery<ProposalCountResponse, Error, TData>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
 }
-export interface CwSingleReverseProposalsQuery extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
+export interface CwSingleReverseProposalsQuery<TData> extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
   args: {
     limit?: number;
     startBefore?: number;
@@ -89,7 +89,7 @@ export function useCwSingleReverseProposalsQuery<TData = ReverseProposalsRespons
     startBefore: args.startBefore
   }), options);
 }
-export interface CwSingleListProposalsQuery extends CwSingleReactQuery<ListProposalsResponse, TData> {
+export interface CwSingleListProposalsQuery<TData> extends CwSingleReactQuery<ListProposalsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: number;
@@ -105,7 +105,7 @@ export function useCwSingleListProposalsQuery<TData = ListProposalsResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleProposalQuery extends CwSingleReactQuery<ProposalResponse, TData> {
+export interface CwSingleProposalQuery<TData> extends CwSingleReactQuery<ProposalResponse, TData> {
   args: {
     proposalId: number;
   };
@@ -119,7 +119,7 @@ export function useCwSingleProposalQuery<TData = ProposalResponse>({
     proposalId: args.proposalId
   }), options);
 }
-export interface CwSingleConfigQuery extends CwSingleReactQuery<ConfigResponse, TData> {}
+export interface CwSingleConfigQuery<TData> extends CwSingleReactQuery<ConfigResponse, TData> {}
 export function useCwSingleConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/builder/default/Factory.react-query.ts b/__output__/builder/default/Factory.react-query.ts
index 41b88b79..2d40ad5e 100644
--- a/__output__/builder/default/Factory.react-query.ts
+++ b/__output__/builder/default/Factory.react-query.ts
@@ -11,28 +11,28 @@ export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
   return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
   return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
   return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
@@ -46,7 +46,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -64,7 +64,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
diff --git a/__output__/builder/default/Minter.react-query.ts b/__output__/builder/default/Minter.react-query.ts
index 28483c5b..007bcfd9 100644
--- a/__output__/builder/default/Minter.react-query.ts
+++ b/__output__/builder/default/Minter.react-query.ts
@@ -11,7 +11,7 @@ export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse, TData> {
+export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
     address: string;
   };
@@ -25,28 +25,28 @@ export function useMinterMintCountQuery<TData = MintCountResponse>({
     address: args.address
   }), options);
 }
-export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse, TData> {}
+export interface MinterMintPriceQuery<TData> extends MinterReactQuery<MintPriceResponse, TData> {}
 export function useMinterMintPriceQuery<TData = MintPriceResponse>({
   client,
   options
 }: MinterMintPriceQuery<TData>) {
   return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
 }
-export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse, TData> {}
+export interface MinterStartTimeQuery<TData> extends MinterReactQuery<StartTimeResponse, TData> {}
 export function useMinterStartTimeQuery<TData = StartTimeResponse>({
   client,
   options
 }: MinterStartTimeQuery<TData>) {
   return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
 }
-export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export interface MinterMintableNumTokensQuery<TData> extends MinterReactQuery<MintableNumTokensResponse, TData> {}
 export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
   client,
   options
 }: MinterMintableNumTokensQuery<TData>) {
   return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
 }
-export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse, TData> {}
+export interface MinterConfigQuery<TData> extends MinterReactQuery<ConfigResponse, TData> {}
 export function useMinterConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts b/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
index f219bfd3..d2bcdc8f 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
@@ -11,7 +11,7 @@ export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
+export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
     chainId: string;
     name: string;
@@ -27,7 +27,7 @@ export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrati
     name: args.name
   }), options);
 }
-export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
+export interface CwCodeIdRegistryInfoForCodeIdQuery<TData> extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
   args: {
     chainId: string;
     codeId: number;
@@ -43,7 +43,7 @@ export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdRespo
     codeId: args.codeId
   }), options);
 }
-export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
+export interface CwCodeIdRegistryGetRegistrationQuery<TData> extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
   args: {
     chainId: string;
     name: string;
@@ -61,7 +61,7 @@ export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationR
     version: args.version
   }), options);
 }
-export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export interface CwCodeIdRegistryConfigQuery<TData> extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
 export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/builder/invoke/CwSingle.react-query.ts b/__output__/builder/invoke/CwSingle.react-query.ts
index c3f26272..874561b4 100644
--- a/__output__/builder/invoke/CwSingle.react-query.ts
+++ b/__output__/builder/invoke/CwSingle.react-query.ts
@@ -11,28 +11,28 @@ export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwSingleInfoQuery extends CwSingleReactQuery<InfoResponse, TData> {}
+export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
 export function useCwSingleInfoQuery<TData = InfoResponse>({
   client,
   options
 }: CwSingleInfoQuery<TData>) {
   return useQuery<InfoResponse, Error, TData>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
 }
-export interface CwSingleVoteHooksQuery extends CwSingleReactQuery<VoteHooksResponse, TData> {}
+export interface CwSingleVoteHooksQuery<TData> extends CwSingleReactQuery<VoteHooksResponse, TData> {}
 export function useCwSingleVoteHooksQuery<TData = VoteHooksResponse>({
   client,
   options
 }: CwSingleVoteHooksQuery<TData>) {
   return useQuery<VoteHooksResponse, Error, TData>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
 }
-export interface CwSingleProposalHooksQuery extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
+export interface CwSingleProposalHooksQuery<TData> extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
 export function useCwSingleProposalHooksQuery<TData = ProposalHooksResponse>({
   client,
   options
 }: CwSingleProposalHooksQuery<TData>) {
   return useQuery<ProposalHooksResponse, Error, TData>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
 }
-export interface CwSingleListVotesQuery extends CwSingleReactQuery<ListVotesResponse, TData> {
+export interface CwSingleListVotesQuery<TData> extends CwSingleReactQuery<ListVotesResponse, TData> {
   args: {
     limit?: number;
     proposalId: number;
@@ -50,7 +50,7 @@ export function useCwSingleListVotesQuery<TData = ListVotesResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleVoteQuery extends CwSingleReactQuery<VoteResponse, TData> {
+export interface CwSingleVoteQuery<TData> extends CwSingleReactQuery<VoteResponse, TData> {
   args: {
     proposalId: number;
     voter: string;
@@ -66,14 +66,14 @@ export function useCwSingleVoteQuery<TData = VoteResponse>({
     voter: args.voter
   }), options);
 }
-export interface CwSingleProposalCountQuery extends CwSingleReactQuery<ProposalCountResponse, TData> {}
+export interface CwSingleProposalCountQuery<TData> extends CwSingleReactQuery<ProposalCountResponse, TData> {}
 export function useCwSingleProposalCountQuery<TData = ProposalCountResponse>({
   client,
   options
 }: CwSingleProposalCountQuery<TData>) {
   return useQuery<ProposalCountResponse, Error, TData>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
 }
-export interface CwSingleReverseProposalsQuery extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
+export interface CwSingleReverseProposalsQuery<TData> extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
   args: {
     limit?: number;
     startBefore?: number;
@@ -89,7 +89,7 @@ export function useCwSingleReverseProposalsQuery<TData = ReverseProposalsRespons
     startBefore: args.startBefore
   }), options);
 }
-export interface CwSingleListProposalsQuery extends CwSingleReactQuery<ListProposalsResponse, TData> {
+export interface CwSingleListProposalsQuery<TData> extends CwSingleReactQuery<ListProposalsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: number;
@@ -105,7 +105,7 @@ export function useCwSingleListProposalsQuery<TData = ListProposalsResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface CwSingleProposalQuery extends CwSingleReactQuery<ProposalResponse, TData> {
+export interface CwSingleProposalQuery<TData> extends CwSingleReactQuery<ProposalResponse, TData> {
   args: {
     proposalId: number;
   };
@@ -119,7 +119,7 @@ export function useCwSingleProposalQuery<TData = ProposalResponse>({
     proposalId: args.proposalId
   }), options);
 }
-export interface CwSingleConfigQuery extends CwSingleReactQuery<ConfigResponse, TData> {}
+export interface CwSingleConfigQuery<TData> extends CwSingleReactQuery<ConfigResponse, TData> {}
 export function useCwSingleConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/builder/invoke/Factory.react-query.ts b/__output__/builder/invoke/Factory.react-query.ts
index 41b88b79..2d40ad5e 100644
--- a/__output__/builder/invoke/Factory.react-query.ts
+++ b/__output__/builder/invoke/Factory.react-query.ts
@@ -11,28 +11,28 @@ export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
   return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
   return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
   return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
@@ -46,7 +46,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -64,7 +64,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
diff --git a/__output__/builder/invoke/Minter.react-query.ts b/__output__/builder/invoke/Minter.react-query.ts
index 28483c5b..007bcfd9 100644
--- a/__output__/builder/invoke/Minter.react-query.ts
+++ b/__output__/builder/invoke/Minter.react-query.ts
@@ -11,7 +11,7 @@ export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse, TData> {
+export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
     address: string;
   };
@@ -25,28 +25,28 @@ export function useMinterMintCountQuery<TData = MintCountResponse>({
     address: args.address
   }), options);
 }
-export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse, TData> {}
+export interface MinterMintPriceQuery<TData> extends MinterReactQuery<MintPriceResponse, TData> {}
 export function useMinterMintPriceQuery<TData = MintPriceResponse>({
   client,
   options
 }: MinterMintPriceQuery<TData>) {
   return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
 }
-export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse, TData> {}
+export interface MinterStartTimeQuery<TData> extends MinterReactQuery<StartTimeResponse, TData> {}
 export function useMinterStartTimeQuery<TData = StartTimeResponse>({
   client,
   options
 }: MinterStartTimeQuery<TData>) {
   return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
 }
-export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export interface MinterMintableNumTokensQuery<TData> extends MinterReactQuery<MintableNumTokensResponse, TData> {}
 export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
   client,
   options
 }: MinterMintableNumTokensQuery<TData>) {
   return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
 }
-export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse, TData> {}
+export interface MinterConfigQuery<TData> extends MinterReactQuery<ConfigResponse, TData> {}
 export function useMinterConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/cosmwasm/CW4Group.react-query.ts b/__output__/cosmwasm/CW4Group.react-query.ts
index 5ee0ff4a..420c1a09 100644
--- a/__output__/cosmwasm/CW4Group.react-query.ts
+++ b/__output__/cosmwasm/CW4Group.react-query.ts
@@ -11,14 +11,14 @@ export interface CW4GroupReactQuery<TResponse, TData = TResponse> {
   client: CW4GroupQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CW4GroupHooksQuery extends CW4GroupReactQuery<HooksResponse, TData> {}
+export interface CW4GroupHooksQuery<TData> extends CW4GroupReactQuery<HooksResponse, TData> {}
 export function useCW4GroupHooksQuery<TData = HooksResponse>({
   client,
   options
 }: CW4GroupHooksQuery<TData>) {
   return useQuery<HooksResponse, Error, TData>(["cW4GroupHooks", client.contractAddress], () => client.hooks(), options);
 }
-export interface CW4GroupMemberQuery extends CW4GroupReactQuery<MemberResponse, TData> {
+export interface CW4GroupMemberQuery<TData> extends CW4GroupReactQuery<MemberResponse, TData> {
   args: {
     addr: string;
     atHeight?: number;
@@ -34,7 +34,7 @@ export function useCW4GroupMemberQuery<TData = MemberResponse>({
     atHeight: args.atHeight
   }), options);
 }
-export interface CW4GroupListMembersQuery extends CW4GroupReactQuery<ListMembersResponse, TData> {
+export interface CW4GroupListMembersQuery<TData> extends CW4GroupReactQuery<ListMembersResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -50,14 +50,14 @@ export function useCW4GroupListMembersQuery<TData = ListMembersResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface CW4GroupTotalWeightQuery extends CW4GroupReactQuery<TotalWeightResponse, TData> {}
+export interface CW4GroupTotalWeightQuery<TData> extends CW4GroupReactQuery<TotalWeightResponse, TData> {}
 export function useCW4GroupTotalWeightQuery<TData = TotalWeightResponse>({
   client,
   options
 }: CW4GroupTotalWeightQuery<TData>) {
   return useQuery<TotalWeightResponse, Error, TData>(["cW4GroupTotalWeight", client.contractAddress], () => client.totalWeight(), options);
 }
-export interface CW4GroupAdminQuery extends CW4GroupReactQuery<AdminResponse, TData> {}
+export interface CW4GroupAdminQuery<TData> extends CW4GroupReactQuery<AdminResponse, TData> {}
 export function useCW4GroupAdminQuery<TData = AdminResponse>({
   client,
   options
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
index f219bfd3..d2bcdc8f 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
@@ -11,7 +11,7 @@ export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwCodeIdRegistryListRegistrationsQuery extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
+export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
     chainId: string;
     name: string;
@@ -27,7 +27,7 @@ export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrati
     name: args.name
   }), options);
 }
-export interface CwCodeIdRegistryInfoForCodeIdQuery extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
+export interface CwCodeIdRegistryInfoForCodeIdQuery<TData> extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
   args: {
     chainId: string;
     codeId: number;
@@ -43,7 +43,7 @@ export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdRespo
     codeId: args.codeId
   }), options);
 }
-export interface CwCodeIdRegistryGetRegistrationQuery extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
+export interface CwCodeIdRegistryGetRegistrationQuery<TData> extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
   args: {
     chainId: string;
     name: string;
@@ -61,7 +61,7 @@ export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationR
     version: args.version
   }), options);
 }
-export interface CwCodeIdRegistryConfigQuery extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export interface CwCodeIdRegistryConfigQuery<TData> extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
 export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
index 5451d8c7..f50712b2 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
@@ -11,7 +11,7 @@ export interface CwNamedGroupsReactQuery<TResponse, TData = TResponse> {
   client: CwNamedGroupsQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwNamedGroupsIsAddressInGroupQuery extends CwNamedGroupsReactQuery<IsAddressInGroupResponse, TData> {
+export interface CwNamedGroupsIsAddressInGroupQuery<TData> extends CwNamedGroupsReactQuery<IsAddressInGroupResponse, TData> {
   args: {
     address: string;
     group: string;
@@ -27,7 +27,7 @@ export function useCwNamedGroupsIsAddressInGroupQuery<TData = IsAddressInGroupRe
     group: args.group
   }), options);
 }
-export interface CwNamedGroupsListAddressesQuery extends CwNamedGroupsReactQuery<ListAddressesResponse, TData> {
+export interface CwNamedGroupsListAddressesQuery<TData> extends CwNamedGroupsReactQuery<ListAddressesResponse, TData> {
   args: {
     group: string;
     limit?: number;
@@ -45,7 +45,7 @@ export function useCwNamedGroupsListAddressesQuery<TData = ListAddressesResponse
     offset: args.offset
   }), options);
 }
-export interface CwNamedGroupsListGroupsQuery extends CwNamedGroupsReactQuery<ListGroupsResponse, TData> {
+export interface CwNamedGroupsListGroupsQuery<TData> extends CwNamedGroupsReactQuery<ListGroupsResponse, TData> {
   args: {
     address: string;
     limit?: number;
@@ -63,7 +63,7 @@ export function useCwNamedGroupsListGroupsQuery<TData = ListGroupsResponse>({
     offset: args.offset
   }), options);
 }
-export interface CwNamedGroupsDumpQuery extends CwNamedGroupsReactQuery<DumpResponse, TData> {}
+export interface CwNamedGroupsDumpQuery<TData> extends CwNamedGroupsReactQuery<DumpResponse, TData> {}
 export function useCwNamedGroupsDumpQuery<TData = DumpResponse>({
   client,
   options
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
index 4ad925ce..d9c0a85e 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
@@ -11,28 +11,28 @@ export interface CwProposalSingleReactQuery<TResponse, TData = TResponse> {
   client: CwProposalSingleQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CwProposalSingleInfoQuery extends CwProposalSingleReactQuery<InfoResponse, TData> {}
+export interface CwProposalSingleInfoQuery<TData> extends CwProposalSingleReactQuery<InfoResponse, TData> {}
 export function useCwProposalSingleInfoQuery<TData = InfoResponse>({
   client,
   options
 }: CwProposalSingleInfoQuery<TData>) {
   return useQuery<InfoResponse, Error, TData>(["cwProposalSingleInfo", client.contractAddress], () => client.info(), options);
 }
-export interface CwProposalSingleVoteHooksQuery extends CwProposalSingleReactQuery<VoteHooksResponse, TData> {}
+export interface CwProposalSingleVoteHooksQuery<TData> extends CwProposalSingleReactQuery<VoteHooksResponse, TData> {}
 export function useCwProposalSingleVoteHooksQuery<TData = VoteHooksResponse>({
   client,
   options
 }: CwProposalSingleVoteHooksQuery<TData>) {
   return useQuery<VoteHooksResponse, Error, TData>(["cwProposalSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
 }
-export interface CwProposalSingleProposalHooksQuery extends CwProposalSingleReactQuery<ProposalHooksResponse, TData> {}
+export interface CwProposalSingleProposalHooksQuery<TData> extends CwProposalSingleReactQuery<ProposalHooksResponse, TData> {}
 export function useCwProposalSingleProposalHooksQuery<TData = ProposalHooksResponse>({
   client,
   options
 }: CwProposalSingleProposalHooksQuery<TData>) {
   return useQuery<ProposalHooksResponse, Error, TData>(["cwProposalSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
 }
-export interface CwProposalSingleListVotesQuery extends CwProposalSingleReactQuery<ListVotesResponse, TData> {
+export interface CwProposalSingleListVotesQuery<TData> extends CwProposalSingleReactQuery<ListVotesResponse, TData> {
   args: {
     limit?: number;
     proposalId: number;
@@ -50,7 +50,7 @@ export function useCwProposalSingleListVotesQuery<TData = ListVotesResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface CwProposalSingleVoteQuery extends CwProposalSingleReactQuery<VoteResponse, TData> {
+export interface CwProposalSingleVoteQuery<TData> extends CwProposalSingleReactQuery<VoteResponse, TData> {
   args: {
     proposalId: number;
     voter: string;
@@ -66,14 +66,14 @@ export function useCwProposalSingleVoteQuery<TData = VoteResponse>({
     voter: args.voter
   }), options);
 }
-export interface CwProposalSingleProposalCountQuery extends CwProposalSingleReactQuery<ProposalCountResponse, TData> {}
+export interface CwProposalSingleProposalCountQuery<TData> extends CwProposalSingleReactQuery<ProposalCountResponse, TData> {}
 export function useCwProposalSingleProposalCountQuery<TData = ProposalCountResponse>({
   client,
   options
 }: CwProposalSingleProposalCountQuery<TData>) {
   return useQuery<ProposalCountResponse, Error, TData>(["cwProposalSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
 }
-export interface CwProposalSingleReverseProposalsQuery extends CwProposalSingleReactQuery<ReverseProposalsResponse, TData> {
+export interface CwProposalSingleReverseProposalsQuery<TData> extends CwProposalSingleReactQuery<ReverseProposalsResponse, TData> {
   args: {
     limit?: number;
     startBefore?: number;
@@ -89,7 +89,7 @@ export function useCwProposalSingleReverseProposalsQuery<TData = ReverseProposal
     startBefore: args.startBefore
   }), options);
 }
-export interface CwProposalSingleListProposalsQuery extends CwProposalSingleReactQuery<ListProposalsResponse, TData> {
+export interface CwProposalSingleListProposalsQuery<TData> extends CwProposalSingleReactQuery<ListProposalsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: number;
@@ -105,7 +105,7 @@ export function useCwProposalSingleListProposalsQuery<TData = ListProposalsRespo
     startAfter: args.startAfter
   }), options);
 }
-export interface CwProposalSingleProposalQuery extends CwProposalSingleReactQuery<ProposalResponse, TData> {
+export interface CwProposalSingleProposalQuery<TData> extends CwProposalSingleReactQuery<ProposalResponse, TData> {
   args: {
     proposalId: number;
   };
@@ -119,7 +119,7 @@ export function useCwProposalSingleProposalQuery<TData = ProposalResponse>({
     proposalId: args.proposalId
   }), options);
 }
-export interface CwProposalSingleConfigQuery extends CwProposalSingleReactQuery<ConfigResponse, TData> {}
+export interface CwProposalSingleConfigQuery<TData> extends CwProposalSingleReactQuery<ConfigResponse, TData> {}
 export function useCwProposalSingleConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/minter/Minter.react-query.ts b/__output__/minter/Minter.react-query.ts
index 28483c5b..007bcfd9 100644
--- a/__output__/minter/Minter.react-query.ts
+++ b/__output__/minter/Minter.react-query.ts
@@ -11,7 +11,7 @@ export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface MinterMintCountQuery extends MinterReactQuery<MintCountResponse, TData> {
+export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
     address: string;
   };
@@ -25,28 +25,28 @@ export function useMinterMintCountQuery<TData = MintCountResponse>({
     address: args.address
   }), options);
 }
-export interface MinterMintPriceQuery extends MinterReactQuery<MintPriceResponse, TData> {}
+export interface MinterMintPriceQuery<TData> extends MinterReactQuery<MintPriceResponse, TData> {}
 export function useMinterMintPriceQuery<TData = MintPriceResponse>({
   client,
   options
 }: MinterMintPriceQuery<TData>) {
   return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
 }
-export interface MinterStartTimeQuery extends MinterReactQuery<StartTimeResponse, TData> {}
+export interface MinterStartTimeQuery<TData> extends MinterReactQuery<StartTimeResponse, TData> {}
 export function useMinterStartTimeQuery<TData = StartTimeResponse>({
   client,
   options
 }: MinterStartTimeQuery<TData>) {
   return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
 }
-export interface MinterMintableNumTokensQuery extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export interface MinterMintableNumTokensQuery<TData> extends MinterReactQuery<MintableNumTokensResponse, TData> {}
 export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
   client,
   options
 }: MinterMintableNumTokensQuery<TData>) {
   return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
 }
-export interface MinterConfigQuery extends MinterReactQuery<ConfigResponse, TData> {}
+export interface MinterConfigQuery<TData> extends MinterReactQuery<ConfigResponse, TData> {}
 export function useMinterConfigQuery<TData = ConfigResponse>({
   client,
   options
diff --git a/__output__/sg721/Sg721.react-query.ts b/__output__/sg721/Sg721.react-query.ts
index c4ba9cfa..3a62ccbf 100644
--- a/__output__/sg721/Sg721.react-query.ts
+++ b/__output__/sg721/Sg721.react-query.ts
@@ -11,21 +11,21 @@ export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface Sg721CollectionInfoQuery extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
 export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
 }: Sg721CollectionInfoQuery<TData>) {
   return useQuery<CollectionInfoResponse, Error, TData>(["sg721CollectionInfo", client.contractAddress], () => client.collectionInfo(), options);
 }
-export interface Sg721MinterQuery extends Sg721ReactQuery<MinterResponse, TData> {}
+export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
 export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
 }: Sg721MinterQuery<TData>) {
   return useQuery<MinterResponse, Error, TData>(["sg721Minter", client.contractAddress], () => client.minter(), options);
 }
-export interface Sg721AllTokensQuery extends Sg721ReactQuery<AllTokensResponse, TData> {
+export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -41,7 +41,7 @@ export function useSg721AllTokensQuery<TData = AllTokensResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721TokensQuery extends Sg721ReactQuery<TokensResponse, TData> {
+export interface Sg721TokensQuery<TData> extends Sg721ReactQuery<TokensResponse, TData> {
   args: {
     limit?: number;
     owner: string;
@@ -59,7 +59,7 @@ export function useSg721TokensQuery<TData = TokensResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721AllNftInfoQuery extends Sg721ReactQuery<AllNftInfoResponse, TData> {
+export interface Sg721AllNftInfoQuery<TData> extends Sg721ReactQuery<AllNftInfoResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
@@ -75,7 +75,7 @@ export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721NftInfoQuery extends Sg721ReactQuery<NftInfoResponse, TData> {
+export interface Sg721NftInfoQuery<TData> extends Sg721ReactQuery<NftInfoResponse, TData> {
   args: {
     tokenId: string;
   };
@@ -89,21 +89,21 @@ export function useSg721NftInfoQuery<TData = NftInfoResponse>({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ContractInfoQuery extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export interface Sg721ContractInfoQuery<TData> extends Sg721ReactQuery<ContractInfoResponse, TData> {}
 export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
 }: Sg721ContractInfoQuery<TData>) {
   return useQuery<ContractInfoResponse, Error, TData>(["sg721ContractInfo", client.contractAddress], () => client.contractInfo(), options);
 }
-export interface Sg721NumTokensQuery extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
 export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
 }: Sg721NumTokensQuery<TData>) {
   return useQuery<NumTokensResponse, Error, TData>(["sg721NumTokens", client.contractAddress], () => client.numTokens(), options);
 }
-export interface Sg721AllOperatorsQuery extends Sg721ReactQuery<AllOperatorsResponse, TData> {
+export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
     includeExpired?: boolean;
     limit?: number;
@@ -123,7 +123,7 @@ export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
     startAfter: args.startAfter
   }), options);
 }
-export interface Sg721ApprovalsQuery extends Sg721ReactQuery<ApprovalsResponse, TData> {
+export interface Sg721ApprovalsQuery<TData> extends Sg721ReactQuery<ApprovalsResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
@@ -139,7 +139,7 @@ export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721ApprovalQuery extends Sg721ReactQuery<ApprovalResponse, TData> {
+export interface Sg721ApprovalQuery<TData> extends Sg721ReactQuery<ApprovalResponse, TData> {
   args: {
     includeExpired?: boolean;
     spender: string;
@@ -157,7 +157,7 @@ export function useSg721ApprovalQuery<TData = ApprovalResponse>({
     tokenId: args.tokenId
   }), options);
 }
-export interface Sg721OwnerOfQuery extends Sg721ReactQuery<OwnerOfResponse, TData> {
+export interface Sg721OwnerOfQuery<TData> extends Sg721ReactQuery<OwnerOfResponse, TData> {
   args: {
     includeExpired?: boolean;
     tokenId: string;
diff --git a/__output__/vectis/factory-optional-client/Factory.react-query.ts b/__output__/vectis/factory-optional-client/Factory.react-query.ts
index 0514312c..d4ae40f0 100644
--- a/__output__/vectis/factory-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-optional-client/Factory.react-query.ts
@@ -11,7 +11,7 @@ export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient | undefined;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
@@ -20,7 +20,7 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
@@ -29,7 +29,7 @@ export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
@@ -38,7 +38,7 @@ export function useFactoryFeeQuery<TData = FeeResponse>({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
@@ -54,7 +54,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -74,7 +74,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
diff --git a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
index 4b292ea0..1e598df4 100644
--- a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
@@ -14,91 +14,91 @@ export const factoryQueryKeys = {
   address: (contractAddress: string | undefined) => ([{ ...factoryQueryKeys.contract[0],
     address: contractAddress
   }] as const),
-  wallets: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  wallets: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets",
     args
   }] as const),
-  walletsOf: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  walletsOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets_of",
     args
   }] as const),
-  codeId: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  codeId: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "code_id",
     args
   }] as const),
-  fee: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  fee: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "fee",
     args
   }] as const),
-  govecAddr: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  govecAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "govec_addr",
     args
   }] as const),
-  adminAddr: (contractAddress: string | undefined, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  adminAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "admin_addr",
     args
   }] as const)
 };
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient | undefined;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client?.contractAddress), () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client?.contractAddress), () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client?.contractAddress), () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client?.contractAddress, args), () => client ? client.codeId({
     ty: args.ty
   }) : Promise.reject(new Error("Invalid client")), { ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client?.contractAddress, args), () => client ? client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
@@ -106,18 +106,18 @@ export function useFactoryWalletsOfQuery({
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client?.contractAddress, args), () => client ? client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }) : Promise.reject(new Error("Invalid client")), { ...options,
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index 41c30fb5..e233c2bb 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -14,100 +14,100 @@ export const factoryQueryKeys = {
   address: (contractAddress: string) => ([{ ...factoryQueryKeys.contract[0],
     address: contractAddress
   }] as const),
-  wallets: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets",
     args
   }] as const),
-  walletsOf: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets_of",
     args
   }] as const),
-  codeId: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "code_id",
     args
   }] as const),
-  fee: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "fee",
     args
   }] as const),
-  govecAddr: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "govec_addr",
     args
   }] as const),
-  adminAddr: (contractAddress: string, args: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
     method: "admin_addr",
     args
   }] as const)
 };
-export interface FactoryReactQuery<TResponse> {
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TResponse, (string | undefined)[]>;
+  options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse> {}
-export function useFactoryAdminAddrQuery({
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client.contractAddress), () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse> {}
-export function useFactoryGovecAddrQuery({
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client.contractAddress), () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse> {}
-export function useFactoryFeeQuery({
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client.contractAddress), () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
 }
-export function useFactoryCodeIdQuery({
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   client,
   args,
   options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client.contractAddress, args), () => client.codeId({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
     user: string;
   };
 }
-export function useFactoryWalletsOfQuery({
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   client,
   args,
   options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client.contractAddress, args), () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
   };
 }
-export function useFactoryWalletsQuery({
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
   client,
   args,
   options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client.contractAddress, args), () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/vectis/factory-v4-query/Factory.react-query.ts b/__output__/vectis/factory-v4-query/Factory.react-query.ts
index fc74f99f..0bbeba10 100644
--- a/__output__/vectis/factory-v4-query/Factory.react-query.ts
+++ b/__output__/vectis/factory-v4-query/Factory.react-query.ts
@@ -13,28 +13,28 @@ export interface FactoryReactQuery<TResponse, TData = TResponse> {
     initialData?: undefined;
   };
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
   return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
   return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
   return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
@@ -48,7 +48,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -66,7 +66,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index d1fa2ce2..93a6f935 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -15,28 +15,28 @@ export interface FactoryReactQuery<TResponse, TData = TResponse> {
     initialData?: undefined;
   };
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
   return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
   return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
   return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
@@ -50,7 +50,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -68,7 +68,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
diff --git a/__output__/vectis/factory/Factory.react-query.ts b/__output__/vectis/factory/Factory.react-query.ts
index 41b88b79..2d40ad5e 100644
--- a/__output__/vectis/factory/Factory.react-query.ts
+++ b/__output__/vectis/factory/Factory.react-query.ts
@@ -11,28 +11,28 @@ export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface FactoryAdminAddrQuery extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
   return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
-export interface FactoryGovecAddrQuery extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
   return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
-export interface FactoryFeeQuery extends FactoryReactQuery<FeeResponse, TData> {}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
   return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
-export interface FactoryCodeIdQuery extends FactoryReactQuery<CodeIdResponse, TData> {
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
     ty: CodeIdType;
   };
@@ -46,7 +46,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
     ty: args.ty
   }), options);
 }
-export interface FactoryWalletsOfQuery extends FactoryReactQuery<WalletsOfResponse, TData> {
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
     limit?: number;
     startAfter?: string;
@@ -64,7 +64,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     user: args.user
   }), options);
 }
-export interface FactoryWalletsQuery extends FactoryReactQuery<WalletsResponse, TData> {
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
     limit?: number;
     startAfter?: WalletQueryPrefix;
diff --git a/__output__/vectis/govec/Govec.react-query.ts b/__output__/vectis/govec/Govec.react-query.ts
index 638b2bd1..88d2ed1f 100644
--- a/__output__/vectis/govec/Govec.react-query.ts
+++ b/__output__/vectis/govec/Govec.react-query.ts
@@ -11,7 +11,7 @@ export interface GovecReactQuery<TResponse, TData = TResponse> {
   client: GovecQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface GovecCanExecuteRelayQuery extends GovecReactQuery<CanExecuteRelayResponse, TData> {
+export interface GovecCanExecuteRelayQuery<TData> extends GovecReactQuery<CanExecuteRelayResponse, TData> {
   args: {
     sender: string;
   };
@@ -25,7 +25,7 @@ export function useGovecCanExecuteRelayQuery<TData = CanExecuteRelayResponse>({
     sender: args.sender
   }), options);
 }
-export interface GovecInfoQuery extends GovecReactQuery<InfoResponse, TData> {}
+export interface GovecInfoQuery<TData> extends GovecReactQuery<InfoResponse, TData> {}
 export function useGovecInfoQuery<TData = InfoResponse>({
   client,
   options
diff --git a/__output__/vectis/proxy/Proxy.react-query.ts b/__output__/vectis/proxy/Proxy.react-query.ts
index 1bcb2754..a6fc6d41 100644
--- a/__output__/vectis/proxy/Proxy.react-query.ts
+++ b/__output__/vectis/proxy/Proxy.react-query.ts
@@ -11,7 +11,7 @@ export interface ProxyReactQuery<TResponse, TData = TResponse> {
   client: ProxyQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface ProxyCanExecuteRelayQuery extends ProxyReactQuery<CanExecuteRelayResponse, TData> {
+export interface ProxyCanExecuteRelayQuery<TData> extends ProxyReactQuery<CanExecuteRelayResponse, TData> {
   args: {
     sender: string;
   };
@@ -25,7 +25,7 @@ export function useProxyCanExecuteRelayQuery<TData = CanExecuteRelayResponse>({
     sender: args.sender
   }), options);
 }
-export interface ProxyInfoQuery extends ProxyReactQuery<InfoResponse, TData> {}
+export interface ProxyInfoQuery<TData> extends ProxyReactQuery<InfoResponse, TData> {}
 export function useProxyInfoQuery<TData = InfoResponse>({
   client,
   options
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index df47231c..463da362 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -20,6 +20,7 @@ TSBuilder {
       "enabled": true,
       "mutations": false,
       "optionalClient": false,
+      "queryKeys": false,
       "version": "v3",
     },
     "recoil": Object {
@@ -53,6 +54,7 @@ TSBuilder {
       "enabled": false,
       "mutations": false,
       "optionalClient": false,
+      "queryKeys": false,
       "version": "v3",
     },
     "recoil": Object {

From d63f1f6594db19cf692da4dd062a16b277ddf057 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 22 Aug 2022 10:01:49 -0700
Subject: [PATCH 006/287] dep

---
 packages/ts-codegen/package.json              |    3 +-
 .../ts-client.issues.55.test.ts.snap          | 1967 -----------------
 2 files changed, 2 insertions(+), 1968 deletions(-)
 delete mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.55.test.ts.snap

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index c889104e..0a7e92d7 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -82,6 +82,7 @@
     "@babel/types": "7.18.10",
     "case": "1.6.3",
     "dargs": "7.0.0",
+    "deepmerge": "4.2.2",
     "dotty": "0.1.2",
     "fuzzy": "0.1.3",
     "glob": "8.0.3",
@@ -95,4 +96,4 @@
     "shelljs": "0.8.5",
     "wasm-ast-types": "^0.8.1"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.55.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.55.test.ts.snap
deleted file mode 100644
index 6649bbf6..00000000
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.55.test.ts.snap
+++ /dev/null
@@ -1,1967 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`execute class /issues/0001/batch.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/0001/denom_response.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/0001/edge.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/0001/execute_msg.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.createEdge = this.createEdge.bind(this);
-    this.editEdge = this.editEdge.bind(this);
-    this.removeEdge = this.removeEdge.bind(this);
-    this.createGraph = this.createGraph.bind(this);
-    this.createGraphSimplified = this.createGraphSimplified.bind(this);
-    this.editGraphSimplified = this.editGraphSimplified.bind(this);
-    this.removeGraph = this.removeGraph.bind(this);
-    this.updateEdges = this.updateEdges.bind(this);
-    this.findSavings = this.findSavings.bind(this);
-    this.findSavingsInAGraph = this.findSavingsInAGraph.bind(this);
-    this.reset = this.reset.bind(this);
-    this.saveNetworkToFile = this.saveNetworkToFile.bind(this);
-    this.createGraphFromFile = this.createGraphFromFile.bind(this);
-    this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
-  }
-
-  createEdge = async ({
-    amount,
-    creditor
-  }: {
-    amount: number;
-    creditor: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_edge: {
-        amount,
-        creditor
-      }
-    }, fee, memo, funds);
-  };
-  editEdge = async ({
-    amount,
-    creditor,
-    edgeId
-  }: {
-    amount: number;
-    creditor: Addr;
-    edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      edit_edge: {
-        amount,
-        creditor,
-        edge_id: edgeId
-      }
-    }, fee, memo, funds);
-  };
-  removeEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      remove_edge: {
-        edge_id: edgeId
-      }
-    }, fee, memo, funds);
-  };
-  createGraph = async ({
-    graph
-  }: {
-    graph: Edge[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_graph: {
-        graph
-      }
-    }, fee, memo, funds);
-  };
-  createGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  editGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      edit_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  removeGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      remove_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  updateEdges = async ({
-    edges
-  }: {
-    edges: number[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_edges: {
-        edges
-      }
-    }, fee, memo, funds);
-  };
-  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      find_savings: {}
-    }, fee, memo, funds);
-  };
-  findSavingsInAGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      find_savings_in_a_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      reset: {}
-    }, fee, memo, funds);
-  };
-  saveNetworkToFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      save_network_to_file: {
-        filepath
-      }
-    }, fee, memo, funds);
-  };
-  createGraphFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_graph_from_file: {
-        filepath
-      }
-    }, fee, memo, funds);
-  };
-  applySetOffFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      apply_set_off_from_file: {
-        filepath
-      }
-    }, fee, memo, funds);
-  };
-}"
-`;
-
-exports[`execute class /issues/0001/instantiate_msg.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/0001/network.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/0001/query_msg.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.getDenom = this.getDenom.bind(this);
-    this.getOwner = this.getOwner.bind(this);
-    this.allEdges = this.allEdges.bind(this);
-    this.oneEdge = this.oneEdge.bind(this);
-    this.oneBatch = this.oneBatch.bind(this);
-    this.oneGraph = this.oneGraph.bind(this);
-    this.getEdgesByAddress = this.getEdgesByAddress.bind(this);
-    this.getEdgesAsCounterparty = this.getEdgesAsCounterparty.bind(this);
-    this.getTotalDebtPerAddress = this.getTotalDebtPerAddress.bind(this);
-    this.getTotalCreditPerAddress = this.getTotalCreditPerAddress.bind(this);
-    this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
-    this.getTotalDebt = this.getTotalDebt.bind(this);
-  }
-
-  getDenom = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_denom: {}
-    }, fee, memo, funds);
-  };
-  getOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_owner: {}
-    }, fee, memo, funds);
-  };
-  allEdges = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      all_edges: {}
-    }, fee, memo, funds);
-  };
-  oneEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      one_edge: {
-        edge_id: edgeId
-      }
-    }, fee, memo, funds);
-  };
-  oneBatch = async ({
-    batchId
-  }: {
-    batchId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      one_batch: {
-        batch_id: batchId
-      }
-    }, fee, memo, funds);
-  };
-  oneGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      one_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  getEdgesByAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_edges_by_address: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getEdgesAsCounterparty = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_edges_as_counterparty: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getTotalDebtPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_debt_per_address: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getTotalCreditPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_credit_per_address: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getTotalDebtByGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_debt_by_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  getTotalDebt = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_debt: {}
-    }, fee, memo, funds);
-  };
-}"
-`;
-
-exports[`execute class /issues/55/batch.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/55/denom_response.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/55/edge.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/55/execute_msg.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.createEdge = this.createEdge.bind(this);
-    this.editEdge = this.editEdge.bind(this);
-    this.removeEdge = this.removeEdge.bind(this);
-    this.createGraph = this.createGraph.bind(this);
-    this.createGraphSimplified = this.createGraphSimplified.bind(this);
-    this.editGraphSimplified = this.editGraphSimplified.bind(this);
-    this.removeGraph = this.removeGraph.bind(this);
-    this.updateEdges = this.updateEdges.bind(this);
-    this.findSavings = this.findSavings.bind(this);
-    this.findSavingsInAGraph = this.findSavingsInAGraph.bind(this);
-    this.reset = this.reset.bind(this);
-    this.saveNetworkToFile = this.saveNetworkToFile.bind(this);
-    this.createGraphFromFile = this.createGraphFromFile.bind(this);
-    this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
-  }
-
-  createEdge = async ({
-    amount,
-    creditor
-  }: {
-    amount: number;
-    creditor: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_edge: {
-        amount,
-        creditor
-      }
-    }, fee, memo, funds);
-  };
-  editEdge = async ({
-    amount,
-    creditor,
-    edgeId
-  }: {
-    amount: number;
-    creditor: Addr;
-    edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      edit_edge: {
-        amount,
-        creditor,
-        edge_id: edgeId
-      }
-    }, fee, memo, funds);
-  };
-  removeEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      remove_edge: {
-        edge_id: edgeId
-      }
-    }, fee, memo, funds);
-  };
-  createGraph = async ({
-    graph
-  }: {
-    graph: Edge[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_graph: {
-        graph
-      }
-    }, fee, memo, funds);
-  };
-  createGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  editGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      edit_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  removeGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      remove_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  updateEdges = async ({
-    edges
-  }: {
-    edges: number[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_edges: {
-        edges
-      }
-    }, fee, memo, funds);
-  };
-  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      find_savings: {}
-    }, fee, memo, funds);
-  };
-  findSavingsInAGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      find_savings_in_a_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      reset: {}
-    }, fee, memo, funds);
-  };
-  saveNetworkToFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      save_network_to_file: {
-        filepath
-      }
-    }, fee, memo, funds);
-  };
-  createGraphFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      create_graph_from_file: {
-        filepath
-      }
-    }, fee, memo, funds);
-  };
-  applySetOffFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      apply_set_off_from_file: {
-        filepath
-      }
-    }, fee, memo, funds);
-  };
-}"
-`;
-
-exports[`execute class /issues/55/instantiate_msg.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/55/network.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`execute class /issues/55/query_msg.json 1`] = `
-"export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.getDenom = this.getDenom.bind(this);
-    this.getOwner = this.getOwner.bind(this);
-    this.allEdges = this.allEdges.bind(this);
-    this.oneEdge = this.oneEdge.bind(this);
-    this.oneBatch = this.oneBatch.bind(this);
-    this.oneGraph = this.oneGraph.bind(this);
-    this.getEdgesByAddress = this.getEdgesByAddress.bind(this);
-    this.getEdgesAsCounterparty = this.getEdgesAsCounterparty.bind(this);
-    this.getTotalDebtPerAddress = this.getTotalDebtPerAddress.bind(this);
-    this.getTotalCreditPerAddress = this.getTotalCreditPerAddress.bind(this);
-    this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
-    this.getTotalDebt = this.getTotalDebt.bind(this);
-  }
-
-  getDenom = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_denom: {}
-    }, fee, memo, funds);
-  };
-  getOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_owner: {}
-    }, fee, memo, funds);
-  };
-  allEdges = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      all_edges: {}
-    }, fee, memo, funds);
-  };
-  oneEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      one_edge: {
-        edge_id: edgeId
-      }
-    }, fee, memo, funds);
-  };
-  oneBatch = async ({
-    batchId
-  }: {
-    batchId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      one_batch: {
-        batch_id: batchId
-      }
-    }, fee, memo, funds);
-  };
-  oneGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      one_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  getEdgesByAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_edges_by_address: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getEdgesAsCounterparty = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_edges_as_counterparty: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getTotalDebtPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_debt_per_address: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getTotalCreditPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_credit_per_address: {
-        address
-      }
-    }, fee, memo, funds);
-  };
-  getTotalDebtByGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_debt_by_graph: {
-        graph_id: graphId
-      }
-    }, fee, memo, funds);
-  };
-  getTotalDebt = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      get_total_debt: {}
-    }, fee, memo, funds);
-  };
-}"
-`;
-
-exports[`execute interface /issues/0001/batch.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/0001/denom_response.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/0001/edge.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/0001/execute_msg.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-  createEdge: ({
-    amount,
-    creditor
-  }: {
-    amount: number;
-    creditor: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  editEdge: ({
-    amount,
-    creditor,
-    edgeId
-  }: {
-    amount: number;
-    creditor: Addr;
-    edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  removeEdge: ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  createGraph: ({
-    graph
-  }: {
-    graph: Edge[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  createGraphSimplified: ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  editGraphSimplified: ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  removeGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateEdges: ({
-    edges
-  }: {
-    edges: number[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavingsInAGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  saveNetworkToFile: ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  createGraphFromFile: ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  applySetOffFromFile: ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-}"
-`;
-
-exports[`execute interface /issues/0001/instantiate_msg.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/0001/network.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/0001/query_msg.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-  getDenom: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  allEdges: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  oneEdge: ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  oneBatch: ({
-    batchId
-  }: {
-    batchId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  oneGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getEdgesByAddress: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getEdgesAsCounterparty: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebtPerAddress: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalCreditPerAddress: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebtByGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebt: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-}"
-`;
-
-exports[`execute interface /issues/55/batch.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/55/denom_response.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/55/edge.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/55/execute_msg.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-  createEdge: ({
-    amount,
-    creditor
-  }: {
-    amount: number;
-    creditor: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  editEdge: ({
-    amount,
-    creditor,
-    edgeId
-  }: {
-    amount: number;
-    creditor: Addr;
-    edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  removeEdge: ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  createGraph: ({
-    graph
-  }: {
-    graph: Edge[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  createGraphSimplified: ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  editGraphSimplified: ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  removeGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateEdges: ({
-    edges
-  }: {
-    edges: number[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavingsInAGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  saveNetworkToFile: ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  createGraphFromFile: ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  applySetOffFromFile: ({
-    filepath
-  }: {
-    filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-}"
-`;
-
-exports[`execute interface /issues/55/instantiate_msg.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/55/network.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-}"
-`;
-
-exports[`execute interface /issues/55/query_msg.json 1`] = `
-"export interface SG721Instance {
-  contractAddress: string;
-  sender: string;
-  getDenom: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  allEdges: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  oneEdge: ({
-    edgeId
-  }: {
-    edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  oneBatch: ({
-    batchId
-  }: {
-    batchId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  oneGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getEdgesByAddress: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getEdgesAsCounterparty: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebtPerAddress: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalCreditPerAddress: ({
-    address
-  }: {
-    address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebtByGraph: ({
-    graphId
-  }: {
-    graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebt: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/0001/batch.json 1`] = `
-"export interface Batch {
-  batchId: number;
-  setoffs: number[][];
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/0001/denom_response.json 1`] = `
-"export interface DenomResponse {
-  denom: string;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/0001/edge.json 1`] = `
-"export interface Edge {
-  amount: number;
-  creditor: Addr;
-  debtor: Addr;
-  edgeId: number;
-  graphId?: number;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/0001/execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
-
-exports[`execute_msg_for__empty /issues/0001/instantiate_msg.json 1`] = `
-"export interface InstantiateMsg {
-  denom: string;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/0001/network.json 1`] = `
-"export interface Network {
-  denom: string;
-  owner: Addr;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/0001/query_msg.json 1`] = `"export type QueryMsg = QueryMsg;"`;
-
-exports[`execute_msg_for__empty /issues/55/batch.json 1`] = `
-"export interface Batch {
-  batchId: number;
-  setoffs: number[][];
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/55/denom_response.json 1`] = `
-"export interface DenomResponse {
-  denom: string;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/55/edge.json 1`] = `
-"export interface Edge {
-  amount: number;
-  creditor: Addr;
-  debtor: Addr;
-  edgeId: number;
-  graphId?: number;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/55/execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
-
-exports[`execute_msg_for__empty /issues/55/instantiate_msg.json 1`] = `
-"export interface InstantiateMsg {
-  denom: string;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/55/network.json 1`] = `
-"export interface Network {
-  denom: string;
-  owner: Addr;
-}"
-`;
-
-exports[`execute_msg_for__empty /issues/55/query_msg.json 1`] = `"export type QueryMsg = QueryMsg;"`;
-
-exports[`query classes /issues/0001/batch.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/0001/denom_response.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/0001/edge.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/0001/execute_msg.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-    this.createEdge = this.createEdge.bind(this);
-    this.editEdge = this.editEdge.bind(this);
-    this.removeEdge = this.removeEdge.bind(this);
-    this.createGraph = this.createGraph.bind(this);
-    this.createGraphSimplified = this.createGraphSimplified.bind(this);
-    this.editGraphSimplified = this.editGraphSimplified.bind(this);
-    this.removeGraph = this.removeGraph.bind(this);
-    this.updateEdges = this.updateEdges.bind(this);
-    this.findSavings = this.findSavings.bind(this);
-    this.findSavingsInAGraph = this.findSavingsInAGraph.bind(this);
-    this.reset = this.reset.bind(this);
-    this.saveNetworkToFile = this.saveNetworkToFile.bind(this);
-    this.createGraphFromFile = this.createGraphFromFile.bind(this);
-    this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
-  }
-
-  createEdge = async ({
-    amount,
-    creditor
-  }: {
-    amount: number;
-    creditor: Addr;
-  }): Promise<CreateEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_edge: {
-        amount,
-        creditor
-      }
-    });
-  };
-  editEdge = async ({
-    amount,
-    creditor,
-    edgeId
-  }: {
-    amount: number;
-    creditor: Addr;
-    edgeId: number;
-  }): Promise<EditEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      edit_edge: {
-        amount,
-        creditor,
-        edge_id: edgeId
-      }
-    });
-  };
-  removeEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }): Promise<RemoveEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      remove_edge: {
-        edge_id: edgeId
-      }
-    });
-  };
-  createGraph = async ({
-    graph
-  }: {
-    graph: Edge[];
-  }): Promise<CreateGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_graph: {
-        graph
-      }
-    });
-  };
-  createGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }): Promise<CreateGraphSimplifiedResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    });
-  };
-  editGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }): Promise<EditGraphSimplifiedResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      edit_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    });
-  };
-  removeGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<RemoveGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      remove_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  updateEdges = async ({
-    edges
-  }: {
-    edges: number[][];
-  }): Promise<UpdateEdgesResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      update_edges: {
-        edges
-      }
-    });
-  };
-  findSavings = async (): Promise<FindSavingsResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      find_savings: {}
-    });
-  };
-  findSavingsInAGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<FindSavingsInAGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      find_savings_in_a_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  reset = async (): Promise<ResetResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      reset: {}
-    });
-  };
-  saveNetworkToFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }): Promise<SaveNetworkToFileResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      save_network_to_file: {
-        filepath
-      }
-    });
-  };
-  createGraphFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }): Promise<CreateGraphFromFileResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_graph_from_file: {
-        filepath
-      }
-    });
-  };
-  applySetOffFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }): Promise<ApplySetOffFromFileResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      apply_set_off_from_file: {
-        filepath
-      }
-    });
-  };
-}"
-`;
-
-exports[`query classes /issues/0001/instantiate_msg.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/0001/network.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/0001/query_msg.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-    this.getDenom = this.getDenom.bind(this);
-    this.getOwner = this.getOwner.bind(this);
-    this.allEdges = this.allEdges.bind(this);
-    this.oneEdge = this.oneEdge.bind(this);
-    this.oneBatch = this.oneBatch.bind(this);
-    this.oneGraph = this.oneGraph.bind(this);
-    this.getEdgesByAddress = this.getEdgesByAddress.bind(this);
-    this.getEdgesAsCounterparty = this.getEdgesAsCounterparty.bind(this);
-    this.getTotalDebtPerAddress = this.getTotalDebtPerAddress.bind(this);
-    this.getTotalCreditPerAddress = this.getTotalCreditPerAddress.bind(this);
-    this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
-    this.getTotalDebt = this.getTotalDebt.bind(this);
-  }
-
-  getDenom = async (): Promise<GetDenomResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_denom: {}
-    });
-  };
-  getOwner = async (): Promise<GetOwnerResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_owner: {}
-    });
-  };
-  allEdges = async (): Promise<AllEdgesResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      all_edges: {}
-    });
-  };
-  oneEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }): Promise<OneEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      one_edge: {
-        edge_id: edgeId
-      }
-    });
-  };
-  oneBatch = async ({
-    batchId
-  }: {
-    batchId: number;
-  }): Promise<OneBatchResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      one_batch: {
-        batch_id: batchId
-      }
-    });
-  };
-  oneGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<OneGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      one_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  getEdgesByAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetEdgesByAddressResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_edges_by_address: {
-        address
-      }
-    });
-  };
-  getEdgesAsCounterparty = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetEdgesAsCounterpartyResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_edges_as_counterparty: {
-        address
-      }
-    });
-  };
-  getTotalDebtPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetTotalDebtPerAddressResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_debt_per_address: {
-        address
-      }
-    });
-  };
-  getTotalCreditPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetTotalCreditPerAddressResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_credit_per_address: {
-        address
-      }
-    });
-  };
-  getTotalDebtByGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<GetTotalDebtByGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_debt_by_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  getTotalDebt = async (): Promise<GetTotalDebtResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_debt: {}
-    });
-  };
-}"
-`;
-
-exports[`query classes /issues/55/batch.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/55/denom_response.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/55/edge.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/55/execute_msg.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-    this.createEdge = this.createEdge.bind(this);
-    this.editEdge = this.editEdge.bind(this);
-    this.removeEdge = this.removeEdge.bind(this);
-    this.createGraph = this.createGraph.bind(this);
-    this.createGraphSimplified = this.createGraphSimplified.bind(this);
-    this.editGraphSimplified = this.editGraphSimplified.bind(this);
-    this.removeGraph = this.removeGraph.bind(this);
-    this.updateEdges = this.updateEdges.bind(this);
-    this.findSavings = this.findSavings.bind(this);
-    this.findSavingsInAGraph = this.findSavingsInAGraph.bind(this);
-    this.reset = this.reset.bind(this);
-    this.saveNetworkToFile = this.saveNetworkToFile.bind(this);
-    this.createGraphFromFile = this.createGraphFromFile.bind(this);
-    this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
-  }
-
-  createEdge = async ({
-    amount,
-    creditor
-  }: {
-    amount: number;
-    creditor: Addr;
-  }): Promise<CreateEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_edge: {
-        amount,
-        creditor
-      }
-    });
-  };
-  editEdge = async ({
-    amount,
-    creditor,
-    edgeId
-  }: {
-    amount: number;
-    creditor: Addr;
-    edgeId: number;
-  }): Promise<EditEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      edit_edge: {
-        amount,
-        creditor,
-        edge_id: edgeId
-      }
-    });
-  };
-  removeEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }): Promise<RemoveEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      remove_edge: {
-        edge_id: edgeId
-      }
-    });
-  };
-  createGraph = async ({
-    graph
-  }: {
-    graph: Edge[];
-  }): Promise<CreateGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_graph: {
-        graph
-      }
-    });
-  };
-  createGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }): Promise<CreateGraphSimplifiedResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    });
-  };
-  editGraphSimplified = async ({
-    graph,
-    graphId
-  }: {
-    graph: Addr[][];
-    graphId: number;
-  }): Promise<EditGraphSimplifiedResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      edit_graph_simplified: {
-        graph,
-        graph_id: graphId
-      }
-    });
-  };
-  removeGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<RemoveGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      remove_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  updateEdges = async ({
-    edges
-  }: {
-    edges: number[][];
-  }): Promise<UpdateEdgesResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      update_edges: {
-        edges
-      }
-    });
-  };
-  findSavings = async (): Promise<FindSavingsResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      find_savings: {}
-    });
-  };
-  findSavingsInAGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<FindSavingsInAGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      find_savings_in_a_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  reset = async (): Promise<ResetResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      reset: {}
-    });
-  };
-  saveNetworkToFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }): Promise<SaveNetworkToFileResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      save_network_to_file: {
-        filepath
-      }
-    });
-  };
-  createGraphFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }): Promise<CreateGraphFromFileResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      create_graph_from_file: {
-        filepath
-      }
-    });
-  };
-  applySetOffFromFile = async ({
-    filepath
-  }: {
-    filepath: string;
-  }): Promise<ApplySetOffFromFileResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      apply_set_off_from_file: {
-        filepath
-      }
-    });
-  };
-}"
-`;
-
-exports[`query classes /issues/55/instantiate_msg.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/55/network.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-  }
-
-}"
-`;
-
-exports[`query classes /issues/55/query_msg.json 1`] = `
-"export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-    this.getDenom = this.getDenom.bind(this);
-    this.getOwner = this.getOwner.bind(this);
-    this.allEdges = this.allEdges.bind(this);
-    this.oneEdge = this.oneEdge.bind(this);
-    this.oneBatch = this.oneBatch.bind(this);
-    this.oneGraph = this.oneGraph.bind(this);
-    this.getEdgesByAddress = this.getEdgesByAddress.bind(this);
-    this.getEdgesAsCounterparty = this.getEdgesAsCounterparty.bind(this);
-    this.getTotalDebtPerAddress = this.getTotalDebtPerAddress.bind(this);
-    this.getTotalCreditPerAddress = this.getTotalCreditPerAddress.bind(this);
-    this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
-    this.getTotalDebt = this.getTotalDebt.bind(this);
-  }
-
-  getDenom = async (): Promise<GetDenomResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_denom: {}
-    });
-  };
-  getOwner = async (): Promise<GetOwnerResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_owner: {}
-    });
-  };
-  allEdges = async (): Promise<AllEdgesResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      all_edges: {}
-    });
-  };
-  oneEdge = async ({
-    edgeId
-  }: {
-    edgeId: number;
-  }): Promise<OneEdgeResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      one_edge: {
-        edge_id: edgeId
-      }
-    });
-  };
-  oneBatch = async ({
-    batchId
-  }: {
-    batchId: number;
-  }): Promise<OneBatchResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      one_batch: {
-        batch_id: batchId
-      }
-    });
-  };
-  oneGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<OneGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      one_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  getEdgesByAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetEdgesByAddressResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_edges_by_address: {
-        address
-      }
-    });
-  };
-  getEdgesAsCounterparty = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetEdgesAsCounterpartyResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_edges_as_counterparty: {
-        address
-      }
-    });
-  };
-  getTotalDebtPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetTotalDebtPerAddressResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_debt_per_address: {
-        address
-      }
-    });
-  };
-  getTotalCreditPerAddress = async ({
-    address
-  }: {
-    address: Addr;
-  }): Promise<GetTotalCreditPerAddressResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_credit_per_address: {
-        address
-      }
-    });
-  };
-  getTotalDebtByGraph = async ({
-    graphId
-  }: {
-    graphId: number;
-  }): Promise<GetTotalDebtByGraphResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_debt_by_graph: {
-        graph_id: graphId
-      }
-    });
-  };
-  getTotalDebt = async (): Promise<GetTotalDebtResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_total_debt: {}
-    });
-  };
-}"
-`;

From d36b8c2de0e9f6eb14c9056705d460600a2b15d5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 22 Aug 2022 10:01:55 -0700
Subject: [PATCH 007/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.11.2
 - wasm-ast-types@0.8.2
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 6 +++---
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 32e9a2d5..aa5d846a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.11.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.11.1...@cosmwasm/ts-codegen@0.11.2) (2022-08-22)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.11.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.11.0...@cosmwasm/ts-codegen@0.11.1) (2022-08-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 0a7e92d7..8b542f77 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.8.1"
+    "wasm-ast-types": "^0.8.2"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 4931f908..a199a421 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.8.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.1...wasm-ast-types@0.8.2) (2022-08-22)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.8.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.0...wasm-ast-types@0.8.1) (2022-08-13)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 37c5499d..f831e202 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "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",

From 42bd456c43144180f024ecf37b4b979620531524 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 22 Aug 2022 11:45:44 -0700
Subject: [PATCH 008/287] update package

---
 packages/ts-codegen/package.json         |  4 +-
 packages/ts-codegen/src/utils/schemas.ts |  2 +-
 yarn.lock                                | 60 ++++++++++++------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 8b542f77..fe8ad58c 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -87,7 +87,7 @@
     "fuzzy": "0.1.3",
     "glob": "8.0.3",
     "inquirerer": "0.1.3",
-    "json-schema-to-typescript": "11.0.1",
+    "@pyramation/json-schema-to-typescript": " 11.0.4",
     "long": "^5.2.0",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
@@ -96,4 +96,4 @@
     "shelljs": "0.8.5",
     "wasm-ast-types": "^0.8.2"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index fa4ae08e..e98f40b0 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -1,7 +1,7 @@
 import { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { cleanse } from './cleanse';
-import { compile } from 'json-schema-to-typescript';
+import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
 import { JSONSchema } from 'wasm-ast-types';
 
diff --git a/yarn.lock b/yarn.lock
index 1acb83c4..220b3fe5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,15 +10,6 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@apidevtools/json-schema-ref-parser@https://github.com/bcherny/json-schema-ref-parser.git#984282d34a2993e5243aa35100fe32a63699164d":
-  version "0.0.0-dev"
-  resolved "https://github.com/bcherny/json-schema-ref-parser.git#984282d34a2993e5243aa35100fe32a63699164d"
-  dependencies:
-    "@jsdevtools/ono" "^7.1.3"
-    "@types/json-schema" "^7.0.6"
-    call-me-maybe "^1.0.1"
-    js-yaml "^4.1.0"
-
 "@babel/cli@7.18.10":
   version "7.18.10"
   resolved "https://registry.npmjs.org/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a"
@@ -3232,6 +3223,35 @@
     "@babel/preset-react" "7.9.4"
     babel-plugin-macros "2.8.0"
 
+"@pyramation/json-schema-ref-parser@9.0.6":
+  version "9.0.6"
+  resolved "https://registry.npmjs.org/@pyramation/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#556e416ce7dcc15a3c1afd04d6a059e03ed09aeb"
+  integrity sha512-L5kToHAEc1Q87R8ZwWFaNa4tPHr8Hnm+U+DRdUVq3tUtk+EX4pCqSd34Z6EMxNi/bjTzt1syAG9J2Oo1YFlqSg==
+  dependencies:
+    "@jsdevtools/ono" "^7.1.3"
+    call-me-maybe "^1.0.1"
+    js-yaml "^3.13.1"
+
+"@pyramation/json-schema-to-typescript@ 11.0.4":
+  version "11.0.4"
+  resolved "https://registry.npmjs.org/@pyramation/json-schema-to-typescript/-/json-schema-to-typescript-11.0.4.tgz#959bdb631dad336e1fdbf608a9b5908ab0da1d6b"
+  integrity sha512-+aSzXDLhMHOEdV2cJ7Tjg/9YenjHU5BCmClVygzwxJZ1R16NOfEn7lTAwVzb/2jivOSnhjHzMJbnSf8b6rd1zg==
+  dependencies:
+    "@pyramation/json-schema-ref-parser" "9.0.6"
+    "@types/json-schema" "^7.0.11"
+    "@types/lodash" "^4.14.182"
+    "@types/prettier" "^2.6.1"
+    cli-color "^2.0.2"
+    get-stdin "^8.0.0"
+    glob "^7.1.6"
+    glob-promise "^4.2.2"
+    is-glob "^4.0.3"
+    lodash "^4.17.21"
+    minimist "^1.2.6"
+    mkdirp "^1.0.4"
+    mz "^2.7.0"
+    prettier "^2.6.2"
+
 "@sinclair/typebox@^0.23.3":
   version "0.23.5"
   resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz"
@@ -3336,7 +3356,7 @@
     jest-matcher-utils "^28.0.0"
     pretty-format "^28.0.0"
 
-"@types/json-schema@^7.0.11", "@types/json-schema@^7.0.6":
+"@types/json-schema@^7.0.11":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -6536,26 +6556,6 @@ json-parse-even-better-errors@^2.3.0:
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-schema-to-typescript@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-11.0.1.tgz#9203036817ca797f1116cbfe9163e8a4ec948bc3"
-  integrity sha512-iQFEErdr9PWQUN3kLvaFFdgWAfwBeqH3PMzxza4NpSU/8uadwHKKi66Hgu5Rb3NeVSk85xkwTYIeuah+R0ASeA==
-  dependencies:
-    "@apidevtools/json-schema-ref-parser" "https://github.com/bcherny/json-schema-ref-parser.git#984282d34a2993e5243aa35100fe32a63699164d"
-    "@types/json-schema" "^7.0.11"
-    "@types/lodash" "^4.14.182"
-    "@types/prettier" "^2.6.1"
-    cli-color "^2.0.2"
-    get-stdin "^8.0.0"
-    glob "^7.1.6"
-    glob-promise "^4.2.2"
-    is-glob "^4.0.3"
-    lodash "^4.17.21"
-    minimist "^1.2.6"
-    mkdirp "^1.0.4"
-    mz "^2.7.0"
-    prettier "^2.6.2"
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"

From a6ba17d4ba6e02e5c34614e425720d5353f7cc6e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 22 Aug 2022 11:45:59 -0700
Subject: [PATCH 009/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.12.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index aa5d846a..81860e2d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.12.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.11.2...@cosmwasm/ts-codegen@0.12.0) (2022-08-22)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.11.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.11.1...@cosmwasm/ts-codegen@0.11.2) (2022-08-22)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index fe8ad58c..54d0eb1d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -80,6 +80,7 @@
     "@babel/runtime": "^7.18.9",
     "@babel/traverse": "7.18.11",
     "@babel/types": "7.18.10",
+    "@pyramation/json-schema-to-typescript": " 11.0.4",
     "case": "1.6.3",
     "dargs": "7.0.0",
     "deepmerge": "4.2.2",
@@ -87,7 +88,6 @@
     "fuzzy": "0.1.3",
     "glob": "8.0.3",
     "inquirerer": "0.1.3",
-    "@pyramation/json-schema-to-typescript": " 11.0.4",
     "long": "^5.2.0",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
@@ -96,4 +96,4 @@
     "shelljs": "0.8.5",
     "wasm-ast-types": "^0.8.2"
   }
-}
\ No newline at end of file
+}

From 3b7ca02c9283c346a365d8426d3034af355afcac Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 22 Aug 2022 23:13:26 -0700
Subject: [PATCH 010/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.13.0
 - wasm-ast-types@0.9.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 81860e2d..54e5d986 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.13.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.12.0...@cosmwasm/ts-codegen@0.13.0) (2022-08-23)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.12.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.11.2...@cosmwasm/ts-codegen@0.12.0) (2022-08-22)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 54d0eb1d..8f8f38ec 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.8.2"
+    "wasm-ast-types": "^0.9.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index a199a421..4212d463 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.9.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.2...wasm-ast-types@0.9.0) (2022-08-23)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.8.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.1...wasm-ast-types@0.8.2) (2022-08-22)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index f831e202..e19ff7dd 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.8.2",
+  "version": "0.9.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",

From 1d22dd4e5372a7ff99e5738b01c8d75994ca8042 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 24 Aug 2022 18:12:30 -0700
Subject: [PATCH 011/287] empty bundles

---
 packages/ts-codegen/src/builder/builder.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 79ab26f6..ec7ff609 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -167,8 +167,7 @@ export class TSBuilder {
         });
 
         const ast = recursiveModuleBundle(bundleVariables);
-
-        const code = generate(t.program(
+        let code = generate(t.program(
             [
                 ...importPaths,
                 ...ast
@@ -176,6 +175,9 @@ export class TSBuilder {
         )).code;
 
         mkdirp(this.outPath);
+
+        if (code.trim() === '') code = 'export {};'
+
         writeFileSync(join(this.outPath, bundleFile), header + code);
 
     }

From 37ca0c4ace985d47d31fcbcf24b585e185b65432 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 24 Aug 2022 18:12:37 -0700
Subject: [PATCH 012/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.13.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 54e5d986..f801dcd7 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.13.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.0...@cosmwasm/ts-codegen@0.13.1) (2022-08-25)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.13.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.12.0...@cosmwasm/ts-codegen@0.13.0) (2022-08-23)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 8f8f38ec..ab424ba2 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 8d3634e501642a228d128e9f83384b889f47c54c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Aug 2022 15:03:02 -0700
Subject: [PATCH 013/287] install

---
 packages/ts-codegen/src/commands/install.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index 267c799d..3cedf009 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -50,6 +50,7 @@ export default async (argv) => {
                 'stargaze-royalty-group',
                 'stargaze-sg721',
                 'stargaze-whitelist',
+                'wasmswap'
             ].map(name => {
                 return {
                     name,

From 8aa97ed3052ef00ea377f6fe5530d4ea7ed76ad4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Aug 2022 15:03:08 -0700
Subject: [PATCH 014/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.13.2
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index f801dcd7..4857cb1e 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.13.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.1...@cosmwasm/ts-codegen@0.13.2) (2022-08-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.13.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.0...@cosmwasm/ts-codegen@0.13.1) (2022-08-25)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index ab424ba2..5f0b07a7 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 52679636294ceb7e6caf6632d00ad2f378d40090 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Aug 2022 15:19:55 -0700
Subject: [PATCH 015/287] bundle

---
 packages/ts-codegen/src/commands/generate.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index c7343bc7..4d0c47d3 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -67,10 +67,10 @@ export default async (argv) => {
                 choices: ['v3', 'v4']
             },
             {
-              type: 'confirm',
-              name: 'queryKeys',
-              message: 'queryKeys?',
-              default: false
+                type: 'confirm',
+                name: 'queryKeys',
+                message: 'queryKeys?',
+                default: false
             },
         ])
     };
@@ -99,7 +99,7 @@ export default async (argv) => {
                 type: 'string',
                 name: 'bundleFile',
                 message: 'bundleFile?',
-                default: 'bundle.ts'
+                default: 'index.ts'
             },
             {
                 type: 'string',

From 50046a43a3c9464fb8f8f84522d6433f25b1dc50 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Aug 2022 15:20:02 -0700
Subject: [PATCH 016/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.13.3
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 4857cb1e..3db6fe0a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.13.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.2...@cosmwasm/ts-codegen@0.13.3) (2022-08-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.13.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.1...@cosmwasm/ts-codegen@0.13.2) (2022-08-26)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 5f0b07a7..e0cc265b 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 49f5708243b36243ff365903d7fa58565b022e02 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Aug 2022 17:26:59 -0700
Subject: [PATCH 017/287] readme

---
 README.md                     | 16 ++++++++--------
 packages/ts-codegen/README.md | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 412d556a..db0df7a0 100644
--- a/README.md
+++ b/README.md
@@ -162,14 +162,14 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 
 #### React Query Options
 
-  | option                      | description                                                         |
------------------------------| ------------------------------ | ------------------------------------------------------------------- |
-  | `reactQuery.enabled`        | enable the react-query plugin                                       |
-  | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders     |
-  | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values      |
-  | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`       |
-  | `reactQuery.mutations`      | also generate mutations                                             |
-  | `reactQuery.camelize`       | use camelCase style for property names                              |
+  | option                      | description                                                                  |
+  | ----------------------------| ---------------------------------------------------------------------------- |
+  | `reactQuery.enabled`        | enable the react-query plugin                                                |
+  | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
+  | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+  | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
+  | `reactQuery.mutations`      | also generate mutations                                                      |
+  | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
 #### React Query via CLI 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index c2397866..db0df7a0 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -106,7 +106,8 @@ codegen({
       enabled: true,
       optionalClient: true,
       version: 'v4',
-      mutations: true
+      mutations: true,
+      queryKeys: true,
     },
     recoil: {
       enabled: false
@@ -161,13 +162,14 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 
 #### React Query Options
 
-  | option                         | description                                                         |
-  | ------------------------------ | ------------------------------------------------------------------- |
-  | `reactQuery.enabled`           | enable the react-query plugin                                       |
-  | `reactQuery.optionalClient`    | allows contract client to be undefined as the component renders     |
-  | `reactQuery.version`           | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`       |
-  | `reactQuery.mutations`         | also generate mutations                                             |
-  | `reactQuery.camelize`          | use camelCase style for property names                              |
+  | option                      | description                                                                  |
+  | ----------------------------| ---------------------------------------------------------------------------- |
+  | `reactQuery.enabled`        | enable the react-query plugin                                                |
+  | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
+  | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+  | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
+  | `reactQuery.mutations`      | also generate mutations                                                      |
+  | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
 #### React Query via CLI 

From cce2e2903084d313d7a3a148a41c3f6b6c6c60e1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Aug 2022 17:27:04 -0700
Subject: [PATCH 018/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.13.4
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 3db6fe0a..2c5b1a1d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.13.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.3...@cosmwasm/ts-codegen@0.13.4) (2022-08-27)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.13.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.2...@cosmwasm/ts-codegen@0.13.3) (2022-08-26)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e0cc265b..34a93fd9 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From eab9036191e0619eca08b876756358a63c1e8c8f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 5 Sep 2022 17:55:08 -0700
Subject: [PATCH 019/287] new IDL objects

---
 .../ts-codegen/__tests__/ts-codegen.test.ts   | 108 +++++++++++++-----
 packages/ts-codegen/src/builder/builder.ts    |  20 +++-
 packages/ts-codegen/src/commands/generate.ts  |   2 +-
 packages/ts-codegen/src/types.ts              |  16 ++-
 packages/ts-codegen/src/utils/schemas.ts      |  64 +++++++++--
 5 files changed, 161 insertions(+), 49 deletions(-)

diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 6977bd3d..75863f5c 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -11,36 +11,46 @@ const OUTPUT_DIR = __dirname + '/../../../__output__';
 it('optionalClient', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-optional-client';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateReactQuery('Factory', schemas, outopt, { optionalClient: true });
 })
 
 it('v4Query', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-v4-query';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateReactQuery('Factory', schemas, outopt, { version: 'v4' });
 })
 
 it('queryKeys', async () => {
-  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
-  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-  const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
-  await generateReactQuery('Factory', schemas, outopt, { queryKeys: true });
+    const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
+    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
+    await generateReactQuery('Factory', schemas, outopt, { queryKeys: true });
 })
 
 
 it('queryKeysOptionalClient', async () => {
-  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
-  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-  const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
-  await generateReactQuery('Factory', schemas, outopt, { queryKeys: true, optionalClient: true });
+    const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
+    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
+    await generateReactQuery('Factory', schemas, outopt, { queryKeys: true, optionalClient: true });
 })
 
 it('useMutations', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateReactQuery('Factory', schemas, outopt, { version: 'v4', mutations: true });
 })
 
@@ -48,7 +58,9 @@ it('vectis/factory', async () => {
     const out = OUTPUT_DIR + '/vectis/factory';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('Factory', schemas, out);
     await generateClient('Factory', schemas, out);
     await generateMessageComposer('Factory', schemas, out);
@@ -60,7 +72,9 @@ it('vectis/govec', async () => {
     const out = OUTPUT_DIR + '/vectis/govec';
     const schemaDir = FIXTURE_DIR + '/vectis/govec/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('Govec', schemas, out);
     await generateClient('Govec', schemas, out);
     await generateMessageComposer('Govec', schemas, out);
@@ -72,7 +86,9 @@ it('vectis/proxy', async () => {
     const out = OUTPUT_DIR + '/vectis/proxy';
     const schemaDir = FIXTURE_DIR + '/vectis/proxy/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('Proxy', schemas, out);
     await generateClient('Proxy', schemas, out);
     await generateMessageComposer('Proxy', schemas, out);
@@ -80,21 +96,12 @@ it('vectis/proxy', async () => {
     await generateReactQuery('Proxy', schemas, out);
 })
 
-it('cosmwasm', async () => {
-    const out = OUTPUT_DIR + '/cosmwasm';
-    const schemaDir = FIXTURE_DIR + '/cosmwasm/';
-    const schemas = await readSchemas({ schemaDir, schemaOptions: { packed: true } });
-    await generateTypes('CW4Group', schemas, out);
-    await generateClient('CW4Group', schemas, out);
-    await generateMessageComposer('CW4Group', schemas, out);
-    await generateRecoil('CW4Group', schemas, out);
-    await generateReactQuery('CW4Group', schemas, out);
-})
-
 it('minter', async () => {
     const out = OUTPUT_DIR + '/minter';
     const schemaDir = FIXTURE_DIR + '/minter/';
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('Minter', schemas, out);
     await generateClient('Minter', schemas, out);
     await generateMessageComposer('Minter', schemas, out);
@@ -106,7 +113,9 @@ it('sg721', async () => {
     const out = OUTPUT_DIR + '/sg721';
     const schemaDir = FIXTURE_DIR + '/sg721/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('Sg721', schemas, out);
     await generateClient('Sg721', schemas, out);
     await generateMessageComposer('Sg721', schemas, out);
@@ -118,7 +127,9 @@ it('cw-named-groups', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-named-groups';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-named-groups/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('CwNamedGroups', schemas, out);
     await generateClient('CwNamedGroups', schemas, out);
     await generateMessageComposer('CwNamedGroups', schemas, out);
@@ -130,7 +141,9 @@ it('cw-proposal-single', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-proposal-single';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-proposal-single/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('CwProposalSingle', schemas, out);
     await generateClient('CwProposalSingle', schemas, out);
     await generateMessageComposer('CwProposalSingle', schemas, out);
@@ -142,7 +155,9 @@ it('cw-admin-factory', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-admin-factory';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-admin-factory/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('CwAdminFactory', schemas, out);
     await generateClient('CwAdminFactory', schemas, out);
     await generateMessageComposer('CwAdminFactory', schemas, out);
@@ -154,10 +169,41 @@ it('cw-code-id-registry', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
 
-    const schemas = await readSchemas({ schemaDir, schemaOptions: {} });
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
     await generateTypes('CwCodeIdRegistry', schemas, out);
     await generateClient('CwCodeIdRegistry', schemas, out);
     await generateMessageComposer('CwCodeIdRegistry', schemas, out);
     await generateRecoil('CwCodeIdRegistry', schemas, out);
     await generateReactQuery('CwCodeIdRegistry', schemas, out);
 })
+
+it('idl-version/hackatom', async () => {
+    const out = OUTPUT_DIR + '/idl-version/hackatom';
+    const schemaDir = FIXTURE_DIR + '/idl-version/hackatom/';
+
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
+    await generateTypes('HackAtom', schemas, out);
+    await generateClient('HackAtom', schemas, out);
+    await generateMessageComposer('HackAtom', schemas, out);
+    await generateRecoil('HackAtom', schemas, out);
+    await generateReactQuery('HackAtom', schemas, out);
+})
+
+it('idl-version/cyberpunk', async () => {
+    const out = OUTPUT_DIR + '/idl-version/cyberpunk';
+    const schemaDir = FIXTURE_DIR + '/idl-version/cyberpunk/';
+
+    const { schemas } = await readSchemas({
+        schemaDir
+    });
+
+    await generateTypes('CyberPunk', schemas, out);
+    await generateClient('CyberPunk', schemas, out);
+    await generateMessageComposer('CyberPunk', schemas, out);
+    await generateRecoil('CyberPunk', schemas, out);
+    await generateReactQuery('CyberPunk', schemas, out);
+})
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index ec7ff609..9f15817c 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -95,7 +95,9 @@ export class TSBuilder {
     async renderTypes(contract: ContractFile) {
         const { enabled, ...options } = this.options.types;
         if (!enabled) return;
-        const schemas = await readSchemas({ schemaDir: contract.dir });
+        const { schemas } = await readSchemas({
+            schemaDir: contract.dir
+        });
         const files = await generateTypes(contract.name, schemas, this.outPath, options);
         [].push.apply(this.files, files);
     }
@@ -103,7 +105,9 @@ export class TSBuilder {
     async renderClient(contract: ContractFile) {
         const { enabled, ...options } = this.options.client;
         if (!enabled) return;
-        const schemas = await readSchemas({ schemaDir: contract.dir });
+        const { schemas } = await readSchemas({
+            schemaDir: contract.dir
+        });
         const files = await generateClient(contract.name, schemas, this.outPath, options);
         [].push.apply(this.files, files);
     }
@@ -111,7 +115,9 @@ export class TSBuilder {
     async renderRecoil(contract: ContractFile) {
         const { enabled, ...options } = this.options.recoil;
         if (!enabled) return;
-        const schemas = await readSchemas({ schemaDir: contract.dir });
+        const { schemas } = await readSchemas({
+            schemaDir: contract.dir
+        });
         const files = await generateRecoil(contract.name, schemas, this.outPath, options);
         [].push.apply(this.files, files);
     }
@@ -119,7 +125,9 @@ export class TSBuilder {
     async renderReactQuery(contract: ContractFile) {
         const { enabled, ...options } = this.options.reactQuery;
         if (!enabled) return;
-        const schemas = await readSchemas({ schemaDir: contract.dir });
+        const { schemas } = await readSchemas({
+            schemaDir: contract.dir
+        });
         const files = await generateReactQuery(contract.name, schemas, this.outPath, options);
         [].push.apply(this.files, files);
     }
@@ -127,7 +135,9 @@ export class TSBuilder {
     async renderMessageComposer(contract: ContractFile) {
         const { enabled, ...options } = this.options.messageComposer;
         if (!enabled) return;
-        const schemas = await readSchemas({ schemaDir: contract.dir });
+        const { schemas } = await readSchemas({
+            schemaDir: contract.dir
+        });
         const files = await generateMessageComposer(contract.name, schemas, this.outPath, options);
         [].push.apply(this.files, files);
     }
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index 4d0c47d3..182313d7 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -46,6 +46,7 @@ export default async (argv) => {
     if (argv.typesOnly) {
         argv.plugin = 'types';
     }
+
     let { schema, out, name, plugin, bundle } = await prompt(questions, argv);
     if (!Array.isArray(plugin)) plugin = [plugin];
 
@@ -112,7 +113,6 @@ export default async (argv) => {
     const { bundleFile, bundleScope } = await prompt(questions4, argv);
     ///////// END BUNDLE
 
-
     const options: TSBuilderOptions = {
         types: {
             enabled: true
diff --git a/packages/ts-codegen/src/types.ts b/packages/ts-codegen/src/types.ts
index fd550b46..cefe1c96 100644
--- a/packages/ts-codegen/src/types.ts
+++ b/packages/ts-codegen/src/types.ts
@@ -1,2 +1,16 @@
-import { TSClientOptions, ReactQueryOptions } from "wasm-ast-types";
+import { JSONSchema } from "wasm-ast-types";
 
+interface KeyedSchema {
+    [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;
+}
\ No newline at end of file
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index e98f40b0..fe6c1144 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -4,30 +4,72 @@ import { cleanse } from './cleanse';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
 import { JSONSchema } from 'wasm-ast-types';
+import { IDLObject } from '../types';
 
 interface ReadSchemaOpts {
     schemaDir: string;
-    schemaOptions?: {
-        packed?: boolean
-    };
     clean?: boolean;
 };
+interface ReadSchemasValue {
+    schemas: JSONSchema[];
+    idlObject?: IDLObject
+};
 
 export const readSchemas = async ({
-    schemaDir, schemaOptions, clean = true
-}: ReadSchemaOpts) => {
+    schemaDir, clean = true
+}: ReadSchemaOpts): Promise<ReadSchemasValue> => {
     const fn = clean ? cleanse : (str) => str;
     const files = glob(schemaDir + '/**/*.json');
     const schemas = files
         .map(file => JSON.parse(readFileSync(file, 'utf-8')));
 
-    if (schemaOptions?.packed) {
-        if (schemas.length !== 1) {
-            throw new Error('packed option only supports one file');
-        }
-        return Object.values(fn(schemas[0]));
+    if (schemas.length > 1) {
+        // legacy
+        // TODO add console.warn here
+        return {
+            schemas: fn(schemas)
+        };
+    }
+
+    if (schemas.length === 0) {
+        throw new Error('Error [too few files]: requires one schema file per contract');
+    }
+
+    if (schemas.length !== 1) {
+        throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
     }
-    return fn(schemas);
+
+    const idlObject = schemas[0];
+    const {
+        contract_name,
+        contract_version,
+        idl_version,
+        responses,
+        instantiate,
+        execute,
+        query,
+        migrate,
+        sudo
+    } = idlObject;
+
+    if (typeof idl_version !== 'string') {
+        // legacy
+        return {
+            schemas: fn(schemas)
+        };
+    }
+
+    // TODO use contract_name, etc.
+    return {
+        schemas: Object.values(fn({
+            instantiate,
+            execute,
+            query,
+            migrate,
+            sudo
+        })).filter(Boolean),
+        idlObject
+    };
 };
 
 export const findQueryMsg = (schemas) => {

From 7a1517afa627f0b32bb296a9e9c25f23b4a9e5a4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 5 Sep 2022 17:55:14 -0700
Subject: [PATCH 020/287] fixtures

---
 .../idl-version/cyberpunk/cyberpunk.json      | 185 ++++++++
 .../idl-version/hackatom/hackatom.json        | 403 ++++++++++++++++++
 2 files changed, 588 insertions(+)
 create mode 100644 __fixtures__/idl-version/cyberpunk/cyberpunk.json
 create mode 100644 __fixtures__/idl-version/hackatom/hackatom.json

diff --git a/__fixtures__/idl-version/cyberpunk/cyberpunk.json b/__fixtures__/idl-version/cyberpunk/cyberpunk.json
new file mode 100644
index 00000000..9439d305
--- /dev/null
+++ b/__fixtures__/idl-version/cyberpunk/cyberpunk.json
@@ -0,0 +1,185 @@
+{
+  "contract_name": "cyberpunk",
+  "contract_version": "0.0.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+    "type": "object"
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "description": "Hashes some data. Uses CPU and memory, but no external calls.",
+        "type": "object",
+        "required": [
+          "argon2"
+        ],
+        "properties": {
+          "argon2": {
+            "type": "object",
+            "required": [
+              "mem_cost",
+              "time_cost"
+            ],
+            "properties": {
+              "mem_cost": {
+                "description": "The amount of memory requested (KB).",
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "time_cost": {
+                "description": "The number of passes.",
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Returns the env for testing",
+        "type": "object",
+        "required": [
+          "mirror_env"
+        ],
+        "properties": {
+          "mirror_env": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "description": "Returns the env for testing",
+        "type": "object",
+        "required": [
+          "mirror_env"
+        ],
+        "properties": {
+          "mirror_env": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": null,
+  "sudo": null,
+  "responses": {
+    "mirror_env": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "Env",
+      "type": "object",
+      "required": [
+        "block",
+        "contract"
+      ],
+      "properties": {
+        "block": {
+          "$ref": "#/definitions/BlockInfo"
+        },
+        "contract": {
+          "$ref": "#/definitions/ContractInfo"
+        },
+        "transaction": {
+          "description": "Information on the transaction this message was executed in. The field is unset when the `MsgExecuteContract`/`MsgInstantiateContract`/`MsgMigrateContract` is not executed as part of a transaction.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TransactionInfo"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "BlockInfo": {
+          "type": "object",
+          "required": [
+            "chain_id",
+            "height",
+            "time"
+          ],
+          "properties": {
+            "chain_id": {
+              "type": "string"
+            },
+            "height": {
+              "description": "The height of a block is the number of blocks preceding it in the blockchain.",
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "time": {
+              "description": "Absolute time of the block creation in seconds since the UNIX epoch (00:00:00 on 1970-01-01 UTC).\n\nThe source of this is the [BFT Time in Tendermint](https://github.com/tendermint/tendermint/blob/58dc1726/spec/consensus/bft-time.md), which has the same nanosecond precision as the `Timestamp` type.\n\n# Examples\n\nUsing chrono:\n\n``` # use cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; # let env = Env { #     block: BlockInfo { #         height: 12_345, #         time: Timestamp::from_nanos(1_571_797_419_879_305_533), #         chain_id: \"cosmos-testnet-14002\".to_string(), #     }, #     transaction: Some(TransactionInfo { index: 3 }), #     contract: ContractInfo { #         address: Addr::unchecked(\"contract\"), #     }, # }; # extern crate chrono; use chrono::NaiveDateTime; let seconds = env.block.time.seconds(); let nsecs = env.block.time.subsec_nanos(); let dt = NaiveDateTime::from_timestamp(seconds as i64, nsecs as u32); ```\n\nCreating a simple millisecond-precision timestamp (as used in JavaScript):\n\n``` # use cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; # let env = Env { #     block: BlockInfo { #         height: 12_345, #         time: Timestamp::from_nanos(1_571_797_419_879_305_533), #         chain_id: \"cosmos-testnet-14002\".to_string(), #     }, #     transaction: Some(TransactionInfo { index: 3 }), #     contract: ContractInfo { #         address: Addr::unchecked(\"contract\"), #     }, # }; let millis = env.block.time.nanos() / 1_000_000; ```",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              ]
+            }
+          }
+        },
+        "ContractInfo": {
+          "type": "object",
+          "required": [
+            "address"
+          ],
+          "properties": {
+            "address": {
+              "$ref": "#/definitions/Addr"
+            }
+          }
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "TransactionInfo": {
+          "type": "object",
+          "required": [
+            "index"
+          ],
+          "properties": {
+            "index": {
+              "description": "The position of this transaction in the block. The first transaction has index 0.\n\nThis allows you to get a unique transaction indentifier in this chain using the pair (`env.block.height`, `env.transaction.index`).",
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            }
+          }
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    }
+  }
+}
diff --git a/__fixtures__/idl-version/hackatom/hackatom.json b/__fixtures__/idl-version/hackatom/hackatom.json
new file mode 100644
index 00000000..3bdc458a
--- /dev/null
+++ b/__fixtures__/idl-version/hackatom/hackatom.json
@@ -0,0 +1,403 @@
+{
+  "contract_name": "hackatom",
+  "contract_version": "0.0.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "beneficiary",
+      "verifier"
+    ],
+    "properties": {
+      "beneficiary": {
+        "type": "string"
+      },
+      "verifier": {
+        "type": "string"
+      }
+    },
+    "additionalProperties": false
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "description": "Releasing all funds in the contract to the beneficiary. This is the only \"proper\" action of this demo contract.",
+        "type": "object",
+        "required": [
+          "release"
+        ],
+        "properties": {
+          "release": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop to burn cpu cycles (only run when metering is enabled)",
+        "type": "object",
+        "required": [
+          "cpu_loop"
+        ],
+        "properties": {
+          "cpu_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop making storage calls (to test when their limit hits)",
+        "type": "object",
+        "required": [
+          "storage_loop"
+        ],
+        "properties": {
+          "storage_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop reading and writing memory",
+        "type": "object",
+        "required": [
+          "memory_loop"
+        ],
+        "properties": {
+          "memory_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop sending message to itself",
+        "type": "object",
+        "required": [
+          "message_loop"
+        ],
+        "properties": {
+          "message_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Allocate large amounts of memory without consuming much gas",
+        "type": "object",
+        "required": [
+          "allocate_large_memory"
+        ],
+        "properties": {
+          "allocate_large_memory": {
+            "type": "object",
+            "required": [
+              "pages"
+            ],
+            "properties": {
+              "pages": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Trigger a panic to ensure framework handles gracefully",
+        "type": "object",
+        "required": [
+          "panic"
+        ],
+        "properties": {
+          "panic": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Starting with CosmWasm 0.10, some API calls return user errors back to the contract. This triggers such user errors, ensuring the transaction does not fail in the backend.",
+        "type": "object",
+        "required": [
+          "user_errors_in_api_calls"
+        ],
+        "properties": {
+          "user_errors_in_api_calls": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "description": "returns a human-readable representation of the verifier use to ensure query path works in integration tests",
+        "type": "object",
+        "required": [
+          "verifier"
+        ],
+        "properties": {
+          "verifier": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "This returns cosmwasm_std::AllBalanceResponse to demo use of the querier",
+        "type": "object",
+        "required": [
+          "other_balance"
+        ],
+        "properties": {
+          "other_balance": {
+            "type": "object",
+            "required": [
+              "address"
+            ],
+            "properties": {
+              "address": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Recurse will execute a query into itself up to depth-times and return Each step of the recursion may perform some extra work to test gas metering (`work` rounds of sha256 on contract). Now that we have Env, we can auto-calculate the address to recurse into",
+        "type": "object",
+        "required": [
+          "recurse"
+        ],
+        "properties": {
+          "recurse": {
+            "type": "object",
+            "required": [
+              "depth",
+              "work"
+            ],
+            "properties": {
+              "depth": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "work": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "GetInt returns a hardcoded u32 value",
+        "type": "object",
+        "required": [
+          "get_int"
+        ],
+        "properties": {
+          "get_int": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "MigrateMsg",
+    "description": "MigrateMsg allows a privileged contract administrator to run a migration on the contract. In this (demo) case it is just migrating from one hackatom code to the same code, but taking advantage of the migration step to set a new validator.\n\nNote that the contract doesn't enforce permissions here, this is done by blockchain logic (in the future by blockchain governance)",
+    "type": "object",
+    "required": [
+      "verifier"
+    ],
+    "properties": {
+      "verifier": {
+        "type": "string"
+      }
+    },
+    "additionalProperties": false
+  },
+  "sudo": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "SudoMsg",
+    "description": "SudoMsg is only exposed for internal Cosmos SDK modules to call. This is showing how we can expose \"admin\" functionality than can not be called by external users or contracts, but only trusted (native/Go) code in the blockchain",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "steal_funds"
+        ],
+        "properties": {
+          "steal_funds": {
+            "type": "object",
+            "required": [
+              "amount",
+              "recipient"
+            ],
+            "properties": {
+              "amount": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/Coin"
+                }
+              },
+              "recipient": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "responses": {
+    "get_int": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "IntResponse",
+      "type": "object",
+      "required": [
+        "int"
+      ],
+      "properties": {
+        "int": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "other_balance": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllBalanceResponse",
+      "type": "object",
+      "required": [
+        "amount"
+      ],
+      "properties": {
+        "amount": {
+          "description": "Returns all non-zero coins held by this account.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Coin"
+          }
+        }
+      },
+      "definitions": {
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "recurse": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "RecurseResponse",
+      "type": "object",
+      "required": [
+        "hashed"
+      ],
+      "properties": {
+        "hashed": {
+          "description": "hashed is the result of running sha256 \"work+1\" times on the contract's human address",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Binary"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        }
+      }
+    },
+    "verifier": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VerifierResponse",
+      "type": "object",
+      "required": [
+        "verifier"
+      ],
+      "properties": {
+        "verifier": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}

From b6ada53ded213a7ebbf7bf5d72bf9b034b17ae77 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 5 Sep 2022 17:55:22 -0700
Subject: [PATCH 021/287] snaps

---
 .../daodao/cw-code-id-registry/clean.json     | 1534 +++++-----
 .../daodao/cw-code-id-registry/orig.json      | 1534 +++++-----
 .../idl-version/cyberpunk/CyberPunk.client.ts |   75 +
 .../cyberpunk/CyberPunk.message-composer.ts   |   70 +
 .../cyberpunk/CyberPunk.react-query.ts        |   20 +
 .../idl-version/cyberpunk/CyberPunk.recoil.ts |   38 +
 .../idl-version/cyberpunk/CyberPunk.types.ts  |   20 +
 .../idl-version/hackatom/HackAtom.client.ts   |  158 +
 .../hackatom/HackAtom.message-composer.ts     |  154 +
 .../hackatom/HackAtom.react-query.ts          |   57 +
 .../idl-version/hackatom/HackAtom.recoil.ts   |   80 +
 .../idl-version/hackatom/HackAtom.types.ts    |   58 +
 __output__/sg721/clean.json                   | 2708 +++++++++--------
 __output__/sg721/orig.json                    | 2708 +++++++++--------
 14 files changed, 4976 insertions(+), 4238 deletions(-)
 create mode 100644 __output__/idl-version/cyberpunk/CyberPunk.client.ts
 create mode 100644 __output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
 create mode 100644 __output__/idl-version/cyberpunk/CyberPunk.react-query.ts
 create mode 100644 __output__/idl-version/cyberpunk/CyberPunk.recoil.ts
 create mode 100644 __output__/idl-version/cyberpunk/CyberPunk.types.ts
 create mode 100644 __output__/idl-version/hackatom/HackAtom.client.ts
 create mode 100644 __output__/idl-version/hackatom/HackAtom.message-composer.ts
 create mode 100644 __output__/idl-version/hackatom/HackAtom.react-query.ts
 create mode 100644 __output__/idl-version/hackatom/HackAtom.recoil.ts
 create mode 100644 __output__/idl-version/hackatom/HackAtom.types.ts

diff --git a/__output__/daodao/cw-code-id-registry/clean.json b/__output__/daodao/cw-code-id-registry/clean.json
index 867179dc..1a92d761 100644
--- a/__output__/daodao/cw-code-id-registry/clean.json
+++ b/__output__/daodao/cw-code-id-registry/clean.json
@@ -1,825 +1,827 @@
-[
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ConfigResponse",
-    "type": "object",
-    "required": [
-      "admin",
-      "payment_info"
-    ],
-    "properties": {
-      "admin": {
-        "description": "Admin receives fees, can register anything, and set owners to allow future registration.",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Addr"
-          }
-        ]
-      },
-      "payment_info": {
-        "$ref": "#/definitions/PaymentInfo"
-      }
-    },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
+{
+  "schemas": [
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ConfigResponse",
+      "type": "object",
+      "required": [
+        "admin",
+        "payment_info"
+      ],
+      "properties": {
+        "admin": {
+          "description": "Admin receives fees, can register anything, and set owners to allow future registration.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Addr"
+            }
+          ]
+        },
+        "payment_info": {
+          "$ref": "#/definitions/PaymentInfo"
+        }
       },
-      "PaymentInfo": {
-        "oneOf": [
-          {
-            "type": "object",
-            "required": [
-              "none"
-            ],
-            "properties": {
-              "none": {
-                "type": "object",
-                "additionalProperties": false
-              }
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "PaymentInfo": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "none"
+              ],
+              "properties": {
+                "none": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "native_payment"
-            ],
-            "properties": {
-              "native_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_denom"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "native_payment"
+              ],
+              "properties": {
+                "native_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_denom"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_denom": {
+                      "type": "string"
+                    }
                   },
-                  "token_denom": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "cw20_payment"
-            ],
-            "properties": {
-              "cw20_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_address"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "cw20_payment"
+              ],
+              "properties": {
+                "cw20_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_address"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_address": {
+                      "type": "string"
+                    }
                   },
-                  "token_address": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
-            },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ExecuteMsg",
-    "oneOf": [
-      {
-        "description": "Receive payment to register when payment info is a CW20.",
-        "type": "object",
-        "required": [
-          "receive"
-        ],
-        "properties": {
-          "receive": {
-            "$ref": "#/definitions/Cw20ReceiveMsg"
-          }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg",
+      "oneOf": [
+        {
+          "description": "Receive payment to register when payment info is a CW20.",
+          "type": "object",
+          "required": [
+            "receive"
+          ],
+          "properties": {
+            "receive": {
+              "$ref": "#/definitions/Cw20ReceiveMsg"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Receive payment to register when payment info is native.",
-        "type": "object",
-        "required": [
-          "register"
-        ],
-        "properties": {
-          "register": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "checksum",
-              "code_id",
-              "name",
-              "version"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
-              },
-              "checksum": {
-                "type": "string"
-              },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              },
-              "name": {
-                "type": "string"
+        {
+          "description": "Receive payment to register when payment info is native.",
+          "type": "object",
+          "required": [
+            "register"
+          ],
+          "properties": {
+            "register": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "checksum",
+                "code_id",
+                "name",
+                "version"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "checksum": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                },
+                "name": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": "string"
+                }
               },
-              "version": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Set owner for registration.",
-        "type": "object",
-        "required": [
-          "set_owner"
-        ],
-        "properties": {
-          "set_owner": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "name"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "description": "Set owner for registration.",
+          "type": "object",
+          "required": [
+            "set_owner"
+          ],
+          "properties": {
+            "set_owner": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "name"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "owner": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               },
-              "name": {
-                "type": "string"
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Allow admin to unregister code IDs.",
+          "type": "object",
+          "required": [
+            "unregister"
+          ],
+          "properties": {
+            "unregister": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "code_id"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
               },
-              "owner": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Allow admin to unregister code IDs.",
-        "type": "object",
-        "required": [
-          "unregister"
-        ],
-        "properties": {
-          "unregister": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "code_id"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "description": "Update config.",
+          "type": "object",
+          "required": [
+            "update_config"
+          ],
+          "properties": {
+            "update_config": {
+              "type": "object",
+              "properties": {
+                "admin": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "payment_info": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/PaymentInfo"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                }
               },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Cw20ReceiveMsg": {
+          "description": "Cw20ReceiveMsg should be de/serialized under `Receive()` variant in a ExecuteMsg",
+          "type": "object",
+          "required": [
+            "amount",
+            "msg",
+            "sender"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "msg": {
+              "$ref": "#/definitions/Binary"
             },
-            "additionalProperties": false
+            "sender": {
+              "type": "string"
+            }
           }
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Update config.",
-        "type": "object",
-        "required": [
-          "update_config"
-        ],
-        "properties": {
-          "update_config": {
-            "type": "object",
-            "properties": {
-              "admin": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        "PaymentInfo": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "none"
+              ],
+              "properties": {
+                "none": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
               },
-              "payment_info": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/PaymentInfo"
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "native_payment"
+              ],
+              "properties": {
+                "native_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_denom"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_denom": {
+                      "type": "string"
+                    }
                   },
-                  {
-                    "type": "null"
-                  }
-                ]
-              }
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
+            {
+              "type": "object",
+              "required": [
+                "cw20_payment"
+              ],
+              "properties": {
+                "cw20_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_address"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_address": {
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
         },
-        "additionalProperties": false
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
       }
-    ],
-    "definitions": {
-      "Binary": {
-        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
-        "type": "string"
-      },
-      "Cw20ReceiveMsg": {
-        "description": "Cw20ReceiveMsg should be de/serialized under `Receive()` variant in a ExecuteMsg",
-        "type": "object",
-        "required": [
-          "amount",
-          "msg",
-          "sender"
-        ],
-        "properties": {
-          "amount": {
-            "$ref": "#/definitions/Uint128"
-          },
-          "msg": {
-            "$ref": "#/definitions/Binary"
-          },
-          "sender": {
-            "type": "string"
-          }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "GetRegistrationResponse",
+      "type": "object",
+      "required": [
+        "registration"
+      ],
+      "properties": {
+        "registration": {
+          "$ref": "#/definitions/Registration"
         }
       },
-      "PaymentInfo": {
-        "oneOf": [
-          {
-            "type": "object",
-            "required": [
-              "none"
-            ],
-            "properties": {
-              "none": {
-                "type": "object",
-                "additionalProperties": false
-              }
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Registration": {
+          "type": "object",
+          "required": [
+            "checksum",
+            "code_id",
+            "registered_by",
+            "version"
+          ],
+          "properties": {
+            "checksum": {
+              "type": "string"
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "native_payment"
-            ],
-            "properties": {
-              "native_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_denom"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
-                  },
-                  "token_denom": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+            "code_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "cw20_payment"
-            ],
-            "properties": {
-              "cw20_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_address"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
-                  },
-                  "token_address": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+            "registered_by": {
+              "$ref": "#/definitions/Addr"
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "GetRegistrationResponse",
-    "type": "object",
-    "required": [
-      "registration"
-    ],
-    "properties": {
-      "registration": {
-        "$ref": "#/definitions/Registration"
+            "version": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
       }
     },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      },
-      "Registration": {
-        "type": "object",
-        "required": [
-          "checksum",
-          "code_id",
-          "registered_by",
-          "version"
-        ],
-        "properties": {
-          "checksum": {
-            "type": "string"
-          },
-          "code_id": {
-            "type": "integer",
-            "format": "uint64",
-            "minimum": 0
-          },
-          "registered_by": {
-            "$ref": "#/definitions/Addr"
-          },
-          "version": {
-            "type": "string"
-          }
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InfoForCodeIdResponse",
+      "type": "object",
+      "required": [
+        "checksum",
+        "name",
+        "registered_by",
+        "version"
+      ],
+      "properties": {
+        "checksum": {
+          "type": "string"
         },
-        "additionalProperties": false
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "InfoForCodeIdResponse",
-    "type": "object",
-    "required": [
-      "checksum",
-      "name",
-      "registered_by",
-      "version"
-    ],
-    "properties": {
-      "checksum": {
-        "type": "string"
-      },
-      "name": {
-        "type": "string"
-      },
-      "registered_by": {
-        "$ref": "#/definitions/Addr"
+        "name": {
+          "type": "string"
+        },
+        "registered_by": {
+          "$ref": "#/definitions/Addr"
+        },
+        "version": {
+          "type": "string"
+        }
       },
-      "version": {
-        "type": "string"
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
       }
     },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "InstantiateMsg",
-    "type": "object",
-    "required": [
-      "admin",
-      "payment_info"
-    ],
-    "properties": {
-      "admin": {
-        "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "admin",
+        "payment_info"
+      ],
+      "properties": {
+        "admin": {
+          "type": "string"
+        },
+        "payment_info": {
+          "$ref": "#/definitions/PaymentInfo"
+        }
       },
-      "payment_info": {
-        "$ref": "#/definitions/PaymentInfo"
-      }
-    },
-    "additionalProperties": false,
-    "definitions": {
-      "PaymentInfo": {
-        "oneOf": [
-          {
-            "type": "object",
-            "required": [
-              "none"
-            ],
-            "properties": {
-              "none": {
-                "type": "object",
-                "additionalProperties": false
-              }
+      "additionalProperties": false,
+      "definitions": {
+        "PaymentInfo": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "none"
+              ],
+              "properties": {
+                "none": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "native_payment"
-            ],
-            "properties": {
-              "native_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_denom"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "native_payment"
+              ],
+              "properties": {
+                "native_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_denom"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_denom": {
+                      "type": "string"
+                    }
                   },
-                  "token_denom": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "cw20_payment"
-            ],
-            "properties": {
-              "cw20_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_address"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "cw20_payment"
+              ],
+              "properties": {
+                "cw20_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_address"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_address": {
+                      "type": "string"
+                    }
                   },
-                  "token_address": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
-            },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ListRegistrationsResponse",
-    "type": "object",
-    "required": [
-      "registrations"
-    ],
-    "properties": {
-      "registrations": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Registration"
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
         }
       }
     },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      },
-      "Registration": {
-        "type": "object",
-        "required": [
-          "checksum",
-          "code_id",
-          "registered_by",
-          "version"
-        ],
-        "properties": {
-          "checksum": {
-            "type": "string"
-          },
-          "code_id": {
-            "type": "integer",
-            "format": "uint64",
-            "minimum": 0
-          },
-          "registered_by": {
-            "$ref": "#/definitions/Addr"
-          },
-          "version": {
-            "type": "string"
-          }
-        },
-        "additionalProperties": false
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "PaymentInfo",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "none"
-        ],
-        "properties": {
-          "none": {
-            "type": "object",
-            "additionalProperties": false
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ListRegistrationsResponse",
+      "type": "object",
+      "required": [
+        "registrations"
+      ],
+      "properties": {
+        "registrations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Registration"
           }
-        },
-        "additionalProperties": false
+        }
       },
-      {
-        "type": "object",
-        "required": [
-          "native_payment"
-        ],
-        "properties": {
-          "native_payment": {
-            "type": "object",
-            "required": [
-              "payment_amount",
-              "token_denom"
-            ],
-            "properties": {
-              "payment_amount": {
-                "$ref": "#/definitions/Uint128"
-              },
-              "token_denom": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "cw20_payment"
-        ],
-        "properties": {
-          "cw20_payment": {
-            "type": "object",
-            "required": [
-              "payment_amount",
-              "token_address"
-            ],
-            "properties": {
-              "payment_amount": {
-                "$ref": "#/definitions/Uint128"
-              },
-              "token_address": {
-                "type": "string"
-              }
+        "Registration": {
+          "type": "object",
+          "required": [
+            "checksum",
+            "code_id",
+            "registered_by",
+            "version"
+          ],
+          "properties": {
+            "checksum": {
+              "type": "string"
             },
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      }
-    ],
-    "definitions": {
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
+            "code_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0
+            },
+            "registered_by": {
+              "$ref": "#/definitions/Addr"
+            },
+            "version": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "QueryMsg",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "config"
-        ],
-        "properties": {
-          "config": {
-            "type": "object",
-            "additionalProperties": false
-          }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "PaymentInfo",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "none"
+          ],
+          "properties": {
+            "none": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "If version provided, tries to find given version. Otherwise returns the latest version registered.",
-        "type": "object",
-        "required": [
-          "get_registration"
-        ],
-        "properties": {
-          "get_registration": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "name"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
-              },
-              "name": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "native_payment"
+          ],
+          "properties": {
+            "native_payment": {
+              "type": "object",
+              "required": [
+                "payment_amount",
+                "token_denom"
+              ],
+              "properties": {
+                "payment_amount": {
+                  "$ref": "#/definitions/Uint128"
+                },
+                "token_denom": {
+                  "type": "string"
+                }
               },
-              "version": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "info_for_code_id"
-        ],
-        "properties": {
-          "info_for_code_id": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "code_id"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "cw20_payment"
+          ],
+          "properties": {
+            "cw20_payment": {
+              "type": "object",
+              "required": [
+                "payment_amount",
+                "token_address"
+              ],
+              "properties": {
+                "payment_amount": {
+                  "$ref": "#/definitions/Uint128"
+                },
+                "token_address": {
+                  "type": "string"
+                }
               },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "config"
+          ],
+          "properties": {
+            "config": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "list_registrations"
-        ],
-        "properties": {
-          "list_registrations": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "name"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "description": "If version provided, tries to find given version. Otherwise returns the latest version registered.",
+          "type": "object",
+          "required": [
+            "get_registration"
+          ],
+          "properties": {
+            "get_registration": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "name"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               },
-              "name": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      }
-    ]
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ReceiveMsg",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "register"
-        ],
-        "properties": {
-          "register": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "checksum",
-              "code_id",
-              "name",
-              "version"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
-              },
-              "checksum": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "info_for_code_id"
+          ],
+          "properties": {
+            "info_for_code_id": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "code_id"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
               },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "required": [
+            "list_registrations"
+          ],
+          "properties": {
+            "list_registrations": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "name"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                }
               },
-              "name": {
-                "type": "string"
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ReceiveMsg",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "register"
+          ],
+          "properties": {
+            "register": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "checksum",
+                "code_id",
+                "name",
+                "version"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "checksum": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                },
+                "name": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": "string"
+                }
               },
-              "version": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "Registration",
+      "type": "object",
+      "required": [
+        "checksum",
+        "code_id",
+        "registered_by",
+        "version"
+      ],
+      "properties": {
+        "checksum": {
+          "type": "string"
         },
-        "additionalProperties": false
-      }
-    ]
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Registration",
-    "type": "object",
-    "required": [
-      "checksum",
-      "code_id",
-      "registered_by",
-      "version"
-    ],
-    "properties": {
-      "checksum": {
-        "type": "string"
-      },
-      "code_id": {
-        "type": "integer",
-        "format": "uint64",
-        "minimum": 0
-      },
-      "registered_by": {
-        "$ref": "#/definitions/Addr"
+        "code_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0
+        },
+        "registered_by": {
+          "$ref": "#/definitions/Addr"
+        },
+        "version": {
+          "type": "string"
+        }
       },
-      "version": {
-        "type": "string"
-      }
-    },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
       }
     }
-  }
-]
\ No newline at end of file
+  ]
+}
\ No newline at end of file
diff --git a/__output__/daodao/cw-code-id-registry/orig.json b/__output__/daodao/cw-code-id-registry/orig.json
index 867179dc..1a92d761 100644
--- a/__output__/daodao/cw-code-id-registry/orig.json
+++ b/__output__/daodao/cw-code-id-registry/orig.json
@@ -1,825 +1,827 @@
-[
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ConfigResponse",
-    "type": "object",
-    "required": [
-      "admin",
-      "payment_info"
-    ],
-    "properties": {
-      "admin": {
-        "description": "Admin receives fees, can register anything, and set owners to allow future registration.",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Addr"
-          }
-        ]
-      },
-      "payment_info": {
-        "$ref": "#/definitions/PaymentInfo"
-      }
-    },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
+{
+  "schemas": [
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ConfigResponse",
+      "type": "object",
+      "required": [
+        "admin",
+        "payment_info"
+      ],
+      "properties": {
+        "admin": {
+          "description": "Admin receives fees, can register anything, and set owners to allow future registration.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Addr"
+            }
+          ]
+        },
+        "payment_info": {
+          "$ref": "#/definitions/PaymentInfo"
+        }
       },
-      "PaymentInfo": {
-        "oneOf": [
-          {
-            "type": "object",
-            "required": [
-              "none"
-            ],
-            "properties": {
-              "none": {
-                "type": "object",
-                "additionalProperties": false
-              }
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "PaymentInfo": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "none"
+              ],
+              "properties": {
+                "none": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "native_payment"
-            ],
-            "properties": {
-              "native_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_denom"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "native_payment"
+              ],
+              "properties": {
+                "native_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_denom"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_denom": {
+                      "type": "string"
+                    }
                   },
-                  "token_denom": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "cw20_payment"
-            ],
-            "properties": {
-              "cw20_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_address"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "cw20_payment"
+              ],
+              "properties": {
+                "cw20_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_address"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_address": {
+                      "type": "string"
+                    }
                   },
-                  "token_address": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
-            },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ExecuteMsg",
-    "oneOf": [
-      {
-        "description": "Receive payment to register when payment info is a CW20.",
-        "type": "object",
-        "required": [
-          "receive"
-        ],
-        "properties": {
-          "receive": {
-            "$ref": "#/definitions/Cw20ReceiveMsg"
-          }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg",
+      "oneOf": [
+        {
+          "description": "Receive payment to register when payment info is a CW20.",
+          "type": "object",
+          "required": [
+            "receive"
+          ],
+          "properties": {
+            "receive": {
+              "$ref": "#/definitions/Cw20ReceiveMsg"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Receive payment to register when payment info is native.",
-        "type": "object",
-        "required": [
-          "register"
-        ],
-        "properties": {
-          "register": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "checksum",
-              "code_id",
-              "name",
-              "version"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
-              },
-              "checksum": {
-                "type": "string"
-              },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              },
-              "name": {
-                "type": "string"
+        {
+          "description": "Receive payment to register when payment info is native.",
+          "type": "object",
+          "required": [
+            "register"
+          ],
+          "properties": {
+            "register": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "checksum",
+                "code_id",
+                "name",
+                "version"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "checksum": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                },
+                "name": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": "string"
+                }
               },
-              "version": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Set owner for registration.",
-        "type": "object",
-        "required": [
-          "set_owner"
-        ],
-        "properties": {
-          "set_owner": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "name"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "description": "Set owner for registration.",
+          "type": "object",
+          "required": [
+            "set_owner"
+          ],
+          "properties": {
+            "set_owner": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "name"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "owner": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               },
-              "name": {
-                "type": "string"
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Allow admin to unregister code IDs.",
+          "type": "object",
+          "required": [
+            "unregister"
+          ],
+          "properties": {
+            "unregister": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "code_id"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
               },
-              "owner": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Allow admin to unregister code IDs.",
-        "type": "object",
-        "required": [
-          "unregister"
-        ],
-        "properties": {
-          "unregister": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "code_id"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "description": "Update config.",
+          "type": "object",
+          "required": [
+            "update_config"
+          ],
+          "properties": {
+            "update_config": {
+              "type": "object",
+              "properties": {
+                "admin": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                "payment_info": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/PaymentInfo"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                }
               },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Cw20ReceiveMsg": {
+          "description": "Cw20ReceiveMsg should be de/serialized under `Receive()` variant in a ExecuteMsg",
+          "type": "object",
+          "required": [
+            "amount",
+            "msg",
+            "sender"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "msg": {
+              "$ref": "#/definitions/Binary"
             },
-            "additionalProperties": false
+            "sender": {
+              "type": "string"
+            }
           }
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Update config.",
-        "type": "object",
-        "required": [
-          "update_config"
-        ],
-        "properties": {
-          "update_config": {
-            "type": "object",
-            "properties": {
-              "admin": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        "PaymentInfo": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "none"
+              ],
+              "properties": {
+                "none": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
               },
-              "payment_info": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/PaymentInfo"
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "native_payment"
+              ],
+              "properties": {
+                "native_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_denom"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_denom": {
+                      "type": "string"
+                    }
                   },
-                  {
-                    "type": "null"
-                  }
-                ]
-              }
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
+            {
+              "type": "object",
+              "required": [
+                "cw20_payment"
+              ],
+              "properties": {
+                "cw20_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_address"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_address": {
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
         },
-        "additionalProperties": false
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
       }
-    ],
-    "definitions": {
-      "Binary": {
-        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
-        "type": "string"
-      },
-      "Cw20ReceiveMsg": {
-        "description": "Cw20ReceiveMsg should be de/serialized under `Receive()` variant in a ExecuteMsg",
-        "type": "object",
-        "required": [
-          "amount",
-          "msg",
-          "sender"
-        ],
-        "properties": {
-          "amount": {
-            "$ref": "#/definitions/Uint128"
-          },
-          "msg": {
-            "$ref": "#/definitions/Binary"
-          },
-          "sender": {
-            "type": "string"
-          }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "GetRegistrationResponse",
+      "type": "object",
+      "required": [
+        "registration"
+      ],
+      "properties": {
+        "registration": {
+          "$ref": "#/definitions/Registration"
         }
       },
-      "PaymentInfo": {
-        "oneOf": [
-          {
-            "type": "object",
-            "required": [
-              "none"
-            ],
-            "properties": {
-              "none": {
-                "type": "object",
-                "additionalProperties": false
-              }
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Registration": {
+          "type": "object",
+          "required": [
+            "checksum",
+            "code_id",
+            "registered_by",
+            "version"
+          ],
+          "properties": {
+            "checksum": {
+              "type": "string"
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "native_payment"
-            ],
-            "properties": {
-              "native_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_denom"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
-                  },
-                  "token_denom": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+            "code_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "cw20_payment"
-            ],
-            "properties": {
-              "cw20_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_address"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
-                  },
-                  "token_address": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+            "registered_by": {
+              "$ref": "#/definitions/Addr"
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "GetRegistrationResponse",
-    "type": "object",
-    "required": [
-      "registration"
-    ],
-    "properties": {
-      "registration": {
-        "$ref": "#/definitions/Registration"
+            "version": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
       }
     },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      },
-      "Registration": {
-        "type": "object",
-        "required": [
-          "checksum",
-          "code_id",
-          "registered_by",
-          "version"
-        ],
-        "properties": {
-          "checksum": {
-            "type": "string"
-          },
-          "code_id": {
-            "type": "integer",
-            "format": "uint64",
-            "minimum": 0
-          },
-          "registered_by": {
-            "$ref": "#/definitions/Addr"
-          },
-          "version": {
-            "type": "string"
-          }
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InfoForCodeIdResponse",
+      "type": "object",
+      "required": [
+        "checksum",
+        "name",
+        "registered_by",
+        "version"
+      ],
+      "properties": {
+        "checksum": {
+          "type": "string"
         },
-        "additionalProperties": false
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "InfoForCodeIdResponse",
-    "type": "object",
-    "required": [
-      "checksum",
-      "name",
-      "registered_by",
-      "version"
-    ],
-    "properties": {
-      "checksum": {
-        "type": "string"
-      },
-      "name": {
-        "type": "string"
-      },
-      "registered_by": {
-        "$ref": "#/definitions/Addr"
+        "name": {
+          "type": "string"
+        },
+        "registered_by": {
+          "$ref": "#/definitions/Addr"
+        },
+        "version": {
+          "type": "string"
+        }
       },
-      "version": {
-        "type": "string"
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
       }
     },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "InstantiateMsg",
-    "type": "object",
-    "required": [
-      "admin",
-      "payment_info"
-    ],
-    "properties": {
-      "admin": {
-        "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "admin",
+        "payment_info"
+      ],
+      "properties": {
+        "admin": {
+          "type": "string"
+        },
+        "payment_info": {
+          "$ref": "#/definitions/PaymentInfo"
+        }
       },
-      "payment_info": {
-        "$ref": "#/definitions/PaymentInfo"
-      }
-    },
-    "additionalProperties": false,
-    "definitions": {
-      "PaymentInfo": {
-        "oneOf": [
-          {
-            "type": "object",
-            "required": [
-              "none"
-            ],
-            "properties": {
-              "none": {
-                "type": "object",
-                "additionalProperties": false
-              }
+      "additionalProperties": false,
+      "definitions": {
+        "PaymentInfo": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "none"
+              ],
+              "properties": {
+                "none": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "native_payment"
-            ],
-            "properties": {
-              "native_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_denom"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "native_payment"
+              ],
+              "properties": {
+                "native_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_denom"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_denom": {
+                      "type": "string"
+                    }
                   },
-                  "token_denom": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "required": [
-              "cw20_payment"
-            ],
-            "properties": {
-              "cw20_payment": {
-                "type": "object",
-                "required": [
-                  "payment_amount",
-                  "token_address"
-                ],
-                "properties": {
-                  "payment_amount": {
-                    "$ref": "#/definitions/Uint128"
+            {
+              "type": "object",
+              "required": [
+                "cw20_payment"
+              ],
+              "properties": {
+                "cw20_payment": {
+                  "type": "object",
+                  "required": [
+                    "payment_amount",
+                    "token_address"
+                  ],
+                  "properties": {
+                    "payment_amount": {
+                      "$ref": "#/definitions/Uint128"
+                    },
+                    "token_address": {
+                      "type": "string"
+                    }
                   },
-                  "token_address": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
-            },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ListRegistrationsResponse",
-    "type": "object",
-    "required": [
-      "registrations"
-    ],
-    "properties": {
-      "registrations": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Registration"
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
         }
       }
     },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
-      },
-      "Registration": {
-        "type": "object",
-        "required": [
-          "checksum",
-          "code_id",
-          "registered_by",
-          "version"
-        ],
-        "properties": {
-          "checksum": {
-            "type": "string"
-          },
-          "code_id": {
-            "type": "integer",
-            "format": "uint64",
-            "minimum": 0
-          },
-          "registered_by": {
-            "$ref": "#/definitions/Addr"
-          },
-          "version": {
-            "type": "string"
-          }
-        },
-        "additionalProperties": false
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "PaymentInfo",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "none"
-        ],
-        "properties": {
-          "none": {
-            "type": "object",
-            "additionalProperties": false
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ListRegistrationsResponse",
+      "type": "object",
+      "required": [
+        "registrations"
+      ],
+      "properties": {
+        "registrations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Registration"
           }
-        },
-        "additionalProperties": false
+        }
       },
-      {
-        "type": "object",
-        "required": [
-          "native_payment"
-        ],
-        "properties": {
-          "native_payment": {
-            "type": "object",
-            "required": [
-              "payment_amount",
-              "token_denom"
-            ],
-            "properties": {
-              "payment_amount": {
-                "$ref": "#/definitions/Uint128"
-              },
-              "token_denom": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "cw20_payment"
-        ],
-        "properties": {
-          "cw20_payment": {
-            "type": "object",
-            "required": [
-              "payment_amount",
-              "token_address"
-            ],
-            "properties": {
-              "payment_amount": {
-                "$ref": "#/definitions/Uint128"
-              },
-              "token_address": {
-                "type": "string"
-              }
+        "Registration": {
+          "type": "object",
+          "required": [
+            "checksum",
+            "code_id",
+            "registered_by",
+            "version"
+          ],
+          "properties": {
+            "checksum": {
+              "type": "string"
             },
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      }
-    ],
-    "definitions": {
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
+            "code_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0
+            },
+            "registered_by": {
+              "$ref": "#/definitions/Addr"
+            },
+            "version": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "QueryMsg",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "config"
-        ],
-        "properties": {
-          "config": {
-            "type": "object",
-            "additionalProperties": false
-          }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "PaymentInfo",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "none"
+          ],
+          "properties": {
+            "none": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "If version provided, tries to find given version. Otherwise returns the latest version registered.",
-        "type": "object",
-        "required": [
-          "get_registration"
-        ],
-        "properties": {
-          "get_registration": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "name"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
-              },
-              "name": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "native_payment"
+          ],
+          "properties": {
+            "native_payment": {
+              "type": "object",
+              "required": [
+                "payment_amount",
+                "token_denom"
+              ],
+              "properties": {
+                "payment_amount": {
+                  "$ref": "#/definitions/Uint128"
+                },
+                "token_denom": {
+                  "type": "string"
+                }
               },
-              "version": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "info_for_code_id"
-        ],
-        "properties": {
-          "info_for_code_id": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "code_id"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "cw20_payment"
+          ],
+          "properties": {
+            "cw20_payment": {
+              "type": "object",
+              "required": [
+                "payment_amount",
+                "token_address"
+              ],
+              "properties": {
+                "payment_amount": {
+                  "$ref": "#/definitions/Uint128"
+                },
+                "token_address": {
+                  "type": "string"
+                }
               },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "config"
+          ],
+          "properties": {
+            "config": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "list_registrations"
-        ],
-        "properties": {
-          "list_registrations": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "name"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
+        {
+          "description": "If version provided, tries to find given version. Otherwise returns the latest version registered.",
+          "type": "object",
+          "required": [
+            "get_registration"
+          ],
+          "properties": {
+            "get_registration": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "name"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               },
-              "name": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      }
-    ]
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ReceiveMsg",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "register"
-        ],
-        "properties": {
-          "register": {
-            "type": "object",
-            "required": [
-              "chain_id",
-              "checksum",
-              "code_id",
-              "name",
-              "version"
-            ],
-            "properties": {
-              "chain_id": {
-                "type": "string"
-              },
-              "checksum": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "info_for_code_id"
+          ],
+          "properties": {
+            "info_for_code_id": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "code_id"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
               },
-              "code_id": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "required": [
+            "list_registrations"
+          ],
+          "properties": {
+            "list_registrations": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "name"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                }
               },
-              "name": {
-                "type": "string"
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ReceiveMsg",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "register"
+          ],
+          "properties": {
+            "register": {
+              "type": "object",
+              "required": [
+                "chain_id",
+                "checksum",
+                "code_id",
+                "name",
+                "version"
+              ],
+              "properties": {
+                "chain_id": {
+                  "type": "string"
+                },
+                "checksum": {
+                  "type": "string"
+                },
+                "code_id": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                },
+                "name": {
+                  "type": "string"
+                },
+                "version": {
+                  "type": "string"
+                }
               },
-              "version": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          }
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "Registration",
+      "type": "object",
+      "required": [
+        "checksum",
+        "code_id",
+        "registered_by",
+        "version"
+      ],
+      "properties": {
+        "checksum": {
+          "type": "string"
         },
-        "additionalProperties": false
-      }
-    ]
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Registration",
-    "type": "object",
-    "required": [
-      "checksum",
-      "code_id",
-      "registered_by",
-      "version"
-    ],
-    "properties": {
-      "checksum": {
-        "type": "string"
-      },
-      "code_id": {
-        "type": "integer",
-        "format": "uint64",
-        "minimum": 0
-      },
-      "registered_by": {
-        "$ref": "#/definitions/Addr"
+        "code_id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0
+        },
+        "registered_by": {
+          "$ref": "#/definitions/Addr"
+        },
+        "version": {
+          "type": "string"
+        }
       },
-      "version": {
-        "type": "string"
-      }
-    },
-    "additionalProperties": false,
-    "definitions": {
-      "Addr": {
-        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-        "type": "string"
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        }
       }
     }
-  }
-]
\ No newline at end of file
+  ]
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
new file mode 100644
index 00000000..5dbf4ca0
--- /dev/null
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -0,0 +1,75 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+export interface CyberPunkReadOnlyInterface {
+  contractAddress: string;
+  mirrorEnv: () => Promise<MirrorEnvResponse>;
+}
+export class CyberPunkQueryClient implements CyberPunkReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.mirrorEnv = this.mirrorEnv.bind(this);
+  }
+
+  mirrorEnv = async (): Promise<MirrorEnvResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mirror_env: {}
+    });
+  };
+}
+export interface CyberPunkInterface extends CyberPunkReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  argon2: ({
+    memCost,
+    timeCost
+  }: {
+    memCost: number;
+    timeCost: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mirrorEnv: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.argon2 = this.argon2.bind(this);
+    this.mirrorEnv = this.mirrorEnv.bind(this);
+  }
+
+  argon2 = async ({
+    memCost,
+    timeCost
+  }: {
+    memCost: number;
+    timeCost: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      argon2: {
+        mem_cost: memCost,
+        time_cost: timeCost
+      }
+    }, fee, memo, funds);
+  };
+  mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mirror_env: {}
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
new file mode 100644
index 00000000..fef92e22
--- /dev/null
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -0,0 +1,70 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+export interface CyberPunkMessage {
+  contractAddress: string;
+  sender: string;
+  argon2: ({
+    memCost,
+    timeCost
+  }: {
+    memCost: number;
+    timeCost: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mirrorEnv: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CyberPunkMessageComposer implements CyberPunkMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.argon2 = this.argon2.bind(this);
+    this.mirrorEnv = this.mirrorEnv.bind(this);
+  }
+
+  argon2 = ({
+    memCost,
+    timeCost
+  }: {
+    memCost: number;
+    timeCost: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          argon2: {
+            mem_cost: memCost,
+            time_cost: timeCost
+          }
+        })),
+        funds
+      })
+    };
+  };
+  mirrorEnv = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mirror_env: {}
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts b/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
new file mode 100644
index 00000000..d6c80f03
--- /dev/null
+++ b/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+import { CyberPunkQueryClient } from "./CyberPunk.client";
+export interface CyberPunkReactQuery<TResponse, TData = TResponse> {
+  client: CyberPunkQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface CyberPunkMirrorEnvQuery<TData> extends CyberPunkReactQuery<MirrorEnvResponse, TData> {}
+export function useCyberPunkMirrorEnvQuery<TData = MirrorEnvResponse>({
+  client,
+  options
+}: CyberPunkMirrorEnvQuery<TData>) {
+  return useQuery<MirrorEnvResponse, Error, TData>(["cyberPunkMirrorEnv", client.contractAddress], () => client.mirrorEnv(), options);
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts b/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts
new file mode 100644
index 00000000..55e8eb18
--- /dev/null
+++ b/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts
@@ -0,0 +1,38 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+import { CyberPunkQueryClient } from "./CyberPunk.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CyberPunkQueryClient, QueryClientParams>({
+  key: "cyberPunkQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CyberPunkQueryClient(client, contractAddress);
+  }
+});
+export const mirrorEnvSelector = selectorFamily<MirrorEnvResponse, QueryClientParams & {
+  params: Parameters<CyberPunkQueryClient["mirrorEnv"]>;
+}>({
+  key: "cyberPunkMirrorEnv",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mirrorEnv(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.types.ts b/__output__/idl-version/cyberpunk/CyberPunk.types.ts
new file mode 100644
index 00000000..81228471
--- /dev/null
+++ b/__output__/idl-version/cyberpunk/CyberPunk.types.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export interface InstantiateMsg {
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  argon2: {
+    mem_cost: number;
+    time_cost: number;
+  };
+} | {
+  mirror_env: {};
+};
+export type QueryMsg = {
+  mirror_env: {};
+};
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
new file mode 100644
index 00000000..297ee46f
--- /dev/null
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -0,0 +1,158 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+export interface HackAtomReadOnlyInterface {
+  contractAddress: string;
+  verifier: () => Promise<VerifierResponse>;
+  otherBalance: ({
+    address
+  }: {
+    address: string;
+  }) => Promise<OtherBalanceResponse>;
+  recurse: ({
+    depth,
+    work
+  }: {
+    depth: number;
+    work: number;
+  }) => Promise<RecurseResponse>;
+  getInt: () => Promise<GetIntResponse>;
+}
+export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.verifier = this.verifier.bind(this);
+    this.otherBalance = this.otherBalance.bind(this);
+    this.recurse = this.recurse.bind(this);
+    this.getInt = this.getInt.bind(this);
+  }
+
+  verifier = async (): Promise<VerifierResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      verifier: {}
+    });
+  };
+  otherBalance = async ({
+    address
+  }: {
+    address: string;
+  }): Promise<OtherBalanceResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      other_balance: {
+        address
+      }
+    });
+  };
+  recurse = async ({
+    depth,
+    work
+  }: {
+    depth: number;
+    work: number;
+  }): Promise<RecurseResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      recurse: {
+        depth,
+        work
+      }
+    });
+  };
+  getInt = async (): Promise<GetIntResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_int: {}
+    });
+  };
+}
+export interface HackAtomInterface extends HackAtomReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  release: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  cpuLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  storageLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  memoryLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  messageLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allocateLargeMemory: ({
+    pages
+  }: {
+    pages: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  panic: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  userErrorsInApiCalls: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class HackAtomClient extends HackAtomQueryClient implements HackAtomInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.release = this.release.bind(this);
+    this.cpuLoop = this.cpuLoop.bind(this);
+    this.storageLoop = this.storageLoop.bind(this);
+    this.memoryLoop = this.memoryLoop.bind(this);
+    this.messageLoop = this.messageLoop.bind(this);
+    this.allocateLargeMemory = this.allocateLargeMemory.bind(this);
+    this.panic = this.panic.bind(this);
+    this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
+  }
+
+  release = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      release: {}
+    }, fee, memo, funds);
+  };
+  cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      cpu_loop: {}
+    }, fee, memo, funds);
+  };
+  storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      storage_loop: {}
+    }, fee, memo, funds);
+  };
+  memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      memory_loop: {}
+    }, fee, memo, funds);
+  };
+  messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      message_loop: {}
+    }, fee, memo, funds);
+  };
+  allocateLargeMemory = async ({
+    pages
+  }: {
+    pages: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      allocate_large_memory: {
+        pages
+      }
+    }, fee, memo, funds);
+  };
+  panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      panic: {}
+    }, fee, memo, funds);
+  };
+  userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      user_errors_in_api_calls: {}
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
new file mode 100644
index 00000000..399f497d
--- /dev/null
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -0,0 +1,154 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+export interface HackAtomMessage {
+  contractAddress: string;
+  sender: string;
+  release: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  cpuLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  storageLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  memoryLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  messageLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  allocateLargeMemory: ({
+    pages
+  }: {
+    pages: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  panic: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  userErrorsInApiCalls: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class HackAtomMessageComposer implements HackAtomMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.release = this.release.bind(this);
+    this.cpuLoop = this.cpuLoop.bind(this);
+    this.storageLoop = this.storageLoop.bind(this);
+    this.memoryLoop = this.memoryLoop.bind(this);
+    this.messageLoop = this.messageLoop.bind(this);
+    this.allocateLargeMemory = this.allocateLargeMemory.bind(this);
+    this.panic = this.panic.bind(this);
+    this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
+  }
+
+  release = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          release: {}
+        })),
+        funds
+      })
+    };
+  };
+  cpuLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          cpu_loop: {}
+        })),
+        funds
+      })
+    };
+  };
+  storageLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          storage_loop: {}
+        })),
+        funds
+      })
+    };
+  };
+  memoryLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          memory_loop: {}
+        })),
+        funds
+      })
+    };
+  };
+  messageLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          message_loop: {}
+        })),
+        funds
+      })
+    };
+  };
+  allocateLargeMemory = ({
+    pages
+  }: {
+    pages: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          allocate_large_memory: {
+            pages
+          }
+        })),
+        funds
+      })
+    };
+  };
+  panic = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          panic: {}
+        })),
+        funds
+      })
+    };
+  };
+  userErrorsInApiCalls = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          user_errors_in_api_calls: {}
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.react-query.ts b/__output__/idl-version/hackatom/HackAtom.react-query.ts
new file mode 100644
index 00000000..4503f9d5
--- /dev/null
+++ b/__output__/idl-version/hackatom/HackAtom.react-query.ts
@@ -0,0 +1,57 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+import { HackAtomQueryClient } from "./HackAtom.client";
+export interface HackAtomReactQuery<TResponse, TData = TResponse> {
+  client: HackAtomQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface HackAtomGetIntQuery<TData> extends HackAtomReactQuery<GetIntResponse, TData> {}
+export function useHackAtomGetIntQuery<TData = GetIntResponse>({
+  client,
+  options
+}: HackAtomGetIntQuery<TData>) {
+  return useQuery<GetIntResponse, Error, TData>(["hackAtomGetInt", client.contractAddress], () => client.getInt(), options);
+}
+export interface HackAtomRecurseQuery<TData> extends HackAtomReactQuery<RecurseResponse, TData> {
+  args: {
+    depth: number;
+    work: number;
+  };
+}
+export function useHackAtomRecurseQuery<TData = RecurseResponse>({
+  client,
+  args,
+  options
+}: HackAtomRecurseQuery<TData>) {
+  return useQuery<RecurseResponse, Error, TData>(["hackAtomRecurse", client.contractAddress, JSON.stringify(args)], () => client.recurse({
+    depth: args.depth,
+    work: args.work
+  }), options);
+}
+export interface HackAtomOtherBalanceQuery<TData> extends HackAtomReactQuery<OtherBalanceResponse, TData> {
+  args: {
+    address: string;
+  };
+}
+export function useHackAtomOtherBalanceQuery<TData = OtherBalanceResponse>({
+  client,
+  args,
+  options
+}: HackAtomOtherBalanceQuery<TData>) {
+  return useQuery<OtherBalanceResponse, Error, TData>(["hackAtomOtherBalance", client.contractAddress, JSON.stringify(args)], () => client.otherBalance({
+    address: args.address
+  }), options);
+}
+export interface HackAtomVerifierQuery<TData> extends HackAtomReactQuery<VerifierResponse, TData> {}
+export function useHackAtomVerifierQuery<TData = VerifierResponse>({
+  client,
+  options
+}: HackAtomVerifierQuery<TData>) {
+  return useQuery<VerifierResponse, Error, TData>(["hackAtomVerifier", client.contractAddress], () => client.verifier(), options);
+}
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.recoil.ts b/__output__/idl-version/hackatom/HackAtom.recoil.ts
new file mode 100644
index 00000000..6fe2294e
--- /dev/null
+++ b/__output__/idl-version/hackatom/HackAtom.recoil.ts
@@ -0,0 +1,80 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+import { HackAtomQueryClient } from "./HackAtom.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<HackAtomQueryClient, QueryClientParams>({
+  key: "hackAtomQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new HackAtomQueryClient(client, contractAddress);
+  }
+});
+export const verifierSelector = selectorFamily<VerifierResponse, QueryClientParams & {
+  params: Parameters<HackAtomQueryClient["verifier"]>;
+}>({
+  key: "hackAtomVerifier",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.verifier(...params);
+  }
+});
+export const otherBalanceSelector = selectorFamily<OtherBalanceResponse, QueryClientParams & {
+  params: Parameters<HackAtomQueryClient["otherBalance"]>;
+}>({
+  key: "hackAtomOtherBalance",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.otherBalance(...params);
+  }
+});
+export const recurseSelector = selectorFamily<RecurseResponse, QueryClientParams & {
+  params: Parameters<HackAtomQueryClient["recurse"]>;
+}>({
+  key: "hackAtomRecurse",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.recurse(...params);
+  }
+});
+export const getIntSelector = selectorFamily<GetIntResponse, QueryClientParams & {
+  params: Parameters<HackAtomQueryClient["getInt"]>;
+}>({
+  key: "hackAtomGetInt",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.getInt(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.types.ts b/__output__/idl-version/hackatom/HackAtom.types.ts
new file mode 100644
index 00000000..8a564933
--- /dev/null
+++ b/__output__/idl-version/hackatom/HackAtom.types.ts
@@ -0,0 +1,58 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export interface InstantiateMsg {
+  beneficiary: string;
+  verifier: string;
+}
+export type ExecuteMsg = {
+  release: {};
+} | {
+  cpu_loop: {};
+} | {
+  storage_loop: {};
+} | {
+  memory_loop: {};
+} | {
+  message_loop: {};
+} | {
+  allocate_large_memory: {
+    pages: number;
+  };
+} | {
+  panic: {};
+} | {
+  user_errors_in_api_calls: {};
+};
+export type QueryMsg = {
+  verifier: {};
+} | {
+  other_balance: {
+    address: string;
+  };
+} | {
+  recurse: {
+    depth: number;
+    work: number;
+  };
+} | {
+  get_int: {};
+};
+export interface MigrateMsg {
+  verifier: string;
+}
+export type SudoMsg = {
+  steal_funds: {
+    amount: Coin[];
+    recipient: string;
+  };
+};
+export type Uint128 = string;
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
\ No newline at end of file
diff --git a/__output__/sg721/clean.json b/__output__/sg721/clean.json
index 7026c82b..8bd3787d 100644
--- a/__output__/sg721/clean.json
+++ b/__output__/sg721/clean.json
@@ -1,1487 +1,1489 @@
-[
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "AllNftInfoResponse",
-    "type": "object",
-    "required": [
-      "access",
-      "info"
-    ],
-    "properties": {
-      "access": {
-        "description": "Who can transfer the token",
-        "allOf": [
-          {
-            "$ref": "#/definitions/OwnerOfResponse"
-          }
-        ]
-      },
-      "info": {
-        "description": "Data on the token itself,",
-        "allOf": [
-          {
-            "$ref": "#/definitions/NftInfoResponseForEmpty"
-          }
-        ]
-      }
-    },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
-          }
+{
+  "schemas": [
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllNftInfoResponse",
+      "type": "object",
+      "required": [
+        "access",
+        "info"
+      ],
+      "properties": {
+        "access": {
+          "description": "Who can transfer the token",
+          "allOf": [
+            {
+              "$ref": "#/definitions/OwnerOfResponse"
+            }
+          ]
+        },
+        "info": {
+          "description": "Data on the token itself,",
+          "allOf": [
+            {
+              "$ref": "#/definitions/NftInfoResponseForEmpty"
+            }
+          ]
         }
       },
-      "Empty": {
-        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-        "type": "object"
-      },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "NftInfoResponseForEmpty": {
+          "type": "object",
+          "required": [
+            "extension"
+          ],
+          "properties": {
+            "extension": {
+              "description": "You can add any custom metadata here when you extend cw721-base",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Empty"
+                }
+              ]
+            },
+            "token_uri": {
+              "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
           }
-        ]
-      },
-      "NftInfoResponseForEmpty": {
-        "type": "object",
-        "required": [
-          "extension"
-        ],
-        "properties": {
-          "extension": {
-            "description": "You can add any custom metadata here when you extend cw721-base",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Empty"
+        },
+        "OwnerOfResponse": {
+          "type": "object",
+          "required": [
+            "approvals",
+            "owner"
+          ],
+          "properties": {
+            "approvals": {
+              "description": "If set this address is approved to transfer/send the token as well",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Approval"
               }
-            ]
-          },
-          "token_uri": {
-            "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
-            "type": [
-              "string",
-              "null"
-            ]
-          }
-        }
-      },
-      "OwnerOfResponse": {
-        "type": "object",
-        "required": [
-          "approvals",
-          "owner"
-        ],
-        "properties": {
-          "approvals": {
-            "description": "If set this address is approved to transfer/send the token as well",
-            "type": "array",
-            "items": {
-              "$ref": "#/definitions/Approval"
+            },
+            "owner": {
+              "description": "Owner of the token",
+              "type": "string"
             }
-          },
-          "owner": {
-            "description": "Owner of the token",
-            "type": "string"
-          }
-        }
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
           }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "AllOperatorsResponse",
-    "type": "object",
-    "required": [
-      "operators"
-    ],
-    "properties": {
-      "operators": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
         }
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllOperatorsResponse",
+      "type": "object",
+      "required": [
+        "operators"
+      ],
+      "properties": {
+        "operators": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "AllTokensResponse",
-    "type": "object",
-    "required": [
-      "tokens"
-    ],
-    "properties": {
-      "tokens": {
-        "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
-        "type": "array",
-        "items": {
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
           "type": "string"
         }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ApprovalResponse",
-    "type": "object",
-    "required": [
-      "approval"
-    ],
-    "properties": {
-      "approval": {
-        "$ref": "#/definitions/Approval"
-      }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllTokensResponse",
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "type": "array",
+          "items": {
             "type": "string"
           }
         }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ApprovalResponse",
+      "type": "object",
+      "required": [
+        "approval"
+      ],
+      "properties": {
+        "approval": {
+          "$ref": "#/definitions/Approval"
+        }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ApprovalsResponse",
-    "type": "object",
-    "required": [
-      "approvals"
-    ],
-    "properties": {
-      "approvals": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
         }
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ApprovalsResponse",
+      "type": "object",
+      "required": [
+        "approvals"
+      ],
+      "properties": {
+        "approvals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "CollectionInfoResponse",
-    "type": "object",
-    "required": [
-      "creator",
-      "description",
-      "image"
-    ],
-    "properties": {
-      "creator": {
-        "type": "string"
-      },
-      "description": {
-        "type": "string"
-      },
-      "external_link": {
-        "type": [
-          "string",
-          "null"
-        ]
-      },
-      "image": {
-        "type": "string"
-      },
-      "royalty_info": {
-        "anyOf": [
-          {
-            "$ref": "#/definitions/RoyaltyInfoResponse"
-          },
-          {
-            "type": "null"
-          }
-        ]
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
       }
     },
-    "definitions": {
-      "Decimal": {
-        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-        "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "CollectionInfoResponse",
+      "type": "object",
+      "required": [
+        "creator",
+        "description",
+        "image"
+      ],
+      "properties": {
+        "creator": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "external_link": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "image": {
+          "type": "string"
+        },
+        "royalty_info": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RoyaltyInfoResponse"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
       },
-      "RoyaltyInfoResponse": {
-        "type": "object",
-        "required": [
-          "payment_address",
-          "share"
-        ],
-        "properties": {
-          "payment_address": {
-            "type": "string"
-          },
-          "share": {
-            "$ref": "#/definitions/Decimal"
+      "definitions": {
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "RoyaltyInfoResponse": {
+          "type": "object",
+          "required": [
+            "payment_address",
+            "share"
+          ],
+          "properties": {
+            "payment_address": {
+              "type": "string"
+            },
+            "share": {
+              "$ref": "#/definitions/Decimal"
+            }
           }
         }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ContractInfoResponse",
-    "type": "object",
-    "required": [
-      "name",
-      "symbol"
-    ],
-    "properties": {
-      "name": {
-        "type": "string"
-      },
-      "symbol": {
-        "type": "string"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ContractInfoResponse",
+      "type": "object",
+      "required": [
+        "name",
+        "symbol"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "symbol": {
+          "type": "string"
+        }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ExecuteMsgForEmpty",
-    "description": "This is like Cw721ExecuteMsg but we add a Mint command for an owner to make this stand-alone. You will likely want to remove mint and use other control logic in any contract that inherits this.",
-    "oneOf": [
-      {
-        "description": "Transfer is a base message to move a token to another account without triggering actions",
-        "type": "object",
-        "required": [
-          "transfer_nft"
-        ],
-        "properties": {
-          "transfer_nft": {
-            "type": "object",
-            "required": [
-              "recipient",
-              "token_id"
-            ],
-            "properties": {
-              "recipient": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsgForEmpty",
+      "description": "This is like Cw721ExecuteMsg but we add a Mint command for an owner to make this stand-alone. You will likely want to remove mint and use other control logic in any contract that inherits this.",
+      "oneOf": [
+        {
+          "description": "Transfer is a base message to move a token to another account without triggering actions",
+          "type": "object",
+          "required": [
+            "transfer_nft"
+          ],
+          "properties": {
+            "transfer_nft": {
+              "type": "object",
+              "required": [
+                "recipient",
+                "token_id"
+              ],
+              "properties": {
+                "recipient": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Send is a base message to transfer a token to a contract and trigger an action on the receiving contract.",
-        "type": "object",
-        "required": [
-          "send_nft"
-        ],
-        "properties": {
-          "send_nft": {
-            "type": "object",
-            "required": [
-              "contract",
-              "msg",
-              "token_id"
-            ],
-            "properties": {
-              "contract": {
-                "type": "string"
-              },
-              "msg": {
-                "$ref": "#/definitions/Binary"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Send is a base message to transfer a token to a contract and trigger an action on the receiving contract.",
+          "type": "object",
+          "required": [
+            "send_nft"
+          ],
+          "properties": {
+            "send_nft": {
+              "type": "object",
+              "required": [
+                "contract",
+                "msg",
+                "token_id"
+              ],
+              "properties": {
+                "contract": {
+                  "type": "string"
+                },
+                "msg": {
+                  "$ref": "#/definitions/Binary"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Allows operator to transfer / send the token from the owner's account. If expiration is set, then this allowance has a time/height limit",
-        "type": "object",
-        "required": [
-          "approve"
-        ],
-        "properties": {
-          "approve": {
-            "type": "object",
-            "required": [
-              "spender",
-              "token_id"
-            ],
-            "properties": {
-              "expires": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/Expiration"
-                  },
-                  {
-                    "type": "null"
-                  }
-                ]
-              },
-              "spender": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Allows operator to transfer / send the token from the owner's account. If expiration is set, then this allowance has a time/height limit",
+          "type": "object",
+          "required": [
+            "approve"
+          ],
+          "properties": {
+            "approve": {
+              "type": "object",
+              "required": [
+                "spender",
+                "token_id"
+              ],
+              "properties": {
+                "expires": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/Expiration"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                },
+                "spender": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Remove previously granted Approval",
-        "type": "object",
-        "required": [
-          "revoke"
-        ],
-        "properties": {
-          "revoke": {
-            "type": "object",
-            "required": [
-              "spender",
-              "token_id"
-            ],
-            "properties": {
-              "spender": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Remove previously granted Approval",
+          "type": "object",
+          "required": [
+            "revoke"
+          ],
+          "properties": {
+            "revoke": {
+              "type": "object",
+              "required": [
+                "spender",
+                "token_id"
+              ],
+              "properties": {
+                "spender": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Allows operator to transfer / send any token from the owner's account. If expiration is set, then this allowance has a time/height limit",
-        "type": "object",
-        "required": [
-          "approve_all"
-        ],
-        "properties": {
-          "approve_all": {
-            "type": "object",
-            "required": [
-              "operator"
-            ],
-            "properties": {
-              "expires": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/Expiration"
-                  },
-                  {
-                    "type": "null"
-                  }
-                ]
-              },
-              "operator": {
-                "type": "string"
+        {
+          "description": "Allows operator to transfer / send any token from the owner's account. If expiration is set, then this allowance has a time/height limit",
+          "type": "object",
+          "required": [
+            "approve_all"
+          ],
+          "properties": {
+            "approve_all": {
+              "type": "object",
+              "required": [
+                "operator"
+              ],
+              "properties": {
+                "expires": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/Expiration"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                },
+                "operator": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Remove previously granted ApproveAll permission",
-        "type": "object",
-        "required": [
-          "revoke_all"
-        ],
-        "properties": {
-          "revoke_all": {
-            "type": "object",
-            "required": [
-              "operator"
-            ],
-            "properties": {
-              "operator": {
-                "type": "string"
+        {
+          "description": "Remove previously granted ApproveAll permission",
+          "type": "object",
+          "required": [
+            "revoke_all"
+          ],
+          "properties": {
+            "revoke_all": {
+              "type": "object",
+              "required": [
+                "operator"
+              ],
+              "properties": {
+                "operator": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Mint a new NFT, can only be called by the contract minter",
-        "type": "object",
-        "required": [
-          "mint"
-        ],
-        "properties": {
-          "mint": {
-            "$ref": "#/definitions/MintMsgForEmpty"
-          }
+        {
+          "description": "Mint a new NFT, can only be called by the contract minter",
+          "type": "object",
+          "required": [
+            "mint"
+          ],
+          "properties": {
+            "mint": {
+              "$ref": "#/definitions/MintMsgForEmpty"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Burn an NFT the sender has access to",
-        "type": "object",
-        "required": [
-          "burn"
-        ],
-        "properties": {
-          "burn": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Burn an NFT the sender has access to",
+          "type": "object",
+          "required": [
+            "burn"
+          ],
+          "properties": {
+            "burn": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "MintMsgForEmpty": {
+          "type": "object",
+          "required": [
+            "extension",
+            "owner",
+            "token_id"
+          ],
+          "properties": {
+            "extension": {
+              "description": "Any custom extension used by this contract",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Empty"
+                }
+              ]
+            },
+            "owner": {
+              "description": "The owner of the newly minter NFT",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Unique ID of the NFT",
+              "type": "string"
+            },
+            "token_uri": {
+              "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
           }
         },
-        "additionalProperties": false
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
       }
-    ],
-    "definitions": {
-      "Binary": {
-        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
-        "type": "string"
-      },
-      "Empty": {
-        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-        "type": "object"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "collection_info",
+        "minter",
+        "name",
+        "symbol"
+      ],
+      "properties": {
+        "collection_info": {
+          "$ref": "#/definitions/CollectionInfoForRoyaltyInfoResponse"
+        },
+        "minter": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "symbol": {
+          "type": "string"
+        }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "CollectionInfoForRoyaltyInfoResponse": {
+          "type": "object",
+          "required": [
+            "creator",
+            "description",
+            "image"
+          ],
+          "properties": {
+            "creator": {
+              "type": "string"
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "description": {
+              "type": "string"
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            "external_link": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "image": {
+              "type": "string"
             },
-            "additionalProperties": false
+            "royalty_info": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RoyaltyInfoResponse"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
           }
-        ]
-      },
-      "MintMsgForEmpty": {
-        "type": "object",
-        "required": [
-          "extension",
-          "owner",
-          "token_id"
-        ],
-        "properties": {
-          "extension": {
-            "description": "Any custom extension used by this contract",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Empty"
-              }
-            ]
-          },
-          "owner": {
-            "description": "The owner of the newly minter NFT",
-            "type": "string"
-          },
-          "token_id": {
-            "description": "Unique ID of the NFT",
-            "type": "string"
-          },
-          "token_uri": {
-            "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
-            "type": [
-              "string",
-              "null"
-            ]
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "RoyaltyInfoResponse": {
+          "type": "object",
+          "required": [
+            "payment_address",
+            "share"
+          ],
+          "properties": {
+            "payment_address": {
+              "type": "string"
+            },
+            "share": {
+              "$ref": "#/definitions/Decimal"
+            }
           }
         }
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "InstantiateMsg",
-    "type": "object",
-    "required": [
-      "collection_info",
-      "minter",
-      "name",
-      "symbol"
-    ],
-    "properties": {
-      "collection_info": {
-        "$ref": "#/definitions/CollectionInfoForRoyaltyInfoResponse"
-      },
-      "minter": {
-        "type": "string"
-      },
-      "name": {
-        "type": "string"
-      },
-      "symbol": {
-        "type": "string"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "MinterResponse",
+      "description": "Shows who can mint these tokens",
+      "type": "object",
+      "required": [
+        "minter"
+      ],
+      "properties": {
+        "minter": {
+          "type": "string"
+        }
       }
     },
-    "definitions": {
-      "CollectionInfoForRoyaltyInfoResponse": {
-        "type": "object",
-        "required": [
-          "creator",
-          "description",
-          "image"
-        ],
-        "properties": {
-          "creator": {
-            "type": "string"
-          },
-          "description": {
-            "type": "string"
-          },
-          "external_link": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "image": {
-            "type": "string"
-          },
-          "royalty_info": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/RoyaltyInfoResponse"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          }
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NftInfoResponse",
+      "type": "object",
+      "required": [
+        "extension"
+      ],
+      "properties": {
+        "extension": {
+          "description": "You can add any custom metadata here when you extend cw721-base",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Empty"
+            }
+          ]
+        },
+        "token_uri": {
+          "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
-      "Decimal": {
-        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-        "type": "string"
-      },
-      "RoyaltyInfoResponse": {
-        "type": "object",
-        "required": [
-          "payment_address",
-          "share"
-        ],
-        "properties": {
-          "payment_address": {
-            "type": "string"
-          },
-          "share": {
-            "$ref": "#/definitions/Decimal"
-          }
+      "definitions": {
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
         }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "MinterResponse",
-    "description": "Shows who can mint these tokens",
-    "type": "object",
-    "required": [
-      "minter"
-    ],
-    "properties": {
-      "minter": {
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "NftInfoResponse",
-    "type": "object",
-    "required": [
-      "extension"
-    ],
-    "properties": {
-      "extension": {
-        "description": "You can add any custom metadata here when you extend cw721-base",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Empty"
-          }
-        ]
-      },
-      "token_uri": {
-        "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
-        "type": [
-          "string",
-          "null"
-        ]
-      }
     },
-    "definitions": {
-      "Empty": {
-        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-        "type": "object"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "NumTokensResponse",
-    "type": "object",
-    "required": [
-      "count"
-    ],
-    "properties": {
-      "count": {
-        "type": "integer",
-        "format": "uint64",
-        "minimum": 0
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "OperatorsResponse",
-    "type": "object",
-    "required": [
-      "operators"
-    ],
-    "properties": {
-      "operators": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NumTokensResponse",
+      "type": "object",
+      "required": [
+        "count"
+      ],
+      "properties": {
+        "count": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0
         }
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OperatorsResponse",
+      "type": "object",
+      "required": [
+        "operators"
+      ],
+      "properties": {
+        "operators": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "OwnerOfResponse",
-    "type": "object",
-    "required": [
-      "approvals",
-      "owner"
-    ],
-    "properties": {
-      "approvals": {
-        "description": "If set this address is approved to transfer/send the token as well",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
         }
-      },
-      "owner": {
-        "description": "Owner of the token",
-        "type": "string"
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OwnerOfResponse",
+      "type": "object",
+      "required": [
+        "approvals",
+        "owner"
+      ],
+      "properties": {
+        "approvals": {
+          "description": "If set this address is approved to transfer/send the token as well",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
+        },
+        "owner": {
+          "description": "Owner of the token",
+          "type": "string"
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "QueryMsg",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "owner_of"
-        ],
-        "properties": {
-          "owner_of": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
               },
-              "token_id": {
-                "type": "string"
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "owner_of"
+          ],
+          "properties": {
+            "owner_of": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "approval"
-        ],
-        "properties": {
-          "approval": {
-            "type": "object",
-            "required": [
-              "spender",
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "spender": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "approval"
+          ],
+          "properties": {
+            "approval": {
+              "type": "object",
+              "required": [
+                "spender",
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "spender": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "approvals"
-        ],
-        "properties": {
-          "approvals": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "approvals"
+          ],
+          "properties": {
+            "approvals": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "all_operators"
-        ],
-        "properties": {
-          "all_operators": {
-            "type": "object",
-            "required": [
-              "owner"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0
-              },
-              "owner": {
-                "type": "string"
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        {
+          "type": "object",
+          "required": [
+            "all_operators"
+          ],
+          "properties": {
+            "all_operators": {
+              "type": "object",
+              "required": [
+                "owner"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "limit": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint32",
+                  "minimum": 0
+                },
+                "owner": {
+                  "type": "string"
+                },
+                "start_after": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "num_tokens"
-        ],
-        "properties": {
-          "num_tokens": {
-            "type": "object"
-          }
+        {
+          "type": "object",
+          "required": [
+            "num_tokens"
+          ],
+          "properties": {
+            "num_tokens": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "contract_info"
-        ],
-        "properties": {
-          "contract_info": {
-            "type": "object"
-          }
+        {
+          "type": "object",
+          "required": [
+            "contract_info"
+          ],
+          "properties": {
+            "contract_info": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "nft_info"
-        ],
-        "properties": {
-          "nft_info": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "nft_info"
+          ],
+          "properties": {
+            "nft_info": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "all_nft_info"
-        ],
-        "properties": {
-          "all_nft_info": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "all_nft_info"
+          ],
+          "properties": {
+            "all_nft_info": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "tokens"
-        ],
-        "properties": {
-          "tokens": {
-            "type": "object",
-            "required": [
-              "owner"
-            ],
-            "properties": {
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0
-              },
-              "owner": {
-                "type": "string"
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        {
+          "type": "object",
+          "required": [
+            "tokens"
+          ],
+          "properties": {
+            "tokens": {
+              "type": "object",
+              "required": [
+                "owner"
+              ],
+              "properties": {
+                "limit": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint32",
+                  "minimum": 0
+                },
+                "owner": {
+                  "type": "string"
+                },
+                "start_after": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "all_tokens"
-        ],
-        "properties": {
-          "all_tokens": {
-            "type": "object",
-            "properties": {
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        {
+          "type": "object",
+          "required": [
+            "all_tokens"
+          ],
+          "properties": {
+            "all_tokens": {
+              "type": "object",
+              "properties": {
+                "limit": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint32",
+                  "minimum": 0
+                },
+                "start_after": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "minter"
-        ],
-        "properties": {
-          "minter": {
-            "type": "object"
-          }
+        {
+          "type": "object",
+          "required": [
+            "minter"
+          ],
+          "properties": {
+            "minter": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "collection_info"
-        ],
-        "properties": {
-          "collection_info": {
-            "type": "object"
+        {
+          "type": "object",
+          "required": [
+            "collection_info"
+          ],
+          "properties": {
+            "collection_info": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "TokensResponse",
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "type": "array",
+          "items": {
+            "type": "string"
           }
-        },
-        "additionalProperties": false
-      }
-    ]
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "TokensResponse",
-    "type": "object",
-    "required": [
-      "tokens"
-    ],
-    "properties": {
-      "tokens": {
-        "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
-        "type": "array",
-        "items": {
-          "type": "string"
         }
       }
     }
-  }
-]
\ No newline at end of file
+  ]
+}
\ No newline at end of file
diff --git a/__output__/sg721/orig.json b/__output__/sg721/orig.json
index 7e7e6f72..177acf3b 100644
--- a/__output__/sg721/orig.json
+++ b/__output__/sg721/orig.json
@@ -1,1487 +1,1489 @@
-[
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "AllNftInfoResponse",
-    "type": "object",
-    "required": [
-      "access",
-      "info"
-    ],
-    "properties": {
-      "access": {
-        "description": "Who can transfer the token",
-        "allOf": [
-          {
-            "$ref": "#/definitions/OwnerOfResponse"
-          }
-        ]
-      },
-      "info": {
-        "description": "Data on the token itself,",
-        "allOf": [
-          {
-            "$ref": "#/definitions/NftInfoResponse_for_Empty"
-          }
-        ]
-      }
-    },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
-          }
+{
+  "schemas": [
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllNftInfoResponse",
+      "type": "object",
+      "required": [
+        "access",
+        "info"
+      ],
+      "properties": {
+        "access": {
+          "description": "Who can transfer the token",
+          "allOf": [
+            {
+              "$ref": "#/definitions/OwnerOfResponse"
+            }
+          ]
+        },
+        "info": {
+          "description": "Data on the token itself,",
+          "allOf": [
+            {
+              "$ref": "#/definitions/NftInfoResponse_for_Empty"
+            }
+          ]
         }
       },
-      "Empty": {
-        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-        "type": "object"
-      },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "NftInfoResponse_for_Empty": {
+          "type": "object",
+          "required": [
+            "extension"
+          ],
+          "properties": {
+            "extension": {
+              "description": "You can add any custom metadata here when you extend cw721-base",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Empty"
+                }
+              ]
+            },
+            "token_uri": {
+              "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
           }
-        ]
-      },
-      "NftInfoResponse_for_Empty": {
-        "type": "object",
-        "required": [
-          "extension"
-        ],
-        "properties": {
-          "extension": {
-            "description": "You can add any custom metadata here when you extend cw721-base",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Empty"
+        },
+        "OwnerOfResponse": {
+          "type": "object",
+          "required": [
+            "approvals",
+            "owner"
+          ],
+          "properties": {
+            "approvals": {
+              "description": "If set this address is approved to transfer/send the token as well",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Approval"
               }
-            ]
-          },
-          "token_uri": {
-            "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
-            "type": [
-              "string",
-              "null"
-            ]
-          }
-        }
-      },
-      "OwnerOfResponse": {
-        "type": "object",
-        "required": [
-          "approvals",
-          "owner"
-        ],
-        "properties": {
-          "approvals": {
-            "description": "If set this address is approved to transfer/send the token as well",
-            "type": "array",
-            "items": {
-              "$ref": "#/definitions/Approval"
+            },
+            "owner": {
+              "description": "Owner of the token",
+              "type": "string"
             }
-          },
-          "owner": {
-            "description": "Owner of the token",
-            "type": "string"
-          }
-        }
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
           }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "AllOperatorsResponse",
-    "type": "object",
-    "required": [
-      "operators"
-    ],
-    "properties": {
-      "operators": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
         }
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllOperatorsResponse",
+      "type": "object",
+      "required": [
+        "operators"
+      ],
+      "properties": {
+        "operators": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "AllTokensResponse",
-    "type": "object",
-    "required": [
-      "tokens"
-    ],
-    "properties": {
-      "tokens": {
-        "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
-        "type": "array",
-        "items": {
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
           "type": "string"
         }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ApprovalResponse",
-    "type": "object",
-    "required": [
-      "approval"
-    ],
-    "properties": {
-      "approval": {
-        "$ref": "#/definitions/Approval"
-      }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllTokensResponse",
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "type": "array",
+          "items": {
             "type": "string"
           }
         }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ApprovalResponse",
+      "type": "object",
+      "required": [
+        "approval"
+      ],
+      "properties": {
+        "approval": {
+          "$ref": "#/definitions/Approval"
+        }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ApprovalsResponse",
-    "type": "object",
-    "required": [
-      "approvals"
-    ],
-    "properties": {
-      "approvals": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
         }
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ApprovalsResponse",
+      "type": "object",
+      "required": [
+        "approvals"
+      ],
+      "properties": {
+        "approvals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "CollectionInfoResponse",
-    "type": "object",
-    "required": [
-      "creator",
-      "description",
-      "image"
-    ],
-    "properties": {
-      "creator": {
-        "type": "string"
-      },
-      "description": {
-        "type": "string"
-      },
-      "external_link": {
-        "type": [
-          "string",
-          "null"
-        ]
-      },
-      "image": {
-        "type": "string"
-      },
-      "royalty_info": {
-        "anyOf": [
-          {
-            "$ref": "#/definitions/RoyaltyInfoResponse"
-          },
-          {
-            "type": "null"
-          }
-        ]
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
       }
     },
-    "definitions": {
-      "Decimal": {
-        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-        "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "CollectionInfoResponse",
+      "type": "object",
+      "required": [
+        "creator",
+        "description",
+        "image"
+      ],
+      "properties": {
+        "creator": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "external_link": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "image": {
+          "type": "string"
+        },
+        "royalty_info": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RoyaltyInfoResponse"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
       },
-      "RoyaltyInfoResponse": {
-        "type": "object",
-        "required": [
-          "payment_address",
-          "share"
-        ],
-        "properties": {
-          "payment_address": {
-            "type": "string"
-          },
-          "share": {
-            "$ref": "#/definitions/Decimal"
+      "definitions": {
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "RoyaltyInfoResponse": {
+          "type": "object",
+          "required": [
+            "payment_address",
+            "share"
+          ],
+          "properties": {
+            "payment_address": {
+              "type": "string"
+            },
+            "share": {
+              "$ref": "#/definitions/Decimal"
+            }
           }
         }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ContractInfoResponse",
-    "type": "object",
-    "required": [
-      "name",
-      "symbol"
-    ],
-    "properties": {
-      "name": {
-        "type": "string"
-      },
-      "symbol": {
-        "type": "string"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ContractInfoResponse",
+      "type": "object",
+      "required": [
+        "name",
+        "symbol"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "symbol": {
+          "type": "string"
+        }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "ExecuteMsg_for_Empty",
-    "description": "This is like Cw721ExecuteMsg but we add a Mint command for an owner to make this stand-alone. You will likely want to remove mint and use other control logic in any contract that inherits this.",
-    "oneOf": [
-      {
-        "description": "Transfer is a base message to move a token to another account without triggering actions",
-        "type": "object",
-        "required": [
-          "transfer_nft"
-        ],
-        "properties": {
-          "transfer_nft": {
-            "type": "object",
-            "required": [
-              "recipient",
-              "token_id"
-            ],
-            "properties": {
-              "recipient": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg_for_Empty",
+      "description": "This is like Cw721ExecuteMsg but we add a Mint command for an owner to make this stand-alone. You will likely want to remove mint and use other control logic in any contract that inherits this.",
+      "oneOf": [
+        {
+          "description": "Transfer is a base message to move a token to another account without triggering actions",
+          "type": "object",
+          "required": [
+            "transfer_nft"
+          ],
+          "properties": {
+            "transfer_nft": {
+              "type": "object",
+              "required": [
+                "recipient",
+                "token_id"
+              ],
+              "properties": {
+                "recipient": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Send is a base message to transfer a token to a contract and trigger an action on the receiving contract.",
-        "type": "object",
-        "required": [
-          "send_nft"
-        ],
-        "properties": {
-          "send_nft": {
-            "type": "object",
-            "required": [
-              "contract",
-              "msg",
-              "token_id"
-            ],
-            "properties": {
-              "contract": {
-                "type": "string"
-              },
-              "msg": {
-                "$ref": "#/definitions/Binary"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Send is a base message to transfer a token to a contract and trigger an action on the receiving contract.",
+          "type": "object",
+          "required": [
+            "send_nft"
+          ],
+          "properties": {
+            "send_nft": {
+              "type": "object",
+              "required": [
+                "contract",
+                "msg",
+                "token_id"
+              ],
+              "properties": {
+                "contract": {
+                  "type": "string"
+                },
+                "msg": {
+                  "$ref": "#/definitions/Binary"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Allows operator to transfer / send the token from the owner's account. If expiration is set, then this allowance has a time/height limit",
-        "type": "object",
-        "required": [
-          "approve"
-        ],
-        "properties": {
-          "approve": {
-            "type": "object",
-            "required": [
-              "spender",
-              "token_id"
-            ],
-            "properties": {
-              "expires": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/Expiration"
-                  },
-                  {
-                    "type": "null"
-                  }
-                ]
-              },
-              "spender": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Allows operator to transfer / send the token from the owner's account. If expiration is set, then this allowance has a time/height limit",
+          "type": "object",
+          "required": [
+            "approve"
+          ],
+          "properties": {
+            "approve": {
+              "type": "object",
+              "required": [
+                "spender",
+                "token_id"
+              ],
+              "properties": {
+                "expires": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/Expiration"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                },
+                "spender": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Remove previously granted Approval",
-        "type": "object",
-        "required": [
-          "revoke"
-        ],
-        "properties": {
-          "revoke": {
-            "type": "object",
-            "required": [
-              "spender",
-              "token_id"
-            ],
-            "properties": {
-              "spender": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Remove previously granted Approval",
+          "type": "object",
+          "required": [
+            "revoke"
+          ],
+          "properties": {
+            "revoke": {
+              "type": "object",
+              "required": [
+                "spender",
+                "token_id"
+              ],
+              "properties": {
+                "spender": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Allows operator to transfer / send any token from the owner's account. If expiration is set, then this allowance has a time/height limit",
-        "type": "object",
-        "required": [
-          "approve_all"
-        ],
-        "properties": {
-          "approve_all": {
-            "type": "object",
-            "required": [
-              "operator"
-            ],
-            "properties": {
-              "expires": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/Expiration"
-                  },
-                  {
-                    "type": "null"
-                  }
-                ]
-              },
-              "operator": {
-                "type": "string"
+        {
+          "description": "Allows operator to transfer / send any token from the owner's account. If expiration is set, then this allowance has a time/height limit",
+          "type": "object",
+          "required": [
+            "approve_all"
+          ],
+          "properties": {
+            "approve_all": {
+              "type": "object",
+              "required": [
+                "operator"
+              ],
+              "properties": {
+                "expires": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/Expiration"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                },
+                "operator": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Remove previously granted ApproveAll permission",
-        "type": "object",
-        "required": [
-          "revoke_all"
-        ],
-        "properties": {
-          "revoke_all": {
-            "type": "object",
-            "required": [
-              "operator"
-            ],
-            "properties": {
-              "operator": {
-                "type": "string"
+        {
+          "description": "Remove previously granted ApproveAll permission",
+          "type": "object",
+          "required": [
+            "revoke_all"
+          ],
+          "properties": {
+            "revoke_all": {
+              "type": "object",
+              "required": [
+                "operator"
+              ],
+              "properties": {
+                "operator": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Mint a new NFT, can only be called by the contract minter",
-        "type": "object",
-        "required": [
-          "mint"
-        ],
-        "properties": {
-          "mint": {
-            "$ref": "#/definitions/MintMsg_for_Empty"
-          }
+        {
+          "description": "Mint a new NFT, can only be called by the contract minter",
+          "type": "object",
+          "required": [
+            "mint"
+          ],
+          "properties": {
+            "mint": {
+              "$ref": "#/definitions/MintMsg_for_Empty"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "description": "Burn an NFT the sender has access to",
-        "type": "object",
-        "required": [
-          "burn"
-        ],
-        "properties": {
-          "burn": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "token_id": {
-                "type": "string"
+        {
+          "description": "Burn an NFT the sender has access to",
+          "type": "object",
+          "required": [
+            "burn"
+          ],
+          "properties": {
+            "burn": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "MintMsg_for_Empty": {
+          "type": "object",
+          "required": [
+            "extension",
+            "owner",
+            "token_id"
+          ],
+          "properties": {
+            "extension": {
+              "description": "Any custom extension used by this contract",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Empty"
+                }
+              ]
+            },
+            "owner": {
+              "description": "The owner of the newly minter NFT",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Unique ID of the NFT",
+              "type": "string"
+            },
+            "token_uri": {
+              "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
           }
         },
-        "additionalProperties": false
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
       }
-    ],
-    "definitions": {
-      "Binary": {
-        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
-        "type": "string"
-      },
-      "Empty": {
-        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-        "type": "object"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "collection_info",
+        "minter",
+        "name",
+        "symbol"
+      ],
+      "properties": {
+        "collection_info": {
+          "$ref": "#/definitions/CollectionInfo_for_RoyaltyInfoResponse"
+        },
+        "minter": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "symbol": {
+          "type": "string"
+        }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "CollectionInfo_for_RoyaltyInfoResponse": {
+          "type": "object",
+          "required": [
+            "creator",
+            "description",
+            "image"
+          ],
+          "properties": {
+            "creator": {
+              "type": "string"
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "description": {
+              "type": "string"
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            "external_link": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "image": {
+              "type": "string"
             },
-            "additionalProperties": false
+            "royalty_info": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RoyaltyInfoResponse"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
           }
-        ]
-      },
-      "MintMsg_for_Empty": {
-        "type": "object",
-        "required": [
-          "extension",
-          "owner",
-          "token_id"
-        ],
-        "properties": {
-          "extension": {
-            "description": "Any custom extension used by this contract",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Empty"
-              }
-            ]
-          },
-          "owner": {
-            "description": "The owner of the newly minter NFT",
-            "type": "string"
-          },
-          "token_id": {
-            "description": "Unique ID of the NFT",
-            "type": "string"
-          },
-          "token_uri": {
-            "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
-            "type": [
-              "string",
-              "null"
-            ]
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "RoyaltyInfoResponse": {
+          "type": "object",
+          "required": [
+            "payment_address",
+            "share"
+          ],
+          "properties": {
+            "payment_address": {
+              "type": "string"
+            },
+            "share": {
+              "$ref": "#/definitions/Decimal"
+            }
           }
         }
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "InstantiateMsg",
-    "type": "object",
-    "required": [
-      "collection_info",
-      "minter",
-      "name",
-      "symbol"
-    ],
-    "properties": {
-      "collection_info": {
-        "$ref": "#/definitions/CollectionInfo_for_RoyaltyInfoResponse"
-      },
-      "minter": {
-        "type": "string"
-      },
-      "name": {
-        "type": "string"
-      },
-      "symbol": {
-        "type": "string"
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "MinterResponse",
+      "description": "Shows who can mint these tokens",
+      "type": "object",
+      "required": [
+        "minter"
+      ],
+      "properties": {
+        "minter": {
+          "type": "string"
+        }
       }
     },
-    "definitions": {
-      "CollectionInfo_for_RoyaltyInfoResponse": {
-        "type": "object",
-        "required": [
-          "creator",
-          "description",
-          "image"
-        ],
-        "properties": {
-          "creator": {
-            "type": "string"
-          },
-          "description": {
-            "type": "string"
-          },
-          "external_link": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "image": {
-            "type": "string"
-          },
-          "royalty_info": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/RoyaltyInfoResponse"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          }
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NftInfoResponse",
+      "type": "object",
+      "required": [
+        "extension"
+      ],
+      "properties": {
+        "extension": {
+          "description": "You can add any custom metadata here when you extend cw721-base",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Empty"
+            }
+          ]
+        },
+        "token_uri": {
+          "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
-      "Decimal": {
-        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-        "type": "string"
-      },
-      "RoyaltyInfoResponse": {
-        "type": "object",
-        "required": [
-          "payment_address",
-          "share"
-        ],
-        "properties": {
-          "payment_address": {
-            "type": "string"
-          },
-          "share": {
-            "$ref": "#/definitions/Decimal"
-          }
+      "definitions": {
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
         }
       }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "MinterResponse",
-    "description": "Shows who can mint these tokens",
-    "type": "object",
-    "required": [
-      "minter"
-    ],
-    "properties": {
-      "minter": {
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "NftInfoResponse",
-    "type": "object",
-    "required": [
-      "extension"
-    ],
-    "properties": {
-      "extension": {
-        "description": "You can add any custom metadata here when you extend cw721-base",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Empty"
-          }
-        ]
-      },
-      "token_uri": {
-        "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
-        "type": [
-          "string",
-          "null"
-        ]
-      }
     },
-    "definitions": {
-      "Empty": {
-        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
-        "type": "object"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "NumTokensResponse",
-    "type": "object",
-    "required": [
-      "count"
-    ],
-    "properties": {
-      "count": {
-        "type": "integer",
-        "format": "uint64",
-        "minimum": 0
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "OperatorsResponse",
-    "type": "object",
-    "required": [
-      "operators"
-    ],
-    "properties": {
-      "operators": {
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NumTokensResponse",
+      "type": "object",
+      "required": [
+        "count"
+      ],
+      "properties": {
+        "count": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0
         }
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OperatorsResponse",
+      "type": "object",
+      "required": [
+        "operators"
+      ],
+      "properties": {
+        "operators": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "OwnerOfResponse",
-    "type": "object",
-    "required": [
-      "approvals",
-      "owner"
-    ],
-    "properties": {
-      "approvals": {
-        "description": "If set this address is approved to transfer/send the token as well",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/Approval"
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
         }
-      },
-      "owner": {
-        "description": "Owner of the token",
-        "type": "string"
       }
     },
-    "definitions": {
-      "Approval": {
-        "type": "object",
-        "required": [
-          "expires",
-          "spender"
-        ],
-        "properties": {
-          "expires": {
-            "description": "When the Approval expires (maybe Expiration::never)",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Expiration"
-              }
-            ]
-          },
-          "spender": {
-            "description": "Account that can transfer/send the token",
-            "type": "string"
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OwnerOfResponse",
+      "type": "object",
+      "required": [
+        "approvals",
+        "owner"
+      ],
+      "properties": {
+        "approvals": {
+          "description": "If set this address is approved to transfer/send the token as well",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
           }
+        },
+        "owner": {
+          "description": "Owner of the token",
+          "type": "string"
         }
       },
-      "Expiration": {
-        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
-        "oneOf": [
-          {
-            "description": "AtHeight will expire when `env.block.height` >= height",
-            "type": "object",
-            "required": [
-              "at_height"
-            ],
-            "properties": {
-              "at_height": {
-                "type": "integer",
-                "format": "uint64",
-                "minimum": 0
-              }
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "AtTime will expire when `env.block.time` >= time",
-            "type": "object",
-            "required": [
-              "at_time"
-            ],
-            "properties": {
-              "at_time": {
-                "$ref": "#/definitions/Timestamp"
-              }
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          },
-          {
-            "description": "Never will never expire. Used to express the empty variant",
-            "type": "object",
-            "required": [
-              "never"
-            ],
-            "properties": {
-              "never": {
-                "type": "object"
-              }
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
             },
-            "additionalProperties": false
-          }
-        ]
-      },
-      "Timestamp": {
-        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
-        "allOf": [
-          {
-            "$ref": "#/definitions/Uint64"
-          }
-        ]
-      },
-      "Uint64": {
-        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
-        "type": "string"
-      }
-    }
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "QueryMsg",
-    "oneOf": [
-      {
-        "type": "object",
-        "required": [
-          "owner_of"
-        ],
-        "properties": {
-          "owner_of": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
               },
-              "token_id": {
-                "type": "string"
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "owner_of"
+          ],
+          "properties": {
+            "owner_of": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "approval"
-        ],
-        "properties": {
-          "approval": {
-            "type": "object",
-            "required": [
-              "spender",
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "spender": {
-                "type": "string"
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "approval"
+          ],
+          "properties": {
+            "approval": {
+              "type": "object",
+              "required": [
+                "spender",
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "spender": {
+                  "type": "string"
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "approvals"
-        ],
-        "properties": {
-          "approvals": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "approvals"
+          ],
+          "properties": {
+            "approvals": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "all_operators"
-        ],
-        "properties": {
-          "all_operators": {
-            "type": "object",
-            "required": [
-              "owner"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0
-              },
-              "owner": {
-                "type": "string"
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        {
+          "type": "object",
+          "required": [
+            "all_operators"
+          ],
+          "properties": {
+            "all_operators": {
+              "type": "object",
+              "required": [
+                "owner"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "limit": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint32",
+                  "minimum": 0
+                },
+                "owner": {
+                  "type": "string"
+                },
+                "start_after": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "num_tokens"
-        ],
-        "properties": {
-          "num_tokens": {
-            "type": "object"
-          }
+        {
+          "type": "object",
+          "required": [
+            "num_tokens"
+          ],
+          "properties": {
+            "num_tokens": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "contract_info"
-        ],
-        "properties": {
-          "contract_info": {
-            "type": "object"
-          }
+        {
+          "type": "object",
+          "required": [
+            "contract_info"
+          ],
+          "properties": {
+            "contract_info": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "nft_info"
-        ],
-        "properties": {
-          "nft_info": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "nft_info"
+          ],
+          "properties": {
+            "nft_info": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "all_nft_info"
-        ],
-        "properties": {
-          "all_nft_info": {
-            "type": "object",
-            "required": [
-              "token_id"
-            ],
-            "properties": {
-              "include_expired": {
-                "type": [
-                  "boolean",
-                  "null"
-                ]
-              },
-              "token_id": {
-                "type": "string"
+        {
+          "type": "object",
+          "required": [
+            "all_nft_info"
+          ],
+          "properties": {
+            "all_nft_info": {
+              "type": "object",
+              "required": [
+                "token_id"
+              ],
+              "properties": {
+                "include_expired": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ]
+                },
+                "token_id": {
+                  "type": "string"
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "tokens"
-        ],
-        "properties": {
-          "tokens": {
-            "type": "object",
-            "required": [
-              "owner"
-            ],
-            "properties": {
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0
-              },
-              "owner": {
-                "type": "string"
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        {
+          "type": "object",
+          "required": [
+            "tokens"
+          ],
+          "properties": {
+            "tokens": {
+              "type": "object",
+              "required": [
+                "owner"
+              ],
+              "properties": {
+                "limit": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint32",
+                  "minimum": 0
+                },
+                "owner": {
+                  "type": "string"
+                },
+                "start_after": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "all_tokens"
-        ],
-        "properties": {
-          "all_tokens": {
-            "type": "object",
-            "properties": {
-              "limit": {
-                "type": [
-                  "integer",
-                  "null"
-                ],
-                "format": "uint32",
-                "minimum": 0
-              },
-              "start_after": {
-                "type": [
-                  "string",
-                  "null"
-                ]
+        {
+          "type": "object",
+          "required": [
+            "all_tokens"
+          ],
+          "properties": {
+            "all_tokens": {
+              "type": "object",
+              "properties": {
+                "limit": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint32",
+                  "minimum": 0
+                },
+                "start_after": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
               }
             }
-          }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "minter"
-        ],
-        "properties": {
-          "minter": {
-            "type": "object"
-          }
+        {
+          "type": "object",
+          "required": [
+            "minter"
+          ],
+          "properties": {
+            "minter": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
         },
-        "additionalProperties": false
-      },
-      {
-        "type": "object",
-        "required": [
-          "collection_info"
-        ],
-        "properties": {
-          "collection_info": {
-            "type": "object"
+        {
+          "type": "object",
+          "required": [
+            "collection_info"
+          ],
+          "properties": {
+            "collection_info": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "TokensResponse",
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "type": "array",
+          "items": {
+            "type": "string"
           }
-        },
-        "additionalProperties": false
-      }
-    ]
-  },
-  {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "TokensResponse",
-    "type": "object",
-    "required": [
-      "tokens"
-    ],
-    "properties": {
-      "tokens": {
-        "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
-        "type": "array",
-        "items": {
-          "type": "string"
         }
       }
     }
-  }
-]
\ No newline at end of file
+  ]
+}
\ No newline at end of file

From 28e393701bdf630ff99ba395fbd25643679665ba Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 5 Sep 2022 21:54:37 -0700
Subject: [PATCH 022/287] types

---
 packages/ts-codegen/types/src/types.d.ts         | 15 +++++++++++++++
 packages/ts-codegen/types/src/utils/schemas.d.ts | 10 ++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/ts-codegen/types/src/types.d.ts b/packages/ts-codegen/types/src/types.d.ts
index cb0ff5c3..e390180c 100644
--- a/packages/ts-codegen/types/src/types.d.ts
+++ b/packages/ts-codegen/types/src/types.d.ts
@@ -1 +1,16 @@
+import { JSONSchema } from "wasm-ast-types";
+interface KeyedSchema {
+    [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;
+}
 export {};
diff --git a/packages/ts-codegen/types/src/utils/schemas.d.ts b/packages/ts-codegen/types/src/utils/schemas.d.ts
index f50f1b1d..ba6ec91e 100644
--- a/packages/ts-codegen/types/src/utils/schemas.d.ts
+++ b/packages/ts-codegen/types/src/utils/schemas.d.ts
@@ -1,12 +1,14 @@
 import { JSONSchema } from 'wasm-ast-types';
+import { IDLObject } from '../types';
 interface ReadSchemaOpts {
     schemaDir: string;
-    schemaOptions?: {
-        packed?: boolean;
-    };
     clean?: boolean;
 }
-export declare const readSchemas: ({ schemaDir, schemaOptions, clean }: ReadSchemaOpts) => Promise<any>;
+interface ReadSchemasValue {
+    schemas: JSONSchema[];
+    idlObject?: IDLObject;
+}
+export declare const readSchemas: ({ schemaDir, clean }: ReadSchemaOpts) => Promise<ReadSchemasValue>;
 export declare const findQueryMsg: (schemas: any) => any;
 export declare const findExecuteMsg: (schemas: any) => any;
 export declare const findAndParseTypes: (schemas: any) => Promise<{}>;

From bd618c3cbad6241017f09c79afd2b306a9ca8ee2 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 6 Sep 2022 20:59:16 -0700
Subject: [PATCH 023/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.14.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 2c5b1a1d..c9500ce9 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.14.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.4...@cosmwasm/ts-codegen@0.14.0) (2022-09-07)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.13.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.3...@cosmwasm/ts-codegen@0.13.4) (2022-08-27)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 34a93fd9..4ccdeb76 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.13.4",
+  "version": "0.14.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 949261d0702aba23ec8ef0755217cf3f4dc2dc34 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 9 Sep 2022 11:27:09 -0400
Subject: [PATCH 024/287] typings

---
 packages/ts-codegen/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 4ccdeb76..c03aaef5 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -7,7 +7,7 @@
   "license": "SEE LICENSE IN LICENSE",
   "main": "main/index.js",
   "module": "module/index.js",
-  "typings": "types/index.d.ts",
+  "typings": "types/src/index.d.ts",
   "bin": {
     "cosmwasm-ts-codegen": "main/ts-codegen.js"
   },
@@ -96,4 +96,4 @@
     "shelljs": "0.8.5",
     "wasm-ast-types": "^0.9.0"
   }
-}
+}
\ No newline at end of file

From 4aad0373cb937e7dce0798f7cda0c935ecde9cd8 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 9 Sep 2022 11:27:32 -0400
Subject: [PATCH 025/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.14.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index c9500ce9..4ee19db1 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.14.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.14.0...@cosmwasm/ts-codegen@0.14.1) (2022-09-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.14.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.13.4...@cosmwasm/ts-codegen@0.14.0) (2022-09-07)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index c03aaef5..bfe76e8c 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,4 +96,4 @@
     "shelljs": "0.8.5",
     "wasm-ast-types": "^0.9.0"
   }
-}
\ No newline at end of file
+}

From 7016ebbab29a2662a3043ec9ab8701436da965b1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 11 Sep 2022 13:22:36 -0400
Subject: [PATCH 026/287] switch to https

---
 README.md                                              | 7 ++++---
 packages/ts-codegen/src/commands/create-boilerplate.ts | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index db0df7a0..6da8093d 100644
--- a/README.md
+++ b/README.md
@@ -47,8 +47,8 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone git@github.com:public-awesome/stargaze-contracts.git
-cd stargaze-contracts/contracts/sg721/
+git clone https://github.com/public-awesome/launchpad.git
+cd launchpad/contracts/sg721-base/
 ```
 
 Run `cosmwasm-ts-codegen` to generate your code.
@@ -58,7 +58,8 @@ cosmwasm-ts-codegen generate \
           --plugin client \
           --schema ./schema \
           --out ./ts \
-          --name SG721
+          --name SG721 \
+          --no-bundle
 ```
 
 The output will be in the folder specified by `--out`, enjoy!
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index fb867eec..db36a30d 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -5,7 +5,7 @@ const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
 
-const repo = 'git@github.com:pyramation/tmpl-cosmwasm-module.git';
+const repo = 'https://github.com/pyramation/tmpl-cosmwasm-module.git';
 export default async argv => {
     if (!shell.which('git')) {
         shell.echo('Sorry, this script requires git');

From f1b4bb730177be7342b0867c162cc7edf5ce3a29 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 11 Sep 2022 13:22:45 -0400
Subject: [PATCH 027/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.14.2
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 4ee19db1..85071cc8 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.14.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.14.1...@cosmwasm/ts-codegen@0.14.2) (2022-09-11)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.14.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.14.0...@cosmwasm/ts-codegen@0.14.1) (2022-09-09)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index bfe76e8c..3b4f6b83 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 883407abdee3389fdf794434fd6ec6b3319892a1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 12 Sep 2022 22:13:37 -0400
Subject: [PATCH 028/287] readme

---
 README.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6da8093d..00aba9a9 100644
--- a/README.md
+++ b/README.md
@@ -405,7 +405,28 @@ cd contracts/sg721/
 cargo schema
 ```
 ### Exporting Schemas
-#### `cosmwasm_std` Examples
+#### `cosmwasm v1.1` Example
+
+Using the new `write_api` method, you can export schemas:
+
+```rs
+use cosmwasm_schema::write_api;
+
+pub use cw4::{AdminResponse, MemberListResponse, MemberResponse, TotalWeightResponse};
+pub use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}
+```
+
+#### `cosmwasm_std` Example
+
+Here is a legacy example:
 
 ```rs
 use cosmwasm_std::{Addr, CosmosMsg, Empty};

From 9f6c2041a6533a0e1ffc637a34fb1165ad6a5062 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 12 Sep 2022 22:13:47 -0400
Subject: [PATCH 029/287] readme

---
 packages/ts-codegen/README.md | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index db0df7a0..00aba9a9 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -47,8 +47,8 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone git@github.com:public-awesome/stargaze-contracts.git
-cd stargaze-contracts/contracts/sg721/
+git clone https://github.com/public-awesome/launchpad.git
+cd launchpad/contracts/sg721-base/
 ```
 
 Run `cosmwasm-ts-codegen` to generate your code.
@@ -58,7 +58,8 @@ cosmwasm-ts-codegen generate \
           --plugin client \
           --schema ./schema \
           --out ./ts \
-          --name SG721
+          --name SG721 \
+          --no-bundle
 ```
 
 The output will be in the folder specified by `--out`, enjoy!
@@ -404,7 +405,28 @@ cd contracts/sg721/
 cargo schema
 ```
 ### Exporting Schemas
-#### `cosmwasm_std` Examples
+#### `cosmwasm v1.1` Example
+
+Using the new `write_api` method, you can export schemas:
+
+```rs
+use cosmwasm_schema::write_api;
+
+pub use cw4::{AdminResponse, MemberListResponse, MemberResponse, TotalWeightResponse};
+pub use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}
+```
+
+#### `cosmwasm_std` Example
+
+Here is a legacy example:
 
 ```rs
 use cosmwasm_std::{Addr, CosmosMsg, Empty};

From 10c8be3191cc16e89df92030662227e267c2df34 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 12 Sep 2022 22:14:33 -0400
Subject: [PATCH 030/287] ts-codegen

---
 packages/ts-codegen/__tests__/cleanse.test.ts |   8 +-
 .../ts-codegen/__tests__/ts-codegen.test.ts   | 182 ++++++++++--------
 packages/ts-codegen/src/builder/builder.ts    |  20 +-
 packages/ts-codegen/src/generators/client.ts  |  11 +-
 .../src/generators/message-composer.ts        |  11 +-
 .../ts-codegen/src/generators/react-query.ts  |   9 +-
 packages/ts-codegen/src/generators/recoil.ts  |   9 +-
 packages/ts-codegen/src/generators/types.ts   |   9 +-
 packages/ts-codegen/src/types.ts              |  16 --
 packages/ts-codegen/src/utils/schemas.ts      |  46 ++---
 10 files changed, 160 insertions(+), 161 deletions(-)
 delete mode 100644 packages/ts-codegen/src/types.ts

diff --git a/packages/ts-codegen/__tests__/cleanse.test.ts b/packages/ts-codegen/__tests__/cleanse.test.ts
index f360e747..c60a838d 100644
--- a/packages/ts-codegen/__tests__/cleanse.test.ts
+++ b/packages/ts-codegen/__tests__/cleanse.test.ts
@@ -10,8 +10,8 @@ it('sg721', async () => {
     const out = OUTPUT_DIR + '/sg721';
     const schemaDir = FIXTURE_DIR + '/sg721/';
 
-    const clean = await readSchemas({ schemaDir, argv: {}, clean: true });
-    const orig = await readSchemas({ schemaDir, argv: {}, clean: false });
+    const clean = await readSchemas({ schemaDir, clean: true });
+    const orig = await readSchemas({ schemaDir, clean: false });
 
     mkdirp(out);
     writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
@@ -23,8 +23,8 @@ it('daodao/cw-code-id-registry', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
 
-    const clean = await readSchemas({ schemaDir, argv: {}, clean: true });
-    const orig = await readSchemas({ schemaDir, argv: {}, clean: false });
+    const clean = await readSchemas({ schemaDir, clean: true });
+    const orig = await readSchemas({ schemaDir, clean: false });
 
     mkdirp(out);
     writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 75863f5c..cfdf2896 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -11,199 +11,229 @@ const OUTPUT_DIR = __dirname + '/../../../__output__';
 it('optionalClient', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-optional-client';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateReactQuery('Factory', schemas, outopt, { optionalClient: true });
+    await generateReactQuery('Factory', contractInfo, outopt, { optionalClient: true });
 })
 
 it('v4Query', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-v4-query';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateReactQuery('Factory', schemas, outopt, { version: 'v4' });
+    await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4' });
 })
 
 it('queryKeys', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateReactQuery('Factory', schemas, outopt, { queryKeys: true });
+    await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true });
 })
 
 
 it('queryKeysOptionalClient', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateReactQuery('Factory', schemas, outopt, { queryKeys: true, optionalClient: true });
+    await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, optionalClient: true });
 })
 
 it('useMutations', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateReactQuery('Factory', schemas, outopt, { version: 'v4', mutations: true });
+    await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4', mutations: true });
 })
 
 it('vectis/factory', async () => {
     const out = OUTPUT_DIR + '/vectis/factory';
     const schemaDir = FIXTURE_DIR + '/vectis/factory/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('Factory', schemas, out);
-    await generateClient('Factory', schemas, out);
-    await generateMessageComposer('Factory', schemas, out);
-    await generateRecoil('Factory', schemas, out);
-    await generateReactQuery('Factory', schemas, out);
+    await generateTypes('Factory', contractInfo, out);
+    await generateClient('Factory', contractInfo, out);
+    await generateMessageComposer('Factory', contractInfo, out);
+    await generateRecoil('Factory', contractInfo, out);
+    await generateReactQuery('Factory', contractInfo, out);
 })
 
 it('vectis/govec', async () => {
     const out = OUTPUT_DIR + '/vectis/govec';
     const schemaDir = FIXTURE_DIR + '/vectis/govec/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('Govec', schemas, out);
-    await generateClient('Govec', schemas, out);
-    await generateMessageComposer('Govec', schemas, out);
-    await generateRecoil('Govec', schemas, out);
-    await generateReactQuery('Govec', schemas, out);
+    await generateTypes('Govec', contractInfo, out);
+    await generateClient('Govec', contractInfo, out);
+    await generateMessageComposer('Govec', contractInfo, out);
+    await generateRecoil('Govec', contractInfo, out);
+    await generateReactQuery('Govec', contractInfo, out);
 })
 
 it('vectis/proxy', async () => {
     const out = OUTPUT_DIR + '/vectis/proxy';
     const schemaDir = FIXTURE_DIR + '/vectis/proxy/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('Proxy', schemas, out);
-    await generateClient('Proxy', schemas, out);
-    await generateMessageComposer('Proxy', schemas, out);
-    await generateRecoil('Proxy', schemas, out);
-    await generateReactQuery('Proxy', schemas, out);
+    await generateTypes('Proxy', contractInfo, out);
+    await generateClient('Proxy', contractInfo, out);
+    await generateMessageComposer('Proxy', contractInfo, out);
+    await generateRecoil('Proxy', contractInfo, out);
+    await generateReactQuery('Proxy', contractInfo, out);
 })
 
 it('minter', async () => {
     const out = OUTPUT_DIR + '/minter';
     const schemaDir = FIXTURE_DIR + '/minter/';
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('Minter', schemas, out);
-    await generateClient('Minter', schemas, out);
-    await generateMessageComposer('Minter', schemas, out);
-    await generateRecoil('Minter', schemas, out);
-    await generateReactQuery('Minter', schemas, out);
+    await generateTypes('Minter', contractInfo, out);
+    await generateClient('Minter', contractInfo, out);
+    await generateMessageComposer('Minter', contractInfo, out);
+    await generateRecoil('Minter', contractInfo, out);
+    await generateReactQuery('Minter', contractInfo, out);
 })
 
 it('sg721', async () => {
     const out = OUTPUT_DIR + '/sg721';
     const schemaDir = FIXTURE_DIR + '/sg721/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('Sg721', schemas, out);
-    await generateClient('Sg721', schemas, out);
-    await generateMessageComposer('Sg721', schemas, out);
-    await generateRecoil('Sg721', schemas, out);
-    await generateReactQuery('Sg721', schemas, out);
+    await generateTypes('Sg721', contractInfo, out);
+    await generateClient('Sg721', contractInfo, out);
+    await generateMessageComposer('Sg721', contractInfo, out);
+    await generateRecoil('Sg721', contractInfo, out);
+    await generateReactQuery('Sg721', contractInfo, out);
 })
 
 it('cw-named-groups', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-named-groups';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-named-groups/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('CwNamedGroups', schemas, out);
-    await generateClient('CwNamedGroups', schemas, out);
-    await generateMessageComposer('CwNamedGroups', schemas, out);
-    await generateRecoil('CwNamedGroups', schemas, out);
-    await generateReactQuery('CwNamedGroups', schemas, out);
+    await generateTypes('CwNamedGroups', contractInfo, out);
+    await generateClient('CwNamedGroups', contractInfo, out);
+    await generateMessageComposer('CwNamedGroups', contractInfo, out);
+    await generateRecoil('CwNamedGroups', contractInfo, out);
+    await generateReactQuery('CwNamedGroups', contractInfo, out);
 })
 
 it('cw-proposal-single', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-proposal-single';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-proposal-single/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('CwProposalSingle', schemas, out);
-    await generateClient('CwProposalSingle', schemas, out);
-    await generateMessageComposer('CwProposalSingle', schemas, out);
-    await generateRecoil('CwProposalSingle', schemas, out);
-    await generateReactQuery('CwProposalSingle', schemas, out);
+    await generateTypes('CwProposalSingle', contractInfo, out);
+    await generateClient('CwProposalSingle', contractInfo, out);
+    await generateMessageComposer('CwProposalSingle', contractInfo, out);
+    await generateRecoil('CwProposalSingle', contractInfo, out);
+    await generateReactQuery('CwProposalSingle', contractInfo, out);
 })
 
 it('cw-admin-factory', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-admin-factory';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-admin-factory/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('CwAdminFactory', schemas, out);
-    await generateClient('CwAdminFactory', schemas, out);
-    await generateMessageComposer('CwAdminFactory', schemas, out);
-    await generateRecoil('CwAdminFactory', schemas, out);
-    await generateReactQuery('CwAdminFactory', schemas, out);
+    await generateTypes('CwAdminFactory', contractInfo, out);
+    await generateClient('CwAdminFactory', contractInfo, out);
+    await generateMessageComposer('CwAdminFactory', contractInfo, out);
+    await generateRecoil('CwAdminFactory', contractInfo, out);
+    await generateReactQuery('CwAdminFactory', contractInfo, out);
 })
 
 it('cw-code-id-registry', async () => {
     const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
     const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('CwCodeIdRegistry', schemas, out);
-    await generateClient('CwCodeIdRegistry', schemas, out);
-    await generateMessageComposer('CwCodeIdRegistry', schemas, out);
-    await generateRecoil('CwCodeIdRegistry', schemas, out);
-    await generateReactQuery('CwCodeIdRegistry', schemas, out);
+    await generateTypes('CwCodeIdRegistry', contractInfo, out);
+    await generateClient('CwCodeIdRegistry', contractInfo, out);
+    await generateMessageComposer('CwCodeIdRegistry', contractInfo, out);
+    await generateRecoil('CwCodeIdRegistry', contractInfo, out);
+    await generateReactQuery('CwCodeIdRegistry', contractInfo, out);
 })
 
 it('idl-version/hackatom', async () => {
     const out = OUTPUT_DIR + '/idl-version/hackatom';
     const schemaDir = FIXTURE_DIR + '/idl-version/hackatom/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
-    await generateTypes('HackAtom', schemas, out);
-    await generateClient('HackAtom', schemas, out);
-    await generateMessageComposer('HackAtom', schemas, out);
-    await generateRecoil('HackAtom', schemas, out);
-    await generateReactQuery('HackAtom', schemas, out);
+    await generateTypes('HackAtom', contractInfo, out);
+    await generateClient('HackAtom', contractInfo, out);
+    await generateMessageComposer('HackAtom', contractInfo, out);
+    await generateRecoil('HackAtom', contractInfo, out);
+    await generateReactQuery('HackAtom', contractInfo, out);
 })
 
 it('idl-version/cyberpunk', async () => {
     const out = OUTPUT_DIR + '/idl-version/cyberpunk';
     const schemaDir = FIXTURE_DIR + '/idl-version/cyberpunk/';
 
-    const { schemas } = await readSchemas({
+    const contractInfo = await readSchemas({
         schemaDir
     });
 
-    await generateTypes('CyberPunk', schemas, out);
-    await generateClient('CyberPunk', schemas, out);
-    await generateMessageComposer('CyberPunk', schemas, out);
-    await generateRecoil('CyberPunk', schemas, out);
-    await generateReactQuery('CyberPunk', schemas, out);
+    await generateTypes('CyberPunk', contractInfo, out);
+    await generateClient('CyberPunk', contractInfo, out);
+    await generateMessageComposer('CyberPunk', contractInfo, out);
+    await generateRecoil('CyberPunk', contractInfo, out);
+    await generateReactQuery('CyberPunk', contractInfo, out);
+})
+
+it('idl-version/cw4-group', async () => {
+    const out = OUTPUT_DIR + '/idl-version/cw4-group';
+    const schemaDir = FIXTURE_DIR + '/idl-version/cw4-group/';
+
+    const contractInfo = await readSchemas({
+        schemaDir
+    });
+
+    await generateTypes('Cw4Group', contractInfo, out);
+    await generateClient('Cw4Group', contractInfo, out);
+    await generateMessageComposer('Cw4Group', contractInfo, out);
+    await generateRecoil('Cw4Group', contractInfo, out);
+    await generateReactQuery('Cw4Group', contractInfo, out);
+})
+
+it('idl-version/cw3-fixed-multisig', async () => {
+    const out = OUTPUT_DIR + '/idl-version/cw3-fixed-multisig';
+    const schemaDir = FIXTURE_DIR + '/idl-version/cw3-fixed-multisig/';
+
+    const contractInfo = await readSchemas({
+        schemaDir
+    });
+
+    await generateTypes('Cw3FixedMultiSig', contractInfo, out);
+    await generateClient('Cw3FixedMultiSig', contractInfo, out);
+    await generateMessageComposer('Cw3FixedMultiSig', contractInfo, out);
+    await generateRecoil('Cw3FixedMultiSig', contractInfo, out);
+    await generateReactQuery('Cw3FixedMultiSig', contractInfo, out);
 })
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 9f15817c..c4ae7739 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -95,50 +95,50 @@ export class TSBuilder {
     async renderTypes(contract: ContractFile) {
         const { enabled, ...options } = this.options.types;
         if (!enabled) return;
-        const { schemas } = await readSchemas({
+        const contractInfo = await readSchemas({
             schemaDir: contract.dir
         });
-        const files = await generateTypes(contract.name, schemas, this.outPath, options);
+        const files = await generateTypes(contract.name, contractInfo, this.outPath, options);
         [].push.apply(this.files, files);
     }
 
     async renderClient(contract: ContractFile) {
         const { enabled, ...options } = this.options.client;
         if (!enabled) return;
-        const { schemas } = await readSchemas({
+        const contractInfo = await readSchemas({
             schemaDir: contract.dir
         });
-        const files = await generateClient(contract.name, schemas, this.outPath, options);
+        const files = await generateClient(contract.name, contractInfo, this.outPath, options);
         [].push.apply(this.files, files);
     }
 
     async renderRecoil(contract: ContractFile) {
         const { enabled, ...options } = this.options.recoil;
         if (!enabled) return;
-        const { schemas } = await readSchemas({
+        const contractInfo = await readSchemas({
             schemaDir: contract.dir
         });
-        const files = await generateRecoil(contract.name, schemas, this.outPath, options);
+        const files = await generateRecoil(contract.name, contractInfo, this.outPath, options);
         [].push.apply(this.files, files);
     }
 
     async renderReactQuery(contract: ContractFile) {
         const { enabled, ...options } = this.options.reactQuery;
         if (!enabled) return;
-        const { schemas } = await readSchemas({
+        const contractInfo = await readSchemas({
             schemaDir: contract.dir
         });
-        const files = await generateReactQuery(contract.name, schemas, this.outPath, options);
+        const files = await generateReactQuery(contract.name, contractInfo, this.outPath, options);
         [].push.apply(this.files, files);
     }
 
     async renderMessageComposer(contract: ContractFile) {
         const { enabled, ...options } = this.options.messageComposer;
         if (!enabled) return;
-        const { schemas } = await readSchemas({
+        const contractInfo = await readSchemas({
             schemaDir: contract.dir
         });
-        const files = await generateMessageComposer(contract.name, schemas, this.outPath, options);
+        const files = await generateMessageComposer(contract.name, contractInfo, this.outPath, options);
         [].push.apply(this.files, files);
     }
 
diff --git a/packages/ts-codegen/src/generators/client.ts b/packages/ts-codegen/src/generators/client.ts
index 4b7354c7..b43bbdfe 100644
--- a/packages/ts-codegen/src/generators/client.ts
+++ b/packages/ts-codegen/src/generators/client.ts
@@ -6,22 +6,23 @@ import * as w from 'wasm-ast-types';
 import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
-import { getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg, getDefinitionSchema } from '../utils';
+import { ContractInfo, getMessageProperties } from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { RenderContext, TSClientOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
 export default async (
   name: string,
-  schemas: any[],
+  contractInfo: ContractInfo,
   outPath: string,
   tsClientOptions?: TSClientOptions
 ): Promise<BuilderFile[]> => {
 
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+  const { schemas } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     client: tsClientOptions ?? {}
   });
-  const options = context.options.client;
+  // const options = context.options.client;
 
   const localname = pascal(name) + '.client.ts';
   const TypesFile = pascal(name) + '.types'
diff --git a/packages/ts-codegen/src/generators/message-composer.ts b/packages/ts-codegen/src/generators/message-composer.ts
index c068eadc..3c808675 100644
--- a/packages/ts-codegen/src/generators/message-composer.ts
+++ b/packages/ts-codegen/src/generators/message-composer.ts
@@ -6,22 +6,23 @@ import * as w from 'wasm-ast-types';
 import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
-import { getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, getDefinitionSchema } from "../utils";
+import { ContractInfo, getMessageProperties } from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg } from "../utils";
 import { RenderContext, MessageComposerOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
 export default async (
   name: string,
-  schemas: any[],
+  contractInfo: ContractInfo,
   outPath: string,
   messageComposerOptions?: MessageComposerOptions
 ): Promise<BuilderFile[]> => {
 
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+  const { schemas } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     messageComposer: messageComposerOptions ?? {}
   });
-  const options = context.options.messageComposer;
+  // const options = context.options.messageComposer;
 
   const localname = pascal(name) + '.message-composer.ts';
   const TypesFile = pascal(name) + '.types';
diff --git a/packages/ts-codegen/src/generators/react-query.ts b/packages/ts-codegen/src/generators/react-query.ts
index c2c83257..5ade22fa 100644
--- a/packages/ts-codegen/src/generators/react-query.ts
+++ b/packages/ts-codegen/src/generators/react-query.ts
@@ -7,17 +7,18 @@ import { RenderContext } from 'wasm-ast-types';
 import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg, getDefinitionSchema } from '../utils';
-import { getMessageProperties, ReactQueryOptions } from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
+import { getMessageProperties, ReactQueryOptions, ContractInfo } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
 export default async (
   contractName: string,
-  schemas: any[],
+  contractInfo: ContractInfo,
   outPath: string,
   reactQueryOptions?: ReactQueryOptions
 ): Promise<BuilderFile[]> => {
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+  const { schemas } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     reactQuery: reactQueryOptions ?? {}
   });
   const options = context.options.reactQuery;
diff --git a/packages/ts-codegen/src/generators/recoil.ts b/packages/ts-codegen/src/generators/recoil.ts
index 601b1891..7bd46303 100644
--- a/packages/ts-codegen/src/generators/recoil.ts
+++ b/packages/ts-codegen/src/generators/recoil.ts
@@ -6,18 +6,19 @@ import * as w from 'wasm-ast-types';
 import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
-import { findAndParseTypes, findQueryMsg, getDefinitionSchema } from "../utils";
-import { RenderContext, RecoilOptions } from "wasm-ast-types";
+import { findAndParseTypes, findQueryMsg } from "../utils";
+import { ContractInfo, RenderContext, RecoilOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
 export default async (
   name: string,
-  schemas: any[],
+  contractInfo: ContractInfo,
   outPath: string,
   recoilOptions?: RecoilOptions
 ): Promise<BuilderFile[]> => {
 
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+  const { schemas } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     recoil: recoilOptions ?? {}
   });
   const options = context.options.recoil;
diff --git a/packages/ts-codegen/src/generators/types.ts b/packages/ts-codegen/src/generators/types.ts
index d839c05d..972c9fe8 100644
--- a/packages/ts-codegen/src/generators/types.ts
+++ b/packages/ts-codegen/src/generators/types.ts
@@ -6,18 +6,19 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { clean } from "../utils/clean";
-import { findAndParseTypes, findExecuteMsg, getDefinitionSchema } from '../utils';
-import { RenderContext, TSTypesOptions } from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { ContractInfo, RenderContext, TSTypesOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
 export default async (
   name: string,
-  schemas: any[],
+  contractInfo: ContractInfo,
   outPath: string,
   tsTypesOptions?: TSTypesOptions
 ): Promise<BuilderFile[]> => {
 
-  const context = new RenderContext(getDefinitionSchema(schemas), {
+  const { schemas } = contractInfo;
+  const context = new RenderContext(contractInfo, {
     types: tsTypesOptions ?? {}
   });
   const options = context.options.types;
diff --git a/packages/ts-codegen/src/types.ts b/packages/ts-codegen/src/types.ts
deleted file mode 100644
index cefe1c96..00000000
--- a/packages/ts-codegen/src/types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { JSONSchema } from "wasm-ast-types";
-
-interface KeyedSchema {
-    [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;
-}
\ No newline at end of file
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index fe6c1144..8d4ffcaa 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -3,21 +3,15 @@ import { readFileSync } from 'fs';
 import { cleanse } from './cleanse';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
-import { JSONSchema } from 'wasm-ast-types';
-import { IDLObject } from '../types';
-
+import { ContractInfo, JSONSchema } from 'wasm-ast-types';
 interface ReadSchemaOpts {
     schemaDir: string;
     clean?: boolean;
 };
-interface ReadSchemasValue {
-    schemas: JSONSchema[];
-    idlObject?: IDLObject
-};
 
 export const readSchemas = async ({
     schemaDir, clean = true
-}: ReadSchemaOpts): Promise<ReadSchemasValue> => {
+}: ReadSchemaOpts): Promise<ContractInfo> => {
     const fn = clean ? cleanse : (str) => str;
     const files = glob(schemaDir + '/**/*.json');
     const schemas = files
@@ -61,13 +55,17 @@ export const readSchemas = async ({
 
     // TODO use contract_name, etc.
     return {
-        schemas: Object.values(fn({
-            instantiate,
-            execute,
-            query,
-            migrate,
-            sudo
-        })).filter(Boolean),
+        schemas: [
+            ...Object.values(fn({
+                instantiate,
+                execute,
+                query,
+                migrate,
+                sudo
+            })).filter(Boolean),
+            ...Object.values(fn({ ...responses })).filter(Boolean)
+        ],
+        responses,
         idlObject
     };
 };
@@ -102,21 +100,3 @@ export const findAndParseTypes = async (schemas) => {
     const typeHash = parser(allTypes);
     return typeHash;
 };
-
-export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
-    const aggregateSchema = {
-        definitions: {
-            //
-        }
-    };
-
-    schemas.forEach(schema => {
-        schema.definitions = schema.definitions || {};
-        aggregateSchema.definitions = {
-            ...aggregateSchema.definitions,
-            ...schema.definitions
-        };
-    });
-
-    return aggregateSchema;
-};
\ No newline at end of file

From b371dd9d74919eb53c3dff9c018928b2bbac5c3f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 12 Sep 2022 22:14:44 -0400
Subject: [PATCH 031/287] ast types

---
 packages/wasm-ast-types/src/client/client.ts  |   6 +-
 .../client/test/ts-client.arrays-ref.spec.ts  |   4 +-
 .../src/client/test/ts-client.arrays.spec.ts  |   4 +-
 .../test/ts-client.cw-named-groups.test.ts    |   4 +-
 .../test/ts-client.cw-proposal-single.test.ts |  11 +-
 .../client/test/ts-client.empty-enums.spec.ts |   5 +-
 .../src/client/test/ts-client.issues.test.ts  |  11 +-
 .../src/client/test/ts-client.sg721.spec.ts   |   5 +-
 .../src/client/test/ts-client.spec.ts         |  37 +-
 .../src/client/test/ts-client.vectis.spec.ts  |  20 +-
 .../wasm-ast-types/src/context/context.ts     |  48 +-
 .../message-composer/message-composer.spec.ts |   7 +-
 .../src/react-query/react-query.spec.ts       |  12 +-
 .../src/react-query/react-query.ts            | 418 +++++++++---------
 .../wasm-ast-types/src/recoil/recoil.spec.ts  |   7 +-
 packages/wasm-ast-types/src/recoil/recoil.ts  |  11 +-
 packages/wasm-ast-types/src/utils/types.ts    |  16 +-
 packages/wasm-ast-types/test-utils/index.ts   |  12 +
 .../wasm-ast-types/types/context/context.d.ts |  28 +-
 .../types/react-query/react-query.d.ts        |   5 +-
 .../wasm-ast-types/types/recoil/recoil.d.ts   |   2 +-
 .../wasm-ast-types/types/utils/types.d.ts     |   1 +
 22 files changed, 380 insertions(+), 294 deletions(-)

diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/wasm-ast-types/src/client/client.ts
index 5e0d2685..ca01115c 100644
--- a/packages/wasm-ast-types/src/client/client.ts
+++ b/packages/wasm-ast-types/src/client/client.ts
@@ -15,7 +15,7 @@ import {
   ExecuteMsg
 } from '../types';
 
-import { getPropertyType, getType, createTypedObjectParams } from '../utils/types';
+import { getPropertyType, getType, createTypedObjectParams, getResponseType } from '../utils/types';
 import { RenderContext } from '../context';
 import { JSONSchema } from '../types';
 import { identifier, propertySignature } from '../utils/babel';
@@ -87,7 +87,7 @@ export const createWasmQueryMethod = (
 
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const responseType = pascal(`${methodName}Response`);
+  const responseType = getResponseType(context, underscoreName);
 
   const obj = createTypedObjectParams(
     context,
@@ -573,7 +573,7 @@ export const createQueryInterface = (
     .map(jsonschema => {
       const underscoreName = Object.keys(jsonschema.properties)[0];
       const methodName = camel(underscoreName);
-      const responseType = pascal(`${methodName}Response`);
+      const responseType = getResponseType(context, underscoreName);
       return createPropertyFunctionWithObjectParams(
         context,
         methodName,
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.arrays-ref.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.arrays-ref.spec.ts
index 4ad17cc4..bd31bf19 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.arrays-ref.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.arrays-ref.spec.ts
@@ -7,9 +7,9 @@ import {
     createTypeInterface
 } from '../client'
 import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
-const ctx = new RenderContext(message);
+const ctx = makeContext(message);
 
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
index 79855d37..a991464b 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
@@ -7,9 +7,9 @@ import {
     createTypeInterface
 } from '../client'
 import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
-const ctx = new RenderContext(message);
+const ctx = makeContext(message);
 
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.cw-named-groups.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.cw-named-groups.test.ts
index 0774b2bf..e88f1f52 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.cw-named-groups.test.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.cw-named-groups.test.ts
@@ -7,9 +7,9 @@ import {
     createTypeInterface
 } from '../client'
 import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
-const ctx = new RenderContext(execute_msg);
+const ctx = makeContext(execute_msg);
 
 it('execute_msg', () => {
     expectCode(createTypeInterface(
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.cw-proposal-single.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.cw-proposal-single.test.ts
index d592ac8b..77ed57fa 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.cw-proposal-single.test.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.cw-proposal-single.test.ts
@@ -7,11 +7,10 @@ import {
     createExecuteInterface,
     createTypeInterface
 } from '../client'
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
 it('execute_msg_for', () => {
-    const ctx = new RenderContext(execute_msg);
+    const ctx = makeContext(execute_msg);
     expectCode(createTypeInterface(
         ctx,
         execute_msg
@@ -20,7 +19,7 @@ it('execute_msg_for', () => {
 
 
 it('query classes', () => {
-    const ctx = new RenderContext(query_msg);
+    const ctx = makeContext(query_msg);
     expectCode(createQueryClass(
         ctx,
         'SG721QueryClient',
@@ -30,7 +29,7 @@ it('query classes', () => {
 });
 
 it('execute classes array types', () => {
-    const ctx = new RenderContext(execute_msg);
+    const ctx = makeContext(execute_msg);
     expectCode(createExecuteClass(
         ctx,
         'SG721Client',
@@ -41,7 +40,7 @@ it('execute classes array types', () => {
 });
 
 it('execute interfaces no extends', () => {
-    const ctx = new RenderContext(execute_msg);
+    const ctx = makeContext(execute_msg);
     expectCode(createExecuteInterface(
         ctx,
         'SG721Instance',
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.empty-enums.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.empty-enums.spec.ts
index 44e8a506..f6d5daa3 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.empty-enums.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.empty-enums.spec.ts
@@ -4,10 +4,9 @@ import {
     createQueryClass,
     createQueryInterface
 } from '../client'
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
-const ctx = new RenderContext(query_msg);
+const ctx = makeContext(query_msg);
 
 it('query classes', () => {
     expectCode(createQueryClass(
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issues.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.issues.test.ts
index 6aed0369..d1b70188 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.issues.test.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.issues.test.ts
@@ -1,11 +1,10 @@
-import { globContracts } from '../../../test-utils'
+import { globContracts, makeContext } from '../../../test-utils'
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
 } from '../client'
-import { RenderContext } from '../../context';
 import { expectCode } from '../../../test-utils';
 import cases from 'jest-in-case';
 
@@ -13,7 +12,7 @@ const contracts = globContracts('issues/55');
 
 
 cases('execute_msg_for__empty', async opts => {
-    const ctx = new RenderContext(opts.content);
+    const ctx = makeContext(opts.content);
     expectCode(createTypeInterface(
         ctx,
         opts.content
@@ -21,7 +20,7 @@ cases('execute_msg_for__empty', async opts => {
 }, contracts);
 
 cases('query classes', async opts => {
-    const ctx = new RenderContext(opts.content);
+    const ctx = makeContext(opts.content);
     expectCode(createQueryClass(
         ctx,
         'SG721QueryClient',
@@ -31,7 +30,7 @@ cases('query classes', async opts => {
 }, contracts);
 
 cases('execute class', async opts => {
-    const ctx = new RenderContext(opts.content);
+    const ctx = makeContext(opts.content);
     expectCode(createExecuteClass(
         ctx,
         'SG721Client',
@@ -42,7 +41,7 @@ cases('execute class', async opts => {
 }, contracts);
 
 cases('execute interface', async opts => {
-    const ctx = new RenderContext(opts.content);
+    const ctx = makeContext(opts.content);
     expectCode(createExecuteInterface(
         ctx,
         'SG721Instance',
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.sg721.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.sg721.spec.ts
index 489e96cb..69f2f971 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.sg721.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.sg721.spec.ts
@@ -5,10 +5,9 @@ import {
     createExecuteInterface,
     createTypeInterface
 } from '../client'
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
-const ctx = new RenderContext(execute_msg_for__empty);
+const ctx = makeContext(execute_msg_for__empty);
 
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.spec.ts
index 4db182a9..e8decbb5 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.spec.ts
@@ -22,11 +22,10 @@ import {
   createTypeInterface
 } from '../client';
 
-import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
 it('approval_response', () => {
-  const ctx = new RenderContext(approval_response);
+  const ctx = makeContext(approval_response);
   expectCode(createTypeInterface(
     ctx,
     approval_response
@@ -34,70 +33,70 @@ it('approval_response', () => {
 });
 
 it('all_nft_info_response', () => {
-  const ctx = new RenderContext(all_nft_info_response);
+  const ctx = makeContext(all_nft_info_response);
   expectCode(createTypeInterface(
     ctx,
     all_nft_info_response
   ))
 })
 it('approvals_response', () => {
-  const ctx = new RenderContext(approvals_response);
+  const ctx = makeContext(approvals_response);
   expectCode(createTypeInterface(
     ctx,
     approvals_response
   ))
 })
 it('collection_info_response', () => {
-  const ctx = new RenderContext(collection_info_response);
+  const ctx = makeContext(collection_info_response);
   expectCode(createTypeInterface(
     ctx,
     collection_info_response
   ))
 })
 it('contract_info_response', () => {
-  const ctx = new RenderContext(contract_info_response);
+  const ctx = makeContext(contract_info_response);
   expectCode(createTypeInterface(
     ctx,
     contract_info_response
   ))
 })
 it('instantiate_msg', () => {
-  const ctx = new RenderContext(instantiate_msg);
+  const ctx = makeContext(instantiate_msg);
   expectCode(createTypeInterface(
     ctx,
     instantiate_msg
   ))
 })
 it('nft_info_response', () => {
-  const ctx = new RenderContext(nft_info_response);
+  const ctx = makeContext(nft_info_response);
   expectCode(createTypeInterface(
     ctx,
     nft_info_response
   ))
 })
 it('num_tokens_response', () => {
-  const ctx = new RenderContext(num_tokens_response);
+  const ctx = makeContext(num_tokens_response);
   expectCode(createTypeInterface(
     ctx,
     num_tokens_response
   ))
 })
 it('operators_response', () => {
-  const ctx = new RenderContext(operators_response);
+  const ctx = makeContext(operators_response);
   expectCode(createTypeInterface(
     ctx,
     operators_response
   ))
 })
 it('owner_of_response', () => {
-  const ctx = new RenderContext(owner_of_response);
+  const ctx = makeContext(owner_of_response);
   expectCode(createTypeInterface(
     ctx,
     owner_of_response
   ))
 })
 it('tokens_response', () => {
-  const ctx = new RenderContext(tokens_response);
+  const ctx = makeContext(tokens_response);
   expectCode(createTypeInterface(
     ctx,
     tokens_response
@@ -105,7 +104,7 @@ it('tokens_response', () => {
 })
 
 it('query classes', () => {
-  const ctx = new RenderContext(query_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createQueryClass(
     ctx,
     'SG721QueryClient',
@@ -115,7 +114,7 @@ it('query classes', () => {
 });
 
 it('execute classes', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteClass(
     ctx,
     'SG721Client',
@@ -126,7 +125,7 @@ it('execute classes', () => {
 });
 
 it('execute classes no extends', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteClass(
     ctx,
     'SG721Client',
@@ -137,7 +136,7 @@ it('execute classes no extends', () => {
 });
 
 it('execute classes array types', () => {
-  const ctx = new RenderContext(execute_msg_named_groups);
+  const ctx = makeContext(execute_msg_named_groups);
   expectCode(createExecuteClass(
     ctx,
     'SG721Client',
@@ -148,7 +147,7 @@ it('execute classes array types', () => {
 });
 
 it('execute interfaces no extends', () => {
-  const ctx = new RenderContext(execute_msg);
+  const ctx = makeContext(execute_msg);
   expectCode(createExecuteInterface(
     ctx,
     'SG721Instance',
@@ -158,7 +157,7 @@ it('execute interfaces no extends', () => {
 });
 
 it('query interfaces', () => {
-  const ctx = new RenderContext(query_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createQueryInterface(
     ctx,
     'SG721ReadOnlyInstance',
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts
index cdfdc8c2..dde93637 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts
@@ -12,10 +12,10 @@ import {
 } from '../client';
 
 import { RenderContext } from '../../context';
-import { expectCode } from '../../../test-utils';
+import { expectCode, makeContext } from '../../../test-utils';
 
 it('cosmos_msg_for__empty', () => {
-    const ctx = new RenderContext(cosmos_msg_for__empty);
+    const ctx = makeContext(cosmos_msg_for__empty);
     expectCode(createTypeInterface(
         ctx,
         cosmos_msg_for__empty
@@ -23,7 +23,7 @@ it('cosmos_msg_for__empty', () => {
 });
 
 it('execute_msg_for__empty', () => {
-    const ctx = new RenderContext(execute_msg_for__empty);
+    const ctx = makeContext(execute_msg_for__empty);
     expectCode(createTypeInterface(
         ctx,
         execute_msg_for__empty
@@ -31,7 +31,7 @@ it('execute_msg_for__empty', () => {
 })
 
 it('can_execute_relay_response', () => {
-    const ctx = new RenderContext(can_execute_relay_response);
+    const ctx = makeContext(can_execute_relay_response);
     expectCode(createTypeInterface(
         ctx,
         can_execute_relay_response
@@ -39,7 +39,7 @@ it('can_execute_relay_response', () => {
 })
 
 it('info_response', () => {
-    const ctx = new RenderContext(info_response);
+    const ctx = makeContext(info_response);
     expectCode(createTypeInterface(
         ctx,
         info_response
@@ -47,7 +47,7 @@ it('info_response', () => {
 })
 
 it('relay_transaction', () => {
-    const ctx = new RenderContext(relay_transaction);
+    const ctx = makeContext(relay_transaction);
     expectCode(createTypeInterface(
         ctx,
         relay_transaction
@@ -56,7 +56,7 @@ it('relay_transaction', () => {
 
 
 it('query classes', () => {
-    const ctx = new RenderContext(cosmos_msg_for__empty);
+    const ctx = makeContext(cosmos_msg_for__empty);
     expectCode(createQueryClass(
         ctx,
         'SG721QueryClient',
@@ -66,7 +66,7 @@ it('query classes', () => {
 });
 
 it('query classes', () => {
-    const ctx = new RenderContext(execute_msg_for__empty);
+    const ctx = makeContext(execute_msg_for__empty);
     expectCode(createQueryClass(
         ctx,
         'SG721QueryClient',
@@ -76,7 +76,7 @@ it('query classes', () => {
 });
 
 it('execute classes array types', () => {
-    const ctx = new RenderContext(execute_msg_for__empty);
+    const ctx = makeContext(execute_msg_for__empty);
     expectCode(createExecuteClass(
         ctx,
         'SG721Client',
@@ -87,7 +87,7 @@ it('execute classes array types', () => {
 });
 
 it('execute interfaces no extends', () => {
-    const ctx = new RenderContext(execute_msg_for__empty);
+    const ctx = makeContext(execute_msg_for__empty);
     expectCode(createExecuteInterface(
         ctx,
         'SG721Instance',
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 6d81dd74..23ec6b25 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -27,6 +27,27 @@ export interface TSTypesOptions {
 }
 
 /// END Plugin Types
+
+interface KeyedSchema {
+    [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;
+}
+
+export interface ContractInfo {
+    schemas: JSONSchema[];
+    responses?: Record<string, JSONSchema>;
+    idlObject?: IDLObject;
+};
 export interface RenderOptions {
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
@@ -36,7 +57,7 @@ export interface RenderOptions {
 }
 
 export interface RenderContext {
-    schema: JSONSchema;
+    contract: ContractInfo;
     options: RenderOptions;
 }
 
@@ -64,14 +85,33 @@ export const defaultOptions: RenderOptions = {
     }
 };
 
+export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
+    const aggregateSchema = {
+        definitions: {
+            //
+        }
+    };
+
+    schemas.forEach(schema => {
+        schema.definitions = schema.definitions || {};
+        aggregateSchema.definitions = {
+            ...aggregateSchema.definitions,
+            ...schema.definitions
+        };
+    });
+
+    return aggregateSchema;
+};
 export class RenderContext implements RenderContext {
-    schema: JSONSchema;
+    contract: ContractInfo;
     utils: string[] = [];
+    schema: JSONSchema;
     constructor(
-        schema: JSONSchema,
+        contract: ContractInfo,
         options?: RenderOptions
     ) {
-        this.schema = schema;
+        this.contract = contract;
+        this.schema = getDefinitionSchema(contract.schemas);
         this.options = deepmerge(defaultOptions, options ?? {});
     }
     refLookup($ref: string) {
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts b/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
index 83c89714..5b840aaf 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
@@ -3,11 +3,10 @@ import {
     createMessageComposerClass,
     createMessageComposerInterface
 } from './message-composer'
-import { RenderContext } from '../context';
-import { expectCode } from '../../test-utils';
+import { expectCode, makeContext } from '../../test-utils';
 
 it('execute classes', () => {
-    const ctx = new RenderContext(execute_msg);
+    const ctx = makeContext(execute_msg);
     expectCode(createMessageComposerClass(
         ctx,
         'SG721MessageComposer',
@@ -17,7 +16,7 @@ it('execute classes', () => {
 });
 
 it('createMessageComposerInterface', () => {
-    const ctx = new RenderContext(execute_msg);
+    const ctx = makeContext(execute_msg);
     expectCode(createMessageComposerInterface(
         ctx,
         'SG721Message',
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
index 6d5c2fca..1a2dcdfb 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.spec.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
@@ -7,10 +7,10 @@ import {
   createReactQueryHooks,
   createReactQueryMutationHooks,
 } from './react-query'
-import { expectCode } from '../../test-utils';
+import { expectCode, makeContext } from '../../test-utils';
 
-const execCtx = new RenderContext(execute_msg);
-const queryCtx = new RenderContext(query_msg);
+const execCtx = makeContext(execute_msg);
+const queryCtx = makeContext(query_msg);
 
 it('createReactQueryHooks', () => {
   expectCode(t.program(
@@ -25,7 +25,7 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: new RenderContext(query_msg, {
+        context: makeContext(query_msg, {
           reactQuery: {
             optionalClient: true
           }
@@ -38,7 +38,7 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: new RenderContext(query_msg, {
+        context: makeContext(query_msg, {
           reactQuery: {
             version: 'v4'
           }
@@ -51,7 +51,7 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: new RenderContext(query_msg, {
+        context: makeContext(query_msg, {
           reactQuery: {
             optionalClient: true,
             version: 'v4'
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index b482934f..91935510 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -7,14 +7,12 @@ import {
     omitTypeReference,
     optionalConditionalExpression,
     propertySignature,
-    shorthandProperty,
-    typeRefOrUnionWithUndefined
+    shorthandProperty
 } from '../utils/babel';
-import { getParamsTypeAnnotation, getPropertyType } from '../utils/types';
+import { getParamsTypeAnnotation, getPropertyType, getResponseType } from '../utils/types';
 import { ReactQueryOptions, RenderContext } from '../context';
 import { JSONSchema } from '../types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
-import { ArgumentPlaceholder, JSXNamespacedName, SpreadElement } from '@babel/types';
 
 interface ReactQueryHookQuery {
     context: RenderContext,
@@ -42,28 +40,28 @@ export const createReactQueryHooks = ({
 }: ReactQueryHooks) => {
     const options = context.options.reactQuery;
 
-  const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
-  const underscoreNames: string[] = getMessageProperties(queryMsg).map((schema) => (Object.keys(schema.properties)[0]))
+    const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
+    const underscoreNames: string[] = getMessageProperties(queryMsg).map((schema) => (Object.keys(schema.properties)[0]))
 
-  const body = []
+    const body = []
 
-  const queryKeysName = `${camel(contractName)}QueryKeys`
-  if (options.queryKeys) {
-    body.push(
-      createReactQueryKeys({
-        context,
-        queryKeysName,
-        camelContractName: camel(contractName),
-        underscoreNames,
-      }))
-  }
+    const queryKeysName = `${camel(contractName)}QueryKeys`
+    if (options.queryKeys) {
+        body.push(
+            createReactQueryKeys({
+                context,
+                queryKeysName,
+                camelContractName: camel(contractName),
+                underscoreNames,
+            }))
+    }
 
-  body.push(
-      createReactQueryHookGenericInterface({
-        context,
-        QueryClient,
-        genericQueryInterfaceName,
-      }))
+    body.push(
+        createReactQueryHookGenericInterface({
+            context,
+            QueryClient,
+            genericQueryInterfaceName,
+        }))
 
     body.push(...getMessageProperties(queryMsg)
         .reduce((m, schema) => {
@@ -76,7 +74,7 @@ export const createReactQueryHooks = ({
             // useCw3FlexMultisigListVotersQuery
             const hookName = `use${hookParamsTypeName}`;
             // listVotersResponse
-            const responseType = pascal(`${methodName}Response`);
+            const responseType = getResponseType(context, underscoreName);
             // cw3FlexMultisigListVoters
             const getterKey = camel(`${contractName}${pascal(methodName)}`);
             const jsonschema = schema.properties[underscoreName];
@@ -146,9 +144,9 @@ export const createReactQueryHook = ({
         props = ['client', 'args', 'options'];
     }
 
-  const selectResponseGenericTypeName = 'TData';
+    const selectResponseGenericTypeName = 'TData';
 
-  const queryFunctionDeclaration =
+    const queryFunctionDeclaration =
         t.functionDeclaration(
             t.identifier(hookName),
             [
@@ -166,7 +164,7 @@ export const createReactQueryHook = ({
                     t.tsTypeAnnotation(t.tsTypeReference(
                         t.identifier(hookParamsTypeName),
                         t.tsTypeParameterInstantiation([
-                          t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
+                            t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
                         ])
                     ))
                 )
@@ -178,7 +176,7 @@ export const createReactQueryHook = ({
                         callExpression(
                             t.identifier('useQuery'),
                             [
-                                    generateUseQueryQueryKey({hookKeyName, queryKeysName, methodName, props, options }),
+                                generateUseQueryQueryKey({ hookKeyName, queryKeysName, methodName, props, options }),
                                 t.arrowFunctionExpression(
                                     [],
                                     optionalConditionalExpression(
@@ -260,18 +258,18 @@ export const createReactQueryHook = ({
 
                 ]
             ),
-      )
-
-  // Add the TData type parameters
-  queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([
-      t.tsTypeParameter(
-        undefined,
-        t.tSTypeReference(t.identifier(responseType)),
-        selectResponseGenericTypeName
-      )
+        )
+
+    // Add the TData type parameters
+    queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([
+        t.tsTypeParameter(
+            undefined,
+            t.tSTypeReference(t.identifier(responseType)),
+            selectResponseGenericTypeName
+        )
     ])
 
-  return  t.exportNamedDeclaration(queryFunctionDeclaration)
+    return t.exportNamedDeclaration(queryFunctionDeclaration)
 
 };
 
@@ -547,142 +545,142 @@ export const createReactQueryMutationHook = ({
 };
 
 function createReactQueryKeys({
-  context,
-  queryKeysName,
-  camelContractName,
-  underscoreNames
+    context,
+    queryKeysName,
+    camelContractName,
+    underscoreNames
 }: {
-  context: RenderContext;
-  queryKeysName: string,
-  camelContractName: string;
-  underscoreNames: string[];
+    context: RenderContext;
+    queryKeysName: string,
+    camelContractName: string;
+    underscoreNames: string[];
 }) {
-  const options = context.options.reactQuery
-
-  const contractAddressTypeAnnotation = t.tsTypeAnnotation(
-    options.optionalClient
-      ? t.tsUnionType([
-        t.tsStringKeyword(),
-        t.tsUndefinedKeyword()
-      ])
-      : t.tSStringKeyword()
-  )
+    const options = context.options.reactQuery
+
+    const contractAddressTypeAnnotation = t.tsTypeAnnotation(
+        options.optionalClient
+            ? t.tsUnionType([
+                t.tsStringKeyword(),
+                t.tsUndefinedKeyword()
+            ])
+            : t.tSStringKeyword()
+    )
 
-  return t.exportNamedDeclaration(
-    t.variableDeclaration('const', [
-      t.variableDeclarator(
-        t.identifier(queryKeysName),
-        t.objectExpression([
-          // 1: contract
-          t.objectProperty(
-            t.identifier('contract'),
-            t.tSAsExpression(
-              t.arrayExpression([
+    return t.exportNamedDeclaration(
+        t.variableDeclaration('const', [
+            t.variableDeclarator(
+                t.identifier(queryKeysName),
                 t.objectExpression([
-                  t.objectProperty(
-                    t.identifier('contract'),
-                    t.stringLiteral(camelContractName)
-                  )
-                ])
-              ]),
-              t.tSTypeReference(t.identifier('const'))
-            )
-          ),
-          // 2: address
-          t.objectProperty(
-            t.identifier('address'),
-            t.arrowFunctionExpression(
-              [
-                identifier(
-                  'contractAddress',
-                  contractAddressTypeAnnotation
-                )
-              ],
-              t.tSAsExpression(
-                t.arrayExpression([
-                  t.objectExpression([
-                    // 1
-                    t.spreadElement(
-                      t.memberExpression(
-                        t.memberExpression(
-                          t.identifier(queryKeysName),
-                          t.identifier('contract')
-                        ),
-                        t.numericLiteral(0),
-                        true // computed
-                      )
+                    // 1: contract
+                    t.objectProperty(
+                        t.identifier('contract'),
+                        t.tSAsExpression(
+                            t.arrayExpression([
+                                t.objectExpression([
+                                    t.objectProperty(
+                                        t.identifier('contract'),
+                                        t.stringLiteral(camelContractName)
+                                    )
+                                ])
+                            ]),
+                            t.tSTypeReference(t.identifier('const'))
+                        )
                     ),
+                    // 2: address
                     t.objectProperty(
-                      t.identifier('address'),
-                      t.identifier('contractAddress')
-                    )
-                  ])
-                ]),
-                t.tSTypeReference(t.identifier('const'))
-              )
-            )
-          ),
-          // 3: methods
-          ...underscoreNames.map((underscoreMethodName) =>
-            t.objectProperty(
-              // key id is the camel method name
-              t.identifier(camel(underscoreMethodName)),
-              t.arrowFunctionExpression(
-                [
-                  identifier(
-                    'contractAddress',
-                    contractAddressTypeAnnotation
-                  ),
-                  identifier(
-                    'args',
-                    // Record<string, unknown>
-                    t.tSTypeAnnotation(
-                      t.tsTypeReference(
-                        t.identifier('Record'),
-                        t.tsTypeParameterInstantiation([
-                          t.tsStringKeyword(),
-                          t.tsUnknownKeyword()
-                        ])
-                      )
+                        t.identifier('address'),
+                        t.arrowFunctionExpression(
+                            [
+                                identifier(
+                                    'contractAddress',
+                                    contractAddressTypeAnnotation
+                                )
+                            ],
+                            t.tSAsExpression(
+                                t.arrayExpression([
+                                    t.objectExpression([
+                                        // 1
+                                        t.spreadElement(
+                                            t.memberExpression(
+                                                t.memberExpression(
+                                                    t.identifier(queryKeysName),
+                                                    t.identifier('contract')
+                                                ),
+                                                t.numericLiteral(0),
+                                                true // computed
+                                            )
+                                        ),
+                                        t.objectProperty(
+                                            t.identifier('address'),
+                                            t.identifier('contractAddress')
+                                        )
+                                    ])
+                                ]),
+                                t.tSTypeReference(t.identifier('const'))
+                            )
+                        )
                     ),
-                    true // optional
-                  )
-                ],
-                t.tSAsExpression(
-                  t.arrayExpression([
-                    t.objectExpression([
-                      //...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
-                      t.spreadElement(
-                        t.memberExpression(
-                          t.callExpression(
-                            t.memberExpression(
-                              t.identifier(queryKeysName),
-                              t.identifier('address')
-                            ),
-                            [t.identifier('contractAddress')]
-                          ),
-                          t.numericLiteral(0),
-                          true // computed
+                    // 3: methods
+                    ...underscoreNames.map((underscoreMethodName) =>
+                        t.objectProperty(
+                            // key id is the camel method name
+                            t.identifier(camel(underscoreMethodName)),
+                            t.arrowFunctionExpression(
+                                [
+                                    identifier(
+                                        'contractAddress',
+                                        contractAddressTypeAnnotation
+                                    ),
+                                    identifier(
+                                        'args',
+                                        // Record<string, unknown>
+                                        t.tSTypeAnnotation(
+                                            t.tsTypeReference(
+                                                t.identifier('Record'),
+                                                t.tsTypeParameterInstantiation([
+                                                    t.tsStringKeyword(),
+                                                    t.tsUnknownKeyword()
+                                                ])
+                                            )
+                                        ),
+                                        true // optional
+                                    )
+                                ],
+                                t.tSAsExpression(
+                                    t.arrayExpression([
+                                        t.objectExpression([
+                                            //...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
+                                            t.spreadElement(
+                                                t.memberExpression(
+                                                    t.callExpression(
+                                                        t.memberExpression(
+                                                            t.identifier(queryKeysName),
+                                                            t.identifier('address')
+                                                        ),
+                                                        [t.identifier('contractAddress')]
+                                                    ),
+                                                    t.numericLiteral(0),
+                                                    true // computed
+                                                )
+                                            ),
+                                            // method: list_voters
+                                            t.objectProperty(
+                                                t.identifier('method'),
+                                                t.stringLiteral(underscoreMethodName)
+                                            ),
+                                            // args
+                                            shorthandProperty('args')
+                                        ])
+                                    ]),
+                                    t.tSTypeReference(t.identifier('const'))
+                                )
+                            )
                         )
-                      ),
-                      // method: list_voters
-                      t.objectProperty(
-                        t.identifier('method'),
-                        t.stringLiteral(underscoreMethodName)
-                      ),
-                      // args
-                      shorthandProperty('args')
-                    ])
-                  ]),
-                  t.tSTypeReference(t.identifier('const'))
-                )
-              )
+                    )
+                ])
             )
-          )
         ])
-      )
-    ])
-  )
+    )
 }
 
 interface ReactQueryHookGenericInterface {
@@ -708,15 +706,15 @@ function createReactQueryHookGenericInterface({
     const typedUseQueryOptions = t.tsTypeReference(
         t.identifier('UseQueryOptions'),
         t.tsTypeParameterInstantiation(
-          [
-            t.tsTypeReference(
-                t.identifier(genericResponseTypeName)
-            ),
-            t.tsTypeReference(t.identifier('Error')),
-            t.tsTypeReference(
-                t.identifier(genericSelectResponseTypeName)
-            )
-        ])
+            [
+                t.tsTypeReference(
+                    t.identifier(genericResponseTypeName)
+                ),
+                t.tsTypeReference(t.identifier('Error')),
+                t.tsTypeReference(
+                    t.identifier(genericSelectResponseTypeName)
+                )
+            ])
     )
 
     const body = [
@@ -761,14 +759,14 @@ function createReactQueryHookGenericInterface({
         t.tsInterfaceDeclaration(
             t.identifier(genericQueryInterfaceName),
             t.tsTypeParameterDeclaration([
-              // 1: TResponse
-              t.tsTypeParameter(undefined, undefined, genericResponseTypeName),
-              // 2: TData
-              t.tsTypeParameter(
-                undefined,
-                t.tSTypeReference(t.identifier(genericResponseTypeName)),
-                genericSelectResponseTypeName
-              )
+                // 1: TResponse
+                t.tsTypeParameter(undefined, undefined, genericResponseTypeName),
+                // 2: TData
+                t.tsTypeParameter(
+                    undefined,
+                    t.tSTypeReference(t.identifier(genericResponseTypeName)),
+                    genericSelectResponseTypeName
+                )
             ]),
             [],
             t.tSInterfaceBody(body)
@@ -814,7 +812,7 @@ export const createReactQueryHookInterface = ({
         t.tsInterfaceDeclaration(
             t.identifier(hookParamsTypeName),
             t.tsTypeParameterDeclaration([
-              t.tSTypeParameter(undefined, undefined, 'TData')
+                t.tSTypeParameter(undefined, undefined, 'TData')
             ]),
             [
                 t.tSExpressionWithTypeArguments(
@@ -854,11 +852,11 @@ const getProps = (
 }
 
 interface GenerateUseQueryQueryKeyParams {
-  hookKeyName: string;
-  queryKeysName: string;
-  methodName: string;
-  props: string[];
-  options: ReactQueryOptions;
+    hookKeyName: string;
+    queryKeysName: string;
+    methodName: string;
+    props: string[];
+    options: ReactQueryOptions;
 }
 
 const generateUseQueryQueryKey = ({
@@ -867,37 +865,37 @@ const generateUseQueryQueryKey = ({
     methodName,
     props,
     options,
-  }: GenerateUseQueryQueryKeyParams): t.ArrayExpression | t.CallExpression => {
-  const { optionalClient, queryKeys } = options
+}: GenerateUseQueryQueryKeyParams): t.ArrayExpression | t.CallExpression => {
+    const { optionalClient, queryKeys } = options
 
-  const hasArgs = props.includes('args')
+    const hasArgs = props.includes('args')
 
-  const contractAddressExpression =
-    t.optionalMemberExpression(
-      t.identifier('client'),
-      t.identifier('contractAddress'),
-      false,
-      optionalClient
-    )
+    const contractAddressExpression =
+        t.optionalMemberExpression(
+            t.identifier('client'),
+            t.identifier('contractAddress'),
+            false,
+            optionalClient
+        )
 
-  if (queryKeys) {
+    if (queryKeys) {
 
-    const callArgs: Array<Expression> = [contractAddressExpression]
+        const callArgs: Array<Expression> = [contractAddressExpression]
 
-    if (hasArgs) callArgs.push(t.identifier('args'))
+        if (hasArgs) callArgs.push(t.identifier('args'))
 
-    return t.callExpression(
-      t.memberExpression(
-        t.identifier(queryKeysName),
-        t.identifier(camel(methodName))
-      ),
-      callArgs
-    )
-  }
+        return t.callExpression(
+            t.memberExpression(
+                t.identifier(queryKeysName),
+                t.identifier(camel(methodName))
+            ),
+            callArgs
+        )
+    }
 
     const queryKey: Array<Expression> = [
-      t.stringLiteral(hookKeyName),
-      contractAddressExpression
+        t.stringLiteral(hookKeyName),
+        contractAddressExpression
     ];
 
     if (hasArgs) {
diff --git a/packages/wasm-ast-types/src/recoil/recoil.spec.ts b/packages/wasm-ast-types/src/recoil/recoil.spec.ts
index 418d8b47..0719711d 100644
--- a/packages/wasm-ast-types/src/recoil/recoil.spec.ts
+++ b/packages/wasm-ast-types/src/recoil/recoil.spec.ts
@@ -6,16 +6,17 @@ import {
     createRecoilQueryClient,
 } from './recoil';
 import { RenderContext } from '../context';
-import { expectCode } from '../../test-utils';
+import { expectCode, makeContext } from '../../test-utils';
 
-const ctx = new RenderContext(query_msg);
+const ctx = makeContext(query_msg);
 
 it('selector', () => {
     expectCode(createRecoilSelector(
         ctx,
         'SG721',
         'SG721QueryClient',
-        'governanceModules'
+        'governanceModules',
+        'GovernanceModulesResponse'
     ))
 });
 
diff --git a/packages/wasm-ast-types/src/recoil/recoil.ts b/packages/wasm-ast-types/src/recoil/recoil.ts
index c669b5fc..fb4e02f8 100644
--- a/packages/wasm-ast-types/src/recoil/recoil.ts
+++ b/packages/wasm-ast-types/src/recoil/recoil.ts
@@ -2,7 +2,8 @@ import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import {
   callExpression,
-  getMessageProperties
+  getMessageProperties,
+  getResponseType
 } from '../utils';
 import { QueryMsg } from '../types';
 import { RenderContext } from '../context';
@@ -11,13 +12,13 @@ export const createRecoilSelector = (
   context: RenderContext,
   keyPrefix: string,
   QueryClient: string,
-  methodName: string
+  methodName: string,
+  responseType: string
 ) => {
 
   context.addUtil('selectorFamily');
 
   const selectorName = camel(`${methodName}Selector`);
-  const responseType = pascal(`${methodName}Response`);
   const getterKey = camel(`${keyPrefix}${pascal(methodName)}`);
 
   return t.exportNamedDeclaration(
@@ -164,12 +165,14 @@ export const createRecoilSelectors = (
 
       const underscoreName = Object.keys(schema.properties)[0];
       const methodName = camel(underscoreName);
+      const responseType = getResponseType(context, underscoreName);
 
       return createRecoilSelector(
         context,
         keyPrefix,
         QueryClient,
-        methodName
+        methodName,
+        responseType
       );
 
     });
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index f7f31444..aa08f114 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -1,10 +1,23 @@
 import * as t from '@babel/types';
-import { camel } from 'case';
+import { camel, pascal } from 'case';
 import { propertySignature } from './babel';
 import { TSTypeAnnotation } from '@babel/types';
 import { RenderContext } from '../context';
 import { JSONSchema } from '../types';
 
+export function getResponseType(
+  context: RenderContext,
+  underscoreName: string
+) {
+  const methodName = camel(underscoreName);
+  return pascal(
+    context.contract?.responses?.[underscoreName]?.title
+    ??
+    // after v1.1 is adopted, we can deprecate this and require the above response
+    `${methodName}Response`
+  );
+};
+
 const getTypeStrFromRef = ($ref) => {
   if ($ref?.startsWith('#/definitions/')) {
     return $ref.replace('#/definitions/', '');
@@ -162,6 +175,7 @@ export const getPropertyType = (
   return { type, optional };
 };
 
+
 export function getPropertySignatureFromProp(
   context: RenderContext,
   jsonschema: JSONSchema,
diff --git a/packages/wasm-ast-types/test-utils/index.ts b/packages/wasm-ast-types/test-utils/index.ts
index de0df777..1d489368 100644
--- a/packages/wasm-ast-types/test-utils/index.ts
+++ b/packages/wasm-ast-types/test-utils/index.ts
@@ -3,6 +3,7 @@ import { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { join } from 'path';
 import { JSONSchema } from '../src/types';
+import { RenderContext, RenderOptions } from '../src/context';
 
 export const expectCode = (ast) => {
     expect(
@@ -16,6 +17,17 @@ export const printCode = (ast) => {
     );
 }
 
+export const makeContext = (
+    schema: JSONSchema,
+    options?: RenderOptions,
+    responses?: Record<string, JSONSchema>
+) => {
+    return new RenderContext({
+        schemas: [schema],
+        responses
+    }, options)
+};
+
 interface GlobContract {
     name: `/${string}.json`;
     content: JSONSchema;
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 8dd73001..7464030c 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -20,6 +20,25 @@ export interface TSTypesOptions {
     enabled?: boolean;
     aliasExecuteMsg?: boolean;
 }
+interface KeyedSchema {
+    [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;
+}
+export interface ContractInfo {
+    schemas: JSONSchema[];
+    responses?: Record<string, JSONSchema>;
+    idlObject?: IDLObject;
+}
 export interface RenderOptions {
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
@@ -28,15 +47,18 @@ export interface RenderOptions {
     reactQuery?: ReactQueryOptions;
 }
 export interface RenderContext {
-    schema: JSONSchema;
+    contract: ContractInfo;
     options: RenderOptions;
 }
 export declare const defaultOptions: RenderOptions;
+export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
 export declare class RenderContext implements RenderContext {
-    schema: JSONSchema;
+    contract: ContractInfo;
     utils: string[];
-    constructor(schema: JSONSchema, options?: RenderOptions);
+    schema: JSONSchema;
+    constructor(contract: ContractInfo, options?: RenderOptions);
     refLookup($ref: string): JSONSchema;
     addUtil(util: string): void;
     getImports(): any[];
 }
+export {};
diff --git a/packages/wasm-ast-types/types/react-query/react-query.d.ts b/packages/wasm-ast-types/types/react-query/react-query.d.ts
index 47fcdb78..b4ecf402 100644
--- a/packages/wasm-ast-types/types/react-query/react-query.d.ts
+++ b/packages/wasm-ast-types/types/react-query/react-query.d.ts
@@ -7,6 +7,7 @@ interface ReactQueryHookQuery {
     hookName: string;
     hookParamsTypeName: string;
     hookKeyName: string;
+    queryKeysName: string;
     responseType: string;
     methodName: string;
     jsonschema: any;
@@ -17,8 +18,8 @@ interface ReactQueryHooks {
     contractName: string;
     QueryClient: string;
 }
-export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => t.ExportNamedDeclaration[];
-export declare const createReactQueryHook: ({ context, hookName, hookParamsTypeName, responseType, hookKeyName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
+export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => any[];
+export declare const createReactQueryHook: ({ context, hookName, hookParamsTypeName, responseType, hookKeyName, queryKeysName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
 interface ReactQueryMutationHookInterface {
     context: RenderContext;
     ExecuteClient: string;
diff --git a/packages/wasm-ast-types/types/recoil/recoil.d.ts b/packages/wasm-ast-types/types/recoil/recoil.d.ts
index 9b035042..03ee4b37 100644
--- a/packages/wasm-ast-types/types/recoil/recoil.d.ts
+++ b/packages/wasm-ast-types/types/recoil/recoil.d.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { QueryMsg } from '../types';
 import { RenderContext } from '../context';
-export declare const createRecoilSelector: (context: RenderContext, keyPrefix: string, QueryClient: string, methodName: string) => t.ExportNamedDeclaration;
+export declare const createRecoilSelector: (context: RenderContext, keyPrefix: string, QueryClient: string, methodName: string, responseType: string) => t.ExportNamedDeclaration;
 export declare const createRecoilSelectors: (context: RenderContext, keyPrefix: string, QueryClient: string, queryMsg: QueryMsg) => any;
 export declare const createRecoilQueryClientType: () => {
     type: string;
diff --git a/packages/wasm-ast-types/types/utils/types.d.ts b/packages/wasm-ast-types/types/utils/types.d.ts
index f4e52129..bbde18ac 100644
--- a/packages/wasm-ast-types/types/utils/types.d.ts
+++ b/packages/wasm-ast-types/types/utils/types.d.ts
@@ -2,6 +2,7 @@ import * as t from '@babel/types';
 import { TSTypeAnnotation } from '@babel/types';
 import { RenderContext } from '../context';
 import { JSONSchema } from '../types';
+export declare function getResponseType(context: RenderContext, underscoreName: string): string;
 export declare const getTypeFromRef: ($ref: any) => t.TSTypeReference;
 export declare const getType: (type: any) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword;
 export declare const getPropertyType: (context: RenderContext, schema: JSONSchema, prop: string) => {

From a80e254e692ba6bfeb62aaacf008925eb7d76eee Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 12 Sep 2022 22:14:53 -0400
Subject: [PATCH 032/287] fixtures

---
 .../cw3-fixed-multisig.json                   | 3360 +++++++++++++++++
 .../idl-version/cw4-group/cw4-group.json      |  385 ++
 .../Cw3FixedMultiSig.client.ts                |  283 ++
 .../Cw3FixedMultiSig.message-composer.ts      |  144 +
 .../Cw3FixedMultiSig.react-query.ts           |  130 +
 .../Cw3FixedMultiSig.recoil.ts                |  136 +
 .../Cw3FixedMultiSig.types.ts                 |  254 ++
 .../idl-version/cw4-group/Cw4Group.client.ts  |  177 +
 .../cw4-group/Cw4Group.message-composer.ts    |  130 +
 .../cw4-group/Cw4Group.react-query.ts         |   66 +
 .../idl-version/cw4-group/Cw4Group.recoil.ts  |   94 +
 .../idl-version/cw4-group/Cw4Group.types.ts   |   64 +
 .../idl-version/cyberpunk/CyberPunk.client.ts |    6 +-
 .../cyberpunk/CyberPunk.message-composer.ts   |    2 +-
 .../cyberpunk/CyberPunk.react-query.ts        |    8 +-
 .../idl-version/cyberpunk/CyberPunk.recoil.ts |    4 +-
 .../idl-version/cyberpunk/CyberPunk.types.ts  |   25 +-
 .../idl-version/hackatom/HackAtom.client.ts   |   10 +-
 .../hackatom/HackAtom.message-composer.ts     |    2 +-
 .../hackatom/HackAtom.react-query.ts          |   14 +-
 .../idl-version/hackatom/HackAtom.recoil.ts   |    6 +-
 .../idl-version/hackatom/HackAtom.types.ts    |   14 +
 22 files changed, 5287 insertions(+), 27 deletions(-)
 create mode 100644 __fixtures__/idl-version/cw3-fixed-multisig/cw3-fixed-multisig.json
 create mode 100644 __fixtures__/idl-version/cw4-group/cw4-group.json
 create mode 100644 __output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
 create mode 100644 __output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
 create mode 100644 __output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts
 create mode 100644 __output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.recoil.ts
 create mode 100644 __output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.types.ts
 create mode 100644 __output__/idl-version/cw4-group/Cw4Group.client.ts
 create mode 100644 __output__/idl-version/cw4-group/Cw4Group.message-composer.ts
 create mode 100644 __output__/idl-version/cw4-group/Cw4Group.react-query.ts
 create mode 100644 __output__/idl-version/cw4-group/Cw4Group.recoil.ts
 create mode 100644 __output__/idl-version/cw4-group/Cw4Group.types.ts

diff --git a/__fixtures__/idl-version/cw3-fixed-multisig/cw3-fixed-multisig.json b/__fixtures__/idl-version/cw3-fixed-multisig/cw3-fixed-multisig.json
new file mode 100644
index 00000000..4cfc615d
--- /dev/null
+++ b/__fixtures__/idl-version/cw3-fixed-multisig/cw3-fixed-multisig.json
@@ -0,0 +1,3360 @@
+{
+  "contract_name": "cw3-fixed-multisig",
+  "contract_version": "0.14.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "max_voting_period",
+      "threshold",
+      "voters"
+    ],
+    "properties": {
+      "max_voting_period": {
+        "$ref": "#/definitions/Duration"
+      },
+      "threshold": {
+        "$ref": "#/definitions/Threshold"
+      },
+      "voters": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/Voter"
+        }
+      }
+    },
+    "additionalProperties": false,
+    "definitions": {
+      "Decimal": {
+        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+        "type": "string"
+      },
+      "Duration": {
+        "description": "Duration is a delta of time. You can add it to a BlockInfo or Expiration to move that further in the future. Note that an height-based Duration and a time-based Expiration cannot be combined",
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "height"
+            ],
+            "properties": {
+              "height": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Time in seconds",
+            "type": "object",
+            "required": [
+              "time"
+            ],
+            "properties": {
+              "time": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Threshold": {
+        "description": "This defines the different ways tallies can happen.\n\nThe total_weight used for calculating success as well as the weights of each individual voter used in tallying should be snapshotted at the beginning of the block at which the proposal starts (this is likely the responsibility of a correct cw4 implementation). See also `ThresholdResponse` in the cw3 spec.",
+        "oneOf": [
+          {
+            "description": "Declares that a fixed weight of Yes votes is needed to pass. See `ThresholdResponse.AbsoluteCount` in the cw3 spec for details.",
+            "type": "object",
+            "required": [
+              "absolute_count"
+            ],
+            "properties": {
+              "absolute_count": {
+                "type": "object",
+                "required": [
+                  "weight"
+                ],
+                "properties": {
+                  "weight": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                },
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Declares a percentage of the total weight that must cast Yes votes in order for a proposal to pass. See `ThresholdResponse.AbsolutePercentage` in the cw3 spec for details.",
+            "type": "object",
+            "required": [
+              "absolute_percentage"
+            ],
+            "properties": {
+              "absolute_percentage": {
+                "type": "object",
+                "required": [
+                  "percentage"
+                ],
+                "properties": {
+                  "percentage": {
+                    "$ref": "#/definitions/Decimal"
+                  }
+                },
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Declares a `quorum` of the total votes that must participate in the election in order for the vote to be considered at all. See `ThresholdResponse.ThresholdQuorum` in the cw3 spec for details.",
+            "type": "object",
+            "required": [
+              "threshold_quorum"
+            ],
+            "properties": {
+              "threshold_quorum": {
+                "type": "object",
+                "required": [
+                  "quorum",
+                  "threshold"
+                ],
+                "properties": {
+                  "quorum": {
+                    "$ref": "#/definitions/Decimal"
+                  },
+                  "threshold": {
+                    "$ref": "#/definitions/Decimal"
+                  }
+                },
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Voter": {
+        "type": "object",
+        "required": [
+          "addr",
+          "weight"
+        ],
+        "properties": {
+          "addr": {
+            "type": "string"
+          },
+          "weight": {
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
+      }
+    }
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "propose"
+        ],
+        "properties": {
+          "propose": {
+            "type": "object",
+            "required": [
+              "description",
+              "msgs",
+              "title"
+            ],
+            "properties": {
+              "description": {
+                "type": "string"
+              },
+              "latest": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Expiration"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "msgs": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/CosmosMsg_for_Empty"
+                }
+              },
+              "title": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "vote"
+        ],
+        "properties": {
+          "vote": {
+            "type": "object",
+            "required": [
+              "proposal_id",
+              "vote"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
+              "vote": {
+                "$ref": "#/definitions/Vote"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "execute"
+        ],
+        "properties": {
+          "execute": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "close"
+        ],
+        "properties": {
+          "close": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "BankMsg": {
+        "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto",
+        "oneOf": [
+          {
+            "description": "Sends native tokens from the contract to the given address.\n\nThis is translated to a [MsgSend](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto#L19-L28). `from_address` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "send"
+            ],
+            "properties": {
+              "send": {
+                "type": "object",
+                "required": [
+                  "amount",
+                  "to_address"
+                ],
+                "properties": {
+                  "amount": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/definitions/Coin"
+                    }
+                  },
+                  "to_address": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
+            "type": "object",
+            "required": [
+              "burn"
+            ],
+            "properties": {
+              "burn": {
+                "type": "object",
+                "required": [
+                  "amount"
+                ],
+                "properties": {
+                  "amount": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/definitions/Coin"
+                    }
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Binary": {
+        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+        "type": "string"
+      },
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
+      "CosmosMsg_for_Empty": {
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "bank"
+            ],
+            "properties": {
+              "bank": {
+                "$ref": "#/definitions/BankMsg"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "custom"
+            ],
+            "properties": {
+              "custom": {
+                "$ref": "#/definitions/Empty"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "staking"
+            ],
+            "properties": {
+              "staking": {
+                "$ref": "#/definitions/StakingMsg"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "distribution"
+            ],
+            "properties": {
+              "distribution": {
+                "$ref": "#/definitions/DistributionMsg"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "wasm"
+            ],
+            "properties": {
+              "wasm": {
+                "$ref": "#/definitions/WasmMsg"
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "DistributionMsg": {
+        "description": "The message types of the distribution module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto",
+        "oneOf": [
+          {
+            "description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37). `delegator_address` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "set_withdraw_address"
+            ],
+            "properties": {
+              "set_withdraw_address": {
+                "type": "object",
+                "required": [
+                  "address"
+                ],
+                "properties": {
+                  "address": {
+                    "description": "The `withdraw_address`",
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "This is translated to a [[MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "withdraw_delegator_reward"
+            ],
+            "properties": {
+              "withdraw_delegator_reward": {
+                "type": "object",
+                "required": [
+                  "validator"
+                ],
+                "properties": {
+                  "validator": {
+                    "description": "The `validator_address`",
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Empty": {
+        "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+        "type": "object"
+      },
+      "Expiration": {
+        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+        "oneOf": [
+          {
+            "description": "AtHeight will expire when `env.block.height` >= height",
+            "type": "object",
+            "required": [
+              "at_height"
+            ],
+            "properties": {
+              "at_height": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "AtTime will expire when `env.block.time` >= time",
+            "type": "object",
+            "required": [
+              "at_time"
+            ],
+            "properties": {
+              "at_time": {
+                "$ref": "#/definitions/Timestamp"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Never will never expire. Used to express the empty variant",
+            "type": "object",
+            "required": [
+              "never"
+            ],
+            "properties": {
+              "never": {
+                "type": "object",
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "StakingMsg": {
+        "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
+        "oneOf": [
+          {
+            "description": "This is translated to a [MsgDelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L81-L90). `delegator_address` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "delegate"
+            ],
+            "properties": {
+              "delegate": {
+                "type": "object",
+                "required": [
+                  "amount",
+                  "validator"
+                ],
+                "properties": {
+                  "amount": {
+                    "$ref": "#/definitions/Coin"
+                  },
+                  "validator": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "This is translated to a [MsgUndelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L112-L121). `delegator_address` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "undelegate"
+            ],
+            "properties": {
+              "undelegate": {
+                "type": "object",
+                "required": [
+                  "amount",
+                  "validator"
+                ],
+                "properties": {
+                  "amount": {
+                    "$ref": "#/definitions/Coin"
+                  },
+                  "validator": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "This is translated to a [MsgBeginRedelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L95-L105). `delegator_address` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "redelegate"
+            ],
+            "properties": {
+              "redelegate": {
+                "type": "object",
+                "required": [
+                  "amount",
+                  "dst_validator",
+                  "src_validator"
+                ],
+                "properties": {
+                  "amount": {
+                    "$ref": "#/definitions/Coin"
+                  },
+                  "dst_validator": {
+                    "type": "string"
+                  },
+                  "src_validator": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Timestamp": {
+        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+        "allOf": [
+          {
+            "$ref": "#/definitions/Uint64"
+          }
+        ]
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      },
+      "Uint64": {
+        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+        "type": "string"
+      },
+      "Vote": {
+        "type": "string",
+        "enum": [
+          "yes",
+          "no",
+          "abstain",
+          "veto"
+        ]
+      },
+      "WasmMsg": {
+        "description": "The message types of the wasm module.\n\nSee https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto",
+        "oneOf": [
+          {
+            "description": "Dispatches a call to another contract at a known address (with known ABI).\n\nThis is translated to a [MsgExecuteContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L68-L78). `sender` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "execute"
+            ],
+            "properties": {
+              "execute": {
+                "type": "object",
+                "required": [
+                  "contract_addr",
+                  "funds",
+                  "msg"
+                ],
+                "properties": {
+                  "contract_addr": {
+                    "type": "string"
+                  },
+                  "funds": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/definitions/Coin"
+                    }
+                  },
+                  "msg": {
+                    "description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
+                    "allOf": [
+                      {
+                        "$ref": "#/definitions/Binary"
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Instantiates a new contracts from previously uploaded Wasm code.\n\nThis is translated to a [MsgInstantiateContract](https://github.com/CosmWasm/wasmd/blob/v0.16.0-alpha1/x/wasm/internal/types/tx.proto#L47-L61). `sender` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "instantiate"
+            ],
+            "properties": {
+              "instantiate": {
+                "type": "object",
+                "required": [
+                  "code_id",
+                  "funds",
+                  "label",
+                  "msg"
+                ],
+                "properties": {
+                  "admin": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "code_id": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  "funds": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/definitions/Coin"
+                    }
+                  },
+                  "label": {
+                    "description": "A human-readbale label for the contract",
+                    "type": "string"
+                  },
+                  "msg": {
+                    "description": "msg is the JSON-encoded InstantiateMsg struct (as raw Binary)",
+                    "allOf": [
+                      {
+                        "$ref": "#/definitions/Binary"
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Migrates a given contracts to use new wasm code. Passes a MigrateMsg to allow us to customize behavior.\n\nOnly the contract admin (as defined in wasmd), if any, is able to make this call.\n\nThis is translated to a [MsgMigrateContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L86-L96). `sender` is automatically filled with the current contract's address.",
+            "type": "object",
+            "required": [
+              "migrate"
+            ],
+            "properties": {
+              "migrate": {
+                "type": "object",
+                "required": [
+                  "contract_addr",
+                  "msg",
+                  "new_code_id"
+                ],
+                "properties": {
+                  "contract_addr": {
+                    "type": "string"
+                  },
+                  "msg": {
+                    "description": "msg is the json-encoded MigrateMsg struct that will be passed to the new code",
+                    "allOf": [
+                      {
+                        "$ref": "#/definitions/Binary"
+                      }
+                    ]
+                  },
+                  "new_code_id": {
+                    "description": "the code_id of the new logic to place in the given contract",
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
+            "type": "object",
+            "required": [
+              "update_admin"
+            ],
+            "properties": {
+              "update_admin": {
+                "type": "object",
+                "required": [
+                  "admin",
+                  "contract_addr"
+                ],
+                "properties": {
+                  "admin": {
+                    "type": "string"
+                  },
+                  "contract_addr": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
+            "type": "object",
+            "required": [
+              "clear_admin"
+            ],
+            "properties": {
+              "clear_admin": {
+                "type": "object",
+                "required": [
+                  "contract_addr"
+                ],
+                "properties": {
+                  "contract_addr": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      }
+    }
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "threshold"
+        ],
+        "properties": {
+          "threshold": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "proposal"
+        ],
+        "properties": {
+          "proposal": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "list_proposals"
+        ],
+        "properties": {
+          "list_proposals": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "reverse_proposals"
+        ],
+        "properties": {
+          "reverse_proposals": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_before": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "vote"
+        ],
+        "properties": {
+          "vote": {
+            "type": "object",
+            "required": [
+              "proposal_id",
+              "voter"
+            ],
+            "properties": {
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
+              "voter": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "list_votes"
+        ],
+        "properties": {
+          "list_votes": {
+            "type": "object",
+            "required": [
+              "proposal_id"
+            ],
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "proposal_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "voter"
+        ],
+        "properties": {
+          "voter": {
+            "type": "object",
+            "required": [
+              "address"
+            ],
+            "properties": {
+              "address": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "list_voters"
+        ],
+        "properties": {
+          "list_voters": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": null,
+  "sudo": null,
+  "responses": {
+    "list_proposals": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ProposalListResponse",
+      "type": "object",
+      "required": [
+        "proposals"
+      ],
+      "properties": {
+        "proposals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ProposalResponse_for_Empty"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "BankMsg": {
+          "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "Sends native tokens from the contract to the given address.\n\nThis is translated to a [MsgSend](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto#L19-L28). `from_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "send"
+              ],
+              "properties": {
+                "send": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "to_address"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "to_address": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
+              "type": "object",
+              "required": [
+                "burn"
+              ],
+              "properties": {
+                "burn": {
+                  "type": "object",
+                  "required": [
+                    "amount"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "CosmosMsg_for_Empty": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "bank"
+              ],
+              "properties": {
+                "bank": {
+                  "$ref": "#/definitions/BankMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "custom"
+              ],
+              "properties": {
+                "custom": {
+                  "$ref": "#/definitions/Empty"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "staking"
+              ],
+              "properties": {
+                "staking": {
+                  "$ref": "#/definitions/StakingMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "distribution"
+              ],
+              "properties": {
+                "distribution": {
+                  "$ref": "#/definitions/DistributionMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "wasm"
+              ],
+              "properties": {
+                "wasm": {
+                  "$ref": "#/definitions/WasmMsg"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "DistributionMsg": {
+          "description": "The message types of the distribution module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "set_withdraw_address"
+              ],
+              "properties": {
+                "set_withdraw_address": {
+                  "type": "object",
+                  "required": [
+                    "address"
+                  ],
+                  "properties": {
+                    "address": {
+                      "description": "The `withdraw_address`",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [[MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "withdraw_delegator_reward"
+              ],
+              "properties": {
+                "withdraw_delegator_reward": {
+                  "type": "object",
+                  "required": [
+                    "validator"
+                  ],
+                  "properties": {
+                    "validator": {
+                      "description": "The `validator_address`",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "ProposalResponse_for_Empty": {
+          "description": "Note, if you are storing custom messages in the proposal, the querier needs to know what possible custom message types those are in order to parse the response",
+          "type": "object",
+          "required": [
+            "description",
+            "expires",
+            "id",
+            "msgs",
+            "status",
+            "threshold",
+            "title"
+          ],
+          "properties": {
+            "description": {
+              "type": "string"
+            },
+            "expires": {
+              "$ref": "#/definitions/Expiration"
+            },
+            "id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "msgs": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/CosmosMsg_for_Empty"
+              }
+            },
+            "status": {
+              "$ref": "#/definitions/Status"
+            },
+            "threshold": {
+              "description": "This is the threshold that is applied to this proposal. Both the rules of the voting contract, as well as the total_weight of the voting group may have changed since this time. That means that the generic `Threshold{}` query does not provide valid information for existing proposals.",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ThresholdResponse"
+                }
+              ]
+            },
+            "title": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "StakingMsg": {
+          "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "This is translated to a [MsgDelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L81-L90). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "delegate"
+              ],
+              "properties": {
+                "delegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [MsgUndelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L112-L121). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "undelegate"
+              ],
+              "properties": {
+                "undelegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [MsgBeginRedelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L95-L105). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "redelegate"
+              ],
+              "properties": {
+                "redelegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "dst_validator",
+                    "src_validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "dst_validator": {
+                      "type": "string"
+                    },
+                    "src_validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Status": {
+          "type": "string",
+          "enum": [
+            "pending",
+            "open",
+            "rejected",
+            "passed",
+            "executed"
+          ]
+        },
+        "ThresholdResponse": {
+          "description": "This defines the different ways tallies can happen. Every contract should support a subset of these, ideally all.\n\nThe total_weight used for calculating success as well as the weights of each individual voter used in tallying should be snapshotted at the beginning of the block at which the proposal starts (this is likely the responsibility of a correct cw4 implementation).",
+          "oneOf": [
+            {
+              "description": "Declares that a fixed weight of yes votes is needed to pass. It does not matter how many no votes are cast, or how many do not vote, as long as `weight` yes votes are cast.\n\nThis is the simplest format and usually suitable for small multisigs of trusted parties, like 3 of 5. (weight: 3, total_weight: 5)\n\nA proposal of this type can pass early as soon as the needed weight of yes votes has been cast.",
+              "type": "object",
+              "required": [
+                "absolute_count"
+              ],
+              "properties": {
+                "absolute_count": {
+                  "type": "object",
+                  "required": [
+                    "total_weight",
+                    "weight"
+                  ],
+                  "properties": {
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    },
+                    "weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Declares a percentage of the total weight that must cast Yes votes, in order for a proposal to pass. The passing weight is computed over the total weight minus the weight of the abstained votes.\n\nThis is useful for similar circumstances as `AbsoluteCount`, where we have a relatively small set of voters, and participation is required. It is understood that if the voting set (group) changes between different proposals that refer to the same group, each proposal will work with a different set of voter weights (the ones snapshotted at proposal creation), and the passing weight for each proposal will be computed based on the absolute percentage, times the total weights of the members at the time of each proposal creation.\n\nExample: we set `percentage` to 51%. Proposal 1 starts when there is a `total_weight` of 5. This will require 3 weight of Yes votes in order to pass. Later, the Proposal 2 starts but the `total_weight` of the group has increased to 9. That proposal will then automatically require 5 Yes of 9 to pass, rather than 3 yes of 9 as would be the case with `AbsoluteCount`.",
+              "type": "object",
+              "required": [
+                "absolute_percentage"
+              ],
+              "properties": {
+                "absolute_percentage": {
+                  "type": "object",
+                  "required": [
+                    "percentage",
+                    "total_weight"
+                  ],
+                  "properties": {
+                    "percentage": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "In addition to a `threshold`, declares a `quorum` of the total votes that must participate in the election in order for the vote to be considered at all. Within the votes that were cast, it requires `threshold` votes in favor. That is calculated by ignoring the Abstain votes (they count towards `quorum`, but do not influence `threshold`). That is, we calculate `Yes / (Yes + No + Veto)` and compare it with `threshold` to consider if the proposal was passed.\n\nIt is rather difficult for a proposal of this type to pass early. That can only happen if the required quorum has been already met, and there are already enough Yes votes for the proposal to pass.\n\n30% Yes votes, 10% No votes, and 20% Abstain would pass early if quorum <= 60% (who has cast votes) and if the threshold is <= 37.5% (the remaining 40% voting no => 30% yes + 50% no). Once the voting period has passed with no additional votes, that same proposal would be considered successful if quorum <= 60% and threshold <= 75% (percent in favor if we ignore abstain votes).\n\nThis type is more common in general elections, where participation is often expected to be low, and `AbsolutePercentage` would either be too high to pass anything, or allow low percentages to pass, independently of if there was high participation in the election or not.",
+              "type": "object",
+              "required": [
+                "threshold_quorum"
+              ],
+              "properties": {
+                "threshold_quorum": {
+                  "type": "object",
+                  "required": [
+                    "quorum",
+                    "threshold",
+                    "total_weight"
+                  ],
+                  "properties": {
+                    "quorum": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "threshold": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        },
+        "WasmMsg": {
+          "description": "The message types of the wasm module.\n\nSee https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto",
+          "oneOf": [
+            {
+              "description": "Dispatches a call to another contract at a known address (with known ABI).\n\nThis is translated to a [MsgExecuteContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L68-L78). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "execute"
+              ],
+              "properties": {
+                "execute": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr",
+                    "funds",
+                    "msg"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    },
+                    "funds": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "msg": {
+                      "description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Instantiates a new contracts from previously uploaded Wasm code.\n\nThis is translated to a [MsgInstantiateContract](https://github.com/CosmWasm/wasmd/blob/v0.16.0-alpha1/x/wasm/internal/types/tx.proto#L47-L61). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "instantiate"
+              ],
+              "properties": {
+                "instantiate": {
+                  "type": "object",
+                  "required": [
+                    "code_id",
+                    "funds",
+                    "label",
+                    "msg"
+                  ],
+                  "properties": {
+                    "admin": {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    "code_id": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    },
+                    "funds": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "label": {
+                      "description": "A human-readbale label for the contract",
+                      "type": "string"
+                    },
+                    "msg": {
+                      "description": "msg is the JSON-encoded InstantiateMsg struct (as raw Binary)",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Migrates a given contracts to use new wasm code. Passes a MigrateMsg to allow us to customize behavior.\n\nOnly the contract admin (as defined in wasmd), if any, is able to make this call.\n\nThis is translated to a [MsgMigrateContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L86-L96). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "migrate"
+              ],
+              "properties": {
+                "migrate": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr",
+                    "msg",
+                    "new_code_id"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    },
+                    "msg": {
+                      "description": "msg is the json-encoded MigrateMsg struct that will be passed to the new code",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    },
+                    "new_code_id": {
+                      "description": "the code_id of the new logic to place in the given contract",
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
+              "type": "object",
+              "required": [
+                "update_admin"
+              ],
+              "properties": {
+                "update_admin": {
+                  "type": "object",
+                  "required": [
+                    "admin",
+                    "contract_addr"
+                  ],
+                  "properties": {
+                    "admin": {
+                      "type": "string"
+                    },
+                    "contract_addr": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
+              "type": "object",
+              "required": [
+                "clear_admin"
+              ],
+              "properties": {
+                "clear_admin": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        }
+      }
+    },
+    "list_voters": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VoterListResponse",
+      "type": "object",
+      "required": [
+        "voters"
+      ],
+      "properties": {
+        "voters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VoterDetail"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "VoterDetail": {
+          "type": "object",
+          "required": [
+            "addr",
+            "weight"
+          ],
+          "properties": {
+            "addr": {
+              "type": "string"
+            },
+            "weight": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "list_votes": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VoteListResponse",
+      "type": "object",
+      "required": [
+        "votes"
+      ],
+      "properties": {
+        "votes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VoteInfo"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Vote": {
+          "type": "string",
+          "enum": [
+            "yes",
+            "no",
+            "abstain",
+            "veto"
+          ]
+        },
+        "VoteInfo": {
+          "description": "Returns the vote (opinion as well as weight counted) as well as the address of the voter who submitted it",
+          "type": "object",
+          "required": [
+            "proposal_id",
+            "vote",
+            "voter",
+            "weight"
+          ],
+          "properties": {
+            "proposal_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "vote": {
+              "$ref": "#/definitions/Vote"
+            },
+            "voter": {
+              "type": "string"
+            },
+            "weight": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "proposal": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ProposalResponse_for_Empty",
+      "description": "Note, if you are storing custom messages in the proposal, the querier needs to know what possible custom message types those are in order to parse the response",
+      "type": "object",
+      "required": [
+        "description",
+        "expires",
+        "id",
+        "msgs",
+        "status",
+        "threshold",
+        "title"
+      ],
+      "properties": {
+        "description": {
+          "type": "string"
+        },
+        "expires": {
+          "$ref": "#/definitions/Expiration"
+        },
+        "id": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "msgs": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CosmosMsg_for_Empty"
+          }
+        },
+        "status": {
+          "$ref": "#/definitions/Status"
+        },
+        "threshold": {
+          "description": "This is the threshold that is applied to this proposal. Both the rules of the voting contract, as well as the total_weight of the voting group may have changed since this time. That means that the generic `Threshold{}` query does not provide valid information for existing proposals.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/ThresholdResponse"
+            }
+          ]
+        },
+        "title": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "BankMsg": {
+          "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "Sends native tokens from the contract to the given address.\n\nThis is translated to a [MsgSend](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto#L19-L28). `from_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "send"
+              ],
+              "properties": {
+                "send": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "to_address"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "to_address": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
+              "type": "object",
+              "required": [
+                "burn"
+              ],
+              "properties": {
+                "burn": {
+                  "type": "object",
+                  "required": [
+                    "amount"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "CosmosMsg_for_Empty": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "bank"
+              ],
+              "properties": {
+                "bank": {
+                  "$ref": "#/definitions/BankMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "custom"
+              ],
+              "properties": {
+                "custom": {
+                  "$ref": "#/definitions/Empty"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "staking"
+              ],
+              "properties": {
+                "staking": {
+                  "$ref": "#/definitions/StakingMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "distribution"
+              ],
+              "properties": {
+                "distribution": {
+                  "$ref": "#/definitions/DistributionMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "wasm"
+              ],
+              "properties": {
+                "wasm": {
+                  "$ref": "#/definitions/WasmMsg"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "DistributionMsg": {
+          "description": "The message types of the distribution module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "set_withdraw_address"
+              ],
+              "properties": {
+                "set_withdraw_address": {
+                  "type": "object",
+                  "required": [
+                    "address"
+                  ],
+                  "properties": {
+                    "address": {
+                      "description": "The `withdraw_address`",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [[MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "withdraw_delegator_reward"
+              ],
+              "properties": {
+                "withdraw_delegator_reward": {
+                  "type": "object",
+                  "required": [
+                    "validator"
+                  ],
+                  "properties": {
+                    "validator": {
+                      "description": "The `validator_address`",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "StakingMsg": {
+          "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "This is translated to a [MsgDelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L81-L90). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "delegate"
+              ],
+              "properties": {
+                "delegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [MsgUndelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L112-L121). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "undelegate"
+              ],
+              "properties": {
+                "undelegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [MsgBeginRedelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L95-L105). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "redelegate"
+              ],
+              "properties": {
+                "redelegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "dst_validator",
+                    "src_validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "dst_validator": {
+                      "type": "string"
+                    },
+                    "src_validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Status": {
+          "type": "string",
+          "enum": [
+            "pending",
+            "open",
+            "rejected",
+            "passed",
+            "executed"
+          ]
+        },
+        "ThresholdResponse": {
+          "description": "This defines the different ways tallies can happen. Every contract should support a subset of these, ideally all.\n\nThe total_weight used for calculating success as well as the weights of each individual voter used in tallying should be snapshotted at the beginning of the block at which the proposal starts (this is likely the responsibility of a correct cw4 implementation).",
+          "oneOf": [
+            {
+              "description": "Declares that a fixed weight of yes votes is needed to pass. It does not matter how many no votes are cast, or how many do not vote, as long as `weight` yes votes are cast.\n\nThis is the simplest format and usually suitable for small multisigs of trusted parties, like 3 of 5. (weight: 3, total_weight: 5)\n\nA proposal of this type can pass early as soon as the needed weight of yes votes has been cast.",
+              "type": "object",
+              "required": [
+                "absolute_count"
+              ],
+              "properties": {
+                "absolute_count": {
+                  "type": "object",
+                  "required": [
+                    "total_weight",
+                    "weight"
+                  ],
+                  "properties": {
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    },
+                    "weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Declares a percentage of the total weight that must cast Yes votes, in order for a proposal to pass. The passing weight is computed over the total weight minus the weight of the abstained votes.\n\nThis is useful for similar circumstances as `AbsoluteCount`, where we have a relatively small set of voters, and participation is required. It is understood that if the voting set (group) changes between different proposals that refer to the same group, each proposal will work with a different set of voter weights (the ones snapshotted at proposal creation), and the passing weight for each proposal will be computed based on the absolute percentage, times the total weights of the members at the time of each proposal creation.\n\nExample: we set `percentage` to 51%. Proposal 1 starts when there is a `total_weight` of 5. This will require 3 weight of Yes votes in order to pass. Later, the Proposal 2 starts but the `total_weight` of the group has increased to 9. That proposal will then automatically require 5 Yes of 9 to pass, rather than 3 yes of 9 as would be the case with `AbsoluteCount`.",
+              "type": "object",
+              "required": [
+                "absolute_percentage"
+              ],
+              "properties": {
+                "absolute_percentage": {
+                  "type": "object",
+                  "required": [
+                    "percentage",
+                    "total_weight"
+                  ],
+                  "properties": {
+                    "percentage": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "In addition to a `threshold`, declares a `quorum` of the total votes that must participate in the election in order for the vote to be considered at all. Within the votes that were cast, it requires `threshold` votes in favor. That is calculated by ignoring the Abstain votes (they count towards `quorum`, but do not influence `threshold`). That is, we calculate `Yes / (Yes + No + Veto)` and compare it with `threshold` to consider if the proposal was passed.\n\nIt is rather difficult for a proposal of this type to pass early. That can only happen if the required quorum has been already met, and there are already enough Yes votes for the proposal to pass.\n\n30% Yes votes, 10% No votes, and 20% Abstain would pass early if quorum <= 60% (who has cast votes) and if the threshold is <= 37.5% (the remaining 40% voting no => 30% yes + 50% no). Once the voting period has passed with no additional votes, that same proposal would be considered successful if quorum <= 60% and threshold <= 75% (percent in favor if we ignore abstain votes).\n\nThis type is more common in general elections, where participation is often expected to be low, and `AbsolutePercentage` would either be too high to pass anything, or allow low percentages to pass, independently of if there was high participation in the election or not.",
+              "type": "object",
+              "required": [
+                "threshold_quorum"
+              ],
+              "properties": {
+                "threshold_quorum": {
+                  "type": "object",
+                  "required": [
+                    "quorum",
+                    "threshold",
+                    "total_weight"
+                  ],
+                  "properties": {
+                    "quorum": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "threshold": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        },
+        "WasmMsg": {
+          "description": "The message types of the wasm module.\n\nSee https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto",
+          "oneOf": [
+            {
+              "description": "Dispatches a call to another contract at a known address (with known ABI).\n\nThis is translated to a [MsgExecuteContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L68-L78). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "execute"
+              ],
+              "properties": {
+                "execute": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr",
+                    "funds",
+                    "msg"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    },
+                    "funds": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "msg": {
+                      "description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Instantiates a new contracts from previously uploaded Wasm code.\n\nThis is translated to a [MsgInstantiateContract](https://github.com/CosmWasm/wasmd/blob/v0.16.0-alpha1/x/wasm/internal/types/tx.proto#L47-L61). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "instantiate"
+              ],
+              "properties": {
+                "instantiate": {
+                  "type": "object",
+                  "required": [
+                    "code_id",
+                    "funds",
+                    "label",
+                    "msg"
+                  ],
+                  "properties": {
+                    "admin": {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    "code_id": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    },
+                    "funds": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "label": {
+                      "description": "A human-readbale label for the contract",
+                      "type": "string"
+                    },
+                    "msg": {
+                      "description": "msg is the JSON-encoded InstantiateMsg struct (as raw Binary)",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Migrates a given contracts to use new wasm code. Passes a MigrateMsg to allow us to customize behavior.\n\nOnly the contract admin (as defined in wasmd), if any, is able to make this call.\n\nThis is translated to a [MsgMigrateContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L86-L96). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "migrate"
+              ],
+              "properties": {
+                "migrate": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr",
+                    "msg",
+                    "new_code_id"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    },
+                    "msg": {
+                      "description": "msg is the json-encoded MigrateMsg struct that will be passed to the new code",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    },
+                    "new_code_id": {
+                      "description": "the code_id of the new logic to place in the given contract",
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
+              "type": "object",
+              "required": [
+                "update_admin"
+              ],
+              "properties": {
+                "update_admin": {
+                  "type": "object",
+                  "required": [
+                    "admin",
+                    "contract_addr"
+                  ],
+                  "properties": {
+                    "admin": {
+                      "type": "string"
+                    },
+                    "contract_addr": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
+              "type": "object",
+              "required": [
+                "clear_admin"
+              ],
+              "properties": {
+                "clear_admin": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        }
+      }
+    },
+    "reverse_proposals": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ProposalListResponse",
+      "type": "object",
+      "required": [
+        "proposals"
+      ],
+      "properties": {
+        "proposals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ProposalResponse_for_Empty"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "BankMsg": {
+          "description": "The message types of the bank module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "Sends native tokens from the contract to the given address.\n\nThis is translated to a [MsgSend](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/bank/v1beta1/tx.proto#L19-L28). `from_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "send"
+              ],
+              "properties": {
+                "send": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "to_address"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "to_address": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
+              "type": "object",
+              "required": [
+                "burn"
+              ],
+              "properties": {
+                "burn": {
+                  "type": "object",
+                  "required": [
+                    "amount"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+          "type": "string"
+        },
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "CosmosMsg_for_Empty": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "bank"
+              ],
+              "properties": {
+                "bank": {
+                  "$ref": "#/definitions/BankMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "custom"
+              ],
+              "properties": {
+                "custom": {
+                  "$ref": "#/definitions/Empty"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "staking"
+              ],
+              "properties": {
+                "staking": {
+                  "$ref": "#/definitions/StakingMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "distribution"
+              ],
+              "properties": {
+                "distribution": {
+                  "$ref": "#/definitions/DistributionMsg"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "wasm"
+              ],
+              "properties": {
+                "wasm": {
+                  "$ref": "#/definitions/WasmMsg"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "DistributionMsg": {
+          "description": "The message types of the distribution module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "set_withdraw_address"
+              ],
+              "properties": {
+                "set_withdraw_address": {
+                  "type": "object",
+                  "required": [
+                    "address"
+                  ],
+                  "properties": {
+                    "address": {
+                      "description": "The `withdraw_address`",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [[MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "withdraw_delegator_reward"
+              ],
+              "properties": {
+                "withdraw_delegator_reward": {
+                  "type": "object",
+                  "required": [
+                    "validator"
+                  ],
+                  "properties": {
+                    "validator": {
+                      "description": "The `validator_address`",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object",
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "ProposalResponse_for_Empty": {
+          "description": "Note, if you are storing custom messages in the proposal, the querier needs to know what possible custom message types those are in order to parse the response",
+          "type": "object",
+          "required": [
+            "description",
+            "expires",
+            "id",
+            "msgs",
+            "status",
+            "threshold",
+            "title"
+          ],
+          "properties": {
+            "description": {
+              "type": "string"
+            },
+            "expires": {
+              "$ref": "#/definitions/Expiration"
+            },
+            "id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "msgs": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/CosmosMsg_for_Empty"
+              }
+            },
+            "status": {
+              "$ref": "#/definitions/Status"
+            },
+            "threshold": {
+              "description": "This is the threshold that is applied to this proposal. Both the rules of the voting contract, as well as the total_weight of the voting group may have changed since this time. That means that the generic `Threshold{}` query does not provide valid information for existing proposals.",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ThresholdResponse"
+                }
+              ]
+            },
+            "title": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        "StakingMsg": {
+          "description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
+          "oneOf": [
+            {
+              "description": "This is translated to a [MsgDelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L81-L90). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "delegate"
+              ],
+              "properties": {
+                "delegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [MsgUndelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L112-L121). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "undelegate"
+              ],
+              "properties": {
+                "undelegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "This is translated to a [MsgBeginRedelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L95-L105). `delegator_address` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "redelegate"
+              ],
+              "properties": {
+                "redelegate": {
+                  "type": "object",
+                  "required": [
+                    "amount",
+                    "dst_validator",
+                    "src_validator"
+                  ],
+                  "properties": {
+                    "amount": {
+                      "$ref": "#/definitions/Coin"
+                    },
+                    "dst_validator": {
+                      "type": "string"
+                    },
+                    "src_validator": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Status": {
+          "type": "string",
+          "enum": [
+            "pending",
+            "open",
+            "rejected",
+            "passed",
+            "executed"
+          ]
+        },
+        "ThresholdResponse": {
+          "description": "This defines the different ways tallies can happen. Every contract should support a subset of these, ideally all.\n\nThe total_weight used for calculating success as well as the weights of each individual voter used in tallying should be snapshotted at the beginning of the block at which the proposal starts (this is likely the responsibility of a correct cw4 implementation).",
+          "oneOf": [
+            {
+              "description": "Declares that a fixed weight of yes votes is needed to pass. It does not matter how many no votes are cast, or how many do not vote, as long as `weight` yes votes are cast.\n\nThis is the simplest format and usually suitable for small multisigs of trusted parties, like 3 of 5. (weight: 3, total_weight: 5)\n\nA proposal of this type can pass early as soon as the needed weight of yes votes has been cast.",
+              "type": "object",
+              "required": [
+                "absolute_count"
+              ],
+              "properties": {
+                "absolute_count": {
+                  "type": "object",
+                  "required": [
+                    "total_weight",
+                    "weight"
+                  ],
+                  "properties": {
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    },
+                    "weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Declares a percentage of the total weight that must cast Yes votes, in order for a proposal to pass. The passing weight is computed over the total weight minus the weight of the abstained votes.\n\nThis is useful for similar circumstances as `AbsoluteCount`, where we have a relatively small set of voters, and participation is required. It is understood that if the voting set (group) changes between different proposals that refer to the same group, each proposal will work with a different set of voter weights (the ones snapshotted at proposal creation), and the passing weight for each proposal will be computed based on the absolute percentage, times the total weights of the members at the time of each proposal creation.\n\nExample: we set `percentage` to 51%. Proposal 1 starts when there is a `total_weight` of 5. This will require 3 weight of Yes votes in order to pass. Later, the Proposal 2 starts but the `total_weight` of the group has increased to 9. That proposal will then automatically require 5 Yes of 9 to pass, rather than 3 yes of 9 as would be the case with `AbsoluteCount`.",
+              "type": "object",
+              "required": [
+                "absolute_percentage"
+              ],
+              "properties": {
+                "absolute_percentage": {
+                  "type": "object",
+                  "required": [
+                    "percentage",
+                    "total_weight"
+                  ],
+                  "properties": {
+                    "percentage": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "In addition to a `threshold`, declares a `quorum` of the total votes that must participate in the election in order for the vote to be considered at all. Within the votes that were cast, it requires `threshold` votes in favor. That is calculated by ignoring the Abstain votes (they count towards `quorum`, but do not influence `threshold`). That is, we calculate `Yes / (Yes + No + Veto)` and compare it with `threshold` to consider if the proposal was passed.\n\nIt is rather difficult for a proposal of this type to pass early. That can only happen if the required quorum has been already met, and there are already enough Yes votes for the proposal to pass.\n\n30% Yes votes, 10% No votes, and 20% Abstain would pass early if quorum <= 60% (who has cast votes) and if the threshold is <= 37.5% (the remaining 40% voting no => 30% yes + 50% no). Once the voting period has passed with no additional votes, that same proposal would be considered successful if quorum <= 60% and threshold <= 75% (percent in favor if we ignore abstain votes).\n\nThis type is more common in general elections, where participation is often expected to be low, and `AbsolutePercentage` would either be too high to pass anything, or allow low percentages to pass, independently of if there was high participation in the election or not.",
+              "type": "object",
+              "required": [
+                "threshold_quorum"
+              ],
+              "properties": {
+                "threshold_quorum": {
+                  "type": "object",
+                  "required": [
+                    "quorum",
+                    "threshold",
+                    "total_weight"
+                  ],
+                  "properties": {
+                    "quorum": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "threshold": {
+                      "$ref": "#/definitions/Decimal"
+                    },
+                    "total_weight": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        },
+        "WasmMsg": {
+          "description": "The message types of the wasm module.\n\nSee https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto",
+          "oneOf": [
+            {
+              "description": "Dispatches a call to another contract at a known address (with known ABI).\n\nThis is translated to a [MsgExecuteContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L68-L78). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "execute"
+              ],
+              "properties": {
+                "execute": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr",
+                    "funds",
+                    "msg"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    },
+                    "funds": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "msg": {
+                      "description": "msg is the json-encoded ExecuteMsg struct (as raw Binary)",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Instantiates a new contracts from previously uploaded Wasm code.\n\nThis is translated to a [MsgInstantiateContract](https://github.com/CosmWasm/wasmd/blob/v0.16.0-alpha1/x/wasm/internal/types/tx.proto#L47-L61). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "instantiate"
+              ],
+              "properties": {
+                "instantiate": {
+                  "type": "object",
+                  "required": [
+                    "code_id",
+                    "funds",
+                    "label",
+                    "msg"
+                  ],
+                  "properties": {
+                    "admin": {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    "code_id": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    },
+                    "funds": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/definitions/Coin"
+                      }
+                    },
+                    "label": {
+                      "description": "A human-readbale label for the contract",
+                      "type": "string"
+                    },
+                    "msg": {
+                      "description": "msg is the JSON-encoded InstantiateMsg struct (as raw Binary)",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Migrates a given contracts to use new wasm code. Passes a MigrateMsg to allow us to customize behavior.\n\nOnly the contract admin (as defined in wasmd), if any, is able to make this call.\n\nThis is translated to a [MsgMigrateContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L86-L96). `sender` is automatically filled with the current contract's address.",
+              "type": "object",
+              "required": [
+                "migrate"
+              ],
+              "properties": {
+                "migrate": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr",
+                    "msg",
+                    "new_code_id"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    },
+                    "msg": {
+                      "description": "msg is the json-encoded MigrateMsg struct that will be passed to the new code",
+                      "allOf": [
+                        {
+                          "$ref": "#/definitions/Binary"
+                        }
+                      ]
+                    },
+                    "new_code_id": {
+                      "description": "the code_id of the new logic to place in the given contract",
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
+              "type": "object",
+              "required": [
+                "update_admin"
+              ],
+              "properties": {
+                "update_admin": {
+                  "type": "object",
+                  "required": [
+                    "admin",
+                    "contract_addr"
+                  ],
+                  "properties": {
+                    "admin": {
+                      "type": "string"
+                    },
+                    "contract_addr": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
+              "type": "object",
+              "required": [
+                "clear_admin"
+              ],
+              "properties": {
+                "clear_admin": {
+                  "type": "object",
+                  "required": [
+                    "contract_addr"
+                  ],
+                  "properties": {
+                    "contract_addr": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        }
+      }
+    },
+    "threshold": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ThresholdResponse",
+      "description": "This defines the different ways tallies can happen. Every contract should support a subset of these, ideally all.\n\nThe total_weight used for calculating success as well as the weights of each individual voter used in tallying should be snapshotted at the beginning of the block at which the proposal starts (this is likely the responsibility of a correct cw4 implementation).",
+      "oneOf": [
+        {
+          "description": "Declares that a fixed weight of yes votes is needed to pass. It does not matter how many no votes are cast, or how many do not vote, as long as `weight` yes votes are cast.\n\nThis is the simplest format and usually suitable for small multisigs of trusted parties, like 3 of 5. (weight: 3, total_weight: 5)\n\nA proposal of this type can pass early as soon as the needed weight of yes votes has been cast.",
+          "type": "object",
+          "required": [
+            "absolute_count"
+          ],
+          "properties": {
+            "absolute_count": {
+              "type": "object",
+              "required": [
+                "total_weight",
+                "weight"
+              ],
+              "properties": {
+                "total_weight": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                },
+                "weight": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Declares a percentage of the total weight that must cast Yes votes, in order for a proposal to pass. The passing weight is computed over the total weight minus the weight of the abstained votes.\n\nThis is useful for similar circumstances as `AbsoluteCount`, where we have a relatively small set of voters, and participation is required. It is understood that if the voting set (group) changes between different proposals that refer to the same group, each proposal will work with a different set of voter weights (the ones snapshotted at proposal creation), and the passing weight for each proposal will be computed based on the absolute percentage, times the total weights of the members at the time of each proposal creation.\n\nExample: we set `percentage` to 51%. Proposal 1 starts when there is a `total_weight` of 5. This will require 3 weight of Yes votes in order to pass. Later, the Proposal 2 starts but the `total_weight` of the group has increased to 9. That proposal will then automatically require 5 Yes of 9 to pass, rather than 3 yes of 9 as would be the case with `AbsoluteCount`.",
+          "type": "object",
+          "required": [
+            "absolute_percentage"
+          ],
+          "properties": {
+            "absolute_percentage": {
+              "type": "object",
+              "required": [
+                "percentage",
+                "total_weight"
+              ],
+              "properties": {
+                "percentage": {
+                  "$ref": "#/definitions/Decimal"
+                },
+                "total_weight": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "In addition to a `threshold`, declares a `quorum` of the total votes that must participate in the election in order for the vote to be considered at all. Within the votes that were cast, it requires `threshold` votes in favor. That is calculated by ignoring the Abstain votes (they count towards `quorum`, but do not influence `threshold`). That is, we calculate `Yes / (Yes + No + Veto)` and compare it with `threshold` to consider if the proposal was passed.\n\nIt is rather difficult for a proposal of this type to pass early. That can only happen if the required quorum has been already met, and there are already enough Yes votes for the proposal to pass.\n\n30% Yes votes, 10% No votes, and 20% Abstain would pass early if quorum <= 60% (who has cast votes) and if the threshold is <= 37.5% (the remaining 40% voting no => 30% yes + 50% no). Once the voting period has passed with no additional votes, that same proposal would be considered successful if quorum <= 60% and threshold <= 75% (percent in favor if we ignore abstain votes).\n\nThis type is more common in general elections, where participation is often expected to be low, and `AbsolutePercentage` would either be too high to pass anything, or allow low percentages to pass, independently of if there was high participation in the election or not.",
+          "type": "object",
+          "required": [
+            "threshold_quorum"
+          ],
+          "properties": {
+            "threshold_quorum": {
+              "type": "object",
+              "required": [
+                "quorum",
+                "threshold",
+                "total_weight"
+              ],
+              "properties": {
+                "quorum": {
+                  "$ref": "#/definitions/Decimal"
+                },
+                "threshold": {
+                  "$ref": "#/definitions/Decimal"
+                },
+                "total_weight": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ],
+      "definitions": {
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        }
+      }
+    },
+    "vote": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VoteResponse",
+      "type": "object",
+      "properties": {
+        "vote": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/VoteInfo"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Vote": {
+          "type": "string",
+          "enum": [
+            "yes",
+            "no",
+            "abstain",
+            "veto"
+          ]
+        },
+        "VoteInfo": {
+          "description": "Returns the vote (opinion as well as weight counted) as well as the address of the voter who submitted it",
+          "type": "object",
+          "required": [
+            "proposal_id",
+            "vote",
+            "voter",
+            "weight"
+          ],
+          "properties": {
+            "proposal_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "vote": {
+              "$ref": "#/definitions/Vote"
+            },
+            "voter": {
+              "type": "string"
+            },
+            "weight": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "voter": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VoterResponse",
+      "type": "object",
+      "properties": {
+        "weight": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/__fixtures__/idl-version/cw4-group/cw4-group.json b/__fixtures__/idl-version/cw4-group/cw4-group.json
new file mode 100644
index 00000000..589e2fef
--- /dev/null
+++ b/__fixtures__/idl-version/cw4-group/cw4-group.json
@@ -0,0 +1,385 @@
+{
+  "contract_name": "cw4-group",
+  "contract_version": "0.14.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "members"
+    ],
+    "properties": {
+      "admin": {
+        "description": "The admin is the only account that can update the group state. Omit it to make the group immutable.",
+        "type": [
+          "string",
+          "null"
+        ]
+      },
+      "members": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/Member"
+        }
+      }
+    },
+    "additionalProperties": false,
+    "definitions": {
+      "Member": {
+        "description": "A group member has a weight associated with them. This may all be equal, or may have meaning in the app that makes use of the group (eg. voting power)",
+        "type": "object",
+        "required": [
+          "addr",
+          "weight"
+        ],
+        "properties": {
+          "addr": {
+            "type": "string"
+          },
+          "weight": {
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
+      }
+    }
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "description": "Change the admin",
+        "type": "object",
+        "required": [
+          "update_admin"
+        ],
+        "properties": {
+          "update_admin": {
+            "type": "object",
+            "properties": {
+              "admin": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "apply a diff to the existing members. remove is applied after add, so if an address is in both, it is removed",
+        "type": "object",
+        "required": [
+          "update_members"
+        ],
+        "properties": {
+          "update_members": {
+            "type": "object",
+            "required": [
+              "add",
+              "remove"
+            ],
+            "properties": {
+              "add": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/Member"
+                }
+              },
+              "remove": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Add a new hook to be informed of all membership changes. Must be called by Admin",
+        "type": "object",
+        "required": [
+          "add_hook"
+        ],
+        "properties": {
+          "add_hook": {
+            "type": "object",
+            "required": [
+              "addr"
+            ],
+            "properties": {
+              "addr": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Remove a hook. Must be called by Admin",
+        "type": "object",
+        "required": [
+          "remove_hook"
+        ],
+        "properties": {
+          "remove_hook": {
+            "type": "object",
+            "required": [
+              "addr"
+            ],
+            "properties": {
+              "addr": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Member": {
+        "description": "A group member has a weight associated with them. This may all be equal, or may have meaning in the app that makes use of the group (eg. voting power)",
+        "type": "object",
+        "required": [
+          "addr",
+          "weight"
+        ],
+        "properties": {
+          "addr": {
+            "type": "string"
+          },
+          "weight": {
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
+      }
+    }
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "admin"
+        ],
+        "properties": {
+          "admin": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "total_weight"
+        ],
+        "properties": {
+          "total_weight": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "list_members"
+        ],
+        "properties": {
+          "list_members": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "member"
+        ],
+        "properties": {
+          "member": {
+            "type": "object",
+            "required": [
+              "addr"
+            ],
+            "properties": {
+              "addr": {
+                "type": "string"
+              },
+              "at_height": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Shows all registered hooks.",
+        "type": "object",
+        "required": [
+          "hooks"
+        ],
+        "properties": {
+          "hooks": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": null,
+  "sudo": null,
+  "responses": {
+    "admin": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AdminResponse",
+      "description": "Returned from Admin.query_admin()",
+      "type": "object",
+      "properties": {
+        "admin": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "hooks": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "HooksResponse",
+      "type": "object",
+      "required": [
+        "hooks"
+      ],
+      "properties": {
+        "hooks": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "list_members": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "MemberListResponse",
+      "type": "object",
+      "required": [
+        "members"
+      ],
+      "properties": {
+        "members": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Member"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Member": {
+          "description": "A group member has a weight associated with them. This may all be equal, or may have meaning in the app that makes use of the group (eg. voting power)",
+          "type": "object",
+          "required": [
+            "addr",
+            "weight"
+          ],
+          "properties": {
+            "addr": {
+              "type": "string"
+            },
+            "weight": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "member": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "MemberResponse",
+      "type": "object",
+      "properties": {
+        "weight": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "total_weight": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "TotalWeightResponse",
+      "type": "object",
+      "required": [
+        "weight"
+      ],
+      "properties": {
+        "weight": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
new file mode 100644
index 00000000..6f780f31
--- /dev/null
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
@@ -0,0 +1,283 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
+export interface Cw3FixedMultiSigReadOnlyInterface {
+  contractAddress: string;
+  threshold: () => Promise<ThresholdResponse>;
+  proposal: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }) => Promise<ProposalResponseForEmpty>;
+  listProposals: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }) => Promise<ProposalListResponse>;
+  reverseProposals: ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }) => Promise<ProposalListResponse>;
+  vote: ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }) => Promise<VoteResponse>;
+  listVotes: ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }) => Promise<VoteListResponse>;
+  voter: ({
+    address
+  }: {
+    address: string;
+  }) => Promise<VoterResponse>;
+  listVoters: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }) => Promise<VoterListResponse>;
+}
+export class Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.threshold = this.threshold.bind(this);
+    this.proposal = this.proposal.bind(this);
+    this.listProposals = this.listProposals.bind(this);
+    this.reverseProposals = this.reverseProposals.bind(this);
+    this.vote = this.vote.bind(this);
+    this.listVotes = this.listVotes.bind(this);
+    this.voter = this.voter.bind(this);
+    this.listVoters = this.listVoters.bind(this);
+  }
+
+  threshold = async (): Promise<ThresholdResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      threshold: {}
+    });
+  };
+  proposal = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): Promise<ProposalResponseForEmpty> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal: {
+        proposal_id: proposalId
+      }
+    });
+  };
+  listProposals = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): Promise<ProposalListResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_proposals: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  reverseProposals = async ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }): Promise<ProposalListResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      reverse_proposals: {
+        limit,
+        start_before: startBefore
+      }
+    });
+  };
+  vote = async ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }): Promise<VoteResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      vote: {
+        proposal_id: proposalId,
+        voter
+      }
+    });
+  };
+  listVotes = async ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }): Promise<VoteListResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_votes: {
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      }
+    });
+  };
+  voter = async ({
+    address
+  }: {
+    address: string;
+  }): Promise<VoterResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      voter: {
+        address
+      }
+    });
+  };
+  listVoters = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }): Promise<VoterListResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_voters: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+}
+export interface Cw3FixedMultiSigInterface extends Cw3FixedMultiSigReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  propose: ({
+    description,
+    latest,
+    msgs,
+    title
+  }: {
+    description: string;
+    latest?: Expiration;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  vote: ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  execute: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  close: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.propose = this.propose.bind(this);
+    this.vote = this.vote.bind(this);
+    this.execute = this.execute.bind(this);
+    this.close = this.close.bind(this);
+  }
+
+  propose = async ({
+    description,
+    latest,
+    msgs,
+    title
+  }: {
+    description: string;
+    latest?: Expiration;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      propose: {
+        description,
+        latest,
+        msgs,
+        title
+      }
+    }, fee, memo, funds);
+  };
+  vote = async ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      vote: {
+        proposal_id: proposalId,
+        vote
+      }
+    }, fee, memo, funds);
+  };
+  execute = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      execute: {
+        proposal_id: proposalId
+      }
+    }, fee, memo, funds);
+  };
+  close = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      close: {
+        proposal_id: proposalId
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
new file mode 100644
index 00000000..a191ec12
--- /dev/null
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -0,0 +1,144 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
+export interface Cw3FixedMultiSigMessage {
+  contractAddress: string;
+  sender: string;
+  propose: ({
+    description,
+    latest,
+    msgs,
+    title
+  }: {
+    description: string;
+    latest?: Expiration;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  vote: ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  execute: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  close: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.propose = this.propose.bind(this);
+    this.vote = this.vote.bind(this);
+    this.execute = this.execute.bind(this);
+    this.close = this.close.bind(this);
+  }
+
+  propose = ({
+    description,
+    latest,
+    msgs,
+    title
+  }: {
+    description: string;
+    latest?: Expiration;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          propose: {
+            description,
+            latest,
+            msgs,
+            title
+          }
+        })),
+        funds
+      })
+    };
+  };
+  vote = ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          vote: {
+            proposal_id: proposalId,
+            vote
+          }
+        })),
+        funds
+      })
+    };
+  };
+  execute = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          execute: {
+            proposal_id: proposalId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  close = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          close: {
+            proposal_id: proposalId
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts
new file mode 100644
index 00000000..dd485541
--- /dev/null
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts
@@ -0,0 +1,130 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
+import { Cw3FixedMultiSigQueryClient } from "./Cw3FixedMultiSig.client";
+export interface Cw3FixedMultiSigReactQuery<TResponse, TData = TResponse> {
+  client: Cw3FixedMultiSigQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface Cw3FixedMultiSigListVotersQuery<TData> extends Cw3FixedMultiSigReactQuery<VoterListResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+  };
+}
+export function useCw3FixedMultiSigListVotersQuery<TData = VoterListResponse>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigListVotersQuery<TData>) {
+  return useQuery<VoterListResponse, Error, TData>(["cw3FixedMultiSigListVoters", client.contractAddress, JSON.stringify(args)], () => client.listVoters({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Cw3FixedMultiSigVoterQuery<TData> extends Cw3FixedMultiSigReactQuery<VoterResponse, TData> {
+  args: {
+    address: string;
+  };
+}
+export function useCw3FixedMultiSigVoterQuery<TData = VoterResponse>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigVoterQuery<TData>) {
+  return useQuery<VoterResponse, Error, TData>(["cw3FixedMultiSigVoter", client.contractAddress, JSON.stringify(args)], () => client.voter({
+    address: args.address
+  }), options);
+}
+export interface Cw3FixedMultiSigListVotesQuery<TData> extends Cw3FixedMultiSigReactQuery<VoteListResponse, TData> {
+  args: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  };
+}
+export function useCw3FixedMultiSigListVotesQuery<TData = VoteListResponse>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigListVotesQuery<TData>) {
+  return useQuery<VoteListResponse, Error, TData>(["cw3FixedMultiSigListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
+    limit: args.limit,
+    proposalId: args.proposalId,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Cw3FixedMultiSigVoteQuery<TData> extends Cw3FixedMultiSigReactQuery<VoteResponse, TData> {
+  args: {
+    proposalId: number;
+    voter: string;
+  };
+}
+export function useCw3FixedMultiSigVoteQuery<TData = VoteResponse>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigVoteQuery<TData>) {
+  return useQuery<VoteResponse, Error, TData>(["cw3FixedMultiSigVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
+    proposalId: args.proposalId,
+    voter: args.voter
+  }), options);
+}
+export interface Cw3FixedMultiSigReverseProposalsQuery<TData> extends Cw3FixedMultiSigReactQuery<ProposalListResponse, TData> {
+  args: {
+    limit?: number;
+    startBefore?: number;
+  };
+}
+export function useCw3FixedMultiSigReverseProposalsQuery<TData = ProposalListResponse>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigReverseProposalsQuery<TData>) {
+  return useQuery<ProposalListResponse, Error, TData>(["cw3FixedMultiSigReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
+    limit: args.limit,
+    startBefore: args.startBefore
+  }), options);
+}
+export interface Cw3FixedMultiSigListProposalsQuery<TData> extends Cw3FixedMultiSigReactQuery<ProposalListResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: number;
+  };
+}
+export function useCw3FixedMultiSigListProposalsQuery<TData = ProposalListResponse>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigListProposalsQuery<TData>) {
+  return useQuery<ProposalListResponse, Error, TData>(["cw3FixedMultiSigListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Cw3FixedMultiSigProposalQuery<TData> extends Cw3FixedMultiSigReactQuery<ProposalResponseForEmpty, TData> {
+  args: {
+    proposalId: number;
+  };
+}
+export function useCw3FixedMultiSigProposalQuery<TData = ProposalResponseForEmpty>({
+  client,
+  args,
+  options
+}: Cw3FixedMultiSigProposalQuery<TData>) {
+  return useQuery<ProposalResponseForEmpty, Error, TData>(["cw3FixedMultiSigProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
+    proposalId: args.proposalId
+  }), options);
+}
+export interface Cw3FixedMultiSigThresholdQuery<TData> extends Cw3FixedMultiSigReactQuery<ThresholdResponse, TData> {}
+export function useCw3FixedMultiSigThresholdQuery<TData = ThresholdResponse>({
+  client,
+  options
+}: Cw3FixedMultiSigThresholdQuery<TData>) {
+  return useQuery<ThresholdResponse, Error, TData>(["cw3FixedMultiSigThreshold", client.contractAddress], () => client.threshold(), options);
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.recoil.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.recoil.ts
new file mode 100644
index 00000000..150517c8
--- /dev/null
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.recoil.ts
@@ -0,0 +1,136 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
+import { Cw3FixedMultiSigQueryClient } from "./Cw3FixedMultiSig.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<Cw3FixedMultiSigQueryClient, QueryClientParams>({
+  key: "cw3FixedMultiSigQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new Cw3FixedMultiSigQueryClient(client, contractAddress);
+  }
+});
+export const thresholdSelector = selectorFamily<ThresholdResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["threshold"]>;
+}>({
+  key: "cw3FixedMultiSigThreshold",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.threshold(...params);
+  }
+});
+export const proposalSelector = selectorFamily<ProposalResponseForEmpty, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["proposal"]>;
+}>({
+  key: "cw3FixedMultiSigProposal",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposal(...params);
+  }
+});
+export const listProposalsSelector = selectorFamily<ProposalListResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["listProposals"]>;
+}>({
+  key: "cw3FixedMultiSigListProposals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listProposals(...params);
+  }
+});
+export const reverseProposalsSelector = selectorFamily<ProposalListResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["reverseProposals"]>;
+}>({
+  key: "cw3FixedMultiSigReverseProposals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.reverseProposals(...params);
+  }
+});
+export const voteSelector = selectorFamily<VoteResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["vote"]>;
+}>({
+  key: "cw3FixedMultiSigVote",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.vote(...params);
+  }
+});
+export const listVotesSelector = selectorFamily<VoteListResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["listVotes"]>;
+}>({
+  key: "cw3FixedMultiSigListVotes",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listVotes(...params);
+  }
+});
+export const voterSelector = selectorFamily<VoterResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["voter"]>;
+}>({
+  key: "cw3FixedMultiSigVoter",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.voter(...params);
+  }
+});
+export const listVotersSelector = selectorFamily<VoterListResponse, QueryClientParams & {
+  params: Parameters<Cw3FixedMultiSigQueryClient["listVoters"]>;
+}>({
+  key: "cw3FixedMultiSigListVoters",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listVoters(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.types.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.types.ts
new file mode 100644
index 00000000..8f40d647
--- /dev/null
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.types.ts
@@ -0,0 +1,254 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Duration = {
+  height: number;
+} | {
+  time: number;
+};
+export type Threshold = {
+  absolute_count: {
+    weight: number;
+  };
+} | {
+  absolute_percentage: {
+    percentage: Decimal;
+  };
+} | {
+  threshold_quorum: {
+    quorum: Decimal;
+    threshold: Decimal;
+  };
+};
+export type Decimal = string;
+export interface InstantiateMsg {
+  max_voting_period: Duration;
+  threshold: Threshold;
+  voters: Voter[];
+}
+export interface Voter {
+  addr: string;
+  weight: number;
+}
+export type ExecuteMsg = {
+  propose: {
+    description: string;
+    latest?: Expiration | null;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  };
+} | {
+  vote: {
+    proposal_id: number;
+    vote: Vote;
+  };
+} | {
+  execute: {
+    proposal_id: number;
+  };
+} | {
+  close: {
+    proposal_id: number;
+  };
+};
+export type Expiration = {
+  at_height: number;
+} | {
+  at_time: Timestamp;
+} | {
+  never: {};
+};
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type CosmosMsgForEmpty = {
+  bank: BankMsg;
+} | {
+  custom: Empty;
+} | {
+  staking: StakingMsg;
+} | {
+  distribution: DistributionMsg;
+} | {
+  wasm: WasmMsg;
+};
+export type BankMsg = {
+  send: {
+    amount: Coin[];
+    to_address: string;
+    [k: string]: unknown;
+  };
+} | {
+  burn: {
+    amount: Coin[];
+    [k: string]: unknown;
+  };
+};
+export type Uint128 = string;
+export type StakingMsg = {
+  delegate: {
+    amount: Coin;
+    validator: string;
+    [k: string]: unknown;
+  };
+} | {
+  undelegate: {
+    amount: Coin;
+    validator: string;
+    [k: string]: unknown;
+  };
+} | {
+  redelegate: {
+    amount: Coin;
+    dst_validator: string;
+    src_validator: string;
+    [k: string]: unknown;
+  };
+};
+export type DistributionMsg = {
+  set_withdraw_address: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  withdraw_delegator_reward: {
+    validator: string;
+    [k: string]: unknown;
+  };
+};
+export type WasmMsg = {
+  execute: {
+    contract_addr: string;
+    funds: Coin[];
+    msg: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  instantiate: {
+    admin?: string | null;
+    code_id: number;
+    funds: Coin[];
+    label: string;
+    msg: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  migrate: {
+    contract_addr: string;
+    msg: Binary;
+    new_code_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_admin: {
+    admin: string;
+    contract_addr: string;
+    [k: string]: unknown;
+  };
+} | {
+  clear_admin: {
+    contract_addr: string;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export type Vote = "yes" | "no" | "abstain" | "veto";
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export interface Empty {
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  threshold: {};
+} | {
+  proposal: {
+    proposal_id: number;
+  };
+} | {
+  list_proposals: {
+    limit?: number | null;
+    start_after?: number | null;
+  };
+} | {
+  reverse_proposals: {
+    limit?: number | null;
+    start_before?: number | null;
+  };
+} | {
+  vote: {
+    proposal_id: number;
+    voter: string;
+  };
+} | {
+  list_votes: {
+    limit?: number | null;
+    proposal_id: number;
+    start_after?: string | null;
+  };
+} | {
+  voter: {
+    address: string;
+  };
+} | {
+  list_voters: {
+    limit?: number | null;
+    start_after?: string | null;
+  };
+};
+export type Status = "pending" | "open" | "rejected" | "passed" | "executed";
+export type ThresholdResponse = {
+  absolute_count: {
+    total_weight: number;
+    weight: number;
+  };
+} | {
+  absolute_percentage: {
+    percentage: Decimal;
+    total_weight: number;
+  };
+} | {
+  threshold_quorum: {
+    quorum: Decimal;
+    threshold: Decimal;
+    total_weight: number;
+  };
+};
+export interface ProposalListResponse {
+  proposals: ProposalResponseForEmpty[];
+}
+export interface ProposalResponseForEmpty {
+  description: string;
+  expires: Expiration;
+  id: number;
+  msgs: CosmosMsgForEmpty[];
+  status: Status;
+  threshold: ThresholdResponse;
+  title: string;
+}
+export interface VoterListResponse {
+  voters: VoterDetail[];
+}
+export interface VoterDetail {
+  addr: string;
+  weight: number;
+}
+export interface VoteListResponse {
+  votes: VoteInfo[];
+}
+export interface VoteInfo {
+  proposal_id: number;
+  vote: Vote;
+  voter: string;
+  weight: number;
+}
+export interface VoteResponse {
+  vote?: VoteInfo | null;
+}
+export interface VoterResponse {
+  weight?: number | null;
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts
new file mode 100644
index 00000000..c438469b
--- /dev/null
+++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts
@@ -0,0 +1,177 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
+export interface Cw4GroupReadOnlyInterface {
+  contractAddress: string;
+  admin: () => Promise<AdminResponse>;
+  totalWeight: () => Promise<TotalWeightResponse>;
+  listMembers: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }) => Promise<MemberListResponse>;
+  member: ({
+    addr,
+    atHeight
+  }: {
+    addr: string;
+    atHeight?: number;
+  }) => Promise<MemberResponse>;
+  hooks: () => Promise<HooksResponse>;
+}
+export class Cw4GroupQueryClient implements Cw4GroupReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.admin = this.admin.bind(this);
+    this.totalWeight = this.totalWeight.bind(this);
+    this.listMembers = this.listMembers.bind(this);
+    this.member = this.member.bind(this);
+    this.hooks = this.hooks.bind(this);
+  }
+
+  admin = async (): Promise<AdminResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      admin: {}
+    });
+  };
+  totalWeight = async (): Promise<TotalWeightResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      total_weight: {}
+    });
+  };
+  listMembers = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }): Promise<MemberListResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_members: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  member = async ({
+    addr,
+    atHeight
+  }: {
+    addr: string;
+    atHeight?: number;
+  }): Promise<MemberResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      member: {
+        addr,
+        at_height: atHeight
+      }
+    });
+  };
+  hooks = async (): Promise<HooksResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      hooks: {}
+    });
+  };
+}
+export interface Cw4GroupInterface extends Cw4GroupReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  updateAdmin: ({
+    admin
+  }: {
+    admin?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateMembers: ({
+    add,
+    remove
+  }: {
+    add: Member[];
+    remove: string[];
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  addHook: ({
+    addr
+  }: {
+    addr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  removeHook: ({
+    addr
+  }: {
+    addr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.updateAdmin = this.updateAdmin.bind(this);
+    this.updateMembers = this.updateMembers.bind(this);
+    this.addHook = this.addHook.bind(this);
+    this.removeHook = this.removeHook.bind(this);
+  }
+
+  updateAdmin = async ({
+    admin
+  }: {
+    admin?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_admin: {
+        admin
+      }
+    }, fee, memo, funds);
+  };
+  updateMembers = async ({
+    add,
+    remove
+  }: {
+    add: Member[];
+    remove: string[];
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_members: {
+        add,
+        remove
+      }
+    }, fee, memo, funds);
+  };
+  addHook = async ({
+    addr
+  }: {
+    addr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      add_hook: {
+        addr
+      }
+    }, fee, memo, funds);
+  };
+  removeHook = async ({
+    addr
+  }: {
+    addr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      remove_hook: {
+        addr
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
new file mode 100644
index 00000000..e516b7ca
--- /dev/null
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -0,0 +1,130 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
+export interface Cw4GroupMessage {
+  contractAddress: string;
+  sender: string;
+  updateAdmin: ({
+    admin
+  }: {
+    admin?: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateMembers: ({
+    add,
+    remove
+  }: {
+    add: Member[];
+    remove: string[];
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  addHook: ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  removeHook: ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class Cw4GroupMessageComposer implements Cw4GroupMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.updateAdmin = this.updateAdmin.bind(this);
+    this.updateMembers = this.updateMembers.bind(this);
+    this.addHook = this.addHook.bind(this);
+    this.removeHook = this.removeHook.bind(this);
+  }
+
+  updateAdmin = ({
+    admin
+  }: {
+    admin?: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_admin: {
+            admin
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateMembers = ({
+    add,
+    remove
+  }: {
+    add: Member[];
+    remove: string[];
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_members: {
+            add,
+            remove
+          }
+        })),
+        funds
+      })
+    };
+  };
+  addHook = ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          add_hook: {
+            addr
+          }
+        })),
+        funds
+      })
+    };
+  };
+  removeHook = ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          remove_hook: {
+            addr
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.react-query.ts b/__output__/idl-version/cw4-group/Cw4Group.react-query.ts
new file mode 100644
index 00000000..c6773c81
--- /dev/null
+++ b/__output__/idl-version/cw4-group/Cw4Group.react-query.ts
@@ -0,0 +1,66 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
+import { Cw4GroupQueryClient } from "./Cw4Group.client";
+export interface Cw4GroupReactQuery<TResponse, TData = TResponse> {
+  client: Cw4GroupQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface Cw4GroupHooksQuery<TData> extends Cw4GroupReactQuery<HooksResponse, TData> {}
+export function useCw4GroupHooksQuery<TData = HooksResponse>({
+  client,
+  options
+}: Cw4GroupHooksQuery<TData>) {
+  return useQuery<HooksResponse, Error, TData>(["cw4GroupHooks", client.contractAddress], () => client.hooks(), options);
+}
+export interface Cw4GroupMemberQuery<TData> extends Cw4GroupReactQuery<MemberResponse, TData> {
+  args: {
+    addr: string;
+    atHeight?: number;
+  };
+}
+export function useCw4GroupMemberQuery<TData = MemberResponse>({
+  client,
+  args,
+  options
+}: Cw4GroupMemberQuery<TData>) {
+  return useQuery<MemberResponse, Error, TData>(["cw4GroupMember", client.contractAddress, JSON.stringify(args)], () => client.member({
+    addr: args.addr,
+    atHeight: args.atHeight
+  }), options);
+}
+export interface Cw4GroupListMembersQuery<TData> extends Cw4GroupReactQuery<MemberListResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+  };
+}
+export function useCw4GroupListMembersQuery<TData = MemberListResponse>({
+  client,
+  args,
+  options
+}: Cw4GroupListMembersQuery<TData>) {
+  return useQuery<MemberListResponse, Error, TData>(["cw4GroupListMembers", client.contractAddress, JSON.stringify(args)], () => client.listMembers({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Cw4GroupTotalWeightQuery<TData> extends Cw4GroupReactQuery<TotalWeightResponse, TData> {}
+export function useCw4GroupTotalWeightQuery<TData = TotalWeightResponse>({
+  client,
+  options
+}: Cw4GroupTotalWeightQuery<TData>) {
+  return useQuery<TotalWeightResponse, Error, TData>(["cw4GroupTotalWeight", client.contractAddress], () => client.totalWeight(), options);
+}
+export interface Cw4GroupAdminQuery<TData> extends Cw4GroupReactQuery<AdminResponse, TData> {}
+export function useCw4GroupAdminQuery<TData = AdminResponse>({
+  client,
+  options
+}: Cw4GroupAdminQuery<TData>) {
+  return useQuery<AdminResponse, Error, TData>(["cw4GroupAdmin", client.contractAddress], () => client.admin(), options);
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.recoil.ts b/__output__/idl-version/cw4-group/Cw4Group.recoil.ts
new file mode 100644
index 00000000..e07778ac
--- /dev/null
+++ b/__output__/idl-version/cw4-group/Cw4Group.recoil.ts
@@ -0,0 +1,94 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
+import { Cw4GroupQueryClient } from "./Cw4Group.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<Cw4GroupQueryClient, QueryClientParams>({
+  key: "cw4GroupQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new Cw4GroupQueryClient(client, contractAddress);
+  }
+});
+export const adminSelector = selectorFamily<AdminResponse, QueryClientParams & {
+  params: Parameters<Cw4GroupQueryClient["admin"]>;
+}>({
+  key: "cw4GroupAdmin",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.admin(...params);
+  }
+});
+export const totalWeightSelector = selectorFamily<TotalWeightResponse, QueryClientParams & {
+  params: Parameters<Cw4GroupQueryClient["totalWeight"]>;
+}>({
+  key: "cw4GroupTotalWeight",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.totalWeight(...params);
+  }
+});
+export const listMembersSelector = selectorFamily<MemberListResponse, QueryClientParams & {
+  params: Parameters<Cw4GroupQueryClient["listMembers"]>;
+}>({
+  key: "cw4GroupListMembers",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listMembers(...params);
+  }
+});
+export const memberSelector = selectorFamily<MemberResponse, QueryClientParams & {
+  params: Parameters<Cw4GroupQueryClient["member"]>;
+}>({
+  key: "cw4GroupMember",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.member(...params);
+  }
+});
+export const hooksSelector = selectorFamily<HooksResponse, QueryClientParams & {
+  params: Parameters<Cw4GroupQueryClient["hooks"]>;
+}>({
+  key: "cw4GroupHooks",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.hooks(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.types.ts b/__output__/idl-version/cw4-group/Cw4Group.types.ts
new file mode 100644
index 00000000..461389d2
--- /dev/null
+++ b/__output__/idl-version/cw4-group/Cw4Group.types.ts
@@ -0,0 +1,64 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export interface InstantiateMsg {
+  admin?: string | null;
+  members: Member[];
+}
+export interface Member {
+  addr: string;
+  weight: number;
+}
+export type ExecuteMsg = {
+  update_admin: {
+    admin?: string | null;
+  };
+} | {
+  update_members: {
+    add: Member[];
+    remove: string[];
+  };
+} | {
+  add_hook: {
+    addr: string;
+  };
+} | {
+  remove_hook: {
+    addr: string;
+  };
+};
+export type QueryMsg = {
+  admin: {};
+} | {
+  total_weight: {};
+} | {
+  list_members: {
+    limit?: number | null;
+    start_after?: string | null;
+  };
+} | {
+  member: {
+    addr: string;
+    at_height?: number | null;
+  };
+} | {
+  hooks: {};
+};
+export interface AdminResponse {
+  admin?: string | null;
+}
+export interface HooksResponse {
+  hooks: string[];
+}
+export interface MemberListResponse {
+  members: Member[];
+}
+export interface MemberResponse {
+  weight?: number | null;
+}
+export interface TotalWeightResponse {
+  weight: number;
+}
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
index 5dbf4ca0..70e3100c 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -6,10 +6,10 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { Coin, StdFee } from "@cosmjs/amino";
-import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 export interface CyberPunkReadOnlyInterface {
   contractAddress: string;
-  mirrorEnv: () => Promise<MirrorEnvResponse>;
+  mirrorEnv: () => Promise<Env>;
 }
 export class CyberPunkQueryClient implements CyberPunkReadOnlyInterface {
   client: CosmWasmClient;
@@ -21,7 +21,7 @@ export class CyberPunkQueryClient implements CyberPunkReadOnlyInterface {
     this.mirrorEnv = this.mirrorEnv.bind(this);
   }
 
-  mirrorEnv = async (): Promise<MirrorEnvResponse> => {
+  mirrorEnv = async (): Promise<Env> => {
     return this.client.queryContractSmart(this.contractAddress, {
       mirror_env: {}
     });
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index fef92e22..22f9edde 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino";
 import { MsgExecuteContractEncodeObject } from "cosmwasm";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 export interface CyberPunkMessage {
   contractAddress: string;
   sender: string;
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts b/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
index d6c80f03..37307588 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
@@ -5,16 +5,16 @@
 */
 
 import { UseQueryOptions, useQuery } from "react-query";
-import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 import { CyberPunkQueryClient } from "./CyberPunk.client";
 export interface CyberPunkReactQuery<TResponse, TData = TResponse> {
   client: CyberPunkQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface CyberPunkMirrorEnvQuery<TData> extends CyberPunkReactQuery<MirrorEnvResponse, TData> {}
-export function useCyberPunkMirrorEnvQuery<TData = MirrorEnvResponse>({
+export interface CyberPunkMirrorEnvQuery<TData> extends CyberPunkReactQuery<Env, TData> {}
+export function useCyberPunkMirrorEnvQuery<TData = Env>({
   client,
   options
 }: CyberPunkMirrorEnvQuery<TData>) {
-  return useQuery<MirrorEnvResponse, Error, TData>(["cyberPunkMirrorEnv", client.contractAddress], () => client.mirrorEnv(), options);
+  return useQuery<Env, Error, TData>(["cyberPunkMirrorEnv", client.contractAddress], () => client.mirrorEnv(), options);
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts b/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts
index 55e8eb18..02290cbb 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { InstantiateMsg, ExecuteMsg, QueryMsg } from "./CyberPunk.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 import { CyberPunkQueryClient } from "./CyberPunk.client";
 type QueryClientParams = {
   contractAddress: string;
@@ -22,7 +22,7 @@ export const queryClient = selectorFamily<CyberPunkQueryClient, QueryClientParam
     return new CyberPunkQueryClient(client, contractAddress);
   }
 });
-export const mirrorEnvSelector = selectorFamily<MirrorEnvResponse, QueryClientParams & {
+export const mirrorEnvSelector = selectorFamily<Env, QueryClientParams & {
   params: Parameters<CyberPunkQueryClient["mirrorEnv"]>;
 }>({
   key: "cyberPunkMirrorEnv",
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.types.ts b/__output__/idl-version/cyberpunk/CyberPunk.types.ts
index 81228471..91b6a9bb 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.types.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.types.ts
@@ -17,4 +17,27 @@ export type ExecuteMsg = {
 };
 export type QueryMsg = {
   mirror_env: {};
-};
\ No newline at end of file
+};
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type Addr = string;
+export interface Env {
+  block: BlockInfo;
+  contract: ContractInfo;
+  transaction?: TransactionInfo | null;
+  [k: string]: unknown;
+}
+export interface BlockInfo {
+  chain_id: string;
+  height: number;
+  time: Timestamp;
+  [k: string]: unknown;
+}
+export interface ContractInfo {
+  address: Addr;
+  [k: string]: unknown;
+}
+export interface TransactionInfo {
+  index: number;
+  [k: string]: unknown;
+}
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
index 297ee46f..bce1ebde 100644
--- a/__output__/idl-version/hackatom/HackAtom.client.ts
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
-import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 export interface HackAtomReadOnlyInterface {
   contractAddress: string;
   verifier: () => Promise<VerifierResponse>;
@@ -14,7 +14,7 @@ export interface HackAtomReadOnlyInterface {
     address
   }: {
     address: string;
-  }) => Promise<OtherBalanceResponse>;
+  }) => Promise<AllBalanceResponse>;
   recurse: ({
     depth,
     work
@@ -22,7 +22,7 @@ export interface HackAtomReadOnlyInterface {
     depth: number;
     work: number;
   }) => Promise<RecurseResponse>;
-  getInt: () => Promise<GetIntResponse>;
+  getInt: () => Promise<IntResponse>;
 }
 export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
   client: CosmWasmClient;
@@ -46,7 +46,7 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
     address
   }: {
     address: string;
-  }): Promise<OtherBalanceResponse> => {
+  }): Promise<AllBalanceResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       other_balance: {
         address
@@ -67,7 +67,7 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
       }
     });
   };
-  getInt = async (): Promise<GetIntResponse> => {
+  getInt = async (): Promise<IntResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       get_int: {}
     });
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index 399f497d..6fade775 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -7,7 +7,7 @@
 import { MsgExecuteContractEncodeObject } from "cosmwasm";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 export interface HackAtomMessage {
   contractAddress: string;
   sender: string;
diff --git a/__output__/idl-version/hackatom/HackAtom.react-query.ts b/__output__/idl-version/hackatom/HackAtom.react-query.ts
index 4503f9d5..549016db 100644
--- a/__output__/idl-version/hackatom/HackAtom.react-query.ts
+++ b/__output__/idl-version/hackatom/HackAtom.react-query.ts
@@ -5,18 +5,18 @@
 */
 
 import { UseQueryOptions, useQuery } from "react-query";
-import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 import { HackAtomQueryClient } from "./HackAtom.client";
 export interface HackAtomReactQuery<TResponse, TData = TResponse> {
   client: HackAtomQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
 }
-export interface HackAtomGetIntQuery<TData> extends HackAtomReactQuery<GetIntResponse, TData> {}
-export function useHackAtomGetIntQuery<TData = GetIntResponse>({
+export interface HackAtomGetIntQuery<TData> extends HackAtomReactQuery<IntResponse, TData> {}
+export function useHackAtomGetIntQuery<TData = IntResponse>({
   client,
   options
 }: HackAtomGetIntQuery<TData>) {
-  return useQuery<GetIntResponse, Error, TData>(["hackAtomGetInt", client.contractAddress], () => client.getInt(), options);
+  return useQuery<IntResponse, Error, TData>(["hackAtomGetInt", client.contractAddress], () => client.getInt(), options);
 }
 export interface HackAtomRecurseQuery<TData> extends HackAtomReactQuery<RecurseResponse, TData> {
   args: {
@@ -34,17 +34,17 @@ export function useHackAtomRecurseQuery<TData = RecurseResponse>({
     work: args.work
   }), options);
 }
-export interface HackAtomOtherBalanceQuery<TData> extends HackAtomReactQuery<OtherBalanceResponse, TData> {
+export interface HackAtomOtherBalanceQuery<TData> extends HackAtomReactQuery<AllBalanceResponse, TData> {
   args: {
     address: string;
   };
 }
-export function useHackAtomOtherBalanceQuery<TData = OtherBalanceResponse>({
+export function useHackAtomOtherBalanceQuery<TData = AllBalanceResponse>({
   client,
   args,
   options
 }: HackAtomOtherBalanceQuery<TData>) {
-  return useQuery<OtherBalanceResponse, Error, TData>(["hackAtomOtherBalance", client.contractAddress, JSON.stringify(args)], () => client.otherBalance({
+  return useQuery<AllBalanceResponse, Error, TData>(["hackAtomOtherBalance", client.contractAddress, JSON.stringify(args)], () => client.otherBalance({
     address: args.address
   }), options);
 }
diff --git a/__output__/idl-version/hackatom/HackAtom.recoil.ts b/__output__/idl-version/hackatom/HackAtom.recoil.ts
index 6fe2294e..04e915e8 100644
--- a/__output__/idl-version/hackatom/HackAtom.recoil.ts
+++ b/__output__/idl-version/hackatom/HackAtom.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin } from "./HackAtom.types";
+import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 import { HackAtomQueryClient } from "./HackAtom.client";
 type QueryClientParams = {
   contractAddress: string;
@@ -36,7 +36,7 @@ export const verifierSelector = selectorFamily<VerifierResponse, QueryClientPara
     return await client.verifier(...params);
   }
 });
-export const otherBalanceSelector = selectorFamily<OtherBalanceResponse, QueryClientParams & {
+export const otherBalanceSelector = selectorFamily<AllBalanceResponse, QueryClientParams & {
   params: Parameters<HackAtomQueryClient["otherBalance"]>;
 }>({
   key: "hackAtomOtherBalance",
@@ -64,7 +64,7 @@ export const recurseSelector = selectorFamily<RecurseResponse, QueryClientParams
     return await client.recurse(...params);
   }
 });
-export const getIntSelector = selectorFamily<GetIntResponse, QueryClientParams & {
+export const getIntSelector = selectorFamily<IntResponse, QueryClientParams & {
   params: Parameters<HackAtomQueryClient["getInt"]>;
 }>({
   key: "hackAtomGetInt",
diff --git a/__output__/idl-version/hackatom/HackAtom.types.ts b/__output__/idl-version/hackatom/HackAtom.types.ts
index 8a564933..fd21f5e3 100644
--- a/__output__/idl-version/hackatom/HackAtom.types.ts
+++ b/__output__/idl-version/hackatom/HackAtom.types.ts
@@ -55,4 +55,18 @@ export interface Coin {
   amount: Uint128;
   denom: string;
   [k: string]: unknown;
+}
+export interface IntResponse {
+  int: number;
+}
+export interface AllBalanceResponse {
+  amount: Coin[];
+  [k: string]: unknown;
+}
+export type Binary = string;
+export interface RecurseResponse {
+  hashed: Binary;
+}
+export interface VerifierResponse {
+  verifier: string;
 }
\ No newline at end of file

From 94c5785d947e329df1cc9108cc33bb7a0c21af60 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 12 Sep 2022 22:20:31 -0400
Subject: [PATCH 033/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.15.0
 - wasm-ast-types@0.10.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 85071cc8..a6f550d3 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.15.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.14.2...@cosmwasm/ts-codegen@0.15.0) (2022-09-13)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.14.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.14.1...@cosmwasm/ts-codegen@0.14.2) (2022-09-11)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 3b4f6b83..4074f787 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.14.2",
+  "version": "0.15.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.9.0"
+    "wasm-ast-types": "^0.10.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 4212d463..5ccd9601 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.10.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.9.0...wasm-ast-types@0.10.0) (2022-09-13)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.9.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.2...wasm-ast-types@0.9.0) (2022-08-23)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index e19ff7dd..70e4f673 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.9.0",
+  "version": "0.10.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",

From af68247176aaf1499dd8893478f54d1363720330 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 10:28:52 -0400
Subject: [PATCH 034/287] readme

---
 README.md                     | 5 ++---
 packages/ts-codegen/README.md | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 00aba9a9..88248d59 100644
--- a/README.md
+++ b/README.md
@@ -412,8 +412,7 @@ Using the new `write_api` method, you can export schemas:
 ```rs
 use cosmwasm_schema::write_api;
 
-pub use cw4::{AdminResponse, MemberListResponse, MemberResponse, TotalWeightResponse};
-pub use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
     write_api! {
@@ -477,5 +476,5 @@ Checkout these related projects:
 
 ## Credits
 
-Built by Cosmology — if you like our tools, please consider delegating to [our validator](https://www.mintscan.io/juno/validators/junovaloper1pr5qgj4jg47lvsnejtfvk78090shvuctgdwdm5)
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 00aba9a9..17d5dd4d 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -412,8 +412,7 @@ Using the new `write_api` method, you can export schemas:
 ```rs
 use cosmwasm_schema::write_api;
 
-pub use cw4::{AdminResponse, MemberListResponse, MemberResponse, TotalWeightResponse};
-pub use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
     write_api! {
@@ -477,5 +476,4 @@ Checkout these related projects:
 
 ## Credits
 
-Built by Cosmology — if you like our tools, please consider delegating to [our validator](https://www.mintscan.io/juno/validators/junovaloper1pr5qgj4jg47lvsnejtfvk78090shvuctgdwdm5)
-
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)

From 1de67fe821e940e8f29927115b670f6b38c1c359 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 10:28:56 -0400
Subject: [PATCH 035/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.15.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index a6f550d3..8f6cdf81 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.15.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.15.0...@cosmwasm/ts-codegen@0.15.1) (2022-09-13)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.15.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.14.2...@cosmwasm/ts-codegen@0.15.0) (2022-09-13)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 4074f787..6defa96c 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From feec2f4b8dac4df2e01520452034739358a415c3 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:06:15 -0400
Subject: [PATCH 036/287] ts lint

---
 packages/ts-codegen/src/generators/client.ts           | 1 +
 packages/ts-codegen/src/generators/message-composer.ts | 1 +
 packages/ts-codegen/src/generators/react-query.ts      | 1 +
 packages/ts-codegen/src/generators/recoil.ts           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/packages/ts-codegen/src/generators/client.ts b/packages/ts-codegen/src/generators/client.ts
index b43bbdfe..2ee571dd 100644
--- a/packages/ts-codegen/src/generators/client.ts
+++ b/packages/ts-codegen/src/generators/client.ts
@@ -83,6 +83,7 @@ export default async (
   }
 
   if (typeHash.hasOwnProperty('Coin')) {
+    // @ts-ignore
     delete context.utils.Coin;
   }
   const imports = context.getImports();
diff --git a/packages/ts-codegen/src/generators/message-composer.ts b/packages/ts-codegen/src/generators/message-composer.ts
index 3c808675..f60645a4 100644
--- a/packages/ts-codegen/src/generators/message-composer.ts
+++ b/packages/ts-codegen/src/generators/message-composer.ts
@@ -61,6 +61,7 @@ export default async (
   }
 
   if (typeHash.hasOwnProperty('Coin')) {
+    // @ts-ignore
     delete context.utils.Coin;
   }
   const imports = context.getImports();
diff --git a/packages/ts-codegen/src/generators/react-query.ts b/packages/ts-codegen/src/generators/react-query.ts
index 5ade22fa..cdeed267 100644
--- a/packages/ts-codegen/src/generators/react-query.ts
+++ b/packages/ts-codegen/src/generators/react-query.ts
@@ -77,6 +77,7 @@ export default async (
   }
 
   if (typeHash.hasOwnProperty('Coin')) {
+    // @ts-ignore
     delete context.utils.Coin;
   }
   const imports = context.getImports();
diff --git a/packages/ts-codegen/src/generators/recoil.ts b/packages/ts-codegen/src/generators/recoil.ts
index 7bd46303..aac4e3cc 100644
--- a/packages/ts-codegen/src/generators/recoil.ts
+++ b/packages/ts-codegen/src/generators/recoil.ts
@@ -67,6 +67,7 @@ export default async (
   }
 
   if (typeHash.hasOwnProperty('Coin')) {
+    // @ts-ignore
     delete context.utils.Coin;
   }
   const imports = context.getImports();

From 15ecaad3377f10524b85332e9af5a63f75933610 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:06:50 -0400
Subject: [PATCH 037/287] fixture

---
 __fixtures__/misc/schema/arrays.json | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/__fixtures__/misc/schema/arrays.json b/__fixtures__/misc/schema/arrays.json
index 276c6aa2..04e67a96 100644
--- a/__fixtures__/misc/schema/arrays.json
+++ b/__fixtures__/misc/schema/arrays.json
@@ -13,10 +13,56 @@
                     "type": "object",
                     "required": [
                         "edges",
+                        "edges2",
                         "nested",
                         "supernested"
                     ],
                     "properties": {
+                        "edges3": {
+                            "type": [
+                                "array",
+                                "null"
+                            ],
+                            "items": {
+                                "type": [
+                                    "array",
+                                    "null"
+                                ],
+                                "items": [
+                                    {
+                                        "type": "integer",
+                                        "format": "int32"
+                                    },
+                                    {
+                                        "type": "integer",
+                                        "format": "int32"
+                                    }
+                                ],
+                                "maxItems": 2,
+                                "minItems": 2
+                            }
+                        },
+                        "edges2": {
+                            "type": [
+                                "array",
+                                "null"
+                            ],
+                            "items": {
+                                "type": "array",
+                                "items": [
+                                    {
+                                        "type": "integer",
+                                        "format": "int32"
+                                    },
+                                    {
+                                        "type": "integer",
+                                        "format": "int32"
+                                    }
+                                ],
+                                "maxItems": 2,
+                                "minItems": 2
+                            }
+                        },
                         "edges": {
                             "type": "array",
                             "items": {

From a676c3a13e7b68529d423ecb2b7dae27ba834423 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:07:29 -0400
Subject: [PATCH 038/287] functionality

---
 .../ts-client.arrays.spec.ts.snap             |  18 +++
 .../src/client/test/ts-client.arrays.spec.ts  |  14 +-
 packages/wasm-ast-types/src/utils/types.ts    | 129 +++++++++++++-----
 3 files changed, 125 insertions(+), 36 deletions(-)

diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
index d455b3ec..911ff10a 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
@@ -14,16 +14,22 @@ exports[`execute classes array types 1`] = `
   }
 
   updateEdges = async ({
+    edges3,
+    edges2,
     edges,
     nested,
     supernested
   }: {
+    edges3?: number[][][];
+    edges2: number[][][];
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
   }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
+        edges3,
+        edges2,
         edges,
         nested,
         supernested
@@ -38,10 +44,14 @@ exports[`execute interfaces no extends 1`] = `
   contractAddress: string;
   sender: string;
   updateEdges: ({
+    edges3,
+    edges2,
     edges,
     nested,
     supernested
   }: {
+    edges3?: number[][][];
+    edges2: number[][][];
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
@@ -51,6 +61,8 @@ exports[`execute interfaces no extends 1`] = `
 
 exports[`execute_msg_for__empty 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
+exports[`getPropertyType 1`] = `"number[][][]"`;
+
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
@@ -63,16 +75,22 @@ exports[`query classes 1`] = `
   }
 
   updateEdges = async ({
+    edges3,
+    edges2,
     edges,
     nested,
     supernested
   }: {
+    edges3?: number[][][];
+    edges2: number[][][];
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
   }): Promise<UpdateEdgesResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       update_edges: {
+        edges3,
+        edges2,
         edges,
         nested,
         supernested
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
index a991464b..1945ada0 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
@@ -6,11 +6,21 @@ import {
     createExecuteInterface,
     createTypeInterface
 } from '../client'
-import { RenderContext } from '../../context';
-import { expectCode, makeContext } from '../../../test-utils';
+import { expectCode, printCode, makeContext } from '../../../test-utils';
+import { getPropertyType } from '../../utils';
 
 const ctx = makeContext(message);
 
+it('getPropertyType', () => {
+    const ast = getPropertyType(
+        ctx,
+        message.oneOf[0].properties.update_edges,
+        'edges3'
+    );
+    expectCode(ast.type)
+    // printCode(ast.type)
+})
+
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
         ctx,
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index aa08f114..26c6abc9 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -46,7 +46,9 @@ const getTypeOrRef = (obj) => {
 }
 
 const getArrayTypeFromItems = (items) => {
-  if (items.type === 'array') {
+  const detect = detectType(items.type);
+
+  if (detect.type === 'array') {
     if (Array.isArray(items.items)) {
       return t.tsArrayType(
         t.tsArrayType(
@@ -61,43 +63,40 @@ const getArrayTypeFromItems = (items) => {
       );
     }
   }
+
+
   return t.tsArrayType(
-    getType(items.type)
+    getType(detect.type)
   );
 }
 
 
-export const getType = (type) => {
-  switch (type) {
-    case 'string':
-      return t.tsStringKeyword();
-    case 'boolean':
-      return t.tSBooleanKeyword();
-    case 'integer':
-      return t.tsNumberKeyword();
-    default:
-      throw new Error('contact maintainers [unknown type]: ' + type);
+export const detectType = (type: string | string[]) => {
+  let optional = false;
+  let theType = '';
+  if (Array.isArray(type)) {
+    if (type.length !== 2) {
+      throw new Error('[getType(array length)] case not handled by transpiler. contact maintainers.')
+    }
+    const [nullableType, nullType] = type;
+    if (nullType !== 'null') {
+      throw new Error('[getType(null)] case not handled by transpiler. contact maintainers.')
+    }
+    theType = nullableType;
+    optional = true;
+  } else {
+    theType = type;
   }
-}
-
-export const getPropertyType = (
-  context: RenderContext,
-  schema: JSONSchema,
-  prop: string
-) => {
-  const props = schema.properties ?? {};
-  let info = props[prop];
 
-  let type = null;
-  let optional = !schema.required?.includes(prop);
-
-  if (info.allOf && info.allOf.length === 1) {
-    info = info.allOf[0];
-  }
+  return {
+    type: theType,
+    optional
+  };
+}
 
-  if (typeof info.$ref === 'string') {
-    type = getTypeFromRef(info.$ref)
-  }
+export const getTypeInfo = (info: JSONSchema) => {
+  let type = undefined;
+  let optional = undefined;
 
   if (Array.isArray(info.anyOf)) {
     // assuming 2nd is null, but let's check to ensure
@@ -120,6 +119,7 @@ export const getPropertyType = (
     optional = true;
   }
 
+
   if (typeof info.type === 'string') {
     if (info.type === 'array') {
       if (typeof info.items === 'object' && !Array.isArray(info.items)) {
@@ -140,7 +140,9 @@ export const getPropertyType = (
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
       }
     } else {
-      type = getType(info.type);
+      const detect = detectType(info.type);
+      type = getType(detect.type);
+      optional = detect.optional;
     }
   }
 
@@ -155,15 +157,74 @@ export const getPropertyType = (
     }
 
     if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
-      type = t.tsArrayType(
-        getType(info.items.type)
-      );
+      const detect = detectType(info.items.type);
+      if (detect.type === 'array') {
+        // wen recursion?
+        type = t.tsArrayType(
+          getArrayTypeFromItems(info.items)
+        );
+      } else {
+        type = t.tsArrayType(
+          getType(detect.type)
+        );
+      }
+      optional = detect.optional;
+
     } else {
       type = getType(nullableType);
     }
 
     optional = true;
   }
+
+  return {
+    type,
+    optional
+  };
+
+}
+
+
+export const getType = (type: string) => {
+  switch (type) {
+    case 'string':
+      return t.tsStringKeyword();
+    case 'boolean':
+      return t.tSBooleanKeyword();
+    case 'integer':
+      return t.tsNumberKeyword();
+    default:
+      throw new Error('contact maintainers [unknown type]: ' + type);
+  }
+}
+
+export const getPropertyType = (
+  context: RenderContext,
+  schema: JSONSchema,
+  prop: string
+) => {
+  const props = schema.properties ?? {};
+  let info = props[prop];
+
+  let type = null;
+  let optional = !schema.required?.includes(prop);
+
+  if (info.allOf && info.allOf.length === 1) {
+    info = info.allOf[0];
+  }
+
+  if (typeof info.$ref === 'string') {
+    type = getTypeFromRef(info.$ref)
+  }
+
+  const typeInfo = getTypeInfo(info);
+  if (typeof typeInfo.optional !== 'undefined') {
+    optional = typeInfo.optional;
+  }
+  if (typeof typeInfo.type !== 'undefined') {
+    type = typeInfo.type;
+  }
+
   if (!type) {
     throw new Error('cannot find type for ' + JSON.stringify(info))
   }

From 6b42c191d7cb2fbf3c374cd307040118a24658f4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:07:36 -0400
Subject: [PATCH 039/287] types

---
 packages/ts-codegen/types/src/generators/client.d.ts   |  3 ++-
 .../types/src/generators/message-composer.d.ts         |  3 ++-
 .../ts-codegen/types/src/generators/react-query.d.ts   |  4 ++--
 packages/ts-codegen/types/src/generators/recoil.d.ts   |  4 ++--
 packages/ts-codegen/types/src/generators/types.d.ts    |  4 ++--
 packages/ts-codegen/types/src/utils/schemas.d.ts       | 10 ++--------
 packages/wasm-ast-types/types/utils/types.d.ts         | 10 +++++++++-
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/ts-codegen/types/src/generators/client.d.ts b/packages/ts-codegen/types/src/generators/client.d.ts
index 5c9a5a91..b6aed11a 100644
--- a/packages/ts-codegen/types/src/generators/client.d.ts
+++ b/packages/ts-codegen/types/src/generators/client.d.ts
@@ -1,4 +1,5 @@
+import { ContractInfo } from "wasm-ast-types";
 import { TSClientOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, schemas: any[], outPath: string, tsClientOptions?: TSClientOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, tsClientOptions?: TSClientOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/generators/message-composer.d.ts b/packages/ts-codegen/types/src/generators/message-composer.d.ts
index 7162e360..e2f4a834 100644
--- a/packages/ts-codegen/types/src/generators/message-composer.d.ts
+++ b/packages/ts-codegen/types/src/generators/message-composer.d.ts
@@ -1,4 +1,5 @@
+import { ContractInfo } from "wasm-ast-types";
 import { MessageComposerOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, schemas: any[], outPath: string, messageComposerOptions?: MessageComposerOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageComposerOptions?: MessageComposerOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/generators/react-query.d.ts b/packages/ts-codegen/types/src/generators/react-query.d.ts
index 238d41f0..0e7d1cd1 100644
--- a/packages/ts-codegen/types/src/generators/react-query.d.ts
+++ b/packages/ts-codegen/types/src/generators/react-query.d.ts
@@ -1,4 +1,4 @@
-import { ReactQueryOptions } from "wasm-ast-types";
+import { ReactQueryOptions, ContractInfo } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (contractName: string, schemas: any[], outPath: string, reactQueryOptions?: ReactQueryOptions) => Promise<BuilderFile[]>;
+declare const _default: (contractName: string, contractInfo: ContractInfo, outPath: string, reactQueryOptions?: ReactQueryOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/generators/recoil.d.ts b/packages/ts-codegen/types/src/generators/recoil.d.ts
index e46702d7..cb352533 100644
--- a/packages/ts-codegen/types/src/generators/recoil.d.ts
+++ b/packages/ts-codegen/types/src/generators/recoil.d.ts
@@ -1,4 +1,4 @@
-import { RecoilOptions } from "wasm-ast-types";
+import { ContractInfo, RecoilOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, schemas: any[], outPath: string, recoilOptions?: RecoilOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, recoilOptions?: RecoilOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/generators/types.d.ts b/packages/ts-codegen/types/src/generators/types.d.ts
index 29e985ed..d49e838d 100644
--- a/packages/ts-codegen/types/src/generators/types.d.ts
+++ b/packages/ts-codegen/types/src/generators/types.d.ts
@@ -1,4 +1,4 @@
-import { TSTypesOptions } from "wasm-ast-types";
+import { ContractInfo, TSTypesOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, schemas: any[], outPath: string, tsTypesOptions?: TSTypesOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, tsTypesOptions?: TSTypesOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/utils/schemas.d.ts b/packages/ts-codegen/types/src/utils/schemas.d.ts
index ba6ec91e..8e19d7a1 100644
--- a/packages/ts-codegen/types/src/utils/schemas.d.ts
+++ b/packages/ts-codegen/types/src/utils/schemas.d.ts
@@ -1,16 +1,10 @@
-import { JSONSchema } from 'wasm-ast-types';
-import { IDLObject } from '../types';
+import { ContractInfo } from 'wasm-ast-types';
 interface ReadSchemaOpts {
     schemaDir: string;
     clean?: boolean;
 }
-interface ReadSchemasValue {
-    schemas: JSONSchema[];
-    idlObject?: IDLObject;
-}
-export declare const readSchemas: ({ schemaDir, clean }: ReadSchemaOpts) => Promise<ReadSchemasValue>;
+export declare const readSchemas: ({ schemaDir, clean }: ReadSchemaOpts) => Promise<ContractInfo>;
 export declare const findQueryMsg: (schemas: any) => any;
 export declare const findExecuteMsg: (schemas: any) => any;
 export declare const findAndParseTypes: (schemas: any) => Promise<{}>;
-export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
 export {};
diff --git a/packages/wasm-ast-types/types/utils/types.d.ts b/packages/wasm-ast-types/types/utils/types.d.ts
index bbde18ac..bcaeb367 100644
--- a/packages/wasm-ast-types/types/utils/types.d.ts
+++ b/packages/wasm-ast-types/types/utils/types.d.ts
@@ -4,7 +4,15 @@ import { RenderContext } from '../context';
 import { JSONSchema } from '../types';
 export declare function getResponseType(context: RenderContext, underscoreName: string): string;
 export declare const getTypeFromRef: ($ref: any) => t.TSTypeReference;
-export declare const getType: (type: any) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword;
+export declare const detectType: (type: string | string[]) => {
+    type: string;
+    optional: boolean;
+};
+export declare const getTypeInfo: (info: JSONSchema) => {
+    type: any;
+    optional: any;
+};
+export declare const getType: (type: string) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword;
 export declare const getPropertyType: (context: RenderContext, schema: JSONSchema, prop: string) => {
     type: any;
     optional: boolean;

From d7f8c715f76edac8c5c2762e58fe8c73351d2af5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:15:58 -0400
Subject: [PATCH 040/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.16.0
 - wasm-ast-types@0.11.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 8f6cdf81..a309a240 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.16.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.15.1...@cosmwasm/ts-codegen@0.16.0) (2022-09-13)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.15.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.15.0...@cosmwasm/ts-codegen@0.15.1) (2022-09-13)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 6defa96c..46f3754e 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.10.0"
+    "wasm-ast-types": "^0.11.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 5ccd9601..ae2e903e 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.11.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.10.0...wasm-ast-types@0.11.0) (2022-09-13)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.10.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.9.0...wasm-ast-types@0.10.0) (2022-09-13)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 70e4f673..78056392 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.10.0",
+  "version": "0.11.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",

From deddde0b602859421fe28a2c2b547cc3b65029ac Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:34:59 -0400
Subject: [PATCH 041/287] array case

---
 .../idl-version/accounts-nft/account-nft.json | 1390 +++++++++++++++++
 .../ts-client.account-nfts.spec.ts.snap       |  447 ++++++
 .../test/ts-client.account-nfts.spec.ts       |   48 +
 packages/wasm-ast-types/src/utils/types.ts    |   23 +-
 4 files changed, 1906 insertions(+), 2 deletions(-)
 create mode 100644 __fixtures__/idl-version/accounts-nft/account-nft.json
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts

diff --git a/__fixtures__/idl-version/accounts-nft/account-nft.json b/__fixtures__/idl-version/accounts-nft/account-nft.json
new file mode 100644
index 00000000..0303666a
--- /dev/null
+++ b/__fixtures__/idl-version/accounts-nft/account-nft.json
@@ -0,0 +1,1390 @@
+{
+  "contract_name": "account-nft",
+  "contract_version": "0.1.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "minter",
+      "name",
+      "symbol"
+    ],
+    "properties": {
+      "minter": {
+        "description": "The minter is the only one who can create new NFTs. This is designed for a base NFT that is controlled by an external program or contract. You will likely replace this with custom logic in custom NFTs",
+        "type": "string"
+      },
+      "name": {
+        "description": "Name of the NFT contract",
+        "type": "string"
+      },
+      "symbol": {
+        "description": "Symbol of the NFT contract",
+        "type": "string"
+      }
+    }
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "description": "Due to some chains being permissioned via governance, we must instantiate this contract first and give ownership access to Rover contract with this action after both are independently deployed.",
+        "type": "object",
+        "required": [
+          "propose_new_owner"
+        ],
+        "properties": {
+          "propose_new_owner": {
+            "type": "object",
+            "required": [
+              "new_owner"
+            ],
+            "properties": {
+              "new_owner": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Accept the proposed ownership transfer",
+        "type": "object",
+        "required": [
+          "accept_ownership"
+        ],
+        "properties": {
+          "accept_ownership": {
+            "type": "object"
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Mint a new NFT to the specified user; can only be called by the contract minter",
+        "type": "object",
+        "required": [
+          "mint"
+        ],
+        "properties": {
+          "mint": {
+            "type": "object",
+            "required": [
+              "user"
+            ],
+            "properties": {
+              "user": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Transfer is a base message to move a token to another account without triggering actions",
+        "type": "object",
+        "required": [
+          "transfer_nft"
+        ],
+        "properties": {
+          "transfer_nft": {
+            "type": "object",
+            "required": [
+              "recipient",
+              "token_id"
+            ],
+            "properties": {
+              "recipient": {
+                "type": "string"
+              },
+              "token_id": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Send is a base message to transfer a token to a contract and trigger an action on the receiving contract.",
+        "type": "object",
+        "required": [
+          "send_nft"
+        ],
+        "properties": {
+          "send_nft": {
+            "type": "object",
+            "required": [
+              "contract",
+              "msg",
+              "token_id"
+            ],
+            "properties": {
+              "contract": {
+                "type": "string"
+              },
+              "msg": {
+                "$ref": "#/definitions/Binary"
+              },
+              "token_id": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Allows operator to transfer / send the token from the owner's account. If expiration is set, then this allowance has a time/height limit",
+        "type": "object",
+        "required": [
+          "approve"
+        ],
+        "properties": {
+          "approve": {
+            "type": "object",
+            "required": [
+              "spender",
+              "token_id"
+            ],
+            "properties": {
+              "expires": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Expiration"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "spender": {
+                "type": "string"
+              },
+              "token_id": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Remove previously granted Approval",
+        "type": "object",
+        "required": [
+          "revoke"
+        ],
+        "properties": {
+          "revoke": {
+            "type": "object",
+            "required": [
+              "spender",
+              "token_id"
+            ],
+            "properties": {
+              "spender": {
+                "type": "string"
+              },
+              "token_id": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Allows operator to transfer / send any token from the owner's account. If expiration is set, then this allowance has a time/height limit",
+        "type": "object",
+        "required": [
+          "approve_all"
+        ],
+        "properties": {
+          "approve_all": {
+            "type": "object",
+            "required": [
+              "operator"
+            ],
+            "properties": {
+              "expires": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Expiration"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "operator": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Remove previously granted ApproveAll permission",
+        "type": "object",
+        "required": [
+          "revoke_all"
+        ],
+        "properties": {
+          "revoke_all": {
+            "type": "object",
+            "required": [
+              "operator"
+            ],
+            "properties": {
+              "operator": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Burn an NFT the sender has access to",
+        "type": "object",
+        "required": [
+          "burn"
+        ],
+        "properties": {
+          "burn": {
+            "type": "object",
+            "required": [
+              "token_id"
+            ],
+            "properties": {
+              "token_id": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Binary": {
+        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+        "type": "string"
+      },
+      "Expiration": {
+        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+        "oneOf": [
+          {
+            "description": "AtHeight will expire when `env.block.height` >= height",
+            "type": "object",
+            "required": [
+              "at_height"
+            ],
+            "properties": {
+              "at_height": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "AtTime will expire when `env.block.time` >= time",
+            "type": "object",
+            "required": [
+              "at_time"
+            ],
+            "properties": {
+              "at_time": {
+                "$ref": "#/definitions/Timestamp"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Never will never expire. Used to express the empty variant",
+            "type": "object",
+            "required": [
+              "never"
+            ],
+            "properties": {
+              "never": {
+                "type": "object"
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Timestamp": {
+        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+        "allOf": [
+          {
+            "$ref": "#/definitions/Uint64"
+          }
+        ]
+      },
+      "Uint64": {
+        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "proposed_new_owner"
+        ],
+        "properties": {
+          "proposed_new_owner": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Enumerate debt shares for all token positions; start_after accepts (token_id, denom)",
+        "type": "object",
+        "required": [
+          "all_debt_shares"
+        ],
+        "properties": {
+          "all_debt_shares": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "array",
+                  "null"
+                ],
+                "items": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Return the owner of the given token, error if token does not exist",
+        "type": "object",
+        "required": [
+          "owner_of"
+        ],
+        "properties": {
+          "owner_of": {
+            "type": "object",
+            "required": [
+              "token_id"
+            ],
+            "properties": {
+              "include_expired": {
+                "description": "unset or false will filter out expired approvals, you must set to true to see them",
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "token_id": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Return operator that can access all of the owner's tokens.",
+        "type": "object",
+        "required": [
+          "approval"
+        ],
+        "properties": {
+          "approval": {
+            "type": "object",
+            "required": [
+              "spender",
+              "token_id"
+            ],
+            "properties": {
+              "include_expired": {
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "spender": {
+                "type": "string"
+              },
+              "token_id": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Return approvals that a token has",
+        "type": "object",
+        "required": [
+          "approvals"
+        ],
+        "properties": {
+          "approvals": {
+            "type": "object",
+            "required": [
+              "token_id"
+            ],
+            "properties": {
+              "include_expired": {
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "token_id": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "List all operators that can access all of the owner's tokens",
+        "type": "object",
+        "required": [
+          "all_operators"
+        ],
+        "properties": {
+          "all_operators": {
+            "type": "object",
+            "required": [
+              "owner"
+            ],
+            "properties": {
+              "include_expired": {
+                "description": "unset or false will filter out expired items, you must set to true to see them",
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "owner": {
+                "type": "string"
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Total number of tokens issued",
+        "type": "object",
+        "required": [
+          "num_tokens"
+        ],
+        "properties": {
+          "num_tokens": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "With MetaData Extension. Returns top-level metadata about the contract",
+        "type": "object",
+        "required": [
+          "contract_info"
+        ],
+        "properties": {
+          "contract_info": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "With MetaData Extension. Returns metadata about one particular token, based on *ERC721 Metadata JSON Schema* but directly from the contract",
+        "type": "object",
+        "required": [
+          "nft_info"
+        ],
+        "properties": {
+          "nft_info": {
+            "type": "object",
+            "required": [
+              "token_id"
+            ],
+            "properties": {
+              "token_id": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "With MetaData Extension. Returns the result of both `NftInfo` and `OwnerOf` as one query as an optimization for clients",
+        "type": "object",
+        "required": [
+          "all_nft_info"
+        ],
+        "properties": {
+          "all_nft_info": {
+            "type": "object",
+            "required": [
+              "token_id"
+            ],
+            "properties": {
+              "include_expired": {
+                "description": "unset or false will filter out expired approvals, you must set to true to see them",
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
+              "token_id": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "With Enumerable extension. Returns all tokens owned by the given address, [] if unset.",
+        "type": "object",
+        "required": [
+          "tokens"
+        ],
+        "properties": {
+          "tokens": {
+            "type": "object",
+            "required": [
+              "owner"
+            ],
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "owner": {
+                "type": "string"
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "With Enumerable extension. Requires pagination. Lists all token_ids controlled by the contract. Return type: TokensResponse.",
+        "type": "object",
+        "required": [
+          "all_tokens"
+        ],
+        "properties": {
+          "all_tokens": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Return the minter",
+        "type": "object",
+        "required": [
+          "minter"
+        ],
+        "properties": {
+          "minter": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": null,
+  "sudo": null,
+  "responses": {
+    "all_debt_shares": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "Array_of_SharesResponseItem",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/SharesResponseItem"
+      },
+      "definitions": {
+        "SharesResponseItem": {
+          "type": "object",
+          "required": [
+            "denom",
+            "shares",
+            "token_id"
+          ],
+          "properties": {
+            "denom": {
+              "type": "string"
+            },
+            "shares": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "token_id": {
+              "type": "string"
+            }
+          }
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "all_nft_info": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "AllNftInfoResponse_for_Empty",
+      "type": "object",
+      "required": [
+        "access",
+        "info"
+      ],
+      "properties": {
+        "access": {
+          "description": "Who can transfer the token",
+          "allOf": [
+            {
+              "$ref": "#/definitions/OwnerOfResponse"
+            }
+          ]
+        },
+        "info": {
+          "description": "Data on the token itself,",
+          "allOf": [
+            {
+              "$ref": "#/definitions/NftInfoResponse_for_Empty"
+            }
+          ]
+        }
+      },
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
+            },
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "NftInfoResponse_for_Empty": {
+          "type": "object",
+          "required": [
+            "extension"
+          ],
+          "properties": {
+            "extension": {
+              "description": "You can add any custom metadata here when you extend cw721-base",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Empty"
+                }
+              ]
+            },
+            "token_uri": {
+              "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          }
+        },
+        "OwnerOfResponse": {
+          "type": "object",
+          "required": [
+            "approvals",
+            "owner"
+          ],
+          "properties": {
+            "approvals": {
+              "description": "If set this address is approved to transfer/send the token as well",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Approval"
+              }
+            },
+            "owner": {
+              "description": "Owner of the token",
+              "type": "string"
+            }
+          }
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "all_operators": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OperatorsResponse",
+      "type": "object",
+      "required": [
+        "operators"
+      ],
+      "properties": {
+        "operators": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
+          }
+        }
+      },
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
+            },
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "all_tokens": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "TokensResponse",
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "approval": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ApprovalResponse",
+      "type": "object",
+      "required": [
+        "approval"
+      ],
+      "properties": {
+        "approval": {
+          "$ref": "#/definitions/Approval"
+        }
+      },
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
+            },
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "approvals": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ApprovalsResponse",
+      "type": "object",
+      "required": [
+        "approvals"
+      ],
+      "properties": {
+        "approvals": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
+          }
+        }
+      },
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
+            },
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "contract_info": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ContractInfoResponse",
+      "type": "object",
+      "required": [
+        "name",
+        "symbol"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "symbol": {
+          "type": "string"
+        }
+      }
+    },
+    "minter": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "MinterResponse",
+      "description": "Shows who can mint these tokens",
+      "type": "object",
+      "required": [
+        "minter"
+      ],
+      "properties": {
+        "minter": {
+          "type": "string"
+        }
+      }
+    },
+    "nft_info": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NftInfoResponse_for_Empty",
+      "type": "object",
+      "required": [
+        "extension"
+      ],
+      "properties": {
+        "extension": {
+          "description": "You can add any custom metadata here when you extend cw721-base",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Empty"
+            }
+          ]
+        },
+        "token_uri": {
+          "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "definitions": {
+        "Empty": {
+          "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+          "type": "object"
+        }
+      }
+    },
+    "num_tokens": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "NumTokensResponse",
+      "type": "object",
+      "required": [
+        "count"
+      ],
+      "properties": {
+        "count": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      }
+    },
+    "owner_of": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "OwnerOfResponse",
+      "type": "object",
+      "required": [
+        "approvals",
+        "owner"
+      ],
+      "properties": {
+        "approvals": {
+          "description": "If set this address is approved to transfer/send the token as well",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
+          }
+        },
+        "owner": {
+          "description": "Owner of the token",
+          "type": "string"
+        }
+      },
+      "definitions": {
+        "Approval": {
+          "type": "object",
+          "required": [
+            "expires",
+            "spender"
+          ],
+          "properties": {
+            "expires": {
+              "description": "When the Approval expires (maybe Expiration::never)",
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                }
+              ]
+            },
+            "spender": {
+              "description": "Account that can transfer/send the token",
+              "type": "string"
+            }
+          }
+        },
+        "Expiration": {
+          "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+          "oneOf": [
+            {
+              "description": "AtHeight will expire when `env.block.height` >= height",
+              "type": "object",
+              "required": [
+                "at_height"
+              ],
+              "properties": {
+                "at_height": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "AtTime will expire when `env.block.time` >= time",
+              "type": "object",
+              "required": [
+                "at_time"
+              ],
+              "properties": {
+                "at_time": {
+                  "$ref": "#/definitions/Timestamp"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "description": "Never will never expire. Used to express the empty variant",
+              "type": "object",
+              "required": [
+                "never"
+              ],
+              "properties": {
+                "never": {
+                  "type": "object"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "proposed_new_owner": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "String",
+      "type": "string"
+    },
+    "tokens": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "TokensResponse",
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
new file mode 100644
index 00000000..e3d3eec7
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
@@ -0,0 +1,447 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute classes array types 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.proposedNewOwner = this.proposedNewOwner.bind(this);
+    this.allDebtShares = this.allDebtShares.bind(this);
+    this.ownerOf = this.ownerOf.bind(this);
+    this.approval = this.approval.bind(this);
+    this.approvals = this.approvals.bind(this);
+    this.allOperators = this.allOperators.bind(this);
+    this.numTokens = this.numTokens.bind(this);
+    this.contractInfo = this.contractInfo.bind(this);
+    this.nftInfo = this.nftInfo.bind(this);
+    this.allNftInfo = this.allNftInfo.bind(this);
+    this.tokens = this.tokens.bind(this);
+    this.allTokens = this.allTokens.bind(this);
+    this.minter = this.minter.bind(this);
+  }
+
+  proposedNewOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      proposed_new_owner: {}
+    }, fee, memo, funds);
+  };
+  allDebtShares = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string[][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      all_debt_shares: {
+        limit,
+        start_after: startAfter
+      }
+    }, fee, memo, funds);
+  };
+  ownerOf = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      owner_of: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approval = async ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approval: {
+        include_expired: includeExpired,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approvals = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approvals: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  allOperators = async ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      all_operators: {
+        include_expired: includeExpired,
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    }, fee, memo, funds);
+  };
+  numTokens = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      num_tokens: {}
+    }, fee, memo, funds);
+  };
+  contractInfo = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      contract_info: {}
+    }, fee, memo, funds);
+  };
+  nftInfo = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      nft_info: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  allNftInfo = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      all_nft_info: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  tokens = async ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      tokens: {
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    }, fee, memo, funds);
+  };
+  allTokens = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      all_tokens: {
+        limit,
+        start_after: startAfter
+      }
+    }, fee, memo, funds);
+  };
+  minter = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      minter: {}
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`execute interfaces no extends 1`] = `
+"export interface SG721Instance {
+  contractAddress: string;
+  sender: string;
+  proposedNewOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allDebtShares: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string[][];
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  ownerOf: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  approval: ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  approvals: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allOperators: ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  numTokens: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  contractInfo: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  nftInfo: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allNftInfo: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  tokens: ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allTokens: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  minter: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}"
+`;
+
+exports[`execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query classes 1`] = `
+"export class SG721QueryClient implements SG721ReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.proposedNewOwner = this.proposedNewOwner.bind(this);
+    this.allDebtShares = this.allDebtShares.bind(this);
+    this.ownerOf = this.ownerOf.bind(this);
+    this.approval = this.approval.bind(this);
+    this.approvals = this.approvals.bind(this);
+    this.allOperators = this.allOperators.bind(this);
+    this.numTokens = this.numTokens.bind(this);
+    this.contractInfo = this.contractInfo.bind(this);
+    this.nftInfo = this.nftInfo.bind(this);
+    this.allNftInfo = this.allNftInfo.bind(this);
+    this.tokens = this.tokens.bind(this);
+    this.allTokens = this.allTokens.bind(this);
+    this.minter = this.minter.bind(this);
+  }
+
+  proposedNewOwner = async (): Promise<ProposedNewOwnerResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposed_new_owner: {}
+    });
+  };
+  allDebtShares = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string[][];
+  }): Promise<AllDebtSharesResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_debt_shares: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  ownerOf = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<OwnerOfResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      owner_of: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  approval = async ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }): Promise<ApprovalResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      approval: {
+        include_expired: includeExpired,
+        spender,
+        token_id: tokenId
+      }
+    });
+  };
+  approvals = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<ApprovalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      approvals: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  allOperators = async ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): Promise<AllOperatorsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_operators: {
+        include_expired: includeExpired,
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    });
+  };
+  numTokens = async (): Promise<NumTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      num_tokens: {}
+    });
+  };
+  contractInfo = async (): Promise<ContractInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      contract_info: {}
+    });
+  };
+  nftInfo = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }): Promise<NftInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      nft_info: {
+        token_id: tokenId
+      }
+    });
+  };
+  allNftInfo = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<AllNftInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_nft_info: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  tokens = async ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): Promise<TokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      tokens: {
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    });
+  };
+  allTokens = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }): Promise<AllTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_tokens: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  minter = async (): Promise<MinterResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      minter: {}
+    });
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
new file mode 100644
index 00000000..a0ee8254
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
@@ -0,0 +1,48 @@
+import contract from '../../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
+
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, printCode, makeContext } from '../../../test-utils';
+
+const message = contract.query
+const ctx = makeContext(message);
+
+it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(
+        ctx,
+        message
+    ))
+})
+
+
+it('query classes', () => {
+    expectCode(createQueryClass(
+        ctx,
+        'SG721QueryClient',
+        'SG721ReadOnlyInstance',
+        message
+    ))
+});
+
+it('execute classes array types', () => {
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        message
+    ))
+});
+
+it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(
+        ctx,
+        'SG721Instance',
+        null,
+        message
+    ))
+});
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index 26c6abc9..fe5360f1 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -46,6 +46,16 @@ const getTypeOrRef = (obj) => {
 }
 
 const getArrayTypeFromItems = (items) => {
+  // passing in [{"type":"string"}]
+  if (Array.isArray(items)) {
+    return t.tsArrayType(
+      t.tsArrayType(
+        getTypeOrRef(items[0])
+      )
+    );
+  }
+
+  // passing in {"items": [{"type":"string"}]}
   const detect = detectType(items.type);
 
   if (detect.type === 'array') {
@@ -171,7 +181,16 @@ export const getTypeInfo = (info: JSONSchema) => {
       optional = detect.optional;
 
     } else {
-      type = getType(nullableType);
+      const detect = detectType(nullableType);
+      optional = detect.optional;
+      if (detect.type === 'array') {
+        type = getArrayTypeFromItems(
+          info.items
+        );
+      } else {
+        type = getType(detect.type);
+      }
+
     }
 
     optional = true;
@@ -332,7 +351,7 @@ export function getPropertySignatureFromProp(
     getPropertyType(context, jsonschema, prop);
   } catch (e) {
     console.log(e);
-    console.log(jsonschema, prop);
+    console.log(JSON.stringify(jsonschema, null, 2), prop);
   }
 
   const { type, optional } = getPropertyType(context, jsonschema, prop);

From 4d6287ab9d17ea8cef91b183c00e9bae6e8529e1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 13 Sep 2022 14:35:23 -0400
Subject: [PATCH 042/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.16.1
 - wasm-ast-types@0.11.1
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index a309a240..8d7dc0f0 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.0...@cosmwasm/ts-codegen@0.16.1) (2022-09-13)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.16.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.15.1...@cosmwasm/ts-codegen@0.16.0) (2022-09-13)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 46f3754e..20c69941 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.11.0"
+    "wasm-ast-types": "^0.11.1"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index ae2e903e..c8d00b6b 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.11.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.0...wasm-ast-types@0.11.1) (2022-09-13)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.11.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.10.0...wasm-ast-types@0.11.0) (2022-09-13)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 78056392..b0db3c75 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "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",

From df88c817ee53b3691315d76ff5823e298c1287f1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 14 Sep 2022 11:34:01 -0400
Subject: [PATCH 043/287] case fix

---
 .../accounts-nft/AccountsNft.client.ts        | 475 ++++++++++++++++++
 .../AccountsNft.message-composer.ts           | 300 +++++++++++
 .../accounts-nft/AccountsNft.react-query.ts   | 191 +++++++
 .../accounts-nft/AccountsNft.recoil.ts        | 206 ++++++++
 .../accounts-nft/AccountsNft.types.ts         | 199 ++++++++
 .../ts-codegen/__tests__/ts-codegen.test.ts   |  15 +
 packages/ts-codegen/src/utils/cleanse.ts      |   3 +
 .../test/ts-client.account-nfts.spec.ts       |   7 +
 8 files changed, 1396 insertions(+)
 create mode 100644 __output__/idl-version/accounts-nft/AccountsNft.client.ts
 create mode 100644 __output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
 create mode 100644 __output__/idl-version/accounts-nft/AccountsNft.react-query.ts
 create mode 100644 __output__/idl-version/accounts-nft/AccountsNft.recoil.ts
 create mode 100644 __output__/idl-version/accounts-nft/AccountsNft.types.ts

diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
new file mode 100644
index 00000000..48fab63a
--- /dev/null
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -0,0 +1,475 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+export interface AccountsNftReadOnlyInterface {
+  contractAddress: string;
+  proposedNewOwner: () => Promise<String>;
+  allDebtShares: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string[][];
+  }) => Promise<ArrayOfSharesResponseItem>;
+  ownerOf: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }) => Promise<OwnerOfResponse>;
+  approval: ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }) => Promise<ApprovalResponse>;
+  approvals: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }) => Promise<ApprovalsResponse>;
+  allOperators: ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }) => Promise<OperatorsResponse>;
+  numTokens: () => Promise<NumTokensResponse>;
+  contractInfo: () => Promise<ContractInfoResponse>;
+  nftInfo: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }) => Promise<NftInfoResponseForEmpty>;
+  allNftInfo: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }) => Promise<AllNftInfoResponseForEmpty>;
+  tokens: ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }) => Promise<TokensResponse>;
+  allTokens: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }) => Promise<TokensResponse>;
+  minter: () => Promise<MinterResponse>;
+}
+export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.proposedNewOwner = this.proposedNewOwner.bind(this);
+    this.allDebtShares = this.allDebtShares.bind(this);
+    this.ownerOf = this.ownerOf.bind(this);
+    this.approval = this.approval.bind(this);
+    this.approvals = this.approvals.bind(this);
+    this.allOperators = this.allOperators.bind(this);
+    this.numTokens = this.numTokens.bind(this);
+    this.contractInfo = this.contractInfo.bind(this);
+    this.nftInfo = this.nftInfo.bind(this);
+    this.allNftInfo = this.allNftInfo.bind(this);
+    this.tokens = this.tokens.bind(this);
+    this.allTokens = this.allTokens.bind(this);
+    this.minter = this.minter.bind(this);
+  }
+
+  proposedNewOwner = async (): Promise<String> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposed_new_owner: {}
+    });
+  };
+  allDebtShares = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string[][];
+  }): Promise<ArrayOfSharesResponseItem> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_debt_shares: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  ownerOf = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<OwnerOfResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      owner_of: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  approval = async ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }): Promise<ApprovalResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      approval: {
+        include_expired: includeExpired,
+        spender,
+        token_id: tokenId
+      }
+    });
+  };
+  approvals = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<ApprovalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      approvals: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  allOperators = async ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): Promise<OperatorsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_operators: {
+        include_expired: includeExpired,
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    });
+  };
+  numTokens = async (): Promise<NumTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      num_tokens: {}
+    });
+  };
+  contractInfo = async (): Promise<ContractInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      contract_info: {}
+    });
+  };
+  nftInfo = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }): Promise<NftInfoResponseForEmpty> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      nft_info: {
+        token_id: tokenId
+      }
+    });
+  };
+  allNftInfo = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<AllNftInfoResponseForEmpty> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_nft_info: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  tokens = async ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): Promise<TokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      tokens: {
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    });
+  };
+  allTokens = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }): Promise<TokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_tokens: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  minter = async (): Promise<MinterResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      minter: {}
+    });
+  };
+}
+export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  proposeNewOwner: ({
+    newOwner
+  }: {
+    newOwner: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  acceptOwnership: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: ({
+    user
+  }: {
+    user: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  transferNft: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  sendNft: ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  approve: ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  revoke: ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  approveAll: ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  revokeAll: ({
+    operator
+  }: {
+    operator: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  burn: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class AccountsNftClient extends AccountsNftQueryClient implements AccountsNftInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.proposeNewOwner = this.proposeNewOwner.bind(this);
+    this.acceptOwnership = this.acceptOwnership.bind(this);
+    this.mint = this.mint.bind(this);
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  proposeNewOwner = async ({
+    newOwner
+  }: {
+    newOwner: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      propose_new_owner: {
+        new_owner: newOwner
+      }
+    }, fee, memo, funds);
+  };
+  acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      accept_ownership: {}
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    user
+  }: {
+    user: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        user
+      }
+    }, fee, memo, funds);
+  };
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
new file mode 100644
index 00000000..d09bda4a
--- /dev/null
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -0,0 +1,300 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+export interface AccountsNftMessage {
+  contractAddress: string;
+  sender: string;
+  proposeNewOwner: ({
+    newOwner
+  }: {
+    newOwner: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  acceptOwnership: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: ({
+    user
+  }: {
+    user: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  transferNft: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  sendNft: ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  approve: ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  revoke: ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  approveAll: ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  revokeAll: ({
+    operator
+  }: {
+    operator: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  burn: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class AccountsNftMessageComposer implements AccountsNftMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.proposeNewOwner = this.proposeNewOwner.bind(this);
+    this.acceptOwnership = this.acceptOwnership.bind(this);
+    this.mint = this.mint.bind(this);
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  proposeNewOwner = ({
+    newOwner
+  }: {
+    newOwner: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          propose_new_owner: {
+            new_owner: newOwner
+          }
+        })),
+        funds
+      })
+    };
+  };
+  acceptOwnership = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          accept_ownership: {}
+        })),
+        funds
+      })
+    };
+  };
+  mint = ({
+    user
+  }: {
+    user: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint: {
+            user
+          }
+        })),
+        funds
+      })
+    };
+  };
+  transferNft = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          transfer_nft: {
+            recipient,
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  sendNft = ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          send_nft: {
+            contract,
+            msg,
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  approve = ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          approve: {
+            expires,
+            spender,
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  revoke = ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          revoke: {
+            spender,
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  approveAll = ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          approve_all: {
+            expires,
+            operator
+          }
+        })),
+        funds
+      })
+    };
+  };
+  revokeAll = ({
+    operator
+  }: {
+    operator: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          revoke_all: {
+            operator
+          }
+        })),
+        funds
+      })
+    };
+  };
+  burn = ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          burn: {
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
new file mode 100644
index 00000000..5ce72700
--- /dev/null
+++ b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
@@ -0,0 +1,191 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+import { AccountsNftQueryClient } from "./AccountsNft.client";
+export interface AccountsNftReactQuery<TResponse, TData = TResponse> {
+  client: AccountsNftQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface AccountsNftMinterQuery<TData> extends AccountsNftReactQuery<MinterResponse, TData> {}
+export function useAccountsNftMinterQuery<TData = MinterResponse>({
+  client,
+  options
+}: AccountsNftMinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>(["accountsNftMinter", client.contractAddress], () => client.minter(), options);
+}
+export interface AccountsNftAllTokensQuery<TData> extends AccountsNftReactQuery<TokensResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+  };
+}
+export function useAccountsNftAllTokensQuery<TData = TokensResponse>({
+  client,
+  args,
+  options
+}: AccountsNftAllTokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>(["accountsNftAllTokens", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface AccountsNftTokensQuery<TData> extends AccountsNftReactQuery<TokensResponse, TData> {
+  args: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  };
+}
+export function useAccountsNftTokensQuery<TData = TokensResponse>({
+  client,
+  args,
+  options
+}: AccountsNftTokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>(["accountsNftTokens", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+    limit: args.limit,
+    owner: args.owner,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface AccountsNftAllNftInfoQuery<TData> extends AccountsNftReactQuery<AllNftInfoResponseForEmpty, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useAccountsNftAllNftInfoQuery<TData = AllNftInfoResponseForEmpty>({
+  client,
+  args,
+  options
+}: AccountsNftAllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponseForEmpty, Error, TData>(["accountsNftAllNftInfo", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface AccountsNftNftInfoQuery<TData> extends AccountsNftReactQuery<NftInfoResponseForEmpty, TData> {
+  args: {
+    tokenId: string;
+  };
+}
+export function useAccountsNftNftInfoQuery<TData = NftInfoResponseForEmpty>({
+  client,
+  args,
+  options
+}: AccountsNftNftInfoQuery<TData>) {
+  return useQuery<NftInfoResponseForEmpty, Error, TData>(["accountsNftNftInfo", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+    tokenId: args.tokenId
+  }), options);
+}
+export interface AccountsNftContractInfoQuery<TData> extends AccountsNftReactQuery<ContractInfoResponse, TData> {}
+export function useAccountsNftContractInfoQuery<TData = ContractInfoResponse>({
+  client,
+  options
+}: AccountsNftContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>(["accountsNftContractInfo", client.contractAddress], () => client.contractInfo(), options);
+}
+export interface AccountsNftNumTokensQuery<TData> extends AccountsNftReactQuery<NumTokensResponse, TData> {}
+export function useAccountsNftNumTokensQuery<TData = NumTokensResponse>({
+  client,
+  options
+}: AccountsNftNumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>(["accountsNftNumTokens", client.contractAddress], () => client.numTokens(), options);
+}
+export interface AccountsNftAllOperatorsQuery<TData> extends AccountsNftReactQuery<OperatorsResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  };
+}
+export function useAccountsNftAllOperatorsQuery<TData = OperatorsResponse>({
+  client,
+  args,
+  options
+}: AccountsNftAllOperatorsQuery<TData>) {
+  return useQuery<OperatorsResponse, Error, TData>(["accountsNftAllOperators", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+    includeExpired: args.includeExpired,
+    limit: args.limit,
+    owner: args.owner,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface AccountsNftApprovalsQuery<TData> extends AccountsNftReactQuery<ApprovalsResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useAccountsNftApprovalsQuery<TData = ApprovalsResponse>({
+  client,
+  args,
+  options
+}: AccountsNftApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>(["accountsNftApprovals", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface AccountsNftApprovalQuery<TData> extends AccountsNftReactQuery<ApprovalResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  };
+}
+export function useAccountsNftApprovalQuery<TData = ApprovalResponse>({
+  client,
+  args,
+  options
+}: AccountsNftApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>(["accountsNftApproval", client.contractAddress, JSON.stringify(args)], () => client.approval({
+    includeExpired: args.includeExpired,
+    spender: args.spender,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface AccountsNftOwnerOfQuery<TData> extends AccountsNftReactQuery<OwnerOfResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useAccountsNftOwnerOfQuery<TData = OwnerOfResponse>({
+  client,
+  args,
+  options
+}: AccountsNftOwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>(["accountsNftOwnerOf", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface AccountsNftAllDebtSharesQuery<TData> extends AccountsNftReactQuery<ArrayOfSharesResponseItem, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string[][];
+  };
+}
+export function useAccountsNftAllDebtSharesQuery<TData = ArrayOfSharesResponseItem>({
+  client,
+  args,
+  options
+}: AccountsNftAllDebtSharesQuery<TData>) {
+  return useQuery<ArrayOfSharesResponseItem, Error, TData>(["accountsNftAllDebtShares", client.contractAddress, JSON.stringify(args)], () => client.allDebtShares({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface AccountsNftProposedNewOwnerQuery<TData> extends AccountsNftReactQuery<String, TData> {}
+export function useAccountsNftProposedNewOwnerQuery<TData = String>({
+  client,
+  options
+}: AccountsNftProposedNewOwnerQuery<TData>) {
+  return useQuery<String, Error, TData>(["accountsNftProposedNewOwner", client.contractAddress], () => client.proposedNewOwner(), options);
+}
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts b/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
new file mode 100644
index 00000000..04e6665b
--- /dev/null
+++ b/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
@@ -0,0 +1,206 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+import { AccountsNftQueryClient } from "./AccountsNft.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<AccountsNftQueryClient, QueryClientParams>({
+  key: "accountsNftQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new AccountsNftQueryClient(client, contractAddress);
+  }
+});
+export const proposedNewOwnerSelector = selectorFamily<String, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["proposedNewOwner"]>;
+}>({
+  key: "accountsNftProposedNewOwner",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposedNewOwner(...params);
+  }
+});
+export const allDebtSharesSelector = selectorFamily<ArrayOfSharesResponseItem, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["allDebtShares"]>;
+}>({
+  key: "accountsNftAllDebtShares",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.allDebtShares(...params);
+  }
+});
+export const ownerOfSelector = selectorFamily<OwnerOfResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["ownerOf"]>;
+}>({
+  key: "accountsNftOwnerOf",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.ownerOf(...params);
+  }
+});
+export const approvalSelector = selectorFamily<ApprovalResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["approval"]>;
+}>({
+  key: "accountsNftApproval",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.approval(...params);
+  }
+});
+export const approvalsSelector = selectorFamily<ApprovalsResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["approvals"]>;
+}>({
+  key: "accountsNftApprovals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.approvals(...params);
+  }
+});
+export const allOperatorsSelector = selectorFamily<OperatorsResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["allOperators"]>;
+}>({
+  key: "accountsNftAllOperators",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.allOperators(...params);
+  }
+});
+export const numTokensSelector = selectorFamily<NumTokensResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["numTokens"]>;
+}>({
+  key: "accountsNftNumTokens",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.numTokens(...params);
+  }
+});
+export const contractInfoSelector = selectorFamily<ContractInfoResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["contractInfo"]>;
+}>({
+  key: "accountsNftContractInfo",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.contractInfo(...params);
+  }
+});
+export const nftInfoSelector = selectorFamily<NftInfoResponseForEmpty, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["nftInfo"]>;
+}>({
+  key: "accountsNftNftInfo",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.nftInfo(...params);
+  }
+});
+export const allNftInfoSelector = selectorFamily<AllNftInfoResponseForEmpty, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["allNftInfo"]>;
+}>({
+  key: "accountsNftAllNftInfo",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.allNftInfo(...params);
+  }
+});
+export const tokensSelector = selectorFamily<TokensResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["tokens"]>;
+}>({
+  key: "accountsNftTokens",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.tokens(...params);
+  }
+});
+export const allTokensSelector = selectorFamily<TokensResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["allTokens"]>;
+}>({
+  key: "accountsNftAllTokens",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.allTokens(...params);
+  }
+});
+export const minterSelector = selectorFamily<MinterResponse, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["minter"]>;
+}>({
+  key: "accountsNftMinter",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.minter(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.types.ts b/__output__/idl-version/accounts-nft/AccountsNft.types.ts
new file mode 100644
index 00000000..364d67d7
--- /dev/null
+++ b/__output__/idl-version/accounts-nft/AccountsNft.types.ts
@@ -0,0 +1,199 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export interface InstantiateMsg {
+  minter: string;
+  name: string;
+  symbol: string;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  propose_new_owner: {
+    new_owner: string;
+    [k: string]: unknown;
+  };
+} | {
+  accept_ownership: {
+    [k: string]: unknown;
+  };
+} | {
+  mint: {
+    user: string;
+    [k: string]: unknown;
+  };
+} | {
+  transfer_nft: {
+    recipient: string;
+    token_id: string;
+    [k: string]: unknown;
+  };
+} | {
+  send_nft: {
+    contract: string;
+    msg: Binary;
+    token_id: string;
+    [k: string]: unknown;
+  };
+} | {
+  approve: {
+    expires?: Expiration | null;
+    spender: string;
+    token_id: string;
+    [k: string]: unknown;
+  };
+} | {
+  revoke: {
+    spender: string;
+    token_id: string;
+    [k: string]: unknown;
+  };
+} | {
+  approve_all: {
+    expires?: Expiration | null;
+    operator: string;
+    [k: string]: unknown;
+  };
+} | {
+  revoke_all: {
+    operator: string;
+    [k: string]: unknown;
+  };
+} | {
+  burn: {
+    token_id: string;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export type Expiration = {
+  at_height: number;
+} | {
+  at_time: Timestamp;
+} | {
+  never: {
+    [k: string]: unknown;
+  };
+};
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type QueryMsg = {
+  proposed_new_owner: {};
+} | {
+  all_debt_shares: {
+    limit?: number | null;
+    start_after?: [string, string] | null;
+  };
+} | {
+  owner_of: {
+    include_expired?: boolean | null;
+    token_id: string;
+  };
+} | {
+  approval: {
+    include_expired?: boolean | null;
+    spender: string;
+    token_id: string;
+  };
+} | {
+  approvals: {
+    include_expired?: boolean | null;
+    token_id: string;
+  };
+} | {
+  all_operators: {
+    include_expired?: boolean | null;
+    limit?: number | null;
+    owner: string;
+    start_after?: string | null;
+  };
+} | {
+  num_tokens: {};
+} | {
+  contract_info: {};
+} | {
+  nft_info: {
+    token_id: string;
+  };
+} | {
+  all_nft_info: {
+    include_expired?: boolean | null;
+    token_id: string;
+  };
+} | {
+  tokens: {
+    limit?: number | null;
+    owner: string;
+    start_after?: string | null;
+  };
+} | {
+  all_tokens: {
+    limit?: number | null;
+    start_after?: string | null;
+  };
+} | {
+  minter: {};
+};
+export type Uint128 = string;
+export type ArrayOfSharesResponseItem = SharesResponseItem[];
+export interface SharesResponseItem {
+  denom: string;
+  shares: Uint128;
+  token_id: string;
+  [k: string]: unknown;
+}
+export interface AllNftInfoResponseForEmpty {
+  access: OwnerOfResponse;
+  info: NftInfoResponseForEmpty;
+  [k: string]: unknown;
+}
+export interface OwnerOfResponse {
+  approvals: Approval[];
+  owner: string;
+  [k: string]: unknown;
+}
+export interface Approval {
+  expires: Expiration;
+  spender: string;
+  [k: string]: unknown;
+}
+export interface NftInfoResponseForEmpty {
+  extension: Empty;
+  token_uri?: string | null;
+  [k: string]: unknown;
+}
+export interface Empty {
+  [k: string]: unknown;
+}
+export interface OperatorsResponse {
+  operators: Approval[];
+  [k: string]: unknown;
+}
+export interface TokensResponse {
+  tokens: string[];
+  [k: string]: unknown;
+}
+export interface ApprovalResponse {
+  approval: Approval;
+  [k: string]: unknown;
+}
+export interface ApprovalsResponse {
+  approvals: Approval[];
+  [k: string]: unknown;
+}
+export interface ContractInfoResponse {
+  name: string;
+  symbol: string;
+  [k: string]: unknown;
+}
+export interface MinterResponse {
+  minter: string;
+  [k: string]: unknown;
+}
+export interface NumTokensResponse {
+  count: number;
+  [k: string]: unknown;
+}
+export type String = string;
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index cfdf2896..74fa6618 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -237,3 +237,18 @@ it('idl-version/cw3-fixed-multisig', async () => {
     await generateRecoil('Cw3FixedMultiSig', contractInfo, out);
     await generateReactQuery('Cw3FixedMultiSig', contractInfo, out);
 })
+
+it('idl-version/accounts-nft', async () => {
+    const out = OUTPUT_DIR + '/idl-version/accounts-nft';
+    const schemaDir = FIXTURE_DIR + '/idl-version/accounts-nft/';
+
+    const contractInfo = await readSchemas({
+        schemaDir
+    });
+
+    await generateTypes('AccountsNft', contractInfo, out);
+    await generateClient('AccountsNft', contractInfo, out);
+    await generateMessageComposer('AccountsNft', contractInfo, out);
+    await generateRecoil('AccountsNft', contractInfo, out);
+    await generateReactQuery('AccountsNft', contractInfo, out);
+})
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index 406029cf..be543e22 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -6,6 +6,9 @@ const cleanFor = (str) => {
     if (/_for_[A-Z]/.test(str)) {
         return str.replace(/_for_/, 'For');
     }
+    if (/_of_[A-Z]/.test(str)) {
+        return str.replace(/_of_/, 'Of');
+    }
     return str;
 };
 
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
index a0ee8254..0f07a397 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
@@ -28,6 +28,13 @@ it('query classes', () => {
     ))
 });
 
+// it('query classes response', () => {
+//     expectCode(createTypeInterface(
+//         ctx,
+//         contract.responses.all_debt_shares
+//     ))
+// });
+
 it('execute classes array types', () => {
     expectCode(createExecuteClass(
         ctx,

From 800c1113e152c70ff5f2e48628c5d98a9b28b51b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 14 Sep 2022 11:34:11 -0400
Subject: [PATCH 044/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.16.2
 - wasm-ast-types@0.11.2
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 8d7dc0f0..b2acddaa 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.1...@cosmwasm/ts-codegen@0.16.2) (2022-09-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.16.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.0...@cosmwasm/ts-codegen@0.16.1) (2022-09-13)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 20c69941..5095570e 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.11.1"
+    "wasm-ast-types": "^0.11.2"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index c8d00b6b..3a21d83e 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.11.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.1...wasm-ast-types@0.11.2) (2022-09-14)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.11.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.0...wasm-ast-types@0.11.1) (2022-09-13)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index b0db3c75..2f0df48c 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "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",

From acbb8339cd8c8a9cb7311548832e08239516cfa8 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 14 Sep 2022 11:41:07 -0400
Subject: [PATCH 045/287] scalar schema example

---
 .../idl-version/accounts-nft/account-nft.json | 19 ++++++++++++++++++-
 .../accounts-nft/AccountsNft.client.ts        |  9 ++++++++-
 .../AccountsNft.message-composer.ts           |  2 +-
 .../accounts-nft/AccountsNft.react-query.ts   |  9 ++++++++-
 .../accounts-nft/AccountsNft.recoil.ts        | 16 +++++++++++++++-
 .../accounts-nft/AccountsNft.types.ts         |  6 ++++--
 .../ts-client.account-nfts.spec.ts.snap       | 13 +++++++++++++
 7 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/__fixtures__/idl-version/accounts-nft/account-nft.json b/__fixtures__/idl-version/accounts-nft/account-nft.json
index 0303666a..efc7f4ce 100644
--- a/__fixtures__/idl-version/accounts-nft/account-nft.json
+++ b/__fixtures__/idl-version/accounts-nft/account-nft.json
@@ -395,6 +395,18 @@
         },
         "additionalProperties": false
       },
+      {
+        "type": "object",
+        "required": [
+          "all_previous_owners"
+        ],
+        "properties": {
+          "all_previous_owners": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "description": "Return the owner of the given token, error if token does not exist",
         "type": "object",
@@ -976,6 +988,11 @@
         }
       }
     },
+    "all_previous_owners": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "String",
+      "type": "string"
+    },
     "all_tokens": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "TokensResponse",
@@ -1387,4 +1404,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 48fab63a..3acb582e 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { Coin, StdFee } from "@cosmjs/amino";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 export interface AccountsNftReadOnlyInterface {
   contractAddress: string;
   proposedNewOwner: () => Promise<String>;
@@ -17,6 +17,7 @@ export interface AccountsNftReadOnlyInterface {
     limit?: number;
     startAfter?: string[][];
   }) => Promise<ArrayOfSharesResponseItem>;
+  allPreviousOwners: () => Promise<String>;
   ownerOf: ({
     includeExpired,
     tokenId
@@ -92,6 +93,7 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
     this.allDebtShares = this.allDebtShares.bind(this);
+    this.allPreviousOwners = this.allPreviousOwners.bind(this);
     this.ownerOf = this.ownerOf.bind(this);
     this.approval = this.approval.bind(this);
     this.approvals = this.approvals.bind(this);
@@ -124,6 +126,11 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
       }
     });
   };
+  allPreviousOwners = async (): Promise<String> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_previous_owners: {}
+    });
+  };
   ownerOf = async ({
     includeExpired,
     tokenId
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index d09bda4a..21196923 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino";
 import { MsgExecuteContractEncodeObject } from "cosmwasm";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 export interface AccountsNftMessage {
   contractAddress: string;
   sender: string;
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
index 5ce72700..522d621a 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "react-query";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 import { AccountsNftQueryClient } from "./AccountsNft.client";
 export interface AccountsNftReactQuery<TResponse, TData = TResponse> {
   client: AccountsNftQueryClient;
@@ -166,6 +166,13 @@ export function useAccountsNftOwnerOfQuery<TData = OwnerOfResponse>({
     tokenId: args.tokenId
   }), options);
 }
+export interface AccountsNftAllPreviousOwnersQuery<TData> extends AccountsNftReactQuery<String, TData> {}
+export function useAccountsNftAllPreviousOwnersQuery<TData = String>({
+  client,
+  options
+}: AccountsNftAllPreviousOwnersQuery<TData>) {
+  return useQuery<String, Error, TData>(["accountsNftAllPreviousOwners", client.contractAddress], () => client.allPreviousOwners(), options);
+}
 export interface AccountsNftAllDebtSharesQuery<TData> extends AccountsNftReactQuery<ArrayOfSharesResponseItem, TData> {
   args: {
     limit?: number;
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts b/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
index 04e6665b..6a149297 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse, String } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 import { AccountsNftQueryClient } from "./AccountsNft.client";
 type QueryClientParams = {
   contractAddress: string;
@@ -50,6 +50,20 @@ export const allDebtSharesSelector = selectorFamily<ArrayOfSharesResponseItem, Q
     return await client.allDebtShares(...params);
   }
 });
+export const allPreviousOwnersSelector = selectorFamily<String, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["allPreviousOwners"]>;
+}>({
+  key: "accountsNftAllPreviousOwners",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.allPreviousOwners(...params);
+  }
+});
 export const ownerOfSelector = selectorFamily<OwnerOfResponse, QueryClientParams & {
   params: Parameters<AccountsNftQueryClient["ownerOf"]>;
 }>({
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.types.ts b/__output__/idl-version/accounts-nft/AccountsNft.types.ts
index 364d67d7..50f93d61 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.types.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.types.ts
@@ -86,6 +86,8 @@ export type QueryMsg = {
     limit?: number | null;
     start_after?: [string, string] | null;
   };
+} | {
+  all_previous_owners: string;
 } | {
   owner_of: {
     include_expired?: boolean | null;
@@ -171,6 +173,7 @@ export interface OperatorsResponse {
   operators: Approval[];
   [k: string]: unknown;
 }
+export type String = string;
 export interface TokensResponse {
   tokens: string[];
   [k: string]: unknown;
@@ -195,5 +198,4 @@ export interface MinterResponse {
 export interface NumTokensResponse {
   count: number;
   [k: string]: unknown;
-}
-export type String = string;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
index e3d3eec7..eb3400fa 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
@@ -12,6 +12,7 @@ exports[`execute classes array types 1`] = `
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
     this.allDebtShares = this.allDebtShares.bind(this);
+    this.allPreviousOwners = this.allPreviousOwners.bind(this);
     this.ownerOf = this.ownerOf.bind(this);
     this.approval = this.approval.bind(this);
     this.approvals = this.approvals.bind(this);
@@ -44,6 +45,11 @@ exports[`execute classes array types 1`] = `
       }
     }, fee, memo, funds);
   };
+  allPreviousOwners = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      all_previous_owners: {}
+    }, fee, memo, funds);
+  };
   ownerOf = async ({
     includeExpired,
     tokenId
@@ -195,6 +201,7 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     startAfter?: string[][];
   }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allPreviousOwners: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
   ownerOf: ({
     includeExpired,
     tokenId
@@ -275,6 +282,7 @@ exports[`query classes 1`] = `
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
     this.allDebtShares = this.allDebtShares.bind(this);
+    this.allPreviousOwners = this.allPreviousOwners.bind(this);
     this.ownerOf = this.ownerOf.bind(this);
     this.approval = this.approval.bind(this);
     this.approvals = this.approvals.bind(this);
@@ -307,6 +315,11 @@ exports[`query classes 1`] = `
       }
     });
   };
+  allPreviousOwners = async (): Promise<AllPreviousOwnersResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_previous_owners: {}
+    });
+  };
   ownerOf = async ({
     includeExpired,
     tokenId

From f849d4199977b2319e8ebbfd58bc89e3f9b58181 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 14 Sep 2022 12:00:58 -0400
Subject: [PATCH 046/287] update cleanse

---
 .../idl-version/accounts-nft/account-nft.json | 53 ++++++++++++++++++-
 .../accounts-nft/AccountsNft.client.ts        | 24 ++++++++-
 .../AccountsNft.message-composer.ts           |  2 +-
 .../accounts-nft/AccountsNft.react-query.ts   | 18 ++++++-
 .../accounts-nft/AccountsNft.recoil.ts        | 16 +++++-
 .../accounts-nft/AccountsNft.types.ts         |  7 +++
 packages/ts-codegen/src/utils/cleanse.ts      | 11 ++--
 .../ts-client.account-nfts.spec.ts.snap       | 37 +++++++++++++
 8 files changed, 158 insertions(+), 10 deletions(-)

diff --git a/__fixtures__/idl-version/accounts-nft/account-nft.json b/__fixtures__/idl-version/accounts-nft/account-nft.json
index efc7f4ce..d2fa6f30 100644
--- a/__fixtures__/idl-version/accounts-nft/account-nft.json
+++ b/__fixtures__/idl-version/accounts-nft/account-nft.json
@@ -355,6 +355,39 @@
         },
         "additionalProperties": false
       },
+      {
+        "type": "object",
+        "required": [
+          "allowed_vaults"
+        ],
+        "properties": {
+          "allowed_vaults": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/VaultBase_for_String"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "description": "Enumerate debt shares for all token positions; start_after accepts (token_id, denom)",
         "type": "object",
@@ -698,7 +731,12 @@
         },
         "additionalProperties": false
       }
-    ]
+    ],
+    "definitions": {
+      "VaultBase_for_String": {
+        "type": "string"
+      }
+    }
   },
   "migrate": null,
   "sudo": null,
@@ -1010,6 +1048,19 @@
         }
       }
     },
+    "allowed_vaults": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "Array_of_VaultBase_for_String",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/VaultBase_for_String"
+      },
+      "definitions": {
+        "VaultBase_for_String": {
+          "type": "string"
+        }
+      }
+    },
     "approval": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "ApprovalResponse",
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 3acb582e..02276b5d 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -6,10 +6,17 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { Coin, StdFee } from "@cosmjs/amino";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 export interface AccountsNftReadOnlyInterface {
   contractAddress: string;
   proposedNewOwner: () => Promise<String>;
+  allowedVaults: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: VaultBaseForString;
+  }) => Promise<ArrayOfVaultBaseForString>;
   allDebtShares: ({
     limit,
     startAfter
@@ -92,6 +99,7 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
     this.client = client;
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
+    this.allowedVaults = this.allowedVaults.bind(this);
     this.allDebtShares = this.allDebtShares.bind(this);
     this.allPreviousOwners = this.allPreviousOwners.bind(this);
     this.ownerOf = this.ownerOf.bind(this);
@@ -112,6 +120,20 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
       proposed_new_owner: {}
     });
   };
+  allowedVaults = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: VaultBaseForString;
+  }): Promise<ArrayOfVaultBaseForString> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      allowed_vaults: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
   allDebtShares = async ({
     limit,
     startAfter
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index 21196923..f0397c4a 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino";
 import { MsgExecuteContractEncodeObject } from "cosmwasm";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 export interface AccountsNftMessage {
   contractAddress: string;
   sender: string;
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
index 522d621a..641b624b 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "react-query";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 import { AccountsNftQueryClient } from "./AccountsNft.client";
 export interface AccountsNftReactQuery<TResponse, TData = TResponse> {
   client: AccountsNftQueryClient;
@@ -189,6 +189,22 @@ export function useAccountsNftAllDebtSharesQuery<TData = ArrayOfSharesResponseIt
     startAfter: args.startAfter
   }), options);
 }
+export interface AccountsNftAllowedVaultsQuery<TData> extends AccountsNftReactQuery<ArrayOfVaultBaseForString, TData> {
+  args: {
+    limit?: number;
+    startAfter?: VaultBaseForString;
+  };
+}
+export function useAccountsNftAllowedVaultsQuery<TData = ArrayOfVaultBaseForString>({
+  client,
+  args,
+  options
+}: AccountsNftAllowedVaultsQuery<TData>) {
+  return useQuery<ArrayOfVaultBaseForString, Error, TData>(["accountsNftAllowedVaults", client.contractAddress, JSON.stringify(args)], () => client.allowedVaults({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
 export interface AccountsNftProposedNewOwnerQuery<TData> extends AccountsNftReactQuery<String, TData> {}
 export function useAccountsNftProposedNewOwnerQuery<TData = String>({
   client,
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts b/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
index 6a149297..d8d0274b 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
+import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 import { AccountsNftQueryClient } from "./AccountsNft.client";
 type QueryClientParams = {
   contractAddress: string;
@@ -36,6 +36,20 @@ export const proposedNewOwnerSelector = selectorFamily<String, QueryClientParams
     return await client.proposedNewOwner(...params);
   }
 });
+export const allowedVaultsSelector = selectorFamily<ArrayOfVaultBaseForString, QueryClientParams & {
+  params: Parameters<AccountsNftQueryClient["allowedVaults"]>;
+}>({
+  key: "accountsNftAllowedVaults",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.allowedVaults(...params);
+  }
+});
 export const allDebtSharesSelector = selectorFamily<ArrayOfSharesResponseItem, QueryClientParams & {
   params: Parameters<AccountsNftQueryClient["allDebtShares"]>;
 }>({
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.types.ts b/__output__/idl-version/accounts-nft/AccountsNft.types.ts
index 50f93d61..975a314a 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.types.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.types.ts
@@ -81,6 +81,11 @@ export type Timestamp = Uint64;
 export type Uint64 = string;
 export type QueryMsg = {
   proposed_new_owner: {};
+} | {
+  allowed_vaults: {
+    limit?: number | null;
+    start_after?: VaultBaseForString | null;
+  };
 } | {
   all_debt_shares: {
     limit?: number | null;
@@ -138,6 +143,7 @@ export type QueryMsg = {
 } | {
   minter: {};
 };
+export type VaultBaseForString = string;
 export type Uint128 = string;
 export type ArrayOfSharesResponseItem = SharesResponseItem[];
 export interface SharesResponseItem {
@@ -178,6 +184,7 @@ export interface TokensResponse {
   tokens: string[];
   [k: string]: unknown;
 }
+export type ArrayOfVaultBaseForString = VaultBaseForString[];
 export interface ApprovalResponse {
   approval: Approval;
   [k: string]: unknown;
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index be543e22..2e32b7c6 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -1,14 +1,15 @@
+import { pascal } from "case";
+
 const cleanFor = (str) => {
     /*
         1. look at first char after _for_
         2. ONLY if you find capitals after, modify it
     */
-    if (/_for_[A-Z]/.test(str)) {
-        return str.replace(/_for_/, 'For');
-    }
-    if (/_of_[A-Z]/.test(str)) {
-        return str.replace(/_of_/, 'Of');
+    while (/_[a-z]+_[A-Z]/.test(str)) {
+        const m = str.match(/(_[a-z]+_)[A-Z]/);
+        str = str.replace(m[1], pascal(m[1]));
     }
+
     return str;
 };
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
index eb3400fa..254ba6b0 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
@@ -11,6 +11,7 @@ exports[`execute classes array types 1`] = `
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
+    this.allowedVaults = this.allowedVaults.bind(this);
     this.allDebtShares = this.allDebtShares.bind(this);
     this.allPreviousOwners = this.allPreviousOwners.bind(this);
     this.ownerOf = this.ownerOf.bind(this);
@@ -31,6 +32,20 @@ exports[`execute classes array types 1`] = `
       proposed_new_owner: {}
     }, fee, memo, funds);
   };
+  allowedVaults = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: VaultBase_for_String;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      allowed_vaults: {
+        limit,
+        start_after: startAfter
+      }
+    }, fee, memo, funds);
+  };
   allDebtShares = async ({
     limit,
     startAfter
@@ -194,6 +209,13 @@ exports[`execute interfaces no extends 1`] = `
   contractAddress: string;
   sender: string;
   proposedNewOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  allowedVaults: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: VaultBase_for_String;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
   allDebtShares: ({
     limit,
     startAfter
@@ -281,6 +303,7 @@ exports[`query classes 1`] = `
     this.client = client;
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
+    this.allowedVaults = this.allowedVaults.bind(this);
     this.allDebtShares = this.allDebtShares.bind(this);
     this.allPreviousOwners = this.allPreviousOwners.bind(this);
     this.ownerOf = this.ownerOf.bind(this);
@@ -301,6 +324,20 @@ exports[`query classes 1`] = `
       proposed_new_owner: {}
     });
   };
+  allowedVaults = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: VaultBase_for_String;
+  }): Promise<AllowedVaultsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      allowed_vaults: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
   allDebtShares = async ({
     limit,
     startAfter

From b7fc988703af9305db47b3259f7e2a95db4665ba Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 14 Sep 2022 12:01:06 -0400
Subject: [PATCH 047/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.16.3
 - wasm-ast-types@0.11.3
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index b2acddaa..740050a7 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.2...@cosmwasm/ts-codegen@0.16.3) (2022-09-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.16.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.1...@cosmwasm/ts-codegen@0.16.2) (2022-09-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 5095570e..682e5885 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.16.2",
+  "version": "0.16.3",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -94,6 +94,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.11.2"
+    "wasm-ast-types": "^0.11.3"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 3a21d83e..65c53686 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.11.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.2...wasm-ast-types@0.11.3) (2022-09-14)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.11.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.1...wasm-ast-types@0.11.2) (2022-09-14)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 2f0df48c..128129cf 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "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",

From b20316d63b85ac8ce2d75ed90124087b7c50c5b4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 15 Sep 2022 15:28:41 -0400
Subject: [PATCH 048/287] readme

---
 README.md                     | 1 +
 packages/ts-codegen/README.md | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 88248d59..562ad087 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ npm install -g @cosmwasm/ts-codegen
 
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
 
+🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
 ## Table of contents
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 17d5dd4d..562ad087 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -21,6 +21,7 @@ npm install -g @cosmwasm/ts-codegen
 
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
 
+🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
 ## Table of contents
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
@@ -477,3 +478,4 @@ Checkout these related projects:
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)
+

From 15ad71ea06140dc79f594b946c52f3efbcf3a295 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 15 Sep 2022 15:28:44 -0400
Subject: [PATCH 049/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.16.4
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 740050a7..f0820eea 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.3...@cosmwasm/ts-codegen@0.16.4) (2022-09-15)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.16.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.2...@cosmwasm/ts-codegen@0.16.3) (2022-09-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 682e5885..32114419 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 4aef1195851b0cd43556d53cd3b9880034a3fa5b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 21 Sep 2022 17:29:55 -0500
Subject: [PATCH 050/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 562ad087..b5f4dbea 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Generate TypeScript SDKs for your CosmWasm smart contracts
 
 <p align="center">
-  <img width="120" src="https://user-images.githubusercontent.com/545047/163705368-bc899f6d-a2de-43ee-889b-dbf44e17f288.png">
+  <img width="120" src="https://user-images.githubusercontent.com/545047/191621556-6f1baa40-15ff-4465-8d80-63b3ff9bc23a.svg">
 </p>
 
 <p align="center" width="100%">
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 562ad087..b5f4dbea 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -3,7 +3,7 @@
 Generate TypeScript SDKs for your CosmWasm smart contracts
 
 <p align="center">
-  <img width="120" src="https://user-images.githubusercontent.com/545047/163705368-bc899f6d-a2de-43ee-889b-dbf44e17f288.png">
+  <img width="120" src="https://user-images.githubusercontent.com/545047/191621556-6f1baa40-15ff-4465-8d80-63b3ff9bc23a.svg">
 </p>
 
 <p align="center" width="100%">

From d5c403bd9db776c23428a53db346accb111b3098 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 21 Sep 2022 17:30:00 -0500
Subject: [PATCH 051/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.16.5
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index f0820eea..db299bb2 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.4...@cosmwasm/ts-codegen@0.16.5) (2022-09-21)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.16.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.3...@cosmwasm/ts-codegen@0.16.4) (2022-09-15)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 32114419..5c2943a0 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.16.4",
+  "version": "0.16.5",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 737d1f2e6cb03f6e814e985831d1845373205ea8 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 2 Oct 2022 01:54:06 -0500
Subject: [PATCH 052/287] contracts

---
 packages/ts-codegen/src/commands/install.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index 3cedf009..2005cf3f 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -44,11 +44,14 @@ export default async (argv) => {
             message:
                 'which chain contracts do you want to support?',
             choices: [
-                'stargaze-claim',
-                'stargaze-ics721',
-                'stargaze-minter',
-                'stargaze-royalty-group',
-                'stargaze-sg721',
+                'stargaze-base-factory',
+                'stargaze-base-minter',
+                'stargaze-sg721-base',
+                'stargaze-sg721-metdata-onchain',
+                'stargaze-sg721-nt',
+                'stargaze-splits',
+                'stargaze-vending-factory',
+                'stargaze-vending-minter',
                 'stargaze-whitelist',
                 'wasmswap'
             ].map(name => {

From 98faaab5547b61074b697d7e5728a1788ef52826 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 2 Oct 2022 01:54:15 -0500
Subject: [PATCH 053/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.17.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index db299bb2..f413848c 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.17.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.5...@cosmwasm/ts-codegen@0.17.0) (2022-10-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.16.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.4...@cosmwasm/ts-codegen@0.16.5) (2022-09-21)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 5c2943a0..f5f55148 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.16.5",
+  "version": "0.17.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 653f6cda264e5e79237336885fc24fd361d8131f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 14:33:53 -0700
Subject: [PATCH 054/287] fixture for #71

---
 __fixtures__/issues/71/execute_msg.json       | 645 ++++++++++++++++++
 .../client/test/ts-client.issue-71.test.ts    |  51 ++
 2 files changed, 696 insertions(+)
 create mode 100644 __fixtures__/issues/71/execute_msg.json
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.issue-71.test.ts

diff --git a/__fixtures__/issues/71/execute_msg.json b/__fixtures__/issues/71/execute_msg.json
new file mode 100644
index 00000000..af6f24cd
--- /dev/null
+++ b/__fixtures__/issues/71/execute_msg.json
@@ -0,0 +1,645 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ExecuteMsg",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "receive"
+      ],
+      "properties": {
+        "receive": {
+          "$ref": "#/definitions/Cw20ReceiveMsg"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Executable only by `config.owner`. Facilitates updating `config.fee_collector`, `config.generator_address`, `config.lp_token_code_id` parameters.",
+      "type": "object",
+      "required": [
+        "update_config"
+      ],
+      "properties": {
+        "update_config": {
+          "type": "object",
+          "properties": {
+            "fee_collector": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "generator_address": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "lp_token_code_id": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Executable only by `pool_config.fee_info.developer_addr` or `config.owner` if its not set. Facilitates enabling / disabling new pool instances creation (`pool_config.is_disabled`) , and updating Fee (` pool_config.fee_info`) for new pool instances",
+      "type": "object",
+      "required": [
+        "update_pool_config"
+      ],
+      "properties": {
+        "update_pool_config": {
+          "type": "object",
+          "required": [
+            "pool_type"
+          ],
+          "properties": {
+            "is_disabled": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "new_fee_info": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/FeeInfo"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "pool_type": {
+              "$ref": "#/definitions/PoolType"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Adds a new pool with a new [`PoolType`] Key.",
+      "type": "object",
+      "required": [
+        "add_to_registery"
+      ],
+      "properties": {
+        "add_to_registery": {
+          "type": "object",
+          "required": [
+            "new_pool_config"
+          ],
+          "properties": {
+            "new_pool_config": {
+              "$ref": "#/definitions/PoolConfig"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Creates a new pool with the specified parameters in the `asset_infos` variable.",
+      "type": "object",
+      "required": [
+        "create_pool_instance"
+      ],
+      "properties": {
+        "create_pool_instance": {
+          "type": "object",
+          "required": [
+            "asset_infos",
+            "pool_type"
+          ],
+          "properties": {
+            "asset_infos": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/AssetInfo"
+              }
+            },
+            "init_params": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Binary"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "lp_token_name": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "lp_token_symbol": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "pool_type": {
+              "$ref": "#/definitions/PoolType"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "join_pool"
+      ],
+      "properties": {
+        "join_pool": {
+          "type": "object",
+          "required": [
+            "pool_id"
+          ],
+          "properties": {
+            "assets": {
+              "type": [
+                "array",
+                "null"
+              ],
+              "items": {
+                "$ref": "#/definitions/Asset"
+              }
+            },
+            "auto_stake": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "lp_to_mint": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Uint128"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "pool_id": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "recipient": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "slippage_tolerance": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Decimal"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "swap"
+      ],
+      "properties": {
+        "swap": {
+          "type": "object",
+          "required": [
+            "swap_request"
+          ],
+          "properties": {
+            "recipient": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "swap_request": {
+              "$ref": "#/definitions/SingleSwapRequest"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "ProposeNewOwner creates an offer for a new owner. The validity period of the offer is set in the `expires_in` variable.",
+      "type": "object",
+      "required": [
+        "propose_new_owner"
+      ],
+      "properties": {
+        "propose_new_owner": {
+          "type": "object",
+          "required": [
+            "expires_in",
+            "owner"
+          ],
+          "properties": {
+            "expires_in": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "owner": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "DropOwnershipProposal removes the existing offer for the new owner.",
+      "type": "object",
+      "required": [
+        "drop_ownership_proposal"
+      ],
+      "properties": {
+        "drop_ownership_proposal": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Used to claim(approve) new owner proposal, thus changing contract's owner",
+      "type": "object",
+      "required": [
+        "claim_ownership"
+      ],
+      "properties": {
+        "claim_ownership": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    }
+  ],
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "Asset": {
+      "title": "Description - This enum describes a asset (native or CW20).",
+      "type": "object",
+      "required": [
+        "amount",
+        "info"
+      ],
+      "properties": {
+        "amount": {
+          "description": "A token amount",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint128"
+            }
+          ]
+        },
+        "info": {
+          "description": "Information about an asset stored in a [`AssetInfo`] struct",
+          "allOf": [
+            {
+              "$ref": "#/definitions/AssetInfo"
+            }
+          ]
+        }
+      }
+    },
+    "AssetInfo": {
+      "description": "This enum describes available Token types.",
+      "oneOf": [
+        {
+          "description": "Non-native Token",
+          "type": "object",
+          "required": [
+            "token"
+          ],
+          "properties": {
+            "token": {
+              "type": "object",
+              "required": [
+                "contract_addr"
+              ],
+              "properties": {
+                "contract_addr": {
+                  "$ref": "#/definitions/Addr"
+                }
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Native token",
+          "type": "object",
+          "required": [
+            "native_token"
+          ],
+          "properties": {
+            "native_token": {
+              "type": "object",
+              "required": [
+                "denom"
+              ],
+              "properties": {
+                "denom": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Binary": {
+      "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+      "type": "string"
+    },
+    "Cw20ReceiveMsg": {
+      "description": "Cw20ReceiveMsg should be de/serialized under `Receive()` variant in a ExecuteMsg",
+      "type": "object",
+      "required": [
+        "amount",
+        "msg",
+        "sender"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "msg": {
+          "$ref": "#/definitions/Binary"
+        },
+        "sender": {
+          "type": "string"
+        }
+      }
+    },
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
+    "FeeInfo": {
+      "title": "Description - This struct describes the Fee configuration supported by a particular pool type.",
+      "type": "object",
+      "required": [
+        "dev_fee_percent",
+        "protocol_fee_percent",
+        "total_fee_bps"
+      ],
+      "properties": {
+        "dev_fee_percent": {
+          "type": "integer",
+          "format": "uint16",
+          "minimum": 0.0
+        },
+        "developer_addr": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Addr"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "protocol_fee_percent": {
+          "type": "integer",
+          "format": "uint16",
+          "minimum": 0.0
+        },
+        "total_fee_bps": {
+          "type": "integer",
+          "format": "uint16",
+          "minimum": 0.0
+        }
+      }
+    },
+    "PoolConfig": {
+      "description": "This struct stores a pool type's configuration.",
+      "type": "object",
+      "required": [
+        "code_id",
+        "fee_info",
+        "is_disabled",
+        "is_generator_disabled",
+        "pool_type"
+      ],
+      "properties": {
+        "code_id": {
+          "description": "ID of contract which is used to create pools of this type",
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "fee_info": {
+          "$ref": "#/definitions/FeeInfo"
+        },
+        "is_disabled": {
+          "description": "Whether a pool type is disabled or not. If it is disabled, new pools cannot be created, but existing ones can still read the pool configuration",
+          "type": "boolean"
+        },
+        "is_generator_disabled": {
+          "description": "Setting this to true means that pools of this type will not be able to get added to generator",
+          "type": "boolean"
+        },
+        "pool_type": {
+          "description": "The pools type (provided in a [`PoolType`])",
+          "allOf": [
+            {
+              "$ref": "#/definitions/PoolType"
+            }
+          ]
+        }
+      }
+    },
+    "PoolType": {
+      "description": "This enum describes the key for the different Pool types supported by Dexter ## Available pool types ``` Xyk Stable2Pool Weighted Stable3Pool Custom(String::from(\"Custom\")); ```",
+      "oneOf": [
+        {
+          "description": "XYK pool type",
+          "type": "object",
+          "required": [
+            "xyk"
+          ],
+          "properties": {
+            "xyk": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Stable pool type",
+          "type": "object",
+          "required": [
+            "stable2_pool"
+          ],
+          "properties": {
+            "stable2_pool": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Stable pool type",
+          "type": "object",
+          "required": [
+            "stable3_pool"
+          ],
+          "properties": {
+            "stable3_pool": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Weighted pool type",
+          "type": "object",
+          "required": [
+            "weighted"
+          ],
+          "properties": {
+            "weighted": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Custom pool type",
+          "type": "object",
+          "required": [
+            "custom"
+          ],
+          "properties": {
+            "custom": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "SingleSwapRequest": {
+      "type": "object",
+      "required": [
+        "amount",
+        "asset_in",
+        "asset_out",
+        "pool_id",
+        "swap_type"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "asset_in": {
+          "$ref": "#/definitions/AssetInfo"
+        },
+        "asset_out": {
+          "$ref": "#/definitions/AssetInfo"
+        },
+        "belief_price": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Decimal"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "max_spread": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Decimal"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "pool_id": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "swap_type": {
+          "$ref": "#/definitions/SwapType"
+        }
+      }
+    },
+    "SwapType": {
+      "description": "This enum describes available Swap types. ## Available swap types ``` GiveIn ::   When we have the number of tokens being provided by the user to the pool in the swap request GiveOut :: When we have the number of tokens to be sent to the user from the pool in the swap request ```",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "give_in"
+          ],
+          "properties": {
+            "give_in": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "required": [
+            "give_out"
+          ],
+          "properties": {
+            "give_out": {
+              "type": "object"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Custom swap type",
+          "type": "object",
+          "required": [
+            "custom"
+          ],
+          "properties": {
+            "custom": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-71.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.issue-71.test.ts
new file mode 100644
index 00000000..18f48125
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.issue-71.test.ts
@@ -0,0 +1,51 @@
+import { globContracts, makeContext } from '../../../test-utils'
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode } from '../../../test-utils';
+import cases from 'jest-in-case';
+
+const contracts = globContracts('issues/71');
+
+cases('execute_msg_for__empty', async opts => {
+    const ctx = makeContext(opts.content);
+    expectCode(createTypeInterface(
+        ctx,
+        opts.content
+    ));
+}, contracts);
+
+cases('query classes', async opts => {
+    const ctx = makeContext(opts.content);
+    expectCode(createQueryClass(
+        ctx,
+        'SG721QueryClient',
+        'SG721ReadOnlyInstance',
+        opts.content
+    ))
+}, contracts);
+
+cases('execute class', async opts => {
+    const ctx = makeContext(opts.content);
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        opts.content
+    ))
+}, contracts);
+
+cases('execute interface', async opts => {
+    const ctx = makeContext(opts.content);
+    expectCode(createExecuteInterface(
+        ctx,
+        'SG721Instance',
+        null,
+        opts.content
+    ))
+}, contracts);
+

From ac7f8acee2f843cba77fa71427bd8e9344c4c70d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 18:11:55 -0700
Subject: [PATCH 055/287] fix #71

---
 .../ts-client.issue-71.test.ts.snap           | 432 ++++++++++++++++++
 packages/wasm-ast-types/src/utils/types.ts    |  35 +-
 2 files changed, 457 insertions(+), 10 deletions(-)
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap

diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap
new file mode 100644
index 00000000..29fbf717
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -0,0 +1,432 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute class /issues/71/execute_msg.json 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.receive = this.receive.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+    this.updatePoolConfig = this.updatePoolConfig.bind(this);
+    this.addToRegistery = this.addToRegistery.bind(this);
+    this.createPoolInstance = this.createPoolInstance.bind(this);
+    this.joinPool = this.joinPool.bind(this);
+    this.swap = this.swap.bind(this);
+    this.proposeNewOwner = this.proposeNewOwner.bind(this);
+    this.dropOwnershipProposal = this.dropOwnershipProposal.bind(this);
+    this.claimOwnership = this.claimOwnership.bind(this);
+  }
+
+  receive = async ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      receive: {
+        amount,
+        msg,
+        sender
+      }
+    }, fee, memo, funds);
+  };
+  updateConfig = async ({
+    feeCollector,
+    generatorAddress,
+    lpTokenCodeId
+  }: {
+    feeCollector?: string;
+    generatorAddress?: string;
+    lpTokenCodeId?: number;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        fee_collector: feeCollector,
+        generator_address: generatorAddress,
+        lp_token_code_id: lpTokenCodeId
+      }
+    }, fee, memo, funds);
+  };
+  updatePoolConfig = async ({
+    isDisabled,
+    newFeeInfo,
+    poolType
+  }: {
+    isDisabled?: boolean;
+    newFeeInfo?: FeeInfo;
+    poolType: PoolType;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_pool_config: {
+        is_disabled: isDisabled,
+        new_fee_info: newFeeInfo,
+        pool_type: poolType
+      }
+    }, fee, memo, funds);
+  };
+  addToRegistery = async ({
+    newPoolConfig
+  }: {
+    newPoolConfig: PoolConfig;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      add_to_registery: {
+        new_pool_config: newPoolConfig
+      }
+    }, fee, memo, funds);
+  };
+  createPoolInstance = async ({
+    assetInfos,
+    initParams,
+    lpTokenName,
+    lpTokenSymbol,
+    poolType
+  }: {
+    assetInfos: AssetInfo[];
+    initParams?: Binary;
+    lpTokenName?: string;
+    lpTokenSymbol?: string;
+    poolType: PoolType;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      create_pool_instance: {
+        asset_infos: assetInfos,
+        init_params: initParams,
+        lp_token_name: lpTokenName,
+        lp_token_symbol: lpTokenSymbol,
+        pool_type: poolType
+      }
+    }, fee, memo, funds);
+  };
+  joinPool = async ({
+    assets,
+    autoStake,
+    lpToMint,
+    poolId,
+    recipient,
+    slippageTolerance
+  }: {
+    assets?: Asset[];
+    autoStake?: boolean;
+    lpToMint?: Uint128;
+    poolId: Uint128;
+    recipient?: string;
+    slippageTolerance?: Decimal;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      join_pool: {
+        assets,
+        auto_stake: autoStake,
+        lp_to_mint: lpToMint,
+        pool_id: poolId,
+        recipient,
+        slippage_tolerance: slippageTolerance
+      }
+    }, fee, memo, funds);
+  };
+  swap = async ({
+    recipient,
+    swapRequest
+  }: {
+    recipient?: string;
+    swapRequest: SingleSwapRequest;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      swap: {
+        recipient,
+        swap_request: swapRequest
+      }
+    }, fee, memo, funds);
+  };
+  proposeNewOwner = async ({
+    expiresIn,
+    owner
+  }: {
+    expiresIn: number;
+    owner: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      propose_new_owner: {
+        expires_in: expiresIn,
+        owner
+      }
+    }, fee, memo, funds);
+  };
+  dropOwnershipProposal = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      drop_ownership_proposal: {}
+    }, fee, memo, funds);
+  };
+  claimOwnership = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      claim_ownership: {}
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`execute interface /issues/71/execute_msg.json 1`] = `
+"export interface SG721Instance {
+  contractAddress: string;
+  sender: string;
+  receive: ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateConfig: ({
+    feeCollector,
+    generatorAddress,
+    lpTokenCodeId
+  }: {
+    feeCollector?: string;
+    generatorAddress?: string;
+    lpTokenCodeId?: number;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updatePoolConfig: ({
+    isDisabled,
+    newFeeInfo,
+    poolType
+  }: {
+    isDisabled?: boolean;
+    newFeeInfo?: FeeInfo;
+    poolType: PoolType;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  addToRegistery: ({
+    newPoolConfig
+  }: {
+    newPoolConfig: PoolConfig;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  createPoolInstance: ({
+    assetInfos,
+    initParams,
+    lpTokenName,
+    lpTokenSymbol,
+    poolType
+  }: {
+    assetInfos: AssetInfo[];
+    initParams?: Binary;
+    lpTokenName?: string;
+    lpTokenSymbol?: string;
+    poolType: PoolType;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  joinPool: ({
+    assets,
+    autoStake,
+    lpToMint,
+    poolId,
+    recipient,
+    slippageTolerance
+  }: {
+    assets?: Asset[];
+    autoStake?: boolean;
+    lpToMint?: Uint128;
+    poolId: Uint128;
+    recipient?: string;
+    slippageTolerance?: Decimal;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  swap: ({
+    recipient,
+    swapRequest
+  }: {
+    recipient?: string;
+    swapRequest: SingleSwapRequest;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  proposeNewOwner: ({
+    expiresIn,
+    owner
+  }: {
+    expiresIn: number;
+    owner: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  dropOwnershipProposal: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  claimOwnership: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}"
+`;
+
+exports[`execute_msg_for__empty /issues/71/execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
+
+exports[`query classes /issues/71/execute_msg.json 1`] = `
+"export class SG721QueryClient implements SG721ReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.receive = this.receive.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+    this.updatePoolConfig = this.updatePoolConfig.bind(this);
+    this.addToRegistery = this.addToRegistery.bind(this);
+    this.createPoolInstance = this.createPoolInstance.bind(this);
+    this.joinPool = this.joinPool.bind(this);
+    this.swap = this.swap.bind(this);
+    this.proposeNewOwner = this.proposeNewOwner.bind(this);
+    this.dropOwnershipProposal = this.dropOwnershipProposal.bind(this);
+    this.claimOwnership = this.claimOwnership.bind(this);
+  }
+
+  receive = async ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }): Promise<ReceiveResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      receive: {
+        amount,
+        msg,
+        sender
+      }
+    });
+  };
+  updateConfig = async ({
+    feeCollector,
+    generatorAddress,
+    lpTokenCodeId
+  }: {
+    feeCollector?: string;
+    generatorAddress?: string;
+    lpTokenCodeId?: number;
+  }): Promise<UpdateConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      update_config: {
+        fee_collector: feeCollector,
+        generator_address: generatorAddress,
+        lp_token_code_id: lpTokenCodeId
+      }
+    });
+  };
+  updatePoolConfig = async ({
+    isDisabled,
+    newFeeInfo,
+    poolType
+  }: {
+    isDisabled?: boolean;
+    newFeeInfo?: FeeInfo;
+    poolType: PoolType;
+  }): Promise<UpdatePoolConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      update_pool_config: {
+        is_disabled: isDisabled,
+        new_fee_info: newFeeInfo,
+        pool_type: poolType
+      }
+    });
+  };
+  addToRegistery = async ({
+    newPoolConfig
+  }: {
+    newPoolConfig: PoolConfig;
+  }): Promise<AddToRegisteryResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      add_to_registery: {
+        new_pool_config: newPoolConfig
+      }
+    });
+  };
+  createPoolInstance = async ({
+    assetInfos,
+    initParams,
+    lpTokenName,
+    lpTokenSymbol,
+    poolType
+  }: {
+    assetInfos: AssetInfo[];
+    initParams?: Binary;
+    lpTokenName?: string;
+    lpTokenSymbol?: string;
+    poolType: PoolType;
+  }): Promise<CreatePoolInstanceResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      create_pool_instance: {
+        asset_infos: assetInfos,
+        init_params: initParams,
+        lp_token_name: lpTokenName,
+        lp_token_symbol: lpTokenSymbol,
+        pool_type: poolType
+      }
+    });
+  };
+  joinPool = async ({
+    assets,
+    autoStake,
+    lpToMint,
+    poolId,
+    recipient,
+    slippageTolerance
+  }: {
+    assets?: Asset[];
+    autoStake?: boolean;
+    lpToMint?: Uint128;
+    poolId: Uint128;
+    recipient?: string;
+    slippageTolerance?: Decimal;
+  }): Promise<JoinPoolResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      join_pool: {
+        assets,
+        auto_stake: autoStake,
+        lp_to_mint: lpToMint,
+        pool_id: poolId,
+        recipient,
+        slippage_tolerance: slippageTolerance
+      }
+    });
+  };
+  swap = async ({
+    recipient,
+    swapRequest
+  }: {
+    recipient?: string;
+    swapRequest: SingleSwapRequest;
+  }): Promise<SwapResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      swap: {
+        recipient,
+        swap_request: swapRequest
+      }
+    });
+  };
+  proposeNewOwner = async ({
+    expiresIn,
+    owner
+  }: {
+    expiresIn: number;
+    owner: string;
+  }): Promise<ProposeNewOwnerResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      propose_new_owner: {
+        expires_in: expiresIn,
+        owner
+      }
+    });
+  };
+  dropOwnershipProposal = async (): Promise<DropOwnershipProposalResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      drop_ownership_proposal: {}
+    });
+  };
+  claimOwnership = async (): Promise<ClaimOwnershipResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      claim_ownership: {}
+    });
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index fe5360f1..01de42c3 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -167,18 +167,33 @@ export const getTypeInfo = (info: JSONSchema) => {
     }
 
     if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
-      const detect = detectType(info.items.type);
-      if (detect.type === 'array') {
-        // wen recursion?
-        type = t.tsArrayType(
-          getArrayTypeFromItems(info.items)
-        );
+
+      if (info.items.type) {
+        const detect = detectType(info.items.type);
+        if (detect.type === 'array') {
+          // wen recursion?
+          type = t.tsArrayType(
+            getArrayTypeFromItems(info.items)
+          );
+        } else {
+          type = t.tsArrayType(
+            getType(detect.type)
+          );
+        }
+        optional = detect.optional;
+      } else if (info.items.$ref) {
+        type = getArrayTypeFromRef(info.items.$ref);
+        // } else if (info.items.title) {
+        //   type = t.tsArrayType(
+        //     t.tsTypeReference(
+        //       t.identifier(info.items.title)
+        //     )
+        //   );
+      } else if (info.items.type) {
+        type = getArrayTypeFromItems(info.items);
       } else {
-        type = t.tsArrayType(
-          getType(detect.type)
-        );
+        throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
       }
-      optional = detect.optional;
 
     } else {
       const detect = detectType(nullableType);

From 573e12a87370fc2f6b005e928f1291931a9cf2e7 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 18:15:48 -0700
Subject: [PATCH 056/287] pkg

---
 packages/ts-codegen/package.json     | 6 ++++--
 packages/wasm-ast-types/package.json | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index f5f55148..5ea4660d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -18,13 +18,15 @@
   "files": [
     "types",
     "main",
+    "src",
     "module"
   ],
   "scripts": {
     "build:main": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"",
     "build:module": "cross-env MODULE=true babel src --out-dir module --delete-dir-on-start  --extensions \".tsx,.ts,.js\"",
-    "build": "npm run build:module && npm run build:main",
     "build:ts": "tsc --project ./tsconfig.json",
+    "build": "npm run build:module && npm run build:main",
+    "buidl": "npm run build && npm run build:ts",
     "prepare": "npm run build",
     "dev": "cross-env NODE_ENV=development babel-node src/ts-codegen --extensions \".tsx,.ts,.js\"",
     "watch": "cross-env NODE_ENV=development babel-watch src/ts-codegen --extensions \".tsx,.ts,.js\"",
@@ -96,4 +98,4 @@
     "shelljs": "0.8.5",
     "wasm-ast-types": "^0.11.3"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 128129cf..06007674 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -15,13 +15,15 @@
   "files": [
     "types",
     "main",
+    "src",
     "module"
   ],
   "scripts": {
     "build:main": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"",
     "build:module": "cross-env MODULE=true babel src --out-dir module --delete-dir-on-start  --extensions \".tsx,.ts,.js\"",
-    "build": "npm run build:module && npm run build:main",
     "build:ts": "tsc --project ./tsconfig.json",
+    "build": "npm run build:module && npm run build:main",
+    "buidl": "npm run build && npm run build:ts",
     "prepare": "npm run build",
     "lint": "eslint .",
     "format": "eslint . --fix",
@@ -86,4 +88,4 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   }
-}
+}
\ No newline at end of file

From 59dcc054d241c6bf43d5a617b31c3cd5c4ecff6e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 18:15:56 -0700
Subject: [PATCH 057/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.18.0
 - wasm-ast-types@0.12.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 6 +++---
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index f413848c..81c3c15d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.18.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.17.0...@cosmwasm/ts-codegen@0.18.0) (2022-10-11)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.17.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.16.5...@cosmwasm/ts-codegen@0.17.0) (2022-10-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 5ea4660d..81b5145f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.11.3"
+    "wasm-ast-types": "^0.12.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 65c53686..27fd5784 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.12.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.3...wasm-ast-types@0.12.0) (2022-10-11)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.11.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.2...wasm-ast-types@0.11.3) (2022-09-14)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 06007674..f4a16143 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.11.3",
+  "version": "0.12.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,4 +88,4 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   }
-}
\ No newline at end of file
+}

From 930b1f1b29c2cd7c3b4655e8bb85f96decb74a2a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 18:49:17 -0700
Subject: [PATCH 058/287] execExtendsQuery option

---
 .../no-extends/CwAdminFactory.client.ts       |  65 +++
 .../CwAdminFactory.message-composer.ts        |  60 +++
 .../no-extends/CwAdminFactory.react-query.ts  |  13 +
 .../no-extends/CwAdminFactory.recoil.ts       |  24 +
 .../no-extends/CwAdminFactory.types.ts        |  19 +
 .../no-extends/CwCodeIdRegistry.client.ts     | 251 +++++++++++
 .../CwCodeIdRegistry.message-composer.ts      | 200 +++++++++
 .../CwCodeIdRegistry.react-query.ts           |  70 +++
 .../no-extends/CwCodeIdRegistry.recoil.ts     |  80 ++++
 .../no-extends/CwCodeIdRegistry.types.ts      | 109 +++++
 .../builder/no-extends/CwSingle.client.ts     | 381 ++++++++++++++++
 .../no-extends/CwSingle.message-composer.ts   | 294 +++++++++++++
 .../no-extends/CwSingle.react-query.ts        | 128 ++++++
 .../builder/no-extends/CwSingle.recoil.ts     | 164 +++++++
 .../builder/no-extends/CwSingle.types.ts      | 416 ++++++++++++++++++
 .../builder/no-extends/Factory.client.ts      | 259 +++++++++++
 .../no-extends/Factory.message-composer.ts    | 214 +++++++++
 .../builder/no-extends/Factory.react-query.ts |  82 ++++
 .../builder/no-extends/Factory.recoil.ts      | 108 +++++
 .../builder/no-extends/Factory.types.ts       | 183 ++++++++
 .../builder/no-extends/Minter.client.ts       | 177 ++++++++
 .../no-extends/Minter.message-composer.ts     | 174 ++++++++
 .../builder/no-extends/Minter.react-query.ts  |  55 +++
 .../builder/no-extends/Minter.recoil.ts       |  94 ++++
 __output__/builder/no-extends/Minter.types.ts | 124 ++++++
 __output__/builder/no-extends/index.ts        |  65 +++
 package.json                                  |   1 +
 .../__snapshots__/builder.test.ts.snap        |   2 +
 packages/ts-codegen/__tests__/builder.test.ts |  41 ++
 packages/ts-codegen/src/generators/client.ts  |   5 +-
 packages/wasm-ast-types/src/client/client.ts  |   2 +-
 .../wasm-ast-types/src/context/context.ts     |   4 +-
 .../wasm-ast-types/types/client/client.d.ts   |   2 +-
 .../wasm-ast-types/types/context/context.d.ts |   1 +
 34 files changed, 3862 insertions(+), 5 deletions(-)
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.client.ts
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.message-composer.ts
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.react-query.ts
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.recoil.ts
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.types.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.client.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.react-query.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.recoil.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.types.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.client.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.message-composer.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.react-query.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.recoil.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.types.ts
 create mode 100644 __output__/builder/no-extends/Factory.client.ts
 create mode 100644 __output__/builder/no-extends/Factory.message-composer.ts
 create mode 100644 __output__/builder/no-extends/Factory.react-query.ts
 create mode 100644 __output__/builder/no-extends/Factory.recoil.ts
 create mode 100644 __output__/builder/no-extends/Factory.types.ts
 create mode 100644 __output__/builder/no-extends/Minter.client.ts
 create mode 100644 __output__/builder/no-extends/Minter.message-composer.ts
 create mode 100644 __output__/builder/no-extends/Minter.react-query.ts
 create mode 100644 __output__/builder/no-extends/Minter.recoil.ts
 create mode 100644 __output__/builder/no-extends/Minter.types.ts
 create mode 100644 __output__/builder/no-extends/index.ts

diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts
new file mode 100644
index 00000000..3194c8c0
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.client.ts
@@ -0,0 +1,65 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+export interface CwAdminFactoryReadOnlyInterface {
+  contractAddress: string;
+}
+export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+  }
+
+}
+export interface CwAdminFactoryInterface {
+  contractAddress: string;
+  sender: string;
+  instantiateContractWithSelfAdmin: ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CwAdminFactoryClient implements CwAdminFactoryInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
+  }
+
+  instantiateContractWithSelfAdmin = async ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      instantiate_contract_with_self_admin: {
+        code_id: codeId,
+        instantiate_msg: instantiateMsg,
+        label
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
new file mode 100644
index 00000000..6ff9c5fb
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -0,0 +1,60 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+export interface CwAdminFactoryMessage {
+  contractAddress: string;
+  sender: string;
+  instantiateContractWithSelfAdmin: ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
+  }
+
+  instantiateContractWithSelfAdmin = ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          instantiate_contract_with_self_admin: {
+            code_id: codeId,
+            instantiate_msg: instantiateMsg,
+            label
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.react-query.ts b/__output__/builder/no-extends/CwAdminFactory.react-query.ts
new file mode 100644
index 00000000..be2aa1b7
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.react-query.ts
@@ -0,0 +1,13 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions } from "react-query";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
+  client: CwAdminFactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.recoil.ts b/__output__/builder/no-extends/CwAdminFactory.recoil.ts
new file mode 100644
index 00000000..eddb158c
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.recoil.ts
@@ -0,0 +1,24 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CwAdminFactoryQueryClient, QueryClientParams>({
+  key: "cwAdminFactoryQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CwAdminFactoryQueryClient(client, contractAddress);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.types.ts b/__output__/builder/no-extends/CwAdminFactory.types.ts
new file mode 100644
index 00000000..11b47d44
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.types.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type ExecuteMsg = {
+  instantiate_contract_with_self_admin: {
+    code_id: number;
+    instantiate_msg: Binary;
+    label: string;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export interface InstantiateMsg {
+  [k: string]: unknown;
+}
+export type QueryMsg = string;
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
new file mode 100644
index 00000000..59e6506b
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
@@ -0,0 +1,251 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+export interface CwCodeIdRegistryReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+  getRegistration: ({
+    chainId,
+    name,
+    version
+  }: {
+    chainId: string;
+    name: string;
+    version?: string;
+  }) => Promise<GetRegistrationResponse>;
+  infoForCodeId: ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }) => Promise<InfoForCodeIdResponse>;
+  listRegistrations: ({
+    chainId,
+    name
+  }: {
+    chainId: string;
+    name: string;
+  }) => Promise<ListRegistrationsResponse>;
+}
+export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+    this.getRegistration = this.getRegistration.bind(this);
+    this.infoForCodeId = this.infoForCodeId.bind(this);
+    this.listRegistrations = this.listRegistrations.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+  getRegistration = async ({
+    chainId,
+    name,
+    version
+  }: {
+    chainId: string;
+    name: string;
+    version?: string;
+  }): Promise<GetRegistrationResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_registration: {
+        chain_id: chainId,
+        name,
+        version
+      }
+    });
+  };
+  infoForCodeId = async ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }): Promise<InfoForCodeIdResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      info_for_code_id: {
+        chain_id: chainId,
+        code_id: codeId
+      }
+    });
+  };
+  listRegistrations = async ({
+    chainId,
+    name
+  }: {
+    chainId: string;
+    name: string;
+  }): Promise<ListRegistrationsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_registrations: {
+        chain_id: chainId,
+        name
+      }
+    });
+  };
+}
+export interface CwCodeIdRegistryInterface {
+  contractAddress: string;
+  sender: string;
+  receive: ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  register: ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  setOwner: ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  unregister: ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateConfig: ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.receive = this.receive.bind(this);
+    this.register = this.register.bind(this);
+    this.setOwner = this.setOwner.bind(this);
+    this.unregister = this.unregister.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+  }
+
+  receive = async ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      receive: {
+        amount,
+        msg,
+        sender
+      }
+    }, fee, memo, funds);
+  };
+  register = async ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      register: {
+        chain_id: chainId,
+        checksum,
+        code_id: codeId,
+        name,
+        version
+      }
+    }, fee, memo, funds);
+  };
+  setOwner = async ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_owner: {
+        chain_id: chainId,
+        name,
+        owner
+      }
+    }, fee, memo, funds);
+  };
+  unregister = async ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      unregister: {
+        chain_id: chainId,
+        code_id: codeId
+      }
+    }, fee, memo, funds);
+  };
+  updateConfig = async ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        admin,
+        payment_info: paymentInfo
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
new file mode 100644
index 00000000..2590da00
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -0,0 +1,200 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+export interface CwCodeIdRegistryMessage {
+  contractAddress: string;
+  sender: string;
+  receive: ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  register: ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  setOwner: ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  unregister: ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateConfig: ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.receive = this.receive.bind(this);
+    this.register = this.register.bind(this);
+    this.setOwner = this.setOwner.bind(this);
+    this.unregister = this.unregister.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+  }
+
+  receive = ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          receive: {
+            amount,
+            msg,
+            sender
+          }
+        })),
+        funds
+      })
+    };
+  };
+  register = ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          register: {
+            chain_id: chainId,
+            checksum,
+            code_id: codeId,
+            name,
+            version
+          }
+        })),
+        funds
+      })
+    };
+  };
+  setOwner = ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          set_owner: {
+            chain_id: chainId,
+            name,
+            owner
+          }
+        })),
+        funds
+      })
+    };
+  };
+  unregister = ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          unregister: {
+            chain_id: chainId,
+            code_id: codeId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateConfig = ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_config: {
+            admin,
+            payment_info: paymentInfo
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts b/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts
new file mode 100644
index 00000000..d2bcdc8f
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts
@@ -0,0 +1,70 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
+  client: CwCodeIdRegistryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
+  args: {
+    chainId: string;
+    name: string;
+  };
+}
+export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrationsResponse>({
+  client,
+  args,
+  options
+}: CwCodeIdRegistryListRegistrationsQuery<TData>) {
+  return useQuery<ListRegistrationsResponse, Error, TData>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
+    chainId: args.chainId,
+    name: args.name
+  }), options);
+}
+export interface CwCodeIdRegistryInfoForCodeIdQuery<TData> extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
+  args: {
+    chainId: string;
+    codeId: number;
+  };
+}
+export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdResponse>({
+  client,
+  args,
+  options
+}: CwCodeIdRegistryInfoForCodeIdQuery<TData>) {
+  return useQuery<InfoForCodeIdResponse, Error, TData>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
+    chainId: args.chainId,
+    codeId: args.codeId
+  }), options);
+}
+export interface CwCodeIdRegistryGetRegistrationQuery<TData> extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
+  args: {
+    chainId: string;
+    name: string;
+    version?: string;
+  };
+}
+export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationResponse>({
+  client,
+  args,
+  options
+}: CwCodeIdRegistryGetRegistrationQuery<TData>) {
+  return useQuery<GetRegistrationResponse, Error, TData>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
+    chainId: args.chainId,
+    name: args.name,
+    version: args.version
+  }), options);
+}
+export interface CwCodeIdRegistryConfigQuery<TData> extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: CwCodeIdRegistryConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.recoil.ts b/__output__/builder/no-extends/CwCodeIdRegistry.recoil.ts
new file mode 100644
index 00000000..c76fd755
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.recoil.ts
@@ -0,0 +1,80 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CwCodeIdRegistryQueryClient, QueryClientParams>({
+  key: "cwCodeIdRegistryQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CwCodeIdRegistryQueryClient(client, contractAddress);
+  }
+});
+export const configSelector = selectorFamily<ConfigResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["config"]>;
+}>({
+  key: "cwCodeIdRegistryConfig",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.config(...params);
+  }
+});
+export const getRegistrationSelector = selectorFamily<GetRegistrationResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["getRegistration"]>;
+}>({
+  key: "cwCodeIdRegistryGetRegistration",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.getRegistration(...params);
+  }
+});
+export const infoForCodeIdSelector = selectorFamily<InfoForCodeIdResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["infoForCodeId"]>;
+}>({
+  key: "cwCodeIdRegistryInfoForCodeId",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.infoForCodeId(...params);
+  }
+});
+export const listRegistrationsSelector = selectorFamily<ListRegistrationsResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["listRegistrations"]>;
+}>({
+  key: "cwCodeIdRegistryListRegistrations",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listRegistrations(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.types.ts b/__output__/builder/no-extends/CwCodeIdRegistry.types.ts
new file mode 100644
index 00000000..46a8c284
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.types.ts
@@ -0,0 +1,109 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Addr = string;
+export type PaymentInfo = {
+  none: {};
+} | {
+  native_payment: {
+    payment_amount: Uint128;
+    token_denom: string;
+  };
+} | {
+  cw20_payment: {
+    payment_amount: Uint128;
+    token_address: string;
+  };
+};
+export type Uint128 = string;
+export interface ConfigResponse {
+  admin: Addr;
+  payment_info: PaymentInfo;
+}
+export type ExecuteMsg = {
+  receive: Cw20ReceiveMsg;
+} | {
+  register: {
+    chain_id: string;
+    checksum: string;
+    code_id: number;
+    name: string;
+    version: string;
+  };
+} | {
+  set_owner: {
+    chain_id: string;
+    name: string;
+    owner?: string | null;
+  };
+} | {
+  unregister: {
+    chain_id: string;
+    code_id: number;
+  };
+} | {
+  update_config: {
+    admin?: string | null;
+    payment_info?: PaymentInfo | null;
+  };
+};
+export type Binary = string;
+export interface Cw20ReceiveMsg {
+  amount: Uint128;
+  msg: Binary;
+  sender: string;
+  [k: string]: unknown;
+}
+export interface GetRegistrationResponse {
+  registration: Registration;
+}
+export interface Registration {
+  checksum: string;
+  code_id: number;
+  registered_by: Addr;
+  version: string;
+}
+export interface InfoForCodeIdResponse {
+  checksum: string;
+  name: string;
+  registered_by: Addr;
+  version: string;
+}
+export interface InstantiateMsg {
+  admin: string;
+  payment_info: PaymentInfo;
+}
+export interface ListRegistrationsResponse {
+  registrations: Registration[];
+}
+export type QueryMsg = {
+  config: {};
+} | {
+  get_registration: {
+    chain_id: string;
+    name: string;
+    version?: string | null;
+  };
+} | {
+  info_for_code_id: {
+    chain_id: string;
+    code_id: number;
+  };
+} | {
+  list_registrations: {
+    chain_id: string;
+    name: string;
+  };
+};
+export type ReceiveMsg = {
+  register: {
+    chain_id: string;
+    checksum: string;
+    code_id: number;
+    name: string;
+    version: string;
+  };
+};
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts
new file mode 100644
index 00000000..05c0dc73
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.client.ts
@@ -0,0 +1,381 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+export interface CwSingleReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+  proposal: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }) => Promise<ProposalResponse>;
+  listProposals: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }) => Promise<ListProposalsResponse>;
+  reverseProposals: ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }) => Promise<ReverseProposalsResponse>;
+  proposalCount: () => Promise<ProposalCountResponse>;
+  vote: ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }) => Promise<VoteResponse>;
+  listVotes: ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }) => Promise<ListVotesResponse>;
+  proposalHooks: () => Promise<ProposalHooksResponse>;
+  voteHooks: () => Promise<VoteHooksResponse>;
+  info: () => Promise<InfoResponse>;
+}
+export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+    this.proposal = this.proposal.bind(this);
+    this.listProposals = this.listProposals.bind(this);
+    this.reverseProposals = this.reverseProposals.bind(this);
+    this.proposalCount = this.proposalCount.bind(this);
+    this.vote = this.vote.bind(this);
+    this.listVotes = this.listVotes.bind(this);
+    this.proposalHooks = this.proposalHooks.bind(this);
+    this.voteHooks = this.voteHooks.bind(this);
+    this.info = this.info.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+  proposal = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): Promise<ProposalResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal: {
+        proposal_id: proposalId
+      }
+    });
+  };
+  listProposals = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): Promise<ListProposalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_proposals: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  reverseProposals = async ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }): Promise<ReverseProposalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      reverse_proposals: {
+        limit,
+        start_before: startBefore
+      }
+    });
+  };
+  proposalCount = async (): Promise<ProposalCountResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal_count: {}
+    });
+  };
+  vote = async ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }): Promise<VoteResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      vote: {
+        proposal_id: proposalId,
+        voter
+      }
+    });
+  };
+  listVotes = async ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }): Promise<ListVotesResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_votes: {
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      }
+    });
+  };
+  proposalHooks = async (): Promise<ProposalHooksResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal_hooks: {}
+    });
+  };
+  voteHooks = async (): Promise<VoteHooksResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      vote_hooks: {}
+    });
+  };
+  info = async (): Promise<InfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      info: {}
+    });
+  };
+}
+export interface CwSingleInterface {
+  contractAddress: string;
+  sender: string;
+  propose: ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  vote: ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  execute: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  close: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateConfig: ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  addProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  removeProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  addVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  removeVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CwSingleClient implements CwSingleInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.propose = this.propose.bind(this);
+    this.vote = this.vote.bind(this);
+    this.execute = this.execute.bind(this);
+    this.close = this.close.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+    this.addProposalHook = this.addProposalHook.bind(this);
+    this.removeProposalHook = this.removeProposalHook.bind(this);
+    this.addVoteHook = this.addVoteHook.bind(this);
+    this.removeVoteHook = this.removeVoteHook.bind(this);
+  }
+
+  propose = async ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      propose: {
+        description,
+        msgs,
+        title
+      }
+    }, fee, memo, funds);
+  };
+  vote = async ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      vote: {
+        proposal_id: proposalId,
+        vote
+      }
+    }, fee, memo, funds);
+  };
+  execute = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      execute: {
+        proposal_id: proposalId
+      }
+    }, fee, memo, funds);
+  };
+  close = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      close: {
+        proposal_id: proposalId
+      }
+    }, fee, memo, funds);
+  };
+  updateConfig = async ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        allow_revoting: allowRevoting,
+        dao,
+        deposit_info: depositInfo,
+        max_voting_period: maxVotingPeriod,
+        min_voting_period: minVotingPeriod,
+        only_members_execute: onlyMembersExecute,
+        threshold
+      }
+    }, fee, memo, funds);
+  };
+  addProposalHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      add_proposal_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+  removeProposalHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      remove_proposal_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+  addVoteHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      add_vote_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+  removeVoteHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      remove_vote_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
new file mode 100644
index 00000000..0a8436fc
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -0,0 +1,294 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+export interface CwSingleMessage {
+  contractAddress: string;
+  sender: string;
+  propose: ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  vote: ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  execute: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  close: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateConfig: ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  addProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  removeProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  addVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  removeVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CwSingleMessageComposer implements CwSingleMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.propose = this.propose.bind(this);
+    this.vote = this.vote.bind(this);
+    this.execute = this.execute.bind(this);
+    this.close = this.close.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+    this.addProposalHook = this.addProposalHook.bind(this);
+    this.removeProposalHook = this.removeProposalHook.bind(this);
+    this.addVoteHook = this.addVoteHook.bind(this);
+    this.removeVoteHook = this.removeVoteHook.bind(this);
+  }
+
+  propose = ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          propose: {
+            description,
+            msgs,
+            title
+          }
+        })),
+        funds
+      })
+    };
+  };
+  vote = ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          vote: {
+            proposal_id: proposalId,
+            vote
+          }
+        })),
+        funds
+      })
+    };
+  };
+  execute = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          execute: {
+            proposal_id: proposalId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  close = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          close: {
+            proposal_id: proposalId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateConfig = ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_config: {
+            allow_revoting: allowRevoting,
+            dao,
+            deposit_info: depositInfo,
+            max_voting_period: maxVotingPeriod,
+            min_voting_period: minVotingPeriod,
+            only_members_execute: onlyMembersExecute,
+            threshold
+          }
+        })),
+        funds
+      })
+    };
+  };
+  addProposalHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          add_proposal_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+  removeProposalHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          remove_proposal_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+  addVoteHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          add_vote_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+  removeVoteHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          remove_vote_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.react-query.ts b/__output__/builder/no-extends/CwSingle.react-query.ts
new file mode 100644
index 00000000..874561b4
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.react-query.ts
@@ -0,0 +1,128 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CwSingleQueryClient } from "./CwSingle.client";
+export interface CwSingleReactQuery<TResponse, TData = TResponse> {
+  client: CwSingleQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
+export function useCwSingleInfoQuery<TData = InfoResponse>({
+  client,
+  options
+}: CwSingleInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
+}
+export interface CwSingleVoteHooksQuery<TData> extends CwSingleReactQuery<VoteHooksResponse, TData> {}
+export function useCwSingleVoteHooksQuery<TData = VoteHooksResponse>({
+  client,
+  options
+}: CwSingleVoteHooksQuery<TData>) {
+  return useQuery<VoteHooksResponse, Error, TData>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
+}
+export interface CwSingleProposalHooksQuery<TData> extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
+export function useCwSingleProposalHooksQuery<TData = ProposalHooksResponse>({
+  client,
+  options
+}: CwSingleProposalHooksQuery<TData>) {
+  return useQuery<ProposalHooksResponse, Error, TData>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
+}
+export interface CwSingleListVotesQuery<TData> extends CwSingleReactQuery<ListVotesResponse, TData> {
+  args: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  };
+}
+export function useCwSingleListVotesQuery<TData = ListVotesResponse>({
+  client,
+  args,
+  options
+}: CwSingleListVotesQuery<TData>) {
+  return useQuery<ListVotesResponse, Error, TData>(["cwSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
+    limit: args.limit,
+    proposalId: args.proposalId,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface CwSingleVoteQuery<TData> extends CwSingleReactQuery<VoteResponse, TData> {
+  args: {
+    proposalId: number;
+    voter: string;
+  };
+}
+export function useCwSingleVoteQuery<TData = VoteResponse>({
+  client,
+  args,
+  options
+}: CwSingleVoteQuery<TData>) {
+  return useQuery<VoteResponse, Error, TData>(["cwSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
+    proposalId: args.proposalId,
+    voter: args.voter
+  }), options);
+}
+export interface CwSingleProposalCountQuery<TData> extends CwSingleReactQuery<ProposalCountResponse, TData> {}
+export function useCwSingleProposalCountQuery<TData = ProposalCountResponse>({
+  client,
+  options
+}: CwSingleProposalCountQuery<TData>) {
+  return useQuery<ProposalCountResponse, Error, TData>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
+}
+export interface CwSingleReverseProposalsQuery<TData> extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
+  args: {
+    limit?: number;
+    startBefore?: number;
+  };
+}
+export function useCwSingleReverseProposalsQuery<TData = ReverseProposalsResponse>({
+  client,
+  args,
+  options
+}: CwSingleReverseProposalsQuery<TData>) {
+  return useQuery<ReverseProposalsResponse, Error, TData>(["cwSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
+    limit: args.limit,
+    startBefore: args.startBefore
+  }), options);
+}
+export interface CwSingleListProposalsQuery<TData> extends CwSingleReactQuery<ListProposalsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: number;
+  };
+}
+export function useCwSingleListProposalsQuery<TData = ListProposalsResponse>({
+  client,
+  args,
+  options
+}: CwSingleListProposalsQuery<TData>) {
+  return useQuery<ListProposalsResponse, Error, TData>(["cwSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface CwSingleProposalQuery<TData> extends CwSingleReactQuery<ProposalResponse, TData> {
+  args: {
+    proposalId: number;
+  };
+}
+export function useCwSingleProposalQuery<TData = ProposalResponse>({
+  client,
+  args,
+  options
+}: CwSingleProposalQuery<TData>) {
+  return useQuery<ProposalResponse, Error, TData>(["cwSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
+    proposalId: args.proposalId
+  }), options);
+}
+export interface CwSingleConfigQuery<TData> extends CwSingleReactQuery<ConfigResponse, TData> {}
+export function useCwSingleConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: CwSingleConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwSingleConfig", client.contractAddress], () => client.config(), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.recoil.ts b/__output__/builder/no-extends/CwSingle.recoil.ts
new file mode 100644
index 00000000..79b2c1ba
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.recoil.ts
@@ -0,0 +1,164 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CwSingleQueryClient } from "./CwSingle.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CwSingleQueryClient, QueryClientParams>({
+  key: "cwSingleQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CwSingleQueryClient(client, contractAddress);
+  }
+});
+export const configSelector = selectorFamily<ConfigResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["config"]>;
+}>({
+  key: "cwSingleConfig",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.config(...params);
+  }
+});
+export const proposalSelector = selectorFamily<ProposalResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["proposal"]>;
+}>({
+  key: "cwSingleProposal",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposal(...params);
+  }
+});
+export const listProposalsSelector = selectorFamily<ListProposalsResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["listProposals"]>;
+}>({
+  key: "cwSingleListProposals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listProposals(...params);
+  }
+});
+export const reverseProposalsSelector = selectorFamily<ReverseProposalsResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["reverseProposals"]>;
+}>({
+  key: "cwSingleReverseProposals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.reverseProposals(...params);
+  }
+});
+export const proposalCountSelector = selectorFamily<ProposalCountResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["proposalCount"]>;
+}>({
+  key: "cwSingleProposalCount",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposalCount(...params);
+  }
+});
+export const voteSelector = selectorFamily<VoteResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["vote"]>;
+}>({
+  key: "cwSingleVote",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.vote(...params);
+  }
+});
+export const listVotesSelector = selectorFamily<ListVotesResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["listVotes"]>;
+}>({
+  key: "cwSingleListVotes",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listVotes(...params);
+  }
+});
+export const proposalHooksSelector = selectorFamily<ProposalHooksResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["proposalHooks"]>;
+}>({
+  key: "cwSingleProposalHooks",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposalHooks(...params);
+  }
+});
+export const voteHooksSelector = selectorFamily<VoteHooksResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["voteHooks"]>;
+}>({
+  key: "cwSingleVoteHooks",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.voteHooks(...params);
+  }
+});
+export const infoSelector = selectorFamily<InfoResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["info"]>;
+}>({
+  key: "cwSingleInfo",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.info(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.types.ts b/__output__/builder/no-extends/CwSingle.types.ts
new file mode 100644
index 00000000..01398dab
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.types.ts
@@ -0,0 +1,416 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Addr = string;
+export type Uint128 = string;
+export type Duration = {
+  height: number;
+} | {
+  time: number;
+};
+export type Threshold = {
+  absolute_percentage: {
+    percentage: PercentageThreshold;
+    [k: string]: unknown;
+  };
+} | {
+  threshold_quorum: {
+    quorum: PercentageThreshold;
+    threshold: PercentageThreshold;
+    [k: string]: unknown;
+  };
+} | {
+  absolute_count: {
+    threshold: Uint128;
+    [k: string]: unknown;
+  };
+};
+export type PercentageThreshold = {
+  majority: {
+    [k: string]: unknown;
+  };
+} | {
+  percent: Decimal;
+};
+export type Decimal = string;
+export interface ConfigResponse {
+  allow_revoting: boolean;
+  dao: Addr;
+  deposit_info?: CheckedDepositInfo | null;
+  max_voting_period: Duration;
+  min_voting_period?: Duration | null;
+  only_members_execute: boolean;
+  threshold: Threshold;
+  [k: string]: unknown;
+}
+export interface CheckedDepositInfo {
+  deposit: Uint128;
+  refund_failed_proposals: boolean;
+  token: Addr;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  propose: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+    [k: string]: unknown;
+  };
+} | {
+  vote: {
+    proposal_id: number;
+    vote: Vote;
+    [k: string]: unknown;
+  };
+} | {
+  execute: {
+    proposal_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  close: {
+    proposal_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_config: {
+    allow_revoting: boolean;
+    dao: string;
+    deposit_info?: DepositInfo | null;
+    max_voting_period: Duration;
+    min_voting_period?: Duration | null;
+    only_members_execute: boolean;
+    threshold: Threshold;
+    [k: string]: unknown;
+  };
+} | {
+  add_proposal_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  remove_proposal_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  add_vote_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  remove_vote_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+};
+export type CosmosMsgForEmpty = {
+  bank: BankMsg;
+} | {
+  custom: Empty;
+} | {
+  staking: StakingMsg;
+} | {
+  distribution: DistributionMsg;
+} | {
+  stargate: {
+    type_url: string;
+    value: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  ibc: IbcMsg;
+} | {
+  wasm: WasmMsg;
+} | {
+  gov: GovMsg;
+};
+export type BankMsg = {
+  send: {
+    amount: Coin[];
+    to_address: string;
+    [k: string]: unknown;
+  };
+} | {
+  burn: {
+    amount: Coin[];
+    [k: string]: unknown;
+  };
+};
+export type StakingMsg = {
+  delegate: {
+    amount: Coin;
+    validator: string;
+    [k: string]: unknown;
+  };
+} | {
+  undelegate: {
+    amount: Coin;
+    validator: string;
+    [k: string]: unknown;
+  };
+} | {
+  redelegate: {
+    amount: Coin;
+    dst_validator: string;
+    src_validator: string;
+    [k: string]: unknown;
+  };
+};
+export type DistributionMsg = {
+  set_withdraw_address: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  withdraw_delegator_reward: {
+    validator: string;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export type IbcMsg = {
+  transfer: {
+    amount: Coin;
+    channel_id: string;
+    timeout: IbcTimeout;
+    to_address: string;
+    [k: string]: unknown;
+  };
+} | {
+  send_packet: {
+    channel_id: string;
+    data: Binary;
+    timeout: IbcTimeout;
+    [k: string]: unknown;
+  };
+} | {
+  close_channel: {
+    channel_id: string;
+    [k: string]: unknown;
+  };
+};
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type WasmMsg = {
+  execute: {
+    contract_addr: string;
+    funds: Coin[];
+    msg: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  instantiate: {
+    admin?: string | null;
+    code_id: number;
+    funds: Coin[];
+    label: string;
+    msg: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  migrate: {
+    contract_addr: string;
+    msg: Binary;
+    new_code_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_admin: {
+    admin: string;
+    contract_addr: string;
+    [k: string]: unknown;
+  };
+} | {
+  clear_admin: {
+    contract_addr: string;
+    [k: string]: unknown;
+  };
+};
+export type GovMsg = {
+  vote: {
+    proposal_id: number;
+    vote: VoteOption;
+    [k: string]: unknown;
+  };
+};
+export type VoteOption = "yes" | "no" | "abstain" | "no_with_veto";
+export type Vote = "yes" | "no" | "abstain";
+export type DepositToken = {
+  token: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  voting_module_token: {
+    [k: string]: unknown;
+  };
+};
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export interface Empty {
+  [k: string]: unknown;
+}
+export interface IbcTimeout {
+  block?: IbcTimeoutBlock | null;
+  timestamp?: Timestamp | null;
+  [k: string]: unknown;
+}
+export interface IbcTimeoutBlock {
+  height: number;
+  revision: number;
+  [k: string]: unknown;
+}
+export interface DepositInfo {
+  deposit: Uint128;
+  refund_failed_proposals: boolean;
+  token: DepositToken;
+  [k: string]: unknown;
+}
+export type GovernanceModulesResponse = Addr[];
+export interface InfoResponse {
+  info: ContractVersion;
+  [k: string]: unknown;
+}
+export interface ContractVersion {
+  contract: string;
+  version: string;
+  [k: string]: unknown;
+}
+export interface InstantiateMsg {
+  allow_revoting: boolean;
+  deposit_info?: DepositInfo | null;
+  max_voting_period: Duration;
+  min_voting_period?: Duration | null;
+  only_members_execute: boolean;
+  threshold: Threshold;
+  [k: string]: unknown;
+}
+export type Expiration = {
+  at_height: number;
+} | {
+  at_time: Timestamp;
+} | {
+  never: {
+    [k: string]: unknown;
+  };
+};
+export type Status = "open" | "rejected" | "passed" | "executed" | "closed";
+export interface ListProposalsResponse {
+  proposals: ProposalResponse[];
+  [k: string]: unknown;
+}
+export interface ProposalResponse {
+  id: number;
+  proposal: Proposal;
+  [k: string]: unknown;
+}
+export interface Proposal {
+  allow_revoting: boolean;
+  deposit_info?: CheckedDepositInfo | null;
+  description: string;
+  expiration: Expiration;
+  min_voting_period?: Expiration | null;
+  msgs: CosmosMsgForEmpty[];
+  proposer: Addr;
+  start_height: number;
+  status: Status;
+  threshold: Threshold;
+  title: string;
+  total_power: Uint128;
+  votes: Votes;
+  [k: string]: unknown;
+}
+export interface Votes {
+  abstain: Uint128;
+  no: Uint128;
+  yes: Uint128;
+  [k: string]: unknown;
+}
+export interface ListVotesResponse {
+  votes: VoteInfo[];
+  [k: string]: unknown;
+}
+export interface VoteInfo {
+  power: Uint128;
+  vote: Vote;
+  voter: Addr;
+  [k: string]: unknown;
+}
+export interface MigrateMsg {
+  [k: string]: unknown;
+}
+export type ProposalCountResponse = number;
+export interface ProposalHooksResponse {
+  hooks: string[];
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  config: {
+    [k: string]: unknown;
+  };
+} | {
+  proposal: {
+    proposal_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  list_proposals: {
+    limit?: number | null;
+    start_after?: number | null;
+    [k: string]: unknown;
+  };
+} | {
+  reverse_proposals: {
+    limit?: number | null;
+    start_before?: number | null;
+    [k: string]: unknown;
+  };
+} | {
+  proposal_count: {
+    [k: string]: unknown;
+  };
+} | {
+  vote: {
+    proposal_id: number;
+    voter: string;
+    [k: string]: unknown;
+  };
+} | {
+  list_votes: {
+    limit?: number | null;
+    proposal_id: number;
+    start_after?: string | null;
+    [k: string]: unknown;
+  };
+} | {
+  proposal_hooks: {
+    [k: string]: unknown;
+  };
+} | {
+  vote_hooks: {
+    [k: string]: unknown;
+  };
+} | {
+  info: {
+    [k: string]: unknown;
+  };
+};
+export interface ReverseProposalsResponse {
+  proposals: ProposalResponse[];
+  [k: string]: unknown;
+}
+export interface VoteHooksResponse {
+  hooks: string[];
+  [k: string]: unknown;
+}
+export interface VoteResponse {
+  vote?: VoteInfo | null;
+  [k: string]: unknown;
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts
new file mode 100644
index 00000000..6e9897d6
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.client.ts
@@ -0,0 +1,259 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+export interface FactoryReadOnlyInterface {
+  contractAddress: string;
+  wallets: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  }) => Promise<WalletsResponse>;
+  walletsOf: ({
+    limit,
+    startAfter,
+    user
+  }: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  }) => Promise<WalletsOfResponse>;
+  codeId: ({
+    ty
+  }: {
+    ty: CodeIdType;
+  }) => Promise<CodeIdResponse>;
+  fee: () => Promise<FeeResponse>;
+  govecAddr: () => Promise<GovecAddrResponse>;
+  adminAddr: () => Promise<AdminAddrResponse>;
+}
+export class FactoryQueryClient implements FactoryReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.wallets = this.wallets.bind(this);
+    this.walletsOf = this.walletsOf.bind(this);
+    this.codeId = this.codeId.bind(this);
+    this.fee = this.fee.bind(this);
+    this.govecAddr = this.govecAddr.bind(this);
+    this.adminAddr = this.adminAddr.bind(this);
+  }
+
+  wallets = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  }): Promise<WalletsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wallets: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  walletsOf = async ({
+    limit,
+    startAfter,
+    user
+  }: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  }): Promise<WalletsOfResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wallets_of: {
+        limit,
+        start_after: startAfter,
+        user
+      }
+    });
+  };
+  codeId = async ({
+    ty
+  }: {
+    ty: CodeIdType;
+  }): Promise<CodeIdResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      code_id: {
+        ty
+      }
+    });
+  };
+  fee = async (): Promise<FeeResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      fee: {}
+    });
+  };
+  govecAddr = async (): Promise<GovecAddrResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      govec_addr: {}
+    });
+  };
+  adminAddr = async (): Promise<AdminAddrResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      admin_addr: {}
+    });
+  };
+}
+export interface FactoryInterface {
+  contractAddress: string;
+  sender: string;
+  createWallet: ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateProxyUser: ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  migrateWallet: ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateCodeId: ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateWalletFee: ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateGovecAddr: ({
+    addr
+  }: {
+    addr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateAdmin: ({
+    addr
+  }: {
+    addr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class FactoryClient implements FactoryInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.createWallet = this.createWallet.bind(this);
+    this.updateProxyUser = this.updateProxyUser.bind(this);
+    this.migrateWallet = this.migrateWallet.bind(this);
+    this.updateCodeId = this.updateCodeId.bind(this);
+    this.updateWalletFee = this.updateWalletFee.bind(this);
+    this.updateGovecAddr = this.updateGovecAddr.bind(this);
+    this.updateAdmin = this.updateAdmin.bind(this);
+  }
+
+  createWallet = async ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      create_wallet: {
+        create_wallet_msg: createWalletMsg
+      }
+    }, fee, memo, funds);
+  };
+  updateProxyUser = async ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_proxy_user: {
+        new_user: newUser,
+        old_user: oldUser
+      }
+    }, fee, memo, funds);
+  };
+  migrateWallet = async ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      migrate_wallet: {
+        migration_msg: migrationMsg,
+        wallet_address: walletAddress
+      }
+    }, fee, memo, funds);
+  };
+  updateCodeId = async ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_code_id: {
+        new_code_id: newCodeId,
+        ty
+      }
+    }, fee, memo, funds);
+  };
+  updateWalletFee = async ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_wallet_fee: {
+        new_fee: newFee
+      }
+    }, fee, memo, funds);
+  };
+  updateGovecAddr = async ({
+    addr
+  }: {
+    addr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_govec_addr: {
+        addr
+      }
+    }, fee, memo, funds);
+  };
+  updateAdmin = async ({
+    addr
+  }: {
+    addr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_admin: {
+        addr
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
new file mode 100644
index 00000000..21e5a2d1
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -0,0 +1,214 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+export interface FactoryMessage {
+  contractAddress: string;
+  sender: string;
+  createWallet: ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateProxyUser: ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  migrateWallet: ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateCodeId: ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateWalletFee: ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateGovecAddr: ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateAdmin: ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class FactoryMessageComposer implements FactoryMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.createWallet = this.createWallet.bind(this);
+    this.updateProxyUser = this.updateProxyUser.bind(this);
+    this.migrateWallet = this.migrateWallet.bind(this);
+    this.updateCodeId = this.updateCodeId.bind(this);
+    this.updateWalletFee = this.updateWalletFee.bind(this);
+    this.updateGovecAddr = this.updateGovecAddr.bind(this);
+    this.updateAdmin = this.updateAdmin.bind(this);
+  }
+
+  createWallet = ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          create_wallet: {
+            create_wallet_msg: createWalletMsg
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateProxyUser = ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_proxy_user: {
+            new_user: newUser,
+            old_user: oldUser
+          }
+        })),
+        funds
+      })
+    };
+  };
+  migrateWallet = ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          migrate_wallet: {
+            migration_msg: migrationMsg,
+            wallet_address: walletAddress
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateCodeId = ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_code_id: {
+            new_code_id: newCodeId,
+            ty
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateWalletFee = ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_wallet_fee: {
+            new_fee: newFee
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateGovecAddr = ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_govec_addr: {
+            addr
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateAdmin = ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_admin: {
+            addr
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.react-query.ts b/__output__/builder/no-extends/Factory.react-query.ts
new file mode 100644
index 00000000..2d40ad5e
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.react-query.ts
@@ -0,0 +1,82 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
+  client: FactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
+  client,
+  options
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
+  client,
+  options
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
+  client,
+  options
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
+  args: {
+    ty: CodeIdType;
+  };
+}
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
+  client,
+  args,
+  options
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+    ty: args.ty
+  }), options);
+}
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  };
+}
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+    limit: args.limit,
+    startAfter: args.startAfter,
+    user: args.user
+  }), options);
+}
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  };
+}
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.recoil.ts b/__output__/builder/no-extends/Factory.recoil.ts
new file mode 100644
index 00000000..3e17ff15
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.recoil.ts
@@ -0,0 +1,108 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<FactoryQueryClient, QueryClientParams>({
+  key: "factoryQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new FactoryQueryClient(client, contractAddress);
+  }
+});
+export const walletsSelector = selectorFamily<WalletsResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["wallets"]>;
+}>({
+  key: "factoryWallets",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.wallets(...params);
+  }
+});
+export const walletsOfSelector = selectorFamily<WalletsOfResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["walletsOf"]>;
+}>({
+  key: "factoryWalletsOf",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.walletsOf(...params);
+  }
+});
+export const codeIdSelector = selectorFamily<CodeIdResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["codeId"]>;
+}>({
+  key: "factoryCodeId",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.codeId(...params);
+  }
+});
+export const feeSelector = selectorFamily<FeeResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["fee"]>;
+}>({
+  key: "factoryFee",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.fee(...params);
+  }
+});
+export const govecAddrSelector = selectorFamily<GovecAddrResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["govecAddr"]>;
+}>({
+  key: "factoryGovecAddr",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.govecAddr(...params);
+  }
+});
+export const adminAddrSelector = selectorFamily<AdminAddrResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["adminAddr"]>;
+}>({
+  key: "factoryAdminAddr",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.adminAddr(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.types.ts b/__output__/builder/no-extends/Factory.types.ts
new file mode 100644
index 00000000..ddea5192
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.types.ts
@@ -0,0 +1,183 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type AdminAddrResponse = string;
+export type CodeIdResponse = number;
+export type CodeIdType = "Proxy" | "Multisig";
+export type Uint128 = string;
+export type Binary = string;
+export interface CreateWalletMsg {
+  guardians: Guardians;
+  label: string;
+  proxy_initial_funds: Coin[];
+  relayers: string[];
+  user_pubkey: Binary;
+  [k: string]: unknown;
+}
+export interface Guardians {
+  addresses: string[];
+  guardians_multisig?: MultiSig | null;
+  [k: string]: unknown;
+}
+export interface MultiSig {
+  multisig_initial_funds: Coin[];
+  threshold_absolute_count: number;
+  [k: string]: unknown;
+}
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export interface Cw20Coin {
+  address: string;
+  amount: Uint128;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  create_wallet: {
+    create_wallet_msg: CreateWalletMsg;
+    [k: string]: unknown;
+  };
+} | {
+  update_proxy_user: {
+    new_user: Addr;
+    old_user: Addr;
+    [k: string]: unknown;
+  };
+} | {
+  migrate_wallet: {
+    migration_msg: ProxyMigrationTxMsg;
+    wallet_address: WalletAddr;
+    [k: string]: unknown;
+  };
+} | {
+  update_code_id: {
+    new_code_id: number;
+    ty: CodeIdType;
+    [k: string]: unknown;
+  };
+} | {
+  update_wallet_fee: {
+    new_fee: Coin;
+    [k: string]: unknown;
+  };
+} | {
+  update_govec_addr: {
+    addr: string;
+    [k: string]: unknown;
+  };
+} | {
+  update_admin: {
+    addr: string;
+    [k: string]: unknown;
+  };
+};
+export type Addr = string;
+export type ProxyMigrationTxMsg = {
+  RelayTx: RelayTransaction;
+} | {
+  DirectMigrationMsg: Binary;
+};
+export type WalletAddr = {
+  Canonical: CanonicalAddr;
+} | {
+  Addr: Addr;
+};
+export type CanonicalAddr = string;
+export interface RelayTransaction {
+  message: Binary;
+  nonce: number;
+  signature: Binary;
+  user_pubkey: Binary;
+  [k: string]: unknown;
+}
+export interface FeeResponse {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export type GovecAddrResponse = string;
+export interface InstantiateMsg {
+  addr_prefix: string;
+  govec?: string | null;
+  proxy_code_id: number;
+  proxy_multisig_code_id: number;
+  wallet_fee: Coin;
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  wallets: {
+    limit?: number | null;
+    start_after?: WalletQueryPrefix | null;
+    [k: string]: unknown;
+  };
+} | {
+  wallets_of: {
+    limit?: number | null;
+    start_after?: string | null;
+    user: string;
+    [k: string]: unknown;
+  };
+} | {
+  code_id: {
+    ty: CodeIdType;
+    [k: string]: unknown;
+  };
+} | {
+  fee: {
+    [k: string]: unknown;
+  };
+} | {
+  govec_addr: {
+    [k: string]: unknown;
+  };
+} | {
+  admin_addr: {
+    [k: string]: unknown;
+  };
+};
+export interface WalletQueryPrefix {
+  user_addr: string;
+  wallet_addr: string;
+  [k: string]: unknown;
+}
+export type Duration = {
+  height: number;
+} | {
+  time: number;
+};
+export interface StakingOptions {
+  code_id: number;
+  duration?: Duration | null;
+  [k: string]: unknown;
+}
+export interface WalletInfo {
+  code_id: number;
+  guardians: Addr[];
+  is_frozen: boolean;
+  label: string;
+  multisig_address?: Addr | null;
+  multisig_code_id: number;
+  nonce: number;
+  relayers: Addr[];
+  user_addr: Addr;
+  version: ContractVersion;
+  [k: string]: unknown;
+}
+export interface ContractVersion {
+  contract: string;
+  version: string;
+  [k: string]: unknown;
+}
+export interface WalletsOfResponse {
+  wallets: Addr[];
+  [k: string]: unknown;
+}
+export interface WalletsResponse {
+  wallets: Addr[];
+  [k: string]: unknown;
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
new file mode 100644
index 00000000..deffa10a
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -0,0 +1,177 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+export interface MinterReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+  mintableNumTokens: () => Promise<MintableNumTokensResponse>;
+  startTime: () => Promise<StartTimeResponse>;
+  mintPrice: () => Promise<MintPriceResponse>;
+  mintCount: ({
+    address
+  }: {
+    address: string;
+  }) => Promise<MintCountResponse>;
+}
+export class MinterQueryClient implements MinterReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+    this.mintableNumTokens = this.mintableNumTokens.bind(this);
+    this.startTime = this.startTime.bind(this);
+    this.mintPrice = this.mintPrice.bind(this);
+    this.mintCount = this.mintCount.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+  mintableNumTokens = async (): Promise<MintableNumTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mintable_num_tokens: {}
+    });
+  };
+  startTime = async (): Promise<StartTimeResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      start_time: {}
+    });
+  };
+  mintPrice = async (): Promise<MintPriceResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mint_price: {}
+    });
+  };
+  mintCount = async ({
+    address
+  }: {
+    address: string;
+  }): Promise<MintCountResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mint_count: {
+        address
+      }
+    });
+  };
+}
+export interface MinterInterface {
+  contractAddress: string;
+  sender: string;
+  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  setWhitelist: ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updatePerAddressLimit: ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mintTo: ({
+    recipient
+  }: {
+    recipient: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mintFor: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class MinterClient implements MinterInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.mint = this.mint.bind(this);
+    this.setWhitelist = this.setWhitelist.bind(this);
+    this.updateStartTime = this.updateStartTime.bind(this);
+    this.updatePerAddressLimit = this.updatePerAddressLimit.bind(this);
+    this.mintTo = this.mintTo.bind(this);
+    this.mintFor = this.mintFor.bind(this);
+    this.withdraw = this.withdraw.bind(this);
+  }
+
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {}
+    }, fee, memo, funds);
+  };
+  setWhitelist = async ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_whitelist: {
+        whitelist
+      }
+    }, fee, memo, funds);
+  };
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_start_time: {}
+    }, fee, memo, funds);
+  };
+  updatePerAddressLimit = async ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_per_address_limit: {
+        per_address_limit: perAddressLimit
+      }
+    }, fee, memo, funds);
+  };
+  mintTo = async ({
+    recipient
+  }: {
+    recipient: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint_to: {
+        recipient
+      }
+    }, fee, memo, funds);
+  };
+  mintFor = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint_for: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      withdraw: {}
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
new file mode 100644
index 00000000..30a74b8b
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -0,0 +1,174 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+export interface MinterMessage {
+  contractAddress: string;
+  sender: string;
+  mint: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  setWhitelist: ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updatePerAddressLimit: ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mintTo: ({
+    recipient
+  }: {
+    recipient: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mintFor: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class MinterMessageComposer implements MinterMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.mint = this.mint.bind(this);
+    this.setWhitelist = this.setWhitelist.bind(this);
+    this.updateStartTime = this.updateStartTime.bind(this);
+    this.updatePerAddressLimit = this.updatePerAddressLimit.bind(this);
+    this.mintTo = this.mintTo.bind(this);
+    this.mintFor = this.mintFor.bind(this);
+    this.withdraw = this.withdraw.bind(this);
+  }
+
+  mint = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint: {}
+        })),
+        funds
+      })
+    };
+  };
+  setWhitelist = ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          set_whitelist: {
+            whitelist
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateStartTime = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_start_time: {}
+        })),
+        funds
+      })
+    };
+  };
+  updatePerAddressLimit = ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_per_address_limit: {
+            per_address_limit: perAddressLimit
+          }
+        })),
+        funds
+      })
+    };
+  };
+  mintTo = ({
+    recipient
+  }: {
+    recipient: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint_to: {
+            recipient
+          }
+        })),
+        funds
+      })
+    };
+  };
+  mintFor = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint_for: {
+            recipient,
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  withdraw = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          withdraw: {}
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.react-query.ts b/__output__/builder/no-extends/Minter.react-query.ts
new file mode 100644
index 00000000..007bcfd9
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.react-query.ts
@@ -0,0 +1,55 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { MinterQueryClient } from "./Minter.client";
+export interface MinterReactQuery<TResponse, TData = TResponse> {
+  client: MinterQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
+  args: {
+    address: string;
+  };
+}
+export function useMinterMintCountQuery<TData = MintCountResponse>({
+  client,
+  args,
+  options
+}: MinterMintCountQuery<TData>) {
+  return useQuery<MintCountResponse, Error, TData>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
+    address: args.address
+  }), options);
+}
+export interface MinterMintPriceQuery<TData> extends MinterReactQuery<MintPriceResponse, TData> {}
+export function useMinterMintPriceQuery<TData = MintPriceResponse>({
+  client,
+  options
+}: MinterMintPriceQuery<TData>) {
+  return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
+}
+export interface MinterStartTimeQuery<TData> extends MinterReactQuery<StartTimeResponse, TData> {}
+export function useMinterStartTimeQuery<TData = StartTimeResponse>({
+  client,
+  options
+}: MinterStartTimeQuery<TData>) {
+  return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
+}
+export interface MinterMintableNumTokensQuery<TData> extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
+  client,
+  options
+}: MinterMintableNumTokensQuery<TData>) {
+  return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
+}
+export interface MinterConfigQuery<TData> extends MinterReactQuery<ConfigResponse, TData> {}
+export function useMinterConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: MinterConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["minterConfig", client.contractAddress], () => client.config(), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.recoil.ts b/__output__/builder/no-extends/Minter.recoil.ts
new file mode 100644
index 00000000..826fb57c
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.recoil.ts
@@ -0,0 +1,94 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { MinterQueryClient } from "./Minter.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<MinterQueryClient, QueryClientParams>({
+  key: "minterQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new MinterQueryClient(client, contractAddress);
+  }
+});
+export const configSelector = selectorFamily<ConfigResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["config"]>;
+}>({
+  key: "minterConfig",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.config(...params);
+  }
+});
+export const mintableNumTokensSelector = selectorFamily<MintableNumTokensResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["mintableNumTokens"]>;
+}>({
+  key: "minterMintableNumTokens",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mintableNumTokens(...params);
+  }
+});
+export const startTimeSelector = selectorFamily<StartTimeResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["startTime"]>;
+}>({
+  key: "minterStartTime",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.startTime(...params);
+  }
+});
+export const mintPriceSelector = selectorFamily<MintPriceResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["mintPrice"]>;
+}>({
+  key: "minterMintPrice",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mintPrice(...params);
+  }
+});
+export const mintCountSelector = selectorFamily<MintCountResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["mintCount"]>;
+}>({
+  key: "minterMintCount",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mintCount(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.types.ts b/__output__/builder/no-extends/Minter.types.ts
new file mode 100644
index 00000000..55999b8d
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.types.ts
@@ -0,0 +1,124 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type Uint128 = string;
+export interface ConfigResponse {
+  admin: string;
+  base_token_uri: string;
+  num_tokens: number;
+  per_address_limit: number;
+  sg721_address: string;
+  sg721_code_id: number;
+  start_time: Timestamp;
+  unit_price: Coin;
+  whitelist?: string | null;
+  [k: string]: unknown;
+}
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export type Addr = string;
+export interface Config {
+  admin: Addr;
+  base_token_uri: string;
+  num_tokens: number;
+  per_address_limit: number;
+  sg721_code_id: number;
+  start_time: Timestamp;
+  unit_price: Coin;
+  whitelist?: Addr | null;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  mint: {
+    [k: string]: unknown;
+  };
+} | {
+  set_whitelist: {
+    whitelist: string;
+    [k: string]: unknown;
+  };
+} | {
+  update_start_time: Timestamp;
+} | {
+  update_per_address_limit: {
+    per_address_limit: number;
+    [k: string]: unknown;
+  };
+} | {
+  mint_to: {
+    recipient: string;
+    [k: string]: unknown;
+  };
+} | {
+  mint_for: {
+    recipient: string;
+    token_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  withdraw: {
+    [k: string]: unknown;
+  };
+};
+export type Decimal = string;
+export interface InstantiateMsg {
+  base_token_uri: string;
+  num_tokens: number;
+  per_address_limit: number;
+  sg721_code_id: number;
+  sg721_instantiate_msg: InstantiateMsg1;
+  start_time: Timestamp;
+  unit_price: Coin;
+  whitelist?: string | null;
+  [k: string]: unknown;
+}
+export interface InstantiateMsg1 {
+  collection_info: CollectionInfoForRoyaltyInfoResponse;
+  minter: string;
+  name: string;
+  symbol: string;
+  [k: string]: unknown;
+}
+export interface CollectionInfoForRoyaltyInfoResponse {
+  creator: string;
+  description: string;
+  external_link?: string | null;
+  image: string;
+  royalty_info?: RoyaltyInfoResponse | null;
+  [k: string]: unknown;
+}
+export interface RoyaltyInfoResponse {
+  payment_address: string;
+  share: Decimal;
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  config: {
+    [k: string]: unknown;
+  };
+} | {
+  mintable_num_tokens: {
+    [k: string]: unknown;
+  };
+} | {
+  start_time: {
+    [k: string]: unknown;
+  };
+} | {
+  mint_price: {
+    [k: string]: unknown;
+  };
+} | {
+  mint_count: {
+    address: string;
+    [k: string]: unknown;
+  };
+};
\ No newline at end of file
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
new file mode 100644
index 00000000..baf3d150
--- /dev/null
+++ b/__output__/builder/no-extends/index.ts
@@ -0,0 +1,65 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import * as _40 from "./Factory.types";
+import * as _41 from "./Factory.client";
+import * as _42 from "./Factory.message-composer";
+import * as _43 from "./Factory.react-query";
+import * as _44 from "./Factory.recoil";
+import * as _45 from "./Minter.types";
+import * as _46 from "./Minter.client";
+import * as _47 from "./Minter.message-composer";
+import * as _48 from "./Minter.react-query";
+import * as _49 from "./Minter.recoil";
+import * as _50 from "./CwAdminFactory.types";
+import * as _51 from "./CwAdminFactory.client";
+import * as _52 from "./CwAdminFactory.message-composer";
+import * as _53 from "./CwAdminFactory.react-query";
+import * as _54 from "./CwAdminFactory.recoil";
+import * as _55 from "./CwCodeIdRegistry.types";
+import * as _56 from "./CwCodeIdRegistry.client";
+import * as _57 from "./CwCodeIdRegistry.message-composer";
+import * as _58 from "./CwCodeIdRegistry.react-query";
+import * as _59 from "./CwCodeIdRegistry.recoil";
+import * as _60 from "./CwSingle.types";
+import * as _61 from "./CwSingle.client";
+import * as _62 from "./CwSingle.message-composer";
+import * as _63 from "./CwSingle.react-query";
+import * as _64 from "./CwSingle.recoil";
+export namespace smart {
+  export namespace contracts {
+    export const Factory = { ..._40,
+      ..._41,
+      ..._42,
+      ..._43,
+      ..._44
+    };
+    export const Minter = { ..._45,
+      ..._46,
+      ..._47,
+      ..._48,
+      ..._49
+    };
+    export const CwAdminFactory = { ..._50,
+      ..._51,
+      ..._52,
+      ..._53,
+      ..._54
+    };
+    export const CwCodeIdRegistry = { ..._55,
+      ..._56,
+      ..._57,
+      ..._58,
+      ..._59
+    };
+    export const CwSingle = { ..._60,
+      ..._61,
+      ..._62,
+      ..._63,
+      ..._64
+    };
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index f21e06f9..707d8556 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
   "private": true,
   "scripts": {
     "build": "lerna run prepare --parallel",
+    "buidl": "lerna run buidl --parallel",
     "bootstrap": "lerna bootstrap --use-workspaces",
     "lint": "lerna run lint",
     "format": "lerna run format",
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 463da362..fb2cd3fa 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -11,6 +11,7 @@ TSBuilder {
     },
     "client": Object {
       "enabled": true,
+      "execExtendsQuery": true,
     },
     "messageComposer": Object {
       "enabled": false,
@@ -45,6 +46,7 @@ TSBuilder {
     },
     "client": Object {
       "enabled": true,
+      "execExtendsQuery": true,
     },
     "messageComposer": Object {
       "enabled": false,
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 72895b46..c06b8135 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -98,8 +98,49 @@ it('builder default', async () => {
                 enabled: true
             },
             client: {
+                enabled: true,
+                execExtendsQuery: true
+            },
+            reactQuery: {
+                enabled: true
+            },
+            recoil: {
                 enabled: true
             },
+            messageComposer: {
+                enabled: true
+            }
+        }
+    });
+});
+
+it('builder no extends', async () => {
+    const outPath = OUTPUT_DIR + '/no-extends/';
+    const s = (str) => FIXTURE_DIR + str;
+    await codegen({
+        contracts: [
+            s('/vectis/factory'),
+            s('/minter'),
+            s('/daodao/cw-admin-factory'),
+            s('/daodao/cw-code-id-registry'),
+            {
+                name: 'CwSingle',
+                dir: s('/daodao/cw-proposal-single')
+            }
+        ],
+        outPath,
+        options: {
+            bundle: {
+                bundleFile: 'index.ts',
+                scope: 'smart.contracts'
+            },
+            types: {
+                enabled: true
+            },
+            client: {
+                enabled: true,
+                execExtendsQuery: false
+            },
             reactQuery: {
                 enabled: true
             },
diff --git a/packages/ts-codegen/src/generators/client.ts b/packages/ts-codegen/src/generators/client.ts
index 2ee571dd..2b838e41 100644
--- a/packages/ts-codegen/src/generators/client.ts
+++ b/packages/ts-codegen/src/generators/client.ts
@@ -66,16 +66,17 @@ export default async (
         w.createExecuteInterface(
           context,
           Instance,
-          ReadOnlyInstance,
+          context.options.client.execExtendsQuery ? ReadOnlyInstance : null,
           ExecuteMsg
         )
       );
+
       body.push(
         w.createExecuteClass(
           context,
           Client,
           Instance,
-          QueryClient,
+          context.options.client.execExtendsQuery ? QueryClient : null,
           ExecuteMsg
         )
       );
diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/wasm-ast-types/src/client/client.ts
index ca01115c..06265b33 100644
--- a/packages/wasm-ast-types/src/client/client.ts
+++ b/packages/wasm-ast-types/src/client/client.ts
@@ -346,7 +346,7 @@ export const createExecuteClass = (
   context: RenderContext,
   className: string,
   implementsClassName: string,
-  extendsClassName: string,
+  extendsClassName: string | null,
   execMsg: ExecuteMsg
 ) => {
 
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 23ec6b25..48bb0f00 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -14,6 +14,7 @@ export interface ReactQueryOptions {
 
 export interface TSClientOptions {
     enabled?: boolean;
+    execExtendsQuery?: boolean;
 }
 export interface MessageComposerOptions {
     enabled?: boolean;
@@ -67,7 +68,8 @@ export const defaultOptions: RenderOptions = {
         aliasExecuteMsg: false
     },
     client: {
-        enabled: true
+        enabled: true,
+        execExtendsQuery: true
     },
     recoil: {
         enabled: false
diff --git a/packages/wasm-ast-types/types/client/client.d.ts b/packages/wasm-ast-types/types/client/client.d.ts
index 4c7ad20e..77f57150 100644
--- a/packages/wasm-ast-types/types/client/client.d.ts
+++ b/packages/wasm-ast-types/types/client/client.d.ts
@@ -8,7 +8,7 @@ export declare const createWasmQueryMethod: (context: RenderContext, jsonschema:
 export declare const createQueryClass: (context: RenderContext, className: string, implementsClassName: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration;
 export declare const getWasmMethodArgs: (context: RenderContext, jsonschema: JSONSchema) => t.ObjectProperty[];
 export declare const createWasmExecMethod: (context: RenderContext, jsonschema: JSONSchema) => t.ClassProperty;
-export declare const createExecuteClass: (context: RenderContext, className: string, implementsClassName: string, extendsClassName: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
+export declare const createExecuteClass: (context: RenderContext, className: string, implementsClassName: string, extendsClassName: string | null, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
 export declare const createExecuteInterface: (context: RenderContext, className: string, extendsClassName: string | null, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
 export declare const createPropertyFunctionWithObjectParams: (context: RenderContext, methodName: string, responseType: string, jsonschema: JSONSchema) => t.TSPropertySignature;
 export declare const createPropertyFunctionWithObjectParamsForExec: (context: RenderContext, methodName: string, responseType: string, jsonschema: JSONSchema) => t.TSPropertySignature;
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 7464030c..28fe022d 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -9,6 +9,7 @@ export interface ReactQueryOptions {
 }
 export interface TSClientOptions {
     enabled?: boolean;
+    execExtendsQuery?: boolean;
 }
 export interface MessageComposerOptions {
     enabled?: boolean;

From 10e4cbebd8a57a025ac1a466324bc1e914563ab6 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 18:51:05 -0700
Subject: [PATCH 059/287] readme

---
 README.md                     | 1 +
 packages/ts-codegen/README.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b5f4dbea..1046ae9b 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,7 @@ The `client` plugin will generate TS client classes for your contracts. This opt
   | option                        | description                                          |
   | ----------------------------- | ---------------------------------------------------  |
   | `client.enabled`              | generate TS client classes for your contracts        |
+  | `client.execExtendsQuery`     | execute should extend query message clients          |
 
 #### Client via CLI
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index b5f4dbea..1046ae9b 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -146,6 +146,7 @@ The `client` plugin will generate TS client classes for your contracts. This opt
   | option                        | description                                          |
   | ----------------------------- | ---------------------------------------------------  |
   | `client.enabled`              | generate TS client classes for your contracts        |
+  | `client.execExtendsQuery`     | execute should extend query message clients          |
 
 #### Client via CLI
 

From e46828bd476d30465a35a8021e611938abf89846 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Oct 2022 18:51:12 -0700
Subject: [PATCH 060/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.19.0
 - wasm-ast-types@0.13.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 81c3c15d..8a816d7c 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.19.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.18.0...@cosmwasm/ts-codegen@0.19.0) (2022-10-11)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.18.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.17.0...@cosmwasm/ts-codegen@0.18.0) (2022-10-11)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 81b5145f..1417f85d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.12.0"
+    "wasm-ast-types": "^0.13.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 27fd5784..3c40cd22 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.13.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.12.0...wasm-ast-types@0.13.0) (2022-10-11)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.12.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.3...wasm-ast-types@0.12.0) (2022-10-11)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index f4a16143..cc2b381a 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.12.0",
+  "version": "0.13.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",

From 4d67923c3400768a862012e1d7e601fc16cc4f82 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Tue, 27 Sep 2022 10:46:21 -0500
Subject: [PATCH 061/287] Lint react-query

---
 .../src/react-query/react-query.ts            | 1468 ++++++++---------
 1 file changed, 714 insertions(+), 754 deletions(-)

diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 91935510..927b8e7f 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -2,283 +2,285 @@ import type { Expression } from '@babel/types';
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { ExecuteMsg, QueryMsg } from '../types';
-import { callExpression, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from '../utils';
 import {
-    omitTypeReference,
-    optionalConditionalExpression,
-    propertySignature,
-    shorthandProperty
+  callExpression,
+  getMessageProperties,
+  identifier,
+  tsObjectPattern,
+  tsPropertySignature
+} from '../utils';
+import {
+  omitTypeReference,
+  optionalConditionalExpression,
+  propertySignature,
+  shorthandProperty
 } from '../utils/babel';
-import { getParamsTypeAnnotation, getPropertyType, getResponseType } from '../utils/types';
+import {
+  getParamsTypeAnnotation,
+  getPropertyType,
+  getResponseType
+} from '../utils/types';
 import { ReactQueryOptions, RenderContext } from '../context';
 import { JSONSchema } from '../types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
 
 interface ReactQueryHookQuery {
-    context: RenderContext,
-    hookName: string;
-    hookParamsTypeName: string;
-    hookKeyName: string;
-    queryKeysName: string
-    responseType: string;
-    methodName: string;
-    jsonschema: any;
+  context: RenderContext;
+  hookName: string;
+  hookParamsTypeName: string;
+  hookKeyName: string;
+  queryKeysName: string;
+  responseType: string;
+  methodName: string;
+  jsonschema: any;
 }
 
 interface ReactQueryHooks {
-    context: RenderContext;
-    queryMsg: QueryMsg;
-    contractName: string;
-    QueryClient: string;
+  context: RenderContext;
+  queryMsg: QueryMsg;
+  contractName: string;
+  QueryClient: string;
 }
 
 export const createReactQueryHooks = ({
-    context,
-    queryMsg,
-    contractName,
-    QueryClient
+  context,
+  queryMsg,
+  contractName,
+  QueryClient
 }: ReactQueryHooks) => {
-    const options = context.options.reactQuery;
+  const options = context.options.reactQuery;
 
-    const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
-    const underscoreNames: string[] = getMessageProperties(queryMsg).map((schema) => (Object.keys(schema.properties)[0]))
+  const genericQueryInterfaceName = `${pascal(contractName)}ReactQuery`;
+  const underscoreNames: string[] = getMessageProperties(queryMsg).map(
+    (schema) => Object.keys(schema.properties)[0]
+  );
 
-    const body = []
-
-    const queryKeysName = `${camel(contractName)}QueryKeys`
-    if (options.queryKeys) {
-        body.push(
-            createReactQueryKeys({
-                context,
-                queryKeysName,
-                camelContractName: camel(contractName),
-                underscoreNames,
-            }))
-    }
+  const body = [];
 
+  const queryKeysName = `${camel(contractName)}QueryKeys`;
+  if (options.queryKeys) {
     body.push(
-        createReactQueryHookGenericInterface({
-            context,
-            QueryClient,
-            genericQueryInterfaceName,
-        }))
-
-    body.push(...getMessageProperties(queryMsg)
-        .reduce((m, schema) => {
-            // list_voters
-            const underscoreName = Object.keys(schema.properties)[0];
-            // listVoters
-            const methodName = camel(underscoreName);
-            // Cw3FlexMultisigListVotersQuery
-            const hookParamsTypeName = `${pascal(contractName)}${pascal(methodName)}Query`;
-            // useCw3FlexMultisigListVotersQuery
-            const hookName = `use${hookParamsTypeName}`;
-            // listVotersResponse
-            const responseType = getResponseType(context, underscoreName);
-            // cw3FlexMultisigListVoters
-            const getterKey = camel(`${contractName}${pascal(methodName)}`);
-            const jsonschema = schema.properties[underscoreName];
-            return [
-                createReactQueryHookInterface({
-                    context,
-                    hookParamsTypeName,
-                    responseType,
-                    queryInterfaceName: genericQueryInterfaceName,
-                    QueryClient,
-                    jsonschema,
-                }),
-                createReactQueryHook({
-                    context,
-                    methodName,
-                    hookName,
-                    hookParamsTypeName,
-                    queryKeysName,
-                    responseType,
-                    hookKeyName: getterKey,
-                    jsonschema
-                }),
-                ...m,
-            ]
-        }, [])
+      createReactQueryKeys({
+        context,
+        queryKeysName,
+        camelContractName: camel(contractName),
+        underscoreNames
+      })
     );
+  }
 
-    return body
+  body.push(
+    createReactQueryHookGenericInterface({
+      context,
+      QueryClient,
+      genericQueryInterfaceName
+    })
+  );
+
+  body.push(
+    ...getMessageProperties(queryMsg).reduce((m, schema) => {
+      // list_voters
+      const underscoreName = Object.keys(schema.properties)[0];
+      // listVoters
+      const methodName = camel(underscoreName);
+      // Cw3FlexMultisigListVotersQuery
+      const hookParamsTypeName = `${pascal(contractName)}${pascal(
+        methodName
+      )}Query`;
+      // useCw3FlexMultisigListVotersQuery
+      const hookName = `use${hookParamsTypeName}`;
+      // listVotersResponse
+      const responseType = getResponseType(context, underscoreName);
+      // cw3FlexMultisigListVoters
+      const getterKey = camel(`${contractName}${pascal(methodName)}`);
+      const jsonschema = schema.properties[underscoreName];
+      return [
+        createReactQueryHookInterface({
+          context,
+          hookParamsTypeName,
+          responseType,
+          queryInterfaceName: genericQueryInterfaceName,
+          QueryClient,
+          jsonschema
+        }),
+        createReactQueryHook({
+          context,
+          methodName,
+          hookName,
+          hookParamsTypeName,
+          queryKeysName,
+          responseType,
+          hookKeyName: getterKey,
+          jsonschema
+        }),
+        ...m
+      ];
+    }, [])
+  );
+
+  return body;
 };
 
-
 export const createReactQueryHook = ({
-    context,
-    hookName,
-    hookParamsTypeName,
-    responseType,
-    hookKeyName,
-    queryKeysName,
-    methodName,
-    jsonschema
+  context,
+  hookName,
+  hookParamsTypeName,
+  responseType,
+  hookKeyName,
+  queryKeysName,
+  methodName,
+  jsonschema
 }: ReactQueryHookQuery) => {
+  context.addUtil('useQuery');
+  context.addUtil('UseQueryOptions');
+
+  const options = context.options.reactQuery;
+  const keys = Object.keys(jsonschema.properties ?? {});
+  let args = [];
+  if (keys.length) {
+    args = [
+      t.objectExpression([
+        ...keys.map((prop) => {
+          return t.objectProperty(
+            t.identifier(camel(prop)),
+            t.memberExpression(t.identifier('args'), t.identifier(camel(prop)))
+          );
+        })
+      ])
+    ];
+  }
 
-    context.addUtil('useQuery');
-    context.addUtil('UseQueryOptions');
-
-    const options = context.options.reactQuery;
-    const keys = Object.keys(jsonschema.properties ?? {});
-    let args = [];
-    if (keys.length) {
-        args = [
-            t.objectExpression([
-                ...keys.map(prop => {
-                    return t.objectProperty(
-                        t.identifier(camel(prop)),
-                        t.memberExpression(
-                            t.identifier('args'),
-                            t.identifier(camel(prop))
-                        )
-                    )
-                })
-            ])
-        ]
-    }
-
-    let props = ['client', 'options'];
-    if (keys.length) {
-        props = ['client', 'args', 'options'];
-    }
-
-    const selectResponseGenericTypeName = 'TData';
-
-    const queryFunctionDeclaration =
-        t.functionDeclaration(
-            t.identifier(hookName),
-            [
-                tsObjectPattern(
-                    [
-                        ...props.map(prop => {
-                            return t.objectProperty(
-                                t.identifier(prop),
-                                t.identifier(prop),
-                                false,
-                                true
-                            )
-                        })
-                    ],
-                    t.tsTypeAnnotation(t.tsTypeReference(
-                        t.identifier(hookParamsTypeName),
-                        t.tsTypeParameterInstantiation([
-                            t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
-                        ])
-                    ))
-                )
-            ],
-            t.blockStatement(
-                [
-
-                    t.returnStatement(
-                        callExpression(
-                            t.identifier('useQuery'),
-                            [
-                                generateUseQueryQueryKey({ hookKeyName, queryKeysName, methodName, props, options }),
-                                t.arrowFunctionExpression(
-                                    [],
-                                    optionalConditionalExpression(
-                                        t.identifier('client'),
-                                        t.callExpression(
-                                            t.memberExpression(
-                                                t.identifier('client'),
-                                                t.identifier(methodName)
-                                            ),
-                                            args
-                                        ),
-                                        t.callExpression(
-                                            t.memberExpression(
-                                                t.identifier('Promise'),
-                                                t.identifier('reject'),
-                                            ),
-                                            [
-                                                t.newExpression(
-                                                    t.identifier('Error'),
-                                                    [
-                                                        t.stringLiteral('Invalid client')
-                                                    ]
-                                                )
-                                            ]
-                                        ),
-                                        options.optionalClient
-                                    ),
-                                    false
-                                ),
-                                options.optionalClient
-                                    ? t.objectExpression([
-                                        t.spreadElement(t.identifier('options')),
-                                        t.objectProperty(
-                                            t.identifier('enabled'),
-                                            t.logicalExpression(
-                                                '&&',
-                                                t.unaryExpression(
-                                                    '!',
-                                                    t.unaryExpression('!', t.identifier('client'))
-                                                ),
-                                                t.conditionalExpression(
-                                                    // explicitly check for undefined
-                                                    t.binaryExpression(
-                                                        '!=',
-                                                        t.optionalMemberExpression(
-                                                            t.identifier('options'),
-                                                            t.identifier('enabled'),
-                                                            false,
-                                                            true
-                                                        ),
-                                                        t.identifier('undefined')
-                                                    ),
-                                                    t.memberExpression(
-                                                        t.identifier('options'),
-                                                        t.identifier('enabled')
-                                                    ),
-                                                    t.booleanLiteral(true)
-                                                )
-
-                                            )),
-                                    ])
-                                    : t.identifier('options'),
-                            ],
-                            t.tsTypeParameterInstantiation(
-                                [
-                                    t.tsTypeReference(
-                                        t.identifier(responseType)
-                                    ),
-                                    t.tsTypeReference(
-                                        t.identifier('Error')
-                                    ),
-                                    t.tsTypeReference(
-                                        t.identifier(selectResponseGenericTypeName)
-                                    )
-                                ]
-                            )
-                        )
-                    )
+  let props = ['client', 'options'];
+  if (keys.length) {
+    props = ['client', 'args', 'options'];
+  }
 
-                ]
-            ),
+  const selectResponseGenericTypeName = 'TData';
+
+  const queryFunctionDeclaration = t.functionDeclaration(
+    t.identifier(hookName),
+    [
+      tsObjectPattern(
+        [
+          ...props.map((prop) => {
+            return t.objectProperty(
+              t.identifier(prop),
+              t.identifier(prop),
+              false,
+              true
+            );
+          })
+        ],
+        t.tsTypeAnnotation(
+          t.tsTypeReference(
+            t.identifier(hookParamsTypeName),
+            t.tsTypeParameterInstantiation([
+              t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
+            ])
+          )
         )
-
-    // Add the TData type parameters
-    queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([
-        t.tsTypeParameter(
-            undefined,
-            t.tSTypeReference(t.identifier(responseType)),
-            selectResponseGenericTypeName
+      )
+    ],
+    t.blockStatement([
+      t.returnStatement(
+        callExpression(
+          t.identifier('useQuery'),
+          [
+            generateUseQueryQueryKey({
+              hookKeyName,
+              queryKeysName,
+              methodName,
+              props,
+              options
+            }),
+            t.arrowFunctionExpression(
+              [],
+              optionalConditionalExpression(
+                t.identifier('client'),
+                t.callExpression(
+                  t.memberExpression(
+                    t.identifier('client'),
+                    t.identifier(methodName)
+                  ),
+                  args
+                ),
+                t.callExpression(
+                  t.memberExpression(
+                    t.identifier('Promise'),
+                    t.identifier('reject')
+                  ),
+                  [
+                    t.newExpression(t.identifier('Error'), [
+                      t.stringLiteral('Invalid client')
+                    ])
+                  ]
+                ),
+                options.optionalClient
+              ),
+              false
+            ),
+            options.optionalClient
+              ? t.objectExpression([
+                  t.spreadElement(t.identifier('options')),
+                  t.objectProperty(
+                    t.identifier('enabled'),
+                    t.logicalExpression(
+                      '&&',
+                      t.unaryExpression(
+                        '!',
+                        t.unaryExpression('!', t.identifier('client'))
+                      ),
+                      t.conditionalExpression(
+                        // explicitly check for undefined
+                        t.binaryExpression(
+                          '!=',
+                          t.optionalMemberExpression(
+                            t.identifier('options'),
+                            t.identifier('enabled'),
+                            false,
+                            true
+                          ),
+                          t.identifier('undefined')
+                        ),
+                        t.memberExpression(
+                          t.identifier('options'),
+                          t.identifier('enabled')
+                        ),
+                        t.booleanLiteral(true)
+                      )
+                    )
+                  )
+                ])
+              : t.identifier('options')
+          ],
+          t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier(responseType)),
+            t.tsTypeReference(t.identifier('Error')),
+            t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
+          ])
         )
+      )
     ])
+  );
+
+  // Add the TData type parameters
+  queryFunctionDeclaration.typeParameters = t.tsTypeParameterDeclaration([
+    t.tsTypeParameter(
+      undefined,
+      t.tSTypeReference(t.identifier(responseType)),
+      selectResponseGenericTypeName
+    )
+  ]);
 
-    return t.exportNamedDeclaration(queryFunctionDeclaration)
-
+  return t.exportNamedDeclaration(queryFunctionDeclaration);
 };
 
 interface ReactQueryMutationHookInterface {
-    context: RenderContext;
-    ExecuteClient: string;
-    mutationHookParamsTypeName: string;
-    jsonschema: JSONSchema;
-    useMutationTypeParameter: t.TSTypeParameterInstantiation;
+  context: RenderContext;
+  ExecuteClient: string;
+  mutationHookParamsTypeName: string;
+  jsonschema: JSONSchema;
+  useMutationTypeParameter: t.TSTypeParameterInstantiation;
 }
 
 /**
@@ -298,167 +300,155 @@ export interface Cw4UpdateMembersMutation {
 ```
  */
 export const createReactQueryMutationArgsInterface = ({
-    context,
-    ExecuteClient,
-    mutationHookParamsTypeName,
-    useMutationTypeParameter,
-    jsonschema,
+  context,
+  ExecuteClient,
+  mutationHookParamsTypeName,
+  useMutationTypeParameter,
+  jsonschema
 }: ReactQueryMutationHookInterface) => {
-
-    const typedUseMutationOptions = t.tsTypeReference(
-        t.identifier('UseMutationOptions'),
-        useMutationTypeParameter
+  const typedUseMutationOptions = t.tsTypeReference(
+    t.identifier('UseMutationOptions'),
+    useMutationTypeParameter
+  );
+
+  const body = [
+    tsPropertySignature(
+      t.identifier('client'),
+      t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))),
+      false
     )
+  ];
 
-    const body = [
-        tsPropertySignature(
-            t.identifier('client'),
-            t.tsTypeAnnotation(
-                t.tsTypeReference(
-                    t.identifier(ExecuteClient)
-                )
-            ),
-            false
-        ),
-    ]
-
-    const msgType: t.TSTypeAnnotation = getParamsTypeAnnotation(context, jsonschema)
-
-    if (msgType) {
-        body.push(
-            t.tsPropertySignature(
-                t.identifier('msg'),
-                msgType
-            ))
-    }
+  const msgType: t.TSTypeAnnotation = getParamsTypeAnnotation(
+    context,
+    jsonschema
+  );
 
-    context.addUtil('StdFee')
-    context.addUtil('Coin');
-    //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
+  if (msgType) {
+    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+  }
 
-    const optionalArgs = t.tsPropertySignature(
-        t.identifier('args'),
-        t.tsTypeAnnotation(
+  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
-            t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(
-                param.name,
-                // @ts-ignore:next-line
-                param.typeAnnotation,
-                param.optional
-            )))
+            param.typeAnnotation,
+            param.optional
+          )
         )
+      )
     )
+  );
 
-    optionalArgs.optional = true
-
-    body.push(optionalArgs)
+  optionalArgs.optional = true;
 
+  body.push(optionalArgs);
 
-    return t.exportNamedDeclaration(t.tsInterfaceDeclaration(
-        t.identifier(mutationHookParamsTypeName),
-        null,
-        [],
-        t.tsInterfaceBody(
-            body
-        )
-    ))
+  return t.exportNamedDeclaration(
+    t.tsInterfaceDeclaration(
+      t.identifier(mutationHookParamsTypeName),
+      null,
+      [],
+      t.tsInterfaceBody(body)
+    )
+  );
 };
 
-
 interface ReactQueryMutationHooks {
-    context: RenderContext;
-    execMsg: ExecuteMsg;
-    contractName: string;
-    ExecuteClient: string;
+  context: RenderContext;
+  execMsg: ExecuteMsg;
+  contractName: string;
+  ExecuteClient: string;
 }
 
 export const createReactQueryMutationHooks = ({
-    context,
-    execMsg,
-    contractName,
-    ExecuteClient
+  context,
+  execMsg,
+  contractName,
+  ExecuteClient
 }: ReactQueryMutationHooks) => {
-    // merge the user options with the defaults
-    return getMessageProperties(execMsg)
-        .reduce((m, schema) => {
-            // update_members
-            const execMethodUnderscoreName = Object.keys(schema.properties)[0];
-            // updateMembers
-            const execMethodName = camel(execMethodUnderscoreName);
-            // Cw20UpdateMembersMutation
-            const mutationHookParamsTypeName = `${pascal(contractName)}${pascal(execMethodName)}Mutation`;
-            // useCw20UpdateMembersMutation
-            const mutationHookName = `use${mutationHookParamsTypeName}`;
-
-            const jsonschema = schema.properties[execMethodUnderscoreName];
-
-            const properties = jsonschema.properties ?? {};
-
-            // TODO: there should be a better way to do this
-            const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref)
-
-            // <ExecuteResult, Error, Cw4UpdateMembersMutation>
-            const useMutationTypeParameter = generateMutationTypeParameter(
-                context,
-                mutationHookParamsTypeName
-            );
-
+  // merge the user options with the defaults
+  return getMessageProperties(execMsg).reduce((m, schema) => {
+    // update_members
+    const execMethodUnderscoreName = Object.keys(schema.properties)[0];
+    // updateMembers
+    const execMethodName = camel(execMethodUnderscoreName);
+    // Cw20UpdateMembersMutation
+    const mutationHookParamsTypeName = `${pascal(contractName)}${pascal(
+      execMethodName
+    )}Mutation`;
+    // useCw20UpdateMembersMutation
+    const mutationHookName = `use${mutationHookParamsTypeName}`;
+
+    const jsonschema = schema.properties[execMethodUnderscoreName];
+
+    const properties = jsonschema.properties ?? {};
+
+    // TODO: there should be a better way to do this
+    const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref);
+
+    // <ExecuteResult, Error, Cw4UpdateMembersMutation>
+    const useMutationTypeParameter = generateMutationTypeParameter(
+      context,
+      mutationHookParamsTypeName
+    );
 
-            return [
-                createReactQueryMutationArgsInterface({
-                    context,
-                    mutationHookParamsTypeName,
-                    ExecuteClient,
-                    jsonschema,
-                    useMutationTypeParameter
-                }),
-                createReactQueryMutationHook({
-                    context,
-                    execMethodName,
-                    mutationHookName,
-                    mutationHookParamsTypeName,
-                    hasMsg,
-                    useMutationTypeParameter,
-                }),
-                ...m,
-            ]
-        }, []);
+    return [
+      createReactQueryMutationArgsInterface({
+        context,
+        mutationHookParamsTypeName,
+        ExecuteClient,
+        jsonschema,
+        useMutationTypeParameter
+      }),
+      createReactQueryMutationHook({
+        context,
+        execMethodName,
+        mutationHookName,
+        mutationHookParamsTypeName,
+        hasMsg,
+        useMutationTypeParameter
+      }),
+      ...m
+    ];
+  }, []);
 };
 
 /**
  * Generates the mutation type parameter. If args exist, we use a pick. If not, we just return the params type.
  */
 const generateMutationTypeParameter = (
-    context: RenderContext,
-    mutationHookParamsTypeName: string
+  context: RenderContext,
+  mutationHookParamsTypeName: string
 ) => {
-
-    context.addUtil('ExecuteResult');
-
-    return t.tsTypeParameterInstantiation([
-        // Data
-        t.tSTypeReference(
-            t.identifier('ExecuteResult')
-        ),
-        // Error
-        t.tsTypeReference(
-            t.identifier('Error')
-        ),
-        // Variables
-        t.tsTypeReference(
-            t.identifier(mutationHookParamsTypeName)
-        )
-    ]);
-}
-
+  context.addUtil('ExecuteResult');
+
+  return t.tsTypeParameterInstantiation([
+    // Data
+    t.tSTypeReference(t.identifier('ExecuteResult')),
+    // Error
+    t.tsTypeReference(t.identifier('Error')),
+    // Variables
+    t.tsTypeReference(t.identifier(mutationHookParamsTypeName))
+  ]);
+};
 
 interface ReactQueryMutationHook {
-    context: RenderContext;
-    mutationHookName: string;
-    mutationHookParamsTypeName: string;
-    execMethodName: string;
-    useMutationTypeParameter: t.TSTypeParameterInstantiation;
-    hasMsg: boolean;
+  context: RenderContext;
+  mutationHookName: string;
+  mutationHookParamsTypeName: string;
+  execMethodName: string;
+  useMutationTypeParameter: t.TSTypeParameterInstantiation;
+  hasMsg: boolean;
 }
 
 /**
@@ -473,441 +463,411 @@ export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateM
 ```
  */
 export const createReactQueryMutationHook = ({
-    context,
-    mutationHookName,
-    mutationHookParamsTypeName,
-    execMethodName,
-    useMutationTypeParameter,
-    hasMsg,
+  context,
+  mutationHookName,
+  mutationHookParamsTypeName,
+  execMethodName,
+  useMutationTypeParameter,
+  hasMsg
 }: ReactQueryMutationHook) => {
-
-    context.addUtil('useMutation');
-    context.addUtil('UseMutationOptions');
-
-    const useMutationFunctionArgs = [shorthandProperty('client')]
-    if (hasMsg) useMutationFunctionArgs.push(shorthandProperty('msg'))
-    useMutationFunctionArgs.push(
-        t.objectProperty(
-            t.identifier('args'),
-            t.assignmentPattern(
-                t.objectPattern(FIXED_EXECUTE_PARAMS.map(param => shorthandProperty(param.name))),
-                t.objectExpression([])
+  context.addUtil('useMutation');
+  context.addUtil('UseMutationOptions');
+
+  const useMutationFunctionArgs = [shorthandProperty('client')];
+  if (hasMsg) useMutationFunctionArgs.push(shorthandProperty('msg'));
+  useMutationFunctionArgs.push(
+    t.objectProperty(
+      t.identifier('args'),
+      t.assignmentPattern(
+        t.objectPattern(
+          FIXED_EXECUTE_PARAMS.map((param) => shorthandProperty(param.name))
+        ),
+        t.objectExpression([])
+      )
+    )
+  );
+
+  return t.exportNamedDeclaration(
+    t.functionDeclaration(
+      t.identifier(mutationHookName),
+      [
+        identifier(
+          'options',
+          t.tsTypeAnnotation(
+            omitTypeReference(
+              t.tsTypeReference(
+                t.identifier('UseMutationOptions'),
+                useMutationTypeParameter
+              ),
+              'mutationFn'
             )
+          ),
+          true
         )
-    )
-
-    return t.exportNamedDeclaration(
-        t.functionDeclaration(
-            t.identifier(mutationHookName),
+      ],
+      t.blockStatement([
+        t.returnStatement(
+          callExpression(
+            t.identifier('useMutation'),
             [
-                identifier('options', t.tsTypeAnnotation(
-                    omitTypeReference(
-                        t.tsTypeReference(
-                            t.identifier('UseMutationOptions'),
-                            useMutationTypeParameter
-                        ),
-                        'mutationFn'
+              t.arrowFunctionExpression(
+                [t.objectPattern(useMutationFunctionArgs)],
+                t.callExpression(
+                  t.memberExpression(
+                    t.identifier('client'),
+                    t.identifier(execMethodName)
+                  ),
+                  (hasMsg ? [t.identifier('msg')] : []).concat(
+                    FIXED_EXECUTE_PARAMS.map((param) =>
+                      t.identifier(param.name)
                     )
-                ), true)
+                  )
+                ),
+                false // not async
+              ),
+              t.identifier('options')
             ],
-            t.blockStatement(
-                [
-                    t.returnStatement(
-                        callExpression(
-                            t.identifier('useMutation'),
-                            [
-                                t.arrowFunctionExpression(
-                                    [t.objectPattern(useMutationFunctionArgs)],
-                                    t.callExpression(
-                                        t.memberExpression(
-                                            t.identifier('client'),
-                                            t.identifier(execMethodName)
-                                        ),
-                                        (hasMsg
-                                            ? [t.identifier('msg')]
-                                            : []
-                                        )
-                                            .concat(FIXED_EXECUTE_PARAMS.map(param => t.identifier(param.name)))
-                                    ),
-                                    false // not async
-                                ),
-                                t.identifier('options'),
-                            ],
-                            useMutationTypeParameter
-                        )
-                    )
-
-                ]
-            ),
+            useMutationTypeParameter
+          )
         )
+      ])
     )
-
+  );
 };
 
 function createReactQueryKeys({
-    context,
-    queryKeysName,
-    camelContractName,
-    underscoreNames
+  context,
+  queryKeysName,
+  camelContractName,
+  underscoreNames
 }: {
-    context: RenderContext;
-    queryKeysName: string,
-    camelContractName: string;
-    underscoreNames: string[];
+  context: RenderContext;
+  queryKeysName: string;
+  camelContractName: string;
+  underscoreNames: string[];
 }) {
-    const options = context.options.reactQuery
-
-    const contractAddressTypeAnnotation = t.tsTypeAnnotation(
-        options.optionalClient
-            ? t.tsUnionType([
-                t.tsStringKeyword(),
-                t.tsUndefinedKeyword()
-            ])
-            : t.tSStringKeyword()
-    )
-
-    return t.exportNamedDeclaration(
-        t.variableDeclaration('const', [
-            t.variableDeclarator(
-                t.identifier(queryKeysName),
+  const options = context.options.reactQuery;
+
+  const contractAddressTypeAnnotation = t.tsTypeAnnotation(
+    options.optionalClient
+      ? t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])
+      : t.tSStringKeyword()
+  );
+
+  return t.exportNamedDeclaration(
+    t.variableDeclaration('const', [
+      t.variableDeclarator(
+        t.identifier(queryKeysName),
+        t.objectExpression([
+          // 1: contract
+          t.objectProperty(
+            t.identifier('contract'),
+            t.tSAsExpression(
+              t.arrayExpression([
                 t.objectExpression([
-                    // 1: contract
-                    t.objectProperty(
-                        t.identifier('contract'),
-                        t.tSAsExpression(
-                            t.arrayExpression([
-                                t.objectExpression([
-                                    t.objectProperty(
-                                        t.identifier('contract'),
-                                        t.stringLiteral(camelContractName)
-                                    )
-                                ])
-                            ]),
-                            t.tSTypeReference(t.identifier('const'))
-                        )
+                  t.objectProperty(
+                    t.identifier('contract'),
+                    t.stringLiteral(camelContractName)
+                  )
+                ])
+              ]),
+              t.tSTypeReference(t.identifier('const'))
+            )
+          ),
+          // 2: address
+          t.objectProperty(
+            t.identifier('address'),
+            t.arrowFunctionExpression(
+              [identifier('contractAddress', contractAddressTypeAnnotation)],
+              t.tSAsExpression(
+                t.arrayExpression([
+                  t.objectExpression([
+                    // 1
+                    t.spreadElement(
+                      t.memberExpression(
+                        t.memberExpression(
+                          t.identifier(queryKeysName),
+                          t.identifier('contract')
+                        ),
+                        t.numericLiteral(0),
+                        true // computed
+                      )
                     ),
-                    // 2: address
                     t.objectProperty(
-                        t.identifier('address'),
-                        t.arrowFunctionExpression(
-                            [
-                                identifier(
-                                    'contractAddress',
-                                    contractAddressTypeAnnotation
-                                )
-                            ],
-                            t.tSAsExpression(
-                                t.arrayExpression([
-                                    t.objectExpression([
-                                        // 1
-                                        t.spreadElement(
-                                            t.memberExpression(
-                                                t.memberExpression(
-                                                    t.identifier(queryKeysName),
-                                                    t.identifier('contract')
-                                                ),
-                                                t.numericLiteral(0),
-                                                true // computed
-                                            )
-                                        ),
-                                        t.objectProperty(
-                                            t.identifier('address'),
-                                            t.identifier('contractAddress')
-                                        )
-                                    ])
-                                ]),
-                                t.tSTypeReference(t.identifier('const'))
-                            )
-                        )
+                      t.identifier('address'),
+                      t.identifier('contractAddress')
+                    )
+                  ])
+                ]),
+                t.tSTypeReference(t.identifier('const'))
+              )
+            )
+          ),
+          // 3: methods
+          ...underscoreNames.map((underscoreMethodName) =>
+            t.objectProperty(
+              // key id is the camel method name
+              t.identifier(camel(underscoreMethodName)),
+              t.arrowFunctionExpression(
+                [
+                  identifier('contractAddress', contractAddressTypeAnnotation),
+                  identifier(
+                    'args',
+                    // Record<string, unknown>
+                    t.tSTypeAnnotation(
+                      t.tsTypeReference(
+                        t.identifier('Record'),
+                        t.tsTypeParameterInstantiation([
+                          t.tsStringKeyword(),
+                          t.tsUnknownKeyword()
+                        ])
+                      )
                     ),
-                    // 3: methods
-                    ...underscoreNames.map((underscoreMethodName) =>
-                        t.objectProperty(
-                            // key id is the camel method name
-                            t.identifier(camel(underscoreMethodName)),
-                            t.arrowFunctionExpression(
-                                [
-                                    identifier(
-                                        'contractAddress',
-                                        contractAddressTypeAnnotation
-                                    ),
-                                    identifier(
-                                        'args',
-                                        // Record<string, unknown>
-                                        t.tSTypeAnnotation(
-                                            t.tsTypeReference(
-                                                t.identifier('Record'),
-                                                t.tsTypeParameterInstantiation([
-                                                    t.tsStringKeyword(),
-                                                    t.tsUnknownKeyword()
-                                                ])
-                                            )
-                                        ),
-                                        true // optional
-                                    )
-                                ],
-                                t.tSAsExpression(
-                                    t.arrayExpression([
-                                        t.objectExpression([
-                                            //...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
-                                            t.spreadElement(
-                                                t.memberExpression(
-                                                    t.callExpression(
-                                                        t.memberExpression(
-                                                            t.identifier(queryKeysName),
-                                                            t.identifier('address')
-                                                        ),
-                                                        [t.identifier('contractAddress')]
-                                                    ),
-                                                    t.numericLiteral(0),
-                                                    true // computed
-                                                )
-                                            ),
-                                            // method: list_voters
-                                            t.objectProperty(
-                                                t.identifier('method'),
-                                                t.stringLiteral(underscoreMethodName)
-                                            ),
-                                            // args
-                                            shorthandProperty('args')
-                                        ])
-                                    ]),
-                                    t.tSTypeReference(t.identifier('const'))
-                                )
-                            )
+                    true // optional
+                  )
+                ],
+                t.tSAsExpression(
+                  t.arrayExpression([
+                    t.objectExpression([
+                      //...cw3FlexMultisigQueryKeys.address(contractAddress)[0]
+                      t.spreadElement(
+                        t.memberExpression(
+                          t.callExpression(
+                            t.memberExpression(
+                              t.identifier(queryKeysName),
+                              t.identifier('address')
+                            ),
+                            [t.identifier('contractAddress')]
+                          ),
+                          t.numericLiteral(0),
+                          true // computed
                         )
-                    )
-                ])
+                      ),
+                      // method: list_voters
+                      t.objectProperty(
+                        t.identifier('method'),
+                        t.stringLiteral(underscoreMethodName)
+                      ),
+                      // args
+                      shorthandProperty('args')
+                    ])
+                  ]),
+                  t.tSTypeReference(t.identifier('const'))
+                )
+              )
             )
+          )
         ])
-    )
+      )
+    ])
+  );
 }
 
 interface ReactQueryHookGenericInterface {
-    context: RenderContext,
-    QueryClient: string,
-    genericQueryInterfaceName: string
+  context: RenderContext;
+  QueryClient: string;
+  genericQueryInterfaceName: string;
 }
 
 function createReactQueryHookGenericInterface({
-    context,
-    QueryClient,
-    genericQueryInterfaceName
+  context,
+  QueryClient,
+  genericQueryInterfaceName
 }: ReactQueryHookGenericInterface) {
+  const options = context.options.reactQuery;
 
-    const options = context.options.reactQuery;
+  const genericResponseTypeName = 'TResponse';
+  const genericSelectResponseTypeName = 'TData';
 
-    const genericResponseTypeName = 'TResponse'
-    const genericSelectResponseTypeName = 'TData'
+  context.addUtil('UseQueryOptions');
 
-    context.addUtil('UseQueryOptions');
+  // UseQueryOptions<TResponse, Error, TData>,
+  const typedUseQueryOptions = t.tsTypeReference(
+    t.identifier('UseQueryOptions'),
+    t.tsTypeParameterInstantiation([
+      t.tsTypeReference(t.identifier(genericResponseTypeName)),
+      t.tsTypeReference(t.identifier('Error')),
+      t.tsTypeReference(t.identifier(genericSelectResponseTypeName))
+    ])
+  );
 
-    // UseQueryOptions<TResponse, Error, TData>,
-    const typedUseQueryOptions = t.tsTypeReference(
-        t.identifier('UseQueryOptions'),
-        t.tsTypeParameterInstantiation(
-            [
-                t.tsTypeReference(
-                    t.identifier(genericResponseTypeName)
-                ),
-                t.tsTypeReference(t.identifier('Error')),
-                t.tsTypeReference(
-                    t.identifier(genericSelectResponseTypeName)
+  const body = [
+    tsPropertySignature(
+      t.identifier('client'),
+      t.tsTypeAnnotation(
+        options.optionalClient
+          ? t.tsUnionType([
+              t.tsTypeReference(t.identifier(QueryClient)),
+              t.tsUndefinedKeyword()
+            ])
+          : t.tsTypeReference(t.identifier(QueryClient))
+      ),
+      false
+    ),
+    tsPropertySignature(
+      t.identifier('options'),
+      t.tsTypeAnnotation(
+        options.version === 'v4'
+          ? t.tSIntersectionType([
+              omitTypeReference(
+                typedUseQueryOptions,
+                "'queryKey' | 'queryFn' | 'initialData'"
+              ),
+              t.tSTypeLiteral([
+                t.tsPropertySignature(
+                  t.identifier('initialData?'),
+                  t.tsTypeAnnotation(t.tsUndefinedKeyword())
                 )
+              ])
             ])
+          : typedUseQueryOptions
+      ),
+      true
     )
-
-    const body = [
-        tsPropertySignature(
-            t.identifier('client'),
-            t.tsTypeAnnotation(
-                options.optionalClient
-                    ? t.tsUnionType([
-                        t.tsTypeReference(
-                            t.identifier(QueryClient)
-                        ),
-                        t.tsUndefinedKeyword()
-                    ])
-                    : t.tsTypeReference(
-                        t.identifier(QueryClient)
-                    )
-            ),
-            false
-        ),
-        tsPropertySignature(
-            t.identifier('options'),
-            t.tsTypeAnnotation(
-                options.version === 'v4'
-                    ? t.tSIntersectionType([
-                        omitTypeReference(typedUseQueryOptions, "'queryKey' | 'queryFn' | 'initialData'"),
-                        t.tSTypeLiteral([
-                            t.tsPropertySignature(
-                                t.identifier('initialData?'),
-                                t.tsTypeAnnotation(
-                                    t.tsUndefinedKeyword()
-                                )
-                            )
-                        ])
-                    ])
-                    : typedUseQueryOptions
-            ),
-            true
-        )
-    ];
-
-    return t.exportNamedDeclaration(
-        t.tsInterfaceDeclaration(
-            t.identifier(genericQueryInterfaceName),
-            t.tsTypeParameterDeclaration([
-                // 1: TResponse
-                t.tsTypeParameter(undefined, undefined, genericResponseTypeName),
-                // 2: TData
-                t.tsTypeParameter(
-                    undefined,
-                    t.tSTypeReference(t.identifier(genericResponseTypeName)),
-                    genericSelectResponseTypeName
-                )
-            ]),
-            [],
-            t.tSInterfaceBody(body)
+  ];
+
+  return t.exportNamedDeclaration(
+    t.tsInterfaceDeclaration(
+      t.identifier(genericQueryInterfaceName),
+      t.tsTypeParameterDeclaration([
+        // 1: TResponse
+        t.tsTypeParameter(undefined, undefined, genericResponseTypeName),
+        // 2: TData
+        t.tsTypeParameter(
+          undefined,
+          t.tSTypeReference(t.identifier(genericResponseTypeName)),
+          genericSelectResponseTypeName
         )
+      ]),
+      [],
+      t.tSInterfaceBody(body)
     )
+  );
 }
 
 interface ReactQueryHookQueryInterface {
-    context: RenderContext,
-    QueryClient: string;
-    hookParamsTypeName: string;
-    queryInterfaceName: string
-    responseType: string;
-    jsonschema: any;
+  context: RenderContext;
+  QueryClient: string;
+  hookParamsTypeName: string;
+  queryInterfaceName: string;
+  responseType: string;
+  jsonschema: any;
 }
 
 export const createReactQueryHookInterface = ({
-    context,
-    QueryClient,
-    hookParamsTypeName,
-    queryInterfaceName,
-    responseType,
-    jsonschema
+  context,
+  QueryClient,
+  hookParamsTypeName,
+  queryInterfaceName,
+  responseType,
+  jsonschema
 }: ReactQueryHookQueryInterface) => {
-    // merge the user options with the defaults
-    const options = context.options.reactQuery;
-
-    const body = []
-
-    const props = getProps(context, jsonschema);
-    if (props.length) {
-        body.push(t.tsPropertySignature(
-            t.identifier('args'),
-            t.tsTypeAnnotation(
-                // @ts-ignore:next-line
-                t.tsTypeLiteral(props)
-            )
-        ))
-    }
+  // merge the user options with the defaults
+  const options = context.options.reactQuery;
 
+  const body = [];
 
-    return t.exportNamedDeclaration(
-        t.tsInterfaceDeclaration(
-            t.identifier(hookParamsTypeName),
-            t.tsTypeParameterDeclaration([
-                t.tSTypeParameter(undefined, undefined, 'TData')
-            ]),
-            [
-                t.tSExpressionWithTypeArguments(
-                    t.identifier(queryInterfaceName),
-                    t.tsTypeParameterInstantiation([
-                        // 1: response
-                        t.tsTypeReference(t.identifier(responseType)),
-                        // 2: select generic
-                        t.tSTypeReference(t.identifier('TData'))
-                    ])
-                )
-            ],
-            t.tsInterfaceBody(
-                body
-            )
+  const props = getProps(context, jsonschema);
+  if (props.length) {
+    body.push(
+      t.tsPropertySignature(
+        t.identifier('args'),
+        t.tsTypeAnnotation(
+          // @ts-ignore:next-line
+          t.tsTypeLiteral(props)
+        )
+      )
+    );
+  }
+
+  return t.exportNamedDeclaration(
+    t.tsInterfaceDeclaration(
+      t.identifier(hookParamsTypeName),
+      t.tsTypeParameterDeclaration([
+        t.tSTypeParameter(undefined, undefined, 'TData')
+      ]),
+      [
+        t.tSExpressionWithTypeArguments(
+          t.identifier(queryInterfaceName),
+          t.tsTypeParameterInstantiation([
+            // 1: response
+            t.tsTypeReference(t.identifier(responseType)),
+            // 2: select generic
+            t.tSTypeReference(t.identifier('TData'))
+          ])
         )
+      ],
+      t.tsInterfaceBody(body)
     )
+  );
 };
 
-const getProps = (
-    context: RenderContext,
-    jsonschema: JSONSchema
-) => {
-    const keys = Object.keys(jsonschema.properties ?? {});
-    if (!keys.length) return [];
-
-    return keys.map(prop => {
-        const { type, optional } = getPropertyType(context, jsonschema, prop);
-        return propertySignature(
-            context.options.reactQuery.camelize ? camel(prop) : prop,
-            t.tsTypeAnnotation(
-                type
-            ),
-            optional
-        )
-    });
-}
+const getProps = (context: RenderContext, jsonschema: JSONSchema) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return [];
+
+  return keys.map((prop) => {
+    const { type, optional } = getPropertyType(context, jsonschema, prop);
+    return propertySignature(
+      context.options.reactQuery.camelize ? camel(prop) : prop,
+      t.tsTypeAnnotation(type),
+      optional
+    );
+  });
+};
 
 interface GenerateUseQueryQueryKeyParams {
-    hookKeyName: string;
-    queryKeysName: string;
-    methodName: string;
-    props: string[];
-    options: ReactQueryOptions;
+  hookKeyName: string;
+  queryKeysName: string;
+  methodName: string;
+  props: string[];
+  options: ReactQueryOptions;
 }
 
 const generateUseQueryQueryKey = ({
-    hookKeyName,
-    queryKeysName,
-    methodName,
-    props,
-    options,
+  hookKeyName,
+  queryKeysName,
+  methodName,
+  props,
+  options
 }: GenerateUseQueryQueryKeyParams): t.ArrayExpression | t.CallExpression => {
-    const { optionalClient, queryKeys } = options
-
-    const hasArgs = props.includes('args')
+  const { optionalClient, queryKeys } = options;
 
-    const contractAddressExpression =
-        t.optionalMemberExpression(
-            t.identifier('client'),
-            t.identifier('contractAddress'),
-            false,
-            optionalClient
-        )
+  const hasArgs = props.includes('args');
 
-    if (queryKeys) {
+  const contractAddressExpression = t.optionalMemberExpression(
+    t.identifier('client'),
+    t.identifier('contractAddress'),
+    false,
+    optionalClient
+  );
 
-        const callArgs: Array<Expression> = [contractAddressExpression]
+  if (queryKeys) {
+    const callArgs: Array<Expression> = [contractAddressExpression];
 
-        if (hasArgs) callArgs.push(t.identifier('args'))
+    if (hasArgs) callArgs.push(t.identifier('args'));
 
-        return t.callExpression(
-            t.memberExpression(
-                t.identifier(queryKeysName),
-                t.identifier(camel(methodName))
-            ),
-            callArgs
-        )
-    }
-
-    const queryKey: Array<Expression> = [
-        t.stringLiteral(hookKeyName),
-        contractAddressExpression
-    ];
+    return t.callExpression(
+      t.memberExpression(
+        t.identifier(queryKeysName),
+        t.identifier(camel(methodName))
+      ),
+      callArgs
+    );
+  }
 
-    if (hasArgs) {
-        queryKey.push(t.callExpression(
-            t.memberExpression(
-                t.identifier('JSON'),
-                t.identifier('stringify')
-            ),
-            [
-                t.identifier('args')
-            ]
-        ))
-    }
-    return t.arrayExpression(queryKey)
-}
+  const queryKey: Array<Expression> = [
+    t.stringLiteral(hookKeyName),
+    contractAddressExpression
+  ];
+
+  if (hasArgs) {
+    queryKey.push(
+      t.callExpression(
+        t.memberExpression(t.identifier('JSON'), t.identifier('stringify')),
+        [t.identifier('args')]
+      )
+    );
+  }
+  return t.arrayExpression(queryKey);
+};

From b7a2bbbede2d39b689c86c8c5e0028f0f18562c5 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Tue, 27 Sep 2022 16:41:06 -0500
Subject: [PATCH 062/287] Allow the user to generate a query factory

---
 .../Factory.react-query.ts                    | 114 +++++
 .../factory-query-keys/Factory.react-query.ts |  68 +++
 .../ts-codegen/__tests__/ts-codegen.test.ts   |  10 +
 .../wasm-ast-types/src/context/context.ts     |   1 +
 .../src/react-query/react-query.ts            | 406 +++++++++++++-----
 .../wasm-ast-types/types/context/context.d.ts |   1 +
 6 files changed, 493 insertions(+), 107 deletions(-)
 create mode 100644 __output__/vectis/factory-query-factory/Factory.react-query.ts

diff --git a/__output__/vectis/factory-query-factory/Factory.react-query.ts b/__output__/vectis/factory-query-factory/Factory.react-query.ts
new file mode 100644
index 00000000..e233c2bb
--- /dev/null
+++ b/__output__/vectis/factory-query-factory/Factory.react-query.ts
@@ -0,0 +1,114 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+export const factoryQueryKeys = {
+  contract: ([{
+    contract: "factory"
+  }] as const),
+  address: (contractAddress: string) => ([{ ...factoryQueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets",
+    args
+  }] as const),
+  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets_of",
+    args
+  }] as const),
+  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "code_id",
+    args
+  }] as const),
+  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "fee",
+    args
+  }] as const),
+  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "govec_addr",
+    args
+  }] as const),
+  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+    method: "admin_addr",
+    args
+  }] as const)
+};
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
+  client: FactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
+  client,
+  options
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client.contractAddress), () => client.adminAddr(), options);
+}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
+  client,
+  options
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client.contractAddress), () => client.govecAddr(), options);
+}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
+  client,
+  options
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client.contractAddress), () => client.fee(), options);
+}
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
+  args: {
+    ty: CodeIdType;
+  };
+}
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
+  client,
+  args,
+  options
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client.contractAddress, args), () => client.codeId({
+    ty: args.ty
+  }), options);
+}
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  };
+}
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client.contractAddress, args), () => client.walletsOf({
+    limit: args.limit,
+    startAfter: args.startAfter,
+    user: args.user
+  }), options);
+}
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  };
+}
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client.contractAddress, args), () => client.wallets({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index e233c2bb..76a77dda 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -39,6 +39,74 @@ export const factoryQueryKeys = {
     args
   }] as const)
 };
+export const factoryQueries = {
+  wallets: <TData = WalletsResponse,>({
+    client,
+    options,
+    args
+  }: FactoryWalletsQuery<TData>): UseQueryOptions<WalletsResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.wallets(client?.contractAddress, args),
+    queryFn: () => client.wallets({
+      limit: args.limit,
+      startAfter: args.startAfter
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  walletsOf: <TData = WalletsOfResponse,>({
+    client,
+    options,
+    args
+  }: FactoryWalletsOfQuery<TData>): UseQueryOptions<WalletsOfResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.walletsOf(client?.contractAddress, args),
+    queryFn: () => client.walletsOf({
+      limit: args.limit,
+      startAfter: args.startAfter,
+      user: args.user
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  codeId: <TData = CodeIdResponse,>({
+    client,
+    options,
+    args
+  }: FactoryCodeIdQuery<TData>): UseQueryOptions<CodeIdResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.codeId(client?.contractAddress, args),
+    queryFn: () => client.codeId({
+      ty: args.ty
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  fee: <TData = FeeResponse,>({
+    client,
+    options
+  }: FactoryFeeQuery<TData>): UseQueryOptions<FeeResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.fee(client?.contractAddress),
+    queryFn: () => client.fee(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  govecAddr: <TData = GovecAddrResponse,>({
+    client,
+    options
+  }: FactoryGovecAddrQuery<TData>): UseQueryOptions<GovecAddrResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.govecAddr(client?.contractAddress),
+    queryFn: () => client.govecAddr(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  adminAddr: <TData = AdminAddrResponse,>({
+    client,
+    options
+  }: FactoryAdminAddrQuery<TData>): UseQueryOptions<AdminAddrResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.adminAddr(client?.contractAddress),
+    queryFn: () => client.adminAddr(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  })
+};
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: UseQueryOptions<TResponse, Error, TData>;
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 74fa6618..692ee668 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -35,6 +35,16 @@ it('queryKeys', async () => {
     await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true });
 })
 
+it('queryFactory', async () => {
+  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
+})
+
+
 
 it('queryKeysOptionalClient', async () => {
     const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 48bb0f00..27a070e2 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -10,6 +10,7 @@ export interface ReactQueryOptions {
     mutations?: boolean;
     camelize?: boolean;
     queryKeys?: boolean
+    queryFactory?: boolean
 }
 
 export interface TSClientOptions {
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 927b8e7f..4156379a 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -23,6 +23,7 @@ import {
 import { ReactQueryOptions, RenderContext } from '../context';
 import { JSONSchema } from '../types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
+import { ArrowFunctionExpression, objectExpression } from '@babel/types';
 
 interface ReactQueryHookQuery {
   context: RenderContext;
@@ -35,6 +36,17 @@ interface ReactQueryHookQuery {
   jsonschema: any;
 }
 
+interface ParsedQueryMsg {
+  underscoreName: string;
+  methodName: string;
+  hookParamsTypeName: string;
+  hookName: string;
+  responseType: string;
+  getterKey: string;
+  jsonschema: any;
+  // jsonschema: JSONSchema;
+}
+
 interface ReactQueryHooks {
   context: RenderContext;
   queryMsg: QueryMsg;
@@ -69,16 +81,8 @@ export const createReactQueryHooks = ({
     );
   }
 
-  body.push(
-    createReactQueryHookGenericInterface({
-      context,
-      QueryClient,
-      genericQueryInterfaceName
-    })
-  );
-
-  body.push(
-    ...getMessageProperties(queryMsg).reduce((m, schema) => {
+  const queryMsgs: ParsedQueryMsg[] = getMessageProperties(queryMsg).map(
+    (schema) => {
       // list_voters
       const underscoreName = Object.keys(schema.properties)[0];
       // listVoters
@@ -94,33 +98,184 @@ export const createReactQueryHooks = ({
       // cw3FlexMultisigListVoters
       const getterKey = camel(`${contractName}${pascal(methodName)}`);
       const jsonschema = schema.properties[underscoreName];
-      return [
-        createReactQueryHookInterface({
-          context,
-          hookParamsTypeName,
-          responseType,
-          queryInterfaceName: genericQueryInterfaceName,
-          QueryClient,
-          jsonschema
-        }),
-        createReactQueryHook({
-          context,
+
+      return {
+        underscoreName,
+        methodName,
+        hookParamsTypeName,
+        hookName,
+        responseType,
+        getterKey,
+        jsonschema
+      };
+    }
+  );
+
+  const queryFactoryName = `${camel(contractName)}Queries`;
+  if (options.queryFactory) {
+    body.push(
+      createReactQueryFactory({
+        context,
+        queryFactoryName,
+        queryKeysName,
+        queryMsgs,
+      })
+    );
+  }
+
+  body.push(
+    createReactQueryHookGenericInterface({
+      context,
+      QueryClient,
+      genericQueryInterfaceName
+    })
+  );
+
+  body.push(
+    ...queryMsgs.reduce(
+      (
+        m,
+        {
           methodName,
-          hookName,
           hookParamsTypeName,
-          queryKeysName,
+          hookName,
           responseType,
-          hookKeyName: getterKey,
+          getterKey,
           jsonschema
-        }),
-        ...m
-      ];
-    }, [])
+        }
+      ) => {
+        return [
+          createReactQueryHookInterface({
+            context,
+            hookParamsTypeName,
+            responseType,
+            queryInterfaceName: genericQueryInterfaceName,
+            QueryClient,
+            jsonschema
+          }),
+          createReactQueryHook({
+            context,
+            methodName,
+            hookName,
+            hookParamsTypeName,
+            queryKeysName,
+            responseType,
+            hookKeyName: getterKey,
+            jsonschema
+          }),
+          ...m
+        ];
+      },
+      []
+    )
   );
 
   return body;
 };
 
+function buildQueryFn(
+  methodName: string,
+  jsonschema: any,
+  options: ReactQueryOptions
+): ArrowFunctionExpression {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  let args = [];
+  if (keys.length) {
+    args = [
+      t.objectExpression([
+        ...keys.map((prop) => {
+          return t.objectProperty(
+            t.identifier(camel(prop)),
+            t.memberExpression(t.identifier('args'), t.identifier(camel(prop)))
+          );
+        })
+      ])
+    ];
+  }
+
+  const rejectInvalidClient = t.callExpression(
+    t.memberExpression(t.identifier('Promise'), t.identifier('reject')),
+    [
+      t.newExpression(t.identifier('Error'), [
+        t.stringLiteral('Invalid client')
+      ])
+    ]
+  );
+
+  return t.arrowFunctionExpression(
+    [],
+    optionalConditionalExpression(
+      t.identifier('client'),
+      t.callExpression(
+        t.memberExpression(t.identifier('client'), t.identifier(methodName)),
+        args
+      ),
+      rejectInvalidClient,
+      options.optionalClient
+    ),
+    false
+  );
+}
+
+const ENABLED_QUERY_OPTION = t.objectProperty(
+  t.identifier('enabled'),
+  t.logicalExpression(
+    '&&',
+    t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))),
+    t.conditionalExpression(
+      // explicitly check for undefined
+      t.binaryExpression(
+        '!=',
+        t.optionalMemberExpression(
+          t.identifier('options'),
+          t.identifier('enabled'),
+          false,
+          true
+        ),
+        t.identifier('undefined')
+      ),
+      t.memberExpression(t.identifier('options'), t.identifier('enabled')),
+      t.booleanLiteral(true)
+    )
+  )
+);
+
+function buildQueryOptions(options: ReactQueryOptions) {
+  return options.optionalClient
+    ? t.objectExpression([
+        t.spreadElement(t.identifier('options')),
+        t.objectProperty(
+          t.identifier('enabled'),
+          t.logicalExpression(
+            '&&',
+            t.unaryExpression(
+              '!',
+              t.unaryExpression('!', t.identifier('client'))
+            ),
+            t.conditionalExpression(
+              // explicitly check for undefined
+              t.binaryExpression(
+                '!=',
+                t.optionalMemberExpression(
+                  t.identifier('options'),
+                  t.identifier('enabled'),
+                  false,
+                  true
+                ),
+                t.identifier('undefined')
+              ),
+              t.memberExpression(
+                t.identifier('options'),
+                t.identifier('enabled')
+              ),
+              t.booleanLiteral(true)
+            )
+          )
+        )
+      ])
+    : t.identifier('options');
+}
+
 export const createReactQueryHook = ({
   context,
   hookName,
@@ -136,26 +291,13 @@ export const createReactQueryHook = ({
 
   const options = context.options.reactQuery;
   const keys = Object.keys(jsonschema.properties ?? {});
-  let args = [];
-  if (keys.length) {
-    args = [
-      t.objectExpression([
-        ...keys.map((prop) => {
-          return t.objectProperty(
-            t.identifier(camel(prop)),
-            t.memberExpression(t.identifier('args'), t.identifier(camel(prop)))
-          );
-        })
-      ])
-    ];
-  }
 
   let props = ['client', 'options'];
   if (keys.length) {
     props = ['client', 'args', 'options'];
   }
 
-  const selectResponseGenericTypeName = 'TData';
+  const selectResponseGenericTypeName = GENERIC_SELECT_RESPONSE_NAME;
 
   const queryFunctionDeclaration = t.functionDeclaration(
     t.identifier(hookName),
@@ -193,65 +335,8 @@ export const createReactQueryHook = ({
               props,
               options
             }),
-            t.arrowFunctionExpression(
-              [],
-              optionalConditionalExpression(
-                t.identifier('client'),
-                t.callExpression(
-                  t.memberExpression(
-                    t.identifier('client'),
-                    t.identifier(methodName)
-                  ),
-                  args
-                ),
-                t.callExpression(
-                  t.memberExpression(
-                    t.identifier('Promise'),
-                    t.identifier('reject')
-                  ),
-                  [
-                    t.newExpression(t.identifier('Error'), [
-                      t.stringLiteral('Invalid client')
-                    ])
-                  ]
-                ),
-                options.optionalClient
-              ),
-              false
-            ),
-            options.optionalClient
-              ? t.objectExpression([
-                  t.spreadElement(t.identifier('options')),
-                  t.objectProperty(
-                    t.identifier('enabled'),
-                    t.logicalExpression(
-                      '&&',
-                      t.unaryExpression(
-                        '!',
-                        t.unaryExpression('!', t.identifier('client'))
-                      ),
-                      t.conditionalExpression(
-                        // explicitly check for undefined
-                        t.binaryExpression(
-                          '!=',
-                          t.optionalMemberExpression(
-                            t.identifier('options'),
-                            t.identifier('enabled'),
-                            false,
-                            true
-                          ),
-                          t.identifier('undefined')
-                        ),
-                        t.memberExpression(
-                          t.identifier('options'),
-                          t.identifier('enabled')
-                        ),
-                        t.booleanLiteral(true)
-                      )
-                    )
-                  )
-                ])
-              : t.identifier('options')
+            buildQueryFn(methodName, jsonschema, options),
+            buildQueryOptions(options)
           ],
           t.tsTypeParameterInstantiation([
             t.tsTypeReference(t.identifier(responseType)),
@@ -663,21 +748,128 @@ function createReactQueryKeys({
   );
 }
 
+function createReactQueryFactory({
+  context,
+  queryFactoryName,
+  queryKeysName,
+  queryMsgs
+}: {
+  context: RenderContext;
+  queryFactoryName: string;
+  queryKeysName: string;
+  queryMsgs: ParsedQueryMsg[];
+}) {
+  const options = context.options.reactQuery;
+
+  return t.exportNamedDeclaration(
+    t.variableDeclaration('const', [
+      t.variableDeclarator(
+        t.identifier(queryFactoryName),
+        t.objectExpression([
+          ...queryMsgs.map(
+            ({ methodName, hookParamsTypeName, responseType, jsonschema }) => {
+              const hasArgs =
+                Object.keys(jsonschema.properties ?? {}).length > 0;
+
+              const methodQueryOptionsFn = t.arrowFunctionExpression(
+                [
+                  tsObjectPattern(
+                    [
+                      shorthandProperty('client'),
+                      ...(hasArgs ? [shorthandProperty('args')] : []),
+                      shorthandProperty('options')
+                    ],
+                    t.tsTypeAnnotation(
+                      t.tsTypeReference(
+                        t.identifier(hookParamsTypeName),
+                        t.tsTypeParameterInstantiation([
+                          t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
+                        ])
+                      )
+                    )
+                  )
+                ],
+                t.objectExpression([
+                  // 1: queryKey
+                  t.objectProperty(
+                    t.identifier('queryKey'),
+                    t.callExpression(
+                      t.memberExpression(
+                        t.identifier(queryKeysName),
+                        t.identifier(methodName)
+                      ),
+                      [
+                        t.optionalMemberExpression(
+                          t.identifier('client'),
+                          t.identifier('contractAddress'),
+                          false,
+                          true
+                        ),
+                        ...(hasArgs ? [t.identifier('args')] : [])
+                      ]
+                    )
+                  ),
+                  // 2: queryFn
+                  t.objectProperty(
+                    t.identifier('queryFn'),
+                    buildQueryFn(methodName, jsonschema, options)
+                  ),
+                  // 3: spread options
+                  t.spreadElement(t.identifier('options')),
+                  // 4. enabled
+                  ENABLED_QUERY_OPTION
+                ])
+              );
+
+              methodQueryOptionsFn.typeParameters =
+                t.tsTypeParameterDeclaration([
+                  t.tsTypeParameter(
+                    undefined,
+                    t.tsTypeReference(t.identifier(responseType)),
+                    GENERIC_SELECT_RESPONSE_NAME
+                  )
+                ]);
+
+              methodQueryOptionsFn.returnType = t.tsTypeAnnotation(
+                t.tsTypeReference(
+                  t.identifier('UseQueryOptions'),
+                  t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier(responseType)),
+                    t.tsTypeReference(t.identifier('Error')),
+                    t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
+                  ])
+                )
+              );
+
+              return t.objectProperty(
+                // key id is the camel method name
+                t.identifier(camel(methodName)),
+                methodQueryOptionsFn
+              );
+            }
+          )
+        ])
+      )
+    ])
+  );
+}
+
 interface ReactQueryHookGenericInterface {
   context: RenderContext;
   QueryClient: string;
   genericQueryInterfaceName: string;
 }
 
+const GENERIC_SELECT_RESPONSE_NAME = 'TData';
+
 function createReactQueryHookGenericInterface({
   context,
   QueryClient,
   genericQueryInterfaceName
 }: ReactQueryHookGenericInterface) {
-  const options = context.options.reactQuery;
 
+  const options = context.options.reactQuery;
   const genericResponseTypeName = 'TResponse';
-  const genericSelectResponseTypeName = 'TData';
 
   context.addUtil('UseQueryOptions');
 
@@ -687,7 +879,7 @@ function createReactQueryHookGenericInterface({
     t.tsTypeParameterInstantiation([
       t.tsTypeReference(t.identifier(genericResponseTypeName)),
       t.tsTypeReference(t.identifier('Error')),
-      t.tsTypeReference(t.identifier(genericSelectResponseTypeName))
+      t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
     ])
   );
 
@@ -736,7 +928,7 @@ function createReactQueryHookGenericInterface({
         t.tsTypeParameter(
           undefined,
           t.tSTypeReference(t.identifier(genericResponseTypeName)),
-          genericSelectResponseTypeName
+          GENERIC_SELECT_RESPONSE_NAME
         )
       ]),
       [],
@@ -784,7 +976,7 @@ export const createReactQueryHookInterface = ({
     t.tsInterfaceDeclaration(
       t.identifier(hookParamsTypeName),
       t.tsTypeParameterDeclaration([
-        t.tSTypeParameter(undefined, undefined, 'TData')
+        t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME)
       ]),
       [
         t.tSExpressionWithTypeArguments(
@@ -793,7 +985,7 @@ export const createReactQueryHookInterface = ({
             // 1: response
             t.tsTypeReference(t.identifier(responseType)),
             // 2: select generic
-            t.tSTypeReference(t.identifier('TData'))
+            t.tSTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
           ])
         )
       ],
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 28fe022d..e595f00b 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -6,6 +6,7 @@ export interface ReactQueryOptions {
     mutations?: boolean;
     camelize?: boolean;
     queryKeys?: boolean;
+    queryFactory?: boolean;
 }
 export interface TSClientOptions {
     enabled?: boolean;

From 1e700d5c10d2c1eda945e075e47493b13d43e5c2 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:21:03 -0500
Subject: [PATCH 063/287] Add factory snapshots

---
 .../__snapshots__/react-query.spec.ts.snap    | 396 ++++++++++++++++++
 .../src/react-query/react-query.spec.ts       |  17 +
 2 files changed, 413 insertions(+)

diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index afd93450..f558323d 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -729,6 +729,402 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
 `;
 
 exports[`createReactQueryHooks 5`] = `
+"export const sg721QueryKeys = {
+  contract: ([{
+    contract: \\"sg721\\"
+  }] as const),
+  address: (contractAddress: string | undefined) => ([{ ...sg721QueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  ownerOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"owner_of\\",
+    args
+  }] as const),
+  approval: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"approval\\",
+    args
+  }] as const),
+  approvals: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"approvals\\",
+    args
+  }] as const),
+  allOperators: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"all_operators\\",
+    args
+  }] as const),
+  numTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"num_tokens\\",
+    args
+  }] as const),
+  contractInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"contract_info\\",
+    args
+  }] as const),
+  nftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"nft_info\\",
+    args
+  }] as const),
+  allNftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"all_nft_info\\",
+    args
+  }] as const),
+  tokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"tokens\\",
+    args
+  }] as const),
+  allTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"all_tokens\\",
+    args
+  }] as const),
+  minter: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"minter\\",
+    args
+  }] as const),
+  collectionInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
+    method: \\"collection_info\\",
+    args
+  }] as const)
+};
+export const sg721Queries = {
+  ownerOf: <TData = OwnerOfResponse,>({
+    client,
+    args,
+    options
+  }: Sg721OwnerOfQuery<TData>): UseQueryOptions<OwnerOfResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.ownerOf(client?.contractAddress, args),
+    queryFn: () => client ? client.ownerOf({
+      includeExpired: args.includeExpired,
+      tokenId: args.tokenId
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  approval: <TData = ApprovalResponse,>({
+    client,
+    args,
+    options
+  }: Sg721ApprovalQuery<TData>): UseQueryOptions<ApprovalResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.approval(client?.contractAddress, args),
+    queryFn: () => client ? client.approval({
+      includeExpired: args.includeExpired,
+      spender: args.spender,
+      tokenId: args.tokenId
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  approvals: <TData = ApprovalsResponse,>({
+    client,
+    args,
+    options
+  }: Sg721ApprovalsQuery<TData>): UseQueryOptions<ApprovalsResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.approvals(client?.contractAddress, args),
+    queryFn: () => client ? client.approvals({
+      includeExpired: args.includeExpired,
+      tokenId: args.tokenId
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  allOperators: <TData = AllOperatorsResponse,>({
+    client,
+    args,
+    options
+  }: Sg721AllOperatorsQuery<TData>): UseQueryOptions<AllOperatorsResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.allOperators(client?.contractAddress, args),
+    queryFn: () => client ? client.allOperators({
+      includeExpired: args.includeExpired,
+      limit: args.limit,
+      owner: args.owner,
+      startAfter: args.startAfter
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  numTokens: <TData = NumTokensResponse,>({
+    client,
+    options
+  }: Sg721NumTokensQuery<TData>): UseQueryOptions<NumTokensResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.numTokens(client?.contractAddress),
+    queryFn: () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  contractInfo: <TData = ContractInfoResponse,>({
+    client,
+    options
+  }: Sg721ContractInfoQuery<TData>): UseQueryOptions<ContractInfoResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.contractInfo(client?.contractAddress),
+    queryFn: () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  nftInfo: <TData = NftInfoResponse,>({
+    client,
+    args,
+    options
+  }: Sg721NftInfoQuery<TData>): UseQueryOptions<NftInfoResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.nftInfo(client?.contractAddress, args),
+    queryFn: () => client ? client.nftInfo({
+      tokenId: args.tokenId
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  allNftInfo: <TData = AllNftInfoResponse,>({
+    client,
+    args,
+    options
+  }: Sg721AllNftInfoQuery<TData>): UseQueryOptions<AllNftInfoResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.allNftInfo(client?.contractAddress, args),
+    queryFn: () => client ? client.allNftInfo({
+      includeExpired: args.includeExpired,
+      tokenId: args.tokenId
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  tokens: <TData = TokensResponse,>({
+    client,
+    args,
+    options
+  }: Sg721TokensQuery<TData>): UseQueryOptions<TokensResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.tokens(client?.contractAddress, args),
+    queryFn: () => client ? client.tokens({
+      limit: args.limit,
+      owner: args.owner,
+      startAfter: args.startAfter
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  allTokens: <TData = AllTokensResponse,>({
+    client,
+    args,
+    options
+  }: Sg721AllTokensQuery<TData>): UseQueryOptions<AllTokensResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.allTokens(client?.contractAddress, args),
+    queryFn: () => client ? client.allTokens({
+      limit: args.limit,
+      startAfter: args.startAfter
+    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  minter: <TData = MinterResponse,>({
+    client,
+    options
+  }: Sg721MinterQuery<TData>): UseQueryOptions<MinterResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.minter(client?.contractAddress),
+    queryFn: () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  collectionInfo: <TData = CollectionInfoResponse,>({
+    client,
+    options
+  }: Sg721CollectionInfoQuery<TData>): UseQueryOptions<CollectionInfoResponse, Error, TData> => ({
+    queryKey: sg721QueryKeys.collectionInfo(client?.contractAddress),
+    queryFn: () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  })
+};
+export interface Sg721ReactQuery<TResponse, TData = TResponse> {
+  client: Sg721QueryClient | undefined;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+    initialData?: undefined;
+  };
+}
+export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
+  client,
+  options
+}: Sg721CollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>(sg721QueryKeys.collectionInfo(client?.contractAddress), () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
+export function useSg721MinterQuery<TData = MinterResponse>({
+  client,
+  options
+}: Sg721MinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>(sg721QueryKeys.minter(client?.contractAddress), () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+  };
+}
+export function useSg721AllTokensQuery<TData = AllTokensResponse>({
+  client,
+  args,
+  options
+}: Sg721AllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>(sg721QueryKeys.allTokens(client?.contractAddress, args), () => client ? client.allTokens({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721TokensQuery<TData> extends Sg721ReactQuery<TokensResponse, TData> {
+  args: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  };
+}
+export function useSg721TokensQuery<TData = TokensResponse>({
+  client,
+  args,
+  options
+}: Sg721TokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>(sg721QueryKeys.tokens(client?.contractAddress, args), () => client ? client.tokens({
+    limit: args.limit,
+    owner: args.owner,
+    startAfter: args.startAfter
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721AllNftInfoQuery<TData> extends Sg721ReactQuery<AllNftInfoResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
+  client,
+  args,
+  options
+}: Sg721AllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>(sg721QueryKeys.allNftInfo(client?.contractAddress, args), () => client ? client.allNftInfo({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721NftInfoQuery<TData> extends Sg721ReactQuery<NftInfoResponse, TData> {
+  args: {
+    tokenId: string;
+  };
+}
+export function useSg721NftInfoQuery<TData = NftInfoResponse>({
+  client,
+  args,
+  options
+}: Sg721NftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>(sg721QueryKeys.nftInfo(client?.contractAddress, args), () => client ? client.nftInfo({
+    tokenId: args.tokenId
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721ContractInfoQuery<TData> extends Sg721ReactQuery<ContractInfoResponse, TData> {}
+export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
+  client,
+  options
+}: Sg721ContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>(sg721QueryKeys.contractInfo(client?.contractAddress), () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
+export function useSg721NumTokensQuery<TData = NumTokensResponse>({
+  client,
+  options
+}: Sg721NumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>(sg721QueryKeys.numTokens(client?.contractAddress), () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  };
+}
+export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
+  client,
+  args,
+  options
+}: Sg721AllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>(sg721QueryKeys.allOperators(client?.contractAddress, args), () => client ? client.allOperators({
+    includeExpired: args.includeExpired,
+    limit: args.limit,
+    owner: args.owner,
+    startAfter: args.startAfter
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721ApprovalsQuery<TData> extends Sg721ReactQuery<ApprovalsResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
+  client,
+  args,
+  options
+}: Sg721ApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>(sg721QueryKeys.approvals(client?.contractAddress, args), () => client ? client.approvals({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721ApprovalQuery<TData> extends Sg721ReactQuery<ApprovalResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  };
+}
+export function useSg721ApprovalQuery<TData = ApprovalResponse>({
+  client,
+  args,
+  options
+}: Sg721ApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>(sg721QueryKeys.approval(client?.contractAddress, args), () => client ? client.approval({
+    includeExpired: args.includeExpired,
+    spender: args.spender,
+    tokenId: args.tokenId
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}
+export interface Sg721OwnerOfQuery<TData> extends Sg721ReactQuery<OwnerOfResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
+  client,
+  args,
+  options
+}: Sg721OwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>(sg721QueryKeys.ownerOf(client?.contractAddress, args), () => client ? client.ownerOf({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
+}"
+`;
+
+exports[`createReactQueryHooks 6`] = `
 "export interface Sg721BurnMutation {
   client: Sg721Client;
   msg: {
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
index 1a2dcdfb..7198b8a2 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.spec.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
@@ -62,6 +62,23 @@ it('createReactQueryHooks', () => {
         QueryClient: 'Sg721QueryClient'
       }
     )))
+  expectCode(
+    t.program(
+      createReactQueryHooks({
+        context: makeContext(query_msg, {
+          reactQuery: {
+            optionalClient: true,
+            version: 'v4',
+            queryKeys: true,
+            queryFactory: true
+          }
+        }),
+        queryMsg: query_msg,
+        contractName: 'Sg721',
+        QueryClient: 'Sg721QueryClient'
+      })
+    )
+  );
   expectCode(t.program(
     createReactQueryMutationHooks(
       {

From fca2414cfa3dd06b5f2893f1b66c2f1a533141da Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:25:58 -0500
Subject: [PATCH 064/287] Add query factory questions

---
 packages/ts-codegen/src/commands/generate.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index 182313d7..db7351e7 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -90,6 +90,20 @@ export default async (argv) => {
         ])
     };
     const { mutations } = await prompt(questions3, argv);
+
+    const queryFactoryQuestions  = [];
+    if (queryKeys) {
+      [].push.apply(queryFactoryQuestions, [
+        // Only can use queryFactory if queryKeys is enabled
+        {
+          type: 'confirm',
+          name: 'queryFactory',
+          message: 'queryFactory? ',
+          default: false
+        }
+      ])
+    };
+    const { queryFactory } = await prompt(queryFactoryQuestions, argv);
     ///////// END REACT QUERY
 
     ///////// BUNDLE
@@ -128,7 +142,8 @@ export default async (argv) => {
             optionalClient,
             queryKeys,
             version,
-            mutations
+            mutations,
+            queryFactory
         },
         recoil: {
             enabled: plugin.includes('recoil'),

From 7dcdf7f36155332047f713ec4d00c00522ff0f62 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:27:05 -0500
Subject: [PATCH 065/287] Update vectis factory test

---
 .../vectis/factory-query-keys/Factory.react-query.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index 76a77dda..83c13696 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -42,8 +42,8 @@ export const factoryQueryKeys = {
 export const factoryQueries = {
   wallets: <TData = WalletsResponse,>({
     client,
-    options,
-    args
+    args,
+    options
   }: FactoryWalletsQuery<TData>): UseQueryOptions<WalletsResponse, Error, TData> => ({
     queryKey: factoryQueryKeys.wallets(client?.contractAddress, args),
     queryFn: () => client.wallets({
@@ -55,8 +55,8 @@ export const factoryQueries = {
   }),
   walletsOf: <TData = WalletsOfResponse,>({
     client,
-    options,
-    args
+    args,
+    options
   }: FactoryWalletsOfQuery<TData>): UseQueryOptions<WalletsOfResponse, Error, TData> => ({
     queryKey: factoryQueryKeys.walletsOf(client?.contractAddress, args),
     queryFn: () => client.walletsOf({
@@ -69,8 +69,8 @@ export const factoryQueries = {
   }),
   codeId: <TData = CodeIdResponse,>({
     client,
-    options,
-    args
+    args,
+    options
   }: FactoryCodeIdQuery<TData>): UseQueryOptions<CodeIdResponse, Error, TData> => ({
     queryKey: factoryQueryKeys.codeId(client?.contractAddress, args),
     queryFn: () => client.codeId({

From 79e4190c599ea7a40187e03374395c8a5af3dfee Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Mon, 24 Oct 2022 14:33:37 -0400
Subject: [PATCH 066/287] Update react-query ts-codegen readme with
 queryFactory

---
 README.md                     | 4 +++-
 packages/ts-codegen/README.md | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1046ae9b..058887e5 100644
--- a/README.md
+++ b/README.md
@@ -110,6 +110,7 @@ codegen({
       version: 'v4',
       mutations: true,
       queryKeys: true,
+      queryFactory: true,
     },
     recoil: {
       enabled: false
@@ -166,10 +167,11 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
   | option                      | description                                                                  |
-  | ----------------------------| ---------------------------------------------------------------------------- |
+-----------------------------| ----------------------------| ---------------------------------------------------------------------------- |
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+  | `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
   | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
   | `reactQuery.mutations`      | also generate mutations                                                      |
   | `reactQuery.camelize`       | use camelCase style for property names                                       |
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 1046ae9b..9cb50160 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -110,6 +110,7 @@ codegen({
       version: 'v4',
       mutations: true,
       queryKeys: true,
+      queryFactory: true,
     },
     recoil: {
       enabled: false
@@ -170,6 +171,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+  | `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
   | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
   | `reactQuery.mutations`      | also generate mutations                                                      |
   | `reactQuery.camelize`       | use camelCase style for property names                                       |

From 844a4c5a234001108b3942f01ffc2e869af304b6 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 26 Oct 2022 13:48:28 -0700
Subject: [PATCH 067/287] readme

---
 README.md                     | 2 ++
 packages/ts-codegen/README.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 058887e5..98b20239 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,13 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
+   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
+
 ```
 npm install -g @cosmwasm/ts-codegen
 ```
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 9cb50160..fe80ac88 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -10,6 +10,7 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
+   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>

From e58a660b6265fc94bdd11f311afe9fac11708c51 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 26 Oct 2022 13:48:47 -0700
Subject: [PATCH 068/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.20.0
 - wasm-ast-types@0.14.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 8a816d7c..cbd1be93 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.20.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.19.0...@cosmwasm/ts-codegen@0.20.0) (2022-10-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.19.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.18.0...@cosmwasm/ts-codegen@0.19.0) (2022-10-11)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 1417f85d..c46aa19f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.13.0"
+    "wasm-ast-types": "^0.14.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 3c40cd22..50c8bad7 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.14.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.13.0...wasm-ast-types@0.14.0) (2022-10-26)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.13.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.12.0...wasm-ast-types@0.13.0) (2022-10-11)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index cc2b381a..896acee1 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.13.0",
+  "version": "0.14.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",

From 3fa99de6d6ac0536075000d7f1922a9d0e6bcd91 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Nov 2022 15:25:02 -0800
Subject: [PATCH 069/287] noImplicitOverride option

---
 .../__tests__/__snapshots__/builder.test.ts.snap         | 2 ++
 packages/wasm-ast-types/src/client/client.ts             | 6 ++++--
 packages/wasm-ast-types/src/context/context.ts           | 4 +++-
 packages/wasm-ast-types/src/utils/babel.ts               | 9 ++++++++-
 packages/wasm-ast-types/types/context/context.d.ts       | 1 +
 .../wasm-ast-types/types/react-query/react-query.d.ts    | 4 ++--
 packages/wasm-ast-types/types/utils/babel.d.ts           | 2 +-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index fb2cd3fa..f01767f9 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -12,6 +12,7 @@ TSBuilder {
     "client": Object {
       "enabled": true,
       "execExtendsQuery": true,
+      "noImplicitOverride": false,
     },
     "messageComposer": Object {
       "enabled": false,
@@ -47,6 +48,7 @@ TSBuilder {
     "client": Object {
       "enabled": true,
       "execExtendsQuery": true,
+      "noImplicitOverride": false,
     },
     "messageComposer": Object {
       "enabled": false,
diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/wasm-ast-types/src/client/client.ts
index 06265b33..49b64984 100644
--- a/packages/wasm-ast-types/src/client/client.ts
+++ b/packages/wasm-ast-types/src/client/client.ts
@@ -414,13 +414,15 @@ export const createExecuteClass = (
     ...bindings
   ]);
 
+  const noImplicitOverride = context.options.client.noImplicitOverride && extendsClassName && context.options.client.execExtendsQuery;
+
   return t.exportNamedDeclaration(
     classDeclaration(className,
       [
         // client
         classProperty('client', t.tsTypeAnnotation(
           t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
-        )),
+        ), false, false, noImplicitOverride),
 
         // sender
         classProperty('sender', t.tsTypeAnnotation(
@@ -430,7 +432,7 @@ export const createExecuteClass = (
         // contractAddress
         classProperty('contractAddress', t.tsTypeAnnotation(
           t.tsStringKeyword()
-        )),
+        ), false, false, noImplicitOverride),
 
         // constructor
         t.classMethod('constructor',
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 27a070e2..fdbc9edc 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -16,6 +16,7 @@ export interface ReactQueryOptions {
 export interface TSClientOptions {
     enabled?: boolean;
     execExtendsQuery?: boolean;
+    noImplicitOverride?: boolean;
 }
 export interface MessageComposerOptions {
     enabled?: boolean;
@@ -70,7 +71,8 @@ export const defaultOptions: RenderOptions = {
     },
     client: {
         enabled: true,
-        execExtendsQuery: true
+        execExtendsQuery: true,
+        noImplicitOverride: false,
     },
     recoil: {
         enabled: false
diff --git a/packages/wasm-ast-types/src/utils/babel.ts b/packages/wasm-ast-types/src/utils/babel.ts
index a82ff161..4c686d6d 100644
--- a/packages/wasm-ast-types/src/utils/babel.ts
+++ b/packages/wasm-ast-types/src/utils/babel.ts
@@ -125,11 +125,18 @@ export const classDeclaration = (name: string, body: any[], implementsExressions
 };
 
 
-export const classProperty = (name: string, typeAnnotation: TSTypeAnnotation = null, isReadonly: boolean = false, isStatic: boolean = false) => {
+export const classProperty = (
+    name: string,
+    typeAnnotation: TSTypeAnnotation = null,
+    isReadonly: boolean = false,
+    isStatic: boolean = false,
+    noImplicitOverride: boolean = false
+) => {
     const prop = t.classProperty(t.identifier(name));
     if (isReadonly) prop.readonly = true;
     if (isStatic) prop.static = true;
     if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
+    if (noImplicitOverride) prop.override = true;
     return prop;
 };
 
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index e595f00b..a9d71793 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -11,6 +11,7 @@ export interface ReactQueryOptions {
 export interface TSClientOptions {
     enabled?: boolean;
     execExtendsQuery?: boolean;
+    noImplicitOverride?: boolean;
 }
 export interface MessageComposerOptions {
     enabled?: boolean;
diff --git a/packages/wasm-ast-types/types/react-query/react-query.d.ts b/packages/wasm-ast-types/types/react-query/react-query.d.ts
index b4ecf402..697ff0d7 100644
--- a/packages/wasm-ast-types/types/react-query/react-query.d.ts
+++ b/packages/wasm-ast-types/types/react-query/react-query.d.ts
@@ -43,7 +43,7 @@ export interface Cw4UpdateMembersMutation {
 }
 ```
  */
-export declare const createReactQueryMutationArgsInterface: ({ context, ExecuteClient, mutationHookParamsTypeName, useMutationTypeParameter, jsonschema, }: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
+export declare const createReactQueryMutationArgsInterface: ({ context, ExecuteClient, mutationHookParamsTypeName, useMutationTypeParameter, jsonschema }: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
 interface ReactQueryMutationHooks {
     context: RenderContext;
     execMsg: ExecuteMsg;
@@ -70,7 +70,7 @@ export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateM
   )
 ```
  */
-export declare const createReactQueryMutationHook: ({ context, mutationHookName, mutationHookParamsTypeName, execMethodName, useMutationTypeParameter, hasMsg, }: ReactQueryMutationHook) => t.ExportNamedDeclaration;
+export declare const createReactQueryMutationHook: ({ context, mutationHookName, mutationHookParamsTypeName, execMethodName, useMutationTypeParameter, hasMsg }: ReactQueryMutationHook) => t.ExportNamedDeclaration;
 interface ReactQueryHookQueryInterface {
     context: RenderContext;
     QueryClient: string;
diff --git a/packages/wasm-ast-types/types/utils/babel.d.ts b/packages/wasm-ast-types/types/utils/babel.d.ts
index e4dbac2d..2a86d792 100644
--- a/packages/wasm-ast-types/types/utils/babel.d.ts
+++ b/packages/wasm-ast-types/types/utils/babel.d.ts
@@ -17,7 +17,7 @@ export declare const bindMethod: (name: string) => t.ExpressionStatement;
 export declare const typedIdentifier: (name: string, typeAnnotation: TSTypeAnnotation, optional?: boolean) => t.Identifier;
 export declare const promiseTypeAnnotation: (name: any) => t.TSTypeAnnotation;
 export declare const classDeclaration: (name: string, body: any[], implementsExressions?: TSExpressionWithTypeArguments[], superClass?: t.Identifier) => t.ClassDeclaration;
-export declare const classProperty: (name: string, typeAnnotation?: TSTypeAnnotation, isReadonly?: boolean, isStatic?: boolean) => t.ClassProperty;
+export declare const classProperty: (name: string, typeAnnotation?: TSTypeAnnotation, isReadonly?: boolean, isStatic?: boolean, noImplicitOverride?: boolean) => t.ClassProperty;
 export declare const arrowFunctionExpression: (params: (t.Identifier | t.Pattern | t.RestElement)[], body: t.BlockStatement, returnType: t.TSTypeAnnotation, isAsync?: boolean) => t.ArrowFunctionExpression;
 export declare const recursiveNamespace: (names: any, moduleBlockBody: any) => any;
 export declare const arrayTypeNDimensions: (body: any, n: any) => any;

From 2bc52c783c63047afdc892a80413b5dfc323b119 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Nov 2022 15:34:46 -0800
Subject: [PATCH 070/287] tests

---
 .../ts-client.overrides.spec.ts.snap          | 709 ++++++++++++++++++
 .../client/test/ts-client.overrides.spec.ts   |  74 ++
 2 files changed, 783 insertions(+)
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.overrides.spec.ts

diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
new file mode 100644
index 00000000..0993ff62
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
@@ -0,0 +1,709 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Impl, execExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`Impl, execExtends, noExtendsClass 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`noImpl, execExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  override client: SigningCosmWasmClient;
+  sender: string;
+  override contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.overrides.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.overrides.spec.ts
new file mode 100644
index 00000000..c653d8b5
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.overrides.spec.ts
@@ -0,0 +1,74 @@
+import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, makeContext } from '../../../test-utils';
+
+const ctx = makeContext(execute_msg_for__empty);
+
+describe('exec', () => {
+
+})
+
+it('Impl, execExtends, noExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = false;
+    ctx.options.client.execExtendsQuery = true;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        execute_msg_for__empty
+    ))
+});
+
+it('Impl, execExtends, ExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = false;
+    ctx.options.client.execExtendsQuery = true;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        'ExtendsClassName',
+        execute_msg_for__empty
+    ))
+});
+
+it('noImpl, execExtends, ExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = true;
+    ctx.options.client.execExtendsQuery = true;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        'ExtendsClassName',
+        execute_msg_for__empty
+    ))
+});
+
+it('noImpl, noExecExtends, ExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = true;
+    ctx.options.client.execExtendsQuery = false;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        'ExtendsClassName',
+        execute_msg_for__empty
+    ))
+});
+
+it('noImpl, noExecExtends, noExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = true;
+    ctx.options.client.execExtendsQuery = false;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        execute_msg_for__empty
+    ))
+});

From 058bdfb2b76325b47b9d9cc68922f689446c108e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Nov 2022 15:39:07 -0800
Subject: [PATCH 071/287] readme

---
 README.md                     | 12 +++++++-----
 packages/ts-codegen/README.md | 15 +++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 98b20239..2dadb9ab 100644
--- a/README.md
+++ b/README.md
@@ -146,10 +146,11 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 
 #### Client Options
 
-  | option                        | description                                          |
-  | ----------------------------- | ---------------------------------------------------  |
-  | `client.enabled`              | generate TS client classes for your contracts        |
-  | `client.execExtendsQuery`     | execute should extend query message clients          |
+  | option                                  | description                                          |
+  | --------------------------------------- | ---------------------------------------------------  |
+  | `client.enabled`                        | generate TS client classes for your contracts        |
+  | `client.execExtendsQuery`               | execute should extend query message clients          |
+  | `client.noImplicit.noImplicitOverride`  | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 
@@ -479,7 +480,8 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 Checkout these related projects:
 
 * [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Cosmos chain registry and chain info.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos.
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index fe80ac88..2dadb9ab 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -16,6 +16,7 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
+
 ```
 npm install -g @cosmwasm/ts-codegen
 ```
@@ -145,10 +146,11 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 
 #### Client Options
 
-  | option                        | description                                          |
-  | ----------------------------- | ---------------------------------------------------  |
-  | `client.enabled`              | generate TS client classes for your contracts        |
-  | `client.execExtendsQuery`     | execute should extend query message clients          |
+  | option                                  | description                                          |
+  | --------------------------------------- | ---------------------------------------------------  |
+  | `client.enabled`                        | generate TS client classes for your contracts        |
+  | `client.execExtendsQuery`               | execute should extend query message clients          |
+  | `client.noImplicit.noImplicitOverride`  | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 
@@ -168,7 +170,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
   | option                      | description                                                                  |
-  | ----------------------------| ---------------------------------------------------------------------------- |
+-----------------------------| ----------------------------| ---------------------------------------------------------------------------- |
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
@@ -478,7 +480,8 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 Checkout these related projects:
 
 * [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Cosmos chain registry and chain info.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos.
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)

From ef4b39134cf220c860469ae3cae49aeab91ee80d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Nov 2022 15:39:55 -0800
Subject: [PATCH 072/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.21.0
 - wasm-ast-types@0.15.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index cbd1be93..570442fb 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.21.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.20.0...@cosmwasm/ts-codegen@0.21.0) (2022-11-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.20.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.19.0...@cosmwasm/ts-codegen@0.20.0) (2022-10-26)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index c46aa19f..68f0c466 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.14.0"
+    "wasm-ast-types": "^0.15.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 50c8bad7..13264366 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.15.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.14.0...wasm-ast-types@0.15.0) (2022-11-09)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.14.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.13.0...wasm-ast-types@0.14.0) (2022-10-26)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 896acee1..8118fe09 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.14.0",
+  "version": "0.15.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",

From 7b684a9d8d26e5a46006b3920909c5ad22b29bcf Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Nov 2022 15:44:43 -0800
Subject: [PATCH 073/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2dadb9ab..675ca22d 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
   | option                      | description                                                                  |
------------------------------| ----------------------------| ---------------------------------------------------------------------------- |
+  | ---------------------------- | ---------------------------------------------------------------------------- |
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 2dadb9ab..675ca22d 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -170,7 +170,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
   | option                      | description                                                                  |
------------------------------| ----------------------------| ---------------------------------------------------------------------------- |
+  | ---------------------------- | ---------------------------------------------------------------------------- |
   | `reactQuery.enabled`        | enable the react-query plugin                                                |
   | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
   | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |

From 390e1a9c503c79e2a2f5276e479a7791bd63f7a7 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Nov 2022 15:44:49 -0800
Subject: [PATCH 074/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.21.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 570442fb..7c80e1af 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.21.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.21.0...@cosmwasm/ts-codegen@0.21.1) (2022-11-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.21.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.20.0...@cosmwasm/ts-codegen@0.21.0) (2022-11-09)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 68f0c466..b095014d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 5a6c59c161c6c428232c37f2ceac82b0a27c0868 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 17 Nov 2022 14:18:56 -0800
Subject: [PATCH 075/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 675ca22d..045b7bb8 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ The `client` plugin will generate TS client classes for your contracts. This opt
   | --------------------------------------- | ---------------------------------------------------  |
   | `client.enabled`                        | generate TS client classes for your contracts        |
   | `client.execExtendsQuery`               | execute should extend query message clients          |
-  | `client.noImplicit.noImplicitOverride`  | should match your tsconfig noImplicitOverride option |
+  | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 675ca22d..045b7bb8 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -150,7 +150,7 @@ The `client` plugin will generate TS client classes for your contracts. This opt
   | --------------------------------------- | ---------------------------------------------------  |
   | `client.enabled`                        | generate TS client classes for your contracts        |
   | `client.execExtendsQuery`               | execute should extend query message clients          |
-  | `client.noImplicit.noImplicitOverride`  | should match your tsconfig noImplicitOverride option |
+  | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 

From 2c1947c57a11cb8c44542befe7513988a1ec248c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 17 Nov 2022 14:19:02 -0800
Subject: [PATCH 076/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.21.2
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 7c80e1af..eb91a628 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.21.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.21.1...@cosmwasm/ts-codegen@0.21.2) (2022-11-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.21.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.21.0...@cosmwasm/ts-codegen@0.21.1) (2022-11-09)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index b095014d..8fbc1acd 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From d6c1ef88330acff0bff030bb52fc759f2956bfb2 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 18 Nov 2022 12:22:45 -0800
Subject: [PATCH 077/287] Option<Thing> Nullable fix

---
 packages/ts-codegen/src/utils/cleanse.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index 2e32b7c6..b62351b0 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -13,6 +13,14 @@ const cleanFor = (str) => {
     return str;
 };
 
+const cleanNullable = (str) => {
+    if (/^Nullable_/.test(str)) {
+        str = str.replace(/^Nullable_/, 'Nullable');
+    }
+
+    return str;
+};
+
 export const cleanse = (obj) => {
     var copy;
     // Handle the 3 simple types, and null or undefined
@@ -51,12 +59,16 @@ export const cleanse = (obj) => {
 
                 if (/_for_/.test(attr)) {
                     copy[cleanFor(attr)] = cleanse(obj[attr]);
+                } else if (/^Nullable_/.test(attr)) {
+                    copy[cleanNullable(attr)] = cleanse(obj[attr]);
                 } else {
                     switch (attr) {
                         case 'title':
                         case '$ref':
                             if (typeof obj[attr] === 'string') {
-                                copy[attr] = cleanse(cleanFor(obj[attr]));
+                                copy[attr] = cleanse(
+                                    cleanNullable(cleanFor(obj[attr]))
+                                );
                             } else {
                                 copy[attr] = cleanse(obj[attr]);
                             }

From 9135105f4362a390946d93659a750d80a39e6df0 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 18 Nov 2022 12:25:45 -0800
Subject: [PATCH 078/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.22.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index eb91a628..4a9d2e0a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.21.2...@cosmwasm/ts-codegen@0.22.0) (2022-11-18)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.21.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.21.1...@cosmwasm/ts-codegen@0.21.2) (2022-11-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 8fbc1acd..fc966e57 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 0c1b60e73bf08bc491634cd2fec1a5bf49b6518c Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:05:22 -0800
Subject: [PATCH 079/287] Expand the referenced types for react query mutations

---
 .../Factory.react-query.ts                    |  1 -
 .../__snapshots__/react-query.spec.ts.snap    |  7 +++-
 .../src/react-query/react-query.ts            | 39 ++++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 93a6f935..ff1c505d 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -6,7 +6,6 @@
 
 import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
 import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient, FactoryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index f558323d..276b8fe5 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/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;
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 4156379a..bdb25618 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/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,17 @@ 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'),
+        // @ts-ignore
+        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(

From 4591946f899f4f545bd0048c75ef43f28725be47 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:12:23 -0800
Subject: [PATCH 080/287] Format

---
 packages/ts-codegen/src/cmds.js                        | 5 +----
 packages/wasm-ast-types/src/react-query/react-query.ts | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/ts-codegen/src/cmds.js b/packages/ts-codegen/src/cmds.js
index 1756a711..93fdec85 100644
--- a/packages/ts-codegen/src/cmds.js
+++ b/packages/ts-codegen/src/cmds.js
@@ -1,4 +1,3 @@
-
 import _create_boilerplate from './commands/create-boilerplate';
 import _generate from './commands/generate';
 import _install from './commands/install';
@@ -7,6 +6,4 @@ Commands['create-boilerplate'] = _create_boilerplate;
 Commands['generate'] = _generate;
 Commands['install'] = _install;
 
-  export { Commands }; 
-
-  
\ No newline at end of file
+export { Commands };
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index bdb25618..1b283338 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -413,7 +413,6 @@ export const createReactQueryMutationArgsInterface = ({
     body.push(
       t.tsPropertySignature(
         t.identifier('msg'),
-        // @ts-ignore
         msgType
       ));
   }

From 4d78cf7a1e9bdccf07ee9d44d4c0286dd1df7e9d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 25 Nov 2022 13:55:53 -0800
Subject: [PATCH 081/287] react-query

---
 __output__/vectis/factory-w-mutations/Factory.react-query.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index ff1c505d..93a6f935 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -6,6 +6,7 @@
 
 import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
 import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient, FactoryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {

From 9724a2787e6427b62e874ece3b733b5bfa5be2af Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 25 Nov 2022 13:56:05 -0800
Subject: [PATCH 082/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.23.0
 - wasm-ast-types@0.16.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 4a9d2e0a..501d770b 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.23.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.22.0...@cosmwasm/ts-codegen@0.23.0) (2022-11-25)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.22.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.21.2...@cosmwasm/ts-codegen@0.22.0) (2022-11-18)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index fc966e57..8b305c71 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.15.0"
+    "wasm-ast-types": "^0.16.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 13264366..3908c583 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.16.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.15.0...wasm-ast-types@0.16.0) (2022-11-25)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.15.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.14.0...wasm-ast-types@0.15.0) (2022-11-09)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 8118fe09..0b041e15 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/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",

From e87d9f01d53288c7bf47f5072fa1d3d646240aca Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 25 Nov 2022 16:43:44 -0800
Subject: [PATCH 083/287] fixtures

---
 __output__/vectis/factory-w-mutations/Factory.react-query.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 93a6f935..ff1c505d 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -6,7 +6,6 @@
 
 import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
 import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient, FactoryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {

From 1530f4ef9d23fa18af8a577ecedb545af8aad33c Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 27 Nov 2022 22:24:23 -0800
Subject: [PATCH 084/287] Re-add missing StdFee and Coin imports to react query
 mutations

---
 .../vectis/factory-w-mutations/Factory.react-query.ts       | 1 +
 packages/wasm-ast-types/src/react-query/react-query.ts      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index ff1c505d..93a6f935 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -6,6 +6,7 @@
 
 import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
 import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient, FactoryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 1b283338..6a6a50a5 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -407,16 +407,20 @@ export const createReactQueryMutationArgsInterface = ({
     )
   ];
 
-  const msgType = createTypedObjectParams(context, jsonschema).typeAnnotation as unknown as t.TSTypeAnnotation
+  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation
 
   if (msgType) {
     body.push(
       t.tsPropertySignature(
         t.identifier('msg'),
+        // @ts-ignore
         msgType
       ));
   }
 
+  context.addUtil('StdFee');
+  context.addUtil('Coin');
+
   const optionalArgs = t.tsPropertySignature(
     t.identifier('args'),
     t.tsTypeAnnotation(

From cffa2acebb86f3c1f96fb00c4abae5ba0987e63e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 2 Dec 2022 15:38:44 +1000
Subject: [PATCH 085/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.24.0
 - wasm-ast-types@0.17.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 501d770b..6b1652f4 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.24.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.23.0...@cosmwasm/ts-codegen@0.24.0) (2022-12-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.23.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.22.0...@cosmwasm/ts-codegen@0.23.0) (2022-11-25)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 8b305c71..d0ba0a60 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.16.0"
+    "wasm-ast-types": "^0.17.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 3908c583..4b71a8c3 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.17.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.16.0...wasm-ast-types@0.17.0) (2022-12-02)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.16.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.15.0...wasm-ast-types@0.16.0) (2022-11-25)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 0b041e15..4c853b3a 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.16.0",
+  "version": "0.17.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",

From 259629513d3bb037ab7d95d2062304521ebe687e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 Feb 2023 19:28:27 -0800
Subject: [PATCH 086/287] arrays

---
 __fixtures__/wager/cw-wager.json              | 1031 +++++++++++++++++
 .../ts-client.wager.spec.ts.snap              |   54 +
 .../src/client/test/ts-client.wager.spec.ts   |   53 +
 packages/wasm-ast-types/src/utils/types.ts    |    9 +-
 4 files changed, 1146 insertions(+), 1 deletion(-)
 create mode 100644 __fixtures__/wager/cw-wager.json
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts

diff --git a/__fixtures__/wager/cw-wager.json b/__fixtures__/wager/cw-wager.json
new file mode 100644
index 00000000..f0460f1b
--- /dev/null
+++ b/__fixtures__/wager/cw-wager.json
@@ -0,0 +1,1031 @@
+{
+  "contract_name": "cw-wager",
+  "contract_version": "0.1.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "amounts",
+      "collection_address",
+      "expiries",
+      "fairburn_bps",
+      "fee_address",
+      "fee_bps",
+      "matchmaking_expiry",
+      "max_currencies"
+    ],
+    "properties": {
+      "amounts": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/Uint128"
+        }
+      },
+      "collection_address": {
+        "type": "string"
+      },
+      "expiries": {
+        "type": "array",
+        "items": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "fairburn_bps": {
+        "type": "integer",
+        "format": "uint64",
+        "minimum": 0.0
+      },
+      "fee_address": {
+        "type": "string"
+      },
+      "fee_bps": {
+        "type": "integer",
+        "format": "uint64",
+        "minimum": 0.0
+      },
+      "matchmaking_expiry": {
+        "type": "integer",
+        "format": "uint64",
+        "minimum": 0.0
+      },
+      "max_currencies": {
+        "type": "integer",
+        "format": "uint8",
+        "minimum": 0.0
+      }
+    },
+    "additionalProperties": false,
+    "definitions": {
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "description": "Privileged",
+        "type": "object",
+        "required": [
+          "update_config"
+        ],
+        "properties": {
+          "update_config": {
+            "type": "object",
+            "required": [
+              "params"
+            ],
+            "properties": {
+              "params": {
+                "$ref": "#/definitions/ParamInfo"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Use Authz",
+        "type": "object",
+        "required": [
+          "set_winner"
+        ],
+        "properties": {
+          "set_winner": {
+            "type": "object",
+            "required": [
+              "current_prices",
+              "prev_prices",
+              "wager_key"
+            ],
+            "properties": {
+              "current_prices": {
+                "type": "array",
+                "items": [
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              },
+              "prev_prices": {
+                "type": "array",
+                "items": [
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              },
+              "wager_key": {
+                "type": "array",
+                "items": [
+                  {
+                    "type": "array",
+                    "items": [
+                      {
+                        "$ref": "#/definitions/Addr"
+                      },
+                      {
+                        "type": "integer",
+                        "format": "uint64",
+                        "minimum": 0.0
+                      }
+                    ],
+                    "maxItems": 2,
+                    "minItems": 2
+                  },
+                  {
+                    "type": "array",
+                    "items": [
+                      {
+                        "$ref": "#/definitions/Addr"
+                      },
+                      {
+                        "type": "integer",
+                        "format": "uint64",
+                        "minimum": 0.0
+                      }
+                    ],
+                    "maxItems": 2,
+                    "minItems": 2
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "User-facing",
+        "type": "object",
+        "required": [
+          "wager"
+        ],
+        "properties": {
+          "wager": {
+            "type": "object",
+            "required": [
+              "against_currencies",
+              "currency",
+              "expiry",
+              "token"
+            ],
+            "properties": {
+              "against_currencies": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/Currency"
+                }
+              },
+              "currency": {
+                "$ref": "#/definitions/Currency"
+              },
+              "expiry": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
+              "token": {
+                "type": "array",
+                "items": [
+                  {
+                    "$ref": "#/definitions/Addr"
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "cancel"
+        ],
+        "properties": {
+          "cancel": {
+            "type": "object",
+            "required": [
+              "token"
+            ],
+            "properties": {
+              "token": {
+                "type": "array",
+                "items": [
+                  {
+                    "$ref": "#/definitions/Addr"
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Addr": {
+        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+        "type": "string"
+      },
+      "Currency": {
+        "type": "string",
+        "enum": [
+          "dot",
+          "avax",
+          "uni",
+          "atom",
+          "link",
+          "near",
+          "icp",
+          "sand",
+          "btc",
+          "eth",
+          "bnb",
+          "xrp",
+          "ada",
+          "doge",
+          "sol",
+          "mana",
+          "cake",
+          "ar",
+          "osmo",
+          "rune",
+          "luna",
+          "ustc",
+          "stars",
+          "mir"
+        ]
+      },
+      "ParamInfo": {
+        "type": "object",
+        "properties": {
+          "amounts": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/definitions/Uint128"
+            }
+          },
+          "collection_address": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "expiries": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "fairburn_bps": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "uint64",
+            "minimum": 0.0
+          },
+          "fee_address": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "fee_bps": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "uint64",
+            "minimum": 0.0
+          },
+          "matchmaking_expiry": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "uint64",
+            "minimum": 0.0
+          },
+          "max_currencies": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        },
+        "additionalProperties": false
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "wagers"
+        ],
+        "properties": {
+          "wagers": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "wager"
+        ],
+        "properties": {
+          "wager": {
+            "type": "object",
+            "required": [
+              "token"
+            ],
+            "properties": {
+              "token": {
+                "type": "array",
+                "items": [
+                  {
+                    "$ref": "#/definitions/Addr"
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "token_status"
+        ],
+        "properties": {
+          "token_status": {
+            "type": "object",
+            "required": [
+              "token"
+            ],
+            "properties": {
+              "token": {
+                "type": "array",
+                "items": [
+                  {
+                    "$ref": "#/definitions/Addr"
+                  },
+                  {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                ],
+                "maxItems": 2,
+                "minItems": 2
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "config"
+        ],
+        "properties": {
+          "config": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Addr": {
+        "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+        "type": "string"
+      }
+    }
+  },
+  "migrate": null,
+  "sudo": null,
+  "responses": {
+    "config": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ConfigResponse",
+      "type": "object",
+      "required": [
+        "config"
+      ],
+      "properties": {
+        "config": {
+          "$ref": "#/definitions/Config"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Config": {
+          "type": "object",
+          "required": [
+            "amounts",
+            "collection_address",
+            "expiries",
+            "fairburn_percent",
+            "fee_address",
+            "fee_percent",
+            "matchmaking_expiry",
+            "max_currencies"
+          ],
+          "properties": {
+            "amounts": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Uint128"
+              }
+            },
+            "collection_address": {
+              "$ref": "#/definitions/Addr"
+            },
+            "expiries": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "fairburn_percent": {
+              "$ref": "#/definitions/Decimal"
+            },
+            "fee_address": {
+              "$ref": "#/definitions/Addr"
+            },
+            "fee_percent": {
+              "$ref": "#/definitions/Decimal"
+            },
+            "matchmaking_expiry": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "max_currencies": {
+              "type": "integer",
+              "format": "uint8",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "token_status": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "TokenStatusResponse",
+      "type": "object",
+      "required": [
+        "token_status"
+      ],
+      "properties": {
+        "token_status": {
+          "$ref": "#/definitions/TokenStatus"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Currency": {
+          "type": "string",
+          "enum": [
+            "dot",
+            "avax",
+            "uni",
+            "atom",
+            "link",
+            "near",
+            "icp",
+            "sand",
+            "btc",
+            "eth",
+            "bnb",
+            "xrp",
+            "ada",
+            "doge",
+            "sol",
+            "mana",
+            "cake",
+            "ar",
+            "osmo",
+            "rune",
+            "luna",
+            "ustc",
+            "stars",
+            "mir"
+          ]
+        },
+        "MatchmakingItemExport": {
+          "type": "object",
+          "required": [
+            "against_currencies",
+            "amount",
+            "currency",
+            "expires_at",
+            "expiry",
+            "token"
+          ],
+          "properties": {
+            "against_currencies": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Currency"
+              }
+            },
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "currency": {
+              "$ref": "#/definitions/Currency"
+            },
+            "expires_at": {
+              "$ref": "#/definitions/Timestamp"
+            },
+            "expiry": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "token": {
+              "$ref": "#/definitions/NFT"
+            }
+          },
+          "additionalProperties": false
+        },
+        "NFT": {
+          "type": "object",
+          "required": [
+            "collection",
+            "token_id"
+          ],
+          "properties": {
+            "collection": {
+              "$ref": "#/definitions/Addr"
+            },
+            "token_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "TokenStatus": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "none"
+              ]
+            },
+            {
+              "type": "object",
+              "required": [
+                "matchmaking"
+              ],
+              "properties": {
+                "matchmaking": {
+                  "$ref": "#/definitions/MatchmakingItemExport"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "wager"
+              ],
+              "properties": {
+                "wager": {
+                  "$ref": "#/definitions/WagerExport"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        },
+        "WagerExport": {
+          "type": "object",
+          "required": [
+            "amount",
+            "expires_at",
+            "wagers"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "expires_at": {
+              "$ref": "#/definitions/Timestamp"
+            },
+            "wagers": {
+              "type": "array",
+              "items": [
+                {
+                  "$ref": "#/definitions/WagerInfo"
+                },
+                {
+                  "$ref": "#/definitions/WagerInfo"
+                }
+              ],
+              "maxItems": 2,
+              "minItems": 2
+            }
+          },
+          "additionalProperties": false
+        },
+        "WagerInfo": {
+          "type": "object",
+          "required": [
+            "currency",
+            "token"
+          ],
+          "properties": {
+            "currency": {
+              "$ref": "#/definitions/Currency"
+            },
+            "token": {
+              "$ref": "#/definitions/NFT"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "wager": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "WagerResponse",
+      "type": "object",
+      "required": [
+        "wager"
+      ],
+      "properties": {
+        "wager": {
+          "$ref": "#/definitions/WagerExport"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Currency": {
+          "type": "string",
+          "enum": [
+            "dot",
+            "avax",
+            "uni",
+            "atom",
+            "link",
+            "near",
+            "icp",
+            "sand",
+            "btc",
+            "eth",
+            "bnb",
+            "xrp",
+            "ada",
+            "doge",
+            "sol",
+            "mana",
+            "cake",
+            "ar",
+            "osmo",
+            "rune",
+            "luna",
+            "ustc",
+            "stars",
+            "mir"
+          ]
+        },
+        "NFT": {
+          "type": "object",
+          "required": [
+            "collection",
+            "token_id"
+          ],
+          "properties": {
+            "collection": {
+              "$ref": "#/definitions/Addr"
+            },
+            "token_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        },
+        "WagerExport": {
+          "type": "object",
+          "required": [
+            "amount",
+            "expires_at",
+            "wagers"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "expires_at": {
+              "$ref": "#/definitions/Timestamp"
+            },
+            "wagers": {
+              "type": "array",
+              "items": [
+                {
+                  "$ref": "#/definitions/WagerInfo"
+                },
+                {
+                  "$ref": "#/definitions/WagerInfo"
+                }
+              ],
+              "maxItems": 2,
+              "minItems": 2
+            }
+          },
+          "additionalProperties": false
+        },
+        "WagerInfo": {
+          "type": "object",
+          "required": [
+            "currency",
+            "token"
+          ],
+          "properties": {
+            "currency": {
+              "$ref": "#/definitions/Currency"
+            },
+            "token": {
+              "$ref": "#/definitions/NFT"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "wagers": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "WagersResponse",
+      "type": "object",
+      "required": [
+        "wagers"
+      ],
+      "properties": {
+        "wagers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/WagerExport"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Currency": {
+          "type": "string",
+          "enum": [
+            "dot",
+            "avax",
+            "uni",
+            "atom",
+            "link",
+            "near",
+            "icp",
+            "sand",
+            "btc",
+            "eth",
+            "bnb",
+            "xrp",
+            "ada",
+            "doge",
+            "sol",
+            "mana",
+            "cake",
+            "ar",
+            "osmo",
+            "rune",
+            "luna",
+            "ustc",
+            "stars",
+            "mir"
+          ]
+        },
+        "NFT": {
+          "type": "object",
+          "required": [
+            "collection",
+            "token_id"
+          ],
+          "properties": {
+            "collection": {
+              "$ref": "#/definitions/Addr"
+            },
+            "token_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        "Timestamp": {
+          "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Uint64"
+            }
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        },
+        "Uint64": {
+          "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+          "type": "string"
+        },
+        "WagerExport": {
+          "type": "object",
+          "required": [
+            "amount",
+            "expires_at",
+            "wagers"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "expires_at": {
+              "$ref": "#/definitions/Timestamp"
+            },
+            "wagers": {
+              "type": "array",
+              "items": [
+                {
+                  "$ref": "#/definitions/WagerInfo"
+                },
+                {
+                  "$ref": "#/definitions/WagerInfo"
+                }
+              ],
+              "maxItems": 2,
+              "minItems": 2
+            }
+          },
+          "additionalProperties": false
+        },
+        "WagerInfo": {
+          "type": "object",
+          "required": [
+            "currency",
+            "token"
+          ],
+          "properties": {
+            "currency": {
+              "$ref": "#/definitions/Currency"
+            },
+            "token": {
+              "$ref": "#/definitions/NFT"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    }
+  }
+}
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
new file mode 100644
index 00000000..84720036
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
@@ -0,0 +1,54 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
+
+exports[`query 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query classes 1`] = `
+"export class WagerQueryClient implements WagerReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.wagers = this.wagers.bind(this);
+    this.wager = this.wager.bind(this);
+    this.tokenStatus = this.tokenStatus.bind(this);
+    this.config = this.config.bind(this);
+  }
+
+  wagers = async (): Promise<WagersResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wagers: {}
+    });
+  };
+  wager = async ({
+    token
+  }: {
+    token: Addr[][];
+  }): Promise<WagerResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wager: {
+        token
+      }
+    });
+  };
+  tokenStatus = async ({
+    token
+  }: {
+    token: Addr[][];
+  }): Promise<TokenStatusResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      token_status: {
+        token
+      }
+    });
+  };
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts
new file mode 100644
index 00000000..17b91d7b
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts
@@ -0,0 +1,53 @@
+import wagerJson from '../../../../../__fixtures__/wager/cw-wager.json';
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, makeContext } from '../../../test-utils';
+
+const queryCtx = makeContext(wagerJson.query);
+const executeCtx = makeContext(wagerJson.execute);
+
+it('query', () => {
+    expectCode(createTypeInterface(
+        queryCtx,
+        wagerJson.query
+    ))
+})
+
+it('execute', () => {
+    expectCode(createTypeInterface(
+        executeCtx,
+        wagerJson.execute
+    ))
+})
+
+it('query classes', () => {
+    expectCode(createQueryClass(
+        queryCtx,
+        'WagerQueryClient',
+        'WagerReadOnlyInstance',
+        wagerJson.query
+    ))
+});
+
+// it('execute classes array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index 01de42c3..005272a6 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -147,7 +147,14 @@ export const getTypeInfo = (info: JSONSchema) => {
           throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
         }
       } else {
-        throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+        if (Array.isArray(info.items)) {
+          type = getArrayTypeFromItems(info.items);
+          // console.log(typeof info.items === 'object');
+          // console.log(Array.isArray(info.items));
+          // console.log(info);
+        } else {
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+        }
       }
     } else {
       const detect = detectType(info.type);

From 857ca4b9661677f7c1a72d0327fb327b0a318e33 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 Feb 2023 19:37:09 -0800
Subject: [PATCH 087/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.25.0
 - wasm-ast-types@0.18.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 6b1652f4..638f0b61 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.25.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.24.0...@cosmwasm/ts-codegen@0.25.0) (2023-02-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.24.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.23.0...@cosmwasm/ts-codegen@0.24.0) (2022-12-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index d0ba0a60..47389d8c 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.17.0"
+    "wasm-ast-types": "^0.18.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 4b71a8c3..8f619724 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.18.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.17.0...wasm-ast-types@0.18.0) (2023-02-26)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.17.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.16.0...wasm-ast-types@0.17.0) (2022-12-02)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 4c853b3a..db531427 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.17.0",
+  "version": "0.18.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",

From 36dd8fb41449a3b02352ee72719878e00e59223a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 1 Mar 2023 21:20:59 -0700
Subject: [PATCH 088/287] handle more array cases

---
 .../ts-client.wager.spec.ts.snap              | 78 +++++++++++++++++++
 .../src/client/test/ts-client.wager.spec.ts   | 10 +++
 packages/wasm-ast-types/src/utils/types.ts    |  9 +++
 3 files changed, 97 insertions(+)

diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
index 84720036..9bc5571a 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
@@ -2,6 +2,84 @@
 
 exports[`execute 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
+exports[`execute classes 1`] = `
+"export class WagerClient implements WagerInstance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.updateConfig = this.updateConfig.bind(this);
+    this.setWinner = this.setWinner.bind(this);
+    this.wager = this.wager.bind(this);
+    this.cancel = this.cancel.bind(this);
+  }
+
+  updateConfig = async ({
+    params
+  }: {
+    params: ParamInfo;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        params
+      }
+    }, fee, memo, funds);
+  };
+  setWinner = async ({
+    currentPrices,
+    prevPrices,
+    wagerKey
+  }: {
+    currentPrices: number[][];
+    prevPrices: number[][];
+    wagerKey: Addr[][][][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_winner: {
+        current_prices: currentPrices,
+        prev_prices: prevPrices,
+        wager_key: wagerKey
+      }
+    }, fee, memo, funds);
+  };
+  wager = async ({
+    againstCurrencies,
+    currency,
+    expiry,
+    token
+  }: {
+    againstCurrencies: Currency[];
+    currency: Currency;
+    expiry: number;
+    token: Addr[][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      wager: {
+        against_currencies: againstCurrencies,
+        currency,
+        expiry,
+        token
+      }
+    }, fee, memo, funds);
+  };
+  cancel = async ({
+    token
+  }: {
+    token: Addr[][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      cancel: {
+        token
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
 exports[`query 1`] = `"export type QueryMsg = QueryMsg;"`;
 
 exports[`query classes 1`] = `
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts
index 17b91d7b..aa43f26b 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts
@@ -33,6 +33,16 @@ it('query classes', () => {
     ))
 });
 
+it('execute classes', () => {
+    expectCode(createExecuteClass(
+        executeCtx,
+        'WagerClient',
+        'WagerInstance',
+        null,
+        wagerJson.execute
+    ))
+});
+
 // it('execute classes array types', () => {
 //     expectCode(createExecuteClass(
 //         ctx,
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index 005272a6..5c1ad2c4 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -48,6 +48,15 @@ const getTypeOrRef = (obj) => {
 const getArrayTypeFromItems = (items) => {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
+    if (items[0]?.type === 'array') {
+      return t.tsArrayType(
+        t.tsArrayType(
+          getArrayTypeFromItems(
+            items[0]
+          )
+        )
+      );
+    }
     return t.tsArrayType(
       t.tsArrayType(
         getTypeOrRef(items[0])

From e6daf701507cad95127613a815fc0fca1a883f8a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 1 Mar 2023 21:21:07 -0700
Subject: [PATCH 089/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.25.1
 - wasm-ast-types@0.18.1
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 638f0b61..8b18bbba 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.25.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.25.0...@cosmwasm/ts-codegen@0.25.1) (2023-03-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.25.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.24.0...@cosmwasm/ts-codegen@0.25.0) (2023-02-26)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 47389d8c..b89b199f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.18.0"
+    "wasm-ast-types": "^0.18.1"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 8f619724..14749ac9 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.18.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.0...wasm-ast-types@0.18.1) (2023-03-02)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.18.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.17.0...wasm-ast-types@0.18.0) (2023-02-26)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index db531427..4e2203a1 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "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",

From 4cc8a793a43e1609377102c86a935feff7ec16f1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 1 Mar 2023 21:23:15 -0700
Subject: [PATCH 090/287] fix array types

---
 .../test/__snapshots__/ts-client.wager.spec.ts.snap       | 2 +-
 packages/wasm-ast-types/src/utils/types.ts                | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
index 9bc5571a..7e9bf03d 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
@@ -36,7 +36,7 @@ exports[`execute classes 1`] = `
   }: {
     currentPrices: number[][];
     prevPrices: number[][];
-    wagerKey: Addr[][][][];
+    wagerKey: Addr[][];
   }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index 5c1ad2c4..a552f753 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -49,12 +49,8 @@ const getArrayTypeFromItems = (items) => {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
     if (items[0]?.type === 'array') {
-      return t.tsArrayType(
-        t.tsArrayType(
-          getArrayTypeFromItems(
-            items[0]
-          )
-        )
+      return getArrayTypeFromItems(
+        items[0]
       );
     }
     return t.tsArrayType(

From a980b8040099876a056027f4bb45e83de86fb278 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 1 Mar 2023 21:23:22 -0700
Subject: [PATCH 091/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.25.2
 - wasm-ast-types@0.18.2
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 8b18bbba..039dc42a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.25.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.25.1...@cosmwasm/ts-codegen@0.25.2) (2023-03-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.25.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.25.0...@cosmwasm/ts-codegen@0.25.1) (2023-03-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index b89b199f..76411338 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.18.1"
+    "wasm-ast-types": "^0.18.2"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 14749ac9..3e9be2cc 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.18.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.1...wasm-ast-types@0.18.2) (2023-03-02)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.18.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.0...wasm-ast-types@0.18.1) (2023-03-02)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 4e2203a1..a83c24ff 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "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",

From f6ffe03704c051d352c10c0fb61205f3fef804f2 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Mon, 6 Mar 2023 13:35:20 +0800
Subject: [PATCH 092/287] add bundlePath for setting bundle file path.

---
 .../contracts/CwAdminFactory.client.ts        |  65 +++
 .../CwAdminFactory.message-composer.ts        |  60 +++
 .../contracts/CwAdminFactory.react-query.ts   |  13 +
 .../contracts/CwAdminFactory.recoil.ts        |  24 +
 .../contracts/CwAdminFactory.types.ts         |  19 +
 .../contracts/CwCodeIdRegistry.client.ts      | 251 +++++++++++
 .../CwCodeIdRegistry.message-composer.ts      | 200 +++++++++
 .../contracts/CwCodeIdRegistry.react-query.ts |  70 +++
 .../contracts/CwCodeIdRegistry.recoil.ts      |  80 ++++
 .../contracts/CwCodeIdRegistry.types.ts       | 109 +++++
 .../bundler_test/contracts/CwSingle.client.ts | 381 ++++++++++++++++
 .../contracts/CwSingle.message-composer.ts    | 294 +++++++++++++
 .../contracts/CwSingle.react-query.ts         | 128 ++++++
 .../bundler_test/contracts/CwSingle.recoil.ts | 164 +++++++
 .../bundler_test/contracts/CwSingle.types.ts  | 416 ++++++++++++++++++
 .../bundler_test/contracts/Factory.client.ts  | 259 +++++++++++
 .../contracts/Factory.message-composer.ts     | 214 +++++++++
 .../contracts/Factory.react-query.ts          |  82 ++++
 .../bundler_test/contracts/Factory.recoil.ts  | 108 +++++
 .../bundler_test/contracts/Factory.types.ts   | 183 ++++++++
 .../bundler_test/contracts/Minter.client.ts   | 177 ++++++++
 .../contracts/Minter.message-composer.ts      | 174 ++++++++
 .../contracts/Minter.react-query.ts           |  55 +++
 .../bundler_test/contracts/Minter.recoil.ts   |  94 ++++
 .../bundler_test/contracts/Minter.types.ts    | 124 ++++++
 __output__/builder/bundler_test/index.ts      |  65 +++
 packages/ts-codegen/__tests__/builder.test.ts | 310 +++++++------
 packages/ts-codegen/src/builder/builder.ts    | 342 +++++++-------
 .../ts-codegen/types/src/builder/builder.d.ts |   5 +-
 29 files changed, 4168 insertions(+), 298 deletions(-)
 create mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.recoil.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.types.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.recoil.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.types.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwSingle.client.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwSingle.react-query.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwSingle.recoil.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwSingle.types.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Factory.client.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Factory.message-composer.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Factory.react-query.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Factory.recoil.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Factory.types.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Minter.client.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Minter.message-composer.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Minter.react-query.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Minter.recoil.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Minter.types.ts
 create mode 100644 __output__/builder/bundler_test/index.ts

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
new file mode 100644
index 00000000..3194c8c0
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
@@ -0,0 +1,65 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+export interface CwAdminFactoryReadOnlyInterface {
+  contractAddress: string;
+}
+export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+  }
+
+}
+export interface CwAdminFactoryInterface {
+  contractAddress: string;
+  sender: string;
+  instantiateContractWithSelfAdmin: ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CwAdminFactoryClient implements CwAdminFactoryInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
+  }
+
+  instantiateContractWithSelfAdmin = async ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      instantiate_contract_with_self_admin: {
+        code_id: codeId,
+        instantiate_msg: instantiateMsg,
+        label
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
new file mode 100644
index 00000000..6ff9c5fb
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -0,0 +1,60 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+export interface CwAdminFactoryMessage {
+  contractAddress: string;
+  sender: string;
+  instantiateContractWithSelfAdmin: ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
+  }
+
+  instantiateContractWithSelfAdmin = ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          instantiate_contract_with_self_admin: {
+            code_id: codeId,
+            instantiate_msg: instantiateMsg,
+            label
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts
new file mode 100644
index 00000000..be2aa1b7
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts
@@ -0,0 +1,13 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions } from "react-query";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
+  client: CwAdminFactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.recoil.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.recoil.ts
new file mode 100644
index 00000000..eddb158c
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.recoil.ts
@@ -0,0 +1,24 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CwAdminFactoryQueryClient, QueryClientParams>({
+  key: "cwAdminFactoryQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CwAdminFactoryQueryClient(client, contractAddress);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.types.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.types.ts
new file mode 100644
index 00000000..11b47d44
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.types.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type ExecuteMsg = {
+  instantiate_contract_with_self_admin: {
+    code_id: number;
+    instantiate_msg: Binary;
+    label: string;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export interface InstantiateMsg {
+  [k: string]: unknown;
+}
+export type QueryMsg = string;
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
new file mode 100644
index 00000000..59e6506b
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
@@ -0,0 +1,251 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+export interface CwCodeIdRegistryReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+  getRegistration: ({
+    chainId,
+    name,
+    version
+  }: {
+    chainId: string;
+    name: string;
+    version?: string;
+  }) => Promise<GetRegistrationResponse>;
+  infoForCodeId: ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }) => Promise<InfoForCodeIdResponse>;
+  listRegistrations: ({
+    chainId,
+    name
+  }: {
+    chainId: string;
+    name: string;
+  }) => Promise<ListRegistrationsResponse>;
+}
+export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+    this.getRegistration = this.getRegistration.bind(this);
+    this.infoForCodeId = this.infoForCodeId.bind(this);
+    this.listRegistrations = this.listRegistrations.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+  getRegistration = async ({
+    chainId,
+    name,
+    version
+  }: {
+    chainId: string;
+    name: string;
+    version?: string;
+  }): Promise<GetRegistrationResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_registration: {
+        chain_id: chainId,
+        name,
+        version
+      }
+    });
+  };
+  infoForCodeId = async ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }): Promise<InfoForCodeIdResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      info_for_code_id: {
+        chain_id: chainId,
+        code_id: codeId
+      }
+    });
+  };
+  listRegistrations = async ({
+    chainId,
+    name
+  }: {
+    chainId: string;
+    name: string;
+  }): Promise<ListRegistrationsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_registrations: {
+        chain_id: chainId,
+        name
+      }
+    });
+  };
+}
+export interface CwCodeIdRegistryInterface {
+  contractAddress: string;
+  sender: string;
+  receive: ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  register: ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  setOwner: ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  unregister: ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateConfig: ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.receive = this.receive.bind(this);
+    this.register = this.register.bind(this);
+    this.setOwner = this.setOwner.bind(this);
+    this.unregister = this.unregister.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+  }
+
+  receive = async ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      receive: {
+        amount,
+        msg,
+        sender
+      }
+    }, fee, memo, funds);
+  };
+  register = async ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      register: {
+        chain_id: chainId,
+        checksum,
+        code_id: codeId,
+        name,
+        version
+      }
+    }, fee, memo, funds);
+  };
+  setOwner = async ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_owner: {
+        chain_id: chainId,
+        name,
+        owner
+      }
+    }, fee, memo, funds);
+  };
+  unregister = async ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      unregister: {
+        chain_id: chainId,
+        code_id: codeId
+      }
+    }, fee, memo, funds);
+  };
+  updateConfig = async ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        admin,
+        payment_info: paymentInfo
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
new file mode 100644
index 00000000..2590da00
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -0,0 +1,200 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+export interface CwCodeIdRegistryMessage {
+  contractAddress: string;
+  sender: string;
+  receive: ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  register: ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  setOwner: ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  unregister: ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateConfig: ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.receive = this.receive.bind(this);
+    this.register = this.register.bind(this);
+    this.setOwner = this.setOwner.bind(this);
+    this.unregister = this.unregister.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+  }
+
+  receive = ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          receive: {
+            amount,
+            msg,
+            sender
+          }
+        })),
+        funds
+      })
+    };
+  };
+  register = ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          register: {
+            chain_id: chainId,
+            checksum,
+            code_id: codeId,
+            name,
+            version
+          }
+        })),
+        funds
+      })
+    };
+  };
+  setOwner = ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          set_owner: {
+            chain_id: chainId,
+            name,
+            owner
+          }
+        })),
+        funds
+      })
+    };
+  };
+  unregister = ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          unregister: {
+            chain_id: chainId,
+            code_id: codeId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateConfig = ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_config: {
+            admin,
+            payment_info: paymentInfo
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts
new file mode 100644
index 00000000..d2bcdc8f
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts
@@ -0,0 +1,70 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
+  client: CwCodeIdRegistryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
+  args: {
+    chainId: string;
+    name: string;
+  };
+}
+export function useCwCodeIdRegistryListRegistrationsQuery<TData = ListRegistrationsResponse>({
+  client,
+  args,
+  options
+}: CwCodeIdRegistryListRegistrationsQuery<TData>) {
+  return useQuery<ListRegistrationsResponse, Error, TData>(["cwCodeIdRegistryListRegistrations", client.contractAddress, JSON.stringify(args)], () => client.listRegistrations({
+    chainId: args.chainId,
+    name: args.name
+  }), options);
+}
+export interface CwCodeIdRegistryInfoForCodeIdQuery<TData> extends CwCodeIdRegistryReactQuery<InfoForCodeIdResponse, TData> {
+  args: {
+    chainId: string;
+    codeId: number;
+  };
+}
+export function useCwCodeIdRegistryInfoForCodeIdQuery<TData = InfoForCodeIdResponse>({
+  client,
+  args,
+  options
+}: CwCodeIdRegistryInfoForCodeIdQuery<TData>) {
+  return useQuery<InfoForCodeIdResponse, Error, TData>(["cwCodeIdRegistryInfoForCodeId", client.contractAddress, JSON.stringify(args)], () => client.infoForCodeId({
+    chainId: args.chainId,
+    codeId: args.codeId
+  }), options);
+}
+export interface CwCodeIdRegistryGetRegistrationQuery<TData> extends CwCodeIdRegistryReactQuery<GetRegistrationResponse, TData> {
+  args: {
+    chainId: string;
+    name: string;
+    version?: string;
+  };
+}
+export function useCwCodeIdRegistryGetRegistrationQuery<TData = GetRegistrationResponse>({
+  client,
+  args,
+  options
+}: CwCodeIdRegistryGetRegistrationQuery<TData>) {
+  return useQuery<GetRegistrationResponse, Error, TData>(["cwCodeIdRegistryGetRegistration", client.contractAddress, JSON.stringify(args)], () => client.getRegistration({
+    chainId: args.chainId,
+    name: args.name,
+    version: args.version
+  }), options);
+}
+export interface CwCodeIdRegistryConfigQuery<TData> extends CwCodeIdRegistryReactQuery<ConfigResponse, TData> {}
+export function useCwCodeIdRegistryConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: CwCodeIdRegistryConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwCodeIdRegistryConfig", client.contractAddress], () => client.config(), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.recoil.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.recoil.ts
new file mode 100644
index 00000000..c76fd755
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.recoil.ts
@@ -0,0 +1,80 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CwCodeIdRegistryQueryClient, QueryClientParams>({
+  key: "cwCodeIdRegistryQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CwCodeIdRegistryQueryClient(client, contractAddress);
+  }
+});
+export const configSelector = selectorFamily<ConfigResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["config"]>;
+}>({
+  key: "cwCodeIdRegistryConfig",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.config(...params);
+  }
+});
+export const getRegistrationSelector = selectorFamily<GetRegistrationResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["getRegistration"]>;
+}>({
+  key: "cwCodeIdRegistryGetRegistration",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.getRegistration(...params);
+  }
+});
+export const infoForCodeIdSelector = selectorFamily<InfoForCodeIdResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["infoForCodeId"]>;
+}>({
+  key: "cwCodeIdRegistryInfoForCodeId",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.infoForCodeId(...params);
+  }
+});
+export const listRegistrationsSelector = selectorFamily<ListRegistrationsResponse, QueryClientParams & {
+  params: Parameters<CwCodeIdRegistryQueryClient["listRegistrations"]>;
+}>({
+  key: "cwCodeIdRegistryListRegistrations",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listRegistrations(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.types.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.types.ts
new file mode 100644
index 00000000..46a8c284
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.types.ts
@@ -0,0 +1,109 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Addr = string;
+export type PaymentInfo = {
+  none: {};
+} | {
+  native_payment: {
+    payment_amount: Uint128;
+    token_denom: string;
+  };
+} | {
+  cw20_payment: {
+    payment_amount: Uint128;
+    token_address: string;
+  };
+};
+export type Uint128 = string;
+export interface ConfigResponse {
+  admin: Addr;
+  payment_info: PaymentInfo;
+}
+export type ExecuteMsg = {
+  receive: Cw20ReceiveMsg;
+} | {
+  register: {
+    chain_id: string;
+    checksum: string;
+    code_id: number;
+    name: string;
+    version: string;
+  };
+} | {
+  set_owner: {
+    chain_id: string;
+    name: string;
+    owner?: string | null;
+  };
+} | {
+  unregister: {
+    chain_id: string;
+    code_id: number;
+  };
+} | {
+  update_config: {
+    admin?: string | null;
+    payment_info?: PaymentInfo | null;
+  };
+};
+export type Binary = string;
+export interface Cw20ReceiveMsg {
+  amount: Uint128;
+  msg: Binary;
+  sender: string;
+  [k: string]: unknown;
+}
+export interface GetRegistrationResponse {
+  registration: Registration;
+}
+export interface Registration {
+  checksum: string;
+  code_id: number;
+  registered_by: Addr;
+  version: string;
+}
+export interface InfoForCodeIdResponse {
+  checksum: string;
+  name: string;
+  registered_by: Addr;
+  version: string;
+}
+export interface InstantiateMsg {
+  admin: string;
+  payment_info: PaymentInfo;
+}
+export interface ListRegistrationsResponse {
+  registrations: Registration[];
+}
+export type QueryMsg = {
+  config: {};
+} | {
+  get_registration: {
+    chain_id: string;
+    name: string;
+    version?: string | null;
+  };
+} | {
+  info_for_code_id: {
+    chain_id: string;
+    code_id: number;
+  };
+} | {
+  list_registrations: {
+    chain_id: string;
+    name: string;
+  };
+};
+export type ReceiveMsg = {
+  register: {
+    chain_id: string;
+    checksum: string;
+    code_id: number;
+    name: string;
+    version: string;
+  };
+};
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
new file mode 100644
index 00000000..05c0dc73
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
@@ -0,0 +1,381 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+export interface CwSingleReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+  proposal: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }) => Promise<ProposalResponse>;
+  listProposals: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }) => Promise<ListProposalsResponse>;
+  reverseProposals: ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }) => Promise<ReverseProposalsResponse>;
+  proposalCount: () => Promise<ProposalCountResponse>;
+  vote: ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }) => Promise<VoteResponse>;
+  listVotes: ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }) => Promise<ListVotesResponse>;
+  proposalHooks: () => Promise<ProposalHooksResponse>;
+  voteHooks: () => Promise<VoteHooksResponse>;
+  info: () => Promise<InfoResponse>;
+}
+export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+    this.proposal = this.proposal.bind(this);
+    this.listProposals = this.listProposals.bind(this);
+    this.reverseProposals = this.reverseProposals.bind(this);
+    this.proposalCount = this.proposalCount.bind(this);
+    this.vote = this.vote.bind(this);
+    this.listVotes = this.listVotes.bind(this);
+    this.proposalHooks = this.proposalHooks.bind(this);
+    this.voteHooks = this.voteHooks.bind(this);
+    this.info = this.info.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+  proposal = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): Promise<ProposalResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal: {
+        proposal_id: proposalId
+      }
+    });
+  };
+  listProposals = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): Promise<ListProposalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_proposals: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  reverseProposals = async ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }): Promise<ReverseProposalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      reverse_proposals: {
+        limit,
+        start_before: startBefore
+      }
+    });
+  };
+  proposalCount = async (): Promise<ProposalCountResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal_count: {}
+    });
+  };
+  vote = async ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }): Promise<VoteResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      vote: {
+        proposal_id: proposalId,
+        voter
+      }
+    });
+  };
+  listVotes = async ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }): Promise<ListVotesResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      list_votes: {
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      }
+    });
+  };
+  proposalHooks = async (): Promise<ProposalHooksResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      proposal_hooks: {}
+    });
+  };
+  voteHooks = async (): Promise<VoteHooksResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      vote_hooks: {}
+    });
+  };
+  info = async (): Promise<InfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      info: {}
+    });
+  };
+}
+export interface CwSingleInterface {
+  contractAddress: string;
+  sender: string;
+  propose: ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  vote: ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  execute: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  close: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateConfig: ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  addProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  removeProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  addVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  removeVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class CwSingleClient implements CwSingleInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.propose = this.propose.bind(this);
+    this.vote = this.vote.bind(this);
+    this.execute = this.execute.bind(this);
+    this.close = this.close.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+    this.addProposalHook = this.addProposalHook.bind(this);
+    this.removeProposalHook = this.removeProposalHook.bind(this);
+    this.addVoteHook = this.addVoteHook.bind(this);
+    this.removeVoteHook = this.removeVoteHook.bind(this);
+  }
+
+  propose = async ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      propose: {
+        description,
+        msgs,
+        title
+      }
+    }, fee, memo, funds);
+  };
+  vote = async ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      vote: {
+        proposal_id: proposalId,
+        vote
+      }
+    }, fee, memo, funds);
+  };
+  execute = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      execute: {
+        proposal_id: proposalId
+      }
+    }, fee, memo, funds);
+  };
+  close = async ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      close: {
+        proposal_id: proposalId
+      }
+    }, fee, memo, funds);
+  };
+  updateConfig = async ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        allow_revoting: allowRevoting,
+        dao,
+        deposit_info: depositInfo,
+        max_voting_period: maxVotingPeriod,
+        min_voting_period: minVotingPeriod,
+        only_members_execute: onlyMembersExecute,
+        threshold
+      }
+    }, fee, memo, funds);
+  };
+  addProposalHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      add_proposal_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+  removeProposalHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      remove_proposal_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+  addVoteHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      add_vote_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+  removeVoteHook = async ({
+    address
+  }: {
+    address: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      remove_vote_hook: {
+        address
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
new file mode 100644
index 00000000..0a8436fc
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -0,0 +1,294 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+export interface CwSingleMessage {
+  contractAddress: string;
+  sender: string;
+  propose: ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  vote: ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  execute: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  close: ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateConfig: ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  addProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  removeProposalHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  addVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  removeVoteHook: ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class CwSingleMessageComposer implements CwSingleMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.propose = this.propose.bind(this);
+    this.vote = this.vote.bind(this);
+    this.execute = this.execute.bind(this);
+    this.close = this.close.bind(this);
+    this.updateConfig = this.updateConfig.bind(this);
+    this.addProposalHook = this.addProposalHook.bind(this);
+    this.removeProposalHook = this.removeProposalHook.bind(this);
+    this.addVoteHook = this.addVoteHook.bind(this);
+    this.removeVoteHook = this.removeVoteHook.bind(this);
+  }
+
+  propose = ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          propose: {
+            description,
+            msgs,
+            title
+          }
+        })),
+        funds
+      })
+    };
+  };
+  vote = ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          vote: {
+            proposal_id: proposalId,
+            vote
+          }
+        })),
+        funds
+      })
+    };
+  };
+  execute = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          execute: {
+            proposal_id: proposalId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  close = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          close: {
+            proposal_id: proposalId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateConfig = ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_config: {
+            allow_revoting: allowRevoting,
+            dao,
+            deposit_info: depositInfo,
+            max_voting_period: maxVotingPeriod,
+            min_voting_period: minVotingPeriod,
+            only_members_execute: onlyMembersExecute,
+            threshold
+          }
+        })),
+        funds
+      })
+    };
+  };
+  addProposalHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          add_proposal_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+  removeProposalHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          remove_proposal_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+  addVoteHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          add_vote_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+  removeVoteHook = ({
+    address
+  }: {
+    address: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          remove_vote_hook: {
+            address
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts b/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts
new file mode 100644
index 00000000..874561b4
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts
@@ -0,0 +1,128 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CwSingleQueryClient } from "./CwSingle.client";
+export interface CwSingleReactQuery<TResponse, TData = TResponse> {
+  client: CwSingleQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
+export function useCwSingleInfoQuery<TData = InfoResponse>({
+  client,
+  options
+}: CwSingleInfoQuery<TData>) {
+  return useQuery<InfoResponse, Error, TData>(["cwSingleInfo", client.contractAddress], () => client.info(), options);
+}
+export interface CwSingleVoteHooksQuery<TData> extends CwSingleReactQuery<VoteHooksResponse, TData> {}
+export function useCwSingleVoteHooksQuery<TData = VoteHooksResponse>({
+  client,
+  options
+}: CwSingleVoteHooksQuery<TData>) {
+  return useQuery<VoteHooksResponse, Error, TData>(["cwSingleVoteHooks", client.contractAddress], () => client.voteHooks(), options);
+}
+export interface CwSingleProposalHooksQuery<TData> extends CwSingleReactQuery<ProposalHooksResponse, TData> {}
+export function useCwSingleProposalHooksQuery<TData = ProposalHooksResponse>({
+  client,
+  options
+}: CwSingleProposalHooksQuery<TData>) {
+  return useQuery<ProposalHooksResponse, Error, TData>(["cwSingleProposalHooks", client.contractAddress], () => client.proposalHooks(), options);
+}
+export interface CwSingleListVotesQuery<TData> extends CwSingleReactQuery<ListVotesResponse, TData> {
+  args: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  };
+}
+export function useCwSingleListVotesQuery<TData = ListVotesResponse>({
+  client,
+  args,
+  options
+}: CwSingleListVotesQuery<TData>) {
+  return useQuery<ListVotesResponse, Error, TData>(["cwSingleListVotes", client.contractAddress, JSON.stringify(args)], () => client.listVotes({
+    limit: args.limit,
+    proposalId: args.proposalId,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface CwSingleVoteQuery<TData> extends CwSingleReactQuery<VoteResponse, TData> {
+  args: {
+    proposalId: number;
+    voter: string;
+  };
+}
+export function useCwSingleVoteQuery<TData = VoteResponse>({
+  client,
+  args,
+  options
+}: CwSingleVoteQuery<TData>) {
+  return useQuery<VoteResponse, Error, TData>(["cwSingleVote", client.contractAddress, JSON.stringify(args)], () => client.vote({
+    proposalId: args.proposalId,
+    voter: args.voter
+  }), options);
+}
+export interface CwSingleProposalCountQuery<TData> extends CwSingleReactQuery<ProposalCountResponse, TData> {}
+export function useCwSingleProposalCountQuery<TData = ProposalCountResponse>({
+  client,
+  options
+}: CwSingleProposalCountQuery<TData>) {
+  return useQuery<ProposalCountResponse, Error, TData>(["cwSingleProposalCount", client.contractAddress], () => client.proposalCount(), options);
+}
+export interface CwSingleReverseProposalsQuery<TData> extends CwSingleReactQuery<ReverseProposalsResponse, TData> {
+  args: {
+    limit?: number;
+    startBefore?: number;
+  };
+}
+export function useCwSingleReverseProposalsQuery<TData = ReverseProposalsResponse>({
+  client,
+  args,
+  options
+}: CwSingleReverseProposalsQuery<TData>) {
+  return useQuery<ReverseProposalsResponse, Error, TData>(["cwSingleReverseProposals", client.contractAddress, JSON.stringify(args)], () => client.reverseProposals({
+    limit: args.limit,
+    startBefore: args.startBefore
+  }), options);
+}
+export interface CwSingleListProposalsQuery<TData> extends CwSingleReactQuery<ListProposalsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: number;
+  };
+}
+export function useCwSingleListProposalsQuery<TData = ListProposalsResponse>({
+  client,
+  args,
+  options
+}: CwSingleListProposalsQuery<TData>) {
+  return useQuery<ListProposalsResponse, Error, TData>(["cwSingleListProposals", client.contractAddress, JSON.stringify(args)], () => client.listProposals({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface CwSingleProposalQuery<TData> extends CwSingleReactQuery<ProposalResponse, TData> {
+  args: {
+    proposalId: number;
+  };
+}
+export function useCwSingleProposalQuery<TData = ProposalResponse>({
+  client,
+  args,
+  options
+}: CwSingleProposalQuery<TData>) {
+  return useQuery<ProposalResponse, Error, TData>(["cwSingleProposal", client.contractAddress, JSON.stringify(args)], () => client.proposal({
+    proposalId: args.proposalId
+  }), options);
+}
+export interface CwSingleConfigQuery<TData> extends CwSingleReactQuery<ConfigResponse, TData> {}
+export function useCwSingleConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: CwSingleConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["cwSingleConfig", client.contractAddress], () => client.config(), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.recoil.ts b/__output__/builder/bundler_test/contracts/CwSingle.recoil.ts
new file mode 100644
index 00000000..79b2c1ba
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwSingle.recoil.ts
@@ -0,0 +1,164 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CwSingleQueryClient } from "./CwSingle.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<CwSingleQueryClient, QueryClientParams>({
+  key: "cwSingleQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new CwSingleQueryClient(client, contractAddress);
+  }
+});
+export const configSelector = selectorFamily<ConfigResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["config"]>;
+}>({
+  key: "cwSingleConfig",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.config(...params);
+  }
+});
+export const proposalSelector = selectorFamily<ProposalResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["proposal"]>;
+}>({
+  key: "cwSingleProposal",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposal(...params);
+  }
+});
+export const listProposalsSelector = selectorFamily<ListProposalsResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["listProposals"]>;
+}>({
+  key: "cwSingleListProposals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listProposals(...params);
+  }
+});
+export const reverseProposalsSelector = selectorFamily<ReverseProposalsResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["reverseProposals"]>;
+}>({
+  key: "cwSingleReverseProposals",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.reverseProposals(...params);
+  }
+});
+export const proposalCountSelector = selectorFamily<ProposalCountResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["proposalCount"]>;
+}>({
+  key: "cwSingleProposalCount",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposalCount(...params);
+  }
+});
+export const voteSelector = selectorFamily<VoteResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["vote"]>;
+}>({
+  key: "cwSingleVote",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.vote(...params);
+  }
+});
+export const listVotesSelector = selectorFamily<ListVotesResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["listVotes"]>;
+}>({
+  key: "cwSingleListVotes",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.listVotes(...params);
+  }
+});
+export const proposalHooksSelector = selectorFamily<ProposalHooksResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["proposalHooks"]>;
+}>({
+  key: "cwSingleProposalHooks",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.proposalHooks(...params);
+  }
+});
+export const voteHooksSelector = selectorFamily<VoteHooksResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["voteHooks"]>;
+}>({
+  key: "cwSingleVoteHooks",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.voteHooks(...params);
+  }
+});
+export const infoSelector = selectorFamily<InfoResponse, QueryClientParams & {
+  params: Parameters<CwSingleQueryClient["info"]>;
+}>({
+  key: "cwSingleInfo",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.info(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.types.ts b/__output__/builder/bundler_test/contracts/CwSingle.types.ts
new file mode 100644
index 00000000..01398dab
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwSingle.types.ts
@@ -0,0 +1,416 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Addr = string;
+export type Uint128 = string;
+export type Duration = {
+  height: number;
+} | {
+  time: number;
+};
+export type Threshold = {
+  absolute_percentage: {
+    percentage: PercentageThreshold;
+    [k: string]: unknown;
+  };
+} | {
+  threshold_quorum: {
+    quorum: PercentageThreshold;
+    threshold: PercentageThreshold;
+    [k: string]: unknown;
+  };
+} | {
+  absolute_count: {
+    threshold: Uint128;
+    [k: string]: unknown;
+  };
+};
+export type PercentageThreshold = {
+  majority: {
+    [k: string]: unknown;
+  };
+} | {
+  percent: Decimal;
+};
+export type Decimal = string;
+export interface ConfigResponse {
+  allow_revoting: boolean;
+  dao: Addr;
+  deposit_info?: CheckedDepositInfo | null;
+  max_voting_period: Duration;
+  min_voting_period?: Duration | null;
+  only_members_execute: boolean;
+  threshold: Threshold;
+  [k: string]: unknown;
+}
+export interface CheckedDepositInfo {
+  deposit: Uint128;
+  refund_failed_proposals: boolean;
+  token: Addr;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  propose: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+    [k: string]: unknown;
+  };
+} | {
+  vote: {
+    proposal_id: number;
+    vote: Vote;
+    [k: string]: unknown;
+  };
+} | {
+  execute: {
+    proposal_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  close: {
+    proposal_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_config: {
+    allow_revoting: boolean;
+    dao: string;
+    deposit_info?: DepositInfo | null;
+    max_voting_period: Duration;
+    min_voting_period?: Duration | null;
+    only_members_execute: boolean;
+    threshold: Threshold;
+    [k: string]: unknown;
+  };
+} | {
+  add_proposal_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  remove_proposal_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  add_vote_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  remove_vote_hook: {
+    address: string;
+    [k: string]: unknown;
+  };
+};
+export type CosmosMsgForEmpty = {
+  bank: BankMsg;
+} | {
+  custom: Empty;
+} | {
+  staking: StakingMsg;
+} | {
+  distribution: DistributionMsg;
+} | {
+  stargate: {
+    type_url: string;
+    value: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  ibc: IbcMsg;
+} | {
+  wasm: WasmMsg;
+} | {
+  gov: GovMsg;
+};
+export type BankMsg = {
+  send: {
+    amount: Coin[];
+    to_address: string;
+    [k: string]: unknown;
+  };
+} | {
+  burn: {
+    amount: Coin[];
+    [k: string]: unknown;
+  };
+};
+export type StakingMsg = {
+  delegate: {
+    amount: Coin;
+    validator: string;
+    [k: string]: unknown;
+  };
+} | {
+  undelegate: {
+    amount: Coin;
+    validator: string;
+    [k: string]: unknown;
+  };
+} | {
+  redelegate: {
+    amount: Coin;
+    dst_validator: string;
+    src_validator: string;
+    [k: string]: unknown;
+  };
+};
+export type DistributionMsg = {
+  set_withdraw_address: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  withdraw_delegator_reward: {
+    validator: string;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export type IbcMsg = {
+  transfer: {
+    amount: Coin;
+    channel_id: string;
+    timeout: IbcTimeout;
+    to_address: string;
+    [k: string]: unknown;
+  };
+} | {
+  send_packet: {
+    channel_id: string;
+    data: Binary;
+    timeout: IbcTimeout;
+    [k: string]: unknown;
+  };
+} | {
+  close_channel: {
+    channel_id: string;
+    [k: string]: unknown;
+  };
+};
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type WasmMsg = {
+  execute: {
+    contract_addr: string;
+    funds: Coin[];
+    msg: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  instantiate: {
+    admin?: string | null;
+    code_id: number;
+    funds: Coin[];
+    label: string;
+    msg: Binary;
+    [k: string]: unknown;
+  };
+} | {
+  migrate: {
+    contract_addr: string;
+    msg: Binary;
+    new_code_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_admin: {
+    admin: string;
+    contract_addr: string;
+    [k: string]: unknown;
+  };
+} | {
+  clear_admin: {
+    contract_addr: string;
+    [k: string]: unknown;
+  };
+};
+export type GovMsg = {
+  vote: {
+    proposal_id: number;
+    vote: VoteOption;
+    [k: string]: unknown;
+  };
+};
+export type VoteOption = "yes" | "no" | "abstain" | "no_with_veto";
+export type Vote = "yes" | "no" | "abstain";
+export type DepositToken = {
+  token: {
+    address: string;
+    [k: string]: unknown;
+  };
+} | {
+  voting_module_token: {
+    [k: string]: unknown;
+  };
+};
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export interface Empty {
+  [k: string]: unknown;
+}
+export interface IbcTimeout {
+  block?: IbcTimeoutBlock | null;
+  timestamp?: Timestamp | null;
+  [k: string]: unknown;
+}
+export interface IbcTimeoutBlock {
+  height: number;
+  revision: number;
+  [k: string]: unknown;
+}
+export interface DepositInfo {
+  deposit: Uint128;
+  refund_failed_proposals: boolean;
+  token: DepositToken;
+  [k: string]: unknown;
+}
+export type GovernanceModulesResponse = Addr[];
+export interface InfoResponse {
+  info: ContractVersion;
+  [k: string]: unknown;
+}
+export interface ContractVersion {
+  contract: string;
+  version: string;
+  [k: string]: unknown;
+}
+export interface InstantiateMsg {
+  allow_revoting: boolean;
+  deposit_info?: DepositInfo | null;
+  max_voting_period: Duration;
+  min_voting_period?: Duration | null;
+  only_members_execute: boolean;
+  threshold: Threshold;
+  [k: string]: unknown;
+}
+export type Expiration = {
+  at_height: number;
+} | {
+  at_time: Timestamp;
+} | {
+  never: {
+    [k: string]: unknown;
+  };
+};
+export type Status = "open" | "rejected" | "passed" | "executed" | "closed";
+export interface ListProposalsResponse {
+  proposals: ProposalResponse[];
+  [k: string]: unknown;
+}
+export interface ProposalResponse {
+  id: number;
+  proposal: Proposal;
+  [k: string]: unknown;
+}
+export interface Proposal {
+  allow_revoting: boolean;
+  deposit_info?: CheckedDepositInfo | null;
+  description: string;
+  expiration: Expiration;
+  min_voting_period?: Expiration | null;
+  msgs: CosmosMsgForEmpty[];
+  proposer: Addr;
+  start_height: number;
+  status: Status;
+  threshold: Threshold;
+  title: string;
+  total_power: Uint128;
+  votes: Votes;
+  [k: string]: unknown;
+}
+export interface Votes {
+  abstain: Uint128;
+  no: Uint128;
+  yes: Uint128;
+  [k: string]: unknown;
+}
+export interface ListVotesResponse {
+  votes: VoteInfo[];
+  [k: string]: unknown;
+}
+export interface VoteInfo {
+  power: Uint128;
+  vote: Vote;
+  voter: Addr;
+  [k: string]: unknown;
+}
+export interface MigrateMsg {
+  [k: string]: unknown;
+}
+export type ProposalCountResponse = number;
+export interface ProposalHooksResponse {
+  hooks: string[];
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  config: {
+    [k: string]: unknown;
+  };
+} | {
+  proposal: {
+    proposal_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  list_proposals: {
+    limit?: number | null;
+    start_after?: number | null;
+    [k: string]: unknown;
+  };
+} | {
+  reverse_proposals: {
+    limit?: number | null;
+    start_before?: number | null;
+    [k: string]: unknown;
+  };
+} | {
+  proposal_count: {
+    [k: string]: unknown;
+  };
+} | {
+  vote: {
+    proposal_id: number;
+    voter: string;
+    [k: string]: unknown;
+  };
+} | {
+  list_votes: {
+    limit?: number | null;
+    proposal_id: number;
+    start_after?: string | null;
+    [k: string]: unknown;
+  };
+} | {
+  proposal_hooks: {
+    [k: string]: unknown;
+  };
+} | {
+  vote_hooks: {
+    [k: string]: unknown;
+  };
+} | {
+  info: {
+    [k: string]: unknown;
+  };
+};
+export interface ReverseProposalsResponse {
+  proposals: ProposalResponse[];
+  [k: string]: unknown;
+}
+export interface VoteHooksResponse {
+  hooks: string[];
+  [k: string]: unknown;
+}
+export interface VoteResponse {
+  vote?: VoteInfo | null;
+  [k: string]: unknown;
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts
new file mode 100644
index 00000000..6e9897d6
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Factory.client.ts
@@ -0,0 +1,259 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+export interface FactoryReadOnlyInterface {
+  contractAddress: string;
+  wallets: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  }) => Promise<WalletsResponse>;
+  walletsOf: ({
+    limit,
+    startAfter,
+    user
+  }: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  }) => Promise<WalletsOfResponse>;
+  codeId: ({
+    ty
+  }: {
+    ty: CodeIdType;
+  }) => Promise<CodeIdResponse>;
+  fee: () => Promise<FeeResponse>;
+  govecAddr: () => Promise<GovecAddrResponse>;
+  adminAddr: () => Promise<AdminAddrResponse>;
+}
+export class FactoryQueryClient implements FactoryReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.wallets = this.wallets.bind(this);
+    this.walletsOf = this.walletsOf.bind(this);
+    this.codeId = this.codeId.bind(this);
+    this.fee = this.fee.bind(this);
+    this.govecAddr = this.govecAddr.bind(this);
+    this.adminAddr = this.adminAddr.bind(this);
+  }
+
+  wallets = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  }): Promise<WalletsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wallets: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  walletsOf = async ({
+    limit,
+    startAfter,
+    user
+  }: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  }): Promise<WalletsOfResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wallets_of: {
+        limit,
+        start_after: startAfter,
+        user
+      }
+    });
+  };
+  codeId = async ({
+    ty
+  }: {
+    ty: CodeIdType;
+  }): Promise<CodeIdResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      code_id: {
+        ty
+      }
+    });
+  };
+  fee = async (): Promise<FeeResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      fee: {}
+    });
+  };
+  govecAddr = async (): Promise<GovecAddrResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      govec_addr: {}
+    });
+  };
+  adminAddr = async (): Promise<AdminAddrResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      admin_addr: {}
+    });
+  };
+}
+export interface FactoryInterface {
+  contractAddress: string;
+  sender: string;
+  createWallet: ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateProxyUser: ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  migrateWallet: ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateCodeId: ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateWalletFee: ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateGovecAddr: ({
+    addr
+  }: {
+    addr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateAdmin: ({
+    addr
+  }: {
+    addr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class FactoryClient implements FactoryInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.createWallet = this.createWallet.bind(this);
+    this.updateProxyUser = this.updateProxyUser.bind(this);
+    this.migrateWallet = this.migrateWallet.bind(this);
+    this.updateCodeId = this.updateCodeId.bind(this);
+    this.updateWalletFee = this.updateWalletFee.bind(this);
+    this.updateGovecAddr = this.updateGovecAddr.bind(this);
+    this.updateAdmin = this.updateAdmin.bind(this);
+  }
+
+  createWallet = async ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      create_wallet: {
+        create_wallet_msg: createWalletMsg
+      }
+    }, fee, memo, funds);
+  };
+  updateProxyUser = async ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_proxy_user: {
+        new_user: newUser,
+        old_user: oldUser
+      }
+    }, fee, memo, funds);
+  };
+  migrateWallet = async ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      migrate_wallet: {
+        migration_msg: migrationMsg,
+        wallet_address: walletAddress
+      }
+    }, fee, memo, funds);
+  };
+  updateCodeId = async ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_code_id: {
+        new_code_id: newCodeId,
+        ty
+      }
+    }, fee, memo, funds);
+  };
+  updateWalletFee = async ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_wallet_fee: {
+        new_fee: newFee
+      }
+    }, fee, memo, funds);
+  };
+  updateGovecAddr = async ({
+    addr
+  }: {
+    addr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_govec_addr: {
+        addr
+      }
+    }, fee, memo, funds);
+  };
+  updateAdmin = async ({
+    addr
+  }: {
+    addr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_admin: {
+        addr
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
new file mode 100644
index 00000000..21e5a2d1
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -0,0 +1,214 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+export interface FactoryMessage {
+  contractAddress: string;
+  sender: string;
+  createWallet: ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateProxyUser: ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  migrateWallet: ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateCodeId: ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateWalletFee: ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateGovecAddr: ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateAdmin: ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class FactoryMessageComposer implements FactoryMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.createWallet = this.createWallet.bind(this);
+    this.updateProxyUser = this.updateProxyUser.bind(this);
+    this.migrateWallet = this.migrateWallet.bind(this);
+    this.updateCodeId = this.updateCodeId.bind(this);
+    this.updateWalletFee = this.updateWalletFee.bind(this);
+    this.updateGovecAddr = this.updateGovecAddr.bind(this);
+    this.updateAdmin = this.updateAdmin.bind(this);
+  }
+
+  createWallet = ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          create_wallet: {
+            create_wallet_msg: createWalletMsg
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateProxyUser = ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_proxy_user: {
+            new_user: newUser,
+            old_user: oldUser
+          }
+        })),
+        funds
+      })
+    };
+  };
+  migrateWallet = ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          migrate_wallet: {
+            migration_msg: migrationMsg,
+            wallet_address: walletAddress
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateCodeId = ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_code_id: {
+            new_code_id: newCodeId,
+            ty
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateWalletFee = ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_wallet_fee: {
+            new_fee: newFee
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateGovecAddr = ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_govec_addr: {
+            addr
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateAdmin = ({
+    addr
+  }: {
+    addr: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_admin: {
+            addr
+          }
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.react-query.ts b/__output__/builder/bundler_test/contracts/Factory.react-query.ts
new file mode 100644
index 00000000..2d40ad5e
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Factory.react-query.ts
@@ -0,0 +1,82 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+export interface FactoryReactQuery<TResponse, TData = TResponse> {
+  client: FactoryQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
+export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
+  client,
+  options
+}: FactoryAdminAddrQuery<TData>) {
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+}
+export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
+export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
+  client,
+  options
+}: FactoryGovecAddrQuery<TData>) {
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+}
+export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
+export function useFactoryFeeQuery<TData = FeeResponse>({
+  client,
+  options
+}: FactoryFeeQuery<TData>) {
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
+}
+export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
+  args: {
+    ty: CodeIdType;
+  };
+}
+export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
+  client,
+  args,
+  options
+}: FactoryCodeIdQuery<TData>) {
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+    ty: args.ty
+  }), options);
+}
+export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  };
+}
+export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsOfQuery<TData>) {
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+    limit: args.limit,
+    startAfter: args.startAfter,
+    user: args.user
+  }), options);
+}
+export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  };
+}
+export function useFactoryWalletsQuery<TData = WalletsResponse>({
+  client,
+  args,
+  options
+}: FactoryWalletsQuery<TData>) {
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.recoil.ts b/__output__/builder/bundler_test/contracts/Factory.recoil.ts
new file mode 100644
index 00000000..3e17ff15
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Factory.recoil.ts
@@ -0,0 +1,108 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { FactoryQueryClient } from "./Factory.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<FactoryQueryClient, QueryClientParams>({
+  key: "factoryQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new FactoryQueryClient(client, contractAddress);
+  }
+});
+export const walletsSelector = selectorFamily<WalletsResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["wallets"]>;
+}>({
+  key: "factoryWallets",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.wallets(...params);
+  }
+});
+export const walletsOfSelector = selectorFamily<WalletsOfResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["walletsOf"]>;
+}>({
+  key: "factoryWalletsOf",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.walletsOf(...params);
+  }
+});
+export const codeIdSelector = selectorFamily<CodeIdResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["codeId"]>;
+}>({
+  key: "factoryCodeId",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.codeId(...params);
+  }
+});
+export const feeSelector = selectorFamily<FeeResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["fee"]>;
+}>({
+  key: "factoryFee",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.fee(...params);
+  }
+});
+export const govecAddrSelector = selectorFamily<GovecAddrResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["govecAddr"]>;
+}>({
+  key: "factoryGovecAddr",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.govecAddr(...params);
+  }
+});
+export const adminAddrSelector = selectorFamily<AdminAddrResponse, QueryClientParams & {
+  params: Parameters<FactoryQueryClient["adminAddr"]>;
+}>({
+  key: "factoryAdminAddr",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.adminAddr(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.types.ts b/__output__/builder/bundler_test/contracts/Factory.types.ts
new file mode 100644
index 00000000..ddea5192
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Factory.types.ts
@@ -0,0 +1,183 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type AdminAddrResponse = string;
+export type CodeIdResponse = number;
+export type CodeIdType = "Proxy" | "Multisig";
+export type Uint128 = string;
+export type Binary = string;
+export interface CreateWalletMsg {
+  guardians: Guardians;
+  label: string;
+  proxy_initial_funds: Coin[];
+  relayers: string[];
+  user_pubkey: Binary;
+  [k: string]: unknown;
+}
+export interface Guardians {
+  addresses: string[];
+  guardians_multisig?: MultiSig | null;
+  [k: string]: unknown;
+}
+export interface MultiSig {
+  multisig_initial_funds: Coin[];
+  threshold_absolute_count: number;
+  [k: string]: unknown;
+}
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export interface Cw20Coin {
+  address: string;
+  amount: Uint128;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  create_wallet: {
+    create_wallet_msg: CreateWalletMsg;
+    [k: string]: unknown;
+  };
+} | {
+  update_proxy_user: {
+    new_user: Addr;
+    old_user: Addr;
+    [k: string]: unknown;
+  };
+} | {
+  migrate_wallet: {
+    migration_msg: ProxyMigrationTxMsg;
+    wallet_address: WalletAddr;
+    [k: string]: unknown;
+  };
+} | {
+  update_code_id: {
+    new_code_id: number;
+    ty: CodeIdType;
+    [k: string]: unknown;
+  };
+} | {
+  update_wallet_fee: {
+    new_fee: Coin;
+    [k: string]: unknown;
+  };
+} | {
+  update_govec_addr: {
+    addr: string;
+    [k: string]: unknown;
+  };
+} | {
+  update_admin: {
+    addr: string;
+    [k: string]: unknown;
+  };
+};
+export type Addr = string;
+export type ProxyMigrationTxMsg = {
+  RelayTx: RelayTransaction;
+} | {
+  DirectMigrationMsg: Binary;
+};
+export type WalletAddr = {
+  Canonical: CanonicalAddr;
+} | {
+  Addr: Addr;
+};
+export type CanonicalAddr = string;
+export interface RelayTransaction {
+  message: Binary;
+  nonce: number;
+  signature: Binary;
+  user_pubkey: Binary;
+  [k: string]: unknown;
+}
+export interface FeeResponse {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export type GovecAddrResponse = string;
+export interface InstantiateMsg {
+  addr_prefix: string;
+  govec?: string | null;
+  proxy_code_id: number;
+  proxy_multisig_code_id: number;
+  wallet_fee: Coin;
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  wallets: {
+    limit?: number | null;
+    start_after?: WalletQueryPrefix | null;
+    [k: string]: unknown;
+  };
+} | {
+  wallets_of: {
+    limit?: number | null;
+    start_after?: string | null;
+    user: string;
+    [k: string]: unknown;
+  };
+} | {
+  code_id: {
+    ty: CodeIdType;
+    [k: string]: unknown;
+  };
+} | {
+  fee: {
+    [k: string]: unknown;
+  };
+} | {
+  govec_addr: {
+    [k: string]: unknown;
+  };
+} | {
+  admin_addr: {
+    [k: string]: unknown;
+  };
+};
+export interface WalletQueryPrefix {
+  user_addr: string;
+  wallet_addr: string;
+  [k: string]: unknown;
+}
+export type Duration = {
+  height: number;
+} | {
+  time: number;
+};
+export interface StakingOptions {
+  code_id: number;
+  duration?: Duration | null;
+  [k: string]: unknown;
+}
+export interface WalletInfo {
+  code_id: number;
+  guardians: Addr[];
+  is_frozen: boolean;
+  label: string;
+  multisig_address?: Addr | null;
+  multisig_code_id: number;
+  nonce: number;
+  relayers: Addr[];
+  user_addr: Addr;
+  version: ContractVersion;
+  [k: string]: unknown;
+}
+export interface ContractVersion {
+  contract: string;
+  version: string;
+  [k: string]: unknown;
+}
+export interface WalletsOfResponse {
+  wallets: Addr[];
+  [k: string]: unknown;
+}
+export interface WalletsResponse {
+  wallets: Addr[];
+  [k: string]: unknown;
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
new file mode 100644
index 00000000..deffa10a
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -0,0 +1,177 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+export interface MinterReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+  mintableNumTokens: () => Promise<MintableNumTokensResponse>;
+  startTime: () => Promise<StartTimeResponse>;
+  mintPrice: () => Promise<MintPriceResponse>;
+  mintCount: ({
+    address
+  }: {
+    address: string;
+  }) => Promise<MintCountResponse>;
+}
+export class MinterQueryClient implements MinterReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+    this.mintableNumTokens = this.mintableNumTokens.bind(this);
+    this.startTime = this.startTime.bind(this);
+    this.mintPrice = this.mintPrice.bind(this);
+    this.mintCount = this.mintCount.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+  mintableNumTokens = async (): Promise<MintableNumTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mintable_num_tokens: {}
+    });
+  };
+  startTime = async (): Promise<StartTimeResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      start_time: {}
+    });
+  };
+  mintPrice = async (): Promise<MintPriceResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mint_price: {}
+    });
+  };
+  mintCount = async ({
+    address
+  }: {
+    address: string;
+  }): Promise<MintCountResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      mint_count: {
+        address
+      }
+    });
+  };
+}
+export interface MinterInterface {
+  contractAddress: string;
+  sender: string;
+  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  setWhitelist: ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updatePerAddressLimit: ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mintTo: ({
+    recipient
+  }: {
+    recipient: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mintFor: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class MinterClient implements MinterInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.mint = this.mint.bind(this);
+    this.setWhitelist = this.setWhitelist.bind(this);
+    this.updateStartTime = this.updateStartTime.bind(this);
+    this.updatePerAddressLimit = this.updatePerAddressLimit.bind(this);
+    this.mintTo = this.mintTo.bind(this);
+    this.mintFor = this.mintFor.bind(this);
+    this.withdraw = this.withdraw.bind(this);
+  }
+
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {}
+    }, fee, memo, funds);
+  };
+  setWhitelist = async ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_whitelist: {
+        whitelist
+      }
+    }, fee, memo, funds);
+  };
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_start_time: {}
+    }, fee, memo, funds);
+  };
+  updatePerAddressLimit = async ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_per_address_limit: {
+        per_address_limit: perAddressLimit
+      }
+    }, fee, memo, funds);
+  };
+  mintTo = async ({
+    recipient
+  }: {
+    recipient: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint_to: {
+        recipient
+      }
+    }, fee, memo, funds);
+  };
+  mintFor = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint_for: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      withdraw: {}
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
new file mode 100644
index 00000000..30a74b8b
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -0,0 +1,174 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+export interface MinterMessage {
+  contractAddress: string;
+  sender: string;
+  mint: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  setWhitelist: ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updatePerAddressLimit: ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mintTo: ({
+    recipient
+  }: {
+    recipient: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mintFor: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class MinterMessageComposer implements MinterMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.mint = this.mint.bind(this);
+    this.setWhitelist = this.setWhitelist.bind(this);
+    this.updateStartTime = this.updateStartTime.bind(this);
+    this.updatePerAddressLimit = this.updatePerAddressLimit.bind(this);
+    this.mintTo = this.mintTo.bind(this);
+    this.mintFor = this.mintFor.bind(this);
+    this.withdraw = this.withdraw.bind(this);
+  }
+
+  mint = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint: {}
+        })),
+        funds
+      })
+    };
+  };
+  setWhitelist = ({
+    whitelist
+  }: {
+    whitelist: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          set_whitelist: {
+            whitelist
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateStartTime = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_start_time: {}
+        })),
+        funds
+      })
+    };
+  };
+  updatePerAddressLimit = ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_per_address_limit: {
+            per_address_limit: perAddressLimit
+          }
+        })),
+        funds
+      })
+    };
+  };
+  mintTo = ({
+    recipient
+  }: {
+    recipient: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint_to: {
+            recipient
+          }
+        })),
+        funds
+      })
+    };
+  };
+  mintFor = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint_for: {
+            recipient,
+            token_id: tokenId
+          }
+        })),
+        funds
+      })
+    };
+  };
+  withdraw = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          withdraw: {}
+        })),
+        funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.react-query.ts b/__output__/builder/bundler_test/contracts/Minter.react-query.ts
new file mode 100644
index 00000000..007bcfd9
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Minter.react-query.ts
@@ -0,0 +1,55 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { MinterQueryClient } from "./Minter.client";
+export interface MinterReactQuery<TResponse, TData = TResponse> {
+  client: MinterQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
+  args: {
+    address: string;
+  };
+}
+export function useMinterMintCountQuery<TData = MintCountResponse>({
+  client,
+  args,
+  options
+}: MinterMintCountQuery<TData>) {
+  return useQuery<MintCountResponse, Error, TData>(["minterMintCount", client.contractAddress, JSON.stringify(args)], () => client.mintCount({
+    address: args.address
+  }), options);
+}
+export interface MinterMintPriceQuery<TData> extends MinterReactQuery<MintPriceResponse, TData> {}
+export function useMinterMintPriceQuery<TData = MintPriceResponse>({
+  client,
+  options
+}: MinterMintPriceQuery<TData>) {
+  return useQuery<MintPriceResponse, Error, TData>(["minterMintPrice", client.contractAddress], () => client.mintPrice(), options);
+}
+export interface MinterStartTimeQuery<TData> extends MinterReactQuery<StartTimeResponse, TData> {}
+export function useMinterStartTimeQuery<TData = StartTimeResponse>({
+  client,
+  options
+}: MinterStartTimeQuery<TData>) {
+  return useQuery<StartTimeResponse, Error, TData>(["minterStartTime", client.contractAddress], () => client.startTime(), options);
+}
+export interface MinterMintableNumTokensQuery<TData> extends MinterReactQuery<MintableNumTokensResponse, TData> {}
+export function useMinterMintableNumTokensQuery<TData = MintableNumTokensResponse>({
+  client,
+  options
+}: MinterMintableNumTokensQuery<TData>) {
+  return useQuery<MintableNumTokensResponse, Error, TData>(["minterMintableNumTokens", client.contractAddress], () => client.mintableNumTokens(), options);
+}
+export interface MinterConfigQuery<TData> extends MinterReactQuery<ConfigResponse, TData> {}
+export function useMinterConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: MinterConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["minterConfig", client.contractAddress], () => client.config(), options);
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.recoil.ts b/__output__/builder/bundler_test/contracts/Minter.recoil.ts
new file mode 100644
index 00000000..826fb57c
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Minter.recoil.ts
@@ -0,0 +1,94 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { selectorFamily } from "recoil";
+import { cosmWasmClient } from "./chain";
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { MinterQueryClient } from "./Minter.client";
+type QueryClientParams = {
+  contractAddress: string;
+};
+export const queryClient = selectorFamily<MinterQueryClient, QueryClientParams>({
+  key: "minterQueryClient",
+  get: ({
+    contractAddress
+  }) => ({
+    get
+  }) => {
+    const client = get(cosmWasmClient);
+    return new MinterQueryClient(client, contractAddress);
+  }
+});
+export const configSelector = selectorFamily<ConfigResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["config"]>;
+}>({
+  key: "minterConfig",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.config(...params);
+  }
+});
+export const mintableNumTokensSelector = selectorFamily<MintableNumTokensResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["mintableNumTokens"]>;
+}>({
+  key: "minterMintableNumTokens",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mintableNumTokens(...params);
+  }
+});
+export const startTimeSelector = selectorFamily<StartTimeResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["startTime"]>;
+}>({
+  key: "minterStartTime",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.startTime(...params);
+  }
+});
+export const mintPriceSelector = selectorFamily<MintPriceResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["mintPrice"]>;
+}>({
+  key: "minterMintPrice",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mintPrice(...params);
+  }
+});
+export const mintCountSelector = selectorFamily<MintCountResponse, QueryClientParams & {
+  params: Parameters<MinterQueryClient["mintCount"]>;
+}>({
+  key: "minterMintCount",
+  get: ({
+    params,
+    ...queryClientParams
+  }) => async ({
+    get
+  }) => {
+    const client = get(queryClient(queryClientParams));
+    return await client.mintCount(...params);
+  }
+});
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.types.ts b/__output__/builder/bundler_test/contracts/Minter.types.ts
new file mode 100644
index 00000000..55999b8d
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Minter.types.ts
@@ -0,0 +1,124 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export type Uint128 = string;
+export interface ConfigResponse {
+  admin: string;
+  base_token_uri: string;
+  num_tokens: number;
+  per_address_limit: number;
+  sg721_address: string;
+  sg721_code_id: number;
+  start_time: Timestamp;
+  unit_price: Coin;
+  whitelist?: string | null;
+  [k: string]: unknown;
+}
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export type Addr = string;
+export interface Config {
+  admin: Addr;
+  base_token_uri: string;
+  num_tokens: number;
+  per_address_limit: number;
+  sg721_code_id: number;
+  start_time: Timestamp;
+  unit_price: Coin;
+  whitelist?: Addr | null;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = {
+  mint: {
+    [k: string]: unknown;
+  };
+} | {
+  set_whitelist: {
+    whitelist: string;
+    [k: string]: unknown;
+  };
+} | {
+  update_start_time: Timestamp;
+} | {
+  update_per_address_limit: {
+    per_address_limit: number;
+    [k: string]: unknown;
+  };
+} | {
+  mint_to: {
+    recipient: string;
+    [k: string]: unknown;
+  };
+} | {
+  mint_for: {
+    recipient: string;
+    token_id: number;
+    [k: string]: unknown;
+  };
+} | {
+  withdraw: {
+    [k: string]: unknown;
+  };
+};
+export type Decimal = string;
+export interface InstantiateMsg {
+  base_token_uri: string;
+  num_tokens: number;
+  per_address_limit: number;
+  sg721_code_id: number;
+  sg721_instantiate_msg: InstantiateMsg1;
+  start_time: Timestamp;
+  unit_price: Coin;
+  whitelist?: string | null;
+  [k: string]: unknown;
+}
+export interface InstantiateMsg1 {
+  collection_info: CollectionInfoForRoyaltyInfoResponse;
+  minter: string;
+  name: string;
+  symbol: string;
+  [k: string]: unknown;
+}
+export interface CollectionInfoForRoyaltyInfoResponse {
+  creator: string;
+  description: string;
+  external_link?: string | null;
+  image: string;
+  royalty_info?: RoyaltyInfoResponse | null;
+  [k: string]: unknown;
+}
+export interface RoyaltyInfoResponse {
+  payment_address: string;
+  share: Decimal;
+  [k: string]: unknown;
+}
+export type QueryMsg = {
+  config: {
+    [k: string]: unknown;
+  };
+} | {
+  mintable_num_tokens: {
+    [k: string]: unknown;
+  };
+} | {
+  start_time: {
+    [k: string]: unknown;
+  };
+} | {
+  mint_price: {
+    [k: string]: unknown;
+  };
+} | {
+  mint_count: {
+    address: string;
+    [k: string]: unknown;
+  };
+};
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
new file mode 100644
index 00000000..563d49ab
--- /dev/null
+++ b/__output__/builder/bundler_test/index.ts
@@ -0,0 +1,65 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import * as _65 from "./contracts/Factory.types";
+import * as _66 from "./contracts/Factory.client";
+import * as _67 from "./contracts/Factory.message-composer";
+import * as _68 from "./contracts/Factory.react-query";
+import * as _69 from "./contracts/Factory.recoil";
+import * as _70 from "./contracts/Minter.types";
+import * as _71 from "./contracts/Minter.client";
+import * as _72 from "./contracts/Minter.message-composer";
+import * as _73 from "./contracts/Minter.react-query";
+import * as _74 from "./contracts/Minter.recoil";
+import * as _75 from "./contracts/CwAdminFactory.types";
+import * as _76 from "./contracts/CwAdminFactory.client";
+import * as _77 from "./contracts/CwAdminFactory.message-composer";
+import * as _78 from "./contracts/CwAdminFactory.react-query";
+import * as _79 from "./contracts/CwAdminFactory.recoil";
+import * as _80 from "./contracts/CwCodeIdRegistry.types";
+import * as _81 from "./contracts/CwCodeIdRegistry.client";
+import * as _82 from "./contracts/CwCodeIdRegistry.message-composer";
+import * as _83 from "./contracts/CwCodeIdRegistry.react-query";
+import * as _84 from "./contracts/CwCodeIdRegistry.recoil";
+import * as _85 from "./contracts/CwSingle.types";
+import * as _86 from "./contracts/CwSingle.client";
+import * as _87 from "./contracts/CwSingle.message-composer";
+import * as _88 from "./contracts/CwSingle.react-query";
+import * as _89 from "./contracts/CwSingle.recoil";
+export namespace smart {
+  export namespace contracts {
+    export const Factory = { ..._65,
+      ..._66,
+      ..._67,
+      ..._68,
+      ..._69
+    };
+    export const Minter = { ..._70,
+      ..._71,
+      ..._72,
+      ..._73,
+      ..._74
+    };
+    export const CwAdminFactory = { ..._75,
+      ..._76,
+      ..._77,
+      ..._78,
+      ..._79
+    };
+    export const CwCodeIdRegistry = { ..._80,
+      ..._81,
+      ..._82,
+      ..._83,
+      ..._84
+    };
+    export const CwSingle = { ..._85,
+      ..._86,
+      ..._87,
+      ..._88,
+      ..._89
+    };
+  }
+}
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index c06b8135..8e26e23c 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -5,151 +5,189 @@ const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__/builder';
 
 it('options undefined', async () => {
-    const outPath = OUTPUT_DIR + '/vectis/factory-opt';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const builder = new TSBuilder({
-        contracts: [
-            schemaDir
-        ],
-        outPath,
-        options: undefined
-    });
-    delete builder.contracts;
-    delete builder.outPath;
-    expect(builder).toMatchSnapshot();
+  const outPath = OUTPUT_DIR + '/vectis/factory-opt';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const builder = new TSBuilder({
+    contracts: [schemaDir],
+    outPath,
+    options: undefined
+  });
+  delete builder.contracts;
+  delete builder.outPath;
+  expect(builder).toMatchSnapshot();
 });
 
 it('options tsClient.enabled', async () => {
-    const outPath = OUTPUT_DIR + '/vectis/factory-opt';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const builder = new TSBuilder({
-        contracts: [
-            schemaDir
-        ],
-        outPath,
-        options: {
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true
-            },
-            reactQuery: {
-                enabled: true
-            }
-        }
-    });
-    delete builder.contracts;
-    delete builder.outPath;
-    expect(builder).toMatchSnapshot();
+  const outPath = OUTPUT_DIR + '/vectis/factory-opt';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const builder = new TSBuilder({
+    contracts: [schemaDir],
+    outPath,
+    options: {
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true
+      },
+      reactQuery: {
+        enabled: true
+      }
+    }
+  });
+  delete builder.contracts;
+  delete builder.outPath;
+  expect(builder).toMatchSnapshot();
 });
 
 it('builder invoke', async () => {
-    const outPath = OUTPUT_DIR + '/invoke/';
-    const s = (str) => FIXTURE_DIR + str;
-    const builder = new TSBuilder({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true
-            },
-            reactQuery: {
-                enabled: true
-            }
-        }
-    });
-    await builder.build();
+  const outPath = OUTPUT_DIR + '/invoke/';
+  const s = (str) => FIXTURE_DIR + str;
+  const builder = new TSBuilder({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true
+      },
+      reactQuery: {
+        enabled: true
+      }
+    }
+  });
+  await builder.build();
 });
 
 it('builder default', async () => {
-    const outPath = OUTPUT_DIR + '/default/';
-    const s = (str) => FIXTURE_DIR + str;
-    await codegen({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            bundle: {
-                bundleFile: 'index.ts',
-                scope: 'smart.contracts'
-            },
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true,
-                execExtendsQuery: true
-            },
-            reactQuery: {
-                enabled: true
-            },
-            recoil: {
-                enabled: true
-            },
-            messageComposer: {
-                enabled: true
-            }
-        }
-    });
+  const outPath = OUTPUT_DIR + '/default/';
+  const s = (str) => FIXTURE_DIR + str;
+  await codegen({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      bundle: {
+        bundleFile: 'index.ts',
+        scope: 'smart.contracts'
+      },
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true,
+        execExtendsQuery: true
+      },
+      reactQuery: {
+        enabled: true
+      },
+      recoil: {
+        enabled: true
+      },
+      messageComposer: {
+        enabled: true
+      }
+    }
+  });
 });
 
 it('builder no extends', async () => {
-    const outPath = OUTPUT_DIR + '/no-extends/';
-    const s = (str) => FIXTURE_DIR + str;
-    await codegen({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            bundle: {
-                bundleFile: 'index.ts',
-                scope: 'smart.contracts'
-            },
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true,
-                execExtendsQuery: false
-            },
-            reactQuery: {
-                enabled: true
-            },
-            recoil: {
-                enabled: true
-            },
-            messageComposer: {
-                enabled: true
-            }
-        }
-    });
-});
\ No newline at end of file
+  const outPath = OUTPUT_DIR + '/no-extends/';
+  const s = (str) => FIXTURE_DIR + str;
+  await codegen({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      bundle: {
+        bundleFile: 'index.ts',
+        scope: 'smart.contracts'
+      },
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true,
+        execExtendsQuery: false
+      },
+      reactQuery: {
+        enabled: true
+      },
+      recoil: {
+        enabled: true
+      },
+      messageComposer: {
+        enabled: true
+      }
+    }
+  });
+});
+
+it('builder set bundler path', async () => {
+  const outPath = OUTPUT_DIR + '/bundler_test/contracts';
+  const bundlerPath = OUTPUT_DIR + '/bundler_test/';
+  const s = (str) => FIXTURE_DIR + str;
+  await codegen({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      bundle: {
+        bundlePath: bundlerPath,
+        bundleFile: 'index.ts',
+        scope: 'smart.contracts'
+      },
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true,
+        execExtendsQuery: false
+      },
+      reactQuery: {
+        enabled: true
+      },
+      recoil: {
+        enabled: true
+      },
+      messageComposer: {
+        enabled: true
+      }
+    }
+  });
+});
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index c4ae7739..2a276f53 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,9 +1,9 @@
-import { RenderOptions, defaultOptions } from "wasm-ast-types";
+import { RenderOptions, defaultOptions } from 'wasm-ast-types';
 
 import { header } from '../utils/header';
-import { join } from "path";
+import { join } from 'path';
 import { writeFileSync } from 'fs';
-import { sync as mkdirp } from "mkdirp";
+import { sync as mkdirp } from 'mkdirp';
 
 import generateMessageComposer from '../generators/message-composer';
 import generateTypes from '../generators/types';
@@ -15,180 +15,202 @@ import { basename } from 'path';
 import { readSchemas } from '../utils';
 
 import deepmerge from 'deepmerge';
-import { pascal } from "case";
-import { createFileBundle, recursiveModuleBundle } from "../bundler";
+import { pascal } from 'case';
+import { createFileBundle, recursiveModuleBundle } from '../bundler';
 
 import generate from '@babel/generator';
 import * as t from '@babel/types';
 
 const defaultOpts: TSBuilderOptions = {
-    bundle: {
-        enabled: true,
-        scope: 'contracts',
-        bundleFile: 'bundle.ts'
-    }
-}
+  bundle: {
+    enabled: true,
+    scope: 'contracts',
+    bundleFile: 'bundle.ts'
+  }
+};
 
 export interface TSBuilderInput {
-    contracts: Array<ContractFile | string>;
-    outPath: string;
-    options?: TSBuilderOptions;
-};
+  contracts: Array<ContractFile | string>;
+  outPath: string;
+  options?: TSBuilderOptions;
+}
 
 export interface BundleOptions {
-    enabled?: boolean;
-    scope?: string;
-    bundleFile?: string;
-};
+  enabled?: boolean;
+  scope?: string;
+  bundleFile?: string;
+  bundlePath?: string;
+}
 
 export type TSBuilderOptions = {
-    bundle?: BundleOptions;
+  bundle?: BundleOptions;
 } & RenderOptions;
 
 export interface BuilderFile {
-    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer';
-    contract: string;
-    localname: string;
-    filename: string;
-};
+  type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer';
+  contract: string;
+  localname: string;
+  filename: string;
+}
 
 export interface ContractFile {
-    name: string;
-    dir: string;
+  name: string;
+  dir: string;
 }
 export class TSBuilder {
-    contracts: Array<ContractFile | string>;
-    outPath: string;
-    options?: TSBuilderOptions;
-
-    protected files: BuilderFile[] = [];
-
-    constructor({ contracts, outPath, options }: TSBuilderInput) {
-        this.contracts = contracts;
-        this.outPath = outPath;
-        this.options = deepmerge(
-            deepmerge(
-                defaultOptions,
-                defaultOpts
-            ),
-            options ?? {}
-        );
-    }
-
-    getContracts(): ContractFile[] {
-        return this.contracts.map(contractOpt => {
-            if (typeof contractOpt === 'string') {
-                const name = basename(contractOpt);
-                const contractName = pascal(name);
-                return {
-                    name: contractName,
-                    dir: contractOpt
-                }
-            }
-            return {
-                name: pascal(contractOpt.name),
-                dir: contractOpt.dir
-            };
-        });
-    }
-
-    async renderTypes(contract: ContractFile) {
-        const { enabled, ...options } = this.options.types;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateTypes(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
-    }
-
-    async renderClient(contract: ContractFile) {
-        const { enabled, ...options } = this.options.client;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateClient(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
-    }
-
-    async renderRecoil(contract: ContractFile) {
-        const { enabled, ...options } = this.options.recoil;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateRecoil(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
+  contracts: Array<ContractFile | string>;
+  outPath: string;
+  options?: TSBuilderOptions;
+
+  protected files: BuilderFile[] = [];
+
+  constructor({ contracts, outPath, options }: TSBuilderInput) {
+    this.contracts = contracts;
+    this.outPath = outPath;
+    this.options = deepmerge(
+      deepmerge(defaultOptions, defaultOpts),
+      options ?? {}
+    );
+  }
+
+  getContracts(): ContractFile[] {
+    return this.contracts.map((contractOpt) => {
+      if (typeof contractOpt === 'string') {
+        const name = basename(contractOpt);
+        const contractName = pascal(name);
+        return {
+          name: contractName,
+          dir: contractOpt
+        };
+      }
+      return {
+        name: pascal(contractOpt.name),
+        dir: contractOpt.dir
+      };
+    });
+  }
+
+  async renderTypes(contract: ContractFile) {
+    const { enabled, ...options } = this.options.types;
+    if (!enabled) return;
+    const contractInfo = await readSchemas({
+      schemaDir: contract.dir
+    });
+    const files = await generateTypes(
+      contract.name,
+      contractInfo,
+      this.outPath,
+      options
+    );
+    [].push.apply(this.files, files);
+  }
+
+  async renderClient(contract: ContractFile) {
+    const { enabled, ...options } = this.options.client;
+    if (!enabled) return;
+    const contractInfo = await readSchemas({
+      schemaDir: contract.dir
+    });
+    const files = await generateClient(
+      contract.name,
+      contractInfo,
+      this.outPath,
+      options
+    );
+    [].push.apply(this.files, files);
+  }
+
+  async renderRecoil(contract: ContractFile) {
+    const { enabled, ...options } = this.options.recoil;
+    if (!enabled) return;
+    const contractInfo = await readSchemas({
+      schemaDir: contract.dir
+    });
+    const files = await generateRecoil(
+      contract.name,
+      contractInfo,
+      this.outPath,
+      options
+    );
+    [].push.apply(this.files, files);
+  }
+
+  async renderReactQuery(contract: ContractFile) {
+    const { enabled, ...options } = this.options.reactQuery;
+    if (!enabled) return;
+    const contractInfo = await readSchemas({
+      schemaDir: contract.dir
+    });
+    const files = await generateReactQuery(
+      contract.name,
+      contractInfo,
+      this.outPath,
+      options
+    );
+    [].push.apply(this.files, files);
+  }
+
+  async renderMessageComposer(contract: ContractFile) {
+    const { enabled, ...options } = this.options.messageComposer;
+    if (!enabled) return;
+    const contractInfo = await readSchemas({
+      schemaDir: contract.dir
+    });
+    const files = await generateMessageComposer(
+      contract.name,
+      contractInfo,
+      this.outPath,
+      options
+    );
+    [].push.apply(this.files, files);
+  }
+
+  async build() {
+    const contracts = this.getContracts();
+    for (let c = 0; c < contracts.length; c++) {
+      const contract = contracts[c];
+      await this.renderTypes(contract);
+      await this.renderClient(contract);
+      await this.renderMessageComposer(contract);
+      await this.renderReactQuery(contract);
+      await this.renderRecoil(contract);
     }
-
-    async renderReactQuery(contract: ContractFile) {
-        const { enabled, ...options } = this.options.reactQuery;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateReactQuery(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
-    }
-
-    async renderMessageComposer(contract: ContractFile) {
-        const { enabled, ...options } = this.options.messageComposer;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateMessageComposer(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
-    }
-
-    async build() {
-        const contracts = this.getContracts();
-        for (let c = 0; c < contracts.length; c++) {
-            const contract = contracts[c];
-            await this.renderTypes(contract);
-            await this.renderClient(contract);
-            await this.renderMessageComposer(contract);
-            await this.renderReactQuery(contract);
-            await this.renderRecoil(contract);
-        }
-        if (this.options.bundle.enabled) {
-            this.bundle();
-        }
+    if (this.options.bundle.enabled) {
+      this.bundle();
     }
-
-    async bundle() {
-
-        const allFiles = this.files;
-
-        const bundleFile = this.options.bundle.bundleFile;
-        const bundleVariables = {};
-        const importPaths = [];
-
-        allFiles.forEach(file => {
-            createFileBundle(
-                `${this.options.bundle.scope}.${file.contract}`,
-                file.localname,
-                bundleFile,
-                importPaths,
-                bundleVariables
-            );
-
-        });
-
-        const ast = recursiveModuleBundle(bundleVariables);
-        let code = generate(t.program(
-            [
-                ...importPaths,
-                ...ast
-            ]
-        )).code;
-
-        mkdirp(this.outPath);
-
-        if (code.trim() === '') code = 'export {};'
-
-        writeFileSync(join(this.outPath, bundleFile), header + code);
-
-    }
-}
\ No newline at end of file
+  }
+
+  async bundle() {
+    const allFiles = this.files;
+
+    const bundleFile = this.options.bundle.bundleFile;
+    const bundlePath = join(
+      this.options?.bundle?.bundlePath ?? this.outPath,
+      bundleFile
+    );
+    const bundleVariables = {};
+    const importPaths = [];
+
+    allFiles.forEach((file) => {
+      createFileBundle(
+        `${this.options.bundle.scope}.${file.contract}`,
+        file.filename,
+        bundlePath,
+        importPaths,
+        bundleVariables
+      );
+    });
+
+    const ast = recursiveModuleBundle(bundleVariables);
+    let code = generate(t.program([...importPaths, ...ast])).code;
+
+    mkdirp(this.outPath);
+
+    if (code.trim() === '') code = 'export {};';
+
+    writeFileSync(
+      bundlePath,
+      header + code
+    );
+  }
+}
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 70939b47..b9c6aaf9 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -1,4 +1,4 @@
-import { RenderOptions } from "wasm-ast-types";
+import { RenderOptions } from 'wasm-ast-types';
 export interface TSBuilderInput {
     contracts: Array<ContractFile | string>;
     outPath: string;
@@ -8,8 +8,9 @@ export interface BundleOptions {
     enabled?: boolean;
     scope?: string;
     bundleFile?: string;
+    bundlePath?: string;
 }
-export declare type TSBuilderOptions = {
+export type TSBuilderOptions = {
     bundle?: BundleOptions;
 } & RenderOptions;
 export interface BuilderFile {

From 7482490871cb24131a5f337703c4e0b491d7eb4b Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Mon, 6 Mar 2023 13:49:02 +0800
Subject: [PATCH 093/287] fix format

---
 packages/ts-codegen/__tests__/builder.test.ts | 344 ++++++++---------
 packages/ts-codegen/src/builder/builder.ts    | 347 +++++++++---------
 2 files changed, 339 insertions(+), 352 deletions(-)

diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 8e26e23c..f23f9f14 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -5,189 +5,193 @@ const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__/builder';
 
 it('options undefined', async () => {
-  const outPath = OUTPUT_DIR + '/vectis/factory-opt';
-  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-  const builder = new TSBuilder({
-    contracts: [schemaDir],
-    outPath,
-    options: undefined
-  });
-  delete builder.contracts;
-  delete builder.outPath;
-  expect(builder).toMatchSnapshot();
+    const outPath = OUTPUT_DIR + '/vectis/factory-opt';
+    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+    const builder = new TSBuilder({
+        contracts: [
+            schemaDir
+        ],
+        outPath,
+        options: undefined
+    });
+    delete builder.contracts;
+    delete builder.outPath;
+    expect(builder).toMatchSnapshot();
 });
 
 it('options tsClient.enabled', async () => {
-  const outPath = OUTPUT_DIR + '/vectis/factory-opt';
-  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-  const builder = new TSBuilder({
-    contracts: [schemaDir],
-    outPath,
-    options: {
-      types: {
-        enabled: true
-      },
-      client: {
-        enabled: true
-      },
-      reactQuery: {
-        enabled: true
-      }
-    }
-  });
-  delete builder.contracts;
-  delete builder.outPath;
-  expect(builder).toMatchSnapshot();
+    const outPath = OUTPUT_DIR + '/vectis/factory-opt';
+    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+    const builder = new TSBuilder({
+        contracts: [
+            schemaDir
+        ],
+        outPath,
+        options: {
+            types: {
+                enabled: true
+            },
+            client: {
+                enabled: true
+            },
+            reactQuery: {
+                enabled: true
+            }
+        }
+    });
+    delete builder.contracts;
+    delete builder.outPath;
+    expect(builder).toMatchSnapshot();
 });
 
 it('builder invoke', async () => {
-  const outPath = OUTPUT_DIR + '/invoke/';
-  const s = (str) => FIXTURE_DIR + str;
-  const builder = new TSBuilder({
-    contracts: [
-      s('/vectis/factory'),
-      s('/minter'),
-      s('/daodao/cw-admin-factory'),
-      s('/daodao/cw-code-id-registry'),
-      {
-        name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
-    ],
-    outPath,
-    options: {
-      types: {
-        enabled: true
-      },
-      client: {
-        enabled: true
-      },
-      reactQuery: {
-        enabled: true
-      }
-    }
-  });
-  await builder.build();
+    const outPath = OUTPUT_DIR + '/invoke/';
+    const s = (str) => FIXTURE_DIR + str;
+    const builder = new TSBuilder({
+        contracts: [
+            s('/vectis/factory'),
+            s('/minter'),
+            s('/daodao/cw-admin-factory'),
+            s('/daodao/cw-code-id-registry'),
+            {
+                name: 'CwSingle',
+                dir: s('/daodao/cw-proposal-single')
+            }
+        ],
+        outPath,
+        options: {
+            types: {
+                enabled: true
+            },
+            client: {
+                enabled: true
+            },
+            reactQuery: {
+                enabled: true
+            }
+        }
+    });
+    await builder.build();
 });
 
 it('builder default', async () => {
-  const outPath = OUTPUT_DIR + '/default/';
-  const s = (str) => FIXTURE_DIR + str;
-  await codegen({
-    contracts: [
-      s('/vectis/factory'),
-      s('/minter'),
-      s('/daodao/cw-admin-factory'),
-      s('/daodao/cw-code-id-registry'),
-      {
-        name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
-    ],
-    outPath,
-    options: {
-      bundle: {
-        bundleFile: 'index.ts',
-        scope: 'smart.contracts'
-      },
-      types: {
-        enabled: true
-      },
-      client: {
-        enabled: true,
-        execExtendsQuery: true
-      },
-      reactQuery: {
-        enabled: true
-      },
-      recoil: {
-        enabled: true
-      },
-      messageComposer: {
-        enabled: true
-      }
-    }
-  });
+    const outPath = OUTPUT_DIR + '/default/';
+    const s = (str) => FIXTURE_DIR + str;
+    await codegen({
+        contracts: [
+            s('/vectis/factory'),
+            s('/minter'),
+            s('/daodao/cw-admin-factory'),
+            s('/daodao/cw-code-id-registry'),
+            {
+                name: 'CwSingle',
+                dir: s('/daodao/cw-proposal-single')
+            }
+        ],
+        outPath,
+        options: {
+            bundle: {
+                bundleFile: 'index.ts',
+                scope: 'smart.contracts'
+            },
+            types: {
+                enabled: true
+            },
+            client: {
+                enabled: true,
+                execExtendsQuery: true
+            },
+            reactQuery: {
+                enabled: true
+            },
+            recoil: {
+                enabled: true
+            },
+            messageComposer: {
+                enabled: true
+            }
+        }
+    });
 });
 
 it('builder no extends', async () => {
-  const outPath = OUTPUT_DIR + '/no-extends/';
-  const s = (str) => FIXTURE_DIR + str;
-  await codegen({
-    contracts: [
-      s('/vectis/factory'),
-      s('/minter'),
-      s('/daodao/cw-admin-factory'),
-      s('/daodao/cw-code-id-registry'),
-      {
-        name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
-    ],
-    outPath,
-    options: {
-      bundle: {
-        bundleFile: 'index.ts',
-        scope: 'smart.contracts'
-      },
-      types: {
-        enabled: true
-      },
-      client: {
-        enabled: true,
-        execExtendsQuery: false
-      },
-      reactQuery: {
-        enabled: true
-      },
-      recoil: {
-        enabled: true
-      },
-      messageComposer: {
-        enabled: true
-      }
-    }
-  });
+    const outPath = OUTPUT_DIR + '/no-extends/';
+    const s = (str) => FIXTURE_DIR + str;
+    await codegen({
+        contracts: [
+            s('/vectis/factory'),
+            s('/minter'),
+            s('/daodao/cw-admin-factory'),
+            s('/daodao/cw-code-id-registry'),
+            {
+                name: 'CwSingle',
+                dir: s('/daodao/cw-proposal-single')
+            }
+        ],
+        outPath,
+        options: {
+            bundle: {
+                bundleFile: 'index.ts',
+                scope: 'smart.contracts'
+            },
+            types: {
+                enabled: true
+            },
+            client: {
+                enabled: true,
+                execExtendsQuery: false
+            },
+            reactQuery: {
+                enabled: true
+            },
+            recoil: {
+                enabled: true
+            },
+            messageComposer: {
+                enabled: true
+            }
+        }
+    });
 });
 
 it('builder set bundler path', async () => {
-  const outPath = OUTPUT_DIR + '/bundler_test/contracts';
-  const bundlerPath = OUTPUT_DIR + '/bundler_test/';
-  const s = (str) => FIXTURE_DIR + str;
-  await codegen({
-    contracts: [
-      s('/vectis/factory'),
-      s('/minter'),
-      s('/daodao/cw-admin-factory'),
-      s('/daodao/cw-code-id-registry'),
-      {
-        name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
-    ],
-    outPath,
-    options: {
-      bundle: {
-        bundlePath: bundlerPath,
-        bundleFile: 'index.ts',
-        scope: 'smart.contracts'
-      },
-      types: {
-        enabled: true
-      },
-      client: {
-        enabled: true,
-        execExtendsQuery: false
-      },
-      reactQuery: {
-        enabled: true
-      },
-      recoil: {
-        enabled: true
-      },
-      messageComposer: {
-        enabled: true
-      }
-    }
-  });
+    const outPath = OUTPUT_DIR + '/bundler_test/contracts';
+    const bundlerPath = OUTPUT_DIR + '/bundler_test/';
+    const s = (str) => FIXTURE_DIR + str;
+    await codegen({
+        contracts: [
+          s('/vectis/factory'),
+          s('/minter'),
+          s('/daodao/cw-admin-factory'),
+          s('/daodao/cw-code-id-registry'),
+          {
+              name: 'CwSingle',
+              dir: s('/daodao/cw-proposal-single')
+          }
+        ],
+        outPath,
+        options: {
+            bundle: {
+              bundlePath: bundlerPath,
+              bundleFile: 'index.ts',
+              scope: 'smart.contracts'
+            },
+            types: {
+              enabled: true
+            },
+            client: {
+              enabled: true,
+              execExtendsQuery: false
+            },
+            reactQuery: {
+              enabled: true
+            },
+            recoil: {
+              enabled: true
+            },
+            messageComposer: {
+              enabled: true
+            }
+        }
+    });
 });
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 2a276f53..5d5a3e5d 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,9 +1,9 @@
-import { RenderOptions, defaultOptions } from 'wasm-ast-types';
+import { RenderOptions, defaultOptions } from "wasm-ast-types";
 
 import { header } from '../utils/header';
-import { join } from 'path';
+import { join } from "path";
 import { writeFileSync } from 'fs';
-import { sync as mkdirp } from 'mkdirp';
+import { sync as mkdirp } from "mkdirp";
 
 import generateMessageComposer from '../generators/message-composer';
 import generateTypes from '../generators/types';
@@ -15,202 +15,185 @@ import { basename } from 'path';
 import { readSchemas } from '../utils';
 
 import deepmerge from 'deepmerge';
-import { pascal } from 'case';
-import { createFileBundle, recursiveModuleBundle } from '../bundler';
+import { pascal } from "case";
+import { createFileBundle, recursiveModuleBundle } from "../bundler";
 
 import generate from '@babel/generator';
 import * as t from '@babel/types';
 
 const defaultOpts: TSBuilderOptions = {
-  bundle: {
-    enabled: true,
-    scope: 'contracts',
-    bundleFile: 'bundle.ts'
-  }
-};
+    bundle: {
+        enabled: true,
+        scope: 'contracts',
+        bundleFile: 'bundle.ts'
+    }
+}
 
 export interface TSBuilderInput {
-  contracts: Array<ContractFile | string>;
-  outPath: string;
-  options?: TSBuilderOptions;
-}
+    contracts: Array<ContractFile | string>;
+    outPath: string;
+    options?: TSBuilderOptions;
+};
 
 export interface BundleOptions {
-  enabled?: boolean;
-  scope?: string;
-  bundleFile?: string;
-  bundlePath?: string;
-}
+    enabled?: boolean;
+    scope?: string;
+    bundleFile?: string;
+    bundlePath?: string;
+};
 
 export type TSBuilderOptions = {
-  bundle?: BundleOptions;
+    bundle?: BundleOptions;
 } & RenderOptions;
 
 export interface BuilderFile {
-  type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer';
-  contract: string;
-  localname: string;
-  filename: string;
-}
+    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer';
+    contract: string;
+    localname: string;
+    filename: string;
+};
 
 export interface ContractFile {
-  name: string;
-  dir: string;
+    name: string;
+    dir: string;
 }
 export class TSBuilder {
-  contracts: Array<ContractFile | string>;
-  outPath: string;
-  options?: TSBuilderOptions;
-
-  protected files: BuilderFile[] = [];
-
-  constructor({ contracts, outPath, options }: TSBuilderInput) {
-    this.contracts = contracts;
-    this.outPath = outPath;
-    this.options = deepmerge(
-      deepmerge(defaultOptions, defaultOpts),
-      options ?? {}
-    );
-  }
-
-  getContracts(): ContractFile[] {
-    return this.contracts.map((contractOpt) => {
-      if (typeof contractOpt === 'string') {
-        const name = basename(contractOpt);
-        const contractName = pascal(name);
-        return {
-          name: contractName,
-          dir: contractOpt
-        };
-      }
-      return {
-        name: pascal(contractOpt.name),
-        dir: contractOpt.dir
-      };
-    });
-  }
-
-  async renderTypes(contract: ContractFile) {
-    const { enabled, ...options } = this.options.types;
-    if (!enabled) return;
-    const contractInfo = await readSchemas({
-      schemaDir: contract.dir
-    });
-    const files = await generateTypes(
-      contract.name,
-      contractInfo,
-      this.outPath,
-      options
-    );
-    [].push.apply(this.files, files);
-  }
-
-  async renderClient(contract: ContractFile) {
-    const { enabled, ...options } = this.options.client;
-    if (!enabled) return;
-    const contractInfo = await readSchemas({
-      schemaDir: contract.dir
-    });
-    const files = await generateClient(
-      contract.name,
-      contractInfo,
-      this.outPath,
-      options
-    );
-    [].push.apply(this.files, files);
-  }
-
-  async renderRecoil(contract: ContractFile) {
-    const { enabled, ...options } = this.options.recoil;
-    if (!enabled) return;
-    const contractInfo = await readSchemas({
-      schemaDir: contract.dir
-    });
-    const files = await generateRecoil(
-      contract.name,
-      contractInfo,
-      this.outPath,
-      options
-    );
-    [].push.apply(this.files, files);
-  }
-
-  async renderReactQuery(contract: ContractFile) {
-    const { enabled, ...options } = this.options.reactQuery;
-    if (!enabled) return;
-    const contractInfo = await readSchemas({
-      schemaDir: contract.dir
-    });
-    const files = await generateReactQuery(
-      contract.name,
-      contractInfo,
-      this.outPath,
-      options
-    );
-    [].push.apply(this.files, files);
-  }
-
-  async renderMessageComposer(contract: ContractFile) {
-    const { enabled, ...options } = this.options.messageComposer;
-    if (!enabled) return;
-    const contractInfo = await readSchemas({
-      schemaDir: contract.dir
-    });
-    const files = await generateMessageComposer(
-      contract.name,
-      contractInfo,
-      this.outPath,
-      options
-    );
-    [].push.apply(this.files, files);
-  }
-
-  async build() {
-    const contracts = this.getContracts();
-    for (let c = 0; c < contracts.length; c++) {
-      const contract = contracts[c];
-      await this.renderTypes(contract);
-      await this.renderClient(contract);
-      await this.renderMessageComposer(contract);
-      await this.renderReactQuery(contract);
-      await this.renderRecoil(contract);
+    contracts: Array<ContractFile | string>;
+    outPath: string;
+    options?: TSBuilderOptions;
+
+    protected files: BuilderFile[] = [];
+
+    constructor({ contracts, outPath, options }: TSBuilderInput) {
+        this.contracts = contracts;
+        this.outPath = outPath;
+        this.options = deepmerge(
+            deepmerge(
+                defaultOptions,
+                defaultOpts
+            ),
+            options ?? {}
+        );
     }
-    if (this.options.bundle.enabled) {
-      this.bundle();
+
+    getContracts(): ContractFile[] {
+        return this.contracts.map(contractOpt => {
+            if (typeof contractOpt === 'string') {
+                const name = basename(contractOpt);
+                const contractName = pascal(name);
+                return {
+                    name: contractName,
+                    dir: contractOpt
+                }
+            }
+            return {
+                name: pascal(contractOpt.name),
+                dir: contractOpt.dir
+            };
+        });
     }
-  }
-
-  async bundle() {
-    const allFiles = this.files;
-
-    const bundleFile = this.options.bundle.bundleFile;
-    const bundlePath = join(
-      this.options?.bundle?.bundlePath ?? this.outPath,
-      bundleFile
-    );
-    const bundleVariables = {};
-    const importPaths = [];
-
-    allFiles.forEach((file) => {
-      createFileBundle(
-        `${this.options.bundle.scope}.${file.contract}`,
-        file.filename,
-        bundlePath,
-        importPaths,
-        bundleVariables
-      );
-    });
-
-    const ast = recursiveModuleBundle(bundleVariables);
-    let code = generate(t.program([...importPaths, ...ast])).code;
-
-    mkdirp(this.outPath);
-
-    if (code.trim() === '') code = 'export {};';
-
-    writeFileSync(
-      bundlePath,
-      header + code
-    );
-  }
-}
+
+    async renderTypes(contract: ContractFile) {
+        const { enabled, ...options } = this.options.types;
+        if (!enabled) return;
+        const contractInfo = await readSchemas({
+            schemaDir: contract.dir
+        });
+        const files = await generateTypes(contract.name, contractInfo, this.outPath, options);
+        [].push.apply(this.files, files);
+    }
+
+    async renderClient(contract: ContractFile) {
+        const { enabled, ...options } = this.options.client;
+        if (!enabled) return;
+        const contractInfo = await readSchemas({
+            schemaDir: contract.dir
+        });
+        const files = await generateClient(contract.name, contractInfo, this.outPath, options);
+        [].push.apply(this.files, files);
+    }
+
+    async renderRecoil(contract: ContractFile) {
+        const { enabled, ...options } = this.options.recoil;
+        if (!enabled) return;
+        const contractInfo = await readSchemas({
+            schemaDir: contract.dir
+        });
+        const files = await generateRecoil(contract.name, contractInfo, this.outPath, options);
+        [].push.apply(this.files, files);
+    }
+
+    async renderReactQuery(contract: ContractFile) {
+        const { enabled, ...options } = this.options.reactQuery;
+        if (!enabled) return;
+        const contractInfo = await readSchemas({
+            schemaDir: contract.dir
+        });
+        const files = await generateReactQuery(contract.name, contractInfo, this.outPath, options);
+        [].push.apply(this.files, files);
+    }
+
+    async renderMessageComposer(contract: ContractFile) {
+        const { enabled, ...options } = this.options.messageComposer;
+        if (!enabled) return;
+        const contractInfo = await readSchemas({
+            schemaDir: contract.dir
+        });
+        const files = await generateMessageComposer(contract.name, contractInfo, this.outPath, options);
+        [].push.apply(this.files, files);
+    }
+
+    async build() {
+        const contracts = this.getContracts();
+        for (let c = 0; c < contracts.length; c++) {
+            const contract = contracts[c];
+            await this.renderTypes(contract);
+            await this.renderClient(contract);
+            await this.renderMessageComposer(contract);
+            await this.renderReactQuery(contract);
+            await this.renderRecoil(contract);
+        }
+        if (this.options.bundle.enabled) {
+            this.bundle();
+        }
+    }
+
+    async bundle() {
+
+        const allFiles = this.files;
+
+        const bundleFile = this.options.bundle.bundleFile;
+        const bundlePath = join(
+          this.options?.bundle?.bundlePath ?? this.outPath,
+          bundleFile
+        );
+        const bundleVariables = {};
+        const importPaths = [];
+
+        allFiles.forEach(file => {
+            createFileBundle(
+                `${this.options.bundle.scope}.${file.contract}`,
+                file.filename,
+                bundlePath,
+                importPaths,
+                bundleVariables
+            );
+
+        });
+
+        const ast = recursiveModuleBundle(bundleVariables);
+        let code = generate(t.program(
+            [
+                ...importPaths,
+                ...ast
+            ]
+        )).code;
+
+        mkdirp(this.outPath);
+
+        if (code.trim() === '') code = 'export {};'
+
+        writeFileSync(bundlePath, header + code);
+
+    }
+}
\ No newline at end of file

From 01c9c9d14027ed324b017a2b3123ae8144a24dde Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Mon, 6 Mar 2023 13:56:09 +0800
Subject: [PATCH 094/287] mkdir for bundle path

---
 packages/ts-codegen/src/builder/builder.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 5d5a3e5d..640c89fe 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -189,6 +189,10 @@ export class TSBuilder {
             ]
         )).code;
 
+        if(this.options?.bundle?.bundlePath){
+            mkdirp(this.options?.bundle?.bundlePath);
+        }
+
         mkdirp(this.outPath);
 
         if (code.trim() === '') code = 'export {};'

From 02ee56dce1e443466144485b146cac37b8769f51 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 1 Jan 2023 18:48:47 +0100
Subject: [PATCH 095/287] Implement an entry point message builder

---
 .yarnrc.yml                                   |   3 +
 .../default/CwAdminFactory.msg-builder.ts     |  26 ++
 .../default/CwCodeIdRegistry.msg-builder.ts   | 146 ++++++++++
 .../builder/default/CwSingle.msg-builder.ts   | 232 +++++++++++++++
 .../builder/default/Factory.msg-builder.ts    | 154 ++++++++++
 .../builder/default/Minter.msg-builder.ts     | 104 +++++++
 __output__/builder/default/index.ts           |  86 +++---
 .../no-extends/CwAdminFactory.msg-builder.ts  |  26 ++
 .../CwCodeIdRegistry.msg-builder.ts           | 146 ++++++++++
 .../no-extends/CwSingle.msg-builder.ts        | 232 +++++++++++++++
 .../builder/no-extends/Factory.msg-builder.ts | 154 ++++++++++
 .../builder/no-extends/Minter.msg-builder.ts  | 104 +++++++
 __output__/builder/no-extends/index.ts        | 100 ++++---
 .../__snapshots__/builder.test.ts.snap        |   6 +
 packages/ts-codegen/__tests__/builder.test.ts |   8 +-
 packages/ts-codegen/src/builder/builder.ts    |  16 +-
 packages/ts-codegen/src/commands/generate.ts  |   3 +
 .../ts-codegen/src/generators/msg-builder.ts  |  78 +++++
 .../ts-codegen/types/src/builder/builder.d.ts |   3 +-
 .../types/src/generators/msg-builder.ts       |   5 +
 .../wasm-ast-types/src/context/context.ts     |   7 +
 packages/wasm-ast-types/src/index.ts          |   3 +-
 .../__snapshots__/msg-builder.spec.ts.snap    | 270 ++++++++++++++++++
 .../wasm-ast-types/src/msg-builder/index.ts   |   1 +
 .../src/msg-builder/msg-builder.spec.ts       |  18 ++
 .../src/msg-builder/msg-builder.ts            |  76 +++++
 packages/wasm-ast-types/src/utils/babel.ts    |  11 +
 .../wasm-ast-types/types/context/context.d.ts |   4 +
 packages/wasm-ast-types/types/index.d.ts      |   1 +
 .../types/msg-builder/index.d.ts              |   1 +
 .../types/msg-builder/msg-builder.d.ts        |   5 +
 31 files changed, 1941 insertions(+), 88 deletions(-)
 create mode 100644 .yarnrc.yml
 create mode 100644 __output__/builder/default/CwAdminFactory.msg-builder.ts
 create mode 100644 __output__/builder/default/CwCodeIdRegistry.msg-builder.ts
 create mode 100644 __output__/builder/default/CwSingle.msg-builder.ts
 create mode 100644 __output__/builder/default/Factory.msg-builder.ts
 create mode 100644 __output__/builder/default/Minter.msg-builder.ts
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.msg-builder.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.msg-builder.ts
 create mode 100644 __output__/builder/no-extends/Factory.msg-builder.ts
 create mode 100644 __output__/builder/no-extends/Minter.msg-builder.ts
 create mode 100644 packages/ts-codegen/src/generators/msg-builder.ts
 create mode 100644 packages/ts-codegen/types/src/generators/msg-builder.ts
 create mode 100644 packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
 create mode 100644 packages/wasm-ast-types/src/msg-builder/index.ts
 create mode 100644 packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
 create mode 100644 packages/wasm-ast-types/src/msg-builder/msg-builder.ts
 create mode 100644 packages/wasm-ast-types/types/msg-builder/index.d.ts
 create mode 100644 packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts

diff --git a/.yarnrc.yml b/.yarnrc.yml
new file mode 100644
index 00000000..8d823cc3
--- /dev/null
+++ b/.yarnrc.yml
@@ -0,0 +1,3 @@
+enableGlobalCache: true
+
+nodeLinker: node-modules
diff --git a/__output__/builder/default/CwAdminFactory.msg-builder.ts b/__output__/builder/default/CwAdminFactory.msg-builder.ts
new file mode 100644
index 00000000..776222d0
--- /dev/null
+++ b/__output__/builder/default/CwAdminFactory.msg-builder.ts
@@ -0,0 +1,26 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+export abstract class CwAdminFactoryExecuteMsgBuilder {
+  static instantiateContractWithSelfAdmin = ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }): ExecuteMsg => {
+    return {
+      instantiate_contract_with_self_admin: ({
+        code_id: codeId,
+        instantiate_msg: instantiateMsg,
+        label
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
new file mode 100644
index 00000000..d9388c55
--- /dev/null
+++ b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
@@ -0,0 +1,146 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+export abstract class CwCodeIdRegistryExecuteMsgBuilder {
+  static receive = ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }): ExecuteMsg => {
+    return {
+      receive: ({
+        amount,
+        msg,
+        sender
+      } as const)
+    };
+  };
+  static register = ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }): ExecuteMsg => {
+    return {
+      register: ({
+        chain_id: chainId,
+        checksum,
+        code_id: codeId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static setOwner = ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }): ExecuteMsg => {
+    return {
+      set_owner: ({
+        chain_id: chainId,
+        name,
+        owner
+      } as const)
+    };
+  };
+  static unregister = ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }): ExecuteMsg => {
+    return {
+      unregister: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }): ExecuteMsg => {
+    return {
+      update_config: ({
+        admin,
+        payment_info: paymentInfo
+      } as const)
+    };
+  };
+}
+export abstract class CwCodeIdRegistryQueryMsgBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static getRegistration = ({
+    chainId,
+    name,
+    version
+  }: {
+    chainId: string;
+    name: string;
+    version?: string;
+  }): QueryMsg => {
+    return {
+      get_registration: ({
+        chain_id: chainId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static infoForCodeId = ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }): QueryMsg => {
+    return {
+      info_for_code_id: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static listRegistrations = ({
+    chainId,
+    name
+  }: {
+    chainId: string;
+    name: string;
+  }): QueryMsg => {
+    return {
+      list_registrations: ({
+        chain_id: chainId,
+        name
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.msg-builder.ts b/__output__/builder/default/CwSingle.msg-builder.ts
new file mode 100644
index 00000000..9a0e73fb
--- /dev/null
+++ b/__output__/builder/default/CwSingle.msg-builder.ts
@@ -0,0 +1,232 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+export abstract class CwSingleExecuteMsgBuilder {
+  static propose = ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }): ExecuteMsg => {
+    return {
+      propose: ({
+        description,
+        msgs,
+        title
+      } as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }): ExecuteMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        vote
+      } as const)
+    };
+  };
+  static execute = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): ExecuteMsg => {
+    return {
+      execute: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static close = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): ExecuteMsg => {
+    return {
+      close: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }): ExecuteMsg => {
+    return {
+      update_config: ({
+        allow_revoting: allowRevoting,
+        dao,
+        deposit_info: depositInfo,
+        max_voting_period: maxVotingPeriod,
+        min_voting_period: minVotingPeriod,
+        only_members_execute: onlyMembersExecute,
+        threshold
+      } as const)
+    };
+  };
+  static addProposalHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      add_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeProposalHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      remove_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static addVoteHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      add_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeVoteHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      remove_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+}
+export abstract class CwSingleQueryMsgBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static proposal = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): QueryMsg => {
+    return {
+      proposal: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static listProposals = ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): QueryMsg => {
+    return {
+      list_proposals: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static reverseProposals = ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }): QueryMsg => {
+    return {
+      reverse_proposals: ({
+        limit,
+        start_before: startBefore
+      } as const)
+    };
+  };
+  static proposalCount = (): QueryMsg => {
+    return {
+      proposal_count: ({} as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }): QueryMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        voter
+      } as const)
+    };
+  };
+  static listVotes = ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }): QueryMsg => {
+    return {
+      list_votes: ({
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static proposalHooks = (): QueryMsg => {
+    return {
+      proposal_hooks: ({} as const)
+    };
+  };
+  static voteHooks = (): QueryMsg => {
+    return {
+      vote_hooks: ({} as const)
+    };
+  };
+  static info = (): QueryMsg => {
+    return {
+      info: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.msg-builder.ts b/__output__/builder/default/Factory.msg-builder.ts
new file mode 100644
index 00000000..4f5527b4
--- /dev/null
+++ b/__output__/builder/default/Factory.msg-builder.ts
@@ -0,0 +1,154 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+export abstract class FactoryExecuteMsgBuilder {
+  static createWallet = ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }): ExecuteMsg => {
+    return {
+      create_wallet: ({
+        create_wallet_msg: createWalletMsg
+      } as const)
+    };
+  };
+  static updateProxyUser = ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }): ExecuteMsg => {
+    return {
+      update_proxy_user: ({
+        new_user: newUser,
+        old_user: oldUser
+      } as const)
+    };
+  };
+  static migrateWallet = ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }): ExecuteMsg => {
+    return {
+      migrate_wallet: ({
+        migration_msg: migrationMsg,
+        wallet_address: walletAddress
+      } as const)
+    };
+  };
+  static updateCodeId = ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }): ExecuteMsg => {
+    return {
+      update_code_id: ({
+        new_code_id: newCodeId,
+        ty
+      } as const)
+    };
+  };
+  static updateWalletFee = ({
+    newFee
+  }: {
+    newFee: Coin;
+  }): ExecuteMsg => {
+    return {
+      update_wallet_fee: ({
+        new_fee: newFee
+      } as const)
+    };
+  };
+  static updateGovecAddr = ({
+    addr
+  }: {
+    addr: string;
+  }): ExecuteMsg => {
+    return {
+      update_govec_addr: ({
+        addr
+      } as const)
+    };
+  };
+  static updateAdmin = ({
+    addr
+  }: {
+    addr: string;
+  }): ExecuteMsg => {
+    return {
+      update_admin: ({
+        addr
+      } as const)
+    };
+  };
+}
+export abstract class FactoryQueryMsgBuilder {
+  static wallets = ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  }): QueryMsg => {
+    return {
+      wallets: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static walletsOf = ({
+    limit,
+    startAfter,
+    user
+  }: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  }): QueryMsg => {
+    return {
+      wallets_of: ({
+        limit,
+        start_after: startAfter,
+        user
+      } as const)
+    };
+  };
+  static codeId = ({
+    ty
+  }: {
+    ty: CodeIdType;
+  }): QueryMsg => {
+    return {
+      code_id: ({
+        ty
+      } as const)
+    };
+  };
+  static fee = (): QueryMsg => {
+    return {
+      fee: ({} as const)
+    };
+  };
+  static govecAddr = (): QueryMsg => {
+    return {
+      govec_addr: ({} as const)
+    };
+  };
+  static adminAddr = (): QueryMsg => {
+    return {
+      admin_addr: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.msg-builder.ts b/__output__/builder/default/Minter.msg-builder.ts
new file mode 100644
index 00000000..e0b406ce
--- /dev/null
+++ b/__output__/builder/default/Minter.msg-builder.ts
@@ -0,0 +1,104 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+export abstract class MinterExecuteMsgBuilder {
+  static mint = (): ExecuteMsg => {
+    return {
+      mint: ({} as const)
+    };
+  };
+  static setWhitelist = ({
+    whitelist
+  }: {
+    whitelist: string;
+  }): ExecuteMsg => {
+    return {
+      set_whitelist: ({
+        whitelist
+      } as const)
+    };
+  };
+  static updateStartTime = (): ExecuteMsg => {
+    return {
+      update_start_time: ({} as const)
+    };
+  };
+  static updatePerAddressLimit = ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }): ExecuteMsg => {
+    return {
+      update_per_address_limit: ({
+        per_address_limit: perAddressLimit
+      } as const)
+    };
+  };
+  static mintTo = ({
+    recipient
+  }: {
+    recipient: string;
+  }): ExecuteMsg => {
+    return {
+      mint_to: ({
+        recipient
+      } as const)
+    };
+  };
+  static mintFor = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }): ExecuteMsg => {
+    return {
+      mint_for: ({
+        recipient,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static withdraw = (): ExecuteMsg => {
+    return {
+      withdraw: ({} as const)
+    };
+  };
+}
+export abstract class MinterQueryMsgBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static mintableNumTokens = (): QueryMsg => {
+    return {
+      mintable_num_tokens: ({} as const)
+    };
+  };
+  static startTime = (): QueryMsg => {
+    return {
+      start_time: ({} as const)
+    };
+  };
+  static mintPrice = (): QueryMsg => {
+    return {
+      mint_price: ({} as const)
+    };
+  };
+  static mintCount = ({
+    address
+  }: {
+    address: string;
+  }): QueryMsg => {
+    return {
+      mint_count: ({
+        address
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index 1dbf2dbe..7b947b6b 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -7,59 +7,69 @@
 import * as _15 from "./Factory.types";
 import * as _16 from "./Factory.client";
 import * as _17 from "./Factory.message-composer";
-import * as _18 from "./Factory.react-query";
-import * as _19 from "./Factory.recoil";
-import * as _20 from "./Minter.types";
-import * as _21 from "./Minter.client";
-import * as _22 from "./Minter.message-composer";
-import * as _23 from "./Minter.react-query";
-import * as _24 from "./Minter.recoil";
-import * as _25 from "./CwAdminFactory.types";
-import * as _26 from "./CwAdminFactory.client";
-import * as _27 from "./CwAdminFactory.message-composer";
-import * as _28 from "./CwAdminFactory.react-query";
-import * as _29 from "./CwAdminFactory.recoil";
-import * as _30 from "./CwCodeIdRegistry.types";
-import * as _31 from "./CwCodeIdRegistry.client";
-import * as _32 from "./CwCodeIdRegistry.message-composer";
-import * as _33 from "./CwCodeIdRegistry.react-query";
-import * as _34 from "./CwCodeIdRegistry.recoil";
-import * as _35 from "./CwSingle.types";
-import * as _36 from "./CwSingle.client";
-import * as _37 from "./CwSingle.message-composer";
-import * as _38 from "./CwSingle.react-query";
-import * as _39 from "./CwSingle.recoil";
+import * as _18 from "./Factory.msg-builder";
+import * as _19 from "./Factory.react-query";
+import * as _20 from "./Factory.recoil";
+import * as _21 from "./Minter.types";
+import * as _22 from "./Minter.client";
+import * as _23 from "./Minter.message-composer";
+import * as _24 from "./Minter.msg-builder";
+import * as _25 from "./Minter.react-query";
+import * as _26 from "./Minter.recoil";
+import * as _27 from "./CwAdminFactory.types";
+import * as _28 from "./CwAdminFactory.client";
+import * as _29 from "./CwAdminFactory.message-composer";
+import * as _30 from "./CwAdminFactory.msg-builder";
+import * as _31 from "./CwAdminFactory.react-query";
+import * as _32 from "./CwAdminFactory.recoil";
+import * as _33 from "./CwCodeIdRegistry.types";
+import * as _34 from "./CwCodeIdRegistry.client";
+import * as _35 from "./CwCodeIdRegistry.message-composer";
+import * as _36 from "./CwCodeIdRegistry.msg-builder";
+import * as _37 from "./CwCodeIdRegistry.react-query";
+import * as _38 from "./CwCodeIdRegistry.recoil";
+import * as _39 from "./CwSingle.types";
+import * as _40 from "./CwSingle.client";
+import * as _41 from "./CwSingle.message-composer";
+import * as _42 from "./CwSingle.msg-builder";
+import * as _43 from "./CwSingle.react-query";
+import * as _44 from "./CwSingle.recoil";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._15,
       ..._16,
       ..._17,
       ..._18,
-      ..._19
+      ..._19,
+      ..._20
     };
-    export const Minter = { ..._20,
-      ..._21,
+    export const Minter = { ..._21,
       ..._22,
       ..._23,
-      ..._24
+      ..._24,
+      ..._25,
+      ..._26
     };
-    export const CwAdminFactory = { ..._25,
-      ..._26,
-      ..._27,
+    export const CwAdminFactory = { ..._27,
       ..._28,
-      ..._29
-    };
-    export const CwCodeIdRegistry = { ..._30,
+      ..._29,
+      ..._30,
       ..._31,
-      ..._32,
-      ..._33,
-      ..._34
+      ..._32
     };
-    export const CwSingle = { ..._35,
+    export const CwCodeIdRegistry = { ..._33,
+      ..._34,
+      ..._35,
       ..._36,
       ..._37,
-      ..._38,
-      ..._39
+      ..._38
+    };
+    export const CwSingle = { ..._39,
+      ..._40,
+      ..._41,
+      ..._42,
+      ..._43,
+      ..._44
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
new file mode 100644
index 00000000..776222d0
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
@@ -0,0 +1,26 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+export abstract class CwAdminFactoryExecuteMsgBuilder {
+  static instantiateContractWithSelfAdmin = ({
+    codeId,
+    instantiateMsg,
+    label
+  }: {
+    codeId: number;
+    instantiateMsg: Binary;
+    label: string;
+  }): ExecuteMsg => {
+    return {
+      instantiate_contract_with_self_admin: ({
+        code_id: codeId,
+        instantiate_msg: instantiateMsg,
+        label
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
new file mode 100644
index 00000000..d9388c55
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
@@ -0,0 +1,146 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+export abstract class CwCodeIdRegistryExecuteMsgBuilder {
+  static receive = ({
+    amount,
+    msg,
+    sender
+  }: {
+    amount: Uint128;
+    msg: Binary;
+    sender: string;
+  }): ExecuteMsg => {
+    return {
+      receive: ({
+        amount,
+        msg,
+        sender
+      } as const)
+    };
+  };
+  static register = ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: {
+    chainId: string;
+    checksum: string;
+    codeId: number;
+    name: string;
+    version: string;
+  }): ExecuteMsg => {
+    return {
+      register: ({
+        chain_id: chainId,
+        checksum,
+        code_id: codeId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static setOwner = ({
+    chainId,
+    name,
+    owner
+  }: {
+    chainId: string;
+    name: string;
+    owner?: string;
+  }): ExecuteMsg => {
+    return {
+      set_owner: ({
+        chain_id: chainId,
+        name,
+        owner
+      } as const)
+    };
+  };
+  static unregister = ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }): ExecuteMsg => {
+    return {
+      unregister: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    admin,
+    paymentInfo
+  }: {
+    admin?: string;
+    paymentInfo?: PaymentInfo;
+  }): ExecuteMsg => {
+    return {
+      update_config: ({
+        admin,
+        payment_info: paymentInfo
+      } as const)
+    };
+  };
+}
+export abstract class CwCodeIdRegistryQueryMsgBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static getRegistration = ({
+    chainId,
+    name,
+    version
+  }: {
+    chainId: string;
+    name: string;
+    version?: string;
+  }): QueryMsg => {
+    return {
+      get_registration: ({
+        chain_id: chainId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static infoForCodeId = ({
+    chainId,
+    codeId
+  }: {
+    chainId: string;
+    codeId: number;
+  }): QueryMsg => {
+    return {
+      info_for_code_id: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static listRegistrations = ({
+    chainId,
+    name
+  }: {
+    chainId: string;
+    name: string;
+  }): QueryMsg => {
+    return {
+      list_registrations: ({
+        chain_id: chainId,
+        name
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.msg-builder.ts b/__output__/builder/no-extends/CwSingle.msg-builder.ts
new file mode 100644
index 00000000..9a0e73fb
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.msg-builder.ts
@@ -0,0 +1,232 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+export abstract class CwSingleExecuteMsgBuilder {
+  static propose = ({
+    description,
+    msgs,
+    title
+  }: {
+    description: string;
+    msgs: CosmosMsgForEmpty[];
+    title: string;
+  }): ExecuteMsg => {
+    return {
+      propose: ({
+        description,
+        msgs,
+        title
+      } as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    vote
+  }: {
+    proposalId: number;
+    vote: Vote;
+  }): ExecuteMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        vote
+      } as const)
+    };
+  };
+  static execute = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): ExecuteMsg => {
+    return {
+      execute: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static close = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): ExecuteMsg => {
+    return {
+      close: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: {
+    allowRevoting: boolean;
+    dao: string;
+    depositInfo?: DepositInfo;
+    maxVotingPeriod: Duration;
+    minVotingPeriod?: Duration;
+    onlyMembersExecute: boolean;
+    threshold: Threshold;
+  }): ExecuteMsg => {
+    return {
+      update_config: ({
+        allow_revoting: allowRevoting,
+        dao,
+        deposit_info: depositInfo,
+        max_voting_period: maxVotingPeriod,
+        min_voting_period: minVotingPeriod,
+        only_members_execute: onlyMembersExecute,
+        threshold
+      } as const)
+    };
+  };
+  static addProposalHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      add_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeProposalHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      remove_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static addVoteHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      add_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeVoteHook = ({
+    address
+  }: {
+    address: string;
+  }): ExecuteMsg => {
+    return {
+      remove_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+}
+export abstract class CwSingleQueryMsgBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static proposal = ({
+    proposalId
+  }: {
+    proposalId: number;
+  }): QueryMsg => {
+    return {
+      proposal: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static listProposals = ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): QueryMsg => {
+    return {
+      list_proposals: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static reverseProposals = ({
+    limit,
+    startBefore
+  }: {
+    limit?: number;
+    startBefore?: number;
+  }): QueryMsg => {
+    return {
+      reverse_proposals: ({
+        limit,
+        start_before: startBefore
+      } as const)
+    };
+  };
+  static proposalCount = (): QueryMsg => {
+    return {
+      proposal_count: ({} as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    voter
+  }: {
+    proposalId: number;
+    voter: string;
+  }): QueryMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        voter
+      } as const)
+    };
+  };
+  static listVotes = ({
+    limit,
+    proposalId,
+    startAfter
+  }: {
+    limit?: number;
+    proposalId: number;
+    startAfter?: string;
+  }): QueryMsg => {
+    return {
+      list_votes: ({
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static proposalHooks = (): QueryMsg => {
+    return {
+      proposal_hooks: ({} as const)
+    };
+  };
+  static voteHooks = (): QueryMsg => {
+    return {
+      vote_hooks: ({} as const)
+    };
+  };
+  static info = (): QueryMsg => {
+    return {
+      info: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.msg-builder.ts b/__output__/builder/no-extends/Factory.msg-builder.ts
new file mode 100644
index 00000000..4f5527b4
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.msg-builder.ts
@@ -0,0 +1,154 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+export abstract class FactoryExecuteMsgBuilder {
+  static createWallet = ({
+    createWalletMsg
+  }: {
+    createWalletMsg: CreateWalletMsg;
+  }): ExecuteMsg => {
+    return {
+      create_wallet: ({
+        create_wallet_msg: createWalletMsg
+      } as const)
+    };
+  };
+  static updateProxyUser = ({
+    newUser,
+    oldUser
+  }: {
+    newUser: Addr;
+    oldUser: Addr;
+  }): ExecuteMsg => {
+    return {
+      update_proxy_user: ({
+        new_user: newUser,
+        old_user: oldUser
+      } as const)
+    };
+  };
+  static migrateWallet = ({
+    migrationMsg,
+    walletAddress
+  }: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  }): ExecuteMsg => {
+    return {
+      migrate_wallet: ({
+        migration_msg: migrationMsg,
+        wallet_address: walletAddress
+      } as const)
+    };
+  };
+  static updateCodeId = ({
+    newCodeId,
+    ty
+  }: {
+    newCodeId: number;
+    ty: CodeIdType;
+  }): ExecuteMsg => {
+    return {
+      update_code_id: ({
+        new_code_id: newCodeId,
+        ty
+      } as const)
+    };
+  };
+  static updateWalletFee = ({
+    newFee
+  }: {
+    newFee: Coin;
+  }): ExecuteMsg => {
+    return {
+      update_wallet_fee: ({
+        new_fee: newFee
+      } as const)
+    };
+  };
+  static updateGovecAddr = ({
+    addr
+  }: {
+    addr: string;
+  }): ExecuteMsg => {
+    return {
+      update_govec_addr: ({
+        addr
+      } as const)
+    };
+  };
+  static updateAdmin = ({
+    addr
+  }: {
+    addr: string;
+  }): ExecuteMsg => {
+    return {
+      update_admin: ({
+        addr
+      } as const)
+    };
+  };
+}
+export abstract class FactoryQueryMsgBuilder {
+  static wallets = ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: WalletQueryPrefix;
+  }): QueryMsg => {
+    return {
+      wallets: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static walletsOf = ({
+    limit,
+    startAfter,
+    user
+  }: {
+    limit?: number;
+    startAfter?: string;
+    user: string;
+  }): QueryMsg => {
+    return {
+      wallets_of: ({
+        limit,
+        start_after: startAfter,
+        user
+      } as const)
+    };
+  };
+  static codeId = ({
+    ty
+  }: {
+    ty: CodeIdType;
+  }): QueryMsg => {
+    return {
+      code_id: ({
+        ty
+      } as const)
+    };
+  };
+  static fee = (): QueryMsg => {
+    return {
+      fee: ({} as const)
+    };
+  };
+  static govecAddr = (): QueryMsg => {
+    return {
+      govec_addr: ({} as const)
+    };
+  };
+  static adminAddr = (): QueryMsg => {
+    return {
+      admin_addr: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.msg-builder.ts b/__output__/builder/no-extends/Minter.msg-builder.ts
new file mode 100644
index 00000000..e0b406ce
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.msg-builder.ts
@@ -0,0 +1,104 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+export abstract class MinterExecuteMsgBuilder {
+  static mint = (): ExecuteMsg => {
+    return {
+      mint: ({} as const)
+    };
+  };
+  static setWhitelist = ({
+    whitelist
+  }: {
+    whitelist: string;
+  }): ExecuteMsg => {
+    return {
+      set_whitelist: ({
+        whitelist
+      } as const)
+    };
+  };
+  static updateStartTime = (): ExecuteMsg => {
+    return {
+      update_start_time: ({} as const)
+    };
+  };
+  static updatePerAddressLimit = ({
+    perAddressLimit
+  }: {
+    perAddressLimit: number;
+  }): ExecuteMsg => {
+    return {
+      update_per_address_limit: ({
+        per_address_limit: perAddressLimit
+      } as const)
+    };
+  };
+  static mintTo = ({
+    recipient
+  }: {
+    recipient: string;
+  }): ExecuteMsg => {
+    return {
+      mint_to: ({
+        recipient
+      } as const)
+    };
+  };
+  static mintFor = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: number;
+  }): ExecuteMsg => {
+    return {
+      mint_for: ({
+        recipient,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static withdraw = (): ExecuteMsg => {
+    return {
+      withdraw: ({} as const)
+    };
+  };
+}
+export abstract class MinterQueryMsgBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static mintableNumTokens = (): QueryMsg => {
+    return {
+      mintable_num_tokens: ({} as const)
+    };
+  };
+  static startTime = (): QueryMsg => {
+    return {
+      start_time: ({} as const)
+    };
+  };
+  static mintPrice = (): QueryMsg => {
+    return {
+      mint_price: ({} as const)
+    };
+  };
+  static mintCount = ({
+    address
+  }: {
+    address: string;
+  }): QueryMsg => {
+    return {
+      mint_count: ({
+        address
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
index baf3d150..6a2abe65 100644
--- a/__output__/builder/no-extends/index.ts
+++ b/__output__/builder/no-extends/index.ts
@@ -4,62 +4,72 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import * as _40 from "./Factory.types";
-import * as _41 from "./Factory.client";
-import * as _42 from "./Factory.message-composer";
-import * as _43 from "./Factory.react-query";
-import * as _44 from "./Factory.recoil";
-import * as _45 from "./Minter.types";
-import * as _46 from "./Minter.client";
-import * as _47 from "./Minter.message-composer";
-import * as _48 from "./Minter.react-query";
-import * as _49 from "./Minter.recoil";
-import * as _50 from "./CwAdminFactory.types";
-import * as _51 from "./CwAdminFactory.client";
-import * as _52 from "./CwAdminFactory.message-composer";
-import * as _53 from "./CwAdminFactory.react-query";
-import * as _54 from "./CwAdminFactory.recoil";
-import * as _55 from "./CwCodeIdRegistry.types";
-import * as _56 from "./CwCodeIdRegistry.client";
-import * as _57 from "./CwCodeIdRegistry.message-composer";
-import * as _58 from "./CwCodeIdRegistry.react-query";
-import * as _59 from "./CwCodeIdRegistry.recoil";
-import * as _60 from "./CwSingle.types";
-import * as _61 from "./CwSingle.client";
-import * as _62 from "./CwSingle.message-composer";
-import * as _63 from "./CwSingle.react-query";
-import * as _64 from "./CwSingle.recoil";
+import * as _45 from "./Factory.types";
+import * as _46 from "./Factory.client";
+import * as _47 from "./Factory.message-composer";
+import * as _48 from "./Factory.msg-builder";
+import * as _49 from "./Factory.react-query";
+import * as _50 from "./Factory.recoil";
+import * as _51 from "./Minter.types";
+import * as _52 from "./Minter.client";
+import * as _53 from "./Minter.message-composer";
+import * as _54 from "./Minter.msg-builder";
+import * as _55 from "./Minter.react-query";
+import * as _56 from "./Minter.recoil";
+import * as _57 from "./CwAdminFactory.types";
+import * as _58 from "./CwAdminFactory.client";
+import * as _59 from "./CwAdminFactory.message-composer";
+import * as _60 from "./CwAdminFactory.msg-builder";
+import * as _61 from "./CwAdminFactory.react-query";
+import * as _62 from "./CwAdminFactory.recoil";
+import * as _63 from "./CwCodeIdRegistry.types";
+import * as _64 from "./CwCodeIdRegistry.client";
+import * as _65 from "./CwCodeIdRegistry.message-composer";
+import * as _66 from "./CwCodeIdRegistry.msg-builder";
+import * as _67 from "./CwCodeIdRegistry.react-query";
+import * as _68 from "./CwCodeIdRegistry.recoil";
+import * as _69 from "./CwSingle.types";
+import * as _70 from "./CwSingle.client";
+import * as _71 from "./CwSingle.message-composer";
+import * as _72 from "./CwSingle.msg-builder";
+import * as _73 from "./CwSingle.react-query";
+import * as _74 from "./CwSingle.recoil";
 export namespace smart {
   export namespace contracts {
-    export const Factory = { ..._40,
-      ..._41,
-      ..._42,
-      ..._43,
-      ..._44
-    };
-    export const Minter = { ..._45,
+    export const Factory = { ..._45,
       ..._46,
       ..._47,
       ..._48,
-      ..._49
+      ..._49,
+      ..._50
     };
-    export const CwAdminFactory = { ..._50,
-      ..._51,
+    export const Minter = { ..._51,
       ..._52,
       ..._53,
-      ..._54
+      ..._54,
+      ..._55,
+      ..._56
     };
-    export const CwCodeIdRegistry = { ..._55,
-      ..._56,
-      ..._57,
+    export const CwAdminFactory = { ..._57,
       ..._58,
-      ..._59
-    };
-    export const CwSingle = { ..._60,
+      ..._59,
+      ..._60,
       ..._61,
-      ..._62,
-      ..._63,
-      ..._64
+      ..._62
+    };
+    export const CwCodeIdRegistry = { ..._63,
+      ..._64,
+      ..._65,
+      ..._66,
+      ..._67,
+      ..._68
+    };
+    export const CwSingle = { ..._69,
+      ..._70,
+      ..._71,
+      ..._72,
+      ..._73,
+      ..._74
     };
   }
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index f01767f9..a765e207 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -17,6 +17,9 @@ TSBuilder {
     "messageComposer": Object {
       "enabled": false,
     },
+    "msgBuilder": Object {
+      "enabled": false,
+    },
     "reactQuery": Object {
       "camelize": true,
       "enabled": true,
@@ -53,6 +56,9 @@ TSBuilder {
     "messageComposer": Object {
       "enabled": false,
     },
+    "msgBuilder": Object {
+      "enabled": false,
+    },
     "reactQuery": Object {
       "camelize": true,
       "enabled": false,
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index c06b8135..f8424330 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -109,6 +109,9 @@ it('builder default', async () => {
             },
             messageComposer: {
                 enabled: true
+            },
+            msgBuilder: {
+              enabled: true
             }
         }
     });
@@ -149,7 +152,10 @@ it('builder no extends', async () => {
             },
             messageComposer: {
                 enabled: true
+            },
+            msgBuilder: {
+              enabled: true
             }
         }
     });
-});
\ No newline at end of file
+});
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index c4ae7739..7bbaaebc 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -6,6 +6,7 @@ import { writeFileSync } from 'fs';
 import { sync as mkdirp } from "mkdirp";
 
 import generateMessageComposer from '../generators/message-composer';
+import generateMsgBuilder from '../generators/msg-builder';
 import generateTypes from '../generators/types';
 import generateReactQuery from '../generators/react-query';
 import generateRecoil from '../generators/recoil';
@@ -46,7 +47,7 @@ export type TSBuilderOptions = {
 } & RenderOptions;
 
 export interface BuilderFile {
-    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer';
+    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder';
     contract: string;
     localname: string;
     filename: string;
@@ -142,6 +143,16 @@ export class TSBuilder {
         [].push.apply(this.files, files);
     }
 
+    async renderMsgBuilder(contract: ContractFile) {
+      const { enabled, ...options } = this.options.messageComposer;
+      if (!enabled) return;
+      const contractInfo = await readSchemas({
+        schemaDir: contract.dir
+      });
+      const files = await generateMsgBuilder(contract.name, contractInfo, this.outPath, options);
+      [].push.apply(this.files, files);
+    }
+
     async build() {
         const contracts = this.getContracts();
         for (let c = 0; c < contracts.length; c++) {
@@ -149,6 +160,7 @@ export class TSBuilder {
             await this.renderTypes(contract);
             await this.renderClient(contract);
             await this.renderMessageComposer(contract);
+            await this.renderMsgBuilder(contract);
             await this.renderReactQuery(contract);
             await this.renderRecoil(contract);
         }
@@ -191,4 +203,4 @@ export class TSBuilder {
         writeFileSync(join(this.outPath, bundleFile), header + code);
 
     }
-}
\ No newline at end of file
+}
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index db7351e7..2adee769 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -151,6 +151,9 @@ export default async (argv) => {
         messageComposer: {
             enabled: plugin.includes('message-composer')
         },
+        msgBuilder: {
+          enabled: plugin.includes('msg-builder')
+        },
         bundle: {
             enabled: bundle,
             scope: bundleScope,
diff --git a/packages/ts-codegen/src/generators/msg-builder.ts b/packages/ts-codegen/src/generators/msg-builder.ts
new file mode 100644
index 00000000..eaf3f754
--- /dev/null
+++ b/packages/ts-codegen/src/generators/msg-builder.ts
@@ -0,0 +1,78 @@
+import { pascal } from "case";
+import { header } from "../utils/header";
+import { join } from "path";
+import { sync as mkdirp } from "mkdirp";
+import * as w from "wasm-ast-types";
+import * as t from "@babel/types";
+import { writeFileSync } from "fs";
+import generate from "@babel/generator";
+import { ContractInfo, getMessageProperties } from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
+import { RenderContext, MsgBuilderOptions } from 'wasm-ast-types';
+import { BuilderFile } from "../builder";
+
+export default async (
+  name: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  msgBuilderOptions?: MsgBuilderOptions
+): Promise<BuilderFile[]> => {
+  const { schemas } = contractInfo;
+  const context = new RenderContext(contractInfo, {
+    msgBuilder: msgBuilderOptions ?? {},
+  });
+  // const options = context.options.msgBuilder;
+
+  const localname = pascal(name) + ".msg-builder.ts";
+  const TypesFile = pascal(name) + ".types";
+  const ExecuteMsg = findExecuteMsg(schemas);
+  const typeHash = await findAndParseTypes(schemas);
+
+  const body = [];
+
+  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+
+  // execute messages
+  if (ExecuteMsg) {
+    const children = getMessageProperties(ExecuteMsg);
+    if (children.length > 0) {
+      const className = pascal(`${name}ExecuteMsgBuilder`);
+
+      body.push(
+        w.createMsgBuilderClass(context, className, ExecuteMsg)
+      );
+    }
+  }
+
+  const QueryMsg = findQueryMsg(schemas);
+  // query messages
+  if (QueryMsg) {
+    const children = getMessageProperties(QueryMsg);
+    if (children.length > 0) {
+      const className = pascal(`${name}QueryMsgBuilder`);
+
+      body.push(
+        w.createMsgBuilderClass(context, className, QueryMsg)
+      );
+    }
+  }
+
+  if (typeHash.hasOwnProperty("Coin")) {
+    // @ts-ignore
+    delete context.utils.Coin;
+  }
+  const imports = context.getImports();
+  const code = header + generate(t.program([...imports, ...body])).code;
+
+  mkdirp(outPath);
+  writeFileSync(join(outPath, localname), code);
+
+  return [
+    {
+      type: "msg-builder",
+      contract: name,
+      localname,
+      filename: join(outPath, localname),
+    },
+  ];
+};
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 70939b47..7bf170f9 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -13,7 +13,7 @@ export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
 } & RenderOptions;
 export interface BuilderFile {
-    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer';
+    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder';
     contract: string;
     localname: string;
     filename: string;
@@ -34,6 +34,7 @@ export declare class TSBuilder {
     renderRecoil(contract: ContractFile): Promise<void>;
     renderReactQuery(contract: ContractFile): Promise<void>;
     renderMessageComposer(contract: ContractFile): Promise<void>;
+    renderMsgBuilder(contract: ContractFile): Promise<void>;
     build(): Promise<void>;
     bundle(): Promise<void>;
 }
diff --git a/packages/ts-codegen/types/src/generators/msg-builder.ts b/packages/ts-codegen/types/src/generators/msg-builder.ts
new file mode 100644
index 00000000..4db98a6b
--- /dev/null
+++ b/packages/ts-codegen/types/src/generators/msg-builder.ts
@@ -0,0 +1,5 @@
+import { ContractInfo } from "wasm-ast-types";
+import { MsgBuilderOptions } from "wasm-ast-types";
+import { BuilderFile } from "../builder";
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, msgBuilderOptions?: MsgBuilderOptions) => Promise<BuilderFile[]>;
+export default _default;
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index fdbc9edc..b93ac877 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -21,6 +21,9 @@ export interface TSClientOptions {
 export interface MessageComposerOptions {
     enabled?: boolean;
 }
+export interface MsgBuilderOptions {
+    enabled?: boolean;
+}
 export interface RecoilOptions {
     enabled?: boolean;
 }
@@ -55,6 +58,7 @@ export interface RenderOptions {
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
     messageComposer?: MessageComposerOptions;
+    msgBuilder?: MsgBuilderOptions;
     client?: TSClientOptions;
     reactQuery?: ReactQueryOptions;
 }
@@ -80,6 +84,9 @@ export const defaultOptions: RenderOptions = {
     messageComposer: {
         enabled: false
     },
+    msgBuilder: {
+      enabled: false,
+    },
     reactQuery: {
         enabled: false,
         optionalClient: false,
diff --git a/packages/wasm-ast-types/src/index.ts b/packages/wasm-ast-types/src/index.ts
index fddeeb45..9c493b78 100644
--- a/packages/wasm-ast-types/src/index.ts
+++ b/packages/wasm-ast-types/src/index.ts
@@ -4,4 +4,5 @@ export * from './context';
 export * from './recoil';
 export * from './message-composer';
 export * from './react-query';
-export * from './types';
\ No newline at end of file
+export * from './types';
+export * from './msg-builder';
diff --git a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
new file mode 100644
index 00000000..e2b098e0
--- /dev/null
+++ b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
@@ -0,0 +1,270 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute class 1`] = `
+"export abstract class SG721MsgBuilder {
+  static transferNft = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      transfer_nft: ({
+        recipient,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static sendNft = ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      send_nft: ({
+        contract,
+        msg,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approve = ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      approve: ({
+        expires,
+        spender,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static revoke = ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      revoke: ({
+        spender,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approveAll = ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      approve_all: ({
+        expires,
+        operator
+      } as const)
+    };
+  };
+  static revokeAll = ({
+    operator
+  }: {
+    operator: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      revoke_all: ({
+        operator
+      } as const)
+    };
+  };
+  static mint = ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      mint: ({
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      } as const)
+    };
+  };
+  static burn = ({
+    tokenId
+  }: {
+    tokenId: string;
+  }): ExecuteMsg_for_Empty => {
+    return {
+      burn: ({
+        token_id: tokenId
+      } as const)
+    };
+  };
+}"
+`;
+
+exports[`query class 1`] = `
+"export abstract class SG721MsgBuilder {
+  static ownerOf = ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): QueryMsg => {
+    return {
+      owner_of: ({
+        include_expired: includeExpired,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approval = ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }): QueryMsg => {
+    return {
+      approval: ({
+        include_expired: includeExpired,
+        spender,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approvals = ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): QueryMsg => {
+    return {
+      approvals: ({
+        include_expired: includeExpired,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static allOperators = ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): QueryMsg => {
+    return {
+      all_operators: ({
+        include_expired: includeExpired,
+        limit,
+        owner,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static numTokens = (): QueryMsg => {
+    return {
+      num_tokens: ({} as const)
+    };
+  };
+  static contractInfo = (): QueryMsg => {
+    return {
+      contract_info: ({} as const)
+    };
+  };
+  static nftInfo = ({
+    tokenId
+  }: {
+    tokenId: string;
+  }): QueryMsg => {
+    return {
+      nft_info: ({
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static allNftInfo = ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): QueryMsg => {
+    return {
+      all_nft_info: ({
+        include_expired: includeExpired,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static tokens = ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): QueryMsg => {
+    return {
+      tokens: ({
+        limit,
+        owner,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static allTokens = ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }): QueryMsg => {
+    return {
+      all_tokens: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static minter = (): QueryMsg => {
+    return {
+      minter: ({} as const)
+    };
+  };
+  static collectionInfo = (): QueryMsg => {
+    return {
+      collection_info: ({} as const)
+    };
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/msg-builder/index.ts b/packages/wasm-ast-types/src/msg-builder/index.ts
new file mode 100644
index 00000000..8b5b3650
--- /dev/null
+++ b/packages/wasm-ast-types/src/msg-builder/index.ts
@@ -0,0 +1 @@
+export * from './msg-builder';
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
new file mode 100644
index 00000000..37f48461
--- /dev/null
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
@@ -0,0 +1,18 @@
+import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
+import query_msg from '../../../../__fixtures__/basic/query_msg.json';
+import {
+    createMsgBuilderClass,
+    createMsgBuilderInterface
+} from './msg-builder'
+import { expectCode, makeContext } from '../../test-utils';
+
+it('execute class', () => {
+    const ctx = makeContext(execute_msg);
+    expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', execute_msg))
+});
+
+
+it('query class', () => {
+  const ctx = makeContext(execute_msg);
+  expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', query_msg))
+});
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
new file mode 100644
index 00000000..26a76152
--- /dev/null
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
@@ -0,0 +1,76 @@
+import * as t from "@babel/types";
+import { camel } from "case";
+import {
+  abstractClassDeclaration,
+  arrowFunctionExpression,
+  bindMethod,
+  classDeclaration,
+  getMessageProperties,
+} from "../utils";
+import { ExecuteMsg, QueryMsg } from "../types";
+import { createTypedObjectParams } from "../utils/types";
+import { RenderContext } from "../context";
+import { getWasmMethodArgs } from "../client/client";
+
+export const createMsgBuilderClass = (
+  context: RenderContext,
+  className: string,
+  msg: ExecuteMsg | QueryMsg
+) => {
+  const staticMethods = getMessageProperties(msg).map((schema) => {
+    return createStaticExecMethodMsgBuilder(context, schema, msg.title);
+  });
+
+  // const blockStmt = bindings;
+
+  return t.exportNamedDeclaration(
+    abstractClassDeclaration(className, staticMethods, [], null)
+  );
+};
+
+const createStaticExecMethodMsgBuilder = (
+  context: RenderContext,
+  jsonschema: any,
+  msgTitle: string
+) => {
+  const underscoreName = Object.keys(jsonschema.properties)[0];
+  const methodName = camel(underscoreName);
+  const obj = createTypedObjectParams(
+    context,
+    jsonschema.properties[underscoreName]
+  );
+  const args = getWasmMethodArgs(
+    context,
+    jsonschema.properties[underscoreName]
+  );
+
+  return t.classProperty(
+    t.identifier(methodName),
+    arrowFunctionExpression(
+      obj
+        ? [
+            // props
+            obj,
+          ]
+        : [],
+      t.blockStatement([
+        t.returnStatement(
+          t.objectExpression([
+            t.objectProperty(
+              t.identifier(underscoreName),
+              t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const')))
+            ),
+          ])
+        ),
+      ]),
+      // return type
+      t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))),
+      false
+    ),
+    null,
+    null,
+    false,
+    // static
+    true
+  );
+};
diff --git a/packages/wasm-ast-types/src/utils/babel.ts b/packages/wasm-ast-types/src/utils/babel.ts
index 4c686d6d..5cbe2d8c 100644
--- a/packages/wasm-ast-types/src/utils/babel.ts
+++ b/packages/wasm-ast-types/src/utils/babel.ts
@@ -112,6 +112,17 @@ export const promiseTypeAnnotation = (name) => {
     );
 }
 
+export const abstractClassDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
+  const declaration = classDeclaration(
+    name,
+    body,
+    implementsExressions,
+    superClass
+  );
+  declaration.abstract = true
+  return declaration;
+};
+
 export const classDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
     const declaration = t.classDeclaration(
         t.identifier(name),
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index a9d71793..a5a006ab 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -16,6 +16,9 @@ export interface TSClientOptions {
 export interface MessageComposerOptions {
     enabled?: boolean;
 }
+export interface MsgBuilderOptions {
+    enabled?: boolean;
+}
 export interface RecoilOptions {
     enabled?: boolean;
 }
@@ -46,6 +49,7 @@ export interface RenderOptions {
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
     messageComposer?: MessageComposerOptions;
+    msgBuilder?: MsgBuilderOptions;
     client?: TSClientOptions;
     reactQuery?: ReactQueryOptions;
 }
diff --git a/packages/wasm-ast-types/types/index.d.ts b/packages/wasm-ast-types/types/index.d.ts
index d28d8286..f92ecfa2 100644
--- a/packages/wasm-ast-types/types/index.d.ts
+++ b/packages/wasm-ast-types/types/index.d.ts
@@ -3,5 +3,6 @@ export * from './client';
 export * from './context';
 export * from './recoil';
 export * from './message-composer';
+export * from './msg-builder';
 export * from './react-query';
 export * from './types';
diff --git a/packages/wasm-ast-types/types/msg-builder/index.d.ts b/packages/wasm-ast-types/types/msg-builder/index.d.ts
new file mode 100644
index 00000000..8b5b3650
--- /dev/null
+++ b/packages/wasm-ast-types/types/msg-builder/index.d.ts
@@ -0,0 +1 @@
+export * from './msg-builder';
diff --git a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
new file mode 100644
index 00000000..2e2c329e
--- /dev/null
+++ b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
@@ -0,0 +1,5 @@
+import * as t from '@babel/types';
+import { ExecuteMsg } from '../types';
+import { RenderContext } from '../context';
+export declare const createMsgBuilderClass: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
+export declare const createMsgBuilderInterface: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;

From 75fd3e8924a237513f0f7d80f9093a3ccde12af8 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Wed, 8 Mar 2023 23:38:26 -0700
Subject: [PATCH 096/287] Use typescript magic for extracting camelcased types

---
 .../default/CwAdminFactory.msg-builder.ts     |   9 +-
 .../default/CwCodeIdRegistry.msg-builder.ts   |  63 ++++------
 .../builder/default/CwSingle.msg-builder.ts   |  99 +++++++--------
 .../builder/default/Factory.msg-builder.ts    |  67 +++++-----
 .../builder/default/Minter.msg-builder.ts     |  32 ++---
 .../no-extends/CwAdminFactory.msg-builder.ts  |   9 +-
 .../CwCodeIdRegistry.msg-builder.ts           |  63 ++++------
 .../no-extends/CwSingle.msg-builder.ts        |  99 +++++++--------
 .../builder/no-extends/Factory.msg-builder.ts |  67 +++++-----
 .../builder/no-extends/Minter.msg-builder.ts  |  32 ++---
 .../ts-codegen/src/generators/msg-builder.ts  |   4 +-
 .../__snapshots__/msg-builder.spec.ts.snap    | 117 +++++++-----------
 .../src/msg-builder/msg-builder.spec.ts       |   1 -
 .../src/msg-builder/msg-builder.ts            |  33 ++++-
 .../types/msg-builder/msg-builder.d.ts        |   5 +-
 yarn.lock                                     |  12 ++
 16 files changed, 335 insertions(+), 377 deletions(-)

diff --git a/__output__/builder/default/CwAdminFactory.msg-builder.ts b/__output__/builder/default/CwAdminFactory.msg-builder.ts
index 776222d0..1e03ab7b 100644
--- a/__output__/builder/default/CwAdminFactory.msg-builder.ts
+++ b/__output__/builder/default/CwAdminFactory.msg-builder.ts
@@ -5,16 +5,15 @@
 */
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class CwAdminFactoryExecuteMsgBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
     label
-  }: {
-    codeId: number;
-    instantiateMsg: Binary;
-    label: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    instantiate_contract_with_self_admin: unknown;
+  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
     return {
       instantiate_contract_with_self_admin: ({
         code_id: codeId,
diff --git a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
index d9388c55..3e15defb 100644
--- a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
@@ -5,16 +5,15 @@
 */
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static receive = ({
     amount,
     msg,
     sender
-  }: {
-    amount: Uint128;
-    msg: Binary;
-    sender: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    receive: unknown;
+  }>["receive"]>): ExecuteMsg => {
     return {
       receive: ({
         amount,
@@ -29,13 +28,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     codeId,
     name,
     version
-  }: {
-    chainId: string;
-    checksum: string;
-    codeId: number;
-    name: string;
-    version: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    register: unknown;
+  }>["register"]>): ExecuteMsg => {
     return {
       register: ({
         chain_id: chainId,
@@ -50,11 +45,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     chainId,
     name,
     owner
-  }: {
-    chainId: string;
-    name: string;
-    owner?: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_owner: unknown;
+  }>["set_owner"]>): ExecuteMsg => {
     return {
       set_owner: ({
         chain_id: chainId,
@@ -66,10 +59,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static unregister = ({
     chainId,
     codeId
-  }: {
-    chainId: string;
-    codeId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    unregister: unknown;
+  }>["unregister"]>): ExecuteMsg => {
     return {
       unregister: ({
         chain_id: chainId,
@@ -80,10 +72,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static updateConfig = ({
     admin,
     paymentInfo
-  }: {
-    admin?: string;
-    paymentInfo?: PaymentInfo;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
     return {
       update_config: ({
         admin,
@@ -102,11 +93,9 @@ export abstract class CwCodeIdRegistryQueryMsgBuilder {
     chainId,
     name,
     version
-  }: {
-    chainId: string;
-    name: string;
-    version?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    get_registration: unknown;
+  }>["get_registration"]>): QueryMsg => {
     return {
       get_registration: ({
         chain_id: chainId,
@@ -118,10 +107,9 @@ export abstract class CwCodeIdRegistryQueryMsgBuilder {
   static infoForCodeId = ({
     chainId,
     codeId
-  }: {
-    chainId: string;
-    codeId: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    info_for_code_id: unknown;
+  }>["info_for_code_id"]>): QueryMsg => {
     return {
       info_for_code_id: ({
         chain_id: chainId,
@@ -132,10 +120,9 @@ export abstract class CwCodeIdRegistryQueryMsgBuilder {
   static listRegistrations = ({
     chainId,
     name
-  }: {
-    chainId: string;
-    name: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_registrations: unknown;
+  }>["list_registrations"]>): QueryMsg => {
     return {
       list_registrations: ({
         chain_id: chainId,
diff --git a/__output__/builder/default/CwSingle.msg-builder.ts b/__output__/builder/default/CwSingle.msg-builder.ts
index 9a0e73fb..1859f108 100644
--- a/__output__/builder/default/CwSingle.msg-builder.ts
+++ b/__output__/builder/default/CwSingle.msg-builder.ts
@@ -5,16 +5,15 @@
 */
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class CwSingleExecuteMsgBuilder {
   static propose = ({
     description,
     msgs,
     title
-  }: {
-    description: string;
-    msgs: CosmosMsgForEmpty[];
-    title: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    propose: unknown;
+  }>["propose"]>): ExecuteMsg => {
     return {
       propose: ({
         description,
@@ -26,10 +25,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   static vote = ({
     proposalId,
     vote
-  }: {
-    proposalId: number;
-    vote: Vote;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    vote: unknown;
+  }>["vote"]>): ExecuteMsg => {
     return {
       vote: ({
         proposal_id: proposalId,
@@ -39,9 +37,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static execute = ({
     proposalId
-  }: {
-    proposalId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    execute: unknown;
+  }>["execute"]>): ExecuteMsg => {
     return {
       execute: ({
         proposal_id: proposalId
@@ -50,9 +48,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static close = ({
     proposalId
-  }: {
-    proposalId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    close: unknown;
+  }>["close"]>): ExecuteMsg => {
     return {
       close: ({
         proposal_id: proposalId
@@ -67,15 +65,9 @@ export abstract class CwSingleExecuteMsgBuilder {
     minVotingPeriod,
     onlyMembersExecute,
     threshold
-  }: {
-    allowRevoting: boolean;
-    dao: string;
-    depositInfo?: DepositInfo;
-    maxVotingPeriod: Duration;
-    minVotingPeriod?: Duration;
-    onlyMembersExecute: boolean;
-    threshold: Threshold;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
     return {
       update_config: ({
         allow_revoting: allowRevoting,
@@ -90,9 +82,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static addProposalHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_proposal_hook: unknown;
+  }>["add_proposal_hook"]>): ExecuteMsg => {
     return {
       add_proposal_hook: ({
         address
@@ -101,9 +93,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static removeProposalHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_proposal_hook: unknown;
+  }>["remove_proposal_hook"]>): ExecuteMsg => {
     return {
       remove_proposal_hook: ({
         address
@@ -112,9 +104,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static addVoteHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_vote_hook: unknown;
+  }>["add_vote_hook"]>): ExecuteMsg => {
     return {
       add_vote_hook: ({
         address
@@ -123,9 +115,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static removeVoteHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_vote_hook: unknown;
+  }>["remove_vote_hook"]>): ExecuteMsg => {
     return {
       remove_vote_hook: ({
         address
@@ -141,9 +133,9 @@ export abstract class CwSingleQueryMsgBuilder {
   };
   static proposal = ({
     proposalId
-  }: {
-    proposalId: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    proposal: unknown;
+  }>["proposal"]>): QueryMsg => {
     return {
       proposal: ({
         proposal_id: proposalId
@@ -153,10 +145,9 @@ export abstract class CwSingleQueryMsgBuilder {
   static listProposals = ({
     limit,
     startAfter
-  }: {
-    limit?: number;
-    startAfter?: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_proposals: unknown;
+  }>["list_proposals"]>): QueryMsg => {
     return {
       list_proposals: ({
         limit,
@@ -167,10 +158,9 @@ export abstract class CwSingleQueryMsgBuilder {
   static reverseProposals = ({
     limit,
     startBefore
-  }: {
-    limit?: number;
-    startBefore?: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    reverse_proposals: unknown;
+  }>["reverse_proposals"]>): QueryMsg => {
     return {
       reverse_proposals: ({
         limit,
@@ -186,10 +176,9 @@ export abstract class CwSingleQueryMsgBuilder {
   static vote = ({
     proposalId,
     voter
-  }: {
-    proposalId: number;
-    voter: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    vote: unknown;
+  }>["vote"]>): QueryMsg => {
     return {
       vote: ({
         proposal_id: proposalId,
@@ -201,11 +190,9 @@ export abstract class CwSingleQueryMsgBuilder {
     limit,
     proposalId,
     startAfter
-  }: {
-    limit?: number;
-    proposalId: number;
-    startAfter?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_votes: unknown;
+  }>["list_votes"]>): QueryMsg => {
     return {
       list_votes: ({
         limit,
diff --git a/__output__/builder/default/Factory.msg-builder.ts b/__output__/builder/default/Factory.msg-builder.ts
index 4f5527b4..0c662c0a 100644
--- a/__output__/builder/default/Factory.msg-builder.ts
+++ b/__output__/builder/default/Factory.msg-builder.ts
@@ -5,12 +5,13 @@
 */
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class FactoryExecuteMsgBuilder {
   static createWallet = ({
     createWalletMsg
-  }: {
-    createWalletMsg: CreateWalletMsg;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    create_wallet: unknown;
+  }>["create_wallet"]>): ExecuteMsg => {
     return {
       create_wallet: ({
         create_wallet_msg: createWalletMsg
@@ -20,10 +21,9 @@ export abstract class FactoryExecuteMsgBuilder {
   static updateProxyUser = ({
     newUser,
     oldUser
-  }: {
-    newUser: Addr;
-    oldUser: Addr;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_proxy_user: unknown;
+  }>["update_proxy_user"]>): ExecuteMsg => {
     return {
       update_proxy_user: ({
         new_user: newUser,
@@ -34,10 +34,9 @@ export abstract class FactoryExecuteMsgBuilder {
   static migrateWallet = ({
     migrationMsg,
     walletAddress
-  }: {
-    migrationMsg: ProxyMigrationTxMsg;
-    walletAddress: WalletAddr;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    migrate_wallet: unknown;
+  }>["migrate_wallet"]>): ExecuteMsg => {
     return {
       migrate_wallet: ({
         migration_msg: migrationMsg,
@@ -48,10 +47,9 @@ export abstract class FactoryExecuteMsgBuilder {
   static updateCodeId = ({
     newCodeId,
     ty
-  }: {
-    newCodeId: number;
-    ty: CodeIdType;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_code_id: unknown;
+  }>["update_code_id"]>): ExecuteMsg => {
     return {
       update_code_id: ({
         new_code_id: newCodeId,
@@ -61,9 +59,9 @@ export abstract class FactoryExecuteMsgBuilder {
   };
   static updateWalletFee = ({
     newFee
-  }: {
-    newFee: Coin;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_wallet_fee: unknown;
+  }>["update_wallet_fee"]>): ExecuteMsg => {
     return {
       update_wallet_fee: ({
         new_fee: newFee
@@ -72,9 +70,9 @@ export abstract class FactoryExecuteMsgBuilder {
   };
   static updateGovecAddr = ({
     addr
-  }: {
-    addr: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_govec_addr: unknown;
+  }>["update_govec_addr"]>): ExecuteMsg => {
     return {
       update_govec_addr: ({
         addr
@@ -83,9 +81,9 @@ export abstract class FactoryExecuteMsgBuilder {
   };
   static updateAdmin = ({
     addr
-  }: {
-    addr: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_admin: unknown;
+  }>["update_admin"]>): ExecuteMsg => {
     return {
       update_admin: ({
         addr
@@ -97,10 +95,9 @@ export abstract class FactoryQueryMsgBuilder {
   static wallets = ({
     limit,
     startAfter
-  }: {
-    limit?: number;
-    startAfter?: WalletQueryPrefix;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets: unknown;
+  }>["wallets"]>): QueryMsg => {
     return {
       wallets: ({
         limit,
@@ -112,11 +109,9 @@ export abstract class FactoryQueryMsgBuilder {
     limit,
     startAfter,
     user
-  }: {
-    limit?: number;
-    startAfter?: string;
-    user: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets_of: unknown;
+  }>["wallets_of"]>): QueryMsg => {
     return {
       wallets_of: ({
         limit,
@@ -127,9 +122,9 @@ export abstract class FactoryQueryMsgBuilder {
   };
   static codeId = ({
     ty
-  }: {
-    ty: CodeIdType;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    code_id: unknown;
+  }>["code_id"]>): QueryMsg => {
     return {
       code_id: ({
         ty
diff --git a/__output__/builder/default/Minter.msg-builder.ts b/__output__/builder/default/Minter.msg-builder.ts
index e0b406ce..897f3fa8 100644
--- a/__output__/builder/default/Minter.msg-builder.ts
+++ b/__output__/builder/default/Minter.msg-builder.ts
@@ -5,6 +5,7 @@
 */
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class MinterExecuteMsgBuilder {
   static mint = (): ExecuteMsg => {
     return {
@@ -13,9 +14,9 @@ export abstract class MinterExecuteMsgBuilder {
   };
   static setWhitelist = ({
     whitelist
-  }: {
-    whitelist: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_whitelist: unknown;
+  }>["set_whitelist"]>): ExecuteMsg => {
     return {
       set_whitelist: ({
         whitelist
@@ -29,9 +30,9 @@ export abstract class MinterExecuteMsgBuilder {
   };
   static updatePerAddressLimit = ({
     perAddressLimit
-  }: {
-    perAddressLimit: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_per_address_limit: unknown;
+  }>["update_per_address_limit"]>): ExecuteMsg => {
     return {
       update_per_address_limit: ({
         per_address_limit: perAddressLimit
@@ -40,9 +41,9 @@ export abstract class MinterExecuteMsgBuilder {
   };
   static mintTo = ({
     recipient
-  }: {
-    recipient: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_to: unknown;
+  }>["mint_to"]>): ExecuteMsg => {
     return {
       mint_to: ({
         recipient
@@ -52,10 +53,9 @@ export abstract class MinterExecuteMsgBuilder {
   static mintFor = ({
     recipient,
     tokenId
-  }: {
-    recipient: string;
-    tokenId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_for: unknown;
+  }>["mint_for"]>): ExecuteMsg => {
     return {
       mint_for: ({
         recipient,
@@ -92,9 +92,9 @@ export abstract class MinterQueryMsgBuilder {
   };
   static mintCount = ({
     address
-  }: {
-    address: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    mint_count: unknown;
+  }>["mint_count"]>): QueryMsg => {
     return {
       mint_count: ({
         address
diff --git a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
index 776222d0..1e03ab7b 100644
--- a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
@@ -5,16 +5,15 @@
 */
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class CwAdminFactoryExecuteMsgBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
     label
-  }: {
-    codeId: number;
-    instantiateMsg: Binary;
-    label: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    instantiate_contract_with_self_admin: unknown;
+  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
     return {
       instantiate_contract_with_self_admin: ({
         code_id: codeId,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
index d9388c55..3e15defb 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
@@ -5,16 +5,15 @@
 */
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static receive = ({
     amount,
     msg,
     sender
-  }: {
-    amount: Uint128;
-    msg: Binary;
-    sender: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    receive: unknown;
+  }>["receive"]>): ExecuteMsg => {
     return {
       receive: ({
         amount,
@@ -29,13 +28,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     codeId,
     name,
     version
-  }: {
-    chainId: string;
-    checksum: string;
-    codeId: number;
-    name: string;
-    version: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    register: unknown;
+  }>["register"]>): ExecuteMsg => {
     return {
       register: ({
         chain_id: chainId,
@@ -50,11 +45,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     chainId,
     name,
     owner
-  }: {
-    chainId: string;
-    name: string;
-    owner?: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_owner: unknown;
+  }>["set_owner"]>): ExecuteMsg => {
     return {
       set_owner: ({
         chain_id: chainId,
@@ -66,10 +59,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static unregister = ({
     chainId,
     codeId
-  }: {
-    chainId: string;
-    codeId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    unregister: unknown;
+  }>["unregister"]>): ExecuteMsg => {
     return {
       unregister: ({
         chain_id: chainId,
@@ -80,10 +72,9 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static updateConfig = ({
     admin,
     paymentInfo
-  }: {
-    admin?: string;
-    paymentInfo?: PaymentInfo;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
     return {
       update_config: ({
         admin,
@@ -102,11 +93,9 @@ export abstract class CwCodeIdRegistryQueryMsgBuilder {
     chainId,
     name,
     version
-  }: {
-    chainId: string;
-    name: string;
-    version?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    get_registration: unknown;
+  }>["get_registration"]>): QueryMsg => {
     return {
       get_registration: ({
         chain_id: chainId,
@@ -118,10 +107,9 @@ export abstract class CwCodeIdRegistryQueryMsgBuilder {
   static infoForCodeId = ({
     chainId,
     codeId
-  }: {
-    chainId: string;
-    codeId: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    info_for_code_id: unknown;
+  }>["info_for_code_id"]>): QueryMsg => {
     return {
       info_for_code_id: ({
         chain_id: chainId,
@@ -132,10 +120,9 @@ export abstract class CwCodeIdRegistryQueryMsgBuilder {
   static listRegistrations = ({
     chainId,
     name
-  }: {
-    chainId: string;
-    name: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_registrations: unknown;
+  }>["list_registrations"]>): QueryMsg => {
     return {
       list_registrations: ({
         chain_id: chainId,
diff --git a/__output__/builder/no-extends/CwSingle.msg-builder.ts b/__output__/builder/no-extends/CwSingle.msg-builder.ts
index 9a0e73fb..1859f108 100644
--- a/__output__/builder/no-extends/CwSingle.msg-builder.ts
+++ b/__output__/builder/no-extends/CwSingle.msg-builder.ts
@@ -5,16 +5,15 @@
 */
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class CwSingleExecuteMsgBuilder {
   static propose = ({
     description,
     msgs,
     title
-  }: {
-    description: string;
-    msgs: CosmosMsgForEmpty[];
-    title: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    propose: unknown;
+  }>["propose"]>): ExecuteMsg => {
     return {
       propose: ({
         description,
@@ -26,10 +25,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   static vote = ({
     proposalId,
     vote
-  }: {
-    proposalId: number;
-    vote: Vote;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    vote: unknown;
+  }>["vote"]>): ExecuteMsg => {
     return {
       vote: ({
         proposal_id: proposalId,
@@ -39,9 +37,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static execute = ({
     proposalId
-  }: {
-    proposalId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    execute: unknown;
+  }>["execute"]>): ExecuteMsg => {
     return {
       execute: ({
         proposal_id: proposalId
@@ -50,9 +48,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static close = ({
     proposalId
-  }: {
-    proposalId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    close: unknown;
+  }>["close"]>): ExecuteMsg => {
     return {
       close: ({
         proposal_id: proposalId
@@ -67,15 +65,9 @@ export abstract class CwSingleExecuteMsgBuilder {
     minVotingPeriod,
     onlyMembersExecute,
     threshold
-  }: {
-    allowRevoting: boolean;
-    dao: string;
-    depositInfo?: DepositInfo;
-    maxVotingPeriod: Duration;
-    minVotingPeriod?: Duration;
-    onlyMembersExecute: boolean;
-    threshold: Threshold;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
     return {
       update_config: ({
         allow_revoting: allowRevoting,
@@ -90,9 +82,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static addProposalHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_proposal_hook: unknown;
+  }>["add_proposal_hook"]>): ExecuteMsg => {
     return {
       add_proposal_hook: ({
         address
@@ -101,9 +93,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static removeProposalHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_proposal_hook: unknown;
+  }>["remove_proposal_hook"]>): ExecuteMsg => {
     return {
       remove_proposal_hook: ({
         address
@@ -112,9 +104,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static addVoteHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_vote_hook: unknown;
+  }>["add_vote_hook"]>): ExecuteMsg => {
     return {
       add_vote_hook: ({
         address
@@ -123,9 +115,9 @@ export abstract class CwSingleExecuteMsgBuilder {
   };
   static removeVoteHook = ({
     address
-  }: {
-    address: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_vote_hook: unknown;
+  }>["remove_vote_hook"]>): ExecuteMsg => {
     return {
       remove_vote_hook: ({
         address
@@ -141,9 +133,9 @@ export abstract class CwSingleQueryMsgBuilder {
   };
   static proposal = ({
     proposalId
-  }: {
-    proposalId: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    proposal: unknown;
+  }>["proposal"]>): QueryMsg => {
     return {
       proposal: ({
         proposal_id: proposalId
@@ -153,10 +145,9 @@ export abstract class CwSingleQueryMsgBuilder {
   static listProposals = ({
     limit,
     startAfter
-  }: {
-    limit?: number;
-    startAfter?: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_proposals: unknown;
+  }>["list_proposals"]>): QueryMsg => {
     return {
       list_proposals: ({
         limit,
@@ -167,10 +158,9 @@ export abstract class CwSingleQueryMsgBuilder {
   static reverseProposals = ({
     limit,
     startBefore
-  }: {
-    limit?: number;
-    startBefore?: number;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    reverse_proposals: unknown;
+  }>["reverse_proposals"]>): QueryMsg => {
     return {
       reverse_proposals: ({
         limit,
@@ -186,10 +176,9 @@ export abstract class CwSingleQueryMsgBuilder {
   static vote = ({
     proposalId,
     voter
-  }: {
-    proposalId: number;
-    voter: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    vote: unknown;
+  }>["vote"]>): QueryMsg => {
     return {
       vote: ({
         proposal_id: proposalId,
@@ -201,11 +190,9 @@ export abstract class CwSingleQueryMsgBuilder {
     limit,
     proposalId,
     startAfter
-  }: {
-    limit?: number;
-    proposalId: number;
-    startAfter?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_votes: unknown;
+  }>["list_votes"]>): QueryMsg => {
     return {
       list_votes: ({
         limit,
diff --git a/__output__/builder/no-extends/Factory.msg-builder.ts b/__output__/builder/no-extends/Factory.msg-builder.ts
index 4f5527b4..0c662c0a 100644
--- a/__output__/builder/no-extends/Factory.msg-builder.ts
+++ b/__output__/builder/no-extends/Factory.msg-builder.ts
@@ -5,12 +5,13 @@
 */
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class FactoryExecuteMsgBuilder {
   static createWallet = ({
     createWalletMsg
-  }: {
-    createWalletMsg: CreateWalletMsg;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    create_wallet: unknown;
+  }>["create_wallet"]>): ExecuteMsg => {
     return {
       create_wallet: ({
         create_wallet_msg: createWalletMsg
@@ -20,10 +21,9 @@ export abstract class FactoryExecuteMsgBuilder {
   static updateProxyUser = ({
     newUser,
     oldUser
-  }: {
-    newUser: Addr;
-    oldUser: Addr;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_proxy_user: unknown;
+  }>["update_proxy_user"]>): ExecuteMsg => {
     return {
       update_proxy_user: ({
         new_user: newUser,
@@ -34,10 +34,9 @@ export abstract class FactoryExecuteMsgBuilder {
   static migrateWallet = ({
     migrationMsg,
     walletAddress
-  }: {
-    migrationMsg: ProxyMigrationTxMsg;
-    walletAddress: WalletAddr;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    migrate_wallet: unknown;
+  }>["migrate_wallet"]>): ExecuteMsg => {
     return {
       migrate_wallet: ({
         migration_msg: migrationMsg,
@@ -48,10 +47,9 @@ export abstract class FactoryExecuteMsgBuilder {
   static updateCodeId = ({
     newCodeId,
     ty
-  }: {
-    newCodeId: number;
-    ty: CodeIdType;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_code_id: unknown;
+  }>["update_code_id"]>): ExecuteMsg => {
     return {
       update_code_id: ({
         new_code_id: newCodeId,
@@ -61,9 +59,9 @@ export abstract class FactoryExecuteMsgBuilder {
   };
   static updateWalletFee = ({
     newFee
-  }: {
-    newFee: Coin;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_wallet_fee: unknown;
+  }>["update_wallet_fee"]>): ExecuteMsg => {
     return {
       update_wallet_fee: ({
         new_fee: newFee
@@ -72,9 +70,9 @@ export abstract class FactoryExecuteMsgBuilder {
   };
   static updateGovecAddr = ({
     addr
-  }: {
-    addr: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_govec_addr: unknown;
+  }>["update_govec_addr"]>): ExecuteMsg => {
     return {
       update_govec_addr: ({
         addr
@@ -83,9 +81,9 @@ export abstract class FactoryExecuteMsgBuilder {
   };
   static updateAdmin = ({
     addr
-  }: {
-    addr: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_admin: unknown;
+  }>["update_admin"]>): ExecuteMsg => {
     return {
       update_admin: ({
         addr
@@ -97,10 +95,9 @@ export abstract class FactoryQueryMsgBuilder {
   static wallets = ({
     limit,
     startAfter
-  }: {
-    limit?: number;
-    startAfter?: WalletQueryPrefix;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets: unknown;
+  }>["wallets"]>): QueryMsg => {
     return {
       wallets: ({
         limit,
@@ -112,11 +109,9 @@ export abstract class FactoryQueryMsgBuilder {
     limit,
     startAfter,
     user
-  }: {
-    limit?: number;
-    startAfter?: string;
-    user: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets_of: unknown;
+  }>["wallets_of"]>): QueryMsg => {
     return {
       wallets_of: ({
         limit,
@@ -127,9 +122,9 @@ export abstract class FactoryQueryMsgBuilder {
   };
   static codeId = ({
     ty
-  }: {
-    ty: CodeIdType;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    code_id: unknown;
+  }>["code_id"]>): QueryMsg => {
     return {
       code_id: ({
         ty
diff --git a/__output__/builder/no-extends/Minter.msg-builder.ts b/__output__/builder/no-extends/Minter.msg-builder.ts
index e0b406ce..897f3fa8 100644
--- a/__output__/builder/no-extends/Minter.msg-builder.ts
+++ b/__output__/builder/no-extends/Minter.msg-builder.ts
@@ -5,6 +5,7 @@
 */
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { CamelCasedProperties } from "type-fest";
 export abstract class MinterExecuteMsgBuilder {
   static mint = (): ExecuteMsg => {
     return {
@@ -13,9 +14,9 @@ export abstract class MinterExecuteMsgBuilder {
   };
   static setWhitelist = ({
     whitelist
-  }: {
-    whitelist: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_whitelist: unknown;
+  }>["set_whitelist"]>): ExecuteMsg => {
     return {
       set_whitelist: ({
         whitelist
@@ -29,9 +30,9 @@ export abstract class MinterExecuteMsgBuilder {
   };
   static updatePerAddressLimit = ({
     perAddressLimit
-  }: {
-    perAddressLimit: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_per_address_limit: unknown;
+  }>["update_per_address_limit"]>): ExecuteMsg => {
     return {
       update_per_address_limit: ({
         per_address_limit: perAddressLimit
@@ -40,9 +41,9 @@ export abstract class MinterExecuteMsgBuilder {
   };
   static mintTo = ({
     recipient
-  }: {
-    recipient: string;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_to: unknown;
+  }>["mint_to"]>): ExecuteMsg => {
     return {
       mint_to: ({
         recipient
@@ -52,10 +53,9 @@ export abstract class MinterExecuteMsgBuilder {
   static mintFor = ({
     recipient,
     tokenId
-  }: {
-    recipient: string;
-    tokenId: number;
-  }): ExecuteMsg => {
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_for: unknown;
+  }>["mint_for"]>): ExecuteMsg => {
     return {
       mint_for: ({
         recipient,
@@ -92,9 +92,9 @@ export abstract class MinterQueryMsgBuilder {
   };
   static mintCount = ({
     address
-  }: {
-    address: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    mint_count: unknown;
+  }>["mint_count"]>): QueryMsg => {
     return {
       mint_count: ({
         address
diff --git a/packages/ts-codegen/src/generators/msg-builder.ts b/packages/ts-codegen/src/generators/msg-builder.ts
index eaf3f754..5f6643b7 100644
--- a/packages/ts-codegen/src/generators/msg-builder.ts
+++ b/packages/ts-codegen/src/generators/msg-builder.ts
@@ -10,6 +10,8 @@ import { ContractInfo, getMessageProperties } from "wasm-ast-types";
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { RenderContext, MsgBuilderOptions } from 'wasm-ast-types';
 import { BuilderFile } from "../builder";
+import babelTraverse from '@babel/traverse';
+import { parse as babelParse } from '@babel/parser'
 
 export default async (
   name: string,
@@ -21,7 +23,6 @@ export default async (
   const context = new RenderContext(contractInfo, {
     msgBuilder: msgBuilderOptions ?? {},
   });
-  // const options = context.options.msgBuilder;
 
   const localname = pascal(name) + ".msg-builder.ts";
   const TypesFile = pascal(name) + ".types";
@@ -31,6 +32,7 @@ export default async (
   const body = [];
 
   body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+  body.push(w.importStmt(["CamelCasedProperties"], "type-fest"));
 
   // execute messages
   if (ExecuteMsg) {
diff --git a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
index e2b098e0..aafd28dd 100644
--- a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
+++ b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
@@ -5,10 +5,9 @@ exports[`execute class 1`] = `
   static transferNft = ({
     recipient,
     tokenId
-  }: {
-    recipient: string;
-    tokenId: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    transfer_nft: unknown;
+  }>[\\"transfer_nft\\"]>): ExecuteMsg_for_Empty => {
     return {
       transfer_nft: ({
         recipient,
@@ -20,11 +19,9 @@ exports[`execute class 1`] = `
     contract,
     msg,
     tokenId
-  }: {
-    contract: string;
-    msg: Binary;
-    tokenId: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    send_nft: unknown;
+  }>[\\"send_nft\\"]>): ExecuteMsg_for_Empty => {
     return {
       send_nft: ({
         contract,
@@ -37,11 +34,9 @@ exports[`execute class 1`] = `
     expires,
     spender,
     tokenId
-  }: {
-    expires?: Expiration;
-    spender: string;
-    tokenId: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    approve: unknown;
+  }>[\\"approve\\"]>): ExecuteMsg_for_Empty => {
     return {
       approve: ({
         expires,
@@ -53,10 +48,9 @@ exports[`execute class 1`] = `
   static revoke = ({
     spender,
     tokenId
-  }: {
-    spender: string;
-    tokenId: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    revoke: unknown;
+  }>[\\"revoke\\"]>): ExecuteMsg_for_Empty => {
     return {
       revoke: ({
         spender,
@@ -67,10 +61,9 @@ exports[`execute class 1`] = `
   static approveAll = ({
     expires,
     operator
-  }: {
-    expires?: Expiration;
-    operator: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    approve_all: unknown;
+  }>[\\"approve_all\\"]>): ExecuteMsg_for_Empty => {
     return {
       approve_all: ({
         expires,
@@ -80,9 +73,9 @@ exports[`execute class 1`] = `
   };
   static revokeAll = ({
     operator
-  }: {
-    operator: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    revoke_all: unknown;
+  }>[\\"revoke_all\\"]>): ExecuteMsg_for_Empty => {
     return {
       revoke_all: ({
         operator
@@ -94,12 +87,9 @@ exports[`execute class 1`] = `
     owner,
     tokenId,
     tokenUri
-  }: {
-    extension: Empty;
-    owner: string;
-    tokenId: string;
-    tokenUri?: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    mint: unknown;
+  }>[\\"mint\\"]>): ExecuteMsg_for_Empty => {
     return {
       mint: ({
         extension,
@@ -111,9 +101,9 @@ exports[`execute class 1`] = `
   };
   static burn = ({
     tokenId
-  }: {
-    tokenId: string;
-  }): ExecuteMsg_for_Empty => {
+  }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
+    burn: unknown;
+  }>[\\"burn\\"]>): ExecuteMsg_for_Empty => {
     return {
       burn: ({
         token_id: tokenId
@@ -128,10 +118,9 @@ exports[`query class 1`] = `
   static ownerOf = ({
     includeExpired,
     tokenId
-  }: {
-    includeExpired?: boolean;
-    tokenId: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    owner_of: unknown;
+  }>[\\"owner_of\\"]>): QueryMsg => {
     return {
       owner_of: ({
         include_expired: includeExpired,
@@ -143,11 +132,9 @@ exports[`query class 1`] = `
     includeExpired,
     spender,
     tokenId
-  }: {
-    includeExpired?: boolean;
-    spender: string;
-    tokenId: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    approval: unknown;
+  }>[\\"approval\\"]>): QueryMsg => {
     return {
       approval: ({
         include_expired: includeExpired,
@@ -159,10 +146,9 @@ exports[`query class 1`] = `
   static approvals = ({
     includeExpired,
     tokenId
-  }: {
-    includeExpired?: boolean;
-    tokenId: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    approvals: unknown;
+  }>[\\"approvals\\"]>): QueryMsg => {
     return {
       approvals: ({
         include_expired: includeExpired,
@@ -175,12 +161,9 @@ exports[`query class 1`] = `
     limit,
     owner,
     startAfter
-  }: {
-    includeExpired?: boolean;
-    limit?: number;
-    owner: string;
-    startAfter?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    all_operators: unknown;
+  }>[\\"all_operators\\"]>): QueryMsg => {
     return {
       all_operators: ({
         include_expired: includeExpired,
@@ -202,9 +185,9 @@ exports[`query class 1`] = `
   };
   static nftInfo = ({
     tokenId
-  }: {
-    tokenId: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    nft_info: unknown;
+  }>[\\"nft_info\\"]>): QueryMsg => {
     return {
       nft_info: ({
         token_id: tokenId
@@ -214,10 +197,9 @@ exports[`query class 1`] = `
   static allNftInfo = ({
     includeExpired,
     tokenId
-  }: {
-    includeExpired?: boolean;
-    tokenId: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    all_nft_info: unknown;
+  }>[\\"all_nft_info\\"]>): QueryMsg => {
     return {
       all_nft_info: ({
         include_expired: includeExpired,
@@ -229,11 +211,9 @@ exports[`query class 1`] = `
     limit,
     owner,
     startAfter
-  }: {
-    limit?: number;
-    owner: string;
-    startAfter?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    tokens: unknown;
+  }>[\\"tokens\\"]>): QueryMsg => {
     return {
       tokens: ({
         limit,
@@ -245,10 +225,9 @@ exports[`query class 1`] = `
   static allTokens = ({
     limit,
     startAfter
-  }: {
-    limit?: number;
-    startAfter?: string;
-  }): QueryMsg => {
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    all_tokens: unknown;
+  }>[\\"all_tokens\\"]>): QueryMsg => {
     return {
       all_tokens: ({
         limit,
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
index 37f48461..5b1c43d4 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
@@ -2,7 +2,6 @@ import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.j
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import {
     createMsgBuilderClass,
-    createMsgBuilderInterface
 } from './msg-builder'
 import { expectCode, makeContext } from '../../test-utils';
 
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
index 26a76152..fec31547 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
@@ -16,7 +16,7 @@ export const createMsgBuilderClass = (
   context: RenderContext,
   className: string,
   msg: ExecuteMsg | QueryMsg
-) => {
+): t.ExportNamedDeclaration => {
   const staticMethods = getMessageProperties(msg).map((schema) => {
     return createStaticExecMethodMsgBuilder(context, schema, msg.title);
   });
@@ -28,6 +28,33 @@ export const createMsgBuilderClass = (
   );
 };
 
+/**
+ * CamelCasedProperties<Extract<ExecuteMsg, { exec_on_module: unknown }>['exec_on_module']>
+ */
+function createExtractTypeAnnotation(underscoreName: string, msgTitle: string) {
+  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: RenderContext,
   jsonschema: any,
@@ -44,15 +71,19 @@ const createStaticExecMethodMsgBuilder = (
     jsonschema.properties[underscoreName]
   );
 
+  if (obj) obj.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle)
+
   return t.classProperty(
     t.identifier(methodName),
     arrowFunctionExpression(
+      // params
       obj
         ? [
             // props
             obj,
           ]
         : [],
+      // body
       t.blockStatement([
         t.returnStatement(
           t.objectExpression([
diff --git a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
index 2e2c329e..4a3f0edb 100644
--- a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
+++ b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
@@ -1,5 +1,4 @@
 import * as t from '@babel/types';
-import { ExecuteMsg } from '../types';
+import { ExecuteMsg, QueryMsg } from '../types';
 import { RenderContext } from '../context';
-export declare const createMsgBuilderClass: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
-export declare const createMsgBuilderInterface: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
+export declare const createMsgBuilderClass: (context: RenderContext, className: string, msg: ExecuteMsg | QueryMsg) => t.ExportNamedDeclaration;
diff --git a/yarn.lock b/yarn.lock
index 220b3fe5..5c41f663 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9218,6 +9218,18 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
+"wasm-ast-types@path:../wasm-ast-types":
+  version "0.17.0"
+  resolved "https://registry.npmjs.org/wasm-ast-types/-/wasm-ast-types-0.17.0.tgz#417280a61d60ea9964667cf2edb8f5281dc295d7"
+  integrity sha512-WeriXPbG67iI51Mf/5qRR0xcpEaTO/Wyjpl+vsmjZ5K6q/0W6iO03zHsESNIH/hpc5FPTpb0Y0L9xAtnnNe9Ow==
+  dependencies:
+    "@babel/runtime" "^7.18.9"
+    "@babel/types" "7.18.10"
+    "@jest/transform" "28.1.3"
+    ast-stringify "0.1.0"
+    case "1.6.3"
+    deepmerge "4.2.2"
+
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"

From 1f9aeae24ad28d2d53b899263f6a82865bdc8bb5 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 15 Mar 2023 02:21:54 +0800
Subject: [PATCH 097/287] refactor builder into plugin style

---
 packages/ts-codegen/src/builder/builder.ts    | 159 ++++++++----------
 packages/ts-codegen/src/index.ts              |   1 +
 packages/ts-codegen/src/plugins/client.ts     | 108 ++++++++++++
 packages/ts-codegen/src/plugins/index.ts      |   1 +
 .../src/plugins/message-composer.ts           |  80 +++++++++
 .../ts-codegen/src/plugins/msg-builder.ts     |  85 ++++++++++
 .../ts-codegen/src/plugins/plugin-base.ts     | 112 ++++++++++++
 .../ts-codegen/src/plugins/react-query.ts     | 115 +++++++++++++
 packages/ts-codegen/src/plugins/recoil.ts     |  89 ++++++++++
 packages/ts-codegen/src/plugins/types.ts      |  74 ++++++++
 .../ts-codegen/types/src/builder/builder.d.ts |  20 ++-
 packages/ts-codegen/types/src/index.d.ts      |   1 +
 .../ts-codegen/types/src/plugins/client.d.ts  |  12 ++
 .../ts-codegen/types/src/plugins/index.d.ts   |   1 +
 .../types/src/plugins/message-composer.d.ts   |  12 ++
 .../types/src/plugins/msg-builder.d.ts        |  12 ++
 .../types/src/plugins/plugin-base.d.ts        |  47 ++++++
 .../types/src/plugins/react-query.d.ts        |  12 ++
 .../ts-codegen/types/src/plugins/recoil.d.ts  |  13 ++
 .../ts-codegen/types/src/plugins/types.d.ts   |  12 ++
 .../wasm-ast-types/src/context/context.ts     |  44 ++++-
 .../wasm-ast-types/src/context/imports.ts     |  64 +++++--
 .../src/react-query/react-query.ts            |   2 +-
 .../wasm-ast-types/types/context/context.d.ts |  31 +++-
 .../wasm-ast-types/types/context/imports.d.ts |   9 +-
 25 files changed, 986 insertions(+), 130 deletions(-)
 create mode 100644 packages/ts-codegen/src/plugins/client.ts
 create mode 100644 packages/ts-codegen/src/plugins/index.ts
 create mode 100644 packages/ts-codegen/src/plugins/message-composer.ts
 create mode 100644 packages/ts-codegen/src/plugins/msg-builder.ts
 create mode 100644 packages/ts-codegen/src/plugins/plugin-base.ts
 create mode 100644 packages/ts-codegen/src/plugins/react-query.ts
 create mode 100644 packages/ts-codegen/src/plugins/recoil.ts
 create mode 100644 packages/ts-codegen/src/plugins/types.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/client.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/index.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/message-composer.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/msg-builder.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/plugin-base.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/react-query.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/recoil.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/types.d.ts

diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 1e0a35e5..b17ac22c 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,19 +1,13 @@
-import { RenderOptions, defaultOptions } from "wasm-ast-types";
+import { RenderOptions, defaultOptions, RenderContext, ContractInfo, MessageComposerOptions} from "wasm-ast-types";
 
 import { header } from '../utils/header';
 import { join } from "path";
 import { writeFileSync } from 'fs';
 import { sync as mkdirp } from "mkdirp";
 
-import generateMessageComposer from '../generators/message-composer';
-import generateMsgBuilder from '../generators/msg-builder';
-import generateTypes from '../generators/types';
-import generateReactQuery from '../generators/react-query';
-import generateRecoil from '../generators/recoil';
-import generateClient from '../generators/client';
-
 import { basename } from 'path';
 import { readSchemas } from '../utils';
+import { IBuilderPlugin } from '../plugins';
 
 import deepmerge from 'deepmerge';
 import { pascal } from "case";
@@ -21,6 +15,12 @@ import { createFileBundle, recursiveModuleBundle } from "../bundler";
 
 import generate from '@babel/generator';
 import * as t from '@babel/types';
+import { ReactQueryPlugin } from "../plugins/react-query";
+import { RecoilPlugin } from "../plugins/recoil";
+import { MsgBuilderPlugin } from "../plugins/msg-builder";
+import { MessageComposerPlugin } from "../plugins/message-composer";
+import { ClientPlugin } from "../plugins/client";
+import { TypesPlugin } from "../plugins/types";
 
 const defaultOpts: TSBuilderOptions = {
     bundle: {
@@ -34,6 +34,7 @@ export interface TSBuilderInput {
     contracts: Array<ContractFile | string>;
     outPath: string;
     options?: TSBuilderOptions;
+    plugins?: IBuilderPlugin[];
 };
 
 export interface BundleOptions {
@@ -47,8 +48,11 @@ export type TSBuilderOptions = {
     bundle?: BundleOptions;
 } & RenderOptions;
 
+export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
+
 export interface BuilderFile {
-    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder';
+    type: BuilderFileType;
+    pluginType?: string;
     contract: string;
     localname: string;
     filename: string;
@@ -58,14 +62,42 @@ export interface ContractFile {
     name: string;
     dir: string;
 }
+
+function getContract(contractOpt): ContractFile {
+    if (typeof contractOpt === 'string') {
+        const name = basename(contractOpt);
+        const contractName = pascal(name);
+        return {
+            name: contractName,
+            dir: contractOpt
+        }
+    }
+    return {
+        name: pascal(contractOpt.name),
+        dir: contractOpt.dir
+    };
+}
+
 export class TSBuilder {
     contracts: Array<ContractFile | string>;
     outPath: string;
     options?: TSBuilderOptions;
+    plugins: IBuilderPlugin[] = [];
 
     protected files: BuilderFile[] = [];
 
-    constructor({ contracts, outPath, options }: TSBuilderInput) {
+    loadDefaultPlugins() {
+        [].push.apply(this.plugins, [
+            new TypesPlugin(this.options),
+            new ClientPlugin(this.options),
+            new MessageComposerPlugin(this.options),
+            new ReactQueryPlugin(this.options),
+            new RecoilPlugin(this.options),
+            new MsgBuilderPlugin(this.options),
+        ]);
+    }
+
+    constructor({ contracts, outPath, options, plugins }: TSBuilderInput) {
         this.contracts = contracts;
         this.outPath = outPath;
         this.options = deepmerge(
@@ -75,96 +107,43 @@ export class TSBuilder {
             ),
             options ?? {}
         );
-    }
-
-    getContracts(): ContractFile[] {
-        return this.contracts.map(contractOpt => {
-            if (typeof contractOpt === 'string') {
-                const name = basename(contractOpt);
-                const contractName = pascal(name);
-                return {
-                    name: contractName,
-                    dir: contractOpt
-                }
-            }
-            return {
-                name: pascal(contractOpt.name),
-                dir: contractOpt.dir
-            };
-        });
-    }
 
-    async renderTypes(contract: ContractFile) {
-        const { enabled, ...options } = this.options.types;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateTypes(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
-    }
+        this.loadDefaultPlugins();
 
-    async renderClient(contract: ContractFile) {
-        const { enabled, ...options } = this.options.client;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateClient(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
-    }
-
-    async renderRecoil(contract: ContractFile) {
-        const { enabled, ...options } = this.options.recoil;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateRecoil(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
+        if (plugins && plugins.length) {
+            [].push.apply(this.plugins, plugins);
+        }
     }
 
-    async renderReactQuery(contract: ContractFile) {
-        const { enabled, ...options } = this.options.reactQuery;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateReactQuery(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
+    async build() {
+        await this.process();
+        await this.after();
     }
 
-    async renderMessageComposer(contract: ContractFile) {
-        const { enabled, ...options } = this.options.messageComposer;
-        if (!enabled) return;
-        const contractInfo = await readSchemas({
-            schemaDir: contract.dir
-        });
-        const files = await generateMessageComposer(contract.name, contractInfo, this.outPath, options);
-        [].push.apply(this.files, files);
+    // lifecycle functions
+    private async process(){
+        for (const contractOpt of this.contracts) {
+            const contract = getContract(contractOpt);
+            //resolve contract schema.
+            const contractInfo = await readSchemas({
+                schemaDir: contract.dir
+            });
+
+            //lifecycle and plugins.
+            await this.render(contract.name, contractInfo);
+        }
     }
 
-    async renderMsgBuilder(contract: ContractFile) {
-      const { enabled, ...options } = this.options.messageComposer;
-      if (!enabled) return;
-      const contractInfo = await readSchemas({
-        schemaDir: contract.dir
-      });
-      const files = await generateMsgBuilder(contract.name, contractInfo, this.outPath, options);
-      [].push.apply(this.files, files);
+    private async render(name: string, contractInfo: ContractInfo){
+      for (const plugin of this.plugins) {
+          let files = await plugin.render(name, contractInfo, this.outPath);
+          if(files && files.length){
+              [].push.apply(this.files, files);
+          }
+      }
     }
 
-    async build() {
-        const contracts = this.getContracts();
-        for (let c = 0; c < contracts.length; c++) {
-            const contract = contracts[c];
-            await this.renderTypes(contract);
-            await this.renderClient(contract);
-            await this.renderMessageComposer(contract);
-            await this.renderMsgBuilder(contract);
-            await this.renderReactQuery(contract);
-            await this.renderRecoil(contract);
-        }
+    private async after(){
         if (this.options.bundle.enabled) {
             this.bundle();
         }
diff --git a/packages/ts-codegen/src/index.ts b/packages/ts-codegen/src/index.ts
index 472d70fe..f037df7b 100644
--- a/packages/ts-codegen/src/index.ts
+++ b/packages/ts-codegen/src/index.ts
@@ -9,6 +9,7 @@ export { default as generateRecoil } from './generators/recoil';
 export * from './utils';
 export * from './builder';
 export * from './bundler';
+export * from './plugins';
 
 export default async (input: TSBuilderInput) => {
     const builder = new TSBuilder(input);
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
new file mode 100644
index 00000000..049e6702
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -0,0 +1,108 @@
+import { pascal } from 'case';
+import * as w from 'wasm-ast-types';
+import { findExecuteMsg, findAndParseTypes, findQueryMsg } from '../utils';
+import {
+  RenderContext,
+  ContractInfo,
+  RenderContextBase,
+  getMessageProperties,
+  RenderOptions
+} from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const { enabled } = this.option.client;
+
+    if (!enabled) {
+      return;
+    }
+
+    const { schemas } = context.contract;
+
+    const localname = pascal(name) + '.client.ts';
+    const TypesFile = pascal(name) + '.types';
+    const QueryMsg = findQueryMsg(schemas);
+    const ExecuteMsg = findExecuteMsg(schemas);
+    const typeHash = await findAndParseTypes(schemas);
+
+    let Client = null;
+    let Instance = null;
+    let QueryClient = null;
+    let ReadOnlyInstance = null;
+
+    const body = [];
+
+    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+
+    // query messages
+    if (QueryMsg) {
+      QueryClient = pascal(`${name}QueryClient`);
+      ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
+
+      body.push(w.createQueryInterface(context, ReadOnlyInstance, QueryMsg));
+      body.push(
+        w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg)
+      );
+    }
+
+    // execute messages
+    if (ExecuteMsg) {
+      const children = getMessageProperties(ExecuteMsg);
+      if (children.length > 0) {
+        Client = pascal(`${name}Client`);
+        Instance = pascal(`${name}Interface`);
+
+        body.push(
+          w.createExecuteInterface(
+            context,
+            Instance,
+            this.option.client.execExtendsQuery ? ReadOnlyInstance : null,
+            ExecuteMsg
+          )
+        );
+
+        body.push(
+          w.createExecuteClass(
+            context,
+            Client,
+            Instance,
+            this.option.client.execExtendsQuery ? QueryClient : null,
+            ExecuteMsg
+          )
+        );
+      }
+    }
+
+    if (typeHash.hasOwnProperty('Coin')) {
+      // @ts-ignore
+      delete context.utils.Coin;
+    }
+
+    return [
+      {
+        type: 'client',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/index.ts b/packages/ts-codegen/src/plugins/index.ts
new file mode 100644
index 00000000..58f95815
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/index.ts
@@ -0,0 +1 @@
+export * from "./plugin-base"
\ No newline at end of file
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
new file mode 100644
index 00000000..6c6caa40
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -0,0 +1,80 @@
+import { pascal } from 'case';
+import * as w from 'wasm-ast-types';
+import { findAndParseTypes, findExecuteMsg } from '../utils';
+import {
+  MessageComposerOptions,
+  getMessageProperties,
+  ContractInfo,
+  RenderContextBase,
+  RenderContext,
+  RenderOptions
+} from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const { enabled } = this.option.messageComposer;
+
+    if (!enabled) {
+      return;
+    }
+
+    const { schemas } = context.contract;
+
+    const localname = pascal(name) + '.message-composer.ts';
+    const TypesFile = pascal(name) + '.types';
+    const ExecuteMsg = findExecuteMsg(schemas);
+    const typeHash = await findAndParseTypes(schemas);
+
+    const body = [];
+
+    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+
+    // execute messages
+    if (ExecuteMsg) {
+      const children = getMessageProperties(ExecuteMsg);
+      if (children.length > 0) {
+        const TheClass = pascal(`${name}MessageComposer`);
+        const Interface = pascal(`${name}Message`);
+
+        body.push(
+          w.createMessageComposerInterface(context, Interface, ExecuteMsg)
+        );
+        body.push(
+          w.createMessageComposerClass(context, TheClass, Interface, ExecuteMsg)
+        );
+      }
+    }
+
+    if (typeHash.hasOwnProperty('Coin')) {
+      // @ts-ignore
+      delete context.utils.Coin;
+    }
+
+    return [
+      {
+        type: 'message-composer',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/msg-builder.ts b/packages/ts-codegen/src/plugins/msg-builder.ts
new file mode 100644
index 00000000..918a3ad3
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/msg-builder.ts
@@ -0,0 +1,85 @@
+import { pascal } from 'case';
+import * as w from 'wasm-ast-types';
+import { findAndParseTypes, findQueryMsg, findExecuteMsg } from '../utils';
+import {
+  getMessageProperties,
+  RenderContext,
+  RenderContextBase,
+  ContractInfo,
+  RenderOptions
+} from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const { enabled } = this.option.msgBuilder;
+
+    if (!enabled) {
+      return;
+    }
+
+    const { schemas } = context.contract;
+
+    const localname = pascal(name) + '.msg-builder.ts';
+    const TypesFile = pascal(name) + '.types';
+    const ExecuteMsg = findExecuteMsg(schemas);
+    const typeHash = await findAndParseTypes(schemas);
+
+    const body = [];
+
+    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+    body.push(w.importStmt(['CamelCasedProperties'], 'type-fest'));
+
+    // execute messages
+    if (ExecuteMsg) {
+      const children = getMessageProperties(ExecuteMsg);
+      if (children.length > 0) {
+        const className = pascal(`${name}ExecuteMsgBuilder`);
+
+        body.push(w.createMsgBuilderClass(context, className, ExecuteMsg));
+      }
+    }
+
+    const QueryMsg = findQueryMsg(schemas);
+    // query messages
+    if (QueryMsg) {
+      const children = getMessageProperties(QueryMsg);
+      if (children.length > 0) {
+        const className = pascal(`${name}QueryMsgBuilder`);
+
+        body.push(w.createMsgBuilderClass(context, className, QueryMsg));
+      }
+    }
+
+    if (typeHash.hasOwnProperty('Coin')) {
+      // @ts-ignore
+      delete context.utils.Coin;
+    }
+
+    return [
+      {
+        type: 'msg-builder',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
new file mode 100644
index 00000000..c1dd4e58
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -0,0 +1,112 @@
+import { sync as mkdirp } from 'mkdirp';
+import { join } from 'path';
+import { writeFileSync } from 'fs';
+import { header } from '../utils/header';
+import {
+  ContractInfo,
+  UtilMapping,
+  IContext
+} from 'wasm-ast-types';
+import generate from '@babel/generator';
+import * as t from '@babel/types';
+import { BuilderFile, BuilderFileType, TSBuilderOptions } from '../builder';
+
+/**
+ * IBuilderPlugin is a common plugin that render generated code.
+ */
+export interface IBuilderPlugin {
+  /**
+   * a mapping of utils will be used in generated code.
+   */
+  utils: UtilMapping;
+
+  /**
+   * render generated cdoe.
+   * @param name the name of contract
+   * @param contractInfo contract
+   * @param outPath the path of generated code.
+   * @returns info of generated files.
+   */
+  render(
+    name: string,
+    contractInfo: ContractInfo,
+    outPath: string,
+  ): Promise<BuilderFile[]>;
+}
+
+/**
+ * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
+ */
+export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }> implements IBuilderPlugin {
+  option: TOpt;
+  utils: UtilMapping;
+
+  constructor(opt: TOpt) {
+    this.option = opt;
+  }
+
+  async render(
+    name: string,
+    contractInfo: ContractInfo,
+    outPath: string
+  ): Promise<BuilderFile[]> {
+    const { enabled } = this.option;
+
+    if (!enabled) {
+      return;
+    }
+
+    const context = this.initContext(contractInfo, this.option);
+
+    const results = await this.doRender(name, context);
+
+    if (!results || !results.length) {
+      return [];
+    }
+
+    return results.map((result) => {
+      const imports = context.getImports(this.utils);
+      const code =
+        header + generate(t.program([...imports, ...result.body])).code;
+
+      mkdirp(outPath);
+      const filename = join(outPath, result.localname);
+      writeFileSync(filename, code);
+
+      return {
+        type: result.type,
+        pluginType: result.pluginType,
+        contract: name,
+        localname: result.localname,
+        filename
+      };
+    });
+  }
+
+  /**
+   * init context here
+   * @param contract
+   * @param options
+   */
+  abstract initContext(
+    contract: ContractInfo,
+    options?: TOpt
+  ): IContext;
+
+  /**
+   * render generated code here.
+   * @param name
+   * @param context
+   */
+  abstract doRender(
+    name: string,
+    context: IContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  >;
+}
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
new file mode 100644
index 00000000..67585351
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -0,0 +1,115 @@
+import { pascal } from 'case';
+import * as w from 'wasm-ast-types';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
+import {
+  getMessageProperties,
+  ContractInfo,
+  RenderOptions,
+  RenderContextBase,
+  RenderContext
+} from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const options = this.option.reactQuery;
+
+    const { enabled } = options;
+
+    if (!enabled) {
+      return;
+    }
+
+    const { schemas } = context.contract;
+
+    const localname = pascal(`${name}`) + '.react-query.ts';
+    const ContractFile = pascal(`${name}`) + '.client';
+    const TypesFile = pascal(`${name}`) + '.types';
+
+    const QueryMsg = findQueryMsg(schemas);
+    const ExecuteMsg = findExecuteMsg(schemas);
+    const typeHash = await findAndParseTypes(schemas);
+
+    const ExecuteClient = pascal(`${name}Client`);
+    const QueryClient = pascal(`${name}QueryClient`);
+
+    const body = [];
+
+    const clientImports = [];
+
+    QueryMsg && clientImports.push(QueryClient);
+
+    // check that there are commands within the exec msg
+    const shouldGenerateMutationHooks =
+      ExecuteMsg &&
+      options?.version === 'v4' &&
+      options?.mutations &&
+      getMessageProperties(ExecuteMsg).length > 0;
+
+    if (shouldGenerateMutationHooks) {
+      clientImports.push(ExecuteClient);
+    }
+
+    // general contract imports
+    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+
+    // client imports
+    body.push(w.importStmt(clientImports, `./${ContractFile}`));
+
+    // query messages
+    if (QueryMsg) {
+      [].push.apply(
+        body,
+        w.createReactQueryHooks({
+          context,
+          queryMsg: QueryMsg,
+          contractName: name,
+          QueryClient
+        })
+      );
+    }
+
+    if (shouldGenerateMutationHooks) {
+      [].push.apply(
+        body,
+        w.createReactQueryMutationHooks({
+          context,
+          execMsg: ExecuteMsg,
+          contractName: name,
+          ExecuteClient
+        })
+      );
+    }
+
+    if (typeHash.hasOwnProperty('Coin')) {
+      // @ts-ignore
+      delete context.utils.Coin;
+    }
+
+    return [
+      {
+        type: 'react-query',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
new file mode 100644
index 00000000..cb1803fa
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -0,0 +1,89 @@
+import { pascal } from 'case';
+import * as w from 'wasm-ast-types';
+import { findAndParseTypes, findQueryMsg } from '../utils';
+import {
+  ContractInfo,
+  RenderContext,
+  RenderContextBase,
+  UtilMapping,
+  RenderOptions
+} from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
+  utils: UtilMapping = {
+    selectorFamily: 'recoil',
+  };
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const { enabled } = this.option.recoil;
+
+    if (!enabled) {
+      return;
+    }
+
+    const { schemas } = context.contract;
+
+    const localname = pascal(name) + '.recoil.ts';
+    const ContractFile = pascal(name) + '.client';
+    const TypesFile = pascal(name) + '.types';
+
+    const QueryMsg = findQueryMsg(schemas);
+    const typeHash = await findAndParseTypes(schemas);
+
+    let QueryClient = null;
+    let ReadOnlyInstance = null;
+
+    const body = [];
+
+    body.push(w.importStmt(['cosmWasmClient'], './chain'));
+
+    body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+
+    // query messages
+    if (QueryMsg) {
+      QueryClient = pascal(`${name}QueryClient`);
+      ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
+
+      body.push(w.importStmt([QueryClient], `./${ContractFile}`));
+
+      body.push(w.createRecoilQueryClientType());
+      body.push(w.createRecoilQueryClient(context, name, QueryClient));
+
+      [].push.apply(
+        body,
+        w.createRecoilSelectors(context, name, QueryClient, QueryMsg)
+      );
+    }
+
+    if (typeHash.hasOwnProperty('Coin')) {
+      // @ts-ignore
+      delete context.utils.Coin;
+    }
+
+    return [
+      {
+        type: 'recoil',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/types.ts b/packages/ts-codegen/src/plugins/types.ts
new file mode 100644
index 00000000..cfb74844
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/types.ts
@@ -0,0 +1,74 @@
+import * as t from '@babel/types';
+import { clean } from '../utils/clean';
+import { pascal } from 'case';
+import { findExecuteMsg, findAndParseTypes, findQueryMsg } from '../utils';
+import {
+  ContractInfo,
+  RenderContext,
+  RenderContextBase,
+  RenderOptions
+} from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class TypesPlugin extends BuilderPluginBase<RenderOptions> {
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const { enabled } = this.option.types;
+
+    if (!enabled) {
+      return;
+    }
+
+    const { schemas } = context.contract;
+    const options = this.option.types;
+
+    const localname = pascal(name) + '.types.ts';
+    const ExecuteMsg = findExecuteMsg(schemas);
+    const typeHash = await findAndParseTypes(schemas);
+
+    const body = [];
+
+    // TYPES
+    Object.values(typeHash).forEach((type: t.Node) => {
+      body.push(clean(type));
+    });
+
+    // alias the ExecuteMsg
+    if (options.aliasExecuteMsg && ExecuteMsg) {
+      body.push(
+        t.exportNamedDeclaration(
+          t.tsTypeAliasDeclaration(
+            t.identifier(`${name}ExecuteMsg`),
+            null,
+            t.tsTypeReference(t.identifier('ExecuteMsg'))
+          )
+        )
+      );
+    }
+
+    return [
+      {
+        type: 'type',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index a18c95ed..fd4d598d 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -1,8 +1,10 @@
 import { RenderOptions } from "wasm-ast-types";
+import { IBuilderPlugin } from '../plugins';
 export interface TSBuilderInput {
     contracts: Array<ContractFile | string>;
     outPath: string;
     options?: TSBuilderOptions;
+    plugins?: IBuilderPlugin[];
 }
 export interface BundleOptions {
     enabled?: boolean;
@@ -13,8 +15,10 @@ export interface BundleOptions {
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
 } & RenderOptions;
+export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
 export interface BuilderFile {
-    type: 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder';
+    type: BuilderFileType;
+    pluginType?: string;
     contract: string;
     localname: string;
     filename: string;
@@ -27,15 +31,13 @@ export declare class TSBuilder {
     contracts: Array<ContractFile | string>;
     outPath: string;
     options?: TSBuilderOptions;
+    plugins: IBuilderPlugin[];
     protected files: BuilderFile[];
-    constructor({ contracts, outPath, options }: TSBuilderInput);
-    getContracts(): ContractFile[];
-    renderTypes(contract: ContractFile): Promise<void>;
-    renderClient(contract: ContractFile): Promise<void>;
-    renderRecoil(contract: ContractFile): Promise<void>;
-    renderReactQuery(contract: ContractFile): Promise<void>;
-    renderMessageComposer(contract: ContractFile): Promise<void>;
-    renderMsgBuilder(contract: ContractFile): Promise<void>;
+    loadDefaultPlugins(): void;
+    constructor({ contracts, outPath, options, plugins }: TSBuilderInput);
     build(): Promise<void>;
+    private process;
+    private render;
+    private after;
     bundle(): Promise<void>;
 }
diff --git a/packages/ts-codegen/types/src/index.d.ts b/packages/ts-codegen/types/src/index.d.ts
index 871f47de..e53bb80f 100644
--- a/packages/ts-codegen/types/src/index.d.ts
+++ b/packages/ts-codegen/types/src/index.d.ts
@@ -7,5 +7,6 @@ export { default as generateRecoil } from './generators/recoil';
 export * from './utils';
 export * from './builder';
 export * from './bundler';
+export * from './plugins';
 declare const _default: (input: TSBuilderInput) => Promise<void>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/plugins/client.d.ts b/packages/ts-codegen/types/src/plugins/client.d.ts
new file mode 100644
index 00000000..43e278b5
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/client.d.ts
@@ -0,0 +1,12 @@
+import { RenderContext, ContractInfo, RenderContextBase, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class ClientPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/index.d.ts b/packages/ts-codegen/types/src/plugins/index.d.ts
new file mode 100644
index 00000000..b6bdd472
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/index.d.ts
@@ -0,0 +1 @@
+export * from "./plugin-base";
diff --git a/packages/ts-codegen/types/src/plugins/message-composer.d.ts b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
new file mode 100644
index 00000000..80f98965
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
@@ -0,0 +1,12 @@
+import { ContractInfo, RenderContextBase, RenderContext, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/msg-builder.d.ts b/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
new file mode 100644
index 00000000..bd5e0467
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
@@ -0,0 +1,12 @@
+import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/plugin-base.d.ts b/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
new file mode 100644
index 00000000..efa14960
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
@@ -0,0 +1,47 @@
+import { ContractInfo, UtilMapping, IContext } from 'wasm-ast-types';
+import { BuilderFile, BuilderFileType } from '../builder';
+/**
+ * IBuilderPlugin is a common plugin that render generated code.
+ */
+export interface IBuilderPlugin {
+    /**
+     * a mapping of utils will be used in generated code.
+     */
+    utils: UtilMapping;
+    /**
+     * render generated cdoe.
+     * @param name the name of contract
+     * @param contractInfo contract
+     * @param outPath the path of generated code.
+     * @returns info of generated files.
+     */
+    render(name: string, contractInfo: ContractInfo, outPath: string): Promise<BuilderFile[]>;
+}
+/**
+ * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
+ */
+export declare abstract class BuilderPluginBase<TOpt extends {
+    enabled?: boolean;
+}> implements IBuilderPlugin {
+    option: TOpt;
+    utils: UtilMapping;
+    constructor(opt: TOpt);
+    render(name: string, contractInfo: ContractInfo, outPath: string): Promise<BuilderFile[]>;
+    /**
+     * init context here
+     * @param contract
+     * @param options
+     */
+    abstract initContext(contract: ContractInfo, options?: TOpt): IContext;
+    /**
+     * render generated code here.
+     * @param name
+     * @param context
+     */
+    abstract doRender(name: string, context: IContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/react-query.d.ts b/packages/ts-codegen/types/src/plugins/react-query.d.ts
new file mode 100644
index 00000000..ff34e39a
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/react-query.d.ts
@@ -0,0 +1,12 @@
+import { ContractInfo, RenderOptions, RenderContextBase, RenderContext } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/recoil.d.ts b/packages/ts-codegen/types/src/plugins/recoil.d.ts
new file mode 100644
index 00000000..16c70a39
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/recoil.d.ts
@@ -0,0 +1,13 @@
+import { ContractInfo, RenderContext, RenderContextBase, UtilMapping, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
+    utils: UtilMapping;
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/types.d.ts b/packages/ts-codegen/types/src/plugins/types.d.ts
new file mode 100644
index 00000000..b45d780c
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/types.d.ts
@@ -0,0 +1,12 @@
+import { ContractInfo, RenderContext, RenderContextBase, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class TypesPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index b93ac877..2b325705 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -1,5 +1,5 @@
 import { JSONSchema } from "../types";
-import { convertUtilsToImportList, getImportStatements } from "./imports";
+import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
 import deepmerge from "deepmerge";
 
 /// Plugin Types
@@ -55,6 +55,7 @@ export interface ContractInfo {
     idlObject?: IDLObject;
 };
 export interface RenderOptions {
+    enabled?: boolean;
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
     messageComposer?: MessageComposerOptions;
@@ -63,12 +64,20 @@ export interface RenderOptions {
     reactQuery?: ReactQueryOptions;
 }
 
-export interface RenderContext {
+
+export interface IContext {
+  refLookup($ref: string);
+  addUtil(util: string);
+  getImports(registeredUtils?: UtilMapping);
+}
+
+export interface IRenderContext<TOpt = RenderOptions> extends IContext {
     contract: ContractInfo;
-    options: RenderOptions;
+    options: TOpt;
 }
 
 export const defaultOptions: RenderOptions = {
+    enabled: true,
     types: {
         enabled: true,
         aliasExecuteMsg: false
@@ -114,18 +123,30 @@ export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
 
     return aggregateSchema;
 };
-export class RenderContext implements RenderContext {
+
+/**
+ * context object for generating code.
+ * only mergeDefaultOpt needs to implementing for combine options and default options.
+ * @param TOpt option type
+ */
+export abstract class RenderContextBase<TOpt = RenderOptions> implements IRenderContext<TOpt> {
     contract: ContractInfo;
     utils: string[] = [];
     schema: JSONSchema;
+    options: TOpt;
     constructor(
         contract: ContractInfo,
-        options?: RenderOptions
+        options?: TOpt
     ) {
         this.contract = contract;
         this.schema = getDefinitionSchema(contract.schemas);
-        this.options = deepmerge(defaultOptions, options ?? {});
+        this.options = this.mergeDefaultOpt(options);
     }
+    /**
+     * merge options and default options
+     * @param options
+     */
+    abstract mergeDefaultOpt(options: TOpt): TOpt;
     refLookup($ref: string) {
         const refName = $ref.replace('#/definitions/', '')
         return this.schema.definitions?.[refName];
@@ -133,12 +154,19 @@ export class RenderContext implements RenderContext {
     addUtil(util: string) {
         this.utils[util] = true;
     }
-    getImports() {
+    getImports(registeredUtils?: UtilMapping) {
         return getImportStatements(
             convertUtilsToImportList(
                 this,
-                Object.keys(this.utils)
+                Object.keys(this.utils),
+                registeredUtils,
             )
         );
     }
 }
+
+export class RenderContext extends RenderContextBase{
+  mergeDefaultOpt(options: RenderOptions): RenderOptions {
+    return deepmerge(defaultOptions, options ?? {});
+  }
+}
diff --git a/packages/wasm-ast-types/src/context/imports.ts b/packages/wasm-ast-types/src/context/imports.ts
index dcecdd29..8669b81a 100644
--- a/packages/wasm-ast-types/src/context/imports.ts
+++ b/packages/wasm-ast-types/src/context/imports.ts
@@ -2,6 +2,7 @@ import * as t from '@babel/types';
 import { importAs, importStmt } from "../utils";
 import { RenderContext } from './context';
 
+
 export interface ImportObj {
   type: 'import' | 'default' | 'namespace';
   name: string;
@@ -9,6 +10,14 @@ export interface ImportObj {
   importAs?: string;
 }
 
+export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export type UtilMapping = {
+  [key: string]:
+    | ImportObj
+    | string
+    | GetUtilFn
+};
+
 const makeReactQuerySwitch = (varName) => {
   return (context: RenderContext) => {
     switch (context.options.reactQuery.version) {
@@ -30,11 +39,11 @@ const makeReactQuerySwitch = (varName) => {
 }
 
 export const UTILS = {
+  selectorFamily: 'recoil',
   MsgExecuteContract: 'cosmjs-types/cosmwasm/wasm/v1/tx',
   MsgExecuteContractEncodeObject: 'cosmwasm',
   Coin: '@cosmjs/amino',
   toUtf8: '@cosmjs/encoding',
-  selectorFamily: 'recoil',
   StdFee: '@cosmjs/amino',
   CosmWasmClient: '@cosmjs/cosmwasm-stargate',
   ExecuteResult: '@cosmjs/cosmwasm-stargate',
@@ -50,23 +59,48 @@ export const UTILS = {
 
 export const convertUtilsToImportList = (
   context: RenderContext,
-  utils: string[]
+  utils: string[],
+  registeredUtils?: UtilMapping
 ): ImportObj[] => {
-  return utils.map(util => {
-    if (!UTILS.hasOwnProperty(util)) throw new Error(`missing Util! ::[${util}]`);
-    if (typeof UTILS[util] === 'string') {
-      return {
-        type: 'import',
-        path: UTILS[util],
-        name: util
-      };
-    } else if (typeof UTILS[util] === 'function') {
-      return UTILS[util](context);
-    } else {
-      UTILS[util];
+  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: RenderContext,
+  util: string,
+  registeredUtils: object
+): ImportObj => {
+  if (!registeredUtils.hasOwnProperty(util)) return null;
+  if (typeof registeredUtils[util] === 'string') {
+    return {
+      type: 'import',
+      path: registeredUtils[util],
+      name: util
+    };
+  } else if (typeof registeredUtils[util] === 'function') {
+    return registeredUtils[util](context);
+  } else {
+    return registeredUtils[util];
+  }
+};
 
 export const getImportStatements = (list: ImportObj[]) => {
   const imports = list.reduce((m, obj) => {
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 6a6a50a5..29ddc4cb 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -432,7 +432,7 @@ export const createReactQueryMutationArgsInterface = ({
             // @ts-ignore:next-line
             param.typeAnnotation,
             param.optional
-          )
+          ) as t.TSTypeElement
         )
       )
     )
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index a5a006ab..073ca6cd 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -1,4 +1,5 @@
 import { JSONSchema } from "../types";
+import { UtilMapping } from "./imports";
 export interface ReactQueryOptions {
     enabled?: boolean;
     optionalClient?: boolean;
@@ -46,6 +47,7 @@ export interface ContractInfo {
     idlObject?: IDLObject;
 }
 export interface RenderOptions {
+    enabled?: boolean;
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
     messageComposer?: MessageComposerOptions;
@@ -53,19 +55,38 @@ export interface RenderOptions {
     client?: TSClientOptions;
     reactQuery?: ReactQueryOptions;
 }
-export interface RenderContext {
+export interface IContext {
+    refLookup($ref: string): any;
+    addUtil(util: string): any;
+    getImports(registeredUtils?: UtilMapping): any;
+}
+export interface IRenderContext<TOpt = RenderOptions> extends IContext {
     contract: ContractInfo;
-    options: RenderOptions;
+    options: TOpt;
 }
 export declare const defaultOptions: RenderOptions;
 export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
-export declare class RenderContext implements RenderContext {
+/**
+ * context object for generating code.
+ * only mergeDefaultOpt needs to implementing for combine options and default options.
+ * @param TOpt option type
+ */
+export declare abstract class RenderContextBase<TOpt = RenderOptions> implements IRenderContext<TOpt> {
     contract: ContractInfo;
     utils: string[];
     schema: JSONSchema;
-    constructor(contract: ContractInfo, options?: RenderOptions);
+    options: TOpt;
+    constructor(contract: ContractInfo, options?: TOpt);
+    /**
+     * merge options and default options
+     * @param options
+     */
+    abstract mergeDefaultOpt(options: TOpt): TOpt;
     refLookup($ref: string): JSONSchema;
     addUtil(util: string): void;
-    getImports(): any[];
+    getImports(registeredUtils?: UtilMapping): any;
+}
+export declare class RenderContext extends RenderContextBase {
+    mergeDefaultOpt(options: RenderOptions): RenderOptions;
 }
 export {};
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
index c7b0ac7a..d88549ce 100644
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ b/packages/wasm-ast-types/types/context/imports.d.ts
@@ -5,12 +5,16 @@ export interface ImportObj {
     path: string;
     importAs?: string;
 }
+export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export type UtilMapping = {
+    [key: string]: ImportObj | string | GetUtilFn;
+};
 export declare const UTILS: {
+    selectorFamily: string;
     MsgExecuteContract: string;
     MsgExecuteContractEncodeObject: string;
     Coin: string;
     toUtf8: string;
-    selectorFamily: string;
     StdFee: string;
     CosmWasmClient: string;
     ExecuteResult: string;
@@ -36,5 +40,6 @@ export declare const UTILS: {
         name: any;
     };
 };
-export declare const convertUtilsToImportList: (context: RenderContext, utils: string[]) => ImportObj[];
+export declare const convertUtilsToImportList: (context: RenderContext, utils: string[], registeredUtils?: UtilMapping) => ImportObj[];
+export declare const convertUtil: (context: RenderContext, util: string, registeredUtils: object) => ImportObj;
 export declare const getImportStatements: (list: ImportObj[]) => any[];

From d91a4f6949fdcfe408710ea2e9a1f2812680fe5d Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 15 Mar 2023 02:26:35 +0800
Subject: [PATCH 098/287] update test results

---
 __output__/builder/bundler_test/index.ts      |  86 ++--
 __output__/builder/default/index.ts           |  30 +-
 __output__/builder/no-extends/index.ts        |  30 +-
 .../__snapshots__/builder.test.ts.snap        | 454 ++++++++++++++++++
 4 files changed, 522 insertions(+), 78 deletions(-)

diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
index a8cfa26a..8dedea79 100644
--- a/__output__/builder/bundler_test/index.ts
+++ b/__output__/builder/bundler_test/index.ts
@@ -7,69 +7,59 @@
 import * as _75 from "./contracts/Factory.types";
 import * as _76 from "./contracts/Factory.client";
 import * as _77 from "./contracts/Factory.message-composer";
-import * as _78 from "./contracts/Factory.msg-builder";
-import * as _79 from "./contracts/Factory.react-query";
-import * as _80 from "./contracts/Factory.recoil";
-import * as _81 from "./contracts/Minter.types";
-import * as _82 from "./contracts/Minter.client";
-import * as _83 from "./contracts/Minter.message-composer";
-import * as _84 from "./contracts/Minter.msg-builder";
-import * as _85 from "./contracts/Minter.react-query";
-import * as _86 from "./contracts/Minter.recoil";
-import * as _87 from "./contracts/CwAdminFactory.types";
-import * as _88 from "./contracts/CwAdminFactory.client";
-import * as _89 from "./contracts/CwAdminFactory.message-composer";
-import * as _90 from "./contracts/CwAdminFactory.msg-builder";
-import * as _91 from "./contracts/CwAdminFactory.react-query";
-import * as _92 from "./contracts/CwAdminFactory.recoil";
-import * as _93 from "./contracts/CwCodeIdRegistry.types";
-import * as _94 from "./contracts/CwCodeIdRegistry.client";
-import * as _95 from "./contracts/CwCodeIdRegistry.message-composer";
-import * as _96 from "./contracts/CwCodeIdRegistry.msg-builder";
-import * as _97 from "./contracts/CwCodeIdRegistry.react-query";
-import * as _98 from "./contracts/CwCodeIdRegistry.recoil";
-import * as _99 from "./contracts/CwSingle.types";
-import * as _100 from "./contracts/CwSingle.client";
-import * as _101 from "./contracts/CwSingle.message-composer";
-import * as _102 from "./contracts/CwSingle.msg-builder";
-import * as _103 from "./contracts/CwSingle.react-query";
-import * as _104 from "./contracts/CwSingle.recoil";
+import * as _78 from "./contracts/Factory.react-query";
+import * as _79 from "./contracts/Factory.recoil";
+import * as _80 from "./contracts/Minter.types";
+import * as _81 from "./contracts/Minter.client";
+import * as _82 from "./contracts/Minter.message-composer";
+import * as _83 from "./contracts/Minter.react-query";
+import * as _84 from "./contracts/Minter.recoil";
+import * as _85 from "./contracts/CwAdminFactory.types";
+import * as _86 from "./contracts/CwAdminFactory.client";
+import * as _87 from "./contracts/CwAdminFactory.message-composer";
+import * as _88 from "./contracts/CwAdminFactory.react-query";
+import * as _89 from "./contracts/CwAdminFactory.recoil";
+import * as _90 from "./contracts/CwCodeIdRegistry.types";
+import * as _91 from "./contracts/CwCodeIdRegistry.client";
+import * as _92 from "./contracts/CwCodeIdRegistry.message-composer";
+import * as _93 from "./contracts/CwCodeIdRegistry.react-query";
+import * as _94 from "./contracts/CwCodeIdRegistry.recoil";
+import * as _95 from "./contracts/CwSingle.types";
+import * as _96 from "./contracts/CwSingle.client";
+import * as _97 from "./contracts/CwSingle.message-composer";
+import * as _98 from "./contracts/CwSingle.react-query";
+import * as _99 from "./contracts/CwSingle.recoil";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._75,
       ..._76,
       ..._77,
       ..._78,
-      ..._79,
-      ..._80
+      ..._79
     };
-    export const Minter = { ..._81,
+    export const Minter = { ..._80,
+      ..._81,
       ..._82,
       ..._83,
-      ..._84,
-      ..._85,
-      ..._86
+      ..._84
     };
-    export const CwAdminFactory = { ..._87,
+    export const CwAdminFactory = { ..._85,
+      ..._86,
+      ..._87,
       ..._88,
-      ..._89,
-      ..._90,
+      ..._89
+    };
+    export const CwCodeIdRegistry = { ..._90,
       ..._91,
-      ..._92
+      ..._92,
+      ..._93,
+      ..._94
     };
-    export const CwCodeIdRegistry = { ..._93,
-      ..._94,
-      ..._95,
+    export const CwSingle = { ..._95,
       ..._96,
       ..._97,
-      ..._98
-    };
-    export const CwSingle = { ..._99,
-      ..._100,
-      ..._101,
-      ..._102,
-      ..._103,
-      ..._104
+      ..._98,
+      ..._99
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index 7b947b6b..d991e94c 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -7,33 +7,33 @@
 import * as _15 from "./Factory.types";
 import * as _16 from "./Factory.client";
 import * as _17 from "./Factory.message-composer";
-import * as _18 from "./Factory.msg-builder";
-import * as _19 from "./Factory.react-query";
-import * as _20 from "./Factory.recoil";
+import * as _18 from "./Factory.react-query";
+import * as _19 from "./Factory.recoil";
+import * as _20 from "./Factory.msg-builder";
 import * as _21 from "./Minter.types";
 import * as _22 from "./Minter.client";
 import * as _23 from "./Minter.message-composer";
-import * as _24 from "./Minter.msg-builder";
-import * as _25 from "./Minter.react-query";
-import * as _26 from "./Minter.recoil";
+import * as _24 from "./Minter.react-query";
+import * as _25 from "./Minter.recoil";
+import * as _26 from "./Minter.msg-builder";
 import * as _27 from "./CwAdminFactory.types";
 import * as _28 from "./CwAdminFactory.client";
 import * as _29 from "./CwAdminFactory.message-composer";
-import * as _30 from "./CwAdminFactory.msg-builder";
-import * as _31 from "./CwAdminFactory.react-query";
-import * as _32 from "./CwAdminFactory.recoil";
+import * as _30 from "./CwAdminFactory.react-query";
+import * as _31 from "./CwAdminFactory.recoil";
+import * as _32 from "./CwAdminFactory.msg-builder";
 import * as _33 from "./CwCodeIdRegistry.types";
 import * as _34 from "./CwCodeIdRegistry.client";
 import * as _35 from "./CwCodeIdRegistry.message-composer";
-import * as _36 from "./CwCodeIdRegistry.msg-builder";
-import * as _37 from "./CwCodeIdRegistry.react-query";
-import * as _38 from "./CwCodeIdRegistry.recoil";
+import * as _36 from "./CwCodeIdRegistry.react-query";
+import * as _37 from "./CwCodeIdRegistry.recoil";
+import * as _38 from "./CwCodeIdRegistry.msg-builder";
 import * as _39 from "./CwSingle.types";
 import * as _40 from "./CwSingle.client";
 import * as _41 from "./CwSingle.message-composer";
-import * as _42 from "./CwSingle.msg-builder";
-import * as _43 from "./CwSingle.react-query";
-import * as _44 from "./CwSingle.recoil";
+import * as _42 from "./CwSingle.react-query";
+import * as _43 from "./CwSingle.recoil";
+import * as _44 from "./CwSingle.msg-builder";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._15,
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
index 6a2abe65..2c07b1e3 100644
--- a/__output__/builder/no-extends/index.ts
+++ b/__output__/builder/no-extends/index.ts
@@ -7,33 +7,33 @@
 import * as _45 from "./Factory.types";
 import * as _46 from "./Factory.client";
 import * as _47 from "./Factory.message-composer";
-import * as _48 from "./Factory.msg-builder";
-import * as _49 from "./Factory.react-query";
-import * as _50 from "./Factory.recoil";
+import * as _48 from "./Factory.react-query";
+import * as _49 from "./Factory.recoil";
+import * as _50 from "./Factory.msg-builder";
 import * as _51 from "./Minter.types";
 import * as _52 from "./Minter.client";
 import * as _53 from "./Minter.message-composer";
-import * as _54 from "./Minter.msg-builder";
-import * as _55 from "./Minter.react-query";
-import * as _56 from "./Minter.recoil";
+import * as _54 from "./Minter.react-query";
+import * as _55 from "./Minter.recoil";
+import * as _56 from "./Minter.msg-builder";
 import * as _57 from "./CwAdminFactory.types";
 import * as _58 from "./CwAdminFactory.client";
 import * as _59 from "./CwAdminFactory.message-composer";
-import * as _60 from "./CwAdminFactory.msg-builder";
-import * as _61 from "./CwAdminFactory.react-query";
-import * as _62 from "./CwAdminFactory.recoil";
+import * as _60 from "./CwAdminFactory.react-query";
+import * as _61 from "./CwAdminFactory.recoil";
+import * as _62 from "./CwAdminFactory.msg-builder";
 import * as _63 from "./CwCodeIdRegistry.types";
 import * as _64 from "./CwCodeIdRegistry.client";
 import * as _65 from "./CwCodeIdRegistry.message-composer";
-import * as _66 from "./CwCodeIdRegistry.msg-builder";
-import * as _67 from "./CwCodeIdRegistry.react-query";
-import * as _68 from "./CwCodeIdRegistry.recoil";
+import * as _66 from "./CwCodeIdRegistry.react-query";
+import * as _67 from "./CwCodeIdRegistry.recoil";
+import * as _68 from "./CwCodeIdRegistry.msg-builder";
 import * as _69 from "./CwSingle.types";
 import * as _70 from "./CwSingle.client";
 import * as _71 from "./CwSingle.message-composer";
-import * as _72 from "./CwSingle.msg-builder";
-import * as _73 from "./CwSingle.react-query";
-import * as _74 from "./CwSingle.recoil";
+import * as _72 from "./CwSingle.react-query";
+import * as _73 from "./CwSingle.recoil";
+import * as _74 from "./CwSingle.msg-builder";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._45,
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index a765e207..21f9e9a1 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -14,6 +14,7 @@ TSBuilder {
       "execExtendsQuery": true,
       "noImplicitOverride": false,
     },
+    "enabled": true,
     "messageComposer": Object {
       "enabled": false,
     },
@@ -36,6 +37,232 @@ TSBuilder {
       "enabled": true,
     },
   },
+  "plugins": Array [
+    TypesPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    ClientPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    MessageComposerPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    ReactQueryPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    RecoilPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": Object {
+        "selectorFamily": "recoil",
+      },
+    },
+    MsgBuilderPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+  ],
 }
 `;
 
@@ -53,6 +280,7 @@ TSBuilder {
       "execExtendsQuery": true,
       "noImplicitOverride": false,
     },
+    "enabled": true,
     "messageComposer": Object {
       "enabled": false,
     },
@@ -75,5 +303,231 @@ TSBuilder {
       "enabled": true,
     },
   },
+  "plugins": Array [
+    TypesPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    ClientPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    MessageComposerPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    ReactQueryPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+    RecoilPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": Object {
+        "selectorFamily": "recoil",
+      },
+    },
+    MsgBuilderPlugin {
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": undefined,
+    },
+  ],
 }
 `;

From 227d87135d7e2e2694632138d34e6e583d13ac5b Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Tue, 11 Apr 2023 07:17:06 +0800
Subject: [PATCH 099/287] fix can't get properties when msgs are $ref

---
 __fixtures__/issues/98/out/98.client.ts       | 247 ++++++++
 __fixtures__/issues/98/out/98.react-query.ts  |  50 ++
 __fixtures__/issues/98/out/98.types.ts        | 100 ++++
 __fixtures__/issues/98/out/bundle.ts          |  15 +
 __fixtures__/issues/98/schema.json            | 550 ++++++++++++++++++
 .../__tests__/ts-codegen.issue-98.test.ts     |  28 +
 .../ts-client.issue-98.test.ts.snap           | 117 ++++
 .../client/test/ts-client.issue-98.test.ts    |  55 ++
 .../wasm-ast-types/src/context/context.ts     |   4 +-
 packages/wasm-ast-types/src/utils/babel.ts    |  28 +-
 packages/wasm-ast-types/src/utils/index.ts    |   1 +
 packages/wasm-ast-types/src/utils/ref.ts      |   6 +
 .../wasm-ast-types/types/recoil/recoil.d.ts   |   2 +-
 .../wasm-ast-types/types/utils/babel.d.ts     |   4 +-
 .../wasm-ast-types/types/utils/index.d.ts     |   1 +
 packages/wasm-ast-types/types/utils/ref.d.ts  |   2 +
 16 files changed, 1200 insertions(+), 10 deletions(-)
 create mode 100644 __fixtures__/issues/98/out/98.client.ts
 create mode 100644 __fixtures__/issues/98/out/98.react-query.ts
 create mode 100644 __fixtures__/issues/98/out/98.types.ts
 create mode 100644 __fixtures__/issues/98/out/bundle.ts
 create mode 100644 __fixtures__/issues/98/schema.json
 create mode 100644 packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.issue-98.test.ts
 create mode 100644 packages/wasm-ast-types/src/utils/ref.ts
 create mode 100644 packages/wasm-ast-types/types/utils/ref.d.ts

diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
new file mode 100644
index 00000000..b4e37f5b
--- /dev/null
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -0,0 +1,247 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
+export interface 98ReadOnlyInterface {
+  contractAddress: string;
+  getConfig: () => Promise<ConfigResponse>;
+  getPlugins: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }) => Promise<PluginsResponse>;
+  getPluginById: ({
+    id
+  }: {
+    id: number;
+  }) => Promise<NullablePlugin>;
+}
+export class 98QueryClient implements 98ReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.getConfig = this.getConfig.bind(this);
+    this.getPlugins = this.getPlugins.bind(this);
+    this.getPluginById = this.getPluginById.bind(this);
+  }
+
+  getConfig = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_config: {}
+    });
+  };
+  getPlugins = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): Promise<PluginsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_plugins: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  getPluginById = async ({
+    id
+  }: {
+    id: number;
+  }): Promise<NullablePlugin> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_plugin_by_id: {
+        id
+      }
+    });
+  };
+}
+export interface 98Interface extends 98ReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  proxyInstallPlugin: ({
+    id,
+    instantiateMsg
+  }: {
+    id: number;
+    instantiateMsg: Binary;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  registerPlugin: ({
+    checksum,
+    codeId,
+    creator,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum: string;
+    codeId: number;
+    creator: string;
+    ipfsHash: string;
+    name: string;
+    version: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  unregisterPlugin: ({
+    id
+  }: {
+    id: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updatePlugin: ({
+    checksum,
+    codeId,
+    creator,
+    id,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum?: string;
+    codeId?: number;
+    creator?: string;
+    id: number;
+    ipfsHash?: string;
+    name?: string;
+    version?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateRegistryFee: ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateDaoAddr: ({
+    newAddr
+  }: {
+    newAddr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class 98Client extends 98QueryClient implements 98Interface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.proxyInstallPlugin = this.proxyInstallPlugin.bind(this);
+    this.registerPlugin = this.registerPlugin.bind(this);
+    this.unregisterPlugin = this.unregisterPlugin.bind(this);
+    this.updatePlugin = this.updatePlugin.bind(this);
+    this.updateRegistryFee = this.updateRegistryFee.bind(this);
+    this.updateDaoAddr = this.updateDaoAddr.bind(this);
+  }
+
+  proxyInstallPlugin = async ({
+    id,
+    instantiateMsg
+  }: {
+    id: number;
+    instantiateMsg: Binary;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      proxy_install_plugin: {
+        id,
+        instantiate_msg: instantiateMsg
+      }
+    }, fee, memo, funds);
+  };
+  registerPlugin = async ({
+    checksum,
+    codeId,
+    creator,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum: string;
+    codeId: number;
+    creator: string;
+    ipfsHash: string;
+    name: string;
+    version: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      register_plugin: {
+        checksum,
+        code_id: codeId,
+        creator,
+        ipfs_hash: ipfsHash,
+        name,
+        version
+      }
+    }, fee, memo, funds);
+  };
+  unregisterPlugin = async ({
+    id
+  }: {
+    id: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      unregister_plugin: {
+        id
+      }
+    }, fee, memo, funds);
+  };
+  updatePlugin = async ({
+    checksum,
+    codeId,
+    creator,
+    id,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum?: string;
+    codeId?: number;
+    creator?: string;
+    id: number;
+    ipfsHash?: string;
+    name?: string;
+    version?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_plugin: {
+        checksum,
+        code_id: codeId,
+        creator,
+        id,
+        ipfs_hash: ipfsHash,
+        name,
+        version
+      }
+    }, fee, memo, funds);
+  };
+  updateRegistryFee = async ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_registry_fee: {
+        new_fee: newFee
+      }
+    }, fee, memo, funds);
+  };
+  updateDaoAddr = async ({
+    newAddr
+  }: {
+    newAddr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_dao_addr: {
+        new_addr: newAddr
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.react-query.ts b/__fixtures__/issues/98/out/98.react-query.ts
new file mode 100644
index 00000000..f9e31110
--- /dev/null
+++ b/__fixtures__/issues/98/out/98.react-query.ts
@@ -0,0 +1,50 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
+import { 98QueryClient } from "./98.client";
+export interface 98ReactQuery<TResponse, TData = TResponse> {
+  client: 98QueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface 98GetPluginByIdQuery<TData> extends 98ReactQuery<NullablePlugin, TData> {
+  args: {
+    id: number;
+  };
+}
+export function use98GetPluginByIdQuery<TData = NullablePlugin>({
+  client,
+  args,
+  options
+}: 98GetPluginByIdQuery<TData>) {
+  return useQuery<NullablePlugin, Error, TData>(["98GetPluginById", client.contractAddress, JSON.stringify(args)], () => client.getPluginById({
+    id: args.id
+  }), options);
+}
+export interface 98GetPluginsQuery<TData> extends 98ReactQuery<PluginsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: number;
+  };
+}
+export function use98GetPluginsQuery<TData = PluginsResponse>({
+  client,
+  args,
+  options
+}: 98GetPluginsQuery<TData>) {
+  return useQuery<PluginsResponse, Error, TData>(["98GetPlugins", client.contractAddress, JSON.stringify(args)], () => client.getPlugins({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface 98GetConfigQuery<TData> extends 98ReactQuery<ConfigResponse, TData> {}
+export function use98GetConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: 98GetConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["98GetConfig", client.contractAddress], () => client.getConfig(), options);
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.types.ts b/__fixtures__/issues/98/out/98.types.ts
new file mode 100644
index 00000000..3fa99382
--- /dev/null
+++ b/__fixtures__/issues/98/out/98.types.ts
@@ -0,0 +1,100 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Uint128 = string;
+export interface InstantiateMsg {
+  install_fee: Coin;
+  registry_fee: Coin;
+  [k: string]: unknown;
+}
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = InstallableExecMsg | ExecMsg;
+export type InstallableExecMsg = {
+  proxy_install_plugin: {
+    id: number;
+    instantiate_msg: Binary;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export type ExecMsg = {
+  register_plugin: {
+    checksum: string;
+    code_id: number;
+    creator: string;
+    ipfs_hash: string;
+    name: string;
+    version: string;
+    [k: string]: unknown;
+  };
+} | {
+  unregister_plugin: {
+    id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_plugin: {
+    checksum?: string | null;
+    code_id?: number | null;
+    creator?: string | null;
+    id: number;
+    ipfs_hash?: string | null;
+    name?: string | null;
+    version?: string | null;
+    [k: string]: unknown;
+  };
+} | {
+  update_registry_fee: {
+    new_fee: Coin;
+    [k: string]: unknown;
+  };
+} | {
+  update_dao_addr: {
+    new_addr: string;
+    [k: string]: unknown;
+  };
+};
+export type QueryMsg = InstallableQueryMsg | QueryMsg1;
+export type InstallableQueryMsg = string;
+export type QueryMsg1 = {
+  get_config: {
+    [k: string]: unknown;
+  };
+} | {
+  get_plugins: {
+    limit?: number | null;
+    start_after?: number | null;
+    [k: string]: unknown;
+  };
+} | {
+  get_plugin_by_id: {
+    id: number;
+    [k: string]: unknown;
+  };
+};
+export interface ConfigResponse {
+  dao_addr: string;
+  registry_fee: Coin;
+}
+export type NullablePlugin = Plugin | null;
+export type CanonicalAddr = Binary;
+export interface Plugin {
+  checksum: string;
+  code_id: number;
+  creator: CanonicalAddr;
+  id: number;
+  ipfs_hash: string;
+  name: string;
+  version: string;
+}
+export interface PluginsResponse {
+  plugins: Plugin[];
+  total: number;
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/bundle.ts b/__fixtures__/issues/98/out/bundle.ts
new file mode 100644
index 00000000..4f76a61e
--- /dev/null
+++ b/__fixtures__/issues/98/out/bundle.ts
@@ -0,0 +1,15 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import * as _0 from "./98.types";
+import * as _1 from "./98.client";
+import * as _2 from "./98.react-query";
+export namespace contracts {
+  export const 98 = { ..._0,
+    ..._1,
+    ..._2
+  };
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/schema.json b/__fixtures__/issues/98/schema.json
new file mode 100644
index 00000000..e0f7fdcf
--- /dev/null
+++ b/__fixtures__/issues/98/schema.json
@@ -0,0 +1,550 @@
+{
+  "contract_name": "vectis-plugin-registry",
+  "contract_version": "0.1.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "install_fee",
+      "registry_fee"
+    ],
+    "properties": {
+      "install_fee": {
+        "$ref": "#/definitions/Coin"
+      },
+      "registry_fee": {
+        "$ref": "#/definitions/Coin"
+      }
+    },
+    "definitions": {
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "anyOf": [
+      {
+        "$ref": "#/definitions/InstallableExecMsg"
+      },
+      {
+        "$ref": "#/definitions/ExecMsg"
+      }
+    ],
+    "definitions": {
+      "Binary": {
+        "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+        "type": "string"
+      },
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
+      "ExecMsg": {
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "register_plugin"
+            ],
+            "properties": {
+              "register_plugin": {
+                "type": "object",
+                "required": [
+                  "checksum",
+                  "code_id",
+                  "creator",
+                  "ipfs_hash",
+                  "name",
+                  "version"
+                ],
+                "properties": {
+                  "checksum": {
+                    "type": "string"
+                  },
+                  "code_id": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  "creator": {
+                    "type": "string"
+                  },
+                  "ipfs_hash": {
+                    "type": "string"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "version": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "unregister_plugin"
+            ],
+            "properties": {
+              "unregister_plugin": {
+                "type": "object",
+                "required": [
+                  "id"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "update_plugin"
+            ],
+            "properties": {
+              "update_plugin": {
+                "type": "object",
+                "required": [
+                  "id"
+                ],
+                "properties": {
+                  "checksum": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "code_id": {
+                    "type": [
+                      "integer",
+                      "null"
+                    ],
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  "creator": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "id": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  "ipfs_hash": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "name": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "version": {
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "update_registry_fee"
+            ],
+            "properties": {
+              "update_registry_fee": {
+                "type": "object",
+                "required": [
+                  "new_fee"
+                ],
+                "properties": {
+                  "new_fee": {
+                    "$ref": "#/definitions/Coin"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "update_dao_addr"
+            ],
+            "properties": {
+              "update_dao_addr": {
+                "type": "object",
+                "required": [
+                  "new_addr"
+                ],
+                "properties": {
+                  "new_addr": {
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "InstallableExecMsg": {
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "proxy_install_plugin"
+            ],
+            "properties": {
+              "proxy_install_plugin": {
+                "type": "object",
+                "required": [
+                  "id",
+                  "instantiate_msg"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  },
+                  "instantiate_msg": {
+                    "$ref": "#/definitions/Binary"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "anyOf": [
+      {
+        "$ref": "#/definitions/InstallableQueryMsg"
+      },
+      {
+        "$ref": "#/definitions/QueryMsg"
+      }
+    ],
+    "definitions": {
+      "InstallableQueryMsg": {
+        "type": "string",
+        "enum": []
+      },
+      "QueryMsg": {
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "get_config"
+            ],
+            "properties": {
+              "get_config": {
+                "type": "object"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "get_plugins"
+            ],
+            "properties": {
+              "get_plugins": {
+                "type": "object",
+                "properties": {
+                  "limit": {
+                    "type": [
+                      "integer",
+                      "null"
+                    ],
+                    "format": "uint32",
+                    "minimum": 0.0
+                  },
+                  "start_after": {
+                    "type": [
+                      "integer",
+                      "null"
+                    ],
+                    "format": "uint32",
+                    "minimum": 0.0
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "get_plugin_by_id"
+            ],
+            "properties": {
+              "get_plugin_by_id": {
+                "type": "object",
+                "required": [
+                  "id"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "uint64",
+                    "minimum": 0.0
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      }
+    }
+  },
+  "migrate": null,
+  "sudo": null,
+  "responses": {
+    "get_config": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ConfigResponse",
+      "type": "object",
+      "required": [
+        "dao_addr",
+        "registry_fee"
+      ],
+      "properties": {
+        "dao_addr": {
+          "type": "string"
+        },
+        "registry_fee": {
+          "$ref": "#/definitions/Coin"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "get_plugin_by_id": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "Nullable_Plugin",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Plugin"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+          "type": "string"
+        },
+        "CanonicalAddr": {
+          "description": "A blockchain address in its binary form.\n\nThe specific implementation is up to the underlying chain and CosmWasm as well as contracts should not make assumptions on that data. In Ethereum for example, an `Addr` would contain a user visible address like 0x14d3cc818735723ab86eaf9502376e847a64ddad and the corresponding `CanonicalAddr` would store the 20 bytes 0x14, 0xD3, ..., 0xAD. In Cosmos, the bech32 format is used for `Addr`s and the `CanonicalAddr` holds the encoded bech32 data without the checksum. Typical sizes are 20 bytes for externally owned addresses and 32 bytes for module addresses (such as x/wasm contract addresses). That being said, a chain might decide to use any size other than 20 or 32 bytes.\n\nThe safe way to obtain a valid `CanonicalAddr` is using `Api::addr_canonicalize`. In addition to that there are many unsafe ways to convert any binary data into an instance. So the type shoud be treated as a marker to express the intended data type, not as a validity guarantee of any sort.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Binary"
+            }
+          ]
+        },
+        "Plugin": {
+          "type": "object",
+          "required": [
+            "checksum",
+            "code_id",
+            "creator",
+            "id",
+            "ipfs_hash",
+            "name",
+            "version"
+          ],
+          "properties": {
+            "checksum": {
+              "type": "string"
+            },
+            "code_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "creator": {
+              "$ref": "#/definitions/CanonicalAddr"
+            },
+            "id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "ipfs_hash": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "version": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
+    "get_plugins": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "PluginsResponse",
+      "type": "object",
+      "required": [
+        "plugins",
+        "total"
+      ],
+      "properties": {
+        "plugins": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Plugin"
+          }
+        },
+        "total": {
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+          "type": "string"
+        },
+        "CanonicalAddr": {
+          "description": "A blockchain address in its binary form.\n\nThe specific implementation is up to the underlying chain and CosmWasm as well as contracts should not make assumptions on that data. In Ethereum for example, an `Addr` would contain a user visible address like 0x14d3cc818735723ab86eaf9502376e847a64ddad and the corresponding `CanonicalAddr` would store the 20 bytes 0x14, 0xD3, ..., 0xAD. In Cosmos, the bech32 format is used for `Addr`s and the `CanonicalAddr` holds the encoded bech32 data without the checksum. Typical sizes are 20 bytes for externally owned addresses and 32 bytes for module addresses (such as x/wasm contract addresses). That being said, a chain might decide to use any size other than 20 or 32 bytes.\n\nThe safe way to obtain a valid `CanonicalAddr` is using `Api::addr_canonicalize`. In addition to that there are many unsafe ways to convert any binary data into an instance. So the type shoud be treated as a marker to express the intended data type, not as a validity guarantee of any sort.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Binary"
+            }
+          ]
+        },
+        "Plugin": {
+          "type": "object",
+          "required": [
+            "checksum",
+            "code_id",
+            "creator",
+            "id",
+            "ipfs_hash",
+            "name",
+            "version"
+          ],
+          "properties": {
+            "checksum": {
+              "type": "string"
+            },
+            "code_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "creator": {
+              "$ref": "#/definitions/CanonicalAddr"
+            },
+            "id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "ipfs_hash": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "version": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts b/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
new file mode 100644
index 00000000..f3748160
--- /dev/null
+++ b/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
@@ -0,0 +1,28 @@
+import { TSBuilder } from '../src/builder';
+
+const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
+const OUTPUT_DIR = __dirname + '/../../../__output__';
+
+it('issue-98', async () => {
+  const outPath = FIXTURE_DIR + '/issues/98/out';
+  const schemaDir = FIXTURE_DIR + '/issues/98/';
+
+  const builder = new TSBuilder({
+      contracts: [
+        schemaDir
+      ],
+      outPath,
+      options: {
+          types: {
+              enabled: true
+          },
+          client: {
+              enabled: true
+          },
+          reactQuery: {
+              enabled: true
+          }
+      }
+  });
+  await builder.build();
+});
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
new file mode 100644
index 00000000..2ec7781f
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -0,0 +1,117 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute classes array types 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.getConfig = this.getConfig.bind(this);
+    this.getPlugins = this.getPlugins.bind(this);
+    this.getPluginById = this.getPluginById.bind(this);
+  }
+
+  getConfig = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      get_config: {}
+    }, fee, memo, funds);
+  };
+  getPlugins = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      get_plugins: {
+        limit,
+        start_after: startAfter
+      }
+    }, fee, memo, funds);
+  };
+  getPluginById = async ({
+    id
+  }: {
+    id: number;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      get_plugin_by_id: {
+        id
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`execute interfaces no extends 1`] = `
+"export interface SG721Instance {
+  contractAddress: string;
+  sender: string;
+  getConfig: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  getPlugins: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  getPluginById: ({
+    id
+  }: {
+    id: number;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}"
+`;
+
+exports[`execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query classes 1`] = `
+"export class SG721QueryClient implements SG721ReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.getConfig = this.getConfig.bind(this);
+    this.getPlugins = this.getPlugins.bind(this);
+    this.getPluginById = this.getPluginById.bind(this);
+  }
+
+  getConfig = async (): Promise<GetConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_config: {}
+    });
+  };
+  getPlugins = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): Promise<GetPluginsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_plugins: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  getPluginById = async ({
+    id
+  }: {
+    id: number;
+  }): Promise<GetPluginByIdResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_plugin_by_id: {
+        id
+      }
+    });
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-98.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.issue-98.test.ts
new file mode 100644
index 00000000..d5fa6905
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.issue-98.test.ts
@@ -0,0 +1,55 @@
+import contract from '../../../../../__fixtures__/issues/98/schema.json';
+
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, printCode, makeContext } from '../../../test-utils';
+
+const message = contract.query
+const ctx = makeContext(message);
+
+it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(
+        ctx,
+        message
+    ))
+})
+
+
+it('query classes', () => {
+    expectCode(createQueryClass(
+        ctx,
+        'SG721QueryClient',
+        'SG721ReadOnlyInstance',
+        message
+    ))
+});
+
+// it('query classes response', () => {
+//     expectCode(createTypeInterface(
+//         ctx,
+//         contract.responses.all_debt_shares
+//     ))
+// });
+
+it('execute classes array types', () => {
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        message
+    ))
+});
+
+it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(
+        ctx,
+        'SG721Instance',
+        null,
+        message
+    ))
+});
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 2b325705..cde2a123 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -1,4 +1,5 @@
 import { JSONSchema } from "../types";
+import { refLookup } from "../utils";
 import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
 import deepmerge from "deepmerge";
 
@@ -148,8 +149,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
      */
     abstract mergeDefaultOpt(options: TOpt): TOpt;
     refLookup($ref: string) {
-        const refName = $ref.replace('#/definitions/', '')
-        return this.schema.definitions?.[refName];
+      return refLookup($ref, this.schema)
     }
     addUtil(util: string) {
         this.utils[util] = true;
diff --git a/packages/wasm-ast-types/src/utils/babel.ts b/packages/wasm-ast-types/src/utils/babel.ts
index 5cbe2d8c..8515f192 100644
--- a/packages/wasm-ast-types/src/utils/babel.ts
+++ b/packages/wasm-ast-types/src/utils/babel.ts
@@ -2,6 +2,7 @@ import * as t from '@babel/types';
 import { snake } from "case";
 import { Field, QueryMsg, ExecuteMsg } from '../types';
 import { TSTypeAnnotation, TSExpressionWithTypeArguments } from '@babel/types';
+import { refLookup } from './ref';
 
 // t.TSPropertySignature - kind?
 export const propertySignature = (
@@ -30,11 +31,28 @@ export const tsTypeOperator = (typeAnnotation: t.TSType, operator: string) => {
     return obj;
 };
 
-export const getMessageProperties = (msg: QueryMsg | ExecuteMsg) => {
-    if (msg.anyOf) return msg.anyOf;
-    if (msg.oneOf) return msg.oneOf;
-    if (msg.allOf) return msg.allOf;
-    return [];
+export const getMessageProperties = (msg) => {
+    let results = [];
+    let objs = [];
+    if (msg.anyOf) { objs = msg.anyOf; }
+    else if (msg.oneOf) { objs = msg.oneOf; }
+    else if (msg.allOf) { objs = msg.allOf; }
+
+    for (const obj of objs) {
+      if(obj.properties){
+        results.push(obj);
+      } else{
+        if(obj.$ref){
+          const ref = refLookup(obj.$ref, msg)
+
+          const refProps = getMessageProperties(ref);
+
+          results = [...results, ...refProps];
+        }
+      }
+    }
+
+    return results;
 }
 
 export const tsPropertySignature = (
diff --git a/packages/wasm-ast-types/src/utils/index.ts b/packages/wasm-ast-types/src/utils/index.ts
index d19d5ac7..2e232599 100644
--- a/packages/wasm-ast-types/src/utils/index.ts
+++ b/packages/wasm-ast-types/src/utils/index.ts
@@ -1,2 +1,3 @@
 export * from './babel';
 export * from './types';
+export * from './ref';
diff --git a/packages/wasm-ast-types/src/utils/ref.ts b/packages/wasm-ast-types/src/utils/ref.ts
new file mode 100644
index 00000000..8c720289
--- /dev/null
+++ b/packages/wasm-ast-types/src/utils/ref.ts
@@ -0,0 +1,6 @@
+import { JSONSchema } from "../types";
+
+export const refLookup = ($ref: string, schema: JSONSchema) => {
+  const refName = $ref.replace('#/definitions/', '')
+  return schema.definitions?.[refName];
+}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/types/recoil/recoil.d.ts b/packages/wasm-ast-types/types/recoil/recoil.d.ts
index 03ee4b37..e296e779 100644
--- a/packages/wasm-ast-types/types/recoil/recoil.d.ts
+++ b/packages/wasm-ast-types/types/recoil/recoil.d.ts
@@ -2,7 +2,7 @@ import * as t from '@babel/types';
 import { QueryMsg } from '../types';
 import { RenderContext } from '../context';
 export declare const createRecoilSelector: (context: RenderContext, keyPrefix: string, QueryClient: string, methodName: string, responseType: string) => t.ExportNamedDeclaration;
-export declare const createRecoilSelectors: (context: RenderContext, keyPrefix: string, QueryClient: string, queryMsg: QueryMsg) => any;
+export declare const createRecoilSelectors: (context: RenderContext, keyPrefix: string, QueryClient: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration[];
 export declare const createRecoilQueryClientType: () => {
     type: string;
     id: {
diff --git a/packages/wasm-ast-types/types/utils/babel.d.ts b/packages/wasm-ast-types/types/utils/babel.d.ts
index 9147f72e..4b9a5919 100644
--- a/packages/wasm-ast-types/types/utils/babel.d.ts
+++ b/packages/wasm-ast-types/types/utils/babel.d.ts
@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { Field, QueryMsg, ExecuteMsg } from '../types';
+import { Field } from '../types';
 import { TSTypeAnnotation, TSExpressionWithTypeArguments } from '@babel/types';
 export declare const propertySignature: (name: string, typeAnnotation: t.TSTypeAnnotation, optional?: boolean) => {
     type: string;
@@ -9,7 +9,7 @@ export declare const propertySignature: (name: string, typeAnnotation: t.TSTypeA
 };
 export declare const identifier: (name: string, typeAnnotation: t.TSTypeAnnotation, optional?: boolean) => t.Identifier;
 export declare const tsTypeOperator: (typeAnnotation: t.TSType, operator: string) => t.TSTypeOperator;
-export declare const getMessageProperties: (msg: QueryMsg | ExecuteMsg) => any;
+export declare const getMessageProperties: (msg: any) => any[];
 export declare const tsPropertySignature: (key: t.Expression, typeAnnotation: t.TSTypeAnnotation, optional: boolean) => t.TSPropertySignature;
 export declare const tsObjectPattern: (properties: (t.RestElement | t.ObjectProperty)[], typeAnnotation: t.TSTypeAnnotation) => t.ObjectPattern;
 export declare const callExpression: (callee: t.Expression | t.V8IntrinsicIdentifier, _arguments: (t.Expression | t.SpreadElement | t.ArgumentPlaceholder)[], typeParameters: t.TSTypeParameterInstantiation) => t.CallExpression;
diff --git a/packages/wasm-ast-types/types/utils/index.d.ts b/packages/wasm-ast-types/types/utils/index.d.ts
index d19d5ac7..2e232599 100644
--- a/packages/wasm-ast-types/types/utils/index.d.ts
+++ b/packages/wasm-ast-types/types/utils/index.d.ts
@@ -1,2 +1,3 @@
 export * from './babel';
 export * from './types';
+export * from './ref';
diff --git a/packages/wasm-ast-types/types/utils/ref.d.ts b/packages/wasm-ast-types/types/utils/ref.d.ts
new file mode 100644
index 00000000..30c8b2c1
--- /dev/null
+++ b/packages/wasm-ast-types/types/utils/ref.d.ts
@@ -0,0 +1,2 @@
+import { JSONSchema } from "../types";
+export declare const refLookup: ($ref: string, schema: JSONSchema) => JSONSchema;

From dccd0edd182dc4d5e58b30e7f46732e0be483bc1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 10 Apr 2023 16:30:50 -0700
Subject: [PATCH 100/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.26.0
 - wasm-ast-types@0.19.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 039dc42a..4ac37d9a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.26.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.25.2...@cosmwasm/ts-codegen@0.26.0) (2023-04-10)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.25.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.25.1...@cosmwasm/ts-codegen@0.25.2) (2023-03-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 76411338..cf13b9bb 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.25.2",
+  "version": "0.26.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.18.2"
+    "wasm-ast-types": "^0.19.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 3e9be2cc..693ebd85 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.19.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.2...wasm-ast-types@0.19.0) (2023-04-10)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.18.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.1...wasm-ast-types@0.18.2) (2023-03-02)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index a83c24ff..387e7fe3 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.18.2",
+  "version": "0.19.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",

From f98a8bdfc52cd6fc568e67b38b3dbc67ea93249d Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Fri, 14 Apr 2023 09:22:49 +0200
Subject: [PATCH 101/287] Generate parameters for tuple types

---
 __fixtures__/basic/ownership.json             | 154 ++++++++++++++++++
 packages/wasm-ast-types/src/client/client.ts  |  53 +++---
 .../ts-client.issue-101.spec.ts.snap          |  47 ++++++
 .../ts-client.vectis.spec.ts.snap             |  16 +-
 .../client/test/ts-client.issue-101.spec.ts   |  37 +++++
 .../message-composer.spec.ts.snap             |  60 +++++++
 .../message-composer/message-composer.spec.ts |  61 ++++---
 .../src/message-composer/message-composer.ts  |  18 +-
 .../__snapshots__/msg-builder.spec.ts.snap    |  21 +++
 .../src/msg-builder/msg-builder.spec.ts       |  10 +-
 .../src/msg-builder/msg-builder.ts            |  60 ++++---
 .../__snapshots__/react-query.spec.ts.snap    |  45 +++++
 .../src/react-query/react-query.spec.ts       |  18 +-
 packages/wasm-ast-types/src/utils/types.ts    |  15 +-
 14 files changed, 528 insertions(+), 87 deletions(-)
 create mode 100644 __fixtures__/basic/ownership.json
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.issue-101.spec.ts

diff --git a/__fixtures__/basic/ownership.json b/__fixtures__/basic/ownership.json
new file mode 100644
index 00000000..c97252fd
--- /dev/null
+++ b/__fixtures__/basic/ownership.json
@@ -0,0 +1,154 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "description": "Ownership Execute msg",
+    "oneOf": [
+      {
+        "description": "Sets a new Factory",
+        "type": "object",
+        "required": [
+          "set_factory"
+        ],
+        "properties": {
+          "set_factory": {
+            "type": "object",
+            "required": [
+              "new_factory"
+            ],
+            "properties": {
+              "new_factory": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Update the contract's ownership. The `action` to be provided can be either to propose transferring ownership to an account, accept a pending ownership transfer, or renounce the ownership permanently.",
+        "type": "object",
+        "required": [
+          "update_ownership"
+        ],
+        "properties": {
+          "update_ownership": {
+            "$ref": "#/definitions/Action"
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Action": {
+        "description": "Actions that can be taken to alter the contract's ownership",
+        "oneOf": [
+          {
+            "description": "Propose to transfer the contract's ownership to another account, optionally with an expiry time.\n\nCan only be called by the contract's current owner.\n\nAny existing pending ownership transfer is overwritten.",
+            "type": "object",
+            "required": [
+              "transfer_ownership"
+            ],
+            "properties": {
+              "transfer_ownership": {
+                "type": "object",
+                "required": [
+                  "new_owner"
+                ],
+                "properties": {
+                  "expiry": {
+                    "anyOf": [
+                      {
+                        "$ref": "#/definitions/Expiration"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "new_owner": {
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Accept the pending ownership transfer.\n\nCan only be called by the pending owner.",
+            "type": "string",
+            "enum": [
+              "accept_ownership"
+            ]
+          },
+          {
+            "description": "Give up the contract's ownership and the possibility of appointing a new owner.\n\nCan only be invoked by the contract's current owner.\n\nAny existing pending ownership transfer is canceled.",
+            "type": "string",
+            "enum": [
+              "renounce_ownership"
+            ]
+          }
+        ]
+      },
+      "Expiration": {
+        "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+        "oneOf": [
+          {
+            "description": "AtHeight will expire when `env.block.height` >= height",
+            "type": "object",
+            "required": [
+              "at_height"
+            ],
+            "properties": {
+              "at_height": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "AtTime will expire when `env.block.time` >= time",
+            "type": "object",
+            "required": [
+              "at_time"
+            ],
+            "properties": {
+              "at_time": {
+                "$ref": "#/definitions/Timestamp"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "description": "Never will never expire. Used to express the empty variant",
+            "type": "object",
+            "required": [
+              "never"
+            ],
+            "properties": {
+              "never": {
+                "type": "object",
+                "additionalProperties": false
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
+      "Timestamp": {
+        "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+        "allOf": [
+          {
+            "$ref": "#/definitions/Uint64"
+          }
+        ]
+      },
+      "Uint64": {
+        "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+        "type": "string"
+      }
+    }
+  }
diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/wasm-ast-types/src/client/client.ts
index 49b64984..a91dfe09 100644
--- a/packages/wasm-ast-types/src/client/client.ts
+++ b/packages/wasm-ast-types/src/client/client.ts
@@ -1,23 +1,19 @@
 import * as t from '@babel/types';
-import { camel, pascal } from 'case';
+import { camel } from 'case';
 import {
+  arrowFunctionExpression,
   bindMethod,
-  typedIdentifier,
-  promiseTypeAnnotation,
   classDeclaration,
   classProperty,
-  arrowFunctionExpression,
-  getMessageProperties
-} from '../utils'
+  getMessageProperties,
+  promiseTypeAnnotation,
+  typedIdentifier
+} from '../utils';
 
-import {
-  QueryMsg,
-  ExecuteMsg
-} from '../types';
+import { ExecuteMsg, JSONSchema, QueryMsg } from '../types';
 
-import { getPropertyType, getType, createTypedObjectParams, getResponseType } from '../utils/types';
+import { createTypedObjectParams, getPropertyType, getResponseType, getType } from '../utils/types';
 import { RenderContext } from '../context';
-import { JSONSchema } from '../types';
 import { identifier, propertySignature } from '../utils/babel';
 
 export const CONSTANT_EXEC_PARAMS = [
@@ -89,7 +85,7 @@ export const createWasmQueryMethod = (
   const methodName = camel(underscoreName);
   const responseType = getResponseType(context, underscoreName);
 
-  const obj = createTypedObjectParams(
+  const param = createTypedObjectParams(
     context,
     jsonschema.properties[underscoreName]
   );
@@ -99,13 +95,14 @@ export const createWasmQueryMethod = (
     jsonschema.properties[underscoreName]
   );
 
-  const actionArg =
-    t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
+  const msgAction = t.identifier(underscoreName);
+  // If the param is an identifier, we can just use it as is
+  const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args)
 
   return t.classProperty(
     t.identifier(methodName),
     arrowFunctionExpression(
-      obj ? [obj] : [],
+      param ? [param] : [],
       t.blockStatement(
         [
           t.returnStatement(
@@ -120,7 +117,7 @@ export const createWasmQueryMethod = (
               [
                 t.memberExpression(t.thisExpression(), t.identifier('contractAddress')),
                 t.objectExpression([
-                  actionArg
+                  t.objectProperty(msgAction, msgActionValue)
                 ])
               ]
             )
@@ -237,9 +234,15 @@ export const getWasmMethodArgs = (
   // only 1 degree $ref-lookup
   if (!keys.length && jsonschema.$ref) {
     const obj = context.refLookup(jsonschema.$ref);
+    // properties
     if (obj) {
       keys = Object.keys(obj.properties ?? {})
     }
+
+    // tuple struct or otherwise, use the name of the reference
+    if (!keys.length && obj?.oneOf) {
+// TODO????? ADAIR
+    }
   }
 
   const args = keys.map(prop => {
@@ -265,7 +268,7 @@ export const createWasmExecMethod = (
 
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const obj = createTypedObjectParams(
+  const param = createTypedObjectParams(
     context,
     jsonschema.properties[underscoreName]
   );
@@ -274,12 +277,16 @@ export const createWasmExecMethod = (
     jsonschema.properties[underscoreName]
   );
 
+  const msgAction = t.identifier(underscoreName);
+  // If the param is an identifier, we can just use it as is
+  const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args)
+
   return t.classProperty(
     t.identifier(methodName),
     arrowFunctionExpression(
-      obj ? [
+      param ? [
         // props
-        obj,
+        param,
         ...CONSTANT_EXEC_PARAMS
       ] : CONSTANT_EXEC_PARAMS,
       t.blockStatement(
@@ -306,10 +313,8 @@ export const createWasmExecMethod = (
                   t.objectExpression(
                     [
                       t.objectProperty(
-                        t.identifier(underscoreName),
-                        t.objectExpression([
-                          ...args
-                        ])
+                        msgAction,
+                        msgActionValue
                       )
 
                     ]
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
new file mode 100644
index 00000000..17159f90
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
@@ -0,0 +1,47 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute interfaces no extends 1`] = `
+"export interface OwnershipInstance {
+  contractAddress: string;
+  sender: string;
+  setFactory: ({
+    newFactory
+  }: {
+    newFactory: string;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateOwnership: (action: Action, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}"
+`;
+
+exports[`ownership client with tuple 1`] = `
+"export class OwnershipClient implements OwnershipInstance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.setFactory = this.setFactory.bind(this);
+    this.updateOwnership = this.updateOwnership.bind(this);
+  }
+
+  setFactory = async ({
+    newFactory
+  }: {
+    newFactory: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_factory: {
+        new_factory: newFactory
+      }
+    }, fee, memo, funds);
+  };
+  updateOwnership = async (action: Action, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_ownership: action
+    }, fee, memo, funds);
+  };
+}"
+`;
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
index ef9254e6..e2b809bf 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
@@ -193,9 +193,9 @@ exports[`query classes 1`] = `
     this.wasm = this.wasm.bind(this);
   }
 
-  bank = async (): Promise<BankResponse> => {
+  bank = async (bankMsg: BankMsg): Promise<BankResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
-      bank: {}
+      bank: bankMsg
     });
   };
   custom = async (): Promise<CustomResponse> => {
@@ -203,19 +203,19 @@ exports[`query classes 1`] = `
       custom: {}
     });
   };
-  staking = async (): Promise<StakingResponse> => {
+  staking = async (stakingMsg: StakingMsg): Promise<StakingResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
-      staking: {}
+      staking: stakingMsg
     });
   };
-  distribution = async (): Promise<DistributionResponse> => {
+  distribution = async (distributionMsg: DistributionMsg): Promise<DistributionResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
-      distribution: {}
+      distribution: distributionMsg
     });
   };
-  wasm = async (): Promise<WasmResponse> => {
+  wasm = async (wasmMsg: WasmMsg): Promise<WasmResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
-      wasm: {}
+      wasm: wasmMsg
     });
   };
 }"
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-101.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.issue-101.spec.ts
new file mode 100644
index 00000000..71b4efa1
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.issue-101.spec.ts
@@ -0,0 +1,37 @@
+import { createExecuteClass, createExecuteInterface } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+import ownership from '../../../../../__fixtures__/basic/ownership.json';
+
+
+// it('query classes', () => {
+//     const ctx = makeContext(cosmos_msg_for__empty);
+//     expectCode(createQueryClass(
+//         ctx,
+//         'SG721QueryClient',
+//         'SG721ReadOnlyInstance',
+//         cosmos_msg_for__empty
+//     ))
+// });
+
+it('execute interfaces no extends', () => {
+  const ctx = makeContext(ownership);
+  expectCode(createExecuteInterface(
+    ctx,
+    'OwnershipInstance',
+    null,
+    ownership
+  ))
+});
+
+it('ownership client with tuple', () => {
+    const ctx = makeContext(ownership);
+    expectCode(createExecuteClass(
+        ctx,
+        'OwnershipClient',
+        'OwnershipInstance',
+        null,
+        ownership
+    ))
+});
+
+
diff --git a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap b/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
index 8973cd20..2fa4a2fb 100644
--- a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
+++ b/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
@@ -269,3 +269,63 @@ exports[`execute classes 1`] = `
   };
 }"
 `;
+
+exports[`ownershipClass 1`] = `
+"export class OwnershipMessageComposer implements OwnershipMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.setFactory = this.setFactory.bind(this);
+    this.updateOwnership = this.updateOwnership.bind(this);
+  }
+
+  setFactory = ({
+    newFactory
+  }: {
+    newFactory: string;
+  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          set_factory: {
+            new_factory: newFactory
+          }
+        })),
+        funds
+      })
+    };
+  };
+  updateOwnership = (action: Action, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_ownership: action
+        })),
+        funds
+      })
+    };
+  };
+}"
+`;
+
+exports[`ownershipInterface 1`] = `
+"export interface OwnershipMessage {
+  contractAddress: string;
+  sender: string;
+  setFactory: ({
+    newFactory
+  }: {
+    newFactory: string;
+  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateOwnership: (action: Action, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}"
+`;
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts b/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
index 5b840aaf..e8a8f62b 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
@@ -1,25 +1,46 @@
-import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
+import execute_msg from "../../../../__fixtures__/basic/execute_msg_for__empty.json";
+import ownership from "../../../../__fixtures__/basic/ownership.json";
+
 import {
-    createMessageComposerClass,
-    createMessageComposerInterface
-} from './message-composer'
-import { expectCode, makeContext } from '../../test-utils';
+  createMessageComposerClass,
+  createMessageComposerInterface,
+} from "./message-composer";
+import { expectCode, makeContext } from "../../test-utils";
+import * as t from "@babel/types";
+import { createReactQueryMutationHooks } from "../react-query";
+
+it("execute classes", () => {
+  const ctx = makeContext(execute_msg);
+  expectCode(
+    createMessageComposerClass(
+      ctx,
+      "SG721MessageComposer",
+      "SG721Message",
+      execute_msg
+    )
+  );
+});
+
+it("createMessageComposerInterface", () => {
+  const ctx = makeContext(execute_msg);
+  expectCode(createMessageComposerInterface(ctx, "SG721Message", execute_msg));
+});
 
-it('execute classes', () => {
-    const ctx = makeContext(execute_msg);
-    expectCode(createMessageComposerClass(
-        ctx,
-        'SG721MessageComposer',
-        'SG721Message',
-        execute_msg
-    ))
+it("ownershipClass", () => {
+  const ctx = makeContext(ownership);
+  expectCode(
+    createMessageComposerClass(
+      ctx,
+      "OwnershipMessageComposer",
+      "OwnershipMessage",
+      ownership
+    )
+  );
 });
 
-it('createMessageComposerInterface', () => {
-    const ctx = makeContext(execute_msg);
-    expectCode(createMessageComposerInterface(
-        ctx,
-        'SG721Message',
-        execute_msg
-    ))
+it("ownershipInterface", () => {
+  const ownershipCtx = makeContext(ownership);
+  expectCode(
+    createMessageComposerInterface(ownershipCtx, "OwnershipMessage", ownership)
+  );
 });
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.ts b/packages/wasm-ast-types/src/message-composer/message-composer.ts
index 80fc35c3..255b3327 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.ts
@@ -14,6 +14,7 @@ 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,
@@ -27,12 +28,20 @@ const createWasmExecMethodMessageComposer = (
 
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    const obj = createTypedObjectParams(context, jsonschema.properties[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
+  if (param?.type === 'Identifier') {
+    actionValue = t.identifier(param.name);
+  } else {
+    actionValue = t.objectExpression(args)
+  }
+
     const constantParams = [
         identifier('funds', t.tsTypeAnnotation(
             t.tsArrayType(
@@ -46,9 +55,9 @@ const createWasmExecMethodMessageComposer = (
     return t.classProperty(
         t.identifier(methodName),
         arrowFunctionExpression(
-            obj ? [
+            param ? [
                 // props
-                obj,
+                param,
                 ...constantParams
             ] : constantParams,
             t.blockStatement(
@@ -95,10 +104,9 @@ const createWasmExecMethodMessageComposer = (
                                                             ),
                                                             [
                                                                 t.objectExpression(
-
                                                                     [
                                                                         t.objectProperty(
-                                                                            t.identifier(underscoreName), t.objectExpression(args)
+                                                                            t.identifier(underscoreName), actionValue
                                                                         )
                                                                     ]
 
diff --git a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
index aafd28dd..4f1c022e 100644
--- a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
+++ b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
@@ -113,6 +113,27 @@ exports[`execute class 1`] = `
 }"
 `;
 
+exports[`ownership 1`] = `
+"export abstract class Ownership {
+  static setFactory = ({
+    newFactory
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_factory: unknown;
+  }>[\\"set_factory\\"]>): ExecuteMsg => {
+    return {
+      set_factory: ({
+        new_factory: newFactory
+      } as const)
+    };
+  };
+  static updateOwnership = (action: Action): ExecuteMsg => {
+    return {
+      update_ownership: action
+    };
+  };
+}"
+`;
+
 exports[`query class 1`] = `
 "export abstract class SG721MsgBuilder {
   static ownerOf = ({
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
index 5b1c43d4..54dcee2d 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
@@ -1,9 +1,12 @@
 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 { expectCode, makeContext } from '../../test-utils';
+import { findExecuteMsg } from '@cosmwasm/ts-codegen/src';
 
 it('execute class', () => {
     const ctx = makeContext(execute_msg);
@@ -12,6 +15,11 @@ it('execute class', () => {
 
 
 it('query class', () => {
-  const ctx = makeContext(execute_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', query_msg))
 });
+
+it('ownership', () => {
+  const ctx = makeContext(ownership);
+  expectCode(createMsgBuilderClass(ctx, 'Ownership', ownership))
+});
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
index fec31547..df7fa8a4 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
@@ -1,16 +1,11 @@
-import * as t from "@babel/types";
-import { camel } from "case";
-import {
-  abstractClassDeclaration,
-  arrowFunctionExpression,
-  bindMethod,
-  classDeclaration,
-  getMessageProperties,
-} from "../utils";
-import { ExecuteMsg, QueryMsg } from "../types";
-import { createTypedObjectParams } from "../utils/types";
-import { RenderContext } from "../context";
-import { getWasmMethodArgs } from "../client/client";
+import * as t from '@babel/types';
+import { camel } from 'case';
+import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
+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';
 
 export const createMsgBuilderClass = (
   context: RenderContext,
@@ -34,10 +29,10 @@ export const createMsgBuilderClass = (
 function createExtractTypeAnnotation(underscoreName: string, msgTitle: string) {
   return t.tsTypeAnnotation(
     t.tsTypeReference(
-      t.identifier("CamelCasedProperties"),
+      t.identifier('CamelCasedProperties'),
       t.tsTypeParameterInstantiation([
         t.tsIndexedAccessType(
-          t.tsTypeReference(t.identifier("Extract"),
+          t.tsTypeReference(t.identifier('Extract'),
             t.tsTypeParameterInstantiation([
               t.tsTypeReference(t.identifier(msgTitle)),
               t.tsTypeLiteral([
@@ -62,7 +57,7 @@ const createStaticExecMethodMsgBuilder = (
 ) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const obj = createTypedObjectParams(
+  const param = createTypedObjectParams(
     context,
     jsonschema.properties[underscoreName]
   );
@@ -71,17 +66,34 @@ const createStaticExecMethodMsgBuilder = (
     jsonschema.properties[underscoreName]
   );
 
-  if (obj) obj.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle)
+  // what the underscore named property in the message is assigned to
+  let actionValue: Expression
+  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
+  if (
+    param &&
+    param.typeAnnotation.type === 'TSTypeAnnotation' &&
+    param.typeAnnotation.typeAnnotation.type === 'TSTypeLiteral'
+  ) {
+      param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+  }
 
   return t.classProperty(
     t.identifier(methodName),
     arrowFunctionExpression(
       // params
-      obj
+      param
         ? [
-            // props
-            obj,
-          ]
+          // props
+          param
+        ]
         : [],
       // body
       t.blockStatement([
@@ -89,10 +101,10 @@ const createStaticExecMethodMsgBuilder = (
           t.objectExpression([
             t.objectProperty(
               t.identifier(underscoreName),
-              t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const')))
-            ),
+              actionValue
+            )
           ])
-        ),
+        )
       ]),
       // return type
       t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))),
diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index 276b8fe5..0da3f360 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -1312,3 +1312,48 @@ export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<Ex
   }) => client.transferNft(msg, fee, memo, funds), options);
 }"
 `;
+
+exports[`ownership 1`] = `
+"export interface OwnershipUpdateOwnershipMutation {
+  client: OwnershipClient;
+  msg: Action;
+  args?: {
+    fee?: number | StdFee | \\"auto\\";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>, \\"mutationFn\\">) {
+  return useMutation<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.updateOwnership(msg, fee, memo, funds), options);
+}
+export interface OwnershipSetFactoryMutation {
+  client: OwnershipClient;
+  msg: {
+    newFactory: string;
+  };
+  args?: {
+    fee?: number | StdFee | \\"auto\\";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipSetFactoryMutation>, \\"mutationFn\\">) {
+  return useMutation<ExecuteResult, Error, OwnershipSetFactoryMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.setFactory(msg, fee, memo, funds), options);
+}"
+`;
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
index 7198b8a2..c959bd73 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.spec.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
@@ -1,13 +1,15 @@
 import * as t from '@babel/types';
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
-import { RenderContext } from '../context';
+import ownership from '../../../../__fixtures__/basic/ownership.json';
+
 
 import {
   createReactQueryHooks,
   createReactQueryMutationHooks,
 } from './react-query'
 import { expectCode, makeContext } from '../../test-utils';
+import { createMsgBuilderClass } from '../msg-builder';
 
 const execCtx = makeContext(execute_msg);
 const queryCtx = makeContext(query_msg);
@@ -90,3 +92,17 @@ it('createReactQueryHooks', () => {
     )))
 });
 
+it('ownership', () => {
+  const ownershipCtx = makeContext(ownership);
+  expectCode(t.program(
+    createReactQueryMutationHooks(
+      {
+        context: ownershipCtx,
+        execMsg: ownership,
+        contractName: 'Ownership',
+        ExecuteClient: 'OwnershipClient',
+      }
+    )))
+});
+
+
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index a552f753..8693107d 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { camel, pascal } from 'case';
+import { camel, pascal, snake } from 'case';
 import { propertySignature } from './babel';
 import { TSTypeAnnotation } from '@babel/types';
 import { RenderContext } from '../context';
@@ -425,15 +425,22 @@ export const createTypedObjectParams = (
   context: RenderContext,
   jsonschema: JSONSchema,
   camelize: boolean = true
-): t.ObjectPattern => {
+): (t.Identifier | t.Pattern | t.RestElement) => {
 
   const keys = Object.keys(jsonschema.properties ?? {});
   if (!keys.length) {
-
     // is there a ref?
     if (jsonschema.$ref) {
       const obj = context.refLookup(jsonschema.$ref);
-      if (obj) {
+      // If there is a oneOf, then we need to create a type for it
+      if (obj?.oneOf) {
+        // the actual type of the ref
+        const refType = jsonschema.$ref.split('/').pop();
+        const refName = camel(refType);
+        const id = t.identifier(refName);
+        id.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(refType)));
+        return id
+      } else if (obj) {
         return createTypedObjectParams(
           context,
           obj,

From 85e69d3dd3bae5ebb50676bdba1fa35d44505cb8 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Fri, 14 Apr 2023 09:29:22 +0200
Subject: [PATCH 102/287] Add msg-builder readme

---
 README.md                     | 29 +++++++++++++++++++++++++++++
 packages/ts-codegen/README.md | 26 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/README.md b/README.md
index 045b7bb8..a51ac9f9 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,9 @@ codegen({
     },
     messageComposer: {
       enabled: false
+    },
+    msgBuilder: {
+      enabled: false
     }
   }
 }).then(() => {
@@ -252,6 +255,28 @@ cosmwasm-ts-codegen generate \
   | ------------------------------ | ------------------------------------------------------------------- |
   | `messageComposer.enabled`      | enable the messageComposer plugin                                   |
 
+### Msg Builder
+
+Generate raw message jsons for use in your application with the `msg-builder` command.
+
+[see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
+
+#### Msg Builder via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin msg-builder \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName 
+```
+#### Message Composer Options
+
+| option      | description                                                         |
+-------------| ------------------------------ | ------------------------------------------------------------------- |
+| `msgBuilder.enabled` | enable the msgBilder plugin                                   |
+
+
 ### Bundles
 
 The bundler will make a nice package of all your contracts. For example:
@@ -389,6 +414,10 @@ https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
 
 https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
 
+- `cosmwasm-ts-codegen generate --plugin msg-builder`
+
+https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
+
 
 ### JSON Schema
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 045b7bb8..4fc0e4b6 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -36,6 +36,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [React Query](#react-query)
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
+    - [Msg Builder](#msg-builder)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
@@ -119,6 +120,9 @@ codegen({
     },
     messageComposer: {
       enabled: false
+    },
+    msgBuilder: { 
+      enabled: false
     }
   }
 }).then(() => {
@@ -252,6 +256,28 @@ cosmwasm-ts-codegen generate \
   | ------------------------------ | ------------------------------------------------------------------- |
   | `messageComposer.enabled`      | enable the messageComposer plugin                                   |
 
+### Msg Builder
+
+Generate raw message jsons for use in your application with the `msg-builder` command.
+
+[see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
+
+#### Msg Builder via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin msg-builder \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName 
+```
+#### Message Composer Options
+
+| option      | description                                                         |
+-------------| ------------------------------ | ------------------------------------------------------------------- |
+| `msgBuilder.enabled` | enable the msgBilder plugin                                   |
+
+
 ### Bundles
 
 The bundler will make a nice package of all your contracts. For example:

From d2edba320c63e2db5fe2db0bfb1f4cd5e44f2188 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 17 Apr 2023 13:40:37 -0700
Subject: [PATCH 103/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.27.0
 - wasm-ast-types@0.20.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 4ac37d9a..4d482ce9 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.27.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.26.0...@cosmwasm/ts-codegen@0.27.0) (2023-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.26.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.25.2...@cosmwasm/ts-codegen@0.26.0) (2023-04-10)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index cf13b9bb..d87898ff 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.19.0"
+    "wasm-ast-types": "^0.20.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 693ebd85..65d6171c 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.20.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.19.0...wasm-ast-types@0.20.0) (2023-04-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.19.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.2...wasm-ast-types@0.19.0) (2023-04-10)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 387e7fe3..1711fffc 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.19.0",
+  "version": "0.20.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",

From 4dac35df2d19499c32aa057d2eeb94388e52508a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 May 2023 10:48:04 -0700
Subject: [PATCH 104/287] test

---
 __fixtures__/issues/103/schema.json           |  58 ++++
 __fixtures__/issues/98/out/98.client.ts       | 247 ------------------
 __fixtures__/issues/98/out/98.react-query.ts  |  50 ----
 __fixtures__/issues/98/out/98.types.ts        | 100 -------
 __fixtures__/issues/98/out/bundle.ts          |  15 --
 .../ts-client.issue-103.test.ts.snap          |  38 +++
 .../client/test/ts-client.issue-103.test.ts   |  55 ++++
 7 files changed, 151 insertions(+), 412 deletions(-)
 create mode 100644 __fixtures__/issues/103/schema.json
 delete mode 100644 __fixtures__/issues/98/out/98.client.ts
 delete mode 100644 __fixtures__/issues/98/out/98.react-query.ts
 delete mode 100644 __fixtures__/issues/98/out/98.types.ts
 delete mode 100644 __fixtures__/issues/98/out/bundle.ts
 create mode 100644 packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
 create mode 100644 packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts

diff --git a/__fixtures__/issues/103/schema.json b/__fixtures__/issues/103/schema.json
new file mode 100644
index 00000000..25c934ae
--- /dev/null
+++ b/__fixtures__/issues/103/schema.json
@@ -0,0 +1,58 @@
+{
+    "contract_name": "cw1-whitelist",
+    "contract_version": "0.3.0",
+    "idl_version": "1.0.0",
+    "instantiate": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "InstantiateMsg",
+        "type": "object",
+        "required": [
+            "admins",
+            "mutable"
+        ],
+        "properties": {
+            "admins": {
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
+            },
+            "mutable": {
+                "type": "boolean"
+            }
+        }
+    },
+    "execute": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "ExecuteMsg",
+        "anyOf": [
+            {
+                "$ref": "#/definitions/ExecMsg"
+            }
+        ],
+        "definitions": {
+            "ExecMsg": {
+                "type": "string",
+                "enum": []
+            }
+        }
+    },
+    "query": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "QueryMsg",
+        "anyOf": [
+            {
+                "$ref": "#/definitions/QueryMsg"
+            }
+        ],
+        "definitions": {
+            "QueryMsg": {
+                "type": "string",
+                "enum": []
+            }
+        }
+    },
+    "migrate": null,
+    "sudo": null,
+    "responses": {}
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
deleted file mode 100644
index b4e37f5b..00000000
--- a/__fixtures__/issues/98/out/98.client.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
-import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
-export interface 98ReadOnlyInterface {
-  contractAddress: string;
-  getConfig: () => Promise<ConfigResponse>;
-  getPlugins: ({
-    limit,
-    startAfter
-  }: {
-    limit?: number;
-    startAfter?: number;
-  }) => Promise<PluginsResponse>;
-  getPluginById: ({
-    id
-  }: {
-    id: number;
-  }) => Promise<NullablePlugin>;
-}
-export class 98QueryClient implements 98ReadOnlyInterface {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-    this.getConfig = this.getConfig.bind(this);
-    this.getPlugins = this.getPlugins.bind(this);
-    this.getPluginById = this.getPluginById.bind(this);
-  }
-
-  getConfig = async (): Promise<ConfigResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_config: {}
-    });
-  };
-  getPlugins = async ({
-    limit,
-    startAfter
-  }: {
-    limit?: number;
-    startAfter?: number;
-  }): Promise<PluginsResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_plugins: {
-        limit,
-        start_after: startAfter
-      }
-    });
-  };
-  getPluginById = async ({
-    id
-  }: {
-    id: number;
-  }): Promise<NullablePlugin> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      get_plugin_by_id: {
-        id
-      }
-    });
-  };
-}
-export interface 98Interface extends 98ReadOnlyInterface {
-  contractAddress: string;
-  sender: string;
-  proxyInstallPlugin: ({
-    id,
-    instantiateMsg
-  }: {
-    id: number;
-    instantiateMsg: Binary;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  registerPlugin: ({
-    checksum,
-    codeId,
-    creator,
-    ipfsHash,
-    name,
-    version
-  }: {
-    checksum: string;
-    codeId: number;
-    creator: string;
-    ipfsHash: string;
-    name: string;
-    version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  unregisterPlugin: ({
-    id
-  }: {
-    id: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updatePlugin: ({
-    checksum,
-    codeId,
-    creator,
-    id,
-    ipfsHash,
-    name,
-    version
-  }: {
-    checksum?: string;
-    codeId?: number;
-    creator?: string;
-    id: number;
-    ipfsHash?: string;
-    name?: string;
-    version?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateRegistryFee: ({
-    newFee
-  }: {
-    newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateDaoAddr: ({
-    newAddr
-  }: {
-    newAddr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-}
-export class 98Client extends 98QueryClient implements 98Interface {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    super(client, contractAddress);
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.proxyInstallPlugin = this.proxyInstallPlugin.bind(this);
-    this.registerPlugin = this.registerPlugin.bind(this);
-    this.unregisterPlugin = this.unregisterPlugin.bind(this);
-    this.updatePlugin = this.updatePlugin.bind(this);
-    this.updateRegistryFee = this.updateRegistryFee.bind(this);
-    this.updateDaoAddr = this.updateDaoAddr.bind(this);
-  }
-
-  proxyInstallPlugin = async ({
-    id,
-    instantiateMsg
-  }: {
-    id: number;
-    instantiateMsg: Binary;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      proxy_install_plugin: {
-        id,
-        instantiate_msg: instantiateMsg
-      }
-    }, fee, memo, funds);
-  };
-  registerPlugin = async ({
-    checksum,
-    codeId,
-    creator,
-    ipfsHash,
-    name,
-    version
-  }: {
-    checksum: string;
-    codeId: number;
-    creator: string;
-    ipfsHash: string;
-    name: string;
-    version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      register_plugin: {
-        checksum,
-        code_id: codeId,
-        creator,
-        ipfs_hash: ipfsHash,
-        name,
-        version
-      }
-    }, fee, memo, funds);
-  };
-  unregisterPlugin = async ({
-    id
-  }: {
-    id: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      unregister_plugin: {
-        id
-      }
-    }, fee, memo, funds);
-  };
-  updatePlugin = async ({
-    checksum,
-    codeId,
-    creator,
-    id,
-    ipfsHash,
-    name,
-    version
-  }: {
-    checksum?: string;
-    codeId?: number;
-    creator?: string;
-    id: number;
-    ipfsHash?: string;
-    name?: string;
-    version?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_plugin: {
-        checksum,
-        code_id: codeId,
-        creator,
-        id,
-        ipfs_hash: ipfsHash,
-        name,
-        version
-      }
-    }, fee, memo, funds);
-  };
-  updateRegistryFee = async ({
-    newFee
-  }: {
-    newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_registry_fee: {
-        new_fee: newFee
-      }
-    }, fee, memo, funds);
-  };
-  updateDaoAddr = async ({
-    newAddr
-  }: {
-    newAddr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_dao_addr: {
-        new_addr: newAddr
-      }
-    }, fee, memo, funds);
-  };
-}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.react-query.ts b/__fixtures__/issues/98/out/98.react-query.ts
deleted file mode 100644
index f9e31110..00000000
--- a/__fixtures__/issues/98/out/98.react-query.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { UseQueryOptions, useQuery } from "react-query";
-import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
-import { 98QueryClient } from "./98.client";
-export interface 98ReactQuery<TResponse, TData = TResponse> {
-  client: 98QueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
-}
-export interface 98GetPluginByIdQuery<TData> extends 98ReactQuery<NullablePlugin, TData> {
-  args: {
-    id: number;
-  };
-}
-export function use98GetPluginByIdQuery<TData = NullablePlugin>({
-  client,
-  args,
-  options
-}: 98GetPluginByIdQuery<TData>) {
-  return useQuery<NullablePlugin, Error, TData>(["98GetPluginById", client.contractAddress, JSON.stringify(args)], () => client.getPluginById({
-    id: args.id
-  }), options);
-}
-export interface 98GetPluginsQuery<TData> extends 98ReactQuery<PluginsResponse, TData> {
-  args: {
-    limit?: number;
-    startAfter?: number;
-  };
-}
-export function use98GetPluginsQuery<TData = PluginsResponse>({
-  client,
-  args,
-  options
-}: 98GetPluginsQuery<TData>) {
-  return useQuery<PluginsResponse, Error, TData>(["98GetPlugins", client.contractAddress, JSON.stringify(args)], () => client.getPlugins({
-    limit: args.limit,
-    startAfter: args.startAfter
-  }), options);
-}
-export interface 98GetConfigQuery<TData> extends 98ReactQuery<ConfigResponse, TData> {}
-export function use98GetConfigQuery<TData = ConfigResponse>({
-  client,
-  options
-}: 98GetConfigQuery<TData>) {
-  return useQuery<ConfigResponse, Error, TData>(["98GetConfig", client.contractAddress], () => client.getConfig(), options);
-}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.types.ts b/__fixtures__/issues/98/out/98.types.ts
deleted file mode 100644
index 3fa99382..00000000
--- a/__fixtures__/issues/98/out/98.types.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-export type Uint128 = string;
-export interface InstantiateMsg {
-  install_fee: Coin;
-  registry_fee: Coin;
-  [k: string]: unknown;
-}
-export interface Coin {
-  amount: Uint128;
-  denom: string;
-  [k: string]: unknown;
-}
-export type ExecuteMsg = InstallableExecMsg | ExecMsg;
-export type InstallableExecMsg = {
-  proxy_install_plugin: {
-    id: number;
-    instantiate_msg: Binary;
-    [k: string]: unknown;
-  };
-};
-export type Binary = string;
-export type ExecMsg = {
-  register_plugin: {
-    checksum: string;
-    code_id: number;
-    creator: string;
-    ipfs_hash: string;
-    name: string;
-    version: string;
-    [k: string]: unknown;
-  };
-} | {
-  unregister_plugin: {
-    id: number;
-    [k: string]: unknown;
-  };
-} | {
-  update_plugin: {
-    checksum?: string | null;
-    code_id?: number | null;
-    creator?: string | null;
-    id: number;
-    ipfs_hash?: string | null;
-    name?: string | null;
-    version?: string | null;
-    [k: string]: unknown;
-  };
-} | {
-  update_registry_fee: {
-    new_fee: Coin;
-    [k: string]: unknown;
-  };
-} | {
-  update_dao_addr: {
-    new_addr: string;
-    [k: string]: unknown;
-  };
-};
-export type QueryMsg = InstallableQueryMsg | QueryMsg1;
-export type InstallableQueryMsg = string;
-export type QueryMsg1 = {
-  get_config: {
-    [k: string]: unknown;
-  };
-} | {
-  get_plugins: {
-    limit?: number | null;
-    start_after?: number | null;
-    [k: string]: unknown;
-  };
-} | {
-  get_plugin_by_id: {
-    id: number;
-    [k: string]: unknown;
-  };
-};
-export interface ConfigResponse {
-  dao_addr: string;
-  registry_fee: Coin;
-}
-export type NullablePlugin = Plugin | null;
-export type CanonicalAddr = Binary;
-export interface Plugin {
-  checksum: string;
-  code_id: number;
-  creator: CanonicalAddr;
-  id: number;
-  ipfs_hash: string;
-  name: string;
-  version: string;
-}
-export interface PluginsResponse {
-  plugins: Plugin[];
-  total: number;
-}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/bundle.ts b/__fixtures__/issues/98/out/bundle.ts
deleted file mode 100644
index 4f76a61e..00000000
--- a/__fixtures__/issues/98/out/bundle.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import * as _0 from "./98.types";
-import * as _1 from "./98.client";
-import * as _2 from "./98.react-query";
-export namespace contracts {
-  export const 98 = { ..._0,
-    ..._1,
-    ..._2
-  };
-}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
new file mode 100644
index 00000000..fe203434
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute classes array types 1`] = `
+"export class Client implements Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+  }
+
+}"
+`;
+
+exports[`execute interfaces no extends 1`] = `
+"export interface SG721Instance {
+  contractAddress: string;
+  sender: string;
+}"
+`;
+
+exports[`execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query classes 1`] = `
+"export class QueryClient implements ReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+  }
+
+}"
+`;
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts
new file mode 100644
index 00000000..686d5484
--- /dev/null
+++ b/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts
@@ -0,0 +1,55 @@
+import contract from '../../../../../__fixtures__/issues/103/schema.json';
+
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, printCode, makeContext } from '../../../test-utils';
+
+const message = contract.query
+const ctx = makeContext(message);
+
+it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(
+        ctx,
+        message
+    ))
+})
+
+
+it('query classes', () => {
+    expectCode(createQueryClass(
+        ctx,
+        'QueryClient',
+        'ReadOnlyInstance',
+        message
+    ))
+});
+
+// it('query classes response', () => {
+//     expectCode(createTypeInterface(
+//         ctx,
+//         contract.responses.all_debt_shares
+//     ))
+// });
+
+it('execute classes array types', () => {
+    expectCode(createExecuteClass(
+        ctx,
+        'Client',
+        'Instance',
+        null,
+        message
+    ))
+});
+
+it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(
+        ctx,
+        'SG721Instance',
+        null,
+        message
+    ))
+});

From e18a55116b7f186a3399318843308a4ea68a8e4c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 May 2023 10:52:30 -0700
Subject: [PATCH 105/287] test

---
 .../ts-client.issue-103.test.ts.snap          |  49 ++++++-
 .../client/test/ts-client.issue-103.test.ts   | 133 ++++++++++++------
 2 files changed, 137 insertions(+), 45 deletions(-)

diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
index fe203434..ba311655 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`execute classes array types 1`] = `
+exports[`execute execute classes array types 1`] = `
 "export class Client implements Instance {
   client: SigningCosmWasmClient;
   sender: string;
@@ -15,16 +15,16 @@ exports[`execute classes array types 1`] = `
 }"
 `;
 
-exports[`execute interfaces no extends 1`] = `
+exports[`execute execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
 }"
 `;
 
-exports[`execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
+exports[`execute execute_msg_for__empty 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
-exports[`query classes 1`] = `
+exports[`execute query classes 1`] = `
 "export class QueryClient implements ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
@@ -36,3 +36,44 @@ exports[`query classes 1`] = `
 
 }"
 `;
+
+exports[`execute query classes response 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query execute classes array types 1`] = `
+"export class Client implements Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+  }
+
+}"
+`;
+
+exports[`query execute interfaces no extends 1`] = `
+"export interface SG721Instance {
+  contractAddress: string;
+  sender: string;
+}"
+`;
+
+exports[`query execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query query classes 1`] = `
+"export class QueryClient implements ReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+  }
+
+}"
+`;
+
+exports[`query query classes response 1`] = `"export type QueryMsg = QueryMsg;"`;
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts b/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts
index 686d5484..4f394115 100644
--- a/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts
+++ b/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts
@@ -8,48 +8,99 @@ import {
 } from '../client'
 import { expectCode, printCode, makeContext } from '../../../test-utils';
 
-const message = contract.query
-const ctx = makeContext(message);
-
-it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        message
-    ))
-})
-
-
-it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'QueryClient',
-        'ReadOnlyInstance',
-        message
-    ))
-});
+const queryMessage = contract.query
+const executeMessage = contract.execute
+const queryCtx = makeContext(queryMessage);
+const executeCtx = makeContext(executeMessage);
+
+describe('query', () => {
+    it('execute_msg_for__empty', () => {
+        expectCode(createTypeInterface(
+            queryCtx,
+            queryMessage
+        ))
+    })
+
+
+    it('query classes', () => {
+        expectCode(createQueryClass(
+            queryCtx,
+            'QueryClient',
+            'ReadOnlyInstance',
+            queryMessage
+        ))
+    });
+
+    it('query classes response', () => {
+        expectCode(createTypeInterface(
+            queryCtx,
+            contract.query
+        ))
+    });
+
+    it('execute classes array types', () => {
+        expectCode(createExecuteClass(
+            queryCtx,
+            'Client',
+            'Instance',
+            null,
+            queryMessage
+        ))
+    });
+
+    it('execute interfaces no extends', () => {
+        expectCode(createExecuteInterface(
+            queryCtx,
+            'SG721Instance',
+            null,
+            queryMessage
+        ))
+    });
 
-// it('query classes response', () => {
-//     expectCode(createTypeInterface(
-//         ctx,
-//         contract.responses.all_debt_shares
-//     ))
-// });
-
-it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'Client',
-        'Instance',
-        null,
-        message
-    ))
 });
 
-it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        message
-    ))
+describe('execute', () => {
+    it('execute_msg_for__empty', () => {
+        expectCode(createTypeInterface(
+            executeCtx,
+            executeMessage
+        ))
+    })
+
+
+    it('query classes', () => {
+        expectCode(createQueryClass(
+            executeCtx,
+            'QueryClient',
+            'ReadOnlyInstance',
+            executeMessage
+        ))
+    });
+
+    it('query classes response', () => {
+        expectCode(createTypeInterface(
+            executeCtx,
+            contract.query
+        ))
+    });
+
+    it('execute classes array types', () => {
+        expectCode(createExecuteClass(
+            executeCtx,
+            'Client',
+            'Instance',
+            null,
+            executeMessage
+        ))
+    });
+
+    it('execute interfaces no extends', () => {
+        expectCode(createExecuteInterface(
+            executeCtx,
+            'SG721Instance',
+            null,
+            executeMessage
+        ))
+    });
+
 });

From b5d8d50e154b6b6a595f6877ff82d7b89db10efc Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 May 2023 17:00:58 -0700
Subject: [PATCH 106/287] fix for raw/

---
 __fixtures__/issues/103/raw/duplicate.json    |   3 +
 __fixtures__/issues/98/out/98.client.ts       | 247 ++++++++++++++++++
 __fixtures__/issues/98/out/98.react-query.ts  |  50 ++++
 __fixtures__/issues/98/out/98.types.ts        | 100 +++++++
 __fixtures__/issues/98/out/bundle.ts          |  15 ++
 __output__/issues/103/clean.json              | 109 ++++++++
 __output__/issues/103/orig.json               | 113 ++++++++
 packages/ts-codegen/__tests__/cleanse.test.ts |  11 +
 packages/ts-codegen/src/utils/schemas.ts      |   4 +-
 9 files changed, 651 insertions(+), 1 deletion(-)
 create mode 100644 __fixtures__/issues/103/raw/duplicate.json
 create mode 100644 __fixtures__/issues/98/out/98.client.ts
 create mode 100644 __fixtures__/issues/98/out/98.react-query.ts
 create mode 100644 __fixtures__/issues/98/out/98.types.ts
 create mode 100644 __fixtures__/issues/98/out/bundle.ts
 create mode 100644 __output__/issues/103/clean.json
 create mode 100644 __output__/issues/103/orig.json

diff --git a/__fixtures__/issues/103/raw/duplicate.json b/__fixtures__/issues/103/raw/duplicate.json
new file mode 100644
index 00000000..22b92543
--- /dev/null
+++ b/__fixtures__/issues/103/raw/duplicate.json
@@ -0,0 +1,3 @@
+{
+    "contract_name": "something-in-raw-folder"
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
new file mode 100644
index 00000000..b4e37f5b
--- /dev/null
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -0,0 +1,247 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
+import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
+export interface 98ReadOnlyInterface {
+  contractAddress: string;
+  getConfig: () => Promise<ConfigResponse>;
+  getPlugins: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }) => Promise<PluginsResponse>;
+  getPluginById: ({
+    id
+  }: {
+    id: number;
+  }) => Promise<NullablePlugin>;
+}
+export class 98QueryClient implements 98ReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.getConfig = this.getConfig.bind(this);
+    this.getPlugins = this.getPlugins.bind(this);
+    this.getPluginById = this.getPluginById.bind(this);
+  }
+
+  getConfig = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_config: {}
+    });
+  };
+  getPlugins = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: number;
+  }): Promise<PluginsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_plugins: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  getPluginById = async ({
+    id
+  }: {
+    id: number;
+  }): Promise<NullablePlugin> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_plugin_by_id: {
+        id
+      }
+    });
+  };
+}
+export interface 98Interface extends 98ReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  proxyInstallPlugin: ({
+    id,
+    instantiateMsg
+  }: {
+    id: number;
+    instantiateMsg: Binary;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  registerPlugin: ({
+    checksum,
+    codeId,
+    creator,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum: string;
+    codeId: number;
+    creator: string;
+    ipfsHash: string;
+    name: string;
+    version: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  unregisterPlugin: ({
+    id
+  }: {
+    id: number;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updatePlugin: ({
+    checksum,
+    codeId,
+    creator,
+    id,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum?: string;
+    codeId?: number;
+    creator?: string;
+    id: number;
+    ipfsHash?: string;
+    name?: string;
+    version?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateRegistryFee: ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  updateDaoAddr: ({
+    newAddr
+  }: {
+    newAddr: string;
+  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class 98Client extends 98QueryClient implements 98Interface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.proxyInstallPlugin = this.proxyInstallPlugin.bind(this);
+    this.registerPlugin = this.registerPlugin.bind(this);
+    this.unregisterPlugin = this.unregisterPlugin.bind(this);
+    this.updatePlugin = this.updatePlugin.bind(this);
+    this.updateRegistryFee = this.updateRegistryFee.bind(this);
+    this.updateDaoAddr = this.updateDaoAddr.bind(this);
+  }
+
+  proxyInstallPlugin = async ({
+    id,
+    instantiateMsg
+  }: {
+    id: number;
+    instantiateMsg: Binary;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      proxy_install_plugin: {
+        id,
+        instantiate_msg: instantiateMsg
+      }
+    }, fee, memo, funds);
+  };
+  registerPlugin = async ({
+    checksum,
+    codeId,
+    creator,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum: string;
+    codeId: number;
+    creator: string;
+    ipfsHash: string;
+    name: string;
+    version: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      register_plugin: {
+        checksum,
+        code_id: codeId,
+        creator,
+        ipfs_hash: ipfsHash,
+        name,
+        version
+      }
+    }, fee, memo, funds);
+  };
+  unregisterPlugin = async ({
+    id
+  }: {
+    id: number;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      unregister_plugin: {
+        id
+      }
+    }, fee, memo, funds);
+  };
+  updatePlugin = async ({
+    checksum,
+    codeId,
+    creator,
+    id,
+    ipfsHash,
+    name,
+    version
+  }: {
+    checksum?: string;
+    codeId?: number;
+    creator?: string;
+    id: number;
+    ipfsHash?: string;
+    name?: string;
+    version?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_plugin: {
+        checksum,
+        code_id: codeId,
+        creator,
+        id,
+        ipfs_hash: ipfsHash,
+        name,
+        version
+      }
+    }, fee, memo, funds);
+  };
+  updateRegistryFee = async ({
+    newFee
+  }: {
+    newFee: Coin;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_registry_fee: {
+        new_fee: newFee
+      }
+    }, fee, memo, funds);
+  };
+  updateDaoAddr = async ({
+    newAddr
+  }: {
+    newAddr: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_dao_addr: {
+        new_addr: newAddr
+      }
+    }, fee, memo, funds);
+  };
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.react-query.ts b/__fixtures__/issues/98/out/98.react-query.ts
new file mode 100644
index 00000000..f9e31110
--- /dev/null
+++ b/__fixtures__/issues/98/out/98.react-query.ts
@@ -0,0 +1,50 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
+import { 98QueryClient } from "./98.client";
+export interface 98ReactQuery<TResponse, TData = TResponse> {
+  client: 98QueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface 98GetPluginByIdQuery<TData> extends 98ReactQuery<NullablePlugin, TData> {
+  args: {
+    id: number;
+  };
+}
+export function use98GetPluginByIdQuery<TData = NullablePlugin>({
+  client,
+  args,
+  options
+}: 98GetPluginByIdQuery<TData>) {
+  return useQuery<NullablePlugin, Error, TData>(["98GetPluginById", client.contractAddress, JSON.stringify(args)], () => client.getPluginById({
+    id: args.id
+  }), options);
+}
+export interface 98GetPluginsQuery<TData> extends 98ReactQuery<PluginsResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: number;
+  };
+}
+export function use98GetPluginsQuery<TData = PluginsResponse>({
+  client,
+  args,
+  options
+}: 98GetPluginsQuery<TData>) {
+  return useQuery<PluginsResponse, Error, TData>(["98GetPlugins", client.contractAddress, JSON.stringify(args)], () => client.getPlugins({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface 98GetConfigQuery<TData> extends 98ReactQuery<ConfigResponse, TData> {}
+export function use98GetConfigQuery<TData = ConfigResponse>({
+  client,
+  options
+}: 98GetConfigQuery<TData>) {
+  return useQuery<ConfigResponse, Error, TData>(["98GetConfig", client.contractAddress], () => client.getConfig(), options);
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/98.types.ts b/__fixtures__/issues/98/out/98.types.ts
new file mode 100644
index 00000000..3fa99382
--- /dev/null
+++ b/__fixtures__/issues/98/out/98.types.ts
@@ -0,0 +1,100 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Uint128 = string;
+export interface InstantiateMsg {
+  install_fee: Coin;
+  registry_fee: Coin;
+  [k: string]: unknown;
+}
+export interface Coin {
+  amount: Uint128;
+  denom: string;
+  [k: string]: unknown;
+}
+export type ExecuteMsg = InstallableExecMsg | ExecMsg;
+export type InstallableExecMsg = {
+  proxy_install_plugin: {
+    id: number;
+    instantiate_msg: Binary;
+    [k: string]: unknown;
+  };
+};
+export type Binary = string;
+export type ExecMsg = {
+  register_plugin: {
+    checksum: string;
+    code_id: number;
+    creator: string;
+    ipfs_hash: string;
+    name: string;
+    version: string;
+    [k: string]: unknown;
+  };
+} | {
+  unregister_plugin: {
+    id: number;
+    [k: string]: unknown;
+  };
+} | {
+  update_plugin: {
+    checksum?: string | null;
+    code_id?: number | null;
+    creator?: string | null;
+    id: number;
+    ipfs_hash?: string | null;
+    name?: string | null;
+    version?: string | null;
+    [k: string]: unknown;
+  };
+} | {
+  update_registry_fee: {
+    new_fee: Coin;
+    [k: string]: unknown;
+  };
+} | {
+  update_dao_addr: {
+    new_addr: string;
+    [k: string]: unknown;
+  };
+};
+export type QueryMsg = InstallableQueryMsg | QueryMsg1;
+export type InstallableQueryMsg = string;
+export type QueryMsg1 = {
+  get_config: {
+    [k: string]: unknown;
+  };
+} | {
+  get_plugins: {
+    limit?: number | null;
+    start_after?: number | null;
+    [k: string]: unknown;
+  };
+} | {
+  get_plugin_by_id: {
+    id: number;
+    [k: string]: unknown;
+  };
+};
+export interface ConfigResponse {
+  dao_addr: string;
+  registry_fee: Coin;
+}
+export type NullablePlugin = Plugin | null;
+export type CanonicalAddr = Binary;
+export interface Plugin {
+  checksum: string;
+  code_id: number;
+  creator: CanonicalAddr;
+  id: number;
+  ipfs_hash: string;
+  name: string;
+  version: string;
+}
+export interface PluginsResponse {
+  plugins: Plugin[];
+  total: number;
+}
\ No newline at end of file
diff --git a/__fixtures__/issues/98/out/bundle.ts b/__fixtures__/issues/98/out/bundle.ts
new file mode 100644
index 00000000..4f76a61e
--- /dev/null
+++ b/__fixtures__/issues/98/out/bundle.ts
@@ -0,0 +1,15 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import * as _0 from "./98.types";
+import * as _1 from "./98.client";
+import * as _2 from "./98.react-query";
+export namespace contracts {
+  export const 98 = { ..._0,
+    ..._1,
+    ..._2
+  };
+}
\ No newline at end of file
diff --git a/__output__/issues/103/clean.json b/__output__/issues/103/clean.json
new file mode 100644
index 00000000..a799739a
--- /dev/null
+++ b/__output__/issues/103/clean.json
@@ -0,0 +1,109 @@
+{
+  "schemas": [
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "admins",
+        "mutable"
+      ],
+      "properties": {
+        "admins": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "mutable": {
+          "type": "boolean"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ExecMsg"
+        }
+      ],
+      "definitions": {
+        "ExecMsg": {
+          "type": "string"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/QueryMsg"
+        }
+      ],
+      "definitions": {
+        "QueryMsg": {
+          "type": "string"
+        }
+      }
+    }
+  ],
+  "responses": {},
+  "idlObject": {
+    "contract_name": "cw1-whitelist",
+    "contract_version": "0.3.0",
+    "idl_version": "1.0.0",
+    "instantiate": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "admins",
+        "mutable"
+      ],
+      "properties": {
+        "admins": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "mutable": {
+          "type": "boolean"
+        }
+      }
+    },
+    "execute": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ExecMsg"
+        }
+      ],
+      "definitions": {
+        "ExecMsg": {
+          "type": "string"
+        }
+      }
+    },
+    "query": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/QueryMsg"
+        }
+      ],
+      "definitions": {
+        "QueryMsg": {
+          "type": "string"
+        }
+      }
+    },
+    "migrate": null,
+    "sudo": null,
+    "responses": {}
+  }
+}
\ No newline at end of file
diff --git a/__output__/issues/103/orig.json b/__output__/issues/103/orig.json
new file mode 100644
index 00000000..b4c7a8f0
--- /dev/null
+++ b/__output__/issues/103/orig.json
@@ -0,0 +1,113 @@
+{
+  "schemas": [
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "admins",
+        "mutable"
+      ],
+      "properties": {
+        "admins": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "mutable": {
+          "type": "boolean"
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ExecMsg"
+        }
+      ],
+      "definitions": {
+        "ExecMsg": {
+          "type": "string",
+          "enum": []
+        }
+      }
+    },
+    {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/QueryMsg"
+        }
+      ],
+      "definitions": {
+        "QueryMsg": {
+          "type": "string",
+          "enum": []
+        }
+      }
+    }
+  ],
+  "responses": {},
+  "idlObject": {
+    "contract_name": "cw1-whitelist",
+    "contract_version": "0.3.0",
+    "idl_version": "1.0.0",
+    "instantiate": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "InstantiateMsg",
+      "type": "object",
+      "required": [
+        "admins",
+        "mutable"
+      ],
+      "properties": {
+        "admins": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "mutable": {
+          "type": "boolean"
+        }
+      }
+    },
+    "execute": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "ExecuteMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ExecMsg"
+        }
+      ],
+      "definitions": {
+        "ExecMsg": {
+          "type": "string",
+          "enum": []
+        }
+      }
+    },
+    "query": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "QueryMsg",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/QueryMsg"
+        }
+      ],
+      "definitions": {
+        "QueryMsg": {
+          "type": "string",
+          "enum": []
+        }
+      }
+    },
+    "migrate": null,
+    "sudo": null,
+    "responses": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/cleanse.test.ts b/packages/ts-codegen/__tests__/cleanse.test.ts
index c60a838d..6b79b3ab 100644
--- a/packages/ts-codegen/__tests__/cleanse.test.ts
+++ b/packages/ts-codegen/__tests__/cleanse.test.ts
@@ -29,6 +29,17 @@ it('daodao/cw-code-id-registry', async () => {
     mkdirp(out);
     writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
     writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
+})
+
+it('issues/103', async () => {
+    const out = OUTPUT_DIR + '/issues/103';
+    const schemaDir = FIXTURE_DIR + '/issues/103/';
+
+    const clean = await readSchemas({ schemaDir, clean: true });
+    const orig = await readSchemas({ schemaDir, clean: false });
 
+    mkdirp(out);
+    writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
+    writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
 })
 
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 8d4ffcaa..a1206a65 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -13,7 +13,9 @@ export const readSchemas = async ({
     schemaDir, clean = true
 }: ReadSchemaOpts): Promise<ContractInfo> => {
     const fn = clean ? cleanse : (str) => str;
-    const files = glob(schemaDir + '/**/*.json');
+    const files = glob(schemaDir + '/**/*.json')
+        .filter(file => !file.match(/\/raw\//));
+
     const schemas = files
         .map(file => JSON.parse(readFileSync(file, 'utf-8')));
 

From 90fb688d19f477d246f9021ac91d824c96b8f3fc Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 May 2023 17:06:00 -0700
Subject: [PATCH 107/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.28.0
 - wasm-ast-types@0.21.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 4d482ce9..0b20b401 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.28.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.27.0...@cosmwasm/ts-codegen@0.28.0) (2023-05-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.27.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.26.0...@cosmwasm/ts-codegen@0.27.0) (2023-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index d87898ff..2f19d9b1 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.20.0"
+    "wasm-ast-types": "^0.21.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 65d6171c..5068315d 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.21.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.20.0...wasm-ast-types@0.21.0) (2023-05-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.20.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.19.0...wasm-ast-types@0.20.0) (2023-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 1711fffc..8bda2efb 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.20.0",
+  "version": "0.21.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",

From 14689316a62db86b53230131d154ee32aa6a41f6 Mon Sep 17 00:00:00 2001
From: "M. Daeva" <embedmad@gmail.com>
Date: Sat, 20 May 2023 20:57:47 +0300
Subject: [PATCH 108/287] cosmwasm -> @cosmjs/cosmwasm-stargate

---
 packages/ts-codegen/package.json              |   2 +-
 .../wasm-ast-types/src/context/imports.ts     |   2 +-
 yarn.lock                                     | 579 +++++-------------
 3 files changed, 166 insertions(+), 417 deletions(-)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 2f19d9b1..be57d7c9 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -52,12 +52,12 @@
     "@babel/cli": "7.18.10",
     "@babel/eslint-parser": "^7.18.9",
     "@babel/node": "^7.18.10",
+    "@cosmjs/cosmwasm-stargate": "0.30.1",
     "@types/jest": "^28.1.6",
     "ast-stringify": "0.1.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "28.1.3",
     "babel-watch": "^7.0.0",
-    "cosmwasm": "1.1.1",
     "cross-env": "^7.0.2",
     "eslint": "8.21.0",
     "eslint-config-prettier": "^8.5.0",
diff --git a/packages/wasm-ast-types/src/context/imports.ts b/packages/wasm-ast-types/src/context/imports.ts
index 8669b81a..cf10b276 100644
--- a/packages/wasm-ast-types/src/context/imports.ts
+++ b/packages/wasm-ast-types/src/context/imports.ts
@@ -41,7 +41,7 @@ const makeReactQuerySwitch = (varName) => {
 export const UTILS = {
   selectorFamily: 'recoil',
   MsgExecuteContract: 'cosmjs-types/cosmwasm/wasm/v1/tx',
-  MsgExecuteContractEncodeObject: 'cosmwasm',
+  MsgExecuteContractEncodeObject: '@cosmjs/cosmwasm-stargate',
   Coin: '@cosmjs/amino',
   toUtf8: '@cosmjs/encoding',
   StdFee: '@cosmjs/amino',
diff --git a/yarn.lock b/yarn.lock
index 5c41f663..a7fa340b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1753,189 +1753,144 @@
 
 "@confio/ics23@^0.6.8":
   version "0.6.8"
-  resolved "https://registry.npmjs.org/@confio/ics23/-/ics23-0.6.8.tgz"
+  resolved "https://registry.npmjs.org/@confio/ics23/-/ics23-0.6.8.tgz#2a6b4f1f2b7b20a35d9a0745bb5a446e72930b3d"
   integrity sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==
   dependencies:
     "@noble/hashes" "^1.0.0"
     protobufjs "^6.8.8"
 
-"@cosmjs/amino@0.28.7", "@cosmjs/amino@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/amino/-/amino-0.28.7.tgz"
-  integrity sha512-NTCUS3+u9bxwW8moC0N1RS4Gk/fs3JPHTKcp7ksH39V4+7uOKM2rGsyFAekiHNxYngnQ+1hU5x2tddS25soK6Q==
-  dependencies:
-    "@cosmjs/crypto" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
-
-"@cosmjs/cli@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/cli/-/cli-0.28.7.tgz"
-  integrity sha512-Cmdp9Ln23A2jem7G+Qun28+lWr40WCVVM7NT7qgtrjLPc1RdEvTN8zdGvIyeROsTNS5Qjr5Mb7bx5AJUyC/Bqw==
-  dependencies:
-    "@cosmjs/amino" "0.28.7"
-    "@cosmjs/cosmwasm-stargate" "0.28.7"
-    "@cosmjs/crypto" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/faucet-client" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/proto-signing" "0.28.7"
-    "@cosmjs/stargate" "0.28.7"
-    "@cosmjs/tendermint-rpc" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
-    axios "^0.21.2"
-    babylon "^6.18.0"
-    chalk "^4"
-    cosmjs-types "^0.4.0"
-    diff "^4"
-    recast "^0.20"
-    ts-node "^8"
-    typescript "~4.4"
-    yargs "^15.3.1"
-
-"@cosmjs/cosmwasm-stargate@0.28.7", "@cosmjs/cosmwasm-stargate@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.28.7.tgz"
-  integrity sha512-pUIHu8ssLFnUqQJlva3AWuXgIiqfCrpmyIe+B61x8GMz/MxDsoiojQHsNQFh4vV518DgIx3bJu6hXF6YPwA+Kg==
-  dependencies:
-    "@cosmjs/amino" "0.28.7"
-    "@cosmjs/crypto" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/proto-signing" "0.28.7"
-    "@cosmjs/stargate" "0.28.7"
-    "@cosmjs/tendermint-rpc" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
-    cosmjs-types "^0.4.0"
+"@cosmjs/amino@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/amino/-/amino-0.30.1.tgz#7c18c14627361ba6c88e3495700ceea1f76baace"
+  integrity sha512-yNHnzmvAlkETDYIpeCTdVqgvrdt1qgkOXwuRVi8s27UKI5hfqyE9fJ/fuunXE6ZZPnKkjIecDznmuUOMrMvw4w==
+  dependencies:
+    "@cosmjs/crypto" "^0.30.1"
+    "@cosmjs/encoding" "^0.30.1"
+    "@cosmjs/math" "^0.30.1"
+    "@cosmjs/utils" "^0.30.1"
+
+"@cosmjs/cosmwasm-stargate@0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.30.1.tgz#6f9ca310f75433a3e30d683bc6aa24eadb345d79"
+  integrity sha512-W/6SLUCJAJGBN+sJLXouLZikVgmqDd9LCdlMzQaxczcCHTWeJAmRvOiZGSZaSy3shw/JN1qc6g6PKpvTVgj10A==
+  dependencies:
+    "@cosmjs/amino" "^0.30.1"
+    "@cosmjs/crypto" "^0.30.1"
+    "@cosmjs/encoding" "^0.30.1"
+    "@cosmjs/math" "^0.30.1"
+    "@cosmjs/proto-signing" "^0.30.1"
+    "@cosmjs/stargate" "^0.30.1"
+    "@cosmjs/tendermint-rpc" "^0.30.1"
+    "@cosmjs/utils" "^0.30.1"
+    cosmjs-types "^0.7.1"
     long "^4.0.0"
     pako "^2.0.2"
 
-"@cosmjs/crypto@0.28.7", "@cosmjs/crypto@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/crypto/-/crypto-0.28.7.tgz"
-  integrity sha512-Fuq90nnqXQb6VvUadGtPy1X6arXY+yhqB95VzN8GM/ZdBLeigu6a3XjOvFki4lKO94QdLn2e9huD8dm4tDQDsA==
+"@cosmjs/crypto@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/crypto/-/crypto-0.30.1.tgz#21e94d5ca8f8ded16eee1389d2639cb5c43c3eb5"
+  integrity sha512-rAljUlake3MSXs9xAm87mu34GfBLN0h/1uPPV6jEwClWjNkAMotzjC0ab9MARy5FFAvYHL3lWb57bhkbt2GtzQ==
   dependencies:
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
+    "@cosmjs/encoding" "^0.30.1"
+    "@cosmjs/math" "^0.30.1"
+    "@cosmjs/utils" "^0.30.1"
     "@noble/hashes" "^1"
     bn.js "^5.2.0"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
     libsodium-wrappers "^0.7.6"
 
-"@cosmjs/encoding@0.28.7", "@cosmjs/encoding@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/encoding/-/encoding-0.28.7.tgz"
-  integrity sha512-m2OuRhxux0YacvtjTocEOHyjnKO/KKGjqXlAY5HXGJpyntr+PIlJFdoS9tHax+1rNRrblZXwYIT+UqOs+kSk5Q==
+"@cosmjs/encoding@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058"
+  integrity sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ==
   dependencies:
     base64-js "^1.3.0"
     bech32 "^1.1.4"
     readonly-date "^1.0.0"
 
-"@cosmjs/faucet-client@0.28.7", "@cosmjs/faucet-client@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/faucet-client/-/faucet-client-0.28.7.tgz"
-  integrity sha512-cIzADy9CbA5xsuEKwYqsw20H6DPOneXa9kTBFofjN/ivDBHw/rV3/DOjrUGuvNMLD+FSJgaHrctw4/nRcxtLQA==
+"@cosmjs/json-rpc@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.30.1.tgz#16f21305fc167598c8a23a45549b85106b2372bc"
+  integrity sha512-pitfC/2YN9t+kXZCbNuyrZ6M8abnCC2n62m+JtU9vQUfaEtVsgy+1Fk4TRQ175+pIWSdBMFi2wT8FWVEE4RhxQ==
   dependencies:
-    axios "^0.21.2"
-
-"@cosmjs/json-rpc@0.28.7":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.28.7.tgz"
-  integrity sha512-2qgRL/9ih/ZYU/8LmtDQopaCKJBKqsuoSXfb2XO3yv6EkE28yiA8YAwLW5IrXjl1tfSiolHaBWarEASS/8Q5xA==
-  dependencies:
-    "@cosmjs/stream" "0.28.7"
+    "@cosmjs/stream" "^0.30.1"
     xstream "^11.14.0"
 
-"@cosmjs/ledger-amino@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/ledger-amino/-/ledger-amino-0.28.7.tgz"
-  integrity sha512-3Ke5j+BEYs+OwL7vY8zGiglvJs5A9dhmicx7Ln7rMdpprKBROgXsvhvk0GuoYq97QngsI8DlJph4kxdHvVkHbg==
-  dependencies:
-    "@cosmjs/amino" "0.28.7"
-    "@cosmjs/crypto" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
-    ledger-cosmos-js "^2.1.8"
-    semver "^7.3.2"
-
-"@cosmjs/math@0.28.7", "@cosmjs/math@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/math/-/math-0.28.7.tgz"
-  integrity sha512-wSXIOOGVzgtRFsGwScpvQ6C6DUx97K7Ez3KyvRALNzspEnIoKPDgTXf438zhZnb+0+ERAwgdkb/6zWaDoVBfUA==
+"@cosmjs/math@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/math/-/math-0.30.1.tgz#8b816ef4de5d3afa66cb9fdfb5df2357a7845b8a"
+  integrity sha512-yaoeI23pin9ZiPHIisa6qqLngfnBR/25tSaWpkTm8Cy10MX70UF5oN4+/t1heLaM6SSmRrhk3psRkV4+7mH51Q==
   dependencies:
     bn.js "^5.2.0"
 
-"@cosmjs/proto-signing@0.28.7", "@cosmjs/proto-signing@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/proto-signing/-/proto-signing-0.28.7.tgz"
-  integrity sha512-cOwDQVv95KnpHWlkrtxZ+2Q+z2Qp8Co//g+bwNc+YZ403iGHXSK5PRe3YsPa4f3elKJkJpHVi5oyzp4DB8p7mA==
-  dependencies:
-    "@cosmjs/amino" "0.28.7"
-    "@cosmjs/crypto" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
-    cosmjs-types "^0.4.0"
+"@cosmjs/proto-signing@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/proto-signing/-/proto-signing-0.30.1.tgz#f0dda372488df9cd2677150b89b3e9c72b3cb713"
+  integrity sha512-tXh8pPYXV4aiJVhTKHGyeZekjj+K9s2KKojMB93Gcob2DxUjfKapFYBMJSgfKPuWUPEmyr8Q9km2hplI38ILgQ==
+  dependencies:
+    "@cosmjs/amino" "^0.30.1"
+    "@cosmjs/crypto" "^0.30.1"
+    "@cosmjs/encoding" "^0.30.1"
+    "@cosmjs/math" "^0.30.1"
+    "@cosmjs/utils" "^0.30.1"
+    cosmjs-types "^0.7.1"
     long "^4.0.0"
 
-"@cosmjs/socket@0.28.7":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.28.7.tgz"
-  integrity sha512-+sCR5AzjjsKlA0K7m8YdxldMvgJa3Tqnx0AAyQXlNw2VXmW1zu9DkKZWW475XFhwO9UYfrdIsOe1vbhnUjQb5g==
+"@cosmjs/socket@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.30.1.tgz#00b22f4b5e2ab01f4d82ccdb7b2e59536bfe5ce0"
+  integrity sha512-r6MpDL+9N+qOS/D5VaxnPaMJ3flwQ36G+vPvYJsXArj93BjgyFB7BwWwXCQDzZ+23cfChPUfhbINOenr8N2Kow==
   dependencies:
-    "@cosmjs/stream" "0.28.7"
+    "@cosmjs/stream" "^0.30.1"
     isomorphic-ws "^4.0.1"
     ws "^7"
     xstream "^11.14.0"
 
-"@cosmjs/stargate@0.28.7", "@cosmjs/stargate@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/stargate/-/stargate-0.28.7.tgz"
-  integrity sha512-3nY7czFUaY74gacbQAZuNji1qJWWQjv2C1cxYNqe7qAZAvCiz6A9adJVUmCJRL4peeG7tKiOny1J5IFbsgRu0g==
+"@cosmjs/stargate@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/stargate/-/stargate-0.30.1.tgz#e1b22e1226cffc6e93914a410755f1f61057ba04"
+  integrity sha512-RdbYKZCGOH8gWebO7r6WvNnQMxHrNXInY/gPHPzMjbQF6UatA6fNM2G2tdgS5j5u7FTqlCI10stNXrknaNdzog==
   dependencies:
     "@confio/ics23" "^0.6.8"
-    "@cosmjs/amino" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/proto-signing" "0.28.7"
-    "@cosmjs/stream" "0.28.7"
-    "@cosmjs/tendermint-rpc" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
-    cosmjs-types "^0.4.0"
+    "@cosmjs/amino" "^0.30.1"
+    "@cosmjs/encoding" "^0.30.1"
+    "@cosmjs/math" "^0.30.1"
+    "@cosmjs/proto-signing" "^0.30.1"
+    "@cosmjs/stream" "^0.30.1"
+    "@cosmjs/tendermint-rpc" "^0.30.1"
+    "@cosmjs/utils" "^0.30.1"
+    cosmjs-types "^0.7.1"
     long "^4.0.0"
     protobufjs "~6.11.3"
     xstream "^11.14.0"
 
-"@cosmjs/stream@0.28.7":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.28.7.tgz"
-  integrity sha512-zTMZadlpmxAMtKUHX/dnYs1STung392+P50WgSUAjllG7CZYl7SAY03AKgc+aoF1ohYQcgH9H7VSgabEgLPhmg==
+"@cosmjs/stream@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.30.1.tgz#ba038a2aaf41343696b1e6e759d8e03a9516ec1a"
+  integrity sha512-Fg0pWz1zXQdoxQZpdHRMGvUH5RqS6tPv+j9Eh7Q953UjMlrwZVo0YFLC8OTf/HKVf10E4i0u6aM8D69Q6cNkgQ==
   dependencies:
     xstream "^11.14.0"
 
-"@cosmjs/tendermint-rpc@0.28.7":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.7.tgz"
-  integrity sha512-xhIVJL3ol+fZxywP76Ik9pHqCvBdU/BGAw6p48mhla3L3xNcFN2Nf+EnJWcIZPqZl8bHm5QHzPk9VqVFVYCMCw==
-  dependencies:
-    "@cosmjs/crypto" "0.28.7"
-    "@cosmjs/encoding" "0.28.7"
-    "@cosmjs/json-rpc" "0.28.7"
-    "@cosmjs/math" "0.28.7"
-    "@cosmjs/socket" "0.28.7"
-    "@cosmjs/stream" "0.28.7"
-    "@cosmjs/utils" "0.28.7"
+"@cosmjs/tendermint-rpc@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.30.1.tgz#c16378892ba1ac63f72803fdf7567eab9d4f0aa0"
+  integrity sha512-Z3nCwhXSbPZJ++v85zHObeUggrEHVfm1u18ZRwXxFE9ZMl5mXTybnwYhczuYOl7KRskgwlB+rID0WYACxj4wdQ==
+  dependencies:
+    "@cosmjs/crypto" "^0.30.1"
+    "@cosmjs/encoding" "^0.30.1"
+    "@cosmjs/json-rpc" "^0.30.1"
+    "@cosmjs/math" "^0.30.1"
+    "@cosmjs/socket" "^0.30.1"
+    "@cosmjs/stream" "^0.30.1"
+    "@cosmjs/utils" "^0.30.1"
     axios "^0.21.2"
     readonly-date "^1.0.0"
     xstream "^11.14.0"
 
-"@cosmjs/utils@0.28.7", "@cosmjs/utils@^0.28.3":
-  version "0.28.7"
-  resolved "https://registry.npmjs.org/@cosmjs/utils/-/utils-0.28.7.tgz"
-  integrity sha512-0ya5mRaDY956n87dKjx6wfqgH/uEfrZyMswIhcEPqQPegwp4FDd6cwJtSdv/d5S7fgvoEs2UABvUFNzCT5C0hg==
+"@cosmjs/utils@^0.30.1":
+  version "0.30.1"
+  resolved "https://registry.npmjs.org/@cosmjs/utils/-/utils-0.30.1.tgz#6d92582341be3c2ec8d82090253cfa4b7f959edb"
+  integrity sha512-KvvX58MGMWh7xA+N+deCfunkA/ZNDvFLw4YbOmX3f/XBIkqrVY7qlotfy2aNb1kgp6h4B6Yc8YawJPDTfvWX7g==
 
 "@eslint/eslintrc@^1.3.0":
   version "1.3.0"
@@ -2254,35 +2209,6 @@
   resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@ledgerhq/devices@^5.51.1":
-  version "5.51.1"
-  resolved "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz"
-  integrity sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA==
-  dependencies:
-    "@ledgerhq/errors" "^5.50.0"
-    "@ledgerhq/logs" "^5.50.0"
-    rxjs "6"
-    semver "^7.3.5"
-
-"@ledgerhq/errors@^5.50.0":
-  version "5.50.0"
-  resolved "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz"
-  integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow==
-
-"@ledgerhq/hw-transport@^5.25.0":
-  version "5.51.1"
-  resolved "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz"
-  integrity sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==
-  dependencies:
-    "@ledgerhq/devices" "^5.51.1"
-    "@ledgerhq/errors" "^5.50.0"
-    events "^3.3.0"
-
-"@ledgerhq/logs@^5.50.0":
-  version "5.50.0"
-  resolved "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz"
-  integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==
-
 "@lerna/add@4.0.0":
   version "4.0.0"
   resolved "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz"
@@ -2960,9 +2886,9 @@
   integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
 
 "@noble/hashes@^1", "@noble/hashes@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.1.tgz"
-  integrity sha512-Lkp9+NijmV7eSVZqiUvt3UCuuHeJpUVmRrvh430gyJjJiuJMqkeHf6/A9lQ/smmbWV/0spDeJscscPzyB4waZg==
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz#085fd70f6d7d9d109671090ccae1d3bec62554a1"
+  integrity sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -3158,27 +3084,27 @@
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
   integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
 
 "@protobufjs/base64@^1.1.2":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
   integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
 
 "@protobufjs/codegen@^2.0.4":
   version "2.0.4"
-  resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
   integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
 
 "@protobufjs/eventemitter@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
   integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
 
 "@protobufjs/fetch@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
   integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
   dependencies:
     "@protobufjs/aspromise" "^1.1.1"
@@ -3186,27 +3112,27 @@
 
 "@protobufjs/float@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
   integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
 
 "@protobufjs/inquire@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
   integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
 
 "@protobufjs/path@^1.1.2":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
   integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
 
 "@protobufjs/pool@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
   integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
 
 "@protobufjs/utf8@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
 "@pyramation/babel-preset-env@0.1.0":
@@ -3368,7 +3294,7 @@
 
 "@types/long@^4.0.1":
   version "4.0.2"
-  resolved "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"
+  resolved "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
@@ -3387,9 +3313,9 @@
   integrity sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==
 
 "@types/node@>=13.7.0":
-  version "18.0.0"
-  resolved "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz"
-  integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
+  version "20.2.1"
+  resolved "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz#de559d4b33be9a808fd43372ccee822c70f39704"
+  integrity sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -3577,11 +3503,6 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -3654,13 +3575,6 @@ ast-stringify@0.1.0:
   dependencies:
     "@babel/runtime" "^7.11.2"
 
-ast-types@0.14.2:
-  version "0.14.2"
-  resolved "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz"
-  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
-  dependencies:
-    tslib "^2.0.1"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
@@ -3683,7 +3597,7 @@ aws4@^1.8.0:
 
 axios@^0.21.2:
   version "0.21.4"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
@@ -3808,11 +3722,6 @@ babel-watch@^7.0.0:
     source-map-support "^0.5.19"
     string-argv "^0.3.1"
 
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -3820,7 +3729,7 @@ balanced-match@^1.0.0:
 
 base64-js@^1.3.0:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 bcrypt-pbkdf@^1.0.0:
@@ -3832,7 +3741,7 @@ bcrypt-pbkdf@^1.0.0:
 
 bech32@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz"
+  resolved "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
 before-after-hook@^2.2.0:
@@ -3847,12 +3756,12 @@ binary-extensions@^2.0.0:
 
 bn.js@^4.11.9:
   version "4.12.0"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
+  resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.2.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz"
+  resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
 brace-expansion@^1.1.7:
@@ -3879,7 +3788,7 @@ braces@^3.0.2, braces@~3.0.2:
 
 brorand@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
 browserslist@^4.11.1, browserslist@^4.20.4:
@@ -3988,7 +3897,7 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -4033,7 +3942,7 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4, chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4136,15 +4045,6 @@ cli-width@^3.0.0:
   resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -4419,31 +4319,14 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmjs-types@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/cosmjs-types/-/cosmjs-types-0.4.1.tgz"
-  integrity sha512-I7E/cHkIgoJzMNQdFF0YVqPlaTqrqKHrskuSTIqlEyxfB5Lf3WKCajSXVK2yHOfOFfSux/RxEdpMzw/eO4DIog==
+cosmjs-types@^0.7.1:
+  version "0.7.2"
+  resolved "https://registry.npmjs.org/cosmjs-types/-/cosmjs-types-0.7.2.tgz#a757371abd340949c5bd5d49c6f8379ae1ffd7e2"
+  integrity sha512-vf2uLyktjr/XVAgEq0DjMxeAWh1yYREe7AMHDKd7EiHVqxBPCaBS+qEEQUkXbR9ndnckqr1sUG8BQhazh4X5lA==
   dependencies:
     long "^4.0.0"
     protobufjs "~6.11.2"
 
-cosmwasm@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/cosmwasm/-/cosmwasm-1.1.1.tgz"
-  integrity sha512-tjpjwnRIQ6VEcTVB0Pq8+F+Xp6jdnC3BcXmcDHCJHIc5Gg4Mm++AA+6fTfR0yuiPbEAk6wYkokfLtv12I0sPNQ==
-  dependencies:
-    "@cosmjs/amino" "^0.28.3"
-    "@cosmjs/cli" "^0.28.3"
-    "@cosmjs/cosmwasm-stargate" "^0.28.3"
-    "@cosmjs/crypto" "^0.28.3"
-    "@cosmjs/encoding" "^0.28.3"
-    "@cosmjs/faucet-client" "^0.28.3"
-    "@cosmjs/ledger-amino" "^0.28.3"
-    "@cosmjs/math" "^0.28.3"
-    "@cosmjs/proto-signing" "^0.28.3"
-    "@cosmjs/stargate" "^0.28.3"
-    "@cosmjs/utils" "^0.28.3"
-
 cross-env@^7.0.2:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
@@ -4505,7 +4388,7 @@ decamelize-keys@^1.1.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.2.0:
+decamelize@^1.1.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
@@ -4593,11 +4476,6 @@ diff-sequences@^28.1.1:
   resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
-diff@^4, diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -4654,9 +4532,9 @@ electron-to-chromium@^1.4.202:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.212.tgz#20cd48e88288fd2428138c108804edb1961bf559"
   integrity sha512-LjQUg1SpLj2GfyaPDVBUHdhmlDU1vDB4f0mJWSGkISoXQrn5/lH3ECPCuo2Bkvf6Y30wO+b69te+rZK/llZmjg==
 
-elliptic@^6.5.3:
+elliptic@^6.5.4:
   version "6.5.4"
-  resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"
+  resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
   integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
     bn.js "^4.11.9"
@@ -4913,7 +4791,7 @@ espree@^9.3.2, espree@^9.3.3:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-esprima@^4.0.0, esprima@~4.0.0:
+esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4960,11 +4838,6 @@ eventemitter3@^4.0.4:
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-events@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -5167,9 +5040,9 @@ flatted@^3.1.0:
   integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
 follow-redirects@^1.14.0:
-  version "1.15.1"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+  version "1.15.2"
+  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -5273,7 +5146,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -5439,7 +5312,7 @@ globals@^13.15.0:
 
 globalthis@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
     define-properties "^1.1.3"
@@ -5549,18 +5422,9 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
-  resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"
+  resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
@@ -5568,7 +5432,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 
 hmac-drbg@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
   dependencies:
     hash.js "^1.0.3"
@@ -5707,7 +5571,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6066,7 +5930,7 @@ isobject@^3.0.1:
 
 isomorphic-ws@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz"
+  resolved "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
   integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
 
 isstream@~0.1.2:
@@ -6615,16 +6479,6 @@ kleur@^3.0.3:
   resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-ledger-cosmos-js@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.npmjs.org/ledger-cosmos-js/-/ledger-cosmos-js-2.1.8.tgz"
-  integrity sha512-Gl7SWMq+3R9OTkF1hLlg5+1geGOmcHX9OdS+INDsGNxSiKRWlsWCvQipGoDnRIQ6CPo2i/Ze58Dw0Mt/l3UYyA==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-    "@ledgerhq/hw-transport" "^5.25.0"
-    bech32 "^1.1.4"
-    ripemd160 "^2.0.2"
-
 lerna@4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz"
@@ -6691,16 +6545,16 @@ libnpmpublish@^4.0.0:
     ssri "^8.0.1"
 
 libsodium-wrappers@^0.7.6:
-  version "0.7.10"
-  resolved "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz"
-  integrity sha512-pO3F1Q9NPLB/MWIhehim42b/Fwb30JNScCNh8TcQ/kIc+qGLQch8ag8wb0keK3EP5kbGakk1H8Wwo7v+36rNQg==
+  version "0.7.11"
+  resolved "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz#53bd20606dffcc54ea2122133c7da38218f575f7"
+  integrity sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==
   dependencies:
-    libsodium "^0.7.0"
+    libsodium "^0.7.11"
 
-libsodium@^0.7.0:
-  version "0.7.10"
-  resolved "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz"
-  integrity sha512-eY+z7hDrDKxkAK+QKZVNv92A5KYkxfvIshtBJkmg5TSiCnYqZP3i9OO9whE79Pwgm4jGaoHgkM4ao/b9Cyu4zQ==
+libsodium@^0.7.11:
+  version "0.7.11"
+  resolved "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz#cd10aae7bcc34a300cc6ad0ac88fcca674cfbc2e"
+  integrity sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
@@ -6814,7 +6668,7 @@ lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17
 
 long@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
 long@^5.2.0:
@@ -6858,7 +6712,7 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
-make-error@1.x, make-error@^1.1.1:
+make-error@1.x:
   version "1.3.6"
   resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -7001,12 +6855,12 @@ min-indent@^1.0.0:
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
 minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
@@ -7638,9 +7492,9 @@ pacote@^11.2.6:
     tar "^6.1.0"
 
 pako@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz"
-  integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
+  integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -7865,7 +7719,7 @@ proto-list@~1.2.1:
 
 protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
   version "6.11.3"
-  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"
+  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
   integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
@@ -8034,7 +7888,7 @@ read@1, read@~1.0.1:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.6.0:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -8075,19 +7929,9 @@ readdirp@~3.6.0:
 
 readonly-date@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz#5af785464d8c7d7c40b9d738cbde8c646f97dcd9"
   integrity sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ==
 
-recast@^0.20:
-  version "0.20.5"
-  resolved "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz"
-  integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==
-  dependencies:
-    ast-types "0.14.2"
-    esprima "~4.0.0"
-    source-map "~0.6.1"
-    tslib "^2.0.1"
-
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
@@ -8208,11 +8052,6 @@ require-directory@^2.1.1:
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -8293,14 +8132,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-ripemd160@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
 run-async@^2.2.0, run-async@^2.3.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
@@ -8325,14 +8156,14 @@ rx-lite@*, rx-lite@^4.0.8:
   resolved "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"
   integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==
 
-rxjs@6, rxjs@^6.4.0, rxjs@^6.6.0:
+rxjs@^6.4.0, rxjs@^6.6.0:
   version "6.6.7"
   resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8369,7 +8200,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -8489,7 +8320,7 @@ source-map-support@0.5.13:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19:
+source-map-support@^0.5.16, source-map-support@^0.5.19:
   version "0.5.21"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -8502,7 +8333,7 @@ source-map@^0.5.0:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -8767,7 +8598,7 @@ supports-preserve-symlinks-flag@^1.0.0:
 
 symbol-observable@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz"
+  resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
 tar@^4.4.12:
@@ -8943,27 +8774,11 @@ ts-jest@^28.0.7:
     semver "7.x"
     yargs-parser "^21.0.1"
 
-ts-node@^8:
-  version "8.10.2"
-  resolved "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz"
-  integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
-  dependencies:
-    arg "^4.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    source-map-support "^0.5.17"
-    yn "3.1.1"
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
@@ -9045,11 +8860,6 @@ typescript@^4.7.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"
   integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
-typescript@~4.4:
-  version "4.4.4"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"
-  integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
-
 uglify-js@^3.1.4:
   version "3.16.1"
   resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.1.tgz"
@@ -9218,18 +9028,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-"wasm-ast-types@path:../wasm-ast-types":
-  version "0.17.0"
-  resolved "https://registry.npmjs.org/wasm-ast-types/-/wasm-ast-types-0.17.0.tgz#417280a61d60ea9964667cf2edb8f5281dc295d7"
-  integrity sha512-WeriXPbG67iI51Mf/5qRR0xcpEaTO/Wyjpl+vsmjZ5K6q/0W6iO03zHsESNIH/hpc5FPTpb0Y0L9xAtnnNe9Ow==
-  dependencies:
-    "@babel/runtime" "^7.18.9"
-    "@babel/types" "7.18.10"
-    "@jest/transform" "28.1.3"
-    ast-stringify "0.1.0"
-    case "1.6.3"
-    deepmerge "4.2.2"
-
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"
@@ -9275,11 +9073,6 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"
-  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
-
 which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
@@ -9311,15 +9104,6 @@ wordwrap@^1.0.0:
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -9395,13 +9179,13 @@ write-pkg@^4.0.0:
     write-json-file "^3.2.0"
 
 ws@^7:
-  version "7.5.8"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz"
-  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
+  version "7.5.9"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 xstream@^11.14.0:
   version "11.14.0"
-  resolved "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz"
+  resolved "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz#2c071d26b18310523b6877e86b4e54df068a9ae5"
   integrity sha512-1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==
   dependencies:
     globalthis "^1.0.1"
@@ -9412,11 +9196,6 @@ xtend@~4.0.1:
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -9442,14 +9221,6 @@ yargs-parser@20.2.4:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
@@ -9465,23 +9236,6 @@ yargs-parser@^21.0.1:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"
   integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
 
-yargs@^15.3.1:
-  version "15.4.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
 yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
@@ -9508,11 +9262,6 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From 062b01d94a1951ee70fe617e5176efffa2d40489 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 14:30:17 +0300
Subject: [PATCH 109/287] Udpate message composer to use underscored funds
 parameter

---
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../CwCodeIdRegistry.message-composer.ts      |  30 +-
 .../contracts/CwSingle.message-composer.ts    |  54 +-
 .../contracts/Factory.message-composer.ts     |  42 +-
 .../contracts/Minter.message-composer.ts      |  42 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../CwCodeIdRegistry.message-composer.ts      |  30 +-
 .../default/CwSingle.message-composer.ts      |  54 +-
 .../default/Factory.message-composer.ts       |  42 +-
 .../default/Minter.message-composer.ts        |  42 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../CwCodeIdRegistry.message-composer.ts      |  30 +-
 .../no-extends/CwSingle.message-composer.ts   |  54 +-
 .../no-extends/Factory.message-composer.ts    |  42 +-
 .../no-extends/Minter.message-composer.ts     |  42 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../CwCodeIdRegistry.message-composer.ts      |  30 +-
 .../CwNamedGroups.message-composer.ts         |  18 +-
 .../CwProposalSingle.message-composer.ts      |  54 +-
 .../AccountsNft.message-composer.ts           |  60 +--
 .../Cw3FixedMultiSig.message-composer.ts      |  24 +-
 .../cw4-group/Cw4Group.message-composer.ts    |  24 +-
 .../cyberpunk/CyberPunk.message-composer.ts   |  12 +-
 .../hackatom/HackAtom.message-composer.ts     |  48 +-
 __output__/minter/Minter.message-composer.ts  |  42 +-
 __output__/sg721/Sg721.message-composer.ts    |  48 +-
 .../factory/Factory.message-composer.ts       |  42 +-
 .../vectis/govec/Govec.message-composer.ts    |  48 +-
 .../vectis/proxy/Proxy.message-composer.ts    |  48 +-
 .../message-composer.spec.ts.snap             |  60 +--
 .../src/message-composer/message-composer.ts  | 482 ++++++++----------
 yarn.lock                                     |  12 -
 32 files changed, 762 insertions(+), 818 deletions(-)

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index 6ff9c5fb..5b6dd320 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
   sender: string;
@@ -40,7 +40,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index 2590da00..97e190f6 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMessage {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMessage {
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMessage {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
   sender: string;
@@ -80,7 +80,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -109,7 +109,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -159,7 +159,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -181,7 +181,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index 0a8436fc..48004019 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwSingleMessageComposer implements CwSingleMessage {
   sender: string;
@@ -101,7 +101,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             title
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             vote
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -144,7 +144,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -155,7 +155,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -163,7 +163,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -174,7 +174,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -194,7 +194,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -211,7 +211,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             threshold
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -219,7 +219,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -230,7 +230,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -238,7 +238,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -249,7 +249,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -257,7 +257,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -268,7 +268,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -276,7 +276,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -287,7 +287,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index 21e5a2d1..5eaf412b 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMessageComposer implements FactoryMessage {
   sender: string;
@@ -73,7 +73,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -116,7 +116,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -138,7 +138,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -158,7 +158,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -177,7 +177,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -196,7 +196,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 30a74b8b..8c951ac0 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMessage {
   contractAddress: string;
   sender: string;
-  mint: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMessageComposer implements MinterMessage {
   sender: string;
@@ -53,7 +53,7 @@ export class MinterMessageComposer implements MinterMessage {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -70,7 +70,7 @@ export class MinterMessageComposer implements MinterMessage {
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -81,11 +81,11 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  updateStartTime = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -102,7 +102,7 @@ export class MinterMessageComposer implements MinterMessage {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -121,7 +121,7 @@ export class MinterMessageComposer implements MinterMessage {
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -142,7 +142,7 @@ export class MinterMessageComposer implements MinterMessage {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -154,11 +154,11 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  withdraw = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index 6ff9c5fb..5b6dd320 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
   sender: string;
@@ -40,7 +40,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index 2590da00..97e190f6 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMessage {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMessage {
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMessage {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
   sender: string;
@@ -80,7 +80,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -109,7 +109,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -159,7 +159,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -181,7 +181,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index 0a8436fc..48004019 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwSingleMessageComposer implements CwSingleMessage {
   sender: string;
@@ -101,7 +101,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             title
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             vote
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -144,7 +144,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -155,7 +155,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -163,7 +163,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -174,7 +174,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -194,7 +194,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -211,7 +211,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             threshold
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -219,7 +219,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -230,7 +230,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -238,7 +238,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -249,7 +249,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -257,7 +257,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -268,7 +268,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -276,7 +276,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -287,7 +287,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index 21e5a2d1..5eaf412b 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMessageComposer implements FactoryMessage {
   sender: string;
@@ -73,7 +73,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -116,7 +116,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -138,7 +138,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -158,7 +158,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -177,7 +177,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -196,7 +196,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 30a74b8b..8c951ac0 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMessage {
   contractAddress: string;
   sender: string;
-  mint: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMessageComposer implements MinterMessage {
   sender: string;
@@ -53,7 +53,7 @@ export class MinterMessageComposer implements MinterMessage {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -70,7 +70,7 @@ export class MinterMessageComposer implements MinterMessage {
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -81,11 +81,11 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  updateStartTime = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -102,7 +102,7 @@ export class MinterMessageComposer implements MinterMessage {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -121,7 +121,7 @@ export class MinterMessageComposer implements MinterMessage {
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -142,7 +142,7 @@ export class MinterMessageComposer implements MinterMessage {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -154,11 +154,11 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  withdraw = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index 6ff9c5fb..5b6dd320 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
   sender: string;
@@ -40,7 +40,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index 2590da00..97e190f6 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMessage {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMessage {
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMessage {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
   sender: string;
@@ -80,7 +80,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -109,7 +109,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -159,7 +159,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -181,7 +181,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index 0a8436fc..48004019 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwSingleMessageComposer implements CwSingleMessage {
   sender: string;
@@ -101,7 +101,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             title
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             vote
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -144,7 +144,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -155,7 +155,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -163,7 +163,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -174,7 +174,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -194,7 +194,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -211,7 +211,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             threshold
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -219,7 +219,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -230,7 +230,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -238,7 +238,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -249,7 +249,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -257,7 +257,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -268,7 +268,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -276,7 +276,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -287,7 +287,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index 21e5a2d1..5eaf412b 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMessageComposer implements FactoryMessage {
   sender: string;
@@ -73,7 +73,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -116,7 +116,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -138,7 +138,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -158,7 +158,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -177,7 +177,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -196,7 +196,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 30a74b8b..8c951ac0 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMessage {
   contractAddress: string;
   sender: string;
-  mint: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMessageComposer implements MinterMessage {
   sender: string;
@@ -53,7 +53,7 @@ export class MinterMessageComposer implements MinterMessage {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -70,7 +70,7 @@ export class MinterMessageComposer implements MinterMessage {
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -81,11 +81,11 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  updateStartTime = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -102,7 +102,7 @@ export class MinterMessageComposer implements MinterMessage {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -121,7 +121,7 @@ export class MinterMessageComposer implements MinterMessage {
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -142,7 +142,7 @@ export class MinterMessageComposer implements MinterMessage {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -154,11 +154,11 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  withdraw = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index 6ff9c5fb..5b6dd320 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
   sender: string;
@@ -40,7 +40,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index 2590da00..97e190f6 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMessage {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMessage {
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMessage {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
   sender: string;
@@ -80,7 +80,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -109,7 +109,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     codeId: number;
     name: string;
     version: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     chainId: string;
     name: string;
     owner?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -159,7 +159,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     chainId: string;
     codeId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -181,7 +181,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index f49ec3cf..1c15918a 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -20,17 +20,17 @@ export interface CwNamedGroupsMessage {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
   sender: string;
@@ -52,7 +52,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -65,7 +65,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
             group
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -73,7 +73,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
     group
   }: {
     group: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
             group
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -92,7 +92,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
     owner
   }: {
     owner: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -103,7 +103,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
             owner
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index ac90dfbe..c07212cd 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwProposalSingleMessage {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwProposalSingleMessage {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwProposalSingleMessageComposer implements CwProposalSingleMessage {
   sender: string;
@@ -101,7 +101,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             title
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             vote
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -144,7 +144,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -155,7 +155,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -163,7 +163,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -174,7 +174,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -194,7 +194,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -211,7 +211,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             threshold
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -219,7 +219,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -230,7 +230,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -238,7 +238,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -249,7 +249,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -257,7 +257,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -268,7 +268,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -276,7 +276,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     address
   }: {
     address: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -287,7 +287,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index f0397c4a..a34e8c51 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -16,20 +16,20 @@ export interface AccountsNftMessage {
     newOwner
   }: {
     newOwner: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  acceptOwnership: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  acceptOwnership: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     user
   }: {
     user: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -38,7 +38,7 @@ export interface AccountsNftMessage {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -47,31 +47,31 @@ export interface AccountsNftMessage {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class AccountsNftMessageComposer implements AccountsNftMessage {
   sender: string;
@@ -96,7 +96,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     newOwner
   }: {
     newOwner: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -107,11 +107,11 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             new_owner: newOwner
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  acceptOwnership = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  acceptOwnership = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -120,7 +120,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
         msg: toUtf8(JSON.stringify({
           accept_ownership: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -128,7 +128,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     user
   }: {
     user: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -139,7 +139,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             user
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -149,7 +149,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -161,7 +161,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -173,7 +173,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -186,7 +186,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -198,7 +198,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -211,7 +211,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -221,7 +221,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
   }: {
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -233,7 +233,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -243,7 +243,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -255,7 +255,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             operator
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -263,7 +263,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     operator
   }: {
     operator: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -274,7 +274,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             operator
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -282,7 +282,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     tokenId
   }: {
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -293,7 +293,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index a191ec12..4df5e0e6 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -21,24 +21,24 @@ export interface Cw3FixedMultiSigMessage {
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage {
   sender: string;
@@ -63,7 +63,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -77,7 +77,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             title
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -87,7 +87,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -99,7 +99,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             vote
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -107,7 +107,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -118,7 +118,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -126,7 +126,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
     proposalId
   }: {
     proposalId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -137,7 +137,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             proposal_id: proposalId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index e516b7ca..02af046e 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -16,24 +16,24 @@ export interface Cw4GroupMessage {
     admin
   }: {
     admin?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateMembers: ({
     add,
     remove
   }: {
     add: Member[];
     remove: string[];
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addHook: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeHook: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Cw4GroupMessageComposer implements Cw4GroupMessage {
   sender: string;
@@ -52,7 +52,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
     admin
   }: {
     admin?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -63,7 +63,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             admin
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -73,7 +73,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
   }: {
     add: Member[];
     remove: string[];
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -85,7 +85,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             remove
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -93,7 +93,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -104,7 +104,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -112,7 +112,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -123,7 +123,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index 22f9edde..132e7a67 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -18,8 +18,8 @@ export interface CyberPunkMessage {
   }: {
     memCost: number;
     timeCost: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  mirrorEnv: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mirrorEnv: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CyberPunkMessageComposer implements CyberPunkMessage {
   sender: string;
@@ -38,7 +38,7 @@ export class CyberPunkMessageComposer implements CyberPunkMessage {
   }: {
     memCost: number;
     timeCost: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -50,11 +50,11 @@ export class CyberPunkMessageComposer implements CyberPunkMessage {
             time_cost: timeCost
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  mirrorEnv = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mirrorEnv = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -63,7 +63,7 @@ export class CyberPunkMessageComposer implements CyberPunkMessage {
         msg: toUtf8(JSON.stringify({
           mirror_env: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index 6fade775..26ac2d28 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -11,18 +11,18 @@ import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coi
 export interface HackAtomMessage {
   contractAddress: string;
   sender: string;
-  release: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  cpuLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  storageLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  memoryLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  messageLoop: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  release: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  cpuLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  storageLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  memoryLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  messageLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   allocateLargeMemory: ({
     pages
   }: {
     pages: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  panic: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  userErrorsInApiCalls: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  panic: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  userErrorsInApiCalls: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class HackAtomMessageComposer implements HackAtomMessage {
   sender: string;
@@ -41,7 +41,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
 
-  release = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  release = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -50,11 +50,11 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           release: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  cpuLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  cpuLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -63,11 +63,11 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           cpu_loop: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  storageLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  storageLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -76,11 +76,11 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           storage_loop: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  memoryLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  memoryLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -89,11 +89,11 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           memory_loop: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  messageLoop = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  messageLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -102,7 +102,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           message_loop: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -110,7 +110,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
     pages
   }: {
     pages: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -121,11 +121,11 @@ export class HackAtomMessageComposer implements HackAtomMessage {
             pages
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  panic = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  panic = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,11 +134,11 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           panic: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  userErrorsInApiCalls = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  userErrorsInApiCalls = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,7 +147,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           user_errors_in_api_calls: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 30a74b8b..8c951ac0 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMessage {
   contractAddress: string;
   sender: string;
-  mint: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMessageComposer implements MinterMessage {
   sender: string;
@@ -53,7 +53,7 @@ export class MinterMessageComposer implements MinterMessage {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -70,7 +70,7 @@ export class MinterMessageComposer implements MinterMessage {
     whitelist
   }: {
     whitelist: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -81,11 +81,11 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  updateStartTime = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -102,7 +102,7 @@ export class MinterMessageComposer implements MinterMessage {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -121,7 +121,7 @@ export class MinterMessageComposer implements MinterMessage {
     recipient
   }: {
     recipient: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -142,7 +142,7 @@ export class MinterMessageComposer implements MinterMessage {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -154,11 +154,11 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  withdraw = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index 9d9017d9..ab6d060a 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -18,7 +18,7 @@ export interface Sg721Message {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -27,7 +27,7 @@ export interface Sg721Message {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -36,26 +36,26 @@ export interface Sg721Message {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     extension,
     owner,
@@ -66,12 +66,12 @@ export interface Sg721Message {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Sg721MessageComposer implements Sg721Message {
   sender: string;
@@ -96,7 +96,7 @@ export class Sg721MessageComposer implements Sg721Message {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -108,7 +108,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -120,7 +120,7 @@ export class Sg721MessageComposer implements Sg721Message {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -133,7 +133,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -145,7 +145,7 @@ export class Sg721MessageComposer implements Sg721Message {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -158,7 +158,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -168,7 +168,7 @@ export class Sg721MessageComposer implements Sg721Message {
   }: {
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -180,7 +180,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -190,7 +190,7 @@ export class Sg721MessageComposer implements Sg721Message {
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -202,7 +202,7 @@ export class Sg721MessageComposer implements Sg721Message {
             operator
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -210,7 +210,7 @@ export class Sg721MessageComposer implements Sg721Message {
     operator
   }: {
     operator: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -221,7 +221,7 @@ export class Sg721MessageComposer implements Sg721Message {
             operator
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -235,7 +235,7 @@ export class Sg721MessageComposer implements Sg721Message {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -249,7 +249,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_uri: tokenUri
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -257,7 +257,7 @@ export class Sg721MessageComposer implements Sg721Message {
     tokenId
   }: {
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -268,7 +268,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index 21e5a2d1..5eaf412b 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMessageComposer implements FactoryMessage {
   sender: string;
@@ -73,7 +73,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -116,7 +116,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -138,7 +138,7 @@ export class FactoryMessageComposer implements FactoryMessage {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -158,7 +158,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     newFee
   }: {
     newFee: Coin;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -177,7 +177,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -196,7 +196,7 @@ export class FactoryMessageComposer implements FactoryMessage {
     addr
   }: {
     addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index 02030e9f..7b030c9f 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -15,40 +15,40 @@ export interface GovecMessage {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  revertFreezeStatus: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  revertFreezeStatus: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class GovecMessageComposer implements GovecMessage {
   sender: string;
@@ -71,7 +71,7 @@ export class GovecMessageComposer implements GovecMessage {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,11 +82,11 @@ export class GovecMessageComposer implements GovecMessage {
             msgs
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  revertFreezeStatus = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  revertFreezeStatus = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -95,7 +95,7 @@ export class GovecMessageComposer implements GovecMessage {
         msg: toUtf8(JSON.stringify({
           revert_freeze_status: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -103,7 +103,7 @@ export class GovecMessageComposer implements GovecMessage {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class GovecMessageComposer implements GovecMessage {
             transaction
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -122,7 +122,7 @@ export class GovecMessageComposer implements GovecMessage {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -133,7 +133,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_user_address: newUserAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -141,7 +141,7 @@ export class GovecMessageComposer implements GovecMessage {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -152,7 +152,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_relayer_address: newRelayerAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -160,7 +160,7 @@ export class GovecMessageComposer implements GovecMessage {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class GovecMessageComposer implements GovecMessage {
             relayer_address: relayerAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -181,7 +181,7 @@ export class GovecMessageComposer implements GovecMessage {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -193,7 +193,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_multisig_code_id: newMultisigCodeId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -201,7 +201,7 @@ export class GovecMessageComposer implements GovecMessage {
     newLabel
   }: {
     newLabel: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -212,7 +212,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_label: newLabel
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index 6470ade8..44fa3716 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -15,40 +15,40 @@ export interface ProxyMessage {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  revertFreezeStatus: (funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  revertFreezeStatus: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class ProxyMessageComposer implements ProxyMessage {
   sender: string;
@@ -71,7 +71,7 @@ export class ProxyMessageComposer implements ProxyMessage {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,11 +82,11 @@ export class ProxyMessageComposer implements ProxyMessage {
             msgs
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  revertFreezeStatus = (funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  revertFreezeStatus = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -95,7 +95,7 @@ export class ProxyMessageComposer implements ProxyMessage {
         msg: toUtf8(JSON.stringify({
           revert_freeze_status: {}
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -103,7 +103,7 @@ export class ProxyMessageComposer implements ProxyMessage {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             transaction
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -122,7 +122,7 @@ export class ProxyMessageComposer implements ProxyMessage {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -133,7 +133,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_user_address: newUserAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -141,7 +141,7 @@ export class ProxyMessageComposer implements ProxyMessage {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -152,7 +152,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_relayer_address: newRelayerAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -160,7 +160,7 @@ export class ProxyMessageComposer implements ProxyMessage {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             relayer_address: relayerAddress
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -181,7 +181,7 @@ export class ProxyMessageComposer implements ProxyMessage {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -193,7 +193,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_multisig_code_id: newMultisigCodeId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -201,7 +201,7 @@ export class ProxyMessageComposer implements ProxyMessage {
     newLabel
   }: {
     newLabel: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -212,7 +212,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_label: newLabel
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
diff --git a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap b/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
index 2fa4a2fb..a211534f 100644
--- a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
+++ b/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
@@ -10,7 +10,7 @@ exports[`createMessageComposerInterface 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -19,7 +19,7 @@ exports[`createMessageComposerInterface 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -28,26 +28,26 @@ exports[`createMessageComposerInterface 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     extension,
     owner,
@@ -58,12 +58,12 @@ exports[`createMessageComposerInterface 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }"
 `;
 
@@ -91,7 +91,7 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -103,7 +103,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -115,7 +115,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -128,7 +128,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -140,7 +140,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -153,7 +153,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -163,7 +163,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -175,7 +175,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -185,7 +185,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -197,7 +197,7 @@ exports[`execute classes 1`] = `
             operator
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -205,7 +205,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -216,7 +216,7 @@ exports[`execute classes 1`] = `
             operator
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -230,7 +230,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -244,7 +244,7 @@ exports[`execute classes 1`] = `
             token_uri: tokenUri
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -252,7 +252,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -263,7 +263,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -286,7 +286,7 @@ exports[`ownershipClass 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -297,11 +297,11 @@ exports[`ownershipClass 1`] = `
             new_factory: newFactory
           }
         })),
-        funds
+        _funds: funds
       })
     };
   };
-  updateOwnership = (action: Action, funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateOwnership = (action: Action, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
       value: MsgExecuteContract.fromPartial({
@@ -310,7 +310,7 @@ exports[`ownershipClass 1`] = `
         msg: toUtf8(JSON.stringify({
           update_ownership: action
         })),
-        funds
+        _funds: funds
       })
     };
   };
@@ -325,7 +325,7 @@ exports[`ownershipInterface 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateOwnership: (action: Action, funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateOwnership: (action: Action, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }"
 `;
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.ts b/packages/wasm-ast-types/src/message-composer/message-composer.ts
index 255b3327..0c1a5eeb 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.ts
@@ -1,13 +1,13 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
 import {
-    bindMethod,
-    typedIdentifier,
-    classDeclaration,
-    classProperty,
-    arrowFunctionExpression,
-    getMessageProperties
-} from '../utils'
+  bindMethod,
+  typedIdentifier,
+  classDeclaration,
+  classProperty,
+  arrowFunctionExpression,
+  getMessageProperties
+} from '../utils';
 import { ExecuteMsg } from '../types';
 import { createTypedObjectParams } from '../utils/types';
 import { JSONSchema } from '../types';
@@ -16,298 +16,254 @@ import { identifier } from '../utils/babel';
 import { getWasmMethodArgs } from '../client/client';
 import { Expression } from '@babel/types';
 
+const OPTIONAL_FUNDS = identifier(
+  '_funds',
+  t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))),
+  true
+);
+
 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];
 
-    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 = [];
+  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()
-                        )
-                    ),
+  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];
+  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
+    )
+  );
 };
-
diff --git a/yarn.lock b/yarn.lock
index 5c41f663..220b3fe5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9218,18 +9218,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-"wasm-ast-types@path:../wasm-ast-types":
-  version "0.17.0"
-  resolved "https://registry.npmjs.org/wasm-ast-types/-/wasm-ast-types-0.17.0.tgz#417280a61d60ea9964667cf2edb8f5281dc295d7"
-  integrity sha512-WeriXPbG67iI51Mf/5qRR0xcpEaTO/Wyjpl+vsmjZ5K6q/0W6iO03zHsESNIH/hpc5FPTpb0Y0L9xAtnnNe9Ow==
-  dependencies:
-    "@babel/runtime" "^7.18.9"
-    "@babel/types" "7.18.10"
-    "@jest/transform" "28.1.3"
-    ast-stringify "0.1.0"
-    case "1.6.3"
-    deepmerge "4.2.2"
-
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"

From 73ecb0163187bdd78539fdc4c149ffbcb280ba14 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 14:35:32 +0300
Subject: [PATCH 110/287] Udpate client to use underscored funds parameter

---
 packages/wasm-ast-types/src/client/client.ts  | 558 ++++++++----------
 .../ts-client.account-nfts.spec.ts.snap       |  90 +--
 .../ts-client.arrays-ref.spec.ts.snap         |  84 +--
 .../ts-client.arrays.spec.ts.snap             |   6 +-
 .../ts-client.cw-named-groups.test.ts.snap    |  18 +-
 .../ts-client.cw-proposal-single.test.ts.snap |  54 +-
 .../ts-client.issue-101.spec.ts.snap          |  12 +-
 .../ts-client.issue-71.test.ts.snap           |  60 +-
 .../ts-client.issue-98.test.ts.snap           |  18 +-
 .../ts-client.issues.test.ts.snap             | 156 ++---
 .../ts-client.overrides.spec.ts.snap          | 160 ++---
 .../ts-client.sg721.spec.ts.snap              |  48 +-
 .../test/__snapshots__/ts-client.spec.ts.snap |  92 +--
 .../ts-client.vectis.spec.ts.snap             |  48 +-
 .../ts-client.wager.spec.ts.snap              |  16 +-
 .../src/message-composer/message-composer.ts  |  23 +-
 .../__snapshots__/react-query.spec.ts.snap    |  60 +-
 .../src/react-query/react-query.ts            |   3 +-
 .../wasm-ast-types/src/utils/constants.ts     |  23 +
 packages/wasm-ast-types/src/utils/index.ts    |   2 +
 20 files changed, 730 insertions(+), 801 deletions(-)
 create mode 100644 packages/wasm-ast-types/src/utils/constants.ts

diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/wasm-ast-types/src/client/client.ts
index a91dfe09..055cf6cb 100644
--- a/packages/wasm-ast-types/src/client/client.ts
+++ b/packages/wasm-ast-types/src/client/client.ts
@@ -5,14 +5,21 @@ import {
   bindMethod,
   classDeclaration,
   classProperty,
+  FIXED_EXECUTE_PARAMS,
   getMessageProperties,
+  OPTIONAL_FUNDS_PARAM,
   promiseTypeAnnotation,
   typedIdentifier
 } from '../utils';
 
 import { ExecuteMsg, JSONSchema, QueryMsg } from '../types';
 
-import { createTypedObjectParams, getPropertyType, getResponseType, getType } from '../utils/types';
+import {
+  createTypedObjectParams,
+  getPropertyType,
+  getResponseType,
+  getType
+} from '../utils/types';
 import { RenderContext } from '../context';
 import { identifier, propertySignature } from '../utils/babel';
 
@@ -21,66 +28,24 @@ export const CONSTANT_EXEC_PARAMS = [
     identifier(
       'fee',
       t.tsTypeAnnotation(
-        t.tsUnionType(
-          [
-            t.tSNumberKeyword(),
-            t.tsTypeReference(
-              t.identifier('StdFee')
-            ),
-            t.tsLiteralType(
-              t.stringLiteral('auto')
-            )
-          ]
-        )
+        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(
-    t.tsArrayType(
-      t.tsTypeReference(
-        t.identifier('Coin')
-      )
-    )
-  ), true)
-];
-
-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(
-    t.tsArrayType(
-      t.tsTypeReference(
-        t.identifier('Coin')
-      )
-    )
-  ), true)
+  identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true),
+  OPTIONAL_FUNDS_PARAM
 ];
 
-
 export const createWasmQueryMethod = (
   context: RenderContext,
   jsonschema: any
 ) => {
-
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const responseType = getResponseType(context, underscoreName);
@@ -97,49 +62,44 @@ export const createWasmQueryMethod = (
 
   const msgAction = t.identifier(underscoreName);
   // If the param is an identifier, we can just use it as is
-  const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args)
+  const msgActionValue =
+    param?.type === 'Identifier'
+      ? t.identifier(param.name)
+      : t.objectExpression(args);
 
   return t.classProperty(
     t.identifier(methodName),
     arrowFunctionExpression(
       param ? [param] : [],
-      t.blockStatement(
-        [
-          t.returnStatement(
-            t.callExpression(
+      t.blockStatement([
+        t.returnStatement(
+          t.callExpression(
+            t.memberExpression(
+              t.memberExpression(t.thisExpression(), t.identifier('client')),
+              t.identifier('queryContractSmart')
+            ),
+            [
               t.memberExpression(
-                t.memberExpression(
-                  t.thisExpression(),
-                  t.identifier('client')
-                ),
-                t.identifier('queryContractSmart')
+                t.thisExpression(),
+                t.identifier('contractAddress')
               ),
-              [
-                t.memberExpression(t.thisExpression(), t.identifier('contractAddress')),
-                t.objectExpression([
-                  t.objectProperty(msgAction, msgActionValue)
-                ])
-              ]
-            )
+              t.objectExpression([t.objectProperty(msgAction, msgActionValue)])
+            ]
           )
-        ]
-      ),
+        )
+      ]),
       t.tsTypeAnnotation(
         t.tsTypeReference(
           t.identifier('Promise'),
-          t.tsTypeParameterInstantiation(
-            [
-              t.tSTypeReference(
-                t.identifier(responseType)
-              )
-            ]
-          )
+          t.tsTypeParameterInstantiation([
+            t.tSTypeReference(t.identifier(responseType))
+          ])
         )
       ),
       true
     )
   );
-}
+};
 
 export const createQueryClass = (
   context: RenderContext,
@@ -147,81 +107,78 @@ export const createQueryClass = (
   implementsClassName: string,
   queryMsg: QueryMsg
 ) => {
-
   context.addUtil('CosmWasmClient');
 
   const propertyNames = getMessageProperties(queryMsg)
-    .map(method => Object.keys(method.properties)?.[0])
+    .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(queryMsg)
-    .map(schema => {
-      return createWasmQueryMethod(context, schema)
-    });
+  const methods = getMessageProperties(queryMsg).map((schema) => {
+    return createWasmQueryMethod(context, schema);
+  });
 
   return t.exportNamedDeclaration(
-    classDeclaration(className,
+    classDeclaration(
+      className,
       [
         // client
-        classProperty('client', t.tsTypeAnnotation(
-          t.tsTypeReference(t.identifier('CosmWasmClient'))
-        )),
+        classProperty(
+          'client',
+          t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))
+        ),
 
         // contractAddress
-        classProperty('contractAddress', t.tsTypeAnnotation(
-          t.tsStringKeyword()
-        )),
+        classProperty(
+          'contractAddress',
+          t.tsTypeAnnotation(t.tsStringKeyword())
+        ),
 
         // constructor
-        t.classMethod('constructor',
+        t.classMethod(
+          'constructor',
           t.identifier('constructor'),
           [
-            typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))),
-            typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))
-
+            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.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')
-                )
-              ),
-
-              ...bindings
+                ),
+                t.identifier('contractAddress')
+              )
+            ),
 
-            ]
-          )),
+            ...bindings
+          ])
+        ),
 
         ...methods
-
       ],
-      [
-        t.tSExpressionWithTypeArguments(
-          t.identifier(implementsClassName)
-        )
-      ])
+      [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]
+    )
   );
 };
 
@@ -236,16 +193,16 @@ export const getWasmMethodArgs = (
     const obj = context.refLookup(jsonschema.$ref);
     // properties
     if (obj) {
-      keys = Object.keys(obj.properties ?? {})
+      keys = Object.keys(obj.properties ?? {});
     }
 
     // tuple struct or otherwise, use the name of the reference
     if (!keys.length && obj?.oneOf) {
-// TODO????? ADAIR
+      // TODO????? ADAIR
     }
   }
 
-  const args = keys.map(prop => {
+  const args = keys.map((prop) => {
     return t.objectProperty(
       t.identifier(prop),
       t.identifier(camel(prop)),
@@ -261,7 +218,6 @@ export const createWasmExecMethod = (
   context: RenderContext,
   jsonschema: JSONSchema
 ) => {
-
   context.addUtil('ExecuteResult');
   context.addUtil('StdFee');
   context.addUtil('Coin');
@@ -279,73 +235,59 @@ export const createWasmExecMethod = (
 
   const msgAction = t.identifier(underscoreName);
   // If the param is an identifier, we can just use it as is
-  const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args)
+  const msgActionValue =
+    param?.type === 'Identifier'
+      ? t.identifier(param.name)
+      : t.objectExpression(args);
 
   return t.classProperty(
     t.identifier(methodName),
     arrowFunctionExpression(
-      param ? [
-        // props
-        param,
-        ...CONSTANT_EXEC_PARAMS
-      ] : CONSTANT_EXEC_PARAMS,
-      t.blockStatement(
-        [
-          t.returnStatement(
-            t.awaitExpression(
-              t.callExpression(
+      param
+        ? [
+            // props
+            param,
+            ...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.memberExpression(
-                    t.thisExpression(),
-                    t.identifier('client')
-                  ),
-                  t.identifier('execute')
+                  t.thisExpression(),
+                  t.identifier('contractAddress')
                 ),
-                [
-                  t.memberExpression(
-                    t.thisExpression(),
-                    t.identifier('sender')
-                  ),
-                  t.memberExpression(
-                    t.thisExpression(),
-                    t.identifier('contractAddress')
-                  ),
-                  t.objectExpression(
-                    [
-                      t.objectProperty(
-                        msgAction,
-                        msgActionValue
-                      )
-
-                    ]
-                  ),
-                  t.identifier('fee'),
-                  t.identifier('memo'),
-                  t.identifier('funds')
-                ]
-              )
+                t.objectExpression([
+                  t.objectProperty(msgAction, msgActionValue)
+                ]),
+                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')
-              )
-            ]
-          )
+          t.tsTypeParameterInstantiation([
+            t.tSTypeReference(t.identifier('ExecuteResult'))
+          ])
         )
       ),
       true
     )
   );
-
-}
+};
 
 export const createExecuteClass = (
   context: RenderContext,
@@ -354,33 +296,29 @@ export const createExecuteClass = (
   extendsClassName: string | null,
   execMsg: ExecuteMsg
 ) => {
-
   context.addUtil('SigningCosmWasmClient');
 
   const propertyNames = getMessageProperties(execMsg)
-    .map(method => Object.keys(method.properties)?.[0])
+    .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 createWasmExecMethod(context, schema)
-    });
+  const methods = getMessageProperties(execMsg).map((schema) => {
+    return createWasmExecMethod(context, schema);
+  });
 
   const blockStmt = [];
 
   if (extendsClassName) {
-    blockStmt.push(    // super()
-      t.expressionStatement(t.callExpression(
-        t.super(),
-        [
+    blockStmt.push(
+      // super()
+      t.expressionStatement(
+        t.callExpression(t.super(), [
           t.identifier('client'),
           t.identifier('contractAddress')
-        ]
-      ))
+        ])
+      )
     );
   }
 
@@ -389,78 +327,85 @@ export const createExecuteClass = (
     t.expressionStatement(
       t.assignmentExpression(
         '=',
-        t.memberExpression(
-          t.thisExpression(),
-          t.identifier('client')
-        ),
+        t.memberExpression(t.thisExpression(), t.identifier('client')),
         t.identifier('client')
       )
     ),
     t.expressionStatement(
       t.assignmentExpression(
         '=',
-        t.memberExpression(
-          t.thisExpression(),
-          t.identifier('sender')
-        ),
+        t.memberExpression(t.thisExpression(), t.identifier('sender')),
         t.identifier('sender')
       )
     ),
     t.expressionStatement(
       t.assignmentExpression(
         '=',
-        t.memberExpression(
-          t.thisExpression(),
-          t.identifier('contractAddress')
-        ),
+        t.memberExpression(t.thisExpression(), t.identifier('contractAddress')),
         t.identifier('contractAddress')
       )
     ),
     ...bindings
   ]);
 
-  const noImplicitOverride = context.options.client.noImplicitOverride && extendsClassName && context.options.client.execExtendsQuery;
+  const noImplicitOverride =
+    context.options.client.noImplicitOverride &&
+    extendsClassName &&
+    context.options.client.execExtendsQuery;
 
   return t.exportNamedDeclaration(
-    classDeclaration(className,
+    classDeclaration(
+      className,
       [
         // client
-        classProperty('client', t.tsTypeAnnotation(
-          t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
-        ), false, false, noImplicitOverride),
+        classProperty(
+          'client',
+          t.tsTypeAnnotation(
+            t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+          ),
+          false,
+          false,
+          noImplicitOverride
+        ),
 
         // sender
-        classProperty('sender', t.tsTypeAnnotation(
-          t.tsStringKeyword()
-        )),
+        classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
 
         // contractAddress
-        classProperty('contractAddress', t.tsTypeAnnotation(
-          t.tsStringKeyword()
-        ), false, false, noImplicitOverride),
+        classProperty(
+          'contractAddress',
+          t.tsTypeAnnotation(t.tsStringKeyword()),
+          false,
+          false,
+          noImplicitOverride
+        ),
 
         // constructor
-        t.classMethod('constructor',
+        t.classMethod(
+          'constructor',
           t.identifier('constructor'),
           [
-            typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))),
+            typedIdentifier(
+              'client',
+              t.tsTypeAnnotation(
+                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+              )
+            ),
             typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
-            typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))
+            typedIdentifier(
+              'contractAddress',
+              t.tsTypeAnnotation(t.tsStringKeyword())
+            )
           ],
-          t.blockStatement(
-            blockStmt
-          )),
+          t.blockStatement(blockStmt)
+        ),
         ...methods
       ],
-      [
-        t.tSExpressionWithTypeArguments(
-          t.identifier(implementsClassName)
-        )
-      ],
+      [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))],
       extendsClassName ? t.identifier(extendsClassName) : null
     )
   );
-}
+};
 
 export const createExecuteInterface = (
   context: RenderContext,
@@ -468,50 +413,41 @@ export const createExecuteInterface = (
   extendsClassName: string | null,
   execMsg: ExecuteMsg
 ) => {
+  const methods = getMessageProperties(execMsg).map((jsonschema) => {
+    const underscoreName = Object.keys(jsonschema.properties)[0];
+    const methodName = camel(underscoreName);
+    return createPropertyFunctionWithObjectParamsForExec(
+      context,
+      methodName,
+      'ExecuteResult',
+      jsonschema.properties[underscoreName]
+    );
+  });
 
-  const methods = getMessageProperties(execMsg)
-    .map(jsonschema => {
-      const underscoreName = Object.keys(jsonschema.properties)[0];
-      const methodName = camel(underscoreName);
-      return createPropertyFunctionWithObjectParamsForExec(
-        context,
-        methodName,
-        'ExecuteResult',
-        jsonschema.properties[underscoreName]
-      );
-    });
-
-  const extendsAst = extendsClassName ? [t.tSExpressionWithTypeArguments(
-    t.identifier(extendsClassName)
-  )] : []
+  const extendsAst = extendsClassName
+    ? [t.tSExpressionWithTypeArguments(t.identifier(extendsClassName))]
+    : [];
 
   return t.exportNamedDeclaration(
     t.tsInterfaceDeclaration(
       t.identifier(className),
       null,
       extendsAst,
-      t.tSInterfaceBody(
-        [
-
-          // contract address
-          t.tSPropertySignature(
-            t.identifier('contractAddress'),
-            t.tsTypeAnnotation(
-              t.tsStringKeyword()
-            )
-          ),
+      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
+      ])
     )
   );
 };
@@ -527,10 +463,8 @@ export const createPropertyFunctionWithObjectParams = (
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [
-      obj
-    ] : []
-  }
+    parameters: obj ? [obj] : []
+  };
 
   return t.tSPropertySignature(
     t.identifier(methodName),
@@ -547,7 +481,6 @@ export const createPropertyFunctionWithObjectParamsForExec = (
   responseType: string,
   jsonschema: JSONSchema
 ) => {
-
   context.addUtil('Coin');
 
   const obj = createTypedObjectParams(context, jsonschema);
@@ -555,12 +488,8 @@ export const createPropertyFunctionWithObjectParamsForExec = (
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [
-      obj,
-      ...FIXED_EXECUTE_PARAMS
-
-    ] : FIXED_EXECUTE_PARAMS
-  }
+    parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
+  };
 
   return t.tSPropertySignature(
     t.identifier(methodName),
@@ -576,47 +505,40 @@ export const createQueryInterface = (
   className: string,
   queryMsg: QueryMsg
 ) => {
-  const methods = getMessageProperties(queryMsg)
-    .map(jsonschema => {
-      const underscoreName = Object.keys(jsonschema.properties)[0];
-      const methodName = camel(underscoreName);
-      const responseType = getResponseType(context, underscoreName);
-      return createPropertyFunctionWithObjectParams(
-        context,
-        methodName,
-        responseType,
-        jsonschema.properties[underscoreName]
-      );
-    });
+  const methods = getMessageProperties(queryMsg).map((jsonschema) => {
+    const underscoreName = Object.keys(jsonschema.properties)[0];
+    const methodName = camel(underscoreName);
+    const responseType = getResponseType(context, underscoreName);
+    return createPropertyFunctionWithObjectParams(
+      context,
+      methodName,
+      responseType,
+      jsonschema.properties[underscoreName]
+    );
+  });
 
   return t.exportNamedDeclaration(
     t.tsInterfaceDeclaration(
       t.identifier(className),
       null,
       [],
-      t.tSInterfaceBody(
-        [
-          t.tSPropertySignature(
-            t.identifier('contractAddress'),
-            t.tsTypeAnnotation(
-              t.tsStringKeyword()
-            )
-          ),
-          ...methods
-        ]
-      )
+      t.tSInterfaceBody([
+        t.tSPropertySignature(
+          t.identifier('contractAddress'),
+          t.tsTypeAnnotation(t.tsStringKeyword())
+        ),
+        ...methods
+      ])
     )
   );
 };
 
-
 export const createTypeOrInterface = (
   context: RenderContext,
   Type: string,
   jsonschema: JSONSchema
 ) => {
   if (jsonschema.type !== 'object') {
-
     if (!jsonschema.type) {
       return t.exportNamedDeclaration(
         t.tsTypeAliasDeclaration(
@@ -624,7 +546,7 @@ export const createTypeOrInterface = (
           null,
           t.tsTypeReference(t.identifier(jsonschema.title))
         )
-      )
+      );
     }
 
     return t.exportNamedDeclaration(
@@ -635,14 +557,10 @@ export const createTypeOrInterface = (
       )
     );
   }
-  const props = Object.keys(jsonschema.properties ?? {})
-    .map(prop => {
-      const { type, optional } = getPropertyType(context, jsonschema, prop);
-      return propertySignature(camel(prop), t.tsTypeAnnotation(
-        type
-      ), optional);
-    });
-
+  const props = Object.keys(jsonschema.properties ?? {}).map((prop) => {
+    const { type, optional } = getPropertyType(context, jsonschema, prop);
+    return propertySignature(camel(prop), t.tsTypeAnnotation(type), optional);
+  });
 
   return t.exportNamedDeclaration(
     t.tsInterfaceDeclaration(
@@ -651,12 +569,10 @@ export const createTypeOrInterface = (
       [],
       t.tsInterfaceBody(
         // @ts-ignore:next-line
-        [
-          ...props
-        ]
+        [...props]
       )
     )
-  )
+  );
 };
 
 export const createTypeInterface = (
@@ -664,9 +580,5 @@ export const createTypeInterface = (
   jsonschema: JSONSchema
 ) => {
   const Type = jsonschema.title;
-  return createTypeOrInterface(
-    context,
-    Type,
-    jsonschema
-  );
+  return createTypeOrInterface(context, Type, jsonschema);
 };
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
index 254ba6b0..70d9f1b6 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
@@ -27,10 +27,10 @@ exports[`execute classes array types 1`] = `
     this.minter = this.minter.bind(this);
   }
 
-  proposedNewOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  proposedNewOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proposed_new_owner: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   allowedVaults = async ({
     limit,
@@ -38,13 +38,13 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allowed_vaults: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   allDebtShares = async ({
     limit,
@@ -52,18 +52,18 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  allPreviousOwners = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  allPreviousOwners = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_previous_owners: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   ownerOf = async ({
     includeExpired,
@@ -71,13 +71,13 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       owner_of: {
         include_expired: includeExpired,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approval = async ({
     includeExpired,
@@ -87,14 +87,14 @@ exports[`execute classes array types 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approval: {
         include_expired: includeExpired,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approvals = async ({
     includeExpired,
@@ -102,13 +102,13 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approvals: {
         include_expired: includeExpired,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   allOperators = async ({
     includeExpired,
@@ -120,7 +120,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_operators: {
         include_expired: includeExpired,
@@ -128,28 +128,28 @@ exports[`execute classes array types 1`] = `
         owner,
         start_after: startAfter
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  numTokens = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  numTokens = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       num_tokens: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  contractInfo = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  contractInfo = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       contract_info: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   nftInfo = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       nft_info: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   allNftInfo = async ({
     includeExpired,
@@ -157,13 +157,13 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_nft_info: {
         include_expired: includeExpired,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   tokens = async ({
     limit,
@@ -173,14 +173,14 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       tokens: {
         limit,
         owner,
         start_after: startAfter
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   allTokens = async ({
     limit,
@@ -188,18 +188,18 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_tokens: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  minter = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  minter = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       minter: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -208,29 +208,29 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  proposedNewOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  proposedNewOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allowedVaults: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allDebtShares: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  allPreviousOwners: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  allPreviousOwners: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   ownerOf: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approval: ({
     includeExpired,
     spender,
@@ -239,14 +239,14 @@ exports[`execute interfaces no extends 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approvals: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allOperators: ({
     includeExpired,
     limit,
@@ -257,21 +257,21 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  numTokens: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  contractInfo: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  numTokens: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  contractInfo: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   nftInfo: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allNftInfo: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   tokens: ({
     limit,
     owner,
@@ -280,15 +280,15 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allTokens: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  minter: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  minter: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays-ref.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays-ref.spec.ts.snap
index 1c35275e..14cfcf4c 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays-ref.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays-ref.spec.ts.snap
@@ -32,13 +32,13 @@ exports[`execute classes array types 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
         creditor
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   editEdge = async ({
     amount,
@@ -48,36 +48,36 @@ exports[`execute classes array types 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
         creditor,
         edge_id: edgeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeEdge = async ({
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createGraph = async ({
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createGraphSimplified = async ({
     graph,
@@ -85,13 +85,13 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   editGraphSimplified = async ({
     graph,
@@ -99,89 +99,89 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateEdges = async ({
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   findSavingsInAGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   saveNetworkToFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createGraphFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   applySetOffFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -196,7 +196,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editEdge: ({
     amount,
     creditor,
@@ -205,63 +205,63 @@ exports[`execute interfaces no extends 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
index 911ff10a..6a8486b4 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
@@ -25,7 +25,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
@@ -34,7 +34,7 @@ exports[`execute classes array types 1`] = `
         nested,
         supernested
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -55,7 +55,7 @@ exports[`execute interfaces no extends 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-named-groups.test.ts.snap
index 9a28efbb..92121685 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-named-groups.test.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-named-groups.test.ts.snap
@@ -23,36 +23,36 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
         addresses_to_remove: addressesToRemove,
         group
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeGroup = async ({
     group
   }: {
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateOwner = async ({
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -69,17 +69,17 @@ exports[`execute interfaces no extends 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
index 107b236e..034b1eb3 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
@@ -29,14 +29,14 @@ exports[`execute classes array types 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -44,35 +44,35 @@ exports[`execute classes array types 1`] = `
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     allowRevoting,
@@ -90,7 +90,7 @@ exports[`execute classes array types 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -101,51 +101,51 @@ exports[`execute classes array types 1`] = `
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -162,24 +162,24 @@ exports[`execute interfaces no extends 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -196,27 +196,27 @@ exports[`execute interfaces no extends 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
index 17159f90..1a480530 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
@@ -8,8 +8,8 @@ exports[`execute interfaces no extends 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateOwnership: (action: Action, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateOwnership: (action: Action, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -31,17 +31,17 @@ exports[`ownership client with tuple 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_factory: {
         new_factory: newFactory
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  updateOwnership = async (action: Action, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  updateOwnership = async (action: Action, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_ownership: action
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap
index 29fbf717..6d9321de 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -30,14 +30,14 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     feeCollector,
@@ -47,14 +47,14 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         fee_collector: feeCollector,
         generator_address: generatorAddress,
         lp_token_code_id: lpTokenCodeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePoolConfig = async ({
     isDisabled,
@@ -64,25 +64,25 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_pool_config: {
         is_disabled: isDisabled,
         new_fee_info: newFeeInfo,
         pool_type: poolType
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addToRegistery = async ({
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_to_registery: {
         new_pool_config: newPoolConfig
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createPoolInstance = async ({
     assetInfos,
@@ -96,7 +96,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_pool_instance: {
         asset_infos: assetInfos,
@@ -105,7 +105,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
         lp_token_symbol: lpTokenSymbol,
         pool_type: poolType
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   joinPool = async ({
     assets,
@@ -121,7 +121,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       join_pool: {
         assets,
@@ -131,7 +131,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
         recipient,
         slippage_tolerance: slippageTolerance
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   swap = async ({
     recipient,
@@ -139,13 +139,13 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       swap: {
         recipient,
         swap_request: swapRequest
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   proposeNewOwner = async ({
     expiresIn,
@@ -153,23 +153,23 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
   }: {
     expiresIn: number;
     owner: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         expires_in: expiresIn,
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  dropOwnershipProposal = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  dropOwnershipProposal = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       drop_ownership_proposal: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  claimOwnership = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  claimOwnership = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       claim_ownership: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -186,7 +186,7 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     feeCollector,
     generatorAddress,
@@ -195,7 +195,7 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePoolConfig: ({
     isDisabled,
     newFeeInfo,
@@ -204,12 +204,12 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addToRegistery: ({
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createPoolInstance: ({
     assetInfos,
     initParams,
@@ -222,7 +222,7 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   joinPool: ({
     assets,
     autoStake,
@@ -237,23 +237,23 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   swap: ({
     recipient,
     swapRequest
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   proposeNewOwner: ({
     expiresIn,
     owner
   }: {
     expiresIn: number;
     owner: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  dropOwnershipProposal: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  claimOwnership: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  dropOwnershipProposal: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  claimOwnership: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
index 2ec7781f..b3e4ecb2 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -15,10 +15,10 @@ exports[`execute classes array types 1`] = `
     this.getPluginById = this.getPluginById.bind(this);
   }
 
-  getConfig = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  getConfig = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_config: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getPlugins = async ({
     limit,
@@ -26,24 +26,24 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugins: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getPluginById = async ({
     id
   }: {
     id: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugin_by_id: {
         id
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -52,19 +52,19 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getConfig: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  getConfig: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getPlugins: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getPluginById: ({
     id
   }: {
     id: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.test.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.test.ts.snap
index 583d6b99..590aac7f 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.test.ts.snap
@@ -77,13 +77,13 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
         creditor
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   editEdge = async ({
     amount,
@@ -93,36 +93,36 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
         creditor,
         edge_id: edgeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeEdge = async ({
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createGraph = async ({
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createGraphSimplified = async ({
     graph,
@@ -130,13 +130,13 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   editGraphSimplified = async ({
     graph,
@@ -144,89 +144,89 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateEdges = async ({
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   findSavingsInAGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   saveNetworkToFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   createGraphFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   applySetOffFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -285,113 +285,113 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
 
-  getDenom = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  getDenom = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_denom: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  getOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  getOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_owner: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  allEdges = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  allEdges = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_edges: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   oneEdge = async ({
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_edge: {
         edge_id: edgeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   oneBatch = async ({
     batchId
   }: {
     batchId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_batch: {
         batch_id: batchId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   oneGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_graph: {
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getEdgesByAddress = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_by_address: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getEdgesAsCounterparty = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_as_counterparty: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getTotalDebtPerAddress = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_per_address: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getTotalCreditPerAddress = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_credit_per_address: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   getTotalDebtByGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_by_graph: {
         graph_id: graphId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  getTotalDebt = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  getTotalDebt = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -427,7 +427,7 @@ exports[`execute interface /issues/55/execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editEdge: ({
     amount,
     creditor,
@@ -436,63 +436,63 @@ exports[`execute interface /issues/55/execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -514,50 +514,50 @@ exports[`execute interface /issues/55/query_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getDenom: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  allEdges: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  getDenom: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  allEdges: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   oneEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   oneBatch: ({
     batchId
   }: {
     batchId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   oneGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getEdgesByAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getEdgesAsCounterparty: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getTotalDebtPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getTotalCreditPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getTotalDebtByGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebt: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getTotalDebt: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
index 0993ff62..66212ac8 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
@@ -27,13 +27,13 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -43,14 +43,14 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -60,14 +60,14 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -75,13 +75,13 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -89,24 +89,24 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -118,7 +118,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -126,18 +126,18 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -168,13 +168,13 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -184,14 +184,14 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -201,14 +201,14 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -216,13 +216,13 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -230,24 +230,24 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -259,7 +259,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -267,18 +267,18 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -310,13 +310,13 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -326,14 +326,14 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -343,14 +343,14 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -358,13 +358,13 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -372,24 +372,24 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -401,7 +401,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,18 +409,18 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -452,13 +452,13 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -468,14 +468,14 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -485,14 +485,14 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -500,13 +500,13 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -514,24 +514,24 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -543,7 +543,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -551,18 +551,18 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -593,13 +593,13 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -609,14 +609,14 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -626,14 +626,14 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -641,13 +641,13 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -655,24 +655,24 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -684,7 +684,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -692,18 +692,18 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.sg721.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.sg721.spec.ts.snap
index f28e0e0e..92b55319 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.sg721.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.sg721.spec.ts.snap
@@ -26,13 +26,13 @@ exports[`execute classes array types 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -42,14 +42,14 @@ exports[`execute classes array types 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -59,14 +59,14 @@ exports[`execute classes array types 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -74,13 +74,13 @@ exports[`execute classes array types 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -88,24 +88,24 @@ exports[`execute classes array types 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -117,7 +117,7 @@ exports[`execute classes array types 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -125,18 +125,18 @@ exports[`execute classes array types 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -151,7 +151,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -160,7 +160,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -169,26 +169,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -199,12 +199,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.spec.ts.snap
index 761ca3cc..a70c59a9 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.spec.ts.snap
@@ -63,13 +63,13 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -79,14 +79,14 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -96,14 +96,14 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -111,13 +111,13 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -125,24 +125,24 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -154,7 +154,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -162,18 +162,18 @@ exports[`execute classes 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -201,36 +201,36 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
         addresses_to_remove: addressesToRemove,
         group
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeGroup = async ({
     group
   }: {
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateOwner = async ({
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -261,13 +261,13 @@ exports[`execute classes no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -277,14 +277,14 @@ exports[`execute classes no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -294,14 +294,14 @@ exports[`execute classes no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -309,13 +309,13 @@ exports[`execute classes no extends 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -323,24 +323,24 @@ exports[`execute classes no extends 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -352,7 +352,7 @@ exports[`execute classes no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -360,18 +360,18 @@ exports[`execute classes no extends 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -386,7 +386,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -395,7 +395,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -404,26 +404,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -434,12 +434,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
index e2b809bf..9810be84 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
@@ -32,61 +32,61 @@ exports[`execute classes array types 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  revertFreezeStatus = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   relay = async ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   rotateUserKey = async ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addRelayer = async ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeRelayer = async ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGuardians = async ({
     guardians,
@@ -94,24 +94,24 @@ exports[`execute classes array types 1`] = `
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
         new_multisig_code_id: newMultisigCodeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateLabel = async ({
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
@@ -124,40 +124,40 @@ exports[`execute interfaces no extends 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
index 7e9bf03d..8d311888 100644
--- a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
+++ b/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
@@ -22,12 +22,12 @@ exports[`execute classes 1`] = `
     params
   }: {
     params: ParamInfo;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         params
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setWinner = async ({
     currentPrices,
@@ -37,14 +37,14 @@ exports[`execute classes 1`] = `
     currentPrices: number[][];
     prevPrices: number[][];
     wagerKey: Addr[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
         current_prices: currentPrices,
         prev_prices: prevPrices,
         wager_key: wagerKey
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   wager = async ({
     againstCurrencies,
@@ -56,7 +56,7 @@ exports[`execute classes 1`] = `
     currency: Currency;
     expiry: number;
     token: Addr[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       wager: {
         against_currencies: againstCurrencies,
@@ -64,18 +64,18 @@ exports[`execute classes 1`] = `
         expiry,
         token
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   cancel = async ({
     token
   }: {
     token: Addr[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cancel: {
         token
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }"
 `;
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.ts b/packages/wasm-ast-types/src/message-composer/message-composer.ts
index 0c1a5eeb..99ad1f64 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.ts
@@ -1,26 +1,19 @@
 import * as t from '@babel/types';
+import { Expression } from '@babel/types';
 import { camel } from 'case';
 import {
+  arrowFunctionExpression,
   bindMethod,
-  typedIdentifier,
   classDeclaration,
   classProperty,
-  arrowFunctionExpression,
-  getMessageProperties
+  getMessageProperties,
+  OPTIONAL_FUNDS_PARAM,
+  typedIdentifier
 } from '../utils';
-import { ExecuteMsg } from '../types';
+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 OPTIONAL_FUNDS = identifier(
-  '_funds',
-  t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))),
-  true
-);
 
 const createWasmExecMethodMessageComposer = (
   context: RenderContext,
@@ -50,7 +43,7 @@ const createWasmExecMethodMessageComposer = (
     actionValue = t.objectExpression(args);
   }
 
-  const constantParams = [OPTIONAL_FUNDS];
+  const constantParams = [OPTIONAL_FUNDS_PARAM];
 
   return t.classProperty(
     t.identifier(methodName),
@@ -250,7 +243,7 @@ const createPropertyFunctionWithObjectParamsForMessageComposer = (
   jsonschema: JSONSchema
 ) => {
   const obj = createTypedObjectParams(context, jsonschema);
-  const fixedParams = [OPTIONAL_FUNDS];
+  const fixedParams = [OPTIONAL_FUNDS_PARAM];
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: t.tsTypeAnnotation(
diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index 0da3f360..6f0a3ecb 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -1133,7 +1133,7 @@ exports[`createReactQueryHooks 6`] = `
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721BurnMutation>, \\"mutationFn\\">) {
@@ -1143,9 +1143,9 @@ export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteRe
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.burn(msg, fee, memo, funds), options);
+  }) => client.burn(msg, fee, memo, _funds), options);
 }
 export interface Sg721MintMutation {
   client: Sg721Client;
@@ -1158,7 +1158,7 @@ export interface Sg721MintMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721MintMutation>, \\"mutationFn\\">) {
@@ -1168,9 +1168,9 @@ export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteRe
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.mint(msg, fee, memo, funds), options);
+  }) => client.mint(msg, fee, memo, _funds), options);
 }
 export interface Sg721RevokeAllMutation {
   client: Sg721Client;
@@ -1180,7 +1180,7 @@ export interface Sg721RevokeAllMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeAllMutation>, \\"mutationFn\\">) {
@@ -1190,9 +1190,9 @@ export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<Exec
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.revokeAll(msg, fee, memo, funds), options);
+  }) => client.revokeAll(msg, fee, memo, _funds), options);
 }
 export interface Sg721ApproveAllMutation {
   client: Sg721Client;
@@ -1203,7 +1203,7 @@ export interface Sg721ApproveAllMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveAllMutation>, \\"mutationFn\\">) {
@@ -1213,9 +1213,9 @@ export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<Exe
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.approveAll(msg, fee, memo, funds), options);
+  }) => client.approveAll(msg, fee, memo, _funds), options);
 }
 export interface Sg721RevokeMutation {
   client: Sg721Client;
@@ -1226,7 +1226,7 @@ export interface Sg721RevokeMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeMutation>, \\"mutationFn\\">) {
@@ -1236,9 +1236,9 @@ export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<Execute
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.revoke(msg, fee, memo, funds), options);
+  }) => client.revoke(msg, fee, memo, _funds), options);
 }
 export interface Sg721ApproveMutation {
   client: Sg721Client;
@@ -1250,7 +1250,7 @@ export interface Sg721ApproveMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveMutation>, \\"mutationFn\\">) {
@@ -1260,9 +1260,9 @@ export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<Execut
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.approve(msg, fee, memo, funds), options);
+  }) => client.approve(msg, fee, memo, _funds), options);
 }
 export interface Sg721SendNftMutation {
   client: Sg721Client;
@@ -1274,7 +1274,7 @@ export interface Sg721SendNftMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721SendNftMutation>, \\"mutationFn\\">) {
@@ -1284,9 +1284,9 @@ export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<Execut
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.sendNft(msg, fee, memo, funds), options);
+  }) => client.sendNft(msg, fee, memo, _funds), options);
 }
 export interface Sg721TransferNftMutation {
   client: Sg721Client;
@@ -1297,7 +1297,7 @@ export interface Sg721TransferNftMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721TransferNftMutation>, \\"mutationFn\\">) {
@@ -1307,9 +1307,9 @@ export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<Ex
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.transferNft(msg, fee, memo, funds), options);
+  }) => client.transferNft(msg, fee, memo, _funds), options);
 }"
 `;
 
@@ -1320,7 +1320,7 @@ exports[`ownership 1`] = `
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>, \\"mutationFn\\">) {
@@ -1330,9 +1330,9 @@ export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOp
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.updateOwnership(msg, fee, memo, funds), options);
+  }) => client.updateOwnership(msg, fee, memo, _funds), options);
 }
 export interface OwnershipSetFactoryMutation {
   client: OwnershipClient;
@@ -1342,7 +1342,7 @@ export interface OwnershipSetFactoryMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipSetFactoryMutation>, \\"mutationFn\\">) {
@@ -1352,8 +1352,8 @@ export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.setFactory(msg, fee, memo, funds), options);
+  }) => client.setFactory(msg, fee, memo, _funds), options);
 }"
 `;
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 29ddc4cb..167db1ca 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -4,7 +4,7 @@ import { camel, pascal } from 'case';
 import { ExecuteMsg, QueryMsg } from '../types';
 import {
   callExpression,
-  createTypedObjectParams,
+  createTypedObjectParams, FIXED_EXECUTE_PARAMS,
   getMessageProperties,
   identifier,
   tsObjectPattern,
@@ -24,7 +24,6 @@ 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';
 
 interface ReactQueryHookQuery {
diff --git a/packages/wasm-ast-types/src/utils/constants.ts b/packages/wasm-ast-types/src/utils/constants.ts
new file mode 100644
index 00000000..46122904
--- /dev/null
+++ b/packages/wasm-ast-types/src/utils/constants.ts
@@ -0,0 +1,23 @@
+import { identifier } from './babel';
+import * as t from '@babel/types';
+
+export const OPTIONAL_FUNDS_PARAM = identifier(
+  '_funds',
+  t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))),
+  true
+);
+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),
+  OPTIONAL_FUNDS_PARAM
+];
diff --git a/packages/wasm-ast-types/src/utils/index.ts b/packages/wasm-ast-types/src/utils/index.ts
index 2e232599..aa3643b7 100644
--- a/packages/wasm-ast-types/src/utils/index.ts
+++ b/packages/wasm-ast-types/src/utils/index.ts
@@ -1,3 +1,5 @@
 export * from './babel';
 export * from './types';
 export * from './ref';
+export { OPTIONAL_FUNDS_PARAM } from './constants';
+export { FIXED_EXECUTE_PARAMS } from './constants';

From 39b6ae2e72fd6a6ef23528b951dbbb1038666bfa Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 14:37:13 +0300
Subject: [PATCH 111/287] Update ts-codegen tests

---
 __fixtures__/issues/98/out/98.client.ts       | 36 +++++------
 .../contracts/CwAdminFactory.client.ts        |  6 +-
 .../contracts/CwCodeIdRegistry.client.ts      | 30 +++++-----
 .../bundler_test/contracts/CwSingle.client.ts | 54 ++++++++---------
 .../bundler_test/contracts/Factory.client.ts  | 42 ++++++-------
 .../bundler_test/contracts/Minter.client.ts   | 42 ++++++-------
 .../builder/default/CwAdminFactory.client.ts  |  6 +-
 .../default/CwCodeIdRegistry.client.ts        | 30 +++++-----
 __output__/builder/default/CwSingle.client.ts | 54 ++++++++---------
 __output__/builder/default/Factory.client.ts  | 42 ++++++-------
 __output__/builder/default/Minter.client.ts   | 42 ++++++-------
 .../builder/invoke/CwAdminFactory.client.ts   |  6 +-
 .../builder/invoke/CwCodeIdRegistry.client.ts | 30 +++++-----
 __output__/builder/invoke/CwSingle.client.ts  | 54 ++++++++---------
 __output__/builder/invoke/Factory.client.ts   | 42 ++++++-------
 __output__/builder/invoke/Minter.client.ts    | 42 ++++++-------
 .../no-extends/CwAdminFactory.client.ts       |  6 +-
 .../no-extends/CwCodeIdRegistry.client.ts     | 30 +++++-----
 .../builder/no-extends/CwSingle.client.ts     | 54 ++++++++---------
 .../builder/no-extends/Factory.client.ts      | 42 ++++++-------
 .../builder/no-extends/Minter.client.ts       | 42 ++++++-------
 .../cw-admin-factory/CwAdminFactory.client.ts |  6 +-
 .../CwCodeIdRegistry.client.ts                | 30 +++++-----
 .../cw-named-groups/CwNamedGroups.client.ts   | 18 +++---
 .../CwProposalSingle.client.ts                | 54 ++++++++---------
 .../accounts-nft/AccountsNft.client.ts        | 60 +++++++++----------
 .../Cw3FixedMultiSig.client.ts                | 24 ++++----
 .../idl-version/cw4-group/Cw4Group.client.ts  | 24 ++++----
 .../idl-version/cyberpunk/CyberPunk.client.ts | 12 ++--
 .../idl-version/hackatom/HackAtom.client.ts   | 48 +++++++--------
 __output__/minter/Minter.client.ts            | 42 ++++++-------
 __output__/sg721/Sg721.client.ts              | 48 +++++++--------
 .../Factory.react-query.ts                    | 42 ++++++-------
 __output__/vectis/factory/Factory.client.ts   | 42 ++++++-------
 __output__/vectis/govec/Govec.client.ts       | 48 +++++++--------
 __output__/vectis/proxy/Proxy.client.ts       | 48 +++++++--------
 yarn.lock                                     | 10 ++++
 37 files changed, 649 insertions(+), 639 deletions(-)

diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
index b4e37f5b..a0e4740d 100644
--- a/__fixtures__/issues/98/out/98.client.ts
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -75,7 +75,7 @@ export interface 98Interface extends 98ReadOnlyInterface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   registerPlugin: ({
     checksum,
     codeId,
@@ -90,12 +90,12 @@ export interface 98Interface extends 98ReadOnlyInterface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   unregisterPlugin: ({
     id
   }: {
     id: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePlugin: ({
     checksum,
     codeId,
@@ -112,17 +112,17 @@ export interface 98Interface extends 98ReadOnlyInterface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateRegistryFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateDaoAddr: ({
     newAddr
   }: {
     newAddr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class 98Client extends 98QueryClient implements 98Interface {
   client: SigningCosmWasmClient;
@@ -148,13 +148,13 @@ export class 98Client extends 98QueryClient implements 98Interface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proxy_install_plugin: {
         id,
         instantiate_msg: instantiateMsg
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   registerPlugin = async ({
     checksum,
@@ -170,7 +170,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register_plugin: {
         checksum,
@@ -180,18 +180,18 @@ export class 98Client extends 98QueryClient implements 98Interface {
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   unregisterPlugin = async ({
     id
   }: {
     id: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister_plugin: {
         id
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePlugin = async ({
     checksum,
@@ -209,7 +209,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_plugin: {
         checksum,
@@ -220,28 +220,28 @@ export class 98Client extends 98QueryClient implements 98Interface {
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateRegistryFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_registry_fee: {
         new_fee: newFee
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateDaoAddr = async ({
     newAddr
   }: {
     newAddr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_dao_addr: {
         new_addr: newAddr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
index 3194c8c0..edbba1e6 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
@@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -53,13 +53,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
index 59e6506b..d95b2ee4 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
@@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -171,14 +171,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   register = async ({
     chainId,
@@ -192,7 +192,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -201,7 +201,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setOwner = async ({
     chainId,
@@ -211,14 +211,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   unregister = async ({
     chainId,
@@ -226,13 +226,13 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     admin,
@@ -240,12 +240,12 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
index 05c0dc73..62d3092c 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
@@ -176,24 +176,24 @@ export interface CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -210,27 +210,27 @@ export interface CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -260,14 +260,14 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -275,35 +275,35 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     allowRevoting,
@@ -321,7 +321,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -332,50 +332,50 @@ export class CwSingleClient implements CwSingleInterface {
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts
index 6e9897d6..8c545bda 100644
--- a/__output__/builder/bundler_test/contracts/Factory.client.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.client.ts
@@ -114,43 +114,43 @@ export interface FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -174,12 +174,12 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateProxyUser = async ({
     newUser,
@@ -187,13 +187,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -201,13 +201,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateCodeId = async ({
     newCodeId,
@@ -215,45 +215,45 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
index deffa10a..6901674a 100644
--- a/__output__/builder/bundler_test/contracts/Minter.client.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -112,48 +112,48 @@ export class MinterClient implements MinterInterface {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintFor = async ({
     recipient,
@@ -161,17 +161,17 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwAdminFactory.client.ts b/__output__/builder/default/CwAdminFactory.client.ts
index e5bab7f2..7a3c1f78 100644
--- a/__output__/builder/default/CwAdminFactory.client.ts
+++ b/__output__/builder/default/CwAdminFactory.client.ts
@@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -54,13 +54,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.client.ts b/__output__/builder/default/CwCodeIdRegistry.client.ts
index 78840c67..5e0b5f2c 100644
--- a/__output__/builder/default/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.client.ts
@@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -172,14 +172,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   register = async ({
     chainId,
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -202,7 +202,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setOwner = async ({
     chainId,
@@ -212,14 +212,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   unregister = async ({
     chainId,
@@ -227,13 +227,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     admin,
@@ -241,12 +241,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.client.ts b/__output__/builder/default/CwSingle.client.ts
index 7ed4b900..69625750 100644
--- a/__output__/builder/default/CwSingle.client.ts
+++ b/__output__/builder/default/CwSingle.client.ts
@@ -176,24 +176,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -210,27 +210,27 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -261,14 +261,14 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -276,35 +276,35 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     allowRevoting,
@@ -322,7 +322,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -333,50 +333,50 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.client.ts b/__output__/builder/default/Factory.client.ts
index f7ff49ac..7ef4e86f 100644
--- a/__output__/builder/default/Factory.client.ts
+++ b/__output__/builder/default/Factory.client.ts
@@ -114,43 +114,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -175,12 +175,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateProxyUser = async ({
     newUser,
@@ -188,13 +188,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -202,13 +202,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateCodeId = async ({
     newCodeId,
@@ -216,45 +216,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts
index 0a2f6b24..24fd0088 100644
--- a/__output__/builder/default/Minter.client.ts
+++ b/__output__/builder/default/Minter.client.ts
@@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -113,48 +113,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintFor = async ({
     recipient,
@@ -162,17 +162,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwAdminFactory.client.ts b/__output__/builder/invoke/CwAdminFactory.client.ts
index e5bab7f2..7a3c1f78 100644
--- a/__output__/builder/invoke/CwAdminFactory.client.ts
+++ b/__output__/builder/invoke/CwAdminFactory.client.ts
@@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -54,13 +54,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.client.ts b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
index 78840c67..5e0b5f2c 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
@@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -172,14 +172,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   register = async ({
     chainId,
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -202,7 +202,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setOwner = async ({
     chainId,
@@ -212,14 +212,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   unregister = async ({
     chainId,
@@ -227,13 +227,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     admin,
@@ -241,12 +241,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwSingle.client.ts b/__output__/builder/invoke/CwSingle.client.ts
index 7ed4b900..69625750 100644
--- a/__output__/builder/invoke/CwSingle.client.ts
+++ b/__output__/builder/invoke/CwSingle.client.ts
@@ -176,24 +176,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -210,27 +210,27 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -261,14 +261,14 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -276,35 +276,35 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     allowRevoting,
@@ -322,7 +322,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -333,50 +333,50 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/Factory.client.ts b/__output__/builder/invoke/Factory.client.ts
index f7ff49ac..7ef4e86f 100644
--- a/__output__/builder/invoke/Factory.client.ts
+++ b/__output__/builder/invoke/Factory.client.ts
@@ -114,43 +114,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -175,12 +175,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateProxyUser = async ({
     newUser,
@@ -188,13 +188,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -202,13 +202,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateCodeId = async ({
     newCodeId,
@@ -216,45 +216,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts
index 0a2f6b24..24fd0088 100644
--- a/__output__/builder/invoke/Minter.client.ts
+++ b/__output__/builder/invoke/Minter.client.ts
@@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -113,48 +113,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintFor = async ({
     recipient,
@@ -162,17 +162,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts
index 3194c8c0..edbba1e6 100644
--- a/__output__/builder/no-extends/CwAdminFactory.client.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.client.ts
@@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -53,13 +53,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
index 59e6506b..d95b2ee4 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
@@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -171,14 +171,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   register = async ({
     chainId,
@@ -192,7 +192,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -201,7 +201,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setOwner = async ({
     chainId,
@@ -211,14 +211,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   unregister = async ({
     chainId,
@@ -226,13 +226,13 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     admin,
@@ -240,12 +240,12 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts
index 05c0dc73..62d3092c 100644
--- a/__output__/builder/no-extends/CwSingle.client.ts
+++ b/__output__/builder/no-extends/CwSingle.client.ts
@@ -176,24 +176,24 @@ export interface CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -210,27 +210,27 @@ export interface CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -260,14 +260,14 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -275,35 +275,35 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     allowRevoting,
@@ -321,7 +321,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -332,50 +332,50 @@ export class CwSingleClient implements CwSingleInterface {
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts
index 6e9897d6..8c545bda 100644
--- a/__output__/builder/no-extends/Factory.client.ts
+++ b/__output__/builder/no-extends/Factory.client.ts
@@ -114,43 +114,43 @@ export interface FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -174,12 +174,12 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateProxyUser = async ({
     newUser,
@@ -187,13 +187,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -201,13 +201,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateCodeId = async ({
     newCodeId,
@@ -215,45 +215,45 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
index deffa10a..6901674a 100644
--- a/__output__/builder/no-extends/Minter.client.ts
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -112,48 +112,48 @@ export class MinterClient implements MinterInterface {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintFor = async ({
     recipient,
@@ -161,17 +161,17 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
index e5bab7f2..7a3c1f78 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
@@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -54,13 +54,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
index 78840c67..5e0b5f2c 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
@@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -172,14 +172,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   register = async ({
     chainId,
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -202,7 +202,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
         name,
         version
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setOwner = async ({
     chainId,
@@ -212,14 +212,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   unregister = async ({
     chainId,
@@ -227,13 +227,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     admin,
@@ -241,12 +241,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
index 3d0ad599..25793dcc 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
@@ -114,17 +114,17 @@ export interface CwNamedGroupsInterface extends CwNamedGroupsReadOnlyInterface {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwNamedGroupsInterface {
   client: SigningCosmWasmClient;
@@ -149,35 +149,35 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
         addresses_to_remove: addressesToRemove,
         group
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeGroup = async ({
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateOwner = async ({
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
index e468ac20..2c19498a 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
@@ -176,24 +176,24 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -210,27 +210,27 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwProposalSingleClient extends CwProposalSingleQueryClient implements CwProposalSingleInterface {
   client: SigningCosmWasmClient;
@@ -261,14 +261,14 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -276,35 +276,35 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateConfig = async ({
     allowRevoting,
@@ -322,7 +322,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -333,50 +333,50 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 02276b5d..5dc0d928 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -297,20 +297,20 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     newOwner
   }: {
     newOwner: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  acceptOwnership: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  acceptOwnership: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     user
   }: {
     user: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -319,7 +319,7 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -328,31 +328,31 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class AccountsNftClient extends AccountsNftQueryClient implements AccountsNftInterface {
   client: SigningCosmWasmClient;
@@ -380,28 +380,28 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     newOwner
   }: {
     newOwner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         new_owner: newOwner
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       accept_ownership: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     user
   }: {
     user: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         user
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   transferNft = async ({
     recipient,
@@ -409,13 +409,13 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -425,14 +425,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -442,14 +442,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -457,13 +457,13 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -471,34 +471,34 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
index 6f780f31..98d790bf 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
@@ -189,24 +189,24 @@ export interface Cw3FixedMultiSigInterface extends Cw3FixedMultiSigReadOnlyInter
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigInterface {
   client: SigningCosmWasmClient;
@@ -234,7 +234,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -242,7 +242,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
         msgs,
         title
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   vote = async ({
     proposalId,
@@ -250,34 +250,34 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts
index c438469b..9b68c374 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.client.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts
@@ -92,24 +92,24 @@ export interface Cw4GroupInterface extends Cw4GroupReadOnlyInterface {
     admin
   }: {
     admin?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateMembers: ({
     add,
     remove
   }: {
     add: Member[];
     remove: string[];
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addHook: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeHook: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInterface {
   client: SigningCosmWasmClient;
@@ -131,12 +131,12 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     admin
   }: {
     admin?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         admin
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateMembers = async ({
     add,
@@ -144,34 +144,34 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
   }: {
     add: Member[];
     remove: string[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_members: {
         add,
         remove
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addHook = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_hook: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeHook = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_hook: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
index 70e3100c..fc2fd386 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -36,8 +36,8 @@ export interface CyberPunkInterface extends CyberPunkReadOnlyInterface {
   }: {
     memCost: number;
     timeCost: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  mirrorEnv: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mirrorEnv: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkInterface {
   client: SigningCosmWasmClient;
@@ -59,17 +59,17 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
   }: {
     memCost: number;
     timeCost: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       argon2: {
         mem_cost: memCost,
         time_cost: timeCost
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mirror_env: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
index bce1ebde..c3139417 100644
--- a/__output__/idl-version/hackatom/HackAtom.client.ts
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -76,18 +76,18 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
 export interface HackAtomInterface extends HackAtomReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  release: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  cpuLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  storageLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  memoryLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  messageLoop: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  release: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  cpuLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  storageLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  memoryLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  messageLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allocateLargeMemory: ({
     pages
   }: {
     pages: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  panic: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  userErrorsInApiCalls: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  panic: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  userErrorsInApiCalls: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class HackAtomClient extends HackAtomQueryClient implements HackAtomInterface {
   client: SigningCosmWasmClient;
@@ -109,50 +109,50 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
 
-  release = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  release = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       release: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cpu_loop: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       storage_loop: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       memory_loop: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       message_loop: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   allocateLargeMemory = async ({
     pages
   }: {
     pages: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allocate_large_memory: {
         pages
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       panic: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       user_errors_in_api_calls: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts
index 0a2f6b24..24fd0088 100644
--- a/__output__/minter/Minter.client.ts
+++ b/__output__/minter/Minter.client.ts
@@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -113,48 +113,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.withdraw = this.withdraw.bind(this);
   }
 
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mintFor = async ({
     recipient,
@@ -162,17 +162,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/sg721/Sg721.client.ts b/__output__/sg721/Sg721.client.ts
index 7946534b..ef6d836b 100644
--- a/__output__/sg721/Sg721.client.ts
+++ b/__output__/sg721/Sg721.client.ts
@@ -248,7 +248,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -257,7 +257,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -266,26 +266,26 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -296,12 +296,12 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   client: SigningCosmWasmClient;
@@ -329,13 +329,13 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   sendNft = async ({
     contract,
@@ -345,14 +345,14 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approve = async ({
     expires,
@@ -362,14 +362,14 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revoke = async ({
     spender,
@@ -377,13 +377,13 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   approveAll = async ({
     expires,
@@ -391,24 +391,24 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   mint = async ({
     extension,
@@ -420,7 +420,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -428,17 +428,17 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 93a6f935..d00d3933 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -92,7 +92,7 @@ export interface FactoryUpdateAdminMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateAdminMutation>, "mutationFn">) {
@@ -102,9 +102,9 @@ export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.updateAdmin(msg, fee, memo, funds), options);
+  }) => client.updateAdmin(msg, fee, memo, _funds), options);
 }
 export interface FactoryUpdateGovecAddrMutation {
   client: FactoryClient;
@@ -114,7 +114,7 @@ export interface FactoryUpdateGovecAddrMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>, "mutationFn">) {
@@ -124,9 +124,9 @@ export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOpti
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.updateGovecAddr(msg, fee, memo, funds), options);
+  }) => client.updateGovecAddr(msg, fee, memo, _funds), options);
 }
 export interface FactoryUpdateWalletFeeMutation {
   client: FactoryClient;
@@ -136,7 +136,7 @@ export interface FactoryUpdateWalletFeeMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>, "mutationFn">) {
@@ -146,9 +146,9 @@ export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOpti
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.updateWalletFee(msg, fee, memo, funds), options);
+  }) => client.updateWalletFee(msg, fee, memo, _funds), options);
 }
 export interface FactoryUpdateCodeIdMutation {
   client: FactoryClient;
@@ -159,7 +159,7 @@ export interface FactoryUpdateCodeIdMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateCodeIdMutation>, "mutationFn">) {
@@ -169,9 +169,9 @@ export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.updateCodeId(msg, fee, memo, funds), options);
+  }) => client.updateCodeId(msg, fee, memo, _funds), options);
 }
 export interface FactoryMigrateWalletMutation {
   client: FactoryClient;
@@ -182,7 +182,7 @@ export interface FactoryMigrateWalletMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryMigrateWalletMutation>, "mutationFn">) {
@@ -192,9 +192,9 @@ export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOption
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.migrateWallet(msg, fee, memo, funds), options);
+  }) => client.migrateWallet(msg, fee, memo, _funds), options);
 }
 export interface FactoryUpdateProxyUserMutation {
   client: FactoryClient;
@@ -205,7 +205,7 @@ export interface FactoryUpdateProxyUserMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateProxyUserMutation>, "mutationFn">) {
@@ -215,9 +215,9 @@ export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOpti
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.updateProxyUser(msg, fee, memo, funds), options);
+  }) => client.updateProxyUser(msg, fee, memo, _funds), options);
 }
 export interface FactoryCreateWalletMutation {
   client: FactoryClient;
@@ -227,7 +227,7 @@ export interface FactoryCreateWalletMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    funds?: Coin[];
+    _funds?: Coin[];
   };
 }
 export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryCreateWalletMutation>, "mutationFn">) {
@@ -237,7 +237,7 @@ export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions
     args: {
       fee,
       memo,
-      funds
+      _funds
     } = {}
-  }) => client.createWallet(msg, fee, memo, funds), options);
+  }) => client.createWallet(msg, fee, memo, _funds), options);
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory/Factory.client.ts b/__output__/vectis/factory/Factory.client.ts
index f7ff49ac..7ef4e86f 100644
--- a/__output__/vectis/factory/Factory.client.ts
+++ b/__output__/vectis/factory/Factory.client.ts
@@ -114,43 +114,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -175,12 +175,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateProxyUser = async ({
     newUser,
@@ -188,13 +188,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -202,13 +202,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateCodeId = async ({
     newCodeId,
@@ -216,45 +216,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/vectis/govec/Govec.client.ts b/__output__/vectis/govec/Govec.client.ts
index 1fcf7a57..0e457046 100644
--- a/__output__/vectis/govec/Govec.client.ts
+++ b/__output__/vectis/govec/Govec.client.ts
@@ -51,40 +51,40 @@ export interface GovecInterface extends GovecReadOnlyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class GovecClient extends GovecQueryClient implements GovecInterface {
   client: SigningCosmWasmClient;
@@ -110,61 +110,61 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   relay = async ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   rotateUserKey = async ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addRelayer = async ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeRelayer = async ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGuardians = async ({
     guardians,
@@ -172,23 +172,23 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
         new_multisig_code_id: newMultisigCodeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateLabel = async ({
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/__output__/vectis/proxy/Proxy.client.ts b/__output__/vectis/proxy/Proxy.client.ts
index 37b7e570..39b36049 100644
--- a/__output__/vectis/proxy/Proxy.client.ts
+++ b/__output__/vectis/proxy/Proxy.client.ts
@@ -51,40 +51,40 @@ export interface ProxyInterface extends ProxyReadOnlyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }
 export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   client: SigningCosmWasmClient;
@@ -110,61 +110,61 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   relay = async ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   rotateUserKey = async ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   addRelayer = async ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   removeRelayer = async ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateGuardians = async ({
     guardians,
@@ -172,23 +172,23 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
         new_multisig_code_id: newMultisigCodeId
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
   updateLabel = async ({
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
       }
-    }, fee, memo, funds);
+    }, fee, memo, _funds);
   };
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 220b3fe5..c515cc58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9218,6 +9218,16 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
+"wasm-ast-types@file:packages/wasm-ast-types":
+  version "0.21.0"
+  dependencies:
+    "@babel/runtime" "^7.18.9"
+    "@babel/types" "7.18.10"
+    "@jest/transform" "28.1.3"
+    ast-stringify "0.1.0"
+    case "1.6.3"
+    deepmerge "4.2.2"
+
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"

From 1da0b2ce40cd85f69c3325bc0de0d3e0f2b55335 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 14:52:59 +0300
Subject: [PATCH 112/287] Reverse funds and _funds

---
 .../CwAdminFactory.message-composer.ts        |  2 +-
 .../CwCodeIdRegistry.message-composer.ts      | 10 +++++-----
 .../contracts/CwSingle.message-composer.ts    | 18 ++++++++---------
 .../contracts/Factory.message-composer.ts     | 14 ++++++-------
 .../contracts/Minter.message-composer.ts      | 14 ++++++-------
 .../CwAdminFactory.message-composer.ts        |  2 +-
 .../CwCodeIdRegistry.message-composer.ts      | 10 +++++-----
 .../default/CwSingle.message-composer.ts      | 18 ++++++++---------
 .../default/Factory.message-composer.ts       | 14 ++++++-------
 .../default/Minter.message-composer.ts        | 14 ++++++-------
 .../CwAdminFactory.message-composer.ts        |  2 +-
 .../CwCodeIdRegistry.message-composer.ts      | 10 +++++-----
 .../no-extends/CwSingle.message-composer.ts   | 18 ++++++++---------
 .../no-extends/Factory.message-composer.ts    | 14 ++++++-------
 .../no-extends/Minter.message-composer.ts     | 14 ++++++-------
 .../CwAdminFactory.message-composer.ts        |  2 +-
 .../CwCodeIdRegistry.message-composer.ts      | 10 +++++-----
 .../CwNamedGroups.message-composer.ts         |  6 +++---
 .../CwProposalSingle.message-composer.ts      | 18 ++++++++---------
 .../AccountsNft.message-composer.ts           | 20 +++++++++----------
 .../Cw3FixedMultiSig.message-composer.ts      |  8 ++++----
 .../cw4-group/Cw4Group.message-composer.ts    |  8 ++++----
 .../cyberpunk/CyberPunk.message-composer.ts   |  4 ++--
 .../hackatom/HackAtom.message-composer.ts     | 16 +++++++--------
 __output__/minter/Minter.message-composer.ts  | 14 ++++++-------
 __output__/sg721/Sg721.message-composer.ts    | 16 +++++++--------
 .../factory/Factory.message-composer.ts       | 14 ++++++-------
 .../vectis/govec/Govec.message-composer.ts    | 16 +++++++--------
 .../vectis/proxy/Proxy.message-composer.ts    | 16 +++++++--------
 .../message-composer.spec.ts.snap             | 20 +++++++++----------
 .../src/message-composer/message-composer.ts  |  4 ++--
 yarn.lock                                     | 10 ----------
 32 files changed, 183 insertions(+), 193 deletions(-)

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index 5b6dd320..6770e937 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index 97e190f6..fe110741 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index 48004019..73d8b24d 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -114,7 +114,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             title
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             vote
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -155,7 +155,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -174,7 +174,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -211,7 +211,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             threshold
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -230,7 +230,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -249,7 +249,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -268,7 +268,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -287,7 +287,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index 5eaf412b..e5d6c5de 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 8c951ac0..78472c03 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -81,7 +81,7 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -154,7 +154,7 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index 5b6dd320..6770e937 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index 97e190f6..fe110741 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index 48004019..73d8b24d 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -114,7 +114,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             title
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             vote
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -155,7 +155,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -174,7 +174,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -211,7 +211,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             threshold
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -230,7 +230,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -249,7 +249,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -268,7 +268,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -287,7 +287,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index 5eaf412b..e5d6c5de 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 8c951ac0..78472c03 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -81,7 +81,7 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -154,7 +154,7 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index 5b6dd320..6770e937 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index 97e190f6..fe110741 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index 48004019..73d8b24d 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -114,7 +114,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             title
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             vote
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -155,7 +155,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -174,7 +174,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -211,7 +211,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             threshold
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -230,7 +230,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -249,7 +249,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -268,7 +268,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -287,7 +287,7 @@ export class CwSingleMessageComposer implements CwSingleMessage {
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index 5eaf412b..e5d6c5de 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 8c951ac0..78472c03 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -81,7 +81,7 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -154,7 +154,7 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index 5b6dd320..6770e937 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -53,7 +53,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
             label
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index 97e190f6..fe110741 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -93,7 +93,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             sender
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -124,7 +124,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             version
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -149,7 +149,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             owner
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -171,7 +171,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             code_id: codeId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -193,7 +193,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
             payment_info: paymentInfo
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index 1c15918a..4836e52f 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -65,7 +65,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
             group
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -84,7 +84,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
             group
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -103,7 +103,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
             owner
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index c07212cd..8843416c 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -114,7 +114,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             title
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -136,7 +136,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             vote
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -155,7 +155,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -174,7 +174,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -211,7 +211,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             threshold
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -230,7 +230,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -249,7 +249,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -268,7 +268,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -287,7 +287,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
             address
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index a34e8c51..e7f1a152 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -107,7 +107,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             new_owner: newOwner
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -120,7 +120,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
         msg: toUtf8(JSON.stringify({
           accept_ownership: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -139,7 +139,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             user
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -161,7 +161,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -186,7 +186,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -211,7 +211,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -233,7 +233,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -255,7 +255,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             operator
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -274,7 +274,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             operator
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -293,7 +293,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index 4df5e0e6..f29fcb55 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -77,7 +77,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             title
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -99,7 +99,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             vote
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -118,7 +118,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -137,7 +137,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
             proposal_id: proposalId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index 02af046e..e9cdd0d6 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -63,7 +63,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             admin
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -85,7 +85,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             remove
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -104,7 +104,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -123,7 +123,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index 132e7a67..fe8d0b77 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -50,7 +50,7 @@ export class CyberPunkMessageComposer implements CyberPunkMessage {
             time_cost: timeCost
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -63,7 +63,7 @@ export class CyberPunkMessageComposer implements CyberPunkMessage {
         msg: toUtf8(JSON.stringify({
           mirror_env: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index 26ac2d28..c7463089 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -50,7 +50,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           release: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -63,7 +63,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           cpu_loop: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -76,7 +76,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           storage_loop: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -89,7 +89,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           memory_loop: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -102,7 +102,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           message_loop: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -121,7 +121,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
             pages
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -134,7 +134,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           panic: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -147,7 +147,7 @@ export class HackAtomMessageComposer implements HackAtomMessage {
         msg: toUtf8(JSON.stringify({
           user_errors_in_api_calls: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 8c951ac0..78472c03 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -62,7 +62,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -81,7 +81,7 @@ export class MinterMessageComposer implements MinterMessage {
             whitelist
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -94,7 +94,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -113,7 +113,7 @@ export class MinterMessageComposer implements MinterMessage {
             per_address_limit: perAddressLimit
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -132,7 +132,7 @@ export class MinterMessageComposer implements MinterMessage {
             recipient
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -154,7 +154,7 @@ export class MinterMessageComposer implements MinterMessage {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -167,7 +167,7 @@ export class MinterMessageComposer implements MinterMessage {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index ab6d060a..84f6d2bd 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -108,7 +108,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -133,7 +133,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -158,7 +158,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -180,7 +180,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -202,7 +202,7 @@ export class Sg721MessageComposer implements Sg721Message {
             operator
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -221,7 +221,7 @@ export class Sg721MessageComposer implements Sg721Message {
             operator
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -249,7 +249,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_uri: tokenUri
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -268,7 +268,7 @@ export class Sg721MessageComposer implements Sg721Message {
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index 5eaf412b..e5d6c5de 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -84,7 +84,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             create_wallet_msg: createWalletMsg
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -106,7 +106,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             old_user: oldUser
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -128,7 +128,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             wallet_address: walletAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -150,7 +150,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             ty
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -169,7 +169,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             new_fee: newFee
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -188,7 +188,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -207,7 +207,7 @@ export class FactoryMessageComposer implements FactoryMessage {
             addr
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index 7b030c9f..4c0426bc 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -82,7 +82,7 @@ export class GovecMessageComposer implements GovecMessage {
             msgs
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -95,7 +95,7 @@ export class GovecMessageComposer implements GovecMessage {
         msg: toUtf8(JSON.stringify({
           revert_freeze_status: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -114,7 +114,7 @@ export class GovecMessageComposer implements GovecMessage {
             transaction
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -133,7 +133,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_user_address: newUserAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -152,7 +152,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_relayer_address: newRelayerAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -171,7 +171,7 @@ export class GovecMessageComposer implements GovecMessage {
             relayer_address: relayerAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -193,7 +193,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_multisig_code_id: newMultisigCodeId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -212,7 +212,7 @@ export class GovecMessageComposer implements GovecMessage {
             new_label: newLabel
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index 44fa3716..92591221 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -82,7 +82,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             msgs
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -95,7 +95,7 @@ export class ProxyMessageComposer implements ProxyMessage {
         msg: toUtf8(JSON.stringify({
           revert_freeze_status: {}
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -114,7 +114,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             transaction
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -133,7 +133,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_user_address: newUserAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -152,7 +152,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_relayer_address: newRelayerAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -171,7 +171,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             relayer_address: relayerAddress
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -193,7 +193,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_multisig_code_id: newMultisigCodeId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -212,7 +212,7 @@ export class ProxyMessageComposer implements ProxyMessage {
             new_label: newLabel
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap b/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
index a211534f..2fdcb0a8 100644
--- a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
+++ b/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
@@ -103,7 +103,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -128,7 +128,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -153,7 +153,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -175,7 +175,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -197,7 +197,7 @@ exports[`execute classes 1`] = `
             operator
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -216,7 +216,7 @@ exports[`execute classes 1`] = `
             operator
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -244,7 +244,7 @@ exports[`execute classes 1`] = `
             token_uri: tokenUri
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -263,7 +263,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -297,7 +297,7 @@ exports[`ownershipClass 1`] = `
             new_factory: newFactory
           }
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
@@ -310,7 +310,7 @@ exports[`ownershipClass 1`] = `
         msg: toUtf8(JSON.stringify({
           update_ownership: action
         })),
-        _funds: funds
+        funds: _funds
       })
     };
   };
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.ts b/packages/wasm-ast-types/src/message-composer/message-composer.ts
index 99ad1f64..841d666b 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.ts
@@ -105,8 +105,8 @@ const createWasmExecMethodMessageComposer = (
                       ])
                     ),
                     t.objectProperty(
-                      t.identifier('_funds'),
-                      t.identifier('funds')
+                      t.identifier('funds'),
+                      t.identifier('_funds')
                     )
                   ])
                 ]
diff --git a/yarn.lock b/yarn.lock
index c515cc58..220b3fe5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9218,16 +9218,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-"wasm-ast-types@file:packages/wasm-ast-types":
-  version "0.21.0"
-  dependencies:
-    "@babel/runtime" "^7.18.9"
-    "@babel/types" "7.18.10"
-    "@jest/transform" "28.1.3"
-    ast-stringify "0.1.0"
-    case "1.6.3"
-    deepmerge "4.2.2"
-
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"

From 8dc8c227bee95009c65b021de1677a1f2385c02e Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 15:53:32 +0300
Subject: [PATCH 113/287] Update react-query to use normal funds

---
 .../Factory.react-query.ts                    | 14 +++---
 .../__snapshots__/react-query.spec.ts.snap    | 20 ++++-----
 .../src/react-query/react-query.ts            | 43 +++++++++++--------
 packages/wasm-ast-types/src/utils/babel.ts    |  7 +--
 .../wasm-ast-types/src/utils/constants.ts     | 31 +++++++------
 5 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index d00d3933..2945c3b6 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -92,7 +92,7 @@ export interface FactoryUpdateAdminMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateAdminMutation>, "mutationFn">) {
@@ -114,7 +114,7 @@ export interface FactoryUpdateGovecAddrMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>, "mutationFn">) {
@@ -136,7 +136,7 @@ export interface FactoryUpdateWalletFeeMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>, "mutationFn">) {
@@ -159,7 +159,7 @@ export interface FactoryUpdateCodeIdMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateCodeIdMutation>, "mutationFn">) {
@@ -182,7 +182,7 @@ export interface FactoryMigrateWalletMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryMigrateWalletMutation>, "mutationFn">) {
@@ -205,7 +205,7 @@ export interface FactoryUpdateProxyUserMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateProxyUserMutation>, "mutationFn">) {
@@ -227,7 +227,7 @@ export interface FactoryCreateWalletMutation {
   args?: {
     fee?: number | StdFee | "auto";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryCreateWalletMutation>, "mutationFn">) {
diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index 6f0a3ecb..6990d5d9 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -1133,7 +1133,7 @@ exports[`createReactQueryHooks 6`] = `
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721BurnMutation>, \\"mutationFn\\">) {
@@ -1158,7 +1158,7 @@ export interface Sg721MintMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721MintMutation>, \\"mutationFn\\">) {
@@ -1180,7 +1180,7 @@ export interface Sg721RevokeAllMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeAllMutation>, \\"mutationFn\\">) {
@@ -1203,7 +1203,7 @@ export interface Sg721ApproveAllMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveAllMutation>, \\"mutationFn\\">) {
@@ -1226,7 +1226,7 @@ export interface Sg721RevokeMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeMutation>, \\"mutationFn\\">) {
@@ -1250,7 +1250,7 @@ export interface Sg721ApproveMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveMutation>, \\"mutationFn\\">) {
@@ -1274,7 +1274,7 @@ export interface Sg721SendNftMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721SendNftMutation>, \\"mutationFn\\">) {
@@ -1297,7 +1297,7 @@ export interface Sg721TransferNftMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721TransferNftMutation>, \\"mutationFn\\">) {
@@ -1320,7 +1320,7 @@ exports[`ownership 1`] = `
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>, \\"mutationFn\\">) {
@@ -1342,7 +1342,7 @@ export interface OwnershipSetFactoryMutation {
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;
-    _funds?: Coin[];
+    funds?: Coin[];
   };
 }
 export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipSetFactoryMutation>, \\"mutationFn\\">) {
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 167db1ca..7f123b5c 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -4,9 +4,11 @@ import { camel, pascal } from 'case';
 import { ExecuteMsg, QueryMsg } from '../types';
 import {
   callExpression,
-  createTypedObjectParams, FIXED_EXECUTE_PARAMS,
+  createTypedObjectParams,
+  FIXED_EXECUTE_PARAMS,
   getMessageProperties,
   identifier,
+  OPTIONAL_FUNDS_PARAM,
   tsObjectPattern,
   tsPropertySignature
 } from '../utils';
@@ -25,6 +27,7 @@ import {
 import { ReactQueryOptions, RenderContext } from '../context';
 import { JSONSchema } from '../types';
 import { ArrowFunctionExpression, objectExpression } from '@babel/types';
+import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
 
 interface ReactQueryHookQuery {
   context: RenderContext;
@@ -119,7 +122,7 @@ export const createReactQueryHooks = ({
         context,
         queryFactoryName,
         queryKeysName,
-        queryMsgs,
+        queryMsgs
       })
     );
   }
@@ -406,7 +409,7 @@ export const createReactQueryMutationArgsInterface = ({
     )
   ];
 
-  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation
+  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation;
 
   if (msgType) {
     body.push(
@@ -414,7 +417,8 @@ export const createReactQueryMutationArgsInterface = ({
         t.identifier('msg'),
         // @ts-ignore
         msgType
-      ));
+      )
+    );
   }
 
   context.addUtil('StdFee');
@@ -424,16 +428,18 @@ 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
+          ),
+          value: '_funds'
+        }
+      ])
     )
   );
 
@@ -786,7 +792,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)
+                          )
                         ])
                       )
                     )
@@ -839,7 +847,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)
+                    )
                   ])
                 )
               );
@@ -870,7 +880,6 @@ function createReactQueryHookGenericInterface({
   QueryClient,
   genericQueryInterfaceName
 }: ReactQueryHookGenericInterface) {
-
   const options = context.options.reactQuery;
   const genericResponseTypeName = 'TResponse';
 
diff --git a/packages/wasm-ast-types/src/utils/babel.ts b/packages/wasm-ast-types/src/utils/babel.ts
index 8515f192..93e68dee 100644
--- a/packages/wasm-ast-types/src/utils/babel.ts
+++ b/packages/wasm-ast-types/src/utils/babel.ts
@@ -1,18 +1,19 @@
 import * as t from '@babel/types';
 import { snake } from "case";
 import { Field, QueryMsg, ExecuteMsg } from '../types';
-import { TSTypeAnnotation, TSExpressionWithTypeArguments } from '@babel/types';
+import { TSTypeAnnotation, TSExpressionWithTypeArguments, Noop, TypeAnnotation } from '@babel/types';
 import { refLookup } from './ref';
 
 // t.TSPropertySignature - kind?
 export const propertySignature = (
     name: string,
-    typeAnnotation: t.TSTypeAnnotation,
+    typeAnnotation: TSTypeAnnotation,
     optional: boolean = false
-) => {
+): t.TSPropertySignature => {
     return {
         type: 'TSPropertySignature',
         key: t.identifier(name),
+      kind: 'get',
         typeAnnotation,
         optional
     }
diff --git a/packages/wasm-ast-types/src/utils/constants.ts b/packages/wasm-ast-types/src/utils/constants.ts
index 46122904..ab2a3e23 100644
--- a/packages/wasm-ast-types/src/utils/constants.ts
+++ b/packages/wasm-ast-types/src/utils/constants.ts
@@ -6,18 +6,25 @@ export const OPTIONAL_FUNDS_PARAM = identifier(
   t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))),
   true
 );
-export const FIXED_EXECUTE_PARAMS = [
-  identifier(
-    'fee',
-    t.tsTypeAnnotation(
-      t.tsUnionType([
-        t.tsNumberKeyword(),
-        t.tsTypeReference(t.identifier('StdFee')),
-        t.tsLiteralType(t.stringLiteral('auto'))
-      ])
-    ),
-    true
+export const OPTIONAL_FEE_PARAM = identifier(
+  'fee',
+  t.tsTypeAnnotation(
+    t.tsUnionType([
+      t.tsNumberKeyword(),
+      t.tsTypeReference(t.identifier('StdFee')),
+      t.tsLiteralType(t.stringLiteral('auto'))
+    ])
   ),
-  identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true),
+  true
+);
+export const OPTIONAL_MEMO_PARAM = identifier(
+  'memo',
+  t.tsTypeAnnotation(t.tsStringKeyword()),
+  true
+);
+
+export const FIXED_EXECUTE_PARAMS = [
+  OPTIONAL_FEE_PARAM,
+  OPTIONAL_MEMO_PARAM,
   OPTIONAL_FUNDS_PARAM
 ];

From a9d3a034ab80639f46fede8a42d92910149375af Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 16:00:19 +0300
Subject: [PATCH 114/287] Update react-query to use normal funds in mutations

---
 .../__snapshots__/react-query.spec.ts.snap    | 40 +++++++++----------
 .../src/react-query/react-query.ts            | 27 +++++--------
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
index 6990d5d9..0da3f360 100644
--- a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
+++ b/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
@@ -1143,9 +1143,9 @@ export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteRe
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.burn(msg, fee, memo, _funds), options);
+  }) => client.burn(msg, fee, memo, funds), options);
 }
 export interface Sg721MintMutation {
   client: Sg721Client;
@@ -1168,9 +1168,9 @@ export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteRe
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.mint(msg, fee, memo, _funds), options);
+  }) => client.mint(msg, fee, memo, funds), options);
 }
 export interface Sg721RevokeAllMutation {
   client: Sg721Client;
@@ -1190,9 +1190,9 @@ export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<Exec
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.revokeAll(msg, fee, memo, _funds), options);
+  }) => client.revokeAll(msg, fee, memo, funds), options);
 }
 export interface Sg721ApproveAllMutation {
   client: Sg721Client;
@@ -1213,9 +1213,9 @@ export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<Exe
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.approveAll(msg, fee, memo, _funds), options);
+  }) => client.approveAll(msg, fee, memo, funds), options);
 }
 export interface Sg721RevokeMutation {
   client: Sg721Client;
@@ -1236,9 +1236,9 @@ export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<Execute
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.revoke(msg, fee, memo, _funds), options);
+  }) => client.revoke(msg, fee, memo, funds), options);
 }
 export interface Sg721ApproveMutation {
   client: Sg721Client;
@@ -1260,9 +1260,9 @@ export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<Execut
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.approve(msg, fee, memo, _funds), options);
+  }) => client.approve(msg, fee, memo, funds), options);
 }
 export interface Sg721SendNftMutation {
   client: Sg721Client;
@@ -1284,9 +1284,9 @@ export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<Execut
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.sendNft(msg, fee, memo, _funds), options);
+  }) => client.sendNft(msg, fee, memo, funds), options);
 }
 export interface Sg721TransferNftMutation {
   client: Sg721Client;
@@ -1307,9 +1307,9 @@ export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<Ex
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.transferNft(msg, fee, memo, _funds), options);
+  }) => client.transferNft(msg, fee, memo, funds), options);
 }"
 `;
 
@@ -1330,9 +1330,9 @@ export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOp
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.updateOwnership(msg, fee, memo, _funds), options);
+  }) => client.updateOwnership(msg, fee, memo, funds), options);
 }
 export interface OwnershipSetFactoryMutation {
   client: OwnershipClient;
@@ -1352,8 +1352,8 @@ export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.setFactory(msg, fee, memo, _funds), options);
+  }) => client.setFactory(msg, fee, memo, funds), options);
 }"
 `;
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 7f123b5c..655c1349 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -431,14 +431,7 @@ export const createReactQueryMutationArgsInterface = ({
       t.tsTypeLiteral([
         propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation, true),
         propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation, true),
-        {
-          ...propertySignature(
-            'funds',
-            OPTIONAL_FUNDS_PARAM.typeAnnotation,
-            true
-          ),
-          value: '_funds'
-        }
+        propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation, true)
       ])
     )
   );
@@ -573,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([])
       )
     )
@@ -611,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
               ),

From dea086543298d82d3e06ae6031172943b88ef9b6 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Sun, 21 May 2023 16:42:30 +0300
Subject: [PATCH 115/287] Add aliasEntryPoints option

---
 README.md                                     |  9 ++++---
 packages/ts-codegen/README.md                 |  1 +
 packages/ts-codegen/src/generators/types.ts   | 26 +++++++++++++++++--
 .../wasm-ast-types/src/context/context.ts     |  2 ++
 .../wasm-ast-types/types/context/context.d.ts |  2 ++
 yarn.lock                                     | 12 ---------
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index a51ac9f9..acef2606 100644
--- a/README.md
+++ b/README.md
@@ -136,10 +136,11 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 #### Types Options
 
-  | option                        | description                                          |
-  | ----------------------------- | ---------------------------------------------------  |
-  | `types.enabled`               | enable type generation                               |
-  | `types.aliasExecuteMsg`       | generate a type alias based on the contract name     |
+  | option                  | description                                          |
+-------------------------| ----------------------------- | ---------------------------------------------------  |
+  | `types.enabled`         | enable type generation                               |
+  | `types.aliasExecuteMsg` | generate a type alias based on the contract name     |
+  | `types.aliasEntryPoints`               | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 4fc0e4b6..e342fd88 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -141,6 +141,7 @@ Typescript types and interfaces are generated in separate files so they can be i
   | ----------------------------- | ---------------------------------------------------  |
   | `types.enabled`               | enable type generation                               |
   | `types.aliasExecuteMsg`       | generate a type alias based on the contract name     |
+  | `types.aliasEntryPoints`               | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 
diff --git a/packages/ts-codegen/src/generators/types.ts b/packages/ts-codegen/src/generators/types.ts
index 972c9fe8..96f184fc 100644
--- a/packages/ts-codegen/src/generators/types.ts
+++ b/packages/ts-codegen/src/generators/types.ts
@@ -6,7 +6,7 @@ import * as t from '@babel/types';
 import { writeFileSync } from 'fs';
 import generate from "@babel/generator";
 import { clean } from "../utils/clean";
-import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { ContractInfo, RenderContext, TSTypesOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
 
@@ -36,7 +36,7 @@ export default async (
     )
   });
 
-  // alias the ExecuteMsg
+  // alias the ExecuteMsg (deprecated option)
   if (options.aliasExecuteMsg && ExecuteMsg) {
     body.push(
       t.exportNamedDeclaration(
@@ -49,6 +49,28 @@ export default async (
     );
   }
 
+  function addEntryPointAlias(msgName: string) {
+    body.push(
+      t.exportNamedDeclaration(
+        t.tsTypeAliasDeclaration(
+          t.identifier(`${name}${msgName}`),
+          null,
+          t.tsTypeReference(t.identifier(msgName))
+        )
+      )
+    );
+  }
+
+  if (options.aliasEntryPoints) {
+    if (ExecuteMsg) {
+      addEntryPointAlias('ExecuteMsg');
+    }
+    if (findQueryMsg(schemas)) {
+      addEntryPointAlias('QueryMsg');
+    }
+  }
+
+
   const imports = context.getImports();
   const code = header + generate(
     t.program([
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index cde2a123..9cb27f60 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -30,7 +30,9 @@ export interface RecoilOptions {
 }
 export interface TSTypesOptions {
     enabled?: boolean;
+    // deprecated
     aliasExecuteMsg?: boolean;
+    aliasEntryPoints?: boolean;
 }
 
 /// END Plugin Types
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 073ca6cd..f3b19e60 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -25,7 +25,9 @@ export interface RecoilOptions {
 }
 export interface TSTypesOptions {
     enabled?: boolean;
+    // deprecated
     aliasExecuteMsg?: boolean;
+    aliasEntryPoints?: boolean;
 }
 interface KeyedSchema {
     [key: string]: JSONSchema;
diff --git a/yarn.lock b/yarn.lock
index 5c41f663..220b3fe5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9218,18 +9218,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-"wasm-ast-types@path:../wasm-ast-types":
-  version "0.17.0"
-  resolved "https://registry.npmjs.org/wasm-ast-types/-/wasm-ast-types-0.17.0.tgz#417280a61d60ea9964667cf2edb8f5281dc295d7"
-  integrity sha512-WeriXPbG67iI51Mf/5qRR0xcpEaTO/Wyjpl+vsmjZ5K6q/0W6iO03zHsESNIH/hpc5FPTpb0Y0L9xAtnnNe9Ow==
-  dependencies:
-    "@babel/runtime" "^7.18.9"
-    "@babel/types" "7.18.10"
-    "@jest/transform" "28.1.3"
-    ast-stringify "0.1.0"
-    case "1.6.3"
-    deepmerge "4.2.2"
-
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"

From 45ac1ece2da95df09f949d692c95c66de0205408 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 24 May 2023 10:14:01 -0700
Subject: [PATCH 116/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.29.0
 - wasm-ast-types@0.22.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 0b20b401..239ee03c 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.29.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.28.0...@cosmwasm/ts-codegen@0.29.0) (2023-05-24)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.28.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.27.0...@cosmwasm/ts-codegen@0.28.0) (2023-05-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 2f19d9b1..ab2c20a3 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.21.0"
+    "wasm-ast-types": "^0.22.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 5068315d..8e2ec908 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.21.0...wasm-ast-types@0.22.0) (2023-05-24)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.21.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.20.0...wasm-ast-types@0.21.0) (2023-05-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 8bda2efb..5e401b3d 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.21.0",
+  "version": "0.22.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",

From 9979ae4b7209f920fe1b822ede2ba80ee0f2eade Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 24 May 2023 10:16:15 -0700
Subject: [PATCH 117/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.30.0
 - wasm-ast-types@0.23.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 239ee03c..e42efdeb 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.30.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.29.0...@cosmwasm/ts-codegen@0.30.0) (2023-05-24)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.29.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.28.0...@cosmwasm/ts-codegen@0.29.0) (2023-05-24)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 0ec15e00..440a2435 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.22.0"
+    "wasm-ast-types": "^0.23.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 8e2ec908..9e4f66e9 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.23.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.22.0...wasm-ast-types@0.23.0) (2023-05-24)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.22.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.21.0...wasm-ast-types@0.22.0) (2023-05-24)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 5e401b3d..595792d8 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.22.0",
+  "version": "0.23.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",

From 27c675ac05a663c528a2f791e902008cdbaa5c8b Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Tue, 6 Jun 2023 22:37:27 +0800
Subject: [PATCH 118/287] fixed bug reading from long execute msg

---
 __fixtures__/sg721-updatable/.cargo/config    |   4 +
 .../sg721-updatable/.circleci/config.yml      |  61 ++
 .../.github/workflows/Basic.yml               |  75 ++
 __fixtures__/sg721-updatable/.gitignore       |  15 +
 __fixtures__/sg721-updatable/Cargo.lock       | 738 ++++++++++++++++++
 __fixtures__/sg721-updatable/Cargo.toml       |  63 ++
 __fixtures__/sg721-updatable/LICENSE          | 202 +++++
 __fixtures__/sg721-updatable/NOTICE           |  13 +
 __fixtures__/sg721-updatable/README.md        |   3 +
 .../sg721-updatable/examples/schema.rs        |  51 ++
 .../schema/all_nft_info_response.json         | 160 ++++
 .../schema/all_operators_response.json        | 100 +++
 .../schema/all_tokens_response.json           |  18 +
 .../schema/approval_response.json             |  97 +++
 .../schema/approvals_response.json            | 100 +++
 .../schema/collection_info_response.json      |  88 +++
 .../schema/contract_info_response.json        |  18 +
 ...e_msg_for__nullable__empty_and__empty.json | 504 ++++++++++++
 .../schema/instantiate_msg.json               | 112 +++
 .../schema/minter_response.json               |  15 +
 .../schema/nft_info_response.json             |  32 +
 .../schema/num_tokens_response.json           |  16 +
 .../schema/owner_of_response.json             | 106 +++
 .../sg721-updatable/schema/query_msg.json     | 296 +++++++
 .../schema/tokens_response.json               |  18 +
 __fixtures__/sg721-updatable/src/contract.rs  | 378 +++++++++
 __fixtures__/sg721-updatable/src/error.rs     |  31 +
 __fixtures__/sg721-updatable/src/lib.rs       |  69 ++
 __fixtures__/sg721-updatable/src/msg.rs       | 250 ++++++
 __fixtures__/sg721-updatable/src/state.rs     |   4 +
 .../CwAdminFactory.message-composer.ts        |   2 +-
 .../CwCodeIdRegistry.message-composer.ts      |   2 +-
 .../contracts/CwSingle.message-composer.ts    |   2 +-
 .../contracts/Factory.message-composer.ts     |   2 +-
 .../contracts/Minter.message-composer.ts      |   2 +-
 .../CwAdminFactory.message-composer.ts        |   2 +-
 .../CwCodeIdRegistry.message-composer.ts      |   2 +-
 .../default/CwSingle.message-composer.ts      |   2 +-
 .../default/Factory.message-composer.ts       |   2 +-
 .../default/Minter.message-composer.ts        |   2 +-
 .../CwAdminFactory.message-composer.ts        |   2 +-
 .../CwCodeIdRegistry.message-composer.ts      |   2 +-
 .../no-extends/CwSingle.message-composer.ts   |   2 +-
 .../no-extends/Factory.message-composer.ts    |   2 +-
 .../no-extends/Minter.message-composer.ts     |   2 +-
 .../CwAdminFactory.message-composer.ts        |   2 +-
 .../CwCodeIdRegistry.message-composer.ts      |   2 +-
 .../CwNamedGroups.message-composer.ts         |   2 +-
 .../CwProposalSingle.message-composer.ts      |   2 +-
 .../AccountsNft.message-composer.ts           |   2 +-
 .../Cw3FixedMultiSig.message-composer.ts      |   2 +-
 .../cw4-group/Cw4Group.message-composer.ts    |   2 +-
 .../cyberpunk/CyberPunk.message-composer.ts   |   2 +-
 .../hackatom/HackAtom.message-composer.ts     |   2 +-
 __output__/minter/Minter.message-composer.ts  |   2 +-
 .../out/Sg721Updatable.client.ts              | 528 +++++++++++++
 .../out/Sg721Updatable.message-composer.ts    | 415 ++++++++++
 .../out/Sg721Updatable.react-query.ts         | 175 +++++
 .../out/Sg721Updatable.types.ts               | 216 +++++
 __output__/sg721-updatable/out/bundle.ts      |  17 +
 __output__/sg721/Sg721.message-composer.ts    |   2 +-
 .../Factory.react-query.ts                    |  28 +-
 .../factory/Factory.message-composer.ts       |   2 +-
 .../vectis/govec/Govec.message-composer.ts    |   2 +-
 .../vectis/proxy/Proxy.message-composer.ts    |   2 +-
 ...ts-codegen.issue-long-exe-msg-name.test.ts |  29 +
 packages/ts-codegen/src/utils/schemas.ts      |   4 +-
 .../wasm-ast-types/types/client/client.d.ts   |   4 +-
 .../wasm-ast-types/types/context/context.d.ts |   1 -
 .../types/msg-builder/msg-builder.d.ts        |   6 +-
 .../wasm-ast-types/types/utils/babel.d.ts     |   7 +-
 .../wasm-ast-types/types/utils/constants.d.ts |   5 +
 .../wasm-ast-types/types/utils/index.d.ts     |   2 +
 .../wasm-ast-types/types/utils/types.d.ts     |   9 +-
 74 files changed, 5075 insertions(+), 66 deletions(-)
 create mode 100644 __fixtures__/sg721-updatable/.cargo/config
 create mode 100644 __fixtures__/sg721-updatable/.circleci/config.yml
 create mode 100644 __fixtures__/sg721-updatable/.github/workflows/Basic.yml
 create mode 100644 __fixtures__/sg721-updatable/.gitignore
 create mode 100644 __fixtures__/sg721-updatable/Cargo.lock
 create mode 100644 __fixtures__/sg721-updatable/Cargo.toml
 create mode 100644 __fixtures__/sg721-updatable/LICENSE
 create mode 100644 __fixtures__/sg721-updatable/NOTICE
 create mode 100644 __fixtures__/sg721-updatable/README.md
 create mode 100644 __fixtures__/sg721-updatable/examples/schema.rs
 create mode 100644 __fixtures__/sg721-updatable/schema/all_nft_info_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/all_operators_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/all_tokens_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/approval_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/approvals_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/collection_info_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/contract_info_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/execute_msg_for__nullable__empty_and__empty.json
 create mode 100644 __fixtures__/sg721-updatable/schema/instantiate_msg.json
 create mode 100644 __fixtures__/sg721-updatable/schema/minter_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/nft_info_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/num_tokens_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/owner_of_response.json
 create mode 100644 __fixtures__/sg721-updatable/schema/query_msg.json
 create mode 100644 __fixtures__/sg721-updatable/schema/tokens_response.json
 create mode 100644 __fixtures__/sg721-updatable/src/contract.rs
 create mode 100644 __fixtures__/sg721-updatable/src/error.rs
 create mode 100644 __fixtures__/sg721-updatable/src/lib.rs
 create mode 100644 __fixtures__/sg721-updatable/src/msg.rs
 create mode 100644 __fixtures__/sg721-updatable/src/state.rs
 create mode 100644 __output__/sg721-updatable/out/Sg721Updatable.client.ts
 create mode 100644 __output__/sg721-updatable/out/Sg721Updatable.message-composer.ts
 create mode 100644 __output__/sg721-updatable/out/Sg721Updatable.react-query.ts
 create mode 100644 __output__/sg721-updatable/out/Sg721Updatable.types.ts
 create mode 100644 __output__/sg721-updatable/out/bundle.ts
 create mode 100644 packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
 create mode 100644 packages/wasm-ast-types/types/utils/constants.d.ts

diff --git a/__fixtures__/sg721-updatable/.cargo/config b/__fixtures__/sg721-updatable/.cargo/config
new file mode 100644
index 00000000..336b618a
--- /dev/null
+++ b/__fixtures__/sg721-updatable/.cargo/config
@@ -0,0 +1,4 @@
+[alias]
+wasm = "build --release --target wasm32-unknown-unknown"
+unit-test = "test --lib"
+schema = "run --example schema"
diff --git a/__fixtures__/sg721-updatable/.circleci/config.yml b/__fixtures__/sg721-updatable/.circleci/config.yml
new file mode 100644
index 00000000..9b076696
--- /dev/null
+++ b/__fixtures__/sg721-updatable/.circleci/config.yml
@@ -0,0 +1,61 @@
+version: 2.1
+
+executors:
+  builder:
+    docker:
+      - image: buildpack-deps:trusty
+
+jobs:
+  docker-image:
+    executor: builder
+    steps:
+      - checkout
+      - setup_remote_docker
+        docker_layer_caching: true
+      - run:
+          name: Build Docker artifact
+          command: docker build --pull -t "cosmwasm/cw-gitpod-base:${CIRCLE_SHA1}" .
+      - run:
+          name: Push application Docker image to docker hub
+          command: |
+            if [ "${CIRCLE_BRANCH}" = "master" ]; then
+              docker tag "cosmwasm/cw-gitpod-base:${CIRCLE_SHA1}" cosmwasm/cw-gitpod-base:latest
+              docker login --password-stdin -u "$DOCKER_USER" \<<<"$DOCKER_PASS"
+              docker push cosmwasm/cw-gitpod-base:latest
+              docker logout
+            fi
+
+  docker-tagged:
+    executor: builder
+    steps:
+      - checkout
+      - setup_remote_docker
+        docker_layer_caching: true
+      - run:
+          name: Push application Docker image to docker hub
+          command: |
+            docker tag "cosmwasm/cw-gitpod-base:${CIRCLE_SHA1}" "cosmwasm/cw-gitpod-base:${CIRCLE_TAG}"
+            docker login --password-stdin -u "$DOCKER_USER" \<<<"$DOCKER_PASS"
+            docker push
+            docker logout
+
+workflows:
+  version: 2
+  test-suite:
+    jobs:
+      # this is now a slow process... let's only run on master
+      - docker-image:
+          filters:
+            branches:
+              only:
+                - master
+      - docker-tagged:
+          filters:
+            tags:
+              only:
+                - /^v.*/
+            branches:
+              ignore:
+                - /.*/
+            requires:
+              - docker-image
diff --git a/__fixtures__/sg721-updatable/.github/workflows/Basic.yml b/__fixtures__/sg721-updatable/.github/workflows/Basic.yml
new file mode 100644
index 00000000..0aa41931
--- /dev/null
+++ b/__fixtures__/sg721-updatable/.github/workflows/Basic.yml
@@ -0,0 +1,75 @@
+# Based on https://github.com/actions-rs/example/blob/master/.github/workflows/quickstart.yml
+
+on: [push, pull_request]
+
+name: Basic
+
+jobs:
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.58.1
+          target: wasm32-unknown-unknown
+          override: true
+
+      - name: Run unit tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: unit-test
+          args: --locked
+        env:
+          RUST_BACKTRACE: 1
+
+      - name: Compile WASM contract
+        uses: actions-rs/cargo@v1
+        with:
+          command: wasm
+          args: --locked
+        env:
+          RUSTFLAGS: "-C link-arg=-s"
+
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.58.1
+          override: true
+          components: rustfmt, clippy
+
+      - name: Run cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+
+      - name: Generate Schema
+        uses: actions-rs/cargo@v1
+        with:
+          command: schema
+          args: --locked
+
+      - name: Schema Changes
+        # fails if any changes not committed
+        run: git diff --exit-code schema
diff --git a/__fixtures__/sg721-updatable/.gitignore b/__fixtures__/sg721-updatable/.gitignore
new file mode 100644
index 00000000..dfdaaa6b
--- /dev/null
+++ b/__fixtures__/sg721-updatable/.gitignore
@@ -0,0 +1,15 @@
+# Build results
+/target
+
+# Cargo+Git helper file (https://github.com/rust-lang/cargo/blob/0.44.1/src/cargo/sources/git/utils.rs#L320-L327)
+.cargo-ok
+
+# Text file backups
+**/*.rs.bk
+
+# macOS
+.DS_Store
+
+# IDEs
+*.iml
+.idea
diff --git a/__fixtures__/sg721-updatable/Cargo.lock b/__fixtures__/sg721-updatable/Cargo.lock
new file mode 100644
index 00000000..91fb09ff
--- /dev/null
+++ b/__fixtures__/sg721-updatable/Cargo.lock
@@ -0,0 +1,738 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "anyhow"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+
+[[package]]
+name = "base16ct"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
+[[package]]
+name = "base64ct"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "const-oid"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
+
+[[package]]
+name = "cosmwasm-crypto"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd"
+dependencies = [
+ "digest",
+ "ed25519-zebra",
+ "k256",
+ "rand_core 0.6.3",
+ "thiserror",
+]
+
+[[package]]
+name = "cosmwasm-derive"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
+dependencies = [
+ "syn",
+]
+
+[[package]]
+name = "cosmwasm-schema"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772e80bbad231a47a2068812b723a1ff81dd4a0d56c9391ac748177bea3a61da"
+dependencies = [
+ "schemars",
+ "serde_json",
+]
+
+[[package]]
+name = "cosmwasm-std"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
+dependencies = [
+ "base64",
+ "cosmwasm-crypto",
+ "cosmwasm-derive",
+ "forward_ref",
+ "schemars",
+ "serde",
+ "serde-json-wasm",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "cosmwasm-storage"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d18403b07304d15d304dad11040d45bbcaf78d603b4be3fb5e2685c16f9229b5"
+dependencies = [
+ "cosmwasm-std",
+ "serde",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+dependencies = [
+ "byteorder",
+ "digest",
+ "rand_core 0.5.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "cw-multi-test"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbea57e5be4a682268a5eca1a57efece57a54ff216bfd87603d5e864aad40e12"
+dependencies = [
+ "anyhow",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "cw-storage-plus",
+ "cw-utils",
+ "derivative",
+ "itertools",
+ "prost",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "cw-storage-plus"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9336ecef1e19d56cf6e3e932475fc6a3dee35eec5a386e07917a1d1ba6bb0e35"
+dependencies = [
+ "cosmwasm-std",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "cw-utils"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "babd2c090f39d07ce5bf2556962305e795daa048ce20a93709eb591476e4a29e"
+dependencies = [
+ "cosmwasm-std",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "cw2"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993df11574f29574dd443eb0c189484bb91bc0638b6de3e32ab7f9319c92122d"
+dependencies = [
+ "cosmwasm-std",
+ "cw-storage-plus",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "der"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
+dependencies = [
+ "const-oid",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
+
+[[package]]
+name = "ecdsa"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
+dependencies = [
+ "der",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-zebra"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
+dependencies = [
+ "curve25519-dalek",
+ "hex",
+ "rand_core 0.6.3",
+ "serde",
+ "sha2",
+ "thiserror",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "der",
+ "ff",
+ "generic-array",
+ "group",
+ "rand_core 0.6.3",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "ff"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
+dependencies = [
+ "rand_core 0.6.3",
+ "subtle",
+]
+
+[[package]]
+name = "forward_ref"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+
+[[package]]
+name = "generic-array"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "group"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
+dependencies = [
+ "ff",
+ "rand_core 0.6.3",
+ "subtle",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+dependencies = [
+ "crypto-mac",
+ "digest",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+
+[[package]]
+name = "k256"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "sec1",
+ "sha2",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "pkcs8"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+dependencies = [
+ "der",
+ "spki",
+ "zeroize",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom 0.2.6",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
+dependencies = [
+ "crypto-bigint",
+ "hmac",
+ "zeroize",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+
+[[package]]
+name = "schemars"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d21ecb263bf75fc69d5e74b0f2a60b6dd80cfd9fb0eba15c4b9d1104ceffc77"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219b924f5b39f25b7d7c9203873a2698fdac8db2b396aaea6fa099b699cc40e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn",
+]
+
+[[package]]
+name = "sec1"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
+dependencies = [
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.137"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-json-wasm"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479b4dbc401ca13ee8ce902851b834893251404c4f3c65370a49e047a6be09a5"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.137"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer",
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+ "opaque-debug",
+]
+
+[[package]]
+name = "signature"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+dependencies = [
+ "digest",
+ "rand_core 0.6.3",
+]
+
+[[package]]
+name = "spki"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "syn"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "testgen-local"
+version = "0.1.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "cw-multi-test",
+ "cw-storage-plus",
+ "cw2",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "typenum"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+
+[[package]]
+name = "uint"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "zeroize"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07"
diff --git a/__fixtures__/sg721-updatable/Cargo.toml b/__fixtures__/sg721-updatable/Cargo.toml
new file mode 100644
index 00000000..65f6af21
--- /dev/null
+++ b/__fixtures__/sg721-updatable/Cargo.toml
@@ -0,0 +1,63 @@
+[package]
+name = "sg721-updatable"
+authors = [
+    "John Y <j@noreply.publicawesome.com>",
+    "Shane Vitarana <s@noreply.publicawesome.com>",
+]
+exclude = [
+    # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+    "contract.wasm",
+    "hash.txt",
+]
+description = "Stargaze Updatable NFT collection contract"
+version = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[profile.release]
+opt-level        = 3
+debug            = false
+rpath            = false
+lto              = true
+debug-assertions = false
+codegen-units    = 1
+panic            = 'abort'
+incremental      = false
+overflow-checks  = true
+
+[features]
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+# use library feature to disable all instantiate/execute/query exports
+library = []
+
+
+[dependencies]
+cosmwasm-schema = { workspace = true }
+cosmwasm-std    = { workspace = true }
+cw-storage-plus = { workspace = true }
+cw-utils        = { workspace = true }
+cw2             = { workspace = true }
+cw721           = { workspace = true }
+schemars        = { workspace = true }
+serde           = { workspace = true }
+thiserror       = { workspace = true }
+cw721-base      = { workspace = true, features = ["library"] }
+sg1             = { workspace = true }
+sg721           = { workspace = true }
+sg721-base      = { workspace = true, features = ["library"] }
+sg-std          = { workspace = true }
+semver          = { workspace = true }
+
+[dev-dependencies]
+cosmwasm-schema = { workspace = true }
+cw-multi-test   = { workspace = true }
+cw721           = { workspace = true }
diff --git a/__fixtures__/sg721-updatable/LICENSE b/__fixtures__/sg721-updatable/LICENSE
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/__fixtures__/sg721-updatable/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/__fixtures__/sg721-updatable/NOTICE b/__fixtures__/sg721-updatable/NOTICE
new file mode 100644
index 00000000..ee31d709
--- /dev/null
+++ b/__fixtures__/sg721-updatable/NOTICE
@@ -0,0 +1,13 @@
+Copyright 2022 John Y <j@publicawesome.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/__fixtures__/sg721-updatable/README.md b/__fixtures__/sg721-updatable/README.md
new file mode 100644
index 00000000..1f443fa8
--- /dev/null
+++ b/__fixtures__/sg721-updatable/README.md
@@ -0,0 +1,3 @@
+# Sg721 NFT collection with updatable token metadata
+
+Extends from `sg721-base` to allow updatable token metadata NFT collection. It's done by updating the token uri of a specified token id.
diff --git a/__fixtures__/sg721-updatable/examples/schema.rs b/__fixtures__/sg721-updatable/examples/schema.rs
new file mode 100644
index 00000000..44d07d85
--- /dev/null
+++ b/__fixtures__/sg721-updatable/examples/schema.rs
@@ -0,0 +1,51 @@
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for};
+
+use cosmwasm_std::Empty;
+pub use cw721::{
+    AllNftInfoResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, NftInfoResponse,
+    NumTokensResponse, OperatorsResponse, OwnerOfResponse, TokensResponse,
+};
+use cw721_base::Extension;
+pub use cw721_base::MinterResponse;
+use sg721::InstantiateMsg;
+pub use sg721_base::msg::CollectionInfoResponse;
+use sg721_base::msg::QueryMsg;
+use sg721_updatable::msg::ExecuteMsg;
+
+fn main() {
+    let mut out_dir = current_dir().unwrap();
+    out_dir.push("schema");
+    create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
+
+    export_schema(&schema_for!(InstantiateMsg), &out_dir);
+    export_schema(&schema_for!(ExecuteMsg<Extension, Empty>), &out_dir);
+    export_schema(&schema_for!(QueryMsg), &out_dir);
+    export_schema(&schema_for!(CollectionInfoResponse), &out_dir);
+    export_schema_with_title(
+        &schema_for!(AllNftInfoResponse<Empty>),
+        &out_dir,
+        "AllNftInfoResponse",
+    );
+    export_schema_with_title(&schema_for!(TokensResponse), &out_dir, "AllTokensResponse");
+    export_schema_with_title(
+        &schema_for!(OperatorsResponse),
+        &out_dir,
+        "AllOperatorsResponse",
+    );
+    export_schema(&schema_for!(MinterResponse), &out_dir);
+    export_schema(&schema_for!(ApprovalResponse), &out_dir);
+    export_schema(&schema_for!(ApprovalsResponse), &out_dir);
+    export_schema(&schema_for!(ContractInfoResponse), &out_dir);
+    export_schema_with_title(
+        &schema_for!(NftInfoResponse<Empty>),
+        &out_dir,
+        "NftInfoResponse",
+    );
+    export_schema(&schema_for!(NumTokensResponse), &out_dir);
+    export_schema(&schema_for!(OwnerOfResponse), &out_dir);
+    export_schema(&schema_for!(TokensResponse), &out_dir);
+}
diff --git a/__fixtures__/sg721-updatable/schema/all_nft_info_response.json b/__fixtures__/sg721-updatable/schema/all_nft_info_response.json
new file mode 100644
index 00000000..bcfe83e9
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/all_nft_info_response.json
@@ -0,0 +1,160 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "AllNftInfoResponse",
+  "type": "object",
+  "required": [
+    "access",
+    "info"
+  ],
+  "properties": {
+    "access": {
+      "description": "Who can transfer the token",
+      "allOf": [
+        {
+          "$ref": "#/definitions/OwnerOfResponse"
+        }
+      ]
+    },
+    "info": {
+      "description": "Data on the token itself,",
+      "allOf": [
+        {
+          "$ref": "#/definitions/NftInfoResponse_for_Empty"
+        }
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Approval": {
+      "type": "object",
+      "required": [
+        "expires",
+        "spender"
+      ],
+      "properties": {
+        "expires": {
+          "description": "When the Approval expires (maybe Expiration::never)",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Expiration"
+            }
+          ]
+        },
+        "spender": {
+          "description": "Account that can transfer/send the token",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Empty": {
+      "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+      "type": "object"
+    },
+    "Expiration": {
+      "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+      "oneOf": [
+        {
+          "description": "AtHeight will expire when `env.block.height` >= height",
+          "type": "object",
+          "required": [
+            "at_height"
+          ],
+          "properties": {
+            "at_height": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "AtTime will expire when `env.block.time` >= time",
+          "type": "object",
+          "required": [
+            "at_time"
+          ],
+          "properties": {
+            "at_time": {
+              "$ref": "#/definitions/Timestamp"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Never will never expire. Used to express the empty variant",
+          "type": "object",
+          "required": [
+            "never"
+          ],
+          "properties": {
+            "never": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "NftInfoResponse_for_Empty": {
+      "type": "object",
+      "required": [
+        "extension"
+      ],
+      "properties": {
+        "extension": {
+          "description": "You can add any custom metadata here when you extend cw721-base",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Empty"
+            }
+          ]
+        },
+        "token_uri": {
+          "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "OwnerOfResponse": {
+      "type": "object",
+      "required": [
+        "approvals",
+        "owner"
+      ],
+      "properties": {
+        "approvals": {
+          "description": "If set this address is approved to transfer/send the token as well",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Approval"
+          }
+        },
+        "owner": {
+          "description": "Owner of the token",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/all_operators_response.json b/__fixtures__/sg721-updatable/schema/all_operators_response.json
new file mode 100644
index 00000000..5c88cf9c
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/all_operators_response.json
@@ -0,0 +1,100 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "AllOperatorsResponse",
+  "type": "object",
+  "required": [
+    "operators"
+  ],
+  "properties": {
+    "operators": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Approval"
+      }
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Approval": {
+      "type": "object",
+      "required": [
+        "expires",
+        "spender"
+      ],
+      "properties": {
+        "expires": {
+          "description": "When the Approval expires (maybe Expiration::never)",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Expiration"
+            }
+          ]
+        },
+        "spender": {
+          "description": "Account that can transfer/send the token",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Expiration": {
+      "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+      "oneOf": [
+        {
+          "description": "AtHeight will expire when `env.block.height` >= height",
+          "type": "object",
+          "required": [
+            "at_height"
+          ],
+          "properties": {
+            "at_height": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "AtTime will expire when `env.block.time` >= time",
+          "type": "object",
+          "required": [
+            "at_time"
+          ],
+          "properties": {
+            "at_time": {
+              "$ref": "#/definitions/Timestamp"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Never will never expire. Used to express the empty variant",
+          "type": "object",
+          "required": [
+            "never"
+          ],
+          "properties": {
+            "never": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/all_tokens_response.json b/__fixtures__/sg721-updatable/schema/all_tokens_response.json
new file mode 100644
index 00000000..231dd32f
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/all_tokens_response.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "AllTokensResponse",
+  "type": "object",
+  "required": [
+    "tokens"
+  ],
+  "properties": {
+    "tokens": {
+      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/sg721-updatable/schema/approval_response.json b/__fixtures__/sg721-updatable/schema/approval_response.json
new file mode 100644
index 00000000..b29eab59
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/approval_response.json
@@ -0,0 +1,97 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ApprovalResponse",
+  "type": "object",
+  "required": [
+    "approval"
+  ],
+  "properties": {
+    "approval": {
+      "$ref": "#/definitions/Approval"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Approval": {
+      "type": "object",
+      "required": [
+        "expires",
+        "spender"
+      ],
+      "properties": {
+        "expires": {
+          "description": "When the Approval expires (maybe Expiration::never)",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Expiration"
+            }
+          ]
+        },
+        "spender": {
+          "description": "Account that can transfer/send the token",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Expiration": {
+      "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+      "oneOf": [
+        {
+          "description": "AtHeight will expire when `env.block.height` >= height",
+          "type": "object",
+          "required": [
+            "at_height"
+          ],
+          "properties": {
+            "at_height": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "AtTime will expire when `env.block.time` >= time",
+          "type": "object",
+          "required": [
+            "at_time"
+          ],
+          "properties": {
+            "at_time": {
+              "$ref": "#/definitions/Timestamp"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Never will never expire. Used to express the empty variant",
+          "type": "object",
+          "required": [
+            "never"
+          ],
+          "properties": {
+            "never": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/approvals_response.json b/__fixtures__/sg721-updatable/schema/approvals_response.json
new file mode 100644
index 00000000..7cdac001
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/approvals_response.json
@@ -0,0 +1,100 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ApprovalsResponse",
+  "type": "object",
+  "required": [
+    "approvals"
+  ],
+  "properties": {
+    "approvals": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Approval"
+      }
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Approval": {
+      "type": "object",
+      "required": [
+        "expires",
+        "spender"
+      ],
+      "properties": {
+        "expires": {
+          "description": "When the Approval expires (maybe Expiration::never)",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Expiration"
+            }
+          ]
+        },
+        "spender": {
+          "description": "Account that can transfer/send the token",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Expiration": {
+      "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+      "oneOf": [
+        {
+          "description": "AtHeight will expire when `env.block.height` >= height",
+          "type": "object",
+          "required": [
+            "at_height"
+          ],
+          "properties": {
+            "at_height": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "AtTime will expire when `env.block.time` >= time",
+          "type": "object",
+          "required": [
+            "at_time"
+          ],
+          "properties": {
+            "at_time": {
+              "$ref": "#/definitions/Timestamp"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Never will never expire. Used to express the empty variant",
+          "type": "object",
+          "required": [
+            "never"
+          ],
+          "properties": {
+            "never": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/collection_info_response.json b/__fixtures__/sg721-updatable/schema/collection_info_response.json
new file mode 100644
index 00000000..0e4e9c2d
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/collection_info_response.json
@@ -0,0 +1,88 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "CollectionInfoResponse",
+  "type": "object",
+  "required": [
+    "creator",
+    "description",
+    "image"
+  ],
+  "properties": {
+    "creator": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "explicit_content": {
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "external_link": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "image": {
+      "type": "string"
+    },
+    "royalty_info": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/RoyaltyInfoResponse"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "start_trading_time": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Timestamp"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
+    "RoyaltyInfoResponse": {
+      "type": "object",
+      "required": [
+        "payment_address",
+        "share"
+      ],
+      "properties": {
+        "payment_address": {
+          "type": "string"
+        },
+        "share": {
+          "$ref": "#/definitions/Decimal"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/contract_info_response.json b/__fixtures__/sg721-updatable/schema/contract_info_response.json
new file mode 100644
index 00000000..4a805a82
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/contract_info_response.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ContractInfoResponse",
+  "type": "object",
+  "required": [
+    "name",
+    "symbol"
+  ],
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "symbol": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/sg721-updatable/schema/execute_msg_for__nullable__empty_and__empty.json b/__fixtures__/sg721-updatable/schema/execute_msg_for__nullable__empty_and__empty.json
new file mode 100644
index 00000000..659d5020
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/execute_msg_for__nullable__empty_and__empty.json
@@ -0,0 +1,504 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ExecuteMsg_for_Nullable_Empty_and_Empty",
+  "oneOf": [
+    {
+      "description": "Freeze token metadata so creator can no longer update token uris",
+      "type": "object",
+      "required": [
+        "freeze_token_metadata"
+      ],
+      "properties": {
+        "freeze_token_metadata": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Creator calls can update token uris",
+      "type": "object",
+      "required": [
+        "update_token_metadata"
+      ],
+      "properties": {
+        "update_token_metadata": {
+          "type": "object",
+          "required": [
+            "token_id"
+          ],
+          "properties": {
+            "token_id": {
+              "type": "string"
+            },
+            "token_uri": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Enable updatable for updating token metadata. One time migration fee for sg721-base to sg721-updatable.",
+      "type": "object",
+      "required": [
+        "enable_updatable"
+      ],
+      "properties": {
+        "enable_updatable": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "transfer_nft"
+      ],
+      "properties": {
+        "transfer_nft": {
+          "type": "object",
+          "required": [
+            "recipient",
+            "token_id"
+          ],
+          "properties": {
+            "recipient": {
+              "type": "string"
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "send_nft"
+      ],
+      "properties": {
+        "send_nft": {
+          "type": "object",
+          "required": [
+            "contract",
+            "msg",
+            "token_id"
+          ],
+          "properties": {
+            "contract": {
+              "type": "string"
+            },
+            "msg": {
+              "$ref": "#/definitions/Binary"
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "approve"
+      ],
+      "properties": {
+        "approve": {
+          "type": "object",
+          "required": [
+            "spender",
+            "token_id"
+          ],
+          "properties": {
+            "expires": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "spender": {
+              "type": "string"
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "revoke"
+      ],
+      "properties": {
+        "revoke": {
+          "type": "object",
+          "required": [
+            "spender",
+            "token_id"
+          ],
+          "properties": {
+            "spender": {
+              "type": "string"
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "approve_all"
+      ],
+      "properties": {
+        "approve_all": {
+          "type": "object",
+          "required": [
+            "operator"
+          ],
+          "properties": {
+            "expires": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Expiration"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "operator": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "revoke_all"
+      ],
+      "properties": {
+        "revoke_all": {
+          "type": "object",
+          "required": [
+            "operator"
+          ],
+          "properties": {
+            "operator": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "burn"
+      ],
+      "properties": {
+        "burn": {
+          "type": "object",
+          "required": [
+            "token_id"
+          ],
+          "properties": {
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "update_collection_info"
+      ],
+      "properties": {
+        "update_collection_info": {
+          "type": "object",
+          "required": [
+            "collection_info"
+          ],
+          "properties": {
+            "collection_info": {
+              "$ref": "#/definitions/UpdateCollectionInfoMsg_for_RoyaltyInfoResponse"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "update_trading_start_time"
+      ],
+      "properties": {
+        "update_trading_start_time": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Timestamp"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "freeze_collection_info"
+      ],
+      "properties": {
+        "freeze_collection_info": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "mint"
+      ],
+      "properties": {
+        "mint": {
+          "type": "object",
+          "required": [
+            "owner",
+            "token_id"
+          ],
+          "properties": {
+            "extension": {
+              "description": "Any custom extension used by this contract",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Empty"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "owner": {
+              "description": "The owner of the newly minter NFT",
+              "type": "string"
+            },
+            "token_id": {
+              "description": "Unique ID of the NFT",
+              "type": "string"
+            },
+            "token_uri": {
+              "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "extension"
+      ],
+      "properties": {
+        "extension": {
+          "type": "object",
+          "required": [
+            "msg"
+          ],
+          "properties": {
+            "msg": {
+              "$ref": "#/definitions/Empty"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ],
+  "definitions": {
+    "Binary": {
+      "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+      "type": "string"
+    },
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
+    "Empty": {
+      "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+      "type": "object"
+    },
+    "Expiration": {
+      "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+      "oneOf": [
+        {
+          "description": "AtHeight will expire when `env.block.height` >= height",
+          "type": "object",
+          "required": [
+            "at_height"
+          ],
+          "properties": {
+            "at_height": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "AtTime will expire when `env.block.time` >= time",
+          "type": "object",
+          "required": [
+            "at_time"
+          ],
+          "properties": {
+            "at_time": {
+              "$ref": "#/definitions/Timestamp"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Never will never expire. Used to express the empty variant",
+          "type": "object",
+          "required": [
+            "never"
+          ],
+          "properties": {
+            "never": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "RoyaltyInfoResponse": {
+      "type": "object",
+      "required": [
+        "payment_address",
+        "share"
+      ],
+      "properties": {
+        "payment_address": {
+          "type": "string"
+        },
+        "share": {
+          "$ref": "#/definitions/Decimal"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    },
+    "UpdateCollectionInfoMsg_for_RoyaltyInfoResponse": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "explicit_content": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "external_link": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "image": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "royalty_info": {
+          "anyOf": [
+            {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RoyaltyInfoResponse"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/instantiate_msg.json b/__fixtures__/sg721-updatable/schema/instantiate_msg.json
new file mode 100644
index 00000000..734b45e8
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/instantiate_msg.json
@@ -0,0 +1,112 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "InstantiateMsg",
+  "type": "object",
+  "required": [
+    "collection_info",
+    "minter",
+    "name",
+    "symbol"
+  ],
+  "properties": {
+    "collection_info": {
+      "$ref": "#/definitions/CollectionInfo_for_RoyaltyInfoResponse"
+    },
+    "minter": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "symbol": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "CollectionInfo_for_RoyaltyInfoResponse": {
+      "type": "object",
+      "required": [
+        "creator",
+        "description",
+        "image"
+      ],
+      "properties": {
+        "creator": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "explicit_content": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "external_link": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "image": {
+          "type": "string"
+        },
+        "royalty_info": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RoyaltyInfoResponse"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "start_trading_time": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Timestamp"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
+    "RoyaltyInfoResponse": {
+      "type": "object",
+      "required": [
+        "payment_address",
+        "share"
+      ],
+      "properties": {
+        "payment_address": {
+          "type": "string"
+        },
+        "share": {
+          "$ref": "#/definitions/Decimal"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/minter_response.json b/__fixtures__/sg721-updatable/schema/minter_response.json
new file mode 100644
index 00000000..c5c90029
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/minter_response.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "MinterResponse",
+  "description": "Shows who can mint these tokens",
+  "type": "object",
+  "required": [
+    "minter"
+  ],
+  "properties": {
+    "minter": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/sg721-updatable/schema/nft_info_response.json b/__fixtures__/sg721-updatable/schema/nft_info_response.json
new file mode 100644
index 00000000..4cecceed
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/nft_info_response.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "NftInfoResponse",
+  "type": "object",
+  "required": [
+    "extension"
+  ],
+  "properties": {
+    "extension": {
+      "description": "You can add any custom metadata here when you extend cw721-base",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Empty"
+        }
+      ]
+    },
+    "token_uri": {
+      "description": "Universal resource identifier for this NFT Should point to a JSON file that conforms to the ERC721 Metadata JSON Schema",
+      "type": [
+        "string",
+        "null"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Empty": {
+      "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
+      "type": "object"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/num_tokens_response.json b/__fixtures__/sg721-updatable/schema/num_tokens_response.json
new file mode 100644
index 00000000..aff5850c
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/num_tokens_response.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "NumTokensResponse",
+  "type": "object",
+  "required": [
+    "count"
+  ],
+  "properties": {
+    "count": {
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/sg721-updatable/schema/owner_of_response.json b/__fixtures__/sg721-updatable/schema/owner_of_response.json
new file mode 100644
index 00000000..abb9006d
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/owner_of_response.json
@@ -0,0 +1,106 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "OwnerOfResponse",
+  "type": "object",
+  "required": [
+    "approvals",
+    "owner"
+  ],
+  "properties": {
+    "approvals": {
+      "description": "If set this address is approved to transfer/send the token as well",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Approval"
+      }
+    },
+    "owner": {
+      "description": "Owner of the token",
+      "type": "string"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Approval": {
+      "type": "object",
+      "required": [
+        "expires",
+        "spender"
+      ],
+      "properties": {
+        "expires": {
+          "description": "When the Approval expires (maybe Expiration::never)",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Expiration"
+            }
+          ]
+        },
+        "spender": {
+          "description": "Account that can transfer/send the token",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Expiration": {
+      "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
+      "oneOf": [
+        {
+          "description": "AtHeight will expire when `env.block.height` >= height",
+          "type": "object",
+          "required": [
+            "at_height"
+          ],
+          "properties": {
+            "at_height": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "AtTime will expire when `env.block.time` >= time",
+          "type": "object",
+          "required": [
+            "at_time"
+          ],
+          "properties": {
+            "at_time": {
+              "$ref": "#/definitions/Timestamp"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "description": "Never will never expire. Used to express the empty variant",
+          "type": "object",
+          "required": [
+            "never"
+          ],
+          "properties": {
+            "never": {
+              "type": "object",
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/sg721-updatable/schema/query_msg.json b/__fixtures__/sg721-updatable/schema/query_msg.json
new file mode 100644
index 00000000..e9e31a3b
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/query_msg.json
@@ -0,0 +1,296 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "QueryMsg",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "owner_of"
+      ],
+      "properties": {
+        "owner_of": {
+          "type": "object",
+          "required": [
+            "token_id"
+          ],
+          "properties": {
+            "include_expired": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "approval"
+      ],
+      "properties": {
+        "approval": {
+          "type": "object",
+          "required": [
+            "spender",
+            "token_id"
+          ],
+          "properties": {
+            "include_expired": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "spender": {
+              "type": "string"
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "approvals"
+      ],
+      "properties": {
+        "approvals": {
+          "type": "object",
+          "required": [
+            "token_id"
+          ],
+          "properties": {
+            "include_expired": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "all_operators"
+      ],
+      "properties": {
+        "all_operators": {
+          "type": "object",
+          "required": [
+            "owner"
+          ],
+          "properties": {
+            "include_expired": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "limit": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "owner": {
+              "type": "string"
+            },
+            "start_after": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "num_tokens"
+      ],
+      "properties": {
+        "num_tokens": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "contract_info"
+      ],
+      "properties": {
+        "contract_info": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "nft_info"
+      ],
+      "properties": {
+        "nft_info": {
+          "type": "object",
+          "required": [
+            "token_id"
+          ],
+          "properties": {
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "all_nft_info"
+      ],
+      "properties": {
+        "all_nft_info": {
+          "type": "object",
+          "required": [
+            "token_id"
+          ],
+          "properties": {
+            "include_expired": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
+            "token_id": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "tokens"
+      ],
+      "properties": {
+        "tokens": {
+          "type": "object",
+          "required": [
+            "owner"
+          ],
+          "properties": {
+            "limit": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "owner": {
+              "type": "string"
+            },
+            "start_after": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "all_tokens"
+      ],
+      "properties": {
+        "all_tokens": {
+          "type": "object",
+          "properties": {
+            "limit": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "start_after": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "minter"
+      ],
+      "properties": {
+        "minter": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "collection_info"
+      ],
+      "properties": {
+        "collection_info": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}
diff --git a/__fixtures__/sg721-updatable/schema/tokens_response.json b/__fixtures__/sg721-updatable/schema/tokens_response.json
new file mode 100644
index 00000000..14499395
--- /dev/null
+++ b/__fixtures__/sg721-updatable/schema/tokens_response.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "TokensResponse",
+  "type": "object",
+  "required": [
+    "tokens"
+  ],
+  "properties": {
+    "tokens": {
+      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/sg721-updatable/src/contract.rs b/__fixtures__/sg721-updatable/src/contract.rs
new file mode 100644
index 00000000..5ad3d84a
--- /dev/null
+++ b/__fixtures__/sg721-updatable/src/contract.rs
@@ -0,0 +1,378 @@
+use crate::error::ContractError;
+use crate::state::FROZEN_TOKEN_METADATA;
+use cosmwasm_std::{Empty, StdError};
+
+use cosmwasm_std::{Deps, StdResult};
+
+#[cfg(not(feature = "library"))]
+use cosmwasm_std::{DepsMut, Env, Event, MessageInfo};
+use cw2::set_contract_version;
+use sg721::InstantiateMsg;
+use sg721_base::msg::CollectionInfoResponse;
+
+use crate::msg::{EnableUpdatableResponse, FrozenTokenMetadataResponse};
+use crate::state::ENABLE_UPDATABLE;
+
+use cw721_base::Extension;
+use cw_utils::nonpayable;
+use sg1::checked_fair_burn;
+use sg721_base::ContractError::Unauthorized;
+use sg721_base::Sg721Contract;
+pub type Sg721UpdatableContract<'a> = Sg721Contract<'a, Extension>;
+use sg_std::Response;
+
+const CONTRACT_NAME: &str = "crates.io:sg721-updatable";
+const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
+pub const EARLIEST_VERSION: &str = "0.16.0";
+pub const TO_VERSION: &str = "3.0.0";
+const ENABLE_UPDATABLE_FEE: u128 = 500_000_000;
+
+pub fn _instantiate(
+    deps: DepsMut,
+    env: Env,
+    info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    // Set frozen to false on instantiate. allows updating token metadata
+    FROZEN_TOKEN_METADATA.save(deps.storage, &false)?;
+    // Set enable_updatable to true on instantiate. allows updating token metadata
+    ENABLE_UPDATABLE.save(deps.storage, &true)?;
+
+    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+    let res = Sg721UpdatableContract::default().instantiate(deps, env, info, msg)?;
+    Ok(res)
+}
+
+pub fn execute_enable_updatable(
+    deps: DepsMut,
+    _env: Env,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
+    let enable_updates = ENABLE_UPDATABLE.load(deps.storage)?;
+    let mut res = Response::new();
+    if enable_updates {
+        return Err(ContractError::AlreadyEnableUpdatable {});
+    }
+
+    // TODO add check if sender is contract admin
+    // Check if sender is creator
+    let collection_info: CollectionInfoResponse =
+        Sg721UpdatableContract::default().query_collection_info(deps.as_ref())?;
+    if info.sender != collection_info.creator {
+        return Err(ContractError::Base(Unauthorized {}));
+    }
+
+    // Check fee matches enable updatable fee and add fairburn msg
+    checked_fair_burn(&info, ENABLE_UPDATABLE_FEE, None, &mut res)?;
+
+    ENABLE_UPDATABLE.save(deps.storage, &true)?;
+
+    Ok(res
+        .add_attribute("action", "enable_updates")
+        .add_attribute("enabled", "true"))
+}
+
+pub fn execute_freeze_token_metadata(
+    deps: DepsMut,
+    _env: Env,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
+    nonpayable(&info)?;
+    // Check if sender is creator
+    let collection_info: CollectionInfoResponse =
+        Sg721UpdatableContract::default().query_collection_info(deps.as_ref())?;
+    if info.sender != collection_info.creator {
+        return Err(ContractError::Base(Unauthorized {}));
+    }
+
+    FROZEN_TOKEN_METADATA.save(deps.storage, &true)?;
+
+    Ok(Response::new()
+        .add_attribute("action", "freeze_token_metadata")
+        .add_attribute("frozen", "true"))
+}
+
+pub fn execute_update_token_metadata(
+    deps: DepsMut,
+    _env: Env,
+    info: MessageInfo,
+    token_id: String,
+    token_uri: Option<String>,
+) -> Result<Response, ContractError> {
+    nonpayable(&info)?;
+    // Check if sender is creator
+    let owner = deps.api.addr_validate(info.sender.as_ref())?;
+    let collection_info: CollectionInfoResponse =
+        Sg721UpdatableContract::default().query_collection_info(deps.as_ref())?;
+    if owner != collection_info.creator {
+        return Err(ContractError::Base(Unauthorized {}));
+    }
+
+    // Check if token metadata is frozen
+    let frozen = FROZEN_TOKEN_METADATA.load(deps.storage)?;
+    if frozen {
+        return Err(ContractError::TokenMetadataFrozen {});
+    }
+
+    // Check if enable updatable is true
+    let enable_updatable = ENABLE_UPDATABLE.load(deps.storage)?;
+    if !enable_updatable {
+        return Err(ContractError::NotEnableUpdatable {});
+    }
+
+    // Update token metadata
+    Sg721UpdatableContract::default().tokens.update(
+        deps.storage,
+        &token_id,
+        |token| match token {
+            Some(mut token_info) => {
+                token_info.token_uri = token_uri.clone();
+                Ok(token_info)
+            }
+            None => Err(ContractError::TokenIdNotFound {}),
+        },
+    )?;
+
+    let mut event = Event::new("update_update_token_metadata")
+        .add_attribute("sender", info.sender)
+        .add_attribute("token_id", token_id);
+    if let Some(token_uri) = token_uri {
+        event = event.add_attribute("token_uri", token_uri);
+    }
+    Ok(Response::new().add_event(event))
+}
+
+pub fn query_enable_updatable(deps: Deps) -> StdResult<EnableUpdatableResponse> {
+    let enabled = ENABLE_UPDATABLE.load(deps.storage)?;
+    Ok(EnableUpdatableResponse { enabled })
+}
+
+pub fn query_frozen_token_metadata(deps: Deps) -> StdResult<FrozenTokenMetadataResponse> {
+    let frozen = FROZEN_TOKEN_METADATA.load(deps.storage)?;
+    Ok(FrozenTokenMetadataResponse { frozen })
+}
+
+pub fn _migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
+    // make sure the correct contract is being upgraded, and it's being
+    // upgraded from the correct version.
+    if CONTRACT_VERSION < EARLIEST_VERSION {
+        return Err(StdError::generic_err("Cannot upgrade to a previous contract version").into());
+    }
+    if CONTRACT_VERSION > TO_VERSION {
+        return Err(StdError::generic_err("Cannot upgrade to a previous contract version").into());
+    }
+    // if same version return
+    if CONTRACT_VERSION == TO_VERSION {
+        return Ok(Response::new());
+    }
+
+    // update contract version
+    cw2::set_contract_version(deps.storage, CONTRACT_NAME, TO_VERSION)?;
+
+    // perform the upgrade
+    cw721_base::upgrades::v0_17::migrate::<Extension, Empty, Empty, Empty>(deps)
+        .map_err(|e| sg721_base::ContractError::MigrationError(e.to_string()))?;
+
+    let event = Event::new("migrate")
+        .add_attribute("from_name", CONTRACT_VERSION)
+        .add_attribute("from_version", CONTRACT_VERSION)
+        .add_attribute("to_name", CONTRACT_NAME)
+        .add_attribute("to_version", TO_VERSION);
+    Ok(Response::new().add_event(event))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::entry::{execute, instantiate};
+    use crate::msg::ExecuteMsg;
+    use cosmwasm_std::testing::{mock_env, mock_info, MockApi, MockQuerier, MockStorage};
+    use cosmwasm_std::{
+        from_slice, to_binary, ContractInfoResponse, ContractResult, Empty, OwnedDeps, Querier,
+        QuerierResult, QueryRequest, SystemError, SystemResult, WasmQuery,
+    };
+    use cw721::Cw721Query;
+    use sg721::{CollectionInfo, InstantiateMsg};
+    use std::marker::PhantomData;
+
+    const CREATOR: &str = "creator";
+    const HACKER: &str = "hacker";
+
+    pub fn mock_deps() -> OwnedDeps<MockStorage, MockApi, CustomMockQuerier, Empty> {
+        OwnedDeps {
+            storage: MockStorage::default(),
+            api: MockApi::default(),
+            querier: CustomMockQuerier::new(MockQuerier::new(&[])),
+            custom_query_type: PhantomData,
+        }
+    }
+
+    pub struct CustomMockQuerier {
+        base: MockQuerier,
+    }
+
+    impl Querier for CustomMockQuerier {
+        fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
+            let request: QueryRequest<Empty> = match from_slice(bin_request) {
+                Ok(v) => v,
+                Err(e) => {
+                    return SystemResult::Err(SystemError::InvalidRequest {
+                        error: format!("Parsing query request: {}", e),
+                        request: bin_request.into(),
+                    })
+                }
+            };
+
+            self.handle_query(&request)
+        }
+    }
+
+    impl CustomMockQuerier {
+        pub fn handle_query(&self, request: &QueryRequest<Empty>) -> QuerierResult {
+            match &request {
+                QueryRequest::Wasm(WasmQuery::ContractInfo { contract_addr: _ }) => {
+                    let mut response = ContractInfoResponse::default();
+                    response.code_id = 1;
+                    response.creator = CREATOR.to_string();
+                    SystemResult::Ok(ContractResult::Ok(to_binary(&response).unwrap()))
+                }
+                _ => self.base.handle_query(request),
+            }
+        }
+
+        pub fn new(base: MockQuerier<Empty>) -> Self {
+            CustomMockQuerier { base }
+        }
+    }
+
+    #[test]
+    fn update_token_metadata() {
+        let mut deps = mock_deps();
+        let contract = Sg721UpdatableContract::default();
+
+        // Instantiate contract
+        let info = mock_info(CREATOR, &[]);
+        let init_msg = InstantiateMsg {
+            name: "SpaceShips".to_string(),
+            symbol: "SPACE".to_string(),
+            minter: CREATOR.to_string(),
+            collection_info: CollectionInfo {
+                creator: CREATOR.to_string(),
+                description: "this is a test".to_string(),
+                image: "https://larry.engineer".to_string(),
+                external_link: None,
+                explicit_content: None,
+                start_trading_time: None,
+                royalty_info: None,
+            },
+        };
+        instantiate(deps.as_mut(), mock_env(), info.clone(), init_msg).unwrap();
+
+        // Mint token
+        let token_id = "Enterprise";
+        let exec_msg = ExecuteMsg::Mint {
+            token_id: token_id.to_string(),
+            owner: "john".to_string(),
+            token_uri: Some("https://starships.example.com/Starship/Enterprise.json".into()),
+            extension: None,
+        };
+        execute(deps.as_mut(), mock_env(), info.clone(), exec_msg).unwrap();
+
+        // Update token metadata fails because token id is not found
+        let updated_token_uri = Some("https://badkids.example.com/collection-cid/1.json".into());
+        let update_msg = ExecuteMsg::UpdateTokenMetadata {
+            token_id: "wrong-token-id".to_string(),
+            token_uri: updated_token_uri.clone(),
+        };
+        let err = execute(deps.as_mut(), mock_env(), info.clone(), update_msg).unwrap_err();
+        assert_eq!(
+            err.to_string(),
+            ContractError::TokenIdNotFound {}.to_string()
+        );
+
+        // Update token metadata fails because sent by hacker
+        let update_msg = ExecuteMsg::UpdateTokenMetadata {
+            token_id: token_id.to_string(),
+            token_uri: updated_token_uri.clone(),
+        };
+        let hacker_info = mock_info(HACKER, &[]);
+        let err = execute(deps.as_mut(), mock_env(), hacker_info, update_msg.clone()).unwrap_err();
+        assert_eq!(
+            err.to_string(),
+            ContractError::Base(Unauthorized {}).to_string()
+        );
+
+        // Update token metadata
+        execute(deps.as_mut(), mock_env(), info.clone(), update_msg).unwrap();
+
+        // Check token contains updated metadata
+        let res = contract
+            .parent
+            .nft_info(deps.as_ref(), token_id.into())
+            .unwrap();
+        assert_eq!(res.token_uri, updated_token_uri);
+
+        // Update token metadata with None token_uri
+        let update_msg = ExecuteMsg::<Extension, Empty>::UpdateTokenMetadata {
+            token_id: token_id.to_string(),
+            token_uri: None,
+        };
+        execute(deps.as_mut(), mock_env(), info.clone(), update_msg).unwrap();
+        let res = contract
+            .parent
+            .nft_info(deps.as_ref(), token_id.into())
+            .unwrap();
+        assert_eq!(res.token_uri, None);
+
+        // Freeze token metadata
+        let freeze_msg = ExecuteMsg::FreezeTokenMetadata {};
+        execute(deps.as_mut(), mock_env(), info.clone(), freeze_msg).unwrap();
+
+        // Throws error trying to update token metadata
+        let updated_token_uri =
+            Some("https://badkids.example.com/other-collection-cid/2.json".into());
+        let update_msg = ExecuteMsg::UpdateTokenMetadata {
+            token_id: token_id.to_string(),
+            token_uri: updated_token_uri,
+        };
+        let err = execute(deps.as_mut(), mock_env(), info, update_msg).unwrap_err();
+        assert_eq!(
+            err.to_string(),
+            ContractError::TokenMetadataFrozen {}.to_string()
+        );
+    }
+
+    #[test]
+    fn enable_updatable() {
+        let mut deps = mock_deps();
+
+        // Instantiate contract
+        let info = mock_info(CREATOR, &[]);
+        let init_msg = InstantiateMsg {
+            name: "SpaceShips".to_string(),
+            symbol: "SPACE".to_string(),
+            minter: CREATOR.to_string(),
+            collection_info: CollectionInfo {
+                creator: CREATOR.to_string(),
+                description: "this is a test".to_string(),
+                image: "https://larry.engineer".to_string(),
+                external_link: None,
+                explicit_content: None,
+                start_trading_time: None,
+                royalty_info: None,
+            },
+        };
+        instantiate(deps.as_mut(), mock_env(), info.clone(), init_msg).unwrap();
+
+        let enable_updatable_msg = ExecuteMsg::EnableUpdatable {};
+        let err = execute(deps.as_mut(), mock_env(), info, enable_updatable_msg).unwrap_err();
+        assert_eq!(
+            err.to_string(),
+            ContractError::AlreadyEnableUpdatable {}.to_string()
+        );
+
+        let res = query_enable_updatable(deps.as_ref()).unwrap();
+        assert!(res.enabled);
+    }
+}
diff --git a/__fixtures__/sg721-updatable/src/error.rs b/__fixtures__/sg721-updatable/src/error.rs
new file mode 100644
index 00000000..29823b2b
--- /dev/null
+++ b/__fixtures__/sg721-updatable/src/error.rs
@@ -0,0 +1,31 @@
+use cosmwasm_std::StdError;
+use cw_utils::PaymentError;
+use sg1::FeeError;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum ContractError {
+    #[error("{0}")]
+    Std(#[from] StdError),
+
+    #[error("{0}")]
+    Payment(#[from] PaymentError),
+
+    #[error("{0}")]
+    Base(#[from] sg721_base::ContractError),
+
+    #[error("{0}")]
+    Fee(#[from] FeeError),
+
+    #[error("TokenIdNotFound")]
+    TokenIdNotFound {},
+
+    #[error("TokenMetadataFrozen")]
+    TokenMetadataFrozen {},
+
+    #[error("NotEnableUpdatable")]
+    NotEnableUpdatable {},
+
+    #[error("AlreadyEnableUpdatable")]
+    AlreadyEnableUpdatable {},
+}
diff --git a/__fixtures__/sg721-updatable/src/lib.rs b/__fixtures__/sg721-updatable/src/lib.rs
new file mode 100644
index 00000000..06a13ea3
--- /dev/null
+++ b/__fixtures__/sg721-updatable/src/lib.rs
@@ -0,0 +1,69 @@
+#[cfg(not(feature = "library"))]
+pub mod contract;
+pub mod error;
+pub mod msg;
+pub mod state;
+
+pub type InstantiateMsg = sg721::InstantiateMsg;
+
+pub mod entry {
+    use super::*;
+    use crate::error::ContractError;
+    use crate::msg::QueryMsg;
+    use crate::{
+        contract::{
+            _instantiate, _migrate, execute_enable_updatable, execute_freeze_token_metadata,
+            execute_update_token_metadata, query_enable_updatable, query_frozen_token_metadata,
+            Sg721UpdatableContract,
+        },
+        msg::ExecuteMsg,
+    };
+    use cosmwasm_std::{entry_point, to_binary, Empty};
+    use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, StdResult};
+    use cw721_base::Extension;
+    use sg_std::Response;
+
+    #[entry_point]
+    pub fn instantiate(
+        deps: DepsMut,
+        env: Env,
+        info: MessageInfo,
+        msg: InstantiateMsg,
+    ) -> Result<Response, ContractError> {
+        _instantiate(deps, env, info, msg)
+    }
+
+    #[entry_point]
+    pub fn execute(
+        deps: DepsMut,
+        env: Env,
+        info: MessageInfo,
+        msg: ExecuteMsg<Extension, Empty>,
+    ) -> Result<Response, ContractError> {
+        match msg {
+            ExecuteMsg::FreezeTokenMetadata {} => execute_freeze_token_metadata(deps, env, info),
+            ExecuteMsg::EnableUpdatable {} => execute_enable_updatable(deps, env, info),
+            ExecuteMsg::UpdateTokenMetadata {
+                token_id,
+                token_uri,
+            } => execute_update_token_metadata(deps, env, info, token_id, token_uri),
+            _ => Sg721UpdatableContract::default()
+                .execute(deps, env, info, msg.into())
+                .map_err(|e| e.into()),
+        }
+    }
+
+    #[entry_point]
+    pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
+        match msg {
+            QueryMsg::EnableUpdatable {} => to_binary(&query_enable_updatable(deps)?),
+            QueryMsg::FreezeTokenMetadata {} => to_binary(&query_frozen_token_metadata(deps)?),
+            _ => Sg721UpdatableContract::default().query(deps, env, msg.into()),
+        }
+    }
+
+    #[entry_point]
+    pub fn migrate(deps: DepsMut, env: Env, msg: Empty) -> Result<Response, ContractError> {
+        _migrate(deps, env, msg)
+    }
+}
diff --git a/__fixtures__/sg721-updatable/src/msg.rs b/__fixtures__/sg721-updatable/src/msg.rs
new file mode 100644
index 00000000..f05672df
--- /dev/null
+++ b/__fixtures__/sg721-updatable/src/msg.rs
@@ -0,0 +1,250 @@
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::Binary;
+use cosmwasm_std::Timestamp;
+use cw_utils::Expiration;
+use sg721::{RoyaltyInfoResponse, UpdateCollectionInfoMsg};
+use sg721_base::msg::QueryMsg as Sg721QueryMsg;
+use sg721_base::ExecuteMsg as Sg721ExecuteMsg;
+
+#[cw_serde]
+pub enum ExecuteMsg<T, E> {
+    /// Freeze token metadata so creator can no longer update token uris
+    FreezeTokenMetadata {},
+    /// Creator calls can update token uris
+    UpdateTokenMetadata {
+        token_id: String,
+        token_uri: Option<String>,
+    },
+    /// Enable updatable for updating token metadata. One time migration fee for sg721-base to sg721-updatable.
+    EnableUpdatable {},
+    // Sg721Base msgs
+    TransferNft {
+        recipient: String,
+        token_id: String,
+    },
+    SendNft {
+        contract: String,
+        token_id: String,
+        msg: Binary,
+    },
+    Approve {
+        spender: String,
+        token_id: String,
+        expires: Option<Expiration>,
+    },
+    Revoke {
+        spender: String,
+        token_id: String,
+    },
+    ApproveAll {
+        operator: String,
+        expires: Option<Expiration>,
+    },
+    RevokeAll {
+        operator: String,
+    },
+    Burn {
+        token_id: String,
+    },
+    UpdateCollectionInfo {
+        collection_info: UpdateCollectionInfoMsg<RoyaltyInfoResponse>,
+    },
+    UpdateTradingStartTime(Option<Timestamp>),
+    FreezeCollectionInfo {},
+    Mint {
+        /// Unique ID of the NFT
+        token_id: String,
+        /// The owner of the newly minter NFT
+        owner: String,
+        /// Universal resource identifier for this NFT
+        /// Should point to a JSON file that conforms to the ERC721
+        /// Metadata JSON Schema
+        token_uri: Option<String>,
+        /// Any custom extension used by this contract
+        extension: T,
+    },
+    Extension {
+        msg: E,
+    },
+}
+
+impl<T, E> From<ExecuteMsg<T, E>> for Sg721ExecuteMsg
+where
+    T: Clone + PartialEq + Into<Option<cosmwasm_std::Empty>>,
+    Option<cosmwasm_std::Empty>: From<T>,
+{
+    fn from(msg: ExecuteMsg<T, E>) -> Sg721ExecuteMsg {
+        match msg {
+            ExecuteMsg::TransferNft {
+                recipient,
+                token_id,
+            } => Sg721ExecuteMsg::TransferNft {
+                recipient,
+                token_id,
+            },
+            ExecuteMsg::SendNft {
+                contract,
+                token_id,
+                msg,
+            } => Sg721ExecuteMsg::SendNft {
+                contract,
+                token_id,
+                msg,
+            },
+            ExecuteMsg::Approve {
+                spender,
+                token_id,
+                expires,
+            } => Sg721ExecuteMsg::Approve {
+                spender,
+                token_id,
+                expires,
+            },
+            ExecuteMsg::ApproveAll { operator, expires } => {
+                Sg721ExecuteMsg::ApproveAll { operator, expires }
+            }
+            ExecuteMsg::Revoke { spender, token_id } => {
+                Sg721ExecuteMsg::Revoke { spender, token_id }
+            }
+            ExecuteMsg::RevokeAll { operator } => Sg721ExecuteMsg::RevokeAll { operator },
+            ExecuteMsg::Burn { token_id } => Sg721ExecuteMsg::Burn { token_id },
+            ExecuteMsg::UpdateCollectionInfo { collection_info } => {
+                Sg721ExecuteMsg::UpdateCollectionInfo { collection_info }
+            }
+            ExecuteMsg::FreezeCollectionInfo {} => Sg721ExecuteMsg::FreezeCollectionInfo {},
+            ExecuteMsg::Mint {
+                token_id,
+                owner,
+                token_uri,
+                extension,
+            } => Sg721ExecuteMsg::Mint {
+                token_id,
+                owner,
+                token_uri,
+                extension: extension.into(),
+            },
+            _ => unreachable!("Invalid ExecuteMsg"),
+        }
+    }
+}
+
+#[cw_serde]
+pub enum QueryMsg {
+    EnableUpdatable {},
+    FreezeTokenMetadata {},
+    OwnerOf {
+        token_id: String,
+        include_expired: Option<bool>,
+    },
+    Approval {
+        token_id: String,
+        spender: String,
+        include_expired: Option<bool>,
+    },
+    Approvals {
+        token_id: String,
+        include_expired: Option<bool>,
+    },
+    AllOperators {
+        owner: String,
+        include_expired: Option<bool>,
+        start_after: Option<String>,
+        limit: Option<u32>,
+    },
+    NumTokens {},
+    ContractInfo {},
+    NftInfo {
+        token_id: String,
+    },
+    AllNftInfo {
+        token_id: String,
+        include_expired: Option<bool>,
+    },
+    Tokens {
+        owner: String,
+        start_after: Option<String>,
+        limit: Option<u32>,
+    },
+    AllTokens {
+        start_after: Option<String>,
+        limit: Option<u32>,
+    },
+    Minter {},
+    CollectionInfo {},
+}
+
+impl From<QueryMsg> for Sg721QueryMsg {
+    fn from(msg: QueryMsg) -> Sg721QueryMsg {
+        match msg {
+            QueryMsg::OwnerOf {
+                token_id,
+                include_expired,
+            } => Sg721QueryMsg::OwnerOf {
+                token_id,
+                include_expired,
+            },
+            QueryMsg::Approval {
+                token_id,
+                spender,
+                include_expired,
+            } => Sg721QueryMsg::Approval {
+                token_id,
+                spender,
+                include_expired,
+            },
+            QueryMsg::Approvals {
+                token_id,
+                include_expired,
+            } => Sg721QueryMsg::Approvals {
+                token_id,
+                include_expired,
+            },
+            QueryMsg::AllOperators {
+                owner,
+                include_expired,
+                start_after,
+                limit,
+            } => Sg721QueryMsg::AllOperators {
+                owner,
+                include_expired,
+                start_after,
+                limit,
+            },
+            QueryMsg::NumTokens {} => Sg721QueryMsg::NumTokens {},
+            QueryMsg::ContractInfo {} => Sg721QueryMsg::ContractInfo {},
+            QueryMsg::NftInfo { token_id } => Sg721QueryMsg::NftInfo { token_id },
+            QueryMsg::AllNftInfo {
+                token_id,
+                include_expired,
+            } => Sg721QueryMsg::AllNftInfo {
+                token_id,
+                include_expired,
+            },
+            QueryMsg::Tokens {
+                owner,
+                start_after,
+                limit,
+            } => Sg721QueryMsg::Tokens {
+                owner,
+                start_after,
+                limit,
+            },
+            QueryMsg::AllTokens { start_after, limit } => {
+                Sg721QueryMsg::AllTokens { start_after, limit }
+            }
+            QueryMsg::Minter {} => Sg721QueryMsg::Minter {},
+            QueryMsg::CollectionInfo {} => Sg721QueryMsg::CollectionInfo {},
+            _ => unreachable!("cannot convert {:?} to Sg721QueryMsg", msg),
+        }
+    }
+}
+
+#[cw_serde]
+pub struct EnableUpdatableResponse {
+    pub enabled: bool,
+}
+
+#[cw_serde]
+pub struct FrozenTokenMetadataResponse {
+    pub frozen: bool,
+}
diff --git a/__fixtures__/sg721-updatable/src/state.rs b/__fixtures__/sg721-updatable/src/state.rs
new file mode 100644
index 00000000..364608e6
--- /dev/null
+++ b/__fixtures__/sg721-updatable/src/state.rs
@@ -0,0 +1,4 @@
+use cw_storage_plus::Item;
+
+pub const FROZEN_TOKEN_METADATA: Item<bool> = Item::new("frozen_token_metadata");
+pub const ENABLE_UPDATABLE: Item<bool> = Item::new("enable_updatable");
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index 6770e937..96fcfa44 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index fe110741..9c28ec26 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index 73d8b24d..465f2b1a 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index e5d6c5de..9b9ae7c4 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 78472c03..57ecfa82 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index 6770e937..96fcfa44 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index fe110741..9c28ec26 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index 73d8b24d..465f2b1a 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index e5d6c5de..9b9ae7c4 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 78472c03..57ecfa82 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index 6770e937..96fcfa44 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index fe110741..9c28ec26 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index 73d8b24d..465f2b1a 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index e5d6c5de..9b9ae7c4 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 78472c03..57ecfa82 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index 6770e937..96fcfa44 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index fe110741..9c28ec26 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index 4836e52f..a5416273 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types";
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index 8843416c..d6b1c420 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types";
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index e7f1a152..4d7ecf3b 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index f29fcb55..64013370 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index e9cdd0d6..3c24b2d7 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index fe8d0b77..aca7c528 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index c7463089..d839559c 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 78472c03..57ecfa82 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.client.ts b/__output__/sg721-updatable/out/Sg721Updatable.client.ts
new file mode 100644
index 00000000..bdc3b8c6
--- /dev/null
+++ b/__output__/sg721-updatable/out/Sg721Updatable.client.ts
@@ -0,0 +1,528 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
+export interface Sg721UpdatableReadOnlyInterface {
+  contractAddress: string;
+  ownerOf: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }) => Promise<OwnerOfResponse>;
+  approval: ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }) => Promise<ApprovalResponse>;
+  approvals: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }) => Promise<ApprovalsResponse>;
+  allOperators: ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }) => Promise<AllOperatorsResponse>;
+  numTokens: () => Promise<NumTokensResponse>;
+  contractInfo: () => Promise<ContractInfoResponse>;
+  nftInfo: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }) => Promise<NftInfoResponse>;
+  allNftInfo: ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }) => Promise<AllNftInfoResponse>;
+  tokens: ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }) => Promise<TokensResponse>;
+  allTokens: ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }) => Promise<AllTokensResponse>;
+  minter: () => Promise<MinterResponse>;
+  collectionInfo: () => Promise<CollectionInfoResponse>;
+}
+export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.ownerOf = this.ownerOf.bind(this);
+    this.approval = this.approval.bind(this);
+    this.approvals = this.approvals.bind(this);
+    this.allOperators = this.allOperators.bind(this);
+    this.numTokens = this.numTokens.bind(this);
+    this.contractInfo = this.contractInfo.bind(this);
+    this.nftInfo = this.nftInfo.bind(this);
+    this.allNftInfo = this.allNftInfo.bind(this);
+    this.tokens = this.tokens.bind(this);
+    this.allTokens = this.allTokens.bind(this);
+    this.minter = this.minter.bind(this);
+    this.collectionInfo = this.collectionInfo.bind(this);
+  }
+
+  ownerOf = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<OwnerOfResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      owner_of: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  approval = async ({
+    includeExpired,
+    spender,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  }): Promise<ApprovalResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      approval: {
+        include_expired: includeExpired,
+        spender,
+        token_id: tokenId
+      }
+    });
+  };
+  approvals = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<ApprovalsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      approvals: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  allOperators = async ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): Promise<AllOperatorsResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_operators: {
+        include_expired: includeExpired,
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    });
+  };
+  numTokens = async (): Promise<NumTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      num_tokens: {}
+    });
+  };
+  contractInfo = async (): Promise<ContractInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      contract_info: {}
+    });
+  };
+  nftInfo = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }): Promise<NftInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      nft_info: {
+        token_id: tokenId
+      }
+    });
+  };
+  allNftInfo = async ({
+    includeExpired,
+    tokenId
+  }: {
+    includeExpired?: boolean;
+    tokenId: string;
+  }): Promise<AllNftInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_nft_info: {
+        include_expired: includeExpired,
+        token_id: tokenId
+      }
+    });
+  };
+  tokens = async ({
+    limit,
+    owner,
+    startAfter
+  }: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  }): Promise<TokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      tokens: {
+        limit,
+        owner,
+        start_after: startAfter
+      }
+    });
+  };
+  allTokens = async ({
+    limit,
+    startAfter
+  }: {
+    limit?: number;
+    startAfter?: string;
+  }): Promise<AllTokensResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      all_tokens: {
+        limit,
+        start_after: startAfter
+      }
+    });
+  };
+  minter = async (): Promise<MinterResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      minter: {}
+    });
+  };
+  collectionInfo = async (): Promise<CollectionInfoResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      collection_info: {}
+    });
+  };
+}
+export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  freezeTokenMetadata: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateTokenMetadata: ({
+    tokenId,
+    tokenUri
+  }: {
+    tokenId: string;
+    tokenUri?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  enableUpdatable: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  transferNft: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  sendNft: ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  approve: ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  revoke: ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  approveAll: ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  revokeAll: ({
+    operator
+  }: {
+    operator: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  burn: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateCollectionInfo: ({
+    collectionInfo
+  }: {
+    collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateTradingStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  freezeCollectionInfo: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension?: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  extension: ({
+    msg
+  }: {
+    msg: Empty;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements Sg721UpdatableInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.freezeTokenMetadata = this.freezeTokenMetadata.bind(this);
+    this.updateTokenMetadata = this.updateTokenMetadata.bind(this);
+    this.enableUpdatable = this.enableUpdatable.bind(this);
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.burn = this.burn.bind(this);
+    this.updateCollectionInfo = this.updateCollectionInfo.bind(this);
+    this.updateTradingStartTime = this.updateTradingStartTime.bind(this);
+    this.freezeCollectionInfo = this.freezeCollectionInfo.bind(this);
+    this.mint = this.mint.bind(this);
+    this.extension = this.extension.bind(this);
+  }
+
+  freezeTokenMetadata = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      freeze_token_metadata: {}
+    }, fee, memo, _funds);
+  };
+  updateTokenMetadata = async ({
+    tokenId,
+    tokenUri
+  }: {
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_token_metadata: {
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  enableUpdatable = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      enable_updatable: {}
+    }, fee, memo, _funds);
+  };
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  updateCollectionInfo = async ({
+    collectionInfo
+  }: {
+    collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_collection_info: {
+        collection_info: collectionInfo
+      }
+    }, fee, memo, _funds);
+  };
+  updateTradingStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_trading_start_time: {}
+    }, fee, memo, _funds);
+  };
+  freezeCollectionInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      freeze_collection_info: {}
+    }, fee, memo, _funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension?: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  extension = async ({
+    msg
+  }: {
+    msg: Empty;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      extension: {
+        msg
+      }
+    }, fee, memo, _funds);
+  };
+}
\ No newline at end of file
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/out/Sg721Updatable.message-composer.ts
new file mode 100644
index 00000000..d717a293
--- /dev/null
+++ b/__output__/sg721-updatable/out/Sg721Updatable.message-composer.ts
@@ -0,0 +1,415 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Coin } from "@cosmjs/amino";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
+import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@cosmjs/encoding";
+import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
+export interface Sg721UpdatableMessage {
+  contractAddress: string;
+  sender: string;
+  freezeTokenMetadata: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateTokenMetadata: ({
+    tokenId,
+    tokenUri
+  }: {
+    tokenId: string;
+    tokenUri?: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  enableUpdatable: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  transferNft: ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  sendNft: ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  approve: ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  revoke: ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  approveAll: ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  revokeAll: ({
+    operator
+  }: {
+    operator: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  burn: ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateCollectionInfo: ({
+    collectionInfo
+  }: {
+    collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateTradingStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  freezeCollectionInfo: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension?: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  extension: ({
+    msg
+  }: {
+    msg: Empty;
+  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+}
+export class Sg721UpdatableMessageComposer implements Sg721UpdatableMessage {
+  sender: string;
+  contractAddress: string;
+
+  constructor(sender: string, contractAddress: string) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.freezeTokenMetadata = this.freezeTokenMetadata.bind(this);
+    this.updateTokenMetadata = this.updateTokenMetadata.bind(this);
+    this.enableUpdatable = this.enableUpdatable.bind(this);
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.burn = this.burn.bind(this);
+    this.updateCollectionInfo = this.updateCollectionInfo.bind(this);
+    this.updateTradingStartTime = this.updateTradingStartTime.bind(this);
+    this.freezeCollectionInfo = this.freezeCollectionInfo.bind(this);
+    this.mint = this.mint.bind(this);
+    this.extension = this.extension.bind(this);
+  }
+
+  freezeTokenMetadata = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          freeze_token_metadata: {}
+        })),
+        funds: _funds
+      })
+    };
+  };
+  updateTokenMetadata = ({
+    tokenId,
+    tokenUri
+  }: {
+    tokenId: string;
+    tokenUri?: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_token_metadata: {
+            token_id: tokenId,
+            token_uri: tokenUri
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  enableUpdatable = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          enable_updatable: {}
+        })),
+        funds: _funds
+      })
+    };
+  };
+  transferNft = ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          transfer_nft: {
+            recipient,
+            token_id: tokenId
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  sendNft = ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          send_nft: {
+            contract,
+            msg,
+            token_id: tokenId
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  approve = ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          approve: {
+            expires,
+            spender,
+            token_id: tokenId
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  revoke = ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          revoke: {
+            spender,
+            token_id: tokenId
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  approveAll = ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          approve_all: {
+            expires,
+            operator
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  revokeAll = ({
+    operator
+  }: {
+    operator: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          revoke_all: {
+            operator
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  burn = ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          burn: {
+            token_id: tokenId
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  updateCollectionInfo = ({
+    collectionInfo
+  }: {
+    collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_collection_info: {
+            collection_info: collectionInfo
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  updateTradingStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          update_trading_start_time: {}
+        })),
+        funds: _funds
+      })
+    };
+  };
+  freezeCollectionInfo = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          freeze_collection_info: {}
+        })),
+        funds: _funds
+      })
+    };
+  };
+  mint = ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension?: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          mint: {
+            extension,
+            owner,
+            token_id: tokenId,
+            token_uri: tokenUri
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+  extension = ({
+    msg
+  }: {
+    msg: Empty;
+  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+    return {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: MsgExecuteContract.fromPartial({
+        sender: this.sender,
+        contract: this.contractAddress,
+        msg: toUtf8(JSON.stringify({
+          extension: {
+            msg
+          }
+        })),
+        funds: _funds
+      })
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.react-query.ts b/__output__/sg721-updatable/out/Sg721Updatable.react-query.ts
new file mode 100644
index 00000000..f0795d29
--- /dev/null
+++ b/__output__/sg721-updatable/out/Sg721Updatable.react-query.ts
@@ -0,0 +1,175 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { UseQueryOptions, useQuery } from "react-query";
+import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
+import { Sg721UpdatableQueryClient } from "./Sg721Updatable.client";
+export interface Sg721UpdatableReactQuery<TResponse, TData = TResponse> {
+  client: Sg721UpdatableQueryClient;
+  options?: UseQueryOptions<TResponse, Error, TData>;
+}
+export interface Sg721UpdatableCollectionInfoQuery<TData> extends Sg721UpdatableReactQuery<CollectionInfoResponse, TData> {}
+export function useSg721UpdatableCollectionInfoQuery<TData = CollectionInfoResponse>({
+  client,
+  options
+}: Sg721UpdatableCollectionInfoQuery<TData>) {
+  return useQuery<CollectionInfoResponse, Error, TData>(["sg721UpdatableCollectionInfo", client.contractAddress], () => client.collectionInfo(), options);
+}
+export interface Sg721UpdatableMinterQuery<TData> extends Sg721UpdatableReactQuery<MinterResponse, TData> {}
+export function useSg721UpdatableMinterQuery<TData = MinterResponse>({
+  client,
+  options
+}: Sg721UpdatableMinterQuery<TData>) {
+  return useQuery<MinterResponse, Error, TData>(["sg721UpdatableMinter", client.contractAddress], () => client.minter(), options);
+}
+export interface Sg721UpdatableAllTokensQuery<TData> extends Sg721UpdatableReactQuery<AllTokensResponse, TData> {
+  args: {
+    limit?: number;
+    startAfter?: string;
+  };
+}
+export function useSg721UpdatableAllTokensQuery<TData = AllTokensResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableAllTokensQuery<TData>) {
+  return useQuery<AllTokensResponse, Error, TData>(["sg721UpdatableAllTokens", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+    limit: args.limit,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Sg721UpdatableTokensQuery<TData> extends Sg721UpdatableReactQuery<TokensResponse, TData> {
+  args: {
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  };
+}
+export function useSg721UpdatableTokensQuery<TData = TokensResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableTokensQuery<TData>) {
+  return useQuery<TokensResponse, Error, TData>(["sg721UpdatableTokens", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+    limit: args.limit,
+    owner: args.owner,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Sg721UpdatableAllNftInfoQuery<TData> extends Sg721UpdatableReactQuery<AllNftInfoResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useSg721UpdatableAllNftInfoQuery<TData = AllNftInfoResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableAllNftInfoQuery<TData>) {
+  return useQuery<AllNftInfoResponse, Error, TData>(["sg721UpdatableAllNftInfo", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface Sg721UpdatableNftInfoQuery<TData> extends Sg721UpdatableReactQuery<NftInfoResponse, TData> {
+  args: {
+    tokenId: string;
+  };
+}
+export function useSg721UpdatableNftInfoQuery<TData = NftInfoResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableNftInfoQuery<TData>) {
+  return useQuery<NftInfoResponse, Error, TData>(["sg721UpdatableNftInfo", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+    tokenId: args.tokenId
+  }), options);
+}
+export interface Sg721UpdatableContractInfoQuery<TData> extends Sg721UpdatableReactQuery<ContractInfoResponse, TData> {}
+export function useSg721UpdatableContractInfoQuery<TData = ContractInfoResponse>({
+  client,
+  options
+}: Sg721UpdatableContractInfoQuery<TData>) {
+  return useQuery<ContractInfoResponse, Error, TData>(["sg721UpdatableContractInfo", client.contractAddress], () => client.contractInfo(), options);
+}
+export interface Sg721UpdatableNumTokensQuery<TData> extends Sg721UpdatableReactQuery<NumTokensResponse, TData> {}
+export function useSg721UpdatableNumTokensQuery<TData = NumTokensResponse>({
+  client,
+  options
+}: Sg721UpdatableNumTokensQuery<TData>) {
+  return useQuery<NumTokensResponse, Error, TData>(["sg721UpdatableNumTokens", client.contractAddress], () => client.numTokens(), options);
+}
+export interface Sg721UpdatableAllOperatorsQuery<TData> extends Sg721UpdatableReactQuery<AllOperatorsResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    limit?: number;
+    owner: string;
+    startAfter?: string;
+  };
+}
+export function useSg721UpdatableAllOperatorsQuery<TData = AllOperatorsResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableAllOperatorsQuery<TData>) {
+  return useQuery<AllOperatorsResponse, Error, TData>(["sg721UpdatableAllOperators", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+    includeExpired: args.includeExpired,
+    limit: args.limit,
+    owner: args.owner,
+    startAfter: args.startAfter
+  }), options);
+}
+export interface Sg721UpdatableApprovalsQuery<TData> extends Sg721UpdatableReactQuery<ApprovalsResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useSg721UpdatableApprovalsQuery<TData = ApprovalsResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableApprovalsQuery<TData>) {
+  return useQuery<ApprovalsResponse, Error, TData>(["sg721UpdatableApprovals", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface Sg721UpdatableApprovalQuery<TData> extends Sg721UpdatableReactQuery<ApprovalResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    spender: string;
+    tokenId: string;
+  };
+}
+export function useSg721UpdatableApprovalQuery<TData = ApprovalResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableApprovalQuery<TData>) {
+  return useQuery<ApprovalResponse, Error, TData>(["sg721UpdatableApproval", client.contractAddress, JSON.stringify(args)], () => client.approval({
+    includeExpired: args.includeExpired,
+    spender: args.spender,
+    tokenId: args.tokenId
+  }), options);
+}
+export interface Sg721UpdatableOwnerOfQuery<TData> extends Sg721UpdatableReactQuery<OwnerOfResponse, TData> {
+  args: {
+    includeExpired?: boolean;
+    tokenId: string;
+  };
+}
+export function useSg721UpdatableOwnerOfQuery<TData = OwnerOfResponse>({
+  client,
+  args,
+  options
+}: Sg721UpdatableOwnerOfQuery<TData>) {
+  return useQuery<OwnerOfResponse, Error, TData>(["sg721UpdatableOwnerOf", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+    includeExpired: args.includeExpired,
+    tokenId: args.tokenId
+  }), options);
+}
\ No newline at end of file
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.types.ts b/__output__/sg721-updatable/out/Sg721Updatable.types.ts
new file mode 100644
index 00000000..bfa2c387
--- /dev/null
+++ b/__output__/sg721-updatable/out/Sg721Updatable.types.ts
@@ -0,0 +1,216 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+export type Expiration = {
+  at_height: number;
+} | {
+  at_time: Timestamp;
+} | {
+  never: {};
+};
+export type Timestamp = Uint64;
+export type Uint64 = string;
+export interface AllNftInfoResponse {
+  access: OwnerOfResponse;
+  info: NftInfoResponseForEmpty;
+}
+export interface OwnerOfResponse {
+  approvals: Approval[];
+  owner: string;
+}
+export interface Approval {
+  expires: Expiration;
+  spender: string;
+}
+export interface NftInfoResponseForEmpty {
+  extension: Empty;
+  token_uri?: string | null;
+}
+export interface Empty {
+  [k: string]: unknown;
+}
+export interface AllOperatorsResponse {
+  operators: Approval[];
+}
+export interface AllTokensResponse {
+  tokens: string[];
+}
+export interface ApprovalResponse {
+  approval: Approval;
+}
+export interface ApprovalsResponse {
+  approvals: Approval[];
+}
+export type Decimal = string;
+export interface CollectionInfoResponse {
+  creator: string;
+  description: string;
+  explicit_content?: boolean | null;
+  external_link?: string | null;
+  image: string;
+  royalty_info?: RoyaltyInfoResponse | null;
+  start_trading_time?: Timestamp | null;
+}
+export interface RoyaltyInfoResponse {
+  payment_address: string;
+  share: Decimal;
+}
+export interface ContractInfoResponse {
+  name: string;
+  symbol: string;
+}
+export type ExecuteMsgForNullable_EmptyAndEmpty = {
+  freeze_token_metadata: {};
+} | {
+  update_token_metadata: {
+    token_id: string;
+    token_uri?: string | null;
+  };
+} | {
+  enable_updatable: {};
+} | {
+  transfer_nft: {
+    recipient: string;
+    token_id: string;
+  };
+} | {
+  send_nft: {
+    contract: string;
+    msg: Binary;
+    token_id: string;
+  };
+} | {
+  approve: {
+    expires?: Expiration | null;
+    spender: string;
+    token_id: string;
+  };
+} | {
+  revoke: {
+    spender: string;
+    token_id: string;
+  };
+} | {
+  approve_all: {
+    expires?: Expiration | null;
+    operator: string;
+  };
+} | {
+  revoke_all: {
+    operator: string;
+  };
+} | {
+  burn: {
+    token_id: string;
+  };
+} | {
+  update_collection_info: {
+    collection_info: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
+  };
+} | {
+  update_trading_start_time: Timestamp | null;
+} | {
+  freeze_collection_info: {};
+} | {
+  mint: {
+    extension?: Empty | null;
+    owner: string;
+    token_id: string;
+    token_uri?: string | null;
+  };
+} | {
+  extension: {
+    msg: Empty;
+  };
+};
+export type Binary = string;
+export interface UpdateCollectionInfoMsgForRoyaltyInfoResponse {
+  description?: string | null;
+  explicit_content?: boolean | null;
+  external_link?: string | null;
+  image?: string | null;
+  royalty_info?: (RoyaltyInfoResponse | null) | null;
+}
+export interface InstantiateMsg {
+  collection_info: CollectionInfoForRoyaltyInfoResponse;
+  minter: string;
+  name: string;
+  symbol: string;
+}
+export interface CollectionInfoForRoyaltyInfoResponse {
+  creator: string;
+  description: string;
+  explicit_content?: boolean | null;
+  external_link?: string | null;
+  image: string;
+  royalty_info?: RoyaltyInfoResponse | null;
+  start_trading_time?: Timestamp | null;
+}
+export interface MinterResponse {
+  minter: string;
+}
+export interface NftInfoResponse {
+  extension: Empty;
+  token_uri?: string | null;
+}
+export interface NumTokensResponse {
+  count: number;
+}
+export type QueryMsg = {
+  owner_of: {
+    include_expired?: boolean | null;
+    token_id: string;
+  };
+} | {
+  approval: {
+    include_expired?: boolean | null;
+    spender: string;
+    token_id: string;
+  };
+} | {
+  approvals: {
+    include_expired?: boolean | null;
+    token_id: string;
+  };
+} | {
+  all_operators: {
+    include_expired?: boolean | null;
+    limit?: number | null;
+    owner: string;
+    start_after?: string | null;
+  };
+} | {
+  num_tokens: {};
+} | {
+  contract_info: {};
+} | {
+  nft_info: {
+    token_id: string;
+  };
+} | {
+  all_nft_info: {
+    include_expired?: boolean | null;
+    token_id: string;
+  };
+} | {
+  tokens: {
+    limit?: number | null;
+    owner: string;
+    start_after?: string | null;
+  };
+} | {
+  all_tokens: {
+    limit?: number | null;
+    start_after?: string | null;
+  };
+} | {
+  minter: {};
+} | {
+  collection_info: {};
+};
+export interface TokensResponse {
+  tokens: string[];
+}
\ No newline at end of file
diff --git a/__output__/sg721-updatable/out/bundle.ts b/__output__/sg721-updatable/out/bundle.ts
new file mode 100644
index 00000000..e36ed81d
--- /dev/null
+++ b/__output__/sg721-updatable/out/bundle.ts
@@ -0,0 +1,17 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import * as _0 from "./Sg721Updatable.types";
+import * as _1 from "./Sg721Updatable.client";
+import * as _2 from "./Sg721Updatable.message-composer";
+import * as _3 from "./Sg721Updatable.react-query";
+export namespace contracts {
+  export const Sg721Updatable = { ..._0,
+    ..._1,
+    ..._2,
+    ..._3
+  };
+}
\ No newline at end of file
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index 84f6d2bd..b405a89f 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -5,7 +5,7 @@
 */
 
 import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 2945c3b6..93a6f935 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -102,9 +102,9 @@ export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.updateAdmin(msg, fee, memo, _funds), options);
+  }) => client.updateAdmin(msg, fee, memo, funds), options);
 }
 export interface FactoryUpdateGovecAddrMutation {
   client: FactoryClient;
@@ -124,9 +124,9 @@ export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOpti
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.updateGovecAddr(msg, fee, memo, _funds), options);
+  }) => client.updateGovecAddr(msg, fee, memo, funds), options);
 }
 export interface FactoryUpdateWalletFeeMutation {
   client: FactoryClient;
@@ -146,9 +146,9 @@ export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOpti
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.updateWalletFee(msg, fee, memo, _funds), options);
+  }) => client.updateWalletFee(msg, fee, memo, funds), options);
 }
 export interface FactoryUpdateCodeIdMutation {
   client: FactoryClient;
@@ -169,9 +169,9 @@ export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.updateCodeId(msg, fee, memo, _funds), options);
+  }) => client.updateCodeId(msg, fee, memo, funds), options);
 }
 export interface FactoryMigrateWalletMutation {
   client: FactoryClient;
@@ -192,9 +192,9 @@ export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOption
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.migrateWallet(msg, fee, memo, _funds), options);
+  }) => client.migrateWallet(msg, fee, memo, funds), options);
 }
 export interface FactoryUpdateProxyUserMutation {
   client: FactoryClient;
@@ -215,9 +215,9 @@ export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOpti
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.updateProxyUser(msg, fee, memo, _funds), options);
+  }) => client.updateProxyUser(msg, fee, memo, funds), options);
 }
 export interface FactoryCreateWalletMutation {
   client: FactoryClient;
@@ -237,7 +237,7 @@ export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions
     args: {
       fee,
       memo,
-      _funds
+      funds
     } = {}
-  }) => client.createWallet(msg, fee, memo, _funds), options);
+  }) => client.createWallet(msg, fee, memo, funds), options);
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index e5d6c5de..9b9ae7c4 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index 4c0426bc..404dda41 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types";
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index 92591221..29ad852e 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
+import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types";
diff --git a/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts b/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
new file mode 100644
index 00000000..ce67b501
--- /dev/null
+++ b/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
@@ -0,0 +1,29 @@
+import { TSBuilder } from '../src/builder';
+
+const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
+const OUTPUT_DIR = __dirname + '/../../../__output__';
+
+it('issue-long-exe-msg-name', async () => {
+  const outPath = OUTPUT_DIR + '/sg721-updatable/out';
+  const schemaDir = FIXTURE_DIR + '/sg721-updatable/';
+
+  const builder = new TSBuilder({
+    contracts: [schemaDir],
+    outPath,
+    options: {
+      messageComposer: {
+        enabled: true
+      },
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true
+      },
+      reactQuery: {
+        enabled: true
+      }
+    }
+  });
+  await builder.build();
+});
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index a1206a65..9c4b3cb6 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -79,9 +79,7 @@ export const findQueryMsg = (schemas) => {
 
 export const findExecuteMsg = (schemas) => {
     const ExecuteMsg = schemas.find(schema =>
-        schema.title === 'ExecuteMsg' ||
-        schema.title === 'ExecuteMsg_for_Empty' || // if cleanse is used, this is never
-        schema.title === 'ExecuteMsgForEmpty'
+      schema.title.startsWith('ExecuteMsg')
     );
     return ExecuteMsg;
 };
diff --git a/packages/wasm-ast-types/types/client/client.d.ts b/packages/wasm-ast-types/types/client/client.d.ts
index 77f57150..bc1e484a 100644
--- a/packages/wasm-ast-types/types/client/client.d.ts
+++ b/packages/wasm-ast-types/types/client/client.d.ts
@@ -1,9 +1,7 @@
 import * as t from '@babel/types';
-import { QueryMsg, ExecuteMsg } from '../types';
+import { ExecuteMsg, JSONSchema, QueryMsg } from '../types';
 import { RenderContext } from '../context';
-import { JSONSchema } from '../types';
 export declare const CONSTANT_EXEC_PARAMS: (t.AssignmentPattern | t.Identifier)[];
-export declare const FIXED_EXECUTE_PARAMS: t.Identifier[];
 export declare const createWasmQueryMethod: (context: RenderContext, jsonschema: any) => t.ClassProperty;
 export declare const createQueryClass: (context: RenderContext, className: string, implementsClassName: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration;
 export declare const getWasmMethodArgs: (context: RenderContext, jsonschema: JSONSchema) => t.ObjectProperty[];
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index f3b19e60..acb7b342 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -25,7 +25,6 @@ export interface RecoilOptions {
 }
 export interface TSTypesOptions {
     enabled?: boolean;
-    // deprecated
     aliasExecuteMsg?: boolean;
     aliasEntryPoints?: boolean;
 }
diff --git a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
index 26f00fc8..4a3f0edb 100644
--- a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
+++ b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
@@ -1,4 +1,4 @@
-import * as t from "@babel/types";
-import { ExecuteMsg, QueryMsg } from "../types";
-import { RenderContext } from "../context";
+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;
diff --git a/packages/wasm-ast-types/types/utils/babel.d.ts b/packages/wasm-ast-types/types/utils/babel.d.ts
index 4b9a5919..c7a4ccb4 100644
--- a/packages/wasm-ast-types/types/utils/babel.d.ts
+++ b/packages/wasm-ast-types/types/utils/babel.d.ts
@@ -1,12 +1,7 @@
 import * as t from '@babel/types';
 import { Field } from '../types';
 import { TSTypeAnnotation, TSExpressionWithTypeArguments } from '@babel/types';
-export declare const propertySignature: (name: string, typeAnnotation: t.TSTypeAnnotation, optional?: boolean) => {
-    type: string;
-    key: t.Identifier;
-    typeAnnotation: t.TSTypeAnnotation;
-    optional: boolean;
-};
+export declare const propertySignature: (name: string, typeAnnotation: TSTypeAnnotation, optional?: boolean) => t.TSPropertySignature;
 export declare const identifier: (name: string, typeAnnotation: t.TSTypeAnnotation, optional?: boolean) => t.Identifier;
 export declare const tsTypeOperator: (typeAnnotation: t.TSType, operator: string) => t.TSTypeOperator;
 export declare const getMessageProperties: (msg: any) => any[];
diff --git a/packages/wasm-ast-types/types/utils/constants.d.ts b/packages/wasm-ast-types/types/utils/constants.d.ts
new file mode 100644
index 00000000..447b24dc
--- /dev/null
+++ b/packages/wasm-ast-types/types/utils/constants.d.ts
@@ -0,0 +1,5 @@
+import * as t from '@babel/types';
+export declare const OPTIONAL_FUNDS_PARAM: t.Identifier;
+export declare const OPTIONAL_FEE_PARAM: t.Identifier;
+export declare const OPTIONAL_MEMO_PARAM: t.Identifier;
+export declare const FIXED_EXECUTE_PARAMS: t.Identifier[];
diff --git a/packages/wasm-ast-types/types/utils/index.d.ts b/packages/wasm-ast-types/types/utils/index.d.ts
index 2e232599..aa3643b7 100644
--- a/packages/wasm-ast-types/types/utils/index.d.ts
+++ b/packages/wasm-ast-types/types/utils/index.d.ts
@@ -1,3 +1,5 @@
 export * from './babel';
 export * from './types';
 export * from './ref';
+export { OPTIONAL_FUNDS_PARAM } from './constants';
+export { FIXED_EXECUTE_PARAMS } from './constants';
diff --git a/packages/wasm-ast-types/types/utils/types.d.ts b/packages/wasm-ast-types/types/utils/types.d.ts
index bcaeb367..297309dc 100644
--- a/packages/wasm-ast-types/types/utils/types.d.ts
+++ b/packages/wasm-ast-types/types/utils/types.d.ts
@@ -17,11 +17,6 @@ export declare const getPropertyType: (context: RenderContext, schema: JSONSchem
     type: any;
     optional: boolean;
 };
-export declare function getPropertySignatureFromProp(context: RenderContext, jsonschema: JSONSchema, prop: string, camelize: boolean): {
-    type: string;
-    key: t.Identifier;
-    typeAnnotation: t.TSTypeAnnotation;
-    optional: boolean;
-};
+export declare function getPropertySignatureFromProp(context: RenderContext, jsonschema: JSONSchema, prop: string, camelize: boolean): t.TSPropertySignature;
 export declare const getParamsTypeAnnotation: (context: RenderContext, jsonschema: any, camelize?: boolean) => t.TSTypeAnnotation;
-export declare const createTypedObjectParams: (context: RenderContext, jsonschema: JSONSchema, camelize?: boolean) => t.ObjectPattern;
+export declare const createTypedObjectParams: (context: RenderContext, jsonschema: JSONSchema, camelize?: boolean) => (t.Identifier | t.Pattern | t.RestElement);

From 5c08757165907e063c3e7468bc7fac9c98530923 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 7 Jun 2023 05:54:32 +0800
Subject: [PATCH 119/287] remain schema only for sg721 updatable

---
 __fixtures__/sg721-updatable/.cargo/config    |   4 -
 .../sg721-updatable/.circleci/config.yml      |  61 --
 .../.github/workflows/Basic.yml               |  75 --
 __fixtures__/sg721-updatable/.gitignore       |  15 -
 __fixtures__/sg721-updatable/Cargo.lock       | 738 ------------------
 __fixtures__/sg721-updatable/Cargo.toml       |  63 --
 __fixtures__/sg721-updatable/LICENSE          | 202 -----
 __fixtures__/sg721-updatable/NOTICE           |  13 -
 __fixtures__/sg721-updatable/README.md        |   3 -
 .../{schema => }/all_nft_info_response.json   |   0
 .../{schema => }/all_operators_response.json  |   0
 .../{schema => }/all_tokens_response.json     |   0
 .../{schema => }/approval_response.json       |   0
 .../{schema => }/approvals_response.json      |   0
 .../collection_info_response.json             |   0
 .../{schema => }/contract_info_response.json  |   0
 .../sg721-updatable/examples/schema.rs        |  51 --
 ...e_msg_for__nullable__empty_and__empty.json |   0
 .../{schema => }/instantiate_msg.json         |   0
 .../{schema => }/minter_response.json         |   0
 .../{schema => }/nft_info_response.json       |   0
 .../{schema => }/num_tokens_response.json     |   0
 .../{schema => }/owner_of_response.json       |   0
 .../{schema => }/query_msg.json               |   0
 __fixtures__/sg721-updatable/src/contract.rs  | 378 ---------
 __fixtures__/sg721-updatable/src/error.rs     |  31 -
 __fixtures__/sg721-updatable/src/lib.rs       |  69 --
 __fixtures__/sg721-updatable/src/msg.rs       | 250 ------
 __fixtures__/sg721-updatable/src/state.rs     |   4 -
 .../{schema => }/tokens_response.json         |   0
 30 files changed, 1957 deletions(-)
 delete mode 100644 __fixtures__/sg721-updatable/.cargo/config
 delete mode 100644 __fixtures__/sg721-updatable/.circleci/config.yml
 delete mode 100644 __fixtures__/sg721-updatable/.github/workflows/Basic.yml
 delete mode 100644 __fixtures__/sg721-updatable/.gitignore
 delete mode 100644 __fixtures__/sg721-updatable/Cargo.lock
 delete mode 100644 __fixtures__/sg721-updatable/Cargo.toml
 delete mode 100644 __fixtures__/sg721-updatable/LICENSE
 delete mode 100644 __fixtures__/sg721-updatable/NOTICE
 delete mode 100644 __fixtures__/sg721-updatable/README.md
 rename __fixtures__/sg721-updatable/{schema => }/all_nft_info_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/all_operators_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/all_tokens_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/approval_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/approvals_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/collection_info_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/contract_info_response.json (100%)
 delete mode 100644 __fixtures__/sg721-updatable/examples/schema.rs
 rename __fixtures__/sg721-updatable/{schema => }/execute_msg_for__nullable__empty_and__empty.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/instantiate_msg.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/minter_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/nft_info_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/num_tokens_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/owner_of_response.json (100%)
 rename __fixtures__/sg721-updatable/{schema => }/query_msg.json (100%)
 delete mode 100644 __fixtures__/sg721-updatable/src/contract.rs
 delete mode 100644 __fixtures__/sg721-updatable/src/error.rs
 delete mode 100644 __fixtures__/sg721-updatable/src/lib.rs
 delete mode 100644 __fixtures__/sg721-updatable/src/msg.rs
 delete mode 100644 __fixtures__/sg721-updatable/src/state.rs
 rename __fixtures__/sg721-updatable/{schema => }/tokens_response.json (100%)

diff --git a/__fixtures__/sg721-updatable/.cargo/config b/__fixtures__/sg721-updatable/.cargo/config
deleted file mode 100644
index 336b618a..00000000
--- a/__fixtures__/sg721-updatable/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/__fixtures__/sg721-updatable/.circleci/config.yml b/__fixtures__/sg721-updatable/.circleci/config.yml
deleted file mode 100644
index 9b076696..00000000
--- a/__fixtures__/sg721-updatable/.circleci/config.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-version: 2.1
-
-executors:
-  builder:
-    docker:
-      - image: buildpack-deps:trusty
-
-jobs:
-  docker-image:
-    executor: builder
-    steps:
-      - checkout
-      - setup_remote_docker
-        docker_layer_caching: true
-      - run:
-          name: Build Docker artifact
-          command: docker build --pull -t "cosmwasm/cw-gitpod-base:${CIRCLE_SHA1}" .
-      - run:
-          name: Push application Docker image to docker hub
-          command: |
-            if [ "${CIRCLE_BRANCH}" = "master" ]; then
-              docker tag "cosmwasm/cw-gitpod-base:${CIRCLE_SHA1}" cosmwasm/cw-gitpod-base:latest
-              docker login --password-stdin -u "$DOCKER_USER" \<<<"$DOCKER_PASS"
-              docker push cosmwasm/cw-gitpod-base:latest
-              docker logout
-            fi
-
-  docker-tagged:
-    executor: builder
-    steps:
-      - checkout
-      - setup_remote_docker
-        docker_layer_caching: true
-      - run:
-          name: Push application Docker image to docker hub
-          command: |
-            docker tag "cosmwasm/cw-gitpod-base:${CIRCLE_SHA1}" "cosmwasm/cw-gitpod-base:${CIRCLE_TAG}"
-            docker login --password-stdin -u "$DOCKER_USER" \<<<"$DOCKER_PASS"
-            docker push
-            docker logout
-
-workflows:
-  version: 2
-  test-suite:
-    jobs:
-      # this is now a slow process... let's only run on master
-      - docker-image:
-          filters:
-            branches:
-              only:
-                - master
-      - docker-tagged:
-          filters:
-            tags:
-              only:
-                - /^v.*/
-            branches:
-              ignore:
-                - /.*/
-            requires:
-              - docker-image
diff --git a/__fixtures__/sg721-updatable/.github/workflows/Basic.yml b/__fixtures__/sg721-updatable/.github/workflows/Basic.yml
deleted file mode 100644
index 0aa41931..00000000
--- a/__fixtures__/sg721-updatable/.github/workflows/Basic.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Based on https://github.com/actions-rs/example/blob/master/.github/workflows/quickstart.yml
-
-on: [push, pull_request]
-
-name: Basic
-
-jobs:
-
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.58.1
-          target: wasm32-unknown-unknown
-          override: true
-
-      - name: Run unit tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: unit-test
-          args: --locked
-        env:
-          RUST_BACKTRACE: 1
-
-      - name: Compile WASM contract
-        uses: actions-rs/cargo@v1
-        with:
-          command: wasm
-          args: --locked
-        env:
-          RUSTFLAGS: "-C link-arg=-s"
-
-  lints:
-    name: Lints
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.58.1
-          override: true
-          components: rustfmt, clippy
-
-      - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
-
-      - name: Generate Schema
-        uses: actions-rs/cargo@v1
-        with:
-          command: schema
-          args: --locked
-
-      - name: Schema Changes
-        # fails if any changes not committed
-        run: git diff --exit-code schema
diff --git a/__fixtures__/sg721-updatable/.gitignore b/__fixtures__/sg721-updatable/.gitignore
deleted file mode 100644
index dfdaaa6b..00000000
--- a/__fixtures__/sg721-updatable/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build results
-/target
-
-# Cargo+Git helper file (https://github.com/rust-lang/cargo/blob/0.44.1/src/cargo/sources/git/utils.rs#L320-L327)
-.cargo-ok
-
-# Text file backups
-**/*.rs.bk
-
-# macOS
-.DS_Store
-
-# IDEs
-*.iml
-.idea
diff --git a/__fixtures__/sg721-updatable/Cargo.lock b/__fixtures__/sg721-updatable/Cargo.lock
deleted file mode 100644
index 91fb09ff..00000000
--- a/__fixtures__/sg721-updatable/Cargo.lock
+++ /dev/null
@@ -1,738 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "anyhow"
-version = "1.0.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "base64ct"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "const-oid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
-
-[[package]]
-name = "cosmwasm-crypto"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd"
-dependencies = [
- "digest",
- "ed25519-zebra",
- "k256",
- "rand_core 0.6.3",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
-dependencies = [
- "syn",
-]
-
-[[package]]
-name = "cosmwasm-schema"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772e80bbad231a47a2068812b723a1ff81dd4a0d56c9391ac748177bea3a61da"
-dependencies = [
- "schemars",
- "serde_json",
-]
-
-[[package]]
-name = "cosmwasm-std"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
-dependencies = [
- "base64",
- "cosmwasm-crypto",
- "cosmwasm-derive",
- "forward_ref",
- "schemars",
- "serde",
- "serde-json-wasm",
- "thiserror",
- "uint",
-]
-
-[[package]]
-name = "cosmwasm-storage"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d18403b07304d15d304dad11040d45bbcaf78d603b4be3fb5e2685c16f9229b5"
-dependencies = [
- "cosmwasm-std",
- "serde",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
-dependencies = [
- "generic-array",
- "rand_core 0.6.3",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "cw-multi-test"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbea57e5be4a682268a5eca1a57efece57a54ff216bfd87603d5e864aad40e12"
-dependencies = [
- "anyhow",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-storage-plus",
- "cw-utils",
- "derivative",
- "itertools",
- "prost",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9336ecef1e19d56cf6e3e932475fc6a3dee35eec5a386e07917a1d1ba6bb0e35"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-utils"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "babd2c090f39d07ce5bf2556962305e795daa048ce20a93709eb591476e4a29e"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw2"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993df11574f29574dd443eb0c189484bb91bc0638b6de3e32ab7f9319c92122d"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "der"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
-dependencies = [
- "const-oid",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
-
-[[package]]
-name = "ecdsa"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
-dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
-]
-
-[[package]]
-name = "ed25519-zebra"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
-dependencies = [
- "curve25519-dalek",
- "hex",
- "rand_core 0.6.3",
- "serde",
- "sha2",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "ff",
- "generic-array",
- "group",
- "rand_core 0.6.3",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "ff"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
-dependencies = [
- "rand_core 0.6.3",
- "subtle",
-]
-
-[[package]]
-name = "forward_ref"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "group"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
-dependencies = [
- "ff",
- "rand_core 0.6.3",
- "subtle",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac",
- "digest",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
-
-[[package]]
-name = "k256"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
-dependencies = [
- "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sec1",
- "sha2",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "pkcs8"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
-dependencies = [
- "der",
- "spki",
- "zeroize",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "prost"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom 0.2.6",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
-dependencies = [
- "crypto-bigint",
- "hmac",
- "zeroize",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
-
-[[package]]
-name = "schemars"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d21ecb263bf75fc69d5e74b0f2a60b6dd80cfd9fb0eba15c4b9d1104ceffc77"
-dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219b924f5b39f25b7d7c9203873a2698fdac8db2b396aaea6fa099b699cc40e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn",
-]
-
-[[package]]
-name = "sec1"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
-dependencies = [
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-json-wasm"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479b4dbc401ca13ee8ce902851b834893251404c4f3c65370a49e047a6be09a5"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer",
- "cfg-if",
- "cpufeatures",
- "digest",
- "opaque-debug",
-]
-
-[[package]]
-name = "signature"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
-dependencies = [
- "digest",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "spki"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "testgen-local"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-multi-test",
- "cw-storage-plus",
- "cw2",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "uint"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "zeroize"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07"
diff --git a/__fixtures__/sg721-updatable/Cargo.toml b/__fixtures__/sg721-updatable/Cargo.toml
deleted file mode 100644
index 65f6af21..00000000
--- a/__fixtures__/sg721-updatable/Cargo.toml
+++ /dev/null
@@ -1,63 +0,0 @@
-[package]
-name = "sg721-updatable"
-authors = [
-    "John Y <j@noreply.publicawesome.com>",
-    "Shane Vitarana <s@noreply.publicawesome.com>",
-]
-exclude = [
-    # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
-    "contract.wasm",
-    "hash.txt",
-]
-description = "Stargaze Updatable NFT collection contract"
-version = { workspace = true }
-edition = { workspace = true }
-homepage = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
-
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[profile.release]
-opt-level        = 3
-debug            = false
-rpath            = false
-lto              = true
-debug-assertions = false
-codegen-units    = 1
-panic            = 'abort'
-incremental      = false
-overflow-checks  = true
-
-[features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
-# use library feature to disable all instantiate/execute/query exports
-library = []
-
-
-[dependencies]
-cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw-utils        = { workspace = true }
-cw2             = { workspace = true }
-cw721           = { workspace = true }
-schemars        = { workspace = true }
-serde           = { workspace = true }
-thiserror       = { workspace = true }
-cw721-base      = { workspace = true, features = ["library"] }
-sg1             = { workspace = true }
-sg721           = { workspace = true }
-sg721-base      = { workspace = true, features = ["library"] }
-sg-std          = { workspace = true }
-semver          = { workspace = true }
-
-[dev-dependencies]
-cosmwasm-schema = { workspace = true }
-cw-multi-test   = { workspace = true }
-cw721           = { workspace = true }
diff --git a/__fixtures__/sg721-updatable/LICENSE b/__fixtures__/sg721-updatable/LICENSE
deleted file mode 100644
index d6456956..00000000
--- a/__fixtures__/sg721-updatable/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/__fixtures__/sg721-updatable/NOTICE b/__fixtures__/sg721-updatable/NOTICE
deleted file mode 100644
index ee31d709..00000000
--- a/__fixtures__/sg721-updatable/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2022 John Y <j@publicawesome.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/__fixtures__/sg721-updatable/README.md b/__fixtures__/sg721-updatable/README.md
deleted file mode 100644
index 1f443fa8..00000000
--- a/__fixtures__/sg721-updatable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sg721 NFT collection with updatable token metadata
-
-Extends from `sg721-base` to allow updatable token metadata NFT collection. It's done by updating the token uri of a specified token id.
diff --git a/__fixtures__/sg721-updatable/schema/all_nft_info_response.json b/__fixtures__/sg721-updatable/all_nft_info_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/all_nft_info_response.json
rename to __fixtures__/sg721-updatable/all_nft_info_response.json
diff --git a/__fixtures__/sg721-updatable/schema/all_operators_response.json b/__fixtures__/sg721-updatable/all_operators_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/all_operators_response.json
rename to __fixtures__/sg721-updatable/all_operators_response.json
diff --git a/__fixtures__/sg721-updatable/schema/all_tokens_response.json b/__fixtures__/sg721-updatable/all_tokens_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/all_tokens_response.json
rename to __fixtures__/sg721-updatable/all_tokens_response.json
diff --git a/__fixtures__/sg721-updatable/schema/approval_response.json b/__fixtures__/sg721-updatable/approval_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/approval_response.json
rename to __fixtures__/sg721-updatable/approval_response.json
diff --git a/__fixtures__/sg721-updatable/schema/approvals_response.json b/__fixtures__/sg721-updatable/approvals_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/approvals_response.json
rename to __fixtures__/sg721-updatable/approvals_response.json
diff --git a/__fixtures__/sg721-updatable/schema/collection_info_response.json b/__fixtures__/sg721-updatable/collection_info_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/collection_info_response.json
rename to __fixtures__/sg721-updatable/collection_info_response.json
diff --git a/__fixtures__/sg721-updatable/schema/contract_info_response.json b/__fixtures__/sg721-updatable/contract_info_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/contract_info_response.json
rename to __fixtures__/sg721-updatable/contract_info_response.json
diff --git a/__fixtures__/sg721-updatable/examples/schema.rs b/__fixtures__/sg721-updatable/examples/schema.rs
deleted file mode 100644
index 44d07d85..00000000
--- a/__fixtures__/sg721-updatable/examples/schema.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::env::current_dir;
-use std::fs::create_dir_all;
-
-use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for};
-
-use cosmwasm_std::Empty;
-pub use cw721::{
-    AllNftInfoResponse, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, NftInfoResponse,
-    NumTokensResponse, OperatorsResponse, OwnerOfResponse, TokensResponse,
-};
-use cw721_base::Extension;
-pub use cw721_base::MinterResponse;
-use sg721::InstantiateMsg;
-pub use sg721_base::msg::CollectionInfoResponse;
-use sg721_base::msg::QueryMsg;
-use sg721_updatable::msg::ExecuteMsg;
-
-fn main() {
-    let mut out_dir = current_dir().unwrap();
-    out_dir.push("schema");
-    create_dir_all(&out_dir).unwrap();
-    remove_schemas(&out_dir).unwrap();
-
-    export_schema(&schema_for!(InstantiateMsg), &out_dir);
-    export_schema(&schema_for!(ExecuteMsg<Extension, Empty>), &out_dir);
-    export_schema(&schema_for!(QueryMsg), &out_dir);
-    export_schema(&schema_for!(CollectionInfoResponse), &out_dir);
-    export_schema_with_title(
-        &schema_for!(AllNftInfoResponse<Empty>),
-        &out_dir,
-        "AllNftInfoResponse",
-    );
-    export_schema_with_title(&schema_for!(TokensResponse), &out_dir, "AllTokensResponse");
-    export_schema_with_title(
-        &schema_for!(OperatorsResponse),
-        &out_dir,
-        "AllOperatorsResponse",
-    );
-    export_schema(&schema_for!(MinterResponse), &out_dir);
-    export_schema(&schema_for!(ApprovalResponse), &out_dir);
-    export_schema(&schema_for!(ApprovalsResponse), &out_dir);
-    export_schema(&schema_for!(ContractInfoResponse), &out_dir);
-    export_schema_with_title(
-        &schema_for!(NftInfoResponse<Empty>),
-        &out_dir,
-        "NftInfoResponse",
-    );
-    export_schema(&schema_for!(NumTokensResponse), &out_dir);
-    export_schema(&schema_for!(OwnerOfResponse), &out_dir);
-    export_schema(&schema_for!(TokensResponse), &out_dir);
-}
diff --git a/__fixtures__/sg721-updatable/schema/execute_msg_for__nullable__empty_and__empty.json b/__fixtures__/sg721-updatable/execute_msg_for__nullable__empty_and__empty.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/execute_msg_for__nullable__empty_and__empty.json
rename to __fixtures__/sg721-updatable/execute_msg_for__nullable__empty_and__empty.json
diff --git a/__fixtures__/sg721-updatable/schema/instantiate_msg.json b/__fixtures__/sg721-updatable/instantiate_msg.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/instantiate_msg.json
rename to __fixtures__/sg721-updatable/instantiate_msg.json
diff --git a/__fixtures__/sg721-updatable/schema/minter_response.json b/__fixtures__/sg721-updatable/minter_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/minter_response.json
rename to __fixtures__/sg721-updatable/minter_response.json
diff --git a/__fixtures__/sg721-updatable/schema/nft_info_response.json b/__fixtures__/sg721-updatable/nft_info_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/nft_info_response.json
rename to __fixtures__/sg721-updatable/nft_info_response.json
diff --git a/__fixtures__/sg721-updatable/schema/num_tokens_response.json b/__fixtures__/sg721-updatable/num_tokens_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/num_tokens_response.json
rename to __fixtures__/sg721-updatable/num_tokens_response.json
diff --git a/__fixtures__/sg721-updatable/schema/owner_of_response.json b/__fixtures__/sg721-updatable/owner_of_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/owner_of_response.json
rename to __fixtures__/sg721-updatable/owner_of_response.json
diff --git a/__fixtures__/sg721-updatable/schema/query_msg.json b/__fixtures__/sg721-updatable/query_msg.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/query_msg.json
rename to __fixtures__/sg721-updatable/query_msg.json
diff --git a/__fixtures__/sg721-updatable/src/contract.rs b/__fixtures__/sg721-updatable/src/contract.rs
deleted file mode 100644
index 5ad3d84a..00000000
--- a/__fixtures__/sg721-updatable/src/contract.rs
+++ /dev/null
@@ -1,378 +0,0 @@
-use crate::error::ContractError;
-use crate::state::FROZEN_TOKEN_METADATA;
-use cosmwasm_std::{Empty, StdError};
-
-use cosmwasm_std::{Deps, StdResult};
-
-#[cfg(not(feature = "library"))]
-use cosmwasm_std::{DepsMut, Env, Event, MessageInfo};
-use cw2::set_contract_version;
-use sg721::InstantiateMsg;
-use sg721_base::msg::CollectionInfoResponse;
-
-use crate::msg::{EnableUpdatableResponse, FrozenTokenMetadataResponse};
-use crate::state::ENABLE_UPDATABLE;
-
-use cw721_base::Extension;
-use cw_utils::nonpayable;
-use sg1::checked_fair_burn;
-use sg721_base::ContractError::Unauthorized;
-use sg721_base::Sg721Contract;
-pub type Sg721UpdatableContract<'a> = Sg721Contract<'a, Extension>;
-use sg_std::Response;
-
-const CONTRACT_NAME: &str = "crates.io:sg721-updatable";
-const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
-pub const EARLIEST_VERSION: &str = "0.16.0";
-pub const TO_VERSION: &str = "3.0.0";
-const ENABLE_UPDATABLE_FEE: u128 = 500_000_000;
-
-pub fn _instantiate(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    msg: InstantiateMsg,
-) -> Result<Response, ContractError> {
-    // Set frozen to false on instantiate. allows updating token metadata
-    FROZEN_TOKEN_METADATA.save(deps.storage, &false)?;
-    // Set enable_updatable to true on instantiate. allows updating token metadata
-    ENABLE_UPDATABLE.save(deps.storage, &true)?;
-
-    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-    let res = Sg721UpdatableContract::default().instantiate(deps, env, info, msg)?;
-    Ok(res)
-}
-
-pub fn execute_enable_updatable(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-) -> Result<Response, ContractError> {
-    let enable_updates = ENABLE_UPDATABLE.load(deps.storage)?;
-    let mut res = Response::new();
-    if enable_updates {
-        return Err(ContractError::AlreadyEnableUpdatable {});
-    }
-
-    // TODO add check if sender is contract admin
-    // Check if sender is creator
-    let collection_info: CollectionInfoResponse =
-        Sg721UpdatableContract::default().query_collection_info(deps.as_ref())?;
-    if info.sender != collection_info.creator {
-        return Err(ContractError::Base(Unauthorized {}));
-    }
-
-    // Check fee matches enable updatable fee and add fairburn msg
-    checked_fair_burn(&info, ENABLE_UPDATABLE_FEE, None, &mut res)?;
-
-    ENABLE_UPDATABLE.save(deps.storage, &true)?;
-
-    Ok(res
-        .add_attribute("action", "enable_updates")
-        .add_attribute("enabled", "true"))
-}
-
-pub fn execute_freeze_token_metadata(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-) -> Result<Response, ContractError> {
-    nonpayable(&info)?;
-    // Check if sender is creator
-    let collection_info: CollectionInfoResponse =
-        Sg721UpdatableContract::default().query_collection_info(deps.as_ref())?;
-    if info.sender != collection_info.creator {
-        return Err(ContractError::Base(Unauthorized {}));
-    }
-
-    FROZEN_TOKEN_METADATA.save(deps.storage, &true)?;
-
-    Ok(Response::new()
-        .add_attribute("action", "freeze_token_metadata")
-        .add_attribute("frozen", "true"))
-}
-
-pub fn execute_update_token_metadata(
-    deps: DepsMut,
-    _env: Env,
-    info: MessageInfo,
-    token_id: String,
-    token_uri: Option<String>,
-) -> Result<Response, ContractError> {
-    nonpayable(&info)?;
-    // Check if sender is creator
-    let owner = deps.api.addr_validate(info.sender.as_ref())?;
-    let collection_info: CollectionInfoResponse =
-        Sg721UpdatableContract::default().query_collection_info(deps.as_ref())?;
-    if owner != collection_info.creator {
-        return Err(ContractError::Base(Unauthorized {}));
-    }
-
-    // Check if token metadata is frozen
-    let frozen = FROZEN_TOKEN_METADATA.load(deps.storage)?;
-    if frozen {
-        return Err(ContractError::TokenMetadataFrozen {});
-    }
-
-    // Check if enable updatable is true
-    let enable_updatable = ENABLE_UPDATABLE.load(deps.storage)?;
-    if !enable_updatable {
-        return Err(ContractError::NotEnableUpdatable {});
-    }
-
-    // Update token metadata
-    Sg721UpdatableContract::default().tokens.update(
-        deps.storage,
-        &token_id,
-        |token| match token {
-            Some(mut token_info) => {
-                token_info.token_uri = token_uri.clone();
-                Ok(token_info)
-            }
-            None => Err(ContractError::TokenIdNotFound {}),
-        },
-    )?;
-
-    let mut event = Event::new("update_update_token_metadata")
-        .add_attribute("sender", info.sender)
-        .add_attribute("token_id", token_id);
-    if let Some(token_uri) = token_uri {
-        event = event.add_attribute("token_uri", token_uri);
-    }
-    Ok(Response::new().add_event(event))
-}
-
-pub fn query_enable_updatable(deps: Deps) -> StdResult<EnableUpdatableResponse> {
-    let enabled = ENABLE_UPDATABLE.load(deps.storage)?;
-    Ok(EnableUpdatableResponse { enabled })
-}
-
-pub fn query_frozen_token_metadata(deps: Deps) -> StdResult<FrozenTokenMetadataResponse> {
-    let frozen = FROZEN_TOKEN_METADATA.load(deps.storage)?;
-    Ok(FrozenTokenMetadataResponse { frozen })
-}
-
-pub fn _migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
-    // make sure the correct contract is being upgraded, and it's being
-    // upgraded from the correct version.
-    if CONTRACT_VERSION < EARLIEST_VERSION {
-        return Err(StdError::generic_err("Cannot upgrade to a previous contract version").into());
-    }
-    if CONTRACT_VERSION > TO_VERSION {
-        return Err(StdError::generic_err("Cannot upgrade to a previous contract version").into());
-    }
-    // if same version return
-    if CONTRACT_VERSION == TO_VERSION {
-        return Ok(Response::new());
-    }
-
-    // update contract version
-    cw2::set_contract_version(deps.storage, CONTRACT_NAME, TO_VERSION)?;
-
-    // perform the upgrade
-    cw721_base::upgrades::v0_17::migrate::<Extension, Empty, Empty, Empty>(deps)
-        .map_err(|e| sg721_base::ContractError::MigrationError(e.to_string()))?;
-
-    let event = Event::new("migrate")
-        .add_attribute("from_name", CONTRACT_VERSION)
-        .add_attribute("from_version", CONTRACT_VERSION)
-        .add_attribute("to_name", CONTRACT_NAME)
-        .add_attribute("to_version", TO_VERSION);
-    Ok(Response::new().add_event(event))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::entry::{execute, instantiate};
-    use crate::msg::ExecuteMsg;
-    use cosmwasm_std::testing::{mock_env, mock_info, MockApi, MockQuerier, MockStorage};
-    use cosmwasm_std::{
-        from_slice, to_binary, ContractInfoResponse, ContractResult, Empty, OwnedDeps, Querier,
-        QuerierResult, QueryRequest, SystemError, SystemResult, WasmQuery,
-    };
-    use cw721::Cw721Query;
-    use sg721::{CollectionInfo, InstantiateMsg};
-    use std::marker::PhantomData;
-
-    const CREATOR: &str = "creator";
-    const HACKER: &str = "hacker";
-
-    pub fn mock_deps() -> OwnedDeps<MockStorage, MockApi, CustomMockQuerier, Empty> {
-        OwnedDeps {
-            storage: MockStorage::default(),
-            api: MockApi::default(),
-            querier: CustomMockQuerier::new(MockQuerier::new(&[])),
-            custom_query_type: PhantomData,
-        }
-    }
-
-    pub struct CustomMockQuerier {
-        base: MockQuerier,
-    }
-
-    impl Querier for CustomMockQuerier {
-        fn raw_query(&self, bin_request: &[u8]) -> QuerierResult {
-            let request: QueryRequest<Empty> = match from_slice(bin_request) {
-                Ok(v) => v,
-                Err(e) => {
-                    return SystemResult::Err(SystemError::InvalidRequest {
-                        error: format!("Parsing query request: {}", e),
-                        request: bin_request.into(),
-                    })
-                }
-            };
-
-            self.handle_query(&request)
-        }
-    }
-
-    impl CustomMockQuerier {
-        pub fn handle_query(&self, request: &QueryRequest<Empty>) -> QuerierResult {
-            match &request {
-                QueryRequest::Wasm(WasmQuery::ContractInfo { contract_addr: _ }) => {
-                    let mut response = ContractInfoResponse::default();
-                    response.code_id = 1;
-                    response.creator = CREATOR.to_string();
-                    SystemResult::Ok(ContractResult::Ok(to_binary(&response).unwrap()))
-                }
-                _ => self.base.handle_query(request),
-            }
-        }
-
-        pub fn new(base: MockQuerier<Empty>) -> Self {
-            CustomMockQuerier { base }
-        }
-    }
-
-    #[test]
-    fn update_token_metadata() {
-        let mut deps = mock_deps();
-        let contract = Sg721UpdatableContract::default();
-
-        // Instantiate contract
-        let info = mock_info(CREATOR, &[]);
-        let init_msg = InstantiateMsg {
-            name: "SpaceShips".to_string(),
-            symbol: "SPACE".to_string(),
-            minter: CREATOR.to_string(),
-            collection_info: CollectionInfo {
-                creator: CREATOR.to_string(),
-                description: "this is a test".to_string(),
-                image: "https://larry.engineer".to_string(),
-                external_link: None,
-                explicit_content: None,
-                start_trading_time: None,
-                royalty_info: None,
-            },
-        };
-        instantiate(deps.as_mut(), mock_env(), info.clone(), init_msg).unwrap();
-
-        // Mint token
-        let token_id = "Enterprise";
-        let exec_msg = ExecuteMsg::Mint {
-            token_id: token_id.to_string(),
-            owner: "john".to_string(),
-            token_uri: Some("https://starships.example.com/Starship/Enterprise.json".into()),
-            extension: None,
-        };
-        execute(deps.as_mut(), mock_env(), info.clone(), exec_msg).unwrap();
-
-        // Update token metadata fails because token id is not found
-        let updated_token_uri = Some("https://badkids.example.com/collection-cid/1.json".into());
-        let update_msg = ExecuteMsg::UpdateTokenMetadata {
-            token_id: "wrong-token-id".to_string(),
-            token_uri: updated_token_uri.clone(),
-        };
-        let err = execute(deps.as_mut(), mock_env(), info.clone(), update_msg).unwrap_err();
-        assert_eq!(
-            err.to_string(),
-            ContractError::TokenIdNotFound {}.to_string()
-        );
-
-        // Update token metadata fails because sent by hacker
-        let update_msg = ExecuteMsg::UpdateTokenMetadata {
-            token_id: token_id.to_string(),
-            token_uri: updated_token_uri.clone(),
-        };
-        let hacker_info = mock_info(HACKER, &[]);
-        let err = execute(deps.as_mut(), mock_env(), hacker_info, update_msg.clone()).unwrap_err();
-        assert_eq!(
-            err.to_string(),
-            ContractError::Base(Unauthorized {}).to_string()
-        );
-
-        // Update token metadata
-        execute(deps.as_mut(), mock_env(), info.clone(), update_msg).unwrap();
-
-        // Check token contains updated metadata
-        let res = contract
-            .parent
-            .nft_info(deps.as_ref(), token_id.into())
-            .unwrap();
-        assert_eq!(res.token_uri, updated_token_uri);
-
-        // Update token metadata with None token_uri
-        let update_msg = ExecuteMsg::<Extension, Empty>::UpdateTokenMetadata {
-            token_id: token_id.to_string(),
-            token_uri: None,
-        };
-        execute(deps.as_mut(), mock_env(), info.clone(), update_msg).unwrap();
-        let res = contract
-            .parent
-            .nft_info(deps.as_ref(), token_id.into())
-            .unwrap();
-        assert_eq!(res.token_uri, None);
-
-        // Freeze token metadata
-        let freeze_msg = ExecuteMsg::FreezeTokenMetadata {};
-        execute(deps.as_mut(), mock_env(), info.clone(), freeze_msg).unwrap();
-
-        // Throws error trying to update token metadata
-        let updated_token_uri =
-            Some("https://badkids.example.com/other-collection-cid/2.json".into());
-        let update_msg = ExecuteMsg::UpdateTokenMetadata {
-            token_id: token_id.to_string(),
-            token_uri: updated_token_uri,
-        };
-        let err = execute(deps.as_mut(), mock_env(), info, update_msg).unwrap_err();
-        assert_eq!(
-            err.to_string(),
-            ContractError::TokenMetadataFrozen {}.to_string()
-        );
-    }
-
-    #[test]
-    fn enable_updatable() {
-        let mut deps = mock_deps();
-
-        // Instantiate contract
-        let info = mock_info(CREATOR, &[]);
-        let init_msg = InstantiateMsg {
-            name: "SpaceShips".to_string(),
-            symbol: "SPACE".to_string(),
-            minter: CREATOR.to_string(),
-            collection_info: CollectionInfo {
-                creator: CREATOR.to_string(),
-                description: "this is a test".to_string(),
-                image: "https://larry.engineer".to_string(),
-                external_link: None,
-                explicit_content: None,
-                start_trading_time: None,
-                royalty_info: None,
-            },
-        };
-        instantiate(deps.as_mut(), mock_env(), info.clone(), init_msg).unwrap();
-
-        let enable_updatable_msg = ExecuteMsg::EnableUpdatable {};
-        let err = execute(deps.as_mut(), mock_env(), info, enable_updatable_msg).unwrap_err();
-        assert_eq!(
-            err.to_string(),
-            ContractError::AlreadyEnableUpdatable {}.to_string()
-        );
-
-        let res = query_enable_updatable(deps.as_ref()).unwrap();
-        assert!(res.enabled);
-    }
-}
diff --git a/__fixtures__/sg721-updatable/src/error.rs b/__fixtures__/sg721-updatable/src/error.rs
deleted file mode 100644
index 29823b2b..00000000
--- a/__fixtures__/sg721-updatable/src/error.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use cosmwasm_std::StdError;
-use cw_utils::PaymentError;
-use sg1::FeeError;
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum ContractError {
-    #[error("{0}")]
-    Std(#[from] StdError),
-
-    #[error("{0}")]
-    Payment(#[from] PaymentError),
-
-    #[error("{0}")]
-    Base(#[from] sg721_base::ContractError),
-
-    #[error("{0}")]
-    Fee(#[from] FeeError),
-
-    #[error("TokenIdNotFound")]
-    TokenIdNotFound {},
-
-    #[error("TokenMetadataFrozen")]
-    TokenMetadataFrozen {},
-
-    #[error("NotEnableUpdatable")]
-    NotEnableUpdatable {},
-
-    #[error("AlreadyEnableUpdatable")]
-    AlreadyEnableUpdatable {},
-}
diff --git a/__fixtures__/sg721-updatable/src/lib.rs b/__fixtures__/sg721-updatable/src/lib.rs
deleted file mode 100644
index 06a13ea3..00000000
--- a/__fixtures__/sg721-updatable/src/lib.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-#[cfg(not(feature = "library"))]
-pub mod contract;
-pub mod error;
-pub mod msg;
-pub mod state;
-
-pub type InstantiateMsg = sg721::InstantiateMsg;
-
-pub mod entry {
-    use super::*;
-    use crate::error::ContractError;
-    use crate::msg::QueryMsg;
-    use crate::{
-        contract::{
-            _instantiate, _migrate, execute_enable_updatable, execute_freeze_token_metadata,
-            execute_update_token_metadata, query_enable_updatable, query_frozen_token_metadata,
-            Sg721UpdatableContract,
-        },
-        msg::ExecuteMsg,
-    };
-    use cosmwasm_std::{entry_point, to_binary, Empty};
-    use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, StdResult};
-    use cw721_base::Extension;
-    use sg_std::Response;
-
-    #[entry_point]
-    pub fn instantiate(
-        deps: DepsMut,
-        env: Env,
-        info: MessageInfo,
-        msg: InstantiateMsg,
-    ) -> Result<Response, ContractError> {
-        _instantiate(deps, env, info, msg)
-    }
-
-    #[entry_point]
-    pub fn execute(
-        deps: DepsMut,
-        env: Env,
-        info: MessageInfo,
-        msg: ExecuteMsg<Extension, Empty>,
-    ) -> Result<Response, ContractError> {
-        match msg {
-            ExecuteMsg::FreezeTokenMetadata {} => execute_freeze_token_metadata(deps, env, info),
-            ExecuteMsg::EnableUpdatable {} => execute_enable_updatable(deps, env, info),
-            ExecuteMsg::UpdateTokenMetadata {
-                token_id,
-                token_uri,
-            } => execute_update_token_metadata(deps, env, info, token_id, token_uri),
-            _ => Sg721UpdatableContract::default()
-                .execute(deps, env, info, msg.into())
-                .map_err(|e| e.into()),
-        }
-    }
-
-    #[entry_point]
-    pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
-        match msg {
-            QueryMsg::EnableUpdatable {} => to_binary(&query_enable_updatable(deps)?),
-            QueryMsg::FreezeTokenMetadata {} => to_binary(&query_frozen_token_metadata(deps)?),
-            _ => Sg721UpdatableContract::default().query(deps, env, msg.into()),
-        }
-    }
-
-    #[entry_point]
-    pub fn migrate(deps: DepsMut, env: Env, msg: Empty) -> Result<Response, ContractError> {
-        _migrate(deps, env, msg)
-    }
-}
diff --git a/__fixtures__/sg721-updatable/src/msg.rs b/__fixtures__/sg721-updatable/src/msg.rs
deleted file mode 100644
index f05672df..00000000
--- a/__fixtures__/sg721-updatable/src/msg.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::Binary;
-use cosmwasm_std::Timestamp;
-use cw_utils::Expiration;
-use sg721::{RoyaltyInfoResponse, UpdateCollectionInfoMsg};
-use sg721_base::msg::QueryMsg as Sg721QueryMsg;
-use sg721_base::ExecuteMsg as Sg721ExecuteMsg;
-
-#[cw_serde]
-pub enum ExecuteMsg<T, E> {
-    /// Freeze token metadata so creator can no longer update token uris
-    FreezeTokenMetadata {},
-    /// Creator calls can update token uris
-    UpdateTokenMetadata {
-        token_id: String,
-        token_uri: Option<String>,
-    },
-    /// Enable updatable for updating token metadata. One time migration fee for sg721-base to sg721-updatable.
-    EnableUpdatable {},
-    // Sg721Base msgs
-    TransferNft {
-        recipient: String,
-        token_id: String,
-    },
-    SendNft {
-        contract: String,
-        token_id: String,
-        msg: Binary,
-    },
-    Approve {
-        spender: String,
-        token_id: String,
-        expires: Option<Expiration>,
-    },
-    Revoke {
-        spender: String,
-        token_id: String,
-    },
-    ApproveAll {
-        operator: String,
-        expires: Option<Expiration>,
-    },
-    RevokeAll {
-        operator: String,
-    },
-    Burn {
-        token_id: String,
-    },
-    UpdateCollectionInfo {
-        collection_info: UpdateCollectionInfoMsg<RoyaltyInfoResponse>,
-    },
-    UpdateTradingStartTime(Option<Timestamp>),
-    FreezeCollectionInfo {},
-    Mint {
-        /// Unique ID of the NFT
-        token_id: String,
-        /// The owner of the newly minter NFT
-        owner: String,
-        /// Universal resource identifier for this NFT
-        /// Should point to a JSON file that conforms to the ERC721
-        /// Metadata JSON Schema
-        token_uri: Option<String>,
-        /// Any custom extension used by this contract
-        extension: T,
-    },
-    Extension {
-        msg: E,
-    },
-}
-
-impl<T, E> From<ExecuteMsg<T, E>> for Sg721ExecuteMsg
-where
-    T: Clone + PartialEq + Into<Option<cosmwasm_std::Empty>>,
-    Option<cosmwasm_std::Empty>: From<T>,
-{
-    fn from(msg: ExecuteMsg<T, E>) -> Sg721ExecuteMsg {
-        match msg {
-            ExecuteMsg::TransferNft {
-                recipient,
-                token_id,
-            } => Sg721ExecuteMsg::TransferNft {
-                recipient,
-                token_id,
-            },
-            ExecuteMsg::SendNft {
-                contract,
-                token_id,
-                msg,
-            } => Sg721ExecuteMsg::SendNft {
-                contract,
-                token_id,
-                msg,
-            },
-            ExecuteMsg::Approve {
-                spender,
-                token_id,
-                expires,
-            } => Sg721ExecuteMsg::Approve {
-                spender,
-                token_id,
-                expires,
-            },
-            ExecuteMsg::ApproveAll { operator, expires } => {
-                Sg721ExecuteMsg::ApproveAll { operator, expires }
-            }
-            ExecuteMsg::Revoke { spender, token_id } => {
-                Sg721ExecuteMsg::Revoke { spender, token_id }
-            }
-            ExecuteMsg::RevokeAll { operator } => Sg721ExecuteMsg::RevokeAll { operator },
-            ExecuteMsg::Burn { token_id } => Sg721ExecuteMsg::Burn { token_id },
-            ExecuteMsg::UpdateCollectionInfo { collection_info } => {
-                Sg721ExecuteMsg::UpdateCollectionInfo { collection_info }
-            }
-            ExecuteMsg::FreezeCollectionInfo {} => Sg721ExecuteMsg::FreezeCollectionInfo {},
-            ExecuteMsg::Mint {
-                token_id,
-                owner,
-                token_uri,
-                extension,
-            } => Sg721ExecuteMsg::Mint {
-                token_id,
-                owner,
-                token_uri,
-                extension: extension.into(),
-            },
-            _ => unreachable!("Invalid ExecuteMsg"),
-        }
-    }
-}
-
-#[cw_serde]
-pub enum QueryMsg {
-    EnableUpdatable {},
-    FreezeTokenMetadata {},
-    OwnerOf {
-        token_id: String,
-        include_expired: Option<bool>,
-    },
-    Approval {
-        token_id: String,
-        spender: String,
-        include_expired: Option<bool>,
-    },
-    Approvals {
-        token_id: String,
-        include_expired: Option<bool>,
-    },
-    AllOperators {
-        owner: String,
-        include_expired: Option<bool>,
-        start_after: Option<String>,
-        limit: Option<u32>,
-    },
-    NumTokens {},
-    ContractInfo {},
-    NftInfo {
-        token_id: String,
-    },
-    AllNftInfo {
-        token_id: String,
-        include_expired: Option<bool>,
-    },
-    Tokens {
-        owner: String,
-        start_after: Option<String>,
-        limit: Option<u32>,
-    },
-    AllTokens {
-        start_after: Option<String>,
-        limit: Option<u32>,
-    },
-    Minter {},
-    CollectionInfo {},
-}
-
-impl From<QueryMsg> for Sg721QueryMsg {
-    fn from(msg: QueryMsg) -> Sg721QueryMsg {
-        match msg {
-            QueryMsg::OwnerOf {
-                token_id,
-                include_expired,
-            } => Sg721QueryMsg::OwnerOf {
-                token_id,
-                include_expired,
-            },
-            QueryMsg::Approval {
-                token_id,
-                spender,
-                include_expired,
-            } => Sg721QueryMsg::Approval {
-                token_id,
-                spender,
-                include_expired,
-            },
-            QueryMsg::Approvals {
-                token_id,
-                include_expired,
-            } => Sg721QueryMsg::Approvals {
-                token_id,
-                include_expired,
-            },
-            QueryMsg::AllOperators {
-                owner,
-                include_expired,
-                start_after,
-                limit,
-            } => Sg721QueryMsg::AllOperators {
-                owner,
-                include_expired,
-                start_after,
-                limit,
-            },
-            QueryMsg::NumTokens {} => Sg721QueryMsg::NumTokens {},
-            QueryMsg::ContractInfo {} => Sg721QueryMsg::ContractInfo {},
-            QueryMsg::NftInfo { token_id } => Sg721QueryMsg::NftInfo { token_id },
-            QueryMsg::AllNftInfo {
-                token_id,
-                include_expired,
-            } => Sg721QueryMsg::AllNftInfo {
-                token_id,
-                include_expired,
-            },
-            QueryMsg::Tokens {
-                owner,
-                start_after,
-                limit,
-            } => Sg721QueryMsg::Tokens {
-                owner,
-                start_after,
-                limit,
-            },
-            QueryMsg::AllTokens { start_after, limit } => {
-                Sg721QueryMsg::AllTokens { start_after, limit }
-            }
-            QueryMsg::Minter {} => Sg721QueryMsg::Minter {},
-            QueryMsg::CollectionInfo {} => Sg721QueryMsg::CollectionInfo {},
-            _ => unreachable!("cannot convert {:?} to Sg721QueryMsg", msg),
-        }
-    }
-}
-
-#[cw_serde]
-pub struct EnableUpdatableResponse {
-    pub enabled: bool,
-}
-
-#[cw_serde]
-pub struct FrozenTokenMetadataResponse {
-    pub frozen: bool,
-}
diff --git a/__fixtures__/sg721-updatable/src/state.rs b/__fixtures__/sg721-updatable/src/state.rs
deleted file mode 100644
index 364608e6..00000000
--- a/__fixtures__/sg721-updatable/src/state.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use cw_storage_plus::Item;
-
-pub const FROZEN_TOKEN_METADATA: Item<bool> = Item::new("frozen_token_metadata");
-pub const ENABLE_UPDATABLE: Item<bool> = Item::new("enable_updatable");
diff --git a/__fixtures__/sg721-updatable/schema/tokens_response.json b/__fixtures__/sg721-updatable/tokens_response.json
similarity index 100%
rename from __fixtures__/sg721-updatable/schema/tokens_response.json
rename to __fixtures__/sg721-updatable/tokens_response.json

From e55d3c92a75ec2f4ba450dc6e48bd550b6ba3326 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 7 Jun 2023 05:58:20 +0800
Subject: [PATCH 120/287] move output of Sg721Updatable out of 'out' folder

---
 __output__/sg721-updatable/{out => }/Sg721Updatable.client.ts   | 0
 .../{out => }/Sg721Updatable.message-composer.ts                | 0
 .../sg721-updatable/{out => }/Sg721Updatable.react-query.ts     | 0
 __output__/sg721-updatable/{out => }/Sg721Updatable.types.ts    | 0
 __output__/sg721-updatable/{out => }/bundle.ts                  | 0
 .../__tests__/ts-codegen.issue-long-exe-msg-name.test.ts        | 2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename __output__/sg721-updatable/{out => }/Sg721Updatable.client.ts (100%)
 rename __output__/sg721-updatable/{out => }/Sg721Updatable.message-composer.ts (100%)
 rename __output__/sg721-updatable/{out => }/Sg721Updatable.react-query.ts (100%)
 rename __output__/sg721-updatable/{out => }/Sg721Updatable.types.ts (100%)
 rename __output__/sg721-updatable/{out => }/bundle.ts (100%)

diff --git a/__output__/sg721-updatable/out/Sg721Updatable.client.ts b/__output__/sg721-updatable/Sg721Updatable.client.ts
similarity index 100%
rename from __output__/sg721-updatable/out/Sg721Updatable.client.ts
rename to __output__/sg721-updatable/Sg721Updatable.client.ts
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
similarity index 100%
rename from __output__/sg721-updatable/out/Sg721Updatable.message-composer.ts
rename to __output__/sg721-updatable/Sg721Updatable.message-composer.ts
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.react-query.ts b/__output__/sg721-updatable/Sg721Updatable.react-query.ts
similarity index 100%
rename from __output__/sg721-updatable/out/Sg721Updatable.react-query.ts
rename to __output__/sg721-updatable/Sg721Updatable.react-query.ts
diff --git a/__output__/sg721-updatable/out/Sg721Updatable.types.ts b/__output__/sg721-updatable/Sg721Updatable.types.ts
similarity index 100%
rename from __output__/sg721-updatable/out/Sg721Updatable.types.ts
rename to __output__/sg721-updatable/Sg721Updatable.types.ts
diff --git a/__output__/sg721-updatable/out/bundle.ts b/__output__/sg721-updatable/bundle.ts
similarity index 100%
rename from __output__/sg721-updatable/out/bundle.ts
rename to __output__/sg721-updatable/bundle.ts
diff --git a/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts b/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
index ce67b501..a4270283 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
@@ -4,7 +4,7 @@ const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
 
 it('issue-long-exe-msg-name', async () => {
-  const outPath = OUTPUT_DIR + '/sg721-updatable/out';
+  const outPath = OUTPUT_DIR + '/sg721-updatable/';
   const schemaDir = FIXTURE_DIR + '/sg721-updatable/';
 
   const builder = new TSBuilder({

From 14dc44173f67be9b0b64dd642697c62a1a3d0211 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 6 Jun 2023 19:30:32 -0700
Subject: [PATCH 121/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.30.1
 - wasm-ast-types@0.23.1
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index e42efdeb..95172642 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.30.0...@cosmwasm/ts-codegen@0.30.1) (2023-06-07)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.30.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.29.0...@cosmwasm/ts-codegen@0.30.0) (2023-05-24)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 440a2435..f9c5dcdf 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.23.0"
+    "wasm-ast-types": "^0.23.1"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 9e4f66e9..a8cedad0 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.23.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.23.0...wasm-ast-types@0.23.1) (2023-06-07)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.23.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.22.0...wasm-ast-types@0.23.0) (2023-05-24)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 595792d8..8fa47c96 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "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",

From e8a5f42c67e40a27a834cc754c17e908d8b25c1d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 11 Jun 2023 11:49:29 -0700
Subject: [PATCH 122/287] readme

---
 README.md                     | 7 +++++--
 packages/ts-codegen/README.md | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index acef2606..70a871ea 100644
--- a/README.md
+++ b/README.md
@@ -510,8 +510,11 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 Checkout these related projects:
 
 * [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Cosmos chain registry and chain info.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.
+* [starship](https://github.com/cosmology-tech/starship) a k8s-based unified development environment for Cosmos Ecosystem
+
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index e342fd88..bc9fb14d 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -507,8 +507,11 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 Checkout these related projects:
 
 * [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Cosmos chain registry and chain info.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.
+* [starship](https://github.com/cosmology-tech/starship) a k8s-based unified development environment for Cosmos Ecosystem
+
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)

From 205295bdb3d5d3e62102b24c8415f52e2cc5e85c Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 12 Jul 2023 14:41:46 +0800
Subject: [PATCH 123/287] add create helpers

---
 packages/ts-codegen/src/builder/builder.ts    |  14 ++
 .../src/generators/create-helpers.ts          |  26 ++++
 .../src/helpers/contractContextBase.ts        |  58 ++++++++
 packages/ts-codegen/src/helpers/index.ts      |   1 +
 .../ts-codegen/src/plugins/use-contracts.ts   |  79 +++++++++++
 packages/ts-codegen/src/utils/files.ts        |  73 ++++++++++
 packages/ts-codegen/src/utils/unused.ts       |  52 +++++++
 .../ts-codegen/types/src/builder/builder.d.ts |   5 +
 .../types/src/generators/create-helpers.d.ts  |   2 +
 .../src/helpers/contractContextBase.d.ts      |   1 +
 .../ts-codegen/types/src/helpers/index.d.ts   |   1 +
 .../types/src/plugins/use-contracts.d.ts      |  12 ++
 .../ts-codegen/types/src/utils/files.d.ts     |   3 +
 .../ts-codegen/types/src/utils/unused.d.ts    |   5 +
 .../wasm-ast-types/src/context/context.ts     |   5 +-
 .../wasm-ast-types/src/context/imports.ts     | 133 +++++++++++-------
 .../wasm-ast-types/types/context/context.d.ts |   2 +-
 .../wasm-ast-types/types/context/imports.d.ts |   4 +-
 18 files changed, 423 insertions(+), 53 deletions(-)
 create mode 100644 packages/ts-codegen/src/generators/create-helpers.ts
 create mode 100644 packages/ts-codegen/src/helpers/contractContextBase.ts
 create mode 100644 packages/ts-codegen/src/helpers/index.ts
 create mode 100644 packages/ts-codegen/src/plugins/use-contracts.ts
 create mode 100644 packages/ts-codegen/src/utils/files.ts
 create mode 100644 packages/ts-codegen/src/utils/unused.ts
 create mode 100644 packages/ts-codegen/types/src/generators/create-helpers.d.ts
 create mode 100644 packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
 create mode 100644 packages/ts-codegen/types/src/helpers/index.d.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/use-contracts.d.ts
 create mode 100644 packages/ts-codegen/types/src/utils/files.d.ts
 create mode 100644 packages/ts-codegen/types/src/utils/unused.d.ts

diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index b17ac22c..e2a3119e 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -21,6 +21,7 @@ import { MsgBuilderPlugin } from "../plugins/msg-builder";
 import { MessageComposerPlugin } from "../plugins/message-composer";
 import { ClientPlugin } from "../plugins/client";
 import { TypesPlugin } from "../plugins/types";
+import { createHelpers } from "../generators/create-helpers";
 
 const defaultOpts: TSBuilderOptions = {
     bundle: {
@@ -44,8 +45,14 @@ export interface BundleOptions {
     bundlePath?: string;
 };
 
+export interface UseContractsOptions {
+  enabled?: boolean;
+  filename?: string;
+};
+
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
+    useContracts?: UseContractsOptions;
 } & RenderOptions;
 
 export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
@@ -147,6 +154,13 @@ export class TSBuilder {
         if (this.options.bundle.enabled) {
             this.bundle();
         }
+
+        createHelpers({
+          outPath: this.outPath,
+          contracts: this.contracts,
+          options: this.options,
+          plugins: this.plugins,
+        });
     }
 
     async bundle() {
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
new file mode 100644
index 00000000..21633f92
--- /dev/null
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -0,0 +1,26 @@
+import { join, dirname } from "path";
+import { sync as mkdirp } from "mkdirp";
+import pkg from "../../package.json";
+import { writeContentToFile } from "../utils/files";
+import { TSBuilderInput } from "../builder";
+import { contractContextBase } from "../helpers";
+
+const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
+const header = `/**
+* This file and any referenced files were automatically generated by ${pkg.name}@${version}
+* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
+* and run the transpile command or yarn proto command to regenerate this bundle.
+*/
+\n`;
+
+const write = (outPath: string, file: string, content: string) => {
+  const outFile = join(outPath, file);
+  mkdirp(dirname(outFile));
+  writeContentToFile(outPath, header + content, outFile);
+};
+
+export const createHelpers = (input: TSBuilderInput) => {
+  if (input.options?.useContracts?.enabled) {
+    write(input.outPath, "contractContextBase.ts", contractContextBase);
+  }
+};
diff --git a/packages/ts-codegen/src/helpers/contractContextBase.ts b/packages/ts-codegen/src/helpers/contractContextBase.ts
new file mode 100644
index 00000000..d2ef4407
--- /dev/null
+++ b/packages/ts-codegen/src/helpers/contractContextBase.ts
@@ -0,0 +1,58 @@
+export const contractContextBase = `
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+export interface IContractConstructor {
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+}
+
+export const noSigningErrorMessage = 'signingCosmWasmClient not connected';
+
+export const noCosmWasmClientErrorMessage = 'cosmWasmClient not connected';
+
+export const noAddressErrorMessage = "address doesn't exist";
+
+export class ContractBase {
+  constructor(
+    public readonly address: string | undefined,
+    public readonly cosmWasmClient: CosmWasmClient | undefined,
+    public readonly signingCosmWasmClient: SigningCosmWasmClient | undefined
+  ) {}
+}
+
+export function getSigningClientDefault<T>(
+  intance: ContractBase,
+  contractAddr: string,
+  T: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => T
+): T {
+  if (!intance.signingCosmWasmClient) throw new Error(noSigningErrorMessage);
+  if (!intance.address) throw new Error(noAddressErrorMessage);
+  return new T(intance.signingCosmWasmClient, intance.address, contractAddr);
+}
+
+export function getQueryClientDefault<T>(
+  intance: ContractBase,
+  contractAddr: string,
+  T: new (client: CosmWasmClient, contractAddress: string) => T
+): T {
+  if (!intance.cosmWasmClient) throw new Error(noCosmWasmClientErrorMessage);
+  return new T(intance.cosmWasmClient, contractAddr);
+}
+
+export function getMessageComposerDefault<T>(
+  intance: ContractBase,
+  contractAddr: string,
+  T: new (address: string, contractAddress: string) => T
+): T {
+  if (!intance.address) throw new Error(noAddressErrorMessage);
+  return new T(intance.address, contractAddr);
+}
+`
\ No newline at end of file
diff --git a/packages/ts-codegen/src/helpers/index.ts b/packages/ts-codegen/src/helpers/index.ts
new file mode 100644
index 00000000..11619fdc
--- /dev/null
+++ b/packages/ts-codegen/src/helpers/index.ts
@@ -0,0 +1 @@
+export * from './contractContextBase';
\ No newline at end of file
diff --git a/packages/ts-codegen/src/plugins/use-contracts.ts b/packages/ts-codegen/src/plugins/use-contracts.ts
new file mode 100644
index 00000000..6f5a0bee
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/use-contracts.ts
@@ -0,0 +1,79 @@
+import { pascal } from 'case';
+import * as w from 'wasm-ast-types';
+import { findAndParseTypes, findExecuteMsg } from '../utils';
+import {
+  getMessageProperties,
+  ContractInfo,
+  RenderContextBase,
+  RenderContext,
+  RenderOptions
+} from 'wasm-ast-types';
+import { BuilderFileType, TSBuilderOptions } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+
+export class ContractsContextPlugin extends BuilderPluginBase<TSBuilderOptions> {
+  initContext(
+    contract: ContractInfo,
+    options?: TSBuilderOptions
+  ): RenderContextBase<TSBuilderOptions> {
+    return new RenderContext(contract, options);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    const { enabled } = this.option.useContracts;
+
+    if (!enabled) {
+      return;
+    }
+
+    const localname = pascal(name) + '.message-composer.ts';
+
+    const TypesFile = pascal(name) + '.types';
+
+    // const ExecuteMsg = findExecuteMsg(schemas);
+    // const typeHash = await findAndParseTypes(schemas);
+
+    // const body = [];
+
+    // body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
+
+    // // execute messages
+    // if (ExecuteMsg) {
+    //   const children = getMessageProperties(ExecuteMsg);
+    //   if (children.length > 0) {
+    //     const TheClass = pascal(`${name}MessageComposer`);
+    //     const Interface = pascal(`${name}Message`);
+
+    //     body.push(
+    //       w.createMessageComposerInterface(context, Interface, ExecuteMsg)
+    //     );
+    //     body.push(
+    //       w.createMessageComposerClass(context, TheClass, Interface, ExecuteMsg)
+    //     );
+    //   }
+    // }
+
+    // if (typeHash.hasOwnProperty('Coin')) {
+    //   // @ts-ignore
+    //   delete context.utils.Coin;
+    // }
+
+    return [
+      {
+        type: 'message-composer',
+        localname,
+        body
+      }
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/utils/files.ts b/packages/ts-codegen/src/utils/files.ts
new file mode 100644
index 00000000..ba1f87c6
--- /dev/null
+++ b/packages/ts-codegen/src/utils/files.ts
@@ -0,0 +1,73 @@
+import * as t from "@babel/types";
+import { parse, ParserPlugin } from "@babel/parser";
+import { sync as mkdirp } from "mkdirp";
+import { writeFileSync } from "fs";
+import { dirname } from "path";
+import generate from "@babel/generator";
+import { unused } from "./unused";
+import traverse from "@babel/traverse";
+
+export const writeAstToFile = (
+  outPath: string,
+  program: t.Statement[],
+  filename: string,
+  removeUnusedImports = false,
+  isTsDisable = false,
+  isEslintDisable = false
+) => {
+  const ast = t.program(program);
+  const content = generate(ast).code;
+
+  if (removeUnusedImports) {
+    const plugins: ParserPlugin[] = ["typescript"];
+    const newAst = parse(content, {
+      sourceType: "module",
+      plugins,
+    });
+    traverse(newAst, unused);
+    const content2 = generate(newAst).code;
+    writeContentToFile(
+      outPath,
+      content2,
+      filename,
+      isTsDisable,
+      isEslintDisable
+    );
+  } else {
+    writeContentToFile(
+      outPath,
+      content,
+      filename,
+      isTsDisable,
+      isEslintDisable
+    );
+  }
+};
+
+export const writeContentToFile = (
+  outPath: string,
+  content: string,
+  filename: string,
+  isTsDisable = false,
+  isEslintDisable = false
+) => {
+  let esLintPrefix = "";
+  let tsLintPrefix = "";
+
+  let nameWithoutPath = filename.replace(outPath, "");
+  // strip off leading slash
+  if (nameWithoutPath.startsWith("/"))
+    nameWithoutPath = nameWithoutPath.replace(/^\//, "");
+
+  if (isTsDisable) {
+    tsLintPrefix = `//@ts-nocheck\n`;
+  }
+
+  if (isEslintDisable) {
+    esLintPrefix = `/* eslint-disable */\n`;
+  }
+
+  const text = tsLintPrefix + esLintPrefix + content;
+  mkdirp(dirname(filename));
+  writeFileSync(filename, text);
+};
diff --git a/packages/ts-codegen/src/utils/unused.ts b/packages/ts-codegen/src/utils/unused.ts
new file mode 100644
index 00000000..4e922a0b
--- /dev/null
+++ b/packages/ts-codegen/src/utils/unused.ts
@@ -0,0 +1,52 @@
+//@ts-nocheck
+
+import * as t from '@babel/types';
+
+// https://github.com/chuyik/babel-plugin-danger-remove-unused-import
+// https://github.com/chuyik/babel-plugin-danger-remove-unused-import/blob/c5454c21e94698a2464a12baa5590761932a71a8/License#L1
+
+export const unused = {
+  Program: {
+    exit: (path) => {
+      const UnRefBindings = new Map()
+      for (const [name, binding] of Object.entries(path.scope.bindings)) {
+        if (!binding.path.parentPath || binding.kind !== 'module') continue
+
+        const source = binding.path.parentPath.get('source')
+        const importName = source.node.value
+        if (
+          !t.isStringLiteral(source)
+        )
+          continue
+
+        const key = `${importName}(${source.node.loc &&
+          source.node.loc.start.line})`
+
+        if (!UnRefBindings.has(key)) {
+          UnRefBindings.set(key, binding)
+        }
+
+        if (binding.referenced) {
+          UnRefBindings.set(key, null)
+        } else {
+          const nodeType = binding.path.node.type
+          if (nodeType === 'ImportSpecifier') {
+            binding.path.remove()
+          } else if (nodeType === 'ImportDefaultSpecifier') {
+            binding.path.remove()
+          } else if (nodeType === 'ImportNamespaceSpecifier') {
+            binding.path.remove()
+          } else if (binding.path.parentPath) {
+            binding.path.parentPath.remove()
+          }
+        }
+      }
+
+      UnRefBindings.forEach((binding, key) => {
+        if (binding && binding.path.parentPath) {
+          binding.path.parentPath.remove()
+        }
+      })
+    }
+  }
+};
\ No newline at end of file
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index fd4d598d..e9aeb6db 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -12,8 +12,13 @@ export interface BundleOptions {
     bundleFile?: string;
     bundlePath?: string;
 }
+export interface UseContractsOptions {
+    enabled?: boolean;
+    filename?: string;
+}
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
+    useContracts?: UseContractsOptions;
 } & RenderOptions;
 export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
 export interface BuilderFile {
diff --git a/packages/ts-codegen/types/src/generators/create-helpers.d.ts b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
new file mode 100644
index 00000000..a09345d0
--- /dev/null
+++ b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
@@ -0,0 +1,2 @@
+import { TSBuilderInput } from '../builder';
+export declare const createHelpers: (input: TSBuilderInput) => void;
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
new file mode 100644
index 00000000..137be22d
--- /dev/null
+++ b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
@@ -0,0 +1 @@
+export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const noSigningErrorMessage = 'signingCosmWasmClient not connected';\n\nexport const noCosmWasmClientErrorMessage = 'cosmWasmClient not connected';\n\nexport const noAddressErrorMessage = \"address doesn't exist\";\n\nexport class ContractBase {\n  constructor(\n    public readonly address: string | undefined,\n    public readonly cosmWasmClient: CosmWasmClient | undefined,\n    public readonly signingCosmWasmClient: SigningCosmWasmClient | undefined\n  ) {}\n}\n\nexport function getSigningClientDefault<T>(\n  intance: ContractBase,\n  contractAddr: string,\n  T: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => T\n): T {\n  if (!intance.signingCosmWasmClient) throw new Error(noSigningErrorMessage);\n  if (!intance.address) throw new Error(noAddressErrorMessage);\n  return new T(intance.signingCosmWasmClient, intance.address, contractAddr);\n}\n\nexport function getQueryClientDefault<T>(\n  intance: ContractBase,\n  contractAddr: string,\n  T: new (client: CosmWasmClient, contractAddress: string) => T\n): T {\n  if (!intance.cosmWasmClient) throw new Error(noCosmWasmClientErrorMessage);\n  return new T(intance.cosmWasmClient, contractAddr);\n}\n\nexport function getMessageComposerDefault<T>(\n  intance: ContractBase,\n  contractAddr: string,\n  T: new (address: string, contractAddress: string) => T\n): T {\n  if (!intance.address) throw new Error(noAddressErrorMessage);\n  return new T(intance.address, contractAddr);\n}\n";
diff --git a/packages/ts-codegen/types/src/helpers/index.d.ts b/packages/ts-codegen/types/src/helpers/index.d.ts
new file mode 100644
index 00000000..71a13410
--- /dev/null
+++ b/packages/ts-codegen/types/src/helpers/index.d.ts
@@ -0,0 +1 @@
+export * from './contractContextBase';
diff --git a/packages/ts-codegen/types/src/plugins/use-contracts.d.ts b/packages/ts-codegen/types/src/plugins/use-contracts.d.ts
new file mode 100644
index 00000000..4b0fce32
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/use-contracts.d.ts
@@ -0,0 +1,12 @@
+import { ContractInfo, RenderContextBase, RenderContext } from 'wasm-ast-types';
+import { BuilderFileType, TSBuilderOptions } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class ContractsContextPlugin extends BuilderPluginBase<TSBuilderOptions> {
+    initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/utils/files.d.ts b/packages/ts-codegen/types/src/utils/files.d.ts
new file mode 100644
index 00000000..313b5cc1
--- /dev/null
+++ b/packages/ts-codegen/types/src/utils/files.d.ts
@@ -0,0 +1,3 @@
+import * as t from "@babel/types";
+export declare const writeAstToFile: (outPath: string, program: t.Statement[], filename: string, removeUnusedImports?: boolean, isTsDisable?: boolean, isEslintDisable?: boolean) => void;
+export declare const writeContentToFile: (outPath: string, content: string, filename: string, isTsDisable?: boolean, isEslintDisable?: boolean) => void;
diff --git a/packages/ts-codegen/types/src/utils/unused.d.ts b/packages/ts-codegen/types/src/utils/unused.d.ts
new file mode 100644
index 00000000..13b921b4
--- /dev/null
+++ b/packages/ts-codegen/types/src/utils/unused.d.ts
@@ -0,0 +1,5 @@
+export declare const unused: {
+    Program: {
+        exit: (path: any) => void;
+    };
+};
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 9cb27f60..95c7831c 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -156,13 +156,14 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     addUtil(util: string) {
         this.utils[util] = true;
     }
-    getImports(registeredUtils?: UtilMapping) {
+    getImports(registeredUtils?: UtilMapping, filepath?: string) {
         return getImportStatements(
             convertUtilsToImportList(
                 this,
                 Object.keys(this.utils),
                 registeredUtils,
-            )
+            ),
+            filepath
         );
     }
 }
diff --git a/packages/wasm-ast-types/src/context/imports.ts b/packages/wasm-ast-types/src/context/imports.ts
index cf10b276..444a9ddb 100644
--- a/packages/wasm-ast-types/src/context/imports.ts
+++ b/packages/wasm-ast-types/src/context/imports.ts
@@ -1,6 +1,7 @@
 import * as t from '@babel/types';
 import { importAs, importStmt } from "../utils";
 import { RenderContext } from './context';
+import { relative, dirname, extname } from 'path';
 
 
 export interface ImportObj {
@@ -57,6 +58,10 @@ export const UTILS = {
 
 };
 
+export const UTIL_HELPERS = [
+  '__contractContextBase__',
+];
+
 export const convertUtilsToImportList = (
   context: RenderContext,
   utils: string[],
@@ -102,59 +107,89 @@ export const convertUtil = (
   }
 };
 
-export const getImportStatements = (list: ImportObj[]) => {
-  const imports = list.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);
 
-    // 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];
-    }
+// __helpers__
+export const getImportStatements = (
+  list: ImportObj[],
+  filepath?: string
+) => {
+
+  // swap helpers with helpers file...
+  const modifiedImports = list.map(imp => {
+      if (filepath && UTIL_HELPERS.includes(imp.path)) {
+          const name = imp.path.replace(/__/g, '');
+          return {
+              ...imp,
+              path: getRelativePath(filepath, `./${name}`)
+          }
+      }
+      return imp;
+  });
 
-    if (!exists) m[obj.path].push(obj);
-    return m;
+  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
+      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]: [string, ImportObj[]]) => {
-      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)
+      .reduce((m, [importPath, imports]: [string, ImportObj[]]) => {
+          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)
+                  )
               )
-            ],
-            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)
+          }
+          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)
+                  )
               )
-            ],
-            t.stringLiteral(namespaced[0].path)
-          )
-        )
-      }
-      return m;
-    }, [])
-};
\ No newline at end of file
+          }
+          return m;
+      }, [])
+};
+
+export const getRelativePath = (f1: string, f2: string) => {
+  const rel = relative(dirname(f1), f2);
+  let importPath = rel.replace(extname(rel), '');
+  if (!/^\./.test(importPath)) importPath = `./${importPath}`;
+  return importPath;
+}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index acb7b342..e6635246 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -85,7 +85,7 @@ export declare abstract class RenderContextBase<TOpt = RenderOptions> implements
     abstract mergeDefaultOpt(options: TOpt): TOpt;
     refLookup($ref: string): JSONSchema;
     addUtil(util: string): void;
-    getImports(registeredUtils?: UtilMapping): any;
+    getImports(registeredUtils?: UtilMapping, filepath?: string): any;
 }
 export declare class RenderContext extends RenderContextBase {
     mergeDefaultOpt(options: RenderOptions): RenderOptions;
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
index d88549ce..21361af1 100644
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ b/packages/wasm-ast-types/types/context/imports.d.ts
@@ -40,6 +40,8 @@ export declare const UTILS: {
         name: any;
     };
 };
+export declare const UTIL_HELPERS: string[];
 export declare const convertUtilsToImportList: (context: RenderContext, utils: string[], registeredUtils?: UtilMapping) => ImportObj[];
 export declare const convertUtil: (context: RenderContext, util: string, registeredUtils: object) => ImportObj;
-export declare const getImportStatements: (list: ImportObj[]) => any[];
+export declare const getImportStatements: (list: ImportObj[], filepath?: string) => any[];
+export declare const getRelativePath: (f1: string, f2: string) => string;

From 2915911686f1ed330e8b7f6cf6c06aff0f9de4a4 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 12 Jul 2023 21:12:23 +0800
Subject: [PATCH 124/287] gen provider class body

---
 .../contracts/CwAdminFactory.provider.ts      |  20 ++++
 .../contracts/CwCodeIdRegistry.provider.ts    |  20 ++++
 .../contracts/CwSingle.provider.ts            |  20 ++++
 .../contracts/Factory.provider.ts             |  20 ++++
 .../bundler_test/contracts/Minter.provider.ts |  20 ++++
 .../contracts/contractContextBase.ts          |  63 ++++++++++
 __output__/builder/bundler_test/index.ts      |  82 +++++++------
 .../__snapshots__/builder.test.ts.snap        | 104 ++++++++++++++++
 packages/ts-codegen/__tests__/builder.test.ts |   3 +
 packages/ts-codegen/src/builder/builder.ts    |   7 +-
 packages/ts-codegen/src/plugins/client.ts     |  11 +-
 .../src/plugins/message-composer.ts           |   8 +-
 .../ts-codegen/src/plugins/msg-builder.ts     |   2 +-
 .../ts-codegen/src/plugins/plugin-base.ts     |  50 ++++----
 packages/ts-codegen/src/plugins/provider.ts   | 111 ++++++++++++++++++
 .../ts-codegen/src/plugins/react-query.ts     |   2 +-
 packages/ts-codegen/src/plugins/recoil.ts     |   2 +-
 packages/ts-codegen/src/plugins/types.ts      |   2 +-
 .../ts-codegen/src/plugins/use-contracts.ts   |   2 +-
 .../ts-codegen/types/src/builder/builder.d.ts |   3 +-
 .../types/src/generators/create-helpers.d.ts  |   2 +-
 .../ts-codegen/types/src/plugins/client.d.ts  |   2 +
 .../types/src/plugins/message-composer.d.ts   |   1 +
 .../types/src/plugins/plugin-base.d.ts        |  10 +-
 .../types/src/plugins/provider.d.ts           |  13 ++
 .../wasm-ast-types/src/context/context.ts     |  36 +++++-
 packages/wasm-ast-types/src/index.ts          |   1 +
 packages/wasm-ast-types/src/provider/index.ts |   1 +
 .../wasm-ast-types/src/provider/provider.ts   |  51 ++++++++
 .../src/react-query/react-query.ts            |   6 +-
 .../wasm-ast-types/types/context/context.d.ts |  23 +++-
 packages/wasm-ast-types/types/index.d.ts      |   1 +
 .../wasm-ast-types/types/provider/index.d.ts  |   1 +
 .../types/provider/provider.d.ts              |   2 +
 34 files changed, 624 insertions(+), 78 deletions(-)
 create mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
 create mode 100644 __output__/builder/bundler_test/contracts/CwSingle.provider.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Factory.provider.ts
 create mode 100644 __output__/builder/bundler_test/contracts/Minter.provider.ts
 create mode 100644 __output__/builder/bundler_test/contracts/contractContextBase.ts
 create mode 100644 packages/ts-codegen/src/plugins/provider.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/provider.d.ts
 create mode 100644 packages/wasm-ast-types/src/provider/index.ts
 create mode 100644 packages/wasm-ast-types/src/provider/provider.ts
 create mode 100644 packages/wasm-ast-types/types/provider/index.d.ts
 create mode 100644 packages/wasm-ast-types/types/provider/provider.d.ts

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
new file mode 100644
index 00000000..7aac8f72
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { CwAdminFactoryClient } from "./CwAdminFactory.client.ts";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client.ts";
+import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer.ts";
+export class CwAdminFactory extends ContractBase {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }) {
+    super(address, cosmWasmClient, signingCosmWasmClient);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
new file mode 100644
index 00000000..5d9e6b95
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client.ts";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client.ts";
+import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer.ts";
+export class CwCodeIdRegistry extends ContractBase {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }) {
+    super(address, cosmWasmClient, signingCosmWasmClient);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
new file mode 100644
index 00000000..f5c349a5
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { CwSingleClient } from "./CwSingle.client.ts";
+import { CwSingleQueryClient } from "./CwSingle.client.ts";
+import { CwSingleMessageComposer } from "./CwSingle.message-composer.ts";
+export class CwSingle extends ContractBase {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }) {
+    super(address, cosmWasmClient, signingCosmWasmClient);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.provider.ts b/__output__/builder/bundler_test/contracts/Factory.provider.ts
new file mode 100644
index 00000000..f63a1ebb
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Factory.provider.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { FactoryClient } from "./Factory.client.ts";
+import { FactoryQueryClient } from "./Factory.client.ts";
+import { FactoryMessageComposer } from "./Factory.message-composer.ts";
+export class Factory extends ContractBase {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }) {
+    super(address, cosmWasmClient, signingCosmWasmClient);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.provider.ts b/__output__/builder/bundler_test/contracts/Minter.provider.ts
new file mode 100644
index 00000000..118e73bd
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/Minter.provider.ts
@@ -0,0 +1,20 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { MinterClient } from "./Minter.client.ts";
+import { MinterQueryClient } from "./Minter.client.ts";
+import { MinterMessageComposer } from "./Minter.message-composer.ts";
+export class Minter extends ContractBase {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }) {
+    super(address, cosmWasmClient, signingCosmWasmClient);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
new file mode 100644
index 00000000..17d38894
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -0,0 +1,63 @@
+/**
+* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
+* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
+* and run the transpile command or yarn proto command to regenerate this bundle.
+*/
+
+
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+export interface IContractConstructor {
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+}
+
+export const noSigningErrorMessage = 'signingCosmWasmClient not connected';
+
+export const noCosmWasmClientErrorMessage = 'cosmWasmClient not connected';
+
+export const noAddressErrorMessage = "address doesn't exist";
+
+export class ContractBase {
+  constructor(
+    public readonly address: string | undefined,
+    public readonly cosmWasmClient: CosmWasmClient | undefined,
+    public readonly signingCosmWasmClient: SigningCosmWasmClient | undefined
+  ) {}
+}
+
+export function getSigningClientDefault<T>(
+  intance: ContractBase,
+  contractAddr: string,
+  T: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => T
+): T {
+  if (!intance.signingCosmWasmClient) throw new Error(noSigningErrorMessage);
+  if (!intance.address) throw new Error(noAddressErrorMessage);
+  return new T(intance.signingCosmWasmClient, intance.address, contractAddr);
+}
+
+export function getQueryClientDefault<T>(
+  intance: ContractBase,
+  contractAddr: string,
+  T: new (client: CosmWasmClient, contractAddress: string) => T
+): T {
+  if (!intance.cosmWasmClient) throw new Error(noCosmWasmClientErrorMessage);
+  return new T(intance.cosmWasmClient, contractAddr);
+}
+
+export function getMessageComposerDefault<T>(
+  intance: ContractBase,
+  contractAddr: string,
+  T: new (address: string, contractAddress: string) => T
+): T {
+  if (!intance.address) throw new Error(noAddressErrorMessage);
+  return new T(intance.address, contractAddr);
+}
diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
index 8dedea79..39f93cb6 100644
--- a/__output__/builder/bundler_test/index.ts
+++ b/__output__/builder/bundler_test/index.ts
@@ -9,57 +9,67 @@ import * as _76 from "./contracts/Factory.client";
 import * as _77 from "./contracts/Factory.message-composer";
 import * as _78 from "./contracts/Factory.react-query";
 import * as _79 from "./contracts/Factory.recoil";
-import * as _80 from "./contracts/Minter.types";
-import * as _81 from "./contracts/Minter.client";
-import * as _82 from "./contracts/Minter.message-composer";
-import * as _83 from "./contracts/Minter.react-query";
-import * as _84 from "./contracts/Minter.recoil";
-import * as _85 from "./contracts/CwAdminFactory.types";
-import * as _86 from "./contracts/CwAdminFactory.client";
-import * as _87 from "./contracts/CwAdminFactory.message-composer";
-import * as _88 from "./contracts/CwAdminFactory.react-query";
-import * as _89 from "./contracts/CwAdminFactory.recoil";
-import * as _90 from "./contracts/CwCodeIdRegistry.types";
-import * as _91 from "./contracts/CwCodeIdRegistry.client";
-import * as _92 from "./contracts/CwCodeIdRegistry.message-composer";
-import * as _93 from "./contracts/CwCodeIdRegistry.react-query";
-import * as _94 from "./contracts/CwCodeIdRegistry.recoil";
-import * as _95 from "./contracts/CwSingle.types";
-import * as _96 from "./contracts/CwSingle.client";
-import * as _97 from "./contracts/CwSingle.message-composer";
-import * as _98 from "./contracts/CwSingle.react-query";
-import * as _99 from "./contracts/CwSingle.recoil";
+import * as _80 from "./contracts/Factory.provider";
+import * as _81 from "./contracts/Minter.types";
+import * as _82 from "./contracts/Minter.client";
+import * as _83 from "./contracts/Minter.message-composer";
+import * as _84 from "./contracts/Minter.react-query";
+import * as _85 from "./contracts/Minter.recoil";
+import * as _86 from "./contracts/Minter.provider";
+import * as _87 from "./contracts/CwAdminFactory.types";
+import * as _88 from "./contracts/CwAdminFactory.client";
+import * as _89 from "./contracts/CwAdminFactory.message-composer";
+import * as _90 from "./contracts/CwAdminFactory.react-query";
+import * as _91 from "./contracts/CwAdminFactory.recoil";
+import * as _92 from "./contracts/CwAdminFactory.provider";
+import * as _93 from "./contracts/CwCodeIdRegistry.types";
+import * as _94 from "./contracts/CwCodeIdRegistry.client";
+import * as _95 from "./contracts/CwCodeIdRegistry.message-composer";
+import * as _96 from "./contracts/CwCodeIdRegistry.react-query";
+import * as _97 from "./contracts/CwCodeIdRegistry.recoil";
+import * as _98 from "./contracts/CwCodeIdRegistry.provider";
+import * as _99 from "./contracts/CwSingle.types";
+import * as _100 from "./contracts/CwSingle.client";
+import * as _101 from "./contracts/CwSingle.message-composer";
+import * as _102 from "./contracts/CwSingle.react-query";
+import * as _103 from "./contracts/CwSingle.recoil";
+import * as _104 from "./contracts/CwSingle.provider";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._75,
       ..._76,
       ..._77,
       ..._78,
-      ..._79
+      ..._79,
+      ..._80
     };
-    export const Minter = { ..._80,
-      ..._81,
+    export const Minter = { ..._81,
       ..._82,
       ..._83,
-      ..._84
+      ..._84,
+      ..._85,
+      ..._86
     };
-    export const CwAdminFactory = { ..._85,
-      ..._86,
-      ..._87,
+    export const CwAdminFactory = { ..._87,
       ..._88,
-      ..._89
-    };
-    export const CwCodeIdRegistry = { ..._90,
+      ..._89,
+      ..._90,
       ..._91,
-      ..._92,
-      ..._93,
-      ..._94
+      ..._92
     };
-    export const CwSingle = { ..._95,
+    export const CwCodeIdRegistry = { ..._93,
+      ..._94,
+      ..._95,
       ..._96,
       ..._97,
-      ..._98,
-      ..._99
+      ..._98
+    };
+    export const CwSingle = { ..._99,
+      ..._100,
+      ..._101,
+      ..._102,
+      ..._103,
+      ..._104
     };
   }
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 21f9e9a1..d52d4370 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -2,6 +2,9 @@
 
 exports[`options tsClient.enabled 1`] = `
 TSBuilder {
+  "builderContext": BuilderContext {
+    "providers": Object {},
+  },
   "files": Array [],
   "options": Object {
     "bundle": Object {
@@ -39,6 +42,7 @@ TSBuilder {
   },
   "plugins": Array [
     TypesPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -76,6 +80,7 @@ TSBuilder {
       "utils": undefined,
     },
     ClientPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -113,6 +118,7 @@ TSBuilder {
       "utils": undefined,
     },
     MessageComposerPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -150,6 +156,7 @@ TSBuilder {
       "utils": undefined,
     },
     ReactQueryPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -187,6 +194,7 @@ TSBuilder {
       "utils": undefined,
     },
     RecoilPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -226,6 +234,7 @@ TSBuilder {
       },
     },
     MsgBuilderPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -262,12 +271,58 @@ TSBuilder {
       },
       "utils": undefined,
     },
+    ContractsContextProviderPlugin {
+      "builder": [Circular],
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": Object {
+        "ContractBase": "__contractContextBase__",
+        "getMessageComposerDefault": "__contractContextBase__",
+        "getQueryClientDefault": "__contractContextBase__",
+        "getSigningClientDefault": "__contractContextBase__",
+      },
+    },
   ],
 }
 `;
 
 exports[`options undefined 1`] = `
 TSBuilder {
+  "builderContext": BuilderContext {
+    "providers": Object {},
+  },
   "files": Array [],
   "options": Object {
     "bundle": Object {
@@ -305,6 +360,7 @@ TSBuilder {
   },
   "plugins": Array [
     TypesPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -342,6 +398,7 @@ TSBuilder {
       "utils": undefined,
     },
     ClientPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -379,6 +436,7 @@ TSBuilder {
       "utils": undefined,
     },
     MessageComposerPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -416,6 +474,7 @@ TSBuilder {
       "utils": undefined,
     },
     ReactQueryPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -453,6 +512,7 @@ TSBuilder {
       "utils": undefined,
     },
     RecoilPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -492,6 +552,7 @@ TSBuilder {
       },
     },
     MsgBuilderPlugin {
+      "builder": [Circular],
       "option": Object {
         "bundle": Object {
           "bundleFile": "bundle.ts",
@@ -528,6 +589,49 @@ TSBuilder {
       },
       "utils": undefined,
     },
+    ContractsContextProviderPlugin {
+      "builder": [Circular],
+      "option": Object {
+        "bundle": Object {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": Object {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageComposer": Object {
+          "enabled": false,
+        },
+        "msgBuilder": Object {
+          "enabled": false,
+        },
+        "reactQuery": Object {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v3",
+        },
+        "recoil": Object {
+          "enabled": false,
+        },
+        "types": Object {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+        },
+      },
+      "utils": Object {
+        "ContractBase": "__contractContextBase__",
+        "getMessageComposerDefault": "__contractContextBase__",
+        "getQueryClientDefault": "__contractContextBase__",
+        "getSigningClientDefault": "__contractContextBase__",
+      },
+    },
   ],
 }
 `;
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 29603e2b..4c6aa185 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -197,6 +197,9 @@ it('builder set bundler path', async () => {
             },
             messageComposer: {
               enabled: true
+            },
+            useContracts:{
+              enabled: true,
             }
         }
     });
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index e2a3119e..2950c324 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,4 +1,4 @@
-import { RenderOptions, defaultOptions, RenderContext, ContractInfo, MessageComposerOptions} from "wasm-ast-types";
+import { RenderOptions, defaultOptions, RenderContext, ContractInfo, MessageComposerOptions, BuilderContext} from "wasm-ast-types";
 
 import { header } from '../utils/header';
 import { join } from "path";
@@ -21,6 +21,7 @@ import { MsgBuilderPlugin } from "../plugins/msg-builder";
 import { MessageComposerPlugin } from "../plugins/message-composer";
 import { ClientPlugin } from "../plugins/client";
 import { TypesPlugin } from "../plugins/types";
+import { ContractsContextProviderPlugin } from "../plugins/provider";
 import { createHelpers } from "../generators/create-helpers";
 
 const defaultOpts: TSBuilderOptions = {
@@ -90,6 +91,7 @@ export class TSBuilder {
     outPath: string;
     options?: TSBuilderOptions;
     plugins: IBuilderPlugin[] = [];
+    builderContext: BuilderContext = new BuilderContext();
 
     protected files: BuilderFile[] = [];
 
@@ -101,6 +103,7 @@ export class TSBuilder {
             new ReactQueryPlugin(this.options),
             new RecoilPlugin(this.options),
             new MsgBuilderPlugin(this.options),
+            new ContractsContextProviderPlugin(this.options),
         ]);
     }
 
@@ -120,6 +123,8 @@ export class TSBuilder {
         if (plugins && plugins.length) {
             [].push.apply(this.plugins, plugins);
         }
+
+        this.plugins.forEach(plugin=> plugin.setBuilder(this))
     }
 
     async build() {
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 049e6702..3b31dfec 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -11,12 +11,15 @@ import {
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
+export const TYPE = 'client';
+export const QUERY_CLIENT_TYPE = 'queryClient';
+
 export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options);
+    return new RenderContext(contract, options, this.builder.builderContext);
   }
 
   async doRender(
@@ -62,6 +65,8 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
       body.push(
         w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg)
       );
+
+      context.addProviderInfo(QUERY_CLIENT_TYPE, QueryClient, localname)
     }
 
     // execute messages
@@ -89,6 +94,8 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
             ExecuteMsg
           )
         );
+
+        context.addProviderInfo(TYPE, Client, localname)
       }
     }
 
@@ -99,7 +106,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type: 'client',
+        type: TYPE,
         localname,
         body
       }
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index 6c6caa40..3326181a 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -12,12 +12,14 @@ import {
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
+export const TYPE = 'message-composer';
+
 export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options);
+    return new RenderContext(contract, options, this.builder.builderContext);
   }
 
   async doRender(
@@ -61,6 +63,8 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
         body.push(
           w.createMessageComposerClass(context, TheClass, Interface, ExecuteMsg)
         );
+
+        context.addProviderInfo(TYPE, TheClass, localname)
       }
     }
 
@@ -71,7 +75,7 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type: 'message-composer',
+        type: TYPE,
         localname,
         body
       }
diff --git a/packages/ts-codegen/src/plugins/msg-builder.ts b/packages/ts-codegen/src/plugins/msg-builder.ts
index 918a3ad3..4222fe65 100644
--- a/packages/ts-codegen/src/plugins/msg-builder.ts
+++ b/packages/ts-codegen/src/plugins/msg-builder.ts
@@ -16,7 +16,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options);
+    return new RenderContext(contract, options, this.builder.builderContext);
   }
 
   async doRender(
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index c1dd4e58..21d54db3 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -1,15 +1,16 @@
-import { sync as mkdirp } from 'mkdirp';
-import { join } from 'path';
-import { writeFileSync } from 'fs';
-import { header } from '../utils/header';
+import { sync as mkdirp } from "mkdirp";
+import { join } from "path";
+import { writeFileSync } from "fs";
+import { header } from "../utils/header";
+import { ContractInfo, UtilMapping, IContext } from "wasm-ast-types";
+import generate from "@babel/generator";
+import * as t from "@babel/types";
 import {
-  ContractInfo,
-  UtilMapping,
-  IContext
-} from 'wasm-ast-types';
-import generate from '@babel/generator';
-import * as t from '@babel/types';
-import { BuilderFile, BuilderFileType, TSBuilderOptions } from '../builder';
+  BuilderFile,
+  BuilderFileType,
+  TSBuilder,
+  TSBuilderOptions,
+} from "../builder";
 
 /**
  * IBuilderPlugin is a common plugin that render generated code.
@@ -20,6 +21,10 @@ export interface IBuilderPlugin {
    */
   utils: UtilMapping;
 
+  builder?: TSBuilder;
+
+  setBuilder(builder: TSBuilder);
+
   /**
    * render generated cdoe.
    * @param name the name of contract
@@ -30,19 +35,27 @@ export interface IBuilderPlugin {
   render(
     name: string,
     contractInfo: ContractInfo,
-    outPath: string,
+    outPath: string
   ): Promise<BuilderFile[]>;
 }
 
 /**
  * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
  */
-export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }> implements IBuilderPlugin {
+export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
+  implements IBuilderPlugin
+{
+  builder?: TSBuilder;
   option: TOpt;
   utils: UtilMapping;
 
-  constructor(opt: TOpt) {
+  constructor(opt: TOpt, builder?: TSBuilder) {
     this.option = opt;
+    this.builder = builder;
+  }
+
+  setBuilder(builder: TSBuilder) {
+    this.builder = builder;
   }
 
   async render(
@@ -65,7 +78,7 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }> impl
     }
 
     return results.map((result) => {
-      const imports = context.getImports(this.utils);
+      const imports = context.getImports(this.utils, result.localname);
       const code =
         header + generate(t.program([...imports, ...result.body])).code;
 
@@ -78,7 +91,7 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }> impl
         pluginType: result.pluginType,
         contract: name,
         localname: result.localname,
-        filename
+        filename,
       };
     });
   }
@@ -88,10 +101,7 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }> impl
    * @param contract
    * @param options
    */
-  abstract initContext(
-    contract: ContractInfo,
-    options?: TOpt
-  ): IContext;
+  abstract initContext(contract: ContractInfo, options?: TOpt): IContext;
 
   /**
    * render generated code here.
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
new file mode 100644
index 00000000..076ee7cb
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -0,0 +1,111 @@
+import { pascal } from "case";
+import * as w from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg } from "../utils";
+import {
+  getMessageProperties,
+  ContractInfo,
+  RenderContextBase,
+  RenderContext,
+  RenderOptions,
+} from "wasm-ast-types";
+import { BuilderFileType, TSBuilder, TSBuilderOptions } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
+import { TYPE as SIGN_CLIENT_TYPE, QUERY_CLIENT_TYPE } from "./client";
+import { TYPE as MESSAGE_COMPOSER_TYPE } from "./message-composer";
+
+export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
+  constructor(opt: TSBuilderOptions) {
+    super(opt);
+
+    this.utils = {
+      ContractBase: "__contractContextBase__",
+      IContractConstructor: "__contractContextBase__",
+      getSigningClientDefault: "__contractContextBase__",
+      getQueryClientDefault: "__contractContextBase__",
+      getMessageComposerDefault: "__contractContextBase__",
+    };
+  }
+
+  initContext(
+    contract: ContractInfo,
+    options?: TSBuilderOptions
+  ): RenderContextBase<TSBuilderOptions> {
+    return new RenderContext(contract, options, this.builder.builderContext);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    if (!this.option?.useContracts?.enabled) {
+      return;
+    }
+
+    if (!Object.keys(context.getProviderInfos())?.length) {
+      return;
+    }
+
+    context.addUtil("ContractBase");
+    const localname = pascal(name) + ".provider.ts";
+
+    const body = [];
+
+    const signClientProviderInfo = context.getProviderInfos()[SIGN_CLIENT_TYPE];
+
+    if (signClientProviderInfo) {
+      context.addUtil("getSigningClientDefault");
+
+      body.push(
+        w.importStmt(
+          [signClientProviderInfo.classname],
+          `./${signClientProviderInfo.filename}`
+        )
+      );
+    }
+
+    const queryClientProviderInfo =
+      context.getProviderInfos()[QUERY_CLIENT_TYPE];
+
+    if (queryClientProviderInfo) {
+      context.addUtil("getQueryClientDefault");
+
+      body.push(
+        w.importStmt(
+          [queryClientProviderInfo.classname],
+          `./${queryClientProviderInfo.filename}`
+        )
+      );
+    }
+
+    const messageComposerProviderInfo =
+      context.getProviderInfos()[MESSAGE_COMPOSER_TYPE];
+
+    if (messageComposerProviderInfo) {
+      context.addUtil("getMessageComposerDefault");
+
+      body.push(
+        w.importStmt(
+          [messageComposerProviderInfo.classname],
+          `./${messageComposerProviderInfo.filename}`
+        )
+      );
+    }
+
+    body.push(w.createProvider(name));
+
+    return [
+      {
+        type: "plugin",
+        localname,
+        body,
+      },
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
index 67585351..1e7de832 100644
--- a/packages/ts-codegen/src/plugins/react-query.ts
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -16,7 +16,7 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options);
+    return new RenderContext(contract, options, this.builder.builderContext);
   }
 
   async doRender(
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index cb1803fa..17b29164 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -19,7 +19,7 @@ export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options);
+    return new RenderContext(contract, options, this.builder.builderContext);
   }
 
   async doRender(
diff --git a/packages/ts-codegen/src/plugins/types.ts b/packages/ts-codegen/src/plugins/types.ts
index cfb74844..f904c70e 100644
--- a/packages/ts-codegen/src/plugins/types.ts
+++ b/packages/ts-codegen/src/plugins/types.ts
@@ -16,7 +16,7 @@ export class TypesPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options);
+    return new RenderContext(contract, options, this.builder.builderContext);
   }
 
   async doRender(
diff --git a/packages/ts-codegen/src/plugins/use-contracts.ts b/packages/ts-codegen/src/plugins/use-contracts.ts
index 6f5a0bee..7310a26a 100644
--- a/packages/ts-codegen/src/plugins/use-contracts.ts
+++ b/packages/ts-codegen/src/plugins/use-contracts.ts
@@ -43,7 +43,7 @@ export class ContractsContextPlugin extends BuilderPluginBase<TSBuilderOptions>
     // const ExecuteMsg = findExecuteMsg(schemas);
     // const typeHash = await findAndParseTypes(schemas);
 
-    // const body = [];
+    const body = [];
 
     // body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
 
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index e9aeb6db..9c7e48b8 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -1,4 +1,4 @@
-import { RenderOptions } from "wasm-ast-types";
+import { RenderOptions, BuilderContext } from "wasm-ast-types";
 import { IBuilderPlugin } from '../plugins';
 export interface TSBuilderInput {
     contracts: Array<ContractFile | string>;
@@ -37,6 +37,7 @@ export declare class TSBuilder {
     outPath: string;
     options?: TSBuilderOptions;
     plugins: IBuilderPlugin[];
+    builderContext: BuilderContext;
     protected files: BuilderFile[];
     loadDefaultPlugins(): void;
     constructor({ contracts, outPath, options, plugins }: TSBuilderInput);
diff --git a/packages/ts-codegen/types/src/generators/create-helpers.d.ts b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
index a09345d0..f1d28914 100644
--- a/packages/ts-codegen/types/src/generators/create-helpers.d.ts
+++ b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
@@ -1,2 +1,2 @@
-import { TSBuilderInput } from '../builder';
+import { TSBuilderInput } from "../builder";
 export declare const createHelpers: (input: TSBuilderInput) => void;
diff --git a/packages/ts-codegen/types/src/plugins/client.d.ts b/packages/ts-codegen/types/src/plugins/client.d.ts
index 43e278b5..09eed64d 100644
--- a/packages/ts-codegen/types/src/plugins/client.d.ts
+++ b/packages/ts-codegen/types/src/plugins/client.d.ts
@@ -1,6 +1,8 @@
 import { RenderContext, ContractInfo, RenderContextBase, RenderOptions } from 'wasm-ast-types';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
+export declare const TYPE = "client";
+export declare const QUERY_CLIENT_TYPE = "queryClient";
 export declare class ClientPlugin extends BuilderPluginBase<RenderOptions> {
     initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
     doRender(name: string, context: RenderContext): Promise<{
diff --git a/packages/ts-codegen/types/src/plugins/message-composer.d.ts b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
index 80f98965..77bdb05f 100644
--- a/packages/ts-codegen/types/src/plugins/message-composer.d.ts
+++ b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
@@ -1,6 +1,7 @@
 import { ContractInfo, RenderContextBase, RenderContext, RenderOptions } from 'wasm-ast-types';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
+export declare const TYPE = "message-composer";
 export declare class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
     initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
     doRender(name: string, context: RenderContext): Promise<{
diff --git a/packages/ts-codegen/types/src/plugins/plugin-base.d.ts b/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
index efa14960..742356f8 100644
--- a/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
+++ b/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
@@ -1,5 +1,5 @@
-import { ContractInfo, UtilMapping, IContext } from 'wasm-ast-types';
-import { BuilderFile, BuilderFileType } from '../builder';
+import { ContractInfo, UtilMapping, IContext } from "wasm-ast-types";
+import { BuilderFile, BuilderFileType, TSBuilder } from "../builder";
 /**
  * IBuilderPlugin is a common plugin that render generated code.
  */
@@ -8,6 +8,8 @@ export interface IBuilderPlugin {
      * a mapping of utils will be used in generated code.
      */
     utils: UtilMapping;
+    builder?: TSBuilder;
+    setBuilder(builder: TSBuilder): any;
     /**
      * render generated cdoe.
      * @param name the name of contract
@@ -23,9 +25,11 @@ export interface IBuilderPlugin {
 export declare abstract class BuilderPluginBase<TOpt extends {
     enabled?: boolean;
 }> implements IBuilderPlugin {
+    builder?: TSBuilder;
     option: TOpt;
     utils: UtilMapping;
-    constructor(opt: TOpt);
+    constructor(opt: TOpt, builder?: TSBuilder);
+    setBuilder(builder: TSBuilder): void;
     render(name: string, contractInfo: ContractInfo, outPath: string): Promise<BuilderFile[]>;
     /**
      * init context here
diff --git a/packages/ts-codegen/types/src/plugins/provider.d.ts b/packages/ts-codegen/types/src/plugins/provider.d.ts
new file mode 100644
index 00000000..cecb56d0
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/provider.d.ts
@@ -0,0 +1,13 @@
+import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
+import { BuilderFileType, TSBuilderOptions } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
+export declare class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
+    constructor(opt: TSBuilderOptions);
+    initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 95c7831c..5911ca1b 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -67,16 +67,25 @@ export interface RenderOptions {
     reactQuery?: ReactQueryOptions;
 }
 
+export interface ProviderInfo{
+  classname: string,
+  filename: string,
+}
 
 export interface IContext {
   refLookup($ref: string);
   addUtil(util: string);
-  getImports(registeredUtils?: UtilMapping);
+  getImports(registeredUtils?: UtilMapping, filepath?: string);
 }
 
 export interface IRenderContext<TOpt = RenderOptions> extends IContext {
     contract: ContractInfo;
     options: TOpt;
+
+    addProviderInfo(type: string, classname: string, filename: string): void;
+    getProviderInfos(): {
+      [key: string]: ProviderInfo;
+    };
 }
 
 export const defaultOptions: RenderOptions = {
@@ -127,23 +136,40 @@ export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
     return aggregateSchema;
 };
 
+export class BuilderContext{
+    providers:{
+      [key: string]: ProviderInfo;
+    } = {};
+
+    addProviderInfo(type: string, classname: string, filename: string): void {
+      this.providers[type] = {
+        classname,
+        filename
+      };
+    }
+}
+
 /**
  * context object for generating code.
  * only mergeDefaultOpt needs to implementing for combine options and default options.
  * @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
+        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
@@ -156,6 +182,12 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     addUtil(util: string) {
         this.utils[util] = true;
     }
+    addProviderInfo(type: string, classname: string, filename: string): void {
+        this.builderContext.addProviderInfo(type, classname, filename);
+    }
+    getProviderInfos(): { [key: string]: ProviderInfo; } {
+        return this.builderContext.providers;
+    }
     getImports(registeredUtils?: UtilMapping, filepath?: string) {
         return getImportStatements(
             convertUtilsToImportList(
diff --git a/packages/wasm-ast-types/src/index.ts b/packages/wasm-ast-types/src/index.ts
index 9c493b78..86db1e42 100644
--- a/packages/wasm-ast-types/src/index.ts
+++ b/packages/wasm-ast-types/src/index.ts
@@ -6,3 +6,4 @@ export * from './message-composer';
 export * from './react-query';
 export * from './types';
 export * from './msg-builder';
+export * from './provider';
diff --git a/packages/wasm-ast-types/src/provider/index.ts b/packages/wasm-ast-types/src/provider/index.ts
new file mode 100644
index 00000000..0a8c7e17
--- /dev/null
+++ b/packages/wasm-ast-types/src/provider/index.ts
@@ -0,0 +1 @@
+export * from './provider';
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/provider/provider.ts b/packages/wasm-ast-types/src/provider/provider.ts
new file mode 100644
index 00000000..4f503cdb
--- /dev/null
+++ b/packages/wasm-ast-types/src/provider/provider.ts
@@ -0,0 +1,51 @@
+import * as t from "@babel/types";
+import { pascal } from "case";
+
+export const createProvider = (name: string) => {
+  return t.exportNamedDeclaration(
+    t.classDeclaration(
+      t.identifier(pascal(name)),
+      t.identifier("ContractBase"),
+      t.classBody([
+        t.classMethod(
+          "constructor",
+          t.identifier("constructor"),
+          [
+            t.objectPattern([
+              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
+              ),
+            ]),
+          ],
+          t.blockStatement(
+            [
+              t.expressionStatement(
+                t.callExpression(t.super(), [
+                  t.identifier("address"),
+                  t.identifier("cosmWasmClient"),
+                  t.identifier("signingCosmWasmClient"),
+                ])
+              ),
+            ],
+            []
+          )
+        ),
+      ])
+    )
+  );
+};
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 655c1349..3a0d50c1 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -429,9 +429,9 @@ export const createReactQueryMutationArgsInterface = ({
     t.tsTypeAnnotation(
       // @ts-ignore:next-line
       t.tsTypeLiteral([
-        propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation, true),
-        propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation, true),
-        propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation, true)
+        propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation as t.TSTypeAnnotation, true),
+        propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation as t.TSTypeAnnotation, true),
+        propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation as t.TSTypeAnnotation, true)
       ])
     )
   );
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index e6635246..bb42a815 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -56,28 +56,43 @@ export interface RenderOptions {
     client?: TSClientOptions;
     reactQuery?: ReactQueryOptions;
 }
+export interface ProviderInfo {
+    classname: string;
+    filename: string;
+}
 export interface IContext {
     refLookup($ref: string): any;
     addUtil(util: string): any;
-    getImports(registeredUtils?: UtilMapping): any;
+    getImports(registeredUtils?: UtilMapping, filepath?: string): any;
 }
 export interface IRenderContext<TOpt = RenderOptions> extends IContext {
     contract: ContractInfo;
     options: TOpt;
+    addProviderInfo(type: string, classname: string, filename: string): void;
+    getProviderInfos(): {
+        [key: string]: ProviderInfo;
+    };
 }
 export declare const defaultOptions: RenderOptions;
 export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
+export declare class BuilderContext {
+    providers: {
+        [key: string]: ProviderInfo;
+    };
+    addProviderInfo(type: string, classname: string, filename: string): void;
+}
 /**
  * context object for generating code.
  * only mergeDefaultOpt needs to implementing for combine options and default options.
  * @param TOpt option type
  */
 export declare abstract class RenderContextBase<TOpt = RenderOptions> implements IRenderContext<TOpt> {
+    builderContext: BuilderContext;
     contract: ContractInfo;
     utils: string[];
     schema: JSONSchema;
     options: TOpt;
-    constructor(contract: ContractInfo, options?: TOpt);
+    constructor(contract: ContractInfo, options?: TOpt, builderContext?: BuilderContext);
     /**
      * merge options and default options
      * @param options
@@ -85,6 +100,10 @@ export declare abstract class RenderContextBase<TOpt = RenderOptions> implements
     abstract mergeDefaultOpt(options: TOpt): TOpt;
     refLookup($ref: string): JSONSchema;
     addUtil(util: string): void;
+    addProviderInfo(type: string, classname: string, filename: string): void;
+    getProviderInfos(): {
+        [key: string]: ProviderInfo;
+    };
     getImports(registeredUtils?: UtilMapping, filepath?: string): any;
 }
 export declare class RenderContext extends RenderContextBase {
diff --git a/packages/wasm-ast-types/types/index.d.ts b/packages/wasm-ast-types/types/index.d.ts
index 9c493b78..86db1e42 100644
--- a/packages/wasm-ast-types/types/index.d.ts
+++ b/packages/wasm-ast-types/types/index.d.ts
@@ -6,3 +6,4 @@ export * from './message-composer';
 export * from './react-query';
 export * from './types';
 export * from './msg-builder';
+export * from './provider';
diff --git a/packages/wasm-ast-types/types/provider/index.d.ts b/packages/wasm-ast-types/types/provider/index.d.ts
new file mode 100644
index 00000000..03be03e5
--- /dev/null
+++ b/packages/wasm-ast-types/types/provider/index.d.ts
@@ -0,0 +1 @@
+export * from './provider';
diff --git a/packages/wasm-ast-types/types/provider/provider.d.ts b/packages/wasm-ast-types/types/provider/provider.d.ts
new file mode 100644
index 00000000..07b77daa
--- /dev/null
+++ b/packages/wasm-ast-types/types/provider/provider.d.ts
@@ -0,0 +1,2 @@
+import * as t from "@babel/types";
+export declare const createProvider: (name: string) => t.ExportNamedDeclaration;

From 6fd2353cd81153b8692e9f0ee62cbe3a23f1ff08 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 12 Jul 2023 22:12:22 +0800
Subject: [PATCH 125/287] finished provider classes

---
 .../contracts/CwAdminFactory.provider.ts      | 22 +++--
 .../contracts/CwCodeIdRegistry.provider.ts    | 22 +++--
 .../contracts/CwSingle.provider.ts            | 22 +++--
 .../contracts/Factory.provider.ts             | 22 +++--
 .../bundler_test/contracts/Minter.provider.ts | 22 +++--
 .../__snapshots__/builder.test.ts.snap        |  2 +
 packages/ts-codegen/src/plugins/provider.ts   | 31 ++++++-
 .../wasm-ast-types/src/context/context.ts     |  5 +-
 .../wasm-ast-types/src/provider/provider.ts   | 86 ++++++++++++-------
 .../wasm-ast-types/types/context/context.d.ts |  1 +
 .../types/provider/provider.d.ts              |  3 +-
 11 files changed, 176 insertions(+), 62 deletions(-)

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
index 7aac8f72..54b4773a 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
@@ -4,17 +4,29 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
-import { CwAdminFactoryClient } from "./CwAdminFactory.client.ts";
-import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client.ts";
-import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer.ts";
+import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { CwAdminFactoryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
 export class CwAdminFactory extends ContractBase {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
-  }) {
+  }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient);
   }
 
+  getSigningClient(contractAddr) {
+    return getSigningClientDefault(this, contractAddr, CwAdminFactoryClient);
+  }
+
+  getQueryClient(contractAddr) {
+    return getQueryClientDefault(this, contractAddr, CwAdminFactoryQueryClient);
+  }
+
+  getMessageComposer(contractAddr) {
+    return getMessageComposerDefault(this, contractAddr, CwAdminFactoryMessageComposer);
+  }
+
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
index 5d9e6b95..35d2fc9c 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
@@ -4,17 +4,29 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
-import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client.ts";
-import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client.ts";
-import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer.ts";
+import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
 export class CwCodeIdRegistry extends ContractBase {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
-  }) {
+  }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient);
   }
 
+  getSigningClient(contractAddr) {
+    return getSigningClientDefault(this, contractAddr, CwCodeIdRegistryClient);
+  }
+
+  getQueryClient(contractAddr) {
+    return getQueryClientDefault(this, contractAddr, CwCodeIdRegistryQueryClient);
+  }
+
+  getMessageComposer(contractAddr) {
+    return getMessageComposerDefault(this, contractAddr, CwCodeIdRegistryMessageComposer);
+  }
+
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
index f5c349a5..fef6270d 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
@@ -4,17 +4,29 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
-import { CwSingleClient } from "./CwSingle.client.ts";
-import { CwSingleQueryClient } from "./CwSingle.client.ts";
-import { CwSingleMessageComposer } from "./CwSingle.message-composer.ts";
+import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { CwSingleClient } from "./CwSingle.client";
+import { CwSingleQueryClient } from "./CwSingle.client";
+import { CwSingleMessageComposer } from "./CwSingle.message-composer";
 export class CwSingle extends ContractBase {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
-  }) {
+  }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient);
   }
 
+  getSigningClient(contractAddr) {
+    return getSigningClientDefault(this, contractAddr, CwSingleClient);
+  }
+
+  getQueryClient(contractAddr) {
+    return getQueryClientDefault(this, contractAddr, CwSingleQueryClient);
+  }
+
+  getMessageComposer(contractAddr) {
+    return getMessageComposerDefault(this, contractAddr, CwSingleMessageComposer);
+  }
+
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.provider.ts b/__output__/builder/bundler_test/contracts/Factory.provider.ts
index f63a1ebb..c53c1d12 100644
--- a/__output__/builder/bundler_test/contracts/Factory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.provider.ts
@@ -4,17 +4,29 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
-import { FactoryClient } from "./Factory.client.ts";
-import { FactoryQueryClient } from "./Factory.client.ts";
-import { FactoryMessageComposer } from "./Factory.message-composer.ts";
+import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { FactoryClient } from "./Factory.client";
+import { FactoryQueryClient } from "./Factory.client";
+import { FactoryMessageComposer } from "./Factory.message-composer";
 export class Factory extends ContractBase {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
-  }) {
+  }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient);
   }
 
+  getSigningClient(contractAddr) {
+    return getSigningClientDefault(this, contractAddr, FactoryClient);
+  }
+
+  getQueryClient(contractAddr) {
+    return getQueryClientDefault(this, contractAddr, FactoryQueryClient);
+  }
+
+  getMessageComposer(contractAddr) {
+    return getMessageComposerDefault(this, contractAddr, FactoryMessageComposer);
+  }
+
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.provider.ts b/__output__/builder/bundler_test/contracts/Minter.provider.ts
index 118e73bd..4a5ac4c5 100644
--- a/__output__/builder/bundler_test/contracts/Minter.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.provider.ts
@@ -4,17 +4,29 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
-import { MinterClient } from "./Minter.client.ts";
-import { MinterQueryClient } from "./Minter.client.ts";
-import { MinterMessageComposer } from "./Minter.message-composer.ts";
+import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { MinterClient } from "./Minter.client";
+import { MinterQueryClient } from "./Minter.client";
+import { MinterMessageComposer } from "./Minter.message-composer";
 export class Minter extends ContractBase {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
-  }) {
+  }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient);
   }
 
+  getSigningClient(contractAddr) {
+    return getSigningClientDefault(this, contractAddr, MinterClient);
+  }
+
+  getQueryClient(contractAddr) {
+    return getQueryClientDefault(this, contractAddr, MinterQueryClient);
+  }
+
+  getMessageComposer(contractAddr) {
+    return getMessageComposerDefault(this, contractAddr, MinterMessageComposer);
+  }
+
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index d52d4370..7e653137 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -309,6 +309,7 @@ TSBuilder {
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
+        "IContractConstructor": "__contractContextBase__",
         "getMessageComposerDefault": "__contractContextBase__",
         "getQueryClientDefault": "__contractContextBase__",
         "getSigningClientDefault": "__contractContextBase__",
@@ -627,6 +628,7 @@ TSBuilder {
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
+        "IContractConstructor": "__contractContextBase__",
         "getMessageComposerDefault": "__contractContextBase__",
         "getQueryClientDefault": "__contractContextBase__",
         "getSigningClientDefault": "__contractContextBase__",
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index 076ee7cb..540555db 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -53,9 +53,11 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     }
 
     context.addUtil("ContractBase");
+    context.addUtil("IContractConstructor");
     const localname = pascal(name) + ".provider.ts";
 
     const body = [];
+    const methods = [];
 
     const signClientProviderInfo = context.getProviderInfos()[SIGN_CLIENT_TYPE];
 
@@ -65,7 +67,14 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body.push(
         w.importStmt(
           [signClientProviderInfo.classname],
-          `./${signClientProviderInfo.filename}`
+          `./${signClientProviderInfo.basename}`
+        )
+      );
+
+      methods.push(
+        w.createProviderFunction(
+          "SigningClient",
+          signClientProviderInfo.classname
         )
       );
     }
@@ -79,7 +88,14 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body.push(
         w.importStmt(
           [queryClientProviderInfo.classname],
-          `./${queryClientProviderInfo.filename}`
+          `./${queryClientProviderInfo.basename}`
+        )
+      );
+
+      methods.push(
+        w.createProviderFunction(
+          "QueryClient",
+          queryClientProviderInfo.classname
         )
       );
     }
@@ -93,12 +109,19 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body.push(
         w.importStmt(
           [messageComposerProviderInfo.classname],
-          `./${messageComposerProviderInfo.filename}`
+          `./${messageComposerProviderInfo.basename}`
+        )
+      );
+
+      methods.push(
+        w.createProviderFunction(
+          "MessageComposer",
+          messageComposerProviderInfo.classname
         )
       );
     }
 
-    body.push(w.createProvider(name));
+    body.push(w.createProvider(name, methods));
 
     return [
       {
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 5911ca1b..0f9bf708 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -2,6 +2,7 @@ import { JSONSchema } from "../types";
 import { refLookup } from "../utils";
 import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
 import deepmerge from "deepmerge";
+import { basename, extname } from 'path'
 
 /// Plugin Types
 export interface ReactQueryOptions {
@@ -70,6 +71,7 @@ export interface RenderOptions {
 export interface ProviderInfo{
   classname: string,
   filename: string,
+  basename: string,
 }
 
 export interface IContext {
@@ -144,7 +146,8 @@ export class BuilderContext{
     addProviderInfo(type: string, classname: string, filename: string): void {
       this.providers[type] = {
         classname,
-        filename
+        filename,
+        basename: basename(filename, extname(filename))
       };
     }
 }
diff --git a/packages/wasm-ast-types/src/provider/provider.ts b/packages/wasm-ast-types/src/provider/provider.ts
index 4f503cdb..efbcf265 100644
--- a/packages/wasm-ast-types/src/provider/provider.ts
+++ b/packages/wasm-ast-types/src/provider/provider.ts
@@ -1,7 +1,8 @@
 import * as t from "@babel/types";
 import { pascal } from "case";
+import { tsObjectPattern } from "../utils";
 
-export const createProvider = (name: string) => {
+export const createProvider = (name: string, methods: t.ClassMethod[]) => {
   return t.exportNamedDeclaration(
     t.classDeclaration(
       t.identifier(pascal(name)),
@@ -11,41 +12,64 @@ export const createProvider = (name: string) => {
           "constructor",
           t.identifier("constructor"),
           [
-            t.objectPattern([
-              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
-              ),
-            ]),
-          ],
-          t.blockStatement(
-            [
-              t.expressionStatement(
-                t.callExpression(t.super(), [
+            tsObjectPattern(
+              [
+                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
+                ),
+              ],
+              t.tsTypeAnnotation(
+                t.tsTypeReference(t.identifier("IContractConstructor"))
+              )
+            ),
+          ],
+          t.blockStatement([
+            t.expressionStatement(
+              t.callExpression(t.super(), [
+                t.identifier("address"),
+                t.identifier("cosmWasmClient"),
+                t.identifier("signingCosmWasmClient"),
+              ])
+            ),
+          ])
         ),
+        ...methods,
       ])
     )
   );
 };
+
+export const createProviderFunction = (
+  functionName: string,
+  classname: string
+) => {
+  return t.classMethod(
+    "method",
+    t.identifier(`get${functionName}`),
+    [t.identifier("contractAddr")],
+    t.blockStatement([
+      t.returnStatement(
+        t.callExpression(t.identifier(`get${functionName}Default`), [
+          t.thisExpression(),
+          t.identifier("contractAddr"),
+          t.identifier(classname),
+        ])
+      ),
+    ])
+  );
+};
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index bb42a815..5251e2e8 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -59,6 +59,7 @@ export interface RenderOptions {
 export interface ProviderInfo {
     classname: string;
     filename: string;
+    basename: string;
 }
 export interface IContext {
     refLookup($ref: string): any;
diff --git a/packages/wasm-ast-types/types/provider/provider.d.ts b/packages/wasm-ast-types/types/provider/provider.d.ts
index 07b77daa..cef648c8 100644
--- a/packages/wasm-ast-types/types/provider/provider.d.ts
+++ b/packages/wasm-ast-types/types/provider/provider.d.ts
@@ -1,2 +1,3 @@
 import * as t from "@babel/types";
-export declare const createProvider: (name: string) => t.ExportNamedDeclaration;
+export declare const createProvider: (name: string, methods: t.ClassMethod[]) => t.ExportNamedDeclaration;
+export declare const createProviderFunction: (functionName: string, classname: string) => t.ClassMethod;

From b8c14ab45bb6c974fa042dd1971b042f631dbfc0 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 13 Jul 2023 06:54:18 +0800
Subject: [PATCH 126/287] finished provider

---
 .../contracts/CwAdminFactory.provider.ts      |  18 +--
 .../contracts/CwCodeIdRegistry.provider.ts    |  18 +--
 .../contracts/CwSingle.provider.ts            |  18 +--
 .../contracts/Factory.provider.ts             |  18 +--
 .../bundler_test/contracts/Minter.provider.ts |  18 +--
 .../contracts/contractContextBase.ts          | 104 ++++++++----
 .../contracts/contracts-context.tsx           |  78 +++++++++
 .../__snapshots__/builder.test.ts.snap        |   8 +-
 .../src/generators/create-helpers.ts          |   3 +-
 .../src/helpers/contractContextBase.ts        | 106 +++++++-----
 .../src/helpers/contractsContextTSX.ts        |  73 +++++++++
 packages/ts-codegen/src/helpers/index.ts      |   3 +-
 packages/ts-codegen/src/plugins/client.ts     |  41 +++--
 .../src/plugins/message-composer.ts           |  33 ++--
 packages/ts-codegen/src/plugins/provider.ts   |  68 +++-----
 .../src/helpers/contractContextBase.d.ts      |   2 +-
 .../src/helpers/contractsContextTSX.d.ts      |   1 +
 .../ts-codegen/types/src/helpers/index.d.ts   |   1 +
 .../ts-codegen/types/src/plugins/client.d.ts  |   7 +-
 .../types/src/plugins/message-composer.d.ts   |   6 +-
 .../wasm-ast-types/src/context/context.ts     |  28 +++-
 .../__snapshots__/provider.spec.ts.snap       |  27 ++++
 .../src/provider/provider.spec.ts             |  39 +++++
 .../wasm-ast-types/src/provider/provider.ts   | 152 ++++++++++--------
 .../wasm-ast-types/src/utils/constants.ts     |   6 +
 packages/wasm-ast-types/src/utils/index.ts    |   1 +
 .../wasm-ast-types/types/context/context.d.ts |  18 ++-
 .../types/provider/provider.d.ts              |   6 +-
 .../wasm-ast-types/types/utils/constants.d.ts |   5 +
 .../wasm-ast-types/types/utils/index.d.ts     |   1 +
 30 files changed, 590 insertions(+), 317 deletions(-)
 create mode 100644 __output__/builder/bundler_test/contracts/contracts-context.tsx
 create mode 100644 packages/ts-codegen/src/helpers/contractsContextTSX.ts
 create mode 100644 packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
 create mode 100644 packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
 create mode 100644 packages/wasm-ast-types/src/provider/provider.spec.ts

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
index 54b4773a..f81eacdc 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
@@ -4,29 +4,17 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwAdminFactoryClient } from "./CwAdminFactory.client";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
-export class CwAdminFactory extends ContractBase {
+export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient);
-  }
-
-  getSigningClient(contractAddr) {
-    return getSigningClientDefault(this, contractAddr, CwAdminFactoryClient);
-  }
-
-  getQueryClient(contractAddr) {
-    return getQueryClientDefault(this, contractAddr, CwAdminFactoryQueryClient);
-  }
-
-  getMessageComposer(contractAddr) {
-    return getMessageComposerDefault(this, contractAddr, CwAdminFactoryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
index 35d2fc9c..8bd16da5 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
@@ -4,29 +4,17 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
-export class CwCodeIdRegistry extends ContractBase {
+export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient);
-  }
-
-  getSigningClient(contractAddr) {
-    return getSigningClientDefault(this, contractAddr, CwCodeIdRegistryClient);
-  }
-
-  getQueryClient(contractAddr) {
-    return getQueryClientDefault(this, contractAddr, CwCodeIdRegistryQueryClient);
-  }
-
-  getMessageComposer(contractAddr) {
-    return getMessageComposerDefault(this, contractAddr, CwCodeIdRegistryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
index fef6270d..e1352be2 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
@@ -4,29 +4,17 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwSingleClient } from "./CwSingle.client";
 import { CwSingleQueryClient } from "./CwSingle.client";
 import { CwSingleMessageComposer } from "./CwSingle.message-composer";
-export class CwSingle extends ContractBase {
+export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient);
-  }
-
-  getSigningClient(contractAddr) {
-    return getSigningClientDefault(this, contractAddr, CwSingleClient);
-  }
-
-  getQueryClient(contractAddr) {
-    return getQueryClientDefault(this, contractAddr, CwSingleQueryClient);
-  }
-
-  getMessageComposer(contractAddr) {
-    return getMessageComposerDefault(this, contractAddr, CwSingleMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.provider.ts b/__output__/builder/bundler_test/contracts/Factory.provider.ts
index c53c1d12..a90baccc 100644
--- a/__output__/builder/bundler_test/contracts/Factory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.provider.ts
@@ -4,29 +4,17 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { FactoryClient } from "./Factory.client";
 import { FactoryQueryClient } from "./Factory.client";
 import { FactoryMessageComposer } from "./Factory.message-composer";
-export class Factory extends ContractBase {
+export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMessageComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient);
-  }
-
-  getSigningClient(contractAddr) {
-    return getSigningClientDefault(this, contractAddr, FactoryClient);
-  }
-
-  getQueryClient(contractAddr) {
-    return getQueryClientDefault(this, contractAddr, FactoryQueryClient);
-  }
-
-  getMessageComposer(contractAddr) {
-    return getMessageComposerDefault(this, contractAddr, FactoryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMessageComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.provider.ts b/__output__/builder/bundler_test/contracts/Minter.provider.ts
index 4a5ac4c5..8814fb75 100644
--- a/__output__/builder/bundler_test/contracts/Minter.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.provider.ts
@@ -4,29 +4,17 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { ContractBase, IContractConstructor, getSigningClientDefault, getQueryClientDefault, getMessageComposerDefault } from "./contractContextBase";
+import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { MinterClient } from "./Minter.client";
 import { MinterQueryClient } from "./Minter.client";
 import { MinterMessageComposer } from "./Minter.message-composer";
-export class Minter extends ContractBase {
+export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMessageComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient);
-  }
-
-  getSigningClient(contractAddr) {
-    return getSigningClientDefault(this, contractAddr, MinterClient);
-  }
-
-  getQueryClient(contractAddr) {
-    return getQueryClientDefault(this, contractAddr, MinterQueryClient);
-  }
-
-  getMessageComposer(contractAddr) {
-    return getMessageComposerDefault(this, contractAddr, MinterMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMessageComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
index 17d38894..7de4022f 100644
--- a/__output__/builder/bundler_test/contracts/contractContextBase.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -16,48 +16,82 @@ export interface IContractConstructor {
   signingCosmWasmClient: SigningCosmWasmClient | undefined;
 }
 
-export const noSigningErrorMessage = 'signingCosmWasmClient not connected';
+export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
 
-export const noCosmWasmClientErrorMessage = 'cosmWasmClient not connected';
+export const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';
 
-export const noAddressErrorMessage = "address doesn't exist";
+export const NO_ADDRESS_ERROR_MESSAGE = "address doesn't exist";
 
-export class ContractBase {
-  constructor(
-    public readonly address: string | undefined,
-    public readonly cosmWasmClient: CosmWasmClient | undefined,
-    public readonly signingCosmWasmClient: SigningCosmWasmClient | undefined
-  ) {}
+export const NO_SIGNING_CLIENT_ERROR_MESSAGE =
+  'Signing client is not generated. Please check ts-codegen config';
+
+export const NO_QUERY_CLIENT_ERROR_MESSAGE =
+  'Query client is not generated. Please check ts-codegen config';
+
+export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
+  'Message composer client is not generated. Please check ts-codegen config';
+
+/**
+ * a placeholder for non-generated classes
+ */
+export class EmptyClient {}
+
+export interface SigningClientProvider<T> {
+  getSigningClient(contractAddr: string): T;
 }
 
-export function getSigningClientDefault<T>(
-  intance: ContractBase,
-  contractAddr: string,
-  T: new (
-    client: SigningCosmWasmClient,
-    sender: string,
-    contractAddress: string
-  ) => T
-): T {
-  if (!intance.signingCosmWasmClient) throw new Error(noSigningErrorMessage);
-  if (!intance.address) throw new Error(noAddressErrorMessage);
-  return new T(intance.signingCosmWasmClient, intance.address, contractAddr);
+export interface QueryClientProvider<T> {
+  getQueryClient(contractAddr: string): T;
 }
 
-export function getQueryClientDefault<T>(
-  intance: ContractBase,
-  contractAddr: string,
-  T: new (client: CosmWasmClient, contractAddress: string) => T
-): T {
-  if (!intance.cosmWasmClient) throw new Error(noCosmWasmClientErrorMessage);
-  return new T(intance.cosmWasmClient, contractAddr);
+export interface MessageComposerProvider<T> {
+  getMessageComposer(contractAddr: string): T;
 }
 
-export function getMessageComposerDefault<T>(
-  intance: ContractBase,
-  contractAddr: string,
-  T: new (address: string, contractAddress: string) => T
-): T {
-  if (!intance.address) throw new Error(noAddressErrorMessage);
-  return new T(intance.address, contractAddr);
+export class ContractBase<
+  TSign = EmptyClient,
+  TQuery = EmptyClient,
+  TMsgComposer = EmptyClient
+> {
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+
+  public getSigningClient(contractAddr: string): TSign {
+    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);
+    return new this.TSign(
+      this.signingCosmWasmClient,
+      this.address,
+      contractAddr
+    );
+  }
+
+  public getQueryClient(contractAddr: string): TQuery {
+    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);
+    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);
+    return new this.TQuery(this.cosmWasmClient, contractAddr);
+  }
+
+  public getMessageComposer(contractAddr: string): TMsgComposer {
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);
+    return new this.TMsgComposer(this.address, contractAddr);
+  }
 }
diff --git a/__output__/builder/bundler_test/contracts/contracts-context.tsx b/__output__/builder/bundler_test/contracts/contracts-context.tsx
new file mode 100644
index 00000000..38d23ef7
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/contracts-context.tsx
@@ -0,0 +1,78 @@
+/**
+* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
+* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
+* and run the transpile command or yarn proto command to regenerate this bundle.
+*/
+
+
+import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+import { IContractsContext, getProviders } from './contractContextProviders';
+
+interface ContractsConfig {
+  address: string | undefined;
+  getCosmWasmClient: () => Promise<CosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+}
+
+const ContractsContext = React.createContext<IContractsContext | null>(null);
+
+export const ContractsProvider = ({
+  children,
+  contractsConfig,
+}: {
+  children: React.ReactNode;
+  contractsConfig: ContractsConfig;
+}) => {
+  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [signingCosmWasmClient, setSigningCosmWasmClient] =
+    useState<SigningCosmWasmClient>();
+
+  const { address, getCosmWasmClient, getSigningCosmWasmClient } =
+    contractsConfig;
+
+  const prevAddressRef = useRef<string | undefined>(address);
+
+  const contracts: IContractsContext = useMemo(() => {
+    return getProviders(address, cosmWasmClient, signingCosmWasmClient);
+  }, [address, cosmWasmClient, signingCosmWasmClient]);
+
+  useEffect(() => {
+    const connectSigningCwClient = async () => {
+      if (address && prevAddressRef.current !== address) {
+        const signingCosmWasmClient = await getSigningCosmWasmClient();
+        setSigningCosmWasmClient(signingCosmWasmClient);
+      } else if (!address) {
+        setSigningCosmWasmClient(undefined);
+      }
+      prevAddressRef.current = address;
+    };
+    connectSigningCwClient();
+  }, [address, getSigningCosmWasmClient]);
+
+  useEffect(() => {
+    const connectCosmWasmClient = async () => {
+      const cosmWasmClient = await getCosmWasmClient();
+      setCosmWasmClient(cosmWasmClient);
+    };
+    connectCosmWasmClient();
+  }, [getCosmWasmClient]);
+
+  return (
+    <ContractsContext.Provider value={contracts}>
+      {children}
+    </ContractsContext.Provider>
+  );
+};
+
+export const useContracts = () => {
+  const contracts = useContext(ContractsContext);
+  if (contracts === null) {
+    throw new Error('useContracts must be used within a ContractsProvider');
+  }
+  return contracts;
+};
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 7e653137..e963687f 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -309,10 +309,8 @@ TSBuilder {
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
+        "EmptyClient": "__contractContextBase__",
         "IContractConstructor": "__contractContextBase__",
-        "getMessageComposerDefault": "__contractContextBase__",
-        "getQueryClientDefault": "__contractContextBase__",
-        "getSigningClientDefault": "__contractContextBase__",
       },
     },
   ],
@@ -628,10 +626,8 @@ TSBuilder {
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
+        "EmptyClient": "__contractContextBase__",
         "IContractConstructor": "__contractContextBase__",
-        "getMessageComposerDefault": "__contractContextBase__",
-        "getQueryClientDefault": "__contractContextBase__",
-        "getSigningClientDefault": "__contractContextBase__",
       },
     },
   ],
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index 21633f92..0d40c2aa 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -3,7 +3,7 @@ import { sync as mkdirp } from "mkdirp";
 import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
 import { TSBuilderInput } from "../builder";
-import { contractContextBase } from "../helpers";
+import { contractContextBase, contractsContextTSX } from "../helpers";
 
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
 const header = `/**
@@ -22,5 +22,6 @@ const write = (outPath: string, file: string, content: string) => {
 export const createHelpers = (input: TSBuilderInput) => {
   if (input.options?.useContracts?.enabled) {
     write(input.outPath, "contractContextBase.ts", contractContextBase);
+    write(input.outPath, "contracts-context.tsx", contractsContextTSX);
   }
 };
diff --git a/packages/ts-codegen/src/helpers/contractContextBase.ts b/packages/ts-codegen/src/helpers/contractContextBase.ts
index d2ef4407..db2d7943 100644
--- a/packages/ts-codegen/src/helpers/contractContextBase.ts
+++ b/packages/ts-codegen/src/helpers/contractContextBase.ts
@@ -10,49 +10,83 @@ export interface IContractConstructor {
   signingCosmWasmClient: SigningCosmWasmClient | undefined;
 }
 
-export const noSigningErrorMessage = 'signingCosmWasmClient not connected';
+export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
 
-export const noCosmWasmClientErrorMessage = 'cosmWasmClient not connected';
+export const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';
 
-export const noAddressErrorMessage = "address doesn't exist";
+export const NO_ADDRESS_ERROR_MESSAGE = "address doesn't exist";
 
-export class ContractBase {
-  constructor(
-    public readonly address: string | undefined,
-    public readonly cosmWasmClient: CosmWasmClient | undefined,
-    public readonly signingCosmWasmClient: SigningCosmWasmClient | undefined
-  ) {}
+export const NO_SIGNING_CLIENT_ERROR_MESSAGE =
+  'Signing client is not generated. Please check ts-codegen config';
+
+export const NO_QUERY_CLIENT_ERROR_MESSAGE =
+  'Query client is not generated. Please check ts-codegen config';
+
+export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
+  'Message composer client is not generated. Please check ts-codegen config';
+
+/**
+ * a placeholder for non-generated classes
+ */
+export class EmptyClient {}
+
+export interface SigningClientProvider<T> {
+  getSigningClient(contractAddr: string): T;
 }
 
-export function getSigningClientDefault<T>(
-  intance: ContractBase,
-  contractAddr: string,
-  T: new (
-    client: SigningCosmWasmClient,
-    sender: string,
-    contractAddress: string
-  ) => T
-): T {
-  if (!intance.signingCosmWasmClient) throw new Error(noSigningErrorMessage);
-  if (!intance.address) throw new Error(noAddressErrorMessage);
-  return new T(intance.signingCosmWasmClient, intance.address, contractAddr);
+export interface QueryClientProvider<T> {
+  getQueryClient(contractAddr: string): T;
 }
 
-export function getQueryClientDefault<T>(
-  intance: ContractBase,
-  contractAddr: string,
-  T: new (client: CosmWasmClient, contractAddress: string) => T
-): T {
-  if (!intance.cosmWasmClient) throw new Error(noCosmWasmClientErrorMessage);
-  return new T(intance.cosmWasmClient, contractAddr);
+export interface MessageComposerProvider<T> {
+  getMessageComposer(contractAddr: string): T;
 }
 
-export function getMessageComposerDefault<T>(
-  intance: ContractBase,
-  contractAddr: string,
-  T: new (address: string, contractAddress: string) => T
-): T {
-  if (!intance.address) throw new Error(noAddressErrorMessage);
-  return new T(intance.address, contractAddr);
+export class ContractBase<
+  TSign = EmptyClient,
+  TQuery = EmptyClient,
+  TMsgComposer = EmptyClient
+> {
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+
+  public getSigningClient(contractAddr: string): TSign {
+    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);
+    return new this.TSign(
+      this.signingCosmWasmClient,
+      this.address,
+      contractAddr
+    );
+  }
+
+  public getQueryClient(contractAddr: string): TQuery {
+    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);
+    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);
+    return new this.TQuery(this.cosmWasmClient, contractAddr);
+  }
+
+  public getMessageComposer(contractAddr: string): TMsgComposer {
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);
+    return new this.TMsgComposer(this.address, contractAddr);
+  }
 }
-`
\ No newline at end of file
+`;
diff --git a/packages/ts-codegen/src/helpers/contractsContextTSX.ts b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
new file mode 100644
index 00000000..7fb4182d
--- /dev/null
+++ b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
@@ -0,0 +1,73 @@
+export const contractsContextTSX = `
+import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+import { IContractsContext, getProviders } from './contractContextProviders';
+
+interface ContractsConfig {
+  address: string | undefined;
+  getCosmWasmClient: () => Promise<CosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+}
+
+const ContractsContext = React.createContext<IContractsContext | null>(null);
+
+export const ContractsProvider = ({
+  children,
+  contractsConfig,
+}: {
+  children: React.ReactNode;
+  contractsConfig: ContractsConfig;
+}) => {
+  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [signingCosmWasmClient, setSigningCosmWasmClient] =
+    useState<SigningCosmWasmClient>();
+
+  const { address, getCosmWasmClient, getSigningCosmWasmClient } =
+    contractsConfig;
+
+  const prevAddressRef = useRef<string | undefined>(address);
+
+  const contracts: IContractsContext = useMemo(() => {
+    return getProviders(address, cosmWasmClient, signingCosmWasmClient);
+  }, [address, cosmWasmClient, signingCosmWasmClient]);
+
+  useEffect(() => {
+    const connectSigningCwClient = async () => {
+      if (address && prevAddressRef.current !== address) {
+        const signingCosmWasmClient = await getSigningCosmWasmClient();
+        setSigningCosmWasmClient(signingCosmWasmClient);
+      } else if (!address) {
+        setSigningCosmWasmClient(undefined);
+      }
+      prevAddressRef.current = address;
+    };
+    connectSigningCwClient();
+  }, [address, getSigningCosmWasmClient]);
+
+  useEffect(() => {
+    const connectCosmWasmClient = async () => {
+      const cosmWasmClient = await getCosmWasmClient();
+      setCosmWasmClient(cosmWasmClient);
+    };
+    connectCosmWasmClient();
+  }, [getCosmWasmClient]);
+
+  return (
+    <ContractsContext.Provider value={contracts}>
+      {children}
+    </ContractsContext.Provider>
+  );
+};
+
+export const useContracts = () => {
+  const contracts = useContext(ContractsContext);
+  if (contracts === null) {
+    throw new Error('useContracts must be used within a ContractsProvider');
+  }
+  return contracts;
+};
+`;
diff --git a/packages/ts-codegen/src/helpers/index.ts b/packages/ts-codegen/src/helpers/index.ts
index 11619fdc..0132275b 100644
--- a/packages/ts-codegen/src/helpers/index.ts
+++ b/packages/ts-codegen/src/helpers/index.ts
@@ -1 +1,2 @@
-export * from './contractContextBase';
\ No newline at end of file
+export * from './contractContextBase';
+export * from './contractsContextTSX';
\ No newline at end of file
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 3b31dfec..35c3db73 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -1,18 +1,17 @@
-import { pascal } from 'case';
-import * as w from 'wasm-ast-types';
-import { findExecuteMsg, findAndParseTypes, findQueryMsg } from '../utils';
+import { pascal } from "case";
+import * as w from "wasm-ast-types";
+import { findExecuteMsg, findAndParseTypes, findQueryMsg } from "../utils";
 import {
   RenderContext,
   ContractInfo,
   RenderContextBase,
   getMessageProperties,
-  RenderOptions
-} from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
+  RenderOptions,
+} from "wasm-ast-types";
+import { BuilderFileType } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
 
-export const TYPE = 'client';
-export const QUERY_CLIENT_TYPE = 'queryClient';
+export const TYPE = "client";
 
 export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
@@ -41,8 +40,8 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
 
     const { schemas } = context.contract;
 
-    const localname = pascal(name) + '.client.ts';
-    const TypesFile = pascal(name) + '.types';
+    const localname = pascal(name) + ".client.ts";
+    const TypesFile = pascal(name) + ".types";
     const QueryMsg = findQueryMsg(schemas);
     const ExecuteMsg = findExecuteMsg(schemas);
     const typeHash = await findAndParseTypes(schemas);
@@ -66,7 +65,12 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
         w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg)
       );
 
-      context.addProviderInfo(QUERY_CLIENT_TYPE, QueryClient, localname)
+      context.addProviderInfo(
+        name,
+        w.PROVIDER_TYPES.QUERY_CLIENT_TYPE,
+        QueryClient,
+        localname
+      );
     }
 
     // execute messages
@@ -95,11 +99,16 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
           )
         );
 
-        context.addProviderInfo(TYPE, Client, localname)
+        context.addProviderInfo(
+          name,
+          w.PROVIDER_TYPES.SIGNING_CLIENT_TYPE,
+          Client,
+          localname
+        );
       }
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (typeHash.hasOwnProperty("Coin")) {
       // @ts-ignore
       delete context.utils.Coin;
     }
@@ -108,8 +117,8 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
       {
         type: TYPE,
         localname,
-        body
-      }
+        body,
+      },
     ];
   }
 }
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index 3326181a..3e9ffe8c 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -1,18 +1,18 @@
-import { pascal } from 'case';
-import * as w from 'wasm-ast-types';
-import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { pascal } from "case";
+import * as w from "wasm-ast-types";
+import { findAndParseTypes, findExecuteMsg } from "../utils";
 import {
   MessageComposerOptions,
   getMessageProperties,
   ContractInfo,
   RenderContextBase,
   RenderContext,
-  RenderOptions
-} from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
+  RenderOptions,
+} from "wasm-ast-types";
+import { BuilderFileType } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
 
-export const TYPE = 'message-composer';
+export const TYPE = "message-composer";
 
 export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
@@ -41,8 +41,8 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
 
     const { schemas } = context.contract;
 
-    const localname = pascal(name) + '.message-composer.ts';
-    const TypesFile = pascal(name) + '.types';
+    const localname = pascal(name) + ".message-composer.ts";
+    const TypesFile = pascal(name) + ".types";
     const ExecuteMsg = findExecuteMsg(schemas);
     const typeHash = await findAndParseTypes(schemas);
 
@@ -64,11 +64,16 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
           w.createMessageComposerClass(context, TheClass, Interface, ExecuteMsg)
         );
 
-        context.addProviderInfo(TYPE, TheClass, localname)
+        context.addProviderInfo(
+          name,
+          w.PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE,
+          TheClass,
+          localname
+        );
       }
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (typeHash.hasOwnProperty("Coin")) {
       // @ts-ignore
       delete context.utils.Coin;
     }
@@ -77,8 +82,8 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
       {
         type: TYPE,
         localname,
-        body
-      }
+        body,
+      },
     ];
   }
 }
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index 540555db..4a74442e 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -1,17 +1,8 @@
 import { pascal } from "case";
 import * as w from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg } from "../utils";
-import {
-  getMessageProperties,
-  ContractInfo,
-  RenderContextBase,
-  RenderContext,
-  RenderOptions,
-} from "wasm-ast-types";
-import { BuilderFileType, TSBuilder, TSBuilderOptions } from "../builder";
+import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
+import { BuilderFileType, TSBuilderOptions } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
-import { TYPE as SIGN_CLIENT_TYPE, QUERY_CLIENT_TYPE } from "./client";
-import { TYPE as MESSAGE_COMPOSER_TYPE } from "./message-composer";
 
 export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
   constructor(opt: TSBuilderOptions) {
@@ -20,9 +11,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     this.utils = {
       ContractBase: "__contractContextBase__",
       IContractConstructor: "__contractContextBase__",
-      getSigningClientDefault: "__contractContextBase__",
-      getQueryClientDefault: "__contractContextBase__",
-      getMessageComposerDefault: "__contractContextBase__",
+      EmptyClient: "__contractContextBase__",
     };
   }
 
@@ -48,80 +37,67 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       return;
     }
 
-    if (!Object.keys(context.getProviderInfos())?.length) {
+    const providerInfo = context.getProviderInfos()[name];
+
+    if (!Object.keys(providerInfo)?.length) {
       return;
     }
 
     context.addUtil("ContractBase");
     context.addUtil("IContractConstructor");
+
     const localname = pascal(name) + ".provider.ts";
+    let needEmptyClientType = false;
 
     const body = [];
-    const methods = [];
 
-    const signClientProviderInfo = context.getProviderInfos()[SIGN_CLIENT_TYPE];
+    const signClientProviderInfo =
+      providerInfo[w.PROVIDER_TYPES.SIGNING_CLIENT_TYPE];
 
     if (signClientProviderInfo) {
-      context.addUtil("getSigningClientDefault");
-
       body.push(
         w.importStmt(
           [signClientProviderInfo.classname],
           `./${signClientProviderInfo.basename}`
         )
       );
-
-      methods.push(
-        w.createProviderFunction(
-          "SigningClient",
-          signClientProviderInfo.classname
-        )
-      );
+    } else {
+      needEmptyClientType = true;
     }
 
     const queryClientProviderInfo =
-      context.getProviderInfos()[QUERY_CLIENT_TYPE];
+      providerInfo[w.PROVIDER_TYPES.QUERY_CLIENT_TYPE];
 
     if (queryClientProviderInfo) {
-      context.addUtil("getQueryClientDefault");
-
       body.push(
         w.importStmt(
           [queryClientProviderInfo.classname],
           `./${queryClientProviderInfo.basename}`
         )
       );
-
-      methods.push(
-        w.createProviderFunction(
-          "QueryClient",
-          queryClientProviderInfo.classname
-        )
-      );
+    } else {
+      needEmptyClientType = true;
     }
 
     const messageComposerProviderInfo =
-      context.getProviderInfos()[MESSAGE_COMPOSER_TYPE];
+      providerInfo[w.PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE];
 
     if (messageComposerProviderInfo) {
-      context.addUtil("getMessageComposerDefault");
-
       body.push(
         w.importStmt(
           [messageComposerProviderInfo.classname],
           `./${messageComposerProviderInfo.basename}`
         )
       );
+    } else {
+      needEmptyClientType = true;
+    }
 
-      methods.push(
-        w.createProviderFunction(
-          "MessageComposer",
-          messageComposerProviderInfo.classname
-        )
-      );
+    if(needEmptyClientType){
+      context.addUtil("EmptyClient")
     }
 
-    body.push(w.createProvider(name, methods));
+    body.push(w.createProvider(name, providerInfo));
 
     return [
       {
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
index 137be22d..75da5eec 100644
--- a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
+++ b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
@@ -1 +1 @@
-export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const noSigningErrorMessage = 'signingCosmWasmClient not connected';\n\nexport const noCosmWasmClientErrorMessage = 'cosmWasmClient not connected';\n\nexport const noAddressErrorMessage = \"address doesn't exist\";\n\nexport class ContractBase {\n  constructor(\n    public readonly address: string | undefined,\n    public readonly cosmWasmClient: CosmWasmClient | undefined,\n    public readonly signingCosmWasmClient: SigningCosmWasmClient | undefined\n  ) {}\n}\n\nexport function getSigningClientDefault<T>(\n  intance: ContractBase,\n  contractAddr: string,\n  T: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => T\n): T {\n  if (!intance.signingCosmWasmClient) throw new Error(noSigningErrorMessage);\n  if (!intance.address) throw new Error(noAddressErrorMessage);\n  return new T(intance.signingCosmWasmClient, intance.address, contractAddr);\n}\n\nexport function getQueryClientDefault<T>(\n  intance: ContractBase,\n  contractAddr: string,\n  T: new (client: CosmWasmClient, contractAddress: string) => T\n): T {\n  if (!intance.cosmWasmClient) throw new Error(noCosmWasmClientErrorMessage);\n  return new T(intance.cosmWasmClient, contractAddr);\n}\n\nexport function getMessageComposerDefault<T>(\n  intance: ContractBase,\n  contractAddr: string,\n  T: new (address: string, contractAddress: string) => T\n): T {\n  if (!intance.address) throw new Error(noAddressErrorMessage);\n  return new T(intance.address, contractAddr);\n}\n";
+export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport class EmptyClient {}\n\nexport interface SigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface QueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface MessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = EmptyClient,\n  TQuery = EmptyClient,\n  TMsgComposer = EmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
diff --git a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
new file mode 100644
index 00000000..38db3def
--- /dev/null
+++ b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
@@ -0,0 +1 @@
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
diff --git a/packages/ts-codegen/types/src/helpers/index.d.ts b/packages/ts-codegen/types/src/helpers/index.d.ts
index 71a13410..d9837fc8 100644
--- a/packages/ts-codegen/types/src/helpers/index.d.ts
+++ b/packages/ts-codegen/types/src/helpers/index.d.ts
@@ -1 +1,2 @@
 export * from './contractContextBase';
+export * from './contractsContextTSX';
diff --git a/packages/ts-codegen/types/src/plugins/client.d.ts b/packages/ts-codegen/types/src/plugins/client.d.ts
index 09eed64d..1cb58168 100644
--- a/packages/ts-codegen/types/src/plugins/client.d.ts
+++ b/packages/ts-codegen/types/src/plugins/client.d.ts
@@ -1,8 +1,7 @@
-import { RenderContext, ContractInfo, RenderContextBase, RenderOptions } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
+import { RenderContext, ContractInfo, RenderContextBase, RenderOptions } from "wasm-ast-types";
+import { BuilderFileType } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
 export declare const TYPE = "client";
-export declare const QUERY_CLIENT_TYPE = "queryClient";
 export declare class ClientPlugin extends BuilderPluginBase<RenderOptions> {
     initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
     doRender(name: string, context: RenderContext): Promise<{
diff --git a/packages/ts-codegen/types/src/plugins/message-composer.d.ts b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
index 77bdb05f..43c536b9 100644
--- a/packages/ts-codegen/types/src/plugins/message-composer.d.ts
+++ b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
@@ -1,6 +1,6 @@
-import { ContractInfo, RenderContextBase, RenderContext, RenderOptions } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
+import { ContractInfo, RenderContextBase, RenderContext, RenderOptions } from "wasm-ast-types";
+import { BuilderFileType } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
 export declare const TYPE = "message-composer";
 export declare class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
     initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 0f9bf708..174fa13a 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -84,9 +84,11 @@ export interface IRenderContext<TOpt = RenderOptions> extends IContext {
     contract: ContractInfo;
     options: TOpt;
 
-    addProviderInfo(type: string, classname: string, filename: string): void;
+    addProviderInfo(contractName:string, type: string, classname: string, filename: string): void;
     getProviderInfos(): {
-      [key: string]: ProviderInfo;
+      [key: string]: {
+        [key: string]: ProviderInfo;
+      };
     };
 }
 
@@ -140,11 +142,17 @@ export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
 
 export class BuilderContext{
     providers:{
-      [key: string]: ProviderInfo;
+      [key: string]: {
+        [key: string]: ProviderInfo;
+      };
     } = {};
 
-    addProviderInfo(type: string, classname: string, filename: string): void {
-      this.providers[type] = {
+    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))
@@ -185,10 +193,14 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     addUtil(util: string) {
         this.utils[util] = true;
     }
-    addProviderInfo(type: string, classname: string, filename: string): void {
-        this.builderContext.addProviderInfo(type, classname, filename);
+    addProviderInfo(contractName:string, type: string, classname: string, filename: string): void {
+        this.builderContext.addProviderInfo(contractName, type, classname, filename);
     }
-    getProviderInfos(): { [key: string]: ProviderInfo; } {
+    getProviderInfos(): {
+      [key: string]: {
+        [key: string]: ProviderInfo;
+      };
+    } {
         return this.builderContext.providers;
     }
     getImports(registeredUtils?: UtilMapping, filepath?: string) {
diff --git a/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap b/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
new file mode 100644
index 00000000..10b5a8ad
--- /dev/null
+++ b/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute class 1`] = `
+"export class Whitelist extends ContractBase<WhitelistClient, WhitelistQueryClient, WhitelistMessageComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, WhitelistClient, WhitelistQueryClient, WhitelistMessageComposer);
+  }
+
+}"
+`;
+
+exports[`execute class without message composer 1`] = `
+"export class Whitelist extends ContractBase<WhitelistClient, WhitelistQueryClient, EmptyClient> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, WhitelistClient, WhitelistQueryClient, undefined);
+  }
+
+}"
+`;
diff --git a/packages/wasm-ast-types/src/provider/provider.spec.ts b/packages/wasm-ast-types/src/provider/provider.spec.ts
new file mode 100644
index 00000000..b27f83cb
--- /dev/null
+++ b/packages/wasm-ast-types/src/provider/provider.spec.ts
@@ -0,0 +1,39 @@
+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 { createProvider } from "./provider";
+
+import { expectCode, makeContext } from "../../test-utils";
+import { PROVIDER_TYPES } from "../utils/constants";
+
+it("execute class", () => {
+  let info = {};
+
+  info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: "WhitelistClient"
+  }
+
+  info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: "WhitelistQueryClient"
+  }
+
+  info[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] = {
+    classname: "WhitelistMessageComposer"
+  }
+
+  expectCode(createProvider("Whitelist", info));
+});
+
+it("execute class without message composer", () => {
+  let info = {};
+
+  info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: "WhitelistClient"
+  }
+
+  info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: "WhitelistQueryClient"
+  }
+
+  expectCode(createProvider("Whitelist", info));
+});
diff --git a/packages/wasm-ast-types/src/provider/provider.ts b/packages/wasm-ast-types/src/provider/provider.ts
index efbcf265..85f63db3 100644
--- a/packages/wasm-ast-types/src/provider/provider.ts
+++ b/packages/wasm-ast-types/src/provider/provider.ts
@@ -1,75 +1,101 @@
 import * as t from "@babel/types";
 import { pascal } from "case";
+import { ProviderInfo } from "../context";
+import { PROVIDER_TYPES } from "../utils/constants";
 import { tsObjectPattern } from "../utils";
 
-export const createProvider = (name: string, methods: t.ClassMethod[]) => {
-  return t.exportNamedDeclaration(
-    t.classDeclaration(
-      t.identifier(pascal(name)),
-      t.identifier("ContractBase"),
-      t.classBody([
-        t.classMethod(
-          "constructor",
-          t.identifier("constructor"),
-          [
-            tsObjectPattern(
-              [
-                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
-                ),
-              ],
-              t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier("IContractConstructor"))
-              )
-            ),
-          ],
-          t.blockStatement([
-            t.expressionStatement(
-              t.callExpression(t.super(), [
+export const createProvider = (
+  name: string,
+  providerInfos: {
+    [key: string]: ProviderInfo;
+  }
+) => {
+  const classDeclaration = t.classDeclaration(
+    t.identifier(name),
+    t.identifier("ContractBase"),
+    t.classBody([
+      t.classMethod(
+        "constructor",
+        t.identifier("constructor"),
+        [
+          tsObjectPattern(
+            [
+              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"),
-              ])
-            ),
-          ])
-        ),
-        ...methods,
-      ])
-    )
-  );
-};
-
-export const createProviderFunction = (
-  functionName: string,
-  classname: string
-) => {
-  return t.classMethod(
-    "method",
-    t.identifier(`get${functionName}`),
-    [t.identifier("contractAddr")],
-    t.blockStatement([
-      t.returnStatement(
-        t.callExpression(t.identifier(`get${functionName}Default`), [
-          t.thisExpression(),
-          t.identifier("contractAddr"),
-          t.identifier(classname),
+                t.identifier("signingCosmWasmClient"),
+                false,
+                true
+              ),
+            ],
+            t.tsTypeAnnotation(
+              t.tsTypeReference(t.identifier("IContractConstructor"))
+            )
+          ),
+        ],
+        t.blockStatement([
+          t.expressionStatement(
+            t.callExpression(t.super(), [
+              t.identifier("address"),
+              t.identifier("cosmWasmClient"),
+              t.identifier("signingCosmWasmClient"),
+              t.identifier(
+                providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE]
+                  ? providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE].classname
+                  : "undefined"
+              ),
+              t.identifier(
+                providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE]
+                  ? providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE].classname
+                  : "undefined"
+              ),
+              t.identifier(
+                providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
+                  ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
+                      .classname
+                  : "undefined"
+              ),
+            ])
+          ),
         ])
       ),
     ])
   );
+
+  classDeclaration.superTypeParameters = t.tsTypeParameterInstantiation([
+    t.tsTypeReference(
+      t.identifier(
+        providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE]
+          ? providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE].classname
+          : "EmptyClient"
+      )
+    ),
+    t.tsTypeReference(
+      t.identifier(
+        providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE]
+          ? providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE].classname
+          : "EmptyClient"
+      )
+    ),
+    t.tsTypeReference(
+      t.identifier(
+        providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
+          ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE].classname
+          : "EmptyClient"
+      )
+    ),
+  ]);
+
+  return t.exportNamedDeclaration(classDeclaration);
 };
diff --git a/packages/wasm-ast-types/src/utils/constants.ts b/packages/wasm-ast-types/src/utils/constants.ts
index ab2a3e23..39196997 100644
--- a/packages/wasm-ast-types/src/utils/constants.ts
+++ b/packages/wasm-ast-types/src/utils/constants.ts
@@ -28,3 +28,9 @@ export const FIXED_EXECUTE_PARAMS = [
   OPTIONAL_MEMO_PARAM,
   OPTIONAL_FUNDS_PARAM
 ];
+
+export const PROVIDER_TYPES = {
+  SIGNING_CLIENT_TYPE: "client",
+  QUERY_CLIENT_TYPE: "queryClient",
+  MESSAGE_COMPOSER_TYPE : 'message-composer'
+};
diff --git a/packages/wasm-ast-types/src/utils/index.ts b/packages/wasm-ast-types/src/utils/index.ts
index aa3643b7..29c1c58e 100644
--- a/packages/wasm-ast-types/src/utils/index.ts
+++ b/packages/wasm-ast-types/src/utils/index.ts
@@ -3,3 +3,4 @@ export * from './types';
 export * from './ref';
 export { OPTIONAL_FUNDS_PARAM } from './constants';
 export { FIXED_EXECUTE_PARAMS } from './constants';
+export { PROVIDER_TYPES } from './constants';
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 5251e2e8..b40cad89 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -69,18 +69,22 @@ export interface IContext {
 export interface IRenderContext<TOpt = RenderOptions> extends IContext {
     contract: ContractInfo;
     options: TOpt;
-    addProviderInfo(type: string, classname: string, filename: string): void;
+    addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
     getProviderInfos(): {
-        [key: string]: ProviderInfo;
+        [key: string]: {
+            [key: string]: ProviderInfo;
+        };
     };
 }
 export declare const defaultOptions: RenderOptions;
 export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
 export declare class BuilderContext {
     providers: {
-        [key: string]: ProviderInfo;
+        [key: string]: {
+            [key: string]: ProviderInfo;
+        };
     };
-    addProviderInfo(type: string, classname: string, filename: string): void;
+    addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
 }
 /**
  * context object for generating code.
@@ -101,9 +105,11 @@ export declare abstract class RenderContextBase<TOpt = RenderOptions> implements
     abstract mergeDefaultOpt(options: TOpt): TOpt;
     refLookup($ref: string): JSONSchema;
     addUtil(util: string): void;
-    addProviderInfo(type: string, classname: string, filename: string): void;
+    addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
     getProviderInfos(): {
-        [key: string]: ProviderInfo;
+        [key: string]: {
+            [key: string]: ProviderInfo;
+        };
     };
     getImports(registeredUtils?: UtilMapping, filepath?: string): any;
 }
diff --git a/packages/wasm-ast-types/types/provider/provider.d.ts b/packages/wasm-ast-types/types/provider/provider.d.ts
index cef648c8..08c5cd62 100644
--- a/packages/wasm-ast-types/types/provider/provider.d.ts
+++ b/packages/wasm-ast-types/types/provider/provider.d.ts
@@ -1,3 +1,5 @@
 import * as t from "@babel/types";
-export declare const createProvider: (name: string, methods: t.ClassMethod[]) => t.ExportNamedDeclaration;
-export declare const createProviderFunction: (functionName: string, classname: string) => t.ClassMethod;
+import { ProviderInfo } from "../context";
+export declare const createProvider: (name: string, providerInfos: {
+    [key: string]: ProviderInfo;
+}) => t.ExportNamedDeclaration;
diff --git a/packages/wasm-ast-types/types/utils/constants.d.ts b/packages/wasm-ast-types/types/utils/constants.d.ts
index 447b24dc..8c2248fa 100644
--- a/packages/wasm-ast-types/types/utils/constants.d.ts
+++ b/packages/wasm-ast-types/types/utils/constants.d.ts
@@ -3,3 +3,8 @@ export declare const OPTIONAL_FUNDS_PARAM: t.Identifier;
 export declare const OPTIONAL_FEE_PARAM: t.Identifier;
 export declare const OPTIONAL_MEMO_PARAM: t.Identifier;
 export declare const FIXED_EXECUTE_PARAMS: t.Identifier[];
+export declare const PROVIDER_TYPES: {
+    SIGNING_CLIENT_TYPE: string;
+    QUERY_CLIENT_TYPE: string;
+    MESSAGE_COMPOSER_TYPE: string;
+};
diff --git a/packages/wasm-ast-types/types/utils/index.d.ts b/packages/wasm-ast-types/types/utils/index.d.ts
index aa3643b7..29c1c58e 100644
--- a/packages/wasm-ast-types/types/utils/index.d.ts
+++ b/packages/wasm-ast-types/types/utils/index.d.ts
@@ -3,3 +3,4 @@ export * from './types';
 export * from './ref';
 export { OPTIONAL_FUNDS_PARAM } from './constants';
 export { FIXED_EXECUTE_PARAMS } from './constants';
+export { PROVIDER_TYPES } from './constants';

From 2f8759044ceffd9f6a984e27ffa6be7ebca299de Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 13 Jul 2023 11:08:06 +0800
Subject: [PATCH 127/287] finished provider generating

---
 .../contracts/CwAdminFactory.provider.ts      |   3 +-
 .../contracts/CwCodeIdRegistry.provider.ts    |   3 +-
 .../contracts/CwSingle.provider.ts            |   3 +-
 .../contracts/Factory.provider.ts             |   3 +-
 .../bundler_test/contracts/Minter.provider.ts |   3 +-
 .../contracts/contractContextBase.ts          |  14 +-
 .../contracts/contractContextProviders.ts     |  62 ++++++++
 .../__snapshots__/builder.test.ts.snap        |   4 +-
 packages/ts-codegen/src/builder/builder.ts    |  18 ++-
 .../src/generators/create-helpers.ts          |   5 +-
 .../src/helpers/contractContextBase.ts        |  14 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |  97 ++++++++++++
 packages/ts-codegen/src/plugins/provider.ts   |  36 +++--
 .../ts-codegen/src/plugins/use-contracts.ts   |  79 ----------
 .../types/src/generators/create-helpers.d.ts  |   3 +-
 .../src/helpers/contractContextBase.d.ts      |   2 +-
 .../types/src/plugins/provider-bundle.d.ts    |  13 ++
 .../types/src/plugins/provider.d.ts           |   2 +
 .../wasm-ast-types/src/context/context.ts     |   7 +
 .../__snapshots__/provider.spec.ts.snap       |  24 ++-
 .../src/provider/provider.spec.ts             |  64 ++++++--
 .../wasm-ast-types/src/provider/provider.ts   | 148 +++++++++++++++++-
 .../wasm-ast-types/src/utils/constants.ts     |   3 +-
 .../wasm-ast-types/types/context/context.d.ts |   5 +
 .../types/provider/provider.d.ts              |  13 ++
 .../wasm-ast-types/types/utils/constants.d.ts |   1 +
 26 files changed, 484 insertions(+), 145 deletions(-)
 create mode 100644 __output__/builder/bundler_test/contracts/contractContextProviders.ts
 create mode 100644 packages/ts-codegen/src/plugins/provider-bundle.ts
 delete mode 100644 packages/ts-codegen/src/plugins/use-contracts.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/provider-bundle.d.ts

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
index f81eacdc..f8d0b76d 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
@@ -5,8 +5,7 @@
 */
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
-import { CwAdminFactoryClient } from "./CwAdminFactory.client";
-import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryClient, CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
 export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer> {
   constructor({
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
index 8bd16da5..ba841f2f 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
@@ -5,8 +5,7 @@
 */
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
-import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
-import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
 export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer> {
   constructor({
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
index e1352be2..e3b2a3b3 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
@@ -5,8 +5,7 @@
 */
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
-import { CwSingleClient } from "./CwSingle.client";
-import { CwSingleQueryClient } from "./CwSingle.client";
+import { CwSingleClient, CwSingleQueryClient } from "./CwSingle.client";
 import { CwSingleMessageComposer } from "./CwSingle.message-composer";
 export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer> {
   constructor({
diff --git a/__output__/builder/bundler_test/contracts/Factory.provider.ts b/__output__/builder/bundler_test/contracts/Factory.provider.ts
index a90baccc..34273f44 100644
--- a/__output__/builder/bundler_test/contracts/Factory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.provider.ts
@@ -5,8 +5,7 @@
 */
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
-import { FactoryClient } from "./Factory.client";
-import { FactoryQueryClient } from "./Factory.client";
+import { FactoryClient, FactoryQueryClient } from "./Factory.client";
 import { FactoryMessageComposer } from "./Factory.message-composer";
 export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMessageComposer> {
   constructor({
diff --git a/__output__/builder/bundler_test/contracts/Minter.provider.ts b/__output__/builder/bundler_test/contracts/Minter.provider.ts
index 8814fb75..c5e6aa5f 100644
--- a/__output__/builder/bundler_test/contracts/Minter.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.provider.ts
@@ -5,8 +5,7 @@
 */
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
-import { MinterClient } from "./Minter.client";
-import { MinterQueryClient } from "./Minter.client";
+import { MinterClient, MinterQueryClient } from "./Minter.client";
 import { MinterMessageComposer } from "./Minter.message-composer";
 export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMessageComposer> {
   constructor({
diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
index 7de4022f..45b6b20a 100644
--- a/__output__/builder/bundler_test/contracts/contractContextBase.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -34,24 +34,24 @@ export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
 /**
  * a placeholder for non-generated classes
  */
-export class EmptyClient {}
+export interface IEmptyClient {}
 
-export interface SigningClientProvider<T> {
+export interface ISigningClientProvider<T> {
   getSigningClient(contractAddr: string): T;
 }
 
-export interface QueryClientProvider<T> {
+export interface IQueryClientProvider<T> {
   getQueryClient(contractAddr: string): T;
 }
 
-export interface MessageComposerProvider<T> {
+export interface IMessageComposerProvider<T> {
   getMessageComposer(contractAddr: string): T;
 }
 
 export class ContractBase<
-  TSign = EmptyClient,
-  TQuery = EmptyClient,
-  TMsgComposer = EmptyClient
+  TSign = IEmptyClient,
+  TQuery = IEmptyClient,
+  TMsgComposer = IEmptyClient
 > {
   constructor(
     protected address: string | undefined,
diff --git a/__output__/builder/bundler_test/contracts/contractContextProviders.ts b/__output__/builder/bundler_test/contracts/contractContextProviders.ts
new file mode 100644
index 00000000..bf15d71a
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/contractContextProviders.ts
@@ -0,0 +1,62 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
+import { FactoryQueryClient } from "./Factory.client";
+import { FactoryClient } from "./Factory.client";
+import { FactoryMessageComposer } from "./Factory.message-composer";
+import { Factory } from "./Factory.provider";
+import { MinterQueryClient } from "./Minter.client";
+import { MinterClient } from "./Minter.client";
+import { MinterMessageComposer } from "./Minter.message-composer";
+import { Minter } from "./Minter.provider";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
+import { CwAdminFactory } from "./CwAdminFactory.provider";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
+import { CwCodeIdRegistry } from "./CwCodeIdRegistry.provider";
+import { CwSingleQueryClient } from "./CwSingle.client";
+import { CwSingleClient } from "./CwSingle.client";
+import { CwSingleMessageComposer } from "./CwSingle.message-composer";
+import { CwSingle } from "./CwSingle.provider";
+export interface IContractsContext {
+  factory: IQueryClientProvider<FactoryQueryClient> & ISigningClientProvider<FactoryClient> & IMessageComposerProvider<FactoryMessageComposer>;
+  minter: IQueryClientProvider<MinterQueryClient> & ISigningClientProvider<MinterClient> & IMessageComposerProvider<MinterMessageComposer>;
+  cwAdminFactory: IQueryClientProvider<CwAdminFactoryQueryClient> & ISigningClientProvider<CwAdminFactoryClient> & IMessageComposerProvider<CwAdminFactoryMessageComposer>;
+  cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMessageComposer>;
+  cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMessageComposer>;
+}
+export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+  factory: new Factory({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  minter: new Minter({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  cwAdminFactory: new CwAdminFactory({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  cwCodeIdRegistry: new CwCodeIdRegistry({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  cwSingle: new CwSingle({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  })
+});
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index e963687f..21fc022a 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -309,8 +309,8 @@ TSBuilder {
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
-        "EmptyClient": "__contractContextBase__",
         "IContractConstructor": "__contractContextBase__",
+        "IEmptyClient": "__contractContextBase__",
       },
     },
   ],
@@ -626,8 +626,8 @@ TSBuilder {
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
-        "EmptyClient": "__contractContextBase__",
         "IContractConstructor": "__contractContextBase__",
+        "IEmptyClient": "__contractContextBase__",
       },
     },
   ],
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 2950c324..fe1b2f39 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -23,6 +23,7 @@ import { ClientPlugin } from "../plugins/client";
 import { TypesPlugin } from "../plugins/types";
 import { ContractsContextProviderPlugin } from "../plugins/provider";
 import { createHelpers } from "../generators/create-helpers";
+import { ContractsProviderBundlePlugin } from "../plugins/provider-bundle";
 
 const defaultOpts: TSBuilderOptions = {
     bundle: {
@@ -160,12 +161,27 @@ export class TSBuilder {
             this.bundle();
         }
 
+        //create useContracts bundle file
+        const contractsProviderBundlePlugin = new ContractsProviderBundlePlugin(this.options);
+        contractsProviderBundlePlugin.setBuilder(this);
+
+        let files = await contractsProviderBundlePlugin.render(
+          "",
+          {
+            schemas: [],
+          },
+          this.outPath
+        );
+        if(files && files.length){
+          [].push.apply(this.files, files);
+        }
+
         createHelpers({
           outPath: this.outPath,
           contracts: this.contracts,
           options: this.options,
           plugins: this.plugins,
-        });
+        }, this.builderContext);
     }
 
     async bundle() {
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index 0d40c2aa..c3b83495 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -4,6 +4,7 @@ import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
 import { TSBuilderInput } from "../builder";
 import { contractContextBase, contractsContextTSX } from "../helpers";
+import { BuilderContext } from "wasm-ast-types";
 
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
 const header = `/**
@@ -19,8 +20,8 @@ const write = (outPath: string, file: string, content: string) => {
   writeContentToFile(outPath, header + content, outFile);
 };
 
-export const createHelpers = (input: TSBuilderInput) => {
-  if (input.options?.useContracts?.enabled) {
+export const createHelpers = (input: TSBuilderInput, builderContext: BuilderContext) => {
+  if (input.options?.useContracts?.enabled && Object.keys(builderContext.providers)?.length) {
     write(input.outPath, "contractContextBase.ts", contractContextBase);
     write(input.outPath, "contracts-context.tsx", contractsContextTSX);
   }
diff --git a/packages/ts-codegen/src/helpers/contractContextBase.ts b/packages/ts-codegen/src/helpers/contractContextBase.ts
index db2d7943..0a9d38ff 100644
--- a/packages/ts-codegen/src/helpers/contractContextBase.ts
+++ b/packages/ts-codegen/src/helpers/contractContextBase.ts
@@ -28,24 +28,24 @@ export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
 /**
  * a placeholder for non-generated classes
  */
-export class EmptyClient {}
+export interface IEmptyClient {}
 
-export interface SigningClientProvider<T> {
+export interface ISigningClientProvider<T> {
   getSigningClient(contractAddr: string): T;
 }
 
-export interface QueryClientProvider<T> {
+export interface IQueryClientProvider<T> {
   getQueryClient(contractAddr: string): T;
 }
 
-export interface MessageComposerProvider<T> {
+export interface IMessageComposerProvider<T> {
   getMessageComposer(contractAddr: string): T;
 }
 
 export class ContractBase<
-  TSign = EmptyClient,
-  TQuery = EmptyClient,
-  TMsgComposer = EmptyClient
+  TSign = IEmptyClient,
+  TQuery = IEmptyClient,
+  TMsgComposer = IEmptyClient
 > {
   constructor(
     protected address: string | undefined,
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
new file mode 100644
index 00000000..c3c8fa87
--- /dev/null
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -0,0 +1,97 @@
+import { pascal } from "case";
+import * as w from "wasm-ast-types";
+import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
+import { BuilderFileType, TSBuilderOptions } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
+import { GetLocalBaseNameByContractName } from "./provider";
+
+export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOptions> {
+  constructor(opt: TSBuilderOptions) {
+    super(opt);
+
+    this.utils = {
+      CosmWasmClient: "@cosmjs/cosmwasm-stargate",
+      SigningCosmWasmClient: "@cosmjs/cosmwasm-stargate",
+      IQueryClientProvider: "__contractContextBase__",
+      ISigningClientProvider: "__contractContextBase__",
+      IMessageComposerProvider: "__contractContextBase__",
+    };
+  }
+
+  initContext(
+    contract: ContractInfo,
+    options?: TSBuilderOptions
+  ): RenderContextBase<TSBuilderOptions> {
+    return new RenderContext(contract, options, this.builder.builderContext);
+  }
+
+  async doRender(
+    name: string,
+    context: RenderContext
+  ): Promise<
+    {
+      type: BuilderFileType;
+      pluginType?: string;
+      localname: string;
+      body: any[];
+    }[]
+  > {
+    if (!this.option?.useContracts?.enabled) {
+      return;
+    }
+
+    const providerInfos = context.getProviderInfos();
+
+    if (!Object.keys(providerInfos)?.length) {
+      return;
+    }
+
+    const localname = "contractContextProviders.ts";
+
+    const body = [];
+
+    context.addUtil("CosmWasmClient");
+    context.addUtil("SigningCosmWasmClient");
+
+    context.addUtil("IQueryClientProvider");
+    context.addUtil("ISigningClientProvider");
+    context.addUtil("IMessageComposerProvider");
+
+    for (const name in providerInfos) {
+      if (Object.prototype.hasOwnProperty.call(providerInfos, name)) {
+        const providerInfo = providerInfos[name];
+
+        for (const key in providerInfo) {
+          if (Object.prototype.hasOwnProperty.call(providerInfo, key)) {
+            const info = providerInfo[key];
+
+            body.push(
+              w.importStmt(
+                [info.classname],
+                `./${info.basename}`
+              )
+            );
+          }
+        }
+
+        body.push(
+          w.importStmt(
+            [pascal(name)],
+            `./${GetLocalBaseNameByContractName(name)}`
+          )
+        );
+      }
+    }
+
+    body.push(w.createIContractsContext(providerInfos));
+    body.push(w.createGettingProviders(providerInfos));
+
+    return [
+      {
+        type: "plugin",
+        localname,
+        body,
+      },
+    ];
+  }
+}
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index 4a74442e..ae6cecf5 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -4,6 +4,12 @@ import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
 import { BuilderFileType, TSBuilderOptions } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
+export const GetLocalNameByContractName = (name) =>
+  `${pascal(name)}.provider.ts`;
+
+export const GetLocalBaseNameByContractName = (name) =>
+  `${pascal(name)}.provider`;
+
 export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
   constructor(opt: TSBuilderOptions) {
     super(opt);
@@ -11,7 +17,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     this.utils = {
       ContractBase: "__contractContextBase__",
       IContractConstructor: "__contractContextBase__",
-      EmptyClient: "__contractContextBase__",
+      IEmptyClient: "__contractContextBase__",
     };
   }
 
@@ -46,8 +52,10 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     context.addUtil("ContractBase");
     context.addUtil("IContractConstructor");
 
-    const localname = pascal(name) + ".provider.ts";
+    const localname = GetLocalNameByContractName(name);
     let needEmptyClientType = false;
+    let clientFile = null;
+    let clientClasses = [];
 
     const body = [];
 
@@ -55,12 +63,8 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       providerInfo[w.PROVIDER_TYPES.SIGNING_CLIENT_TYPE];
 
     if (signClientProviderInfo) {
-      body.push(
-        w.importStmt(
-          [signClientProviderInfo.classname],
-          `./${signClientProviderInfo.basename}`
-        )
-      );
+      clientFile = `./${signClientProviderInfo.basename}`;
+      clientClasses.push(signClientProviderInfo.classname);
     } else {
       needEmptyClientType = true;
     }
@@ -69,16 +73,16 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       providerInfo[w.PROVIDER_TYPES.QUERY_CLIENT_TYPE];
 
     if (queryClientProviderInfo) {
-      body.push(
-        w.importStmt(
-          [queryClientProviderInfo.classname],
-          `./${queryClientProviderInfo.basename}`
-        )
-      );
+      clientFile = `./${queryClientProviderInfo.basename}`;
+      clientClasses.push(queryClientProviderInfo.classname);
     } else {
       needEmptyClientType = true;
     }
 
+    if (clientFile) {
+      body.push(w.importStmt(clientClasses, clientFile));
+    }
+
     const messageComposerProviderInfo =
       providerInfo[w.PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE];
 
@@ -93,8 +97,8 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       needEmptyClientType = true;
     }
 
-    if(needEmptyClientType){
-      context.addUtil("EmptyClient")
+    if (needEmptyClientType) {
+      context.addUtil("IEmptyClient");
     }
 
     body.push(w.createProvider(name, providerInfo));
diff --git a/packages/ts-codegen/src/plugins/use-contracts.ts b/packages/ts-codegen/src/plugins/use-contracts.ts
deleted file mode 100644
index 7310a26a..00000000
--- a/packages/ts-codegen/src/plugins/use-contracts.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { pascal } from 'case';
-import * as w from 'wasm-ast-types';
-import { findAndParseTypes, findExecuteMsg } from '../utils';
-import {
-  getMessageProperties,
-  ContractInfo,
-  RenderContextBase,
-  RenderContext,
-  RenderOptions
-} from 'wasm-ast-types';
-import { BuilderFileType, TSBuilderOptions } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-
-export class ContractsContextPlugin extends BuilderPluginBase<TSBuilderOptions> {
-  initContext(
-    contract: ContractInfo,
-    options?: TSBuilderOptions
-  ): RenderContextBase<TSBuilderOptions> {
-    return new RenderContext(contract, options);
-  }
-
-  async doRender(
-    name: string,
-    context: RenderContext
-  ): Promise<
-    {
-      type: BuilderFileType;
-      pluginType?: string;
-      localname: string;
-      body: any[];
-    }[]
-  > {
-    const { enabled } = this.option.useContracts;
-
-    if (!enabled) {
-      return;
-    }
-
-    const localname = pascal(name) + '.message-composer.ts';
-
-    const TypesFile = pascal(name) + '.types';
-
-    // const ExecuteMsg = findExecuteMsg(schemas);
-    // const typeHash = await findAndParseTypes(schemas);
-
-    const body = [];
-
-    // body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
-
-    // // execute messages
-    // if (ExecuteMsg) {
-    //   const children = getMessageProperties(ExecuteMsg);
-    //   if (children.length > 0) {
-    //     const TheClass = pascal(`${name}MessageComposer`);
-    //     const Interface = pascal(`${name}Message`);
-
-    //     body.push(
-    //       w.createMessageComposerInterface(context, Interface, ExecuteMsg)
-    //     );
-    //     body.push(
-    //       w.createMessageComposerClass(context, TheClass, Interface, ExecuteMsg)
-    //     );
-    //   }
-    // }
-
-    // if (typeHash.hasOwnProperty('Coin')) {
-    //   // @ts-ignore
-    //   delete context.utils.Coin;
-    // }
-
-    return [
-      {
-        type: 'message-composer',
-        localname,
-        body
-      }
-    ];
-  }
-}
diff --git a/packages/ts-codegen/types/src/generators/create-helpers.d.ts b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
index f1d28914..8ce9a180 100644
--- a/packages/ts-codegen/types/src/generators/create-helpers.d.ts
+++ b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
@@ -1,2 +1,3 @@
 import { TSBuilderInput } from "../builder";
-export declare const createHelpers: (input: TSBuilderInput) => void;
+import { BuilderContext } from "wasm-ast-types";
+export declare const createHelpers: (input: TSBuilderInput, builderContext: BuilderContext) => void;
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
index 75da5eec..a21bffcf 100644
--- a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
+++ b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
@@ -1 +1 @@
-export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport class EmptyClient {}\n\nexport interface SigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface QueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface MessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = EmptyClient,\n  TQuery = EmptyClient,\n  TMsgComposer = EmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
diff --git a/packages/ts-codegen/types/src/plugins/provider-bundle.d.ts b/packages/ts-codegen/types/src/plugins/provider-bundle.d.ts
new file mode 100644
index 00000000..e50caa8e
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/provider-bundle.d.ts
@@ -0,0 +1,13 @@
+import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
+import { BuilderFileType, TSBuilderOptions } from "../builder";
+import { BuilderPluginBase } from "./plugin-base";
+export declare class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOptions> {
+    constructor(opt: TSBuilderOptions);
+    initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/ts-codegen/types/src/plugins/provider.d.ts b/packages/ts-codegen/types/src/plugins/provider.d.ts
index cecb56d0..94bd36f5 100644
--- a/packages/ts-codegen/types/src/plugins/provider.d.ts
+++ b/packages/ts-codegen/types/src/plugins/provider.d.ts
@@ -1,6 +1,8 @@
 import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
 import { BuilderFileType, TSBuilderOptions } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
+export declare const GetLocalNameByContractName: (name: any) => string;
+export declare const GetLocalBaseNameByContractName: (name: any) => string;
 export declare class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
     constructor(opt: TSBuilderOptions);
     initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 174fa13a..6c907028 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -158,6 +158,13 @@ export class BuilderContext{
         basename: basename(filename, extname(filename))
       };
     }
+    getProviderInfos(): {
+      [key: string]: {
+        [key: string]: ProviderInfo;
+      };
+    }{
+      return this.providers;
+    }
 }
 
 /**
diff --git a/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap b/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
index 10b5a8ad..7520f8ff 100644
--- a/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
+++ b/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
@@ -1,5 +1,27 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`create IContractsContext 1`] = `
+"export interface IContractsContext {
+  whitelist: ISigningClientProvider<WhitelistClient> & IQueryClientProvider<WhitelistQueryClient>;
+  marketplace: ISigningClientProvider<MarketplaceClient>;
+}"
+`;
+
+exports[`create getProviders 1`] = `
+"export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+  whitelist: new Whitelist({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  marketplace: new Marketplace({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  })
+});"
+`;
+
 exports[`execute class 1`] = `
 "export class Whitelist extends ContractBase<WhitelistClient, WhitelistQueryClient, WhitelistMessageComposer> {
   constructor({
@@ -14,7 +36,7 @@ exports[`execute class 1`] = `
 `;
 
 exports[`execute class without message composer 1`] = `
-"export class Whitelist extends ContractBase<WhitelistClient, WhitelistQueryClient, EmptyClient> {
+"export class Whitelist extends ContractBase<WhitelistClient, WhitelistQueryClient, IEmptyClient> {
   constructor({
     address,
     cosmWasmClient,
diff --git a/packages/wasm-ast-types/src/provider/provider.spec.ts b/packages/wasm-ast-types/src/provider/provider.spec.ts
index b27f83cb..fb333df9 100644
--- a/packages/wasm-ast-types/src/provider/provider.spec.ts
+++ b/packages/wasm-ast-types/src/provider/provider.spec.ts
@@ -1,7 +1,7 @@
 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 { createProvider } from "./provider";
+import { createGettingProviders, createIContractsContext, createProvider } from "./provider";
 
 import { expectCode, makeContext } from "../../test-utils";
 import { PROVIDER_TYPES } from "../utils/constants";
@@ -10,16 +10,16 @@ it("execute class", () => {
   let info = {};
 
   info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "WhitelistClient"
-  }
+    classname: "WhitelistClient",
+  };
 
   info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: "WhitelistQueryClient"
-  }
+    classname: "WhitelistQueryClient",
+  };
 
   info[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] = {
-    classname: "WhitelistMessageComposer"
-  }
+    classname: "WhitelistMessageComposer",
+  };
 
   expectCode(createProvider("Whitelist", info));
 });
@@ -28,12 +28,54 @@ it("execute class without message composer", () => {
   let info = {};
 
   info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "WhitelistClient"
-  }
+    classname: "WhitelistClient",
+  };
 
   info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: "WhitelistQueryClient"
-  }
+    classname: "WhitelistQueryClient",
+  };
 
   expectCode(createProvider("Whitelist", info));
 });
+
+it("create IContractsContext", () => {
+  let info = {
+    Whitelist: {},
+    Marketplace: {},
+  };
+
+  info["Whitelist"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: "WhitelistClient",
+  };
+
+  info["Whitelist"][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: "WhitelistQueryClient",
+  };
+
+  info["Marketplace"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: "MarketplaceClient",
+  };
+
+  expectCode(createIContractsContext(info));
+});
+
+it("create getProviders", () => {
+  let info = {
+    Whitelist: {},
+    Marketplace: {},
+  };
+
+  info["Whitelist"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: "WhitelistClient",
+  };
+
+  info["Whitelist"][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: "WhitelistQueryClient",
+  };
+
+  info["Marketplace"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: "MarketplaceClient",
+  };
+
+  expectCode(createGettingProviders(info));
+});
diff --git a/packages/wasm-ast-types/src/provider/provider.ts b/packages/wasm-ast-types/src/provider/provider.ts
index 85f63db3..bcdaf493 100644
--- a/packages/wasm-ast-types/src/provider/provider.ts
+++ b/packages/wasm-ast-types/src/provider/provider.ts
@@ -1,8 +1,8 @@
 import * as t from "@babel/types";
-import { pascal } from "case";
-import { ProviderInfo } from "../context";
+import { camel, pascal } from "case";
+import { ProviderInfo, RenderContext } from "../context";
 import { PROVIDER_TYPES } from "../utils/constants";
-import { tsObjectPattern } from "../utils";
+import { identifier, tsObjectPattern } from "../utils";
 
 export const createProvider = (
   name: string,
@@ -78,24 +78,160 @@ export const createProvider = (
       t.identifier(
         providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE]
           ? providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE].classname
-          : "EmptyClient"
+          : "IEmptyClient"
       )
     ),
     t.tsTypeReference(
       t.identifier(
         providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE]
           ? providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE].classname
-          : "EmptyClient"
+          : "IEmptyClient"
       )
     ),
     t.tsTypeReference(
       t.identifier(
         providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
           ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE].classname
-          : "EmptyClient"
+          : "IEmptyClient"
       )
     ),
   ]);
 
   return t.exportNamedDeclaration(classDeclaration);
 };
+
+export const createIContractsContext = (providerInfos: {
+  [key: string]: {
+    [key: string]: ProviderInfo;
+  };
+}) => {
+  const properties: t.TSTypeElement[] = [];
+
+  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 = {};
+
+PROVIDER_MAPPING[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = "ISigningClientProvider";
+PROVIDER_MAPPING[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = "IQueryClientProvider";
+PROVIDER_MAPPING[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] =
+  "IMessageComposerProvider";
+
+export const createProperty = (
+  name: string,
+  providerInfos: {
+    [key: string]: ProviderInfo;
+  }
+): t.TSTypeElement => {
+  let typeAnnotation: t.TSTypeAnnotation = 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: t.TSTypeReference[] = [];
+
+    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: {
+  [key: string]: {
+    [key: string]: ProviderInfo;
+  };
+}) => {
+  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)
+        )
+      ),
+    ])
+  );
+};
diff --git a/packages/wasm-ast-types/src/utils/constants.ts b/packages/wasm-ast-types/src/utils/constants.ts
index 39196997..e4f534fe 100644
--- a/packages/wasm-ast-types/src/utils/constants.ts
+++ b/packages/wasm-ast-types/src/utils/constants.ts
@@ -32,5 +32,6 @@ export const FIXED_EXECUTE_PARAMS = [
 export const PROVIDER_TYPES = {
   SIGNING_CLIENT_TYPE: "client",
   QUERY_CLIENT_TYPE: "queryClient",
-  MESSAGE_COMPOSER_TYPE : 'message-composer'
+  MESSAGE_COMPOSER_TYPE : 'message-composer',
+  PROVIDER_TYPE : 'provider'
 };
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index b40cad89..8ab4b255 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -85,6 +85,11 @@ export declare class BuilderContext {
         };
     };
     addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
+    getProviderInfos(): {
+        [key: string]: {
+            [key: string]: ProviderInfo;
+        };
+    };
 }
 /**
  * context object for generating code.
diff --git a/packages/wasm-ast-types/types/provider/provider.d.ts b/packages/wasm-ast-types/types/provider/provider.d.ts
index 08c5cd62..9d89a784 100644
--- a/packages/wasm-ast-types/types/provider/provider.d.ts
+++ b/packages/wasm-ast-types/types/provider/provider.d.ts
@@ -3,3 +3,16 @@ import { ProviderInfo } from "../context";
 export declare const createProvider: (name: string, providerInfos: {
     [key: string]: ProviderInfo;
 }) => t.ExportNamedDeclaration;
+export declare const createIContractsContext: (providerInfos: {
+    [key: string]: {
+        [key: string]: ProviderInfo;
+    };
+}) => t.ExportNamedDeclaration;
+export declare const createProperty: (name: string, providerInfos: {
+    [key: string]: ProviderInfo;
+}) => t.TSTypeElement;
+export declare const createGettingProviders: (providerInfos: {
+    [key: string]: {
+        [key: string]: ProviderInfo;
+    };
+}) => t.ExportNamedDeclaration;
diff --git a/packages/wasm-ast-types/types/utils/constants.d.ts b/packages/wasm-ast-types/types/utils/constants.d.ts
index 8c2248fa..5910254f 100644
--- a/packages/wasm-ast-types/types/utils/constants.d.ts
+++ b/packages/wasm-ast-types/types/utils/constants.d.ts
@@ -7,4 +7,5 @@ export declare const PROVIDER_TYPES: {
     SIGNING_CLIENT_TYPE: string;
     QUERY_CLIENT_TYPE: string;
     MESSAGE_COMPOSER_TYPE: string;
+    PROVIDER_TYPE: string;
 };

From 9c38e7319a3148c39de1be5819d2f2e3face4474 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Fri, 14 Jul 2023 07:24:59 +0800
Subject: [PATCH 128/287] update gitignore

---
 .gitignore                     | 1 +
 packages/ts-codegen/.gitignore | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index be08fab7..031b0da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ coverage
 packages/**/build
 packages/**/main
 packages/**/module
+testgen
diff --git a/packages/ts-codegen/.gitignore b/packages/ts-codegen/.gitignore
index d93985ec..88dd9e52 100644
--- a/packages/ts-codegen/.gitignore
+++ b/packages/ts-codegen/.gitignore
@@ -45,4 +45,5 @@ package-lock.json
 yarn.lock
 
 # others
-.DS_Store
\ No newline at end of file
+.DS_Store
+testgen
\ No newline at end of file

From 4553eb80cd89969583df6164d1c764ab5b289c63 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 04:25:26 +0200
Subject: [PATCH 129/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.0
 - wasm-ast-types@0.24.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 95172642..d975d487 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.31.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.30.1...@cosmwasm/ts-codegen@0.31.0) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.30.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.30.0...@cosmwasm/ts-codegen@0.30.1) (2023-06-07)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index f9c5dcdf..2d361fdc 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.30.1",
+  "version": "0.31.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.23.1"
+    "wasm-ast-types": "^0.24.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index a8cedad0..daafd629 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.24.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.23.1...wasm-ast-types@0.24.0) (2023-07-14)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.23.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.23.0...wasm-ast-types@0.23.1) (2023-06-07)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 8fa47c96..a4d4ce0d 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.23.1",
+  "version": "0.24.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",

From fbb9468f60ecbeb31b33a5183945aa1d2bed400c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 04:35:12 +0200
Subject: [PATCH 130/287] readme

---
 README.md                     | 52 +++++++++++++++---------------
 packages/ts-codegen/README.md | 59 ++++++++++++++++++-----------------
 2 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index 70a871ea..018ccc30 100644
--- a/README.md
+++ b/README.md
@@ -136,11 +136,11 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 #### Types Options
 
-  | option                  | description                                          |
--------------------------| ----------------------------- | ---------------------------------------------------  |
-  | `types.enabled`         | enable type generation                               |
-  | `types.aliasExecuteMsg` | generate a type alias based on the contract name     |
-  | `types.aliasEntryPoints`               | generate type aliases for the entry points based on the contract name     |
+  | option                   | description                                          |
+  | ------------------------ | ---------------------------------------------------- |
+  | `types.enabled`          | enable type generation                               |
+  | `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
+  | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 
@@ -173,15 +173,15 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 
 #### React Query Options
 
-  | option                      | description                                                                  |
-  | ---------------------------- | ---------------------------------------------------------------------------- |
-  | `reactQuery.enabled`        | enable the react-query plugin                                                |
-  | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
-  | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
-  | `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
-  | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
-  | `reactQuery.mutations`      | also generate mutations                                                      |
-  | `reactQuery.camelize`       | use camelCase style for property names                                       |
+| option                      | description                                                                  |
+| --------------------------- | --------------------------------------------------------------------------- |
+| `reactQuery.enabled`        | enable the react-query plugin                                                |
+| `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
+| `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+| `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
+| `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
+| `reactQuery.mutations`      | also generate mutations                                                      |
+| `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
 #### React Query via CLI 
@@ -231,9 +231,9 @@ cosmwasm-ts-codegen generate \
 
 #### Recoil Options
 
-  | option                         | description                                                         |
-  | ------------------------------ | ------------------------------------------------------------------- |
-  | `recoil.enabled`               | enable the recoil plugin                                            |
+| option                         | description                                                         |
+| ------------------------------ | ------------------------------------------------------------------- |
+| `recoil.enabled`               | enable the recoil plugin                                            |
 
 ### Message Composer
 
@@ -252,9 +252,9 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Composer Options
 
-  | option                         | description                                                         |
-  | ------------------------------ | ------------------------------------------------------------------- |
-  | `messageComposer.enabled`      | enable the messageComposer plugin                                   |
+| option                         | description                                                         |
+| ------------------------------ | ------------------------------------------------------------------- |
+| `messageComposer.enabled`      | enable the messageComposer plugin                                   |
 
 ### Msg Builder
 
@@ -274,7 +274,7 @@ cosmwasm-ts-codegen generate \
 #### Message Composer Options
 
 | option      | description                                                         |
--------------| ------------------------------ | ------------------------------------------------------------------- |
+|------------ | ------------------------------ | ------------------------------------------------------------------- |
 | `msgBuilder.enabled` | enable the msgBilder plugin                                   |
 
 
@@ -292,11 +292,11 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 ```
 #### Bundler Options
 
-  | option                | description                                                                      |
-  | --------------------- | -------------------------------------------------------------------------------- |
-  | `bundle.enabled`      | enable the bundler plugin                                                        |
-  | `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
-  | `bundle.bundleFile`   | name of the bundle file                                                          |
+| option                | description                                                                      |
+| --------------------- | -------------------------------------------------------------------------------- |
+| `bundle.enabled`      | enable the bundler plugin                                                        |
+| `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
+| `bundle.bundleFile`   | name of the bundle file                                                          |
 
 ### CLI Usage and Examples
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index bc9fb14d..018ccc30 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -36,7 +36,6 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [React Query](#react-query)
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
-    - [Msg Builder](#msg-builder)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
@@ -121,7 +120,7 @@ codegen({
     messageComposer: {
       enabled: false
     },
-    msgBuilder: { 
+    msgBuilder: {
       enabled: false
     }
   }
@@ -137,11 +136,11 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 #### Types Options
 
-  | option                        | description                                          |
-  | ----------------------------- | ---------------------------------------------------  |
-  | `types.enabled`               | enable type generation                               |
-  | `types.aliasExecuteMsg`       | generate a type alias based on the contract name     |
-  | `types.aliasEntryPoints`               | generate type aliases for the entry points based on the contract name     |
+  | option                   | description                                          |
+  | ------------------------ | ---------------------------------------------------- |
+  | `types.enabled`          | enable type generation                               |
+  | `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
+  | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 
@@ -174,15 +173,15 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 
 #### React Query Options
 
-  | option                      | description                                                                  |
-  | ---------------------------- | ---------------------------------------------------------------------------- |
-  | `reactQuery.enabled`        | enable the react-query plugin                                                |
-  | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
-  | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
-  | `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
-  | `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
-  | `reactQuery.mutations`      | also generate mutations                                                      |
-  | `reactQuery.camelize`       | use camelCase style for property names                                       |
+| option                      | description                                                                  |
+| --------------------------- | --------------------------------------------------------------------------- |
+| `reactQuery.enabled`        | enable the react-query plugin                                                |
+| `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
+| `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+| `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
+| `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
+| `reactQuery.mutations`      | also generate mutations                                                      |
+| `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
 #### React Query via CLI 
@@ -232,9 +231,9 @@ cosmwasm-ts-codegen generate \
 
 #### Recoil Options
 
-  | option                         | description                                                         |
-  | ------------------------------ | ------------------------------------------------------------------- |
-  | `recoil.enabled`               | enable the recoil plugin                                            |
+| option                         | description                                                         |
+| ------------------------------ | ------------------------------------------------------------------- |
+| `recoil.enabled`               | enable the recoil plugin                                            |
 
 ### Message Composer
 
@@ -253,9 +252,9 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Composer Options
 
-  | option                         | description                                                         |
-  | ------------------------------ | ------------------------------------------------------------------- |
-  | `messageComposer.enabled`      | enable the messageComposer plugin                                   |
+| option                         | description                                                         |
+| ------------------------------ | ------------------------------------------------------------------- |
+| `messageComposer.enabled`      | enable the messageComposer plugin                                   |
 
 ### Msg Builder
 
@@ -275,7 +274,7 @@ cosmwasm-ts-codegen generate \
 #### Message Composer Options
 
 | option      | description                                                         |
--------------| ------------------------------ | ------------------------------------------------------------------- |
+|------------ | ------------------------------ | ------------------------------------------------------------------- |
 | `msgBuilder.enabled` | enable the msgBilder plugin                                   |
 
 
@@ -293,11 +292,11 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 ```
 #### Bundler Options
 
-  | option                | description                                                                      |
-  | --------------------- | -------------------------------------------------------------------------------- |
-  | `bundle.enabled`      | enable the bundler plugin                                                        |
-  | `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
-  | `bundle.bundleFile`   | name of the bundle file                                                          |
+| option                | description                                                                      |
+| --------------------- | -------------------------------------------------------------------------------- |
+| `bundle.enabled`      | enable the bundler plugin                                                        |
+| `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
+| `bundle.bundleFile`   | name of the bundle file                                                          |
 
 ### CLI Usage and Examples
 
@@ -416,6 +415,10 @@ https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
 
 https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
 
+- `cosmwasm-ts-codegen generate --plugin msg-builder`
+
+https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
+
 
 ### JSON Schema
 

From da2692beb683c20c5f8804eba44d6d4db002bdb2 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 04:35:50 +0200
Subject: [PATCH 131/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index d975d487..865f9691 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.0...@cosmwasm/ts-codegen@0.31.1) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.31.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.30.1...@cosmwasm/ts-codegen@0.31.0) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 2d361fdc..8c4ce33e 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From e853444a34b52d2f9e601ca44cb01c21835e0bfd Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 04:36:35 +0200
Subject: [PATCH 132/287] readme

---
 README.md                     | 20 ++++++++++----------
 packages/ts-codegen/README.md | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 018ccc30..0785ac8c 100644
--- a/README.md
+++ b/README.md
@@ -136,11 +136,11 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 #### Types Options
 
-  | option                   | description                                          |
-  | ------------------------ | ---------------------------------------------------- |
-  | `types.enabled`          | enable type generation                               |
-  | `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
-  | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
+| option                   | description                                          |
+| ------------------------ | ---------------------------------------------------- |
+| `types.enabled`          | enable type generation                               |
+| `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
+| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 
@@ -150,11 +150,11 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 
 #### Client Options
 
-  | option                                  | description                                          |
-  | --------------------------------------- | ---------------------------------------------------  |
-  | `client.enabled`                        | generate TS client classes for your contracts        |
-  | `client.execExtendsQuery`               | execute should extend query message clients          |
-  | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
+| option                                  | description                                          |
+| --------------------------------------- | ---------------------------------------------------  |
+| `client.enabled`                        | generate TS client classes for your contracts        |
+| `client.execExtendsQuery`               | execute should extend query message clients          |
+| `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 018ccc30..0785ac8c 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -136,11 +136,11 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 #### Types Options
 
-  | option                   | description                                          |
-  | ------------------------ | ---------------------------------------------------- |
-  | `types.enabled`          | enable type generation                               |
-  | `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
-  | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
+| option                   | description                                          |
+| ------------------------ | ---------------------------------------------------- |
+| `types.enabled`          | enable type generation                               |
+| `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
+| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
 
 ### Client
 
@@ -150,11 +150,11 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 
 #### Client Options
 
-  | option                                  | description                                          |
-  | --------------------------------------- | ---------------------------------------------------  |
-  | `client.enabled`                        | generate TS client classes for your contracts        |
-  | `client.execExtendsQuery`               | execute should extend query message clients          |
-  | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
+| option                                  | description                                          |
+| --------------------------------------- | ---------------------------------------------------  |
+| `client.enabled`                        | generate TS client classes for your contracts        |
+| `client.execExtendsQuery`               | execute should extend query message clients          |
+| `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
 #### Client via CLI
 

From ac5ac9a874b56929f76b052a6a719f5c1015ccab Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 04:36:39 +0200
Subject: [PATCH 133/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.2
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 865f9691..794528ed 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.1...@cosmwasm/ts-codegen@0.31.2) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.31.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.0...@cosmwasm/ts-codegen@0.31.1) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 8c4ce33e..5fed295e 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From f0f6efb8a6b5b3a8b72e216bdbf05625b234f3fa Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:06:09 +0200
Subject: [PATCH 134/287] options

---
 README.md                                     | 16 ++++--
 packages/ts-codegen/README.md                 | 16 ++++--
 packages/ts-codegen/__tests__/builder.test.ts | 42 +++++++-------
 packages/ts-codegen/src/builder/builder.ts    | 56 +++++++++----------
 .../src/generators/create-helpers.ts          |  2 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |  2 +-
 packages/ts-codegen/src/plugins/provider.ts   |  2 +-
 .../ts-codegen/types/src/builder/builder.d.ts |  2 +-
 8 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index 0785ac8c..cf6152d8 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,8 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [React Query](#react-query)
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
+    - [Message Builder](#message-builder)
+    - [Use Contracts Hooks](#use-contracts-hooks)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
@@ -256,13 +258,13 @@ cosmwasm-ts-codegen generate \
 | ------------------------------ | ------------------------------------------------------------------- |
 | `messageComposer.enabled`      | enable the messageComposer plugin                                   |
 
-### Msg Builder
+### Message Builder
 
 Generate raw message jsons for use in your application with the `msg-builder` command.
 
 [see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
 
-#### Msg Builder via CLI
+#### Message Builder via CLI
 
 ```sh
 cosmwasm-ts-codegen generate \
@@ -271,12 +273,18 @@ cosmwasm-ts-codegen generate \
     --out ./ts \
     --name MyContractName 
 ```
-#### Message Composer Options
+#### Message Builder Options
 
 | option      | description                                                         |
 |------------ | ------------------------------ | ------------------------------------------------------------------- |
-| `msgBuilder.enabled` | enable the msgBilder plugin                                   |
+| `msgBuilder.enabled` | enable the msgBuilder plugin                                   |
+
+
+### Use Contracts Hooks
 
+| option                           | description                             |
+| -------------------------------- | --------------------------------------- |
+| `useContractsHooks.enabled`      | enable the `useContracts` plugin        |
 
 ### Bundles
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 0785ac8c..cf6152d8 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -36,6 +36,8 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [React Query](#react-query)
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
+    - [Message Builder](#message-builder)
+    - [Use Contracts Hooks](#use-contracts-hooks)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
@@ -256,13 +258,13 @@ cosmwasm-ts-codegen generate \
 | ------------------------------ | ------------------------------------------------------------------- |
 | `messageComposer.enabled`      | enable the messageComposer plugin                                   |
 
-### Msg Builder
+### Message Builder
 
 Generate raw message jsons for use in your application with the `msg-builder` command.
 
 [see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
 
-#### Msg Builder via CLI
+#### Message Builder via CLI
 
 ```sh
 cosmwasm-ts-codegen generate \
@@ -271,12 +273,18 @@ cosmwasm-ts-codegen generate \
     --out ./ts \
     --name MyContractName 
 ```
-#### Message Composer Options
+#### Message Builder Options
 
 | option      | description                                                         |
 |------------ | ------------------------------ | ------------------------------------------------------------------- |
-| `msgBuilder.enabled` | enable the msgBilder plugin                                   |
+| `msgBuilder.enabled` | enable the msgBuilder plugin                                   |
+
+
+### Use Contracts Hooks
 
+| option                           | description                             |
+| -------------------------------- | --------------------------------------- |
+| `useContractsHooks.enabled`      | enable the `useContracts` plugin        |
 
 ### Bundles
 
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 4c6aa185..400c112d 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -111,7 +111,7 @@ it('builder default', async () => {
                 enabled: true
             },
             msgBuilder: {
-              enabled: true
+                enabled: true
             }
         }
     });
@@ -154,7 +154,7 @@ it('builder no extends', async () => {
                 enabled: true
             },
             msgBuilder: {
-              enabled: true
+                enabled: true
             }
         }
     });
@@ -166,40 +166,40 @@ it('builder set bundler path', async () => {
     const s = (str) => FIXTURE_DIR + str;
     await codegen({
         contracts: [
-          s('/vectis/factory'),
-          s('/minter'),
-          s('/daodao/cw-admin-factory'),
-          s('/daodao/cw-code-id-registry'),
-          {
-              name: 'CwSingle',
-              dir: s('/daodao/cw-proposal-single')
-          }
+            s('/vectis/factory'),
+            s('/minter'),
+            s('/daodao/cw-admin-factory'),
+            s('/daodao/cw-code-id-registry'),
+            {
+                name: 'CwSingle',
+                dir: s('/daodao/cw-proposal-single')
+            }
         ],
         outPath,
         options: {
             bundle: {
-              bundlePath: bundlerPath,
-              bundleFile: 'index.ts',
-              scope: 'smart.contracts'
+                bundlePath: bundlerPath,
+                bundleFile: 'index.ts',
+                scope: 'smart.contracts'
             },
             types: {
-              enabled: true
+                enabled: true
             },
             client: {
-              enabled: true,
-              execExtendsQuery: false
+                enabled: true,
+                execExtendsQuery: false
             },
             reactQuery: {
-              enabled: true
+                enabled: true
             },
             recoil: {
-              enabled: true
+                enabled: true
             },
             messageComposer: {
-              enabled: true
+                enabled: true
             },
-            useContracts:{
-              enabled: true,
+            useContractsHooks: {
+                enabled: true,
             }
         }
     });
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index fe1b2f39..339e7ee5 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,4 +1,4 @@
-import { RenderOptions, defaultOptions, RenderContext, ContractInfo, MessageComposerOptions, BuilderContext} from "wasm-ast-types";
+import { RenderOptions, defaultOptions, RenderContext, ContractInfo, MessageComposerOptions, BuilderContext } from "wasm-ast-types";
 
 import { header } from '../utils/header';
 import { join } from "path";
@@ -48,13 +48,13 @@ export interface BundleOptions {
 };
 
 export interface UseContractsOptions {
-  enabled?: boolean;
-  filename?: string;
+    enabled?: boolean;
+    filename?: string;
 };
 
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
-    useContracts?: UseContractsOptions;
+    useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
 
 export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
@@ -125,7 +125,7 @@ export class TSBuilder {
             [].push.apply(this.plugins, plugins);
         }
 
-        this.plugins.forEach(plugin=> plugin.setBuilder(this))
+        this.plugins.forEach(plugin => plugin.setBuilder(this))
     }
 
     async build() {
@@ -134,7 +134,7 @@ export class TSBuilder {
     }
 
     // lifecycle functions
-    private async process(){
+    private async process() {
         for (const contractOpt of this.contracts) {
             const contract = getContract(contractOpt);
             //resolve contract schema.
@@ -147,16 +147,16 @@ export class TSBuilder {
         }
     }
 
-    private async render(name: string, contractInfo: ContractInfo){
-      for (const plugin of this.plugins) {
-          let files = await plugin.render(name, contractInfo, this.outPath);
-          if(files && files.length){
-              [].push.apply(this.files, files);
-          }
-      }
+    private async render(name: string, contractInfo: ContractInfo) {
+        for (const plugin of this.plugins) {
+            let files = await plugin.render(name, contractInfo, this.outPath);
+            if (files && files.length) {
+                [].push.apply(this.files, files);
+            }
+        }
     }
 
-    private async after(){
+    private async after() {
         if (this.options.bundle.enabled) {
             this.bundle();
         }
@@ -166,21 +166,21 @@ export class TSBuilder {
         contractsProviderBundlePlugin.setBuilder(this);
 
         let files = await contractsProviderBundlePlugin.render(
-          "",
-          {
-            schemas: [],
-          },
-          this.outPath
+            "",
+            {
+                schemas: [],
+            },
+            this.outPath
         );
-        if(files && files.length){
-          [].push.apply(this.files, files);
+        if (files && files.length) {
+            [].push.apply(this.files, files);
         }
 
         createHelpers({
-          outPath: this.outPath,
-          contracts: this.contracts,
-          options: this.options,
-          plugins: this.plugins,
+            outPath: this.outPath,
+            contracts: this.contracts,
+            options: this.options,
+            plugins: this.plugins,
         }, this.builderContext);
     }
 
@@ -190,8 +190,8 @@ export class TSBuilder {
 
         const bundleFile = this.options.bundle.bundleFile;
         const bundlePath = join(
-          this.options?.bundle?.bundlePath ?? this.outPath,
-          bundleFile
+            this.options?.bundle?.bundlePath ?? this.outPath,
+            bundleFile
         );
         const bundleVariables = {};
         const importPaths = [];
@@ -215,7 +215,7 @@ export class TSBuilder {
             ]
         )).code;
 
-        if(this.options?.bundle?.bundlePath){
+        if (this.options?.bundle?.bundlePath) {
             mkdirp(this.options?.bundle?.bundlePath);
         }
 
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index c3b83495..3d035fef 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -21,7 +21,7 @@ const write = (outPath: string, file: string, content: string) => {
 };
 
 export const createHelpers = (input: TSBuilderInput, builderContext: BuilderContext) => {
-  if (input.options?.useContracts?.enabled && Object.keys(builderContext.providers)?.length) {
+  if (input.options?.useContractsHooks?.enabled && Object.keys(builderContext.providers)?.length) {
     write(input.outPath, "contractContextBase.ts", contractContextBase);
     write(input.outPath, "contracts-context.tsx", contractsContextTSX);
   }
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index c3c8fa87..a986650d 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -36,7 +36,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
       body: any[];
     }[]
   > {
-    if (!this.option?.useContracts?.enabled) {
+    if (!this.option?.useContractsHooks?.enabled) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index ae6cecf5..b6e053d8 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -39,7 +39,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body: any[];
     }[]
   > {
-    if (!this.option?.useContracts?.enabled) {
+    if (!this.option?.useContractsHooks?.enabled) {
       return;
     }
 
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 9c7e48b8..0eca5b63 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -18,7 +18,7 @@ export interface UseContractsOptions {
 }
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
-    useContracts?: UseContractsOptions;
+    useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
 export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
 export interface BuilderFile {

From 7605b218d5823ab79fd61a529790f88b82d367c5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:09:54 +0200
Subject: [PATCH 135/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.3
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 794528ed..02e42903 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.2...@cosmwasm/ts-codegen@0.31.3) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.31.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.1...@cosmwasm/ts-codegen@0.31.2) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 5fed295e..1262333f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From d0e7dbfc37550290c8e6dbff390ba1c18636805f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:26:08 +0200
Subject: [PATCH 136/287] readme

---
 README.md                     | 48 +++++++++++++++++++++++++++++++++++
 packages/ts-codegen/README.md | 48 +++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/README.md b/README.md
index cf6152d8..d70df93c 100644
--- a/README.md
+++ b/README.md
@@ -286,6 +286,54 @@ cosmwasm-ts-codegen generate \
 | -------------------------------- | --------------------------------------- |
 | `useContractsHooks.enabled`      | enable the `useContracts` plugin        |
 
+#### Use Contracts Provider Usage
+
+```tsx
+import { useChain } from '@cosmos-kit/react';
+import { ContractsProvider } from '../path/to/codegen/contracts-context';
+
+export default function YourComponent() {
+  
+  const { 
+    address,
+    getCosmWasmClient,
+    getSigningCosmWasmClient
+  } = useChain(chainName);
+
+  return (
+    <ContractsProvider
+      contractsConfig={{
+        address,
+        getCosmWasmClient,
+        getSigningCosmWasmClient,
+      }}
+    >
+        <SomeCoolComponent />
+    </ContractsProvider>
+  )
+};
+```
+
+#### Use Contracts Hooks Usage
+
+Once enabled, you can get contracts very simply:
+
+```ts
+const { marketplace } = useContracts();
+```
+
+```ts
+const marketplaceClient = marketplace.signingClient(marketplaceContract);
+await marketplaceClient.updateAskPrice({
+  collection: token.collectionAddr,
+  price: {
+    amount,
+    denom,
+  },
+  tokenId,
+});
+```
+
 ### Bundles
 
 The bundler will make a nice package of all your contracts. For example:
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index cf6152d8..d70df93c 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -286,6 +286,54 @@ cosmwasm-ts-codegen generate \
 | -------------------------------- | --------------------------------------- |
 | `useContractsHooks.enabled`      | enable the `useContracts` plugin        |
 
+#### Use Contracts Provider Usage
+
+```tsx
+import { useChain } from '@cosmos-kit/react';
+import { ContractsProvider } from '../path/to/codegen/contracts-context';
+
+export default function YourComponent() {
+  
+  const { 
+    address,
+    getCosmWasmClient,
+    getSigningCosmWasmClient
+  } = useChain(chainName);
+
+  return (
+    <ContractsProvider
+      contractsConfig={{
+        address,
+        getCosmWasmClient,
+        getSigningCosmWasmClient,
+      }}
+    >
+        <SomeCoolComponent />
+    </ContractsProvider>
+  )
+};
+```
+
+#### Use Contracts Hooks Usage
+
+Once enabled, you can get contracts very simply:
+
+```ts
+const { marketplace } = useContracts();
+```
+
+```ts
+const marketplaceClient = marketplace.signingClient(marketplaceContract);
+await marketplaceClient.updateAskPrice({
+  collection: token.collectionAddr,
+  price: {
+    amount,
+    denom,
+  },
+  tokenId,
+});
+```
+
 ### Bundles
 
 The bundler will make a nice package of all your contracts. For example:

From 4c207bade9c6e542e9fc4d29b60866f4d7ff1627 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:26:13 +0200
Subject: [PATCH 137/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.4
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 02e42903..01e7d241 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.3...@cosmwasm/ts-codegen@0.31.4) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.31.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.2...@cosmwasm/ts-codegen@0.31.3) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 1262333f..b5025f8d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.3",
+  "version": "0.31.4",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 9f77f20c6cf80413d69d420149097418e06da53b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:27:37 +0200
Subject: [PATCH 138/287] readme

---
 README.md                     | 6 +++---
 packages/ts-codegen/README.md | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d70df93c..f5d886f8 100644
--- a/README.md
+++ b/README.md
@@ -275,9 +275,9 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Builder Options
 
-| option      | description                                                         |
-|------------ | ------------------------------ | ------------------------------------------------------------------- |
-| `msgBuilder.enabled` | enable the msgBuilder plugin                                   |
+| option               | description                    |
+|--------------------- | ------------------------------ |
+| `msgBuilder.enabled` | enable the msgBuilder plugin   |
 
 
 ### Use Contracts Hooks
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index d70df93c..f5d886f8 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -275,9 +275,9 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Builder Options
 
-| option      | description                                                         |
-|------------ | ------------------------------ | ------------------------------------------------------------------- |
-| `msgBuilder.enabled` | enable the msgBuilder plugin                                   |
+| option               | description                    |
+|--------------------- | ------------------------------ |
+| `msgBuilder.enabled` | enable the msgBuilder plugin   |
 
 
 ### Use Contracts Hooks

From f678de3cce2ad0dc29f5ad9d6154831bd74ed2a6 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:27:46 +0200
Subject: [PATCH 139/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.5
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 01e7d241..ff599d23 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.4...@cosmwasm/ts-codegen@0.31.5) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.31.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.3...@cosmwasm/ts-codegen@0.31.4) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index b5025f8d..e2643656 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 5559e8249eeb24973d723dc829def0449144cef3 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:28:42 +0200
Subject: [PATCH 140/287] readme

---
 README.md                     | 3 +++
 packages/ts-codegen/README.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index f5d886f8..34874f69 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,9 @@ codegen({
     },
     msgBuilder: {
       enabled: false
+    },
+    useContractsHooks: {
+      enabled: false
     }
   }
 }).then(() => {
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index f5d886f8..34874f69 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -124,6 +124,9 @@ codegen({
     },
     msgBuilder: {
       enabled: false
+    },
+    useContractsHooks: {
+      enabled: false
     }
   }
 }).then(() => {

From e7a88af7c939524d91065da318f262884afb8dee Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 14 Jul 2023 05:28:59 +0200
Subject: [PATCH 141/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.31.6
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index ff599d23..dfb67ce8 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.5...@cosmwasm/ts-codegen@0.31.6) (2023-07-14)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.31.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.4...@cosmwasm/ts-codegen@0.31.5) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e2643656..7b31cd9f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From e35615ec30cabf265f13e38e7f749337d264253c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 16 Jul 2023 15:44:04 +0200
Subject: [PATCH 142/287] boilerplate

---
 packages/ts-codegen/src/commands/create-boilerplate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index db36a30d..35f0edbb 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -5,7 +5,7 @@ const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
 
-const repo = 'https://github.com/pyramation/tmpl-cosmwasm-module.git';
+const repo = 'https://github.com/cosmology-tech/ts-codegen-module-boilerplate';
 export default async argv => {
     if (!shell.which('git')) {
         shell.echo('Sorry, this script requires git');

From 0a4c5d82cb75d82e01e662aec40f613529173da9 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 16 Jul 2023 15:44:12 +0200
Subject: [PATCH 143/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.32.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index dfb67ce8..42e1868d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.32.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.6...@cosmwasm/ts-codegen@0.32.0) (2023-07-16)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.31.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.5...@cosmwasm/ts-codegen@0.31.6) (2023-07-14)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 7b31cd9f..adb97658 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.31.6",
+  "version": "0.32.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From dfe716512ea97636b206ff59cd3217ebc770240c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 16 Jul 2023 15:48:34 +0200
Subject: [PATCH 144/287] cli

---
 packages/ts-codegen/src/commands/create-boilerplate.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 35f0edbb..54cde020 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -88,7 +88,7 @@ export default async argv => {
             path.basename(templateFile) === 'LICENSE' &&
             license.__LICENSE__ === 'closed'
         ) {
-            content = `Copyright (c) 2022 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
+            content = `Copyright (c) 2023 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
 Unauthorized copying via any medium is strictly prohibited
 Proprietary and confidential`;
         }
@@ -118,9 +118,9 @@ Proprietary and confidential`;
             );
         }
 
-        if (path.basename(templateFile) === 'README.md') {
-            content = `# ${results.__MODULENAME__}`;
-        }
+        // if (path.basename(templateFile) === 'README.md') {
+        //     content = `# ${results.__MODULENAME__}`;
+        // }
 
         fs.writeFileSync(templateFile, content);
     }

From 9d4f9eca0ee378e0f53c5b95343842d76d446534 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 16 Jul 2023 15:48:53 +0200
Subject: [PATCH 145/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.33.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 42e1868d..3f4be7d2 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.33.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.32.0...@cosmwasm/ts-codegen@0.33.0) (2023-07-16)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.32.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.31.6...@cosmwasm/ts-codegen@0.32.0) (2023-07-16)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index adb97658..0ff3f217 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 502cf44de144c8c9b1a9373033c562bcb2265a50 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 19 Jul 2023 19:02:37 +0800
Subject: [PATCH 146/287] fix helper files fix exporting helper files and
 provider bundle file

---
 .../contracts/contractContextBase.ts          |  39 +++++-
 .../contracts/contracts-context.tsx           |   2 +-
 __output__/builder/bundler_test/index.ts      | 115 +++++++++--------
 .../default/CwAdminFactory.provider.ts        |  19 +++
 .../default/CwCodeIdRegistry.provider.ts      |  19 +++
 .../builder/default/CwSingle.provider.ts      |  19 +++
 .../builder/default/Factory.provider.ts       |  19 +++
 __output__/builder/default/Minter.provider.ts |  19 +++
 .../builder/default/contractContextBase.ts    | 122 ++++++++++++++++++
 .../default/contractContextProviders.ts       |  62 +++++++++
 .../builder/default/contracts-context.tsx     |  78 +++++++++++
 __output__/builder/default/index.ts           | 103 +++++++++------
 __output__/builder/no-extends/index.ts        | 106 +++++++--------
 packages/ts-codegen/__tests__/builder.test.ts |   3 +
 packages/ts-codegen/src/builder/builder.ts    |  22 +++-
 .../src/generators/create-helpers.ts          |  36 +++++-
 .../src/helpers/contractContextBase.ts        |  39 +++++-
 .../src/helpers/contractsContextTSX.ts        |   2 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |   1 +
 packages/ts-codegen/src/plugins/provider.ts   |   1 +
 .../types/src/generators/create-helpers.d.ts  |   4 +-
 .../src/helpers/contractContextBase.d.ts      |   2 +-
 .../src/helpers/contractsContextTSX.d.ts      |   2 +-
 23 files changed, 652 insertions(+), 182 deletions(-)
 create mode 100644 __output__/builder/default/CwAdminFactory.provider.ts
 create mode 100644 __output__/builder/default/CwCodeIdRegistry.provider.ts
 create mode 100644 __output__/builder/default/CwSingle.provider.ts
 create mode 100644 __output__/builder/default/Factory.provider.ts
 create mode 100644 __output__/builder/default/Minter.provider.ts
 create mode 100644 __output__/builder/default/contractContextBase.ts
 create mode 100644 __output__/builder/default/contractContextProviders.ts
 create mode 100644 __output__/builder/default/contracts-context.tsx

diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
index 45b6b20a..a2f5e7af 100644
--- a/__output__/builder/bundler_test/contracts/contractContextBase.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -53,24 +53,49 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
+
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  TSign?: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => TSign;
+  TQuery?: new (
+    client: CosmWasmClient,
+    contractAddress: string
+  ) => TQuery;
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
   constructor(
-    protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    private TSign?: new (
+    address: string | undefined,
+    cosmWasmClient: CosmWasmClient | undefined,
+    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    private TQuery?: new (
+    TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    private TMsgComposer?: new (
+    TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {}
+  ) {
+    this.address = address;
+    this.cosmWasmClient = cosmWasmClient;
+    this.signingCosmWasmClient = signingCosmWasmClient;
+    this.TSign = TSign;
+    this.TQuery = TQuery;
+    this.TMsgComposer = TMsgComposer;
+  }
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
diff --git a/__output__/builder/bundler_test/contracts/contracts-context.tsx b/__output__/builder/bundler_test/contracts/contracts-context.tsx
index 38d23ef7..d972e515 100644
--- a/__output__/builder/bundler_test/contracts/contracts-context.tsx
+++ b/__output__/builder/bundler_test/contracts/contracts-context.tsx
@@ -70,7 +70,7 @@ export const ContractsProvider = ({
 };
 
 export const useContracts = () => {
-  const contracts = useContext(ContractsContext);
+  const contracts: IContractsContext = useContext(ContractsContext);
   if (contracts === null) {
     throw new Error('useContracts must be used within a ContractsProvider');
   }
diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
index 39f93cb6..a0b6bbbd 100644
--- a/__output__/builder/bundler_test/index.ts
+++ b/__output__/builder/bundler_test/index.ts
@@ -4,72 +4,81 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import * as _75 from "./contracts/Factory.types";
-import * as _76 from "./contracts/Factory.client";
-import * as _77 from "./contracts/Factory.message-composer";
-import * as _78 from "./contracts/Factory.react-query";
-import * as _79 from "./contracts/Factory.recoil";
-import * as _80 from "./contracts/Factory.provider";
-import * as _81 from "./contracts/Minter.types";
-import * as _82 from "./contracts/Minter.client";
-import * as _83 from "./contracts/Minter.message-composer";
-import * as _84 from "./contracts/Minter.react-query";
-import * as _85 from "./contracts/Minter.recoil";
-import * as _86 from "./contracts/Minter.provider";
-import * as _87 from "./contracts/CwAdminFactory.types";
-import * as _88 from "./contracts/CwAdminFactory.client";
-import * as _89 from "./contracts/CwAdminFactory.message-composer";
-import * as _90 from "./contracts/CwAdminFactory.react-query";
-import * as _91 from "./contracts/CwAdminFactory.recoil";
-import * as _92 from "./contracts/CwAdminFactory.provider";
-import * as _93 from "./contracts/CwCodeIdRegistry.types";
-import * as _94 from "./contracts/CwCodeIdRegistry.client";
-import * as _95 from "./contracts/CwCodeIdRegistry.message-composer";
-import * as _96 from "./contracts/CwCodeIdRegistry.react-query";
-import * as _97 from "./contracts/CwCodeIdRegistry.recoil";
-import * as _98 from "./contracts/CwCodeIdRegistry.provider";
-import * as _99 from "./contracts/CwSingle.types";
-import * as _100 from "./contracts/CwSingle.client";
-import * as _101 from "./contracts/CwSingle.message-composer";
-import * as _102 from "./contracts/CwSingle.react-query";
-import * as _103 from "./contracts/CwSingle.recoil";
-import * as _104 from "./contracts/CwSingle.provider";
+import * as _83 from "./contracts/Factory.types";
+import * as _84 from "./contracts/Factory.client";
+import * as _85 from "./contracts/Factory.message-composer";
+import * as _86 from "./contracts/Factory.react-query";
+import * as _87 from "./contracts/Factory.recoil";
+import * as _88 from "./contracts/Factory.provider";
+import * as _89 from "./contracts/Minter.types";
+import * as _90 from "./contracts/Minter.client";
+import * as _91 from "./contracts/Minter.message-composer";
+import * as _92 from "./contracts/Minter.react-query";
+import * as _93 from "./contracts/Minter.recoil";
+import * as _94 from "./contracts/Minter.provider";
+import * as _95 from "./contracts/CwAdminFactory.types";
+import * as _96 from "./contracts/CwAdminFactory.client";
+import * as _97 from "./contracts/CwAdminFactory.message-composer";
+import * as _98 from "./contracts/CwAdminFactory.react-query";
+import * as _99 from "./contracts/CwAdminFactory.recoil";
+import * as _100 from "./contracts/CwAdminFactory.provider";
+import * as _101 from "./contracts/CwCodeIdRegistry.types";
+import * as _102 from "./contracts/CwCodeIdRegistry.client";
+import * as _103 from "./contracts/CwCodeIdRegistry.message-composer";
+import * as _104 from "./contracts/CwCodeIdRegistry.react-query";
+import * as _105 from "./contracts/CwCodeIdRegistry.recoil";
+import * as _106 from "./contracts/CwCodeIdRegistry.provider";
+import * as _107 from "./contracts/CwSingle.types";
+import * as _108 from "./contracts/CwSingle.client";
+import * as _109 from "./contracts/CwSingle.message-composer";
+import * as _110 from "./contracts/CwSingle.react-query";
+import * as _111 from "./contracts/CwSingle.recoil";
+import * as _112 from "./contracts/CwSingle.provider";
+import * as _113 from "./contracts/contractContextProviders";
+import * as _114 from "./contracts/contractContextBase";
+import * as _115 from "./contracts/contracts-context";
 export namespace smart {
   export namespace contracts {
-    export const Factory = { ..._75,
-      ..._76,
-      ..._77,
-      ..._78,
-      ..._79,
-      ..._80
-    };
-    export const Minter = { ..._81,
-      ..._82,
-      ..._83,
+    export const Factory = { ..._83,
       ..._84,
       ..._85,
-      ..._86
+      ..._86,
+      ..._87,
+      ..._88
     };
-    export const CwAdminFactory = { ..._87,
-      ..._88,
-      ..._89,
+    export const Minter = { ..._89,
       ..._90,
       ..._91,
-      ..._92
+      ..._92,
+      ..._93,
+      ..._94
     };
-    export const CwCodeIdRegistry = { ..._93,
-      ..._94,
-      ..._95,
+    export const CwAdminFactory = { ..._95,
       ..._96,
       ..._97,
-      ..._98
+      ..._98,
+      ..._99,
+      ..._100
     };
-    export const CwSingle = { ..._99,
-      ..._100,
-      ..._101,
+    export const CwCodeIdRegistry = { ..._101,
       ..._102,
       ..._103,
-      ..._104
+      ..._104,
+      ..._105,
+      ..._106
+    };
+    export const CwSingle = { ..._107,
+      ..._108,
+      ..._109,
+      ..._110,
+      ..._111,
+      ..._112
+    };
+    export const contractContextProviders = { ..._113
+    };
+    export const contractContextBase = { ..._114
+    };
+    export const contractsContext = { ..._115
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwAdminFactory.provider.ts b/__output__/builder/default/CwAdminFactory.provider.ts
new file mode 100644
index 00000000..f8d0b76d
--- /dev/null
+++ b/__output__/builder/default/CwAdminFactory.provider.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, IContractConstructor } from "./contractContextBase";
+import { CwAdminFactoryClient, CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
+export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.provider.ts b/__output__/builder/default/CwCodeIdRegistry.provider.ts
new file mode 100644
index 00000000..ba841f2f
--- /dev/null
+++ b/__output__/builder/default/CwCodeIdRegistry.provider.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, IContractConstructor } from "./contractContextBase";
+import { CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
+export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.provider.ts b/__output__/builder/default/CwSingle.provider.ts
new file mode 100644
index 00000000..e3b2a3b3
--- /dev/null
+++ b/__output__/builder/default/CwSingle.provider.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, IContractConstructor } from "./contractContextBase";
+import { CwSingleClient, CwSingleQueryClient } from "./CwSingle.client";
+import { CwSingleMessageComposer } from "./CwSingle.message-composer";
+export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.provider.ts b/__output__/builder/default/Factory.provider.ts
new file mode 100644
index 00000000..34273f44
--- /dev/null
+++ b/__output__/builder/default/Factory.provider.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, IContractConstructor } from "./contractContextBase";
+import { FactoryClient, FactoryQueryClient } from "./Factory.client";
+import { FactoryMessageComposer } from "./Factory.message-composer";
+export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMessageComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMessageComposer);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.provider.ts b/__output__/builder/default/Minter.provider.ts
new file mode 100644
index 00000000..c5e6aa5f
--- /dev/null
+++ b/__output__/builder/default/Minter.provider.ts
@@ -0,0 +1,19 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, IContractConstructor } from "./contractContextBase";
+import { MinterClient, MinterQueryClient } from "./Minter.client";
+import { MinterMessageComposer } from "./Minter.message-composer";
+export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMessageComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMessageComposer);
+  }
+
+}
\ No newline at end of file
diff --git a/__output__/builder/default/contractContextBase.ts b/__output__/builder/default/contractContextBase.ts
new file mode 100644
index 00000000..a2f5e7af
--- /dev/null
+++ b/__output__/builder/default/contractContextBase.ts
@@ -0,0 +1,122 @@
+/**
+* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
+* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
+* and run the transpile command or yarn proto command to regenerate this bundle.
+*/
+
+
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+export interface IContractConstructor {
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+}
+
+export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
+
+export const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';
+
+export const NO_ADDRESS_ERROR_MESSAGE = "address doesn't exist";
+
+export const NO_SIGNING_CLIENT_ERROR_MESSAGE =
+  'Signing client is not generated. Please check ts-codegen config';
+
+export const NO_QUERY_CLIENT_ERROR_MESSAGE =
+  'Query client is not generated. Please check ts-codegen config';
+
+export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
+  'Message composer client is not generated. Please check ts-codegen config';
+
+/**
+ * a placeholder for non-generated classes
+ */
+export interface IEmptyClient {}
+
+export interface ISigningClientProvider<T> {
+  getSigningClient(contractAddr: string): T;
+}
+
+export interface IQueryClientProvider<T> {
+  getQueryClient(contractAddr: string): T;
+}
+
+export interface IMessageComposerProvider<T> {
+  getMessageComposer(contractAddr: string): T;
+}
+
+export class ContractBase<
+  TSign = IEmptyClient,
+  TQuery = IEmptyClient,
+  TMsgComposer = IEmptyClient
+> {
+
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  TSign?: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => TSign;
+  TQuery?: new (
+    client: CosmWasmClient,
+    contractAddress: string
+  ) => TQuery;
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
+  constructor(
+    address: string | undefined,
+    cosmWasmClient: CosmWasmClient | undefined,
+    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {
+    this.address = address;
+    this.cosmWasmClient = cosmWasmClient;
+    this.signingCosmWasmClient = signingCosmWasmClient;
+    this.TSign = TSign;
+    this.TQuery = TQuery;
+    this.TMsgComposer = TMsgComposer;
+  }
+
+  public getSigningClient(contractAddr: string): TSign {
+    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);
+    return new this.TSign(
+      this.signingCosmWasmClient,
+      this.address,
+      contractAddr
+    );
+  }
+
+  public getQueryClient(contractAddr: string): TQuery {
+    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);
+    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);
+    return new this.TQuery(this.cosmWasmClient, contractAddr);
+  }
+
+  public getMessageComposer(contractAddr: string): TMsgComposer {
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);
+    return new this.TMsgComposer(this.address, contractAddr);
+  }
+}
diff --git a/__output__/builder/default/contractContextProviders.ts b/__output__/builder/default/contractContextProviders.ts
new file mode 100644
index 00000000..bf15d71a
--- /dev/null
+++ b/__output__/builder/default/contractContextProviders.ts
@@ -0,0 +1,62 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
+import { FactoryQueryClient } from "./Factory.client";
+import { FactoryClient } from "./Factory.client";
+import { FactoryMessageComposer } from "./Factory.message-composer";
+import { Factory } from "./Factory.provider";
+import { MinterQueryClient } from "./Minter.client";
+import { MinterClient } from "./Minter.client";
+import { MinterMessageComposer } from "./Minter.message-composer";
+import { Minter } from "./Minter.provider";
+import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryClient } from "./CwAdminFactory.client";
+import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
+import { CwAdminFactory } from "./CwAdminFactory.provider";
+import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
+import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
+import { CwCodeIdRegistry } from "./CwCodeIdRegistry.provider";
+import { CwSingleQueryClient } from "./CwSingle.client";
+import { CwSingleClient } from "./CwSingle.client";
+import { CwSingleMessageComposer } from "./CwSingle.message-composer";
+import { CwSingle } from "./CwSingle.provider";
+export interface IContractsContext {
+  factory: IQueryClientProvider<FactoryQueryClient> & ISigningClientProvider<FactoryClient> & IMessageComposerProvider<FactoryMessageComposer>;
+  minter: IQueryClientProvider<MinterQueryClient> & ISigningClientProvider<MinterClient> & IMessageComposerProvider<MinterMessageComposer>;
+  cwAdminFactory: IQueryClientProvider<CwAdminFactoryQueryClient> & ISigningClientProvider<CwAdminFactoryClient> & IMessageComposerProvider<CwAdminFactoryMessageComposer>;
+  cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMessageComposer>;
+  cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMessageComposer>;
+}
+export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+  factory: new Factory({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  minter: new Minter({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  cwAdminFactory: new CwAdminFactory({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  cwCodeIdRegistry: new CwCodeIdRegistry({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }),
+  cwSingle: new CwSingle({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  })
+});
\ No newline at end of file
diff --git a/__output__/builder/default/contracts-context.tsx b/__output__/builder/default/contracts-context.tsx
new file mode 100644
index 00000000..d972e515
--- /dev/null
+++ b/__output__/builder/default/contracts-context.tsx
@@ -0,0 +1,78 @@
+/**
+* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
+* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
+* and run the transpile command or yarn proto command to regenerate this bundle.
+*/
+
+
+import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+import { IContractsContext, getProviders } from './contractContextProviders';
+
+interface ContractsConfig {
+  address: string | undefined;
+  getCosmWasmClient: () => Promise<CosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+}
+
+const ContractsContext = React.createContext<IContractsContext | null>(null);
+
+export const ContractsProvider = ({
+  children,
+  contractsConfig,
+}: {
+  children: React.ReactNode;
+  contractsConfig: ContractsConfig;
+}) => {
+  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [signingCosmWasmClient, setSigningCosmWasmClient] =
+    useState<SigningCosmWasmClient>();
+
+  const { address, getCosmWasmClient, getSigningCosmWasmClient } =
+    contractsConfig;
+
+  const prevAddressRef = useRef<string | undefined>(address);
+
+  const contracts: IContractsContext = useMemo(() => {
+    return getProviders(address, cosmWasmClient, signingCosmWasmClient);
+  }, [address, cosmWasmClient, signingCosmWasmClient]);
+
+  useEffect(() => {
+    const connectSigningCwClient = async () => {
+      if (address && prevAddressRef.current !== address) {
+        const signingCosmWasmClient = await getSigningCosmWasmClient();
+        setSigningCosmWasmClient(signingCosmWasmClient);
+      } else if (!address) {
+        setSigningCosmWasmClient(undefined);
+      }
+      prevAddressRef.current = address;
+    };
+    connectSigningCwClient();
+  }, [address, getSigningCosmWasmClient]);
+
+  useEffect(() => {
+    const connectCosmWasmClient = async () => {
+      const cosmWasmClient = await getCosmWasmClient();
+      setCosmWasmClient(cosmWasmClient);
+    };
+    connectCosmWasmClient();
+  }, [getCosmWasmClient]);
+
+  return (
+    <ContractsContext.Provider value={contracts}>
+      {children}
+    </ContractsContext.Provider>
+  );
+};
+
+export const useContracts = () => {
+  const contracts: IContractsContext = useContext(ContractsContext);
+  if (contracts === null) {
+    throw new Error('useContracts must be used within a ContractsProvider');
+  }
+  return contracts;
+};
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index d991e94c..ae44c8eb 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -10,30 +10,38 @@ import * as _17 from "./Factory.message-composer";
 import * as _18 from "./Factory.react-query";
 import * as _19 from "./Factory.recoil";
 import * as _20 from "./Factory.msg-builder";
-import * as _21 from "./Minter.types";
-import * as _22 from "./Minter.client";
-import * as _23 from "./Minter.message-composer";
-import * as _24 from "./Minter.react-query";
-import * as _25 from "./Minter.recoil";
-import * as _26 from "./Minter.msg-builder";
-import * as _27 from "./CwAdminFactory.types";
-import * as _28 from "./CwAdminFactory.client";
-import * as _29 from "./CwAdminFactory.message-composer";
-import * as _30 from "./CwAdminFactory.react-query";
-import * as _31 from "./CwAdminFactory.recoil";
-import * as _32 from "./CwAdminFactory.msg-builder";
-import * as _33 from "./CwCodeIdRegistry.types";
-import * as _34 from "./CwCodeIdRegistry.client";
-import * as _35 from "./CwCodeIdRegistry.message-composer";
-import * as _36 from "./CwCodeIdRegistry.react-query";
-import * as _37 from "./CwCodeIdRegistry.recoil";
-import * as _38 from "./CwCodeIdRegistry.msg-builder";
-import * as _39 from "./CwSingle.types";
-import * as _40 from "./CwSingle.client";
-import * as _41 from "./CwSingle.message-composer";
-import * as _42 from "./CwSingle.react-query";
-import * as _43 from "./CwSingle.recoil";
-import * as _44 from "./CwSingle.msg-builder";
+import * as _21 from "./Factory.provider";
+import * as _22 from "./Minter.types";
+import * as _23 from "./Minter.client";
+import * as _24 from "./Minter.message-composer";
+import * as _25 from "./Minter.react-query";
+import * as _26 from "./Minter.recoil";
+import * as _27 from "./Minter.msg-builder";
+import * as _28 from "./Minter.provider";
+import * as _29 from "./CwAdminFactory.types";
+import * as _30 from "./CwAdminFactory.client";
+import * as _31 from "./CwAdminFactory.message-composer";
+import * as _32 from "./CwAdminFactory.react-query";
+import * as _33 from "./CwAdminFactory.recoil";
+import * as _34 from "./CwAdminFactory.msg-builder";
+import * as _35 from "./CwAdminFactory.provider";
+import * as _36 from "./CwCodeIdRegistry.types";
+import * as _37 from "./CwCodeIdRegistry.client";
+import * as _38 from "./CwCodeIdRegistry.message-composer";
+import * as _39 from "./CwCodeIdRegistry.react-query";
+import * as _40 from "./CwCodeIdRegistry.recoil";
+import * as _41 from "./CwCodeIdRegistry.msg-builder";
+import * as _42 from "./CwCodeIdRegistry.provider";
+import * as _43 from "./CwSingle.types";
+import * as _44 from "./CwSingle.client";
+import * as _45 from "./CwSingle.message-composer";
+import * as _46 from "./CwSingle.react-query";
+import * as _47 from "./CwSingle.recoil";
+import * as _48 from "./CwSingle.msg-builder";
+import * as _49 from "./CwSingle.provider";
+import * as _50 from "./contractContextProviders";
+import * as _51 from "./contractContextBase";
+import * as _52 from "./contracts-context";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._15,
@@ -41,35 +49,46 @@ export namespace smart {
       ..._17,
       ..._18,
       ..._19,
-      ..._20
+      ..._20,
+      ..._21
     };
-    export const Minter = { ..._21,
-      ..._22,
+    export const Minter = { ..._22,
       ..._23,
       ..._24,
       ..._25,
-      ..._26
+      ..._26,
+      ..._27,
+      ..._28
     };
-    export const CwAdminFactory = { ..._27,
-      ..._28,
-      ..._29,
+    export const CwAdminFactory = { ..._29,
       ..._30,
       ..._31,
-      ..._32
-    };
-    export const CwCodeIdRegistry = { ..._33,
+      ..._32,
+      ..._33,
       ..._34,
-      ..._35,
-      ..._36,
-      ..._37,
-      ..._38
+      ..._35
     };
-    export const CwSingle = { ..._39,
+    export const CwCodeIdRegistry = { ..._36,
+      ..._37,
+      ..._38,
+      ..._39,
       ..._40,
       ..._41,
-      ..._42,
-      ..._43,
-      ..._44
+      ..._42
+    };
+    export const CwSingle = { ..._43,
+      ..._44,
+      ..._45,
+      ..._46,
+      ..._47,
+      ..._48,
+      ..._49
+    };
+    export const contractContextProviders = { ..._50
+    };
+    export const contractContextBase = { ..._51
+    };
+    export const contractsContext = { ..._52
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
index 2c07b1e3..26f0e94c 100644
--- a/__output__/builder/no-extends/index.ts
+++ b/__output__/builder/no-extends/index.ts
@@ -4,72 +4,72 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import * as _45 from "./Factory.types";
-import * as _46 from "./Factory.client";
-import * as _47 from "./Factory.message-composer";
-import * as _48 from "./Factory.react-query";
-import * as _49 from "./Factory.recoil";
-import * as _50 from "./Factory.msg-builder";
-import * as _51 from "./Minter.types";
-import * as _52 from "./Minter.client";
-import * as _53 from "./Minter.message-composer";
-import * as _54 from "./Minter.react-query";
-import * as _55 from "./Minter.recoil";
-import * as _56 from "./Minter.msg-builder";
-import * as _57 from "./CwAdminFactory.types";
-import * as _58 from "./CwAdminFactory.client";
-import * as _59 from "./CwAdminFactory.message-composer";
-import * as _60 from "./CwAdminFactory.react-query";
-import * as _61 from "./CwAdminFactory.recoil";
-import * as _62 from "./CwAdminFactory.msg-builder";
-import * as _63 from "./CwCodeIdRegistry.types";
-import * as _64 from "./CwCodeIdRegistry.client";
-import * as _65 from "./CwCodeIdRegistry.message-composer";
-import * as _66 from "./CwCodeIdRegistry.react-query";
-import * as _67 from "./CwCodeIdRegistry.recoil";
-import * as _68 from "./CwCodeIdRegistry.msg-builder";
-import * as _69 from "./CwSingle.types";
-import * as _70 from "./CwSingle.client";
-import * as _71 from "./CwSingle.message-composer";
-import * as _72 from "./CwSingle.react-query";
-import * as _73 from "./CwSingle.recoil";
-import * as _74 from "./CwSingle.msg-builder";
+import * as _53 from "./Factory.types";
+import * as _54 from "./Factory.client";
+import * as _55 from "./Factory.message-composer";
+import * as _56 from "./Factory.react-query";
+import * as _57 from "./Factory.recoil";
+import * as _58 from "./Factory.msg-builder";
+import * as _59 from "./Minter.types";
+import * as _60 from "./Minter.client";
+import * as _61 from "./Minter.message-composer";
+import * as _62 from "./Minter.react-query";
+import * as _63 from "./Minter.recoil";
+import * as _64 from "./Minter.msg-builder";
+import * as _65 from "./CwAdminFactory.types";
+import * as _66 from "./CwAdminFactory.client";
+import * as _67 from "./CwAdminFactory.message-composer";
+import * as _68 from "./CwAdminFactory.react-query";
+import * as _69 from "./CwAdminFactory.recoil";
+import * as _70 from "./CwAdminFactory.msg-builder";
+import * as _71 from "./CwCodeIdRegistry.types";
+import * as _72 from "./CwCodeIdRegistry.client";
+import * as _73 from "./CwCodeIdRegistry.message-composer";
+import * as _74 from "./CwCodeIdRegistry.react-query";
+import * as _75 from "./CwCodeIdRegistry.recoil";
+import * as _76 from "./CwCodeIdRegistry.msg-builder";
+import * as _77 from "./CwSingle.types";
+import * as _78 from "./CwSingle.client";
+import * as _79 from "./CwSingle.message-composer";
+import * as _80 from "./CwSingle.react-query";
+import * as _81 from "./CwSingle.recoil";
+import * as _82 from "./CwSingle.msg-builder";
 export namespace smart {
   export namespace contracts {
-    export const Factory = { ..._45,
-      ..._46,
-      ..._47,
-      ..._48,
-      ..._49,
-      ..._50
-    };
-    export const Minter = { ..._51,
-      ..._52,
-      ..._53,
+    export const Factory = { ..._53,
       ..._54,
       ..._55,
-      ..._56
+      ..._56,
+      ..._57,
+      ..._58
     };
-    export const CwAdminFactory = { ..._57,
-      ..._58,
-      ..._59,
+    export const Minter = { ..._59,
       ..._60,
       ..._61,
-      ..._62
+      ..._62,
+      ..._63,
+      ..._64
     };
-    export const CwCodeIdRegistry = { ..._63,
-      ..._64,
-      ..._65,
+    export const CwAdminFactory = { ..._65,
       ..._66,
       ..._67,
-      ..._68
+      ..._68,
+      ..._69,
+      ..._70
     };
-    export const CwSingle = { ..._69,
-      ..._70,
-      ..._71,
+    export const CwCodeIdRegistry = { ..._71,
       ..._72,
       ..._73,
-      ..._74
+      ..._74,
+      ..._75,
+      ..._76
+    };
+    export const CwSingle = { ..._77,
+      ..._78,
+      ..._79,
+      ..._80,
+      ..._81,
+      ..._82
     };
   }
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 400c112d..db79d700 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -112,6 +112,9 @@ it('builder default', async () => {
             },
             msgBuilder: {
                 enabled: true
+            },
+            useContractsHooks: {
+              enabled: true,
             }
         }
     });
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 339e7ee5..08df59ad 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -63,7 +63,9 @@ export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;
     contract: string;
+    //filename only: Factory.client.ts
     localname: string;
+    //full path: contracts/Factory.client.ts
     filename: string;
 };
 
@@ -157,35 +159,41 @@ export class TSBuilder {
     }
 
     private async after() {
-        if (this.options.bundle.enabled) {
-            this.bundle();
-        }
 
         //create useContracts bundle file
         const contractsProviderBundlePlugin = new ContractsProviderBundlePlugin(this.options);
         contractsProviderBundlePlugin.setBuilder(this);
 
-        let files = await contractsProviderBundlePlugin.render(
-            "",
+        //contractContextProviders.ts
+        const files = await contractsProviderBundlePlugin.render(
+            "contractContextProviders",
             {
                 schemas: [],
             },
             this.outPath
         );
+
         if (files && files.length) {
             [].push.apply(this.files, files);
         }
 
-        createHelpers({
+        const helpers = createHelpers({
             outPath: this.outPath,
             contracts: this.contracts,
             options: this.options,
             plugins: this.plugins,
         }, this.builderContext);
+
+        if (helpers && helpers.length) {
+          [].push.apply(this.files, helpers);
+        }
+
+        if (this.options.bundle.enabled) {
+            this.bundle();
+        }
     }
 
     async bundle() {
-
         const allFiles = this.files;
 
         const bundleFile = this.options.bundle.bundleFile;
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index 3d035fef..13d1a4ab 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -1,8 +1,8 @@
-import { join, dirname } from "path";
+import { join, dirname, basename, extname } from "path";
 import { sync as mkdirp } from "mkdirp";
 import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
-import { TSBuilderInput } from "../builder";
+import { BuilderFile, TSBuilderInput } from "../builder";
 import { contractContextBase, contractsContextTSX } from "../helpers";
 import { BuilderContext } from "wasm-ast-types";
 
@@ -14,15 +14,37 @@ const header = `/**
 */
 \n`;
 
-const write = (outPath: string, file: string, content: string) => {
+const write = (outPath: string, file: string, content: string, varname?: string): BuilderFile => {
   const outFile = join(outPath, file);
   mkdirp(dirname(outFile));
   writeContentToFile(outPath, header + content, outFile);
+
+  return {
+    type: "plugin",
+    pluginType: "helper",
+    contract: varname ?? basename(file, extname(file)),
+    localname: file,
+    filename: outFile,
+  };
 };
 
-export const createHelpers = (input: TSBuilderInput, builderContext: BuilderContext) => {
-  if (input.options?.useContractsHooks?.enabled && Object.keys(builderContext.providers)?.length) {
-    write(input.outPath, "contractContextBase.ts", contractContextBase);
-    write(input.outPath, "contracts-context.tsx", contractsContextTSX);
+export const createHelpers = (
+  input: TSBuilderInput,
+  builderContext: BuilderContext
+): BuilderFile[] => {
+  const files: BuilderFile[] = [];
+
+  if (
+    input.options?.useContractsHooks?.enabled &&
+    Object.keys(builderContext.providers)?.length
+  ) {
+    files.push(
+      write(input.outPath, "contractContextBase.ts", contractContextBase)
+    );
+    files.push(
+      write(input.outPath, "contracts-context.tsx", contractsContextTSX, "contractsContext")
+    );
   }
+
+  return files;
 };
diff --git a/packages/ts-codegen/src/helpers/contractContextBase.ts b/packages/ts-codegen/src/helpers/contractContextBase.ts
index 0a9d38ff..8a575845 100644
--- a/packages/ts-codegen/src/helpers/contractContextBase.ts
+++ b/packages/ts-codegen/src/helpers/contractContextBase.ts
@@ -47,24 +47,49 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
+
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  TSign?: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => TSign;
+  TQuery?: new (
+    client: CosmWasmClient,
+    contractAddress: string
+  ) => TQuery;
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
   constructor(
-    protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    private TSign?: new (
+    address: string | undefined,
+    cosmWasmClient: CosmWasmClient | undefined,
+    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    private TQuery?: new (
+    TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    private TMsgComposer?: new (
+    TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {}
+  ) {
+    this.address = address;
+    this.cosmWasmClient = cosmWasmClient;
+    this.signingCosmWasmClient = signingCosmWasmClient;
+    this.TSign = TSign;
+    this.TQuery = TQuery;
+    this.TMsgComposer = TMsgComposer;
+  }
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
diff --git a/packages/ts-codegen/src/helpers/contractsContextTSX.ts b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
index 7fb4182d..03a439b6 100644
--- a/packages/ts-codegen/src/helpers/contractsContextTSX.ts
+++ b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
@@ -64,7 +64,7 @@ export const ContractsProvider = ({
 };
 
 export const useContracts = () => {
-  const contracts = useContext(ContractsContext);
+  const contracts: IContractsContext = useContext(ContractsContext);
   if (contracts === null) {
     throw new Error('useContracts must be used within a ContractsProvider');
   }
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index a986650d..7be51f1f 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -89,6 +89,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
     return [
       {
         type: "plugin",
+        pluginType: "contractContextProviders",
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index b6e053d8..e7bacaf7 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -106,6 +106,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     return [
       {
         type: "plugin",
+        pluginType: "provider",
         localname,
         body,
       },
diff --git a/packages/ts-codegen/types/src/generators/create-helpers.d.ts b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
index 8ce9a180..9246c147 100644
--- a/packages/ts-codegen/types/src/generators/create-helpers.d.ts
+++ b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
@@ -1,3 +1,3 @@
-import { TSBuilderInput } from "../builder";
+import { BuilderFile, TSBuilderInput } from "../builder";
 import { BuilderContext } from "wasm-ast-types";
-export declare const createHelpers: (input: TSBuilderInput, builderContext: BuilderContext) => void;
+export declare const createHelpers: (input: TSBuilderInput, builderContext: BuilderContext) => BuilderFile[];
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
index a21bffcf..cd8c6596 100644
--- a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
+++ b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
@@ -1 +1 @@
-export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n  TSign?: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => TSign;\n  TQuery?: new (\n    client: CosmWasmClient,\n    contractAddress: string\n  ) => TQuery;\n  TMsgComposer?: new (\n    sender: string,\n    contractAddress: string\n  ) => TMsgComposer;\n\n  constructor(\n    address: string | undefined,\n    cosmWasmClient: CosmWasmClient | undefined,\n    signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {\n    this.address = address;\n    this.cosmWasmClient = cosmWasmClient;\n    this.signingCosmWasmClient = signingCosmWasmClient;\n    this.TSign = TSign;\n    this.TQuery = TQuery;\n    this.TMsgComposer = TMsgComposer;\n  }\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
diff --git a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
index 38db3def..43829a27 100644
--- a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
+++ b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
@@ -1 +1 @@
-export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";

From b83eb57ce1d4d462670427155daaee8fffaec6af Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 26 Jul 2023 10:18:12 +0800
Subject: [PATCH 147/287] add an option of use shorthand ctor

---
 README.md                                     | 77 +++++++++++++---
 .../builder/default/contractContextBase.ts    | 39 ++------
 packages/ts-codegen/__tests__/builder.test.ts |  1 +
 packages/ts-codegen/src/builder/builder.ts    |  6 +-
 .../src/generators/create-helpers.ts          | 29 +++++-
 .../contractContextBaseShortHandCtor.ts       | 92 +++++++++++++++++++
 packages/ts-codegen/src/helpers/index.ts      |  1 +
 .../ts-codegen/types/src/builder/builder.d.ts |  9 +-
 .../contractContextBaseShortHandCtor.d.ts     |  1 +
 .../ts-codegen/types/src/helpers/index.d.ts   |  1 +
 .../wasm-ast-types/types/context/imports.d.ts |  4 +-
 11 files changed, 206 insertions(+), 54 deletions(-)
 create mode 100644 packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts
 create mode 100644 packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts

diff --git a/README.md b/README.md
index 34874f69..3d2c03a5 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Exporting Schemas](#exporting-schemas)
 - [Developing](#developing)
 - [Related](#related)
-## Quickstart 
+## Quickstart
 
 Clone your project and `cd` into your contracts folder
 
@@ -133,7 +133,7 @@ codegen({
   console.log('✨ all done!');
 });
 ```
-#### Types 
+#### Types
 
 Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
 
@@ -149,7 +149,7 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 ### Client
 
-The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations. 
+The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
 
 [see example output code](https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817)
 
@@ -189,7 +189,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
-#### React Query via CLI 
+#### React Query via CLI
 
 Here is an example without optional client, using v3 for `react-query`, without mutations:
 
@@ -231,7 +231,7 @@ cosmwasm-ts-codegen generate \
     --plugin recoil \
     --schema ./schema \
     --out ./ts \
-    --name MyContractName 
+    --name MyContractName
 ```
 
 #### Recoil Options
@@ -253,7 +253,7 @@ cosmwasm-ts-codegen generate \
     --plugin message-composer \
     --schema ./schema \
     --out ./ts \
-    --name MyContractName 
+    --name MyContractName
 ```
 #### Message Composer Options
 
@@ -274,7 +274,7 @@ cosmwasm-ts-codegen generate \
     --plugin msg-builder \
     --schema ./schema \
     --out ./ts \
-    --name MyContractName 
+    --name MyContractName
 ```
 #### Message Builder Options
 
@@ -296,8 +296,8 @@ import { useChain } from '@cosmos-kit/react';
 import { ContractsProvider } from '../path/to/codegen/contracts-context';
 
 export default function YourComponent() {
-  
-  const { 
+
+  const {
     address,
     getCosmWasmClient,
     getSigningCosmWasmClient
@@ -357,11 +357,64 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 | `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
 | `bundle.bundleFile`   | name of the bundle file                                                          |
 
+#### Coding Style
+
+| option                | description                                                                      |
+| --------------------- | -------------------------------------------------------------------------------- |
+| `useShorthandCtor`      |  Enable using shorthand constructor. Default: false |
+
+Using shorthand constructor(Might not be transpiled correctly with babel):
+
+```ts
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+```
+
+Without using shorthand constructor:
+
+```ts
+  address: string | undefined;
+  ...
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
+  constructor(
+    address: string | undefined,
+    ...
+    TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {
+    this.address = address;
+    ...
+    this.TMsgComposer = TMsgComposer;
+  }
+```
+
 ### CLI Usage and Examples
 
 #### Interactive prompt
 
-The CLI is interactive, and if you don't specify an option, it will interactively prompt you. 
+The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
 
 ```sh
 cosmwasm-ts-codegen generate
@@ -444,7 +497,7 @@ cosmwasm-ts-codegen generate \
 for lower-level access, you can import the various plugins directly:
 
 ```ts
-import { 
+import {
   generateTypes,
   generateClient,
   generateReactQuery,
@@ -541,7 +594,7 @@ export_schema_with_title(
 ### Initial setup
 
 ```
-yarn 
+yarn
 yarn bootstrap
 ```
 
diff --git a/__output__/builder/default/contractContextBase.ts b/__output__/builder/default/contractContextBase.ts
index a2f5e7af..45b6b20a 100644
--- a/__output__/builder/default/contractContextBase.ts
+++ b/__output__/builder/default/contractContextBase.ts
@@ -53,49 +53,24 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
-
-  address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
-  TSign?: new (
-    client: SigningCosmWasmClient,
-    sender: string,
-    contractAddress: string
-  ) => TSign;
-  TQuery?: new (
-    client: CosmWasmClient,
-    contractAddress: string
-  ) => TQuery;
-  TMsgComposer?: new (
-    sender: string,
-    contractAddress: string
-  ) => TMsgComposer;
-
   constructor(
-    address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    TSign?: new (
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    TQuery?: new (
+    private TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    TMsgComposer?: new (
+    private TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {
-    this.address = address;
-    this.cosmWasmClient = cosmWasmClient;
-    this.signingCosmWasmClient = signingCosmWasmClient;
-    this.TSign = TSign;
-    this.TQuery = TQuery;
-    this.TMsgComposer = TMsgComposer;
-  }
+  ) {}
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index db79d700..e50af978 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -94,6 +94,7 @@ it('builder default', async () => {
                 bundleFile: 'index.ts',
                 scope: 'smart.contracts'
             },
+            useShorthandCtor: true,
             types: {
                 enabled: true
             },
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 08df59ad..a9af35b5 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -49,11 +49,15 @@ export interface BundleOptions {
 
 export interface UseContractsOptions {
     enabled?: boolean;
-    filename?: string;
 };
 
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
+    /**
+     * Enable using shorthand constructor.
+     * Default: false
+     */
+    useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
 
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index 13d1a4ab..e0209926 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -3,7 +3,11 @@ import { sync as mkdirp } from "mkdirp";
 import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
 import { BuilderFile, TSBuilderInput } from "../builder";
-import { contractContextBase, contractsContextTSX } from "../helpers";
+import {
+  contractContextBase,
+  contractContextBaseShortHandCtor,
+  contractsContextTSX,
+} from "../helpers";
 import { BuilderContext } from "wasm-ast-types";
 
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
@@ -14,7 +18,12 @@ const header = `/**
 */
 \n`;
 
-const write = (outPath: string, file: string, content: string, varname?: string): BuilderFile => {
+const write = (
+  outPath: string,
+  file: string,
+  content: string,
+  varname?: string
+): BuilderFile => {
   const outFile = join(outPath, file);
   mkdirp(dirname(outFile));
   writeContentToFile(outPath, header + content, outFile);
@@ -38,11 +47,23 @@ export const createHelpers = (
     input.options?.useContractsHooks?.enabled &&
     Object.keys(builderContext.providers)?.length
   ) {
+    const useShorthandCtor = input.options?.useShorthandCtor;
     files.push(
-      write(input.outPath, "contractContextBase.ts", contractContextBase)
+      write(
+        input.outPath,
+        "contractContextBase.ts",
+        useShorthandCtor
+          ? contractContextBaseShortHandCtor
+          : contractContextBase
+      )
     );
     files.push(
-      write(input.outPath, "contracts-context.tsx", contractsContextTSX, "contractsContext")
+      write(
+        input.outPath,
+        "contracts-context.tsx",
+        contractsContextTSX,
+        "contractsContext"
+      )
     );
   }
 
diff --git a/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts b/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts
new file mode 100644
index 00000000..844aeadc
--- /dev/null
+++ b/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts
@@ -0,0 +1,92 @@
+export const contractContextBaseShortHandCtor = `
+import {
+  CosmWasmClient,
+  SigningCosmWasmClient,
+} from '@cosmjs/cosmwasm-stargate';
+
+export interface IContractConstructor {
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+}
+
+export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
+
+export const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';
+
+export const NO_ADDRESS_ERROR_MESSAGE = "address doesn't exist";
+
+export const NO_SIGNING_CLIENT_ERROR_MESSAGE =
+  'Signing client is not generated. Please check ts-codegen config';
+
+export const NO_QUERY_CLIENT_ERROR_MESSAGE =
+  'Query client is not generated. Please check ts-codegen config';
+
+export const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =
+  'Message composer client is not generated. Please check ts-codegen config';
+
+/**
+ * a placeholder for non-generated classes
+ */
+export interface IEmptyClient {}
+
+export interface ISigningClientProvider<T> {
+  getSigningClient(contractAddr: string): T;
+}
+
+export interface IQueryClientProvider<T> {
+  getQueryClient(contractAddr: string): T;
+}
+
+export interface IMessageComposerProvider<T> {
+  getMessageComposer(contractAddr: string): T;
+}
+
+export class ContractBase<
+  TSign = IEmptyClient,
+  TQuery = IEmptyClient,
+  TMsgComposer = IEmptyClient
+> {
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+
+  public getSigningClient(contractAddr: string): TSign {
+    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);
+    return new this.TSign(
+      this.signingCosmWasmClient,
+      this.address,
+      contractAddr
+    );
+  }
+
+  public getQueryClient(contractAddr: string): TQuery {
+    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);
+    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);
+    return new this.TQuery(this.cosmWasmClient, contractAddr);
+  }
+
+  public getMessageComposer(contractAddr: string): TMsgComposer {
+    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);
+    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);
+    return new this.TMsgComposer(this.address, contractAddr);
+  }
+}
+`;
diff --git a/packages/ts-codegen/src/helpers/index.ts b/packages/ts-codegen/src/helpers/index.ts
index 0132275b..ab8e74c9 100644
--- a/packages/ts-codegen/src/helpers/index.ts
+++ b/packages/ts-codegen/src/helpers/index.ts
@@ -1,2 +1,3 @@
 export * from './contractContextBase';
+export * from './contractContextBaseShortHandCtor';
 export * from './contractsContextTSX';
\ No newline at end of file
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 0eca5b63..73637368 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -14,13 +14,16 @@ export interface BundleOptions {
 }
 export interface UseContractsOptions {
     enabled?: boolean;
-    filename?: string;
 }
-export type TSBuilderOptions = {
+export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
+    /**
+     * Enable using shorthand constructor.
+     */
+    useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
+export declare type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
 export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts
new file mode 100644
index 00000000..d582a1e9
--- /dev/null
+++ b/packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts
@@ -0,0 +1 @@
+export declare const contractContextBaseShortHandCtor = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
diff --git a/packages/ts-codegen/types/src/helpers/index.d.ts b/packages/ts-codegen/types/src/helpers/index.d.ts
index d9837fc8..de7142d8 100644
--- a/packages/ts-codegen/types/src/helpers/index.d.ts
+++ b/packages/ts-codegen/types/src/helpers/index.d.ts
@@ -1,2 +1,3 @@
 export * from './contractContextBase';
+export * from './contractContextBaseShortHandCtor';
 export * from './contractsContextTSX';
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
index 21361af1..55ca6708 100644
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ b/packages/wasm-ast-types/types/context/imports.d.ts
@@ -5,8 +5,8 @@ export interface ImportObj {
     path: string;
     importAs?: string;
 }
-export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
-export type UtilMapping = {
+export declare type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export declare type UtilMapping = {
     [key: string]: ImportObj | string | GetUtilFn;
 };
 export declare const UTILS: {

From 676f2d7bf1f7317e75660f8c19a71619064857d2 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 28 Jul 2023 20:01:37 +0200
Subject: [PATCH 148/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.34.0
 - wasm-ast-types@0.25.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 3f4be7d2..aed1636a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.34.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.33.0...@cosmwasm/ts-codegen@0.34.0) (2023-07-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.33.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.32.0...@cosmwasm/ts-codegen@0.33.0) (2023-07-16)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 0ff3f217..32b3a1a9 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.24.0"
+    "wasm-ast-types": "^0.25.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index daafd629..ef1b272a 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.25.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.24.0...wasm-ast-types@0.25.0) (2023-07-28)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.24.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.23.1...wasm-ast-types@0.24.0) (2023-07-14)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index a4d4ce0d..d6c024ae 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.24.0",
+  "version": "0.25.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",

From 8baf63fa304dc622095d35cde8de44159b0f9091 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 30 Jul 2023 14:37:53 +0200
Subject: [PATCH 149/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3d2c03a5..47a7df84 100644
--- a/README.md
+++ b/README.md
@@ -621,7 +621,7 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 
 Checkout these related projects:
 
-* [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
+* [@cosmology/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
 * [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
 * [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
 * [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 34874f69..f66fecb6 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -568,7 +568,7 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 
 Checkout these related projects:
 
-* [@osmonauts/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
+* [@cosmology/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
 * [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
 * [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
 * [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.

From b9f3488ecc9beec73a6d39b7fb18e8fe980ba725 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 30 Jul 2023 14:38:01 +0200
Subject: [PATCH 150/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.34.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index aed1636a..2147bca8 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.34.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.34.0...@cosmwasm/ts-codegen@0.34.1) (2023-07-30)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.34.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.33.0...@cosmwasm/ts-codegen@0.34.0) (2023-07-28)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 32b3a1a9..e22d4af7 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 685e8399461448d282688cdd6f2f16506cbbff3d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 30 Jul 2023 14:41:20 +0200
Subject: [PATCH 151/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 47a7df84..89aa3f96 100644
--- a/README.md
+++ b/README.md
@@ -621,7 +621,7 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 
 Checkout these related projects:
 
-* [@cosmology/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
 * [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
 * [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
 * [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index f66fecb6..bd95d4ef 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -568,7 +568,7 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 
 Checkout these related projects:
 
-* [@cosmology/telescope](https://github.com/osmosis-labs/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
 * [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
 * [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
 * [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.

From 0c404a0d94627610256c63f79dc2ffc3b741a845 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sun, 30 Jul 2023 14:41:25 +0200
Subject: [PATCH 152/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.34.2
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 2147bca8..fb82be09 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.34.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.34.1...@cosmwasm/ts-codegen@0.34.2) (2023-07-30)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.34.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.34.0...@cosmwasm/ts-codegen@0.34.1) (2023-07-30)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e22d4af7..ce28a9a7 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.34.1",
+  "version": "0.34.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 058c8854efaa0aa6486ca6b46c36a77862666314 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Mon, 31 Jul 2023 12:45:07 +0800
Subject: [PATCH 153/287] change default useShorthandCtor to true

---
 .../contracts/contractContextBase.ts          | 39 ++++---------------
 .../builder/default/contractContextBase.ts    | 39 +++++++++++++++----
 .../__snapshots__/builder.test.ts.snap        | 16 ++++++++
 packages/ts-codegen/__tests__/builder.test.ts |  2 +-
 packages/ts-codegen/src/builder/builder.ts    |  3 +-
 .../ts-codegen/types/src/builder/builder.d.ts |  1 +
 6 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
index a2f5e7af..45b6b20a 100644
--- a/__output__/builder/bundler_test/contracts/contractContextBase.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -53,49 +53,24 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
-
-  address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
-  TSign?: new (
-    client: SigningCosmWasmClient,
-    sender: string,
-    contractAddress: string
-  ) => TSign;
-  TQuery?: new (
-    client: CosmWasmClient,
-    contractAddress: string
-  ) => TQuery;
-  TMsgComposer?: new (
-    sender: string,
-    contractAddress: string
-  ) => TMsgComposer;
-
   constructor(
-    address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    TSign?: new (
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    TQuery?: new (
+    private TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    TMsgComposer?: new (
+    private TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {
-    this.address = address;
-    this.cosmWasmClient = cosmWasmClient;
-    this.signingCosmWasmClient = signingCosmWasmClient;
-    this.TSign = TSign;
-    this.TQuery = TQuery;
-    this.TMsgComposer = TMsgComposer;
-  }
+  ) {}
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
diff --git a/__output__/builder/default/contractContextBase.ts b/__output__/builder/default/contractContextBase.ts
index 45b6b20a..a2f5e7af 100644
--- a/__output__/builder/default/contractContextBase.ts
+++ b/__output__/builder/default/contractContextBase.ts
@@ -53,24 +53,49 @@ export class ContractBase<
   TQuery = IEmptyClient,
   TMsgComposer = IEmptyClient
 > {
+
+  address: string | undefined;
+  cosmWasmClient: CosmWasmClient | undefined;
+  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  TSign?: new (
+    client: SigningCosmWasmClient,
+    sender: string,
+    contractAddress: string
+  ) => TSign;
+  TQuery?: new (
+    client: CosmWasmClient,
+    contractAddress: string
+  ) => TQuery;
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
   constructor(
-    protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    private TSign?: new (
+    address: string | undefined,
+    cosmWasmClient: CosmWasmClient | undefined,
+    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    TSign?: new (
       client: SigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
-    private TQuery?: new (
+    TQuery?: new (
       client: CosmWasmClient,
       contractAddress: string
     ) => TQuery,
-    private TMsgComposer?: new (
+    TMsgComposer?: new (
       sender: string,
       contractAddress: string
     ) => TMsgComposer
-  ) {}
+  ) {
+    this.address = address;
+    this.cosmWasmClient = cosmWasmClient;
+    this.signingCosmWasmClient = signingCosmWasmClient;
+    this.TSign = TSign;
+    this.TQuery = TQuery;
+    this.TMsgComposer = TMsgComposer;
+  }
 
   public getSigningClient(contractAddr: string): TSign {
     if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 21fc022a..4c71d5fe 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -39,6 +39,7 @@ TSBuilder {
       "aliasExecuteMsg": false,
       "enabled": true,
     },
+    "useShorthandCtor": true,
   },
   "plugins": Array [
     TypesPlugin {
@@ -76,6 +77,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -114,6 +116,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -152,6 +155,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -190,6 +194,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -228,6 +233,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": Object {
         "selectorFamily": "recoil",
@@ -268,6 +274,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -306,6 +313,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
@@ -356,6 +364,7 @@ TSBuilder {
       "aliasExecuteMsg": false,
       "enabled": true,
     },
+    "useShorthandCtor": true,
   },
   "plugins": Array [
     TypesPlugin {
@@ -393,6 +402,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -431,6 +441,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -469,6 +480,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -507,6 +519,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -545,6 +558,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": Object {
         "selectorFamily": "recoil",
@@ -585,6 +599,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": undefined,
     },
@@ -623,6 +638,7 @@ TSBuilder {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
+        "useShorthandCtor": true,
       },
       "utils": Object {
         "ContractBase": "__contractContextBase__",
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index e50af978..e6ed64d9 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -94,7 +94,7 @@ it('builder default', async () => {
                 bundleFile: 'index.ts',
                 scope: 'smart.contracts'
             },
-            useShorthandCtor: true,
+            useShorthandCtor: false,
             types: {
                 enabled: true
             },
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index a9af35b5..7f335472 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -30,7 +30,8 @@ const defaultOpts: TSBuilderOptions = {
         enabled: true,
         scope: 'contracts',
         bundleFile: 'bundle.ts'
-    }
+    },
+    useShorthandCtor: true
 }
 
 export interface TSBuilderInput {
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 73637368..b7b51fa7 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -19,6 +19,7 @@ export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
+     * Default: false
      */
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;

From 7089f56092de6f85df5984314c56f2255d858faf Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Mon, 31 Jul 2023 13:02:02 +0800
Subject: [PATCH 154/287] Change readme for react query in .babelrc.js

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 89aa3f96..0ebb0d43 100644
--- a/README.md
+++ b/README.md
@@ -317,6 +317,16 @@ export default function YourComponent() {
 };
 ```
 
+If you're using Babel, please make sure include '@babel/preset-react' in devDeps and presets in .babelrc.js:
+
+```js
+ presets: [
+      '@babel/typescript',
+      '@babel/env',
+      '@babel/preset-react',
+     ]
+```
+
 #### Use Contracts Hooks Usage
 
 Once enabled, you can get contracts very simply:

From 04afcb8c57e5c4e60f5003941cf0aa3244894f50 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Mon, 31 Jul 2023 13:04:26 +0800
Subject: [PATCH 155/287] Change default of short hand ctor in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0ebb0d43..e675d91b 100644
--- a/README.md
+++ b/README.md
@@ -371,7 +371,7 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 
 | option                | description                                                                      |
 | --------------------- | -------------------------------------------------------------------------------- |
-| `useShorthandCtor`      |  Enable using shorthand constructor. Default: false |
+| `useShorthandCtor`      |  Enable using shorthand constructor. Default: true |
 
 Using shorthand constructor(Might not be transpiled correctly with babel):
 

From 96c6e017dc5f65f7a484022b6b4543b7494b99d8 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Sat, 5 Aug 2023 19:15:05 +0800
Subject: [PATCH 156/287] fix comment of useShortHandCtor

---
 packages/ts-codegen/src/builder/builder.ts         | 2 +-
 packages/ts-codegen/types/src/builder/builder.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 7f335472..440c0888 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -56,7 +56,7 @@ export type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
-     * Default: false
+     * Default: true
      */
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index b7b51fa7..20e1722c 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -19,7 +19,7 @@ export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
-     * Default: false
+     * Default: true
      */
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;

From 5d2a54ef9b1e5c7430662fa35e161008a08f5f9a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:12:01 -0700
Subject: [PATCH 157/287] naming cleanup

---
 README.md                                     |    8 +-
 .../contracts/CwAdminFactory.msg-builder.ts   |    2 +-
 .../contracts/CwCodeIdRegistry.msg-builder.ts |    4 +-
 .../contracts/CwSingle.msg-builder.ts         |    4 +-
 .../contracts/Factory.msg-builder.ts          |    4 +-
 .../contracts/Minter.msg-builder.ts           |    4 +-
 .../default/CwAdminFactory.msg-builder.ts     |    2 +-
 .../default/CwCodeIdRegistry.msg-builder.ts   |    4 +-
 .../builder/default/CwSingle.msg-builder.ts   |    4 +-
 .../builder/default/Factory.msg-builder.ts    |    4 +-
 .../builder/default/Minter.msg-builder.ts     |    4 +-
 .../no-extends/CwAdminFactory.msg-builder.ts  |    2 +-
 .../CwCodeIdRegistry.msg-builder.ts           |    4 +-
 .../no-extends/CwSingle.msg-builder.ts        |    4 +-
 .../builder/no-extends/Factory.msg-builder.ts |    4 +-
 .../builder/no-extends/Minter.msg-builder.ts  |    4 +-
 packages/ts-codegen/README.md                 |    8 +-
 .../__snapshots__/builder.test.ts.snap        |   68 +-
 packages/ts-codegen/__tests__/builder.test.ts |    6 +-
 packages/ts-codegen/src/builder/builder.ts    |    6 +-
 packages/ts-codegen/src/commands/generate.ts  |   24 +-
 .../ts-codegen/src/generators/msg-builder.ts  |   14 +-
 .../{msg-builder.ts => message-builder.ts}    |   12 +-
 .../types/src/generators/msg-builder.d.ts     |    4 +-
 .../types/src/generators/msg-builder.ts       |    4 +-
 .../types/src/plugins/msg-builder.d.ts        |    2 +-
 .../wasm-ast-types/src/context/context.ts     |  316 +-
 .../__snapshots__/msg-builder.spec.ts.snap    |    4 +-
 .../src/msg-builder/msg-builder.spec.ts       |   10 +-
 .../src/msg-builder/msg-builder.ts            |    8 +-
 .../src/react-query/react-query.spec.ts       |    2 +-
 .../wasm-ast-types/types/context/context.d.ts |    6 +-
 .../types/msg-builder/msg-builder.d.ts        |    2 +-
 yarn.lock                                     | 4106 ++++++++---------
 34 files changed, 2135 insertions(+), 2529 deletions(-)
 rename packages/ts-codegen/src/plugins/{msg-builder.ts => message-builder.ts} (80%)

diff --git a/README.md b/README.md
index 89aa3f96..417ed7c9 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ codegen({
     messageComposer: {
       enabled: false
     },
-    msgBuilder: {
+    messageBuilder: {
       enabled: false
     },
     useContractsHooks: {
@@ -278,9 +278,9 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Builder Options
 
-| option               | description                    |
-|--------------------- | ------------------------------ |
-| `msgBuilder.enabled` | enable the msgBuilder plugin   |
+| option                   | description                    |
+|------------------------- | ------------------------------ |
+| `messageBuilder.enabled` | enable the messageBuilder plugin   |
 
 
 ### Use Contracts Hooks
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts
index 1e03ab7b..2a04624c 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMsgBuilder {
+export abstract class CwAdminFactoryExecuteMessageBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts
index 3e15defb..5727cd91 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMsgBuilder {
+export abstract class CwCodeIdRegistryExecuteMessageBuilder {
   static receive = ({
     amount,
     msg,
@@ -83,7 +83,7 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     };
   };
 }
-export abstract class CwCodeIdRegistryQueryMsgBuilder {
+export abstract class CwCodeIdRegistryQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts b/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts
index 1859f108..bdc753da 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMsgBuilder {
+export abstract class CwSingleExecuteMessageBuilder {
   static propose = ({
     description,
     msgs,
@@ -125,7 +125,7 @@ export abstract class CwSingleExecuteMsgBuilder {
     };
   };
 }
-export abstract class CwSingleQueryMsgBuilder {
+export abstract class CwSingleQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts b/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts
index 0c662c0a..2bbace3f 100644
--- a/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMsgBuilder {
+export abstract class FactoryExecuteMessageBuilder {
   static createWallet = ({
     createWalletMsg
   }: CamelCasedProperties<Extract<ExecuteMsg, {
@@ -91,7 +91,7 @@ export abstract class FactoryExecuteMsgBuilder {
     };
   };
 }
-export abstract class FactoryQueryMsgBuilder {
+export abstract class FactoryQueryMessageBuilder {
   static wallets = ({
     limit,
     startAfter
diff --git a/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts b/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts
index 897f3fa8..e139b2ad 100644
--- a/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMsgBuilder {
+export abstract class MinterExecuteMessageBuilder {
   static mint = (): ExecuteMsg => {
     return {
       mint: ({} as const)
@@ -69,7 +69,7 @@ export abstract class MinterExecuteMsgBuilder {
     };
   };
 }
-export abstract class MinterQueryMsgBuilder {
+export abstract class MinterQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/default/CwAdminFactory.msg-builder.ts b/__output__/builder/default/CwAdminFactory.msg-builder.ts
index 1e03ab7b..2a04624c 100644
--- a/__output__/builder/default/CwAdminFactory.msg-builder.ts
+++ b/__output__/builder/default/CwAdminFactory.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMsgBuilder {
+export abstract class CwAdminFactoryExecuteMessageBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
index 3e15defb..5727cd91 100644
--- a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMsgBuilder {
+export abstract class CwCodeIdRegistryExecuteMessageBuilder {
   static receive = ({
     amount,
     msg,
@@ -83,7 +83,7 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     };
   };
 }
-export abstract class CwCodeIdRegistryQueryMsgBuilder {
+export abstract class CwCodeIdRegistryQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/default/CwSingle.msg-builder.ts b/__output__/builder/default/CwSingle.msg-builder.ts
index 1859f108..bdc753da 100644
--- a/__output__/builder/default/CwSingle.msg-builder.ts
+++ b/__output__/builder/default/CwSingle.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMsgBuilder {
+export abstract class CwSingleExecuteMessageBuilder {
   static propose = ({
     description,
     msgs,
@@ -125,7 +125,7 @@ export abstract class CwSingleExecuteMsgBuilder {
     };
   };
 }
-export abstract class CwSingleQueryMsgBuilder {
+export abstract class CwSingleQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/default/Factory.msg-builder.ts b/__output__/builder/default/Factory.msg-builder.ts
index 0c662c0a..2bbace3f 100644
--- a/__output__/builder/default/Factory.msg-builder.ts
+++ b/__output__/builder/default/Factory.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMsgBuilder {
+export abstract class FactoryExecuteMessageBuilder {
   static createWallet = ({
     createWalletMsg
   }: CamelCasedProperties<Extract<ExecuteMsg, {
@@ -91,7 +91,7 @@ export abstract class FactoryExecuteMsgBuilder {
     };
   };
 }
-export abstract class FactoryQueryMsgBuilder {
+export abstract class FactoryQueryMessageBuilder {
   static wallets = ({
     limit,
     startAfter
diff --git a/__output__/builder/default/Minter.msg-builder.ts b/__output__/builder/default/Minter.msg-builder.ts
index 897f3fa8..e139b2ad 100644
--- a/__output__/builder/default/Minter.msg-builder.ts
+++ b/__output__/builder/default/Minter.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMsgBuilder {
+export abstract class MinterExecuteMessageBuilder {
   static mint = (): ExecuteMsg => {
     return {
       mint: ({} as const)
@@ -69,7 +69,7 @@ export abstract class MinterExecuteMsgBuilder {
     };
   };
 }
-export abstract class MinterQueryMsgBuilder {
+export abstract class MinterQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
index 1e03ab7b..2a04624c 100644
--- a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMsgBuilder {
+export abstract class CwAdminFactoryExecuteMessageBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
index 3e15defb..5727cd91 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMsgBuilder {
+export abstract class CwCodeIdRegistryExecuteMessageBuilder {
   static receive = ({
     amount,
     msg,
@@ -83,7 +83,7 @@ export abstract class CwCodeIdRegistryExecuteMsgBuilder {
     };
   };
 }
-export abstract class CwCodeIdRegistryQueryMsgBuilder {
+export abstract class CwCodeIdRegistryQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/no-extends/CwSingle.msg-builder.ts b/__output__/builder/no-extends/CwSingle.msg-builder.ts
index 1859f108..bdc753da 100644
--- a/__output__/builder/no-extends/CwSingle.msg-builder.ts
+++ b/__output__/builder/no-extends/CwSingle.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMsgBuilder {
+export abstract class CwSingleExecuteMessageBuilder {
   static propose = ({
     description,
     msgs,
@@ -125,7 +125,7 @@ export abstract class CwSingleExecuteMsgBuilder {
     };
   };
 }
-export abstract class CwSingleQueryMsgBuilder {
+export abstract class CwSingleQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/no-extends/Factory.msg-builder.ts b/__output__/builder/no-extends/Factory.msg-builder.ts
index 0c662c0a..2bbace3f 100644
--- a/__output__/builder/no-extends/Factory.msg-builder.ts
+++ b/__output__/builder/no-extends/Factory.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMsgBuilder {
+export abstract class FactoryExecuteMessageBuilder {
   static createWallet = ({
     createWalletMsg
   }: CamelCasedProperties<Extract<ExecuteMsg, {
@@ -91,7 +91,7 @@ export abstract class FactoryExecuteMsgBuilder {
     };
   };
 }
-export abstract class FactoryQueryMsgBuilder {
+export abstract class FactoryQueryMessageBuilder {
   static wallets = ({
     limit,
     startAfter
diff --git a/__output__/builder/no-extends/Minter.msg-builder.ts b/__output__/builder/no-extends/Minter.msg-builder.ts
index 897f3fa8..e139b2ad 100644
--- a/__output__/builder/no-extends/Minter.msg-builder.ts
+++ b/__output__/builder/no-extends/Minter.msg-builder.ts
@@ -6,7 +6,7 @@
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMsgBuilder {
+export abstract class MinterExecuteMessageBuilder {
   static mint = (): ExecuteMsg => {
     return {
       mint: ({} as const)
@@ -69,7 +69,7 @@ export abstract class MinterExecuteMsgBuilder {
     };
   };
 }
-export abstract class MinterQueryMsgBuilder {
+export abstract class MinterQueryMessageBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index bd95d4ef..4c47430e 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -122,7 +122,7 @@ codegen({
     messageComposer: {
       enabled: false
     },
-    msgBuilder: {
+    messageBuilder: {
       enabled: false
     },
     useContractsHooks: {
@@ -278,9 +278,9 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Builder Options
 
-| option               | description                    |
-|--------------------- | ------------------------------ |
-| `msgBuilder.enabled` | enable the msgBuilder plugin   |
+| option                   | description                    |
+|------------------------- | ------------------------------ |
+| `messageBuilder.enabled` | enable the messageBuilder plugin   |
 
 
 ### Use Contracts Hooks
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 21fc022a..a5407e9e 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -18,10 +18,10 @@ TSBuilder {
       "noImplicitOverride": false,
     },
     "enabled": true,
-    "messageComposer": Object {
+    "messageBuilder": Object {
       "enabled": false,
     },
-    "msgBuilder": Object {
+    "messageComposer": Object {
       "enabled": false,
     },
     "reactQuery": Object {
@@ -55,10 +55,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -93,10 +93,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -131,10 +131,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -169,10 +169,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -207,10 +207,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -233,7 +233,7 @@ TSBuilder {
         "selectorFamily": "recoil",
       },
     },
-    MsgBuilderPlugin {
+    MessageBuilderPlugin {
       "builder": [Circular],
       "option": Object {
         "bundle": Object {
@@ -247,10 +247,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -285,10 +285,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -335,10 +335,10 @@ TSBuilder {
       "noImplicitOverride": false,
     },
     "enabled": true,
-    "messageComposer": Object {
+    "messageBuilder": Object {
       "enabled": false,
     },
-    "msgBuilder": Object {
+    "messageComposer": Object {
       "enabled": false,
     },
     "reactQuery": Object {
@@ -372,10 +372,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -410,10 +410,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -448,10 +448,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -486,10 +486,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -524,10 +524,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -550,7 +550,7 @@ TSBuilder {
         "selectorFamily": "recoil",
       },
     },
-    MsgBuilderPlugin {
+    MessageBuilderPlugin {
       "builder": [Circular],
       "option": Object {
         "bundle": Object {
@@ -564,10 +564,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
@@ -602,10 +602,10 @@ TSBuilder {
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageComposer": Object {
+        "messageBuilder": Object {
           "enabled": false,
         },
-        "msgBuilder": Object {
+        "messageComposer": Object {
           "enabled": false,
         },
         "reactQuery": Object {
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index e50af978..7f9cd973 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -111,11 +111,11 @@ it('builder default', async () => {
             messageComposer: {
                 enabled: true
             },
-            msgBuilder: {
+            messageBuilder: {
                 enabled: true
             },
             useContractsHooks: {
-              enabled: true,
+                enabled: true,
             }
         }
     });
@@ -157,7 +157,7 @@ it('builder no extends', async () => {
             messageComposer: {
                 enabled: true
             },
-            msgBuilder: {
+            messageBuilder: {
                 enabled: true
             }
         }
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index a9af35b5..691ca6ff 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -17,7 +17,7 @@ import generate from '@babel/generator';
 import * as t from '@babel/types';
 import { ReactQueryPlugin } from "../plugins/react-query";
 import { RecoilPlugin } from "../plugins/recoil";
-import { MsgBuilderPlugin } from "../plugins/msg-builder";
+import { MessageBuilderPlugin } from "../plugins/message-builder";
 import { MessageComposerPlugin } from "../plugins/message-composer";
 import { ClientPlugin } from "../plugins/client";
 import { TypesPlugin } from "../plugins/types";
@@ -109,7 +109,7 @@ export class TSBuilder {
             new MessageComposerPlugin(this.options),
             new ReactQueryPlugin(this.options),
             new RecoilPlugin(this.options),
-            new MsgBuilderPlugin(this.options),
+            new MessageBuilderPlugin(this.options),
             new ContractsContextProviderPlugin(this.options),
         ]);
     }
@@ -189,7 +189,7 @@ export class TSBuilder {
         }, this.builderContext);
 
         if (helpers && helpers.length) {
-          [].push.apply(this.files, helpers);
+            [].push.apply(this.files, helpers);
         }
 
         if (this.options.bundle.enabled) {
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index 2adee769..b7d6c1c8 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -91,17 +91,17 @@ export default async (argv) => {
     };
     const { mutations } = await prompt(questions3, argv);
 
-    const queryFactoryQuestions  = [];
+    const queryFactoryQuestions = [];
     if (queryKeys) {
-      [].push.apply(queryFactoryQuestions, [
-        // Only can use queryFactory if queryKeys is enabled
-        {
-          type: 'confirm',
-          name: 'queryFactory',
-          message: 'queryFactory? ',
-          default: false
-        }
-      ])
+        [].push.apply(queryFactoryQuestions, [
+            // Only can use queryFactory if queryKeys is enabled
+            {
+                type: 'confirm',
+                name: 'queryFactory',
+                message: 'queryFactory? ',
+                default: false
+            }
+        ])
     };
     const { queryFactory } = await prompt(queryFactoryQuestions, argv);
     ///////// END REACT QUERY
@@ -151,8 +151,8 @@ export default async (argv) => {
         messageComposer: {
             enabled: plugin.includes('message-composer')
         },
-        msgBuilder: {
-          enabled: plugin.includes('msg-builder')
+        messageBuilder: {
+            enabled: plugin.includes('msg-builder')
         },
         bundle: {
             enabled: bundle,
diff --git a/packages/ts-codegen/src/generators/msg-builder.ts b/packages/ts-codegen/src/generators/msg-builder.ts
index 5f6643b7..195cce23 100644
--- a/packages/ts-codegen/src/generators/msg-builder.ts
+++ b/packages/ts-codegen/src/generators/msg-builder.ts
@@ -8,7 +8,7 @@ import { writeFileSync } from "fs";
 import generate from "@babel/generator";
 import { ContractInfo, getMessageProperties } from "wasm-ast-types";
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
-import { RenderContext, MsgBuilderOptions } from 'wasm-ast-types';
+import { RenderContext, MessageBuilderOptions } from 'wasm-ast-types';
 import { BuilderFile } from "../builder";
 import babelTraverse from '@babel/traverse';
 import { parse as babelParse } from '@babel/parser'
@@ -17,11 +17,11 @@ export default async (
   name: string,
   contractInfo: ContractInfo,
   outPath: string,
-  msgBuilderOptions?: MsgBuilderOptions
+  messageBuilderOptions?: MessageBuilderOptions
 ): Promise<BuilderFile[]> => {
   const { schemas } = contractInfo;
   const context = new RenderContext(contractInfo, {
-    msgBuilder: msgBuilderOptions ?? {},
+    messageBuilder: messageBuilderOptions ?? {},
   });
 
   const localname = pascal(name) + ".msg-builder.ts";
@@ -38,10 +38,10 @@ export default async (
   if (ExecuteMsg) {
     const children = getMessageProperties(ExecuteMsg);
     if (children.length > 0) {
-      const className = pascal(`${name}ExecuteMsgBuilder`);
+      const className = pascal(`${name}ExecuteMessageBuilder`);
 
       body.push(
-        w.createMsgBuilderClass(context, className, ExecuteMsg)
+        w.createMessageBuilderClass(context, className, ExecuteMsg)
       );
     }
   }
@@ -51,10 +51,10 @@ export default async (
   if (QueryMsg) {
     const children = getMessageProperties(QueryMsg);
     if (children.length > 0) {
-      const className = pascal(`${name}QueryMsgBuilder`);
+      const className = pascal(`${name}QueryMessageBuilder`);
 
       body.push(
-        w.createMsgBuilderClass(context, className, QueryMsg)
+        w.createMessageBuilderClass(context, className, QueryMsg)
       );
     }
   }
diff --git a/packages/ts-codegen/src/plugins/msg-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
similarity index 80%
rename from packages/ts-codegen/src/plugins/msg-builder.ts
rename to packages/ts-codegen/src/plugins/message-builder.ts
index 4222fe65..7e74d854 100644
--- a/packages/ts-codegen/src/plugins/msg-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -11,7 +11,7 @@ import {
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
-export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
     contract: ContractInfo,
     options?: RenderOptions
@@ -30,7 +30,7 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.msgBuilder;
+    const { enabled } = this.option.messageBuilder;
 
     if (!enabled) {
       return;
@@ -52,9 +52,9 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     if (ExecuteMsg) {
       const children = getMessageProperties(ExecuteMsg);
       if (children.length > 0) {
-        const className = pascal(`${name}ExecuteMsgBuilder`);
+        const className = pascal(`${name}ExecuteMessageBuilder`);
 
-        body.push(w.createMsgBuilderClass(context, className, ExecuteMsg));
+        body.push(w.createMessageBuilderClass(context, className, ExecuteMsg));
       }
     }
 
@@ -63,9 +63,9 @@ export class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     if (QueryMsg) {
       const children = getMessageProperties(QueryMsg);
       if (children.length > 0) {
-        const className = pascal(`${name}QueryMsgBuilder`);
+        const className = pascal(`${name}QueryMessageBuilder`);
 
-        body.push(w.createMsgBuilderClass(context, className, QueryMsg));
+        body.push(w.createMessageBuilderClass(context, className, QueryMsg));
       }
     }
 
diff --git a/packages/ts-codegen/types/src/generators/msg-builder.d.ts b/packages/ts-codegen/types/src/generators/msg-builder.d.ts
index 26b45bbe..80f07209 100644
--- a/packages/ts-codegen/types/src/generators/msg-builder.d.ts
+++ b/packages/ts-codegen/types/src/generators/msg-builder.d.ts
@@ -1,5 +1,5 @@
 import { ContractInfo } from "wasm-ast-types";
-import { MsgBuilderOptions } from 'wasm-ast-types';
+import { MessageBuilderOptions } from 'wasm-ast-types';
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, msgBuilderOptions?: MsgBuilderOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageBuilderOptions?: MessageBuilderOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/generators/msg-builder.ts b/packages/ts-codegen/types/src/generators/msg-builder.ts
index 4db98a6b..ac8b6b7b 100644
--- a/packages/ts-codegen/types/src/generators/msg-builder.ts
+++ b/packages/ts-codegen/types/src/generators/msg-builder.ts
@@ -1,5 +1,5 @@
 import { ContractInfo } from "wasm-ast-types";
-import { MsgBuilderOptions } from "wasm-ast-types";
+import { MessageBuilderOptions } from "wasm-ast-types";
 import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, msgBuilderOptions?: MsgBuilderOptions) => Promise<BuilderFile[]>;
+declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageBuilderOptions?: MessageBuilderOptions) => Promise<BuilderFile[]>;
 export default _default;
diff --git a/packages/ts-codegen/types/src/plugins/msg-builder.d.ts b/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
index bd5e0467..8c0aeb4a 100644
--- a/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
+++ b/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
@@ -1,7 +1,7 @@
 import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
-export declare class MsgBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+export declare class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
     doRender(name: string, context: RenderContext): Promise<{
         type: BuilderFileType;
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 6c907028..3db892d2 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/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 ?? {});
   }
diff --git a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
index 4f1c022e..7cd08cb3 100644
--- a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
+++ b/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-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
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
index 54dcee2d..c328646e 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
@@ -3,23 +3,23 @@ import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import ownership from '../../../../__fixtures__/basic/ownership.json';
 
 import {
-    createMsgBuilderClass,
+  createMessageBuilderClass,
 } from './msg-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))
 });
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
index df7fa8a4..5abc1acf 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
+++ b/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
@@ -7,13 +7,13 @@ import { RenderContext } from '../context';
 import { getWasmMethodArgs } from '../client/client';
 import { Expression, Identifier, PatternLike, TSAsExpression } 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(
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
index c959bd73..a390f437 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.spec.ts
+++ b/packages/wasm-ast-types/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 '../msg-builder';
 
 const execCtx = makeContext(execute_msg);
 const queryCtx = makeContext(query_msg);
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 8ab4b255..9c4c198a 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/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;
 }
@@ -121,4 +121,4 @@ export declare abstract class RenderContextBase<TOpt = RenderOptions> implements
 export declare class RenderContext extends RenderContextBase {
     mergeDefaultOpt(options: RenderOptions): RenderOptions;
 }
-export {};
+export { };
diff --git a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
index 4a3f0edb..79ac38d1 100644
--- a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
+++ b/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
@@ -1,4 +1,4 @@
 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;
+export declare const createMessageBuilderClass: (context: RenderContext, className: string, msg: ExecuteMsg | QueryMsg) => t.ExportNamedDeclaration;
diff --git a/yarn.lock b/yarn.lock
index a7fa340b..d9b1e18d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,17 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@babel/cli@7.18.10":
@@ -26,31 +31,20 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.4.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.8.3":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3"
+  integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==
   dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/code-frame@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/compat-data@^7.17.10", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+    "@babel/highlight" "^7.22.10"
+    chalk "^2.4.2"
 
-"@babel/compat-data@^7.9.6":
-  version "7.18.5"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz"
-  integrity sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.9.6":
+  version "7.22.9"
+  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@7.18.10", "@babel/core@^7.11.6", "@babel/core@^7.12.3":
+"@babel/core@7.18.10":
   version "7.18.10"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
   integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==
@@ -73,7 +67,7 @@
 
 "@babel/core@7.9.6":
   version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
   integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
@@ -93,16 +87,37 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.11.6", "@babel/core@^7.12.3":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz#aad442c7bcd1582252cb4576747ace35bc122f35"
+  integrity sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.10"
+    "@babel/generator" "^7.22.10"
+    "@babel/helper-compilation-targets" "^7.22.10"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.10"
+    "@babel/parser" "^7.22.10"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.10"
+    "@babel/types" "^7.22.10"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.1"
+
 "@babel/eslint-parser@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz#255a63796819a97b7578751bb08ab9f2a375a031"
-  integrity sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.10.tgz#bfdf3d1b32ad573fe7c1c3447e0b485e3a41fd09"
+  integrity sha512-0J8DNPRXQRLeR9rPaUMM3fA+RbixjnVLe/MRMYCkp3hzgsSuxCHQ8NN8xQG1wIHKJ4a1DTROTvFJdW+B5/eOsg==
   dependencies:
-    eslint-scope "^5.1.1"
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
-"@babel/generator@7.18.12", "@babel/generator@^7.18.10", "@babel/generator@^7.18.2", "@babel/generator@^7.7.2":
+"@babel/generator@7.18.12":
   version "7.18.12"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4"
   integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==
@@ -111,111 +126,69 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.9.6":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"
-  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
+"@babel/generator@^7.18.10", "@babel/generator@^7.22.10", "@babel/generator@^7.7.2", "@babel/generator@^7.9.6":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz#c92254361f398e160645ac58831069707382b722"
+  integrity sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==
   dependencies:
-    "@babel/types" "^7.18.2"
-    "@jridgewell/gen-mapping" "^0.3.0"
+    "@babel/types" "^7.22.10"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.9.6":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"
-  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
-  dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
-  dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
-
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce"
-  integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.9"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"
-  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-
-"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"
-  integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
-  integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.1.0"
-
-"@babel/helper-define-polyfill-provider@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
-  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz#573e735937e99ea75ea30788b57eb52fab7468c9"
+  integrity sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==
+  dependencies:
+    "@babel/types" "^7.22.10"
+
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.10", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.9.6":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz#01d648bbc25dd88f513d862ee0df27b7d4e67024"
+  integrity sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==
+  dependencies:
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz#dd2612d59eac45588021ac3d6fa976d08f4e95a3"
+  integrity sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6"
+  integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
+
+"@babel/helper-define-polyfill-provider@^0.3.2", "@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -224,323 +197,192 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2", "@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.17.9"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"
-  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
-  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
-  dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-member-expression-to-functions@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"
-  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
-  dependencies:
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-member-expression-to-functions@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
-  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
-  dependencies:
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-imports@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"
-  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
-
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
-  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
-
-"@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"
-  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
-
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-replace-supers@^7.16.7", "@babel/helper-replace-supers@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz"
-  integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.18.2"
-    "@babel/types" "^7.18.2"
-
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6"
-  integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-simple-access@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"
-  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
+"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/types" "^7.18.2"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
-  integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
+"@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.9.0":
+  version "7.22.9"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
+
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
+  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.9"
+
+"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
+  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.18.10", "@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helper-wrap-function@^7.22.9":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz#d845e043880ed0b8c18bd194a12005cb16d2f614"
+  integrity sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.10"
+
+"@babel/helpers@^7.18.9", "@babel/helpers@^7.22.10", "@babel/helpers@^7.9.6":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz#ae6005c539dfbcb5cd71fb51bfc8a52ba63bc37a"
+  integrity sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==
   dependencies:
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
-
-"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
-  dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.18.11"
-  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb"
-  integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==
-  dependencies:
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.18.11"
-    "@babel/types" "^7.18.10"
-
-"@babel/helpers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
-  dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helpers@^7.9.6":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"
-  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.2"
-    "@babel/types" "^7.18.2"
-
-"@babel/highlight@^7.16.7", "@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.10"
+    "@babel/types" "^7.22.10"
+
+"@babel/highlight@^7.22.10":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7"
+  integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.5"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
 
 "@babel/node@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/node/-/node-7.18.10.tgz#ab2be57785346b5bf0721c3d17572402419d9d8a"
-  integrity sha512-VbqzK6QXfQVi4Bpk6J7XqHXKFNbG2j3rdIdx68+/14GDU7jXDOSyUU/cwqCM1fDwCdxp37pNV/ToSCXsNChcyA==
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/node/-/node-7.22.10.tgz#865ef915633790b1e11c091896bb44ab36cd14b6"
+  integrity sha512-FpSgdjIPabpEetDxtKYAcXCs0qRh12S2D40rhpRoo0w5h7/7Tu2ZroaX99cbKFNDODiSs484sZ1q0kutJbZ2iQ==
   dependencies:
-    "@babel/register" "^7.18.9"
+    "@babel/register" "^7.22.5"
     commander "^4.0.1"
-    core-js "^3.22.1"
+    core-js "^3.30.2"
     node-environment-flags "^1.0.5"
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@7.18.11", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.18.5":
+"@babel/parser@7.18.11":
   version "7.18.11"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9"
   integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==
 
-"@babel/parser@^7.9.6":
-  version "7.18.5"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz"
-  integrity sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.22.10", "@babel/parser@^7.22.5", "@babel/parser@^7.9.6":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
+  integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
+  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
-  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
+  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
-  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
+"@babel/plugin-proposal-async-generator-functions@^7.18.10", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
+  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"
-  integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
 "@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
@@ -551,22 +393,22 @@
 
 "@babel/plugin-proposal-class-properties@7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
   integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
-  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
+  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
+"@babel/plugin-proposal-dynamic-import@^7.18.6", "@babel/plugin-proposal-dynamic-import@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
   integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
@@ -574,14 +416,6 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
 "@babel/plugin-proposal-export-default-from@7.18.10":
   version "7.18.10"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.18.10.tgz#091f4794dbce4027c03cf4ebc64d3fb96b75c206"
@@ -592,7 +426,7 @@
 
 "@babel/plugin-proposal-export-default-from@7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz#4cb7c2fdeaed490b60d9bfd3dc8a20f81f9c2e7c"
   integrity sha512-PYtv2S2OdCdp7GSPDg5ndGZFm9DmWFvuLoS5nBxZCgOBggluLnhTScspJxng96alHQzPyrrHxvC9/w4bFuspeA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -606,7 +440,7 @@
     "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.18.6":
+"@babel/plugin-proposal-json-strings@^7.18.6", "@babel/plugin-proposal-json-strings@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
   integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
@@ -614,23 +448,15 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"
-  integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
 "@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
-  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -638,15 +464,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"
-  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
+"@babel/plugin-proposal-numeric-separator@^7.18.6", "@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
   integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
@@ -654,15 +472,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@7.18.9", "@babel/plugin-proposal-object-rest-spread@^7.18.9":
+"@babel/plugin-proposal-object-rest-spread@7.18.9":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
   integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
@@ -675,25 +485,25 @@
 
 "@babel/plugin-proposal-object-rest-spread@7.9.6":
   version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
   integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.9.5"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"
-  integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==
+"@babel/plugin-proposal-object-rest-spread@^7.18.9", "@babel/plugin-proposal-object-rest-spread@^7.9.6":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
   dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-compilation-targets" "^7.17.10"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.17.12"
+    "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6", "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
   integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
@@ -701,30 +511,13 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
-  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"
-  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
+"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@^7.18.6":
@@ -736,16 +529,16 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
-  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
+  version "7.21.11"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6":
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -753,17 +546,9 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"
-  integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
-
 "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
@@ -777,52 +562,45 @@
 
 "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
   integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.18.6.tgz#8df076711a4818c4ce4f23e61d622b0ba2ff84bc"
-  integrity sha512-Kr//z3ujSVNx6E9z9ih5xXXMqK07VVTuqPmqGe6Mss/zW5XPeLZeSDZoP9ab/hT4wPKqAgjl2PnhPrcpk8Seew==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-syntax-export-default-from@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.16.7.tgz"
-  integrity sha512-4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA==
+"@babel/plugin-syntax-export-default-from@^7.18.6", "@babel/plugin-syntax-export-default-from@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.22.5.tgz#ac3a24b362a04415a017ab96b9b4483d0e2a6e44"
+  integrity sha512-ODAqWWXB/yReh/jVQDag/3/tl6lgBueQkk/TcfW/59Oykm4c8a55XloX0CTk2k2VJiFWMgHby9xNX29IbCv9dQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
   integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-import-assertions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4"
-  integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
@@ -833,63 +611,63 @@
 
 "@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz"
-  integrity sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==
+"@babel/plugin-syntax-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
   integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
@@ -901,453 +679,260 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.18.6", "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
-  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-arrow-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
-  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
+"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"
-  integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==
+"@babel/plugin-transform-arrow-functions@^7.18.6", "@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-to-generator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
-  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
+"@babel/plugin-transform-async-to-generator@^7.18.6", "@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-remap-async-to-generator" "^7.18.6"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"
-  integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+"@babel/plugin-transform-block-scoping@^7.18.9", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz#88a1dccc3383899eb5e660534a76a22ecee64faa"
+  integrity sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-classes@^7.18.9", "@babel/plugin-transform-classes@^7.9.5":
+  version "7.22.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
+  integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-transform-block-scoping@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
-  integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.18.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz"
-  integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-classes@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
-  integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-replace-supers" "^7.18.9"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.18.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz"
-  integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-replace-supers" "^7.18.2"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
-  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"
-  integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz#68906549c021cb231bee1db21d3b5b095f8ee292"
-  integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"
-  integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-dotall-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"
-  integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-transform-for-of@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
-  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.18.1"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"
-  integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
+"@babel/plugin-transform-computed-properties@^7.18.9", "@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+"@babel/plugin-transform-destructuring@^7.18.9", "@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz#38e2273814a58c810b6c34ea293be4973c4eb5e2"
+  integrity sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+"@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"
-  integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+"@babel/plugin-transform-for-of@^7.18.8", "@babel/plugin-transform-for-of@^7.9.0":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
+  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
-  integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
+"@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"
-  integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==
+"@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
-  integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
+"@babel/plugin-transform-modules-amd@^7.18.6", "@babel/plugin-transform-modules-amd@^7.9.6":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
+  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"
-  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
+"@babel/plugin-transform-modules-commonjs@^7.18.6", "@babel/plugin-transform-modules-commonjs@^7.22.5", "@babel/plugin-transform-modules-commonjs@^7.9.6":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-simple-access" "^7.18.2"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
-  integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
+"@babel/plugin-transform-modules-systemjs@^7.18.9", "@babel/plugin-transform-modules-systemjs@^7.9.6":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
+  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.18.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz"
-  integrity sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==
+"@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"
-  integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==
+"@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
-  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+"@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"
-  integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==
+"@babel/plugin-transform-optional-chaining@^7.22.5":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz#076d28a7e074392e840d4ae587d83445bac0372a"
+  integrity sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.18.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz"
-  integrity sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
-
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-
-"@babel/plugin-transform-parameters@^7.17.12", "@babel/plugin-transform-parameters@^7.9.5":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"
-  integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-parameters@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
-  integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+"@babel/plugin-transform-parameters@^7.18.8", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.9.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
+  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-react-display-name@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz"
-  integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b"
+  integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-react-jsx-development@^7.9.0":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz"
-  integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
+  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.16.7"
+    "@babel/plugin-transform-react-jsx" "^7.22.5"
 
 "@babel/plugin-transform-react-jsx-self@^7.9.0":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.17.12.tgz"
-  integrity sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz#ca2fdc11bc20d4d46de01137318b13d04e481d8e"
+  integrity sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-react-jsx-source@^7.9.0":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.16.7.tgz"
-  integrity sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz#49af1615bfdf6ed9d3e9e43e425e0b2b65d15b6c"
+  integrity sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-jsx@^7.16.7", "@babel/plugin-transform-react-jsx@^7.9.4":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz"
-  integrity sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==
+"@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.9.4":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416"
+  integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/plugin-syntax-jsx" "^7.17.12"
-    "@babel/types" "^7.17.12"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
-  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
+"@babel/plugin-transform-regenerator@^7.18.6", "@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
+  integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    regenerator-transform "^0.15.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"
-  integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==
+"@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    regenerator-transform "^0.15.0"
-
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"
-  integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-runtime@7.18.10":
   version "7.18.10"
@@ -1363,7 +948,7 @@
 
 "@babel/plugin-transform-runtime@7.9.6":
   version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
   integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
@@ -1371,109 +956,66 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+"@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-spread@^7.18.9", "@babel/plugin-transform-spread@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
-  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"
-  integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==
+"@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+"@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.18.2"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"
-  integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
+"@babel/plugin-transform-typescript@^7.22.5":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz#aadd98fab871f0bb5717bcc24c31aaaa455af923"
+  integrity sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.17.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"
-  integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
-"@babel/plugin-transform-typescript@^7.18.6":
-  version "7.18.12"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz#712e9a71b9e00fde9f8c0238e0cceee86ab2f8fd"
-  integrity sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-typescript" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.10"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.22.5"
 
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
+  integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@7.18.10":
   version "7.18.10"
@@ -1558,7 +1100,7 @@
 
 "@babel/preset-env@7.9.6":
   version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"
+  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
   integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
   dependencies:
     "@babel/compat-data" "^7.9.6"
@@ -1623,9 +1165,9 @@
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+  version "0.1.6"
+  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
+  integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1635,7 +1177,7 @@
 
 "@babel/preset-react@7.9.4":
   version "7.9.4"
-  resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz"
+  resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
   integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -1646,18 +1188,20 @@
     "@babel/plugin-transform-react-jsx-source" "^7.9.0"
 
 "@babel/preset-typescript@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399"
-  integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
+  integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-transform-typescript" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-typescript" "^7.22.5"
 
-"@babel/register@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/register/-/register-7.18.9.tgz#1888b24bc28d5cc41c412feb015e9ff6b96e439c"
-  integrity sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw==
+"@babel/register@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939"
+  integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -1665,39 +1209,28 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.18.3"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz"
-  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
-  dependencies:
-    regenerator-runtime "^0.13.4"
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
-  integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.18.9", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682"
+  integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.16.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+"@babel/template@^7.18.10", "@babel/template@^7.22.5", "@babel/template@^7.3.3", "@babel/template@^7.8.6":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
-
-"@babel/template@^7.8.6":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/traverse@7.18.11", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2":
+"@babel/traverse@7.18.11":
   version "7.18.11"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f"
   integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==
@@ -1713,23 +1246,23 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.16.8", "@babel/traverse@^7.9.6":
-  version "7.18.5"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz"
-  integrity sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.2"
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.18.5"
-    "@babel/types" "^7.18.4"
+"@babel/traverse@^7.18.10", "@babel/traverse@^7.22.10", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.6":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz#20252acb240e746d27c2e82b4484f199cf8141aa"
+  integrity sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==
+  dependencies:
+    "@babel/code-frame" "^7.22.10"
+    "@babel/generator" "^7.22.10"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.22.10"
+    "@babel/types" "^7.22.10"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@7.18.10", "@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.10", "@babel/types@^7.18.2", "@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+"@babel/types@7.18.10":
   version "7.18.10"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
   integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
@@ -1738,12 +1271,13 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.8", "@babel/types@^7.17.12", "@babel/types@^7.4.4", "@babel/types@^7.9.6":
-  version "7.18.4"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"
-  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
+"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.9.6":
+  version "7.22.10"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03"
+  integrity sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1893,14 +1427,14 @@
   integrity sha512-KvvX58MGMWh7xA+N+deCfunkA/ZNDvFLw4YbOmX3f/XBIkqrVY7qlotfy2aNb1kgp6h4B6Yc8YawJPDTfvWX7g==
 
 "@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
+  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
-    globals "^13.15.0"
+    espree "^9.4.0"
+    globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
@@ -1909,13 +1443,13 @@
 
 "@gar/promisify@^1.0.1":
   version "1.1.3"
-  resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"
+  resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@humanwhocodes/config-array@^0.10.4":
-  version "0.10.4"
-  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
-  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
+  version "0.10.7"
+  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
+  integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -1933,7 +1467,7 @@
 
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
-  resolved "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz"
+  resolved "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
@@ -2076,13 +1610,6 @@
     terminal-link "^2.0.0"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^28.0.2":
-  version "28.0.2"
-  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz"
-  integrity sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==
-  dependencies:
-    "@sinclair/typebox" "^0.23.3"
-
 "@jest/schemas@^28.1.3":
   version "28.1.3"
   resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
@@ -2140,18 +1667,6 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.1"
 
-"@jest/types@^28.1.1":
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz"
-  integrity sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==
-  dependencies:
-    "@jest/schemas" "^28.0.2"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
 "@jest/types@^28.1.3":
   version "28.1.3"
   resolved "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
@@ -2164,54 +1679,46 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.19"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
+  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@jsdevtools/ono@^7.1.3":
   version "7.1.3"
-  resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"
+  resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
 "@lerna/add@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
   integrity sha512-cpmAH1iS3k8JBxNvnMqrGTTjbY/ZAiKa1ChJzFevMYY3eeqbvhsBKnBcxjRXtdrJ6bd3dCQM+ZtK+0i682Fhng==
   dependencies:
     "@lerna/bootstrap" "4.0.0"
@@ -2227,7 +1734,7 @@
 
 "@lerna/bootstrap@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-4.0.0.tgz#5f5c5e2c6cfc8fcec50cb2fbe569a8c607101891"
   integrity sha512-RkS7UbeM2vu+kJnHzxNRCLvoOP9yGNgkzRdy4UV2hNalD7EP41bLvRVOwRYQ7fhc2QcbhnKNdOBihYRL0LcKtw==
   dependencies:
     "@lerna/command" "4.0.0"
@@ -2255,7 +1762,7 @@
 
 "@lerna/changed@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-4.0.0.tgz#b9fc76cea39b9292a6cd263f03eb57af85c9270b"
   integrity sha512-cD+KuPRp6qiPOD+BO6S6SN5cARspIaWSOqGBpGnYzLb4uWT8Vk4JzKyYtc8ym1DIwyoFXHosXt8+GDAgR8QrgQ==
   dependencies:
     "@lerna/collect-updates" "4.0.0"
@@ -2265,7 +1772,7 @@
 
 "@lerna/check-working-tree@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz#257e36a602c00142e76082a19358e3e1ae8dbd58"
   integrity sha512-/++bxM43jYJCshBiKP5cRlCTwSJdRSxVmcDAXM+1oUewlZJVSVlnks5eO0uLxokVFvLhHlC5kHMc7gbVFPHv6Q==
   dependencies:
     "@lerna/collect-uncommitted" "4.0.0"
@@ -2274,7 +1781,7 @@
 
 "@lerna/child-process@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/child-process/-/child-process-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/child-process/-/child-process-4.0.0.tgz#341b96a57dffbd9705646d316e231df6fa4df6e1"
   integrity sha512-XtCnmCT9eyVsUUHx6y/CTBYdV9g2Cr/VxyseTWBgfIur92/YKClfEtJTbOh94jRT62hlKLqSvux/UhxXVh613Q==
   dependencies:
     chalk "^4.1.0"
@@ -2283,7 +1790,7 @@
 
 "@lerna/clean@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-4.0.0.tgz#8f778b6f2617aa2a936a6b5e085ae62498e57dc5"
   integrity sha512-uugG2iN9k45ITx2jtd8nEOoAtca8hNlDCUM0N3lFgU/b1mEQYAPRkqr1qs4FLRl/Y50ZJ41wUz1eazS+d/0osA==
   dependencies:
     "@lerna/command" "4.0.0"
@@ -2297,7 +1804,7 @@
 
 "@lerna/cli@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-4.0.0.tgz#8eabd334558836c1664df23f19acb95e98b5bbf3"
   integrity sha512-Neaw3GzFrwZiRZv2g7g6NwFjs3er1vhraIniEs0jjVLPMNC4eata0na3GfE5yibkM/9d3gZdmihhZdZ3EBdvYA==
   dependencies:
     "@lerna/global-options" "4.0.0"
@@ -2307,7 +1814,7 @@
 
 "@lerna/collect-uncommitted@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz#855cd64612969371cfc2453b90593053ff1ba779"
   integrity sha512-ufSTfHZzbx69YNj7KXQ3o66V4RC76ffOjwLX0q/ab//61bObJ41n03SiQEhSlmpP+gmFbTJ3/7pTe04AHX9m/g==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2316,7 +1823,7 @@
 
 "@lerna/collect-updates@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-4.0.0.tgz#8e208b1bafd98a372ff1177f7a5e288f6bea8041"
   integrity sha512-bnNGpaj4zuxsEkyaCZLka9s7nMs58uZoxrRIPJ+nrmrZYp1V5rrd+7/NYTuunOhY2ug1sTBvTAxj3NZQ+JKnOw==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2327,7 +1834,7 @@
 
 "@lerna/command@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/command/-/command-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/command/-/command-4.0.0.tgz#991c7971df8f5bf6ae6e42c808869a55361c1b98"
   integrity sha512-LM9g3rt5FsPNFqIHUeRwWXLNHJ5NKzOwmVKZ8anSp4e1SPrv2HNc1V02/9QyDDZK/w+5POXH5lxZUI1CHaOK/A==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2343,7 +1850,7 @@
 
 "@lerna/conventional-commits@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz#660fb2c7b718cb942ead70110df61f18c6f99750"
   integrity sha512-CSUQRjJHFrH8eBn7+wegZLV3OrNc0Y1FehYfYGhjLE2SIfpCL4bmfu/ViYuHh9YjwHaA+4SX6d3hR+xkeseKmw==
   dependencies:
     "@lerna/validation-error" "4.0.0"
@@ -2360,7 +1867,7 @@
 
 "@lerna/create-symlink@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-4.0.0.tgz#8c5317ce5ae89f67825443bd7651bf4121786228"
   integrity sha512-I0phtKJJdafUiDwm7BBlEUOtogmu8+taxq6PtIrxZbllV9hWg59qkpuIsiFp+no7nfRVuaasNYHwNUhDAVQBig==
   dependencies:
     cmd-shim "^4.1.0"
@@ -2369,7 +1876,7 @@
 
 "@lerna/create@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/create/-/create-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/create/-/create-4.0.0.tgz#b6947e9b5dfb6530321952998948c3e63d64d730"
   integrity sha512-mVOB1niKByEUfxlbKTM1UNECWAjwUdiioIbRQZEeEabtjCL69r9rscIsjlGyhGWCfsdAG5wfq4t47nlDXdLLag==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2393,7 +1900,7 @@
 
 "@lerna/describe-ref@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-4.0.0.tgz#53c53b4ea65fdceffa072a62bfebe6772c45d9ec"
   integrity sha512-eTU5+xC4C5Gcgz+Ey4Qiw9nV2B4JJbMulsYJMW8QjGcGh8zudib7Sduj6urgZXUYNyhYpRs+teci9M2J8u+UvQ==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2401,7 +1908,7 @@
 
 "@lerna/diff@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-4.0.0.tgz#6d3071817aaa4205a07bf77cfc6e932796d48b92"
   integrity sha512-jYPKprQVg41+MUMxx6cwtqsNm0Yxx9GDEwdiPLwcUTFx+/qKCEwifKNJ1oGIPBxyEHX2PFCOjkK39lHoj2qiag==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2411,7 +1918,7 @@
 
 "@lerna/exec@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-4.0.0.tgz#eb6cb95cb92d42590e9e2d628fcaf4719d4a8be6"
   integrity sha512-VGXtL/b/JfY84NB98VWZpIExfhLOzy0ozm/0XaS4a2SmkAJc5CeUfrhvHxxkxiTBLkU+iVQUyYEoAT0ulQ8PCw==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2424,7 +1931,7 @@
 
 "@lerna/filter-options@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-4.0.0.tgz#ac94cc515d7fa3b47e2f7d74deddeabb1de5e9e6"
   integrity sha512-vV2ANOeZhOqM0rzXnYcFFCJ/kBWy/3OA58irXih9AMTAlQLymWAK0akWybl++sUJ4HB9Hx12TOqaXbYS2NM5uw==
   dependencies:
     "@lerna/collect-updates" "4.0.0"
@@ -2434,7 +1941,7 @@
 
 "@lerna/filter-packages@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-4.0.0.tgz#b1f70d70e1de9cdd36a4e50caa0ac501f8d012f2"
   integrity sha512-+4AJIkK7iIiOaqCiVTYJxh/I9qikk4XjNQLhE3kixaqgMuHl1NQ99qXRR0OZqAWB9mh8Z1HA9bM5K1HZLBTOqA==
   dependencies:
     "@lerna/validation-error" "4.0.0"
@@ -2443,14 +1950,14 @@
 
 "@lerna/get-npm-exec-opts@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz#dc955be94a4ae75c374ef9bce91320887d34608f"
   integrity sha512-yvmkerU31CTWS2c7DvmAWmZVeclPBqI7gPVr5VATUKNWJ/zmVcU4PqbYoLu92I9Qc4gY1TuUplMNdNuZTSL7IQ==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/get-packed@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-4.0.0.tgz#0989d61624ac1f97e393bdad2137c49cd7a37823"
   integrity sha512-rfWONRsEIGyPJTxFzC8ECb3ZbsDXJbfqWYyeeQQDrJRPnEJErlltRLPLgC2QWbxFgFPsoDLeQmFHJnf0iDfd8w==
   dependencies:
     fs-extra "^9.1.0"
@@ -2459,7 +1966,7 @@
 
 "@lerna/github-client@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/github-client/-/github-client-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/github-client/-/github-client-4.0.0.tgz#2ced67721363ef70f8e12ffafce4410918f4a8a4"
   integrity sha512-2jhsldZtTKXYUBnOm23Lb0Fx8G4qfSXF9y7UpyUgWUj+YZYd+cFxSuorwQIgk5P4XXrtVhsUesIsli+BYSThiw==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2470,7 +1977,7 @@
 
 "@lerna/gitlab-client@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz#00dad73379c7b38951d4b4ded043504c14e2b67d"
   integrity sha512-OMUpGSkeDWFf7BxGHlkbb35T7YHqVFCwBPSIR6wRsszY8PAzCYahtH3IaJzEJyUg6vmZsNl0FSr3pdA2skhxqA==
   dependencies:
     node-fetch "^2.6.1"
@@ -2479,12 +1986,12 @@
 
 "@lerna/global-options@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-4.0.0.tgz#c7d8b0de6a01d8a845e2621ea89e7f60f18c6a5f"
   integrity sha512-TRMR8afAHxuYBHK7F++Ogop2a82xQjoGna1dvPOY6ltj/pEx59pdgcJfYcynYqMkFIk8bhLJJN9/ndIfX29FTQ==
 
 "@lerna/has-npm-version@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz#d3fc3292c545eb28bd493b36e6237cf0279f631c"
   integrity sha512-LQ3U6XFH8ZmLCsvsgq1zNDqka0Xzjq5ibVN+igAI5ccRWNaUsE/OcmsyMr50xAtNQMYMzmpw5GVLAivT2/YzCg==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2492,7 +1999,7 @@
 
 "@lerna/import@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/import/-/import-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/import/-/import-4.0.0.tgz#bde656c4a451fa87ae41733ff8a8da60547c5465"
   integrity sha512-FaIhd+4aiBousKNqC7TX1Uhe97eNKf5/SC7c5WZANVWtC7aBWdmswwDt3usrzCNpj6/Wwr9EtEbYROzxKH8ffg==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2506,7 +2013,7 @@
 
 "@lerna/info@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/info/-/info-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/info/-/info-4.0.0.tgz#b9fb0e479d60efe1623603958a831a88b1d7f1fc"
   integrity sha512-8Uboa12kaCSZEn4XRfPz5KU9XXoexSPS4oeYGj76s2UQb1O1GdnEyfjyNWoUl1KlJ2i/8nxUskpXIftoFYH0/Q==
   dependencies:
     "@lerna/command" "4.0.0"
@@ -2515,7 +2022,7 @@
 
 "@lerna/init@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/init/-/init-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/init/-/init-4.0.0.tgz#dadff67e6dfb981e8ccbe0e6a310e837962f6c7a"
   integrity sha512-wY6kygop0BCXupzWj5eLvTUqdR7vIAm0OgyV9WHpMYQGfs1V22jhztt8mtjCloD/O0nEe4tJhdG62XU5aYmPNQ==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2526,7 +2033,7 @@
 
 "@lerna/link@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/link/-/link-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/link/-/link-4.0.0.tgz#c3a38aabd44279d714e90f2451e31b63f0fb65ba"
   integrity sha512-KlvPi7XTAcVOByfaLlOeYOfkkDcd+bejpHMCd1KcArcFTwijOwXOVi24DYomIeHvy6HsX/IUquJ4PPUJIeB4+w==
   dependencies:
     "@lerna/command" "4.0.0"
@@ -2537,7 +2044,7 @@
 
 "@lerna/list@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/list/-/list-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/list/-/list-4.0.0.tgz#24b4e6995bd73f81c556793fe502b847efd9d1d7"
   integrity sha512-L2B5m3P+U4Bif5PultR4TI+KtW+SArwq1i75QZ78mRYxPc0U/piau1DbLOmwrdqr99wzM49t0Dlvl6twd7GHFg==
   dependencies:
     "@lerna/command" "4.0.0"
@@ -2547,7 +2054,7 @@
 
 "@lerna/listable@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-4.0.0.tgz#d00d6cb4809b403f2b0374fc521a78e318b01214"
   integrity sha512-/rPOSDKsOHs5/PBLINZOkRIX1joOXUXEtyUs5DHLM8q6/RP668x/1lFhw6Dx7/U+L0+tbkpGtZ1Yt0LewCLgeQ==
   dependencies:
     "@lerna/query-graph" "4.0.0"
@@ -2556,7 +2063,7 @@
 
 "@lerna/log-packed@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-4.0.0.tgz#95168fe2e26ac6a71e42f4be857519b77e57a09f"
   integrity sha512-+dpCiWbdzgMAtpajLToy9PO713IHoE6GV/aizXycAyA07QlqnkpaBNZ8DW84gHdM1j79TWockGJo9PybVhrrZQ==
   dependencies:
     byte-size "^7.0.0"
@@ -2566,7 +2073,7 @@
 
 "@lerna/npm-conf@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-4.0.0.tgz#b259fd1e1cee2bf5402b236e770140ff9ade7fd2"
   integrity sha512-uS7H02yQNq3oejgjxAxqq/jhwGEE0W0ntr8vM3EfpCW1F/wZruwQw+7bleJQ9vUBjmdXST//tk8mXzr5+JXCfw==
   dependencies:
     config-chain "^1.1.12"
@@ -2574,7 +2081,7 @@
 
 "@lerna/npm-dist-tag@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz#d1e99b4eccd3414142f0548ad331bf2d53f3257a"
   integrity sha512-F20sg28FMYTgXqEQihgoqSfwmq+Id3zT23CnOwD+XQMPSy9IzyLf1fFVH319vXIw6NF6Pgs4JZN2Qty6/CQXGw==
   dependencies:
     "@lerna/otplease" "4.0.0"
@@ -2584,7 +2091,7 @@
 
 "@lerna/npm-install@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-4.0.0.tgz#31180be3ab3b7d1818a1a0c206aec156b7094c78"
   integrity sha512-aKNxq2j3bCH3eXl3Fmu4D54s/YLL9WSwV8W7X2O25r98wzrO38AUN6AB9EtmAx+LV/SP15et7Yueg9vSaanRWg==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2597,7 +2104,7 @@
 
 "@lerna/npm-publish@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-4.0.0.tgz#84eb62e876fe949ae1fd62c60804423dbc2c4472"
   integrity sha512-vQb7yAPRo5G5r77DRjHITc9piR9gvEKWrmfCH7wkfBnGWEqu7n8/4bFQ7lhnkujvc8RXOsYpvbMQkNfkYibD/w==
   dependencies:
     "@lerna/otplease" "4.0.0"
@@ -2611,7 +2118,7 @@
 
 "@lerna/npm-run-script@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz#dfebf4f4601442e7c0b5214f9fb0d96c9350743b"
   integrity sha512-Jmyh9/IwXJjOXqKfIgtxi0bxi1pUeKe5bD3S81tkcy+kyng/GNj9WSqD5ZggoNP2NP//s4CLDAtUYLdP7CU9rA==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2620,21 +2127,21 @@
 
 "@lerna/otplease@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/otplease/-/otplease-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/otplease/-/otplease-4.0.0.tgz#84972eb43448f8a1077435ba1c5e59233b725850"
   integrity sha512-Sgzbqdk1GH4psNiT6hk+BhjOfIr/5KhGBk86CEfHNJTk9BK4aZYyJD4lpDbDdMjIV4g03G7pYoqHzH765T4fxw==
   dependencies:
     "@lerna/prompt" "4.0.0"
 
 "@lerna/output@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/output/-/output-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/output/-/output-4.0.0.tgz#b1d72215c0e35483e4f3e9994debc82c621851f2"
   integrity sha512-Un1sHtO1AD7buDQrpnaYTi2EG6sLF+KOPEAMxeUYG5qG3khTs2Zgzq5WE3dt2N/bKh7naESt20JjIW6tBELP0w==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/pack-directory@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-4.0.0.tgz#8b617db95d20792f043aaaa13a9ccc0e04cb4c74"
   integrity sha512-NJrmZNmBHS+5aM+T8N6FVbaKFScVqKlQFJNY2k7nsJ/uklNKsLLl6VhTQBPwMTbf6Tf7l6bcKzpy7aePuq9UiQ==
   dependencies:
     "@lerna/get-packed" "4.0.0"
@@ -2647,7 +2154,7 @@
 
 "@lerna/package-graph@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-4.0.0.tgz#16a00253a8ac810f72041481cb46bcee8d8123dd"
   integrity sha512-QED2ZCTkfXMKFoTGoccwUzjHtZMSf3UKX14A4/kYyBms9xfFsesCZ6SLI5YeySEgcul8iuIWfQFZqRw+Qrjraw==
   dependencies:
     "@lerna/prerelease-id-from-version" "4.0.0"
@@ -2658,7 +2165,7 @@
 
 "@lerna/package@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/package/-/package-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/package/-/package-4.0.0.tgz#1b4c259c4bcff45c876ee1d591a043aacbc0d6b7"
   integrity sha512-l0M/izok6FlyyitxiQKr+gZLVFnvxRQdNhzmQ6nRnN9dvBJWn+IxxpM+cLqGACatTnyo9LDzNTOj2Db3+s0s8Q==
   dependencies:
     load-json-file "^6.2.0"
@@ -2667,14 +2174,14 @@
 
 "@lerna/prerelease-id-from-version@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz#c7e0676fcee1950d85630e108eddecdd5b48c916"
   integrity sha512-GQqguzETdsYRxOSmdFZ6zDBXDErIETWOqomLERRY54f4p+tk4aJjoVdd9xKwehC9TBfIFvlRbL1V9uQGHh1opg==
   dependencies:
     semver "^7.3.4"
 
 "@lerna/profiler@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/profiler/-/profiler-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/profiler/-/profiler-4.0.0.tgz#8a53ab874522eae15d178402bff90a14071908e9"
   integrity sha512-/BaEbqnVh1LgW/+qz8wCuI+obzi5/vRE8nlhjPzdEzdmWmZXuCKyWSEzAyHOJWw1ntwMiww5dZHhFQABuoFz9Q==
   dependencies:
     fs-extra "^9.1.0"
@@ -2683,7 +2190,7 @@
 
 "@lerna/project@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/project/-/project-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/project/-/project-4.0.0.tgz#ff84893935833533a74deff30c0e64ddb7f0ba6b"
   integrity sha512-o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==
   dependencies:
     "@lerna/package" "4.0.0"
@@ -2701,7 +2208,7 @@
 
 "@lerna/prompt@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-4.0.0.tgz#5ec69a803f3f0db0ad9f221dad64664d3daca41b"
   integrity sha512-4Ig46oCH1TH5M7YyTt53fT6TuaKMgqUUaqdgxvp6HP6jtdak6+amcsqB8YGz2eQnw/sdxunx84DfI9XpoLj4bQ==
   dependencies:
     inquirer "^7.3.3"
@@ -2709,7 +2216,7 @@
 
 "@lerna/publish@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-4.0.0.tgz#f67011305adeba120066a3b6d984a5bb5fceef65"
   integrity sha512-K8jpqjHrChH22qtkytA5GRKIVFEtqBF6JWj1I8dWZtHs4Jywn8yB1jQ3BAMLhqmDJjWJtRck0KXhQQKzDK2UPg==
   dependencies:
     "@lerna/check-working-tree" "4.0.0"
@@ -2743,21 +2250,21 @@
 
 "@lerna/pulse-till-done@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz#04bace7d483a8205c187b806bcd8be23d7bb80a3"
   integrity sha512-Frb4F7QGckaybRhbF7aosLsJ5e9WuH7h0KUkjlzSByVycxY91UZgaEIVjS2oN9wQLrheLMHl6SiFY0/Pvo0Cxg==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/query-graph@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-4.0.0.tgz#09dd1c819ac5ee3f38db23931143701f8a6eef63"
   integrity sha512-YlP6yI3tM4WbBmL9GCmNDoeQyzcyg1e4W96y/PKMZa5GbyUvkS2+Jc2kwPD+5KcXou3wQZxSPzR3Te5OenaDdg==
   dependencies:
     "@lerna/package-graph" "4.0.0"
 
 "@lerna/resolve-symlink@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz#6d006628a210c9b821964657a9e20a8c9a115e14"
   integrity sha512-RtX8VEUzqT+uLSCohx8zgmjc6zjyRlh6i/helxtZTMmc4+6O4FS9q5LJas2uGO2wKvBlhcD6siibGt7dIC3xZA==
   dependencies:
     fs-extra "^9.1.0"
@@ -2766,7 +2273,7 @@
 
 "@lerna/rimraf-dir@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz#2edf3b62d4eb0ef4e44e430f5844667d551ec25a"
   integrity sha512-QNH9ABWk9mcMJh2/muD9iYWBk1oQd40y6oH+f3wwmVGKYU5YJD//+zMiBI13jxZRtwBx0vmBZzkBkK1dR11cBg==
   dependencies:
     "@lerna/child-process" "4.0.0"
@@ -2776,7 +2283,7 @@
 
 "@lerna/run-lifecycle@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz#e648a46f9210a9bcd7c391df6844498cb5079334"
   integrity sha512-IwxxsajjCQQEJAeAaxF8QdEixfI7eLKNm4GHhXHrgBu185JcwScFZrj9Bs+PFKxwb+gNLR4iI5rpUdY8Y0UdGQ==
   dependencies:
     "@lerna/npm-conf" "4.0.0"
@@ -2785,7 +2292,7 @@
 
 "@lerna/run-topologically@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-4.0.0.tgz#af846eeee1a09b0c2be0d1bfb5ef0f7b04bb1827"
   integrity sha512-EVZw9hGwo+5yp+VL94+NXRYisqgAlj0jWKWtAIynDCpghRxCE5GMO3xrQLmQgqkpUl9ZxQFpICgYv5DW4DksQA==
   dependencies:
     "@lerna/query-graph" "4.0.0"
@@ -2793,7 +2300,7 @@
 
 "@lerna/run@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/run/-/run-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/run/-/run-4.0.0.tgz#4bc7fda055a729487897c23579694f6183c91262"
   integrity sha512-9giulCOzlMPzcZS/6Eov6pxE9gNTyaXk0Man+iCIdGJNMrCnW7Dme0Z229WWP/UoxDKg71F2tMsVVGDiRd8fFQ==
   dependencies:
     "@lerna/command" "4.0.0"
@@ -2808,7 +2315,7 @@
 
 "@lerna/symlink-binary@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz#21009f62d53a425f136cb4c1a32c6b2a0cc02d47"
   integrity sha512-zualodWC4q1QQc1pkz969hcFeWXOsVYZC5AWVtAPTDfLl+TwM7eG/O6oP+Rr3fFowspxo6b1TQ6sYfDV6HXNWA==
   dependencies:
     "@lerna/create-symlink" "4.0.0"
@@ -2818,7 +2325,7 @@
 
 "@lerna/symlink-dependencies@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz#8910eca084ae062642d0490d8972cf2d98e9ebbd"
   integrity sha512-BABo0MjeUHNAe2FNGty1eantWp8u83BHSeIMPDxNq0MuW2K3CiQRaeWT3EGPAzXpGt0+hVzBrA6+OT0GPn7Yuw==
   dependencies:
     "@lerna/create-symlink" "4.0.0"
@@ -2830,19 +2337,19 @@
 
 "@lerna/timer@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/timer/-/timer-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/timer/-/timer-4.0.0.tgz#a52e51bfcd39bfd768988049ace7b15c1fd7a6da"
   integrity sha512-WFsnlaE7SdOvjuyd05oKt8Leg3ENHICnvX3uYKKdByA+S3g+TCz38JsNs7OUZVt+ba63nC2nbXDlUnuT2Xbsfg==
 
 "@lerna/validation-error@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-4.0.0.tgz#af9d62fe8304eaa2eb9a6ba1394f9aa807026d35"
   integrity sha512-1rBOM5/koiVWlRi3V6dB863E1YzJS8v41UtsHgMr6gB2ncJ2LsQtMKlJpi3voqcgh41H8UsPXR58RrrpPpufyw==
   dependencies:
     npmlog "^4.1.2"
 
 "@lerna/version@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/version/-/version-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/version/-/version-4.0.0.tgz#532659ec6154d8a8789c5ab53878663e244e3228"
   integrity sha512-otUgiqs5W9zGWJZSCCMRV/2Zm2A9q9JwSDS7s/tlKq4mWCYriWo7+wsHEA/nPTMDyYyBO5oyZDj+3X50KDUzeA==
   dependencies:
     "@lerna/check-working-tree" "4.0.0"
@@ -2874,7 +2381,7 @@
 
 "@lerna/write-log-file@4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-4.0.0.tgz#18221a38a6a307d6b0a5844dd592ad53fa27091e"
   integrity sha512-XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg==
   dependencies:
     npmlog "^4.1.2"
@@ -2885,10 +2392,17 @@
   resolved "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
   integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
 
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@noble/hashes@^1", "@noble/hashes@^1.0.0":
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz#085fd70f6d7d9d109671090ccae1d3bec62554a1"
-  integrity sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9"
+  integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2913,12 +2427,12 @@
 
 "@npmcli/ci-detect@^1.0.0":
   version "1.4.0"
-  resolved "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
   integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
 
 "@npmcli/fs@^1.0.0":
   version "1.1.1"
-  resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
   integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
   dependencies:
     "@gar/promisify" "^1.0.1"
@@ -2926,7 +2440,7 @@
 
 "@npmcli/git@^2.1.0":
   version "2.1.0"
-  resolved "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
   integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
     "@npmcli/promise-spawn" "^1.3.2"
@@ -2940,7 +2454,7 @@
 
 "@npmcli/installed-package-contents@^1.0.6":
   version "1.0.7"
-  resolved "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
   dependencies:
     npm-bundled "^1.1.1"
@@ -2948,7 +2462,7 @@
 
 "@npmcli/move-file@^1.0.1":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
   dependencies:
     mkdirp "^1.0.4"
@@ -2956,19 +2470,19 @@
 
 "@npmcli/node-gyp@^1.0.2":
   version "1.0.3"
-  resolved "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
   integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
 "@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
   version "1.3.2"
-  resolved "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
   integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
     infer-owner "^1.0.4"
 
 "@npmcli/run-script@^1.8.2":
   version "1.8.6"
-  resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz"
+  resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
   integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
     "@npmcli/node-gyp" "^1.0.2"
@@ -2978,14 +2492,14 @@
 
 "@octokit/auth-token@^2.4.4":
   version "2.5.0"
-  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"
+  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
   integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==
   dependencies:
     "@octokit/types" "^6.0.3"
 
 "@octokit/core@^3.5.1":
   version "3.6.0"
-  resolved "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz"
+  resolved "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085"
   integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==
   dependencies:
     "@octokit/auth-token" "^2.4.4"
@@ -2998,7 +2512,7 @@
 
 "@octokit/endpoint@^6.0.1":
   version "6.0.12"
-  resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"
+  resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
   integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
   dependencies:
     "@octokit/types" "^6.0.3"
@@ -3007,46 +2521,46 @@
 
 "@octokit/graphql@^4.5.8":
   version "4.8.0"
-  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz"
+  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3"
   integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
   dependencies:
     "@octokit/request" "^5.6.0"
     "@octokit/types" "^6.0.3"
     universal-user-agent "^6.0.0"
 
-"@octokit/openapi-types@^12.1.0":
-  version "12.1.0"
-  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.1.0.tgz"
-  integrity sha512-kQzJh3ZUv3lDpi6M+uekMRHULvf9DlWoI1XgKN6nPeGDzkSgtkhVq1MMz3bFKQ6H6GbdC3ZqG/a6VzKhIx0VeA==
+"@octokit/openapi-types@^12.11.0":
+  version "12.11.0"
+  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0"
+  integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
-  resolved "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz"
+  resolved "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
   integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==
 
 "@octokit/plugin-paginate-rest@^2.16.8":
-  version "2.18.0"
-  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.18.0.tgz"
-  integrity sha512-n5/AzIoy5Wzp85gqzSbR+dWQDHlyHZrGijnDfLh452547Ynu0hCvszH7EfRE0eqM5ZjfkplO0k+q+P8AAIIJEA==
+  version "2.21.3"
+  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz#7f12532797775640dbb8224da577da7dc210c87e"
+  integrity sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==
   dependencies:
-    "@octokit/types" "^6.35.0"
+    "@octokit/types" "^6.40.0"
 
 "@octokit/plugin-request-log@^1.0.4":
   version "1.0.4"
-  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
   integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
 
 "@octokit/plugin-rest-endpoint-methods@^5.12.0":
-  version "5.14.0"
-  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.14.0.tgz"
-  integrity sha512-MRnMs4Dcm1OSaz/g/RLr4YY9otgysS7vN5SUkHGd7t+R8323cHsHFoEWHYPSmgUC0BieHRhvnCRWb4i3Pl+Lgg==
+  version "5.16.2"
+  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz#7ee8bf586df97dd6868cf68f641354e908c25342"
+  integrity sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==
   dependencies:
-    "@octokit/types" "^6.35.0"
+    "@octokit/types" "^6.39.0"
     deprecation "^2.3.1"
 
 "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
   version "2.1.0"
-  resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
   integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
   dependencies:
     "@octokit/types" "^6.0.3"
@@ -3055,7 +2569,7 @@
 
 "@octokit/request@^5.6.0", "@octokit/request@^5.6.3":
   version "5.6.3"
-  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz"
+  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
   integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
@@ -3067,7 +2581,7 @@
 
 "@octokit/rest@^18.1.0":
   version "18.12.0"
-  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz"
+  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881"
   integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
   dependencies:
     "@octokit/core" "^3.5.1"
@@ -3075,12 +2589,12 @@
     "@octokit/plugin-request-log" "^1.0.4"
     "@octokit/plugin-rest-endpoint-methods" "^5.12.0"
 
-"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.35.0":
-  version "6.35.0"
-  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.35.0.tgz"
-  integrity sha512-DhLfdUuv3H37u6jBDfkwamypx3HflHg29b26nbA6iVFYkAlZ5cMEtu/9pQoihGnQE5M7jJFnNo25Rr1UwQNF8Q==
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0":
+  version "6.41.0"
+  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04"
+  integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==
   dependencies:
-    "@octokit/openapi-types" "^12.1.0"
+    "@octokit/openapi-types" "^12.11.0"
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -3137,7 +2651,7 @@
 
 "@pyramation/babel-preset-env@0.1.0":
   version "0.1.0"
-  resolved "https://registry.npmjs.org/@pyramation/babel-preset-env/-/babel-preset-env-0.1.0.tgz"
+  resolved "https://registry.npmjs.org/@pyramation/babel-preset-env/-/babel-preset-env-0.1.0.tgz#cb9bf3a507d79b9ceb8b7e83815ed1a672209952"
   integrity sha512-NgyUnQv5gDe4mTe0SbS3thOyV/XPdVKFx1KYtWARKTPCH4430nMyCrguAR9BJ1q1FLilGQdnr3JbGS1pPTRtrA==
   dependencies:
     "@babel/core" "7.9.6"
@@ -3178,20 +2692,15 @@
     mz "^2.7.0"
     prettier "^2.6.2"
 
-"@sinclair/typebox@^0.23.3":
-  version "0.23.5"
-  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz"
-  integrity sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==
-
 "@sinclair/typebox@^0.24.1":
-  version "0.24.27"
-  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.27.tgz#d55643516a1546174e10da681a8aaa81e757452d"
-  integrity sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg==
+  version "0.24.51"
+  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
+  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.3"
-  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  version "1.8.6"
+  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -3204,16 +2713,16 @@
 
 "@tootallnate/once@1":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
 "@types/babel__core@^7.1.14":
-  version "7.1.19"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
+  version "7.20.1"
+  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
+  integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
   dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
@@ -3234,11 +2743,11 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.0"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz#8134fd78cb39567465be65b9fdc16d378095f41f"
-  integrity sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==
+  version "7.20.1"
+  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf"
+  integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.20.7"
 
 "@types/glob@^7.1.3":
   version "7.2.0"
@@ -3249,9 +2758,9 @@
     "@types/node" "*"
 
 "@types/graceful-fs@^4.1.3":
-  version "4.1.5"
-  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+  version "4.1.6"
+  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
+  integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==
   dependencies:
     "@types/node" "*"
 
@@ -3275,62 +2784,62 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@^28.1.6":
-  version "28.1.6"
-  resolved "https://registry.npmjs.org/@types/jest/-/jest-28.1.6.tgz#d6a9cdd38967d2d746861fb5be6b120e38284dd4"
-  integrity sha512-0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ==
+  version "28.1.8"
+  resolved "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz#6936409f3c9724ea431efd412ea0238a0f03b09b"
+  integrity sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==
   dependencies:
-    jest-matcher-utils "^28.0.0"
+    expect "^28.0.0"
     pretty-format "^28.0.0"
 
 "@types/json-schema@^7.0.11":
-  version "7.0.11"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+  version "7.0.12"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
 "@types/lodash@^4.14.182":
-  version "4.14.182"
-  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
-  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+  version "4.14.197"
+  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.197.tgz#e95c5ddcc814ec3e84c891910a01e0c8a378c54b"
+  integrity sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==
 
 "@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/minimatch@*", "@types/minimatch@^3.0.3":
+"@types/minimatch@*":
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
+"@types/minimatch@^3.0.3":
   version "3.0.5"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"
+  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/minimist@^1.2.0":
   version "1.2.2"
-  resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"
+  resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/node@*":
-  version "18.6.5"
-  resolved "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz#06caea822caf9e59d5034b695186ee74154d2802"
-  integrity sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==
-
-"@types/node@>=13.7.0":
-  version "20.2.1"
-  resolved "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz#de559d4b33be9a808fd43372ccee822c70f39704"
-  integrity sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "20.4.9"
+  resolved "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz#c7164e0f8d3f12dfae336af0b1f7fdec8c6b204f"
+  integrity sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
-  resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
+  resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
-  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prettier@^2.1.5", "@types/prettier@^2.6.1":
-  version "2.7.0"
-  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc"
-  integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==
+  version "2.7.3"
+  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
+  integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
 
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
@@ -3343,15 +2852,15 @@
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^17.0.8":
-  version "17.0.11"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz#5e10ca33e219807c0eee0f08b5efcba9b6a42c06"
-  integrity sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==
+  version "17.0.24"
+  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
+  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
   dependencies:
     "@types/yargs-parser" "*"
 
 JSONStream@^1.0.4:
   version "1.3.5"
-  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"
+  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
   integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
@@ -3359,7 +2868,7 @@ JSONStream@^1.0.4:
 
 abbrev@1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
+  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 acorn-jsx@^5.3.2:
@@ -3367,35 +2876,33 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
 add-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
+  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
 agentkeepalive@^4.1.3:
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
   dependencies:
-    debug "^4.1.0"
-    depd "^1.1.2"
     humanize-ms "^1.2.1"
 
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
@@ -3403,7 +2910,7 @@ aggregate-error@^3.0.0:
 
 ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -3413,12 +2920,12 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
 
 ansi-escapes@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
   integrity sha512-tH/fSoQp4DrEodDK3QpdiWiZTSe7sBJ9eOqcQBZ0o9HTM+5M/viSEn+sPMoTuPjQQ8n++w3QJoPEjt8LVPcrCg==
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"
+  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-escapes@^4.2.1:
@@ -3430,17 +2937,17 @@ ansi-escapes@^4.2.1:
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
   integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
   integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.1:
@@ -3450,7 +2957,7 @@ ansi-regex@^5.0.1:
 
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
 ansi-styles@^3.2.1:
@@ -3474,30 +2981,30 @@ ansi-styles@^5.0.0:
 
 any-promise@^1.0.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"
+  resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
 anymatch@^3.0.3, anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
 aproba@^1.0.3:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"
+  resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 aproba@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
 are-we-there-yet@~1.1.2:
   version "1.1.7"
-  resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"
+  resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
   integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
   dependencies:
     delegates "^1.0.0"
@@ -3515,14 +3022,22 @@ argparse@^2.0.1:
   resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
+
 array-differ@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
   integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
 
 array-ify@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
   integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==
 
 array-union@^2.1.0:
@@ -3530,70 +3045,87 @@ array-union@^2.1.0:
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.reduce@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz"
-  integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==
+array.prototype.reduce@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
+  integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
     es-array-method-boxes-properly "^1.0.0"
     is-string "^1.0.7"
 
+arraybuffer.prototype.slice@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
+  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 arrify@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
 asap@^2.0.0:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
+  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
 asn1@~0.2.3:
   version "0.2.6"
-  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"
+  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
   integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
 ast-stringify@0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/ast-stringify/-/ast-stringify-0.1.0.tgz"
+  resolved "https://registry.npmjs.org/ast-stringify/-/ast-stringify-0.1.0.tgz#5c6439fbfb4513dcc26c7d34464ccd084ed91cb7"
   integrity sha512-J1PgFYV3RG6r37+M6ySZJH406hR82okwGvFM9hLXpOvdx4WC4GEW8/qiw6pi1hKTrqcRvoHP8a7mp87egYr6iA==
   dependencies:
     "@babel/runtime" "^7.11.2"
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 aws-sign2@~0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
+  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+  version "1.12.0"
+  resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
+  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
 axios@^0.21.2:
   version "0.21.4"
@@ -3604,7 +3136,7 @@ axios@^0.21.2:
 
 babel-core@7.0.0-bridge.0:
   version "7.0.0-bridge.0"
-  resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz"
+  resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
 babel-jest@28.1.3, babel-jest@^28.1.3:
@@ -3620,13 +3152,6 @@ babel-jest@28.1.3, babel-jest@^28.1.3:
     graceful-fs "^4.2.9"
     slash "^3.0.0"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
@@ -3650,7 +3175,7 @@ babel-plugin-jest-hoist@^28.1.3:
 
 babel-plugin-macros@2.8.0:
   version "2.8.0"
-  resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"
+  resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
   dependencies:
     "@babel/runtime" "^7.7.2"
@@ -3658,12 +3183,12 @@ babel-plugin-macros@2.8.0:
     resolve "^1.12.0"
 
 babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
-  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
 babel-plugin-polyfill-corejs3@^0.5.3:
@@ -3675,11 +3200,11 @@ babel-plugin-polyfill-corejs3@^0.5.3:
     core-js-compat "^3.21.0"
 
 babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
-  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
@@ -3708,9 +3233,9 @@ babel-preset-jest@^28.1.3:
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-watch@^7.0.0:
-  version "7.7.0"
-  resolved "https://registry.npmjs.org/babel-watch/-/babel-watch-7.7.0.tgz"
-  integrity sha512-PKytGmhgXWcNmNK+Y0fEQ/0+re8jDVAAppL1JGqdPKihab2siG5dzbM1dnKXvn0VWOW1ybJjiW+dDb6nV0S1KA==
+  version "7.8.1"
+  resolved "https://registry.npmjs.org/babel-watch/-/babel-watch-7.8.1.tgz#3be4016d61bfefae9522c116ef9ba209088e6498"
+  integrity sha512-TnAlLAaorqMruh3BaTiXbbuv/b8iHqqvlljaWkCCJQLRsVFn7nUKO+38+DGxEaFvlj/IgIlQlx+DMirxSHiC4g==
   dependencies:
     chalk "^4.1.0"
     chokidar "^3.4.3"
@@ -3719,8 +3244,9 @@ babel-watch@^7.0.0:
     lodash.debounce "^4.0.8"
     lodash.isregexp "^4.0.1"
     lodash.isstring "^4.0.1"
+    signal-exit "^4.0.2"
     source-map-support "^0.5.19"
-    string-argv "^0.3.1"
+    string-argv "^0.3.2"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -3734,7 +3260,7 @@ base64-js@^1.3.0:
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
   integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
   dependencies:
     tweetnacl "^0.14.3"
@@ -3745,9 +3271,9 @@ bech32@^1.1.4:
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
 before-after-hook@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"
-  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
+  version "2.2.3"
+  resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
+  integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
 binary-extensions@^2.0.0:
   version "2.2.0"
@@ -3774,7 +3300,7 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
@@ -3791,30 +3317,19 @@ brorand@^1.1.0:
   resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
-browserslist@^4.11.1, browserslist@^4.20.4:
-  version "4.20.4"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz"
-  integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
-  dependencies:
-    caniuse-lite "^1.0.30001349"
-    electron-to-chromium "^1.4.147"
-    escalade "^3.1.1"
-    node-releases "^2.0.5"
-    picocolors "^1.0.0"
-
-browserslist@^4.20.2:
-  version "4.21.3"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
-  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
+browserslist@^4.11.1, browserslist@^4.21.9:
+  version "4.21.10"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
+  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
   dependencies:
-    caniuse-lite "^1.0.30001370"
-    electron-to-chromium "^1.4.202"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.5"
+    caniuse-lite "^1.0.30001517"
+    electron-to-chromium "^1.4.477"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.11"
 
 bs-logger@0.x:
   version "0.2.6"
-  resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"
+  resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
   dependencies:
     fast-json-stable-stringify "2.x"
@@ -3833,22 +3348,22 @@ buffer-from@^1.0.0:
 
 builtins@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
 byline@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
 
 byte-size@^7.0.0:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz"
+  resolved "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3"
   integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==
 
 cacache@^15.0.5, cacache@^15.2.0:
   version "15.3.0"
-  resolved "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
   dependencies:
     "@npmcli/fs" "^1.0.0"
@@ -3872,16 +3387,16 @@ cacache@^15.0.5, cacache@^15.2.0:
 
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
 call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"
-  integrity sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
+  integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -3890,7 +3405,7 @@ callsites@^3.0.0:
 
 camelcase-keys@^6.2.2:
   version "6.2.2"
-  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"
+  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
   integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
     camelcase "^5.3.1"
@@ -3907,24 +3422,24 @@ camelcase@^6.2.0:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001349, caniuse-lite@^1.0.30001370:
-  version "1.0.30001374"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz#3dab138e3f5485ba2e74bd13eca7fe1037ce6f57"
-  integrity sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==
+caniuse-lite@^1.0.30001517:
+  version "1.0.30001519"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz#3e7b8b8a7077e78b0eb054d69e6edf5c7df35601"
+  integrity sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==
 
 case@1.6.3:
   version "1.6.3"
-  resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz"
+  resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
   integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
+  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
   dependencies:
     ansi-styles "^2.2.1"
@@ -3933,7 +3448,7 @@ chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3957,17 +3472,17 @@ char-regex@^1.0.2:
 
 chardet@^0.4.0:
   version "0.4.2"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"
+  resolved "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
   integrity sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==
 
 chardet@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
+  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 chokidar@^3.4.0, chokidar@^3.4.3:
   version "3.5.3"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
+  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
     anymatch "~3.1.2"
@@ -3982,32 +3497,32 @@ chokidar@^3.4.0, chokidar@^3.4.3:
 
 chownr@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
+  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 chownr@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 ci-info@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 ci-info@^3.2.0:
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128"
-  integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==
+  version "3.8.0"
+  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
 
 cjs-module-lexer@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
-  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
+  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
 cli-color@^2.0.2:
@@ -4023,26 +3538,26 @@ cli-color@^2.0.2:
 
 cli-cursor@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
+  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
 cli-width@^2.0.0:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"
+  resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
 cli-width@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
 cliui@^7.0.2:
@@ -4054,9 +3569,18 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"
+  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
   integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
   dependencies:
     is-plain-object "^2.0.4"
@@ -4065,12 +3589,12 @@ clone-deep@^4.0.1:
 
 clone@^1.0.2:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
 cmd-shim@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz"
+  resolved "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
   integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
@@ -4082,13 +3606,13 @@ co@^4.6.0:
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
 collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
 
 color-convert@^1.9.0:
   version "1.9.3"
@@ -4116,12 +3640,12 @@ color-name@~1.1.4:
 
 colors@^1.1.2:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"
+  resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
 columnify@^1.5.4:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz"
+  resolved "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
   integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
   dependencies:
     strip-ansi "^6.0.1"
@@ -4129,7 +3653,7 @@ columnify@^1.5.4:
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
+  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
@@ -4141,17 +3665,17 @@ commander@^4.0.1:
 
 commander@^6.2.0:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
+  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 compare-func@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
   integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==
   dependencies:
     array-ify "^1.0.0"
@@ -4164,7 +3688,7 @@ concat-map@0.0.1:
 
 concat-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
   integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
   dependencies:
     buffer-from "^1.0.0"
@@ -4174,7 +3698,7 @@ concat-stream@^2.0.0:
 
 config-chain@^1.1.12:
   version "1.1.13"
-  resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"
+  resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
   integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
   dependencies:
     ini "^1.3.4"
@@ -4182,12 +3706,12 @@ config-chain@^1.1.12:
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 conventional-changelog-angular@^5.0.12:
   version "5.0.13"
-  resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz"
+  resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c"
   integrity sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==
   dependencies:
     compare-func "^2.0.0"
@@ -4195,7 +3719,7 @@ conventional-changelog-angular@^5.0.12:
 
 conventional-changelog-core@^4.2.2:
   version "4.2.4"
-  resolved "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz"
+  resolved "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz#e50d047e8ebacf63fac3dc67bf918177001e1e9f"
   integrity sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==
   dependencies:
     add-stream "^1.0.0"
@@ -4215,12 +3739,12 @@ conventional-changelog-core@^4.2.2:
 
 conventional-changelog-preset-loader@^2.3.4:
   version "2.3.4"
-  resolved "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz"
+  resolved "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c"
   integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==
 
 conventional-changelog-writer@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz"
+  resolved "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359"
   integrity sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==
   dependencies:
     conventional-commits-filter "^2.0.7"
@@ -4235,7 +3759,7 @@ conventional-changelog-writer@^5.0.0:
 
 conventional-commits-filter@^2.0.7:
   version "2.0.7"
-  resolved "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz"
+  resolved "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3"
   integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==
   dependencies:
     lodash.ismatch "^4.4.0"
@@ -4243,7 +3767,7 @@ conventional-commits-filter@^2.0.7:
 
 conventional-commits-parser@^3.2.0:
   version "3.2.4"
-  resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz"
+  resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972"
   integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==
   dependencies:
     JSONStream "^1.0.4"
@@ -4255,7 +3779,7 @@ conventional-commits-parser@^3.2.0:
 
 conventional-recommended-bump@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz"
+  resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55"
   integrity sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==
   dependencies:
     concat-stream "^2.0.0"
@@ -4268,38 +3792,35 @@ conventional-recommended-bump@^6.1.0:
     q "^1.5.1"
 
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.6.2:
-  version "3.23.1"
-  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.1.tgz"
-  integrity sha512-KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A==
+  version "3.32.0"
+  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.0.tgz#f41574b6893ab15ddb0ac1693681bd56c8550a90"
+  integrity sha512-7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw==
   dependencies:
-    browserslist "^4.20.4"
-    semver "7.0.0"
+    browserslist "^4.21.9"
 
-core-js@^3.22.1:
-  version "3.23.1"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz"
-  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
+core-js@^3.30.2:
+  version "3.32.0"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz#7643d353d899747ab1f8b03d2803b0312a0fb3b6"
+  integrity sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww==
 
 core-util-is@1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cosmiconfig@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
   integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
   dependencies:
     "@types/parse-json" "^4.0.0"
@@ -4309,9 +3830,9 @@ cosmiconfig@^6.0.0:
     yaml "^1.7.2"
 
 cosmiconfig@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+  version "7.1.0"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -4329,7 +3850,7 @@ cosmjs-types@^0.7.1:
 
 cross-env@^7.0.2:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
+  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
   integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
@@ -4345,7 +3866,7 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
 
 d@1, d@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
   integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
   dependencies:
     es5-ext "^0.10.50"
@@ -4353,19 +3874,19 @@ d@1, d@^1.0.1:
 
 dargs@7.0.0, dargs@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz"
+  resolved "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
   integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
 
 dashdash@^1.12.0:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
+  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
   integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
   dependencies:
     assert-plus "^1.0.0"
 
 dateformat@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"
+  resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
@@ -4377,26 +3898,26 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
 
 debuglog@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
 
 decamelize-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"
-  integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
 decamelize@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
-  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+  version "0.2.2"
+  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -4408,54 +3929,54 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@4.2.2, deepmerge@^4.2.2:
+deepmerge@4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"
-  integrity sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
   dependencies:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 delegates@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
-depd@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
-  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"
+  resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
 detect-indent@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==
 
 detect-indent@^6.0.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz"
+  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
 detect-newline@^3.0.0:
@@ -4465,7 +3986,7 @@ detect-newline@^3.0.0:
 
 dezalgo@^1.0.0:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
   integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
   dependencies:
     asap "^2.0.0"
@@ -4492,14 +4013,14 @@ doctrine@^3.0.0:
 
 dot-prop@^5.1.0:
   version "5.3.0"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"
+  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
   integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
     is-obj "^2.0.0"
 
 dot-prop@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz"
+  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
   integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
   dependencies:
     is-obj "^2.0.0"
@@ -4511,26 +4032,21 @@ dotty@0.1.2:
 
 duplexer@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
+  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
+  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
   integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.4.147:
-  version "1.4.211"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz#afaa8b58313807501312d598d99b953568d60f91"
-  integrity sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==
-
-electron-to-chromium@^1.4.202:
-  version "1.4.212"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.212.tgz#20cd48e88288fd2428138c108804edb1961bf559"
-  integrity sha512-LjQUg1SpLj2GfyaPDVBUHdhmlDU1vDB4f0mJWSGkISoXQrn5/lH3ECPCuo2Bkvf6Y30wO+b69te+rZK/llZmjg==
+electron-to-chromium@^1.4.477:
+  version "1.4.488"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.488.tgz#442b1855f8c84fb1ed79f518985c65db94f64cc9"
+  integrity sha512-Dv4sTjiW7t/UWGL+H8ZkgIjtUAVZDgb/PwGWvMsCT7jipzUV/u5skbLXPFKb6iV0tiddVi/bcS2/kUrczeWgIQ==
 
 elliptic@^6.5.4:
   version "6.5.4"
@@ -4557,24 +4073,24 @@ emoji-regex@^8.0.0:
 
 encoding@^0.1.12:
   version "0.1.13"
-  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
+  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
   dependencies:
     iconv-lite "^0.6.2"
 
 env-paths@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"
+  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.4:
-  version "7.8.1"
-  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+  version "7.10.0"
+  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
+  integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
 
 err-code@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"
+  resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
 error-ex@^1.3.1:
@@ -4584,59 +4100,75 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1:
-  version "1.20.1"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
+  version "1.22.1"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
+  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
   dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.1"
+    available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
     function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
+    get-intrinsic "^1.2.1"
     get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
     has "^1.0.3"
     has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
+    is-typed-array "^1.1.10"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
+    object-inspect "^1.12.3"
     object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.4.3"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.0"
+    safe-array-concat "^1.0.0"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.7"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.10"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
   integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
 
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
+  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
   integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.61"
-  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz"
-  integrity sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==
-  dependencies:
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.3"
-    next-tick "^1.1.0"
-
-es5-ext@^0.10.61:
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.61, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
   version "0.10.62"
   resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
   integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
@@ -4647,7 +4179,7 @@ es5-ext@^0.10.61:
 
 es6-iterator@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"
+  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
   dependencies:
     d "1"
@@ -4656,7 +4188,7 @@ es6-iterator@^2.0.3:
 
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"
+  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
   integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
     d "^1.0.1"
@@ -4664,7 +4196,7 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3:
 
 es6-weak-map@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"
+  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
   integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
@@ -4693,9 +4225,9 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-prettier@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"
-  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+  version "8.10.0"
+  resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
+  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
 
 eslint-plugin-prettier@^4.2.1:
   version "4.2.1"
@@ -4704,7 +4236,7 @@ eslint-plugin-prettier@^4.2.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -4713,9 +4245,9 @@ eslint-scope@^5.1.1:
     estraverse "^4.1.1"
 
 eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -4732,10 +4264,10 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.2"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
 
 eslint@8.21.0:
   version "8.21.0"
@@ -4782,14 +4314,14 @@ eslint@8.21.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^9.3.2, espree@^9.3.3:
-  version "9.3.3"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d"
-  integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==
+espree@^9.3.3, espree@^9.4.0:
+  version "9.6.1"
+  resolved "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0:
   version "4.0.1"
@@ -4797,9 +4329,9 @@ esprima@^4.0.0:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -4827,7 +4359,7 @@ esutils@^2.0.2:
 
 event-emitter@^0.3.5:
   version "0.3.5"
-  resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"
+  resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
   dependencies:
     d "1"
@@ -4835,7 +4367,7 @@ event-emitter@^0.3.5:
 
 eventemitter3@^4.0.4:
   version "4.0.7"
-  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 execa@^5.0.0:
@@ -4858,7 +4390,7 @@ exit@^0.1.2:
   resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
-expect@^28.1.3:
+expect@^28.0.0, expect@^28.1.3:
   version "28.1.3"
   resolved "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
   integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
@@ -4870,20 +4402,20 @@ expect@^28.1.3:
     jest-util "^28.1.3"
 
 ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
   dependencies:
-    type "^2.5.0"
+    type "^2.7.2"
 
 extend@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^2.0.4:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"
+  resolved "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
   dependencies:
     chardet "^0.4.0"
@@ -4892,7 +4424,7 @@ external-editor@^2.0.4:
 
 external-editor@^3.0.3:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
+  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
@@ -4901,12 +4433,12 @@ external-editor@^3.0.3:
 
 extsprintf@1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
+  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
   integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
 
 extsprintf@^1.2.0:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz"
+  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
@@ -4915,14 +4447,14 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
 fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  version "3.3.1"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -4941,29 +4473,29 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  version "1.15.0"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
   dependencies:
     reusify "^1.0.4"
 
 fb-watchman@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
-  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
 figures@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
   integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
   dependencies:
     escape-string-regexp "^1.0.5"
 
 figures@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
+  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
@@ -4984,12 +4516,12 @@ fill-range@^7.0.1:
 
 filter-obj@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
   integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
 
 find-cache-dir@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
@@ -4998,14 +4530,14 @@ find-cache-dir@^2.0.0:
 
 find-up@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
   integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
@@ -5035,23 +4567,30 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
-  integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
+  version "3.2.7"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 follow-redirects@^1.14.0:
   version "1.15.2"
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
+
 forever-agent@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
 form-data@~2.3.2:
   version "2.3.3"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
@@ -5060,7 +4599,7 @@ form-data@~2.3.2:
 
 fs-extra@^9.1.0:
   version "9.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
     at-least-node "^1.0.0"
@@ -5070,14 +4609,14 @@ fs-extra@^9.1.0:
 
 fs-minipass@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"
+  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
   dependencies:
     minipass "^2.6.0"
 
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
   dependencies:
     minipass "^3.0.0"
@@ -5104,7 +4643,7 @@ function-bind@^1.1.1:
 
 function.prototype.name@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
+  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
   integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
   dependencies:
     call-bind "^1.0.2"
@@ -5117,19 +4656,19 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
+  resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 fuzzy@0.1.3:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz"
+  resolved "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
   integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
 
 gauge@~2.7.3:
   version "2.7.4"
-  resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"
+  resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
   integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
   dependencies:
     aproba "^1.0.3"
@@ -5151,13 +4690,14 @@ get-caller-file@^2.0.5:
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"
-  integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
 get-package-type@^0.1.0:
@@ -5167,7 +4707,7 @@ get-package-type@^0.1.0:
 
 get-pkg-repo@^4.0.0:
   version "4.2.1"
-  resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz"
+  resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385"
   integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==
   dependencies:
     "@hutson/parse-repository-url" "^3.0.0"
@@ -5177,12 +4717,12 @@ get-pkg-repo@^4.0.0:
 
 get-port@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz"
+  resolved "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
 get-stdin@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz"
+  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
 get-stream@^6.0.0:
@@ -5192,7 +4732,7 @@ get-stream@^6.0.0:
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
   integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
   dependencies:
     call-bind "^1.0.2"
@@ -5200,14 +4740,14 @@ get-symbol-description@^1.0.0:
 
 getpass@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"
+  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
   integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
   dependencies:
     assert-plus "^1.0.0"
 
 git-raw-commits@^2.0.8:
   version "2.0.11"
-  resolved "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz"
+  resolved "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
   integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==
   dependencies:
     dargs "^7.0.0"
@@ -5218,7 +4758,7 @@ git-raw-commits@^2.0.8:
 
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
   integrity sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==
   dependencies:
     gitconfiglocal "^1.0.0"
@@ -5226,7 +4766,7 @@ git-remote-origin-url@^2.0.0:
 
 git-semver-tags@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz"
+  resolved "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780"
   integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==
   dependencies:
     meow "^8.0.0"
@@ -5234,7 +4774,7 @@ git-semver-tags@^4.1.1:
 
 git-up@^4.0.0:
   version "4.0.5"
-  resolved "https://registry.npmjs.org/git-up/-/git-up-4.0.5.tgz"
+  resolved "https://registry.npmjs.org/git-up/-/git-up-4.0.5.tgz#e7bb70981a37ea2fb8fe049669800a1f9a01d759"
   integrity sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==
   dependencies:
     is-ssh "^1.3.0"
@@ -5242,21 +4782,21 @@ git-up@^4.0.0:
 
 git-url-parse@^11.4.4:
   version "11.6.0"
-  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz"
+  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605"
   integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==
   dependencies:
     git-up "^4.0.0"
 
 gitconfiglocal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
   integrity sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==
   dependencies:
     ini "^1.3.2"
 
 glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
@@ -5277,7 +4817,7 @@ glob-promise@^4.2.2:
 
 glob@8.0.3:
   version "8.0.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"
+  resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
   integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -5303,14 +4843,14 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0:
-  version "13.17.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
-  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
+globals@^13.15.0, globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.1:
+globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
@@ -5319,7 +4859,7 @@ globalthis@^1.0.1:
 
 globby@^11.0.2, globby@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -5329,10 +4869,17 @@ globby@^11.0.2, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+  version "4.2.11"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
@@ -5340,12 +4887,12 @@ grapheme-splitter@^1.0.4:
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
 handlebars@^4.7.7:
-  version "4.7.7"
-  resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"
-  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  version "4.7.8"
+  resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
+  integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==
   dependencies:
     minimist "^1.2.5"
-    neo-async "^2.6.0"
+    neo-async "^2.6.2"
     source-map "^0.6.1"
     wordwrap "^1.0.0"
   optionalDependencies:
@@ -5353,12 +4900,12 @@ handlebars@^4.7.7:
 
 har-schema@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
 
 har-validator@~5.1.3:
   version "5.1.5"
-  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"
+  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
   integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
     ajv "^6.12.3"
@@ -5366,19 +4913,19 @@ har-validator@~5.1.3:
 
 hard-rejection@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
@@ -5393,26 +4940,31 @@ has-flag@^4.0.0:
 
 has-property-descriptors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
   integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
   dependencies:
     get-intrinsic "^1.1.1"
 
-has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
   integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
     has-symbols "^1.0.2"
 
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has@^1.0.3:
@@ -5441,19 +4993,19 @@ hmac-drbg@^1.0.1:
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.0, hosted-git-info@^4.0.1:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
     lru-cache "^6.0.0"
@@ -5464,13 +5016,13 @@ html-escaper@^2.0.0:
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-cache-semantics@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-proxy-agent@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"
+  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
   integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
   dependencies:
     "@tootallnate/once" "1"
@@ -5479,7 +5031,7 @@ http-proxy-agent@^4.0.1:
 
 http-signature@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
+  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
   integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
     assert-plus "^1.0.0"
@@ -5488,7 +5040,7 @@ http-signature@~1.2.0:
 
 https-proxy-agent@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"
+  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
@@ -5501,40 +5053,40 @@ human-signals@^2.1.0:
 
 humanize-ms@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"
+  resolved "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
   integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
   dependencies:
     ms "^2.0.0"
 
 iconv-lite@^0.4.17, iconv-lite@^0.4.24:
   version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.6.2:
   version "0.6.3"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
 ignore-walk@^3.0.3:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"
+  resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
   integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+  version "5.2.4"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
@@ -5555,12 +5107,12 @@ imurmurhash@^0.1.4:
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 infer-owner@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
 inflight@^1.0.4:
@@ -5578,17 +5130,17 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
 
 inherits@2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.2, ini@^1.3.4:
   version "1.3.8"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
+  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 init-package-json@^2.0.2:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz"
+  resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
   integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
     npm-package-arg "^8.1.5"
@@ -5601,7 +5153,7 @@ init-package-json@^2.0.2:
 
 inquirer-autocomplete-prompt@^0.11.1:
   version "0.11.1"
-  resolved "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-0.11.1.tgz"
+  resolved "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-0.11.1.tgz#f90ca9510a4c489882e9be294934bd8c2e575e09"
   integrity sha512-VM4eNiyRD4CeUc2cyKni+F8qgHwL9WC4LdOr+mEC85qP/QNsDV+ysVqUrJYhw1TmDQu1QVhc8hbaL7wfk8SJxw==
   dependencies:
     ansi-escapes "^2.0.0"
@@ -5614,7 +5166,7 @@ inquirer-autocomplete-prompt@^0.11.1:
 
 inquirer@3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-3.1.1.tgz"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-3.1.1.tgz#87621c4fba4072f48a8dd71c9f9df6f100b2d534"
   integrity sha512-H50sHQwgvvaTBd3HpKMVtL/u6LoHDvYym51gd7bGQe/+9HkCE+J0/3N5FJLfd6O6oz44hHewC2Pc2LodzWVafQ==
   dependencies:
     ansi-escapes "^2.0.0"
@@ -5634,7 +5186,7 @@ inquirer@3.1.1:
 
 inquirer@^6.0.0:
   version "6.5.2"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
   integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
@@ -5653,7 +5205,7 @@ inquirer@^6.0.0:
 
 inquirer@^7.3.3:
   version "7.3.3"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
   integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
@@ -5672,38 +5224,47 @@ inquirer@^7.3.3:
 
 inquirerer@0.1.3:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/inquirerer/-/inquirerer-0.1.3.tgz"
+  resolved "https://registry.npmjs.org/inquirerer/-/inquirerer-0.1.3.tgz#ecf91dc672b3bf45211d7f64bf5e8d5e171fd2ad"
   integrity sha512-yGgLUOqPxTsINBjZNZeLi3cv2zgxXtw9feaAOSJf2j6AqIT5Uxs5ZOqOrfAf+xP65Sicla1FD3iDxa3D6TsCAQ==
   dependencies:
     colors "^1.1.2"
     inquirer "^6.0.0"
     inquirer-autocomplete-prompt "^0.11.1"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
   dependencies:
-    get-intrinsic "^1.1.0"
+    get-intrinsic "^1.2.0"
     has "^1.0.3"
     side-channel "^1.0.4"
 
 interpret@^1.0.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
+  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 invariant@^2.2.2:
   version "2.2.4"
-  resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"
+  resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
-ip@^1.1.5:
-  version "1.1.8"
-  resolved "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
+ip@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
+  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -5712,7 +5273,7 @@ is-arrayish@^0.2.1:
 
 is-bigint@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
   integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
   dependencies:
     has-bigints "^1.0.1"
@@ -5726,41 +5287,34 @@ is-binary-path@~2.1.0:
 
 is-boolean-object@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
   integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-ci@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
   integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.5.0:
-  version "2.9.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.10.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
-  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+is-core-module@^2.13.0, is-core-module@^2.5.0:
+  version "2.13.0"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
   dependencies:
     has "^1.0.3"
 
 is-date-object@^1.0.1:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"
+  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   dependencies:
     has-tostringtag "^1.0.0"
@@ -5772,14 +5326,14 @@ is-extglob@^2.1.1:
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
   integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
 is-fullwidth-code-point@^3.0.0:
@@ -5801,17 +5355,17 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
 
 is-lambda@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
   integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
 is-negative-zero@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
+  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"
+  resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
   integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
     has-tostringtag "^1.0.0"
@@ -5823,39 +5377,39 @@ is-number@^7.0.0:
 
 is-obj@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
 is-plain-obj@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
 is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-plain-object@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
 is-promise@^2.2.2:
   version "2.2.2"
-  resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"
+  resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
 is-regex@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
+  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
     call-bind "^1.0.2"
@@ -5863,17 +5417,17 @@ is-regex@^1.1.4:
 
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
   dependencies:
     call-bind "^1.0.2"
 
 is-ssh@^1.3.0:
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz"
-  integrity sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
+  integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
   dependencies:
-    protocols "^1.1.0"
+    protocols "^2.0.1"
 
 is-stream@^2.0.0:
   version "2.0.1"
@@ -5882,40 +5436,52 @@ is-stream@^2.0.0:
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
+  resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
     has-symbols "^1.0.2"
 
 is-text-path@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
   integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==
   dependencies:
     text-extensions "^1.0.0"
 
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
+
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
 is-weakref@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
@@ -5925,7 +5491,7 @@ isexe@^2.0.0:
 
 isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 isomorphic-ws@^4.0.1:
@@ -5935,7 +5501,7 @@ isomorphic-ws@^4.0.1:
 
 isstream@~0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
 
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
@@ -5944,9 +5510,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
 istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f"
-  integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/parser" "^7.14.7"
@@ -5955,12 +5521,12 @@ istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
     semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
+    make-dir "^4.0.0"
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^4.0.0:
@@ -5973,9 +5539,9 @@ istanbul-lib-source-maps@^4.0.0:
     source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+  version "3.1.6"
+  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
+  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -6059,16 +5625,6 @@ jest-config@^28.1.3:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.1.tgz"
-  integrity sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^28.1.1"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.1"
-
 jest-diff@^28.1.3:
   version "28.1.3"
   resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
@@ -6135,7 +5691,7 @@ jest-haste-map@^28.1.3:
 
 jest-in-case@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/jest-in-case/-/jest-in-case-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/jest-in-case/-/jest-in-case-1.0.2.tgz#56744b5af33222bd0abab70cf919f1d170ab75cc"
   integrity sha512-2DE6Gdwnh5jkCYTePWoQinF+zne3lCADibXoYJEt8PS84JaRug0CyAOrEgzMxbzln3YcSY2PBeru7ct4tbflYA==
 
 jest-leak-detector@^28.1.3:
@@ -6146,16 +5702,6 @@ jest-leak-detector@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
-jest-matcher-utils@^28.0.0:
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz"
-  integrity sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^28.1.1"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.1"
-
 jest-matcher-utils@^28.1.3:
   version "28.1.3"
   resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
@@ -6190,9 +5736,9 @@ jest-mock@^28.1.3:
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
 jest-regex-util@^28.0.2:
   version "28.0.2"
@@ -6306,19 +5852,7 @@ jest-snapshot@^28.1.3:
     pretty-format "^28.1.3"
     semver "^7.3.5"
 
-jest-util@^28.0.0:
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz"
-  integrity sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==
-  dependencies:
-    "@jest/types" "^28.1.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-util@^28.1.3:
+jest-util@^28.0.0, jest-util@^28.1.3:
   version "28.1.3"
   resolved "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
   integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
@@ -6397,7 +5931,7 @@ js-yaml@^4.1.0:
 
 jsbn@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
 jsesc@^2.5.1:
@@ -6407,12 +5941,12 @@ jsesc@^2.5.1:
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-parse-even-better-errors@^2.3.0:
@@ -6437,17 +5971,17 @@ json-stable-stringify-without-jsonify@^1.0.1:
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^2.1.2, json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+json5@^2.1.2, json5@^2.2.1, json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonfile@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
   integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
     universalify "^2.0.0"
@@ -6456,12 +5990,12 @@ jsonfile@^6.0.1:
 
 jsonparse@^1.2.0, jsonparse@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
+  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
 jsprim@^1.2.2:
   version "1.4.2"
-  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"
+  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
   integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
   dependencies:
     assert-plus "1.0.0"
@@ -6471,7 +6005,7 @@ jsprim@^1.2.2:
 
 kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
@@ -6481,7 +6015,7 @@ kleur@^3.0.3:
 
 lerna@4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz#b139d685d50ea0ca1be87713a7c2f44a5b678e9e"
   integrity sha512-DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg==
   dependencies:
     "@lerna/add" "4.0.0"
@@ -6510,7 +6044,7 @@ leven@^3.1.0:
 
 levenary@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"
+  resolved "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
   integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
   dependencies:
     leven "^3.1.0"
@@ -6525,7 +6059,7 @@ levn@^0.4.1:
 
 libnpmaccess@^4.0.1:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.3.tgz"
+  resolved "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
   integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
     aproba "^2.0.0"
@@ -6535,7 +6069,7 @@ libnpmaccess@^4.0.1:
 
 libnpmpublish@^4.0.0:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.2.tgz"
+  resolved "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
   integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
     normalize-package-data "^3.0.2"
@@ -6563,7 +6097,7 @@ lines-and-columns@^1.1.6:
 
 load-json-file@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
   integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
   dependencies:
     graceful-fs "^4.1.2"
@@ -6573,7 +6107,7 @@ load-json-file@^4.0.0:
 
 load-json-file@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
   integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==
   dependencies:
     graceful-fs "^4.1.15"
@@ -6583,7 +6117,7 @@ load-json-file@^6.2.0:
 
 locate-path@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
   integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
   dependencies:
     p-locate "^2.0.0"
@@ -6591,7 +6125,7 @@ locate-path@^2.0.0:
 
 locate-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
   integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
@@ -6613,32 +6147,32 @@ locate-path@^6.0.0:
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.ismatch@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz"
+  resolved "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
 lodash.isregexp@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz"
+  resolved "https://registry.npmjs.org/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz#e13e647b30cd559752a04cd912086faf7da1c30b"
   integrity sha512-rw9+95tYcUa9nQ1FgdtKvO+hReLGNqnNMHfLq8SwK5Mo6D0R0tIsnRHGHaTHSKeYBaLCJ1JvXWdz4UmpPZ2bag==
 
 lodash.isstring@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"
+  resolved "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
 
 lodash.memoize@4.x:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
+  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
@@ -6648,7 +6182,7 @@ lodash.merge@^4.6.2:
 
 lodash.template@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"
+  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
   integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
     lodash._reinterpolate "^3.0.0"
@@ -6656,14 +6190,14 @@ lodash.template@^4.5.0:
 
 lodash.templatesettings@^4.0.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"
+  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
   integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
 lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.7.0:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 long@^4.0.0:
@@ -6672,17 +6206,24 @@ long@^4.0.0:
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
 long@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/long/-/long-5.2.0.tgz"
-  integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w==
+  version "5.2.3"
+  resolved "https://registry.npmjs.org/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
 
 loose-envify@^1.0.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
+  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -6692,7 +6233,7 @@ lru-cache@^6.0.0:
 
 lru-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"
+  resolved "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
   integrity sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==
   dependencies:
     es5-ext "~0.10.2"
@@ -6712,14 +6253,21 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
 make-error@1.x:
   version "1.3.6"
-  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
+  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 make-fetch-happen@^8.0.9:
   version "8.0.14"
-  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz"
+  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
   integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==
   dependencies:
     agentkeepalive "^4.1.3"
@@ -6740,7 +6288,7 @@ make-fetch-happen@^8.0.9:
 
 make-fetch-happen@^9.0.1:
   version "9.1.0"
-  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"
+  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
   integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
   dependencies:
     agentkeepalive "^4.1.3"
@@ -6769,17 +6317,17 @@ makeerror@1.0.12:
 
 map-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 map-obj@^4.0.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 memoizee@^0.4.15:
   version "0.4.15"
-  resolved "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz"
+  resolved "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
   integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
   dependencies:
     d "^1.0.1"
@@ -6793,7 +6341,7 @@ memoizee@^0.4.15:
 
 meow@^8.0.0:
   version "8.1.2"
-  resolved "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz"
+  resolved "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
   integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==
   dependencies:
     "@types/minimist" "^1.2.0"
@@ -6828,19 +6376,19 @@ micromatch@^4.0.4:
 
 mime-db@1.52.0:
   version "1.52.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
-  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"
+  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-fn@^2.1.0:
@@ -6850,7 +6398,7 @@ mimic-fn@^2.1.0:
 
 min-indent@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
@@ -6871,36 +6419,41 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
     brace-expansion "^1.1.7"
 
 minimatch@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"
-  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  version "5.1.6"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
 
 minimist-options@4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"
+  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@1.2.6:
   version "1.2.6"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
   integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
   dependencies:
     minipass "^3.0.0"
 
 minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"
+  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
   integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
   dependencies:
     minipass "^3.1.0"
@@ -6911,14 +6464,14 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
 
 minipass-flush@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"
+  resolved "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
   integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
   dependencies:
     minipass "^3.0.0"
 
 minipass-json-stream@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
   integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
   dependencies:
     jsonparse "^1.3.1"
@@ -6926,43 +6479,48 @@ minipass-json-stream@^1.0.1:
 
 minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"
+  resolved "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
 minipass-sized@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"
+  resolved "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
   integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
   dependencies:
     minipass "^3.0.0"
 
 minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
 minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  version "3.3.6"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 minizlib@^1.3.3:
   version "1.3.3"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"
+  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
   dependencies:
     minipass "^2.9.0"
 
 minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"
+  resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
@@ -6970,7 +6528,7 @@ minizlib@^2.0.0, minizlib@^2.1.1:
 
 mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
   dependencies:
     chownr "^2.0.0"
@@ -6979,19 +6537,19 @@ mkdirp-infer-owner@^2.0.0:
 
 mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.6"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
 modify-values@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 ms@2.1.2:
@@ -7001,12 +6559,12 @@ ms@2.1.2:
 
 ms@^2.0.0:
   version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 multimatch@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6"
   integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
   dependencies:
     "@types/minimatch" "^3.0.3"
@@ -7017,17 +6575,17 @@ multimatch@^5.0.0:
 
 mute-stream@0.0.7:
   version "0.0.7"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"
+  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
 
 mute-stream@0.0.8, mute-stream@~0.0.4:
   version "0.0.8"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
+  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 mz@^2.7.0:
   version "2.7.0"
-  resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"
+  resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
   integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
   dependencies:
     any-promise "^1.0.0"
@@ -7041,37 +6599,37 @@ natural-compare@^1.4.0:
 
 negotiator@^0.6.2:
   version "0.6.3"
-  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
+  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.6.0:
+neo-async@^2.6.2:
   version "2.6.2"
-  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
+  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 next-tick@1, next-tick@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
 node-environment-flags@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"
+  resolved "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
   integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
 node-fetch@^2.6.1, node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  version "2.6.12"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
+  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
   dependencies:
     whatwg-url "^5.0.0"
 
 node-gyp@^5.0.2:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.1.tgz"
+  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
   integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
   dependencies:
     env-paths "^2.2.0"
@@ -7088,7 +6646,7 @@ node-gyp@^5.0.2:
 
 node-gyp@^7.1.0:
   version "7.1.2"
-  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"
+  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
   integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
@@ -7107,14 +6665,14 @@ node-int64@^0.4.0:
   resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.5, node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
 nopt@^4.0.1:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"
+  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
   integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
   dependencies:
     abbrev "1"
@@ -7122,14 +6680,14 @@ nopt@^4.0.1:
 
 nopt@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
   integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
   dependencies:
     abbrev "1"
 
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -7139,7 +6697,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-
 
 normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
     hosted-git-info "^4.0.1"
@@ -7154,26 +6712,26 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 
 normalize-url@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"
+  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
 npm-bundled@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"
+  resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
 npm-install-checks@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
   integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
 npm-lifecycle@^3.1.5:
   version "3.1.5"
-  resolved "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz"
+  resolved "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309"
   integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==
   dependencies:
     byline "^5.0.0"
@@ -7187,12 +6745,12 @@ npm-lifecycle@^3.1.5:
 
 npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
 npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
   version "8.1.5"
-  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz"
+  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
   integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
     hosted-git-info "^4.0.1"
@@ -7201,7 +6759,7 @@ npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-pack
 
 npm-packlist@^2.1.4:
   version "2.2.2"
-  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz"
+  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
   integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
     glob "^7.1.6"
@@ -7211,7 +6769,7 @@ npm-packlist@^2.1.4:
 
 npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
   version "6.1.1"
-  resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz"
+  resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
   integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
     npm-install-checks "^4.0.0"
@@ -7221,7 +6779,7 @@ npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
 
 npm-registry-fetch@^11.0.0:
   version "11.0.0"
-  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz"
+  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
   integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
     make-fetch-happen "^9.0.1"
@@ -7233,7 +6791,7 @@ npm-registry-fetch@^11.0.0:
 
 npm-registry-fetch@^9.0.0:
   version "9.0.0"
-  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz"
+  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
   integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==
   dependencies:
     "@npmcli/ci-detect" "^1.0.0"
@@ -7254,7 +6812,7 @@ npm-run-path@^4.0.1:
 
 npmlog@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"
+  resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
@@ -7264,48 +6822,49 @@ npmlog@^4.1.2:
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
-  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
+  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.2"
-  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"
-  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+object-inspect@^1.12.3, object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
 object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
+  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
 object.getownpropertydescriptors@^2.0.3:
-  version "2.1.4"
-  resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz"
-  integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==
+  version "2.1.6"
+  resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
+  integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
   dependencies:
-    array.prototype.reduce "^1.0.4"
+    array.prototype.reduce "^1.0.5"
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.21.2"
+    safe-array-concat "^1.0.0"
 
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
@@ -7316,43 +6875,43 @@ once@^1.3.0, once@^1.4.0:
 
 onetime@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
   integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
   dependencies:
     mimic-fn "^1.0.0"
 
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
 optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  version "0.9.3"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 os-homedir@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 osenv@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"
+  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
@@ -7360,12 +6919,12 @@ osenv@^0.1.4:
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^1.1.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
@@ -7386,14 +6945,14 @@ p-limit@^3.0.2, p-limit@^3.1.0:
 
 p-locate@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
   integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
@@ -7414,24 +6973,24 @@ p-locate@^5.0.0:
 
 p-map-series@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2"
   integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==
 
 p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
 p-pipe@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz"
+  resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
   integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==
 
 p-queue@^6.6.2:
   version "6.6.2"
-  resolved "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"
+  resolved "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
   integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
   dependencies:
     eventemitter3 "^4.0.4"
@@ -7439,19 +6998,19 @@ p-queue@^6.6.2:
 
 p-reduce@^2.0.0, p-reduce@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
   integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
 
 p-timeout@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
+  resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
   integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
 
 p-try@^2.0.0:
@@ -7461,14 +7020,14 @@ p-try@^2.0.0:
 
 p-waterfall@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz"
+  resolved "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz#63153a774f472ccdc4eb281cdb2967fcf158b2ee"
   integrity sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==
   dependencies:
     p-reduce "^2.0.0"
 
 pacote@^11.2.6:
   version "11.3.5"
-  resolved "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz"
+  resolved "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
   integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
     "@npmcli/git" "^2.1.0"
@@ -7505,7 +7064,7 @@ parent-module@^1.0.0:
 
 parse-json@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
   integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
@@ -7513,7 +7072,7 @@ parse-json@^4.0.0:
 
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -7528,12 +7087,12 @@ parse-package-name@1.0.0:
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 parse-path@^4.0.0:
   version "4.0.4"
-  resolved "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz"
+  resolved "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea"
   integrity sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==
   dependencies:
     is-ssh "^1.3.0"
@@ -7542,9 +7101,9 @@ parse-path@^4.0.0:
     query-string "^6.13.8"
 
 parse-url@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/parse-url/-/parse-url-6.0.0.tgz"
-  integrity sha512-cYyojeX7yIIwuJzledIHeLUBVJ6COVLeT4eF+2P6aKVzwvgKQPndCBv3+yQ7pcWjqToYwaligxzSYNNmGoMAvw==
+  version "6.0.5"
+  resolved "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz#4acab8982cef1846a0f8675fa686cef24b2f6f9b"
+  integrity sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==
   dependencies:
     is-ssh "^1.3.0"
     normalize-url "^6.1.0"
@@ -7553,7 +7112,7 @@ parse-url@^6.0.0:
 
 path-exists@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
@@ -7578,7 +7137,7 @@ path-parse@^1.0.7:
 
 path-type@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
   integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
@@ -7590,7 +7149,7 @@ path-type@^4.0.0:
 
 performance-now@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
 picocolors@^1.0.0:
@@ -7605,12 +7164,12 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
 
 pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pify@^4.0.1:
@@ -7620,17 +7179,17 @@ pify@^4.0.1:
 
 pify@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
 
 pirates@^4.0.4, pirates@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+  version "4.0.6"
+  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
   integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
@@ -7654,22 +7213,17 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@2.7.1, prettier@^2.6.2, prettier@^2.7.1:
+prettier@2.7.1:
   version "2.7.1"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
   integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
-pretty-format@^28.0.0, pretty-format@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz"
-  integrity sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==
-  dependencies:
-    "@jest/schemas" "^28.0.2"
-    ansi-regex "^5.0.1"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
+prettier@^2.6.2, prettier@^2.7.1:
+  version "2.8.8"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-pretty-format@^28.1.3:
+pretty-format@^28.0.0, pretty-format@^28.1.3:
   version "28.1.3"
   resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
   integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
@@ -7681,17 +7235,17 @@ pretty-format@^28.1.3:
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
 promise-retry@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
   integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
   dependencies:
     err-code "^2.0.2"
@@ -7707,14 +7261,14 @@ prompts@^2.0.1:
 
 promzard@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+  resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
   integrity sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw==
   dependencies:
     read "1"
 
 proto-list@~1.2.1:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+  resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
 protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
@@ -7736,41 +7290,46 @@ protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
     "@types/node" ">=13.7.0"
     long "^4.0.0"
 
-protocols@^1.1.0, protocols@^1.4.0:
+protocols@^1.4.0:
   version "1.4.8"
-  resolved "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz"
+  resolved "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8"
   integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==
 
+protocols@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
+  integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
+
 psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  version "1.9.0"
+  resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 q@^1.5.1:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
+  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
 qs@^6.9.4:
-  version "6.10.5"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.10.5.tgz"
-  integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==
+  version "6.11.2"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
   dependencies:
     side-channel "^1.0.4"
 
 qs@~6.5.2:
   version "6.5.3"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
   integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
 query-string@^6.13.8:
   version "6.14.1"
-  resolved "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz"
+  resolved "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
   integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
   dependencies:
     decode-uri-component "^0.2.0"
@@ -7785,7 +7344,7 @@ queue-microtask@^1.2.2:
 
 quick-lru@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"
+  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
 react-is@^18.0.0:
@@ -7795,12 +7354,12 @@ react-is@^18.0.0:
 
 read-cmd-shim@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
   integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
 read-package-json-fast@^2.0.1:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"
+  resolved "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
   dependencies:
     json-parse-even-better-errors "^2.3.0"
@@ -7808,7 +7367,7 @@ read-package-json-fast@^2.0.1:
 
 read-package-json@^2.0.0:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz"
+  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
   integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
   dependencies:
     glob "^7.1.1"
@@ -7818,7 +7377,7 @@ read-package-json@^2.0.0:
 
 read-package-json@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9"
   integrity sha512-aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng==
   dependencies:
     glob "^7.1.1"
@@ -7828,7 +7387,7 @@ read-package-json@^3.0.0:
 
 read-package-json@^4.1.1:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz"
+  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
   integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
     glob "^7.1.1"
@@ -7838,7 +7397,7 @@ read-package-json@^4.1.1:
 
 read-package-tree@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz"
+  resolved "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
   integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
   dependencies:
     read-package-json "^2.0.0"
@@ -7847,7 +7406,7 @@ read-package-tree@^5.3.1:
 
 read-pkg-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
   integrity sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==
   dependencies:
     find-up "^2.0.0"
@@ -7855,7 +7414,7 @@ read-pkg-up@^3.0.0:
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
   integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
     find-up "^4.1.0"
@@ -7864,7 +7423,7 @@ read-pkg-up@^7.0.1:
 
 read-pkg@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
   integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
   dependencies:
     load-json-file "^4.0.0"
@@ -7873,7 +7432,7 @@ read-pkg@^3.0.0:
 
 read-pkg@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
@@ -7883,24 +7442,24 @@ read-pkg@^5.2.0:
 
 read@1, read@~1.0.1:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz"
+  resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
 readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  version "3.6.2"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
 readable-stream@^2.0.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -7912,7 +7471,7 @@ readable-stream@^2.0.6, readable-stream@~2.3.6:
 
 readdir-scoped-modules@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
   dependencies:
     debuglog "^1.0.1"
@@ -7934,96 +7493,84 @@ readonly-date@^1.0.0:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
+  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
   dependencies:
     resolve "^1.1.6"
 
 redent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
   integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-regenerate-unicode-properties@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"
-  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
 regenerate@^1.4.2:
   version "1.4.2"
-  resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
+  resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
-  version "0.13.9"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+regenerator-runtime@^0.13.7:
+  version "0.13.11"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"
-  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
+regenerator-runtime@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
+
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
 
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
-  dependencies:
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
-
-regexpu-core@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
-  integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
+    "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
-
-regjsgen@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"
-  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-regjsparser@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"
-  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
 request@^2.88.0, request@^2.88.2:
   version "2.88.2"
-  resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz"
+  resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
@@ -8070,31 +7617,22 @@ resolve-from@^5.0.0:
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
-
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.22.0"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
+  integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
 
-resolve@^1.20.0:
-  version "1.22.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1:
+  version "1.22.4"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
+  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
   dependencies:
-    is-core-module "^2.9.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
   integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
   dependencies:
     onetime "^2.0.0"
@@ -8102,7 +7640,7 @@ restore-cursor@^2.0.0:
 
 restore-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
+  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
   integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
     onetime "^5.1.0"
@@ -8110,7 +7648,7 @@ restore-cursor@^3.1.0:
 
 retry@^0.12.0:
   version "0.12.0"
-  resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"
+  resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 reusify@^1.0.4:
@@ -8127,14 +7665,14 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
 
 rimraf@^2.6.3:
   version "2.7.1"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
 run-async@^2.2.0, run-async@^2.3.0, run-async@^2.4.0:
   version "2.4.1"
-  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
+  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
@@ -8146,26 +7684,36 @@ run-parallel@^1.1.9:
 
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"
+  resolved "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
   integrity sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==
   dependencies:
     rx-lite "*"
 
 rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"
+  resolved "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
   integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==
 
 rxjs@^6.4.0, rxjs@^6.6.0:
   version "6.6.7"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
+safe-array-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
+  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
@@ -8173,41 +7721,45 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+  version "5.7.2"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 set-blocking@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 shallow-clone@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
   integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
   dependencies:
     kind-of "^6.0.2"
@@ -8226,7 +7778,7 @@ shebang-regex@^3.0.0:
 
 shelljs@0.8.5:
   version "0.8.5"
-  resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"
+  resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
   integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
   dependencies:
     glob "^7.0.0"
@@ -8235,7 +7787,7 @@ shelljs@0.8.5:
 
 side-channel@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
     call-bind "^1.0.0"
@@ -8247,6 +7799,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -8264,17 +7821,17 @@ slash@^3.0.0:
 
 slide@^1.1.6:
   version "1.1.6"
-  resolved "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+  resolved "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
 
 smart-buffer@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
+  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
 socks-proxy-agent@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"
+  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e"
   integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==
   dependencies:
     agent-base "^6.0.2"
@@ -8283,7 +7840,7 @@ socks-proxy-agent@^5.0.0:
 
 socks-proxy-agent@^6.0.0:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz"
+  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
   integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
@@ -8291,23 +7848,23 @@ socks-proxy-agent@^6.0.0:
     socks "^2.6.2"
 
 socks@^2.3.3, socks@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"
-  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+  version "2.7.1"
+  resolved "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
+  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
   dependencies:
-    ip "^1.1.5"
+    ip "^2.0.0"
     smart-buffer "^4.2.0"
 
 sort-keys@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
   integrity sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==
   dependencies:
     is-plain-obj "^1.0.0"
 
 sort-keys@^4.0.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz"
+  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18"
   integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==
   dependencies:
     is-plain-obj "^2.0.0"
@@ -8322,7 +7879,7 @@ source-map-support@0.5.13:
 
 source-map-support@^0.5.16, source-map-support@^0.5.19:
   version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -8330,7 +7887,7 @@ source-map-support@^0.5.16, source-map-support@^0.5.19:
 
 source-map@^0.5.0:
   version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1:
@@ -8339,46 +7896,46 @@ source-map@^0.6.0, source-map@^0.6.1:
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
+  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
+  version "3.0.13"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
+  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
 
 split-on-first@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
   integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
 
 split2@^3.0.0:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"
+  resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
   integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
   dependencies:
     readable-stream "^3.0.0"
 
 split@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
   integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
@@ -8390,7 +7947,7 @@ sprintf-js@~1.0.2:
 
 sshpk@^1.7.0:
   version "1.17.0"
-  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"
+  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
   integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
   dependencies:
     asn1 "~0.2.3"
@@ -8405,27 +7962,27 @@ sshpk@^1.7.0:
 
 ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
-  resolved "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"
+  resolved "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
 stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
 strict-uri-encode@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
-string-argv@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"
-  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+string-argv@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
 string-length@^4.0.1:
   version "4.0.2"
@@ -8437,7 +7994,7 @@ string-length@^4.0.1:
 
 string-width@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
   dependencies:
     code-point-at "^1.0.0"
@@ -8446,7 +8003,7 @@ string-width@^1.0.1:
 
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
@@ -8455,61 +8012,70 @@ string-width@^1.0.1:
 
 string-width@^2.0.0, string-width@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    es-abstract "^1.20.4"
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
   integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-ansi@^5.1.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
     ansi-regex "^4.1.0"
@@ -8523,7 +8089,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 
 strip-bom@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-bom@^4.0.0:
@@ -8538,7 +8104,7 @@ strip-final-newline@^2.0.0:
 
 strip-indent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
   integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
   dependencies:
     min-indent "^1.0.0"
@@ -8550,7 +8116,7 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
 
 strong-log-transformer@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
   integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
   dependencies:
     duplexer "^0.1.1"
@@ -8559,7 +8125,7 @@ strong-log-transformer@^2.1.0:
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^5.3.0:
@@ -8584,9 +8150,9 @@ supports-color@^8.0.0:
     has-flag "^4.0.0"
 
 supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
@@ -8603,7 +8169,7 @@ symbol-observable@^2.0.3:
 
 tar@^4.4.12:
   version "4.4.19"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"
+  resolved "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
   integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
     chownr "^1.1.4"
@@ -8615,25 +8181,25 @@ tar@^4.4.12:
     yallist "^3.1.1"
 
 tar@^6.0.2, tar@^6.1.0:
-  version "6.1.11"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  version "6.1.15"
+  resolved "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^3.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
 temp-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==
 
 temp-write@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/temp-write/-/temp-write-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/temp-write/-/temp-write-4.0.0.tgz#cd2e0825fc826ae72d201dc26eef3bf7e6fc9320"
   integrity sha512-HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==
   dependencies:
     graceful-fs "^4.1.15"
@@ -8661,7 +8227,7 @@ test-exclude@^6.0.0:
 
 text-extensions@^1.0.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz"
+  resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
 text-table@^0.2.0:
@@ -8671,21 +8237,21 @@ text-table@^0.2.0:
 
 thenify-all@^1.0.0:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"
+  resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
   integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
   dependencies:
     thenify ">= 3.1.0 < 4"
 
 "thenify@>= 3.1.0 < 4":
   version "3.3.1"
-  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"
+  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
   integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
   dependencies:
     any-promise "^1.0.0"
 
 through2@^2.0.0:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
+  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -8693,19 +8259,19 @@ through2@^2.0.0:
 
 through2@^4.0.0:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
+  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
   integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
   dependencies:
     readable-stream "3"
 
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 timers-ext@^0.1.7:
   version "0.1.7"
-  resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"
+  resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
   integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
   dependencies:
     es5-ext "~0.10.46"
@@ -8713,7 +8279,7 @@ timers-ext@^0.1.7:
 
 tmp@^0.0.33:
   version "0.0.33"
-  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
@@ -8737,7 +8303,7 @@ to-regex-range@^5.0.1:
 
 tough-cookie@~2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
     psl "^1.1.28"
@@ -8745,25 +8311,25 @@ tough-cookie@~2.5.0:
 
 tr46@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
   integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
   dependencies:
     punycode "^2.1.1"
 
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 trim-newlines@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 ts-jest@^28.0.7:
-  version "28.0.7"
-  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.7.tgz#e18757a9e44693da9980a79127e5df5a98b37ac6"
-  integrity sha512-wWXCSmTwBVmdvWrOpYhal79bDpioDy4rTT+0vyUnE3ZzM7LOAAGG9NXwzkEL/a516rQEgnMmS/WKP9jBPCVJyA==
+  version "28.0.8"
+  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
+  integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
@@ -8776,19 +8342,19 @@ ts-jest@^28.0.7:
 
 tslib@^1.9.0:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
-  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
 type-check@^0.4.0, type-check@~0.4.0:
@@ -8805,7 +8371,7 @@ type-detect@4.0.8:
 
 type-fest@^0.18.0:
   version "0.18.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
 type-fest@^0.20.2:
@@ -8820,64 +8386,103 @@ type-fest@^0.21.3:
 
 type-fest@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
   integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
 
 type-fest@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
 type-fest@^0.8.1:
   version "0.8.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
 type@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz"
+  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
-type@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.npmjs.org/type/-/type-2.6.0.tgz"
-  integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==
+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.npmjs.org/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
 
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
-  resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
+  resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
   integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
   dependencies:
     is-typedarray "^1.0.0"
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 typescript@^4.7.4:
-  version "4.7.4"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"
-  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
+  version "4.9.5"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 uglify-js@^3.1.4:
-  version "3.16.1"
-  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.1.tgz"
-  integrity sha512-X5BGTIDH8U6IQ1TIRP62YC36k+ULAa1d59BxlWvPUJ1NkW5L3FwcGfEzuVvGmhJFBu0YJ5Ge25tmRISqCmLiRQ==
+  version "3.17.4"
+  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
 uid-number@0.0.6:
   version "0.0.6"
-  resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+  resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
   integrity sha512-c461FXIljswCuscZn67xq9PpszkPT6RjheWFQTgCyabJrTUozElanb0YEqv2UGgk247YpcJkFBuSGNvBlpXM9w==
 
 umask@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
+  resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha512-lE/rxOhmiScJu9L6RTNVgB/zZbF+vGC0/p6D3xnkAePI2o0sMyFG966iR5Ki50OI/0mNi2yaRnxfLsPmEZF/JA==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
   integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
     call-bind "^1.0.2"
@@ -8887,60 +8492,60 @@ unbox-primitive@^1.0.2:
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
   integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"
-  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"
-  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 unique-filename@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"
+  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"
+  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
   integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
 universal-user-agent@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"
+  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
   integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
 
 universalify@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
 upath@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz"
+  resolved "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
-  integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -8954,26 +8559,26 @@ uri-js@^4.2.2:
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util-promisify@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz"
+  resolved "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
   integrity sha512-K+5eQPYs14b3+E+hmE2J6gCZ4JmMl9DbYS6BeP2CHq6WMuNxErxf5B/n0fz85L8zUuoO6rIzNNmIQDu/j+1OcA==
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
 
 util@^0.10.3:
   version "0.10.4"
-  resolved "https://registry.npmjs.org/util/-/util-0.10.4.tgz"
+  resolved "https://registry.npmjs.org/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
   integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
 uuid@^3.3.2:
   version "3.4.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 v8-compile-cache@^2.0.3:
@@ -8982,9 +8587,9 @@ v8-compile-cache@^2.0.3:
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
-  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
+  version "9.1.0"
+  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
+  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
@@ -8992,14 +8597,14 @@ v8-to-istanbul@^9.0.1:
 
 v8flags@^3.1.1:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"
+  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
   integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
+  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -9007,14 +8612,14 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
 
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"
+  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
   integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
     builtins "^1.0.3"
 
 verror@1.10.0:
   version "1.10.0"
-  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
+  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
   integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
   dependencies:
     assert-plus "^1.0.0"
@@ -9030,24 +8635,24 @@ walker@^1.0.8:
 
 wcwidth@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"
+  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
   integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webidl-conversions@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 whatwg-url@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
   integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
@@ -9055,7 +8660,7 @@ whatwg-url@^5.0.0:
 
 whatwg-url@^8.4.0:
   version "8.7.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
   integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
   dependencies:
     lodash "^4.7.0"
@@ -9064,7 +8669,7 @@ whatwg-url@^8.4.0:
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
+  resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
     is-bigint "^1.0.1"
@@ -9073,35 +8678,41 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which-typed-array@^1.1.10, which-typed-array@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
+  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 which@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.5"
-  resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"
+  resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
 wordwrap@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
+  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
 wrap-ansi@^7.0.0:
@@ -9120,7 +8731,7 @@ wrappy@1:
 
 write-file-atomic@^2.4.2:
   version "2.4.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
   integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
   dependencies:
     graceful-fs "^4.1.11"
@@ -9129,7 +8740,7 @@ write-file-atomic@^2.4.2:
 
 write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
     imurmurhash "^0.1.4"
@@ -9138,16 +8749,16 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
     typedarray-to-buffer "^3.1.5"
 
 write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
 write-json-file@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz"
+  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
   integrity sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==
   dependencies:
     detect-indent "^5.0.0"
@@ -9159,7 +8770,7 @@ write-json-file@^3.2.0:
 
 write-json-file@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz"
+  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d"
   integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==
   dependencies:
     detect-indent "^6.0.0"
@@ -9171,7 +8782,7 @@ write-json-file@^4.3.0:
 
 write-pkg@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz"
+  resolved "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz#675cc04ef6c11faacbbc7771b24c0abbf2a20039"
   integrity sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==
   dependencies:
     sort-keys "^2.0.0"
@@ -9193,7 +8804,7 @@ xstream@^11.14.0:
 
 xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^5.0.5:
@@ -9201,9 +8812,9 @@ y18n@^5.0.5:
   resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^3.0.0, yallist@^3.1.1:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
@@ -9213,32 +8824,27 @@ yallist@^4.0.0:
 
 yaml@^1.10.0, yaml@^1.7.2:
   version "1.10.2"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@20.2.4:
   version "20.2.4"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
 yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
+yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^21.0.1:
-  version "21.0.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
-
 yargs@^16.2.0:
   version "16.2.0"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
     cliui "^7.0.2"
@@ -9250,17 +8856,17 @@ yargs@^16.2.0:
     yargs-parser "^20.2.2"
 
 yargs@^17.3.1:
-  version "17.5.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+  version "17.7.2"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
     escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"
     string-width "^4.2.3"
     y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    yargs-parser "^21.1.1"
 
 yocto-queue@^0.1.0:
   version "0.1.0"

From 2fdb1537b7679f6f61e4b9bc5792125f36ac8039 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:26:34 -0700
Subject: [PATCH 158/287] cleanup

---
 README.md                                     |   6 +-
 .../default/CwAdminFactory.message-builder.ts |  25 ++
 .../CwCodeIdRegistry.message-builder.ts       | 133 +++++++++++
 .../default/CwSingle.message-builder.ts       | 219 ++++++++++++++++++
 .../default/Factory.message-builder.ts        | 149 ++++++++++++
 .../builder/default/Minter.message-builder.ts | 104 +++++++++
 __output__/builder/default/index.ts           |  10 +-
 .../CwAdminFactory.message-builder.ts         |  25 ++
 .../CwCodeIdRegistry.message-builder.ts       | 133 +++++++++++
 .../no-extends/CwSingle.message-builder.ts    | 219 ++++++++++++++++++
 .../no-extends/Factory.message-builder.ts     | 149 ++++++++++++
 .../no-extends/Minter.message-builder.ts      | 104 +++++++++
 __output__/builder/no-extends/index.ts        |  10 +-
 packages/ts-codegen/README.md                 |   6 +-
 packages/ts-codegen/src/builder/builder.ts    |   2 +-
 packages/ts-codegen/src/commands/generate.ts  |   3 +-
 .../ts-codegen/src/generators/msg-builder.ts  |  10 +-
 .../ts-codegen/src/plugins/message-builder.ts |   4 +-
 .../ts-codegen/types/src/builder/builder.d.ts |   5 +-
 .../types/src/plugins/message-builder.d.ts    |  12 +
 packages/wasm-ast-types/src/index.ts          |   2 +-
 .../message-builder.spec.ts.snap}             |   0
 .../src/message-builder/index.ts              |   1 +
 .../message-builder.spec.ts}                  |   3 +-
 .../message-builder.ts}                       |   2 +-
 .../wasm-ast-types/src/msg-builder/index.ts   |   1 -
 .../src/react-query/react-query.spec.ts       |   2 +-
 .../wasm-ast-types/types/context/context.d.ts |   2 +-
 .../wasm-ast-types/types/context/imports.d.ts |   4 +-
 packages/wasm-ast-types/types/index.d.ts      |   2 +-
 .../types/message-builder/index.d.ts          |   1 +
 .../message-builder.d.ts}                     |   0
 .../types/msg-builder/index.d.ts              |   1 -
 33 files changed, 1310 insertions(+), 39 deletions(-)
 create mode 100644 __output__/builder/default/CwAdminFactory.message-builder.ts
 create mode 100644 __output__/builder/default/CwCodeIdRegistry.message-builder.ts
 create mode 100644 __output__/builder/default/CwSingle.message-builder.ts
 create mode 100644 __output__/builder/default/Factory.message-builder.ts
 create mode 100644 __output__/builder/default/Minter.message-builder.ts
 create mode 100644 __output__/builder/no-extends/CwAdminFactory.message-builder.ts
 create mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts
 create mode 100644 __output__/builder/no-extends/CwSingle.message-builder.ts
 create mode 100644 __output__/builder/no-extends/Factory.message-builder.ts
 create mode 100644 __output__/builder/no-extends/Minter.message-builder.ts
 create mode 100644 packages/ts-codegen/types/src/plugins/message-builder.d.ts
 rename packages/wasm-ast-types/src/{msg-builder/__snapshots__/msg-builder.spec.ts.snap => message-builder/__snapshots__/message-builder.spec.ts.snap} (100%)
 create mode 100644 packages/wasm-ast-types/src/message-builder/index.ts
 rename packages/wasm-ast-types/src/{msg-builder/msg-builder.spec.ts => message-builder/message-builder.spec.ts} (90%)
 rename packages/wasm-ast-types/src/{msg-builder/msg-builder.ts => message-builder/message-builder.ts} (97%)
 delete mode 100644 packages/wasm-ast-types/src/msg-builder/index.ts
 create mode 100644 packages/wasm-ast-types/types/message-builder/index.d.ts
 rename packages/wasm-ast-types/types/{msg-builder/msg-builder.d.ts => message-builder/message-builder.d.ts} (100%)
 delete mode 100644 packages/wasm-ast-types/types/msg-builder/index.d.ts

diff --git a/README.md b/README.md
index 417ed7c9..7b8d5b46 100644
--- a/README.md
+++ b/README.md
@@ -263,7 +263,7 @@ cosmwasm-ts-codegen generate \
 
 ### Message Builder
 
-Generate raw message jsons for use in your application with the `msg-builder` command.
+Generate raw message jsons for use in your application with the `message-builder` command.
 
 [see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
 
@@ -271,7 +271,7 @@ Generate raw message jsons for use in your application with the `msg-builder` co
 
 ```sh
 cosmwasm-ts-codegen generate \
-    --plugin msg-builder \
+    --plugin message-builder \
     --schema ./schema \
     --out ./ts \
     --name MyContractName
@@ -527,7 +527,7 @@ https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
 
 https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
 
-- `cosmwasm-ts-codegen generate --plugin msg-builder`
+- `cosmwasm-ts-codegen generate --plugin message-builder`
 
 https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
 
diff --git a/__output__/builder/default/CwAdminFactory.message-builder.ts b/__output__/builder/default/CwAdminFactory.message-builder.ts
new file mode 100644
index 00000000..2a04624c
--- /dev/null
+++ b/__output__/builder/default/CwAdminFactory.message-builder.ts
@@ -0,0 +1,25 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class CwAdminFactoryExecuteMessageBuilder {
+  static instantiateContractWithSelfAdmin = ({
+    codeId,
+    instantiateMsg,
+    label
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    instantiate_contract_with_self_admin: unknown;
+  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
+    return {
+      instantiate_contract_with_self_admin: ({
+        code_id: codeId,
+        instantiate_msg: instantiateMsg,
+        label
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-builder.ts b/__output__/builder/default/CwCodeIdRegistry.message-builder.ts
new file mode 100644
index 00000000..5727cd91
--- /dev/null
+++ b/__output__/builder/default/CwCodeIdRegistry.message-builder.ts
@@ -0,0 +1,133 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class CwCodeIdRegistryExecuteMessageBuilder {
+  static receive = ({
+    amount,
+    msg,
+    sender
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    receive: unknown;
+  }>["receive"]>): ExecuteMsg => {
+    return {
+      receive: ({
+        amount,
+        msg,
+        sender
+      } as const)
+    };
+  };
+  static register = ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    register: unknown;
+  }>["register"]>): ExecuteMsg => {
+    return {
+      register: ({
+        chain_id: chainId,
+        checksum,
+        code_id: codeId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static setOwner = ({
+    chainId,
+    name,
+    owner
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_owner: unknown;
+  }>["set_owner"]>): ExecuteMsg => {
+    return {
+      set_owner: ({
+        chain_id: chainId,
+        name,
+        owner
+      } as const)
+    };
+  };
+  static unregister = ({
+    chainId,
+    codeId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    unregister: unknown;
+  }>["unregister"]>): ExecuteMsg => {
+    return {
+      unregister: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    admin,
+    paymentInfo
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
+    return {
+      update_config: ({
+        admin,
+        payment_info: paymentInfo
+      } as const)
+    };
+  };
+}
+export abstract class CwCodeIdRegistryQueryMessageBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static getRegistration = ({
+    chainId,
+    name,
+    version
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    get_registration: unknown;
+  }>["get_registration"]>): QueryMsg => {
+    return {
+      get_registration: ({
+        chain_id: chainId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static infoForCodeId = ({
+    chainId,
+    codeId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    info_for_code_id: unknown;
+  }>["info_for_code_id"]>): QueryMsg => {
+    return {
+      info_for_code_id: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static listRegistrations = ({
+    chainId,
+    name
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_registrations: unknown;
+  }>["list_registrations"]>): QueryMsg => {
+    return {
+      list_registrations: ({
+        chain_id: chainId,
+        name
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.message-builder.ts b/__output__/builder/default/CwSingle.message-builder.ts
new file mode 100644
index 00000000..bdc753da
--- /dev/null
+++ b/__output__/builder/default/CwSingle.message-builder.ts
@@ -0,0 +1,219 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class CwSingleExecuteMessageBuilder {
+  static propose = ({
+    description,
+    msgs,
+    title
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    propose: unknown;
+  }>["propose"]>): ExecuteMsg => {
+    return {
+      propose: ({
+        description,
+        msgs,
+        title
+      } as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    vote
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    vote: unknown;
+  }>["vote"]>): ExecuteMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        vote
+      } as const)
+    };
+  };
+  static execute = ({
+    proposalId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    execute: unknown;
+  }>["execute"]>): ExecuteMsg => {
+    return {
+      execute: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static close = ({
+    proposalId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    close: unknown;
+  }>["close"]>): ExecuteMsg => {
+    return {
+      close: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
+    return {
+      update_config: ({
+        allow_revoting: allowRevoting,
+        dao,
+        deposit_info: depositInfo,
+        max_voting_period: maxVotingPeriod,
+        min_voting_period: minVotingPeriod,
+        only_members_execute: onlyMembersExecute,
+        threshold
+      } as const)
+    };
+  };
+  static addProposalHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_proposal_hook: unknown;
+  }>["add_proposal_hook"]>): ExecuteMsg => {
+    return {
+      add_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeProposalHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_proposal_hook: unknown;
+  }>["remove_proposal_hook"]>): ExecuteMsg => {
+    return {
+      remove_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static addVoteHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_vote_hook: unknown;
+  }>["add_vote_hook"]>): ExecuteMsg => {
+    return {
+      add_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeVoteHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_vote_hook: unknown;
+  }>["remove_vote_hook"]>): ExecuteMsg => {
+    return {
+      remove_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+}
+export abstract class CwSingleQueryMessageBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static proposal = ({
+    proposalId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    proposal: unknown;
+  }>["proposal"]>): QueryMsg => {
+    return {
+      proposal: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static listProposals = ({
+    limit,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_proposals: unknown;
+  }>["list_proposals"]>): QueryMsg => {
+    return {
+      list_proposals: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static reverseProposals = ({
+    limit,
+    startBefore
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    reverse_proposals: unknown;
+  }>["reverse_proposals"]>): QueryMsg => {
+    return {
+      reverse_proposals: ({
+        limit,
+        start_before: startBefore
+      } as const)
+    };
+  };
+  static proposalCount = (): QueryMsg => {
+    return {
+      proposal_count: ({} as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    voter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    vote: unknown;
+  }>["vote"]>): QueryMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        voter
+      } as const)
+    };
+  };
+  static listVotes = ({
+    limit,
+    proposalId,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_votes: unknown;
+  }>["list_votes"]>): QueryMsg => {
+    return {
+      list_votes: ({
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static proposalHooks = (): QueryMsg => {
+    return {
+      proposal_hooks: ({} as const)
+    };
+  };
+  static voteHooks = (): QueryMsg => {
+    return {
+      vote_hooks: ({} as const)
+    };
+  };
+  static info = (): QueryMsg => {
+    return {
+      info: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.message-builder.ts b/__output__/builder/default/Factory.message-builder.ts
new file mode 100644
index 00000000..2bbace3f
--- /dev/null
+++ b/__output__/builder/default/Factory.message-builder.ts
@@ -0,0 +1,149 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class FactoryExecuteMessageBuilder {
+  static createWallet = ({
+    createWalletMsg
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    create_wallet: unknown;
+  }>["create_wallet"]>): ExecuteMsg => {
+    return {
+      create_wallet: ({
+        create_wallet_msg: createWalletMsg
+      } as const)
+    };
+  };
+  static updateProxyUser = ({
+    newUser,
+    oldUser
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_proxy_user: unknown;
+  }>["update_proxy_user"]>): ExecuteMsg => {
+    return {
+      update_proxy_user: ({
+        new_user: newUser,
+        old_user: oldUser
+      } as const)
+    };
+  };
+  static migrateWallet = ({
+    migrationMsg,
+    walletAddress
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    migrate_wallet: unknown;
+  }>["migrate_wallet"]>): ExecuteMsg => {
+    return {
+      migrate_wallet: ({
+        migration_msg: migrationMsg,
+        wallet_address: walletAddress
+      } as const)
+    };
+  };
+  static updateCodeId = ({
+    newCodeId,
+    ty
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_code_id: unknown;
+  }>["update_code_id"]>): ExecuteMsg => {
+    return {
+      update_code_id: ({
+        new_code_id: newCodeId,
+        ty
+      } as const)
+    };
+  };
+  static updateWalletFee = ({
+    newFee
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_wallet_fee: unknown;
+  }>["update_wallet_fee"]>): ExecuteMsg => {
+    return {
+      update_wallet_fee: ({
+        new_fee: newFee
+      } as const)
+    };
+  };
+  static updateGovecAddr = ({
+    addr
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_govec_addr: unknown;
+  }>["update_govec_addr"]>): ExecuteMsg => {
+    return {
+      update_govec_addr: ({
+        addr
+      } as const)
+    };
+  };
+  static updateAdmin = ({
+    addr
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_admin: unknown;
+  }>["update_admin"]>): ExecuteMsg => {
+    return {
+      update_admin: ({
+        addr
+      } as const)
+    };
+  };
+}
+export abstract class FactoryQueryMessageBuilder {
+  static wallets = ({
+    limit,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets: unknown;
+  }>["wallets"]>): QueryMsg => {
+    return {
+      wallets: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static walletsOf = ({
+    limit,
+    startAfter,
+    user
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets_of: unknown;
+  }>["wallets_of"]>): QueryMsg => {
+    return {
+      wallets_of: ({
+        limit,
+        start_after: startAfter,
+        user
+      } as const)
+    };
+  };
+  static codeId = ({
+    ty
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    code_id: unknown;
+  }>["code_id"]>): QueryMsg => {
+    return {
+      code_id: ({
+        ty
+      } as const)
+    };
+  };
+  static fee = (): QueryMsg => {
+    return {
+      fee: ({} as const)
+    };
+  };
+  static govecAddr = (): QueryMsg => {
+    return {
+      govec_addr: ({} as const)
+    };
+  };
+  static adminAddr = (): QueryMsg => {
+    return {
+      admin_addr: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.message-builder.ts b/__output__/builder/default/Minter.message-builder.ts
new file mode 100644
index 00000000..e139b2ad
--- /dev/null
+++ b/__output__/builder/default/Minter.message-builder.ts
@@ -0,0 +1,104 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class MinterExecuteMessageBuilder {
+  static mint = (): ExecuteMsg => {
+    return {
+      mint: ({} as const)
+    };
+  };
+  static setWhitelist = ({
+    whitelist
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_whitelist: unknown;
+  }>["set_whitelist"]>): ExecuteMsg => {
+    return {
+      set_whitelist: ({
+        whitelist
+      } as const)
+    };
+  };
+  static updateStartTime = (): ExecuteMsg => {
+    return {
+      update_start_time: ({} as const)
+    };
+  };
+  static updatePerAddressLimit = ({
+    perAddressLimit
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_per_address_limit: unknown;
+  }>["update_per_address_limit"]>): ExecuteMsg => {
+    return {
+      update_per_address_limit: ({
+        per_address_limit: perAddressLimit
+      } as const)
+    };
+  };
+  static mintTo = ({
+    recipient
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_to: unknown;
+  }>["mint_to"]>): ExecuteMsg => {
+    return {
+      mint_to: ({
+        recipient
+      } as const)
+    };
+  };
+  static mintFor = ({
+    recipient,
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_for: unknown;
+  }>["mint_for"]>): ExecuteMsg => {
+    return {
+      mint_for: ({
+        recipient,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static withdraw = (): ExecuteMsg => {
+    return {
+      withdraw: ({} as const)
+    };
+  };
+}
+export abstract class MinterQueryMessageBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static mintableNumTokens = (): QueryMsg => {
+    return {
+      mintable_num_tokens: ({} as const)
+    };
+  };
+  static startTime = (): QueryMsg => {
+    return {
+      start_time: ({} as const)
+    };
+  };
+  static mintPrice = (): QueryMsg => {
+    return {
+      mint_price: ({} as const)
+    };
+  };
+  static mintCount = ({
+    address
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    mint_count: unknown;
+  }>["mint_count"]>): QueryMsg => {
+    return {
+      mint_count: ({
+        address
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index ae44c8eb..64ec085e 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -9,35 +9,35 @@ import * as _16 from "./Factory.client";
 import * as _17 from "./Factory.message-composer";
 import * as _18 from "./Factory.react-query";
 import * as _19 from "./Factory.recoil";
-import * as _20 from "./Factory.msg-builder";
+import * as _20 from "./Factory.message-builder";
 import * as _21 from "./Factory.provider";
 import * as _22 from "./Minter.types";
 import * as _23 from "./Minter.client";
 import * as _24 from "./Minter.message-composer";
 import * as _25 from "./Minter.react-query";
 import * as _26 from "./Minter.recoil";
-import * as _27 from "./Minter.msg-builder";
+import * as _27 from "./Minter.message-builder";
 import * as _28 from "./Minter.provider";
 import * as _29 from "./CwAdminFactory.types";
 import * as _30 from "./CwAdminFactory.client";
 import * as _31 from "./CwAdminFactory.message-composer";
 import * as _32 from "./CwAdminFactory.react-query";
 import * as _33 from "./CwAdminFactory.recoil";
-import * as _34 from "./CwAdminFactory.msg-builder";
+import * as _34 from "./CwAdminFactory.message-builder";
 import * as _35 from "./CwAdminFactory.provider";
 import * as _36 from "./CwCodeIdRegistry.types";
 import * as _37 from "./CwCodeIdRegistry.client";
 import * as _38 from "./CwCodeIdRegistry.message-composer";
 import * as _39 from "./CwCodeIdRegistry.react-query";
 import * as _40 from "./CwCodeIdRegistry.recoil";
-import * as _41 from "./CwCodeIdRegistry.msg-builder";
+import * as _41 from "./CwCodeIdRegistry.message-builder";
 import * as _42 from "./CwCodeIdRegistry.provider";
 import * as _43 from "./CwSingle.types";
 import * as _44 from "./CwSingle.client";
 import * as _45 from "./CwSingle.message-composer";
 import * as _46 from "./CwSingle.react-query";
 import * as _47 from "./CwSingle.recoil";
-import * as _48 from "./CwSingle.msg-builder";
+import * as _48 from "./CwSingle.message-builder";
 import * as _49 from "./CwSingle.provider";
 import * as _50 from "./contractContextProviders";
 import * as _51 from "./contractContextBase";
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-builder.ts b/__output__/builder/no-extends/CwAdminFactory.message-builder.ts
new file mode 100644
index 00000000..2a04624c
--- /dev/null
+++ b/__output__/builder/no-extends/CwAdminFactory.message-builder.ts
@@ -0,0 +1,25 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class CwAdminFactoryExecuteMessageBuilder {
+  static instantiateContractWithSelfAdmin = ({
+    codeId,
+    instantiateMsg,
+    label
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    instantiate_contract_with_self_admin: unknown;
+  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
+    return {
+      instantiate_contract_with_self_admin: ({
+        code_id: codeId,
+        instantiate_msg: instantiateMsg,
+        label
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts
new file mode 100644
index 00000000..5727cd91
--- /dev/null
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts
@@ -0,0 +1,133 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class CwCodeIdRegistryExecuteMessageBuilder {
+  static receive = ({
+    amount,
+    msg,
+    sender
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    receive: unknown;
+  }>["receive"]>): ExecuteMsg => {
+    return {
+      receive: ({
+        amount,
+        msg,
+        sender
+      } as const)
+    };
+  };
+  static register = ({
+    chainId,
+    checksum,
+    codeId,
+    name,
+    version
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    register: unknown;
+  }>["register"]>): ExecuteMsg => {
+    return {
+      register: ({
+        chain_id: chainId,
+        checksum,
+        code_id: codeId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static setOwner = ({
+    chainId,
+    name,
+    owner
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_owner: unknown;
+  }>["set_owner"]>): ExecuteMsg => {
+    return {
+      set_owner: ({
+        chain_id: chainId,
+        name,
+        owner
+      } as const)
+    };
+  };
+  static unregister = ({
+    chainId,
+    codeId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    unregister: unknown;
+  }>["unregister"]>): ExecuteMsg => {
+    return {
+      unregister: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    admin,
+    paymentInfo
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
+    return {
+      update_config: ({
+        admin,
+        payment_info: paymentInfo
+      } as const)
+    };
+  };
+}
+export abstract class CwCodeIdRegistryQueryMessageBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static getRegistration = ({
+    chainId,
+    name,
+    version
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    get_registration: unknown;
+  }>["get_registration"]>): QueryMsg => {
+    return {
+      get_registration: ({
+        chain_id: chainId,
+        name,
+        version
+      } as const)
+    };
+  };
+  static infoForCodeId = ({
+    chainId,
+    codeId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    info_for_code_id: unknown;
+  }>["info_for_code_id"]>): QueryMsg => {
+    return {
+      info_for_code_id: ({
+        chain_id: chainId,
+        code_id: codeId
+      } as const)
+    };
+  };
+  static listRegistrations = ({
+    chainId,
+    name
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_registrations: unknown;
+  }>["list_registrations"]>): QueryMsg => {
+    return {
+      list_registrations: ({
+        chain_id: chainId,
+        name
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.message-builder.ts b/__output__/builder/no-extends/CwSingle.message-builder.ts
new file mode 100644
index 00000000..bdc753da
--- /dev/null
+++ b/__output__/builder/no-extends/CwSingle.message-builder.ts
@@ -0,0 +1,219 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class CwSingleExecuteMessageBuilder {
+  static propose = ({
+    description,
+    msgs,
+    title
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    propose: unknown;
+  }>["propose"]>): ExecuteMsg => {
+    return {
+      propose: ({
+        description,
+        msgs,
+        title
+      } as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    vote
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    vote: unknown;
+  }>["vote"]>): ExecuteMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        vote
+      } as const)
+    };
+  };
+  static execute = ({
+    proposalId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    execute: unknown;
+  }>["execute"]>): ExecuteMsg => {
+    return {
+      execute: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static close = ({
+    proposalId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    close: unknown;
+  }>["close"]>): ExecuteMsg => {
+    return {
+      close: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static updateConfig = ({
+    allowRevoting,
+    dao,
+    depositInfo,
+    maxVotingPeriod,
+    minVotingPeriod,
+    onlyMembersExecute,
+    threshold
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_config: unknown;
+  }>["update_config"]>): ExecuteMsg => {
+    return {
+      update_config: ({
+        allow_revoting: allowRevoting,
+        dao,
+        deposit_info: depositInfo,
+        max_voting_period: maxVotingPeriod,
+        min_voting_period: minVotingPeriod,
+        only_members_execute: onlyMembersExecute,
+        threshold
+      } as const)
+    };
+  };
+  static addProposalHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_proposal_hook: unknown;
+  }>["add_proposal_hook"]>): ExecuteMsg => {
+    return {
+      add_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeProposalHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_proposal_hook: unknown;
+  }>["remove_proposal_hook"]>): ExecuteMsg => {
+    return {
+      remove_proposal_hook: ({
+        address
+      } as const)
+    };
+  };
+  static addVoteHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    add_vote_hook: unknown;
+  }>["add_vote_hook"]>): ExecuteMsg => {
+    return {
+      add_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+  static removeVoteHook = ({
+    address
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    remove_vote_hook: unknown;
+  }>["remove_vote_hook"]>): ExecuteMsg => {
+    return {
+      remove_vote_hook: ({
+        address
+      } as const)
+    };
+  };
+}
+export abstract class CwSingleQueryMessageBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static proposal = ({
+    proposalId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    proposal: unknown;
+  }>["proposal"]>): QueryMsg => {
+    return {
+      proposal: ({
+        proposal_id: proposalId
+      } as const)
+    };
+  };
+  static listProposals = ({
+    limit,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_proposals: unknown;
+  }>["list_proposals"]>): QueryMsg => {
+    return {
+      list_proposals: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static reverseProposals = ({
+    limit,
+    startBefore
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    reverse_proposals: unknown;
+  }>["reverse_proposals"]>): QueryMsg => {
+    return {
+      reverse_proposals: ({
+        limit,
+        start_before: startBefore
+      } as const)
+    };
+  };
+  static proposalCount = (): QueryMsg => {
+    return {
+      proposal_count: ({} as const)
+    };
+  };
+  static vote = ({
+    proposalId,
+    voter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    vote: unknown;
+  }>["vote"]>): QueryMsg => {
+    return {
+      vote: ({
+        proposal_id: proposalId,
+        voter
+      } as const)
+    };
+  };
+  static listVotes = ({
+    limit,
+    proposalId,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    list_votes: unknown;
+  }>["list_votes"]>): QueryMsg => {
+    return {
+      list_votes: ({
+        limit,
+        proposal_id: proposalId,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static proposalHooks = (): QueryMsg => {
+    return {
+      proposal_hooks: ({} as const)
+    };
+  };
+  static voteHooks = (): QueryMsg => {
+    return {
+      vote_hooks: ({} as const)
+    };
+  };
+  static info = (): QueryMsg => {
+    return {
+      info: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.message-builder.ts b/__output__/builder/no-extends/Factory.message-builder.ts
new file mode 100644
index 00000000..2bbace3f
--- /dev/null
+++ b/__output__/builder/no-extends/Factory.message-builder.ts
@@ -0,0 +1,149 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class FactoryExecuteMessageBuilder {
+  static createWallet = ({
+    createWalletMsg
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    create_wallet: unknown;
+  }>["create_wallet"]>): ExecuteMsg => {
+    return {
+      create_wallet: ({
+        create_wallet_msg: createWalletMsg
+      } as const)
+    };
+  };
+  static updateProxyUser = ({
+    newUser,
+    oldUser
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_proxy_user: unknown;
+  }>["update_proxy_user"]>): ExecuteMsg => {
+    return {
+      update_proxy_user: ({
+        new_user: newUser,
+        old_user: oldUser
+      } as const)
+    };
+  };
+  static migrateWallet = ({
+    migrationMsg,
+    walletAddress
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    migrate_wallet: unknown;
+  }>["migrate_wallet"]>): ExecuteMsg => {
+    return {
+      migrate_wallet: ({
+        migration_msg: migrationMsg,
+        wallet_address: walletAddress
+      } as const)
+    };
+  };
+  static updateCodeId = ({
+    newCodeId,
+    ty
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_code_id: unknown;
+  }>["update_code_id"]>): ExecuteMsg => {
+    return {
+      update_code_id: ({
+        new_code_id: newCodeId,
+        ty
+      } as const)
+    };
+  };
+  static updateWalletFee = ({
+    newFee
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_wallet_fee: unknown;
+  }>["update_wallet_fee"]>): ExecuteMsg => {
+    return {
+      update_wallet_fee: ({
+        new_fee: newFee
+      } as const)
+    };
+  };
+  static updateGovecAddr = ({
+    addr
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_govec_addr: unknown;
+  }>["update_govec_addr"]>): ExecuteMsg => {
+    return {
+      update_govec_addr: ({
+        addr
+      } as const)
+    };
+  };
+  static updateAdmin = ({
+    addr
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_admin: unknown;
+  }>["update_admin"]>): ExecuteMsg => {
+    return {
+      update_admin: ({
+        addr
+      } as const)
+    };
+  };
+}
+export abstract class FactoryQueryMessageBuilder {
+  static wallets = ({
+    limit,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets: unknown;
+  }>["wallets"]>): QueryMsg => {
+    return {
+      wallets: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static walletsOf = ({
+    limit,
+    startAfter,
+    user
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    wallets_of: unknown;
+  }>["wallets_of"]>): QueryMsg => {
+    return {
+      wallets_of: ({
+        limit,
+        start_after: startAfter,
+        user
+      } as const)
+    };
+  };
+  static codeId = ({
+    ty
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    code_id: unknown;
+  }>["code_id"]>): QueryMsg => {
+    return {
+      code_id: ({
+        ty
+      } as const)
+    };
+  };
+  static fee = (): QueryMsg => {
+    return {
+      fee: ({} as const)
+    };
+  };
+  static govecAddr = (): QueryMsg => {
+    return {
+      govec_addr: ({} as const)
+    };
+  };
+  static adminAddr = (): QueryMsg => {
+    return {
+      admin_addr: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.message-builder.ts b/__output__/builder/no-extends/Minter.message-builder.ts
new file mode 100644
index 00000000..e139b2ad
--- /dev/null
+++ b/__output__/builder/no-extends/Minter.message-builder.ts
@@ -0,0 +1,104 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class MinterExecuteMessageBuilder {
+  static mint = (): ExecuteMsg => {
+    return {
+      mint: ({} as const)
+    };
+  };
+  static setWhitelist = ({
+    whitelist
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    set_whitelist: unknown;
+  }>["set_whitelist"]>): ExecuteMsg => {
+    return {
+      set_whitelist: ({
+        whitelist
+      } as const)
+    };
+  };
+  static updateStartTime = (): ExecuteMsg => {
+    return {
+      update_start_time: ({} as const)
+    };
+  };
+  static updatePerAddressLimit = ({
+    perAddressLimit
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    update_per_address_limit: unknown;
+  }>["update_per_address_limit"]>): ExecuteMsg => {
+    return {
+      update_per_address_limit: ({
+        per_address_limit: perAddressLimit
+      } as const)
+    };
+  };
+  static mintTo = ({
+    recipient
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_to: unknown;
+  }>["mint_to"]>): ExecuteMsg => {
+    return {
+      mint_to: ({
+        recipient
+      } as const)
+    };
+  };
+  static mintFor = ({
+    recipient,
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsg, {
+    mint_for: unknown;
+  }>["mint_for"]>): ExecuteMsg => {
+    return {
+      mint_for: ({
+        recipient,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static withdraw = (): ExecuteMsg => {
+    return {
+      withdraw: ({} as const)
+    };
+  };
+}
+export abstract class MinterQueryMessageBuilder {
+  static config = (): QueryMsg => {
+    return {
+      config: ({} as const)
+    };
+  };
+  static mintableNumTokens = (): QueryMsg => {
+    return {
+      mintable_num_tokens: ({} as const)
+    };
+  };
+  static startTime = (): QueryMsg => {
+    return {
+      start_time: ({} as const)
+    };
+  };
+  static mintPrice = (): QueryMsg => {
+    return {
+      mint_price: ({} as const)
+    };
+  };
+  static mintCount = ({
+    address
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    mint_count: unknown;
+  }>["mint_count"]>): QueryMsg => {
+    return {
+      mint_count: ({
+        address
+      } as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
index 26f0e94c..b6cee78c 100644
--- a/__output__/builder/no-extends/index.ts
+++ b/__output__/builder/no-extends/index.ts
@@ -9,31 +9,31 @@ import * as _54 from "./Factory.client";
 import * as _55 from "./Factory.message-composer";
 import * as _56 from "./Factory.react-query";
 import * as _57 from "./Factory.recoil";
-import * as _58 from "./Factory.msg-builder";
+import * as _58 from "./Factory.message-builder";
 import * as _59 from "./Minter.types";
 import * as _60 from "./Minter.client";
 import * as _61 from "./Minter.message-composer";
 import * as _62 from "./Minter.react-query";
 import * as _63 from "./Minter.recoil";
-import * as _64 from "./Minter.msg-builder";
+import * as _64 from "./Minter.message-builder";
 import * as _65 from "./CwAdminFactory.types";
 import * as _66 from "./CwAdminFactory.client";
 import * as _67 from "./CwAdminFactory.message-composer";
 import * as _68 from "./CwAdminFactory.react-query";
 import * as _69 from "./CwAdminFactory.recoil";
-import * as _70 from "./CwAdminFactory.msg-builder";
+import * as _70 from "./CwAdminFactory.message-builder";
 import * as _71 from "./CwCodeIdRegistry.types";
 import * as _72 from "./CwCodeIdRegistry.client";
 import * as _73 from "./CwCodeIdRegistry.message-composer";
 import * as _74 from "./CwCodeIdRegistry.react-query";
 import * as _75 from "./CwCodeIdRegistry.recoil";
-import * as _76 from "./CwCodeIdRegistry.msg-builder";
+import * as _76 from "./CwCodeIdRegistry.message-builder";
 import * as _77 from "./CwSingle.types";
 import * as _78 from "./CwSingle.client";
 import * as _79 from "./CwSingle.message-composer";
 import * as _80 from "./CwSingle.react-query";
 import * as _81 from "./CwSingle.recoil";
-import * as _82 from "./CwSingle.msg-builder";
+import * as _82 from "./CwSingle.message-builder";
 export namespace smart {
   export namespace contracts {
     export const Factory = { ..._53,
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 4c47430e..efbaf3bc 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -263,7 +263,7 @@ cosmwasm-ts-codegen generate \
 
 ### Message Builder
 
-Generate raw message jsons for use in your application with the `msg-builder` command.
+Generate raw message jsons for use in your application with the `message-builder` command.
 
 [see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
 
@@ -271,7 +271,7 @@ Generate raw message jsons for use in your application with the `msg-builder` co
 
 ```sh
 cosmwasm-ts-codegen generate \
-    --plugin msg-builder \
+    --plugin message-builder \
     --schema ./schema \
     --out ./ts \
     --name MyContractName 
@@ -474,7 +474,7 @@ https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
 
 https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
 
-- `cosmwasm-ts-codegen generate --plugin msg-builder`
+- `cosmwasm-ts-codegen generate --plugin message-builder`
 
 https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
 
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 691ca6ff..222792a7 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -61,7 +61,7 @@ export type TSBuilderOptions = {
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
 
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
+export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
 
 export interface BuilderFile {
     type: BuilderFileType;
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index b7d6c1c8..da45c51e 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -152,7 +152,8 @@ export default async (argv) => {
             enabled: plugin.includes('message-composer')
         },
         messageBuilder: {
-            enabled: plugin.includes('msg-builder')
+
+            enabled: plugin.includes('message-builder')
         },
         bundle: {
             enabled: bundle,
diff --git a/packages/ts-codegen/src/generators/msg-builder.ts b/packages/ts-codegen/src/generators/msg-builder.ts
index 195cce23..af5d7779 100644
--- a/packages/ts-codegen/src/generators/msg-builder.ts
+++ b/packages/ts-codegen/src/generators/msg-builder.ts
@@ -10,8 +10,6 @@ import { ContractInfo, getMessageProperties } from "wasm-ast-types";
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { RenderContext, MessageBuilderOptions } from 'wasm-ast-types';
 import { BuilderFile } from "../builder";
-import babelTraverse from '@babel/traverse';
-import { parse as babelParse } from '@babel/parser'
 
 export default async (
   name: string,
@@ -24,7 +22,7 @@ export default async (
     messageBuilder: messageBuilderOptions ?? {},
   });
 
-  const localname = pascal(name) + ".msg-builder.ts";
+  const localname = pascal(name) + ".message-builder.ts";
   const TypesFile = pascal(name) + ".types";
   const ExecuteMsg = findExecuteMsg(schemas);
   const typeHash = await findAndParseTypes(schemas);
@@ -38,7 +36,7 @@ export default async (
   if (ExecuteMsg) {
     const children = getMessageProperties(ExecuteMsg);
     if (children.length > 0) {
-      const className = pascal(`${name}ExecuteMessageBuilder`);
+      const className = pascal(`${name}ExecuteMsgBuilder`);
 
       body.push(
         w.createMessageBuilderClass(context, className, ExecuteMsg)
@@ -51,7 +49,7 @@ export default async (
   if (QueryMsg) {
     const children = getMessageProperties(QueryMsg);
     if (children.length > 0) {
-      const className = pascal(`${name}QueryMessageBuilder`);
+      const className = pascal(`${name}QueryMsgBuilder`);
 
       body.push(
         w.createMessageBuilderClass(context, className, QueryMsg)
@@ -71,7 +69,7 @@ export default async (
 
   return [
     {
-      type: "msg-builder",
+      type: "message-builder",
       contract: name,
       localname,
       filename: join(outPath, localname),
diff --git a/packages/ts-codegen/src/plugins/message-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
index 7e74d854..3a5c9450 100644
--- a/packages/ts-codegen/src/plugins/message-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -38,7 +38,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
 
     const { schemas } = context.contract;
 
-    const localname = pascal(name) + '.msg-builder.ts';
+    const localname = pascal(name) + '.message-builder.ts';
     const TypesFile = pascal(name) + '.types';
     const ExecuteMsg = findExecuteMsg(schemas);
     const typeHash = await findAndParseTypes(schemas);
@@ -76,7 +76,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type: 'msg-builder',
+        type: 'message-builder',
         localname,
         body
       }
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 73637368..6b3c76f6 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -15,15 +15,16 @@ export interface BundleOptions {
 export interface UseContractsOptions {
     enabled?: boolean;
 }
-export declare type TSBuilderOptions = {
+export type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
+     * Default: false
      */
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
-export declare type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'msg-builder' | 'plugin';
+export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
 export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;
diff --git a/packages/ts-codegen/types/src/plugins/message-builder.d.ts b/packages/ts-codegen/types/src/plugins/message-builder.d.ts
new file mode 100644
index 00000000..8c0aeb4a
--- /dev/null
+++ b/packages/ts-codegen/types/src/plugins/message-builder.d.ts
@@ -0,0 +1,12 @@
+import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
+import { BuilderFileType } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+export declare class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
+    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
+    doRender(name: string, context: RenderContext): Promise<{
+        type: BuilderFileType;
+        pluginType?: string;
+        localname: string;
+        body: any[];
+    }[]>;
+}
diff --git a/packages/wasm-ast-types/src/index.ts b/packages/wasm-ast-types/src/index.ts
index 86db1e42..0c135b31 100644
--- a/packages/wasm-ast-types/src/index.ts
+++ b/packages/wasm-ast-types/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';
diff --git a/packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap b/packages/wasm-ast-types/src/message-builder/__snapshots__/message-builder.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/msg-builder/__snapshots__/msg-builder.spec.ts.snap
rename to packages/wasm-ast-types/src/message-builder/__snapshots__/message-builder.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/message-builder/index.ts b/packages/wasm-ast-types/src/message-builder/index.ts
new file mode 100644
index 00000000..e054b30f
--- /dev/null
+++ b/packages/wasm-ast-types/src/message-builder/index.ts
@@ -0,0 +1 @@
+export * from './message-builder';
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts b/packages/wasm-ast-types/src/message-builder/message-builder.spec.ts
similarity index 90%
rename from packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
rename to packages/wasm-ast-types/src/message-builder/message-builder.spec.ts
index c328646e..ef0b4a0c 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.spec.ts
+++ b/packages/wasm-ast-types/src/message-builder/message-builder.spec.ts
@@ -4,9 +4,8 @@ import ownership from '../../../../__fixtures__/basic/ownership.json';
 
 import {
   createMessageBuilderClass,
-} from './msg-builder'
+} from './message-builder'
 import { expectCode, makeContext } from '../../test-utils';
-import { findExecuteMsg } from '@cosmwasm/ts-codegen/src';
 
 it('execute class', () => {
   const ctx = makeContext(execute_msg);
diff --git a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts b/packages/wasm-ast-types/src/message-builder/message-builder.ts
similarity index 97%
rename from packages/wasm-ast-types/src/msg-builder/msg-builder.ts
rename to packages/wasm-ast-types/src/message-builder/message-builder.ts
index 5abc1acf..16171c08 100644
--- a/packages/wasm-ast-types/src/msg-builder/msg-builder.ts
+++ b/packages/wasm-ast-types/src/message-builder/message-builder.ts
@@ -5,7 +5,7 @@ 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 createMessageBuilderClass = (
   context: RenderContext,
diff --git a/packages/wasm-ast-types/src/msg-builder/index.ts b/packages/wasm-ast-types/src/msg-builder/index.ts
deleted file mode 100644
index 8b5b3650..00000000
--- a/packages/wasm-ast-types/src/msg-builder/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './msg-builder';
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
index a390f437..19921053 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.spec.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
@@ -9,7 +9,7 @@ import {
   createReactQueryMutationHooks,
 } from './react-query'
 import { expectCode, makeContext } from '../../test-utils';
-import { createMessageBuilderClass } from '../msg-builder';
+import { createMessageBuilderClass } from '../message-builder';
 
 const execCtx = makeContext(execute_msg);
 const queryCtx = makeContext(query_msg);
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
index 9c4c198a..654e43d8 100644
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ b/packages/wasm-ast-types/types/context/context.d.ts
@@ -121,4 +121,4 @@ export declare abstract class RenderContextBase<TOpt = RenderOptions> implements
 export declare class RenderContext extends RenderContextBase {
     mergeDefaultOpt(options: RenderOptions): RenderOptions;
 }
-export { };
+export {};
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
index 55ca6708..21361af1 100644
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ b/packages/wasm-ast-types/types/context/imports.d.ts
@@ -5,8 +5,8 @@ export interface ImportObj {
     path: string;
     importAs?: string;
 }
-export declare type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
-export declare type UtilMapping = {
+export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export type UtilMapping = {
     [key: string]: ImportObj | string | GetUtilFn;
 };
 export declare const UTILS: {
diff --git a/packages/wasm-ast-types/types/index.d.ts b/packages/wasm-ast-types/types/index.d.ts
index 86db1e42..0c135b31 100644
--- a/packages/wasm-ast-types/types/index.d.ts
+++ b/packages/wasm-ast-types/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';
diff --git a/packages/wasm-ast-types/types/message-builder/index.d.ts b/packages/wasm-ast-types/types/message-builder/index.d.ts
new file mode 100644
index 00000000..e054b30f
--- /dev/null
+++ b/packages/wasm-ast-types/types/message-builder/index.d.ts
@@ -0,0 +1 @@
+export * from './message-builder';
diff --git a/packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts b/packages/wasm-ast-types/types/message-builder/message-builder.d.ts
similarity index 100%
rename from packages/wasm-ast-types/types/msg-builder/msg-builder.d.ts
rename to packages/wasm-ast-types/types/message-builder/message-builder.d.ts
diff --git a/packages/wasm-ast-types/types/msg-builder/index.d.ts b/packages/wasm-ast-types/types/msg-builder/index.d.ts
deleted file mode 100644
index 8b5b3650..00000000
--- a/packages/wasm-ast-types/types/msg-builder/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './msg-builder';

From 58be5a564d5d2d65f5e8ce574f5f0ccdb80e58ce Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:44:12 -0700
Subject: [PATCH 159/287] cleanup

---
 README.md                                                     | 2 +-
 __output__/builder/default/CwAdminFactory.message-builder.ts  | 2 +-
 .../builder/default/CwCodeIdRegistry.message-builder.ts       | 4 ++--
 __output__/builder/default/CwSingle.message-builder.ts        | 4 ++--
 __output__/builder/default/Factory.message-builder.ts         | 4 ++--
 __output__/builder/default/Minter.message-builder.ts          | 4 ++--
 .../builder/no-extends/CwAdminFactory.message-builder.ts      | 2 +-
 .../builder/no-extends/CwCodeIdRegistry.message-builder.ts    | 4 ++--
 __output__/builder/no-extends/CwSingle.message-builder.ts     | 4 ++--
 __output__/builder/no-extends/Factory.message-builder.ts      | 4 ++--
 __output__/builder/no-extends/Minter.message-builder.ts       | 4 ++--
 packages/ts-codegen/src/plugins/message-builder.ts            | 4 ++--
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 7b8d5b46..bc062836 100644
--- a/README.md
+++ b/README.md
@@ -502,7 +502,7 @@ import {
   generateClient,
   generateReactQuery,
   generateRecoil,
-  generateMessageComposer,
+  generateMessageComposer
 } from '@cosmwasm/ts-codegen';
 ```
 ### Example Output
diff --git a/__output__/builder/default/CwAdminFactory.message-builder.ts b/__output__/builder/default/CwAdminFactory.message-builder.ts
index 2a04624c..1e03ab7b 100644
--- a/__output__/builder/default/CwAdminFactory.message-builder.ts
+++ b/__output__/builder/default/CwAdminFactory.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMessageBuilder {
+export abstract class CwAdminFactoryExecuteMsgBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-builder.ts b/__output__/builder/default/CwCodeIdRegistry.message-builder.ts
index 5727cd91..3e15defb 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-builder.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMessageBuilder {
+export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static receive = ({
     amount,
     msg,
@@ -83,7 +83,7 @@ export abstract class CwCodeIdRegistryExecuteMessageBuilder {
     };
   };
 }
-export abstract class CwCodeIdRegistryQueryMessageBuilder {
+export abstract class CwCodeIdRegistryQueryMsgBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/default/CwSingle.message-builder.ts b/__output__/builder/default/CwSingle.message-builder.ts
index bdc753da..1859f108 100644
--- a/__output__/builder/default/CwSingle.message-builder.ts
+++ b/__output__/builder/default/CwSingle.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMessageBuilder {
+export abstract class CwSingleExecuteMsgBuilder {
   static propose = ({
     description,
     msgs,
@@ -125,7 +125,7 @@ export abstract class CwSingleExecuteMessageBuilder {
     };
   };
 }
-export abstract class CwSingleQueryMessageBuilder {
+export abstract class CwSingleQueryMsgBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/default/Factory.message-builder.ts b/__output__/builder/default/Factory.message-builder.ts
index 2bbace3f..0c662c0a 100644
--- a/__output__/builder/default/Factory.message-builder.ts
+++ b/__output__/builder/default/Factory.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMessageBuilder {
+export abstract class FactoryExecuteMsgBuilder {
   static createWallet = ({
     createWalletMsg
   }: CamelCasedProperties<Extract<ExecuteMsg, {
@@ -91,7 +91,7 @@ export abstract class FactoryExecuteMessageBuilder {
     };
   };
 }
-export abstract class FactoryQueryMessageBuilder {
+export abstract class FactoryQueryMsgBuilder {
   static wallets = ({
     limit,
     startAfter
diff --git a/__output__/builder/default/Minter.message-builder.ts b/__output__/builder/default/Minter.message-builder.ts
index e139b2ad..897f3fa8 100644
--- a/__output__/builder/default/Minter.message-builder.ts
+++ b/__output__/builder/default/Minter.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMessageBuilder {
+export abstract class MinterExecuteMsgBuilder {
   static mint = (): ExecuteMsg => {
     return {
       mint: ({} as const)
@@ -69,7 +69,7 @@ export abstract class MinterExecuteMessageBuilder {
     };
   };
 }
-export abstract class MinterQueryMessageBuilder {
+export abstract class MinterQueryMsgBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-builder.ts b/__output__/builder/no-extends/CwAdminFactory.message-builder.ts
index 2a04624c..1e03ab7b 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-builder.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMessageBuilder {
+export abstract class CwAdminFactoryExecuteMsgBuilder {
   static instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts
index 5727cd91..3e15defb 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMessageBuilder {
+export abstract class CwCodeIdRegistryExecuteMsgBuilder {
   static receive = ({
     amount,
     msg,
@@ -83,7 +83,7 @@ export abstract class CwCodeIdRegistryExecuteMessageBuilder {
     };
   };
 }
-export abstract class CwCodeIdRegistryQueryMessageBuilder {
+export abstract class CwCodeIdRegistryQueryMsgBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/no-extends/CwSingle.message-builder.ts b/__output__/builder/no-extends/CwSingle.message-builder.ts
index bdc753da..1859f108 100644
--- a/__output__/builder/no-extends/CwSingle.message-builder.ts
+++ b/__output__/builder/no-extends/CwSingle.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMessageBuilder {
+export abstract class CwSingleExecuteMsgBuilder {
   static propose = ({
     description,
     msgs,
@@ -125,7 +125,7 @@ export abstract class CwSingleExecuteMessageBuilder {
     };
   };
 }
-export abstract class CwSingleQueryMessageBuilder {
+export abstract class CwSingleQueryMsgBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/__output__/builder/no-extends/Factory.message-builder.ts b/__output__/builder/no-extends/Factory.message-builder.ts
index 2bbace3f..0c662c0a 100644
--- a/__output__/builder/no-extends/Factory.message-builder.ts
+++ b/__output__/builder/no-extends/Factory.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMessageBuilder {
+export abstract class FactoryExecuteMsgBuilder {
   static createWallet = ({
     createWalletMsg
   }: CamelCasedProperties<Extract<ExecuteMsg, {
@@ -91,7 +91,7 @@ export abstract class FactoryExecuteMessageBuilder {
     };
   };
 }
-export abstract class FactoryQueryMessageBuilder {
+export abstract class FactoryQueryMsgBuilder {
   static wallets = ({
     limit,
     startAfter
diff --git a/__output__/builder/no-extends/Minter.message-builder.ts b/__output__/builder/no-extends/Minter.message-builder.ts
index e139b2ad..897f3fa8 100644
--- a/__output__/builder/no-extends/Minter.message-builder.ts
+++ b/__output__/builder/no-extends/Minter.message-builder.ts
@@ -6,7 +6,7 @@
 
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMessageBuilder {
+export abstract class MinterExecuteMsgBuilder {
   static mint = (): ExecuteMsg => {
     return {
       mint: ({} as const)
@@ -69,7 +69,7 @@ export abstract class MinterExecuteMessageBuilder {
     };
   };
 }
-export abstract class MinterQueryMessageBuilder {
+export abstract class MinterQueryMsgBuilder {
   static config = (): QueryMsg => {
     return {
       config: ({} as const)
diff --git a/packages/ts-codegen/src/plugins/message-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
index 3a5c9450..a043d921 100644
--- a/packages/ts-codegen/src/plugins/message-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -52,7 +52,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     if (ExecuteMsg) {
       const children = getMessageProperties(ExecuteMsg);
       if (children.length > 0) {
-        const className = pascal(`${name}ExecuteMessageBuilder`);
+        const className = pascal(`${name}ExecuteMsgBuilder`);
 
         body.push(w.createMessageBuilderClass(context, className, ExecuteMsg));
       }
@@ -63,7 +63,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     if (QueryMsg) {
       const children = getMessageProperties(QueryMsg);
       if (children.length > 0) {
-        const className = pascal(`${name}QueryMessageBuilder`);
+        const className = pascal(`${name}QueryMsgBuilder`);
 
         body.push(w.createMessageBuilderClass(context, className, QueryMsg));
       }

From 37c47d4af0795883b5694f93233ae00a77ad0025 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:45:16 -0700
Subject: [PATCH 160/287] delete old files

---
 .../contracts/CwAdminFactory.msg-builder.ts   |  25 --
 .../contracts/CwCodeIdRegistry.msg-builder.ts | 133 -----------
 .../contracts/CwSingle.msg-builder.ts         | 219 ------------------
 .../contracts/Factory.msg-builder.ts          | 149 ------------
 .../contracts/Minter.msg-builder.ts           | 104 ---------
 .../default/CwAdminFactory.msg-builder.ts     |  25 --
 .../default/CwCodeIdRegistry.msg-builder.ts   | 133 -----------
 .../builder/default/CwSingle.msg-builder.ts   | 219 ------------------
 .../builder/default/Factory.msg-builder.ts    | 149 ------------
 .../builder/default/Minter.msg-builder.ts     | 104 ---------
 .../no-extends/CwAdminFactory.msg-builder.ts  |  25 --
 .../CwCodeIdRegistry.msg-builder.ts           | 133 -----------
 .../no-extends/CwSingle.msg-builder.ts        | 219 ------------------
 .../builder/no-extends/Factory.msg-builder.ts | 149 ------------
 .../builder/no-extends/Minter.msg-builder.ts  | 104 ---------
 __output__/cosmwasm/CW4Group.client.ts        | 177 --------------
 .../cosmwasm/CW4Group.message-composer.ts     | 130 -----------
 __output__/cosmwasm/CW4Group.react-query.ts   |  66 ------
 __output__/cosmwasm/CW4Group.recoil.ts        |  94 --------
 __output__/cosmwasm/CW4Group.types.ts         |  75 ------
 .../vectis/factory-opt/Factory.react-query.ts | 105 ---------
 .../Factory.react-query.ts                    | 114 ---------
 22 files changed, 2651 deletions(-)
 delete mode 100644 __output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts
 delete mode 100644 __output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts
 delete mode 100644 __output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts
 delete mode 100644 __output__/builder/bundler_test/contracts/Factory.msg-builder.ts
 delete mode 100644 __output__/builder/bundler_test/contracts/Minter.msg-builder.ts
 delete mode 100644 __output__/builder/default/CwAdminFactory.msg-builder.ts
 delete mode 100644 __output__/builder/default/CwCodeIdRegistry.msg-builder.ts
 delete mode 100644 __output__/builder/default/CwSingle.msg-builder.ts
 delete mode 100644 __output__/builder/default/Factory.msg-builder.ts
 delete mode 100644 __output__/builder/default/Minter.msg-builder.ts
 delete mode 100644 __output__/builder/no-extends/CwAdminFactory.msg-builder.ts
 delete mode 100644 __output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
 delete mode 100644 __output__/builder/no-extends/CwSingle.msg-builder.ts
 delete mode 100644 __output__/builder/no-extends/Factory.msg-builder.ts
 delete mode 100644 __output__/builder/no-extends/Minter.msg-builder.ts
 delete mode 100644 __output__/cosmwasm/CW4Group.client.ts
 delete mode 100644 __output__/cosmwasm/CW4Group.message-composer.ts
 delete mode 100644 __output__/cosmwasm/CW4Group.react-query.ts
 delete mode 100644 __output__/cosmwasm/CW4Group.recoil.ts
 delete mode 100644 __output__/cosmwasm/CW4Group.types.ts
 delete mode 100644 __output__/vectis/factory-opt/Factory.react-query.ts
 delete mode 100644 __output__/vectis/factory-query-factory/Factory.react-query.ts

diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts
deleted file mode 100644
index 2a04624c..00000000
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.msg-builder.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMessageBuilder {
-  static instantiateContractWithSelfAdmin = ({
-    codeId,
-    instantiateMsg,
-    label
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    instantiate_contract_with_self_admin: unknown;
-  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
-    return {
-      instantiate_contract_with_self_admin: ({
-        code_id: codeId,
-        instantiate_msg: instantiateMsg,
-        label
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts
deleted file mode 100644
index 5727cd91..00000000
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.msg-builder.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMessageBuilder {
-  static receive = ({
-    amount,
-    msg,
-    sender
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    receive: unknown;
-  }>["receive"]>): ExecuteMsg => {
-    return {
-      receive: ({
-        amount,
-        msg,
-        sender
-      } as const)
-    };
-  };
-  static register = ({
-    chainId,
-    checksum,
-    codeId,
-    name,
-    version
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    register: unknown;
-  }>["register"]>): ExecuteMsg => {
-    return {
-      register: ({
-        chain_id: chainId,
-        checksum,
-        code_id: codeId,
-        name,
-        version
-      } as const)
-    };
-  };
-  static setOwner = ({
-    chainId,
-    name,
-    owner
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    set_owner: unknown;
-  }>["set_owner"]>): ExecuteMsg => {
-    return {
-      set_owner: ({
-        chain_id: chainId,
-        name,
-        owner
-      } as const)
-    };
-  };
-  static unregister = ({
-    chainId,
-    codeId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    unregister: unknown;
-  }>["unregister"]>): ExecuteMsg => {
-    return {
-      unregister: ({
-        chain_id: chainId,
-        code_id: codeId
-      } as const)
-    };
-  };
-  static updateConfig = ({
-    admin,
-    paymentInfo
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_config: unknown;
-  }>["update_config"]>): ExecuteMsg => {
-    return {
-      update_config: ({
-        admin,
-        payment_info: paymentInfo
-      } as const)
-    };
-  };
-}
-export abstract class CwCodeIdRegistryQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static getRegistration = ({
-    chainId,
-    name,
-    version
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    get_registration: unknown;
-  }>["get_registration"]>): QueryMsg => {
-    return {
-      get_registration: ({
-        chain_id: chainId,
-        name,
-        version
-      } as const)
-    };
-  };
-  static infoForCodeId = ({
-    chainId,
-    codeId
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    info_for_code_id: unknown;
-  }>["info_for_code_id"]>): QueryMsg => {
-    return {
-      info_for_code_id: ({
-        chain_id: chainId,
-        code_id: codeId
-      } as const)
-    };
-  };
-  static listRegistrations = ({
-    chainId,
-    name
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_registrations: unknown;
-  }>["list_registrations"]>): QueryMsg => {
-    return {
-      list_registrations: ({
-        chain_id: chainId,
-        name
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts b/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts
deleted file mode 100644
index bdc753da..00000000
--- a/__output__/builder/bundler_test/contracts/CwSingle.msg-builder.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMessageBuilder {
-  static propose = ({
-    description,
-    msgs,
-    title
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    propose: unknown;
-  }>["propose"]>): ExecuteMsg => {
-    return {
-      propose: ({
-        description,
-        msgs,
-        title
-      } as const)
-    };
-  };
-  static vote = ({
-    proposalId,
-    vote
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    vote: unknown;
-  }>["vote"]>): ExecuteMsg => {
-    return {
-      vote: ({
-        proposal_id: proposalId,
-        vote
-      } as const)
-    };
-  };
-  static execute = ({
-    proposalId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    execute: unknown;
-  }>["execute"]>): ExecuteMsg => {
-    return {
-      execute: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static close = ({
-    proposalId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    close: unknown;
-  }>["close"]>): ExecuteMsg => {
-    return {
-      close: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static updateConfig = ({
-    allowRevoting,
-    dao,
-    depositInfo,
-    maxVotingPeriod,
-    minVotingPeriod,
-    onlyMembersExecute,
-    threshold
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_config: unknown;
-  }>["update_config"]>): ExecuteMsg => {
-    return {
-      update_config: ({
-        allow_revoting: allowRevoting,
-        dao,
-        deposit_info: depositInfo,
-        max_voting_period: maxVotingPeriod,
-        min_voting_period: minVotingPeriod,
-        only_members_execute: onlyMembersExecute,
-        threshold
-      } as const)
-    };
-  };
-  static addProposalHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    add_proposal_hook: unknown;
-  }>["add_proposal_hook"]>): ExecuteMsg => {
-    return {
-      add_proposal_hook: ({
-        address
-      } as const)
-    };
-  };
-  static removeProposalHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    remove_proposal_hook: unknown;
-  }>["remove_proposal_hook"]>): ExecuteMsg => {
-    return {
-      remove_proposal_hook: ({
-        address
-      } as const)
-    };
-  };
-  static addVoteHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    add_vote_hook: unknown;
-  }>["add_vote_hook"]>): ExecuteMsg => {
-    return {
-      add_vote_hook: ({
-        address
-      } as const)
-    };
-  };
-  static removeVoteHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    remove_vote_hook: unknown;
-  }>["remove_vote_hook"]>): ExecuteMsg => {
-    return {
-      remove_vote_hook: ({
-        address
-      } as const)
-    };
-  };
-}
-export abstract class CwSingleQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static proposal = ({
-    proposalId
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    proposal: unknown;
-  }>["proposal"]>): QueryMsg => {
-    return {
-      proposal: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static listProposals = ({
-    limit,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_proposals: unknown;
-  }>["list_proposals"]>): QueryMsg => {
-    return {
-      list_proposals: ({
-        limit,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static reverseProposals = ({
-    limit,
-    startBefore
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    reverse_proposals: unknown;
-  }>["reverse_proposals"]>): QueryMsg => {
-    return {
-      reverse_proposals: ({
-        limit,
-        start_before: startBefore
-      } as const)
-    };
-  };
-  static proposalCount = (): QueryMsg => {
-    return {
-      proposal_count: ({} as const)
-    };
-  };
-  static vote = ({
-    proposalId,
-    voter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    vote: unknown;
-  }>["vote"]>): QueryMsg => {
-    return {
-      vote: ({
-        proposal_id: proposalId,
-        voter
-      } as const)
-    };
-  };
-  static listVotes = ({
-    limit,
-    proposalId,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_votes: unknown;
-  }>["list_votes"]>): QueryMsg => {
-    return {
-      list_votes: ({
-        limit,
-        proposal_id: proposalId,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static proposalHooks = (): QueryMsg => {
-    return {
-      proposal_hooks: ({} as const)
-    };
-  };
-  static voteHooks = (): QueryMsg => {
-    return {
-      vote_hooks: ({} as const)
-    };
-  };
-  static info = (): QueryMsg => {
-    return {
-      info: ({} as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts b/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts
deleted file mode 100644
index 2bbace3f..00000000
--- a/__output__/builder/bundler_test/contracts/Factory.msg-builder.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMessageBuilder {
-  static createWallet = ({
-    createWalletMsg
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    create_wallet: unknown;
-  }>["create_wallet"]>): ExecuteMsg => {
-    return {
-      create_wallet: ({
-        create_wallet_msg: createWalletMsg
-      } as const)
-    };
-  };
-  static updateProxyUser = ({
-    newUser,
-    oldUser
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_proxy_user: unknown;
-  }>["update_proxy_user"]>): ExecuteMsg => {
-    return {
-      update_proxy_user: ({
-        new_user: newUser,
-        old_user: oldUser
-      } as const)
-    };
-  };
-  static migrateWallet = ({
-    migrationMsg,
-    walletAddress
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    migrate_wallet: unknown;
-  }>["migrate_wallet"]>): ExecuteMsg => {
-    return {
-      migrate_wallet: ({
-        migration_msg: migrationMsg,
-        wallet_address: walletAddress
-      } as const)
-    };
-  };
-  static updateCodeId = ({
-    newCodeId,
-    ty
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_code_id: unknown;
-  }>["update_code_id"]>): ExecuteMsg => {
-    return {
-      update_code_id: ({
-        new_code_id: newCodeId,
-        ty
-      } as const)
-    };
-  };
-  static updateWalletFee = ({
-    newFee
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_wallet_fee: unknown;
-  }>["update_wallet_fee"]>): ExecuteMsg => {
-    return {
-      update_wallet_fee: ({
-        new_fee: newFee
-      } as const)
-    };
-  };
-  static updateGovecAddr = ({
-    addr
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_govec_addr: unknown;
-  }>["update_govec_addr"]>): ExecuteMsg => {
-    return {
-      update_govec_addr: ({
-        addr
-      } as const)
-    };
-  };
-  static updateAdmin = ({
-    addr
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_admin: unknown;
-  }>["update_admin"]>): ExecuteMsg => {
-    return {
-      update_admin: ({
-        addr
-      } as const)
-    };
-  };
-}
-export abstract class FactoryQueryMessageBuilder {
-  static wallets = ({
-    limit,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    wallets: unknown;
-  }>["wallets"]>): QueryMsg => {
-    return {
-      wallets: ({
-        limit,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static walletsOf = ({
-    limit,
-    startAfter,
-    user
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    wallets_of: unknown;
-  }>["wallets_of"]>): QueryMsg => {
-    return {
-      wallets_of: ({
-        limit,
-        start_after: startAfter,
-        user
-      } as const)
-    };
-  };
-  static codeId = ({
-    ty
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    code_id: unknown;
-  }>["code_id"]>): QueryMsg => {
-    return {
-      code_id: ({
-        ty
-      } as const)
-    };
-  };
-  static fee = (): QueryMsg => {
-    return {
-      fee: ({} as const)
-    };
-  };
-  static govecAddr = (): QueryMsg => {
-    return {
-      govec_addr: ({} as const)
-    };
-  };
-  static adminAddr = (): QueryMsg => {
-    return {
-      admin_addr: ({} as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts b/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts
deleted file mode 100644
index e139b2ad..00000000
--- a/__output__/builder/bundler_test/contracts/Minter.msg-builder.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMessageBuilder {
-  static mint = (): ExecuteMsg => {
-    return {
-      mint: ({} as const)
-    };
-  };
-  static setWhitelist = ({
-    whitelist
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    set_whitelist: unknown;
-  }>["set_whitelist"]>): ExecuteMsg => {
-    return {
-      set_whitelist: ({
-        whitelist
-      } as const)
-    };
-  };
-  static updateStartTime = (): ExecuteMsg => {
-    return {
-      update_start_time: ({} as const)
-    };
-  };
-  static updatePerAddressLimit = ({
-    perAddressLimit
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_per_address_limit: unknown;
-  }>["update_per_address_limit"]>): ExecuteMsg => {
-    return {
-      update_per_address_limit: ({
-        per_address_limit: perAddressLimit
-      } as const)
-    };
-  };
-  static mintTo = ({
-    recipient
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    mint_to: unknown;
-  }>["mint_to"]>): ExecuteMsg => {
-    return {
-      mint_to: ({
-        recipient
-      } as const)
-    };
-  };
-  static mintFor = ({
-    recipient,
-    tokenId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    mint_for: unknown;
-  }>["mint_for"]>): ExecuteMsg => {
-    return {
-      mint_for: ({
-        recipient,
-        token_id: tokenId
-      } as const)
-    };
-  };
-  static withdraw = (): ExecuteMsg => {
-    return {
-      withdraw: ({} as const)
-    };
-  };
-}
-export abstract class MinterQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static mintableNumTokens = (): QueryMsg => {
-    return {
-      mintable_num_tokens: ({} as const)
-    };
-  };
-  static startTime = (): QueryMsg => {
-    return {
-      start_time: ({} as const)
-    };
-  };
-  static mintPrice = (): QueryMsg => {
-    return {
-      mint_price: ({} as const)
-    };
-  };
-  static mintCount = ({
-    address
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    mint_count: unknown;
-  }>["mint_count"]>): QueryMsg => {
-    return {
-      mint_count: ({
-        address
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/default/CwAdminFactory.msg-builder.ts b/__output__/builder/default/CwAdminFactory.msg-builder.ts
deleted file mode 100644
index 2a04624c..00000000
--- a/__output__/builder/default/CwAdminFactory.msg-builder.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMessageBuilder {
-  static instantiateContractWithSelfAdmin = ({
-    codeId,
-    instantiateMsg,
-    label
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    instantiate_contract_with_self_admin: unknown;
-  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
-    return {
-      instantiate_contract_with_self_admin: ({
-        code_id: codeId,
-        instantiate_msg: instantiateMsg,
-        label
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
deleted file mode 100644
index 5727cd91..00000000
--- a/__output__/builder/default/CwCodeIdRegistry.msg-builder.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMessageBuilder {
-  static receive = ({
-    amount,
-    msg,
-    sender
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    receive: unknown;
-  }>["receive"]>): ExecuteMsg => {
-    return {
-      receive: ({
-        amount,
-        msg,
-        sender
-      } as const)
-    };
-  };
-  static register = ({
-    chainId,
-    checksum,
-    codeId,
-    name,
-    version
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    register: unknown;
-  }>["register"]>): ExecuteMsg => {
-    return {
-      register: ({
-        chain_id: chainId,
-        checksum,
-        code_id: codeId,
-        name,
-        version
-      } as const)
-    };
-  };
-  static setOwner = ({
-    chainId,
-    name,
-    owner
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    set_owner: unknown;
-  }>["set_owner"]>): ExecuteMsg => {
-    return {
-      set_owner: ({
-        chain_id: chainId,
-        name,
-        owner
-      } as const)
-    };
-  };
-  static unregister = ({
-    chainId,
-    codeId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    unregister: unknown;
-  }>["unregister"]>): ExecuteMsg => {
-    return {
-      unregister: ({
-        chain_id: chainId,
-        code_id: codeId
-      } as const)
-    };
-  };
-  static updateConfig = ({
-    admin,
-    paymentInfo
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_config: unknown;
-  }>["update_config"]>): ExecuteMsg => {
-    return {
-      update_config: ({
-        admin,
-        payment_info: paymentInfo
-      } as const)
-    };
-  };
-}
-export abstract class CwCodeIdRegistryQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static getRegistration = ({
-    chainId,
-    name,
-    version
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    get_registration: unknown;
-  }>["get_registration"]>): QueryMsg => {
-    return {
-      get_registration: ({
-        chain_id: chainId,
-        name,
-        version
-      } as const)
-    };
-  };
-  static infoForCodeId = ({
-    chainId,
-    codeId
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    info_for_code_id: unknown;
-  }>["info_for_code_id"]>): QueryMsg => {
-    return {
-      info_for_code_id: ({
-        chain_id: chainId,
-        code_id: codeId
-      } as const)
-    };
-  };
-  static listRegistrations = ({
-    chainId,
-    name
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_registrations: unknown;
-  }>["list_registrations"]>): QueryMsg => {
-    return {
-      list_registrations: ({
-        chain_id: chainId,
-        name
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.msg-builder.ts b/__output__/builder/default/CwSingle.msg-builder.ts
deleted file mode 100644
index bdc753da..00000000
--- a/__output__/builder/default/CwSingle.msg-builder.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMessageBuilder {
-  static propose = ({
-    description,
-    msgs,
-    title
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    propose: unknown;
-  }>["propose"]>): ExecuteMsg => {
-    return {
-      propose: ({
-        description,
-        msgs,
-        title
-      } as const)
-    };
-  };
-  static vote = ({
-    proposalId,
-    vote
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    vote: unknown;
-  }>["vote"]>): ExecuteMsg => {
-    return {
-      vote: ({
-        proposal_id: proposalId,
-        vote
-      } as const)
-    };
-  };
-  static execute = ({
-    proposalId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    execute: unknown;
-  }>["execute"]>): ExecuteMsg => {
-    return {
-      execute: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static close = ({
-    proposalId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    close: unknown;
-  }>["close"]>): ExecuteMsg => {
-    return {
-      close: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static updateConfig = ({
-    allowRevoting,
-    dao,
-    depositInfo,
-    maxVotingPeriod,
-    minVotingPeriod,
-    onlyMembersExecute,
-    threshold
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_config: unknown;
-  }>["update_config"]>): ExecuteMsg => {
-    return {
-      update_config: ({
-        allow_revoting: allowRevoting,
-        dao,
-        deposit_info: depositInfo,
-        max_voting_period: maxVotingPeriod,
-        min_voting_period: minVotingPeriod,
-        only_members_execute: onlyMembersExecute,
-        threshold
-      } as const)
-    };
-  };
-  static addProposalHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    add_proposal_hook: unknown;
-  }>["add_proposal_hook"]>): ExecuteMsg => {
-    return {
-      add_proposal_hook: ({
-        address
-      } as const)
-    };
-  };
-  static removeProposalHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    remove_proposal_hook: unknown;
-  }>["remove_proposal_hook"]>): ExecuteMsg => {
-    return {
-      remove_proposal_hook: ({
-        address
-      } as const)
-    };
-  };
-  static addVoteHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    add_vote_hook: unknown;
-  }>["add_vote_hook"]>): ExecuteMsg => {
-    return {
-      add_vote_hook: ({
-        address
-      } as const)
-    };
-  };
-  static removeVoteHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    remove_vote_hook: unknown;
-  }>["remove_vote_hook"]>): ExecuteMsg => {
-    return {
-      remove_vote_hook: ({
-        address
-      } as const)
-    };
-  };
-}
-export abstract class CwSingleQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static proposal = ({
-    proposalId
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    proposal: unknown;
-  }>["proposal"]>): QueryMsg => {
-    return {
-      proposal: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static listProposals = ({
-    limit,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_proposals: unknown;
-  }>["list_proposals"]>): QueryMsg => {
-    return {
-      list_proposals: ({
-        limit,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static reverseProposals = ({
-    limit,
-    startBefore
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    reverse_proposals: unknown;
-  }>["reverse_proposals"]>): QueryMsg => {
-    return {
-      reverse_proposals: ({
-        limit,
-        start_before: startBefore
-      } as const)
-    };
-  };
-  static proposalCount = (): QueryMsg => {
-    return {
-      proposal_count: ({} as const)
-    };
-  };
-  static vote = ({
-    proposalId,
-    voter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    vote: unknown;
-  }>["vote"]>): QueryMsg => {
-    return {
-      vote: ({
-        proposal_id: proposalId,
-        voter
-      } as const)
-    };
-  };
-  static listVotes = ({
-    limit,
-    proposalId,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_votes: unknown;
-  }>["list_votes"]>): QueryMsg => {
-    return {
-      list_votes: ({
-        limit,
-        proposal_id: proposalId,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static proposalHooks = (): QueryMsg => {
-    return {
-      proposal_hooks: ({} as const)
-    };
-  };
-  static voteHooks = (): QueryMsg => {
-    return {
-      vote_hooks: ({} as const)
-    };
-  };
-  static info = (): QueryMsg => {
-    return {
-      info: ({} as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.msg-builder.ts b/__output__/builder/default/Factory.msg-builder.ts
deleted file mode 100644
index 2bbace3f..00000000
--- a/__output__/builder/default/Factory.msg-builder.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMessageBuilder {
-  static createWallet = ({
-    createWalletMsg
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    create_wallet: unknown;
-  }>["create_wallet"]>): ExecuteMsg => {
-    return {
-      create_wallet: ({
-        create_wallet_msg: createWalletMsg
-      } as const)
-    };
-  };
-  static updateProxyUser = ({
-    newUser,
-    oldUser
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_proxy_user: unknown;
-  }>["update_proxy_user"]>): ExecuteMsg => {
-    return {
-      update_proxy_user: ({
-        new_user: newUser,
-        old_user: oldUser
-      } as const)
-    };
-  };
-  static migrateWallet = ({
-    migrationMsg,
-    walletAddress
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    migrate_wallet: unknown;
-  }>["migrate_wallet"]>): ExecuteMsg => {
-    return {
-      migrate_wallet: ({
-        migration_msg: migrationMsg,
-        wallet_address: walletAddress
-      } as const)
-    };
-  };
-  static updateCodeId = ({
-    newCodeId,
-    ty
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_code_id: unknown;
-  }>["update_code_id"]>): ExecuteMsg => {
-    return {
-      update_code_id: ({
-        new_code_id: newCodeId,
-        ty
-      } as const)
-    };
-  };
-  static updateWalletFee = ({
-    newFee
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_wallet_fee: unknown;
-  }>["update_wallet_fee"]>): ExecuteMsg => {
-    return {
-      update_wallet_fee: ({
-        new_fee: newFee
-      } as const)
-    };
-  };
-  static updateGovecAddr = ({
-    addr
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_govec_addr: unknown;
-  }>["update_govec_addr"]>): ExecuteMsg => {
-    return {
-      update_govec_addr: ({
-        addr
-      } as const)
-    };
-  };
-  static updateAdmin = ({
-    addr
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_admin: unknown;
-  }>["update_admin"]>): ExecuteMsg => {
-    return {
-      update_admin: ({
-        addr
-      } as const)
-    };
-  };
-}
-export abstract class FactoryQueryMessageBuilder {
-  static wallets = ({
-    limit,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    wallets: unknown;
-  }>["wallets"]>): QueryMsg => {
-    return {
-      wallets: ({
-        limit,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static walletsOf = ({
-    limit,
-    startAfter,
-    user
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    wallets_of: unknown;
-  }>["wallets_of"]>): QueryMsg => {
-    return {
-      wallets_of: ({
-        limit,
-        start_after: startAfter,
-        user
-      } as const)
-    };
-  };
-  static codeId = ({
-    ty
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    code_id: unknown;
-  }>["code_id"]>): QueryMsg => {
-    return {
-      code_id: ({
-        ty
-      } as const)
-    };
-  };
-  static fee = (): QueryMsg => {
-    return {
-      fee: ({} as const)
-    };
-  };
-  static govecAddr = (): QueryMsg => {
-    return {
-      govec_addr: ({} as const)
-    };
-  };
-  static adminAddr = (): QueryMsg => {
-    return {
-      admin_addr: ({} as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.msg-builder.ts b/__output__/builder/default/Minter.msg-builder.ts
deleted file mode 100644
index e139b2ad..00000000
--- a/__output__/builder/default/Minter.msg-builder.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMessageBuilder {
-  static mint = (): ExecuteMsg => {
-    return {
-      mint: ({} as const)
-    };
-  };
-  static setWhitelist = ({
-    whitelist
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    set_whitelist: unknown;
-  }>["set_whitelist"]>): ExecuteMsg => {
-    return {
-      set_whitelist: ({
-        whitelist
-      } as const)
-    };
-  };
-  static updateStartTime = (): ExecuteMsg => {
-    return {
-      update_start_time: ({} as const)
-    };
-  };
-  static updatePerAddressLimit = ({
-    perAddressLimit
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_per_address_limit: unknown;
-  }>["update_per_address_limit"]>): ExecuteMsg => {
-    return {
-      update_per_address_limit: ({
-        per_address_limit: perAddressLimit
-      } as const)
-    };
-  };
-  static mintTo = ({
-    recipient
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    mint_to: unknown;
-  }>["mint_to"]>): ExecuteMsg => {
-    return {
-      mint_to: ({
-        recipient
-      } as const)
-    };
-  };
-  static mintFor = ({
-    recipient,
-    tokenId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    mint_for: unknown;
-  }>["mint_for"]>): ExecuteMsg => {
-    return {
-      mint_for: ({
-        recipient,
-        token_id: tokenId
-      } as const)
-    };
-  };
-  static withdraw = (): ExecuteMsg => {
-    return {
-      withdraw: ({} as const)
-    };
-  };
-}
-export abstract class MinterQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static mintableNumTokens = (): QueryMsg => {
-    return {
-      mintable_num_tokens: ({} as const)
-    };
-  };
-  static startTime = (): QueryMsg => {
-    return {
-      start_time: ({} as const)
-    };
-  };
-  static mintPrice = (): QueryMsg => {
-    return {
-      mint_price: ({} as const)
-    };
-  };
-  static mintCount = ({
-    address
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    mint_count: unknown;
-  }>["mint_count"]>): QueryMsg => {
-    return {
-      mint_count: ({
-        address
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts b/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
deleted file mode 100644
index 2a04624c..00000000
--- a/__output__/builder/no-extends/CwAdminFactory.msg-builder.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwAdminFactoryExecuteMessageBuilder {
-  static instantiateContractWithSelfAdmin = ({
-    codeId,
-    instantiateMsg,
-    label
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    instantiate_contract_with_self_admin: unknown;
-  }>["instantiate_contract_with_self_admin"]>): ExecuteMsg => {
-    return {
-      instantiate_contract_with_self_admin: ({
-        code_id: codeId,
-        instantiate_msg: instantiateMsg,
-        label
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts b/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
deleted file mode 100644
index 5727cd91..00000000
--- a/__output__/builder/no-extends/CwCodeIdRegistry.msg-builder.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwCodeIdRegistryExecuteMessageBuilder {
-  static receive = ({
-    amount,
-    msg,
-    sender
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    receive: unknown;
-  }>["receive"]>): ExecuteMsg => {
-    return {
-      receive: ({
-        amount,
-        msg,
-        sender
-      } as const)
-    };
-  };
-  static register = ({
-    chainId,
-    checksum,
-    codeId,
-    name,
-    version
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    register: unknown;
-  }>["register"]>): ExecuteMsg => {
-    return {
-      register: ({
-        chain_id: chainId,
-        checksum,
-        code_id: codeId,
-        name,
-        version
-      } as const)
-    };
-  };
-  static setOwner = ({
-    chainId,
-    name,
-    owner
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    set_owner: unknown;
-  }>["set_owner"]>): ExecuteMsg => {
-    return {
-      set_owner: ({
-        chain_id: chainId,
-        name,
-        owner
-      } as const)
-    };
-  };
-  static unregister = ({
-    chainId,
-    codeId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    unregister: unknown;
-  }>["unregister"]>): ExecuteMsg => {
-    return {
-      unregister: ({
-        chain_id: chainId,
-        code_id: codeId
-      } as const)
-    };
-  };
-  static updateConfig = ({
-    admin,
-    paymentInfo
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_config: unknown;
-  }>["update_config"]>): ExecuteMsg => {
-    return {
-      update_config: ({
-        admin,
-        payment_info: paymentInfo
-      } as const)
-    };
-  };
-}
-export abstract class CwCodeIdRegistryQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static getRegistration = ({
-    chainId,
-    name,
-    version
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    get_registration: unknown;
-  }>["get_registration"]>): QueryMsg => {
-    return {
-      get_registration: ({
-        chain_id: chainId,
-        name,
-        version
-      } as const)
-    };
-  };
-  static infoForCodeId = ({
-    chainId,
-    codeId
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    info_for_code_id: unknown;
-  }>["info_for_code_id"]>): QueryMsg => {
-    return {
-      info_for_code_id: ({
-        chain_id: chainId,
-        code_id: codeId
-      } as const)
-    };
-  };
-  static listRegistrations = ({
-    chainId,
-    name
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_registrations: unknown;
-  }>["list_registrations"]>): QueryMsg => {
-    return {
-      list_registrations: ({
-        chain_id: chainId,
-        name
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.msg-builder.ts b/__output__/builder/no-extends/CwSingle.msg-builder.ts
deleted file mode 100644
index bdc753da..00000000
--- a/__output__/builder/no-extends/CwSingle.msg-builder.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class CwSingleExecuteMessageBuilder {
-  static propose = ({
-    description,
-    msgs,
-    title
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    propose: unknown;
-  }>["propose"]>): ExecuteMsg => {
-    return {
-      propose: ({
-        description,
-        msgs,
-        title
-      } as const)
-    };
-  };
-  static vote = ({
-    proposalId,
-    vote
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    vote: unknown;
-  }>["vote"]>): ExecuteMsg => {
-    return {
-      vote: ({
-        proposal_id: proposalId,
-        vote
-      } as const)
-    };
-  };
-  static execute = ({
-    proposalId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    execute: unknown;
-  }>["execute"]>): ExecuteMsg => {
-    return {
-      execute: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static close = ({
-    proposalId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    close: unknown;
-  }>["close"]>): ExecuteMsg => {
-    return {
-      close: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static updateConfig = ({
-    allowRevoting,
-    dao,
-    depositInfo,
-    maxVotingPeriod,
-    minVotingPeriod,
-    onlyMembersExecute,
-    threshold
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_config: unknown;
-  }>["update_config"]>): ExecuteMsg => {
-    return {
-      update_config: ({
-        allow_revoting: allowRevoting,
-        dao,
-        deposit_info: depositInfo,
-        max_voting_period: maxVotingPeriod,
-        min_voting_period: minVotingPeriod,
-        only_members_execute: onlyMembersExecute,
-        threshold
-      } as const)
-    };
-  };
-  static addProposalHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    add_proposal_hook: unknown;
-  }>["add_proposal_hook"]>): ExecuteMsg => {
-    return {
-      add_proposal_hook: ({
-        address
-      } as const)
-    };
-  };
-  static removeProposalHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    remove_proposal_hook: unknown;
-  }>["remove_proposal_hook"]>): ExecuteMsg => {
-    return {
-      remove_proposal_hook: ({
-        address
-      } as const)
-    };
-  };
-  static addVoteHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    add_vote_hook: unknown;
-  }>["add_vote_hook"]>): ExecuteMsg => {
-    return {
-      add_vote_hook: ({
-        address
-      } as const)
-    };
-  };
-  static removeVoteHook = ({
-    address
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    remove_vote_hook: unknown;
-  }>["remove_vote_hook"]>): ExecuteMsg => {
-    return {
-      remove_vote_hook: ({
-        address
-      } as const)
-    };
-  };
-}
-export abstract class CwSingleQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static proposal = ({
-    proposalId
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    proposal: unknown;
-  }>["proposal"]>): QueryMsg => {
-    return {
-      proposal: ({
-        proposal_id: proposalId
-      } as const)
-    };
-  };
-  static listProposals = ({
-    limit,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_proposals: unknown;
-  }>["list_proposals"]>): QueryMsg => {
-    return {
-      list_proposals: ({
-        limit,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static reverseProposals = ({
-    limit,
-    startBefore
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    reverse_proposals: unknown;
-  }>["reverse_proposals"]>): QueryMsg => {
-    return {
-      reverse_proposals: ({
-        limit,
-        start_before: startBefore
-      } as const)
-    };
-  };
-  static proposalCount = (): QueryMsg => {
-    return {
-      proposal_count: ({} as const)
-    };
-  };
-  static vote = ({
-    proposalId,
-    voter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    vote: unknown;
-  }>["vote"]>): QueryMsg => {
-    return {
-      vote: ({
-        proposal_id: proposalId,
-        voter
-      } as const)
-    };
-  };
-  static listVotes = ({
-    limit,
-    proposalId,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    list_votes: unknown;
-  }>["list_votes"]>): QueryMsg => {
-    return {
-      list_votes: ({
-        limit,
-        proposal_id: proposalId,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static proposalHooks = (): QueryMsg => {
-    return {
-      proposal_hooks: ({} as const)
-    };
-  };
-  static voteHooks = (): QueryMsg => {
-    return {
-      vote_hooks: ({} as const)
-    };
-  };
-  static info = (): QueryMsg => {
-    return {
-      info: ({} as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.msg-builder.ts b/__output__/builder/no-extends/Factory.msg-builder.ts
deleted file mode 100644
index 2bbace3f..00000000
--- a/__output__/builder/no-extends/Factory.msg-builder.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class FactoryExecuteMessageBuilder {
-  static createWallet = ({
-    createWalletMsg
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    create_wallet: unknown;
-  }>["create_wallet"]>): ExecuteMsg => {
-    return {
-      create_wallet: ({
-        create_wallet_msg: createWalletMsg
-      } as const)
-    };
-  };
-  static updateProxyUser = ({
-    newUser,
-    oldUser
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_proxy_user: unknown;
-  }>["update_proxy_user"]>): ExecuteMsg => {
-    return {
-      update_proxy_user: ({
-        new_user: newUser,
-        old_user: oldUser
-      } as const)
-    };
-  };
-  static migrateWallet = ({
-    migrationMsg,
-    walletAddress
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    migrate_wallet: unknown;
-  }>["migrate_wallet"]>): ExecuteMsg => {
-    return {
-      migrate_wallet: ({
-        migration_msg: migrationMsg,
-        wallet_address: walletAddress
-      } as const)
-    };
-  };
-  static updateCodeId = ({
-    newCodeId,
-    ty
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_code_id: unknown;
-  }>["update_code_id"]>): ExecuteMsg => {
-    return {
-      update_code_id: ({
-        new_code_id: newCodeId,
-        ty
-      } as const)
-    };
-  };
-  static updateWalletFee = ({
-    newFee
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_wallet_fee: unknown;
-  }>["update_wallet_fee"]>): ExecuteMsg => {
-    return {
-      update_wallet_fee: ({
-        new_fee: newFee
-      } as const)
-    };
-  };
-  static updateGovecAddr = ({
-    addr
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_govec_addr: unknown;
-  }>["update_govec_addr"]>): ExecuteMsg => {
-    return {
-      update_govec_addr: ({
-        addr
-      } as const)
-    };
-  };
-  static updateAdmin = ({
-    addr
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_admin: unknown;
-  }>["update_admin"]>): ExecuteMsg => {
-    return {
-      update_admin: ({
-        addr
-      } as const)
-    };
-  };
-}
-export abstract class FactoryQueryMessageBuilder {
-  static wallets = ({
-    limit,
-    startAfter
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    wallets: unknown;
-  }>["wallets"]>): QueryMsg => {
-    return {
-      wallets: ({
-        limit,
-        start_after: startAfter
-      } as const)
-    };
-  };
-  static walletsOf = ({
-    limit,
-    startAfter,
-    user
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    wallets_of: unknown;
-  }>["wallets_of"]>): QueryMsg => {
-    return {
-      wallets_of: ({
-        limit,
-        start_after: startAfter,
-        user
-      } as const)
-    };
-  };
-  static codeId = ({
-    ty
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    code_id: unknown;
-  }>["code_id"]>): QueryMsg => {
-    return {
-      code_id: ({
-        ty
-      } as const)
-    };
-  };
-  static fee = (): QueryMsg => {
-    return {
-      fee: ({} as const)
-    };
-  };
-  static govecAddr = (): QueryMsg => {
-    return {
-      govec_addr: ({} as const)
-    };
-  };
-  static adminAddr = (): QueryMsg => {
-    return {
-      admin_addr: ({} as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.msg-builder.ts b/__output__/builder/no-extends/Minter.msg-builder.ts
deleted file mode 100644
index e139b2ad..00000000
--- a/__output__/builder/no-extends/Minter.msg-builder.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-import { CamelCasedProperties } from "type-fest";
-export abstract class MinterExecuteMessageBuilder {
-  static mint = (): ExecuteMsg => {
-    return {
-      mint: ({} as const)
-    };
-  };
-  static setWhitelist = ({
-    whitelist
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    set_whitelist: unknown;
-  }>["set_whitelist"]>): ExecuteMsg => {
-    return {
-      set_whitelist: ({
-        whitelist
-      } as const)
-    };
-  };
-  static updateStartTime = (): ExecuteMsg => {
-    return {
-      update_start_time: ({} as const)
-    };
-  };
-  static updatePerAddressLimit = ({
-    perAddressLimit
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    update_per_address_limit: unknown;
-  }>["update_per_address_limit"]>): ExecuteMsg => {
-    return {
-      update_per_address_limit: ({
-        per_address_limit: perAddressLimit
-      } as const)
-    };
-  };
-  static mintTo = ({
-    recipient
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    mint_to: unknown;
-  }>["mint_to"]>): ExecuteMsg => {
-    return {
-      mint_to: ({
-        recipient
-      } as const)
-    };
-  };
-  static mintFor = ({
-    recipient,
-    tokenId
-  }: CamelCasedProperties<Extract<ExecuteMsg, {
-    mint_for: unknown;
-  }>["mint_for"]>): ExecuteMsg => {
-    return {
-      mint_for: ({
-        recipient,
-        token_id: tokenId
-      } as const)
-    };
-  };
-  static withdraw = (): ExecuteMsg => {
-    return {
-      withdraw: ({} as const)
-    };
-  };
-}
-export abstract class MinterQueryMessageBuilder {
-  static config = (): QueryMsg => {
-    return {
-      config: ({} as const)
-    };
-  };
-  static mintableNumTokens = (): QueryMsg => {
-    return {
-      mintable_num_tokens: ({} as const)
-    };
-  };
-  static startTime = (): QueryMsg => {
-    return {
-      start_time: ({} as const)
-    };
-  };
-  static mintPrice = (): QueryMsg => {
-    return {
-      mint_price: ({} as const)
-    };
-  };
-  static mintCount = ({
-    address
-  }: CamelCasedProperties<Extract<QueryMsg, {
-    mint_count: unknown;
-  }>["mint_count"]>): QueryMsg => {
-    return {
-      mint_count: ({
-        address
-      } as const)
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/cosmwasm/CW4Group.client.ts b/__output__/cosmwasm/CW4Group.client.ts
deleted file mode 100644
index 87cd927c..00000000
--- a/__output__/cosmwasm/CW4Group.client.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
-import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, QueryResponse, AdminResponse, TotalWeightResponse, MemberListResponse, MemberResponse, HooksResponse } from "./CW4Group.types";
-export interface CW4GroupReadOnlyInterface {
-  contractAddress: string;
-  admin: () => Promise<AdminResponse>;
-  totalWeight: () => Promise<TotalWeightResponse>;
-  listMembers: ({
-    limit,
-    startAfter
-  }: {
-    limit?: number;
-    startAfter?: string;
-  }) => Promise<ListMembersResponse>;
-  member: ({
-    addr,
-    atHeight
-  }: {
-    addr: string;
-    atHeight?: number;
-  }) => Promise<MemberResponse>;
-  hooks: () => Promise<HooksResponse>;
-}
-export class CW4GroupQueryClient implements CW4GroupReadOnlyInterface {
-  client: CosmWasmClient;
-  contractAddress: string;
-
-  constructor(client: CosmWasmClient, contractAddress: string) {
-    this.client = client;
-    this.contractAddress = contractAddress;
-    this.admin = this.admin.bind(this);
-    this.totalWeight = this.totalWeight.bind(this);
-    this.listMembers = this.listMembers.bind(this);
-    this.member = this.member.bind(this);
-    this.hooks = this.hooks.bind(this);
-  }
-
-  admin = async (): Promise<AdminResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      admin: {}
-    });
-  };
-  totalWeight = async (): Promise<TotalWeightResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      total_weight: {}
-    });
-  };
-  listMembers = async ({
-    limit,
-    startAfter
-  }: {
-    limit?: number;
-    startAfter?: string;
-  }): Promise<ListMembersResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      list_members: {
-        limit,
-        start_after: startAfter
-      }
-    });
-  };
-  member = async ({
-    addr,
-    atHeight
-  }: {
-    addr: string;
-    atHeight?: number;
-  }): Promise<MemberResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      member: {
-        addr,
-        at_height: atHeight
-      }
-    });
-  };
-  hooks = async (): Promise<HooksResponse> => {
-    return this.client.queryContractSmart(this.contractAddress, {
-      hooks: {}
-    });
-  };
-}
-export interface CW4GroupInterface extends CW4GroupReadOnlyInterface {
-  contractAddress: string;
-  sender: string;
-  updateAdmin: ({
-    admin
-  }: {
-    admin?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  updateMembers: ({
-    add,
-    remove
-  }: {
-    add: Member[];
-    remove: string[];
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  addHook: ({
-    addr
-  }: {
-    addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-  removeHook: ({
-    addr
-  }: {
-    addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
-}
-export class CW4GroupClient extends CW4GroupQueryClient implements CW4GroupInterface {
-  client: SigningCosmWasmClient;
-  sender: string;
-  contractAddress: string;
-
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
-    super(client, contractAddress);
-    this.client = client;
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.updateAdmin = this.updateAdmin.bind(this);
-    this.updateMembers = this.updateMembers.bind(this);
-    this.addHook = this.addHook.bind(this);
-    this.removeHook = this.removeHook.bind(this);
-  }
-
-  updateAdmin = async ({
-    admin
-  }: {
-    admin?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_admin: {
-        admin
-      }
-    }, fee, memo, funds);
-  };
-  updateMembers = async ({
-    add,
-    remove
-  }: {
-    add: Member[];
-    remove: string[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      update_members: {
-        add,
-        remove
-      }
-    }, fee, memo, funds);
-  };
-  addHook = async ({
-    addr
-  }: {
-    addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      add_hook: {
-        addr
-      }
-    }, fee, memo, funds);
-  };
-  removeHook = async ({
-    addr
-  }: {
-    addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
-    return await this.client.execute(this.sender, this.contractAddress, {
-      remove_hook: {
-        addr
-      }
-    }, fee, memo, funds);
-  };
-}
\ No newline at end of file
diff --git a/__output__/cosmwasm/CW4Group.message-composer.ts b/__output__/cosmwasm/CW4Group.message-composer.ts
deleted file mode 100644
index d6b6a62c..00000000
--- a/__output__/cosmwasm/CW4Group.message-composer.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "cosmwasm";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
-import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, QueryResponse, AdminResponse, TotalWeightResponse, MemberListResponse, MemberResponse, HooksResponse } from "./CW4Group.types";
-export interface CW4GroupMessage {
-  contractAddress: string;
-  sender: string;
-  updateAdmin: ({
-    admin
-  }: {
-    admin?: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateMembers: ({
-    add,
-    remove
-  }: {
-    add: Member[];
-    remove: string[];
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  addHook: ({
-    addr
-  }: {
-    addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  removeHook: ({
-    addr
-  }: {
-    addr: string;
-  }, funds?: Coin[]) => MsgExecuteContractEncodeObject;
-}
-export class CW4GroupMessageComposer implements CW4GroupMessage {
-  sender: string;
-  contractAddress: string;
-
-  constructor(sender: string, contractAddress: string) {
-    this.sender = sender;
-    this.contractAddress = contractAddress;
-    this.updateAdmin = this.updateAdmin.bind(this);
-    this.updateMembers = this.updateMembers.bind(this);
-    this.addHook = this.addHook.bind(this);
-    this.removeHook = this.removeHook.bind(this);
-  }
-
-  updateAdmin = ({
-    admin
-  }: {
-    admin?: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
-    return {
-      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-      value: MsgExecuteContract.fromPartial({
-        sender: this.sender,
-        contract: this.contractAddress,
-        msg: toUtf8(JSON.stringify({
-          update_admin: {
-            admin
-          }
-        })),
-        funds
-      })
-    };
-  };
-  updateMembers = ({
-    add,
-    remove
-  }: {
-    add: Member[];
-    remove: string[];
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
-    return {
-      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-      value: MsgExecuteContract.fromPartial({
-        sender: this.sender,
-        contract: this.contractAddress,
-        msg: toUtf8(JSON.stringify({
-          update_members: {
-            add,
-            remove
-          }
-        })),
-        funds
-      })
-    };
-  };
-  addHook = ({
-    addr
-  }: {
-    addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
-    return {
-      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-      value: MsgExecuteContract.fromPartial({
-        sender: this.sender,
-        contract: this.contractAddress,
-        msg: toUtf8(JSON.stringify({
-          add_hook: {
-            addr
-          }
-        })),
-        funds
-      })
-    };
-  };
-  removeHook = ({
-    addr
-  }: {
-    addr: string;
-  }, funds?: Coin[]): MsgExecuteContractEncodeObject => {
-    return {
-      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-      value: MsgExecuteContract.fromPartial({
-        sender: this.sender,
-        contract: this.contractAddress,
-        msg: toUtf8(JSON.stringify({
-          remove_hook: {
-            addr
-          }
-        })),
-        funds
-      })
-    };
-  };
-}
\ No newline at end of file
diff --git a/__output__/cosmwasm/CW4Group.react-query.ts b/__output__/cosmwasm/CW4Group.react-query.ts
deleted file mode 100644
index 420c1a09..00000000
--- a/__output__/cosmwasm/CW4Group.react-query.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { UseQueryOptions, useQuery } from "react-query";
-import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, QueryResponse, AdminResponse, TotalWeightResponse, MemberListResponse, MemberResponse, HooksResponse } from "./CW4Group.types";
-import { CW4GroupQueryClient } from "./CW4Group.client";
-export interface CW4GroupReactQuery<TResponse, TData = TResponse> {
-  client: CW4GroupQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
-}
-export interface CW4GroupHooksQuery<TData> extends CW4GroupReactQuery<HooksResponse, TData> {}
-export function useCW4GroupHooksQuery<TData = HooksResponse>({
-  client,
-  options
-}: CW4GroupHooksQuery<TData>) {
-  return useQuery<HooksResponse, Error, TData>(["cW4GroupHooks", client.contractAddress], () => client.hooks(), options);
-}
-export interface CW4GroupMemberQuery<TData> extends CW4GroupReactQuery<MemberResponse, TData> {
-  args: {
-    addr: string;
-    atHeight?: number;
-  };
-}
-export function useCW4GroupMemberQuery<TData = MemberResponse>({
-  client,
-  args,
-  options
-}: CW4GroupMemberQuery<TData>) {
-  return useQuery<MemberResponse, Error, TData>(["cW4GroupMember", client.contractAddress, JSON.stringify(args)], () => client.member({
-    addr: args.addr,
-    atHeight: args.atHeight
-  }), options);
-}
-export interface CW4GroupListMembersQuery<TData> extends CW4GroupReactQuery<ListMembersResponse, TData> {
-  args: {
-    limit?: number;
-    startAfter?: string;
-  };
-}
-export function useCW4GroupListMembersQuery<TData = ListMembersResponse>({
-  client,
-  args,
-  options
-}: CW4GroupListMembersQuery<TData>) {
-  return useQuery<ListMembersResponse, Error, TData>(["cW4GroupListMembers", client.contractAddress, JSON.stringify(args)], () => client.listMembers({
-    limit: args.limit,
-    startAfter: args.startAfter
-  }), options);
-}
-export interface CW4GroupTotalWeightQuery<TData> extends CW4GroupReactQuery<TotalWeightResponse, TData> {}
-export function useCW4GroupTotalWeightQuery<TData = TotalWeightResponse>({
-  client,
-  options
-}: CW4GroupTotalWeightQuery<TData>) {
-  return useQuery<TotalWeightResponse, Error, TData>(["cW4GroupTotalWeight", client.contractAddress], () => client.totalWeight(), options);
-}
-export interface CW4GroupAdminQuery<TData> extends CW4GroupReactQuery<AdminResponse, TData> {}
-export function useCW4GroupAdminQuery<TData = AdminResponse>({
-  client,
-  options
-}: CW4GroupAdminQuery<TData>) {
-  return useQuery<AdminResponse, Error, TData>(["cW4GroupAdmin", client.contractAddress], () => client.admin(), options);
-}
\ No newline at end of file
diff --git a/__output__/cosmwasm/CW4Group.recoil.ts b/__output__/cosmwasm/CW4Group.recoil.ts
deleted file mode 100644
index 26463bbc..00000000
--- a/__output__/cosmwasm/CW4Group.recoil.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { selectorFamily } from "recoil";
-import { cosmWasmClient } from "./chain";
-import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, QueryResponse, AdminResponse, TotalWeightResponse, MemberListResponse, MemberResponse, HooksResponse } from "./CW4Group.types";
-import { CW4GroupQueryClient } from "./CW4Group.client";
-type QueryClientParams = {
-  contractAddress: string;
-};
-export const queryClient = selectorFamily<CW4GroupQueryClient, QueryClientParams>({
-  key: "cW4GroupQueryClient",
-  get: ({
-    contractAddress
-  }) => ({
-    get
-  }) => {
-    const client = get(cosmWasmClient);
-    return new CW4GroupQueryClient(client, contractAddress);
-  }
-});
-export const adminSelector = selectorFamily<AdminResponse, QueryClientParams & {
-  params: Parameters<CW4GroupQueryClient["admin"]>;
-}>({
-  key: "cW4GroupAdmin",
-  get: ({
-    params,
-    ...queryClientParams
-  }) => async ({
-    get
-  }) => {
-    const client = get(queryClient(queryClientParams));
-    return await client.admin(...params);
-  }
-});
-export const totalWeightSelector = selectorFamily<TotalWeightResponse, QueryClientParams & {
-  params: Parameters<CW4GroupQueryClient["totalWeight"]>;
-}>({
-  key: "cW4GroupTotalWeight",
-  get: ({
-    params,
-    ...queryClientParams
-  }) => async ({
-    get
-  }) => {
-    const client = get(queryClient(queryClientParams));
-    return await client.totalWeight(...params);
-  }
-});
-export const listMembersSelector = selectorFamily<ListMembersResponse, QueryClientParams & {
-  params: Parameters<CW4GroupQueryClient["listMembers"]>;
-}>({
-  key: "cW4GroupListMembers",
-  get: ({
-    params,
-    ...queryClientParams
-  }) => async ({
-    get
-  }) => {
-    const client = get(queryClient(queryClientParams));
-    return await client.listMembers(...params);
-  }
-});
-export const memberSelector = selectorFamily<MemberResponse, QueryClientParams & {
-  params: Parameters<CW4GroupQueryClient["member"]>;
-}>({
-  key: "cW4GroupMember",
-  get: ({
-    params,
-    ...queryClientParams
-  }) => async ({
-    get
-  }) => {
-    const client = get(queryClient(queryClientParams));
-    return await client.member(...params);
-  }
-});
-export const hooksSelector = selectorFamily<HooksResponse, QueryClientParams & {
-  params: Parameters<CW4GroupQueryClient["hooks"]>;
-}>({
-  key: "cW4GroupHooks",
-  get: ({
-    params,
-    ...queryClientParams
-  }) => async ({
-    get
-  }) => {
-    const client = get(queryClient(queryClientParams));
-    return await client.hooks(...params);
-  }
-});
\ No newline at end of file
diff --git a/__output__/cosmwasm/CW4Group.types.ts b/__output__/cosmwasm/CW4Group.types.ts
deleted file mode 100644
index 1dfa9766..00000000
--- a/__output__/cosmwasm/CW4Group.types.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-export interface InstantiateMsg {
-  admin?: string | null;
-  members: Member[];
-}
-export interface Member {
-  addr: string;
-  weight: number;
-}
-export type ExecuteMsg = {
-  update_admin: {
-    admin?: string | null;
-  };
-} | {
-  update_members: {
-    add: Member[];
-    remove: string[];
-  };
-} | {
-  add_hook: {
-    addr: string;
-  };
-} | {
-  remove_hook: {
-    addr: string;
-  };
-};
-export type QueryMsg = {
-  admin: {};
-} | {
-  total_weight: {};
-} | {
-  list_members: {
-    limit?: number | null;
-    start_after?: string | null;
-  };
-} | {
-  member: {
-    addr: string;
-    at_height?: number | null;
-  };
-} | {
-  hooks: {};
-};
-export type QueryResponse = {
-  admin: AdminResponse;
-} | {
-  total_weight: TotalWeightResponse;
-} | {
-  list_members: MemberListResponse;
-} | {
-  member: MemberResponse;
-} | {
-  hooks: HooksResponse;
-};
-export interface AdminResponse {
-  admin?: string | null;
-}
-export interface TotalWeightResponse {
-  weight: number;
-}
-export interface MemberListResponse {
-  members: Member[];
-}
-export interface MemberResponse {
-  weight?: number | null;
-}
-export interface HooksResponse {
-  hooks: string[];
-}
\ No newline at end of file
diff --git a/__output__/vectis/factory-opt/Factory.react-query.ts b/__output__/vectis/factory-opt/Factory.react-query.ts
deleted file mode 100644
index 94e03744..00000000
--- a/__output__/vectis/factory-opt/Factory.react-query.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { UseQueryOptions, useQuery } from "react-query";
-import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { FactoryQueryClient } from "./Factory.client";
-export interface FactoryAdminAddrQuery {
-  client?: FactoryQueryClient;
-  options?: UseQueryOptions<AdminAddrResponse | undefined, Error, AdminAddrResponse, (string | undefined)[]>;
-}
-export function useFactoryAdminAddrQuery({
-  client,
-  options
-}: FactoryAdminAddrQuery) {
-  return useQuery<AdminAddrResponse | undefined, Error, AdminAddrResponse, (string | undefined)[]>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : undefined, { ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
-}
-export interface FactoryGovecAddrQuery {
-  client?: FactoryQueryClient;
-  options?: UseQueryOptions<GovecAddrResponse | undefined, Error, GovecAddrResponse, (string | undefined)[]>;
-}
-export function useFactoryGovecAddrQuery({
-  client,
-  options
-}: FactoryGovecAddrQuery) {
-  return useQuery<GovecAddrResponse | undefined, Error, GovecAddrResponse, (string | undefined)[]>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : undefined, { ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
-}
-export interface FactoryFeeQuery {
-  client?: FactoryQueryClient;
-  options?: UseQueryOptions<FeeResponse | undefined, Error, FeeResponse, (string | undefined)[]>;
-}
-export function useFactoryFeeQuery({
-  client,
-  options
-}: FactoryFeeQuery) {
-  return useQuery<FeeResponse | undefined, Error, FeeResponse, (string | undefined)[]>(["factoryFee", client?.contractAddress], () => client ? client.fee() : undefined, { ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
-}
-export interface FactoryCodeIdQuery {
-  client?: FactoryQueryClient;
-  options?: UseQueryOptions<CodeIdResponse | undefined, Error, CodeIdResponse, (string | undefined)[]>;
-  args: {
-    ty: CodeIdType;
-  };
-}
-export function useFactoryCodeIdQuery({
-  client,
-  args,
-  options
-}: FactoryCodeIdQuery) {
-  return useQuery<CodeIdResponse | undefined, Error, CodeIdResponse, (string | undefined)[]>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
-    ty: args.ty
-  }) : undefined, { ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
-}
-export interface FactoryWalletsOfQuery {
-  client?: FactoryQueryClient;
-  options?: UseQueryOptions<WalletsOfResponse | undefined, Error, WalletsOfResponse, (string | undefined)[]>;
-  args: {
-    limit?: number;
-    startAfter?: string;
-    user: string;
-  };
-}
-export function useFactoryWalletsOfQuery({
-  client,
-  args,
-  options
-}: FactoryWalletsOfQuery) {
-  return useQuery<WalletsOfResponse | undefined, Error, WalletsOfResponse, (string | undefined)[]>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
-    limit: args.limit,
-    startAfter: args.startAfter,
-    user: args.user
-  }) : undefined, { ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
-}
-export interface FactoryWalletsQuery {
-  client?: FactoryQueryClient;
-  options?: UseQueryOptions<WalletsResponse | undefined, Error, WalletsResponse, (string | undefined)[]>;
-  args: {
-    limit?: number;
-    startAfter?: WalletQueryPrefix;
-  };
-}
-export function useFactoryWalletsQuery({
-  client,
-  args,
-  options
-}: FactoryWalletsQuery) {
-  return useQuery<WalletsResponse | undefined, Error, WalletsResponse, (string | undefined)[]>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
-    limit: args.limit,
-    startAfter: args.startAfter
-  }) : undefined, { ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
-}
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-factory/Factory.react-query.ts b/__output__/vectis/factory-query-factory/Factory.react-query.ts
deleted file mode 100644
index e233c2bb..00000000
--- a/__output__/vectis/factory-query-factory/Factory.react-query.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
-* This file was automatically generated by @cosmwasm/ts-codegen@latest.
-* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
-* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
-*/
-
-import { UseQueryOptions, useQuery } from "react-query";
-import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { FactoryQueryClient } from "./Factory.client";
-export const factoryQueryKeys = {
-  contract: ([{
-    contract: "factory"
-  }] as const),
-  address: (contractAddress: string) => ([{ ...factoryQueryKeys.contract[0],
-    address: contractAddress
-  }] as const),
-  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
-    method: "wallets",
-    args
-  }] as const),
-  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
-    method: "wallets_of",
-    args
-  }] as const),
-  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
-    method: "code_id",
-    args
-  }] as const),
-  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
-    method: "fee",
-    args
-  }] as const),
-  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
-    method: "govec_addr",
-    args
-  }] as const),
-  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
-    method: "admin_addr",
-    args
-  }] as const)
-};
-export interface FactoryReactQuery<TResponse, TData = TResponse> {
-  client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
-}
-export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
-export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
-  client,
-  options
-}: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client.contractAddress), () => client.adminAddr(), options);
-}
-export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
-export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
-  client,
-  options
-}: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client.contractAddress), () => client.govecAddr(), options);
-}
-export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
-export function useFactoryFeeQuery<TData = FeeResponse>({
-  client,
-  options
-}: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client.contractAddress), () => client.fee(), options);
-}
-export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
-  args: {
-    ty: CodeIdType;
-  };
-}
-export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
-  client,
-  args,
-  options
-}: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client.contractAddress, args), () => client.codeId({
-    ty: args.ty
-  }), options);
-}
-export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
-  args: {
-    limit?: number;
-    startAfter?: string;
-    user: string;
-  };
-}
-export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
-  client,
-  args,
-  options
-}: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client.contractAddress, args), () => client.walletsOf({
-    limit: args.limit,
-    startAfter: args.startAfter,
-    user: args.user
-  }), options);
-}
-export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
-  args: {
-    limit?: number;
-    startAfter?: WalletQueryPrefix;
-  };
-}
-export function useFactoryWalletsQuery<TData = WalletsResponse>({
-  client,
-  args,
-  options
-}: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client.contractAddress, args), () => client.wallets({
-    limit: args.limit,
-    startAfter: args.startAfter
-  }), options);
-}
\ No newline at end of file

From 372ec82feafaddd25ad795fbed5796115af1b5d7 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:48:43 -0700
Subject: [PATCH 161/287] output fixtures readme

---
 README.md                                     |  4 +-
 .../CwAdminFactory.message-composer.ts        |  4 +-
 .../contracts/CwAdminFactory.provider.ts      |  6 +-
 .../CwCodeIdRegistry.message-composer.ts      |  4 +-
 .../contracts/CwCodeIdRegistry.provider.ts    |  6 +-
 .../contracts/CwSingle.message-composer.ts    |  4 +-
 .../contracts/CwSingle.provider.ts            |  6 +-
 .../contracts/Factory.message-composer.ts     |  4 +-
 .../contracts/Factory.provider.ts             |  6 +-
 .../contracts/Minter.message-composer.ts      |  4 +-
 .../bundler_test/contracts/Minter.provider.ts |  6 +-
 .../contracts/contractContextProviders.ts     | 20 ++---
 .../CwAdminFactory.message-composer.ts        |  4 +-
 .../default/CwAdminFactory.provider.ts        |  6 +-
 .../CwCodeIdRegistry.message-composer.ts      |  4 +-
 .../default/CwCodeIdRegistry.provider.ts      |  6 +-
 .../default/CwSingle.message-composer.ts      |  4 +-
 .../builder/default/CwSingle.provider.ts      |  6 +-
 .../default/Factory.message-composer.ts       |  4 +-
 .../builder/default/Factory.provider.ts       |  6 +-
 .../default/Minter.message-composer.ts        |  4 +-
 __output__/builder/default/Minter.provider.ts |  6 +-
 .../default/contractContextProviders.ts       | 20 ++---
 .../CwAdminFactory.message-composer.ts        |  4 +-
 .../CwCodeIdRegistry.message-composer.ts      |  4 +-
 .../no-extends/CwSingle.message-composer.ts   |  4 +-
 .../no-extends/Factory.message-composer.ts    |  4 +-
 .../no-extends/Minter.message-composer.ts     |  4 +-
 .../Sg721Updatable.message-composer.ts        |  4 +-
 packages/ts-codegen/README.md                 | 83 +++++++++++++++----
 .../src/plugins/message-composer.ts           |  4 +-
 31 files changed, 154 insertions(+), 101 deletions(-)

diff --git a/README.md b/README.md
index bc062836..a3e9e513 100644
--- a/README.md
+++ b/README.md
@@ -278,8 +278,8 @@ cosmwasm-ts-codegen generate \
 ```
 #### Message Builder Options
 
-| option                   | description                    |
-|------------------------- | ------------------------------ |
+| option                   | description                        |
+|------------------------- | ---------------------------------- |
 | `messageBuilder.enabled` | enable the messageBuilder plugin   |
 
 
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index 96fcfa44..bef32013 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-export interface CwAdminFactoryMessage {
+export interface CwAdminFactoryMsg {
   contractAddress: string;
   sender: string;
   instantiateContractWithSelfAdmin: ({
@@ -22,7 +22,7 @@ export interface CwAdminFactoryMessage {
     label: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
+export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
index f8d0b76d..24c5a646 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwAdminFactoryClient, CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
-import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
-export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer> {
+import { CwAdminFactoryMsgComposer } from "./CwAdminFactory.message-composer";
+export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index 9c28ec26..5e2f60b2 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-export interface CwCodeIdRegistryMessage {
+export interface CwCodeIdRegistryMsg {
   contractAddress: string;
   sender: string;
   receive: ({
@@ -58,7 +58,7 @@ export interface CwCodeIdRegistryMessage {
     paymentInfo?: PaymentInfo;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
+export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
index ba841f2f..eee19b43 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
-import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
-export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer> {
+import { CwCodeIdRegistryMsgComposer } from "./CwCodeIdRegistry.message-composer";
+export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index 465f2b1a..1fcde7c6 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
-export interface CwSingleMessage {
+export interface CwSingleMsg {
   contractAddress: string;
   sender: string;
   propose: ({
@@ -75,7 +75,7 @@ export interface CwSingleMessage {
     address: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwSingleMessageComposer implements CwSingleMessage {
+export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
index e3b2a3b3..2bd53f0f 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwSingleClient, CwSingleQueryClient } from "./CwSingle.client";
-import { CwSingleMessageComposer } from "./CwSingle.message-composer";
-export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer> {
+import { CwSingleMsgComposer } from "./CwSingle.message-composer";
+export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index 9b9ae7c4..d5100d04 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-export interface FactoryMessage {
+export interface FactoryMsg {
   contractAddress: string;
   sender: string;
   createWallet: ({
@@ -53,7 +53,7 @@ export interface FactoryMessage {
     addr: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class FactoryMessageComposer implements FactoryMessage {
+export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/bundler_test/contracts/Factory.provider.ts b/__output__/builder/bundler_test/contracts/Factory.provider.ts
index 34273f44..c60015f4 100644
--- a/__output__/builder/bundler_test/contracts/Factory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { FactoryClient, FactoryQueryClient } from "./Factory.client";
-import { FactoryMessageComposer } from "./Factory.message-composer";
-export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMessageComposer> {
+import { FactoryMsgComposer } from "./Factory.message-composer";
+export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 57ecfa82..28a24747 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-export interface MinterMessage {
+export interface MinterMsg {
   contractAddress: string;
   sender: string;
   mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
@@ -37,7 +37,7 @@ export interface MinterMessage {
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class MinterMessageComposer implements MinterMessage {
+export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/bundler_test/contracts/Minter.provider.ts b/__output__/builder/bundler_test/contracts/Minter.provider.ts
index c5e6aa5f..8d3a1eaa 100644
--- a/__output__/builder/bundler_test/contracts/Minter.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { MinterClient, MinterQueryClient } from "./Minter.client";
-import { MinterMessageComposer } from "./Minter.message-composer";
-export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMessageComposer> {
+import { MinterMsgComposer } from "./Minter.message-composer";
+export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/contractContextProviders.ts b/__output__/builder/bundler_test/contracts/contractContextProviders.ts
index bf15d71a..ca57a66e 100644
--- a/__output__/builder/bundler_test/contracts/contractContextProviders.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextProviders.ts
@@ -8,30 +8,30 @@ import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate
 import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
 import { FactoryQueryClient } from "./Factory.client";
 import { FactoryClient } from "./Factory.client";
-import { FactoryMessageComposer } from "./Factory.message-composer";
+import { FactoryMsgComposer } from "./Factory.message-composer";
 import { Factory } from "./Factory.provider";
 import { MinterQueryClient } from "./Minter.client";
 import { MinterClient } from "./Minter.client";
-import { MinterMessageComposer } from "./Minter.message-composer";
+import { MinterMsgComposer } from "./Minter.message-composer";
 import { Minter } from "./Minter.provider";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 import { CwAdminFactoryClient } from "./CwAdminFactory.client";
-import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
+import { CwAdminFactoryMsgComposer } from "./CwAdminFactory.message-composer";
 import { CwAdminFactory } from "./CwAdminFactory.provider";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
-import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
+import { CwCodeIdRegistryMsgComposer } from "./CwCodeIdRegistry.message-composer";
 import { CwCodeIdRegistry } from "./CwCodeIdRegistry.provider";
 import { CwSingleQueryClient } from "./CwSingle.client";
 import { CwSingleClient } from "./CwSingle.client";
-import { CwSingleMessageComposer } from "./CwSingle.message-composer";
+import { CwSingleMsgComposer } from "./CwSingle.message-composer";
 import { CwSingle } from "./CwSingle.provider";
 export interface IContractsContext {
-  factory: IQueryClientProvider<FactoryQueryClient> & ISigningClientProvider<FactoryClient> & IMessageComposerProvider<FactoryMessageComposer>;
-  minter: IQueryClientProvider<MinterQueryClient> & ISigningClientProvider<MinterClient> & IMessageComposerProvider<MinterMessageComposer>;
-  cwAdminFactory: IQueryClientProvider<CwAdminFactoryQueryClient> & ISigningClientProvider<CwAdminFactoryClient> & IMessageComposerProvider<CwAdminFactoryMessageComposer>;
-  cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMessageComposer>;
-  cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMessageComposer>;
+  factory: IQueryClientProvider<FactoryQueryClient> & ISigningClientProvider<FactoryClient> & IMessageComposerProvider<FactoryMsgComposer>;
+  minter: IQueryClientProvider<MinterQueryClient> & ISigningClientProvider<MinterClient> & IMessageComposerProvider<MinterMsgComposer>;
+  cwAdminFactory: IQueryClientProvider<CwAdminFactoryQueryClient> & ISigningClientProvider<CwAdminFactoryClient> & IMessageComposerProvider<CwAdminFactoryMsgComposer>;
+  cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMsgComposer>;
+  cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMsgComposer>;
 }
 export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
   factory: new Factory({
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index 96fcfa44..bef32013 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-export interface CwAdminFactoryMessage {
+export interface CwAdminFactoryMsg {
   contractAddress: string;
   sender: string;
   instantiateContractWithSelfAdmin: ({
@@ -22,7 +22,7 @@ export interface CwAdminFactoryMessage {
     label: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
+export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/default/CwAdminFactory.provider.ts b/__output__/builder/default/CwAdminFactory.provider.ts
index f8d0b76d..24c5a646 100644
--- a/__output__/builder/default/CwAdminFactory.provider.ts
+++ b/__output__/builder/default/CwAdminFactory.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwAdminFactoryClient, CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
-import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
-export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer> {
+import { CwAdminFactoryMsgComposer } from "./CwAdminFactory.message-composer";
+export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index 9c28ec26..5e2f60b2 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-export interface CwCodeIdRegistryMessage {
+export interface CwCodeIdRegistryMsg {
   contractAddress: string;
   sender: string;
   receive: ({
@@ -58,7 +58,7 @@ export interface CwCodeIdRegistryMessage {
     paymentInfo?: PaymentInfo;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
+export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/default/CwCodeIdRegistry.provider.ts b/__output__/builder/default/CwCodeIdRegistry.provider.ts
index ba841f2f..eee19b43 100644
--- a/__output__/builder/default/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
-import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
-export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer> {
+import { CwCodeIdRegistryMsgComposer } from "./CwCodeIdRegistry.message-composer";
+export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index 465f2b1a..1fcde7c6 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
-export interface CwSingleMessage {
+export interface CwSingleMsg {
   contractAddress: string;
   sender: string;
   propose: ({
@@ -75,7 +75,7 @@ export interface CwSingleMessage {
     address: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwSingleMessageComposer implements CwSingleMessage {
+export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/default/CwSingle.provider.ts b/__output__/builder/default/CwSingle.provider.ts
index e3b2a3b3..2bd53f0f 100644
--- a/__output__/builder/default/CwSingle.provider.ts
+++ b/__output__/builder/default/CwSingle.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { CwSingleClient, CwSingleQueryClient } from "./CwSingle.client";
-import { CwSingleMessageComposer } from "./CwSingle.message-composer";
-export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer> {
+import { CwSingleMsgComposer } from "./CwSingle.message-composer";
+export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient, CwSingleMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index 9b9ae7c4..d5100d04 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-export interface FactoryMessage {
+export interface FactoryMsg {
   contractAddress: string;
   sender: string;
   createWallet: ({
@@ -53,7 +53,7 @@ export interface FactoryMessage {
     addr: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class FactoryMessageComposer implements FactoryMessage {
+export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/default/Factory.provider.ts b/__output__/builder/default/Factory.provider.ts
index 34273f44..c60015f4 100644
--- a/__output__/builder/default/Factory.provider.ts
+++ b/__output__/builder/default/Factory.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { FactoryClient, FactoryQueryClient } from "./Factory.client";
-import { FactoryMessageComposer } from "./Factory.message-composer";
-export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMessageComposer> {
+import { FactoryMsgComposer } from "./Factory.message-composer";
+export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, FactoryMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 57ecfa82..28a24747 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-export interface MinterMessage {
+export interface MinterMsg {
   contractAddress: string;
   sender: string;
   mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
@@ -37,7 +37,7 @@ export interface MinterMessage {
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class MinterMessageComposer implements MinterMessage {
+export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/default/Minter.provider.ts b/__output__/builder/default/Minter.provider.ts
index c5e6aa5f..8d3a1eaa 100644
--- a/__output__/builder/default/Minter.provider.ts
+++ b/__output__/builder/default/Minter.provider.ts
@@ -6,14 +6,14 @@
 
 import { ContractBase, IContractConstructor } from "./contractContextBase";
 import { MinterClient, MinterQueryClient } from "./Minter.client";
-import { MinterMessageComposer } from "./Minter.message-composer";
-export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMessageComposer> {
+import { MinterMsgComposer } from "./Minter.message-composer";
+export class Minter extends ContractBase<MinterClient, MinterQueryClient, MinterMsgComposer> {
   constructor({
     address,
     cosmWasmClient,
     signingCosmWasmClient
   }: IContractConstructor) {
-    super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMessageComposer);
+    super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMsgComposer);
   }
 
 }
\ No newline at end of file
diff --git a/__output__/builder/default/contractContextProviders.ts b/__output__/builder/default/contractContextProviders.ts
index bf15d71a..ca57a66e 100644
--- a/__output__/builder/default/contractContextProviders.ts
+++ b/__output__/builder/default/contractContextProviders.ts
@@ -8,30 +8,30 @@ import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate
 import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
 import { FactoryQueryClient } from "./Factory.client";
 import { FactoryClient } from "./Factory.client";
-import { FactoryMessageComposer } from "./Factory.message-composer";
+import { FactoryMsgComposer } from "./Factory.message-composer";
 import { Factory } from "./Factory.provider";
 import { MinterQueryClient } from "./Minter.client";
 import { MinterClient } from "./Minter.client";
-import { MinterMessageComposer } from "./Minter.message-composer";
+import { MinterMsgComposer } from "./Minter.message-composer";
 import { Minter } from "./Minter.provider";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 import { CwAdminFactoryClient } from "./CwAdminFactory.client";
-import { CwAdminFactoryMessageComposer } from "./CwAdminFactory.message-composer";
+import { CwAdminFactoryMsgComposer } from "./CwAdminFactory.message-composer";
 import { CwAdminFactory } from "./CwAdminFactory.provider";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 import { CwCodeIdRegistryClient } from "./CwCodeIdRegistry.client";
-import { CwCodeIdRegistryMessageComposer } from "./CwCodeIdRegistry.message-composer";
+import { CwCodeIdRegistryMsgComposer } from "./CwCodeIdRegistry.message-composer";
 import { CwCodeIdRegistry } from "./CwCodeIdRegistry.provider";
 import { CwSingleQueryClient } from "./CwSingle.client";
 import { CwSingleClient } from "./CwSingle.client";
-import { CwSingleMessageComposer } from "./CwSingle.message-composer";
+import { CwSingleMsgComposer } from "./CwSingle.message-composer";
 import { CwSingle } from "./CwSingle.provider";
 export interface IContractsContext {
-  factory: IQueryClientProvider<FactoryQueryClient> & ISigningClientProvider<FactoryClient> & IMessageComposerProvider<FactoryMessageComposer>;
-  minter: IQueryClientProvider<MinterQueryClient> & ISigningClientProvider<MinterClient> & IMessageComposerProvider<MinterMessageComposer>;
-  cwAdminFactory: IQueryClientProvider<CwAdminFactoryQueryClient> & ISigningClientProvider<CwAdminFactoryClient> & IMessageComposerProvider<CwAdminFactoryMessageComposer>;
-  cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMessageComposer>;
-  cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMessageComposer>;
+  factory: IQueryClientProvider<FactoryQueryClient> & ISigningClientProvider<FactoryClient> & IMessageComposerProvider<FactoryMsgComposer>;
+  minter: IQueryClientProvider<MinterQueryClient> & ISigningClientProvider<MinterClient> & IMessageComposerProvider<MinterMsgComposer>;
+  cwAdminFactory: IQueryClientProvider<CwAdminFactoryQueryClient> & ISigningClientProvider<CwAdminFactoryClient> & IMessageComposerProvider<CwAdminFactoryMsgComposer>;
+  cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMsgComposer>;
+  cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMsgComposer>;
 }
 export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
   factory: new Factory({
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index 96fcfa44..bef32013 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-export interface CwAdminFactoryMessage {
+export interface CwAdminFactoryMsg {
   contractAddress: string;
   sender: string;
   instantiateContractWithSelfAdmin: ({
@@ -22,7 +22,7 @@ export interface CwAdminFactoryMessage {
     label: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
+export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index 9c28ec26..5e2f60b2 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-export interface CwCodeIdRegistryMessage {
+export interface CwCodeIdRegistryMsg {
   contractAddress: string;
   sender: string;
   receive: ({
@@ -58,7 +58,7 @@ export interface CwCodeIdRegistryMessage {
     paymentInfo?: PaymentInfo;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
+export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index 465f2b1a..1fcde7c6 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
-export interface CwSingleMessage {
+export interface CwSingleMsg {
   contractAddress: string;
   sender: string;
   propose: ({
@@ -75,7 +75,7 @@ export interface CwSingleMessage {
     address: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwSingleMessageComposer implements CwSingleMessage {
+export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index 9b9ae7c4..d5100d04 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-export interface FactoryMessage {
+export interface FactoryMsg {
   contractAddress: string;
   sender: string;
   createWallet: ({
@@ -53,7 +53,7 @@ export interface FactoryMessage {
     addr: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class FactoryMessageComposer implements FactoryMessage {
+export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 57ecfa82..28a24747 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-export interface MinterMessage {
+export interface MinterMsg {
   contractAddress: string;
   sender: string;
   mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
@@ -37,7 +37,7 @@ export interface MinterMessage {
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class MinterMessageComposer implements MinterMessage {
+export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
index d717a293..aae3f337 100644
--- a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
-export interface Sg721UpdatableMessage {
+export interface Sg721UpdatableMsg {
   contractAddress: string;
   sender: string;
   freezeTokenMetadata: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
@@ -94,7 +94,7 @@ export interface Sg721UpdatableMessage {
     msg: Empty;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class Sg721UpdatableMessageComposer implements Sg721UpdatableMessage {
+export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   sender: string;
   contractAddress: string;
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index efbaf3bc..a3e9e513 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -47,7 +47,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Exporting Schemas](#exporting-schemas)
 - [Developing](#developing)
 - [Related](#related)
-## Quickstart 
+## Quickstart
 
 Clone your project and `cd` into your contracts folder
 
@@ -133,7 +133,7 @@ codegen({
   console.log('✨ all done!');
 });
 ```
-#### Types 
+#### Types
 
 Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
 
@@ -149,7 +149,7 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 ### Client
 
-The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations. 
+The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
 
 [see example output code](https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817)
 
@@ -189,7 +189,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
-#### React Query via CLI 
+#### React Query via CLI
 
 Here is an example without optional client, using v3 for `react-query`, without mutations:
 
@@ -231,7 +231,7 @@ cosmwasm-ts-codegen generate \
     --plugin recoil \
     --schema ./schema \
     --out ./ts \
-    --name MyContractName 
+    --name MyContractName
 ```
 
 #### Recoil Options
@@ -253,7 +253,7 @@ cosmwasm-ts-codegen generate \
     --plugin message-composer \
     --schema ./schema \
     --out ./ts \
-    --name MyContractName 
+    --name MyContractName
 ```
 #### Message Composer Options
 
@@ -274,12 +274,12 @@ cosmwasm-ts-codegen generate \
     --plugin message-builder \
     --schema ./schema \
     --out ./ts \
-    --name MyContractName 
+    --name MyContractName
 ```
 #### Message Builder Options
 
-| option                   | description                    |
-|------------------------- | ------------------------------ |
+| option                   | description                        |
+|------------------------- | ---------------------------------- |
 | `messageBuilder.enabled` | enable the messageBuilder plugin   |
 
 
@@ -296,8 +296,8 @@ import { useChain } from '@cosmos-kit/react';
 import { ContractsProvider } from '../path/to/codegen/contracts-context';
 
 export default function YourComponent() {
-  
-  const { 
+
+  const {
     address,
     getCosmWasmClient,
     getSigningCosmWasmClient
@@ -357,11 +357,64 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 | `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
 | `bundle.bundleFile`   | name of the bundle file                                                          |
 
+#### Coding Style
+
+| option                | description                                                                      |
+| --------------------- | -------------------------------------------------------------------------------- |
+| `useShorthandCtor`      |  Enable using shorthand constructor. Default: false |
+
+Using shorthand constructor(Might not be transpiled correctly with babel):
+
+```ts
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+```
+
+Without using shorthand constructor:
+
+```ts
+  address: string | undefined;
+  ...
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
+  constructor(
+    address: string | undefined,
+    ...
+    TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {
+    this.address = address;
+    ...
+    this.TMsgComposer = TMsgComposer;
+  }
+```
+
 ### CLI Usage and Examples
 
 #### Interactive prompt
 
-The CLI is interactive, and if you don't specify an option, it will interactively prompt you. 
+The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
 
 ```sh
 cosmwasm-ts-codegen generate
@@ -444,12 +497,12 @@ cosmwasm-ts-codegen generate \
 for lower-level access, you can import the various plugins directly:
 
 ```ts
-import { 
+import {
   generateTypes,
   generateClient,
   generateReactQuery,
   generateRecoil,
-  generateMessageComposer,
+  generateMessageComposer
 } from '@cosmwasm/ts-codegen';
 ```
 ### Example Output
@@ -541,7 +594,7 @@ export_schema_with_title(
 ### Initial setup
 
 ```
-yarn 
+yarn
 yarn bootstrap
 ```
 
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index 3e9ffe8c..277b6045 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -54,8 +54,8 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
     if (ExecuteMsg) {
       const children = getMessageProperties(ExecuteMsg);
       if (children.length > 0) {
-        const TheClass = pascal(`${name}MessageComposer`);
-        const Interface = pascal(`${name}Message`);
+        const TheClass = pascal(`${name}MsgComposer`);
+        const Interface = pascal(`${name}Msg`);
 
         body.push(
           w.createMessageComposerInterface(context, Interface, ExecuteMsg)

From 34feaf9d151b5e5605b988a7eb4b3c9248d46fb6 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:56:38 -0700
Subject: [PATCH 162/287] readme

---
 README.md                     |  8 ++++----
 packages/ts-codegen/README.md | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index bd11f05e..8843fcae 100644
--- a/README.md
+++ b/README.md
@@ -369,11 +369,11 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 
 #### Coding Style
 
-| option                | description                                                                      |
-| --------------------- | -------------------------------------------------------------------------------- |
-| `useShorthandCtor`      |  Enable using shorthand constructor. Default: true |
+| option                | description                          | default |
+| --------------------- | ---------------------------------------------- |
+| `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
 
-Using shorthand constructor(Might not be transpiled correctly with babel):
+Using shorthand constructor (Might not be transpiled correctly with babel):
 
 ```ts
   constructor(
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index a3e9e513..8843fcae 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -317,6 +317,16 @@ export default function YourComponent() {
 };
 ```
 
+If you're using Babel, please make sure include '@babel/preset-react' in devDeps and presets in .babelrc.js:
+
+```js
+ presets: [
+      '@babel/typescript',
+      '@babel/env',
+      '@babel/preset-react',
+     ]
+```
+
 #### Use Contracts Hooks Usage
 
 Once enabled, you can get contracts very simply:
@@ -359,11 +369,11 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 
 #### Coding Style
 
-| option                | description                                                                      |
-| --------------------- | -------------------------------------------------------------------------------- |
-| `useShorthandCtor`      |  Enable using shorthand constructor. Default: false |
+| option                | description                          | default |
+| --------------------- | ---------------------------------------------- |
+| `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
 
-Using shorthand constructor(Might not be transpiled correctly with babel):
+Using shorthand constructor (Might not be transpiled correctly with babel):
 
 ```ts
   constructor(

From fa5aea0a8de61f713a8dad85c5f7965e82c3b5c0 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 14:57:29 -0700
Subject: [PATCH 163/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.0
 - wasm-ast-types@0.26.0
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index fb82be09..d49c63c0 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.35.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.34.2...@cosmwasm/ts-codegen@0.35.0) (2023-08-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.34.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.34.1...@cosmwasm/ts-codegen@0.34.2) (2023-07-30)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index ce28a9a7..7196d082 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.34.2",
+  "version": "0.35.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.25.0"
+    "wasm-ast-types": "^0.26.0"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index ef1b272a..f1ad5bfd 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.26.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.25.0...wasm-ast-types@0.26.0) (2023-08-09)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.25.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.24.0...wasm-ast-types@0.25.0) (2023-07-28)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index d6c024ae..7e68964c 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.25.0",
+  "version": "0.26.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",

From 4c969705e808b1e64771185c9e37aa4168dc81a0 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 15:25:21 -0700
Subject: [PATCH 164/287] default reactQuery to v4

---
 packages/ts-codegen/src/commands/generate.ts  |  2 +-
 .../wasm-ast-types/src/context/context.ts     |  2 +-
 .../src/react-query/react-query.spec.ts       | 24 ++++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index da45c51e..ce3cc49c 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -64,7 +64,7 @@ export default async (argv) => {
                 type: 'list',
                 name: 'version',
                 message: 'which react-query version?',
-                default: 'v3',
+                default: 'v4',
                 choices: ['v3', 'v4']
             },
             {
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index 3db892d2..c67beaf6 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -115,7 +115,7 @@ export const defaultOptions: RenderOptions = {
   reactQuery: {
     enabled: false,
     optionalClient: false,
-    version: 'v3',
+    version: 'v4',
     mutations: false,
     camelize: true,
     queryKeys: false
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
index 19921053..bad63977 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.spec.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.spec.ts
@@ -9,16 +9,16 @@ import {
   createReactQueryMutationHooks,
 } from './react-query'
 import { expectCode, makeContext } from '../../test-utils';
-import { createMessageBuilderClass } from '../message-builder';
-
-const execCtx = makeContext(execute_msg);
-const queryCtx = makeContext(query_msg);
 
 it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: queryCtx,
+        context: makeContext(query_msg, {
+          reactQuery: {
+            version: 'v3',
+          }
+        }),
         queryMsg: query_msg,
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
@@ -29,6 +29,7 @@ it('createReactQueryHooks', () => {
       {
         context: makeContext(query_msg, {
           reactQuery: {
+            version: 'v3',
             optionalClient: true
           }
         }),
@@ -84,7 +85,11 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryMutationHooks(
       {
-        context: execCtx,
+        context: makeContext(execute_msg, {
+          reactQuery: {
+            version: 'v3'
+          }
+        }),
         execMsg: execute_msg,
         contractName: 'Sg721',
         ExecuteClient: 'Sg721Client',
@@ -93,11 +98,14 @@ it('createReactQueryHooks', () => {
 });
 
 it('ownership', () => {
-  const ownershipCtx = makeContext(ownership);
   expectCode(t.program(
     createReactQueryMutationHooks(
       {
-        context: ownershipCtx,
+        context: makeContext(ownership, {
+          reactQuery: {
+            version: 'v3'
+          }
+        }),
         execMsg: ownership,
         contractName: 'Ownership',
         ExecuteClient: 'OwnershipClient',

From 0cad0afb48264cc726c06a6ff7a1453e7cabb4b5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 15:25:36 -0700
Subject: [PATCH 165/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.1
 - wasm-ast-types@0.26.1
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index d49c63c0..64602698 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.0...@cosmwasm/ts-codegen@0.35.1) (2023-08-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [0.35.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.34.2...@cosmwasm/ts-codegen@0.35.0) (2023-08-09)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 7196d082..24a8ce9c 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.26.0"
+    "wasm-ast-types": "^0.26.1"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index f1ad5bfd..502ef01c 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.26.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.0...wasm-ast-types@0.26.1) (2023-08-09)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [0.26.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.25.0...wasm-ast-types@0.26.0) (2023-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 7e68964c..a5a31ad4 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "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",

From 91f16c3b72fb24e85dcbc814bb8848ad5c05a6a1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 15:26:29 -0700
Subject: [PATCH 166/287] tests

---
 __fixtures__/issues/98/out/98.react-query.ts  |  6 ++--
 .../contracts/CwAdminFactory.react-query.ts   |  6 ++--
 .../contracts/CwCodeIdRegistry.react-query.ts |  6 ++--
 .../contracts/CwSingle.react-query.ts         |  6 ++--
 .../contracts/Factory.react-query.ts          |  6 ++--
 .../contracts/Minter.react-query.ts           |  6 ++--
 .../default/CwAdminFactory.react-query.ts     |  6 ++--
 .../default/CwCodeIdRegistry.react-query.ts   |  6 ++--
 .../builder/default/CwSingle.react-query.ts   |  6 ++--
 .../builder/default/Factory.react-query.ts    |  6 ++--
 .../builder/default/Minter.react-query.ts     |  6 ++--
 .../invoke/CwAdminFactory.react-query.ts      |  6 ++--
 .../invoke/CwCodeIdRegistry.react-query.ts    |  6 ++--
 .../builder/invoke/CwSingle.react-query.ts    |  6 ++--
 .../builder/invoke/Factory.react-query.ts     |  6 ++--
 .../builder/invoke/Minter.react-query.ts      |  6 ++--
 .../no-extends/CwAdminFactory.react-query.ts  |  6 ++--
 .../CwCodeIdRegistry.react-query.ts           |  6 ++--
 .../no-extends/CwSingle.react-query.ts        |  6 ++--
 .../builder/no-extends/Factory.react-query.ts |  6 ++--
 .../builder/no-extends/Minter.react-query.ts  |  6 ++--
 .../CwAdminFactory.react-query.ts             |  6 ++--
 .../CwCodeIdRegistry.react-query.ts           |  6 ++--
 .../CwNamedGroups.react-query.ts              |  6 ++--
 .../CwProposalSingle.react-query.ts           |  6 ++--
 .../accounts-nft/AccountsNft.react-query.ts   |  6 ++--
 .../Cw3FixedMultiSig.react-query.ts           |  6 ++--
 .../cw4-group/Cw4Group.react-query.ts         |  6 ++--
 .../cyberpunk/CyberPunk.react-query.ts        |  6 ++--
 .../hackatom/HackAtom.react-query.ts          |  6 ++--
 __output__/minter/Minter.react-query.ts       |  6 ++--
 .../Sg721Updatable.react-query.ts             |  6 ++--
 __output__/sg721/Sg721.react-query.ts         |  6 ++--
 .../Factory.react-query.ts                    |  6 ++--
 .../Factory.react-query.ts                    |  6 ++--
 .../factory-query-keys/Factory.react-query.ts |  6 ++--
 .../vectis/factory/Factory.react-query.ts     |  6 ++--
 __output__/vectis/govec/Govec.react-query.ts  |  6 ++--
 __output__/vectis/proxy/Proxy.react-query.ts  |  6 ++--
 .../__snapshots__/builder.test.ts.snap        | 32 +++++++++----------
 40 files changed, 172 insertions(+), 94 deletions(-)

diff --git a/__fixtures__/issues/98/out/98.react-query.ts b/__fixtures__/issues/98/out/98.react-query.ts
index f9e31110..c6314122 100644
--- a/__fixtures__/issues/98/out/98.react-query.ts
+++ b/__fixtures__/issues/98/out/98.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
 import { 98QueryClient } from "./98.client";
 export interface 98ReactQuery<TResponse, TData = TResponse> {
   client: 98QueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface 98GetPluginByIdQuery<TData> extends 98ReactQuery<NullablePlugin, TData> {
   args: {
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts
index be2aa1b7..3a3014d7 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.react-query.ts
@@ -4,10 +4,12 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions } from "react-query";
+import { UseQueryOptions } from "@tanstack/react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts
index d2bcdc8f..fe6add33 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts b/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts
index 874561b4..98b118db 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CwSingleQueryClient } from "./CwSingle.client";
 export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
 export function useCwSingleInfoQuery<TData = InfoResponse>({
diff --git a/__output__/builder/bundler_test/contracts/Factory.react-query.ts b/__output__/builder/bundler_test/contracts/Factory.react-query.ts
index 2d40ad5e..0bbeba10 100644
--- a/__output__/builder/bundler_test/contracts/Factory.react-query.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/builder/bundler_test/contracts/Minter.react-query.ts b/__output__/builder/bundler_test/contracts/Minter.react-query.ts
index 007bcfd9..f66f79e3 100644
--- a/__output__/builder/bundler_test/contracts/Minter.react-query.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
diff --git a/__output__/builder/default/CwAdminFactory.react-query.ts b/__output__/builder/default/CwAdminFactory.react-query.ts
index be2aa1b7..3a3014d7 100644
--- a/__output__/builder/default/CwAdminFactory.react-query.ts
+++ b/__output__/builder/default/CwAdminFactory.react-query.ts
@@ -4,10 +4,12 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions } from "react-query";
+import { UseQueryOptions } from "@tanstack/react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.react-query.ts b/__output__/builder/default/CwCodeIdRegistry.react-query.ts
index d2bcdc8f..fe6add33 100644
--- a/__output__/builder/default/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
diff --git a/__output__/builder/default/CwSingle.react-query.ts b/__output__/builder/default/CwSingle.react-query.ts
index 874561b4..98b118db 100644
--- a/__output__/builder/default/CwSingle.react-query.ts
+++ b/__output__/builder/default/CwSingle.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CwSingleQueryClient } from "./CwSingle.client";
 export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
 export function useCwSingleInfoQuery<TData = InfoResponse>({
diff --git a/__output__/builder/default/Factory.react-query.ts b/__output__/builder/default/Factory.react-query.ts
index 2d40ad5e..0bbeba10 100644
--- a/__output__/builder/default/Factory.react-query.ts
+++ b/__output__/builder/default/Factory.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/builder/default/Minter.react-query.ts b/__output__/builder/default/Minter.react-query.ts
index 007bcfd9..f66f79e3 100644
--- a/__output__/builder/default/Minter.react-query.ts
+++ b/__output__/builder/default/Minter.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
diff --git a/__output__/builder/invoke/CwAdminFactory.react-query.ts b/__output__/builder/invoke/CwAdminFactory.react-query.ts
index be2aa1b7..3a3014d7 100644
--- a/__output__/builder/invoke/CwAdminFactory.react-query.ts
+++ b/__output__/builder/invoke/CwAdminFactory.react-query.ts
@@ -4,10 +4,12 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions } from "react-query";
+import { UseQueryOptions } from "@tanstack/react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts b/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
index d2bcdc8f..fe6add33 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
diff --git a/__output__/builder/invoke/CwSingle.react-query.ts b/__output__/builder/invoke/CwSingle.react-query.ts
index 874561b4..98b118db 100644
--- a/__output__/builder/invoke/CwSingle.react-query.ts
+++ b/__output__/builder/invoke/CwSingle.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CwSingleQueryClient } from "./CwSingle.client";
 export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
 export function useCwSingleInfoQuery<TData = InfoResponse>({
diff --git a/__output__/builder/invoke/Factory.react-query.ts b/__output__/builder/invoke/Factory.react-query.ts
index 2d40ad5e..0bbeba10 100644
--- a/__output__/builder/invoke/Factory.react-query.ts
+++ b/__output__/builder/invoke/Factory.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/builder/invoke/Minter.react-query.ts b/__output__/builder/invoke/Minter.react-query.ts
index 007bcfd9..f66f79e3 100644
--- a/__output__/builder/invoke/Minter.react-query.ts
+++ b/__output__/builder/invoke/Minter.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
diff --git a/__output__/builder/no-extends/CwAdminFactory.react-query.ts b/__output__/builder/no-extends/CwAdminFactory.react-query.ts
index be2aa1b7..3a3014d7 100644
--- a/__output__/builder/no-extends/CwAdminFactory.react-query.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.react-query.ts
@@ -4,10 +4,12 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions } from "react-query";
+import { UseQueryOptions } from "@tanstack/react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts b/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts
index d2bcdc8f..fe6add33 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
diff --git a/__output__/builder/no-extends/CwSingle.react-query.ts b/__output__/builder/no-extends/CwSingle.react-query.ts
index 874561b4..98b118db 100644
--- a/__output__/builder/no-extends/CwSingle.react-query.ts
+++ b/__output__/builder/no-extends/CwSingle.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 import { CwSingleQueryClient } from "./CwSingle.client";
 export interface CwSingleReactQuery<TResponse, TData = TResponse> {
   client: CwSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwSingleInfoQuery<TData> extends CwSingleReactQuery<InfoResponse, TData> {}
 export function useCwSingleInfoQuery<TData = InfoResponse>({
diff --git a/__output__/builder/no-extends/Factory.react-query.ts b/__output__/builder/no-extends/Factory.react-query.ts
index 2d40ad5e..0bbeba10 100644
--- a/__output__/builder/no-extends/Factory.react-query.ts
+++ b/__output__/builder/no-extends/Factory.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/builder/no-extends/Minter.react-query.ts b/__output__/builder/no-extends/Minter.react-query.ts
index 007bcfd9..f66f79e3 100644
--- a/__output__/builder/no-extends/Minter.react-query.ts
+++ b/__output__/builder/no-extends/Minter.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts
index be2aa1b7..3a3014d7 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.react-query.ts
@@ -4,10 +4,12 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions } from "react-query";
+import { UseQueryOptions } from "@tanstack/react-query";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 import { CwAdminFactoryQueryClient } from "./CwAdminFactory.client";
 export interface CwAdminFactoryReactQuery<TResponse, TData = TResponse> {
   client: CwAdminFactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
index d2bcdc8f..fe6add33 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 import { CwCodeIdRegistryQueryClient } from "./CwCodeIdRegistry.client";
 export interface CwCodeIdRegistryReactQuery<TResponse, TData = TResponse> {
   client: CwCodeIdRegistryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwCodeIdRegistryListRegistrationsQuery<TData> extends CwCodeIdRegistryReactQuery<ListRegistrationsResponse, TData> {
   args: {
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
index f50712b2..74e31da2 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types";
 import { CwNamedGroupsQueryClient } from "./CwNamedGroups.client";
 export interface CwNamedGroupsReactQuery<TResponse, TData = TResponse> {
   client: CwNamedGroupsQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwNamedGroupsIsAddressInGroupQuery<TData> extends CwNamedGroupsReactQuery<IsAddressInGroupResponse, TData> {
   args: {
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
index d9c0a85e..0e5b4357 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types";
 import { CwProposalSingleQueryClient } from "./CwProposalSingle.client";
 export interface CwProposalSingleReactQuery<TResponse, TData = TResponse> {
   client: CwProposalSingleQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CwProposalSingleInfoQuery<TData> extends CwProposalSingleReactQuery<InfoResponse, TData> {}
 export function useCwProposalSingleInfoQuery<TData = InfoResponse>({
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
index 641b624b..87c16e6b 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 import { AccountsNftQueryClient } from "./AccountsNft.client";
 export interface AccountsNftReactQuery<TResponse, TData = TResponse> {
   client: AccountsNftQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface AccountsNftMinterQuery<TData> extends AccountsNftReactQuery<MinterResponse, TData> {}
 export function useAccountsNftMinterQuery<TData = MinterResponse>({
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts
index dd485541..4711d0c1 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
 import { Cw3FixedMultiSigQueryClient } from "./Cw3FixedMultiSig.client";
 export interface Cw3FixedMultiSigReactQuery<TResponse, TData = TResponse> {
   client: Cw3FixedMultiSigQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface Cw3FixedMultiSigListVotersQuery<TData> extends Cw3FixedMultiSigReactQuery<VoterListResponse, TData> {
   args: {
diff --git a/__output__/idl-version/cw4-group/Cw4Group.react-query.ts b/__output__/idl-version/cw4-group/Cw4Group.react-query.ts
index c6773c81..8fa81170 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.react-query.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
 import { Cw4GroupQueryClient } from "./Cw4Group.client";
 export interface Cw4GroupReactQuery<TResponse, TData = TResponse> {
   client: Cw4GroupQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface Cw4GroupHooksQuery<TData> extends Cw4GroupReactQuery<HooksResponse, TData> {}
 export function useCw4GroupHooksQuery<TData = HooksResponse>({
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts b/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
index 37307588..c1d11e8d 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 import { CyberPunkQueryClient } from "./CyberPunk.client";
 export interface CyberPunkReactQuery<TResponse, TData = TResponse> {
   client: CyberPunkQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface CyberPunkMirrorEnvQuery<TData> extends CyberPunkReactQuery<Env, TData> {}
 export function useCyberPunkMirrorEnvQuery<TData = Env>({
diff --git a/__output__/idl-version/hackatom/HackAtom.react-query.ts b/__output__/idl-version/hackatom/HackAtom.react-query.ts
index 549016db..815a0759 100644
--- a/__output__/idl-version/hackatom/HackAtom.react-query.ts
+++ b/__output__/idl-version/hackatom/HackAtom.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 import { HackAtomQueryClient } from "./HackAtom.client";
 export interface HackAtomReactQuery<TResponse, TData = TResponse> {
   client: HackAtomQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface HackAtomGetIntQuery<TData> extends HackAtomReactQuery<IntResponse, TData> {}
 export function useHackAtomGetIntQuery<TData = IntResponse>({
diff --git a/__output__/minter/Minter.react-query.ts b/__output__/minter/Minter.react-query.ts
index 007bcfd9..f66f79e3 100644
--- a/__output__/minter/Minter.react-query.ts
+++ b/__output__/minter/Minter.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface MinterMintCountQuery<TData> extends MinterReactQuery<MintCountResponse, TData> {
   args: {
diff --git a/__output__/sg721-updatable/Sg721Updatable.react-query.ts b/__output__/sg721-updatable/Sg721Updatable.react-query.ts
index f0795d29..c45bbcb6 100644
--- a/__output__/sg721-updatable/Sg721Updatable.react-query.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
 import { Sg721UpdatableQueryClient } from "./Sg721Updatable.client";
 export interface Sg721UpdatableReactQuery<TResponse, TData = TResponse> {
   client: Sg721UpdatableQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface Sg721UpdatableCollectionInfoQuery<TData> extends Sg721UpdatableReactQuery<CollectionInfoResponse, TData> {}
 export function useSg721UpdatableCollectionInfoQuery<TData = CollectionInfoResponse>({
diff --git a/__output__/sg721/Sg721.react-query.ts b/__output__/sg721/Sg721.react-query.ts
index 3a62ccbf..d575ea1e 100644
--- a/__output__/sg721/Sg721.react-query.ts
+++ b/__output__/sg721/Sg721.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
 import { Sg721QueryClient } from "./Sg721.client";
 export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface Sg721CollectionInfoQuery<TData> extends Sg721ReactQuery<CollectionInfoResponse, TData> {}
 export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
diff --git a/__output__/vectis/factory-optional-client/Factory.react-query.ts b/__output__/vectis/factory-optional-client/Factory.react-query.ts
index d4ae40f0..1f00b810 100644
--- a/__output__/vectis/factory-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-optional-client/Factory.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient | undefined;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
index 1e598df4..812d7ffc 100644
--- a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export const factoryQueryKeys = {
@@ -41,7 +41,9 @@ export const factoryQueryKeys = {
 };
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient | undefined;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index 83c13696..f49b6b05 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export const factoryQueryKeys = {
@@ -109,7 +109,9 @@ export const factoryQueries = {
 };
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/vectis/factory/Factory.react-query.ts b/__output__/vectis/factory/Factory.react-query.ts
index 2d40ad5e..0bbeba10 100644
--- a/__output__/vectis/factory/Factory.react-query.ts
+++ b/__output__/vectis/factory/Factory.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface FactoryAdminAddrQuery<TData> extends FactoryReactQuery<AdminAddrResponse, TData> {}
 export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
diff --git a/__output__/vectis/govec/Govec.react-query.ts b/__output__/vectis/govec/Govec.react-query.ts
index 88d2ed1f..f9325d4e 100644
--- a/__output__/vectis/govec/Govec.react-query.ts
+++ b/__output__/vectis/govec/Govec.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types";
 import { GovecQueryClient } from "./Govec.client";
 export interface GovecReactQuery<TResponse, TData = TResponse> {
   client: GovecQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface GovecCanExecuteRelayQuery<TData> extends GovecReactQuery<CanExecuteRelayResponse, TData> {
   args: {
diff --git a/__output__/vectis/proxy/Proxy.react-query.ts b/__output__/vectis/proxy/Proxy.react-query.ts
index a6fc6d41..1fa04415 100644
--- a/__output__/vectis/proxy/Proxy.react-query.ts
+++ b/__output__/vectis/proxy/Proxy.react-query.ts
@@ -4,12 +4,14 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "react-query";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types";
 import { ProxyQueryClient } from "./Proxy.client";
 export interface ProxyReactQuery<TResponse, TData = TResponse> {
   client: ProxyQueryClient;
-  options?: UseQueryOptions<TResponse, Error, TData>;
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
+    initialData?: undefined;
+  };
 }
 export interface ProxyCanExecuteRelayQuery<TData> extends ProxyReactQuery<CanExecuteRelayResponse, TData> {
   args: {
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 1450280c..d7f5762d 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -30,7 +30,7 @@ TSBuilder {
       "mutations": false,
       "optionalClient": false,
       "queryKeys": false,
-      "version": "v3",
+      "version": "v4",
     },
     "recoil": Object {
       "enabled": false,
@@ -68,7 +68,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -107,7 +107,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -146,7 +146,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -185,7 +185,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -224,7 +224,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -265,7 +265,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -304,7 +304,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -355,7 +355,7 @@ TSBuilder {
       "mutations": false,
       "optionalClient": false,
       "queryKeys": false,
-      "version": "v3",
+      "version": "v4",
     },
     "recoil": Object {
       "enabled": false,
@@ -393,7 +393,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -432,7 +432,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -471,7 +471,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -510,7 +510,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -549,7 +549,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -590,7 +590,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,
@@ -629,7 +629,7 @@ TSBuilder {
           "mutations": false,
           "optionalClient": false,
           "queryKeys": false,
-          "version": "v3",
+          "version": "v4",
         },
         "recoil": Object {
           "enabled": false,

From 14b6ad96c879b82747fc1462ffa34ca86dbfb929 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 15:33:32 -0700
Subject: [PATCH 167/287] readme

---
 README.md                     | 14 +++++++++-----
 packages/ts-codegen/README.md | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 8843fcae..fb62421c 100644
--- a/README.md
+++ b/README.md
@@ -317,16 +317,20 @@ export default function YourComponent() {
 };
 ```
 
-If you're using Babel, please make sure include '@babel/preset-react' in devDeps and presets in .babelrc.js:
+#### Use Contracts Provider Babel/TSC config
+
+If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
 
 ```js
  presets: [
-      '@babel/typescript',
-      '@babel/env',
-      '@babel/preset-react',
-     ]
+   '@babel/typescript',
+   '@babel/env',
+   '@babel/preset-react',
+ ]
 ```
 
+For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
+
 #### Use Contracts Hooks Usage
 
 Once enabled, you can get contracts very simply:
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 8843fcae..fb62421c 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -317,16 +317,20 @@ export default function YourComponent() {
 };
 ```
 
-If you're using Babel, please make sure include '@babel/preset-react' in devDeps and presets in .babelrc.js:
+#### Use Contracts Provider Babel/TSC config
+
+If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
 
 ```js
  presets: [
-      '@babel/typescript',
-      '@babel/env',
-      '@babel/preset-react',
-     ]
+   '@babel/typescript',
+   '@babel/env',
+   '@babel/preset-react',
+ ]
 ```
 
+For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
+
 #### Use Contracts Hooks Usage
 
 Once enabled, you can get contracts very simply:

From 6f697e9e9b4f816b793cd286642b3ece3d916779 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 9 Aug 2023 15:33:39 -0700
Subject: [PATCH 168/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.2
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 64602698..347f65b5 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.1...@cosmwasm/ts-codegen@0.35.2) (2023-08-09)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.0...@cosmwasm/ts-codegen@0.35.1) (2023-08-09)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 24a8ce9c..7d309ba0 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.1",
+  "version": "0.35.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From d84c86cd1cf9bd895cef53dddfbc02969400fd58 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Fri, 11 Aug 2023 05:36:56 +0800
Subject: [PATCH 169/287] fixed export ContractsConfig fixed undefined issue of
 getting providerInfo

---
 .../builder/bundler_test/contracts/contracts-context.tsx      | 2 +-
 __output__/builder/default/contracts-context.tsx              | 2 +-
 packages/ts-codegen/src/helpers/contractsContextTSX.ts        | 2 +-
 packages/ts-codegen/src/plugins/provider-bundle.ts            | 2 +-
 packages/ts-codegen/src/plugins/provider.ts                   | 2 +-
 packages/ts-codegen/types/src/builder/builder.d.ts            | 4 ++--
 .../ts-codegen/types/src/helpers/contractsContextTSX.d.ts     | 2 +-
 packages/wasm-ast-types/types/context/imports.d.ts            | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/__output__/builder/bundler_test/contracts/contracts-context.tsx b/__output__/builder/bundler_test/contracts/contracts-context.tsx
index d972e515..74cb9c9f 100644
--- a/__output__/builder/bundler_test/contracts/contracts-context.tsx
+++ b/__output__/builder/bundler_test/contracts/contracts-context.tsx
@@ -13,7 +13,7 @@ import {
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
-interface ContractsConfig {
+export interface ContractsConfig {
   address: string | undefined;
   getCosmWasmClient: () => Promise<CosmWasmClient>;
   getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
diff --git a/__output__/builder/default/contracts-context.tsx b/__output__/builder/default/contracts-context.tsx
index d972e515..74cb9c9f 100644
--- a/__output__/builder/default/contracts-context.tsx
+++ b/__output__/builder/default/contracts-context.tsx
@@ -13,7 +13,7 @@ import {
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
-interface ContractsConfig {
+export interface ContractsConfig {
   address: string | undefined;
   getCosmWasmClient: () => Promise<CosmWasmClient>;
   getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
diff --git a/packages/ts-codegen/src/helpers/contractsContextTSX.ts b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
index 03a439b6..a247f243 100644
--- a/packages/ts-codegen/src/helpers/contractsContextTSX.ts
+++ b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
@@ -7,7 +7,7 @@ import {
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
-interface ContractsConfig {
+export interface ContractsConfig {
   address: string | undefined;
   getCosmWasmClient: () => Promise<CosmWasmClient>;
   getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 7be51f1f..c99fa255 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -42,7 +42,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
 
     const providerInfos = context.getProviderInfos();
 
-    if (!Object.keys(providerInfos)?.length) {
+    if (!Object.keys(providerInfos || {})?.length) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index e7bacaf7..db26109e 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -45,7 +45,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
 
     const providerInfo = context.getProviderInfos()[name];
 
-    if (!Object.keys(providerInfo)?.length) {
+    if (!Object.keys(providerInfo || {})?.length) {
       return;
     }
 
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 97312696..d193445b 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -15,7 +15,7 @@ export interface BundleOptions {
 export interface UseContractsOptions {
     enabled?: boolean;
 }
-export type TSBuilderOptions = {
+export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
@@ -24,7 +24,7 @@ export type TSBuilderOptions = {
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
+export declare type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
 export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;
diff --git a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
index 43829a27..5e9f80e1 100644
--- a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
+++ b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
@@ -1 +1 @@
-export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\nexport interface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
index 21361af1..55ca6708 100644
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ b/packages/wasm-ast-types/types/context/imports.d.ts
@@ -5,8 +5,8 @@ export interface ImportObj {
     path: string;
     importAs?: string;
 }
-export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
-export type UtilMapping = {
+export declare type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export declare type UtilMapping = {
     [key: string]: ImportObj | string | GetUtilFn;
 };
 export declare const UTILS: {

From 0d12e6ff8339a16ab021c172fc91a31d95fb2c66 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 10 Aug 2023 20:00:00 -0700
Subject: [PATCH 170/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.3
 - wasm-ast-types@0.26.2
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 347f65b5..6f3f0ae5 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.2...@cosmwasm/ts-codegen@0.35.3) (2023-08-11)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.1...@cosmwasm/ts-codegen@0.35.2) (2023-08-09)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 7d309ba0..99536047 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.26.1"
+    "wasm-ast-types": "^0.26.2"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 502ef01c..7efa9ac0 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.26.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.1...wasm-ast-types@0.26.2) (2023-08-11)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.26.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.0...wasm-ast-types@0.26.1) (2023-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index a5a31ad4..01b0fb22 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "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",

From cf673f09e2095395e5c20802457e760dde43343d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 18:35:12 -0800
Subject: [PATCH 171/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fb62421c..87476002 100644
--- a/README.md
+++ b/README.md
@@ -643,5 +643,5 @@ Checkout these related projects:
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index fb62421c..87476002 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -643,5 +643,5 @@ Checkout these related projects:
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.tech/validator)
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
 

From 9fb8bedb57a14c3e4f2a3a700e0cc39549197cd5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 18:40:50 -0800
Subject: [PATCH 172/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.4
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 6f3f0ae5..edae4c0a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.3...@cosmwasm/ts-codegen@0.35.4) (2024-01-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.2...@cosmwasm/ts-codegen@0.35.3) (2023-08-11)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 99536047..a6e7fe3f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.3",
+  "version": "0.35.4",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From fbf5dc5a515de26279577cf6da20b907afacf696 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 21:03:17 -0800
Subject: [PATCH 173/287] readme

---
 README.md                     | 4 ++--
 packages/ts-codegen/README.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 87476002..e9e8a9ef 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
 | option                      | description                                                                  |
-| --------------------------- | --------------------------------------------------------------------------- |
+| --------------------------- | ---------------------------------------------------------------------------- |
 | `reactQuery.enabled`        | enable the react-query plugin                                                |
 | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
 | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
@@ -374,7 +374,7 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 #### Coding Style
 
 | option                | description                          | default |
-| --------------------- | ---------------------------------------------- |
+| --------------------- | ------------------------------------ | ------- |
 | `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
 
 Using shorthand constructor (Might not be transpiled correctly with babel):
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 87476002..e9e8a9ef 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -179,7 +179,7 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 #### React Query Options
 
 | option                      | description                                                                  |
-| --------------------------- | --------------------------------------------------------------------------- |
+| --------------------------- | ---------------------------------------------------------------------------- |
 | `reactQuery.enabled`        | enable the react-query plugin                                                |
 | `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
 | `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
@@ -374,7 +374,7 @@ const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 #### Coding Style
 
 | option                | description                          | default |
-| --------------------- | ---------------------------------------------- |
+| --------------------- | ------------------------------------ | ------- |
 | `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
 
 Using shorthand constructor (Might not be transpiled correctly with babel):

From aee116c0cab9c73e50eb6fdbee1edacc06791b8a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 21:03:24 -0800
Subject: [PATCH 174/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.5
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index edae4c0a..27b4f8b4 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.4...@cosmwasm/ts-codegen@0.35.5) (2024-01-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.3...@cosmwasm/ts-codegen@0.35.4) (2024-01-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index a6e7fe3f..14aca704 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.4",
+  "version": "0.35.5",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 970c13e9a99287227b9adec06cb632337bc1dd55 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 21:13:58 -0800
Subject: [PATCH 175/287] license

---
 LICENSE-Apache                         | 2 +-
 packages/ts-codegen/LICENSE-Apache     | 2 +-
 packages/ts-codegen/LICENSE-MIT        | 2 +-
 packages/wasm-ast-types/LICENSE-Apache | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE-Apache b/LICENSE-Apache
index ce3fa7bf..9acc9b1b 100644
--- a/LICENSE-Apache
+++ b/LICENSE-Apache
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/packages/ts-codegen/LICENSE-Apache b/packages/ts-codegen/LICENSE-Apache
index ce3fa7bf..9acc9b1b 100644
--- a/packages/ts-codegen/LICENSE-Apache
+++ b/packages/ts-codegen/LICENSE-Apache
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/packages/ts-codegen/LICENSE-MIT b/packages/ts-codegen/LICENSE-MIT
index e6388ba7..5a949f08 100644
--- a/packages/ts-codegen/LICENSE-MIT
+++ b/packages/ts-codegen/LICENSE-MIT
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/wasm-ast-types/LICENSE-Apache b/packages/wasm-ast-types/LICENSE-Apache
index ce3fa7bf..9acc9b1b 100644
--- a/packages/wasm-ast-types/LICENSE-Apache
+++ b/packages/wasm-ast-types/LICENSE-Apache
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From dfa17766765676da28c11922b711cd65aa6306ee Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 21:14:04 -0800
Subject: [PATCH 176/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.6
 - wasm-ast-types@0.26.3
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 27b4f8b4..0a296a55 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.5...@cosmwasm/ts-codegen@0.35.6) (2024-01-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.4...@cosmwasm/ts-codegen@0.35.5) (2024-01-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 14aca704..78e1d8da 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.5",
+  "version": "0.35.6",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.26.2"
+    "wasm-ast-types": "^0.26.3"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 7efa9ac0..a48455e5 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.26.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.2...wasm-ast-types@0.26.3) (2024-01-19)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.26.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.1...wasm-ast-types@0.26.2) (2023-08-11)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 01b0fb22..1b54ccca 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.26.2",
+  "version": "0.26.3",
   "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",

From 043124f0075b9d80321dc77482a01a1594acae10 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 22:33:22 -0800
Subject: [PATCH 177/287] readme

---
 README.md                         | 18 +++++++++++++-----
 packages/ts-codegen/README.md     | 18 +++++++++++++-----
 packages/wasm-ast-types/README.md | 23 +++++++++++++++++++++++
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index e9e8a9ef..8fa7ca5c 100644
--- a/README.md
+++ b/README.md
@@ -635,13 +635,21 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 
 Checkout these related projects:
 
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.
-* [starship](https://github.com/cosmology-tech/starship) a k8s-based unified development environment for Cosmos Ecosystem
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
+* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
+* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
+* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
 
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
 
+
+## Disclaimer
+
+AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
+
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index e9e8a9ef..8fa7ca5c 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -635,13 +635,21 @@ See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-as
 
 Checkout these related projects:
 
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) an npm module for the official Cosmos chain-registry.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) A wallet connector for the Cosmos ⚛️
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) set up a modern Cosmos app by running one command.
-* [starship](https://github.com/cosmology-tech/starship) a k8s-based unified development environment for Cosmos Ecosystem
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
+* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
+* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
+* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
 
 ## Credits
 
 🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
 
+
+## Disclaimer
+
+AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
+
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
diff --git a/packages/wasm-ast-types/README.md b/packages/wasm-ast-types/README.md
index 264ed788..1f1bafac 100644
--- a/packages/wasm-ast-types/README.md
+++ b/packages/wasm-ast-types/README.md
@@ -128,3 +128,26 @@ export const createNewGenerator = () => {
     );
 };
 ```
+
+## Related
+
+Checkout these related projects:
+
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
+* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
+* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
+* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+
+## Credits
+
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
+
+
+## Disclaimer
+
+AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
+
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.

From eeba0cf1e0cbadfb6cfc103412108e763fdb9f6a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Jan 2024 22:33:26 -0800
Subject: [PATCH 178/287] chore(release): publish

 - @cosmwasm/ts-codegen@0.35.7
 - wasm-ast-types@0.26.4
---
 packages/ts-codegen/CHANGELOG.md     | 8 ++++++++
 packages/ts-codegen/package.json     | 4 ++--
 packages/wasm-ast-types/CHANGELOG.md | 8 ++++++++
 packages/wasm-ast-types/package.json | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 0a296a55..0722d282 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.7](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.6...@cosmwasm/ts-codegen@0.35.7) (2024-01-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.5...@cosmwasm/ts-codegen@0.35.6) (2024-01-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 78e1d8da..faaf53f4 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.6",
+  "version": "0.35.7",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -96,6 +96,6 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.26.3"
+    "wasm-ast-types": "^0.26.4"
   }
 }
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index a48455e5..6b038db6 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.26.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.3...wasm-ast-types@0.26.4) (2024-01-19)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.26.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.2...wasm-ast-types@0.26.3) (2024-01-19)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 1b54ccca..2b95d6f7 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.26.3",
+  "version": "0.26.4",
   "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",

From 9b1c0335fc8ab715f739ba7c50e63b5021f26639 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 18:53:56 -0700
Subject: [PATCH 179/287] updates

---
 .editorconfig                                 |     12 -
 .eslintignore                                 |     10 -
 .eslintrc.json                                |     39 +
 .github/workflows/run-tests.yaml              |     31 +-
 .gitignore                                    |     14 +-
 .prettierrc.json                              |      6 +
 .vscode/settings.json                         |     22 +-
 .yarn/releases/yarn-1.18.0.cjs                | 147155 ---------------
 .yarnrc                                       |      9 -
 .yarnrc.yml                                   |      3 -
 LICENSE-Apache                                |      2 +-
 LICENSE-MIT                                   |      2 +-
 README.md                                     |      4 +-
 .../accounts-nft/AccountsNft.client.ts        |      4 +-
 .../accounts-nft/AccountsNft.react-query.ts   |      2 +-
 babel.config.js                               |      4 -
 lerna.json                                    |      5 +-
 package.json                                  |     52 +-
 packages/ts-codegen/.babelrc.js               |     14 -
 packages/ts-codegen/.editorconfig             |     12 -
 packages/ts-codegen/.eslintignore             |      5 -
 packages/ts-codegen/.gitignore                |     49 -
 packages/ts-codegen/.npmignore                |     44 -
 packages/ts-codegen/.npmrc                    |      1 -
 packages/ts-codegen/.vscode/settings.json     |     18 -
 packages/ts-codegen/CHANGELOG.md              |    128 +-
 packages/ts-codegen/LICENSE-Apache            |      2 +-
 packages/ts-codegen/LICENSE-MIT               |      2 +-
 packages/ts-codegen/README.md                 |      4 +-
 .../__snapshots__/builder.test.ts.snap        |    276 +-
 packages/ts-codegen/__tests__/builder.test.ts |     12 +-
 packages/ts-codegen/__tests__/bundler.test.ts |     11 +-
 .../__tests__/ts-codegen.issue-98.test.ts     |     29 +-
 packages/ts-codegen/jest.config.js            |     18 +
 packages/ts-codegen/package.json              |     71 +-
 .../ts-codegen/scripts/{cmds.js => cmds.ts}   |     10 +-
 packages/ts-codegen/src/builder/builder.ts    |     29 +-
 packages/ts-codegen/src/bundler/bundler.ts    |     34 +-
 packages/ts-codegen/src/{cli.js => cli.ts}    |      0
 packages/ts-codegen/src/{cmds.js => cmds.ts}  |      0
 .../src/commands/create-boilerplate.ts        |      3 +-
 packages/ts-codegen/src/commands/generate.ts  |      5 +-
 packages/ts-codegen/src/commands/install.ts   |      5 +-
 packages/ts-codegen/src/{file.js => file.ts}  |      0
 packages/ts-codegen/src/generators/client.ts  |      1 +
 .../src/generators/message-composer.ts        |      1 +
 .../ts-codegen/src/generators/msg-builder.ts  |      1 +
 .../ts-codegen/src/generators/react-query.ts  |      1 +
 packages/ts-codegen/src/generators/recoil.ts  |      6 +-
 packages/ts-codegen/src/generators/types.ts   |      1 +
 .../ts-codegen/src/plugins/plugin-base.ts     |     11 +-
 packages/ts-codegen/src/plugins/provider.ts   |      4 +-
 packages/ts-codegen/src/plugins/recoil.ts     |      8 +-
 .../src/{ts-codegen.js => ts-codegen.ts}      |      0
 packages/ts-codegen/src/types.ts              |      4 +
 packages/ts-codegen/src/utils/clean.ts        |      4 +-
 packages/ts-codegen/src/utils/cleanse.ts      |     12 +-
 packages/ts-codegen/src/utils/files.ts        |      6 +-
 packages/ts-codegen/src/utils/parse.ts        |     14 +-
 .../src/utils/{prompt.js => prompt.ts}        |      1 +
 packages/ts-codegen/src/utils/schemas.ts      |     42 +-
 packages/ts-codegen/tsconfig.esm.json         |      9 +
 packages/ts-codegen/tsconfig.json             |     26 +-
 .../ts-codegen/types/src/builder/builder.d.ts |     53 -
 .../ts-codegen/types/src/builder/index.d.ts   |      1 -
 .../ts-codegen/types/src/bundler/bundler.d.ts |      4 -
 .../ts-codegen/types/src/bundler/index.d.ts   |      1 -
 packages/ts-codegen/types/src/cli.d.ts        |      1 -
 packages/ts-codegen/types/src/cmds.d.ts       |      1 -
 .../src/commands/create-boilerplate.d.ts      |      2 -
 .../types/src/commands/generate.d.ts          |      2 -
 .../types/src/commands/install.d.ts           |      2 -
 packages/ts-codegen/types/src/file.d.ts       |      2 -
 .../types/src/generators/client.d.ts          |      5 -
 .../types/src/generators/create-helpers.d.ts  |      3 -
 .../src/generators/message-composer.d.ts      |      5 -
 .../types/src/generators/msg-builder.d.ts     |      5 -
 .../types/src/generators/msg-builder.ts       |      5 -
 .../types/src/generators/react-query.d.ts     |      4 -
 .../types/src/generators/recoil.d.ts          |      4 -
 .../types/src/generators/types.d.ts           |      4 -
 .../src/helpers/contractContextBase.d.ts      |      1 -
 .../contractContextBaseShortHandCtor.d.ts     |      1 -
 .../src/helpers/contractsContextTSX.d.ts      |      1 -
 .../ts-codegen/types/src/helpers/index.d.ts   |      3 -
 packages/ts-codegen/types/src/index.d.ts      |     12 -
 .../ts-codegen/types/src/plugins/client.d.ts  |     13 -
 .../ts-codegen/types/src/plugins/index.d.ts   |      1 -
 .../types/src/plugins/message-builder.d.ts    |     12 -
 .../types/src/plugins/message-composer.d.ts   |     13 -
 .../types/src/plugins/msg-builder.d.ts        |     12 -
 .../types/src/plugins/plugin-base.d.ts        |     51 -
 .../types/src/plugins/provider-bundle.d.ts    |     13 -
 .../types/src/plugins/provider.d.ts           |     15 -
 .../types/src/plugins/react-query.d.ts        |     12 -
 .../ts-codegen/types/src/plugins/recoil.d.ts  |     13 -
 .../ts-codegen/types/src/plugins/types.d.ts   |     12 -
 .../types/src/plugins/use-contracts.d.ts      |     12 -
 packages/ts-codegen/types/src/ts-codegen.d.ts |      2 -
 packages/ts-codegen/types/src/types.d.ts      |     16 -
 .../ts-codegen/types/src/utils/clean.d.ts     |      1 -
 .../ts-codegen/types/src/utils/cleanse.d.ts   |      1 -
 .../ts-codegen/types/src/utils/files.d.ts     |      3 -
 .../ts-codegen/types/src/utils/header.d.ts    |      1 -
 .../ts-codegen/types/src/utils/index.d.ts     |      1 -
 .../ts-codegen/types/src/utils/parse.d.ts     |      1 -
 .../ts-codegen/types/src/utils/prompt.d.ts    |      3 -
 .../ts-codegen/types/src/utils/schemas.d.ts   |     10 -
 .../ts-codegen/types/src/utils/unused.d.ts    |      5 -
 .eslintrc.js => packages/types/.eslintrc.js   |      7 +-
 packages/types/LICENSE-Apache                 |    201 +
 packages/types/LICENSE-MIT                    |     21 +
 packages/types/README.md                      |    153 +
 packages/types/jest.config.js                 |     18 +
 packages/types/package.json                   |     74 +
 packages/types/src/idl.ts                     |     16 +
 packages/types/src/index.ts                   |      2 +
 packages/types/src/types.ts                   |     55 +
 packages/types/tsconfig.esm.json              |      9 +
 packages/types/tsconfig.json                  |      9 +
 packages/wasm-ast-types/.babelrc.js           |     14 -
 packages/wasm-ast-types/.editorconfig         |     12 -
 packages/wasm-ast-types/.eslintignore         |      5 -
 packages/wasm-ast-types/.gitignore            |     48 -
 packages/wasm-ast-types/.npmignore            |     43 -
 packages/wasm-ast-types/.npmrc                |      1 -
 packages/wasm-ast-types/.vscode/settings.json |     18 -
 packages/wasm-ast-types/CHANGELOG.md          |    144 +-
 packages/wasm-ast-types/LICENSE-Apache        |      2 +-
 packages/wasm-ast-types/LICENSE-MIT           |      2 +-
 packages/wasm-ast-types/README.md             |      2 +-
 .../babel/__snapshots__/babel.test.ts.snap}   |      0
 .../__tests__/babel/babel.test.ts             |    483 +
 .../ts-client.account-nfts.spec.ts.snap       |      0
 .../ts-client.arrays-ref.spec.ts.snap         |      0
 .../ts-client.arrays.spec.ts.snap             |      0
 .../ts-client.cw-named-groups.test.ts.snap    |      0
 .../ts-client.cw-proposal-single.test.ts.snap |      0
 .../ts-client.empty-enums.spec.ts.snap        |      0
 .../ts-client.issue-101.spec.ts.snap          |      0
 .../ts-client.issue-103.test.ts.snap          |      0
 .../ts-client.issue-71.test.ts.snap           |      0
 .../ts-client.issue-98.test.ts.snap           |      0
 .../ts-client.issues.test.ts.snap             |      0
 .../ts-client.overrides.spec.ts.snap          |      0
 .../ts-client.sg721.spec.ts.snap              |      0
 .../__snapshots__/ts-client.spec.ts.snap      |      0
 .../ts-client.vectis.spec.ts.snap             |      0
 .../ts-client.wager.spec.ts.snap              |      0
 .../client/ts-client.account-nfts.test.ts     |     38 +
 .../client/ts-client.arrays-ref.test.ts}      |      0
 .../client/ts-client.arrays.test.ts}          |      0
 .../client}/ts-client.cw-named-groups.test.ts |      0
 .../ts-client.cw-proposal-single.test.ts      |      0
 .../client/ts-client.empty-enums.test.ts}     |      0
 .../client/ts-client.issue-101.test.ts}       |      0
 .../client}/ts-client.issue-103.test.ts       |      0
 .../client}/ts-client.issue-71.test.ts        |      0
 .../client}/ts-client.issue-98.test.ts        |      0
 .../client}/ts-client.issues.test.ts          |      0
 .../client/ts-client.overrides.test.ts}       |      0
 .../client/ts-client.sg721.test.ts}           |      0
 .../client/ts-client.test.ts}                 |      0
 .../__tests__/client/ts-client.vectis.test.ts |     94 +
 .../client/ts-client.wager.test.ts}           |      0
 .../message-builder.test.ts.snap}             |      0
 .../message-builder/message-builder.test.ts}  |      0
 .../message-composer.test.ts.snap}            |      0
 .../message-composer.test.ts}                 |      0
 .../__snapshots__/provider.test.ts.snap}      |      0
 .../__tests__/provider/provider.test.ts       |     81 +
 .../__snapshots__/react-query.test.ts.snap}   |      0
 .../react-query/react-query.test.ts}          |      0
 .../recoil/__snapshots__/recoil.test.ts.snap} |      0
 .../__tests__/recoil/recoil.test.ts           |     35 +
 packages/wasm-ast-types/jest.config.js        |     18 +
 packages/wasm-ast-types/package.json          |     83 +-
 .../scripts/{test-ast.js => test-ast.ts}      |      1 +
 packages/wasm-ast-types/src/client/client.ts  |     10 +-
 .../test/ts-client.account-nfts.spec.ts       |     55 -
 .../src/client/test/ts-client.vectis.spec.ts  |     97 -
 .../wasm-ast-types/src/context/context.ts     |     35 +-
 .../wasm-ast-types/src/context/imports.ts     |    130 +-
 packages/wasm-ast-types/src/index.ts          |      1 -
 .../src/message-builder/message-builder.ts    |      2 +-
 .../src/message-composer/message-composer.ts  |     10 +-
 .../src/provider/provider.spec.ts             |     81 -
 .../wasm-ast-types/src/provider/provider.ts   |      6 +-
 .../src/react-query/react-query.ts            |     87 +-
 .../wasm-ast-types/src/recoil/recoil.spec.ts  |     38 -
 packages/wasm-ast-types/src/recoil/recoil.ts  |      6 +-
 packages/wasm-ast-types/src/types.ts          |     44 -
 .../wasm-ast-types/src/utils/babel.spec.ts    |    511 -
 packages/wasm-ast-types/src/utils/babel.ts    |     66 +-
 packages/wasm-ast-types/src/utils/ref.ts      |      4 +-
 packages/wasm-ast-types/src/utils/types.ts    |     33 +-
 .../wasm-ast-types/test-utils/fixtures.ts     |     17 +
 packages/wasm-ast-types/test-utils/index.ts   |     41 +-
 packages/wasm-ast-types/test-utils/utils.ts   |     42 +
 packages/wasm-ast-types/tsconfig.esm.json     |      9 +
 packages/wasm-ast-types/tsconfig.json         |     27 +-
 .../wasm-ast-types/types/client/client.d.ts   |     15 -
 .../wasm-ast-types/types/client/index.d.ts    |      1 -
 .../wasm-ast-types/types/context/context.d.ts |    124 -
 .../wasm-ast-types/types/context/imports.d.ts |     47 -
 .../wasm-ast-types/types/context/index.d.ts   |      2 -
 packages/wasm-ast-types/types/index.d.ts      |      9 -
 .../types/message-builder/index.d.ts          |      1 -
 .../message-builder/message-builder.d.ts      |      4 -
 .../types/message-composer/index.d.ts         |      1 -
 .../message-composer/message-composer.d.ts    |      5 -
 .../wasm-ast-types/types/provider/index.d.ts  |      1 -
 .../types/provider/provider.d.ts              |     18 -
 .../types/react-query/index.d.ts              |      1 -
 .../types/react-query/react-query.d.ts        |     84 -
 .../wasm-ast-types/types/recoil/index.d.ts    |      1 -
 .../wasm-ast-types/types/recoil/recoil.d.ts   |     30 -
 packages/wasm-ast-types/types/types.d.ts      |     41 -
 .../wasm-ast-types/types/utils/babel.d.ts     |     50 -
 .../wasm-ast-types/types/utils/constants.d.ts |     11 -
 .../wasm-ast-types/types/utils/index.d.ts     |      6 -
 packages/wasm-ast-types/types/utils/ref.d.ts  |      2 -
 .../wasm-ast-types/types/utils/types.d.ts     |     22 -
 tsconfig.json                                 |     16 +
 yarn.lock                                     |   8889 +-
 225 files changed, 7373 insertions(+), 153704 deletions(-)
 delete mode 100644 .editorconfig
 delete mode 100644 .eslintignore
 create mode 100644 .eslintrc.json
 create mode 100644 .prettierrc.json
 delete mode 100755 .yarn/releases/yarn-1.18.0.cjs
 delete mode 100644 .yarnrc
 delete mode 100644 .yarnrc.yml
 delete mode 100644 babel.config.js
 delete mode 100644 packages/ts-codegen/.babelrc.js
 delete mode 100644 packages/ts-codegen/.editorconfig
 delete mode 100644 packages/ts-codegen/.eslintignore
 delete mode 100644 packages/ts-codegen/.gitignore
 delete mode 100644 packages/ts-codegen/.npmignore
 delete mode 100644 packages/ts-codegen/.npmrc
 delete mode 100644 packages/ts-codegen/.vscode/settings.json
 create mode 100644 packages/ts-codegen/jest.config.js
 rename packages/ts-codegen/scripts/{cmds.js => cmds.ts} (83%)
 rename packages/ts-codegen/src/{cli.js => cli.ts} (100%)
 rename packages/ts-codegen/src/{cmds.js => cmds.ts} (100%)
 rename packages/ts-codegen/src/{file.js => file.ts} (100%)
 rename packages/ts-codegen/src/{ts-codegen.js => ts-codegen.ts} (100%)
 create mode 100644 packages/ts-codegen/src/types.ts
 rename packages/ts-codegen/src/utils/{prompt.js => prompt.ts} (99%)
 create mode 100644 packages/ts-codegen/tsconfig.esm.json
 delete mode 100644 packages/ts-codegen/types/src/builder/builder.d.ts
 delete mode 100644 packages/ts-codegen/types/src/builder/index.d.ts
 delete mode 100644 packages/ts-codegen/types/src/bundler/bundler.d.ts
 delete mode 100644 packages/ts-codegen/types/src/bundler/index.d.ts
 delete mode 100644 packages/ts-codegen/types/src/cli.d.ts
 delete mode 100644 packages/ts-codegen/types/src/cmds.d.ts
 delete mode 100644 packages/ts-codegen/types/src/commands/create-boilerplate.d.ts
 delete mode 100644 packages/ts-codegen/types/src/commands/generate.d.ts
 delete mode 100644 packages/ts-codegen/types/src/commands/install.d.ts
 delete mode 100644 packages/ts-codegen/types/src/file.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/client.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/create-helpers.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/message-composer.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/msg-builder.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/msg-builder.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/react-query.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/recoil.d.ts
 delete mode 100644 packages/ts-codegen/types/src/generators/types.d.ts
 delete mode 100644 packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
 delete mode 100644 packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts
 delete mode 100644 packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
 delete mode 100644 packages/ts-codegen/types/src/helpers/index.d.ts
 delete mode 100644 packages/ts-codegen/types/src/index.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/client.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/index.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/message-builder.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/message-composer.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/msg-builder.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/plugin-base.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/provider-bundle.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/provider.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/react-query.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/recoil.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/types.d.ts
 delete mode 100644 packages/ts-codegen/types/src/plugins/use-contracts.d.ts
 delete mode 100644 packages/ts-codegen/types/src/ts-codegen.d.ts
 delete mode 100644 packages/ts-codegen/types/src/types.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/clean.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/cleanse.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/files.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/header.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/index.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/parse.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/prompt.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/schemas.d.ts
 delete mode 100644 packages/ts-codegen/types/src/utils/unused.d.ts
 rename .eslintrc.js => packages/types/.eslintrc.js (92%)
 create mode 100644 packages/types/LICENSE-Apache
 create mode 100644 packages/types/LICENSE-MIT
 create mode 100644 packages/types/README.md
 create mode 100644 packages/types/jest.config.js
 create mode 100644 packages/types/package.json
 create mode 100644 packages/types/src/idl.ts
 create mode 100644 packages/types/src/index.ts
 create mode 100644 packages/types/src/types.ts
 create mode 100644 packages/types/tsconfig.esm.json
 create mode 100644 packages/types/tsconfig.json
 delete mode 100644 packages/wasm-ast-types/.babelrc.js
 delete mode 100644 packages/wasm-ast-types/.editorconfig
 delete mode 100644 packages/wasm-ast-types/.eslintignore
 delete mode 100644 packages/wasm-ast-types/.gitignore
 delete mode 100644 packages/wasm-ast-types/.npmignore
 delete mode 100644 packages/wasm-ast-types/.npmrc
 delete mode 100644 packages/wasm-ast-types/.vscode/settings.json
 rename packages/wasm-ast-types/{src/utils/__snapshots__/babel.spec.ts.snap => __tests__/babel/__snapshots__/babel.test.ts.snap} (100%)
 create mode 100644 packages/wasm-ast-types/__tests__/babel/babel.test.ts
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.account-nfts.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.arrays-ref.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.arrays.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.cw-named-groups.test.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.cw-proposal-single.test.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.empty-enums.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.issue-101.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.issue-103.test.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.issue-71.test.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.issue-98.test.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.issues.test.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.overrides.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.sg721.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.vectis.spec.ts.snap (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/__snapshots__/ts-client.wager.spec.ts.snap (100%)
 create mode 100644 packages/wasm-ast-types/__tests__/client/ts-client.account-nfts.test.ts
 rename packages/wasm-ast-types/{src/client/test/ts-client.arrays-ref.spec.ts => __tests__/client/ts-client.arrays-ref.test.ts} (100%)
 rename packages/wasm-ast-types/{src/client/test/ts-client.arrays.spec.ts => __tests__/client/ts-client.arrays.test.ts} (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/ts-client.cw-named-groups.test.ts (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/ts-client.cw-proposal-single.test.ts (100%)
 rename packages/wasm-ast-types/{src/client/test/ts-client.empty-enums.spec.ts => __tests__/client/ts-client.empty-enums.test.ts} (100%)
 rename packages/wasm-ast-types/{src/client/test/ts-client.issue-101.spec.ts => __tests__/client/ts-client.issue-101.test.ts} (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/ts-client.issue-103.test.ts (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/ts-client.issue-71.test.ts (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/ts-client.issue-98.test.ts (100%)
 rename packages/wasm-ast-types/{src/client/test => __tests__/client}/ts-client.issues.test.ts (100%)
 rename packages/wasm-ast-types/{src/client/test/ts-client.overrides.spec.ts => __tests__/client/ts-client.overrides.test.ts} (100%)
 rename packages/wasm-ast-types/{src/client/test/ts-client.sg721.spec.ts => __tests__/client/ts-client.sg721.test.ts} (100%)
 rename packages/wasm-ast-types/{src/client/test/ts-client.spec.ts => __tests__/client/ts-client.test.ts} (100%)
 create mode 100644 packages/wasm-ast-types/__tests__/client/ts-client.vectis.test.ts
 rename packages/wasm-ast-types/{src/client/test/ts-client.wager.spec.ts => __tests__/client/ts-client.wager.test.ts} (100%)
 rename packages/wasm-ast-types/{src/message-builder/__snapshots__/message-builder.spec.ts.snap => __tests__/message-builder/__snapshots__/message-builder.test.ts.snap} (100%)
 rename packages/wasm-ast-types/{src/message-builder/message-builder.spec.ts => __tests__/message-builder/message-builder.test.ts} (100%)
 rename packages/wasm-ast-types/{src/message-composer/__snapshots__/message-composer.spec.ts.snap => __tests__/message-composer/__snapshots__/message-composer.test.ts.snap} (100%)
 rename packages/wasm-ast-types/{src/message-composer/message-composer.spec.ts => __tests__/message-composer/message-composer.test.ts} (100%)
 rename packages/wasm-ast-types/{src/provider/__snapshots__/provider.spec.ts.snap => __tests__/provider/__snapshots__/provider.test.ts.snap} (100%)
 create mode 100644 packages/wasm-ast-types/__tests__/provider/provider.test.ts
 rename packages/wasm-ast-types/{src/react-query/__snapshots__/react-query.spec.ts.snap => __tests__/react-query/__snapshots__/react-query.test.ts.snap} (100%)
 rename packages/wasm-ast-types/{src/react-query/react-query.spec.ts => __tests__/react-query/react-query.test.ts} (100%)
 rename packages/wasm-ast-types/{src/recoil/__snapshots__/recoil.spec.ts.snap => __tests__/recoil/__snapshots__/recoil.test.ts.snap} (100%)
 create mode 100644 packages/wasm-ast-types/__tests__/recoil/recoil.test.ts
 create mode 100644 packages/wasm-ast-types/jest.config.js
 rename packages/wasm-ast-types/scripts/{test-ast.js => test-ast.ts} (96%)
 delete mode 100644 packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
 delete mode 100644 packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts
 delete mode 100644 packages/wasm-ast-types/src/provider/provider.spec.ts
 delete mode 100644 packages/wasm-ast-types/src/recoil/recoil.spec.ts
 delete mode 100644 packages/wasm-ast-types/src/types.ts
 delete mode 100644 packages/wasm-ast-types/src/utils/babel.spec.ts
 create mode 100644 packages/wasm-ast-types/test-utils/fixtures.ts
 create mode 100644 packages/wasm-ast-types/test-utils/utils.ts
 create mode 100644 packages/wasm-ast-types/tsconfig.esm.json
 delete mode 100644 packages/wasm-ast-types/types/client/client.d.ts
 delete mode 100644 packages/wasm-ast-types/types/client/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/context/context.d.ts
 delete mode 100644 packages/wasm-ast-types/types/context/imports.d.ts
 delete mode 100644 packages/wasm-ast-types/types/context/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/message-builder/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/message-builder/message-builder.d.ts
 delete mode 100644 packages/wasm-ast-types/types/message-composer/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/message-composer/message-composer.d.ts
 delete mode 100644 packages/wasm-ast-types/types/provider/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/provider/provider.d.ts
 delete mode 100644 packages/wasm-ast-types/types/react-query/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/react-query/react-query.d.ts
 delete mode 100644 packages/wasm-ast-types/types/recoil/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/recoil/recoil.d.ts
 delete mode 100644 packages/wasm-ast-types/types/types.d.ts
 delete mode 100644 packages/wasm-ast-types/types/utils/babel.d.ts
 delete mode 100644 packages/wasm-ast-types/types/utils/constants.d.ts
 delete mode 100644 packages/wasm-ast-types/types/utils/index.d.ts
 delete mode 100644 packages/wasm-ast-types/types/utils/ref.d.ts
 delete mode 100644 packages/wasm-ast-types/types/utils/types.d.ts
 create mode 100644 tsconfig.json

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 4a7ea303..00000000
--- a/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index f497e718..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.json
-*.md
-*.css
-*.d.ts
-
-node_modules/
-dist/
-main/
-module/
-coverage/
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 00000000..afb9b718
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,39 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "node": true,
+    "jest": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ],
+  "overrides": [],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint", "simple-import-sort", "unused-imports"],
+  "rules": {
+    "simple-import-sort/imports": 1,
+    "simple-import-sort/exports": 1,
+    "unused-imports/no-unused-imports": 1,
+    "@typescript-eslint/no-unused-vars": [
+      1,
+      {
+        "argsIgnorePattern": "React|res|next|^_"
+      }
+    ],
+    "@typescript-eslint/no-explicit-any": 0,
+    "@typescript-eslint/no-var-requires": 0,
+    "no-console": 0,
+    "@typescript-eslint/ban-ts-comment": 0,
+    "prefer-const": 0,
+    "no-case-declarations": 0,
+    "no-implicit-globals": 0,
+    "@typescript-eslint/no-unsafe-declaration-merging": 0
+  }
+}
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index fcadd4e9..cd9d9c60 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -12,19 +12,22 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout 🛎️
-        uses: actions/checkout@v2.3.1
-      - name: node
-        uses: actions/setup-node@v3
+      - name: Checkout Repository 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 16.14.0
-      - name: deps
-        run: yarn
-      - name: bootstrap
-        run: yarn bootstrap
-      - name: build
+          node-version: '20.x'
+
+      - name: Install Dependencies
+        run: yarn install
+
+      - name: Build Project
         run: yarn build
-      - name: ts-codegen
-        run: cd ./packages/ts-codegen && yarn test
-      - name: wasm-ast-types
-        run: cd ./packages/wasm-ast-types && yarn test
\ No newline at end of file
+
+      - name: Test @cosmwasm/ts-codegen
+        run: cd packages/ts-codegen && yarn test
+      
+      - name: Test ast
+        run: cd ./packages/ast && yarn test
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 031b0da3..cb78b839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,5 @@
-.DS_Store
-.eslintcache
-*.log
-**/node_modules
-coverage
-packages/**/build
-packages/**/main
-packages/**/module
-testgen
+**/node_modules/
+**/.DS_Store
+**/dist
+**/yarn-error.log
+lerna-debug.log
\ No newline at end of file
diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 00000000..f0eb61e0
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1d4e4d63..95030db5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,16 +1,16 @@
 {
+  "editor.defaultFormatter": "vscode.typescript-language-features",
   "editor.formatOnSave": true,
-  "[javascriptreact]": {
-      "editor.formatOnSave": false
-  },
-  "[javascript]": {
-      "editor.formatOnSave": false
-  },
   "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.validate": [
-      "javascript",
-      "javascriptreact"
-  ]
-}
\ No newline at end of file
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.format.enable": false,
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.tabSize": 2
+}
diff --git a/.yarn/releases/yarn-1.18.0.cjs b/.yarn/releases/yarn-1.18.0.cjs
deleted file mode 100755
index b2492e1c..00000000
--- a/.yarn/releases/yarn-1.18.0.cjs
+++ /dev/null
@@ -1,147155 +0,0 @@
-#!/usr/bin/env node
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// identity function for calling harmony imports with the correct context
-/******/ 	__webpack_require__.i = function(value) { return value; };
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 549);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports) {
-
-module.exports = require("path");
-
-/***/ }),
-/* 1 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = __extends;
-/* unused harmony export __assign */
-/* unused harmony export __rest */
-/* unused harmony export __decorate */
-/* unused harmony export __param */
-/* unused harmony export __metadata */
-/* unused harmony export __awaiter */
-/* unused harmony export __generator */
-/* unused harmony export __exportStar */
-/* unused harmony export __values */
-/* unused harmony export __read */
-/* unused harmony export __spread */
-/* unused harmony export __await */
-/* unused harmony export __asyncGenerator */
-/* unused harmony export __asyncDelegator */
-/* unused harmony export __asyncValues */
-/* unused harmony export __makeTemplateObject */
-/* unused harmony export __importStar */
-/* unused harmony export __importDefault */
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    }
-    return __assign.apply(this, arguments);
-}
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
-            t[p[i]] = s[p[i]];
-    return t;
-}
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-function __exportStar(m, exports) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-
-function __values(o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-}
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-}
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result.default = mod;
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
-
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-exports.__esModule = true;
-
-var _promise = __webpack_require__(227);
-
-var _promise2 = _interopRequireDefault(_promise);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function (fn) {
-  return function () {
-    var gen = fn.apply(this, arguments);
-    return new _promise2.default(function (resolve, reject) {
-      function step(key, arg) {
-        try {
-          var info = gen[key](arg);
-          var value = info.value;
-        } catch (error) {
-          reject(error);
-          return;
-        }
-
-        if (info.done) {
-          resolve(value);
-        } else {
-          return _promise2.default.resolve(value).then(function (value) {
-            step("next", value);
-          }, function (err) {
-            step("throw", err);
-          });
-        }
-      }
-
-      return step("next");
-    });
-  };
-};
-
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
-
-module.exports = require("util");
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.open = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let buildActionsForCopy = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
-
-    //
-    let build = (() => {
-      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest,
-              type = data.type;
-
-        const onFresh = data.onFresh || noop;
-        const onDone = data.onDone || noop;
-
-        // TODO https://github.com/yarnpkg/yarn/issues/3751
-        // related to bundled dependencies handling
-        if (files.has(dest.toLowerCase())) {
-          reporter.verbose(`The case-insensitive file ${dest} shouldn't be copied twice in one bulk copy`);
-        } else {
-          files.add(dest.toLowerCase());
-        }
-
-        if (type === 'symlink') {
-          yield mkdirp((_path || _load_path()).default.dirname(dest));
-          onFresh();
-          actions.symlink.push({
-            dest,
-            linkname: src
-          });
-          onDone();
-          return;
-        }
-
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
-        }
-
-        const srcStat = yield lstat(src);
-        let srcFiles;
-
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
-        }
-
-        let destStat;
-        try {
-          // try accessing the destination
-          destStat = yield lstat(dest);
-        } catch (e) {
-          // proceed if destination doesn't exist, otherwise error
-          if (e.code !== 'ENOENT') {
-            throw e;
-          }
-        }
-
-        // if destination exists
-        if (destStat) {
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
-
-          // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
-          // us modes that aren't valid. investigate this, it's generally safe to proceed.
-
-          /* if (srcStat.mode !== destStat.mode) {
-            try {
-              await access(dest, srcStat.mode);
-            } catch (err) {}
-          } */
-
-          if (bothFiles && artifactFiles.has(dest)) {
-            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
-            return;
-          }
-
-          if (bothFiles && srcStat.size === destStat.size && (0, (_fsNormalized || _load_fsNormalized()).fileDatesEqual)(srcStat.mtime, destStat.mtime)) {
-            // we can safely assume this is the same file
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.size, +srcStat.mtime));
-            return;
-          }
-
-          if (bothSymlinks) {
-            const srcReallink = yield readlink(src);
-            if (srcReallink === (yield readlink(dest))) {
-              // if both symlinks are the same then we can continue on
-              onDone();
-              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
-              return;
-            }
-          }
-
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
-
-            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-              var _ref6;
-
-              if (_isArray4) {
-                if (_i4 >= _iterator4.length) break;
-                _ref6 = _iterator4[_i4++];
-              } else {
-                _i4 = _iterator4.next();
-                if (_i4.done) break;
-                _ref6 = _i4.value;
-              }
-
-              const file = _ref6;
-
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
-
-                if ((yield lstat(loc)).isDirectory()) {
-                  for (var _iterator5 = yield readdir(loc), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-                    var _ref7;
-
-                    if (_isArray5) {
-                      if (_i5 >= _iterator5.length) break;
-                      _ref7 = _iterator5[_i5++];
-                    } else {
-                      _i5 = _iterator5.next();
-                      if (_i5.done) break;
-                      _ref7 = _i5.value;
-                    }
-
-                    const file = _ref7;
-
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        if (destStat && destStat.isSymbolicLink()) {
-          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
-          destStat = null;
-        }
-
-        if (srcStat.isSymbolicLink()) {
-          onFresh();
-          const linkname = yield readlink(src);
-          actions.symlink.push({
-            dest,
-            linkname
-          });
-          onDone();
-        } else if (srcStat.isDirectory()) {
-          if (!destStat) {
-            reporter.verbose(reporter.lang('verboseFileFolder', dest));
-            yield mkdirp(dest);
-          }
-
-          const destParts = dest.split((_path || _load_path()).default.sep);
-          while (destParts.length) {
-            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
-            destParts.pop();
-          }
-
-          // push all files to queue
-          invariant(srcFiles, 'src files not initialised');
-          let remaining = srcFiles.length;
-          if (!remaining) {
-            onDone();
-          }
-          for (var _iterator6 = srcFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-            var _ref8;
-
-            if (_isArray6) {
-              if (_i6 >= _iterator6.length) break;
-              _ref8 = _iterator6[_i6++];
-            } else {
-              _i6 = _iterator6.next();
-              if (_i6.done) break;
-              _ref8 = _i6.value;
-            }
-
-            const file = _ref8;
-
-            queue.push({
-              dest: (_path || _load_path()).default.join(dest, file),
-              onFresh,
-              onDone: function (_onDone) {
-                function onDone() {
-                  return _onDone.apply(this, arguments);
-                }
-
-                onDone.toString = function () {
-                  return _onDone.toString();
-                };
-
-                return onDone;
-              }(function () {
-                if (--remaining === 0) {
-                  onDone();
-                }
-              }),
-              src: (_path || _load_path()).default.join(src, file)
-            });
-          }
-        } else if (srcStat.isFile()) {
-          onFresh();
-          actions.file.push({
-            src,
-            dest,
-            atime: srcStat.atime,
-            mtime: srcStat.mtime,
-            mode: srcStat.mode
-          });
-          onDone();
-        } else {
-          throw new Error(`unsure how to copy this: ${src}`);
-        }
-      });
-
-      return function build(_x5) {
-        return _ref5.apply(this, arguments);
-      };
-    })();
-
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
-
-    // initialise events
-    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const item = _ref2;
-
-      const onDone = item.onDone;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        if (onDone) {
-          onDone();
-        }
-      };
-    }
-    events.onStart(queue.length);
-
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
-
-    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
-    // at a time due to the requirement to push items onto the queue
-    while (queue.length) {
-      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
-      yield Promise.all(items.map(build));
-    }
-
-    // simulate the existence of some files to prevent considering them extraneous
-    for (var _iterator2 = artifactFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref3 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref3 = _i2.value;
-      }
-
-      const file = _ref3;
-
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
-
-    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
-
-      const loc = _ref4;
-
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
-      }
-    }
-
-    return actions;
-  });
-
-  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let buildActionsForHardlink = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
-
-    //
-    let build = (() => {
-      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest;
-
-        const onFresh = data.onFresh || noop;
-        const onDone = data.onDone || noop;
-        if (files.has(dest.toLowerCase())) {
-          // Fixes issue https://github.com/yarnpkg/yarn/issues/2734
-          // When bulk hardlinking we have A -> B structure that we want to hardlink to A1 -> B1,
-          // package-linker passes that modules A1 and B1 need to be hardlinked,
-          // the recursive linking algorithm of A1 ends up scheduling files in B1 to be linked twice which will case
-          // an exception.
-          onDone();
-          return;
-        }
-        files.add(dest.toLowerCase());
-
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
-        }
-
-        const srcStat = yield lstat(src);
-        let srcFiles;
-
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
-        }
-
-        const destExists = yield exists(dest);
-        if (destExists) {
-          const destStat = yield lstat(dest);
-
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
-
-          if (srcStat.mode !== destStat.mode) {
-            try {
-              yield access(dest, srcStat.mode);
-            } catch (err) {
-              // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
-              // us modes that aren't valid. investigate this, it's generally safe to proceed.
-              reporter.verbose(err);
-            }
-          }
-
-          if (bothFiles && artifactFiles.has(dest)) {
-            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
-            return;
-          }
-
-          // correct hardlink
-          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
-            onDone();
-            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
-            return;
-          }
-
-          if (bothSymlinks) {
-            const srcReallink = yield readlink(src);
-            if (srcReallink === (yield readlink(dest))) {
-              // if both symlinks are the same then we can continue on
-              onDone();
-              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
-              return;
-            }
-          }
-
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
-
-            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-              var _ref14;
-
-              if (_isArray10) {
-                if (_i10 >= _iterator10.length) break;
-                _ref14 = _iterator10[_i10++];
-              } else {
-                _i10 = _iterator10.next();
-                if (_i10.done) break;
-                _ref14 = _i10.value;
-              }
-
-              const file = _ref14;
-
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
-
-                if ((yield lstat(loc)).isDirectory()) {
-                  for (var _iterator11 = yield readdir(loc), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-                    var _ref15;
-
-                    if (_isArray11) {
-                      if (_i11 >= _iterator11.length) break;
-                      _ref15 = _iterator11[_i11++];
-                    } else {
-                      _i11 = _iterator11.next();
-                      if (_i11.done) break;
-                      _ref15 = _i11.value;
-                    }
-
-                    const file = _ref15;
-
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        if (srcStat.isSymbolicLink()) {
-          onFresh();
-          const linkname = yield readlink(src);
-          actions.symlink.push({
-            dest,
-            linkname
-          });
-          onDone();
-        } else if (srcStat.isDirectory()) {
-          reporter.verbose(reporter.lang('verboseFileFolder', dest));
-          yield mkdirp(dest);
-
-          const destParts = dest.split((_path || _load_path()).default.sep);
-          while (destParts.length) {
-            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
-            destParts.pop();
-          }
-
-          // push all files to queue
-          invariant(srcFiles, 'src files not initialised');
-          let remaining = srcFiles.length;
-          if (!remaining) {
-            onDone();
-          }
-          for (var _iterator12 = srcFiles, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-            var _ref16;
-
-            if (_isArray12) {
-              if (_i12 >= _iterator12.length) break;
-              _ref16 = _iterator12[_i12++];
-            } else {
-              _i12 = _iterator12.next();
-              if (_i12.done) break;
-              _ref16 = _i12.value;
-            }
-
-            const file = _ref16;
-
-            queue.push({
-              onFresh,
-              src: (_path || _load_path()).default.join(src, file),
-              dest: (_path || _load_path()).default.join(dest, file),
-              onDone: function (_onDone2) {
-                function onDone() {
-                  return _onDone2.apply(this, arguments);
-                }
-
-                onDone.toString = function () {
-                  return _onDone2.toString();
-                };
-
-                return onDone;
-              }(function () {
-                if (--remaining === 0) {
-                  onDone();
-                }
-              })
-            });
-          }
-        } else if (srcStat.isFile()) {
-          onFresh();
-          actions.link.push({
-            src,
-            dest,
-            removeDest: destExists
-          });
-          onDone();
-        } else {
-          throw new Error(`unsure how to copy this: ${src}`);
-        }
-      });
-
-      return function build(_x10) {
-        return _ref13.apply(this, arguments);
-      };
-    })();
-
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
-
-    // initialise events
-    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-      var _ref10;
-
-      if (_isArray7) {
-        if (_i7 >= _iterator7.length) break;
-        _ref10 = _iterator7[_i7++];
-      } else {
-        _i7 = _iterator7.next();
-        if (_i7.done) break;
-        _ref10 = _i7.value;
-      }
-
-      const item = _ref10;
-
-      const onDone = item.onDone || noop;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        onDone();
-      };
-    }
-    events.onStart(queue.length);
-
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
-
-    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
-    // at a time due to the requirement to push items onto the queue
-    while (queue.length) {
-      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
-      yield Promise.all(items.map(build));
-    }
-
-    // simulate the existence of some files to prevent considering them extraneous
-    for (var _iterator8 = artifactFiles, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray8) {
-        if (_i8 >= _iterator8.length) break;
-        _ref11 = _iterator8[_i8++];
-      } else {
-        _i8 = _iterator8.next();
-        if (_i8.done) break;
-        _ref11 = _i8.value;
-      }
-
-      const file = _ref11;
-
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
-
-    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref12;
-
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref12 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref12 = _i9.value;
-      }
-
-      const loc = _ref12;
-
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
-      }
-    }
-
-    return actions;
-  });
-
-  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
-    return _ref9.apply(this, arguments);
-  };
-})();
-
-let copyBulk = exports.copyBulk = (() => {
-  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
-    const events = {
-      onStart: _events && _events.onStart || noop,
-      onProgress: _events && _events.onProgress || noop,
-      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
-      ignoreBasenames: _events && _events.ignoreBasenames || [],
-      artifactFiles: _events && _events.artifactFiles || []
-    };
-
-    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
-
-    const fileActions = actions.file;
-
-    const currentlyWriting = new Map();
-
-    yield (_promise || _load_promise()).queue(fileActions, (() => {
-      var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        let writePromise;
-        while (writePromise = currentlyWriting.get(data.dest)) {
-          yield writePromise;
-        }
-
-        reporter.verbose(reporter.lang('verboseFileCopy', data.src, data.dest));
-        const copier = (0, (_fsNormalized || _load_fsNormalized()).copyFile)(data, function () {
-          return currentlyWriting.delete(data.dest);
-        });
-        currentlyWriting.set(data.dest, copier);
-        events.onProgress(data.dest);
-        return copier;
-      });
-
-      return function (_x14) {
-        return _ref18.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
-
-    // we need to copy symlinks last as they could reference files we were copying
-    const symlinkActions = actions.symlink;
-    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
-      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
-      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
-      return symlink(linkname, data.dest);
-    });
-  });
-
-  return function copyBulk(_x11, _x12, _x13) {
-    return _ref17.apply(this, arguments);
-  };
-})();
-
-let hardlinkBulk = exports.hardlinkBulk = (() => {
-  var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
-    const events = {
-      onStart: _events && _events.onStart || noop,
-      onProgress: _events && _events.onProgress || noop,
-      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
-      artifactFiles: _events && _events.artifactFiles || [],
-      ignoreBasenames: []
-    };
-
-    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
-
-    const fileActions = actions.link;
-
-    yield (_promise || _load_promise()).queue(fileActions, (() => {
-      var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        reporter.verbose(reporter.lang('verboseFileLink', data.src, data.dest));
-        if (data.removeDest) {
-          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(data.dest);
-        }
-        yield link(data.src, data.dest);
-      });
-
-      return function (_x18) {
-        return _ref20.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
-
-    // we need to copy symlinks last as they could reference files we were copying
-    const symlinkActions = actions.symlink;
-    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
-      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
-      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
-      return symlink(linkname, data.dest);
-    });
-  });
-
-  return function hardlinkBulk(_x15, _x16, _x17) {
-    return _ref19.apply(this, arguments);
-  };
-})();
-
-let readFileAny = exports.readFileAny = (() => {
-  var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (files) {
-    for (var _iterator13 = files, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
-      var _ref22;
-
-      if (_isArray13) {
-        if (_i13 >= _iterator13.length) break;
-        _ref22 = _iterator13[_i13++];
-      } else {
-        _i13 = _iterator13.next();
-        if (_i13.done) break;
-        _ref22 = _i13.value;
-      }
-
-      const file = _ref22;
-
-      if (yield exists(file)) {
-        return readFile(file);
-      }
-    }
-    return null;
-  });
-
-  return function readFileAny(_x19) {
-    return _ref21.apply(this, arguments);
-  };
-})();
-
-let readJson = exports.readJson = (() => {
-  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    return (yield readJsonAndFile(loc)).object;
-  });
-
-  return function readJson(_x20) {
-    return _ref23.apply(this, arguments);
-  };
-})();
-
-let readJsonAndFile = exports.readJsonAndFile = (() => {
-  var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    const file = yield readFile(loc);
-    try {
-      return {
-        object: (0, (_map || _load_map()).default)(JSON.parse(stripBOM(file))),
-        content: file
-      };
-    } catch (err) {
-      err.message = `${loc}: ${err.message}`;
-      throw err;
-    }
-  });
-
-  return function readJsonAndFile(_x21) {
-    return _ref24.apply(this, arguments);
-  };
-})();
-
-let find = exports.find = (() => {
-  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
-    const parts = dir.split((_path || _load_path()).default.sep);
-
-    while (parts.length) {
-      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
-
-      if (yield exists(loc)) {
-        return loc;
-      } else {
-        parts.pop();
-      }
-    }
-
-    return false;
-  });
-
-  return function find(_x22, _x23) {
-    return _ref25.apply(this, arguments);
-  };
-})();
-
-let symlink = exports.symlink = (() => {
-  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
-    if (process.platform !== 'win32') {
-      // use relative paths otherwise which will be retained if the directory is moved
-      src = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src);
-      // When path.relative returns an empty string for the current directory, we should instead use
-      // '.', which is a valid fs.symlink target.
-      src = src || '.';
-    }
-
-    try {
-      const stats = yield lstat(dest);
-      if (stats.isSymbolicLink()) {
-        const resolved = dest;
-        if (resolved === src) {
-          return;
-        }
-      }
-    } catch (err) {
-      if (err.code !== 'ENOENT') {
-        throw err;
-      }
-    }
-
-    // We use rimraf for unlink which never throws an ENOENT on missing target
-    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
-
-    if (process.platform === 'win32') {
-      // use directory junctions if possible on win32, this requires absolute paths
-      yield fsSymlink(src, dest, 'junction');
-    } else {
-      yield fsSymlink(src, dest);
-    }
-  });
-
-  return function symlink(_x24, _x25) {
-    return _ref26.apply(this, arguments);
-  };
-})();
-
-let walk = exports.walk = (() => {
-  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
-    let files = [];
-
-    let filenames = yield readdir(dir);
-    if (ignoreBasenames.size) {
-      filenames = filenames.filter(function (name) {
-        return !ignoreBasenames.has(name);
-      });
-    }
-
-    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-      var _ref28;
-
-      if (_isArray14) {
-        if (_i14 >= _iterator14.length) break;
-        _ref28 = _iterator14[_i14++];
-      } else {
-        _i14 = _iterator14.next();
-        if (_i14.done) break;
-        _ref28 = _i14.value;
-      }
-
-      const name = _ref28;
-
-      const relative = relativeDir ? (_path || _load_path()).default.join(relativeDir, name) : name;
-      const loc = (_path || _load_path()).default.join(dir, name);
-      const stat = yield lstat(loc);
-
-      files.push({
-        relative,
-        basename: name,
-        absolute: loc,
-        mtime: +stat.mtime
-      });
-
-      if (stat.isDirectory()) {
-        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
-      }
-    }
-
-    return files;
-  });
-
-  return function walk(_x26, _x27) {
-    return _ref27.apply(this, arguments);
-  };
-})();
-
-let getFileSizeOnDisk = exports.getFileSizeOnDisk = (() => {
-  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    const stat = yield lstat(loc);
-    const size = stat.size,
-          blockSize = stat.blksize;
-
-
-    return Math.ceil(size / blockSize) * blockSize;
-  });
-
-  return function getFileSizeOnDisk(_x28) {
-    return _ref29.apply(this, arguments);
-  };
-})();
-
-let getEolFromFile = (() => {
-  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
-    if (!(yield exists(path))) {
-      return undefined;
-    }
-
-    const buffer = yield readFileBuffer(path);
-
-    for (let i = 0; i < buffer.length; ++i) {
-      if (buffer[i] === cr) {
-        return '\r\n';
-      }
-      if (buffer[i] === lf) {
-        return '\n';
-      }
-    }
-    return undefined;
-  });
-
-  return function getEolFromFile(_x29) {
-    return _ref30.apply(this, arguments);
-  };
-})();
-
-let writeFilePreservingEol = exports.writeFilePreservingEol = (() => {
-  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path, data) {
-    const eol = (yield getEolFromFile(path)) || (_os || _load_os()).default.EOL;
-    if (eol !== '\n') {
-      data = data.replace(/\n/g, eol);
-    }
-    yield writeFile(path, data);
-  });
-
-  return function writeFilePreservingEol(_x30, _x31) {
-    return _ref31.apply(this, arguments);
-  };
-})();
-
-let hardlinksWork = exports.hardlinksWork = (() => {
-  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
-    const filename = 'test-file' + Math.random();
-    const file = (_path || _load_path()).default.join(dir, filename);
-    const fileLink = (_path || _load_path()).default.join(dir, filename + '-link');
-    try {
-      yield writeFile(file, 'test');
-      yield link(file, fileLink);
-    } catch (err) {
-      return false;
-    } finally {
-      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(file);
-      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(fileLink);
-    }
-    return true;
-  });
-
-  return function hardlinksWork(_x32) {
-    return _ref32.apply(this, arguments);
-  };
-})();
-
-// not a strict polyfill for Node's fs.mkdtemp
-
-
-let makeTempDir = exports.makeTempDir = (() => {
-  var _ref33 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (prefix) {
-    const dir = (_path || _load_path()).default.join((_os || _load_os()).default.tmpdir(), `yarn-${prefix || ''}-${Date.now()}-${Math.random()}`);
-    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dir);
-    yield mkdirp(dir);
-    return dir;
-  });
-
-  return function makeTempDir(_x33) {
-    return _ref33.apply(this, arguments);
-  };
-})();
-
-let readFirstAvailableStream = exports.readFirstAvailableStream = (() => {
-  var _ref34 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths) {
-    for (var _iterator15 = paths, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
-      var _ref35;
-
-      if (_isArray15) {
-        if (_i15 >= _iterator15.length) break;
-        _ref35 = _iterator15[_i15++];
-      } else {
-        _i15 = _iterator15.next();
-        if (_i15.done) break;
-        _ref35 = _i15.value;
-      }
-
-      const path = _ref35;
-
-      try {
-        const fd = yield open(path, 'r');
-        return (_fs || _load_fs()).default.createReadStream(path, { fd });
-      } catch (err) {
-        // Try the next one
-      }
-    }
-    return null;
-  });
-
-  return function readFirstAvailableStream(_x34) {
-    return _ref34.apply(this, arguments);
-  };
-})();
-
-let getFirstSuitableFolder = exports.getFirstSuitableFolder = (() => {
-  var _ref36 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths, mode = constants.W_OK | constants.X_OK) {
-    const result = {
-      skipped: [],
-      folder: null
-    };
-
-    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
-      var _ref37;
-
-      if (_isArray16) {
-        if (_i16 >= _iterator16.length) break;
-        _ref37 = _iterator16[_i16++];
-      } else {
-        _i16 = _iterator16.next();
-        if (_i16.done) break;
-        _ref37 = _i16.value;
-      }
-
-      const folder = _ref37;
-
-      try {
-        yield mkdirp(folder);
-        yield access(folder, mode);
-
-        result.folder = folder;
-
-        return result;
-      } catch (error) {
-        result.skipped.push({
-          error,
-          folder
-        });
-      }
-    }
-    return result;
-  });
-
-  return function getFirstSuitableFolder(_x35) {
-    return _ref36.apply(this, arguments);
-  };
-})();
-
-exports.copy = copy;
-exports.readFile = readFile;
-exports.readFileRaw = readFileRaw;
-exports.normalizeOS = normalizeOS;
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
-}
-
-var _glob;
-
-function _load_glob() {
-  return _glob = _interopRequireDefault(__webpack_require__(99));
-}
-
-var _os;
-
-function _load_os() {
-  return _os = _interopRequireDefault(__webpack_require__(49));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
-}
-
-var _promise;
-
-function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(50));
-}
-
-var _promise2;
-
-function _load_promise2() {
-  return _promise2 = __webpack_require__(50);
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _fsNormalized;
-
-function _load_fsNormalized() {
-  return _fsNormalized = __webpack_require__(218);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const constants = exports.constants = typeof (_fs || _load_fs()).default.constants !== 'undefined' ? (_fs || _load_fs()).default.constants : {
-  R_OK: (_fs || _load_fs()).default.R_OK,
-  W_OK: (_fs || _load_fs()).default.W_OK,
-  X_OK: (_fs || _load_fs()).default.X_OK
-};
-
-const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
-
-const readFileBuffer = exports.readFileBuffer = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readFile);
-const open = exports.open = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.open);
-const writeFile = exports.writeFile = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.writeFile);
-const readlink = exports.readlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readlink);
-const realpath = exports.realpath = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.realpath);
-const readdir = exports.readdir = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readdir);
-const rename = exports.rename = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.rename);
-const access = exports.access = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.access);
-const stat = exports.stat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.stat);
-const mkdirp = exports.mkdirp = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(145));
-const exists = exports.exists = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.exists, true);
-const lstat = exports.lstat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.lstat);
-const chmod = exports.chmod = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.chmod);
-const link = exports.link = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.link);
-const glob = exports.glob = (0, (_promise2 || _load_promise2()).promisify)((_glob || _load_glob()).default);
-exports.unlink = (_fsNormalized || _load_fsNormalized()).unlink;
-
-// fs.copyFile uses the native file copying instructions on the system, performing much better
-// than any JS-based solution and consumes fewer resources. Repeated testing to fine tune the
-// concurrency level revealed 128 as the sweet spot on a quad-core, 16 CPU Intel system with SSD.
-
-const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
-
-const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
-const invariant = __webpack_require__(9);
-const stripBOM = __webpack_require__(160);
-
-const noop = () => {};
-
-function copy(src, dest, reporter) {
-  return copyBulk([{ src, dest }], reporter);
-}
-
-function _readFile(loc, encoding) {
-  return new Promise((resolve, reject) => {
-    (_fs || _load_fs()).default.readFile(loc, encoding, function (err, content) {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(content);
-      }
-    });
-  });
-}
-
-function readFile(loc) {
-  return _readFile(loc, 'utf8').then(normalizeOS);
-}
-
-function readFileRaw(loc) {
-  return _readFile(loc, 'binary');
-}
-
-function normalizeOS(body) {
-  return body.replace(/\r\n/g, '\n');
-}
-
-const cr = '\r'.charCodeAt(0);
-const lf = '\n'.charCodeAt(0);
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-module.exports = require("fs");
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-class MessageError extends Error {
-  constructor(msg, code) {
-    super(msg);
-    this.code = code;
-  }
-
-}
-
-exports.MessageError = MessageError;
-class ProcessSpawnError extends MessageError {
-  constructor(msg, code, process) {
-    super(msg, code);
-    this.process = process;
-  }
-
-}
-
-exports.ProcessSpawnError = ProcessSpawnError;
-class SecurityError extends MessageError {}
-
-exports.SecurityError = SecurityError;
-class ProcessTermError extends MessageError {}
-
-exports.ProcessTermError = ProcessTermError;
-class ResponseError extends Error {
-  constructor(msg, responseCode) {
-    super(msg);
-    this.responseCode = responseCode;
-  }
-
-}
-
-exports.ResponseError = ResponseError;
-class OneTimePasswordError extends Error {}
-exports.OneTimePasswordError = OneTimePasswordError;
-
-/***/ }),
-/* 7 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscriber; });
-/* unused harmony export SafeSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(420);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__ = __webpack_require__(321);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config__ = __webpack_require__(185);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_hostReportError__ = __webpack_require__(323);
-/** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */
-
-
-
-
-
-
-
-var Subscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subscriber, _super);
-    function Subscriber(destinationOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        _this.syncErrorValue = null;
-        _this.syncErrorThrown = false;
-        _this.syncErrorThrowable = false;
-        _this.isStopped = false;
-        _this._parentSubscription = null;
-        switch (arguments.length) {
-            case 0:
-                _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */];
-                break;
-            case 1:
-                if (!destinationOrNext) {
-                    _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */];
-                    break;
-                }
-                if (typeof destinationOrNext === 'object') {
-                    if (destinationOrNext instanceof Subscriber) {
-                        _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
-                        _this.destination = destinationOrNext;
-                        destinationOrNext.add(_this);
-                    }
-                    else {
-                        _this.syncErrorThrowable = true;
-                        _this.destination = new SafeSubscriber(_this, destinationOrNext);
-                    }
-                    break;
-                }
-            default:
-                _this.syncErrorThrowable = true;
-                _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete);
-                break;
-        }
-        return _this;
-    }
-    Subscriber.prototype[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () { return this; };
-    Subscriber.create = function (next, error, complete) {
-        var subscriber = new Subscriber(next, error, complete);
-        subscriber.syncErrorThrowable = false;
-        return subscriber;
-    };
-    Subscriber.prototype.next = function (value) {
-        if (!this.isStopped) {
-            this._next(value);
-        }
-    };
-    Subscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            this.isStopped = true;
-            this._error(err);
-        }
-    };
-    Subscriber.prototype.complete = function () {
-        if (!this.isStopped) {
-            this.isStopped = true;
-            this._complete();
-        }
-    };
-    Subscriber.prototype.unsubscribe = function () {
-        if (this.closed) {
-            return;
-        }
-        this.isStopped = true;
-        _super.prototype.unsubscribe.call(this);
-    };
-    Subscriber.prototype._next = function (value) {
-        this.destination.next(value);
-    };
-    Subscriber.prototype._error = function (err) {
-        this.destination.error(err);
-        this.unsubscribe();
-    };
-    Subscriber.prototype._complete = function () {
-        this.destination.complete();
-        this.unsubscribe();
-    };
-    Subscriber.prototype._unsubscribeAndRecycle = function () {
-        var _a = this, _parent = _a._parent, _parents = _a._parents;
-        this._parent = null;
-        this._parents = null;
-        this.unsubscribe();
-        this.closed = false;
-        this.isStopped = false;
-        this._parent = _parent;
-        this._parents = _parents;
-        this._parentSubscription = null;
-        return this;
-    };
-    return Subscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */]));
-
-var SafeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SafeSubscriber, _super);
-    function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        _this._parentSubscriber = _parentSubscriber;
-        var next;
-        var context = _this;
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(observerOrNext)) {
-            next = observerOrNext;
-        }
-        else if (observerOrNext) {
-            next = observerOrNext.next;
-            error = observerOrNext.error;
-            complete = observerOrNext.complete;
-            if (observerOrNext !== __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]) {
-                context = Object.create(observerOrNext);
-                if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(context.unsubscribe)) {
-                    _this.add(context.unsubscribe.bind(context));
-                }
-                context.unsubscribe = _this.unsubscribe.bind(_this);
-            }
-        }
-        _this._context = context;
-        _this._next = next;
-        _this._error = error;
-        _this._complete = complete;
-        return _this;
-    }
-    SafeSubscriber.prototype.next = function (value) {
-        if (!this.isStopped && this._next) {
-            var _parentSubscriber = this._parentSubscriber;
-            if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                this.__tryOrUnsub(this._next, value);
-            }
-            else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) {
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var _parentSubscriber = this._parentSubscriber;
-            var useDeprecatedSynchronousErrorHandling = __WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling;
-            if (this._error) {
-                if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                    this.__tryOrUnsub(this._error, err);
-                    this.unsubscribe();
-                }
-                else {
-                    this.__tryOrSetError(_parentSubscriber, this._error, err);
-                    this.unsubscribe();
-                }
-            }
-            else if (!_parentSubscriber.syncErrorThrowable) {
-                this.unsubscribe();
-                if (useDeprecatedSynchronousErrorHandling) {
-                    throw err;
-                }
-                __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
-            }
-            else {
-                if (useDeprecatedSynchronousErrorHandling) {
-                    _parentSubscriber.syncErrorValue = err;
-                    _parentSubscriber.syncErrorThrown = true;
-                }
-                else {
-                    __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
-                }
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.complete = function () {
-        var _this = this;
-        if (!this.isStopped) {
-            var _parentSubscriber = this._parentSubscriber;
-            if (this._complete) {
-                var wrappedComplete = function () { return _this._complete.call(_this._context); };
-                if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                    this.__tryOrUnsub(wrappedComplete);
-                    this.unsubscribe();
-                }
-                else {
-                    this.__tryOrSetError(_parentSubscriber, wrappedComplete);
-                    this.unsubscribe();
-                }
-            }
-            else {
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) {
-        try {
-            fn.call(this._context, value);
-        }
-        catch (err) {
-            this.unsubscribe();
-            if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
-                throw err;
-            }
-            else {
-                __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
-            }
-        }
-    };
-    SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) {
-        if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
-            throw new Error('bad call');
-        }
-        try {
-            fn.call(this._context, value);
-        }
-        catch (err) {
-            if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
-                parent.syncErrorValue = err;
-                parent.syncErrorThrown = true;
-                return true;
-            }
-            else {
-                __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err);
-                return true;
-            }
-        }
-        return false;
-    };
-    SafeSubscriber.prototype._unsubscribe = function () {
-        var _parentSubscriber = this._parentSubscriber;
-        this._context = null;
-        this._parentSubscriber = null;
-        _parentSubscriber.unsubscribe();
-    };
-    return SafeSubscriber;
-}(Subscriber));
-
-//# sourceMappingURL=Subscriber.js.map
-
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getPathKey = getPathKey;
-const os = __webpack_require__(49);
-const path = __webpack_require__(0);
-const userHome = __webpack_require__(66).default;
-
-var _require = __webpack_require__(225);
-
-const getCacheDir = _require.getCacheDir,
-      getConfigDir = _require.getConfigDir,
-      getDataDir = _require.getDataDir;
-
-const isWebpackBundle = __webpack_require__(278);
-
-const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
-const OWNED_DEPENDENCY_TYPES = exports.OWNED_DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies'];
-
-const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
-const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
-
-const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
-
-const YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
-const NPM_REGISTRY_RE = exports.NPM_REGISTRY_RE = /https?:\/\/registry\.npmjs\.org/g;
-
-const YARN_DOCS = exports.YARN_DOCS = 'https://yarnpkg.com/en/docs/cli/';
-const YARN_INSTALLER_SH = exports.YARN_INSTALLER_SH = 'https://yarnpkg.com/install.sh';
-const YARN_INSTALLER_MSI = exports.YARN_INSTALLER_MSI = 'https://yarnpkg.com/latest.msi';
-
-const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
-
-// cache version, bump whenever we make backwards incompatible changes
-const CACHE_VERSION = exports.CACHE_VERSION = 4;
-
-// lockfile version, bump whenever we make backwards incompatible changes
-const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
-
-// max amount of network requests to perform concurrently
-const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
-
-// HTTP timeout used when downloading packages
-const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
-
-// max amount of child processes to execute concurrently
-const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
-
-const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
-
-function getPreferredCacheDirectories() {
-  const preferredCacheDirectories = [getCacheDir()];
-
-  if (process.getuid) {
-    // $FlowFixMe: process.getuid exists, dammit
-    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
-  }
-
-  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
-
-  return preferredCacheDirectories;
-}
-
-const PREFERRED_MODULE_CACHE_DIRECTORIES = exports.PREFERRED_MODULE_CACHE_DIRECTORIES = getPreferredCacheDirectories();
-const CONFIG_DIRECTORY = exports.CONFIG_DIRECTORY = getConfigDir();
-const DATA_DIRECTORY = exports.DATA_DIRECTORY = getDataDir();
-const LINK_REGISTRY_DIRECTORY = exports.LINK_REGISTRY_DIRECTORY = path.join(DATA_DIRECTORY, 'link');
-const GLOBAL_MODULE_DIRECTORY = exports.GLOBAL_MODULE_DIRECTORY = path.join(DATA_DIRECTORY, 'global');
-
-const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
-const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
-
-// Webpack needs to be configured with node.__dirname/__filename = false
-function getYarnBinPath() {
-  if (isWebpackBundle) {
-    return __filename;
-  } else {
-    return path.join(__dirname, '..', 'bin', 'yarn.js');
-  }
-}
-
-const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
-const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
-
-const PNP_FILENAME = exports.PNP_FILENAME = '.pnp.js';
-
-const POSIX_GLOBAL_PREFIX = exports.POSIX_GLOBAL_PREFIX = `${process.env.DESTDIR || ''}/usr/local`;
-const FALLBACK_GLOBAL_PREFIX = exports.FALLBACK_GLOBAL_PREFIX = path.join(userHome, '.yarn');
-
-const META_FOLDER = exports.META_FOLDER = '.yarn-meta';
-const INTEGRITY_FILENAME = exports.INTEGRITY_FILENAME = '.yarn-integrity';
-const LOCKFILE_FILENAME = exports.LOCKFILE_FILENAME = 'yarn.lock';
-const METADATA_FILENAME = exports.METADATA_FILENAME = '.yarn-metadata.json';
-const TARBALL_FILENAME = exports.TARBALL_FILENAME = '.yarn-tarball.tgz';
-const CLEAN_FILENAME = exports.CLEAN_FILENAME = '.yarnclean';
-
-const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
-const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
-
-const DEFAULT_INDENT = exports.DEFAULT_INDENT = '  ';
-const SINGLE_INSTANCE_PORT = exports.SINGLE_INSTANCE_PORT = 31997;
-const SINGLE_INSTANCE_FILENAME = exports.SINGLE_INSTANCE_FILENAME = '.yarn-single-instance';
-
-const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
-
-function getPathKey(platform, env) {
-  let pathKey = 'PATH';
-
-  // windows calls its path "Path" usually, but this is not guaranteed.
-  if (platform === 'win32') {
-    pathKey = 'Path';
-
-    for (const key in env) {
-      if (key.toLowerCase() === 'path') {
-        pathKey = key;
-      }
-    }
-  }
-
-  return pathKey;
-}
-
-const VERSION_COLOR_SCHEME = exports.VERSION_COLOR_SCHEME = {
-  major: 'red',
-  premajor: 'red',
-  minor: 'yellow',
-  preminor: 'yellow',
-  patch: 'green',
-  prepatch: 'green',
-  prerelease: 'red',
-  unchanged: 'white',
-  unknown: 'red'
-};
-
-/***/ }),
-/* 9 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-
-
-/**
- * Use invariant() to assert state which your program assumes to be true.
- *
- * Provide sprintf-style format (only %s is supported) and arguments
- * to provide information about what broke and what you were
- * expecting.
- *
- * The invariant message will be stripped in production, but the invariant
- * will remain to ensure logic does not differ in production.
- */
-
-var NODE_ENV = process.env.NODE_ENV;
-
-var invariant = function(condition, format, a, b, c, d, e, f) {
-  if (NODE_ENV !== 'production') {
-    if (format === undefined) {
-      throw new Error('invariant requires an error message argument');
-    }
-  }
-
-  if (!condition) {
-    var error;
-    if (format === undefined) {
-      error = new Error(
-        'Minified exception occurred; use the non-minified dev environment ' +
-        'for the full error message and additional helpful warnings.'
-      );
-    } else {
-      var args = [a, b, c, d, e, f];
-      var argIndex = 0;
-      error = new Error(
-        format.replace(/%s/g, function() { return args[argIndex++]; })
-      );
-      error.name = 'Invariant Violation';
-    }
-
-    error.framesToPop = 1; // we don't care about invariant's own frame
-    throw error;
-  }
-};
-
-module.exports = invariant;
-
-
-/***/ }),
-/* 10 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var YAMLException = __webpack_require__(54);
-
-var TYPE_CONSTRUCTOR_OPTIONS = [
-  'kind',
-  'resolve',
-  'construct',
-  'instanceOf',
-  'predicate',
-  'represent',
-  'defaultStyle',
-  'styleAliases'
-];
-
-var YAML_NODE_KINDS = [
-  'scalar',
-  'sequence',
-  'mapping'
-];
-
-function compileStyleAliases(map) {
-  var result = {};
-
-  if (map !== null) {
-    Object.keys(map).forEach(function (style) {
-      map[style].forEach(function (alias) {
-        result[String(alias)] = style;
-      });
-    });
-  }
-
-  return result;
-}
-
-function Type(tag, options) {
-  options = options || {};
-
-  Object.keys(options).forEach(function (name) {
-    if (TYPE_CONSTRUCTOR_OPTIONS.indexOf(name) === -1) {
-      throw new YAMLException('Unknown option "' + name + '" is met in definition of "' + tag + '" YAML type.');
-    }
-  });
-
-  // TODO: Add tag format check.
-  this.tag          = tag;
-  this.kind         = options['kind']         || null;
-  this.resolve      = options['resolve']      || function () { return true; };
-  this.construct    = options['construct']    || function (data) { return data; };
-  this.instanceOf   = options['instanceOf']   || null;
-  this.predicate    = options['predicate']    || null;
-  this.represent    = options['represent']    || null;
-  this.defaultStyle = options['defaultStyle'] || null;
-  this.styleAliases = compileStyleAliases(options['styleAliases'] || null);
-
-  if (YAML_NODE_KINDS.indexOf(this.kind) === -1) {
-    throw new YAMLException('Unknown kind "' + this.kind + '" is specified for "' + tag + '" YAML type.');
-  }
-}
-
-module.exports = Type;
-
-
-/***/ }),
-/* 11 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_canReportError__ = __webpack_require__(322);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = __webpack_require__(932);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_symbol_observable__ = __webpack_require__(117);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(324);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__config__ = __webpack_require__(185);
-/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
-
-
-
-
-
-var Observable = /*@__PURE__*/ (function () {
-    function Observable(subscribe) {
-        this._isScalar = false;
-        if (subscribe) {
-            this._subscribe = subscribe;
-        }
-    }
-    Observable.prototype.lift = function (operator) {
-        var observable = new Observable();
-        observable.source = this;
-        observable.operator = operator;
-        return observable;
-    };
-    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
-        var operator = this.operator;
-        var sink = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__["a" /* toSubscriber */])(observerOrNext, error, complete);
-        if (operator) {
-            operator.call(sink, this.source);
-        }
-        else {
-            sink.add(this.source || (__WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
-                this._subscribe(sink) :
-                this._trySubscribe(sink));
-        }
-        if (__WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
-            if (sink.syncErrorThrowable) {
-                sink.syncErrorThrowable = false;
-                if (sink.syncErrorThrown) {
-                    throw sink.syncErrorValue;
-                }
-            }
-        }
-        return sink;
-    };
-    Observable.prototype._trySubscribe = function (sink) {
-        try {
-            return this._subscribe(sink);
-        }
-        catch (err) {
-            if (__WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
-                sink.syncErrorThrown = true;
-                sink.syncErrorValue = err;
-            }
-            if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_canReportError__["a" /* canReportError */])(sink)) {
-                sink.error(err);
-            }
-            else {
-                console.warn(err);
-            }
-        }
-    };
-    Observable.prototype.forEach = function (next, promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var subscription;
-            subscription = _this.subscribe(function (value) {
-                try {
-                    next(value);
-                }
-                catch (err) {
-                    reject(err);
-                    if (subscription) {
-                        subscription.unsubscribe();
-                    }
-                }
-            }, reject, resolve);
-        });
-    };
-    Observable.prototype._subscribe = function (subscriber) {
-        var source = this.source;
-        return source && source.subscribe(subscriber);
-    };
-    Observable.prototype[__WEBPACK_IMPORTED_MODULE_2__internal_symbol_observable__["a" /* observable */]] = function () {
-        return this;
-    };
-    Observable.prototype.pipe = function () {
-        var operations = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            operations[_i] = arguments[_i];
-        }
-        if (operations.length === 0) {
-            return this;
-        }
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["b" /* pipeFromArray */])(operations)(this);
-    };
-    Observable.prototype.toPromise = function (promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var value;
-            _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); });
-        });
-    };
-    Observable.create = function (subscribe) {
-        return new Observable(subscribe);
-    };
-    return Observable;
-}());
-
-function getPromiseCtor(promiseCtor) {
-    if (!promiseCtor) {
-        promiseCtor = __WEBPACK_IMPORTED_MODULE_4__config__["a" /* config */].Promise || Promise;
-    }
-    if (!promiseCtor) {
-        throw new Error('no Promise impl found');
-    }
-    return promiseCtor;
-}
-//# sourceMappingURL=Observable.js.map
-
-
-/***/ }),
-/* 12 */
-/***/ (function(module, exports) {
-
-module.exports = require("crypto");
-
-/***/ }),
-/* 13 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OuterSubscriber; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-var OuterSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](OuterSubscriber, _super);
-    function OuterSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    OuterSubscriber.prototype.notifyError = function (error, innerSub) {
-        this.destination.error(error);
-    };
-    OuterSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.destination.complete();
-    };
-    return OuterSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-
-//# sourceMappingURL=OuterSubscriber.js.map
-
-
-/***/ }),
-/* 14 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = subscribeToResult;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeTo__ = __webpack_require__(446);
-/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo PURE_IMPORTS_END */
-
-
-function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, destination) {
-    if (destination === void 0) {
-        destination = new __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__["a" /* InnerSubscriber */](outerSubscriber, outerValue, outerIndex);
-    }
-    if (destination.closed) {
-        return;
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__subscribeTo__["a" /* subscribeTo */])(result)(destination);
-}
-//# sourceMappingURL=subscribeToResult.js.map
-
-
-/***/ }),
-/* 15 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* eslint-disable node/no-deprecated-api */
-
-
-
-var buffer = __webpack_require__(64)
-var Buffer = buffer.Buffer
-
-var safer = {}
-
-var key
-
-for (key in buffer) {
-  if (!buffer.hasOwnProperty(key)) continue
-  if (key === 'SlowBuffer' || key === 'Buffer') continue
-  safer[key] = buffer[key]
-}
-
-var Safer = safer.Buffer = {}
-for (key in Buffer) {
-  if (!Buffer.hasOwnProperty(key)) continue
-  if (key === 'allocUnsafe' || key === 'allocUnsafeSlow') continue
-  Safer[key] = Buffer[key]
-}
-
-safer.Buffer.prototype = Buffer.prototype
-
-if (!Safer.from || Safer.from === Uint8Array.from) {
-  Safer.from = function (value, encodingOrOffset, length) {
-    if (typeof value === 'number') {
-      throw new TypeError('The "value" argument must not be of type number. Received type ' + typeof value)
-    }
-    if (value && typeof value.length === 'undefined') {
-      throw new TypeError('The first argument must be one of type string, Buffer, ArrayBuffer, Array, or Array-like Object. Received type ' + typeof value)
-    }
-    return Buffer(value, encodingOrOffset, length)
-  }
-}
-
-if (!Safer.alloc) {
-  Safer.alloc = function (size, fill, encoding) {
-    if (typeof size !== 'number') {
-      throw new TypeError('The "size" argument must be of type number. Received type ' + typeof size)
-    }
-    if (size < 0 || size >= 2 * (1 << 30)) {
-      throw new RangeError('The value "' + size + '" is invalid for option "size"')
-    }
-    var buf = Buffer(size)
-    if (!fill || fill.length === 0) {
-      buf.fill(0)
-    } else if (typeof encoding === 'string') {
-      buf.fill(fill, encoding)
-    } else {
-      buf.fill(fill)
-    }
-    return buf
-  }
-}
-
-if (!safer.kStringMaxLength) {
-  try {
-    safer.kStringMaxLength = process.binding('buffer').kStringMaxLength
-  } catch (e) {
-    // we can't determine kStringMaxLength in environments where process.binding
-    // is unsupported, so let's not set it
-  }
-}
-
-if (!safer.constants) {
-  safer.constants = {
-    MAX_LENGTH: safer.kMaxLength
-  }
-  if (safer.kStringMaxLength) {
-    safer.constants.MAX_STRING_LENGTH = safer.kStringMaxLength
-  }
-}
-
-module.exports = safer
-
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright (c) 2012, Mark Cavage. All rights reserved.
-// Copyright 2015 Joyent, Inc.
-
-var assert = __webpack_require__(28);
-var Stream = __webpack_require__(23).Stream;
-var util = __webpack_require__(3);
-
-
-///--- Globals
-
-/* JSSTYLED */
-var UUID_REGEXP = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
-
-
-///--- Internal
-
-function _capitalize(str) {
-    return (str.charAt(0).toUpperCase() + str.slice(1));
-}
-
-function _toss(name, expected, oper, arg, actual) {
-    throw new assert.AssertionError({
-        message: util.format('%s (%s) is required', name, expected),
-        actual: (actual === undefined) ? typeof (arg) : actual(arg),
-        expected: expected,
-        operator: oper || '===',
-        stackStartFunction: _toss.caller
-    });
-}
-
-function _getClass(arg) {
-    return (Object.prototype.toString.call(arg).slice(8, -1));
-}
-
-function noop() {
-    // Why even bother with asserts?
-}
-
-
-///--- Exports
-
-var types = {
-    bool: {
-        check: function (arg) { return typeof (arg) === 'boolean'; }
-    },
-    func: {
-        check: function (arg) { return typeof (arg) === 'function'; }
-    },
-    string: {
-        check: function (arg) { return typeof (arg) === 'string'; }
-    },
-    object: {
-        check: function (arg) {
-            return typeof (arg) === 'object' && arg !== null;
-        }
-    },
-    number: {
-        check: function (arg) {
-            return typeof (arg) === 'number' && !isNaN(arg);
-        }
-    },
-    finite: {
-        check: function (arg) {
-            return typeof (arg) === 'number' && !isNaN(arg) && isFinite(arg);
-        }
-    },
-    buffer: {
-        check: function (arg) { return Buffer.isBuffer(arg); },
-        operator: 'Buffer.isBuffer'
-    },
-    array: {
-        check: function (arg) { return Array.isArray(arg); },
-        operator: 'Array.isArray'
-    },
-    stream: {
-        check: function (arg) { return arg instanceof Stream; },
-        operator: 'instanceof',
-        actual: _getClass
-    },
-    date: {
-        check: function (arg) { return arg instanceof Date; },
-        operator: 'instanceof',
-        actual: _getClass
-    },
-    regexp: {
-        check: function (arg) { return arg instanceof RegExp; },
-        operator: 'instanceof',
-        actual: _getClass
-    },
-    uuid: {
-        check: function (arg) {
-            return typeof (arg) === 'string' && UUID_REGEXP.test(arg);
-        },
-        operator: 'isUUID'
-    }
-};
-
-function _setExports(ndebug) {
-    var keys = Object.keys(types);
-    var out;
-
-    /* re-export standard assert */
-    if (process.env.NODE_NDEBUG) {
-        out = noop;
-    } else {
-        out = function (arg, msg) {
-            if (!arg) {
-                _toss(msg, 'true', arg);
-            }
-        };
-    }
-
-    /* standard checks */
-    keys.forEach(function (k) {
-        if (ndebug) {
-            out[k] = noop;
-            return;
-        }
-        var type = types[k];
-        out[k] = function (arg, msg) {
-            if (!type.check(arg)) {
-                _toss(msg, k, type.operator, arg, type.actual);
-            }
-        };
-    });
-
-    /* optional checks */
-    keys.forEach(function (k) {
-        var name = 'optional' + _capitalize(k);
-        if (ndebug) {
-            out[name] = noop;
-            return;
-        }
-        var type = types[k];
-        out[name] = function (arg, msg) {
-            if (arg === undefined || arg === null) {
-                return;
-            }
-            if (!type.check(arg)) {
-                _toss(msg, k, type.operator, arg, type.actual);
-            }
-        };
-    });
-
-    /* arrayOf checks */
-    keys.forEach(function (k) {
-        var name = 'arrayOf' + _capitalize(k);
-        if (ndebug) {
-            out[name] = noop;
-            return;
-        }
-        var type = types[k];
-        var expected = '[' + k + ']';
-        out[name] = function (arg, msg) {
-            if (!Array.isArray(arg)) {
-                _toss(msg, expected, type.operator, arg, type.actual);
-            }
-            var i;
-            for (i = 0; i < arg.length; i++) {
-                if (!type.check(arg[i])) {
-                    _toss(msg, expected, type.operator, arg, type.actual);
-                }
-            }
-        };
-    });
-
-    /* optionalArrayOf checks */
-    keys.forEach(function (k) {
-        var name = 'optionalArrayOf' + _capitalize(k);
-        if (ndebug) {
-            out[name] = noop;
-            return;
-        }
-        var type = types[k];
-        var expected = '[' + k + ']';
-        out[name] = function (arg, msg) {
-            if (arg === undefined || arg === null) {
-                return;
-            }
-            if (!Array.isArray(arg)) {
-                _toss(msg, expected, type.operator, arg, type.actual);
-            }
-            var i;
-            for (i = 0; i < arg.length; i++) {
-                if (!type.check(arg[i])) {
-                    _toss(msg, expected, type.operator, arg, type.actual);
-                }
-            }
-        };
-    });
-
-    /* re-export built-in assertions */
-    Object.keys(assert).forEach(function (k) {
-        if (k === 'AssertionError') {
-            out[k] = assert[k];
-            return;
-        }
-        if (ndebug) {
-            out[k] = noop;
-            return;
-        }
-        out[k] = assert[k];
-    });
-
-    /* export ourselves (for unit tests _only_) */
-    out._setExports = _setExports;
-
-    return out;
-}
-
-module.exports = _setExports(process.env.NODE_NDEBUG);
-
-
-/***/ }),
-/* 17 */
-/***/ (function(module, exports) {
-
-// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-var global = module.exports = typeof window != 'undefined' && window.Math == Math
-  ? window : typeof self != 'undefined' && self.Math == Math ? self
-  // eslint-disable-next-line no-new-func
-  : Function('return this')();
-if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
-
-
-/***/ }),
-/* 18 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortAlpha = sortAlpha;
-exports.sortOptionsByFlags = sortOptionsByFlags;
-exports.entries = entries;
-exports.removePrefix = removePrefix;
-exports.removeSuffix = removeSuffix;
-exports.addSuffix = addSuffix;
-exports.hyphenate = hyphenate;
-exports.camelCase = camelCase;
-exports.compareSortedArrays = compareSortedArrays;
-exports.sleep = sleep;
-const _camelCase = __webpack_require__(230);
-
-function sortAlpha(a, b) {
-  // sort alphabetically in a deterministic way
-  const shortLen = Math.min(a.length, b.length);
-  for (let i = 0; i < shortLen; i++) {
-    const aChar = a.charCodeAt(i);
-    const bChar = b.charCodeAt(i);
-    if (aChar !== bChar) {
-      return aChar - bChar;
-    }
-  }
-  return a.length - b.length;
-}
-
-function sortOptionsByFlags(a, b) {
-  const aOpt = a.flags.replace(/-/g, '');
-  const bOpt = b.flags.replace(/-/g, '');
-  return sortAlpha(aOpt, bOpt);
-}
-
-function entries(obj) {
-  const entries = [];
-  if (obj) {
-    for (const key in obj) {
-      entries.push([key, obj[key]]);
-    }
-  }
-  return entries;
-}
-
-function removePrefix(pattern, prefix) {
-  if (pattern.startsWith(prefix)) {
-    pattern = pattern.slice(prefix.length);
-  }
-
-  return pattern;
-}
-
-function removeSuffix(pattern, suffix) {
-  if (pattern.endsWith(suffix)) {
-    return pattern.slice(0, -suffix.length);
-  }
-
-  return pattern;
-}
-
-function addSuffix(pattern, suffix) {
-  if (!pattern.endsWith(suffix)) {
-    return pattern + suffix;
-  }
-
-  return pattern;
-}
-
-function hyphenate(str) {
-  return str.replace(/[A-Z]/g, match => {
-    return '-' + match.charAt(0).toLowerCase();
-  });
-}
-
-function camelCase(str) {
-  if (/[A-Z]/.test(str)) {
-    return null;
-  } else {
-    return _camelCase(str);
-  }
-}
-
-function compareSortedArrays(array1, array2) {
-  if (array1.length !== array2.length) {
-    return false;
-  }
-  for (let i = 0, len = array1.length; i < len; i++) {
-    if (array1[i] !== array2[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function sleep(ms) {
-  return new Promise(resolve => {
-    setTimeout(resolve, ms);
-  });
-}
-
-/***/ }),
-/* 19 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.stringify = exports.parse = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _parse;
-
-function _load_parse() {
-  return _parse = __webpack_require__(105);
-}
-
-Object.defineProperty(exports, 'parse', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_parse || _load_parse()).default;
-  }
-});
-
-var _stringify;
-
-function _load_stringify() {
-  return _stringify = __webpack_require__(199);
-}
-
-Object.defineProperty(exports, 'stringify', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_stringify || _load_stringify()).default;
-  }
-});
-exports.implodeEntry = implodeEntry;
-exports.explodeEntry = explodeEntry;
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _normalizePattern;
-
-function _load_normalizePattern() {
-  return _normalizePattern = __webpack_require__(37);
-}
-
-var _parse2;
-
-function _load_parse2() {
-  return _parse2 = _interopRequireDefault(__webpack_require__(105));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const path = __webpack_require__(0);
-const ssri = __webpack_require__(77);
-
-function getName(pattern) {
-  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
-}
-
-function blankObjectUndefined(obj) {
-  return obj && Object.keys(obj).length ? obj : undefined;
-}
-
-function keyForRemote(remote) {
-  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
-}
-
-function serializeIntegrity(integrity) {
-  // We need this because `Integrity.toString()` does not use sorting to ensure a stable string output
-  // See https://git.io/vx2Hy
-  return integrity.toString().split(' ').sort().join(' ');
-}
-
-function implodeEntry(pattern, obj) {
-  const inferredName = getName(pattern);
-  const integrity = obj.integrity ? serializeIntegrity(obj.integrity) : '';
-  const imploded = {
-    name: inferredName === obj.name ? undefined : obj.name,
-    version: obj.version,
-    uid: obj.uid === obj.version ? undefined : obj.uid,
-    resolved: obj.resolved,
-    registry: obj.registry === 'npm' ? undefined : obj.registry,
-    dependencies: blankObjectUndefined(obj.dependencies),
-    optionalDependencies: blankObjectUndefined(obj.optionalDependencies),
-    permissions: blankObjectUndefined(obj.permissions),
-    prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants)
-  };
-  if (integrity) {
-    imploded.integrity = integrity;
-  }
-  return imploded;
-}
-
-function explodeEntry(pattern, obj) {
-  obj.optionalDependencies = obj.optionalDependencies || {};
-  obj.dependencies = obj.dependencies || {};
-  obj.uid = obj.uid || obj.version;
-  obj.permissions = obj.permissions || {};
-  obj.registry = obj.registry || 'npm';
-  obj.name = obj.name || getName(pattern);
-  const integrity = obj.integrity;
-  if (integrity && integrity.isIntegrity) {
-    obj.integrity = ssri.parse(integrity);
-  }
-  return obj;
-}
-
-class Lockfile {
-  constructor({ cache, source, parseResultType } = {}) {
-    this.source = source || '';
-    this.cache = cache;
-    this.parseResultType = parseResultType;
-  }
-
-  // source string if the `cache` was parsed
-
-
-  // if true, we're parsing an old yarn file and need to update integrity fields
-  hasEntriesExistWithoutIntegrity() {
-    if (!this.cache) {
-      return false;
-    }
-
-    for (const key in this.cache) {
-      // $FlowFixMe - `this.cache` is clearly defined at this point
-      if (!/^.*@(file:|http)/.test(key) && this.cache[key] && !this.cache[key].integrity) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  static fromDirectory(dir, reporter) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // read the manifest in this directory
-      const lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME);
-
-      let lockfile;
-      let rawLockfile = '';
-      let parseResult;
-
-      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
-        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
-        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
-
-        if (reporter) {
-          if (parseResult.type === 'merge') {
-            reporter.info(reporter.lang('lockfileMerged'));
-          } else if (parseResult.type === 'conflict') {
-            reporter.warn(reporter.lang('lockfileConflict'));
-          }
-        }
-
-        lockfile = parseResult.object;
-      } else if (reporter) {
-        reporter.info(reporter.lang('noLockfileFound'));
-      }
-
-      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
-    })();
-  }
-
-  getLocked(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return undefined;
-    }
-
-    const shrunk = pattern in cache && cache[pattern];
-
-    if (typeof shrunk === 'string') {
-      return this.getLocked(shrunk);
-    } else if (shrunk) {
-      explodeEntry(pattern, shrunk);
-      return shrunk;
-    }
-
-    return undefined;
-  }
-
-  removePattern(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return;
-    }
-    delete cache[pattern];
-  }
-
-  getLockfile(patterns) {
-    const lockfile = {};
-    const seen = new Map();
-
-    // order by name so that lockfile manifest is assigned to the first dependency with this manifest
-    // the others that have the same remoteKey will just refer to the first
-    // ordering allows for consistency in lockfile when it is serialized
-    const sortedPatternsKeys = Object.keys(patterns).sort((_misc || _load_misc()).sortAlpha);
-
-    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const pattern = _ref;
-
-      const pkg = patterns[pattern];
-      const remote = pkg._remote,
-            ref = pkg._reference;
-
-      invariant(ref, 'Package is missing a reference');
-      invariant(remote, 'Package is missing a remote');
-
-      const remoteKey = keyForRemote(remote);
-      const seenPattern = remoteKey && seen.get(remoteKey);
-      if (seenPattern) {
-        // no point in duplicating it
-        lockfile[pattern] = seenPattern;
-
-        // if we're relying on our name being inferred and two of the patterns have
-        // different inferred names then we need to set it
-        if (!seenPattern.name && getName(pattern) !== pkg.name) {
-          seenPattern.name = pkg.name;
-        }
-        continue;
-      }
-      const obj = implodeEntry(pattern, {
-        name: pkg.name,
-        version: pkg.version,
-        uid: pkg._uid,
-        resolved: remote.resolved,
-        integrity: remote.integrity,
-        registry: remote.registry,
-        dependencies: pkg.dependencies,
-        peerDependencies: pkg.peerDependencies,
-        optionalDependencies: pkg.optionalDependencies,
-        permissions: ref.permissions,
-        prebuiltVariants: pkg.prebuiltVariants
-      });
-
-      lockfile[pattern] = obj;
-
-      if (remoteKey) {
-        seen.set(remoteKey, obj);
-      }
-    }
-
-    return lockfile;
-  }
-}
-exports.default = Lockfile;
-
-/***/ }),
-/* 20 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var store = __webpack_require__(133)('wks');
-var uid = __webpack_require__(137);
-var Symbol = __webpack_require__(17).Symbol;
-var USE_SYMBOL = typeof Symbol == 'function';
-
-var $exports = module.exports = function (name) {
-  return store[name] || (store[name] =
-    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
-};
-
-$exports.store = store;
-
-
-/***/ }),
-/* 21 */
-/***/ (function(module, exports) {
-
-exports = module.exports = SemVer;
-
-// The debug function is excluded entirely from the minified version.
-/* nomin */ var debug;
-/* nomin */ if (typeof process === 'object' &&
-    /* nomin */ process.env &&
-    /* nomin */ process.env.NODE_DEBUG &&
-    /* nomin */ /\bsemver\b/i.test(process.env.NODE_DEBUG))
-  /* nomin */ debug = function() {
-    /* nomin */ var args = Array.prototype.slice.call(arguments, 0);
-    /* nomin */ args.unshift('SEMVER');
-    /* nomin */ console.log.apply(console, args);
-    /* nomin */ };
-/* nomin */ else
-  /* nomin */ debug = function() {};
-
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0';
-
-var MAX_LENGTH = 256;
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
-
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16;
-
-// The actual regexps go on exports.re
-var re = exports.re = [];
-var src = exports.src = [];
-var R = 0;
-
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
-
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
-
-var NUMERICIDENTIFIER = R++;
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
-var NUMERICIDENTIFIERLOOSE = R++;
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
-
-
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
-
-var NONNUMERICIDENTIFIER = R++;
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
-
-
-// ## Main Version
-// Three dot-separated numeric identifiers.
-
-var MAINVERSION = R++;
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')';
-
-var MAINVERSIONLOOSE = R++;
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
-
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
-
-var PRERELEASEIDENTIFIER = R++;
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')';
-
-var PRERELEASEIDENTIFIERLOOSE = R++;
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
-
-
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
-
-var PRERELEASE = R++;
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
-
-var PRERELEASELOOSE = R++;
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
-
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
-
-var BUILDIDENTIFIER = R++;
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
-
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
-
-var BUILD = R++;
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
-
-
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
-
-// Note that the only major, minor, patch, and pre-release sections of
-// the version string are capturing groups.  The build metadata is not a
-// capturing group, because it should not ever be used in version
-// comparison.
-
-var FULL = R++;
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?';
-
-src[FULL] = '^' + FULLPLAIN + '$';
-
-// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-// common in the npm registry.
-var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
-                 src[PRERELEASELOOSE] + '?' +
-                 src[BUILD] + '?';
-
-var LOOSE = R++;
-src[LOOSE] = '^' + LOOSEPLAIN + '$';
-
-var GTLT = R++;
-src[GTLT] = '((?:<|>)?=?)';
-
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-var XRANGEIDENTIFIERLOOSE = R++;
-src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
-var XRANGEIDENTIFIER = R++;
-src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
-
-var XRANGEPLAIN = R++;
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?';
-
-var XRANGEPLAINLOOSE = R++;
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?';
-
-var XRANGE = R++;
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
-var XRANGELOOSE = R++;
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
-
-// Coercion.
-// Extract anything that could conceivably be a part of a valid semver
-var COERCE = R++;
-src[COERCE] = '(?:^|[^\\d])' +
-              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:$|[^\\d])';
-
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++;
-src[LONETILDE] = '(?:~>?)';
-
-var TILDETRIM = R++;
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
-var tildeTrimReplace = '$1~';
-
-var TILDE = R++;
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
-var TILDELOOSE = R++;
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
-
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++;
-src[LONECARET] = '(?:\\^)';
-
-var CARETTRIM = R++;
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
-var caretTrimReplace = '$1^';
-
-var CARET = R++;
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
-var CARETLOOSE = R++;
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
-
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-var COMPARATORLOOSE = R++;
-src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
-var COMPARATOR = R++;
-src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
-
-
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-var COMPARATORTRIM = R++;
-src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
-                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
-
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
-var comparatorTrimReplace = '$1$2$3';
-
-
-// Something like `1.2.3 - 1.2.4`
-// Note that these all use the loose form, because they'll be
-// checked against either the strict or loose comparator form
-// later.
-var HYPHENRANGE = R++;
-src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[XRANGEPLAIN] + ')' +
-                   '\\s*$';
-
-var HYPHENRANGELOOSE = R++;
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$';
-
-// Star ranges basically just allow anything at all.
-var STAR = R++;
-src[STAR] = '(<|>)?=?\\s*\\*';
-
-// Compile to actual regexp objects.
-// All are flag-free, unless they were created above with a flag.
-for (var i = 0; i < R; i++) {
-  debug(i, src[i]);
-  if (!re[i])
-    re[i] = new RegExp(src[i]);
-}
-
-exports.parse = parse;
-function parse(version, loose) {
-  if (version instanceof SemVer)
-    return version;
-
-  if (typeof version !== 'string')
-    return null;
-
-  if (version.length > MAX_LENGTH)
-    return null;
-
-  var r = loose ? re[LOOSE] : re[FULL];
-  if (!r.test(version))
-    return null;
-
-  try {
-    return new SemVer(version, loose);
-  } catch (er) {
-    return null;
-  }
-}
-
-exports.valid = valid;
-function valid(version, loose) {
-  var v = parse(version, loose);
-  return v ? v.version : null;
-}
-
-
-exports.clean = clean;
-function clean(version, loose) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
-  return s ? s.version : null;
-}
-
-exports.SemVer = SemVer;
-
-function SemVer(version, loose) {
-  if (version instanceof SemVer) {
-    if (version.loose === loose)
-      return version;
-    else
-      version = version.version;
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version);
-  }
-
-  if (version.length > MAX_LENGTH)
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-
-  if (!(this instanceof SemVer))
-    return new SemVer(version, loose);
-
-  debug('SemVer', version, loose);
-  this.loose = loose;
-  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
-
-  if (!m)
-    throw new TypeError('Invalid Version: ' + version);
-
-  this.raw = version;
-
-  // these are actually numbers
-  this.major = +m[1];
-  this.minor = +m[2];
-  this.patch = +m[3];
-
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
-    throw new TypeError('Invalid major version')
-
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
-    throw new TypeError('Invalid minor version')
-
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
-    throw new TypeError('Invalid patch version')
-
-  // numberify any prerelease numeric ids
-  if (!m[4])
-    this.prerelease = [];
-  else
-    this.prerelease = m[4].split('.').map(function(id) {
-      if (/^[0-9]+$/.test(id)) {
-        var num = +id;
-        if (num >= 0 && num < MAX_SAFE_INTEGER)
-          return num;
-      }
-      return id;
-    });
-
-  this.build = m[5] ? m[5].split('.') : [];
-  this.format();
-}
-
-SemVer.prototype.format = function() {
-  this.version = this.major + '.' + this.minor + '.' + this.patch;
-  if (this.prerelease.length)
-    this.version += '-' + this.prerelease.join('.');
-  return this.version;
-};
-
-SemVer.prototype.toString = function() {
-  return this.version;
-};
-
-SemVer.prototype.compare = function(other) {
-  debug('SemVer.compare', this.version, this.loose, other);
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
-
-  return this.compareMain(other) || this.comparePre(other);
-};
-
-SemVer.prototype.compareMain = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
-
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch);
-};
-
-SemVer.prototype.comparePre = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
-
-  // NOT having a prerelease is > having one
-  if (this.prerelease.length && !other.prerelease.length)
-    return -1;
-  else if (!this.prerelease.length && other.prerelease.length)
-    return 1;
-  else if (!this.prerelease.length && !other.prerelease.length)
-    return 0;
-
-  var i = 0;
-  do {
-    var a = this.prerelease[i];
-    var b = other.prerelease[i];
-    debug('prerelease compare', i, a, b);
-    if (a === undefined && b === undefined)
-      return 0;
-    else if (b === undefined)
-      return 1;
-    else if (a === undefined)
-      return -1;
-    else if (a === b)
-      continue;
-    else
-      return compareIdentifiers(a, b);
-  } while (++i);
-};
-
-// preminor will bump the version up to the next minor release, and immediately
-// down to pre-release. premajor and prepatch work the same way.
-SemVer.prototype.inc = function(release, identifier) {
-  switch (release) {
-    case 'premajor':
-      this.prerelease.length = 0;
-      this.patch = 0;
-      this.minor = 0;
-      this.major++;
-      this.inc('pre', identifier);
-      break;
-    case 'preminor':
-      this.prerelease.length = 0;
-      this.patch = 0;
-      this.minor++;
-      this.inc('pre', identifier);
-      break;
-    case 'prepatch':
-      // If this is already a prerelease, it will bump to the next version
-      // drop any prereleases that might already exist, since they are not
-      // relevant at this point.
-      this.prerelease.length = 0;
-      this.inc('patch', identifier);
-      this.inc('pre', identifier);
-      break;
-    // If the input is a non-prerelease version, this acts the same as
-    // prepatch.
-    case 'prerelease':
-      if (this.prerelease.length === 0)
-        this.inc('patch', identifier);
-      this.inc('pre', identifier);
-      break;
-
-    case 'major':
-      // If this is a pre-major version, bump up to the same major version.
-      // Otherwise increment major.
-      // 1.0.0-5 bumps to 1.0.0
-      // 1.1.0 bumps to 2.0.0
-      if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0)
-        this.major++;
-      this.minor = 0;
-      this.patch = 0;
-      this.prerelease = [];
-      break;
-    case 'minor':
-      // If this is a pre-minor version, bump up to the same minor version.
-      // Otherwise increment minor.
-      // 1.2.0-5 bumps to 1.2.0
-      // 1.2.1 bumps to 1.3.0
-      if (this.patch !== 0 || this.prerelease.length === 0)
-        this.minor++;
-      this.patch = 0;
-      this.prerelease = [];
-      break;
-    case 'patch':
-      // If this is not a pre-release version, it will increment the patch.
-      // If it is a pre-release it will bump up to the same patch version.
-      // 1.2.0-5 patches to 1.2.0
-      // 1.2.0 patches to 1.2.1
-      if (this.prerelease.length === 0)
-        this.patch++;
-      this.prerelease = [];
-      break;
-    // This probably shouldn't be used publicly.
-    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
-    case 'pre':
-      if (this.prerelease.length === 0)
-        this.prerelease = [0];
-      else {
-        var i = this.prerelease.length;
-        while (--i >= 0) {
-          if (typeof this.prerelease[i] === 'number') {
-            this.prerelease[i]++;
-            i = -2;
-          }
-        }
-        if (i === -1) // didn't increment anything
-          this.prerelease.push(0);
-      }
-      if (identifier) {
-        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-        if (this.prerelease[0] === identifier) {
-          if (isNaN(this.prerelease[1]))
-            this.prerelease = [identifier, 0];
-        } else
-          this.prerelease = [identifier, 0];
-      }
-      break;
-
-    default:
-      throw new Error('invalid increment argument: ' + release);
-  }
-  this.format();
-  this.raw = this.version;
-  return this;
-};
-
-exports.inc = inc;
-function inc(version, release, loose, identifier) {
-  if (typeof(loose) === 'string') {
-    identifier = loose;
-    loose = undefined;
-  }
-
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version;
-  } catch (er) {
-    return null;
-  }
-}
-
-exports.diff = diff;
-function diff(version1, version2) {
-  if (eq(version1, version2)) {
-    return null;
-  } else {
-    var v1 = parse(version1);
-    var v2 = parse(version2);
-    if (v1.prerelease.length || v2.prerelease.length) {
-      for (var key in v1) {
-        if (key === 'major' || key === 'minor' || key === 'patch') {
-          if (v1[key] !== v2[key]) {
-            return 'pre'+key;
-          }
-        }
-      }
-      return 'prerelease';
-    }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return key;
-        }
-      }
-    }
-  }
-}
-
-exports.compareIdentifiers = compareIdentifiers;
-
-var numeric = /^[0-9]+$/;
-function compareIdentifiers(a, b) {
-  var anum = numeric.test(a);
-  var bnum = numeric.test(b);
-
-  if (anum && bnum) {
-    a = +a;
-    b = +b;
-  }
-
-  return (anum && !bnum) ? -1 :
-         (bnum && !anum) ? 1 :
-         a < b ? -1 :
-         a > b ? 1 :
-         0;
-}
-
-exports.rcompareIdentifiers = rcompareIdentifiers;
-function rcompareIdentifiers(a, b) {
-  return compareIdentifiers(b, a);
-}
-
-exports.major = major;
-function major(a, loose) {
-  return new SemVer(a, loose).major;
-}
-
-exports.minor = minor;
-function minor(a, loose) {
-  return new SemVer(a, loose).minor;
-}
-
-exports.patch = patch;
-function patch(a, loose) {
-  return new SemVer(a, loose).patch;
-}
-
-exports.compare = compare;
-function compare(a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose));
-}
-
-exports.compareLoose = compareLoose;
-function compareLoose(a, b) {
-  return compare(a, b, true);
-}
-
-exports.rcompare = rcompare;
-function rcompare(a, b, loose) {
-  return compare(b, a, loose);
-}
-
-exports.sort = sort;
-function sort(list, loose) {
-  return list.sort(function(a, b) {
-    return exports.compare(a, b, loose);
-  });
-}
-
-exports.rsort = rsort;
-function rsort(list, loose) {
-  return list.sort(function(a, b) {
-    return exports.rcompare(a, b, loose);
-  });
-}
-
-exports.gt = gt;
-function gt(a, b, loose) {
-  return compare(a, b, loose) > 0;
-}
-
-exports.lt = lt;
-function lt(a, b, loose) {
-  return compare(a, b, loose) < 0;
-}
-
-exports.eq = eq;
-function eq(a, b, loose) {
-  return compare(a, b, loose) === 0;
-}
-
-exports.neq = neq;
-function neq(a, b, loose) {
-  return compare(a, b, loose) !== 0;
-}
-
-exports.gte = gte;
-function gte(a, b, loose) {
-  return compare(a, b, loose) >= 0;
-}
-
-exports.lte = lte;
-function lte(a, b, loose) {
-  return compare(a, b, loose) <= 0;
-}
-
-exports.cmp = cmp;
-function cmp(a, op, b, loose) {
-  var ret;
-  switch (op) {
-    case '===':
-      if (typeof a === 'object') a = a.version;
-      if (typeof b === 'object') b = b.version;
-      ret = a === b;
-      break;
-    case '!==':
-      if (typeof a === 'object') a = a.version;
-      if (typeof b === 'object') b = b.version;
-      ret = a !== b;
-      break;
-    case '': case '=': case '==': ret = eq(a, b, loose); break;
-    case '!=': ret = neq(a, b, loose); break;
-    case '>': ret = gt(a, b, loose); break;
-    case '>=': ret = gte(a, b, loose); break;
-    case '<': ret = lt(a, b, loose); break;
-    case '<=': ret = lte(a, b, loose); break;
-    default: throw new TypeError('Invalid operator: ' + op);
-  }
-  return ret;
-}
-
-exports.Comparator = Comparator;
-function Comparator(comp, loose) {
-  if (comp instanceof Comparator) {
-    if (comp.loose === loose)
-      return comp;
-    else
-      comp = comp.value;
-  }
-
-  if (!(this instanceof Comparator))
-    return new Comparator(comp, loose);
-
-  debug('comparator', comp, loose);
-  this.loose = loose;
-  this.parse(comp);
-
-  if (this.semver === ANY)
-    this.value = '';
-  else
-    this.value = this.operator + this.semver.version;
-
-  debug('comp', this);
-}
-
-var ANY = {};
-Comparator.prototype.parse = function(comp) {
-  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var m = comp.match(r);
-
-  if (!m)
-    throw new TypeError('Invalid comparator: ' + comp);
-
-  this.operator = m[1];
-  if (this.operator === '=')
-    this.operator = '';
-
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2])
-    this.semver = ANY;
-  else
-    this.semver = new SemVer(m[2], this.loose);
-};
-
-Comparator.prototype.toString = function() {
-  return this.value;
-};
-
-Comparator.prototype.test = function(version) {
-  debug('Comparator.test', version, this.loose);
-
-  if (this.semver === ANY)
-    return true;
-
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
-
-  return cmp(version, this.operator, this.semver, this.loose);
-};
-
-Comparator.prototype.intersects = function(comp, loose) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required');
-  }
-
-  var rangeTmp;
-
-  if (this.operator === '') {
-    rangeTmp = new Range(comp.value, loose);
-    return satisfies(this.value, rangeTmp, loose);
-  } else if (comp.operator === '') {
-    rangeTmp = new Range(this.value, loose);
-    return satisfies(comp.semver, rangeTmp, loose);
-  }
-
-  var sameDirectionIncreasing =
-    (this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '>=' || comp.operator === '>');
-  var sameDirectionDecreasing =
-    (this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '<=' || comp.operator === '<');
-  var sameSemVer = this.semver.version === comp.semver.version;
-  var differentDirectionsInclusive =
-    (this.operator === '>=' || this.operator === '<=') &&
-    (comp.operator === '>=' || comp.operator === '<=');
-  var oppositeDirectionsLessThan =
-    cmp(this.semver, '<', comp.semver, loose) &&
-    ((this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '<=' || comp.operator === '<'));
-  var oppositeDirectionsGreaterThan =
-    cmp(this.semver, '>', comp.semver, loose) &&
-    ((this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '>=' || comp.operator === '>'));
-
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
-};
-
-
-exports.Range = Range;
-function Range(range, loose) {
-  if (range instanceof Range) {
-    if (range.loose === loose) {
-      return range;
-    } else {
-      return new Range(range.raw, loose);
-    }
-  }
-
-  if (range instanceof Comparator) {
-    return new Range(range.value, loose);
-  }
-
-  if (!(this instanceof Range))
-    return new Range(range, loose);
-
-  this.loose = loose;
-
-  // First, split based on boolean or ||
-  this.raw = range;
-  this.set = range.split(/\s*\|\|\s*/).map(function(range) {
-    return this.parseRange(range.trim());
-  }, this).filter(function(c) {
-    // throw out any that are not relevant for whatever reason
-    return c.length;
-  });
-
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range);
-  }
-
-  this.format();
-}
-
-Range.prototype.format = function() {
-  this.range = this.set.map(function(comps) {
-    return comps.join(' ').trim();
-  }).join('||').trim();
-  return this.range;
-};
-
-Range.prototype.toString = function() {
-  return this.range;
-};
-
-Range.prototype.parseRange = function(range) {
-  var loose = this.loose;
-  range = range.trim();
-  debug('range', range, loose);
-  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
-  range = range.replace(hr, hyphenReplace);
-  debug('hyphen replace', range);
-  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
-  debug('comparator trim', range, re[COMPARATORTRIM]);
-
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace);
-
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace);
-
-  // normalize spaces
-  range = range.split(/\s+/).join(' ');
-
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
-
-  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var set = range.split(' ').map(function(comp) {
-    return parseComparator(comp, loose);
-  }).join(' ').split(/\s+/);
-  if (this.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function(comp) {
-      return !!comp.match(compRe);
-    });
-  }
-  set = set.map(function(comp) {
-    return new Comparator(comp, loose);
-  });
-
-  return set;
-};
-
-Range.prototype.intersects = function(range, loose) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required');
-  }
-
-  return this.set.some(function(thisComparators) {
-    return thisComparators.every(function(thisComparator) {
-      return range.set.some(function(rangeComparators) {
-        return rangeComparators.every(function(rangeComparator) {
-          return thisComparator.intersects(rangeComparator, loose);
-        });
-      });
-    });
-  });
-};
-
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators;
-function toComparators(range, loose) {
-  return new Range(range, loose).set.map(function(comp) {
-    return comp.map(function(c) {
-      return c.value;
-    }).join(' ').trim().split(' ');
-  });
-}
-
-// comprised of xranges, tildes, stars, and gtlt's at this point.
-// already replaced the hyphen ranges
-// turn into a set of JUST comparators.
-function parseComparator(comp, loose) {
-  debug('comp', comp);
-  comp = replaceCarets(comp, loose);
-  debug('caret', comp);
-  comp = replaceTildes(comp, loose);
-  debug('tildes', comp);
-  comp = replaceXRanges(comp, loose);
-  debug('xrange', comp);
-  comp = replaceStars(comp, loose);
-  debug('stars', comp);
-  return comp;
-}
-
-function isX(id) {
-  return !id || id.toLowerCase() === 'x' || id === '*';
-}
-
-// ~, ~> --> * (any, kinda silly)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-function replaceTildes(comp, loose) {
-  return comp.trim().split(/\s+/).map(function(comp) {
-    return replaceTilde(comp, loose);
-  }).join(' ');
-}
-
-function replaceTilde(comp, loose) {
-  var r = loose ? re[TILDELOOSE] : re[TILDE];
-  return comp.replace(r, function(_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr);
-    var ret;
-
-    if (isX(M))
-      ret = '';
-    else if (isX(m))
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    else if (isX(p))
-      // ~1.2 == >=1.2.0 <1.3.0
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-    else if (pr) {
-      debug('replaceTilde pr', pr);
-      if (pr.charAt(0) !== '-')
-        pr = '-' + pr;
-      ret = '>=' + M + '.' + m + '.' + p + pr +
-            ' <' + M + '.' + (+m + 1) + '.0';
-    } else
-      // ~1.2.3 == >=1.2.3 <1.3.0
-      ret = '>=' + M + '.' + m + '.' + p +
-            ' <' + M + '.' + (+m + 1) + '.0';
-
-    debug('tilde return', ret);
-    return ret;
-  });
-}
-
-// ^ --> * (any, kinda silly)
-// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2.0 --> >=1.2.0 <2.0.0
-function replaceCarets(comp, loose) {
-  return comp.trim().split(/\s+/).map(function(comp) {
-    return replaceCaret(comp, loose);
-  }).join(' ');
-}
-
-function replaceCaret(comp, loose) {
-  debug('caret', comp, loose);
-  var r = loose ? re[CARETLOOSE] : re[CARET];
-  return comp.replace(r, function(_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr);
-    var ret;
-
-    if (isX(M))
-      ret = '';
-    else if (isX(m))
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    else if (isX(p)) {
-      if (M === '0')
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-      else
-        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
-    } else if (pr) {
-      debug('replaceCaret pr', pr);
-      if (pr.charAt(0) !== '-')
-        pr = '-' + pr;
-      if (M === '0') {
-        if (m === '0')
-          ret = '>=' + M + '.' + m + '.' + p + pr +
-                ' <' + M + '.' + m + '.' + (+p + 1);
-        else
-          ret = '>=' + M + '.' + m + '.' + p + pr +
-                ' <' + M + '.' + (+m + 1) + '.0';
-      } else
-        ret = '>=' + M + '.' + m + '.' + p + pr +
-              ' <' + (+M + 1) + '.0.0';
-    } else {
-      debug('no pr');
-      if (M === '0') {
-        if (m === '0')
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + m + '.' + (+p + 1);
-        else
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + (+m + 1) + '.0';
-      } else
-        ret = '>=' + M + '.' + m + '.' + p +
-              ' <' + (+M + 1) + '.0.0';
-    }
-
-    debug('caret return', ret);
-    return ret;
-  });
-}
-
-function replaceXRanges(comp, loose) {
-  debug('replaceXRanges', comp, loose);
-  return comp.split(/\s+/).map(function(comp) {
-    return replaceXRange(comp, loose);
-  }).join(' ');
-}
-
-function replaceXRange(comp, loose) {
-  comp = comp.trim();
-  var r = loose ? re[XRANGELOOSE] : re[XRANGE];
-  return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
-    debug('xRange', comp, ret, gtlt, M, m, p, pr);
-    var xM = isX(M);
-    var xm = xM || isX(m);
-    var xp = xm || isX(p);
-    var anyX = xp;
-
-    if (gtlt === '=' && anyX)
-      gtlt = '';
-
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0';
-      } else {
-        // nothing is forbidden
-        ret = '*';
-      }
-    } else if (gtlt && anyX) {
-      // replace X with 0
-      if (xm)
-        m = 0;
-      if (xp)
-        p = 0;
-
-      if (gtlt === '>') {
-        // >1 => >=2.0.0
-        // >1.2 => >=1.3.0
-        // >1.2.3 => >= 1.2.4
-        gtlt = '>=';
-        if (xm) {
-          M = +M + 1;
-          m = 0;
-          p = 0;
-        } else if (xp) {
-          m = +m + 1;
-          p = 0;
-        }
-      } else if (gtlt === '<=') {
-        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-        gtlt = '<';
-        if (xm)
-          M = +M + 1;
-        else
-          m = +m + 1;
-      }
-
-      ret = gtlt + M + '.' + m + '.' + p;
-    } else if (xm) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-    }
-
-    debug('xRange return', ret);
-
-    return ret;
-  });
-}
-
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars(comp, loose) {
-  debug('replaceStars', comp, loose);
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[STAR], '');
-}
-
-// This function is passed to string.replace(re[HYPHENRANGE])
-// M, m, patch, prerelease, build
-// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
-// 1.2 - 3.4 => >=1.2.0 <3.5.0
-function hyphenReplace($0,
-                       from, fM, fm, fp, fpr, fb,
-                       to, tM, tm, tp, tpr, tb) {
-
-  if (isX(fM))
-    from = '';
-  else if (isX(fm))
-    from = '>=' + fM + '.0.0';
-  else if (isX(fp))
-    from = '>=' + fM + '.' + fm + '.0';
-  else
-    from = '>=' + from;
-
-  if (isX(tM))
-    to = '';
-  else if (isX(tm))
-    to = '<' + (+tM + 1) + '.0.0';
-  else if (isX(tp))
-    to = '<' + tM + '.' + (+tm + 1) + '.0';
-  else if (tpr)
-    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
-  else
-    to = '<=' + to;
-
-  return (from + ' ' + to).trim();
-}
-
-
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function(version) {
-  if (!version)
-    return false;
-
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
-
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version))
-      return true;
-  }
-  return false;
-};
-
-function testSet(set, version) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version))
-      return false;
-  }
-
-  if (version.prerelease.length) {
-    // Find the set of versions that are allowed to have prereleases
-    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-    // That should allow `1.2.3-pr.2` to pass.
-    // However, `1.2.4-alpha.notready` should NOT be allowed,
-    // even though it's within the range set by the comparators.
-    for (var i = 0; i < set.length; i++) {
-      debug(set[i].semver);
-      if (set[i].semver === ANY)
-        continue;
-
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver;
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch)
-          return true;
-      }
-    }
-
-    // Version has a -pre, but it's not one of the ones we like.
-    return false;
-  }
-
-  return true;
-}
-
-exports.satisfies = satisfies;
-function satisfies(version, range, loose) {
-  try {
-    range = new Range(range, loose);
-  } catch (er) {
-    return false;
-  }
-  return range.test(version);
-}
-
-exports.maxSatisfying = maxSatisfying;
-function maxSatisfying(versions, range, loose) {
-  var max = null;
-  var maxSV = null;
-  try {
-    var rangeObj = new Range(range, loose);
-  } catch (er) {
-    return null;
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) { // satisfies(v, range, loose)
-      if (!max || maxSV.compare(v) === -1) { // compare(max, v, true)
-        max = v;
-        maxSV = new SemVer(max, loose);
-      }
-    }
-  })
-  return max;
-}
-
-exports.minSatisfying = minSatisfying;
-function minSatisfying(versions, range, loose) {
-  var min = null;
-  var minSV = null;
-  try {
-    var rangeObj = new Range(range, loose);
-  } catch (er) {
-    return null;
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) { // satisfies(v, range, loose)
-      if (!min || minSV.compare(v) === 1) { // compare(min, v, true)
-        min = v;
-        minSV = new SemVer(min, loose);
-      }
-    }
-  })
-  return min;
-}
-
-exports.validRange = validRange;
-function validRange(range, loose) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, loose).range || '*';
-  } catch (er) {
-    return null;
-  }
-}
-
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr;
-function ltr(version, range, loose) {
-  return outside(version, range, '<', loose);
-}
-
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr;
-function gtr(version, range, loose) {
-  return outside(version, range, '>', loose);
-}
-
-exports.outside = outside;
-function outside(version, range, hilo, loose) {
-  version = new SemVer(version, loose);
-  range = new Range(range, loose);
-
-  var gtfn, ltefn, ltfn, comp, ecomp;
-  switch (hilo) {
-    case '>':
-      gtfn = gt;
-      ltefn = lte;
-      ltfn = lt;
-      comp = '>';
-      ecomp = '>=';
-      break;
-    case '<':
-      gtfn = lt;
-      ltefn = gte;
-      ltfn = gt;
-      comp = '<';
-      ecomp = '<=';
-      break;
-    default:
-      throw new TypeError('Must provide a hilo val of "<" or ">"');
-  }
-
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, loose)) {
-    return false;
-  }
-
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
-
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i];
-
-    var high = null;
-    var low = null;
-
-    comparators.forEach(function(comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
-      }
-      high = high || comparator;
-      low = low || comparator;
-      if (gtfn(comparator.semver, high.semver, loose)) {
-        high = comparator;
-      } else if (ltfn(comparator.semver, low.semver, loose)) {
-        low = comparator;
-      }
-    });
-
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false;
-    }
-
-    // If the lowest version comparator has an operator and our version
-    // is less than it then it isn't higher than the range
-    if ((!low.operator || low.operator === comp) &&
-        ltefn(version, low.semver)) {
-      return false;
-    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-exports.prerelease = prerelease;
-function prerelease(version, loose) {
-  var parsed = parse(version, loose);
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null;
-}
-
-exports.intersects = intersects;
-function intersects(r1, r2, loose) {
-  r1 = new Range(r1, loose)
-  r2 = new Range(r2, loose)
-  return r1.intersects(r2)
-}
-
-exports.coerce = coerce;
-function coerce(version) {
-  if (version instanceof SemVer)
-    return version;
-
-  if (typeof version !== 'string')
-    return null;
-
-  var match = version.match(re[COERCE]);
-
-  if (match == null)
-    return null;
-
-  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0')); 
-}
-
-
-/***/ }),
-/* 22 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-exports.__esModule = true;
-
-var _assign = __webpack_require__(591);
-
-var _assign2 = _interopRequireDefault(_assign);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = _assign2.default || function (target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i];
-
-    for (var key in source) {
-      if (Object.prototype.hasOwnProperty.call(source, key)) {
-        target[key] = source[key];
-      }
-    }
-  }
-
-  return target;
-};
-
-/***/ }),
-/* 23 */
-/***/ (function(module, exports) {
-
-module.exports = require("stream");
-
-/***/ }),
-/* 24 */
-/***/ (function(module, exports) {
-
-module.exports = require("url");
-
-/***/ }),
-/* 25 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscription; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(444);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(441);
-/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */
-
-
-
-
-
-
-var Subscription = /*@__PURE__*/ (function () {
-    function Subscription(unsubscribe) {
-        this.closed = false;
-        this._parent = null;
-        this._parents = null;
-        this._subscriptions = null;
-        if (unsubscribe) {
-            this._unsubscribe = unsubscribe;
-        }
-    }
-    Subscription.prototype.unsubscribe = function () {
-        var hasErrors = false;
-        var errors;
-        if (this.closed) {
-            return;
-        }
-        var _a = this, _parent = _a._parent, _parents = _a._parents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
-        this.closed = true;
-        this._parent = null;
-        this._parents = null;
-        this._subscriptions = null;
-        var index = -1;
-        var len = _parents ? _parents.length : 0;
-        while (_parent) {
-            _parent.remove(this);
-            _parent = ++index < len && _parents[index] || null;
-        }
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(_unsubscribe)) {
-            var trial = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(_unsubscribe).call(this);
-            if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) {
-                hasErrors = true;
-                errors = errors || (__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */] ?
-                    flattenUnsubscriptionErrors(__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e.errors) : [__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e]);
-            }
-        }
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(_subscriptions)) {
-            index = -1;
-            len = _subscriptions.length;
-            while (++index < len) {
-                var sub = _subscriptions[index];
-                if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isObject__["a" /* isObject */])(sub)) {
-                    var trial = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(sub.unsubscribe).call(sub);
-                    if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) {
-                        hasErrors = true;
-                        errors = errors || [];
-                        var err = __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e;
-                        if (err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) {
-                            errors = errors.concat(flattenUnsubscriptionErrors(err.errors));
-                        }
-                        else {
-                            errors.push(err);
-                        }
-                    }
-                }
-            }
-        }
-        if (hasErrors) {
-            throw new __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */](errors);
-        }
-    };
-    Subscription.prototype.add = function (teardown) {
-        if (!teardown || (teardown === Subscription.EMPTY)) {
-            return Subscription.EMPTY;
-        }
-        if (teardown === this) {
-            return this;
-        }
-        var subscription = teardown;
-        switch (typeof teardown) {
-            case 'function':
-                subscription = new Subscription(teardown);
-            case 'object':
-                if (subscription.closed || typeof subscription.unsubscribe !== 'function') {
-                    return subscription;
-                }
-                else if (this.closed) {
-                    subscription.unsubscribe();
-                    return subscription;
-                }
-                else if (typeof subscription._addParent !== 'function') {
-                    var tmp = subscription;
-                    subscription = new Subscription();
-                    subscription._subscriptions = [tmp];
-                }
-                break;
-            default:
-                throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.');
-        }
-        var subscriptions = this._subscriptions || (this._subscriptions = []);
-        subscriptions.push(subscription);
-        subscription._addParent(this);
-        return subscription;
-    };
-    Subscription.prototype.remove = function (subscription) {
-        var subscriptions = this._subscriptions;
-        if (subscriptions) {
-            var subscriptionIndex = subscriptions.indexOf(subscription);
-            if (subscriptionIndex !== -1) {
-                subscriptions.splice(subscriptionIndex, 1);
-            }
-        }
-    };
-    Subscription.prototype._addParent = function (parent) {
-        var _a = this, _parent = _a._parent, _parents = _a._parents;
-        if (!_parent || _parent === parent) {
-            this._parent = parent;
-        }
-        else if (!_parents) {
-            this._parents = [parent];
-        }
-        else if (_parents.indexOf(parent) === -1) {
-            _parents.push(parent);
-        }
-    };
-    Subscription.EMPTY = (function (empty) {
-        empty.closed = true;
-        return empty;
-    }(new Subscription()));
-    return Subscription;
-}());
-
-function flattenUnsubscriptionErrors(errors) {
-    return errors.reduce(function (errs, err) { return errs.concat((err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) ? err.errors : err); }, []);
-}
-//# sourceMappingURL=Subscription.js.map
-
-
-/***/ }),
-/* 26 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	bufferSplit: bufferSplit,
-	addRSAMissing: addRSAMissing,
-	calculateDSAPublic: calculateDSAPublic,
-	calculateED25519Public: calculateED25519Public,
-	calculateX25519Public: calculateX25519Public,
-	mpNormalize: mpNormalize,
-	mpDenormalize: mpDenormalize,
-	ecNormalize: ecNormalize,
-	countZeros: countZeros,
-	assertCompatible: assertCompatible,
-	isCompatible: isCompatible,
-	opensslKeyDeriv: opensslKeyDeriv,
-	opensshCipherInfo: opensshCipherInfo,
-	publicFromPrivateECDSA: publicFromPrivateECDSA,
-	zeroPadToLength: zeroPadToLength,
-	writeBitString: writeBitString,
-	readBitString: readBitString
-};
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var PrivateKey = __webpack_require__(33);
-var Key = __webpack_require__(27);
-var crypto = __webpack_require__(12);
-var algs = __webpack_require__(32);
-var asn1 = __webpack_require__(65);
-
-var ec, jsbn;
-var nacl;
-
-var MAX_CLASS_DEPTH = 3;
-
-function isCompatible(obj, klass, needVer) {
-	if (obj === null || typeof (obj) !== 'object')
-		return (false);
-	if (needVer === undefined)
-		needVer = klass.prototype._sshpkApiVersion;
-	if (obj instanceof klass &&
-	    klass.prototype._sshpkApiVersion[0] == needVer[0])
-		return (true);
-	var proto = Object.getPrototypeOf(obj);
-	var depth = 0;
-	while (proto.constructor.name !== klass.name) {
-		proto = Object.getPrototypeOf(proto);
-		if (!proto || ++depth > MAX_CLASS_DEPTH)
-			return (false);
-	}
-	if (proto.constructor.name !== klass.name)
-		return (false);
-	var ver = proto._sshpkApiVersion;
-	if (ver === undefined)
-		ver = klass._oldVersionDetect(obj);
-	if (ver[0] != needVer[0] || ver[1] < needVer[1])
-		return (false);
-	return (true);
-}
-
-function assertCompatible(obj, klass, needVer, name) {
-	if (name === undefined)
-		name = 'object';
-	assert.ok(obj, name + ' must not be null');
-	assert.object(obj, name + ' must be an object');
-	if (needVer === undefined)
-		needVer = klass.prototype._sshpkApiVersion;
-	if (obj instanceof klass &&
-	    klass.prototype._sshpkApiVersion[0] == needVer[0])
-		return;
-	var proto = Object.getPrototypeOf(obj);
-	var depth = 0;
-	while (proto.constructor.name !== klass.name) {
-		proto = Object.getPrototypeOf(proto);
-		assert.ok(proto && ++depth <= MAX_CLASS_DEPTH,
-		    name + ' must be a ' + klass.name + ' instance');
-	}
-	assert.strictEqual(proto.constructor.name, klass.name,
-	    name + ' must be a ' + klass.name + ' instance');
-	var ver = proto._sshpkApiVersion;
-	if (ver === undefined)
-		ver = klass._oldVersionDetect(obj);
-	assert.ok(ver[0] == needVer[0] && ver[1] >= needVer[1],
-	    name + ' must be compatible with ' + klass.name + ' klass ' +
-	    'version ' + needVer[0] + '.' + needVer[1]);
-}
-
-var CIPHER_LEN = {
-	'des-ede3-cbc': { key: 7, iv: 8 },
-	'aes-128-cbc': { key: 16, iv: 16 }
-};
-var PKCS5_SALT_LEN = 8;
-
-function opensslKeyDeriv(cipher, salt, passphrase, count) {
-	assert.buffer(salt, 'salt');
-	assert.buffer(passphrase, 'passphrase');
-	assert.number(count, 'iteration count');
-
-	var clen = CIPHER_LEN[cipher];
-	assert.object(clen, 'supported cipher');
-
-	salt = salt.slice(0, PKCS5_SALT_LEN);
-
-	var D, D_prev, bufs;
-	var material = Buffer.alloc(0);
-	while (material.length < clen.key + clen.iv) {
-		bufs = [];
-		if (D_prev)
-			bufs.push(D_prev);
-		bufs.push(passphrase);
-		bufs.push(salt);
-		D = Buffer.concat(bufs);
-		for (var j = 0; j < count; ++j)
-			D = crypto.createHash('md5').update(D).digest();
-		material = Buffer.concat([material, D]);
-		D_prev = D;
-	}
-
-	return ({
-	    key: material.slice(0, clen.key),
-	    iv: material.slice(clen.key, clen.key + clen.iv)
-	});
-}
-
-/* Count leading zero bits on a buffer */
-function countZeros(buf) {
-	var o = 0, obit = 8;
-	while (o < buf.length) {
-		var mask = (1 << obit);
-		if ((buf[o] & mask) === mask)
-			break;
-		obit--;
-		if (obit < 0) {
-			o++;
-			obit = 8;
-		}
-	}
-	return (o*8 + (8 - obit) - 1);
-}
-
-function bufferSplit(buf, chr) {
-	assert.buffer(buf);
-	assert.string(chr);
-
-	var parts = [];
-	var lastPart = 0;
-	var matches = 0;
-	for (var i = 0; i < buf.length; ++i) {
-		if (buf[i] === chr.charCodeAt(matches))
-			++matches;
-		else if (buf[i] === chr.charCodeAt(0))
-			matches = 1;
-		else
-			matches = 0;
-
-		if (matches >= chr.length) {
-			var newPart = i + 1;
-			parts.push(buf.slice(lastPart, newPart - matches));
-			lastPart = newPart;
-			matches = 0;
-		}
-	}
-	if (lastPart <= buf.length)
-		parts.push(buf.slice(lastPart, buf.length));
-
-	return (parts);
-}
-
-function ecNormalize(buf, addZero) {
-	assert.buffer(buf);
-	if (buf[0] === 0x00 && buf[1] === 0x04) {
-		if (addZero)
-			return (buf);
-		return (buf.slice(1));
-	} else if (buf[0] === 0x04) {
-		if (!addZero)
-			return (buf);
-	} else {
-		while (buf[0] === 0x00)
-			buf = buf.slice(1);
-		if (buf[0] === 0x02 || buf[0] === 0x03)
-			throw (new Error('Compressed elliptic curve points ' +
-			    'are not supported'));
-		if (buf[0] !== 0x04)
-			throw (new Error('Not a valid elliptic curve point'));
-		if (!addZero)
-			return (buf);
-	}
-	var b = Buffer.alloc(buf.length + 1);
-	b[0] = 0x0;
-	buf.copy(b, 1);
-	return (b);
-}
-
-function readBitString(der, tag) {
-	if (tag === undefined)
-		tag = asn1.Ber.BitString;
-	var buf = der.readString(tag, true);
-	assert.strictEqual(buf[0], 0x00, 'bit strings with unused bits are ' +
-	    'not supported (0x' + buf[0].toString(16) + ')');
-	return (buf.slice(1));
-}
-
-function writeBitString(der, buf, tag) {
-	if (tag === undefined)
-		tag = asn1.Ber.BitString;
-	var b = Buffer.alloc(buf.length + 1);
-	b[0] = 0x00;
-	buf.copy(b, 1);
-	der.writeBuffer(b, tag);
-}
-
-function mpNormalize(buf) {
-	assert.buffer(buf);
-	while (buf.length > 1 && buf[0] === 0x00 && (buf[1] & 0x80) === 0x00)
-		buf = buf.slice(1);
-	if ((buf[0] & 0x80) === 0x80) {
-		var b = Buffer.alloc(buf.length + 1);
-		b[0] = 0x00;
-		buf.copy(b, 1);
-		buf = b;
-	}
-	return (buf);
-}
-
-function mpDenormalize(buf) {
-	assert.buffer(buf);
-	while (buf.length > 1 && buf[0] === 0x00)
-		buf = buf.slice(1);
-	return (buf);
-}
-
-function zeroPadToLength(buf, len) {
-	assert.buffer(buf);
-	assert.number(len);
-	while (buf.length > len) {
-		assert.equal(buf[0], 0x00);
-		buf = buf.slice(1);
-	}
-	while (buf.length < len) {
-		var b = Buffer.alloc(buf.length + 1);
-		b[0] = 0x00;
-		buf.copy(b, 1);
-		buf = b;
-	}
-	return (buf);
-}
-
-function bigintToMpBuf(bigint) {
-	var buf = Buffer.from(bigint.toByteArray());
-	buf = mpNormalize(buf);
-	return (buf);
-}
-
-function calculateDSAPublic(g, p, x) {
-	assert.buffer(g);
-	assert.buffer(p);
-	assert.buffer(x);
-	try {
-		var bigInt = __webpack_require__(81).BigInteger;
-	} catch (e) {
-		throw (new Error('To load a PKCS#8 format DSA private key, ' +
-		    'the node jsbn library is required.'));
-	}
-	g = new bigInt(g);
-	p = new bigInt(p);
-	x = new bigInt(x);
-	var y = g.modPow(x, p);
-	var ybuf = bigintToMpBuf(y);
-	return (ybuf);
-}
-
-function calculateED25519Public(k) {
-	assert.buffer(k);
-
-	if (nacl === undefined)
-		nacl = __webpack_require__(75);
-
-	var kp = nacl.sign.keyPair.fromSeed(new Uint8Array(k));
-	return (Buffer.from(kp.publicKey));
-}
-
-function calculateX25519Public(k) {
-	assert.buffer(k);
-
-	if (nacl === undefined)
-		nacl = __webpack_require__(75);
-
-	var kp = nacl.box.keyPair.fromSeed(new Uint8Array(k));
-	return (Buffer.from(kp.publicKey));
-}
-
-function addRSAMissing(key) {
-	assert.object(key);
-	assertCompatible(key, PrivateKey, [1, 1]);
-	try {
-		var bigInt = __webpack_require__(81).BigInteger;
-	} catch (e) {
-		throw (new Error('To write a PEM private key from ' +
-		    'this source, the node jsbn lib is required.'));
-	}
-
-	var d = new bigInt(key.part.d.data);
-	var buf;
-
-	if (!key.part.dmodp) {
-		var p = new bigInt(key.part.p.data);
-		var dmodp = d.mod(p.subtract(1));
-
-		buf = bigintToMpBuf(dmodp);
-		key.part.dmodp = {name: 'dmodp', data: buf};
-		key.parts.push(key.part.dmodp);
-	}
-	if (!key.part.dmodq) {
-		var q = new bigInt(key.part.q.data);
-		var dmodq = d.mod(q.subtract(1));
-
-		buf = bigintToMpBuf(dmodq);
-		key.part.dmodq = {name: 'dmodq', data: buf};
-		key.parts.push(key.part.dmodq);
-	}
-}
-
-function publicFromPrivateECDSA(curveName, priv) {
-	assert.string(curveName, 'curveName');
-	assert.buffer(priv);
-	if (ec === undefined)
-		ec = __webpack_require__(139);
-	if (jsbn === undefined)
-		jsbn = __webpack_require__(81).BigInteger;
-	var params = algs.curves[curveName];
-	var p = new jsbn(params.p);
-	var a = new jsbn(params.a);
-	var b = new jsbn(params.b);
-	var curve = new ec.ECCurveFp(p, a, b);
-	var G = curve.decodePointHex(params.G.toString('hex'));
-
-	var d = new jsbn(mpNormalize(priv));
-	var pub = G.multiply(d);
-	pub = Buffer.from(curve.encodePointHex(pub), 'hex');
-
-	var parts = [];
-	parts.push({name: 'curve', data: Buffer.from(curveName)});
-	parts.push({name: 'Q', data: pub});
-
-	var key = new Key({type: 'ecdsa', curve: curve, parts: parts});
-	return (key);
-}
-
-function opensshCipherInfo(cipher) {
-	var inf = {};
-	switch (cipher) {
-	case '3des-cbc':
-		inf.keySize = 24;
-		inf.blockSize = 8;
-		inf.opensslName = 'des-ede3-cbc';
-		break;
-	case 'blowfish-cbc':
-		inf.keySize = 16;
-		inf.blockSize = 8;
-		inf.opensslName = 'bf-cbc';
-		break;
-	case 'aes128-cbc':
-	case 'aes128-ctr':
-	case 'aes128-gcm@openssh.com':
-		inf.keySize = 16;
-		inf.blockSize = 16;
-		inf.opensslName = 'aes-128-' + cipher.slice(7, 10);
-		break;
-	case 'aes192-cbc':
-	case 'aes192-ctr':
-	case 'aes192-gcm@openssh.com':
-		inf.keySize = 24;
-		inf.blockSize = 16;
-		inf.opensslName = 'aes-192-' + cipher.slice(7, 10);
-		break;
-	case 'aes256-cbc':
-	case 'aes256-ctr':
-	case 'aes256-gcm@openssh.com':
-		inf.keySize = 32;
-		inf.blockSize = 16;
-		inf.opensslName = 'aes-256-' + cipher.slice(7, 10);
-		break;
-	default:
-		throw (new Error(
-		    'Unsupported openssl cipher "' + cipher + '"'));
-	}
-	return (inf);
-}
-
-
-/***/ }),
-/* 27 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = Key;
-
-var assert = __webpack_require__(16);
-var algs = __webpack_require__(32);
-var crypto = __webpack_require__(12);
-var Fingerprint = __webpack_require__(156);
-var Signature = __webpack_require__(74);
-var DiffieHellman = __webpack_require__(325).DiffieHellman;
-var errs = __webpack_require__(73);
-var utils = __webpack_require__(26);
-var PrivateKey = __webpack_require__(33);
-var edCompat;
-
-try {
-	edCompat = __webpack_require__(454);
-} catch (e) {
-	/* Just continue through, and bail out if we try to use it. */
-}
-
-var InvalidAlgorithmError = errs.InvalidAlgorithmError;
-var KeyParseError = errs.KeyParseError;
-
-var formats = {};
-formats['auto'] = __webpack_require__(455);
-formats['pem'] = __webpack_require__(86);
-formats['pkcs1'] = __webpack_require__(327);
-formats['pkcs8'] = __webpack_require__(157);
-formats['rfc4253'] = __webpack_require__(103);
-formats['ssh'] = __webpack_require__(456);
-formats['ssh-private'] = __webpack_require__(192);
-formats['openssh'] = formats['ssh-private'];
-formats['dnssec'] = __webpack_require__(326);
-
-function Key(opts) {
-	assert.object(opts, 'options');
-	assert.arrayOfObject(opts.parts, 'options.parts');
-	assert.string(opts.type, 'options.type');
-	assert.optionalString(opts.comment, 'options.comment');
-
-	var algInfo = algs.info[opts.type];
-	if (typeof (algInfo) !== 'object')
-		throw (new InvalidAlgorithmError(opts.type));
-
-	var partLookup = {};
-	for (var i = 0; i < opts.parts.length; ++i) {
-		var part = opts.parts[i];
-		partLookup[part.name] = part;
-	}
-
-	this.type = opts.type;
-	this.parts = opts.parts;
-	this.part = partLookup;
-	this.comment = undefined;
-	this.source = opts.source;
-
-	/* for speeding up hashing/fingerprint operations */
-	this._rfc4253Cache = opts._rfc4253Cache;
-	this._hashCache = {};
-
-	var sz;
-	this.curve = undefined;
-	if (this.type === 'ecdsa') {
-		var curve = this.part.curve.data.toString();
-		this.curve = curve;
-		sz = algs.curves[curve].size;
-	} else if (this.type === 'ed25519' || this.type === 'curve25519') {
-		sz = 256;
-		this.curve = 'curve25519';
-	} else {
-		var szPart = this.part[algInfo.sizePart];
-		sz = szPart.data.length;
-		sz = sz * 8 - utils.countZeros(szPart.data);
-	}
-	this.size = sz;
-}
-
-Key.formats = formats;
-
-Key.prototype.toBuffer = function (format, options) {
-	if (format === undefined)
-		format = 'ssh';
-	assert.string(format, 'format');
-	assert.object(formats[format], 'formats[format]');
-	assert.optionalObject(options, 'options');
-
-	if (format === 'rfc4253') {
-		if (this._rfc4253Cache === undefined)
-			this._rfc4253Cache = formats['rfc4253'].write(this);
-		return (this._rfc4253Cache);
-	}
-
-	return (formats[format].write(this, options));
-};
-
-Key.prototype.toString = function (format, options) {
-	return (this.toBuffer(format, options).toString());
-};
-
-Key.prototype.hash = function (algo) {
-	assert.string(algo, 'algorithm');
-	algo = algo.toLowerCase();
-	if (algs.hashAlgs[algo] === undefined)
-		throw (new InvalidAlgorithmError(algo));
-
-	if (this._hashCache[algo])
-		return (this._hashCache[algo]);
-	var hash = crypto.createHash(algo).
-	    update(this.toBuffer('rfc4253')).digest();
-	this._hashCache[algo] = hash;
-	return (hash);
-};
-
-Key.prototype.fingerprint = function (algo) {
-	if (algo === undefined)
-		algo = 'sha256';
-	assert.string(algo, 'algorithm');
-	var opts = {
-		type: 'key',
-		hash: this.hash(algo),
-		algorithm: algo
-	};
-	return (new Fingerprint(opts));
-};
-
-Key.prototype.defaultHashAlgorithm = function () {
-	var hashAlgo = 'sha1';
-	if (this.type === 'rsa')
-		hashAlgo = 'sha256';
-	if (this.type === 'dsa' && this.size > 1024)
-		hashAlgo = 'sha256';
-	if (this.type === 'ed25519')
-		hashAlgo = 'sha512';
-	if (this.type === 'ecdsa') {
-		if (this.size <= 256)
-			hashAlgo = 'sha256';
-		else if (this.size <= 384)
-			hashAlgo = 'sha384';
-		else
-			hashAlgo = 'sha512';
-	}
-	return (hashAlgo);
-};
-
-Key.prototype.createVerify = function (hashAlgo) {
-	if (hashAlgo === undefined)
-		hashAlgo = this.defaultHashAlgorithm();
-	assert.string(hashAlgo, 'hash algorithm');
-
-	/* ED25519 is not supported by OpenSSL, use a javascript impl. */
-	if (this.type === 'ed25519' && edCompat !== undefined)
-		return (new edCompat.Verifier(this, hashAlgo));
-	if (this.type === 'curve25519')
-		throw (new Error('Curve25519 keys are not suitable for ' +
-		    'signing or verification'));
-
-	var v, nm, err;
-	try {
-		nm = hashAlgo.toUpperCase();
-		v = crypto.createVerify(nm);
-	} catch (e) {
-		err = e;
-	}
-	if (v === undefined || (err instanceof Error &&
-	    err.message.match(/Unknown message digest/))) {
-		nm = 'RSA-';
-		nm += hashAlgo.toUpperCase();
-		v = crypto.createVerify(nm);
-	}
-	assert.ok(v, 'failed to create verifier');
-	var oldVerify = v.verify.bind(v);
-	var key = this.toBuffer('pkcs8');
-	var curve = this.curve;
-	var self = this;
-	v.verify = function (signature, fmt) {
-		if (Signature.isSignature(signature, [2, 0])) {
-			if (signature.type !== self.type)
-				return (false);
-			if (signature.hashAlgorithm &&
-			    signature.hashAlgorithm !== hashAlgo)
-				return (false);
-			if (signature.curve && self.type === 'ecdsa' &&
-			    signature.curve !== curve)
-				return (false);
-			return (oldVerify(key, signature.toBuffer('asn1')));
-
-		} else if (typeof (signature) === 'string' ||
-		    Buffer.isBuffer(signature)) {
-			return (oldVerify(key, signature, fmt));
-
-		/*
-		 * Avoid doing this on valid arguments, walking the prototype
-		 * chain can be quite slow.
-		 */
-		} else if (Signature.isSignature(signature, [1, 0])) {
-			throw (new Error('signature was created by too old ' +
-			    'a version of sshpk and cannot be verified'));
-
-		} else {
-			throw (new TypeError('signature must be a string, ' +
-			    'Buffer, or Signature object'));
-		}
-	};
-	return (v);
-};
-
-Key.prototype.createDiffieHellman = function () {
-	if (this.type === 'rsa')
-		throw (new Error('RSA keys do not support Diffie-Hellman'));
-
-	return (new DiffieHellman(this));
-};
-Key.prototype.createDH = Key.prototype.createDiffieHellman;
-
-Key.parse = function (data, format, options) {
-	if (typeof (data) !== 'string')
-		assert.buffer(data, 'data');
-	if (format === undefined)
-		format = 'auto';
-	assert.string(format, 'format');
-	if (typeof (options) === 'string')
-		options = { filename: options };
-	assert.optionalObject(options, 'options');
-	if (options === undefined)
-		options = {};
-	assert.optionalString(options.filename, 'options.filename');
-	if (options.filename === undefined)
-		options.filename = '(unnamed)';
-
-	assert.object(formats[format], 'formats[format]');
-
-	try {
-		var k = formats[format].read(data, options);
-		if (k instanceof PrivateKey)
-			k = k.toPublic();
-		if (!k.comment)
-			k.comment = options.filename;
-		return (k);
-	} catch (e) {
-		if (e.name === 'KeyEncryptedError')
-			throw (e);
-		throw (new KeyParseError(options.filename, format, e));
-	}
-};
-
-Key.isKey = function (obj, ver) {
-	return (utils.isCompatible(obj, Key, ver));
-};
-
-/*
- * API versions for Key:
- * [1,0] -- initial ver, may take Signature for createVerify or may not
- * [1,1] -- added pkcs1, pkcs8 formats
- * [1,2] -- added auto, ssh-private, openssh formats
- * [1,3] -- added defaultHashAlgorithm
- * [1,4] -- added ed support, createDH
- * [1,5] -- first explicitly tagged version
- * [1,6] -- changed ed25519 part names
- */
-Key.prototype._sshpkApiVersion = [1, 6];
-
-Key._oldVersionDetect = function (obj) {
-	assert.func(obj.toBuffer);
-	assert.func(obj.fingerprint);
-	if (obj.createDH)
-		return ([1, 4]);
-	if (obj.defaultHashAlgorithm)
-		return ([1, 3]);
-	if (obj.formats['auto'])
-		return ([1, 2]);
-	if (obj.formats['pkcs1'])
-		return ([1, 1]);
-	return ([1, 0]);
-};
-
-
-/***/ }),
-/* 28 */
-/***/ (function(module, exports) {
-
-module.exports = require("assert");
-
-/***/ }),
-/* 29 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = nullify;
-function nullify(obj = {}) {
-  if (Array.isArray(obj)) {
-    for (var _iterator = obj, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const item = _ref;
-
-      nullify(item);
-    }
-  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
-    Object.setPrototypeOf(obj, null);
-
-    // for..in can only be applied to 'object', not 'function'
-    if (typeof obj === 'object') {
-      for (const key in obj) {
-        nullify(obj[key]);
-      }
-    }
-  }
-
-  return obj;
-}
-
-/***/ }),
-/* 30 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const escapeStringRegexp = __webpack_require__(388);
-const ansiStyles = __webpack_require__(506);
-const stdoutColor = __webpack_require__(598).stdout;
-
-const template = __webpack_require__(599);
-
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
-
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
-
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
-
-const styles = Object.create(null);
-
-function applyOptions(obj, options) {
-	options = options || {};
-
-	// Detect level if not set manually
-	const scLevel = stdoutColor ? stdoutColor.level : 0;
-	obj.level = options.level === undefined ? scLevel : options.level;
-	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
-}
-
-function Chalk(options) {
-	// We check for this.template here since calling `chalk.constructor()`
-	// by itself will have a `this` of a previously constructed chalk object
-	if (!this || !(this instanceof Chalk) || this.template) {
-		const chalk = {};
-		applyOptions(chalk, options);
-
-		chalk.template = function () {
-			const args = [].slice.call(arguments);
-			return chalkTag.apply(null, [chalk.template].concat(args));
-		};
-
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
-
-		chalk.template.constructor = Chalk;
-
-		return chalk.template;
-	}
-
-	applyOptions(this, options);
-}
-
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
-
-for (const key of Object.keys(ansiStyles)) {
-	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
-
-	styles[key] = {
-		get() {
-			const codes = ansiStyles[key];
-			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
-		}
-	};
-}
-
-styles.visible = {
-	get() {
-		return build.call(this, this._styles || [], true, 'visible');
-	}
-};
-
-ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
-for (const model of Object.keys(ansiStyles.color.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
-
-	styles[model] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.color.close,
-					closeRe: ansiStyles.color.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
-
-ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
-for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
-
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.bgColor.close,
-					closeRe: ansiStyles.bgColor.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
-
-const proto = Object.defineProperties(() => {}, styles);
-
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
-
-	builder._styles = _styles;
-	builder._empty = _empty;
-
-	const self = this;
-
-	Object.defineProperty(builder, 'level', {
-		enumerable: true,
-		get() {
-			return self.level;
-		},
-		set(level) {
-			self.level = level;
-		}
-	});
-
-	Object.defineProperty(builder, 'enabled', {
-		enumerable: true,
-		get() {
-			return self.enabled;
-		},
-		set(enabled) {
-			self.enabled = enabled;
-		}
-	});
-
-	// See below for fix regarding invisible grey/dim combination on Windows
-	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
-
-	// `__proto__` is used because we must return a function, but there is
-	// no way to create a function with a different prototype
-	builder.__proto__ = proto; // eslint-disable-line no-proto
-
-	return builder;
-}
-
-function applyStyle() {
-	// Support varags, but simply cast to string in case there's only one arg
-	const args = arguments;
-	const argsLen = args.length;
-	let str = String(arguments[0]);
-
-	if (argsLen === 0) {
-		return '';
-	}
-
-	if (argsLen > 1) {
-		// Don't slice `arguments`, it prevents V8 optimizations
-		for (let a = 1; a < argsLen; a++) {
-			str += ' ' + args[a];
-		}
-	}
-
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
-	}
-
-	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
-	// see https://github.com/chalk/chalk/issues/58
-	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
-	const originalDim = ansiStyles.dim.open;
-	if (isSimpleWindowsTerm && this.hasGrey) {
-		ansiStyles.dim.open = '';
-	}
-
-	for (const code of this._styles.slice().reverse()) {
-		// Replace any instances already present with a re-opening code
-		// otherwise only the part of the string until said closing code
-		// will be colored, and the rest will simply be 'plain'.
-		str = code.open + str.replace(code.closeRe, code.open) + code.close;
-
-		// Close the styling before a linebreak and reopen
-		// after next line to fix a bleed issue on macOS
-		// https://github.com/chalk/chalk/pull/92
-		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
-	}
-
-	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	ansiStyles.dim.open = originalDim;
-
-	return str;
-}
-
-function chalkTag(chalk, strings) {
-	if (!Array.isArray(strings)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return [].slice.call(arguments, 1).join(' ');
-	}
-
-	const args = [].slice.call(arguments, 2);
-	const parts = [strings.raw[0]];
-
-	for (let i = 1; i < strings.length; i++) {
-		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
-		parts.push(String(strings.raw[i]));
-	}
-
-	return template(chalk, parts.join(''));
-}
-
-Object.defineProperties(Chalk.prototype, styles);
-
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
-
-
-/***/ }),
-/* 31 */
-/***/ (function(module, exports) {
-
-var core = module.exports = { version: '2.5.7' };
-if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
-
-
-/***/ }),
-/* 32 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-var Buffer = __webpack_require__(15).Buffer;
-
-var algInfo = {
-	'dsa': {
-		parts: ['p', 'q', 'g', 'y'],
-		sizePart: 'p'
-	},
-	'rsa': {
-		parts: ['e', 'n'],
-		sizePart: 'n'
-	},
-	'ecdsa': {
-		parts: ['curve', 'Q'],
-		sizePart: 'Q'
-	},
-	'ed25519': {
-		parts: ['A'],
-		sizePart: 'A'
-	}
-};
-algInfo['curve25519'] = algInfo['ed25519'];
-
-var algPrivInfo = {
-	'dsa': {
-		parts: ['p', 'q', 'g', 'y', 'x']
-	},
-	'rsa': {
-		parts: ['n', 'e', 'd', 'iqmp', 'p', 'q']
-	},
-	'ecdsa': {
-		parts: ['curve', 'Q', 'd']
-	},
-	'ed25519': {
-		parts: ['A', 'k']
-	}
-};
-algPrivInfo['curve25519'] = algPrivInfo['ed25519'];
-
-var hashAlgs = {
-	'md5': true,
-	'sha1': true,
-	'sha256': true,
-	'sha384': true,
-	'sha512': true
-};
-
-/*
- * Taken from
- * http://csrc.nist.gov/groups/ST/toolkit/documents/dss/NISTReCur.pdf
- */
-var curves = {
-	'nistp256': {
-		size: 256,
-		pkcs8oid: '1.2.840.10045.3.1.7',
-		p: Buffer.from(('00' +
-		    'ffffffff 00000001 00000000 00000000' +
-		    '00000000 ffffffff ffffffff ffffffff').
-		    replace(/ /g, ''), 'hex'),
-		a: Buffer.from(('00' +
-		    'FFFFFFFF 00000001 00000000 00000000' +
-		    '00000000 FFFFFFFF FFFFFFFF FFFFFFFC').
-		    replace(/ /g, ''), 'hex'),
-		b: Buffer.from((
-		    '5ac635d8 aa3a93e7 b3ebbd55 769886bc' +
-		    '651d06b0 cc53b0f6 3bce3c3e 27d2604b').
-		    replace(/ /g, ''), 'hex'),
-		s: Buffer.from(('00' +
-		    'c49d3608 86e70493 6a6678e1 139d26b7' +
-		    '819f7e90').
-		    replace(/ /g, ''), 'hex'),
-		n: Buffer.from(('00' +
-		    'ffffffff 00000000 ffffffff ffffffff' +
-		    'bce6faad a7179e84 f3b9cac2 fc632551').
-		    replace(/ /g, ''), 'hex'),
-		G: Buffer.from(('04' +
-		    '6b17d1f2 e12c4247 f8bce6e5 63a440f2' +
-		    '77037d81 2deb33a0 f4a13945 d898c296' +
-		    '4fe342e2 fe1a7f9b 8ee7eb4a 7c0f9e16' +
-		    '2bce3357 6b315ece cbb64068 37bf51f5').
-		    replace(/ /g, ''), 'hex')
-	},
-	'nistp384': {
-		size: 384,
-		pkcs8oid: '1.3.132.0.34',
-		p: Buffer.from(('00' +
-		    'ffffffff ffffffff ffffffff ffffffff' +
-		    'ffffffff ffffffff ffffffff fffffffe' +
-		    'ffffffff 00000000 00000000 ffffffff').
-		    replace(/ /g, ''), 'hex'),
-		a: Buffer.from(('00' +
-		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
-		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE' +
-		    'FFFFFFFF 00000000 00000000 FFFFFFFC').
-		    replace(/ /g, ''), 'hex'),
-		b: Buffer.from((
-		    'b3312fa7 e23ee7e4 988e056b e3f82d19' +
-		    '181d9c6e fe814112 0314088f 5013875a' +
-		    'c656398d 8a2ed19d 2a85c8ed d3ec2aef').
-		    replace(/ /g, ''), 'hex'),
-		s: Buffer.from(('00' +
-		    'a335926a a319a27a 1d00896a 6773a482' +
-		    '7acdac73').
-		    replace(/ /g, ''), 'hex'),
-		n: Buffer.from(('00' +
-		    'ffffffff ffffffff ffffffff ffffffff' +
-		    'ffffffff ffffffff c7634d81 f4372ddf' +
-		    '581a0db2 48b0a77a ecec196a ccc52973').
-		    replace(/ /g, ''), 'hex'),
-		G: Buffer.from(('04' +
-		    'aa87ca22 be8b0537 8eb1c71e f320ad74' +
-		    '6e1d3b62 8ba79b98 59f741e0 82542a38' +
-		    '5502f25d bf55296c 3a545e38 72760ab7' +
-		    '3617de4a 96262c6f 5d9e98bf 9292dc29' +
-		    'f8f41dbd 289a147c e9da3113 b5f0b8c0' +
-		    '0a60b1ce 1d7e819d 7a431d7c 90ea0e5f').
-		    replace(/ /g, ''), 'hex')
-	},
-	'nistp521': {
-		size: 521,
-		pkcs8oid: '1.3.132.0.35',
-		p: Buffer.from((
-		    '01ffffff ffffffff ffffffff ffffffff' +
-		    'ffffffff ffffffff ffffffff ffffffff' +
-		    'ffffffff ffffffff ffffffff ffffffff' +
-		    'ffffffff ffffffff ffffffff ffffffff' +
-		    'ffff').replace(/ /g, ''), 'hex'),
-		a: Buffer.from(('01FF' +
-		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
-		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
-		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF' +
-		    'FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFC').
-		    replace(/ /g, ''), 'hex'),
-		b: Buffer.from(('51' +
-		    '953eb961 8e1c9a1f 929a21a0 b68540ee' +
-		    'a2da725b 99b315f3 b8b48991 8ef109e1' +
-		    '56193951 ec7e937b 1652c0bd 3bb1bf07' +
-		    '3573df88 3d2c34f1 ef451fd4 6b503f00').
-		    replace(/ /g, ''), 'hex'),
-		s: Buffer.from(('00' +
-		    'd09e8800 291cb853 96cc6717 393284aa' +
-		    'a0da64ba').replace(/ /g, ''), 'hex'),
-		n: Buffer.from(('01ff' +
-		    'ffffffff ffffffff ffffffff ffffffff' +
-		    'ffffffff ffffffff ffffffff fffffffa' +
-		    '51868783 bf2f966b 7fcc0148 f709a5d0' +
-		    '3bb5c9b8 899c47ae bb6fb71e 91386409').
-		    replace(/ /g, ''), 'hex'),
-		G: Buffer.from(('04' +
-		    '00c6 858e06b7 0404e9cd 9e3ecb66 2395b442' +
-		         '9c648139 053fb521 f828af60 6b4d3dba' +
-		         'a14b5e77 efe75928 fe1dc127 a2ffa8de' +
-		         '3348b3c1 856a429b f97e7e31 c2e5bd66' +
-		    '0118 39296a78 9a3bc004 5c8a5fb4 2c7d1bd9' +
-		         '98f54449 579b4468 17afbd17 273e662c' +
-		         '97ee7299 5ef42640 c550b901 3fad0761' +
-		         '353c7086 a272c240 88be9476 9fd16650').
-		    replace(/ /g, ''), 'hex')
-	}
-};
-
-module.exports = {
-	info: algInfo,
-	privInfo: algPrivInfo,
-	hashAlgs: hashAlgs,
-	curves: curves
-};
-
-
-/***/ }),
-/* 33 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = PrivateKey;
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var crypto = __webpack_require__(12);
-var Fingerprint = __webpack_require__(156);
-var Signature = __webpack_require__(74);
-var errs = __webpack_require__(73);
-var util = __webpack_require__(3);
-var utils = __webpack_require__(26);
-var dhe = __webpack_require__(325);
-var generateECDSA = dhe.generateECDSA;
-var generateED25519 = dhe.generateED25519;
-var edCompat;
-var nacl;
-
-try {
-	edCompat = __webpack_require__(454);
-} catch (e) {
-	/* Just continue through, and bail out if we try to use it. */
-}
-
-var Key = __webpack_require__(27);
-
-var InvalidAlgorithmError = errs.InvalidAlgorithmError;
-var KeyParseError = errs.KeyParseError;
-var KeyEncryptedError = errs.KeyEncryptedError;
-
-var formats = {};
-formats['auto'] = __webpack_require__(455);
-formats['pem'] = __webpack_require__(86);
-formats['pkcs1'] = __webpack_require__(327);
-formats['pkcs8'] = __webpack_require__(157);
-formats['rfc4253'] = __webpack_require__(103);
-formats['ssh-private'] = __webpack_require__(192);
-formats['openssh'] = formats['ssh-private'];
-formats['ssh'] = formats['ssh-private'];
-formats['dnssec'] = __webpack_require__(326);
-
-function PrivateKey(opts) {
-	assert.object(opts, 'options');
-	Key.call(this, opts);
-
-	this._pubCache = undefined;
-}
-util.inherits(PrivateKey, Key);
-
-PrivateKey.formats = formats;
-
-PrivateKey.prototype.toBuffer = function (format, options) {
-	if (format === undefined)
-		format = 'pkcs1';
-	assert.string(format, 'format');
-	assert.object(formats[format], 'formats[format]');
-	assert.optionalObject(options, 'options');
-
-	return (formats[format].write(this, options));
-};
-
-PrivateKey.prototype.hash = function (algo) {
-	return (this.toPublic().hash(algo));
-};
-
-PrivateKey.prototype.toPublic = function () {
-	if (this._pubCache)
-		return (this._pubCache);
-
-	var algInfo = algs.info[this.type];
-	var pubParts = [];
-	for (var i = 0; i < algInfo.parts.length; ++i) {
-		var p = algInfo.parts[i];
-		pubParts.push(this.part[p]);
-	}
-
-	this._pubCache = new Key({
-		type: this.type,
-		source: this,
-		parts: pubParts
-	});
-	if (this.comment)
-		this._pubCache.comment = this.comment;
-	return (this._pubCache);
-};
-
-PrivateKey.prototype.derive = function (newType) {
-	assert.string(newType, 'type');
-	var priv, pub, pair;
-
-	if (this.type === 'ed25519' && newType === 'curve25519') {
-		if (nacl === undefined)
-			nacl = __webpack_require__(75);
-
-		priv = this.part.k.data;
-		if (priv[0] === 0x00)
-			priv = priv.slice(1);
-
-		pair = nacl.box.keyPair.fromSecretKey(new Uint8Array(priv));
-		pub = Buffer.from(pair.publicKey);
-
-		return (new PrivateKey({
-			type: 'curve25519',
-			parts: [
-				{ name: 'A', data: utils.mpNormalize(pub) },
-				{ name: 'k', data: utils.mpNormalize(priv) }
-			]
-		}));
-	} else if (this.type === 'curve25519' && newType === 'ed25519') {
-		if (nacl === undefined)
-			nacl = __webpack_require__(75);
-
-		priv = this.part.k.data;
-		if (priv[0] === 0x00)
-			priv = priv.slice(1);
-
-		pair = nacl.sign.keyPair.fromSeed(new Uint8Array(priv));
-		pub = Buffer.from(pair.publicKey);
-
-		return (new PrivateKey({
-			type: 'ed25519',
-			parts: [
-				{ name: 'A', data: utils.mpNormalize(pub) },
-				{ name: 'k', data: utils.mpNormalize(priv) }
-			]
-		}));
-	}
-	throw (new Error('Key derivation not supported from ' + this.type +
-	    ' to ' + newType));
-};
-
-PrivateKey.prototype.createVerify = function (hashAlgo) {
-	return (this.toPublic().createVerify(hashAlgo));
-};
-
-PrivateKey.prototype.createSign = function (hashAlgo) {
-	if (hashAlgo === undefined)
-		hashAlgo = this.defaultHashAlgorithm();
-	assert.string(hashAlgo, 'hash algorithm');
-
-	/* ED25519 is not supported by OpenSSL, use a javascript impl. */
-	if (this.type === 'ed25519' && edCompat !== undefined)
-		return (new edCompat.Signer(this, hashAlgo));
-	if (this.type === 'curve25519')
-		throw (new Error('Curve25519 keys are not suitable for ' +
-		    'signing or verification'));
-
-	var v, nm, err;
-	try {
-		nm = hashAlgo.toUpperCase();
-		v = crypto.createSign(nm);
-	} catch (e) {
-		err = e;
-	}
-	if (v === undefined || (err instanceof Error &&
-	    err.message.match(/Unknown message digest/))) {
-		nm = 'RSA-';
-		nm += hashAlgo.toUpperCase();
-		v = crypto.createSign(nm);
-	}
-	assert.ok(v, 'failed to create verifier');
-	var oldSign = v.sign.bind(v);
-	var key = this.toBuffer('pkcs1');
-	var type = this.type;
-	var curve = this.curve;
-	v.sign = function () {
-		var sig = oldSign(key);
-		if (typeof (sig) === 'string')
-			sig = Buffer.from(sig, 'binary');
-		sig = Signature.parse(sig, type, 'asn1');
-		sig.hashAlgorithm = hashAlgo;
-		sig.curve = curve;
-		return (sig);
-	};
-	return (v);
-};
-
-PrivateKey.parse = function (data, format, options) {
-	if (typeof (data) !== 'string')
-		assert.buffer(data, 'data');
-	if (format === undefined)
-		format = 'auto';
-	assert.string(format, 'format');
-	if (typeof (options) === 'string')
-		options = { filename: options };
-	assert.optionalObject(options, 'options');
-	if (options === undefined)
-		options = {};
-	assert.optionalString(options.filename, 'options.filename');
-	if (options.filename === undefined)
-		options.filename = '(unnamed)';
-
-	assert.object(formats[format], 'formats[format]');
-
-	try {
-		var k = formats[format].read(data, options);
-		assert.ok(k instanceof PrivateKey, 'key is not a private key');
-		if (!k.comment)
-			k.comment = options.filename;
-		return (k);
-	} catch (e) {
-		if (e.name === 'KeyEncryptedError')
-			throw (e);
-		throw (new KeyParseError(options.filename, format, e));
-	}
-};
-
-PrivateKey.isPrivateKey = function (obj, ver) {
-	return (utils.isCompatible(obj, PrivateKey, ver));
-};
-
-PrivateKey.generate = function (type, options) {
-	if (options === undefined)
-		options = {};
-	assert.object(options, 'options');
-
-	switch (type) {
-	case 'ecdsa':
-		if (options.curve === undefined)
-			options.curve = 'nistp256';
-		assert.string(options.curve, 'options.curve');
-		return (generateECDSA(options.curve));
-	case 'ed25519':
-		return (generateED25519());
-	default:
-		throw (new Error('Key generation not supported with key ' +
-		    'type "' + type + '"'));
-	}
-};
-
-/*
- * API versions for PrivateKey:
- * [1,0] -- initial ver
- * [1,1] -- added auto, pkcs[18], openssh/ssh-private formats
- * [1,2] -- added defaultHashAlgorithm
- * [1,3] -- added derive, ed, createDH
- * [1,4] -- first tagged version
- * [1,5] -- changed ed25519 part names and format
- */
-PrivateKey.prototype._sshpkApiVersion = [1, 5];
-
-PrivateKey._oldVersionDetect = function (obj) {
-	assert.func(obj.toPublic);
-	assert.func(obj.createSign);
-	if (obj.derive)
-		return ([1, 3]);
-	if (obj.defaultHashAlgorithm)
-		return ([1, 2]);
-	if (obj.formats['auto'])
-		return ([1, 1]);
-	return ([1, 0]);
-};
-
-
-/***/ }),
-/* 34 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.wrapLifecycle = exports.run = exports.install = exports.Install = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let install = exports.install = (() => {
-  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, lockfile) {
-    yield wrapLifecycle(config, flags, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const install = new Install(flags, config, reporter, lockfile);
-      yield install.init();
-    }));
-  });
-
-  return function install(_x7, _x8, _x9, _x10) {
-    return _ref29.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    let lockfile;
-    let error = 'installCommandRenamed';
-    if (flags.lockfile === false) {
-      lockfile = new (_lockfile || _load_lockfile()).default();
-    } else {
-      lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-    }
-
-    if (args.length) {
-      const exampleArgs = args.slice();
-
-      if (flags.saveDev) {
-        exampleArgs.push('--dev');
-      }
-      if (flags.savePeer) {
-        exampleArgs.push('--peer');
-      }
-      if (flags.saveOptional) {
-        exampleArgs.push('--optional');
-      }
-      if (flags.saveExact) {
-        exampleArgs.push('--exact');
-      }
-      if (flags.saveTilde) {
-        exampleArgs.push('--tilde');
-      }
-      let command = 'add';
-      if (flags.global) {
-        error = 'globalFlagRemoved';
-        command = 'global add';
-      }
-      throw new (_errors || _load_errors()).MessageError(reporter.lang(error, `yarn ${command} ${exampleArgs.join(' ')}`));
-    }
-
-    yield install(config, reporter, flags, lockfile);
-  });
-
-  return function run(_x11, _x12, _x13, _x14) {
-    return _ref31.apply(this, arguments);
-  };
-})();
-
-let wrapLifecycle = exports.wrapLifecycle = (() => {
-  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags, factory) {
-    yield config.executeLifecycleScript('preinstall');
-
-    yield factory();
-
-    // npm behaviour, seems kinda funky but yay compatibility
-    yield config.executeLifecycleScript('install');
-    yield config.executeLifecycleScript('postinstall');
-
-    if (!config.production) {
-      if (!config.disablePrepublish) {
-        yield config.executeLifecycleScript('prepublish');
-      }
-      yield config.executeLifecycleScript('prepare');
-    }
-  });
-
-  return function wrapLifecycle(_x15, _x16, _x17) {
-    return _ref32.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _objectPath;
-
-function _load_objectPath() {
-  return _objectPath = _interopRequireDefault(__webpack_require__(304));
-}
-
-var _hooks;
-
-function _load_hooks() {
-  return _hooks = __webpack_require__(374);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(220));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _integrityChecker;
-
-function _load_integrityChecker() {
-  return _integrityChecker = _interopRequireDefault(__webpack_require__(208));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _lockfile2;
-
-function _load_lockfile2() {
-  return _lockfile2 = __webpack_require__(19);
-}
-
-var _packageFetcher;
-
-function _load_packageFetcher() {
-  return _packageFetcher = _interopRequireWildcard(__webpack_require__(210));
-}
-
-var _packageInstallScripts;
-
-function _load_packageInstallScripts() {
-  return _packageInstallScripts = _interopRequireDefault(__webpack_require__(557));
-}
-
-var _packageCompatibility;
-
-function _load_packageCompatibility() {
-  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(209));
-}
-
-var _packageResolver;
-
-function _load_packageResolver() {
-  return _packageResolver = _interopRequireDefault(__webpack_require__(366));
-}
-
-var _packageLinker;
-
-function _load_packageLinker() {
-  return _packageLinker = _interopRequireDefault(__webpack_require__(211));
-}
-
-var _index2;
-
-function _load_index2() {
-  return _index2 = __webpack_require__(57);
-}
-
-var _index3;
-
-function _load_index3() {
-  return _index3 = __webpack_require__(78);
-}
-
-var _autoclean;
-
-function _load_autoclean() {
-  return _autoclean = __webpack_require__(354);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _normalizePattern;
-
-function _load_normalizePattern() {
-  return _normalizePattern = __webpack_require__(37);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _yarnVersion;
-
-function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
-}
-
-var _generatePnpMap;
-
-function _load_generatePnpMap() {
-  return _generatePnpMap = __webpack_require__(579);
-}
-
-var _workspaceLayout;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
-}
-
-var _resolutionMap;
-
-function _load_resolutionMap() {
-  return _resolutionMap = _interopRequireDefault(__webpack_require__(214));
-}
-
-var _guessName;
-
-function _load_guessName() {
-  return _guessName = _interopRequireDefault(__webpack_require__(169));
-}
-
-var _audit;
-
-function _load_audit() {
-  return _audit = _interopRequireDefault(__webpack_require__(353));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const deepEqual = __webpack_require__(631);
-
-const emoji = __webpack_require__(302);
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-const semver = __webpack_require__(21);
-const uuid = __webpack_require__(119);
-const ssri = __webpack_require__(77);
-
-const ONE_DAY = 1000 * 60 * 60 * 24;
-
-/**
- * Try and detect the installation method for Yarn and provide a command to update it with.
- */
-
-function getUpdateCommand(installationMethod) {
-  if (installationMethod === 'tar') {
-    return `curl --compressed -o- -L ${(_constants || _load_constants()).YARN_INSTALLER_SH} | bash`;
-  }
-
-  if (installationMethod === 'homebrew') {
-    return 'brew upgrade yarn';
-  }
-
-  if (installationMethod === 'deb') {
-    return 'sudo apt-get update && sudo apt-get install yarn';
-  }
-
-  if (installationMethod === 'rpm') {
-    return 'sudo yum install yarn';
-  }
-
-  if (installationMethod === 'npm') {
-    return 'npm install --global yarn';
-  }
-
-  if (installationMethod === 'chocolatey') {
-    return 'choco upgrade yarn';
-  }
-
-  if (installationMethod === 'apk') {
-    return 'apk update && apk add -u yarn';
-  }
-
-  if (installationMethod === 'portage') {
-    return 'sudo emerge --sync && sudo emerge -au sys-apps/yarn';
-  }
-
-  return null;
-}
-
-function getUpdateInstaller(installationMethod) {
-  // Windows
-  if (installationMethod === 'msi') {
-    return (_constants || _load_constants()).YARN_INSTALLER_MSI;
-  }
-
-  return null;
-}
-
-function normalizeFlags(config, rawFlags) {
-  const flags = {
-    // install
-    har: !!rawFlags.har,
-    ignorePlatform: !!rawFlags.ignorePlatform,
-    ignoreEngines: !!rawFlags.ignoreEngines,
-    ignoreScripts: !!rawFlags.ignoreScripts,
-    ignoreOptional: !!rawFlags.ignoreOptional,
-    force: !!rawFlags.force,
-    flat: !!rawFlags.flat,
-    lockfile: rawFlags.lockfile !== false,
-    pureLockfile: !!rawFlags.pureLockfile,
-    updateChecksums: !!rawFlags.updateChecksums,
-    skipIntegrityCheck: !!rawFlags.skipIntegrityCheck,
-    frozenLockfile: !!rawFlags.frozenLockfile,
-    linkDuplicates: !!rawFlags.linkDuplicates,
-    checkFiles: !!rawFlags.checkFiles,
-    audit: !!rawFlags.audit,
-
-    // add
-    peer: !!rawFlags.peer,
-    dev: !!rawFlags.dev,
-    optional: !!rawFlags.optional,
-    exact: !!rawFlags.exact,
-    tilde: !!rawFlags.tilde,
-    ignoreWorkspaceRootCheck: !!rawFlags.ignoreWorkspaceRootCheck,
-
-    // outdated, update-interactive
-    includeWorkspaceDeps: !!rawFlags.includeWorkspaceDeps,
-
-    // add, remove, update
-    workspaceRootIsCwd: rawFlags.workspaceRootIsCwd !== false
-  };
-
-  if (config.getOption('ignore-scripts')) {
-    flags.ignoreScripts = true;
-  }
-
-  if (config.getOption('ignore-platform')) {
-    flags.ignorePlatform = true;
-  }
-
-  if (config.getOption('ignore-engines')) {
-    flags.ignoreEngines = true;
-  }
-
-  if (config.getOption('ignore-optional')) {
-    flags.ignoreOptional = true;
-  }
-
-  if (config.getOption('force')) {
-    flags.force = true;
-  }
-
-  return flags;
-}
-
-class Install {
-  constructor(flags, config, reporter, lockfile) {
-    this.rootManifestRegistries = [];
-    this.rootPatternsToOrigin = (0, (_map || _load_map()).default)();
-    this.lockfile = lockfile;
-    this.reporter = reporter;
-    this.config = config;
-    this.flags = normalizeFlags(config, flags);
-    this.resolutions = (0, (_map || _load_map()).default)(); // Legacy resolutions field used for flat install mode
-    this.resolutionMap = new (_resolutionMap || _load_resolutionMap()).default(config); // Selective resolutions for nested dependencies
-    this.resolver = new (_packageResolver || _load_packageResolver()).default(config, lockfile, this.resolutionMap);
-    this.integrityChecker = new (_integrityChecker || _load_integrityChecker()).default(config);
-    this.linker = new (_packageLinker || _load_packageLinker()).default(config, this.resolver);
-    this.scripts = new (_packageInstallScripts || _load_packageInstallScripts()).default(config, this.resolver, this.flags.force);
-  }
-
-  /**
-   * Create a list of dependency requests from the current directories manifests.
-   */
-
-  fetchRequestFromCwd(excludePatterns = [], ignoreUnusedPatterns = false) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const patterns = [];
-      const deps = [];
-      let resolutionDeps = [];
-      const manifest = {};
-
-      const ignorePatterns = [];
-      const usedPatterns = [];
-      let workspaceLayout;
-
-      // some commands should always run in the context of the entire workspace
-      const cwd = _this.flags.includeWorkspaceDeps || _this.flags.workspaceRootIsCwd ? _this.config.lockfileFolder : _this.config.cwd;
-
-      // non-workspaces are always root, otherwise check for workspace root
-      const cwdIsRoot = !_this.config.workspaceRootFolder || _this.config.lockfileFolder === cwd;
-
-      // exclude package names that are in install args
-      const excludeNames = [];
-      for (var _iterator = excludePatterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const pattern = _ref;
-
-        if ((0, (_index3 || _load_index3()).getExoticResolver)(pattern)) {
-          excludeNames.push((0, (_guessName || _load_guessName()).default)(pattern));
-        } else {
-          // extract the name
-          const parts = (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern);
-          excludeNames.push(parts.name);
-        }
-      }
-
-      const stripExcluded = function stripExcluded(manifest) {
-        for (var _iterator2 = excludeNames, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-          var _ref2;
-
-          if (_isArray2) {
-            if (_i2 >= _iterator2.length) break;
-            _ref2 = _iterator2[_i2++];
-          } else {
-            _i2 = _iterator2.next();
-            if (_i2.done) break;
-            _ref2 = _i2.value;
-          }
-
-          const exclude = _ref2;
-
-          if (manifest.dependencies && manifest.dependencies[exclude]) {
-            delete manifest.dependencies[exclude];
-          }
-          if (manifest.devDependencies && manifest.devDependencies[exclude]) {
-            delete manifest.devDependencies[exclude];
-          }
-          if (manifest.optionalDependencies && manifest.optionalDependencies[exclude]) {
-            delete manifest.optionalDependencies[exclude];
-          }
-        }
-      };
-
-      for (var _iterator3 = Object.keys((_index2 || _load_index2()).registries), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref3 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref3 = _i3.value;
-        }
-
-        const registry = _ref3;
-
-        const filename = (_index2 || _load_index2()).registries[registry].filename;
-
-        const loc = path.join(cwd, filename);
-        if (!(yield (_fs || _load_fs()).exists(loc))) {
-          continue;
-        }
-
-        _this.rootManifestRegistries.push(registry);
-
-        const projectManifestJson = yield _this.config.readJson(loc);
-        yield (0, (_index || _load_index()).default)(projectManifestJson, cwd, _this.config, cwdIsRoot);
-
-        Object.assign(_this.resolutions, projectManifestJson.resolutions);
-        Object.assign(manifest, projectManifestJson);
-
-        _this.resolutionMap.init(_this.resolutions);
-        for (var _iterator4 = Object.keys(_this.resolutionMap.resolutionsByPackage), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref4;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref4 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref4 = _i4.value;
-          }
-
-          const packageName = _ref4;
-
-          const optional = (_objectPath || _load_objectPath()).default.has(manifest.optionalDependencies, packageName) && _this.flags.ignoreOptional;
-          for (var _iterator8 = _this.resolutionMap.resolutionsByPackage[packageName], _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-            var _ref9;
-
-            if (_isArray8) {
-              if (_i8 >= _iterator8.length) break;
-              _ref9 = _iterator8[_i8++];
-            } else {
-              _i8 = _iterator8.next();
-              if (_i8.done) break;
-              _ref9 = _i8.value;
-            }
-
-            const _ref8 = _ref9;
-            const pattern = _ref8.pattern;
-
-            resolutionDeps = [...resolutionDeps, { registry, pattern, optional, hint: 'resolution' }];
-          }
-        }
-
-        const pushDeps = function pushDeps(depType, manifest, { hint, optional }, isUsed) {
-          if (ignoreUnusedPatterns && !isUsed) {
-            return;
-          }
-          // We only take unused dependencies into consideration to get deterministic hoisting.
-          // Since flat mode doesn't care about hoisting and everything is top level and specified then we can safely
-          // leave these out.
-          if (_this.flags.flat && !isUsed) {
-            return;
-          }
-          const depMap = manifest[depType];
-          for (const name in depMap) {
-            if (excludeNames.indexOf(name) >= 0) {
-              continue;
-            }
-
-            let pattern = name;
-            if (!_this.lockfile.getLocked(pattern)) {
-              // when we use --save we save the dependency to the lockfile with just the name rather than the
-              // version combo
-              pattern += '@' + depMap[name];
-            }
-
-            // normalization made sure packages are mentioned only once
-            if (isUsed) {
-              usedPatterns.push(pattern);
-            } else {
-              ignorePatterns.push(pattern);
-            }
-
-            _this.rootPatternsToOrigin[pattern] = depType;
-            patterns.push(pattern);
-            deps.push({ pattern, registry, hint, optional, workspaceName: manifest.name, workspaceLoc: manifest._loc });
-          }
-        };
-
-        if (cwdIsRoot) {
-          pushDeps('dependencies', projectManifestJson, { hint: null, optional: false }, true);
-          pushDeps('devDependencies', projectManifestJson, { hint: 'dev', optional: false }, !_this.config.production);
-          pushDeps('optionalDependencies', projectManifestJson, { hint: 'optional', optional: true }, true);
-        }
-
-        if (_this.config.workspaceRootFolder) {
-          const workspaceLoc = cwdIsRoot ? loc : path.join(_this.config.lockfileFolder, filename);
-          const workspacesRoot = path.dirname(workspaceLoc);
-
-          let workspaceManifestJson = projectManifestJson;
-          if (!cwdIsRoot) {
-            // the manifest we read before was a child workspace, so get the root
-            workspaceManifestJson = yield _this.config.readJson(workspaceLoc);
-            yield (0, (_index || _load_index()).default)(workspaceManifestJson, workspacesRoot, _this.config, true);
-          }
-
-          const workspaces = yield _this.config.resolveWorkspaces(workspacesRoot, workspaceManifestJson);
-          workspaceLayout = new (_workspaceLayout || _load_workspaceLayout()).default(workspaces, _this.config);
-
-          // add virtual manifest that depends on all workspaces, this way package hoisters and resolvers will work fine
-          const workspaceDependencies = (0, (_extends2 || _load_extends()).default)({}, workspaceManifestJson.dependencies);
-          for (var _iterator5 = Object.keys(workspaces), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-            var _ref5;
-
-            if (_isArray5) {
-              if (_i5 >= _iterator5.length) break;
-              _ref5 = _iterator5[_i5++];
-            } else {
-              _i5 = _iterator5.next();
-              if (_i5.done) break;
-              _ref5 = _i5.value;
-            }
-
-            const workspaceName = _ref5;
-
-            const workspaceManifest = workspaces[workspaceName].manifest;
-            workspaceDependencies[workspaceName] = workspaceManifest.version;
-
-            // include dependencies from all workspaces
-            if (_this.flags.includeWorkspaceDeps) {
-              pushDeps('dependencies', workspaceManifest, { hint: null, optional: false }, true);
-              pushDeps('devDependencies', workspaceManifest, { hint: 'dev', optional: false }, !_this.config.production);
-              pushDeps('optionalDependencies', workspaceManifest, { hint: 'optional', optional: true }, true);
-            }
-          }
-          const virtualDependencyManifest = {
-            _uid: '',
-            name: `workspace-aggregator-${uuid.v4()}`,
-            version: '1.0.0',
-            _registry: 'npm',
-            _loc: workspacesRoot,
-            dependencies: workspaceDependencies,
-            devDependencies: (0, (_extends2 || _load_extends()).default)({}, workspaceManifestJson.devDependencies),
-            optionalDependencies: (0, (_extends2 || _load_extends()).default)({}, workspaceManifestJson.optionalDependencies),
-            private: workspaceManifestJson.private,
-            workspaces: workspaceManifestJson.workspaces
-          };
-          workspaceLayout.virtualManifestName = virtualDependencyManifest.name;
-          const virtualDep = {};
-          virtualDep[virtualDependencyManifest.name] = virtualDependencyManifest.version;
-          workspaces[virtualDependencyManifest.name] = { loc: workspacesRoot, manifest: virtualDependencyManifest };
-
-          // ensure dependencies that should be excluded are stripped from the correct manifest
-          stripExcluded(cwdIsRoot ? virtualDependencyManifest : workspaces[projectManifestJson.name].manifest);
-
-          pushDeps('workspaces', { workspaces: virtualDep }, { hint: 'workspaces', optional: false }, true);
-
-          const implicitWorkspaceDependencies = (0, (_extends2 || _load_extends()).default)({}, workspaceDependencies);
-
-          for (var _iterator6 = (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-            var _ref6;
-
-            if (_isArray6) {
-              if (_i6 >= _iterator6.length) break;
-              _ref6 = _iterator6[_i6++];
-            } else {
-              _i6 = _iterator6.next();
-              if (_i6.done) break;
-              _ref6 = _i6.value;
-            }
-
-            const type = _ref6;
-
-            for (var _iterator7 = Object.keys(projectManifestJson[type] || {}), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-              var _ref7;
-
-              if (_isArray7) {
-                if (_i7 >= _iterator7.length) break;
-                _ref7 = _iterator7[_i7++];
-              } else {
-                _i7 = _iterator7.next();
-                if (_i7.done) break;
-                _ref7 = _i7.value;
-              }
-
-              const dependencyName = _ref7;
-
-              delete implicitWorkspaceDependencies[dependencyName];
-            }
-          }
-
-          pushDeps('dependencies', { dependencies: implicitWorkspaceDependencies }, { hint: 'workspaces', optional: false }, true);
-        }
-
-        break;
-      }
-
-      // inherit root flat flag
-      if (manifest.flat) {
-        _this.flags.flat = true;
-      }
-
-      return {
-        requests: [...resolutionDeps, ...deps],
-        patterns,
-        manifest,
-        usedPatterns,
-        ignorePatterns,
-        workspaceLayout
-      };
-    })();
-  }
-
-  /**
-   * TODO description
-   */
-
-  prepareRequests(requests) {
-    return requests;
-  }
-
-  preparePatterns(patterns) {
-    return patterns;
-  }
-  preparePatternsForLinking(patterns, cwdManifest, cwdIsRoot) {
-    return patterns;
-  }
-
-  prepareManifests() {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const manifests = yield _this2.config.getRootManifests();
-      return manifests;
-    })();
-  }
-
-  bailout(patterns, workspaceLayout) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // We don't want to skip the audit - it could yield important errors
-      if (_this3.flags.audit) {
-        return false;
-      }
-      // PNP is so fast that the integrity check isn't pertinent
-      if (_this3.config.plugnplayEnabled) {
-        return false;
-      }
-      if (_this3.flags.skipIntegrityCheck || _this3.flags.force) {
-        return false;
-      }
-      const lockfileCache = _this3.lockfile.cache;
-      if (!lockfileCache) {
-        return false;
-      }
-      const lockfileClean = _this3.lockfile.parseResultType === 'success';
-      const match = yield _this3.integrityChecker.check(patterns, lockfileCache, _this3.flags, workspaceLayout);
-      if (_this3.flags.frozenLockfile && (!lockfileClean || match.missingPatterns.length > 0)) {
-        throw new (_errors || _load_errors()).MessageError(_this3.reporter.lang('frozenLockfileError'));
-      }
-
-      const haveLockfile = yield (_fs || _load_fs()).exists(path.join(_this3.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME));
-
-      const lockfileIntegrityPresent = !_this3.lockfile.hasEntriesExistWithoutIntegrity();
-      const integrityBailout = lockfileIntegrityPresent || !_this3.config.autoAddIntegrity;
-
-      if (match.integrityMatches && haveLockfile && lockfileClean && integrityBailout) {
-        _this3.reporter.success(_this3.reporter.lang('upToDate'));
-        return true;
-      }
-
-      if (match.integrityFileMissing && haveLockfile) {
-        // Integrity file missing, force script installations
-        _this3.scripts.setForce(true);
-        return false;
-      }
-
-      if (match.hardRefreshRequired) {
-        // e.g. node version doesn't match, force script installations
-        _this3.scripts.setForce(true);
-        return false;
-      }
-
-      if (!patterns.length && !match.integrityFileMissing) {
-        _this3.reporter.success(_this3.reporter.lang('nothingToInstall'));
-        yield _this3.createEmptyManifestFolders();
-        yield _this3.saveLockfileAndIntegrity(patterns, workspaceLayout);
-        return true;
-      }
-
-      return false;
-    })();
-  }
-
-  /**
-   * Produce empty folders for all used root manifests.
-   */
-
-  createEmptyManifestFolders() {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (_this4.config.modulesFolder) {
-        // already created
-        return;
-      }
-
-      for (var _iterator9 = _this4.rootManifestRegistries, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-        var _ref10;
-
-        if (_isArray9) {
-          if (_i9 >= _iterator9.length) break;
-          _ref10 = _iterator9[_i9++];
-        } else {
-          _i9 = _iterator9.next();
-          if (_i9.done) break;
-          _ref10 = _i9.value;
-        }
-
-        const registryName = _ref10;
-        const folder = _this4.config.registries[registryName].folder;
-
-        yield (_fs || _load_fs()).mkdirp(path.join(_this4.config.lockfileFolder, folder));
-      }
-    })();
-  }
-
-  /**
-   * TODO description
-   */
-
-  markIgnored(patterns) {
-    for (var _iterator10 = patterns, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray10) {
-        if (_i10 >= _iterator10.length) break;
-        _ref11 = _iterator10[_i10++];
-      } else {
-        _i10 = _iterator10.next();
-        if (_i10.done) break;
-        _ref11 = _i10.value;
-      }
-
-      const pattern = _ref11;
-
-      const manifest = this.resolver.getStrictResolvedPattern(pattern);
-      const ref = manifest._reference;
-      invariant(ref, 'expected package reference');
-
-      // just mark the package as ignored. if the package is used by a required package, the hoister
-      // will take care of that.
-      ref.ignore = true;
-    }
-  }
-
-  /**
-   * helper method that gets only recent manifests
-   * used by global.ls command
-   */
-  getFlattenedDeps() {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _ref12 = yield _this5.fetchRequestFromCwd();
-
-      const depRequests = _ref12.requests,
-            rawPatterns = _ref12.patterns;
-
-
-      yield _this5.resolver.init(depRequests, {});
-
-      const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this5.resolver.getManifests(), _this5.config);
-      _this5.resolver.updateManifests(manifests);
-
-      return _this5.flatten(rawPatterns);
-    })();
-  }
-
-  /**
-   * TODO description
-   */
-
-  init() {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this6.checkUpdate();
-
-      // warn if we have a shrinkwrap
-      if (yield (_fs || _load_fs()).exists(path.join(_this6.config.lockfileFolder, (_constants || _load_constants()).NPM_SHRINKWRAP_FILENAME))) {
-        _this6.reporter.warn(_this6.reporter.lang('shrinkwrapWarning'));
-      }
-
-      // warn if we have an npm lockfile
-      if (yield (_fs || _load_fs()).exists(path.join(_this6.config.lockfileFolder, (_constants || _load_constants()).NPM_LOCK_FILENAME))) {
-        _this6.reporter.warn(_this6.reporter.lang('npmLockfileWarning'));
-      }
-
-      if (_this6.config.plugnplayEnabled) {
-        _this6.reporter.info(_this6.reporter.lang('plugnplaySuggestV2L1'));
-        _this6.reporter.info(_this6.reporter.lang('plugnplaySuggestV2L2'));
-      }
-
-      let flattenedTopLevelPatterns = [];
-      const steps = [];
-
-      var _ref13 = yield _this6.fetchRequestFromCwd();
-
-      const depRequests = _ref13.requests,
-            rawPatterns = _ref13.patterns,
-            ignorePatterns = _ref13.ignorePatterns,
-            workspaceLayout = _ref13.workspaceLayout,
-            manifest = _ref13.manifest;
-
-      let topLevelPatterns = [];
-
-      const artifacts = yield _this6.integrityChecker.getArtifacts();
-      if (artifacts) {
-        _this6.linker.setArtifacts(artifacts);
-        _this6.scripts.setArtifacts(artifacts);
-      }
-
-      if ((_packageCompatibility || _load_packageCompatibility()).shouldCheck(manifest, _this6.flags)) {
-        steps.push((() => {
-          var _ref14 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (curr, total) {
-            _this6.reporter.step(curr, total, _this6.reporter.lang('checkingManifest'), emoji.get('mag'));
-            yield _this6.checkCompatibility();
-          });
-
-          return function (_x, _x2) {
-            return _ref14.apply(this, arguments);
-          };
-        })());
-      }
-
-      const audit = new (_audit || _load_audit()).default(_this6.config, _this6.reporter, { groups: (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES });
-      let auditFoundProblems = false;
-
-      steps.push(function (curr, total) {
-        return (0, (_hooks || _load_hooks()).callThroughHook)('resolveStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-          _this6.reporter.step(curr, total, _this6.reporter.lang('resolvingPackages'), emoji.get('mag'));
-          yield _this6.resolver.init(_this6.prepareRequests(depRequests), {
-            isFlat: _this6.flags.flat,
-            isFrozen: _this6.flags.frozenLockfile,
-            workspaceLayout
-          });
-          topLevelPatterns = _this6.preparePatterns(rawPatterns);
-          flattenedTopLevelPatterns = yield _this6.flatten(topLevelPatterns);
-          return { bailout: !_this6.flags.audit && (yield _this6.bailout(topLevelPatterns, workspaceLayout)) };
-        }));
-      });
-
-      if (_this6.flags.audit) {
-        steps.push(function (curr, total) {
-          return (0, (_hooks || _load_hooks()).callThroughHook)('auditStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-            _this6.reporter.step(curr, total, _this6.reporter.lang('auditRunning'), emoji.get('mag'));
-            if (_this6.flags.offline) {
-              _this6.reporter.warn(_this6.reporter.lang('auditOffline'));
-              return { bailout: false };
-            }
-            const preparedManifests = yield _this6.prepareManifests();
-            // $FlowFixMe - Flow considers `m` in the map operation to be "mixed", so does not recognize `m.object`
-            const mergedManifest = Object.assign({}, ...Object.values(preparedManifests).map(function (m) {
-              return m.object;
-            }));
-            const auditVulnerabilityCounts = yield audit.performAudit(mergedManifest, _this6.lockfile, _this6.resolver, _this6.linker, topLevelPatterns);
-            auditFoundProblems = auditVulnerabilityCounts.info || auditVulnerabilityCounts.low || auditVulnerabilityCounts.moderate || auditVulnerabilityCounts.high || auditVulnerabilityCounts.critical;
-            return { bailout: yield _this6.bailout(topLevelPatterns, workspaceLayout) };
-          }));
-        });
-      }
-
-      steps.push(function (curr, total) {
-        return (0, (_hooks || _load_hooks()).callThroughHook)('fetchStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-          _this6.markIgnored(ignorePatterns);
-          _this6.reporter.step(curr, total, _this6.reporter.lang('fetchingPackages'), emoji.get('truck'));
-          const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this6.resolver.getManifests(), _this6.config);
-          _this6.resolver.updateManifests(manifests);
-          yield (_packageCompatibility || _load_packageCompatibility()).check(_this6.resolver.getManifests(), _this6.config, _this6.flags.ignoreEngines);
-        }));
-      });
-
-      steps.push(function (curr, total) {
-        return (0, (_hooks || _load_hooks()).callThroughHook)('linkStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-          // remove integrity hash to make this operation atomic
-          yield _this6.integrityChecker.removeIntegrityFile();
-          _this6.reporter.step(curr, total, _this6.reporter.lang('linkingDependencies'), emoji.get('link'));
-          flattenedTopLevelPatterns = _this6.preparePatternsForLinking(flattenedTopLevelPatterns, manifest, _this6.config.lockfileFolder === _this6.config.cwd);
-          yield _this6.linker.init(flattenedTopLevelPatterns, workspaceLayout, {
-            linkDuplicates: _this6.flags.linkDuplicates,
-            ignoreOptional: _this6.flags.ignoreOptional
-          });
-        }));
-      });
-
-      if (_this6.config.plugnplayEnabled) {
-        steps.push(function (curr, total) {
-          return (0, (_hooks || _load_hooks()).callThroughHook)('pnpStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-            const pnpPath = `${_this6.config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`;
-
-            const code = yield (0, (_generatePnpMap || _load_generatePnpMap()).generatePnpMap)(_this6.config, flattenedTopLevelPatterns, {
-              resolver: _this6.resolver,
-              reporter: _this6.reporter,
-              targetPath: pnpPath,
-              workspaceLayout
-            });
-
-            try {
-              const file = yield (_fs || _load_fs()).readFile(pnpPath);
-              if (file === code) {
-                return;
-              }
-            } catch (error) {}
-
-            yield (_fs || _load_fs()).writeFile(pnpPath, code);
-            yield (_fs || _load_fs()).chmod(pnpPath, 0o755);
-          }));
-        });
-      }
-
-      steps.push(function (curr, total) {
-        return (0, (_hooks || _load_hooks()).callThroughHook)('buildStep', (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-          _this6.reporter.step(curr, total, _this6.flags.force ? _this6.reporter.lang('rebuildingPackages') : _this6.reporter.lang('buildingFreshPackages'), emoji.get('hammer'));
-
-          if (_this6.config.ignoreScripts) {
-            _this6.reporter.warn(_this6.reporter.lang('ignoredScripts'));
-          } else {
-            yield _this6.scripts.init(flattenedTopLevelPatterns);
-          }
-        }));
-      });
-
-      if (_this6.flags.har) {
-        steps.push((() => {
-          var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (curr, total) {
-            const formattedDate = new Date().toISOString().replace(/:/g, '-');
-            const filename = `yarn-install_${formattedDate}.har`;
-            _this6.reporter.step(curr, total, _this6.reporter.lang('savingHar', filename), emoji.get('black_circle_for_record'));
-            yield _this6.config.requestManager.saveHar(filename);
-          });
-
-          return function (_x3, _x4) {
-            return _ref21.apply(this, arguments);
-          };
-        })());
-      }
-
-      if (yield _this6.shouldClean()) {
-        steps.push((() => {
-          var _ref22 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (curr, total) {
-            _this6.reporter.step(curr, total, _this6.reporter.lang('cleaningModules'), emoji.get('recycle'));
-            yield (0, (_autoclean || _load_autoclean()).clean)(_this6.config, _this6.reporter);
-          });
-
-          return function (_x5, _x6) {
-            return _ref22.apply(this, arguments);
-          };
-        })());
-      }
-
-      let currentStep = 0;
-      for (var _iterator11 = steps, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-        var _ref23;
-
-        if (_isArray11) {
-          if (_i11 >= _iterator11.length) break;
-          _ref23 = _iterator11[_i11++];
-        } else {
-          _i11 = _iterator11.next();
-          if (_i11.done) break;
-          _ref23 = _i11.value;
-        }
-
-        const step = _ref23;
-
-        const stepResult = yield step(++currentStep, steps.length);
-        if (stepResult && stepResult.bailout) {
-          if (_this6.flags.audit) {
-            audit.summary();
-          }
-          if (auditFoundProblems) {
-            _this6.reporter.warn(_this6.reporter.lang('auditRunAuditForDetails'));
-          }
-          _this6.maybeOutputUpdate();
-          return flattenedTopLevelPatterns;
-        }
-      }
-
-      // fin!
-      if (_this6.flags.audit) {
-        audit.summary();
-      }
-      if (auditFoundProblems) {
-        _this6.reporter.warn(_this6.reporter.lang('auditRunAuditForDetails'));
-      }
-      yield _this6.saveLockfileAndIntegrity(topLevelPatterns, workspaceLayout);
-      yield _this6.persistChanges();
-      _this6.maybeOutputUpdate();
-      _this6.config.requestManager.clearCache();
-      return flattenedTopLevelPatterns;
-    })();
-  }
-
-  checkCompatibility() {
-    var _this7 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _ref24 = yield _this7.fetchRequestFromCwd();
-
-      const manifest = _ref24.manifest;
-
-      yield (_packageCompatibility || _load_packageCompatibility()).checkOne(manifest, _this7.config, _this7.flags.ignoreEngines);
-    })();
-  }
-
-  persistChanges() {
-    var _this8 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // get all the different registry manifests in this folder
-      const manifests = yield _this8.config.getRootManifests();
-
-      if (yield _this8.applyChanges(manifests)) {
-        yield _this8.config.saveRootManifests(manifests);
-      }
-    })();
-  }
-
-  applyChanges(manifests) {
-    let hasChanged = false;
-
-    if (this.config.plugnplayPersist) {
-      const object = manifests.npm.object;
-
-
-      if (typeof object.installConfig !== 'object') {
-        object.installConfig = {};
-      }
-
-      if (this.config.plugnplayEnabled && object.installConfig.pnp !== true) {
-        object.installConfig.pnp = true;
-        hasChanged = true;
-      } else if (!this.config.plugnplayEnabled && typeof object.installConfig.pnp !== 'undefined') {
-        delete object.installConfig.pnp;
-        hasChanged = true;
-      }
-
-      if (Object.keys(object.installConfig).length === 0) {
-        delete object.installConfig;
-      }
-    }
-
-    return Promise.resolve(hasChanged);
-  }
-
-  /**
-   * Check if we should run the cleaning step.
-   */
-
-  shouldClean() {
-    return (_fs || _load_fs()).exists(path.join(this.config.lockfileFolder, (_constants || _load_constants()).CLEAN_FILENAME));
-  }
-
-  /**
-   * TODO
-   */
-
-  flatten(patterns) {
-    var _this9 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (!_this9.flags.flat) {
-        return patterns;
-      }
-
-      const flattenedPatterns = [];
-
-      for (var _iterator12 = _this9.resolver.getAllDependencyNamesByLevelOrder(patterns), _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-        var _ref25;
-
-        if (_isArray12) {
-          if (_i12 >= _iterator12.length) break;
-          _ref25 = _iterator12[_i12++];
-        } else {
-          _i12 = _iterator12.next();
-          if (_i12.done) break;
-          _ref25 = _i12.value;
-        }
-
-        const name = _ref25;
-
-        const infos = _this9.resolver.getAllInfoForPackageName(name).filter(function (manifest) {
-          const ref = manifest._reference;
-          invariant(ref, 'expected package reference');
-          return !ref.ignore;
-        });
-
-        if (infos.length === 0) {
-          continue;
-        }
-
-        if (infos.length === 1) {
-          // single version of this package
-          // take out a single pattern as multiple patterns may have resolved to this package
-          flattenedPatterns.push(_this9.resolver.patternsByPackage[name][0]);
-          continue;
-        }
-
-        const options = infos.map(function (info) {
-          const ref = info._reference;
-          invariant(ref, 'expected reference');
-          return {
-            // TODO `and is required by {PARENT}`,
-            name: _this9.reporter.lang('manualVersionResolutionOption', ref.patterns.join(', '), info.version),
-
-            value: info.version
-          };
-        });
-        const versions = infos.map(function (info) {
-          return info.version;
-        });
-        let version;
-
-        const resolutionVersion = _this9.resolutions[name];
-        if (resolutionVersion && versions.indexOf(resolutionVersion) >= 0) {
-          // use json `resolution` version
-          version = resolutionVersion;
-        } else {
-          version = yield _this9.reporter.select(_this9.reporter.lang('manualVersionResolution', name), _this9.reporter.lang('answer'), options);
-          _this9.resolutions[name] = version;
-        }
-
-        flattenedPatterns.push(_this9.resolver.collapseAllVersionsOfPackage(name, version));
-      }
-
-      // save resolutions to their appropriate root manifest
-      if (Object.keys(_this9.resolutions).length) {
-        const manifests = yield _this9.config.getRootManifests();
-
-        for (const name in _this9.resolutions) {
-          const version = _this9.resolutions[name];
-
-          const patterns = _this9.resolver.patternsByPackage[name];
-          if (!patterns) {
-            continue;
-          }
-
-          let manifest;
-          for (var _iterator13 = patterns, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
-            var _ref26;
-
-            if (_isArray13) {
-              if (_i13 >= _iterator13.length) break;
-              _ref26 = _iterator13[_i13++];
-            } else {
-              _i13 = _iterator13.next();
-              if (_i13.done) break;
-              _ref26 = _i13.value;
-            }
-
-            const pattern = _ref26;
-
-            manifest = _this9.resolver.getResolvedPattern(pattern);
-            if (manifest) {
-              break;
-            }
-          }
-          invariant(manifest, 'expected manifest');
-
-          const ref = manifest._reference;
-          invariant(ref, 'expected reference');
-
-          const object = manifests[ref.registry].object;
-          object.resolutions = object.resolutions || {};
-          object.resolutions[name] = version;
-        }
-
-        yield _this9.config.saveRootManifests(manifests);
-      }
-
-      return flattenedPatterns;
-    })();
-  }
-
-  /**
-   * Remove offline tarballs that are no longer required
-   */
-
-  pruneOfflineMirror(lockfile) {
-    var _this10 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const mirror = _this10.config.getOfflineMirrorPath();
-      if (!mirror) {
-        return;
-      }
-
-      const requiredTarballs = new Set();
-      for (const dependency in lockfile) {
-        const resolved = lockfile[dependency].resolved;
-        if (resolved) {
-          const basename = path.basename(resolved.split('#')[0]);
-          if (dependency[0] === '@' && basename[0] !== '@') {
-            requiredTarballs.add(`${dependency.split('/')[0]}-${basename}`);
-          }
-          requiredTarballs.add(basename);
-        }
-      }
-
-      const mirrorFiles = yield (_fs || _load_fs()).walk(mirror);
-      for (var _iterator14 = mirrorFiles, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-        var _ref27;
-
-        if (_isArray14) {
-          if (_i14 >= _iterator14.length) break;
-          _ref27 = _iterator14[_i14++];
-        } else {
-          _i14 = _iterator14.next();
-          if (_i14.done) break;
-          _ref27 = _i14.value;
-        }
-
-        const file = _ref27;
-
-        const isTarball = path.extname(file.basename) === '.tgz';
-        // if using experimental-pack-script-packages-in-mirror flag, don't unlink prebuilt packages
-        const hasPrebuiltPackage = file.relative.startsWith('prebuilt/');
-        if (isTarball && !hasPrebuiltPackage && !requiredTarballs.has(file.basename)) {
-          yield (_fs || _load_fs()).unlink(file.absolute);
-        }
-      }
-    })();
-  }
-
-  /**
-   * Save updated integrity and lockfiles.
-   */
-
-  saveLockfileAndIntegrity(patterns, workspaceLayout) {
-    var _this11 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const resolvedPatterns = {};
-      Object.keys(_this11.resolver.patterns).forEach(function (pattern) {
-        if (!workspaceLayout || !workspaceLayout.getManifestByPattern(pattern)) {
-          resolvedPatterns[pattern] = _this11.resolver.patterns[pattern];
-        }
-      });
-
-      // TODO this code is duplicated in a few places, need a common way to filter out workspace patterns from lockfile
-      patterns = patterns.filter(function (p) {
-        return !workspaceLayout || !workspaceLayout.getManifestByPattern(p);
-      });
-
-      const lockfileBasedOnResolver = _this11.lockfile.getLockfile(resolvedPatterns);
-
-      if (_this11.config.pruneOfflineMirror) {
-        yield _this11.pruneOfflineMirror(lockfileBasedOnResolver);
-      }
-
-      // write integrity hash
-      if (!_this11.config.plugnplayEnabled) {
-        yield _this11.integrityChecker.save(patterns, lockfileBasedOnResolver, _this11.flags, workspaceLayout, _this11.scripts.getArtifacts());
-      }
-
-      // --no-lockfile or --pure-lockfile or --frozen-lockfile
-      if (_this11.flags.lockfile === false || _this11.flags.pureLockfile || _this11.flags.frozenLockfile) {
-        return;
-      }
-
-      const lockFileHasAllPatterns = patterns.every(function (p) {
-        return _this11.lockfile.getLocked(p);
-      });
-      const lockfilePatternsMatch = Object.keys(_this11.lockfile.cache || {}).every(function (p) {
-        return lockfileBasedOnResolver[p];
-      });
-      const resolverPatternsAreSameAsInLockfile = Object.keys(lockfileBasedOnResolver).every(function (pattern) {
-        const manifest = _this11.lockfile.getLocked(pattern);
-        return manifest && manifest.resolved === lockfileBasedOnResolver[pattern].resolved && deepEqual(manifest.prebuiltVariants, lockfileBasedOnResolver[pattern].prebuiltVariants);
-      });
-      const integrityPatternsAreSameAsInLockfile = Object.keys(lockfileBasedOnResolver).every(function (pattern) {
-        const existingIntegrityInfo = lockfileBasedOnResolver[pattern].integrity;
-        if (!existingIntegrityInfo) {
-          // if this entry does not have an integrity, no need to re-write the lockfile because of it
-          return true;
-        }
-        const manifest = _this11.lockfile.getLocked(pattern);
-        if (manifest && manifest.integrity) {
-          const manifestIntegrity = ssri.stringify(manifest.integrity);
-          return manifestIntegrity === existingIntegrityInfo;
-        }
-        return false;
-      });
-
-      // remove command is followed by install with force, lockfile will be rewritten in any case then
-      if (!_this11.flags.force && _this11.lockfile.parseResultType === 'success' && lockFileHasAllPatterns && lockfilePatternsMatch && resolverPatternsAreSameAsInLockfile && integrityPatternsAreSameAsInLockfile && patterns.length) {
-        return;
-      }
-
-      // build lockfile location
-      const loc = path.join(_this11.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME);
-
-      // write lockfile
-      const lockSource = (0, (_lockfile2 || _load_lockfile2()).stringify)(lockfileBasedOnResolver, false, _this11.config.enableLockfileVersions);
-      yield (_fs || _load_fs()).writeFilePreservingEol(loc, lockSource);
-
-      _this11._logSuccessSaveLockfile();
-    })();
-  }
-
-  _logSuccessSaveLockfile() {
-    this.reporter.success(this.reporter.lang('savedLockfile'));
-  }
-
-  /**
-   * Load the dependency graph of the current install. Only does package resolving and wont write to the cwd.
-   */
-  hydrate(ignoreUnusedPatterns) {
-    var _this12 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const request = yield _this12.fetchRequestFromCwd([], ignoreUnusedPatterns);
-      const depRequests = request.requests,
-            rawPatterns = request.patterns,
-            ignorePatterns = request.ignorePatterns,
-            workspaceLayout = request.workspaceLayout;
-
-
-      yield _this12.resolver.init(depRequests, {
-        isFlat: _this12.flags.flat,
-        isFrozen: _this12.flags.frozenLockfile,
-        workspaceLayout
-      });
-      yield _this12.flatten(rawPatterns);
-      _this12.markIgnored(ignorePatterns);
-
-      // fetch packages, should hit cache most of the time
-      const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this12.resolver.getManifests(), _this12.config);
-      _this12.resolver.updateManifests(manifests);
-      yield (_packageCompatibility || _load_packageCompatibility()).check(_this12.resolver.getManifests(), _this12.config, _this12.flags.ignoreEngines);
-
-      // expand minimal manifests
-      for (var _iterator15 = _this12.resolver.getManifests(), _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
-        var _ref28;
-
-        if (_isArray15) {
-          if (_i15 >= _iterator15.length) break;
-          _ref28 = _iterator15[_i15++];
-        } else {
-          _i15 = _iterator15.next();
-          if (_i15.done) break;
-          _ref28 = _i15.value;
-        }
-
-        const manifest = _ref28;
-
-        const ref = manifest._reference;
-        invariant(ref, 'expected reference');
-        const type = ref.remote.type;
-        // link specifier won't ever hit cache
-
-        let loc = '';
-        if (type === 'link') {
-          continue;
-        } else if (type === 'workspace') {
-          if (!ref.remote.reference) {
-            continue;
-          }
-          loc = ref.remote.reference;
-        } else {
-          loc = _this12.config.generateModuleCachePath(ref);
-        }
-        const newPkg = yield _this12.config.readManifest(loc);
-        yield _this12.resolver.updateManifest(ref, newPkg);
-      }
-
-      return request;
-    })();
-  }
-
-  /**
-   * Check for updates every day and output a nag message if there's a newer version.
-   */
-
-  checkUpdate() {
-    if (this.config.nonInteractive) {
-      // don't show upgrade dialog on CI or non-TTY terminals
-      return;
-    }
-
-    // don't check if disabled
-    if (this.config.getOption('disable-self-update-check')) {
-      return;
-    }
-
-    // only check for updates once a day
-    const lastUpdateCheck = Number(this.config.getOption('lastUpdateCheck')) || 0;
-    if (lastUpdateCheck && Date.now() - lastUpdateCheck < ONE_DAY) {
-      return;
-    }
-
-    // don't bug for updates on tagged releases
-    if ((_yarnVersion || _load_yarnVersion()).version.indexOf('-') >= 0) {
-      return;
-    }
-
-    this._checkUpdate().catch(() => {
-      // swallow errors
-    });
-  }
-
-  _checkUpdate() {
-    var _this13 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let latestVersion = yield _this13.config.requestManager.request({
-        url: (_constants || _load_constants()).SELF_UPDATE_VERSION_URL
-      });
-      invariant(typeof latestVersion === 'string', 'expected string');
-      latestVersion = latestVersion.trim();
-      if (!semver.valid(latestVersion)) {
-        return;
-      }
-
-      // ensure we only check for updates periodically
-      _this13.config.registries.yarn.saveHomeConfig({
-        lastUpdateCheck: Date.now()
-      });
-
-      if (semver.gt(latestVersion, (_yarnVersion || _load_yarnVersion()).version)) {
-        const installationMethod = yield (0, (_yarnVersion || _load_yarnVersion()).getInstallationMethod)();
-        _this13.maybeOutputUpdate = function () {
-          _this13.reporter.warn(_this13.reporter.lang('yarnOutdated', latestVersion, (_yarnVersion || _load_yarnVersion()).version));
-
-          const command = getUpdateCommand(installationMethod);
-          if (command) {
-            _this13.reporter.info(_this13.reporter.lang('yarnOutdatedCommand'));
-            _this13.reporter.command(command);
-          } else {
-            const installer = getUpdateInstaller(installationMethod);
-            if (installer) {
-              _this13.reporter.info(_this13.reporter.lang('yarnOutdatedInstaller', installer));
-            }
-          }
-        };
-      }
-    })();
-  }
-
-  /**
-   * Method to override with a possible upgrade message.
-   */
-
-  maybeOutputUpdate() {}
-}
-
-exports.Install = Install;
-function hasWrapper(commander, args) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Yarn install is used to install all dependencies for a project.');
-  commander.usage('install [flags]');
-  commander.option('-A, --audit', 'Run vulnerability audit on installed packages');
-  commander.option('-g, --global', 'DEPRECATED');
-  commander.option('-S, --save', 'DEPRECATED - save package to your `dependencies`');
-  commander.option('-D, --save-dev', 'DEPRECATED - save package to your `devDependencies`');
-  commander.option('-P, --save-peer', 'DEPRECATED - save package to your `peerDependencies`');
-  commander.option('-O, --save-optional', 'DEPRECATED - save package to your `optionalDependencies`');
-  commander.option('-E, --save-exact', 'DEPRECATED');
-  commander.option('-T, --save-tilde', 'DEPRECATED');
-}
-
-/***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isObject = __webpack_require__(52);
-module.exports = function (it) {
-  if (!isObject(it)) throw TypeError(it + ' is not an object!');
-  return it;
-};
-
-
-/***/ }),
-/* 36 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return SubjectSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subject; });
-/* unused harmony export AnonymousSubject */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__ = __webpack_require__(189);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__ = __webpack_require__(422);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__ = __webpack_require__(321);
-/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */
-
-
-
-
-
-
-
-var SubjectSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubjectSubscriber, _super);
-    function SubjectSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        return _this;
-    }
-    return SubjectSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_2__Subscriber__["a" /* Subscriber */]));
-
-var Subject = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subject, _super);
-    function Subject() {
-        var _this = _super.call(this) || this;
-        _this.observers = [];
-        _this.closed = false;
-        _this.isStopped = false;
-        _this.hasError = false;
-        _this.thrownError = null;
-        return _this;
-    }
-    Subject.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () {
-        return new SubjectSubscriber(this);
-    };
-    Subject.prototype.lift = function (operator) {
-        var subject = new AnonymousSubject(this, this);
-        subject.operator = operator;
-        return subject;
-    };
-    Subject.prototype.next = function (value) {
-        if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        if (!this.isStopped) {
-            var observers = this.observers;
-            var len = observers.length;
-            var copy = observers.slice();
-            for (var i = 0; i < len; i++) {
-                copy[i].next(value);
-            }
-        }
-    };
-    Subject.prototype.error = function (err) {
-        if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        this.hasError = true;
-        this.thrownError = err;
-        this.isStopped = true;
-        var observers = this.observers;
-        var len = observers.length;
-        var copy = observers.slice();
-        for (var i = 0; i < len; i++) {
-            copy[i].error(err);
-        }
-        this.observers.length = 0;
-    };
-    Subject.prototype.complete = function () {
-        if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        this.isStopped = true;
-        var observers = this.observers;
-        var len = observers.length;
-        var copy = observers.slice();
-        for (var i = 0; i < len; i++) {
-            copy[i].complete();
-        }
-        this.observers.length = 0;
-    };
-    Subject.prototype.unsubscribe = function () {
-        this.isStopped = true;
-        this.closed = true;
-        this.observers = null;
-    };
-    Subject.prototype._trySubscribe = function (subscriber) {
-        if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        else {
-            return _super.prototype._trySubscribe.call(this, subscriber);
-        }
-    };
-    Subject.prototype._subscribe = function (subscriber) {
-        if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        else if (this.hasError) {
-            subscriber.error(this.thrownError);
-            return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
-        }
-        else if (this.isStopped) {
-            subscriber.complete();
-            return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
-        }
-        else {
-            this.observers.push(subscriber);
-            return new __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber);
-        }
-    };
-    Subject.prototype.asObservable = function () {
-        var observable = new __WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */]();
-        observable.source = this;
-        return observable;
-    };
-    Subject.create = function (destination, source) {
-        return new AnonymousSubject(destination, source);
-    };
-    return Subject;
-}(__WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */]));
-
-var AnonymousSubject = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnonymousSubject, _super);
-    function AnonymousSubject(destination, source) {
-        var _this = _super.call(this) || this;
-        _this.destination = destination;
-        _this.source = source;
-        return _this;
-    }
-    AnonymousSubject.prototype.next = function (value) {
-        var destination = this.destination;
-        if (destination && destination.next) {
-            destination.next(value);
-        }
-    };
-    AnonymousSubject.prototype.error = function (err) {
-        var destination = this.destination;
-        if (destination && destination.error) {
-            this.destination.error(err);
-        }
-    };
-    AnonymousSubject.prototype.complete = function () {
-        var destination = this.destination;
-        if (destination && destination.complete) {
-            this.destination.complete();
-        }
-    };
-    AnonymousSubject.prototype._subscribe = function (subscriber) {
-        var source = this.source;
-        if (source) {
-            return this.source.subscribe(subscriber);
-        }
-        else {
-            return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
-        }
-    };
-    return AnonymousSubject;
-}(Subject));
-
-//# sourceMappingURL=Subject.js.map
-
-
-/***/ }),
-/* 37 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.normalizePattern = normalizePattern;
-
-/**
- * Explode and normalize a pattern into its name and range.
- */
-
-function normalizePattern(pattern) {
-  let hasVersion = false;
-  let range = 'latest';
-  let name = pattern;
-
-  // if we're a scope then remove the @ and add it back later
-  let isScoped = false;
-  if (name[0] === '@') {
-    isScoped = true;
-    name = name.slice(1);
-  }
-
-  // take first part as the name
-  const parts = name.split('@');
-  if (parts.length > 1) {
-    name = parts.shift();
-    range = parts.join('@');
-
-    if (range) {
-      hasVersion = true;
-    } else {
-      range = '*';
-    }
-  }
-
-  // add back @ scope suffix
-  if (isScoped) {
-    name = `@${name}`;
-  }
-
-  return { name, range, hasVersion };
-}
-
-/***/ }),
-/* 38 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(module) {var __WEBPACK_AMD_DEFINE_RESULT__;/**
- * @license
- * Lodash <https://lodash.com/>
- * Copyright JS Foundation and other contributors <https://js.foundation/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-;(function() {
-
-  /** Used as a safe reference for `undefined` in pre-ES5 environments. */
-  var undefined;
-
-  /** Used as the semantic version number. */
-  var VERSION = '4.17.10';
-
-  /** Used as the size to enable large array optimizations. */
-  var LARGE_ARRAY_SIZE = 200;
-
-  /** Error message constants. */
-  var CORE_ERROR_TEXT = 'Unsupported core-js use. Try https://npms.io/search?q=ponyfill.',
-      FUNC_ERROR_TEXT = 'Expected a function';
-
-  /** Used to stand-in for `undefined` hash values. */
-  var HASH_UNDEFINED = '__lodash_hash_undefined__';
-
-  /** Used as the maximum memoize cache size. */
-  var MAX_MEMOIZE_SIZE = 500;
-
-  /** Used as the internal argument placeholder. */
-  var PLACEHOLDER = '__lodash_placeholder__';
-
-  /** Used to compose bitmasks for cloning. */
-  var CLONE_DEEP_FLAG = 1,
-      CLONE_FLAT_FLAG = 2,
-      CLONE_SYMBOLS_FLAG = 4;
-
-  /** Used to compose bitmasks for value comparisons. */
-  var COMPARE_PARTIAL_FLAG = 1,
-      COMPARE_UNORDERED_FLAG = 2;
-
-  /** Used to compose bitmasks for function metadata. */
-  var WRAP_BIND_FLAG = 1,
-      WRAP_BIND_KEY_FLAG = 2,
-      WRAP_CURRY_BOUND_FLAG = 4,
-      WRAP_CURRY_FLAG = 8,
-      WRAP_CURRY_RIGHT_FLAG = 16,
-      WRAP_PARTIAL_FLAG = 32,
-      WRAP_PARTIAL_RIGHT_FLAG = 64,
-      WRAP_ARY_FLAG = 128,
-      WRAP_REARG_FLAG = 256,
-      WRAP_FLIP_FLAG = 512;
-
-  /** Used as default options for `_.truncate`. */
-  var DEFAULT_TRUNC_LENGTH = 30,
-      DEFAULT_TRUNC_OMISSION = '...';
-
-  /** Used to detect hot functions by number of calls within a span of milliseconds. */
-  var HOT_COUNT = 800,
-      HOT_SPAN = 16;
-
-  /** Used to indicate the type of lazy iteratees. */
-  var LAZY_FILTER_FLAG = 1,
-      LAZY_MAP_FLAG = 2,
-      LAZY_WHILE_FLAG = 3;
-
-  /** Used as references for various `Number` constants. */
-  var INFINITY = 1 / 0,
-      MAX_SAFE_INTEGER = 9007199254740991,
-      MAX_INTEGER = 1.7976931348623157e+308,
-      NAN = 0 / 0;
-
-  /** Used as references for the maximum length and index of an array. */
-  var MAX_ARRAY_LENGTH = 4294967295,
-      MAX_ARRAY_INDEX = MAX_ARRAY_LENGTH - 1,
-      HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;
-
-  /** Used to associate wrap methods with their bit flags. */
-  var wrapFlags = [
-    ['ary', WRAP_ARY_FLAG],
-    ['bind', WRAP_BIND_FLAG],
-    ['bindKey', WRAP_BIND_KEY_FLAG],
-    ['curry', WRAP_CURRY_FLAG],
-    ['curryRight', WRAP_CURRY_RIGHT_FLAG],
-    ['flip', WRAP_FLIP_FLAG],
-    ['partial', WRAP_PARTIAL_FLAG],
-    ['partialRight', WRAP_PARTIAL_RIGHT_FLAG],
-    ['rearg', WRAP_REARG_FLAG]
-  ];
-
-  /** `Object#toString` result references. */
-  var argsTag = '[object Arguments]',
-      arrayTag = '[object Array]',
-      asyncTag = '[object AsyncFunction]',
-      boolTag = '[object Boolean]',
-      dateTag = '[object Date]',
-      domExcTag = '[object DOMException]',
-      errorTag = '[object Error]',
-      funcTag = '[object Function]',
-      genTag = '[object GeneratorFunction]',
-      mapTag = '[object Map]',
-      numberTag = '[object Number]',
-      nullTag = '[object Null]',
-      objectTag = '[object Object]',
-      promiseTag = '[object Promise]',
-      proxyTag = '[object Proxy]',
-      regexpTag = '[object RegExp]',
-      setTag = '[object Set]',
-      stringTag = '[object String]',
-      symbolTag = '[object Symbol]',
-      undefinedTag = '[object Undefined]',
-      weakMapTag = '[object WeakMap]',
-      weakSetTag = '[object WeakSet]';
-
-  var arrayBufferTag = '[object ArrayBuffer]',
-      dataViewTag = '[object DataView]',
-      float32Tag = '[object Float32Array]',
-      float64Tag = '[object Float64Array]',
-      int8Tag = '[object Int8Array]',
-      int16Tag = '[object Int16Array]',
-      int32Tag = '[object Int32Array]',
-      uint8Tag = '[object Uint8Array]',
-      uint8ClampedTag = '[object Uint8ClampedArray]',
-      uint16Tag = '[object Uint16Array]',
-      uint32Tag = '[object Uint32Array]';
-
-  /** Used to match empty string literals in compiled template source. */
-  var reEmptyStringLeading = /\b__p \+= '';/g,
-      reEmptyStringMiddle = /\b(__p \+=) '' \+/g,
-      reEmptyStringTrailing = /(__e\(.*?\)|\b__t\)) \+\n'';/g;
-
-  /** Used to match HTML entities and HTML characters. */
-  var reEscapedHtml = /&(?:amp|lt|gt|quot|#39);/g,
-      reUnescapedHtml = /[&<>"']/g,
-      reHasEscapedHtml = RegExp(reEscapedHtml.source),
-      reHasUnescapedHtml = RegExp(reUnescapedHtml.source);
-
-  /** Used to match template delimiters. */
-  var reEscape = /<%-([\s\S]+?)%>/g,
-      reEvaluate = /<%([\s\S]+?)%>/g,
-      reInterpolate = /<%=([\s\S]+?)%>/g;
-
-  /** Used to match property names within property paths. */
-  var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
-      reIsPlainProp = /^\w*$/,
-      rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
-
-  /**
-   * Used to match `RegExp`
-   * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
-   */
-  var reRegExpChar = /[\\^$.*+?()[\]{}|]/g,
-      reHasRegExpChar = RegExp(reRegExpChar.source);
-
-  /** Used to match leading and trailing whitespace. */
-  var reTrim = /^\s+|\s+$/g,
-      reTrimStart = /^\s+/,
-      reTrimEnd = /\s+$/;
-
-  /** Used to match wrap detail comments. */
-  var reWrapComment = /\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,
-      reWrapDetails = /\{\n\/\* \[wrapped with (.+)\] \*/,
-      reSplitDetails = /,? & /;
-
-  /** Used to match words composed of alphanumeric characters. */
-  var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
-
-  /** Used to match backslashes in property paths. */
-  var reEscapeChar = /\\(\\)?/g;
-
-  /**
-   * Used to match
-   * [ES template delimiters](http://ecma-international.org/ecma-262/7.0/#sec-template-literal-lexical-components).
-   */
-  var reEsTemplate = /\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g;
-
-  /** Used to match `RegExp` flags from their coerced string values. */
-  var reFlags = /\w*$/;
-
-  /** Used to detect bad signed hexadecimal string values. */
-  var reIsBadHex = /^[-+]0x[0-9a-f]+$/i;
-
-  /** Used to detect binary string values. */
-  var reIsBinary = /^0b[01]+$/i;
-
-  /** Used to detect host constructors (Safari). */
-  var reIsHostCtor = /^\[object .+?Constructor\]$/;
-
-  /** Used to detect octal string values. */
-  var reIsOctal = /^0o[0-7]+$/i;
-
-  /** Used to detect unsigned integer values. */
-  var reIsUint = /^(?:0|[1-9]\d*)$/;
-
-  /** Used to match Latin Unicode letters (excluding mathematical operators). */
-  var reLatin = /[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g;
-
-  /** Used to ensure capturing order of template delimiters. */
-  var reNoMatch = /($^)/;
-
-  /** Used to match unescaped characters in compiled string literals. */
-  var reUnescapedString = /['\n\r\u2028\u2029\\]/g;
-
-  /** Used to compose unicode character classes. */
-  var rsAstralRange = '\\ud800-\\udfff',
-      rsComboMarksRange = '\\u0300-\\u036f',
-      reComboHalfMarksRange = '\\ufe20-\\ufe2f',
-      rsComboSymbolsRange = '\\u20d0-\\u20ff',
-      rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange,
-      rsDingbatRange = '\\u2700-\\u27bf',
-      rsLowerRange = 'a-z\\xdf-\\xf6\\xf8-\\xff',
-      rsMathOpRange = '\\xac\\xb1\\xd7\\xf7',
-      rsNonCharRange = '\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf',
-      rsPunctuationRange = '\\u2000-\\u206f',
-      rsSpaceRange = ' \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000',
-      rsUpperRange = 'A-Z\\xc0-\\xd6\\xd8-\\xde',
-      rsVarRange = '\\ufe0e\\ufe0f',
-      rsBreakRange = rsMathOpRange + rsNonCharRange + rsPunctuationRange + rsSpaceRange;
-
-  /** Used to compose unicode capture groups. */
-  var rsApos = "['\u2019]",
-      rsAstral = '[' + rsAstralRange + ']',
-      rsBreak = '[' + rsBreakRange + ']',
-      rsCombo = '[' + rsComboRange + ']',
-      rsDigits = '\\d+',
-      rsDingbat = '[' + rsDingbatRange + ']',
-      rsLower = '[' + rsLowerRange + ']',
-      rsMisc = '[^' + rsAstralRange + rsBreakRange + rsDigits + rsDingbatRange + rsLowerRange + rsUpperRange + ']',
-      rsFitz = '\\ud83c[\\udffb-\\udfff]',
-      rsModifier = '(?:' + rsCombo + '|' + rsFitz + ')',
-      rsNonAstral = '[^' + rsAstralRange + ']',
-      rsRegional = '(?:\\ud83c[\\udde6-\\uddff]){2}',
-      rsSurrPair = '[\\ud800-\\udbff][\\udc00-\\udfff]',
-      rsUpper = '[' + rsUpperRange + ']',
-      rsZWJ = '\\u200d';
-
-  /** Used to compose unicode regexes. */
-  var rsMiscLower = '(?:' + rsLower + '|' + rsMisc + ')',
-      rsMiscUpper = '(?:' + rsUpper + '|' + rsMisc + ')',
-      rsOptContrLower = '(?:' + rsApos + '(?:d|ll|m|re|s|t|ve))?',
-      rsOptContrUpper = '(?:' + rsApos + '(?:D|LL|M|RE|S|T|VE))?',
-      reOptMod = rsModifier + '?',
-      rsOptVar = '[' + rsVarRange + ']?',
-      rsOptJoin = '(?:' + rsZWJ + '(?:' + [rsNonAstral, rsRegional, rsSurrPair].join('|') + ')' + rsOptVar + reOptMod + ')*',
-      rsOrdLower = '\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])',
-      rsOrdUpper = '\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])',
-      rsSeq = rsOptVar + reOptMod + rsOptJoin,
-      rsEmoji = '(?:' + [rsDingbat, rsRegional, rsSurrPair].join('|') + ')' + rsSeq,
-      rsSymbol = '(?:' + [rsNonAstral + rsCombo + '?', rsCombo, rsRegional, rsSurrPair, rsAstral].join('|') + ')';
-
-  /** Used to match apostrophes. */
-  var reApos = RegExp(rsApos, 'g');
-
-  /**
-   * Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks) and
-   * [combining diacritical marks for symbols](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks_for_Symbols).
-   */
-  var reComboMark = RegExp(rsCombo, 'g');
-
-  /** Used to match [string symbols](https://mathiasbynens.be/notes/javascript-unicode). */
-  var reUnicode = RegExp(rsFitz + '(?=' + rsFitz + ')|' + rsSymbol + rsSeq, 'g');
-
-  /** Used to match complex or compound words. */
-  var reUnicodeWord = RegExp([
-    rsUpper + '?' + rsLower + '+' + rsOptContrLower + '(?=' + [rsBreak, rsUpper, '$'].join('|') + ')',
-    rsMiscUpper + '+' + rsOptContrUpper + '(?=' + [rsBreak, rsUpper + rsMiscLower, '$'].join('|') + ')',
-    rsUpper + '?' + rsMiscLower + '+' + rsOptContrLower,
-    rsUpper + '+' + rsOptContrUpper,
-    rsOrdUpper,
-    rsOrdLower,
-    rsDigits,
-    rsEmoji
-  ].join('|'), 'g');
-
-  /** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */
-  var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange  + rsComboRange + rsVarRange + ']');
-
-  /** Used to detect strings that need a more robust regexp to match words. */
-  var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
-
-  /** Used to assign default `context` object properties. */
-  var contextProps = [
-    'Array', 'Buffer', 'DataView', 'Date', 'Error', 'Float32Array', 'Float64Array',
-    'Function', 'Int8Array', 'Int16Array', 'Int32Array', 'Map', 'Math', 'Object',
-    'Promise', 'RegExp', 'Set', 'String', 'Symbol', 'TypeError', 'Uint8Array',
-    'Uint8ClampedArray', 'Uint16Array', 'Uint32Array', 'WeakMap',
-    '_', 'clearTimeout', 'isFinite', 'parseInt', 'setTimeout'
-  ];
-
-  /** Used to make template sourceURLs easier to identify. */
-  var templateCounter = -1;
-
-  /** Used to identify `toStringTag` values of typed arrays. */
-  var typedArrayTags = {};
-  typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
-  typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
-  typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
-  typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
-  typedArrayTags[uint32Tag] = true;
-  typedArrayTags[argsTag] = typedArrayTags[arrayTag] =
-  typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =
-  typedArrayTags[dataViewTag] = typedArrayTags[dateTag] =
-  typedArrayTags[errorTag] = typedArrayTags[funcTag] =
-  typedArrayTags[mapTag] = typedArrayTags[numberTag] =
-  typedArrayTags[objectTag] = typedArrayTags[regexpTag] =
-  typedArrayTags[setTag] = typedArrayTags[stringTag] =
-  typedArrayTags[weakMapTag] = false;
-
-  /** Used to identify `toStringTag` values supported by `_.clone`. */
-  var cloneableTags = {};
-  cloneableTags[argsTag] = cloneableTags[arrayTag] =
-  cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] =
-  cloneableTags[boolTag] = cloneableTags[dateTag] =
-  cloneableTags[float32Tag] = cloneableTags[float64Tag] =
-  cloneableTags[int8Tag] = cloneableTags[int16Tag] =
-  cloneableTags[int32Tag] = cloneableTags[mapTag] =
-  cloneableTags[numberTag] = cloneableTags[objectTag] =
-  cloneableTags[regexpTag] = cloneableTags[setTag] =
-  cloneableTags[stringTag] = cloneableTags[symbolTag] =
-  cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
-  cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
-  cloneableTags[errorTag] = cloneableTags[funcTag] =
-  cloneableTags[weakMapTag] = false;
-
-  /** Used to map Latin Unicode letters to basic Latin letters. */
-  var deburredLetters = {
-    // Latin-1 Supplement block.
-    '\xc0': 'A',  '\xc1': 'A', '\xc2': 'A', '\xc3': 'A', '\xc4': 'A', '\xc5': 'A',
-    '\xe0': 'a',  '\xe1': 'a', '\xe2': 'a', '\xe3': 'a', '\xe4': 'a', '\xe5': 'a',
-    '\xc7': 'C',  '\xe7': 'c',
-    '\xd0': 'D',  '\xf0': 'd',
-    '\xc8': 'E',  '\xc9': 'E', '\xca': 'E', '\xcb': 'E',
-    '\xe8': 'e',  '\xe9': 'e', '\xea': 'e', '\xeb': 'e',
-    '\xcc': 'I',  '\xcd': 'I', '\xce': 'I', '\xcf': 'I',
-    '\xec': 'i',  '\xed': 'i', '\xee': 'i', '\xef': 'i',
-    '\xd1': 'N',  '\xf1': 'n',
-    '\xd2': 'O',  '\xd3': 'O', '\xd4': 'O', '\xd5': 'O', '\xd6': 'O', '\xd8': 'O',
-    '\xf2': 'o',  '\xf3': 'o', '\xf4': 'o', '\xf5': 'o', '\xf6': 'o', '\xf8': 'o',
-    '\xd9': 'U',  '\xda': 'U', '\xdb': 'U', '\xdc': 'U',
-    '\xf9': 'u',  '\xfa': 'u', '\xfb': 'u', '\xfc': 'u',
-    '\xdd': 'Y',  '\xfd': 'y', '\xff': 'y',
-    '\xc6': 'Ae', '\xe6': 'ae',
-    '\xde': 'Th', '\xfe': 'th',
-    '\xdf': 'ss',
-    // Latin Extended-A block.
-    '\u0100': 'A',  '\u0102': 'A', '\u0104': 'A',
-    '\u0101': 'a',  '\u0103': 'a', '\u0105': 'a',
-    '\u0106': 'C',  '\u0108': 'C', '\u010a': 'C', '\u010c': 'C',
-    '\u0107': 'c',  '\u0109': 'c', '\u010b': 'c', '\u010d': 'c',
-    '\u010e': 'D',  '\u0110': 'D', '\u010f': 'd', '\u0111': 'd',
-    '\u0112': 'E',  '\u0114': 'E', '\u0116': 'E', '\u0118': 'E', '\u011a': 'E',
-    '\u0113': 'e',  '\u0115': 'e', '\u0117': 'e', '\u0119': 'e', '\u011b': 'e',
-    '\u011c': 'G',  '\u011e': 'G', '\u0120': 'G', '\u0122': 'G',
-    '\u011d': 'g',  '\u011f': 'g', '\u0121': 'g', '\u0123': 'g',
-    '\u0124': 'H',  '\u0126': 'H', '\u0125': 'h', '\u0127': 'h',
-    '\u0128': 'I',  '\u012a': 'I', '\u012c': 'I', '\u012e': 'I', '\u0130': 'I',
-    '\u0129': 'i',  '\u012b': 'i', '\u012d': 'i', '\u012f': 'i', '\u0131': 'i',
-    '\u0134': 'J',  '\u0135': 'j',
-    '\u0136': 'K',  '\u0137': 'k', '\u0138': 'k',
-    '\u0139': 'L',  '\u013b': 'L', '\u013d': 'L', '\u013f': 'L', '\u0141': 'L',
-    '\u013a': 'l',  '\u013c': 'l', '\u013e': 'l', '\u0140': 'l', '\u0142': 'l',
-    '\u0143': 'N',  '\u0145': 'N', '\u0147': 'N', '\u014a': 'N',
-    '\u0144': 'n',  '\u0146': 'n', '\u0148': 'n', '\u014b': 'n',
-    '\u014c': 'O',  '\u014e': 'O', '\u0150': 'O',
-    '\u014d': 'o',  '\u014f': 'o', '\u0151': 'o',
-    '\u0154': 'R',  '\u0156': 'R', '\u0158': 'R',
-    '\u0155': 'r',  '\u0157': 'r', '\u0159': 'r',
-    '\u015a': 'S',  '\u015c': 'S', '\u015e': 'S', '\u0160': 'S',
-    '\u015b': 's',  '\u015d': 's', '\u015f': 's', '\u0161': 's',
-    '\u0162': 'T',  '\u0164': 'T', '\u0166': 'T',
-    '\u0163': 't',  '\u0165': 't', '\u0167': 't',
-    '\u0168': 'U',  '\u016a': 'U', '\u016c': 'U', '\u016e': 'U', '\u0170': 'U', '\u0172': 'U',
-    '\u0169': 'u',  '\u016b': 'u', '\u016d': 'u', '\u016f': 'u', '\u0171': 'u', '\u0173': 'u',
-    '\u0174': 'W',  '\u0175': 'w',
-    '\u0176': 'Y',  '\u0177': 'y', '\u0178': 'Y',
-    '\u0179': 'Z',  '\u017b': 'Z', '\u017d': 'Z',
-    '\u017a': 'z',  '\u017c': 'z', '\u017e': 'z',
-    '\u0132': 'IJ', '\u0133': 'ij',
-    '\u0152': 'Oe', '\u0153': 'oe',
-    '\u0149': "'n", '\u017f': 's'
-  };
-
-  /** Used to map characters to HTML entities. */
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#39;'
-  };
-
-  /** Used to map HTML entities to characters. */
-  var htmlUnescapes = {
-    '&amp;': '&',
-    '&lt;': '<',
-    '&gt;': '>',
-    '&quot;': '"',
-    '&#39;': "'"
-  };
-
-  /** Used to escape characters for inclusion in compiled string literals. */
-  var stringEscapes = {
-    '\\': '\\',
-    "'": "'",
-    '\n': 'n',
-    '\r': 'r',
-    '\u2028': 'u2028',
-    '\u2029': 'u2029'
-  };
-
-  /** Built-in method references without a dependency on `root`. */
-  var freeParseFloat = parseFloat,
-      freeParseInt = parseInt;
-
-  /** Detect free variable `global` from Node.js. */
-  var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
-
-  /** Detect free variable `self`. */
-  var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
-
-  /** Used as a reference to the global object. */
-  var root = freeGlobal || freeSelf || Function('return this')();
-
-  /** Detect free variable `exports`. */
-  var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports;
-
-  /** Detect free variable `module`. */
-  var freeModule = freeExports && typeof module == 'object' && module && !module.nodeType && module;
-
-  /** Detect the popular CommonJS extension `module.exports`. */
-  var moduleExports = freeModule && freeModule.exports === freeExports;
-
-  /** Detect free variable `process` from Node.js. */
-  var freeProcess = moduleExports && freeGlobal.process;
-
-  /** Used to access faster Node.js helpers. */
-  var nodeUtil = (function() {
-    try {
-      // Use `util.types` for Node.js 10+.
-      var types = freeModule && freeModule.require && freeModule.require('util').types;
-
-      if (types) {
-        return types;
-      }
-
-      // Legacy `process.binding('util')` for Node.js < 10.
-      return freeProcess && freeProcess.binding && freeProcess.binding('util');
-    } catch (e) {}
-  }());
-
-  /* Node.js helper references. */
-  var nodeIsArrayBuffer = nodeUtil && nodeUtil.isArrayBuffer,
-      nodeIsDate = nodeUtil && nodeUtil.isDate,
-      nodeIsMap = nodeUtil && nodeUtil.isMap,
-      nodeIsRegExp = nodeUtil && nodeUtil.isRegExp,
-      nodeIsSet = nodeUtil && nodeUtil.isSet,
-      nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * A faster alternative to `Function#apply`, this function invokes `func`
-   * with the `this` binding of `thisArg` and the arguments of `args`.
-   *
-   * @private
-   * @param {Function} func The function to invoke.
-   * @param {*} thisArg The `this` binding of `func`.
-   * @param {Array} args The arguments to invoke `func` with.
-   * @returns {*} Returns the result of `func`.
-   */
-  function apply(func, thisArg, args) {
-    switch (args.length) {
-      case 0: return func.call(thisArg);
-      case 1: return func.call(thisArg, args[0]);
-      case 2: return func.call(thisArg, args[0], args[1]);
-      case 3: return func.call(thisArg, args[0], args[1], args[2]);
-    }
-    return func.apply(thisArg, args);
-  }
-
-  /**
-   * A specialized version of `baseAggregator` for arrays.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} setter The function to set `accumulator` values.
-   * @param {Function} iteratee The iteratee to transform keys.
-   * @param {Object} accumulator The initial aggregated object.
-   * @returns {Function} Returns `accumulator`.
-   */
-  function arrayAggregator(array, setter, iteratee, accumulator) {
-    var index = -1,
-        length = array == null ? 0 : array.length;
-
-    while (++index < length) {
-      var value = array[index];
-      setter(accumulator, value, iteratee(value), array);
-    }
-    return accumulator;
-  }
-
-  /**
-   * A specialized version of `_.forEach` for arrays without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @returns {Array} Returns `array`.
-   */
-  function arrayEach(array, iteratee) {
-    var index = -1,
-        length = array == null ? 0 : array.length;
-
-    while (++index < length) {
-      if (iteratee(array[index], index, array) === false) {
-        break;
-      }
-    }
-    return array;
-  }
-
-  /**
-   * A specialized version of `_.forEachRight` for arrays without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @returns {Array} Returns `array`.
-   */
-  function arrayEachRight(array, iteratee) {
-    var length = array == null ? 0 : array.length;
-
-    while (length--) {
-      if (iteratee(array[length], length, array) === false) {
-        break;
-      }
-    }
-    return array;
-  }
-
-  /**
-   * A specialized version of `_.every` for arrays without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} predicate The function invoked per iteration.
-   * @returns {boolean} Returns `true` if all elements pass the predicate check,
-   *  else `false`.
-   */
-  function arrayEvery(array, predicate) {
-    var index = -1,
-        length = array == null ? 0 : array.length;
-
-    while (++index < length) {
-      if (!predicate(array[index], index, array)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * A specialized version of `_.filter` for arrays without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} predicate The function invoked per iteration.
-   * @returns {Array} Returns the new filtered array.
-   */
-  function arrayFilter(array, predicate) {
-    var index = -1,
-        length = array == null ? 0 : array.length,
-        resIndex = 0,
-        result = [];
-
-    while (++index < length) {
-      var value = array[index];
-      if (predicate(value, index, array)) {
-        result[resIndex++] = value;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * A specialized version of `_.includes` for arrays without support for
-   * specifying an index to search from.
-   *
-   * @private
-   * @param {Array} [array] The array to inspect.
-   * @param {*} target The value to search for.
-   * @returns {boolean} Returns `true` if `target` is found, else `false`.
-   */
-  function arrayIncludes(array, value) {
-    var length = array == null ? 0 : array.length;
-    return !!length && baseIndexOf(array, value, 0) > -1;
-  }
-
-  /**
-   * This function is like `arrayIncludes` except that it accepts a comparator.
-   *
-   * @private
-   * @param {Array} [array] The array to inspect.
-   * @param {*} target The value to search for.
-   * @param {Function} comparator The comparator invoked per element.
-   * @returns {boolean} Returns `true` if `target` is found, else `false`.
-   */
-  function arrayIncludesWith(array, value, comparator) {
-    var index = -1,
-        length = array == null ? 0 : array.length;
-
-    while (++index < length) {
-      if (comparator(value, array[index])) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * A specialized version of `_.map` for arrays without support for iteratee
-   * shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @returns {Array} Returns the new mapped array.
-   */
-  function arrayMap(array, iteratee) {
-    var index = -1,
-        length = array == null ? 0 : array.length,
-        result = Array(length);
-
-    while (++index < length) {
-      result[index] = iteratee(array[index], index, array);
-    }
-    return result;
-  }
-
-  /**
-   * Appends the elements of `values` to `array`.
-   *
-   * @private
-   * @param {Array} array The array to modify.
-   * @param {Array} values The values to append.
-   * @returns {Array} Returns `array`.
-   */
-  function arrayPush(array, values) {
-    var index = -1,
-        length = values.length,
-        offset = array.length;
-
-    while (++index < length) {
-      array[offset + index] = values[index];
-    }
-    return array;
-  }
-
-  /**
-   * A specialized version of `_.reduce` for arrays without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @param {*} [accumulator] The initial value.
-   * @param {boolean} [initAccum] Specify using the first element of `array` as
-   *  the initial value.
-   * @returns {*} Returns the accumulated value.
-   */
-  function arrayReduce(array, iteratee, accumulator, initAccum) {
-    var index = -1,
-        length = array == null ? 0 : array.length;
-
-    if (initAccum && length) {
-      accumulator = array[++index];
-    }
-    while (++index < length) {
-      accumulator = iteratee(accumulator, array[index], index, array);
-    }
-    return accumulator;
-  }
-
-  /**
-   * A specialized version of `_.reduceRight` for arrays without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @param {*} [accumulator] The initial value.
-   * @param {boolean} [initAccum] Specify using the last element of `array` as
-   *  the initial value.
-   * @returns {*} Returns the accumulated value.
-   */
-  function arrayReduceRight(array, iteratee, accumulator, initAccum) {
-    var length = array == null ? 0 : array.length;
-    if (initAccum && length) {
-      accumulator = array[--length];
-    }
-    while (length--) {
-      accumulator = iteratee(accumulator, array[length], length, array);
-    }
-    return accumulator;
-  }
-
-  /**
-   * A specialized version of `_.some` for arrays without support for iteratee
-   * shorthands.
-   *
-   * @private
-   * @param {Array} [array] The array to iterate over.
-   * @param {Function} predicate The function invoked per iteration.
-   * @returns {boolean} Returns `true` if any element passes the predicate check,
-   *  else `false`.
-   */
-  function arraySome(array, predicate) {
-    var index = -1,
-        length = array == null ? 0 : array.length;
-
-    while (++index < length) {
-      if (predicate(array[index], index, array)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Gets the size of an ASCII `string`.
-   *
-   * @private
-   * @param {string} string The string inspect.
-   * @returns {number} Returns the string size.
-   */
-  var asciiSize = baseProperty('length');
-
-  /**
-   * Converts an ASCII `string` to an array.
-   *
-   * @private
-   * @param {string} string The string to convert.
-   * @returns {Array} Returns the converted array.
-   */
-  function asciiToArray(string) {
-    return string.split('');
-  }
-
-  /**
-   * Splits an ASCII `string` into an array of its words.
-   *
-   * @private
-   * @param {string} The string to inspect.
-   * @returns {Array} Returns the words of `string`.
-   */
-  function asciiWords(string) {
-    return string.match(reAsciiWord) || [];
-  }
-
-  /**
-   * The base implementation of methods like `_.findKey` and `_.findLastKey`,
-   * without support for iteratee shorthands, which iterates over `collection`
-   * using `eachFunc`.
-   *
-   * @private
-   * @param {Array|Object} collection The collection to inspect.
-   * @param {Function} predicate The function invoked per iteration.
-   * @param {Function} eachFunc The function to iterate over `collection`.
-   * @returns {*} Returns the found element or its key, else `undefined`.
-   */
-  function baseFindKey(collection, predicate, eachFunc) {
-    var result;
-    eachFunc(collection, function(value, key, collection) {
-      if (predicate(value, key, collection)) {
-        result = key;
-        return false;
-      }
-    });
-    return result;
-  }
-
-  /**
-   * The base implementation of `_.findIndex` and `_.findLastIndex` without
-   * support for iteratee shorthands.
-   *
-   * @private
-   * @param {Array} array The array to inspect.
-   * @param {Function} predicate The function invoked per iteration.
-   * @param {number} fromIndex The index to search from.
-   * @param {boolean} [fromRight] Specify iterating from right to left.
-   * @returns {number} Returns the index of the matched value, else `-1`.
-   */
-  function baseFindIndex(array, predicate, fromIndex, fromRight) {
-    var length = array.length,
-        index = fromIndex + (fromRight ? 1 : -1);
-
-    while ((fromRight ? index-- : ++index < length)) {
-      if (predicate(array[index], index, array)) {
-        return index;
-      }
-    }
-    return -1;
-  }
-
-  /**
-   * The base implementation of `_.indexOf` without `fromIndex` bounds checks.
-   *
-   * @private
-   * @param {Array} array The array to inspect.
-   * @param {*} value The value to search for.
-   * @param {number} fromIndex The index to search from.
-   * @returns {number} Returns the index of the matched value, else `-1`.
-   */
-  function baseIndexOf(array, value, fromIndex) {
-    return value === value
-      ? strictIndexOf(array, value, fromIndex)
-      : baseFindIndex(array, baseIsNaN, fromIndex);
-  }
-
-  /**
-   * This function is like `baseIndexOf` except that it accepts a comparator.
-   *
-   * @private
-   * @param {Array} array The array to inspect.
-   * @param {*} value The value to search for.
-   * @param {number} fromIndex The index to search from.
-   * @param {Function} comparator The comparator invoked per element.
-   * @returns {number} Returns the index of the matched value, else `-1`.
-   */
-  function baseIndexOfWith(array, value, fromIndex, comparator) {
-    var index = fromIndex - 1,
-        length = array.length;
-
-    while (++index < length) {
-      if (comparator(array[index], value)) {
-        return index;
-      }
-    }
-    return -1;
-  }
-
-  /**
-   * The base implementation of `_.isNaN` without support for number objects.
-   *
-   * @private
-   * @param {*} value The value to check.
-   * @returns {boolean} Returns `true` if `value` is `NaN`, else `false`.
-   */
-  function baseIsNaN(value) {
-    return value !== value;
-  }
-
-  /**
-   * The base implementation of `_.mean` and `_.meanBy` without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} array The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @returns {number} Returns the mean.
-   */
-  function baseMean(array, iteratee) {
-    var length = array == null ? 0 : array.length;
-    return length ? (baseSum(array, iteratee) / length) : NAN;
-  }
-
-  /**
-   * The base implementation of `_.property` without support for deep paths.
-   *
-   * @private
-   * @param {string} key The key of the property to get.
-   * @returns {Function} Returns the new accessor function.
-   */
-  function baseProperty(key) {
-    return function(object) {
-      return object == null ? undefined : object[key];
-    };
-  }
-
-  /**
-   * The base implementation of `_.propertyOf` without support for deep paths.
-   *
-   * @private
-   * @param {Object} object The object to query.
-   * @returns {Function} Returns the new accessor function.
-   */
-  function basePropertyOf(object) {
-    return function(key) {
-      return object == null ? undefined : object[key];
-    };
-  }
-
-  /**
-   * The base implementation of `_.reduce` and `_.reduceRight`, without support
-   * for iteratee shorthands, which iterates over `collection` using `eachFunc`.
-   *
-   * @private
-   * @param {Array|Object} collection The collection to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @param {*} accumulator The initial value.
-   * @param {boolean} initAccum Specify using the first or last element of
-   *  `collection` as the initial value.
-   * @param {Function} eachFunc The function to iterate over `collection`.
-   * @returns {*} Returns the accumulated value.
-   */
-  function baseReduce(collection, iteratee, accumulator, initAccum, eachFunc) {
-    eachFunc(collection, function(value, index, collection) {
-      accumulator = initAccum
-        ? (initAccum = false, value)
-        : iteratee(accumulator, value, index, collection);
-    });
-    return accumulator;
-  }
-
-  /**
-   * The base implementation of `_.sortBy` which uses `comparer` to define the
-   * sort order of `array` and replaces criteria objects with their corresponding
-   * values.
-   *
-   * @private
-   * @param {Array} array The array to sort.
-   * @param {Function} comparer The function to define sort order.
-   * @returns {Array} Returns `array`.
-   */
-  function baseSortBy(array, comparer) {
-    var length = array.length;
-
-    array.sort(comparer);
-    while (length--) {
-      array[length] = array[length].value;
-    }
-    return array;
-  }
-
-  /**
-   * The base implementation of `_.sum` and `_.sumBy` without support for
-   * iteratee shorthands.
-   *
-   * @private
-   * @param {Array} array The array to iterate over.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @returns {number} Returns the sum.
-   */
-  function baseSum(array, iteratee) {
-    var result,
-        index = -1,
-        length = array.length;
-
-    while (++index < length) {
-      var current = iteratee(array[index]);
-      if (current !== undefined) {
-        result = result === undefined ? current : (result + current);
-      }
-    }
-    return result;
-  }
-
-  /**
-   * The base implementation of `_.times` without support for iteratee shorthands
-   * or max array length checks.
-   *
-   * @private
-   * @param {number} n The number of times to invoke `iteratee`.
-   * @param {Function} iteratee The function invoked per iteration.
-   * @returns {Array} Returns the array of results.
-   */
-  function baseTimes(n, iteratee) {
-    var index = -1,
-        result = Array(n);
-
-    while (++index < n) {
-      result[index] = iteratee(index);
-    }
-    return result;
-  }
-
-  /**
-   * The base implementation of `_.toPairs` and `_.toPairsIn` which creates an array
-   * of key-value pairs for `object` corresponding to the property names of `props`.
-   *
-   * @private
-   * @param {Object} object The object to query.
-   * @param {Array} props The property names to get values for.
-   * @returns {Object} Returns the key-value pairs.
-   */
-  function baseToPairs(object, props) {
-    return arrayMap(props, function(key) {
-      return [key, object[key]];
-    });
-  }
-
-  /**
-   * The base implementation of `_.unary` without support for storing metadata.
-   *
-   * @private
-   * @param {Function} func The function to cap arguments for.
-   * @returns {Function} Returns the new capped function.
-   */
-  function baseUnary(func) {
-    return function(value) {
-      return func(value);
-    };
-  }
-
-  /**
-   * The base implementation of `_.values` and `_.valuesIn` which creates an
-   * array of `object` property values corresponding to the property names
-   * of `props`.
-   *
-   * @private
-   * @param {Object} object The object to query.
-   * @param {Array} props The property names to get values for.
-   * @returns {Object} Returns the array of property values.
-   */
-  function baseValues(object, props) {
-    return arrayMap(props, function(key) {
-      return object[key];
-    });
-  }
-
-  /**
-   * Checks if a `cache` value for `key` exists.
-   *
-   * @private
-   * @param {Object} cache The cache to query.
-   * @param {string} key The key of the entry to check.
-   * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
-   */
-  function cacheHas(cache, key) {
-    return cache.has(key);
-  }
-
-  /**
-   * Used by `_.trim` and `_.trimStart` to get the index of the first string symbol
-   * that is not found in the character symbols.
-   *
-   * @private
-   * @param {Array} strSymbols The string symbols to inspect.
-   * @param {Array} chrSymbols The character symbols to find.
-   * @returns {number} Returns the index of the first unmatched string symbol.
-   */
-  function charsStartIndex(strSymbols, chrSymbols) {
-    var index = -1,
-        length = strSymbols.length;
-
-    while (++index < length && baseIndexOf(chrSymbols, strSymbols[index], 0) > -1) {}
-    return index;
-  }
-
-  /**
-   * Used by `_.trim` and `_.trimEnd` to get the index of the last string symbol
-   * that is not found in the character symbols.
-   *
-   * @private
-   * @param {Array} strSymbols The string symbols to inspect.
-   * @param {Array} chrSymbols The character symbols to find.
-   * @returns {number} Returns the index of the last unmatched string symbol.
-   */
-  function charsEndIndex(strSymbols, chrSymbols) {
-    var index = strSymbols.length;
-
-    while (index-- && baseIndexOf(chrSymbols, strSymbols[index], 0) > -1) {}
-    return index;
-  }
-
-  /**
-   * Gets the number of `placeholder` occurrences in `array`.
-   *
-   * @private
-   * @param {Array} array The array to inspect.
-   * @param {*} placeholder The placeholder to search for.
-   * @returns {number} Returns the placeholder count.
-   */
-  function countHolders(array, placeholder) {
-    var length = array.length,
-        result = 0;
-
-    while (length--) {
-      if (array[length] === placeholder) {
-        ++result;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Used by `_.deburr` to convert Latin-1 Supplement and Latin Extended-A
-   * letters to basic Latin letters.
-   *
-   * @private
-   * @param {string} letter The matched letter to deburr.
-   * @returns {string} Returns the deburred letter.
-   */
-  var deburrLetter = basePropertyOf(deburredLetters);
-
-  /**
-   * Used by `_.escape` to convert characters to HTML entities.
-   *
-   * @private
-   * @param {string} chr The matched character to escape.
-   * @returns {string} Returns the escaped character.
-   */
-  var escapeHtmlChar = basePropertyOf(htmlEscapes);
-
-  /**
-   * Used by `_.template` to escape characters for inclusion in compiled string literals.
-   *
-   * @private
-   * @param {string} chr The matched character to escape.
-   * @returns {string} Returns the escaped character.
-   */
-  function escapeStringChar(chr) {
-    return '\\' + stringEscapes[chr];
-  }
-
-  /**
-   * Gets the value at `key` of `object`.
-   *
-   * @private
-   * @param {Object} [object] The object to query.
-   * @param {string} key The key of the property to get.
-   * @returns {*} Returns the property value.
-   */
-  function getValue(object, key) {
-    return object == null ? undefined : object[key];
-  }
-
-  /**
-   * Checks if `string` contains Unicode symbols.
-   *
-   * @private
-   * @param {string} string The string to inspect.
-   * @returns {boolean} Returns `true` if a symbol is found, else `false`.
-   */
-  function hasUnicode(string) {
-    return reHasUnicode.test(string);
-  }
-
-  /**
-   * Checks if `string` contains a word composed of Unicode symbols.
-   *
-   * @private
-   * @param {string} string The string to inspect.
-   * @returns {boolean} Returns `true` if a word is found, else `false`.
-   */
-  function hasUnicodeWord(string) {
-    return reHasUnicodeWord.test(string);
-  }
-
-  /**
-   * Converts `iterator` to an array.
-   *
-   * @private
-   * @param {Object} iterator The iterator to convert.
-   * @returns {Array} Returns the converted array.
-   */
-  function iteratorToArray(iterator) {
-    var data,
-        result = [];
-
-    while (!(data = iterator.next()).done) {
-      result.push(data.value);
-    }
-    return result;
-  }
-
-  /**
-   * Converts `map` to its key-value pairs.
-   *
-   * @private
-   * @param {Object} map The map to convert.
-   * @returns {Array} Returns the key-value pairs.
-   */
-  function mapToArray(map) {
-    var index = -1,
-        result = Array(map.size);
-
-    map.forEach(function(value, key) {
-      result[++index] = [key, value];
-    });
-    return result;
-  }
-
-  /**
-   * Creates a unary function that invokes `func` with its argument transformed.
-   *
-   * @private
-   * @param {Function} func The function to wrap.
-   * @param {Function} transform The argument transform.
-   * @returns {Function} Returns the new function.
-   */
-  function overArg(func, transform) {
-    return function(arg) {
-      return func(transform(arg));
-    };
-  }
-
-  /**
-   * Replaces all `placeholder` elements in `array` with an internal placeholder
-   * and returns an array of their indexes.
-   *
-   * @private
-   * @param {Array} array The array to modify.
-   * @param {*} placeholder The placeholder to replace.
-   * @returns {Array} Returns the new array of placeholder indexes.
-   */
-  function replaceHolders(array, placeholder) {
-    var index = -1,
-        length = array.length,
-        resIndex = 0,
-        result = [];
-
-    while (++index < length) {
-      var value = array[index];
-      if (value === placeholder || value === PLACEHOLDER) {
-        array[index] = PLACEHOLDER;
-        result[resIndex++] = index;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Gets the value at `key`, unless `key` is "__proto__".
-   *
-   * @private
-   * @param {Object} object The object to query.
-   * @param {string} key The key of the property to get.
-   * @returns {*} Returns the property value.
-   */
-  function safeGet(object, key) {
-    return key == '__proto__'
-      ? undefined
-      : object[key];
-  }
-
-  /**
-   * Converts `set` to an array of its values.
-   *
-   * @private
-   * @param {Object} set The set to convert.
-   * @returns {Array} Returns the values.
-   */
-  function setToArray(set) {
-    var index = -1,
-        result = Array(set.size);
-
-    set.forEach(function(value) {
-      result[++index] = value;
-    });
-    return result;
-  }
-
-  /**
-   * Converts `set` to its value-value pairs.
-   *
-   * @private
-   * @param {Object} set The set to convert.
-   * @returns {Array} Returns the value-value pairs.
-   */
-  function setToPairs(set) {
-    var index = -1,
-        result = Array(set.size);
-
-    set.forEach(function(value) {
-      result[++index] = [value, value];
-    });
-    return result;
-  }
-
-  /**
-   * A specialized version of `_.indexOf` which performs strict equality
-   * comparisons of values, i.e. `===`.
-   *
-   * @private
-   * @param {Array} array The array to inspect.
-   * @param {*} value The value to search for.
-   * @param {number} fromIndex The index to search from.
-   * @returns {number} Returns the index of the matched value, else `-1`.
-   */
-  function strictIndexOf(array, value, fromIndex) {
-    var index = fromIndex - 1,
-        length = array.length;
-
-    while (++index < length) {
-      if (array[index] === value) {
-        return index;
-      }
-    }
-    return -1;
-  }
-
-  /**
-   * A specialized version of `_.lastIndexOf` which performs strict equality
-   * comparisons of values, i.e. `===`.
-   *
-   * @private
-   * @param {Array} array The array to inspect.
-   * @param {*} value The value to search for.
-   * @param {number} fromIndex The index to search from.
-   * @returns {number} Returns the index of the matched value, else `-1`.
-   */
-  function strictLastIndexOf(array, value, fromIndex) {
-    var index = fromIndex + 1;
-    while (index--) {
-      if (array[index] === value) {
-        return index;
-      }
-    }
-    return index;
-  }
-
-  /**
-   * Gets the number of symbols in `string`.
-   *
-   * @private
-   * @param {string} string The string to inspect.
-   * @returns {number} Returns the string size.
-   */
-  function stringSize(string) {
-    return hasUnicode(string)
-      ? unicodeSize(string)
-      : asciiSize(string);
-  }
-
-  /**
-   * Converts `string` to an array.
-   *
-   * @private
-   * @param {string} string The string to convert.
-   * @returns {Array} Returns the converted array.
-   */
-  function stringToArray(string) {
-    return hasUnicode(string)
-      ? unicodeToArray(string)
-      : asciiToArray(string);
-  }
-
-  /**
-   * Used by `_.unescape` to convert HTML entities to characters.
-   *
-   * @private
-   * @param {string} chr The matched character to unescape.
-   * @returns {string} Returns the unescaped character.
-   */
-  var unescapeHtmlChar = basePropertyOf(htmlUnescapes);
-
-  /**
-   * Gets the size of a Unicode `string`.
-   *
-   * @private
-   * @param {string} string The string inspect.
-   * @returns {number} Returns the string size.
-   */
-  function unicodeSize(string) {
-    var result = reUnicode.lastIndex = 0;
-    while (reUnicode.test(string)) {
-      ++result;
-    }
-    return result;
-  }
-
-  /**
-   * Converts a Unicode `string` to an array.
-   *
-   * @private
-   * @param {string} string The string to convert.
-   * @returns {Array} Returns the converted array.
-   */
-  function unicodeToArray(string) {
-    return string.match(reUnicode) || [];
-  }
-
-  /**
-   * Splits a Unicode `string` into an array of its words.
-   *
-   * @private
-   * @param {string} The string to inspect.
-   * @returns {Array} Returns the words of `string`.
-   */
-  function unicodeWords(string) {
-    return string.match(reUnicodeWord) || [];
-  }
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * Create a new pristine `lodash` function using the `context` object.
-   *
-   * @static
-   * @memberOf _
-   * @since 1.1.0
-   * @category Util
-   * @param {Object} [context=root] The context object.
-   * @returns {Function} Returns a new `lodash` function.
-   * @example
-   *
-   * _.mixin({ 'foo': _.constant('foo') });
-   *
-   * var lodash = _.runInContext();
-   * lodash.mixin({ 'bar': lodash.constant('bar') });
-   *
-   * _.isFunction(_.foo);
-   * // => true
-   * _.isFunction(_.bar);
-   * // => false
-   *
-   * lodash.isFunction(lodash.foo);
-   * // => false
-   * lodash.isFunction(lodash.bar);
-   * // => true
-   *
-   * // Create a suped-up `defer` in Node.js.
-   * var defer = _.runInContext({ 'setTimeout': setImmediate }).defer;
-   */
-  var runInContext = (function runInContext(context) {
-    context = context == null ? root : _.defaults(root.Object(), context, _.pick(root, contextProps));
-
-    /** Built-in constructor references. */
-    var Array = context.Array,
-        Date = context.Date,
-        Error = context.Error,
-        Function = context.Function,
-        Math = context.Math,
-        Object = context.Object,
-        RegExp = context.RegExp,
-        String = context.String,
-        TypeError = context.TypeError;
-
-    /** Used for built-in method references. */
-    var arrayProto = Array.prototype,
-        funcProto = Function.prototype,
-        objectProto = Object.prototype;
-
-    /** Used to detect overreaching core-js shims. */
-    var coreJsData = context['__core-js_shared__'];
-
-    /** Used to resolve the decompiled source of functions. */
-    var funcToString = funcProto.toString;
-
-    /** Used to check objects for own properties. */
-    var hasOwnProperty = objectProto.hasOwnProperty;
-
-    /** Used to generate unique IDs. */
-    var idCounter = 0;
-
-    /** Used to detect methods masquerading as native. */
-    var maskSrcKey = (function() {
-      var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
-      return uid ? ('Symbol(src)_1.' + uid) : '';
-    }());
-
-    /**
-     * Used to resolve the
-     * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
-     * of values.
-     */
-    var nativeObjectToString = objectProto.toString;
-
-    /** Used to infer the `Object` constructor. */
-    var objectCtorString = funcToString.call(Object);
-
-    /** Used to restore the original `_` reference in `_.noConflict`. */
-    var oldDash = root._;
-
-    /** Used to detect if a method is native. */
-    var reIsNative = RegExp('^' +
-      funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
-      .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
-    );
-
-    /** Built-in value references. */
-    var Buffer = moduleExports ? context.Buffer : undefined,
-        Symbol = context.Symbol,
-        Uint8Array = context.Uint8Array,
-        allocUnsafe = Buffer ? Buffer.allocUnsafe : undefined,
-        getPrototype = overArg(Object.getPrototypeOf, Object),
-        objectCreate = Object.create,
-        propertyIsEnumerable = objectProto.propertyIsEnumerable,
-        splice = arrayProto.splice,
-        spreadableSymbol = Symbol ? Symbol.isConcatSpreadable : undefined,
-        symIterator = Symbol ? Symbol.iterator : undefined,
-        symToStringTag = Symbol ? Symbol.toStringTag : undefined;
-
-    var defineProperty = (function() {
-      try {
-        var func = getNative(Object, 'defineProperty');
-        func({}, '', {});
-        return func;
-      } catch (e) {}
-    }());
-
-    /** Mocked built-ins. */
-    var ctxClearTimeout = context.clearTimeout !== root.clearTimeout && context.clearTimeout,
-        ctxNow = Date && Date.now !== root.Date.now && Date.now,
-        ctxSetTimeout = context.setTimeout !== root.setTimeout && context.setTimeout;
-
-    /* Built-in method references for those with the same name as other `lodash` methods. */
-    var nativeCeil = Math.ceil,
-        nativeFloor = Math.floor,
-        nativeGetSymbols = Object.getOwnPropertySymbols,
-        nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined,
-        nativeIsFinite = context.isFinite,
-        nativeJoin = arrayProto.join,
-        nativeKeys = overArg(Object.keys, Object),
-        nativeMax = Math.max,
-        nativeMin = Math.min,
-        nativeNow = Date.now,
-        nativeParseInt = context.parseInt,
-        nativeRandom = Math.random,
-        nativeReverse = arrayProto.reverse;
-
-    /* Built-in method references that are verified to be native. */
-    var DataView = getNative(context, 'DataView'),
-        Map = getNative(context, 'Map'),
-        Promise = getNative(context, 'Promise'),
-        Set = getNative(context, 'Set'),
-        WeakMap = getNative(context, 'WeakMap'),
-        nativeCreate = getNative(Object, 'create');
-
-    /** Used to store function metadata. */
-    var metaMap = WeakMap && new WeakMap;
-
-    /** Used to lookup unminified function names. */
-    var realNames = {};
-
-    /** Used to detect maps, sets, and weakmaps. */
-    var dataViewCtorString = toSource(DataView),
-        mapCtorString = toSource(Map),
-        promiseCtorString = toSource(Promise),
-        setCtorString = toSource(Set),
-        weakMapCtorString = toSource(WeakMap);
-
-    /** Used to convert symbols to primitives and strings. */
-    var symbolProto = Symbol ? Symbol.prototype : undefined,
-        symbolValueOf = symbolProto ? symbolProto.valueOf : undefined,
-        symbolToString = symbolProto ? symbolProto.toString : undefined;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates a `lodash` object which wraps `value` to enable implicit method
-     * chain sequences. Methods that operate on and return arrays, collections,
-     * and functions can be chained together. Methods that retrieve a single value
-     * or may return a primitive value will automatically end the chain sequence
-     * and return the unwrapped value. Otherwise, the value must be unwrapped
-     * with `_#value`.
-     *
-     * Explicit chain sequences, which must be unwrapped with `_#value`, may be
-     * enabled using `_.chain`.
-     *
-     * The execution of chained methods is lazy, that is, it's deferred until
-     * `_#value` is implicitly or explicitly called.
-     *
-     * Lazy evaluation allows several methods to support shortcut fusion.
-     * Shortcut fusion is an optimization to merge iteratee calls; this avoids
-     * the creation of intermediate arrays and can greatly reduce the number of
-     * iteratee executions. Sections of a chain sequence qualify for shortcut
-     * fusion if the section is applied to an array and iteratees accept only
-     * one argument. The heuristic for whether a section qualifies for shortcut
-     * fusion is subject to change.
-     *
-     * Chaining is supported in custom builds as long as the `_#value` method is
-     * directly or indirectly included in the build.
-     *
-     * In addition to lodash methods, wrappers have `Array` and `String` methods.
-     *
-     * The wrapper `Array` methods are:
-     * `concat`, `join`, `pop`, `push`, `shift`, `sort`, `splice`, and `unshift`
-     *
-     * The wrapper `String` methods are:
-     * `replace` and `split`
-     *
-     * The wrapper methods that support shortcut fusion are:
-     * `at`, `compact`, `drop`, `dropRight`, `dropWhile`, `filter`, `find`,
-     * `findLast`, `head`, `initial`, `last`, `map`, `reject`, `reverse`, `slice`,
-     * `tail`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, and `toArray`
-     *
-     * The chainable wrapper methods are:
-     * `after`, `ary`, `assign`, `assignIn`, `assignInWith`, `assignWith`, `at`,
-     * `before`, `bind`, `bindAll`, `bindKey`, `castArray`, `chain`, `chunk`,
-     * `commit`, `compact`, `concat`, `conforms`, `constant`, `countBy`, `create`,
-     * `curry`, `debounce`, `defaults`, `defaultsDeep`, `defer`, `delay`,
-     * `difference`, `differenceBy`, `differenceWith`, `drop`, `dropRight`,
-     * `dropRightWhile`, `dropWhile`, `extend`, `extendWith`, `fill`, `filter`,
-     * `flatMap`, `flatMapDeep`, `flatMapDepth`, `flatten`, `flattenDeep`,
-     * `flattenDepth`, `flip`, `flow`, `flowRight`, `fromPairs`, `functions`,
-     * `functionsIn`, `groupBy`, `initial`, `intersection`, `intersectionBy`,
-     * `intersectionWith`, `invert`, `invertBy`, `invokeMap`, `iteratee`, `keyBy`,
-     * `keys`, `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`, `matchesProperty`,
-     * `memoize`, `merge`, `mergeWith`, `method`, `methodOf`, `mixin`, `negate`,
-     * `nthArg`, `omit`, `omitBy`, `once`, `orderBy`, `over`, `overArgs`,
-     * `overEvery`, `overSome`, `partial`, `partialRight`, `partition`, `pick`,
-     * `pickBy`, `plant`, `property`, `propertyOf`, `pull`, `pullAll`, `pullAllBy`,
-     * `pullAllWith`, `pullAt`, `push`, `range`, `rangeRight`, `rearg`, `reject`,
-     * `remove`, `rest`, `reverse`, `sampleSize`, `set`, `setWith`, `shuffle`,
-     * `slice`, `sort`, `sortBy`, `splice`, `spread`, `tail`, `take`, `takeRight`,
-     * `takeRightWhile`, `takeWhile`, `tap`, `throttle`, `thru`, `toArray`,
-     * `toPairs`, `toPairsIn`, `toPath`, `toPlainObject`, `transform`, `unary`,
-     * `union`, `unionBy`, `unionWith`, `uniq`, `uniqBy`, `uniqWith`, `unset`,
-     * `unshift`, `unzip`, `unzipWith`, `update`, `updateWith`, `values`,
-     * `valuesIn`, `without`, `wrap`, `xor`, `xorBy`, `xorWith`, `zip`,
-     * `zipObject`, `zipObjectDeep`, and `zipWith`
-     *
-     * The wrapper methods that are **not** chainable by default are:
-     * `add`, `attempt`, `camelCase`, `capitalize`, `ceil`, `clamp`, `clone`,
-     * `cloneDeep`, `cloneDeepWith`, `cloneWith`, `conformsTo`, `deburr`,
-     * `defaultTo`, `divide`, `each`, `eachRight`, `endsWith`, `eq`, `escape`,
-     * `escapeRegExp`, `every`, `find`, `findIndex`, `findKey`, `findLast`,
-     * `findLastIndex`, `findLastKey`, `first`, `floor`, `forEach`, `forEachRight`,
-     * `forIn`, `forInRight`, `forOwn`, `forOwnRight`, `get`, `gt`, `gte`, `has`,
-     * `hasIn`, `head`, `identity`, `includes`, `indexOf`, `inRange`, `invoke`,
-     * `isArguments`, `isArray`, `isArrayBuffer`, `isArrayLike`, `isArrayLikeObject`,
-     * `isBoolean`, `isBuffer`, `isDate`, `isElement`, `isEmpty`, `isEqual`,
-     * `isEqualWith`, `isError`, `isFinite`, `isFunction`, `isInteger`, `isLength`,
-     * `isMap`, `isMatch`, `isMatchWith`, `isNaN`, `isNative`, `isNil`, `isNull`,
-     * `isNumber`, `isObject`, `isObjectLike`, `isPlainObject`, `isRegExp`,
-     * `isSafeInteger`, `isSet`, `isString`, `isUndefined`, `isTypedArray`,
-     * `isWeakMap`, `isWeakSet`, `join`, `kebabCase`, `last`, `lastIndexOf`,
-     * `lowerCase`, `lowerFirst`, `lt`, `lte`, `max`, `maxBy`, `mean`, `meanBy`,
-     * `min`, `minBy`, `multiply`, `noConflict`, `noop`, `now`, `nth`, `pad`,
-     * `padEnd`, `padStart`, `parseInt`, `pop`, `random`, `reduce`, `reduceRight`,
-     * `repeat`, `result`, `round`, `runInContext`, `sample`, `shift`, `size`,
-     * `snakeCase`, `some`, `sortedIndex`, `sortedIndexBy`, `sortedLastIndex`,
-     * `sortedLastIndexBy`, `startCase`, `startsWith`, `stubArray`, `stubFalse`,
-     * `stubObject`, `stubString`, `stubTrue`, `subtract`, `sum`, `sumBy`,
-     * `template`, `times`, `toFinite`, `toInteger`, `toJSON`, `toLength`,
-     * `toLower`, `toNumber`, `toSafeInteger`, `toString`, `toUpper`, `trim`,
-     * `trimEnd`, `trimStart`, `truncate`, `unescape`, `uniqueId`, `upperCase`,
-     * `upperFirst`, `value`, and `words`
-     *
-     * @name _
-     * @constructor
-     * @category Seq
-     * @param {*} value The value to wrap in a `lodash` instance.
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * function square(n) {
-     *   return n * n;
-     * }
-     *
-     * var wrapped = _([1, 2, 3]);
-     *
-     * // Returns an unwrapped value.
-     * wrapped.reduce(_.add);
-     * // => 6
-     *
-     * // Returns a wrapped value.
-     * var squares = wrapped.map(square);
-     *
-     * _.isArray(squares);
-     * // => false
-     *
-     * _.isArray(squares.value());
-     * // => true
-     */
-    function lodash(value) {
-      if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {
-        if (value instanceof LodashWrapper) {
-          return value;
-        }
-        if (hasOwnProperty.call(value, '__wrapped__')) {
-          return wrapperClone(value);
-        }
-      }
-      return new LodashWrapper(value);
-    }
-
-    /**
-     * The base implementation of `_.create` without support for assigning
-     * properties to the created object.
-     *
-     * @private
-     * @param {Object} proto The object to inherit from.
-     * @returns {Object} Returns the new object.
-     */
-    var baseCreate = (function() {
-      function object() {}
-      return function(proto) {
-        if (!isObject(proto)) {
-          return {};
-        }
-        if (objectCreate) {
-          return objectCreate(proto);
-        }
-        object.prototype = proto;
-        var result = new object;
-        object.prototype = undefined;
-        return result;
-      };
-    }());
-
-    /**
-     * The function whose prototype chain sequence wrappers inherit from.
-     *
-     * @private
-     */
-    function baseLodash() {
-      // No operation performed.
-    }
-
-    /**
-     * The base constructor for creating `lodash` wrapper objects.
-     *
-     * @private
-     * @param {*} value The value to wrap.
-     * @param {boolean} [chainAll] Enable explicit method chain sequences.
-     */
-    function LodashWrapper(value, chainAll) {
-      this.__wrapped__ = value;
-      this.__actions__ = [];
-      this.__chain__ = !!chainAll;
-      this.__index__ = 0;
-      this.__values__ = undefined;
-    }
-
-    /**
-     * By default, the template delimiters used by lodash are like those in
-     * embedded Ruby (ERB) as well as ES2015 template strings. Change the
-     * following template settings to use alternative delimiters.
-     *
-     * @static
-     * @memberOf _
-     * @type {Object}
-     */
-    lodash.templateSettings = {
-
-      /**
-       * Used to detect `data` property values to be HTML-escaped.
-       *
-       * @memberOf _.templateSettings
-       * @type {RegExp}
-       */
-      'escape': reEscape,
-
-      /**
-       * Used to detect code to be evaluated.
-       *
-       * @memberOf _.templateSettings
-       * @type {RegExp}
-       */
-      'evaluate': reEvaluate,
-
-      /**
-       * Used to detect `data` property values to inject.
-       *
-       * @memberOf _.templateSettings
-       * @type {RegExp}
-       */
-      'interpolate': reInterpolate,
-
-      /**
-       * Used to reference the data object in the template text.
-       *
-       * @memberOf _.templateSettings
-       * @type {string}
-       */
-      'variable': '',
-
-      /**
-       * Used to import variables into the compiled template.
-       *
-       * @memberOf _.templateSettings
-       * @type {Object}
-       */
-      'imports': {
-
-        /**
-         * A reference to the `lodash` function.
-         *
-         * @memberOf _.templateSettings.imports
-         * @type {Function}
-         */
-        '_': lodash
-      }
-    };
-
-    // Ensure wrappers are instances of `baseLodash`.
-    lodash.prototype = baseLodash.prototype;
-    lodash.prototype.constructor = lodash;
-
-    LodashWrapper.prototype = baseCreate(baseLodash.prototype);
-    LodashWrapper.prototype.constructor = LodashWrapper;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates a lazy wrapper object which wraps `value` to enable lazy evaluation.
-     *
-     * @private
-     * @constructor
-     * @param {*} value The value to wrap.
-     */
-    function LazyWrapper(value) {
-      this.__wrapped__ = value;
-      this.__actions__ = [];
-      this.__dir__ = 1;
-      this.__filtered__ = false;
-      this.__iteratees__ = [];
-      this.__takeCount__ = MAX_ARRAY_LENGTH;
-      this.__views__ = [];
-    }
-
-    /**
-     * Creates a clone of the lazy wrapper object.
-     *
-     * @private
-     * @name clone
-     * @memberOf LazyWrapper
-     * @returns {Object} Returns the cloned `LazyWrapper` object.
-     */
-    function lazyClone() {
-      var result = new LazyWrapper(this.__wrapped__);
-      result.__actions__ = copyArray(this.__actions__);
-      result.__dir__ = this.__dir__;
-      result.__filtered__ = this.__filtered__;
-      result.__iteratees__ = copyArray(this.__iteratees__);
-      result.__takeCount__ = this.__takeCount__;
-      result.__views__ = copyArray(this.__views__);
-      return result;
-    }
-
-    /**
-     * Reverses the direction of lazy iteration.
-     *
-     * @private
-     * @name reverse
-     * @memberOf LazyWrapper
-     * @returns {Object} Returns the new reversed `LazyWrapper` object.
-     */
-    function lazyReverse() {
-      if (this.__filtered__) {
-        var result = new LazyWrapper(this);
-        result.__dir__ = -1;
-        result.__filtered__ = true;
-      } else {
-        result = this.clone();
-        result.__dir__ *= -1;
-      }
-      return result;
-    }
-
-    /**
-     * Extracts the unwrapped value from its lazy wrapper.
-     *
-     * @private
-     * @name value
-     * @memberOf LazyWrapper
-     * @returns {*} Returns the unwrapped value.
-     */
-    function lazyValue() {
-      var array = this.__wrapped__.value(),
-          dir = this.__dir__,
-          isArr = isArray(array),
-          isRight = dir < 0,
-          arrLength = isArr ? array.length : 0,
-          view = getView(0, arrLength, this.__views__),
-          start = view.start,
-          end = view.end,
-          length = end - start,
-          index = isRight ? end : (start - 1),
-          iteratees = this.__iteratees__,
-          iterLength = iteratees.length,
-          resIndex = 0,
-          takeCount = nativeMin(length, this.__takeCount__);
-
-      if (!isArr || (!isRight && arrLength == length && takeCount == length)) {
-        return baseWrapperValue(array, this.__actions__);
-      }
-      var result = [];
-
-      outer:
-      while (length-- && resIndex < takeCount) {
-        index += dir;
-
-        var iterIndex = -1,
-            value = array[index];
-
-        while (++iterIndex < iterLength) {
-          var data = iteratees[iterIndex],
-              iteratee = data.iteratee,
-              type = data.type,
-              computed = iteratee(value);
-
-          if (type == LAZY_MAP_FLAG) {
-            value = computed;
-          } else if (!computed) {
-            if (type == LAZY_FILTER_FLAG) {
-              continue outer;
-            } else {
-              break outer;
-            }
-          }
-        }
-        result[resIndex++] = value;
-      }
-      return result;
-    }
-
-    // Ensure `LazyWrapper` is an instance of `baseLodash`.
-    LazyWrapper.prototype = baseCreate(baseLodash.prototype);
-    LazyWrapper.prototype.constructor = LazyWrapper;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates a hash object.
-     *
-     * @private
-     * @constructor
-     * @param {Array} [entries] The key-value pairs to cache.
-     */
-    function Hash(entries) {
-      var index = -1,
-          length = entries == null ? 0 : entries.length;
-
-      this.clear();
-      while (++index < length) {
-        var entry = entries[index];
-        this.set(entry[0], entry[1]);
-      }
-    }
-
-    /**
-     * Removes all key-value entries from the hash.
-     *
-     * @private
-     * @name clear
-     * @memberOf Hash
-     */
-    function hashClear() {
-      this.__data__ = nativeCreate ? nativeCreate(null) : {};
-      this.size = 0;
-    }
-
-    /**
-     * Removes `key` and its value from the hash.
-     *
-     * @private
-     * @name delete
-     * @memberOf Hash
-     * @param {Object} hash The hash to modify.
-     * @param {string} key The key of the value to remove.
-     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
-     */
-    function hashDelete(key) {
-      var result = this.has(key) && delete this.__data__[key];
-      this.size -= result ? 1 : 0;
-      return result;
-    }
-
-    /**
-     * Gets the hash value for `key`.
-     *
-     * @private
-     * @name get
-     * @memberOf Hash
-     * @param {string} key The key of the value to get.
-     * @returns {*} Returns the entry value.
-     */
-    function hashGet(key) {
-      var data = this.__data__;
-      if (nativeCreate) {
-        var result = data[key];
-        return result === HASH_UNDEFINED ? undefined : result;
-      }
-      return hasOwnProperty.call(data, key) ? data[key] : undefined;
-    }
-
-    /**
-     * Checks if a hash value for `key` exists.
-     *
-     * @private
-     * @name has
-     * @memberOf Hash
-     * @param {string} key The key of the entry to check.
-     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
-     */
-    function hashHas(key) {
-      var data = this.__data__;
-      return nativeCreate ? (data[key] !== undefined) : hasOwnProperty.call(data, key);
-    }
-
-    /**
-     * Sets the hash `key` to `value`.
-     *
-     * @private
-     * @name set
-     * @memberOf Hash
-     * @param {string} key The key of the value to set.
-     * @param {*} value The value to set.
-     * @returns {Object} Returns the hash instance.
-     */
-    function hashSet(key, value) {
-      var data = this.__data__;
-      this.size += this.has(key) ? 0 : 1;
-      data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
-      return this;
-    }
-
-    // Add methods to `Hash`.
-    Hash.prototype.clear = hashClear;
-    Hash.prototype['delete'] = hashDelete;
-    Hash.prototype.get = hashGet;
-    Hash.prototype.has = hashHas;
-    Hash.prototype.set = hashSet;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates an list cache object.
-     *
-     * @private
-     * @constructor
-     * @param {Array} [entries] The key-value pairs to cache.
-     */
-    function ListCache(entries) {
-      var index = -1,
-          length = entries == null ? 0 : entries.length;
-
-      this.clear();
-      while (++index < length) {
-        var entry = entries[index];
-        this.set(entry[0], entry[1]);
-      }
-    }
-
-    /**
-     * Removes all key-value entries from the list cache.
-     *
-     * @private
-     * @name clear
-     * @memberOf ListCache
-     */
-    function listCacheClear() {
-      this.__data__ = [];
-      this.size = 0;
-    }
-
-    /**
-     * Removes `key` and its value from the list cache.
-     *
-     * @private
-     * @name delete
-     * @memberOf ListCache
-     * @param {string} key The key of the value to remove.
-     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
-     */
-    function listCacheDelete(key) {
-      var data = this.__data__,
-          index = assocIndexOf(data, key);
-
-      if (index < 0) {
-        return false;
-      }
-      var lastIndex = data.length - 1;
-      if (index == lastIndex) {
-        data.pop();
-      } else {
-        splice.call(data, index, 1);
-      }
-      --this.size;
-      return true;
-    }
-
-    /**
-     * Gets the list cache value for `key`.
-     *
-     * @private
-     * @name get
-     * @memberOf ListCache
-     * @param {string} key The key of the value to get.
-     * @returns {*} Returns the entry value.
-     */
-    function listCacheGet(key) {
-      var data = this.__data__,
-          index = assocIndexOf(data, key);
-
-      return index < 0 ? undefined : data[index][1];
-    }
-
-    /**
-     * Checks if a list cache value for `key` exists.
-     *
-     * @private
-     * @name has
-     * @memberOf ListCache
-     * @param {string} key The key of the entry to check.
-     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
-     */
-    function listCacheHas(key) {
-      return assocIndexOf(this.__data__, key) > -1;
-    }
-
-    /**
-     * Sets the list cache `key` to `value`.
-     *
-     * @private
-     * @name set
-     * @memberOf ListCache
-     * @param {string} key The key of the value to set.
-     * @param {*} value The value to set.
-     * @returns {Object} Returns the list cache instance.
-     */
-    function listCacheSet(key, value) {
-      var data = this.__data__,
-          index = assocIndexOf(data, key);
-
-      if (index < 0) {
-        ++this.size;
-        data.push([key, value]);
-      } else {
-        data[index][1] = value;
-      }
-      return this;
-    }
-
-    // Add methods to `ListCache`.
-    ListCache.prototype.clear = listCacheClear;
-    ListCache.prototype['delete'] = listCacheDelete;
-    ListCache.prototype.get = listCacheGet;
-    ListCache.prototype.has = listCacheHas;
-    ListCache.prototype.set = listCacheSet;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates a map cache object to store key-value pairs.
-     *
-     * @private
-     * @constructor
-     * @param {Array} [entries] The key-value pairs to cache.
-     */
-    function MapCache(entries) {
-      var index = -1,
-          length = entries == null ? 0 : entries.length;
-
-      this.clear();
-      while (++index < length) {
-        var entry = entries[index];
-        this.set(entry[0], entry[1]);
-      }
-    }
-
-    /**
-     * Removes all key-value entries from the map.
-     *
-     * @private
-     * @name clear
-     * @memberOf MapCache
-     */
-    function mapCacheClear() {
-      this.size = 0;
-      this.__data__ = {
-        'hash': new Hash,
-        'map': new (Map || ListCache),
-        'string': new Hash
-      };
-    }
-
-    /**
-     * Removes `key` and its value from the map.
-     *
-     * @private
-     * @name delete
-     * @memberOf MapCache
-     * @param {string} key The key of the value to remove.
-     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
-     */
-    function mapCacheDelete(key) {
-      var result = getMapData(this, key)['delete'](key);
-      this.size -= result ? 1 : 0;
-      return result;
-    }
-
-    /**
-     * Gets the map value for `key`.
-     *
-     * @private
-     * @name get
-     * @memberOf MapCache
-     * @param {string} key The key of the value to get.
-     * @returns {*} Returns the entry value.
-     */
-    function mapCacheGet(key) {
-      return getMapData(this, key).get(key);
-    }
-
-    /**
-     * Checks if a map value for `key` exists.
-     *
-     * @private
-     * @name has
-     * @memberOf MapCache
-     * @param {string} key The key of the entry to check.
-     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
-     */
-    function mapCacheHas(key) {
-      return getMapData(this, key).has(key);
-    }
-
-    /**
-     * Sets the map `key` to `value`.
-     *
-     * @private
-     * @name set
-     * @memberOf MapCache
-     * @param {string} key The key of the value to set.
-     * @param {*} value The value to set.
-     * @returns {Object} Returns the map cache instance.
-     */
-    function mapCacheSet(key, value) {
-      var data = getMapData(this, key),
-          size = data.size;
-
-      data.set(key, value);
-      this.size += data.size == size ? 0 : 1;
-      return this;
-    }
-
-    // Add methods to `MapCache`.
-    MapCache.prototype.clear = mapCacheClear;
-    MapCache.prototype['delete'] = mapCacheDelete;
-    MapCache.prototype.get = mapCacheGet;
-    MapCache.prototype.has = mapCacheHas;
-    MapCache.prototype.set = mapCacheSet;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     *
-     * Creates an array cache object to store unique values.
-     *
-     * @private
-     * @constructor
-     * @param {Array} [values] The values to cache.
-     */
-    function SetCache(values) {
-      var index = -1,
-          length = values == null ? 0 : values.length;
-
-      this.__data__ = new MapCache;
-      while (++index < length) {
-        this.add(values[index]);
-      }
-    }
-
-    /**
-     * Adds `value` to the array cache.
-     *
-     * @private
-     * @name add
-     * @memberOf SetCache
-     * @alias push
-     * @param {*} value The value to cache.
-     * @returns {Object} Returns the cache instance.
-     */
-    function setCacheAdd(value) {
-      this.__data__.set(value, HASH_UNDEFINED);
-      return this;
-    }
-
-    /**
-     * Checks if `value` is in the array cache.
-     *
-     * @private
-     * @name has
-     * @memberOf SetCache
-     * @param {*} value The value to search for.
-     * @returns {number} Returns `true` if `value` is found, else `false`.
-     */
-    function setCacheHas(value) {
-      return this.__data__.has(value);
-    }
-
-    // Add methods to `SetCache`.
-    SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
-    SetCache.prototype.has = setCacheHas;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates a stack cache object to store key-value pairs.
-     *
-     * @private
-     * @constructor
-     * @param {Array} [entries] The key-value pairs to cache.
-     */
-    function Stack(entries) {
-      var data = this.__data__ = new ListCache(entries);
-      this.size = data.size;
-    }
-
-    /**
-     * Removes all key-value entries from the stack.
-     *
-     * @private
-     * @name clear
-     * @memberOf Stack
-     */
-    function stackClear() {
-      this.__data__ = new ListCache;
-      this.size = 0;
-    }
-
-    /**
-     * Removes `key` and its value from the stack.
-     *
-     * @private
-     * @name delete
-     * @memberOf Stack
-     * @param {string} key The key of the value to remove.
-     * @returns {boolean} Returns `true` if the entry was removed, else `false`.
-     */
-    function stackDelete(key) {
-      var data = this.__data__,
-          result = data['delete'](key);
-
-      this.size = data.size;
-      return result;
-    }
-
-    /**
-     * Gets the stack value for `key`.
-     *
-     * @private
-     * @name get
-     * @memberOf Stack
-     * @param {string} key The key of the value to get.
-     * @returns {*} Returns the entry value.
-     */
-    function stackGet(key) {
-      return this.__data__.get(key);
-    }
-
-    /**
-     * Checks if a stack value for `key` exists.
-     *
-     * @private
-     * @name has
-     * @memberOf Stack
-     * @param {string} key The key of the entry to check.
-     * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
-     */
-    function stackHas(key) {
-      return this.__data__.has(key);
-    }
-
-    /**
-     * Sets the stack `key` to `value`.
-     *
-     * @private
-     * @name set
-     * @memberOf Stack
-     * @param {string} key The key of the value to set.
-     * @param {*} value The value to set.
-     * @returns {Object} Returns the stack cache instance.
-     */
-    function stackSet(key, value) {
-      var data = this.__data__;
-      if (data instanceof ListCache) {
-        var pairs = data.__data__;
-        if (!Map || (pairs.length < LARGE_ARRAY_SIZE - 1)) {
-          pairs.push([key, value]);
-          this.size = ++data.size;
-          return this;
-        }
-        data = this.__data__ = new MapCache(pairs);
-      }
-      data.set(key, value);
-      this.size = data.size;
-      return this;
-    }
-
-    // Add methods to `Stack`.
-    Stack.prototype.clear = stackClear;
-    Stack.prototype['delete'] = stackDelete;
-    Stack.prototype.get = stackGet;
-    Stack.prototype.has = stackHas;
-    Stack.prototype.set = stackSet;
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates an array of the enumerable property names of the array-like `value`.
-     *
-     * @private
-     * @param {*} value The value to query.
-     * @param {boolean} inherited Specify returning inherited property names.
-     * @returns {Array} Returns the array of property names.
-     */
-    function arrayLikeKeys(value, inherited) {
-      var isArr = isArray(value),
-          isArg = !isArr && isArguments(value),
-          isBuff = !isArr && !isArg && isBuffer(value),
-          isType = !isArr && !isArg && !isBuff && isTypedArray(value),
-          skipIndexes = isArr || isArg || isBuff || isType,
-          result = skipIndexes ? baseTimes(value.length, String) : [],
-          length = result.length;
-
-      for (var key in value) {
-        if ((inherited || hasOwnProperty.call(value, key)) &&
-            !(skipIndexes && (
-               // Safari 9 has enumerable `arguments.length` in strict mode.
-               key == 'length' ||
-               // Node.js 0.10 has enumerable non-index properties on buffers.
-               (isBuff && (key == 'offset' || key == 'parent')) ||
-               // PhantomJS 2 has enumerable non-index properties on typed arrays.
-               (isType && (key == 'buffer' || key == 'byteLength' || key == 'byteOffset')) ||
-               // Skip index properties.
-               isIndex(key, length)
-            ))) {
-          result.push(key);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * A specialized version of `_.sample` for arrays.
-     *
-     * @private
-     * @param {Array} array The array to sample.
-     * @returns {*} Returns the random element.
-     */
-    function arraySample(array) {
-      var length = array.length;
-      return length ? array[baseRandom(0, length - 1)] : undefined;
-    }
-
-    /**
-     * A specialized version of `_.sampleSize` for arrays.
-     *
-     * @private
-     * @param {Array} array The array to sample.
-     * @param {number} n The number of elements to sample.
-     * @returns {Array} Returns the random elements.
-     */
-    function arraySampleSize(array, n) {
-      return shuffleSelf(copyArray(array), baseClamp(n, 0, array.length));
-    }
-
-    /**
-     * A specialized version of `_.shuffle` for arrays.
-     *
-     * @private
-     * @param {Array} array The array to shuffle.
-     * @returns {Array} Returns the new shuffled array.
-     */
-    function arrayShuffle(array) {
-      return shuffleSelf(copyArray(array));
-    }
-
-    /**
-     * This function is like `assignValue` except that it doesn't assign
-     * `undefined` values.
-     *
-     * @private
-     * @param {Object} object The object to modify.
-     * @param {string} key The key of the property to assign.
-     * @param {*} value The value to assign.
-     */
-    function assignMergeValue(object, key, value) {
-      if ((value !== undefined && !eq(object[key], value)) ||
-          (value === undefined && !(key in object))) {
-        baseAssignValue(object, key, value);
-      }
-    }
-
-    /**
-     * Assigns `value` to `key` of `object` if the existing value is not equivalent
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @private
-     * @param {Object} object The object to modify.
-     * @param {string} key The key of the property to assign.
-     * @param {*} value The value to assign.
-     */
-    function assignValue(object, key, value) {
-      var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
-          (value === undefined && !(key in object))) {
-        baseAssignValue(object, key, value);
-      }
-    }
-
-    /**
-     * Gets the index at which the `key` is found in `array` of key-value pairs.
-     *
-     * @private
-     * @param {Array} array The array to inspect.
-     * @param {*} key The key to search for.
-     * @returns {number} Returns the index of the matched value, else `-1`.
-     */
-    function assocIndexOf(array, key) {
-      var length = array.length;
-      while (length--) {
-        if (eq(array[length][0], key)) {
-          return length;
-        }
-      }
-      return -1;
-    }
-
-    /**
-     * Aggregates elements of `collection` on `accumulator` with keys transformed
-     * by `iteratee` and values set by `setter`.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} setter The function to set `accumulator` values.
-     * @param {Function} iteratee The iteratee to transform keys.
-     * @param {Object} accumulator The initial aggregated object.
-     * @returns {Function} Returns `accumulator`.
-     */
-    function baseAggregator(collection, setter, iteratee, accumulator) {
-      baseEach(collection, function(value, key, collection) {
-        setter(accumulator, value, iteratee(value), collection);
-      });
-      return accumulator;
-    }
-
-    /**
-     * The base implementation of `_.assign` without support for multiple sources
-     * or `customizer` functions.
-     *
-     * @private
-     * @param {Object} object The destination object.
-     * @param {Object} source The source object.
-     * @returns {Object} Returns `object`.
-     */
-    function baseAssign(object, source) {
-      return object && copyObject(source, keys(source), object);
-    }
-
-    /**
-     * The base implementation of `_.assignIn` without support for multiple sources
-     * or `customizer` functions.
-     *
-     * @private
-     * @param {Object} object The destination object.
-     * @param {Object} source The source object.
-     * @returns {Object} Returns `object`.
-     */
-    function baseAssignIn(object, source) {
-      return object && copyObject(source, keysIn(source), object);
-    }
-
-    /**
-     * The base implementation of `assignValue` and `assignMergeValue` without
-     * value checks.
-     *
-     * @private
-     * @param {Object} object The object to modify.
-     * @param {string} key The key of the property to assign.
-     * @param {*} value The value to assign.
-     */
-    function baseAssignValue(object, key, value) {
-      if (key == '__proto__' && defineProperty) {
-        defineProperty(object, key, {
-          'configurable': true,
-          'enumerable': true,
-          'value': value,
-          'writable': true
-        });
-      } else {
-        object[key] = value;
-      }
-    }
-
-    /**
-     * The base implementation of `_.at` without support for individual paths.
-     *
-     * @private
-     * @param {Object} object The object to iterate over.
-     * @param {string[]} paths The property paths to pick.
-     * @returns {Array} Returns the picked elements.
-     */
-    function baseAt(object, paths) {
-      var index = -1,
-          length = paths.length,
-          result = Array(length),
-          skip = object == null;
-
-      while (++index < length) {
-        result[index] = skip ? undefined : get(object, paths[index]);
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.clamp` which doesn't coerce arguments.
-     *
-     * @private
-     * @param {number} number The number to clamp.
-     * @param {number} [lower] The lower bound.
-     * @param {number} upper The upper bound.
-     * @returns {number} Returns the clamped number.
-     */
-    function baseClamp(number, lower, upper) {
-      if (number === number) {
-        if (upper !== undefined) {
-          number = number <= upper ? number : upper;
-        }
-        if (lower !== undefined) {
-          number = number >= lower ? number : lower;
-        }
-      }
-      return number;
-    }
-
-    /**
-     * The base implementation of `_.clone` and `_.cloneDeep` which tracks
-     * traversed objects.
-     *
-     * @private
-     * @param {*} value The value to clone.
-     * @param {boolean} bitmask The bitmask flags.
-     *  1 - Deep clone
-     *  2 - Flatten inherited properties
-     *  4 - Clone symbols
-     * @param {Function} [customizer] The function to customize cloning.
-     * @param {string} [key] The key of `value`.
-     * @param {Object} [object] The parent object of `value`.
-     * @param {Object} [stack] Tracks traversed objects and their clone counterparts.
-     * @returns {*} Returns the cloned value.
-     */
-    function baseClone(value, bitmask, customizer, key, object, stack) {
-      var result,
-          isDeep = bitmask & CLONE_DEEP_FLAG,
-          isFlat = bitmask & CLONE_FLAT_FLAG,
-          isFull = bitmask & CLONE_SYMBOLS_FLAG;
-
-      if (customizer) {
-        result = object ? customizer(value, key, object, stack) : customizer(value);
-      }
-      if (result !== undefined) {
-        return result;
-      }
-      if (!isObject(value)) {
-        return value;
-      }
-      var isArr = isArray(value);
-      if (isArr) {
-        result = initCloneArray(value);
-        if (!isDeep) {
-          return copyArray(value, result);
-        }
-      } else {
-        var tag = getTag(value),
-            isFunc = tag == funcTag || tag == genTag;
-
-        if (isBuffer(value)) {
-          return cloneBuffer(value, isDeep);
-        }
-        if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
-          result = (isFlat || isFunc) ? {} : initCloneObject(value);
-          if (!isDeep) {
-            return isFlat
-              ? copySymbolsIn(value, baseAssignIn(result, value))
-              : copySymbols(value, baseAssign(result, value));
-          }
-        } else {
-          if (!cloneableTags[tag]) {
-            return object ? value : {};
-          }
-          result = initCloneByTag(value, tag, isDeep);
-        }
-      }
-      // Check for circular references and return its corresponding clone.
-      stack || (stack = new Stack);
-      var stacked = stack.get(value);
-      if (stacked) {
-        return stacked;
-      }
-      stack.set(value, result);
-
-      if (isSet(value)) {
-        value.forEach(function(subValue) {
-          result.add(baseClone(subValue, bitmask, customizer, subValue, value, stack));
-        });
-
-        return result;
-      }
-
-      if (isMap(value)) {
-        value.forEach(function(subValue, key) {
-          result.set(key, baseClone(subValue, bitmask, customizer, key, value, stack));
-        });
-
-        return result;
-      }
-
-      var keysFunc = isFull
-        ? (isFlat ? getAllKeysIn : getAllKeys)
-        : (isFlat ? keysIn : keys);
-
-      var props = isArr ? undefined : keysFunc(value);
-      arrayEach(props || value, function(subValue, key) {
-        if (props) {
-          key = subValue;
-          subValue = value[key];
-        }
-        // Recursively populate clone (susceptible to call stack limits).
-        assignValue(result, key, baseClone(subValue, bitmask, customizer, key, value, stack));
-      });
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.conforms` which doesn't clone `source`.
-     *
-     * @private
-     * @param {Object} source The object of property predicates to conform to.
-     * @returns {Function} Returns the new spec function.
-     */
-    function baseConforms(source) {
-      var props = keys(source);
-      return function(object) {
-        return baseConformsTo(object, source, props);
-      };
-    }
-
-    /**
-     * The base implementation of `_.conformsTo` which accepts `props` to check.
-     *
-     * @private
-     * @param {Object} object The object to inspect.
-     * @param {Object} source The object of property predicates to conform to.
-     * @returns {boolean} Returns `true` if `object` conforms, else `false`.
-     */
-    function baseConformsTo(object, source, props) {
-      var length = props.length;
-      if (object == null) {
-        return !length;
-      }
-      object = Object(object);
-      while (length--) {
-        var key = props[length],
-            predicate = source[key],
-            value = object[key];
-
-        if ((value === undefined && !(key in object)) || !predicate(value)) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    /**
-     * The base implementation of `_.delay` and `_.defer` which accepts `args`
-     * to provide to `func`.
-     *
-     * @private
-     * @param {Function} func The function to delay.
-     * @param {number} wait The number of milliseconds to delay invocation.
-     * @param {Array} args The arguments to provide to `func`.
-     * @returns {number|Object} Returns the timer id or timeout object.
-     */
-    function baseDelay(func, wait, args) {
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      return setTimeout(function() { func.apply(undefined, args); }, wait);
-    }
-
-    /**
-     * The base implementation of methods like `_.difference` without support
-     * for excluding multiple arrays or iteratee shorthands.
-     *
-     * @private
-     * @param {Array} array The array to inspect.
-     * @param {Array} values The values to exclude.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of filtered values.
-     */
-    function baseDifference(array, values, iteratee, comparator) {
-      var index = -1,
-          includes = arrayIncludes,
-          isCommon = true,
-          length = array.length,
-          result = [],
-          valuesLength = values.length;
-
-      if (!length) {
-        return result;
-      }
-      if (iteratee) {
-        values = arrayMap(values, baseUnary(iteratee));
-      }
-      if (comparator) {
-        includes = arrayIncludesWith;
-        isCommon = false;
-      }
-      else if (values.length >= LARGE_ARRAY_SIZE) {
-        includes = cacheHas;
-        isCommon = false;
-        values = new SetCache(values);
-      }
-      outer:
-      while (++index < length) {
-        var value = array[index],
-            computed = iteratee == null ? value : iteratee(value);
-
-        value = (comparator || value !== 0) ? value : 0;
-        if (isCommon && computed === computed) {
-          var valuesIndex = valuesLength;
-          while (valuesIndex--) {
-            if (values[valuesIndex] === computed) {
-              continue outer;
-            }
-          }
-          result.push(value);
-        }
-        else if (!includes(values, computed, comparator)) {
-          result.push(value);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.forEach` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @returns {Array|Object} Returns `collection`.
-     */
-    var baseEach = createBaseEach(baseForOwn);
-
-    /**
-     * The base implementation of `_.forEachRight` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @returns {Array|Object} Returns `collection`.
-     */
-    var baseEachRight = createBaseEach(baseForOwnRight, true);
-
-    /**
-     * The base implementation of `_.every` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} predicate The function invoked per iteration.
-     * @returns {boolean} Returns `true` if all elements pass the predicate check,
-     *  else `false`
-     */
-    function baseEvery(collection, predicate) {
-      var result = true;
-      baseEach(collection, function(value, index, collection) {
-        result = !!predicate(value, index, collection);
-        return result;
-      });
-      return result;
-    }
-
-    /**
-     * The base implementation of methods like `_.max` and `_.min` which accepts a
-     * `comparator` to determine the extremum value.
-     *
-     * @private
-     * @param {Array} array The array to iterate over.
-     * @param {Function} iteratee The iteratee invoked per iteration.
-     * @param {Function} comparator The comparator used to compare values.
-     * @returns {*} Returns the extremum value.
-     */
-    function baseExtremum(array, iteratee, comparator) {
-      var index = -1,
-          length = array.length;
-
-      while (++index < length) {
-        var value = array[index],
-            current = iteratee(value);
-
-        if (current != null && (computed === undefined
-              ? (current === current && !isSymbol(current))
-              : comparator(current, computed)
-            )) {
-          var computed = current,
-              result = value;
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.fill` without an iteratee call guard.
-     *
-     * @private
-     * @param {Array} array The array to fill.
-     * @param {*} value The value to fill `array` with.
-     * @param {number} [start=0] The start position.
-     * @param {number} [end=array.length] The end position.
-     * @returns {Array} Returns `array`.
-     */
-    function baseFill(array, value, start, end) {
-      var length = array.length;
-
-      start = toInteger(start);
-      if (start < 0) {
-        start = -start > length ? 0 : (length + start);
-      }
-      end = (end === undefined || end > length) ? length : toInteger(end);
-      if (end < 0) {
-        end += length;
-      }
-      end = start > end ? 0 : toLength(end);
-      while (start < end) {
-        array[start++] = value;
-      }
-      return array;
-    }
-
-    /**
-     * The base implementation of `_.filter` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} predicate The function invoked per iteration.
-     * @returns {Array} Returns the new filtered array.
-     */
-    function baseFilter(collection, predicate) {
-      var result = [];
-      baseEach(collection, function(value, index, collection) {
-        if (predicate(value, index, collection)) {
-          result.push(value);
-        }
-      });
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.flatten` with support for restricting flattening.
-     *
-     * @private
-     * @param {Array} array The array to flatten.
-     * @param {number} depth The maximum recursion depth.
-     * @param {boolean} [predicate=isFlattenable] The function invoked per iteration.
-     * @param {boolean} [isStrict] Restrict to values that pass `predicate` checks.
-     * @param {Array} [result=[]] The initial result value.
-     * @returns {Array} Returns the new flattened array.
-     */
-    function baseFlatten(array, depth, predicate, isStrict, result) {
-      var index = -1,
-          length = array.length;
-
-      predicate || (predicate = isFlattenable);
-      result || (result = []);
-
-      while (++index < length) {
-        var value = array[index];
-        if (depth > 0 && predicate(value)) {
-          if (depth > 1) {
-            // Recursively flatten arrays (susceptible to call stack limits).
-            baseFlatten(value, depth - 1, predicate, isStrict, result);
-          } else {
-            arrayPush(result, value);
-          }
-        } else if (!isStrict) {
-          result[result.length] = value;
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `baseForOwn` which iterates over `object`
-     * properties returned by `keysFunc` and invokes `iteratee` for each property.
-     * Iteratee functions may exit iteration early by explicitly returning `false`.
-     *
-     * @private
-     * @param {Object} object The object to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @param {Function} keysFunc The function to get the keys of `object`.
-     * @returns {Object} Returns `object`.
-     */
-    var baseFor = createBaseFor();
-
-    /**
-     * This function is like `baseFor` except that it iterates over properties
-     * in the opposite order.
-     *
-     * @private
-     * @param {Object} object The object to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @param {Function} keysFunc The function to get the keys of `object`.
-     * @returns {Object} Returns `object`.
-     */
-    var baseForRight = createBaseFor(true);
-
-    /**
-     * The base implementation of `_.forOwn` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Object} object The object to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @returns {Object} Returns `object`.
-     */
-    function baseForOwn(object, iteratee) {
-      return object && baseFor(object, iteratee, keys);
-    }
-
-    /**
-     * The base implementation of `_.forOwnRight` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Object} object The object to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @returns {Object} Returns `object`.
-     */
-    function baseForOwnRight(object, iteratee) {
-      return object && baseForRight(object, iteratee, keys);
-    }
-
-    /**
-     * The base implementation of `_.functions` which creates an array of
-     * `object` function property names filtered from `props`.
-     *
-     * @private
-     * @param {Object} object The object to inspect.
-     * @param {Array} props The property names to filter.
-     * @returns {Array} Returns the function names.
-     */
-    function baseFunctions(object, props) {
-      return arrayFilter(props, function(key) {
-        return isFunction(object[key]);
-      });
-    }
-
-    /**
-     * The base implementation of `_.get` without support for default values.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path of the property to get.
-     * @returns {*} Returns the resolved value.
-     */
-    function baseGet(object, path) {
-      path = castPath(path, object);
-
-      var index = 0,
-          length = path.length;
-
-      while (object != null && index < length) {
-        object = object[toKey(path[index++])];
-      }
-      return (index && index == length) ? object : undefined;
-    }
-
-    /**
-     * The base implementation of `getAllKeys` and `getAllKeysIn` which uses
-     * `keysFunc` and `symbolsFunc` to get the enumerable property names and
-     * symbols of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @param {Function} keysFunc The function to get the keys of `object`.
-     * @param {Function} symbolsFunc The function to get the symbols of `object`.
-     * @returns {Array} Returns the array of property names and symbols.
-     */
-    function baseGetAllKeys(object, keysFunc, symbolsFunc) {
-      var result = keysFunc(object);
-      return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
-    }
-
-    /**
-     * The base implementation of `getTag` without fallbacks for buggy environments.
-     *
-     * @private
-     * @param {*} value The value to query.
-     * @returns {string} Returns the `toStringTag`.
-     */
-    function baseGetTag(value) {
-      if (value == null) {
-        return value === undefined ? undefinedTag : nullTag;
-      }
-      return (symToStringTag && symToStringTag in Object(value))
-        ? getRawTag(value)
-        : objectToString(value);
-    }
-
-    /**
-     * The base implementation of `_.gt` which doesn't coerce arguments.
-     *
-     * @private
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if `value` is greater than `other`,
-     *  else `false`.
-     */
-    function baseGt(value, other) {
-      return value > other;
-    }
-
-    /**
-     * The base implementation of `_.has` without support for deep paths.
-     *
-     * @private
-     * @param {Object} [object] The object to query.
-     * @param {Array|string} key The key to check.
-     * @returns {boolean} Returns `true` if `key` exists, else `false`.
-     */
-    function baseHas(object, key) {
-      return object != null && hasOwnProperty.call(object, key);
-    }
-
-    /**
-     * The base implementation of `_.hasIn` without support for deep paths.
-     *
-     * @private
-     * @param {Object} [object] The object to query.
-     * @param {Array|string} key The key to check.
-     * @returns {boolean} Returns `true` if `key` exists, else `false`.
-     */
-    function baseHasIn(object, key) {
-      return object != null && key in Object(object);
-    }
-
-    /**
-     * The base implementation of `_.inRange` which doesn't coerce arguments.
-     *
-     * @private
-     * @param {number} number The number to check.
-     * @param {number} start The start of the range.
-     * @param {number} end The end of the range.
-     * @returns {boolean} Returns `true` if `number` is in the range, else `false`.
-     */
-    function baseInRange(number, start, end) {
-      return number >= nativeMin(start, end) && number < nativeMax(start, end);
-    }
-
-    /**
-     * The base implementation of methods like `_.intersection`, without support
-     * for iteratee shorthands, that accepts an array of arrays to inspect.
-     *
-     * @private
-     * @param {Array} arrays The arrays to inspect.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of shared values.
-     */
-    function baseIntersection(arrays, iteratee, comparator) {
-      var includes = comparator ? arrayIncludesWith : arrayIncludes,
-          length = arrays[0].length,
-          othLength = arrays.length,
-          othIndex = othLength,
-          caches = Array(othLength),
-          maxLength = Infinity,
-          result = [];
-
-      while (othIndex--) {
-        var array = arrays[othIndex];
-        if (othIndex && iteratee) {
-          array = arrayMap(array, baseUnary(iteratee));
-        }
-        maxLength = nativeMin(array.length, maxLength);
-        caches[othIndex] = !comparator && (iteratee || (length >= 120 && array.length >= 120))
-          ? new SetCache(othIndex && array)
-          : undefined;
-      }
-      array = arrays[0];
-
-      var index = -1,
-          seen = caches[0];
-
-      outer:
-      while (++index < length && result.length < maxLength) {
-        var value = array[index],
-            computed = iteratee ? iteratee(value) : value;
-
-        value = (comparator || value !== 0) ? value : 0;
-        if (!(seen
-              ? cacheHas(seen, computed)
-              : includes(result, computed, comparator)
-            )) {
-          othIndex = othLength;
-          while (--othIndex) {
-            var cache = caches[othIndex];
-            if (!(cache
-                  ? cacheHas(cache, computed)
-                  : includes(arrays[othIndex], computed, comparator))
-                ) {
-              continue outer;
-            }
-          }
-          if (seen) {
-            seen.push(computed);
-          }
-          result.push(value);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.invert` and `_.invertBy` which inverts
-     * `object` with values transformed by `iteratee` and set by `setter`.
-     *
-     * @private
-     * @param {Object} object The object to iterate over.
-     * @param {Function} setter The function to set `accumulator` values.
-     * @param {Function} iteratee The iteratee to transform values.
-     * @param {Object} accumulator The initial inverted object.
-     * @returns {Function} Returns `accumulator`.
-     */
-    function baseInverter(object, setter, iteratee, accumulator) {
-      baseForOwn(object, function(value, key, object) {
-        setter(accumulator, iteratee(value), key, object);
-      });
-      return accumulator;
-    }
-
-    /**
-     * The base implementation of `_.invoke` without support for individual
-     * method arguments.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path of the method to invoke.
-     * @param {Array} args The arguments to invoke the method with.
-     * @returns {*} Returns the result of the invoked method.
-     */
-    function baseInvoke(object, path, args) {
-      path = castPath(path, object);
-      object = parent(object, path);
-      var func = object == null ? object : object[toKey(last(path))];
-      return func == null ? undefined : apply(func, object, args);
-    }
-
-    /**
-     * The base implementation of `_.isArguments`.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an `arguments` object,
-     */
-    function baseIsArguments(value) {
-      return isObjectLike(value) && baseGetTag(value) == argsTag;
-    }
-
-    /**
-     * The base implementation of `_.isArrayBuffer` without Node.js optimizations.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an array buffer, else `false`.
-     */
-    function baseIsArrayBuffer(value) {
-      return isObjectLike(value) && baseGetTag(value) == arrayBufferTag;
-    }
-
-    /**
-     * The base implementation of `_.isDate` without Node.js optimizations.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a date object, else `false`.
-     */
-    function baseIsDate(value) {
-      return isObjectLike(value) && baseGetTag(value) == dateTag;
-    }
-
-    /**
-     * The base implementation of `_.isEqual` which supports partial comparisons
-     * and tracks traversed objects.
-     *
-     * @private
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @param {boolean} bitmask The bitmask flags.
-     *  1 - Unordered comparison
-     *  2 - Partial comparison
-     * @param {Function} [customizer] The function to customize comparisons.
-     * @param {Object} [stack] Tracks traversed `value` and `other` objects.
-     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-     */
-    function baseIsEqual(value, other, bitmask, customizer, stack) {
-      if (value === other) {
-        return true;
-      }
-      if (value == null || other == null || (!isObjectLike(value) && !isObjectLike(other))) {
-        return value !== value && other !== other;
-      }
-      return baseIsEqualDeep(value, other, bitmask, customizer, baseIsEqual, stack);
-    }
-
-    /**
-     * A specialized version of `baseIsEqual` for arrays and objects which performs
-     * deep comparisons and tracks traversed objects enabling objects with circular
-     * references to be compared.
-     *
-     * @private
-     * @param {Object} object The object to compare.
-     * @param {Object} other The other object to compare.
-     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
-     * @param {Function} customizer The function to customize comparisons.
-     * @param {Function} equalFunc The function to determine equivalents of values.
-     * @param {Object} [stack] Tracks traversed `object` and `other` objects.
-     * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
-     */
-    function baseIsEqualDeep(object, other, bitmask, customizer, equalFunc, stack) {
-      var objIsArr = isArray(object),
-          othIsArr = isArray(other),
-          objTag = objIsArr ? arrayTag : getTag(object),
-          othTag = othIsArr ? arrayTag : getTag(other);
-
-      objTag = objTag == argsTag ? objectTag : objTag;
-      othTag = othTag == argsTag ? objectTag : othTag;
-
-      var objIsObj = objTag == objectTag,
-          othIsObj = othTag == objectTag,
-          isSameTag = objTag == othTag;
-
-      if (isSameTag && isBuffer(object)) {
-        if (!isBuffer(other)) {
-          return false;
-        }
-        objIsArr = true;
-        objIsObj = false;
-      }
-      if (isSameTag && !objIsObj) {
-        stack || (stack = new Stack);
-        return (objIsArr || isTypedArray(object))
-          ? equalArrays(object, other, bitmask, customizer, equalFunc, stack)
-          : equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack);
-      }
-      if (!(bitmask & COMPARE_PARTIAL_FLAG)) {
-        var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
-            othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
-
-        if (objIsWrapped || othIsWrapped) {
-          var objUnwrapped = objIsWrapped ? object.value() : object,
-              othUnwrapped = othIsWrapped ? other.value() : other;
-
-          stack || (stack = new Stack);
-          return equalFunc(objUnwrapped, othUnwrapped, bitmask, customizer, stack);
-        }
-      }
-      if (!isSameTag) {
-        return false;
-      }
-      stack || (stack = new Stack);
-      return equalObjects(object, other, bitmask, customizer, equalFunc, stack);
-    }
-
-    /**
-     * The base implementation of `_.isMap` without Node.js optimizations.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a map, else `false`.
-     */
-    function baseIsMap(value) {
-      return isObjectLike(value) && getTag(value) == mapTag;
-    }
-
-    /**
-     * The base implementation of `_.isMatch` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Object} object The object to inspect.
-     * @param {Object} source The object of property values to match.
-     * @param {Array} matchData The property names, values, and compare flags to match.
-     * @param {Function} [customizer] The function to customize comparisons.
-     * @returns {boolean} Returns `true` if `object` is a match, else `false`.
-     */
-    function baseIsMatch(object, source, matchData, customizer) {
-      var index = matchData.length,
-          length = index,
-          noCustomizer = !customizer;
-
-      if (object == null) {
-        return !length;
-      }
-      object = Object(object);
-      while (index--) {
-        var data = matchData[index];
-        if ((noCustomizer && data[2])
-              ? data[1] !== object[data[0]]
-              : !(data[0] in object)
-            ) {
-          return false;
-        }
-      }
-      while (++index < length) {
-        data = matchData[index];
-        var key = data[0],
-            objValue = object[key],
-            srcValue = data[1];
-
-        if (noCustomizer && data[2]) {
-          if (objValue === undefined && !(key in object)) {
-            return false;
-          }
-        } else {
-          var stack = new Stack;
-          if (customizer) {
-            var result = customizer(objValue, srcValue, key, object, source, stack);
-          }
-          if (!(result === undefined
-                ? baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG, customizer, stack)
-                : result
-              )) {
-            return false;
-          }
-        }
-      }
-      return true;
-    }
-
-    /**
-     * The base implementation of `_.isNative` without bad shim checks.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a native function,
-     *  else `false`.
-     */
-    function baseIsNative(value) {
-      if (!isObject(value) || isMasked(value)) {
-        return false;
-      }
-      var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
-      return pattern.test(toSource(value));
-    }
-
-    /**
-     * The base implementation of `_.isRegExp` without Node.js optimizations.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a regexp, else `false`.
-     */
-    function baseIsRegExp(value) {
-      return isObjectLike(value) && baseGetTag(value) == regexpTag;
-    }
-
-    /**
-     * The base implementation of `_.isSet` without Node.js optimizations.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a set, else `false`.
-     */
-    function baseIsSet(value) {
-      return isObjectLike(value) && getTag(value) == setTag;
-    }
-
-    /**
-     * The base implementation of `_.isTypedArray` without Node.js optimizations.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
-     */
-    function baseIsTypedArray(value) {
-      return isObjectLike(value) &&
-        isLength(value.length) && !!typedArrayTags[baseGetTag(value)];
-    }
-
-    /**
-     * The base implementation of `_.iteratee`.
-     *
-     * @private
-     * @param {*} [value=_.identity] The value to convert to an iteratee.
-     * @returns {Function} Returns the iteratee.
-     */
-    function baseIteratee(value) {
-      // Don't store the `typeof` result in a variable to avoid a JIT bug in Safari 9.
-      // See https://bugs.webkit.org/show_bug.cgi?id=156034 for more details.
-      if (typeof value == 'function') {
-        return value;
-      }
-      if (value == null) {
-        return identity;
-      }
-      if (typeof value == 'object') {
-        return isArray(value)
-          ? baseMatchesProperty(value[0], value[1])
-          : baseMatches(value);
-      }
-      return property(value);
-    }
-
-    /**
-     * The base implementation of `_.keys` which doesn't treat sparse arrays as dense.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names.
-     */
-    function baseKeys(object) {
-      if (!isPrototype(object)) {
-        return nativeKeys(object);
-      }
-      var result = [];
-      for (var key in Object(object)) {
-        if (hasOwnProperty.call(object, key) && key != 'constructor') {
-          result.push(key);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.keysIn` which doesn't treat sparse arrays as dense.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names.
-     */
-    function baseKeysIn(object) {
-      if (!isObject(object)) {
-        return nativeKeysIn(object);
-      }
-      var isProto = isPrototype(object),
-          result = [];
-
-      for (var key in object) {
-        if (!(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {
-          result.push(key);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.lt` which doesn't coerce arguments.
-     *
-     * @private
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if `value` is less than `other`,
-     *  else `false`.
-     */
-    function baseLt(value, other) {
-      return value < other;
-    }
-
-    /**
-     * The base implementation of `_.map` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} iteratee The function invoked per iteration.
-     * @returns {Array} Returns the new mapped array.
-     */
-    function baseMap(collection, iteratee) {
-      var index = -1,
-          result = isArrayLike(collection) ? Array(collection.length) : [];
-
-      baseEach(collection, function(value, key, collection) {
-        result[++index] = iteratee(value, key, collection);
-      });
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.matches` which doesn't clone `source`.
-     *
-     * @private
-     * @param {Object} source The object of property values to match.
-     * @returns {Function} Returns the new spec function.
-     */
-    function baseMatches(source) {
-      var matchData = getMatchData(source);
-      if (matchData.length == 1 && matchData[0][2]) {
-        return matchesStrictComparable(matchData[0][0], matchData[0][1]);
-      }
-      return function(object) {
-        return object === source || baseIsMatch(object, source, matchData);
-      };
-    }
-
-    /**
-     * The base implementation of `_.matchesProperty` which doesn't clone `srcValue`.
-     *
-     * @private
-     * @param {string} path The path of the property to get.
-     * @param {*} srcValue The value to match.
-     * @returns {Function} Returns the new spec function.
-     */
-    function baseMatchesProperty(path, srcValue) {
-      if (isKey(path) && isStrictComparable(srcValue)) {
-        return matchesStrictComparable(toKey(path), srcValue);
-      }
-      return function(object) {
-        var objValue = get(object, path);
-        return (objValue === undefined && objValue === srcValue)
-          ? hasIn(object, path)
-          : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
-      };
-    }
-
-    /**
-     * The base implementation of `_.merge` without support for multiple sources.
-     *
-     * @private
-     * @param {Object} object The destination object.
-     * @param {Object} source The source object.
-     * @param {number} srcIndex The index of `source`.
-     * @param {Function} [customizer] The function to customize merged values.
-     * @param {Object} [stack] Tracks traversed source values and their merged
-     *  counterparts.
-     */
-    function baseMerge(object, source, srcIndex, customizer, stack) {
-      if (object === source) {
-        return;
-      }
-      baseFor(source, function(srcValue, key) {
-        if (isObject(srcValue)) {
-          stack || (stack = new Stack);
-          baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
-        }
-        else {
-          var newValue = customizer
-            ? customizer(safeGet(object, key), srcValue, (key + ''), object, source, stack)
-            : undefined;
-
-          if (newValue === undefined) {
-            newValue = srcValue;
-          }
-          assignMergeValue(object, key, newValue);
-        }
-      }, keysIn);
-    }
-
-    /**
-     * A specialized version of `baseMerge` for arrays and objects which performs
-     * deep merges and tracks traversed objects enabling objects with circular
-     * references to be merged.
-     *
-     * @private
-     * @param {Object} object The destination object.
-     * @param {Object} source The source object.
-     * @param {string} key The key of the value to merge.
-     * @param {number} srcIndex The index of `source`.
-     * @param {Function} mergeFunc The function to merge values.
-     * @param {Function} [customizer] The function to customize assigned values.
-     * @param {Object} [stack] Tracks traversed source values and their merged
-     *  counterparts.
-     */
-    function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) {
-      var objValue = safeGet(object, key),
-          srcValue = safeGet(source, key),
-          stacked = stack.get(srcValue);
-
-      if (stacked) {
-        assignMergeValue(object, key, stacked);
-        return;
-      }
-      var newValue = customizer
-        ? customizer(objValue, srcValue, (key + ''), object, source, stack)
-        : undefined;
-
-      var isCommon = newValue === undefined;
-
-      if (isCommon) {
-        var isArr = isArray(srcValue),
-            isBuff = !isArr && isBuffer(srcValue),
-            isTyped = !isArr && !isBuff && isTypedArray(srcValue);
-
-        newValue = srcValue;
-        if (isArr || isBuff || isTyped) {
-          if (isArray(objValue)) {
-            newValue = objValue;
-          }
-          else if (isArrayLikeObject(objValue)) {
-            newValue = copyArray(objValue);
-          }
-          else if (isBuff) {
-            isCommon = false;
-            newValue = cloneBuffer(srcValue, true);
-          }
-          else if (isTyped) {
-            isCommon = false;
-            newValue = cloneTypedArray(srcValue, true);
-          }
-          else {
-            newValue = [];
-          }
-        }
-        else if (isPlainObject(srcValue) || isArguments(srcValue)) {
-          newValue = objValue;
-          if (isArguments(objValue)) {
-            newValue = toPlainObject(objValue);
-          }
-          else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) {
-            newValue = initCloneObject(srcValue);
-          }
-        }
-        else {
-          isCommon = false;
-        }
-      }
-      if (isCommon) {
-        // Recursively merge objects and arrays (susceptible to call stack limits).
-        stack.set(srcValue, newValue);
-        mergeFunc(newValue, srcValue, srcIndex, customizer, stack);
-        stack['delete'](srcValue);
-      }
-      assignMergeValue(object, key, newValue);
-    }
-
-    /**
-     * The base implementation of `_.nth` which doesn't coerce arguments.
-     *
-     * @private
-     * @param {Array} array The array to query.
-     * @param {number} n The index of the element to return.
-     * @returns {*} Returns the nth element of `array`.
-     */
-    function baseNth(array, n) {
-      var length = array.length;
-      if (!length) {
-        return;
-      }
-      n += n < 0 ? length : 0;
-      return isIndex(n, length) ? array[n] : undefined;
-    }
-
-    /**
-     * The base implementation of `_.orderBy` without param guards.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by.
-     * @param {string[]} orders The sort orders of `iteratees`.
-     * @returns {Array} Returns the new sorted array.
-     */
-    function baseOrderBy(collection, iteratees, orders) {
-      var index = -1;
-      iteratees = arrayMap(iteratees.length ? iteratees : [identity], baseUnary(getIteratee()));
-
-      var result = baseMap(collection, function(value, key, collection) {
-        var criteria = arrayMap(iteratees, function(iteratee) {
-          return iteratee(value);
-        });
-        return { 'criteria': criteria, 'index': ++index, 'value': value };
-      });
-
-      return baseSortBy(result, function(object, other) {
-        return compareMultiple(object, other, orders);
-      });
-    }
-
-    /**
-     * The base implementation of `_.pick` without support for individual
-     * property identifiers.
-     *
-     * @private
-     * @param {Object} object The source object.
-     * @param {string[]} paths The property paths to pick.
-     * @returns {Object} Returns the new object.
-     */
-    function basePick(object, paths) {
-      return basePickBy(object, paths, function(value, path) {
-        return hasIn(object, path);
-      });
-    }
-
-    /**
-     * The base implementation of  `_.pickBy` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Object} object The source object.
-     * @param {string[]} paths The property paths to pick.
-     * @param {Function} predicate The function invoked per property.
-     * @returns {Object} Returns the new object.
-     */
-    function basePickBy(object, paths, predicate) {
-      var index = -1,
-          length = paths.length,
-          result = {};
-
-      while (++index < length) {
-        var path = paths[index],
-            value = baseGet(object, path);
-
-        if (predicate(value, path)) {
-          baseSet(result, castPath(path, object), value);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * A specialized version of `baseProperty` which supports deep paths.
-     *
-     * @private
-     * @param {Array|string} path The path of the property to get.
-     * @returns {Function} Returns the new accessor function.
-     */
-    function basePropertyDeep(path) {
-      return function(object) {
-        return baseGet(object, path);
-      };
-    }
-
-    /**
-     * The base implementation of `_.pullAllBy` without support for iteratee
-     * shorthands.
-     *
-     * @private
-     * @param {Array} array The array to modify.
-     * @param {Array} values The values to remove.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns `array`.
-     */
-    function basePullAll(array, values, iteratee, comparator) {
-      var indexOf = comparator ? baseIndexOfWith : baseIndexOf,
-          index = -1,
-          length = values.length,
-          seen = array;
-
-      if (array === values) {
-        values = copyArray(values);
-      }
-      if (iteratee) {
-        seen = arrayMap(array, baseUnary(iteratee));
-      }
-      while (++index < length) {
-        var fromIndex = 0,
-            value = values[index],
-            computed = iteratee ? iteratee(value) : value;
-
-        while ((fromIndex = indexOf(seen, computed, fromIndex, comparator)) > -1) {
-          if (seen !== array) {
-            splice.call(seen, fromIndex, 1);
-          }
-          splice.call(array, fromIndex, 1);
-        }
-      }
-      return array;
-    }
-
-    /**
-     * The base implementation of `_.pullAt` without support for individual
-     * indexes or capturing the removed elements.
-     *
-     * @private
-     * @param {Array} array The array to modify.
-     * @param {number[]} indexes The indexes of elements to remove.
-     * @returns {Array} Returns `array`.
-     */
-    function basePullAt(array, indexes) {
-      var length = array ? indexes.length : 0,
-          lastIndex = length - 1;
-
-      while (length--) {
-        var index = indexes[length];
-        if (length == lastIndex || index !== previous) {
-          var previous = index;
-          if (isIndex(index)) {
-            splice.call(array, index, 1);
-          } else {
-            baseUnset(array, index);
-          }
-        }
-      }
-      return array;
-    }
-
-    /**
-     * The base implementation of `_.random` without support for returning
-     * floating-point numbers.
-     *
-     * @private
-     * @param {number} lower The lower bound.
-     * @param {number} upper The upper bound.
-     * @returns {number} Returns the random number.
-     */
-    function baseRandom(lower, upper) {
-      return lower + nativeFloor(nativeRandom() * (upper - lower + 1));
-    }
-
-    /**
-     * The base implementation of `_.range` and `_.rangeRight` which doesn't
-     * coerce arguments.
-     *
-     * @private
-     * @param {number} start The start of the range.
-     * @param {number} end The end of the range.
-     * @param {number} step The value to increment or decrement by.
-     * @param {boolean} [fromRight] Specify iterating from right to left.
-     * @returns {Array} Returns the range of numbers.
-     */
-    function baseRange(start, end, step, fromRight) {
-      var index = -1,
-          length = nativeMax(nativeCeil((end - start) / (step || 1)), 0),
-          result = Array(length);
-
-      while (length--) {
-        result[fromRight ? length : ++index] = start;
-        start += step;
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.repeat` which doesn't coerce arguments.
-     *
-     * @private
-     * @param {string} string The string to repeat.
-     * @param {number} n The number of times to repeat the string.
-     * @returns {string} Returns the repeated string.
-     */
-    function baseRepeat(string, n) {
-      var result = '';
-      if (!string || n < 1 || n > MAX_SAFE_INTEGER) {
-        return result;
-      }
-      // Leverage the exponentiation by squaring algorithm for a faster repeat.
-      // See https://en.wikipedia.org/wiki/Exponentiation_by_squaring for more details.
-      do {
-        if (n % 2) {
-          result += string;
-        }
-        n = nativeFloor(n / 2);
-        if (n) {
-          string += string;
-        }
-      } while (n);
-
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.rest` which doesn't validate or coerce arguments.
-     *
-     * @private
-     * @param {Function} func The function to apply a rest parameter to.
-     * @param {number} [start=func.length-1] The start position of the rest parameter.
-     * @returns {Function} Returns the new function.
-     */
-    function baseRest(func, start) {
-      return setToString(overRest(func, start, identity), func + '');
-    }
-
-    /**
-     * The base implementation of `_.sample`.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to sample.
-     * @returns {*} Returns the random element.
-     */
-    function baseSample(collection) {
-      return arraySample(values(collection));
-    }
-
-    /**
-     * The base implementation of `_.sampleSize` without param guards.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to sample.
-     * @param {number} n The number of elements to sample.
-     * @returns {Array} Returns the random elements.
-     */
-    function baseSampleSize(collection, n) {
-      var array = values(collection);
-      return shuffleSelf(array, baseClamp(n, 0, array.length));
-    }
-
-    /**
-     * The base implementation of `_.set`.
-     *
-     * @private
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to set.
-     * @param {*} value The value to set.
-     * @param {Function} [customizer] The function to customize path creation.
-     * @returns {Object} Returns `object`.
-     */
-    function baseSet(object, path, value, customizer) {
-      if (!isObject(object)) {
-        return object;
-      }
-      path = castPath(path, object);
-
-      var index = -1,
-          length = path.length,
-          lastIndex = length - 1,
-          nested = object;
-
-      while (nested != null && ++index < length) {
-        var key = toKey(path[index]),
-            newValue = value;
-
-        if (index != lastIndex) {
-          var objValue = nested[key];
-          newValue = customizer ? customizer(objValue, key, nested) : undefined;
-          if (newValue === undefined) {
-            newValue = isObject(objValue)
-              ? objValue
-              : (isIndex(path[index + 1]) ? [] : {});
-          }
-        }
-        assignValue(nested, key, newValue);
-        nested = nested[key];
-      }
-      return object;
-    }
-
-    /**
-     * The base implementation of `setData` without support for hot loop shorting.
-     *
-     * @private
-     * @param {Function} func The function to associate metadata with.
-     * @param {*} data The metadata.
-     * @returns {Function} Returns `func`.
-     */
-    var baseSetData = !metaMap ? identity : function(func, data) {
-      metaMap.set(func, data);
-      return func;
-    };
-
-    /**
-     * The base implementation of `setToString` without support for hot loop shorting.
-     *
-     * @private
-     * @param {Function} func The function to modify.
-     * @param {Function} string The `toString` result.
-     * @returns {Function} Returns `func`.
-     */
-    var baseSetToString = !defineProperty ? identity : function(func, string) {
-      return defineProperty(func, 'toString', {
-        'configurable': true,
-        'enumerable': false,
-        'value': constant(string),
-        'writable': true
-      });
-    };
-
-    /**
-     * The base implementation of `_.shuffle`.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to shuffle.
-     * @returns {Array} Returns the new shuffled array.
-     */
-    function baseShuffle(collection) {
-      return shuffleSelf(values(collection));
-    }
-
-    /**
-     * The base implementation of `_.slice` without an iteratee call guard.
-     *
-     * @private
-     * @param {Array} array The array to slice.
-     * @param {number} [start=0] The start position.
-     * @param {number} [end=array.length] The end position.
-     * @returns {Array} Returns the slice of `array`.
-     */
-    function baseSlice(array, start, end) {
-      var index = -1,
-          length = array.length;
-
-      if (start < 0) {
-        start = -start > length ? 0 : (length + start);
-      }
-      end = end > length ? length : end;
-      if (end < 0) {
-        end += length;
-      }
-      length = start > end ? 0 : ((end - start) >>> 0);
-      start >>>= 0;
-
-      var result = Array(length);
-      while (++index < length) {
-        result[index] = array[index + start];
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.some` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} predicate The function invoked per iteration.
-     * @returns {boolean} Returns `true` if any element passes the predicate check,
-     *  else `false`.
-     */
-    function baseSome(collection, predicate) {
-      var result;
-
-      baseEach(collection, function(value, index, collection) {
-        result = predicate(value, index, collection);
-        return !result;
-      });
-      return !!result;
-    }
-
-    /**
-     * The base implementation of `_.sortedIndex` and `_.sortedLastIndex` which
-     * performs a binary search of `array` to determine the index at which `value`
-     * should be inserted into `array` in order to maintain its sort order.
-     *
-     * @private
-     * @param {Array} array The sorted array to inspect.
-     * @param {*} value The value to evaluate.
-     * @param {boolean} [retHighest] Specify returning the highest qualified index.
-     * @returns {number} Returns the index at which `value` should be inserted
-     *  into `array`.
-     */
-    function baseSortedIndex(array, value, retHighest) {
-      var low = 0,
-          high = array == null ? low : array.length;
-
-      if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {
-        while (low < high) {
-          var mid = (low + high) >>> 1,
-              computed = array[mid];
-
-          if (computed !== null && !isSymbol(computed) &&
-              (retHighest ? (computed <= value) : (computed < value))) {
-            low = mid + 1;
-          } else {
-            high = mid;
-          }
-        }
-        return high;
-      }
-      return baseSortedIndexBy(array, value, identity, retHighest);
-    }
-
-    /**
-     * The base implementation of `_.sortedIndexBy` and `_.sortedLastIndexBy`
-     * which invokes `iteratee` for `value` and each element of `array` to compute
-     * their sort ranking. The iteratee is invoked with one argument; (value).
-     *
-     * @private
-     * @param {Array} array The sorted array to inspect.
-     * @param {*} value The value to evaluate.
-     * @param {Function} iteratee The iteratee invoked per element.
-     * @param {boolean} [retHighest] Specify returning the highest qualified index.
-     * @returns {number} Returns the index at which `value` should be inserted
-     *  into `array`.
-     */
-    function baseSortedIndexBy(array, value, iteratee, retHighest) {
-      value = iteratee(value);
-
-      var low = 0,
-          high = array == null ? 0 : array.length,
-          valIsNaN = value !== value,
-          valIsNull = value === null,
-          valIsSymbol = isSymbol(value),
-          valIsUndefined = value === undefined;
-
-      while (low < high) {
-        var mid = nativeFloor((low + high) / 2),
-            computed = iteratee(array[mid]),
-            othIsDefined = computed !== undefined,
-            othIsNull = computed === null,
-            othIsReflexive = computed === computed,
-            othIsSymbol = isSymbol(computed);
-
-        if (valIsNaN) {
-          var setLow = retHighest || othIsReflexive;
-        } else if (valIsUndefined) {
-          setLow = othIsReflexive && (retHighest || othIsDefined);
-        } else if (valIsNull) {
-          setLow = othIsReflexive && othIsDefined && (retHighest || !othIsNull);
-        } else if (valIsSymbol) {
-          setLow = othIsReflexive && othIsDefined && !othIsNull && (retHighest || !othIsSymbol);
-        } else if (othIsNull || othIsSymbol) {
-          setLow = false;
-        } else {
-          setLow = retHighest ? (computed <= value) : (computed < value);
-        }
-        if (setLow) {
-          low = mid + 1;
-        } else {
-          high = mid;
-        }
-      }
-      return nativeMin(high, MAX_ARRAY_INDEX);
-    }
-
-    /**
-     * The base implementation of `_.sortedUniq` and `_.sortedUniqBy` without
-     * support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array} array The array to inspect.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @returns {Array} Returns the new duplicate free array.
-     */
-    function baseSortedUniq(array, iteratee) {
-      var index = -1,
-          length = array.length,
-          resIndex = 0,
-          result = [];
-
-      while (++index < length) {
-        var value = array[index],
-            computed = iteratee ? iteratee(value) : value;
-
-        if (!index || !eq(computed, seen)) {
-          var seen = computed;
-          result[resIndex++] = value === 0 ? 0 : value;
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.toNumber` which doesn't ensure correct
-     * conversions of binary, hexadecimal, or octal string values.
-     *
-     * @private
-     * @param {*} value The value to process.
-     * @returns {number} Returns the number.
-     */
-    function baseToNumber(value) {
-      if (typeof value == 'number') {
-        return value;
-      }
-      if (isSymbol(value)) {
-        return NAN;
-      }
-      return +value;
-    }
-
-    /**
-     * The base implementation of `_.toString` which doesn't convert nullish
-     * values to empty strings.
-     *
-     * @private
-     * @param {*} value The value to process.
-     * @returns {string} Returns the string.
-     */
-    function baseToString(value) {
-      // Exit early for strings to avoid a performance hit in some environments.
-      if (typeof value == 'string') {
-        return value;
-      }
-      if (isArray(value)) {
-        // Recursively convert values (susceptible to call stack limits).
-        return arrayMap(value, baseToString) + '';
-      }
-      if (isSymbol(value)) {
-        return symbolToString ? symbolToString.call(value) : '';
-      }
-      var result = (value + '');
-      return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
-    }
-
-    /**
-     * The base implementation of `_.uniqBy` without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array} array The array to inspect.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new duplicate free array.
-     */
-    function baseUniq(array, iteratee, comparator) {
-      var index = -1,
-          includes = arrayIncludes,
-          length = array.length,
-          isCommon = true,
-          result = [],
-          seen = result;
-
-      if (comparator) {
-        isCommon = false;
-        includes = arrayIncludesWith;
-      }
-      else if (length >= LARGE_ARRAY_SIZE) {
-        var set = iteratee ? null : createSet(array);
-        if (set) {
-          return setToArray(set);
-        }
-        isCommon = false;
-        includes = cacheHas;
-        seen = new SetCache;
-      }
-      else {
-        seen = iteratee ? [] : result;
-      }
-      outer:
-      while (++index < length) {
-        var value = array[index],
-            computed = iteratee ? iteratee(value) : value;
-
-        value = (comparator || value !== 0) ? value : 0;
-        if (isCommon && computed === computed) {
-          var seenIndex = seen.length;
-          while (seenIndex--) {
-            if (seen[seenIndex] === computed) {
-              continue outer;
-            }
-          }
-          if (iteratee) {
-            seen.push(computed);
-          }
-          result.push(value);
-        }
-        else if (!includes(seen, computed, comparator)) {
-          if (seen !== result) {
-            seen.push(computed);
-          }
-          result.push(value);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * The base implementation of `_.unset`.
-     *
-     * @private
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The property path to unset.
-     * @returns {boolean} Returns `true` if the property is deleted, else `false`.
-     */
-    function baseUnset(object, path) {
-      path = castPath(path, object);
-      object = parent(object, path);
-      return object == null || delete object[toKey(last(path))];
-    }
-
-    /**
-     * The base implementation of `_.update`.
-     *
-     * @private
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to update.
-     * @param {Function} updater The function to produce the updated value.
-     * @param {Function} [customizer] The function to customize path creation.
-     * @returns {Object} Returns `object`.
-     */
-    function baseUpdate(object, path, updater, customizer) {
-      return baseSet(object, path, updater(baseGet(object, path)), customizer);
-    }
-
-    /**
-     * The base implementation of methods like `_.dropWhile` and `_.takeWhile`
-     * without support for iteratee shorthands.
-     *
-     * @private
-     * @param {Array} array The array to query.
-     * @param {Function} predicate The function invoked per iteration.
-     * @param {boolean} [isDrop] Specify dropping elements instead of taking them.
-     * @param {boolean} [fromRight] Specify iterating from right to left.
-     * @returns {Array} Returns the slice of `array`.
-     */
-    function baseWhile(array, predicate, isDrop, fromRight) {
-      var length = array.length,
-          index = fromRight ? length : -1;
-
-      while ((fromRight ? index-- : ++index < length) &&
-        predicate(array[index], index, array)) {}
-
-      return isDrop
-        ? baseSlice(array, (fromRight ? 0 : index), (fromRight ? index + 1 : length))
-        : baseSlice(array, (fromRight ? index + 1 : 0), (fromRight ? length : index));
-    }
-
-    /**
-     * The base implementation of `wrapperValue` which returns the result of
-     * performing a sequence of actions on the unwrapped `value`, where each
-     * successive action is supplied the return value of the previous.
-     *
-     * @private
-     * @param {*} value The unwrapped value.
-     * @param {Array} actions Actions to perform to resolve the unwrapped value.
-     * @returns {*} Returns the resolved value.
-     */
-    function baseWrapperValue(value, actions) {
-      var result = value;
-      if (result instanceof LazyWrapper) {
-        result = result.value();
-      }
-      return arrayReduce(actions, function(result, action) {
-        return action.func.apply(action.thisArg, arrayPush([result], action.args));
-      }, result);
-    }
-
-    /**
-     * The base implementation of methods like `_.xor`, without support for
-     * iteratee shorthands, that accepts an array of arrays to inspect.
-     *
-     * @private
-     * @param {Array} arrays The arrays to inspect.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of values.
-     */
-    function baseXor(arrays, iteratee, comparator) {
-      var length = arrays.length;
-      if (length < 2) {
-        return length ? baseUniq(arrays[0]) : [];
-      }
-      var index = -1,
-          result = Array(length);
-
-      while (++index < length) {
-        var array = arrays[index],
-            othIndex = -1;
-
-        while (++othIndex < length) {
-          if (othIndex != index) {
-            result[index] = baseDifference(result[index] || array, arrays[othIndex], iteratee, comparator);
-          }
-        }
-      }
-      return baseUniq(baseFlatten(result, 1), iteratee, comparator);
-    }
-
-    /**
-     * This base implementation of `_.zipObject` which assigns values using `assignFunc`.
-     *
-     * @private
-     * @param {Array} props The property identifiers.
-     * @param {Array} values The property values.
-     * @param {Function} assignFunc The function to assign values.
-     * @returns {Object} Returns the new object.
-     */
-    function baseZipObject(props, values, assignFunc) {
-      var index = -1,
-          length = props.length,
-          valsLength = values.length,
-          result = {};
-
-      while (++index < length) {
-        var value = index < valsLength ? values[index] : undefined;
-        assignFunc(result, props[index], value);
-      }
-      return result;
-    }
-
-    /**
-     * Casts `value` to an empty array if it's not an array like object.
-     *
-     * @private
-     * @param {*} value The value to inspect.
-     * @returns {Array|Object} Returns the cast array-like object.
-     */
-    function castArrayLikeObject(value) {
-      return isArrayLikeObject(value) ? value : [];
-    }
-
-    /**
-     * Casts `value` to `identity` if it's not a function.
-     *
-     * @private
-     * @param {*} value The value to inspect.
-     * @returns {Function} Returns cast function.
-     */
-    function castFunction(value) {
-      return typeof value == 'function' ? value : identity;
-    }
-
-    /**
-     * Casts `value` to a path array if it's not one.
-     *
-     * @private
-     * @param {*} value The value to inspect.
-     * @param {Object} [object] The object to query keys on.
-     * @returns {Array} Returns the cast property path array.
-     */
-    function castPath(value, object) {
-      if (isArray(value)) {
-        return value;
-      }
-      return isKey(value, object) ? [value] : stringToPath(toString(value));
-    }
-
-    /**
-     * A `baseRest` alias which can be replaced with `identity` by module
-     * replacement plugins.
-     *
-     * @private
-     * @type {Function}
-     * @param {Function} func The function to apply a rest parameter to.
-     * @returns {Function} Returns the new function.
-     */
-    var castRest = baseRest;
-
-    /**
-     * Casts `array` to a slice if it's needed.
-     *
-     * @private
-     * @param {Array} array The array to inspect.
-     * @param {number} start The start position.
-     * @param {number} [end=array.length] The end position.
-     * @returns {Array} Returns the cast slice.
-     */
-    function castSlice(array, start, end) {
-      var length = array.length;
-      end = end === undefined ? length : end;
-      return (!start && end >= length) ? array : baseSlice(array, start, end);
-    }
-
-    /**
-     * A simple wrapper around the global [`clearTimeout`](https://mdn.io/clearTimeout).
-     *
-     * @private
-     * @param {number|Object} id The timer id or timeout object of the timer to clear.
-     */
-    var clearTimeout = ctxClearTimeout || function(id) {
-      return root.clearTimeout(id);
-    };
-
-    /**
-     * Creates a clone of  `buffer`.
-     *
-     * @private
-     * @param {Buffer} buffer The buffer to clone.
-     * @param {boolean} [isDeep] Specify a deep clone.
-     * @returns {Buffer} Returns the cloned buffer.
-     */
-    function cloneBuffer(buffer, isDeep) {
-      if (isDeep) {
-        return buffer.slice();
-      }
-      var length = buffer.length,
-          result = allocUnsafe ? allocUnsafe(length) : new buffer.constructor(length);
-
-      buffer.copy(result);
-      return result;
-    }
-
-    /**
-     * Creates a clone of `arrayBuffer`.
-     *
-     * @private
-     * @param {ArrayBuffer} arrayBuffer The array buffer to clone.
-     * @returns {ArrayBuffer} Returns the cloned array buffer.
-     */
-    function cloneArrayBuffer(arrayBuffer) {
-      var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
-      new Uint8Array(result).set(new Uint8Array(arrayBuffer));
-      return result;
-    }
-
-    /**
-     * Creates a clone of `dataView`.
-     *
-     * @private
-     * @param {Object} dataView The data view to clone.
-     * @param {boolean} [isDeep] Specify a deep clone.
-     * @returns {Object} Returns the cloned data view.
-     */
-    function cloneDataView(dataView, isDeep) {
-      var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer;
-      return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
-    }
-
-    /**
-     * Creates a clone of `regexp`.
-     *
-     * @private
-     * @param {Object} regexp The regexp to clone.
-     * @returns {Object} Returns the cloned regexp.
-     */
-    function cloneRegExp(regexp) {
-      var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
-      result.lastIndex = regexp.lastIndex;
-      return result;
-    }
-
-    /**
-     * Creates a clone of the `symbol` object.
-     *
-     * @private
-     * @param {Object} symbol The symbol object to clone.
-     * @returns {Object} Returns the cloned symbol object.
-     */
-    function cloneSymbol(symbol) {
-      return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
-    }
-
-    /**
-     * Creates a clone of `typedArray`.
-     *
-     * @private
-     * @param {Object} typedArray The typed array to clone.
-     * @param {boolean} [isDeep] Specify a deep clone.
-     * @returns {Object} Returns the cloned typed array.
-     */
-    function cloneTypedArray(typedArray, isDeep) {
-      var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
-      return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
-    }
-
-    /**
-     * Compares values to sort them in ascending order.
-     *
-     * @private
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {number} Returns the sort order indicator for `value`.
-     */
-    function compareAscending(value, other) {
-      if (value !== other) {
-        var valIsDefined = value !== undefined,
-            valIsNull = value === null,
-            valIsReflexive = value === value,
-            valIsSymbol = isSymbol(value);
-
-        var othIsDefined = other !== undefined,
-            othIsNull = other === null,
-            othIsReflexive = other === other,
-            othIsSymbol = isSymbol(other);
-
-        if ((!othIsNull && !othIsSymbol && !valIsSymbol && value > other) ||
-            (valIsSymbol && othIsDefined && othIsReflexive && !othIsNull && !othIsSymbol) ||
-            (valIsNull && othIsDefined && othIsReflexive) ||
-            (!valIsDefined && othIsReflexive) ||
-            !valIsReflexive) {
-          return 1;
-        }
-        if ((!valIsNull && !valIsSymbol && !othIsSymbol && value < other) ||
-            (othIsSymbol && valIsDefined && valIsReflexive && !valIsNull && !valIsSymbol) ||
-            (othIsNull && valIsDefined && valIsReflexive) ||
-            (!othIsDefined && valIsReflexive) ||
-            !othIsReflexive) {
-          return -1;
-        }
-      }
-      return 0;
-    }
-
-    /**
-     * Used by `_.orderBy` to compare multiple properties of a value to another
-     * and stable sort them.
-     *
-     * If `orders` is unspecified, all values are sorted in ascending order. Otherwise,
-     * specify an order of "desc" for descending or "asc" for ascending sort order
-     * of corresponding values.
-     *
-     * @private
-     * @param {Object} object The object to compare.
-     * @param {Object} other The other object to compare.
-     * @param {boolean[]|string[]} orders The order to sort by for each property.
-     * @returns {number} Returns the sort order indicator for `object`.
-     */
-    function compareMultiple(object, other, orders) {
-      var index = -1,
-          objCriteria = object.criteria,
-          othCriteria = other.criteria,
-          length = objCriteria.length,
-          ordersLength = orders.length;
-
-      while (++index < length) {
-        var result = compareAscending(objCriteria[index], othCriteria[index]);
-        if (result) {
-          if (index >= ordersLength) {
-            return result;
-          }
-          var order = orders[index];
-          return result * (order == 'desc' ? -1 : 1);
-        }
-      }
-      // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
-      // that causes it, under certain circumstances, to provide the same value for
-      // `object` and `other`. See https://github.com/jashkenas/underscore/pull/1247
-      // for more details.
-      //
-      // This also ensures a stable sort in V8 and other engines.
-      // See https://bugs.chromium.org/p/v8/issues/detail?id=90 for more details.
-      return object.index - other.index;
-    }
-
-    /**
-     * Creates an array that is the composition of partially applied arguments,
-     * placeholders, and provided arguments into a single array of arguments.
-     *
-     * @private
-     * @param {Array} args The provided arguments.
-     * @param {Array} partials The arguments to prepend to those provided.
-     * @param {Array} holders The `partials` placeholder indexes.
-     * @params {boolean} [isCurried] Specify composing for a curried function.
-     * @returns {Array} Returns the new array of composed arguments.
-     */
-    function composeArgs(args, partials, holders, isCurried) {
-      var argsIndex = -1,
-          argsLength = args.length,
-          holdersLength = holders.length,
-          leftIndex = -1,
-          leftLength = partials.length,
-          rangeLength = nativeMax(argsLength - holdersLength, 0),
-          result = Array(leftLength + rangeLength),
-          isUncurried = !isCurried;
-
-      while (++leftIndex < leftLength) {
-        result[leftIndex] = partials[leftIndex];
-      }
-      while (++argsIndex < holdersLength) {
-        if (isUncurried || argsIndex < argsLength) {
-          result[holders[argsIndex]] = args[argsIndex];
-        }
-      }
-      while (rangeLength--) {
-        result[leftIndex++] = args[argsIndex++];
-      }
-      return result;
-    }
-
-    /**
-     * This function is like `composeArgs` except that the arguments composition
-     * is tailored for `_.partialRight`.
-     *
-     * @private
-     * @param {Array} args The provided arguments.
-     * @param {Array} partials The arguments to append to those provided.
-     * @param {Array} holders The `partials` placeholder indexes.
-     * @params {boolean} [isCurried] Specify composing for a curried function.
-     * @returns {Array} Returns the new array of composed arguments.
-     */
-    function composeArgsRight(args, partials, holders, isCurried) {
-      var argsIndex = -1,
-          argsLength = args.length,
-          holdersIndex = -1,
-          holdersLength = holders.length,
-          rightIndex = -1,
-          rightLength = partials.length,
-          rangeLength = nativeMax(argsLength - holdersLength, 0),
-          result = Array(rangeLength + rightLength),
-          isUncurried = !isCurried;
-
-      while (++argsIndex < rangeLength) {
-        result[argsIndex] = args[argsIndex];
-      }
-      var offset = argsIndex;
-      while (++rightIndex < rightLength) {
-        result[offset + rightIndex] = partials[rightIndex];
-      }
-      while (++holdersIndex < holdersLength) {
-        if (isUncurried || argsIndex < argsLength) {
-          result[offset + holders[holdersIndex]] = args[argsIndex++];
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Copies the values of `source` to `array`.
-     *
-     * @private
-     * @param {Array} source The array to copy values from.
-     * @param {Array} [array=[]] The array to copy values to.
-     * @returns {Array} Returns `array`.
-     */
-    function copyArray(source, array) {
-      var index = -1,
-          length = source.length;
-
-      array || (array = Array(length));
-      while (++index < length) {
-        array[index] = source[index];
-      }
-      return array;
-    }
-
-    /**
-     * Copies properties of `source` to `object`.
-     *
-     * @private
-     * @param {Object} source The object to copy properties from.
-     * @param {Array} props The property identifiers to copy.
-     * @param {Object} [object={}] The object to copy properties to.
-     * @param {Function} [customizer] The function to customize copied values.
-     * @returns {Object} Returns `object`.
-     */
-    function copyObject(source, props, object, customizer) {
-      var isNew = !object;
-      object || (object = {});
-
-      var index = -1,
-          length = props.length;
-
-      while (++index < length) {
-        var key = props[index];
-
-        var newValue = customizer
-          ? customizer(object[key], source[key], key, object, source)
-          : undefined;
-
-        if (newValue === undefined) {
-          newValue = source[key];
-        }
-        if (isNew) {
-          baseAssignValue(object, key, newValue);
-        } else {
-          assignValue(object, key, newValue);
-        }
-      }
-      return object;
-    }
-
-    /**
-     * Copies own symbols of `source` to `object`.
-     *
-     * @private
-     * @param {Object} source The object to copy symbols from.
-     * @param {Object} [object={}] The object to copy symbols to.
-     * @returns {Object} Returns `object`.
-     */
-    function copySymbols(source, object) {
-      return copyObject(source, getSymbols(source), object);
-    }
-
-    /**
-     * Copies own and inherited symbols of `source` to `object`.
-     *
-     * @private
-     * @param {Object} source The object to copy symbols from.
-     * @param {Object} [object={}] The object to copy symbols to.
-     * @returns {Object} Returns `object`.
-     */
-    function copySymbolsIn(source, object) {
-      return copyObject(source, getSymbolsIn(source), object);
-    }
-
-    /**
-     * Creates a function like `_.groupBy`.
-     *
-     * @private
-     * @param {Function} setter The function to set accumulator values.
-     * @param {Function} [initializer] The accumulator object initializer.
-     * @returns {Function} Returns the new aggregator function.
-     */
-    function createAggregator(setter, initializer) {
-      return function(collection, iteratee) {
-        var func = isArray(collection) ? arrayAggregator : baseAggregator,
-            accumulator = initializer ? initializer() : {};
-
-        return func(collection, setter, getIteratee(iteratee, 2), accumulator);
-      };
-    }
-
-    /**
-     * Creates a function like `_.assign`.
-     *
-     * @private
-     * @param {Function} assigner The function to assign values.
-     * @returns {Function} Returns the new assigner function.
-     */
-    function createAssigner(assigner) {
-      return baseRest(function(object, sources) {
-        var index = -1,
-            length = sources.length,
-            customizer = length > 1 ? sources[length - 1] : undefined,
-            guard = length > 2 ? sources[2] : undefined;
-
-        customizer = (assigner.length > 3 && typeof customizer == 'function')
-          ? (length--, customizer)
-          : undefined;
-
-        if (guard && isIterateeCall(sources[0], sources[1], guard)) {
-          customizer = length < 3 ? undefined : customizer;
-          length = 1;
-        }
-        object = Object(object);
-        while (++index < length) {
-          var source = sources[index];
-          if (source) {
-            assigner(object, source, index, customizer);
-          }
-        }
-        return object;
-      });
-    }
-
-    /**
-     * Creates a `baseEach` or `baseEachRight` function.
-     *
-     * @private
-     * @param {Function} eachFunc The function to iterate over a collection.
-     * @param {boolean} [fromRight] Specify iterating from right to left.
-     * @returns {Function} Returns the new base function.
-     */
-    function createBaseEach(eachFunc, fromRight) {
-      return function(collection, iteratee) {
-        if (collection == null) {
-          return collection;
-        }
-        if (!isArrayLike(collection)) {
-          return eachFunc(collection, iteratee);
-        }
-        var length = collection.length,
-            index = fromRight ? length : -1,
-            iterable = Object(collection);
-
-        while ((fromRight ? index-- : ++index < length)) {
-          if (iteratee(iterable[index], index, iterable) === false) {
-            break;
-          }
-        }
-        return collection;
-      };
-    }
-
-    /**
-     * Creates a base function for methods like `_.forIn` and `_.forOwn`.
-     *
-     * @private
-     * @param {boolean} [fromRight] Specify iterating from right to left.
-     * @returns {Function} Returns the new base function.
-     */
-    function createBaseFor(fromRight) {
-      return function(object, iteratee, keysFunc) {
-        var index = -1,
-            iterable = Object(object),
-            props = keysFunc(object),
-            length = props.length;
-
-        while (length--) {
-          var key = props[fromRight ? length : ++index];
-          if (iteratee(iterable[key], key, iterable) === false) {
-            break;
-          }
-        }
-        return object;
-      };
-    }
-
-    /**
-     * Creates a function that wraps `func` to invoke it with the optional `this`
-     * binding of `thisArg`.
-     *
-     * @private
-     * @param {Function} func The function to wrap.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @param {*} [thisArg] The `this` binding of `func`.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createBind(func, bitmask, thisArg) {
-      var isBind = bitmask & WRAP_BIND_FLAG,
-          Ctor = createCtor(func);
-
-      function wrapper() {
-        var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
-        return fn.apply(isBind ? thisArg : this, arguments);
-      }
-      return wrapper;
-    }
-
-    /**
-     * Creates a function like `_.lowerFirst`.
-     *
-     * @private
-     * @param {string} methodName The name of the `String` case method to use.
-     * @returns {Function} Returns the new case function.
-     */
-    function createCaseFirst(methodName) {
-      return function(string) {
-        string = toString(string);
-
-        var strSymbols = hasUnicode(string)
-          ? stringToArray(string)
-          : undefined;
-
-        var chr = strSymbols
-          ? strSymbols[0]
-          : string.charAt(0);
-
-        var trailing = strSymbols
-          ? castSlice(strSymbols, 1).join('')
-          : string.slice(1);
-
-        return chr[methodName]() + trailing;
-      };
-    }
-
-    /**
-     * Creates a function like `_.camelCase`.
-     *
-     * @private
-     * @param {Function} callback The function to combine each word.
-     * @returns {Function} Returns the new compounder function.
-     */
-    function createCompounder(callback) {
-      return function(string) {
-        return arrayReduce(words(deburr(string).replace(reApos, '')), callback, '');
-      };
-    }
-
-    /**
-     * Creates a function that produces an instance of `Ctor` regardless of
-     * whether it was invoked as part of a `new` expression or by `call` or `apply`.
-     *
-     * @private
-     * @param {Function} Ctor The constructor to wrap.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createCtor(Ctor) {
-      return function() {
-        // Use a `switch` statement to work with class constructors. See
-        // http://ecma-international.org/ecma-262/7.0/#sec-ecmascript-function-objects-call-thisargument-argumentslist
-        // for more details.
-        var args = arguments;
-        switch (args.length) {
-          case 0: return new Ctor;
-          case 1: return new Ctor(args[0]);
-          case 2: return new Ctor(args[0], args[1]);
-          case 3: return new Ctor(args[0], args[1], args[2]);
-          case 4: return new Ctor(args[0], args[1], args[2], args[3]);
-          case 5: return new Ctor(args[0], args[1], args[2], args[3], args[4]);
-          case 6: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5]);
-          case 7: return new Ctor(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-        }
-        var thisBinding = baseCreate(Ctor.prototype),
-            result = Ctor.apply(thisBinding, args);
-
-        // Mimic the constructor's `return` behavior.
-        // See https://es5.github.io/#x13.2.2 for more details.
-        return isObject(result) ? result : thisBinding;
-      };
-    }
-
-    /**
-     * Creates a function that wraps `func` to enable currying.
-     *
-     * @private
-     * @param {Function} func The function to wrap.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @param {number} arity The arity of `func`.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createCurry(func, bitmask, arity) {
-      var Ctor = createCtor(func);
-
-      function wrapper() {
-        var length = arguments.length,
-            args = Array(length),
-            index = length,
-            placeholder = getHolder(wrapper);
-
-        while (index--) {
-          args[index] = arguments[index];
-        }
-        var holders = (length < 3 && args[0] !== placeholder && args[length - 1] !== placeholder)
-          ? []
-          : replaceHolders(args, placeholder);
-
-        length -= holders.length;
-        if (length < arity) {
-          return createRecurry(
-            func, bitmask, createHybrid, wrapper.placeholder, undefined,
-            args, holders, undefined, undefined, arity - length);
-        }
-        var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
-        return apply(fn, this, args);
-      }
-      return wrapper;
-    }
-
-    /**
-     * Creates a `_.find` or `_.findLast` function.
-     *
-     * @private
-     * @param {Function} findIndexFunc The function to find the collection index.
-     * @returns {Function} Returns the new find function.
-     */
-    function createFind(findIndexFunc) {
-      return function(collection, predicate, fromIndex) {
-        var iterable = Object(collection);
-        if (!isArrayLike(collection)) {
-          var iteratee = getIteratee(predicate, 3);
-          collection = keys(collection);
-          predicate = function(key) { return iteratee(iterable[key], key, iterable); };
-        }
-        var index = findIndexFunc(collection, predicate, fromIndex);
-        return index > -1 ? iterable[iteratee ? collection[index] : index] : undefined;
-      };
-    }
-
-    /**
-     * Creates a `_.flow` or `_.flowRight` function.
-     *
-     * @private
-     * @param {boolean} [fromRight] Specify iterating from right to left.
-     * @returns {Function} Returns the new flow function.
-     */
-    function createFlow(fromRight) {
-      return flatRest(function(funcs) {
-        var length = funcs.length,
-            index = length,
-            prereq = LodashWrapper.prototype.thru;
-
-        if (fromRight) {
-          funcs.reverse();
-        }
-        while (index--) {
-          var func = funcs[index];
-          if (typeof func != 'function') {
-            throw new TypeError(FUNC_ERROR_TEXT);
-          }
-          if (prereq && !wrapper && getFuncName(func) == 'wrapper') {
-            var wrapper = new LodashWrapper([], true);
-          }
-        }
-        index = wrapper ? index : length;
-        while (++index < length) {
-          func = funcs[index];
-
-          var funcName = getFuncName(func),
-              data = funcName == 'wrapper' ? getData(func) : undefined;
-
-          if (data && isLaziable(data[0]) &&
-                data[1] == (WRAP_ARY_FLAG | WRAP_CURRY_FLAG | WRAP_PARTIAL_FLAG | WRAP_REARG_FLAG) &&
-                !data[4].length && data[9] == 1
-              ) {
-            wrapper = wrapper[getFuncName(data[0])].apply(wrapper, data[3]);
-          } else {
-            wrapper = (func.length == 1 && isLaziable(func))
-              ? wrapper[funcName]()
-              : wrapper.thru(func);
-          }
-        }
-        return function() {
-          var args = arguments,
-              value = args[0];
-
-          if (wrapper && args.length == 1 && isArray(value)) {
-            return wrapper.plant(value).value();
-          }
-          var index = 0,
-              result = length ? funcs[index].apply(this, args) : value;
-
-          while (++index < length) {
-            result = funcs[index].call(this, result);
-          }
-          return result;
-        };
-      });
-    }
-
-    /**
-     * Creates a function that wraps `func` to invoke it with optional `this`
-     * binding of `thisArg`, partial application, and currying.
-     *
-     * @private
-     * @param {Function|string} func The function or method name to wrap.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @param {*} [thisArg] The `this` binding of `func`.
-     * @param {Array} [partials] The arguments to prepend to those provided to
-     *  the new function.
-     * @param {Array} [holders] The `partials` placeholder indexes.
-     * @param {Array} [partialsRight] The arguments to append to those provided
-     *  to the new function.
-     * @param {Array} [holdersRight] The `partialsRight` placeholder indexes.
-     * @param {Array} [argPos] The argument positions of the new function.
-     * @param {number} [ary] The arity cap of `func`.
-     * @param {number} [arity] The arity of `func`.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createHybrid(func, bitmask, thisArg, partials, holders, partialsRight, holdersRight, argPos, ary, arity) {
-      var isAry = bitmask & WRAP_ARY_FLAG,
-          isBind = bitmask & WRAP_BIND_FLAG,
-          isBindKey = bitmask & WRAP_BIND_KEY_FLAG,
-          isCurried = bitmask & (WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG),
-          isFlip = bitmask & WRAP_FLIP_FLAG,
-          Ctor = isBindKey ? undefined : createCtor(func);
-
-      function wrapper() {
-        var length = arguments.length,
-            args = Array(length),
-            index = length;
-
-        while (index--) {
-          args[index] = arguments[index];
-        }
-        if (isCurried) {
-          var placeholder = getHolder(wrapper),
-              holdersCount = countHolders(args, placeholder);
-        }
-        if (partials) {
-          args = composeArgs(args, partials, holders, isCurried);
-        }
-        if (partialsRight) {
-          args = composeArgsRight(args, partialsRight, holdersRight, isCurried);
-        }
-        length -= holdersCount;
-        if (isCurried && length < arity) {
-          var newHolders = replaceHolders(args, placeholder);
-          return createRecurry(
-            func, bitmask, createHybrid, wrapper.placeholder, thisArg,
-            args, newHolders, argPos, ary, arity - length
-          );
-        }
-        var thisBinding = isBind ? thisArg : this,
-            fn = isBindKey ? thisBinding[func] : func;
-
-        length = args.length;
-        if (argPos) {
-          args = reorder(args, argPos);
-        } else if (isFlip && length > 1) {
-          args.reverse();
-        }
-        if (isAry && ary < length) {
-          args.length = ary;
-        }
-        if (this && this !== root && this instanceof wrapper) {
-          fn = Ctor || createCtor(fn);
-        }
-        return fn.apply(thisBinding, args);
-      }
-      return wrapper;
-    }
-
-    /**
-     * Creates a function like `_.invertBy`.
-     *
-     * @private
-     * @param {Function} setter The function to set accumulator values.
-     * @param {Function} toIteratee The function to resolve iteratees.
-     * @returns {Function} Returns the new inverter function.
-     */
-    function createInverter(setter, toIteratee) {
-      return function(object, iteratee) {
-        return baseInverter(object, setter, toIteratee(iteratee), {});
-      };
-    }
-
-    /**
-     * Creates a function that performs a mathematical operation on two values.
-     *
-     * @private
-     * @param {Function} operator The function to perform the operation.
-     * @param {number} [defaultValue] The value used for `undefined` arguments.
-     * @returns {Function} Returns the new mathematical operation function.
-     */
-    function createMathOperation(operator, defaultValue) {
-      return function(value, other) {
-        var result;
-        if (value === undefined && other === undefined) {
-          return defaultValue;
-        }
-        if (value !== undefined) {
-          result = value;
-        }
-        if (other !== undefined) {
-          if (result === undefined) {
-            return other;
-          }
-          if (typeof value == 'string' || typeof other == 'string') {
-            value = baseToString(value);
-            other = baseToString(other);
-          } else {
-            value = baseToNumber(value);
-            other = baseToNumber(other);
-          }
-          result = operator(value, other);
-        }
-        return result;
-      };
-    }
-
-    /**
-     * Creates a function like `_.over`.
-     *
-     * @private
-     * @param {Function} arrayFunc The function to iterate over iteratees.
-     * @returns {Function} Returns the new over function.
-     */
-    function createOver(arrayFunc) {
-      return flatRest(function(iteratees) {
-        iteratees = arrayMap(iteratees, baseUnary(getIteratee()));
-        return baseRest(function(args) {
-          var thisArg = this;
-          return arrayFunc(iteratees, function(iteratee) {
-            return apply(iteratee, thisArg, args);
-          });
-        });
-      });
-    }
-
-    /**
-     * Creates the padding for `string` based on `length`. The `chars` string
-     * is truncated if the number of characters exceeds `length`.
-     *
-     * @private
-     * @param {number} length The padding length.
-     * @param {string} [chars=' '] The string used as padding.
-     * @returns {string} Returns the padding for `string`.
-     */
-    function createPadding(length, chars) {
-      chars = chars === undefined ? ' ' : baseToString(chars);
-
-      var charsLength = chars.length;
-      if (charsLength < 2) {
-        return charsLength ? baseRepeat(chars, length) : chars;
-      }
-      var result = baseRepeat(chars, nativeCeil(length / stringSize(chars)));
-      return hasUnicode(chars)
-        ? castSlice(stringToArray(result), 0, length).join('')
-        : result.slice(0, length);
-    }
-
-    /**
-     * Creates a function that wraps `func` to invoke it with the `this` binding
-     * of `thisArg` and `partials` prepended to the arguments it receives.
-     *
-     * @private
-     * @param {Function} func The function to wrap.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @param {*} thisArg The `this` binding of `func`.
-     * @param {Array} partials The arguments to prepend to those provided to
-     *  the new function.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createPartial(func, bitmask, thisArg, partials) {
-      var isBind = bitmask & WRAP_BIND_FLAG,
-          Ctor = createCtor(func);
-
-      function wrapper() {
-        var argsIndex = -1,
-            argsLength = arguments.length,
-            leftIndex = -1,
-            leftLength = partials.length,
-            args = Array(leftLength + argsLength),
-            fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
-
-        while (++leftIndex < leftLength) {
-          args[leftIndex] = partials[leftIndex];
-        }
-        while (argsLength--) {
-          args[leftIndex++] = arguments[++argsIndex];
-        }
-        return apply(fn, isBind ? thisArg : this, args);
-      }
-      return wrapper;
-    }
-
-    /**
-     * Creates a `_.range` or `_.rangeRight` function.
-     *
-     * @private
-     * @param {boolean} [fromRight] Specify iterating from right to left.
-     * @returns {Function} Returns the new range function.
-     */
-    function createRange(fromRight) {
-      return function(start, end, step) {
-        if (step && typeof step != 'number' && isIterateeCall(start, end, step)) {
-          end = step = undefined;
-        }
-        // Ensure the sign of `-0` is preserved.
-        start = toFinite(start);
-        if (end === undefined) {
-          end = start;
-          start = 0;
-        } else {
-          end = toFinite(end);
-        }
-        step = step === undefined ? (start < end ? 1 : -1) : toFinite(step);
-        return baseRange(start, end, step, fromRight);
-      };
-    }
-
-    /**
-     * Creates a function that performs a relational operation on two values.
-     *
-     * @private
-     * @param {Function} operator The function to perform the operation.
-     * @returns {Function} Returns the new relational operation function.
-     */
-    function createRelationalOperation(operator) {
-      return function(value, other) {
-        if (!(typeof value == 'string' && typeof other == 'string')) {
-          value = toNumber(value);
-          other = toNumber(other);
-        }
-        return operator(value, other);
-      };
-    }
-
-    /**
-     * Creates a function that wraps `func` to continue currying.
-     *
-     * @private
-     * @param {Function} func The function to wrap.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @param {Function} wrapFunc The function to create the `func` wrapper.
-     * @param {*} placeholder The placeholder value.
-     * @param {*} [thisArg] The `this` binding of `func`.
-     * @param {Array} [partials] The arguments to prepend to those provided to
-     *  the new function.
-     * @param {Array} [holders] The `partials` placeholder indexes.
-     * @param {Array} [argPos] The argument positions of the new function.
-     * @param {number} [ary] The arity cap of `func`.
-     * @param {number} [arity] The arity of `func`.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createRecurry(func, bitmask, wrapFunc, placeholder, thisArg, partials, holders, argPos, ary, arity) {
-      var isCurry = bitmask & WRAP_CURRY_FLAG,
-          newHolders = isCurry ? holders : undefined,
-          newHoldersRight = isCurry ? undefined : holders,
-          newPartials = isCurry ? partials : undefined,
-          newPartialsRight = isCurry ? undefined : partials;
-
-      bitmask |= (isCurry ? WRAP_PARTIAL_FLAG : WRAP_PARTIAL_RIGHT_FLAG);
-      bitmask &= ~(isCurry ? WRAP_PARTIAL_RIGHT_FLAG : WRAP_PARTIAL_FLAG);
-
-      if (!(bitmask & WRAP_CURRY_BOUND_FLAG)) {
-        bitmask &= ~(WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG);
-      }
-      var newData = [
-        func, bitmask, thisArg, newPartials, newHolders, newPartialsRight,
-        newHoldersRight, argPos, ary, arity
-      ];
-
-      var result = wrapFunc.apply(undefined, newData);
-      if (isLaziable(func)) {
-        setData(result, newData);
-      }
-      result.placeholder = placeholder;
-      return setWrapToString(result, func, bitmask);
-    }
-
-    /**
-     * Creates a function like `_.round`.
-     *
-     * @private
-     * @param {string} methodName The name of the `Math` method to use when rounding.
-     * @returns {Function} Returns the new round function.
-     */
-    function createRound(methodName) {
-      var func = Math[methodName];
-      return function(number, precision) {
-        number = toNumber(number);
-        precision = precision == null ? 0 : nativeMin(toInteger(precision), 292);
-        if (precision) {
-          // Shift with exponential notation to avoid floating-point issues.
-          // See [MDN](https://mdn.io/round#Examples) for more details.
-          var pair = (toString(number) + 'e').split('e'),
-              value = func(pair[0] + 'e' + (+pair[1] + precision));
-
-          pair = (toString(value) + 'e').split('e');
-          return +(pair[0] + 'e' + (+pair[1] - precision));
-        }
-        return func(number);
-      };
-    }
-
-    /**
-     * Creates a set object of `values`.
-     *
-     * @private
-     * @param {Array} values The values to add to the set.
-     * @returns {Object} Returns the new set.
-     */
-    var createSet = !(Set && (1 / setToArray(new Set([,-0]))[1]) == INFINITY) ? noop : function(values) {
-      return new Set(values);
-    };
-
-    /**
-     * Creates a `_.toPairs` or `_.toPairsIn` function.
-     *
-     * @private
-     * @param {Function} keysFunc The function to get the keys of a given object.
-     * @returns {Function} Returns the new pairs function.
-     */
-    function createToPairs(keysFunc) {
-      return function(object) {
-        var tag = getTag(object);
-        if (tag == mapTag) {
-          return mapToArray(object);
-        }
-        if (tag == setTag) {
-          return setToPairs(object);
-        }
-        return baseToPairs(object, keysFunc(object));
-      };
-    }
-
-    /**
-     * Creates a function that either curries or invokes `func` with optional
-     * `this` binding and partially applied arguments.
-     *
-     * @private
-     * @param {Function|string} func The function or method name to wrap.
-     * @param {number} bitmask The bitmask flags.
-     *    1 - `_.bind`
-     *    2 - `_.bindKey`
-     *    4 - `_.curry` or `_.curryRight` of a bound function
-     *    8 - `_.curry`
-     *   16 - `_.curryRight`
-     *   32 - `_.partial`
-     *   64 - `_.partialRight`
-     *  128 - `_.rearg`
-     *  256 - `_.ary`
-     *  512 - `_.flip`
-     * @param {*} [thisArg] The `this` binding of `func`.
-     * @param {Array} [partials] The arguments to be partially applied.
-     * @param {Array} [holders] The `partials` placeholder indexes.
-     * @param {Array} [argPos] The argument positions of the new function.
-     * @param {number} [ary] The arity cap of `func`.
-     * @param {number} [arity] The arity of `func`.
-     * @returns {Function} Returns the new wrapped function.
-     */
-    function createWrap(func, bitmask, thisArg, partials, holders, argPos, ary, arity) {
-      var isBindKey = bitmask & WRAP_BIND_KEY_FLAG;
-      if (!isBindKey && typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      var length = partials ? partials.length : 0;
-      if (!length) {
-        bitmask &= ~(WRAP_PARTIAL_FLAG | WRAP_PARTIAL_RIGHT_FLAG);
-        partials = holders = undefined;
-      }
-      ary = ary === undefined ? ary : nativeMax(toInteger(ary), 0);
-      arity = arity === undefined ? arity : toInteger(arity);
-      length -= holders ? holders.length : 0;
-
-      if (bitmask & WRAP_PARTIAL_RIGHT_FLAG) {
-        var partialsRight = partials,
-            holdersRight = holders;
-
-        partials = holders = undefined;
-      }
-      var data = isBindKey ? undefined : getData(func);
-
-      var newData = [
-        func, bitmask, thisArg, partials, holders, partialsRight, holdersRight,
-        argPos, ary, arity
-      ];
-
-      if (data) {
-        mergeData(newData, data);
-      }
-      func = newData[0];
-      bitmask = newData[1];
-      thisArg = newData[2];
-      partials = newData[3];
-      holders = newData[4];
-      arity = newData[9] = newData[9] === undefined
-        ? (isBindKey ? 0 : func.length)
-        : nativeMax(newData[9] - length, 0);
-
-      if (!arity && bitmask & (WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG)) {
-        bitmask &= ~(WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG);
-      }
-      if (!bitmask || bitmask == WRAP_BIND_FLAG) {
-        var result = createBind(func, bitmask, thisArg);
-      } else if (bitmask == WRAP_CURRY_FLAG || bitmask == WRAP_CURRY_RIGHT_FLAG) {
-        result = createCurry(func, bitmask, arity);
-      } else if ((bitmask == WRAP_PARTIAL_FLAG || bitmask == (WRAP_BIND_FLAG | WRAP_PARTIAL_FLAG)) && !holders.length) {
-        result = createPartial(func, bitmask, thisArg, partials);
-      } else {
-        result = createHybrid.apply(undefined, newData);
-      }
-      var setter = data ? baseSetData : setData;
-      return setWrapToString(setter(result, newData), func, bitmask);
-    }
-
-    /**
-     * Used by `_.defaults` to customize its `_.assignIn` use to assign properties
-     * of source objects to the destination object for all destination properties
-     * that resolve to `undefined`.
-     *
-     * @private
-     * @param {*} objValue The destination value.
-     * @param {*} srcValue The source value.
-     * @param {string} key The key of the property to assign.
-     * @param {Object} object The parent object of `objValue`.
-     * @returns {*} Returns the value to assign.
-     */
-    function customDefaultsAssignIn(objValue, srcValue, key, object) {
-      if (objValue === undefined ||
-          (eq(objValue, objectProto[key]) && !hasOwnProperty.call(object, key))) {
-        return srcValue;
-      }
-      return objValue;
-    }
-
-    /**
-     * Used by `_.defaultsDeep` to customize its `_.merge` use to merge source
-     * objects into destination objects that are passed thru.
-     *
-     * @private
-     * @param {*} objValue The destination value.
-     * @param {*} srcValue The source value.
-     * @param {string} key The key of the property to merge.
-     * @param {Object} object The parent object of `objValue`.
-     * @param {Object} source The parent object of `srcValue`.
-     * @param {Object} [stack] Tracks traversed source values and their merged
-     *  counterparts.
-     * @returns {*} Returns the value to assign.
-     */
-    function customDefaultsMerge(objValue, srcValue, key, object, source, stack) {
-      if (isObject(objValue) && isObject(srcValue)) {
-        // Recursively merge objects and arrays (susceptible to call stack limits).
-        stack.set(srcValue, objValue);
-        baseMerge(objValue, srcValue, undefined, customDefaultsMerge, stack);
-        stack['delete'](srcValue);
-      }
-      return objValue;
-    }
-
-    /**
-     * Used by `_.omit` to customize its `_.cloneDeep` use to only clone plain
-     * objects.
-     *
-     * @private
-     * @param {*} value The value to inspect.
-     * @param {string} key The key of the property to inspect.
-     * @returns {*} Returns the uncloned value or `undefined` to defer cloning to `_.cloneDeep`.
-     */
-    function customOmitClone(value) {
-      return isPlainObject(value) ? undefined : value;
-    }
-
-    /**
-     * A specialized version of `baseIsEqualDeep` for arrays with support for
-     * partial deep comparisons.
-     *
-     * @private
-     * @param {Array} array The array to compare.
-     * @param {Array} other The other array to compare.
-     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
-     * @param {Function} customizer The function to customize comparisons.
-     * @param {Function} equalFunc The function to determine equivalents of values.
-     * @param {Object} stack Tracks traversed `array` and `other` objects.
-     * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
-     */
-    function equalArrays(array, other, bitmask, customizer, equalFunc, stack) {
-      var isPartial = bitmask & COMPARE_PARTIAL_FLAG,
-          arrLength = array.length,
-          othLength = other.length;
-
-      if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
-        return false;
-      }
-      // Assume cyclic values are equal.
-      var stacked = stack.get(array);
-      if (stacked && stack.get(other)) {
-        return stacked == other;
-      }
-      var index = -1,
-          result = true,
-          seen = (bitmask & COMPARE_UNORDERED_FLAG) ? new SetCache : undefined;
-
-      stack.set(array, other);
-      stack.set(other, array);
-
-      // Ignore non-index properties.
-      while (++index < arrLength) {
-        var arrValue = array[index],
-            othValue = other[index];
-
-        if (customizer) {
-          var compared = isPartial
-            ? customizer(othValue, arrValue, index, other, array, stack)
-            : customizer(arrValue, othValue, index, array, other, stack);
-        }
-        if (compared !== undefined) {
-          if (compared) {
-            continue;
-          }
-          result = false;
-          break;
-        }
-        // Recursively compare arrays (susceptible to call stack limits).
-        if (seen) {
-          if (!arraySome(other, function(othValue, othIndex) {
-                if (!cacheHas(seen, othIndex) &&
-                    (arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack))) {
-                  return seen.push(othIndex);
-                }
-              })) {
-            result = false;
-            break;
-          }
-        } else if (!(
-              arrValue === othValue ||
-                equalFunc(arrValue, othValue, bitmask, customizer, stack)
-            )) {
-          result = false;
-          break;
-        }
-      }
-      stack['delete'](array);
-      stack['delete'](other);
-      return result;
-    }
-
-    /**
-     * A specialized version of `baseIsEqualDeep` for comparing objects of
-     * the same `toStringTag`.
-     *
-     * **Note:** This function only supports comparing values with tags of
-     * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
-     *
-     * @private
-     * @param {Object} object The object to compare.
-     * @param {Object} other The other object to compare.
-     * @param {string} tag The `toStringTag` of the objects to compare.
-     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
-     * @param {Function} customizer The function to customize comparisons.
-     * @param {Function} equalFunc The function to determine equivalents of values.
-     * @param {Object} stack Tracks traversed `object` and `other` objects.
-     * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
-     */
-    function equalByTag(object, other, tag, bitmask, customizer, equalFunc, stack) {
-      switch (tag) {
-        case dataViewTag:
-          if ((object.byteLength != other.byteLength) ||
-              (object.byteOffset != other.byteOffset)) {
-            return false;
-          }
-          object = object.buffer;
-          other = other.buffer;
-
-        case arrayBufferTag:
-          if ((object.byteLength != other.byteLength) ||
-              !equalFunc(new Uint8Array(object), new Uint8Array(other))) {
-            return false;
-          }
-          return true;
-
-        case boolTag:
-        case dateTag:
-        case numberTag:
-          // Coerce booleans to `1` or `0` and dates to milliseconds.
-          // Invalid dates are coerced to `NaN`.
-          return eq(+object, +other);
-
-        case errorTag:
-          return object.name == other.name && object.message == other.message;
-
-        case regexpTag:
-        case stringTag:
-          // Coerce regexes to strings and treat strings, primitives and objects,
-          // as equal. See http://www.ecma-international.org/ecma-262/7.0/#sec-regexp.prototype.tostring
-          // for more details.
-          return object == (other + '');
-
-        case mapTag:
-          var convert = mapToArray;
-
-        case setTag:
-          var isPartial = bitmask & COMPARE_PARTIAL_FLAG;
-          convert || (convert = setToArray);
-
-          if (object.size != other.size && !isPartial) {
-            return false;
-          }
-          // Assume cyclic values are equal.
-          var stacked = stack.get(object);
-          if (stacked) {
-            return stacked == other;
-          }
-          bitmask |= COMPARE_UNORDERED_FLAG;
-
-          // Recursively compare objects (susceptible to call stack limits).
-          stack.set(object, other);
-          var result = equalArrays(convert(object), convert(other), bitmask, customizer, equalFunc, stack);
-          stack['delete'](object);
-          return result;
-
-        case symbolTag:
-          if (symbolValueOf) {
-            return symbolValueOf.call(object) == symbolValueOf.call(other);
-          }
-      }
-      return false;
-    }
-
-    /**
-     * A specialized version of `baseIsEqualDeep` for objects with support for
-     * partial deep comparisons.
-     *
-     * @private
-     * @param {Object} object The object to compare.
-     * @param {Object} other The other object to compare.
-     * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
-     * @param {Function} customizer The function to customize comparisons.
-     * @param {Function} equalFunc The function to determine equivalents of values.
-     * @param {Object} stack Tracks traversed `object` and `other` objects.
-     * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
-     */
-    function equalObjects(object, other, bitmask, customizer, equalFunc, stack) {
-      var isPartial = bitmask & COMPARE_PARTIAL_FLAG,
-          objProps = getAllKeys(object),
-          objLength = objProps.length,
-          othProps = getAllKeys(other),
-          othLength = othProps.length;
-
-      if (objLength != othLength && !isPartial) {
-        return false;
-      }
-      var index = objLength;
-      while (index--) {
-        var key = objProps[index];
-        if (!(isPartial ? key in other : hasOwnProperty.call(other, key))) {
-          return false;
-        }
-      }
-      // Assume cyclic values are equal.
-      var stacked = stack.get(object);
-      if (stacked && stack.get(other)) {
-        return stacked == other;
-      }
-      var result = true;
-      stack.set(object, other);
-      stack.set(other, object);
-
-      var skipCtor = isPartial;
-      while (++index < objLength) {
-        key = objProps[index];
-        var objValue = object[key],
-            othValue = other[key];
-
-        if (customizer) {
-          var compared = isPartial
-            ? customizer(othValue, objValue, key, other, object, stack)
-            : customizer(objValue, othValue, key, object, other, stack);
-        }
-        // Recursively compare objects (susceptible to call stack limits).
-        if (!(compared === undefined
-              ? (objValue === othValue || equalFunc(objValue, othValue, bitmask, customizer, stack))
-              : compared
-            )) {
-          result = false;
-          break;
-        }
-        skipCtor || (skipCtor = key == 'constructor');
-      }
-      if (result && !skipCtor) {
-        var objCtor = object.constructor,
-            othCtor = other.constructor;
-
-        // Non `Object` object instances with different constructors are not equal.
-        if (objCtor != othCtor &&
-            ('constructor' in object && 'constructor' in other) &&
-            !(typeof objCtor == 'function' && objCtor instanceof objCtor &&
-              typeof othCtor == 'function' && othCtor instanceof othCtor)) {
-          result = false;
-        }
-      }
-      stack['delete'](object);
-      stack['delete'](other);
-      return result;
-    }
-
-    /**
-     * A specialized version of `baseRest` which flattens the rest array.
-     *
-     * @private
-     * @param {Function} func The function to apply a rest parameter to.
-     * @returns {Function} Returns the new function.
-     */
-    function flatRest(func) {
-      return setToString(overRest(func, undefined, flatten), func + '');
-    }
-
-    /**
-     * Creates an array of own enumerable property names and symbols of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names and symbols.
-     */
-    function getAllKeys(object) {
-      return baseGetAllKeys(object, keys, getSymbols);
-    }
-
-    /**
-     * Creates an array of own and inherited enumerable property names and
-     * symbols of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names and symbols.
-     */
-    function getAllKeysIn(object) {
-      return baseGetAllKeys(object, keysIn, getSymbolsIn);
-    }
-
-    /**
-     * Gets metadata for `func`.
-     *
-     * @private
-     * @param {Function} func The function to query.
-     * @returns {*} Returns the metadata for `func`.
-     */
-    var getData = !metaMap ? noop : function(func) {
-      return metaMap.get(func);
-    };
-
-    /**
-     * Gets the name of `func`.
-     *
-     * @private
-     * @param {Function} func The function to query.
-     * @returns {string} Returns the function name.
-     */
-    function getFuncName(func) {
-      var result = (func.name + ''),
-          array = realNames[result],
-          length = hasOwnProperty.call(realNames, result) ? array.length : 0;
-
-      while (length--) {
-        var data = array[length],
-            otherFunc = data.func;
-        if (otherFunc == null || otherFunc == func) {
-          return data.name;
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Gets the argument placeholder value for `func`.
-     *
-     * @private
-     * @param {Function} func The function to inspect.
-     * @returns {*} Returns the placeholder value.
-     */
-    function getHolder(func) {
-      var object = hasOwnProperty.call(lodash, 'placeholder') ? lodash : func;
-      return object.placeholder;
-    }
-
-    /**
-     * Gets the appropriate "iteratee" function. If `_.iteratee` is customized,
-     * this function returns the custom method, otherwise it returns `baseIteratee`.
-     * If arguments are provided, the chosen function is invoked with them and
-     * its result is returned.
-     *
-     * @private
-     * @param {*} [value] The value to convert to an iteratee.
-     * @param {number} [arity] The arity of the created iteratee.
-     * @returns {Function} Returns the chosen function or its result.
-     */
-    function getIteratee() {
-      var result = lodash.iteratee || iteratee;
-      result = result === iteratee ? baseIteratee : result;
-      return arguments.length ? result(arguments[0], arguments[1]) : result;
-    }
-
-    /**
-     * Gets the data for `map`.
-     *
-     * @private
-     * @param {Object} map The map to query.
-     * @param {string} key The reference key.
-     * @returns {*} Returns the map data.
-     */
-    function getMapData(map, key) {
-      var data = map.__data__;
-      return isKeyable(key)
-        ? data[typeof key == 'string' ? 'string' : 'hash']
-        : data.map;
-    }
-
-    /**
-     * Gets the property names, values, and compare flags of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the match data of `object`.
-     */
-    function getMatchData(object) {
-      var result = keys(object),
-          length = result.length;
-
-      while (length--) {
-        var key = result[length],
-            value = object[key];
-
-        result[length] = [key, value, isStrictComparable(value)];
-      }
-      return result;
-    }
-
-    /**
-     * Gets the native function at `key` of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @param {string} key The key of the method to get.
-     * @returns {*} Returns the function if it's native, else `undefined`.
-     */
-    function getNative(object, key) {
-      var value = getValue(object, key);
-      return baseIsNative(value) ? value : undefined;
-    }
-
-    /**
-     * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
-     *
-     * @private
-     * @param {*} value The value to query.
-     * @returns {string} Returns the raw `toStringTag`.
-     */
-    function getRawTag(value) {
-      var isOwn = hasOwnProperty.call(value, symToStringTag),
-          tag = value[symToStringTag];
-
-      try {
-        value[symToStringTag] = undefined;
-        var unmasked = true;
-      } catch (e) {}
-
-      var result = nativeObjectToString.call(value);
-      if (unmasked) {
-        if (isOwn) {
-          value[symToStringTag] = tag;
-        } else {
-          delete value[symToStringTag];
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Creates an array of the own enumerable symbols of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of symbols.
-     */
-    var getSymbols = !nativeGetSymbols ? stubArray : function(object) {
-      if (object == null) {
-        return [];
-      }
-      object = Object(object);
-      return arrayFilter(nativeGetSymbols(object), function(symbol) {
-        return propertyIsEnumerable.call(object, symbol);
-      });
-    };
-
-    /**
-     * Creates an array of the own and inherited enumerable symbols of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of symbols.
-     */
-    var getSymbolsIn = !nativeGetSymbols ? stubArray : function(object) {
-      var result = [];
-      while (object) {
-        arrayPush(result, getSymbols(object));
-        object = getPrototype(object);
-      }
-      return result;
-    };
-
-    /**
-     * Gets the `toStringTag` of `value`.
-     *
-     * @private
-     * @param {*} value The value to query.
-     * @returns {string} Returns the `toStringTag`.
-     */
-    var getTag = baseGetTag;
-
-    // Fallback for data views, maps, sets, and weak maps in IE 11 and promises in Node.js < 6.
-    if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
-        (Map && getTag(new Map) != mapTag) ||
-        (Promise && getTag(Promise.resolve()) != promiseTag) ||
-        (Set && getTag(new Set) != setTag) ||
-        (WeakMap && getTag(new WeakMap) != weakMapTag)) {
-      getTag = function(value) {
-        var result = baseGetTag(value),
-            Ctor = result == objectTag ? value.constructor : undefined,
-            ctorString = Ctor ? toSource(Ctor) : '';
-
-        if (ctorString) {
-          switch (ctorString) {
-            case dataViewCtorString: return dataViewTag;
-            case mapCtorString: return mapTag;
-            case promiseCtorString: return promiseTag;
-            case setCtorString: return setTag;
-            case weakMapCtorString: return weakMapTag;
-          }
-        }
-        return result;
-      };
-    }
-
-    /**
-     * Gets the view, applying any `transforms` to the `start` and `end` positions.
-     *
-     * @private
-     * @param {number} start The start of the view.
-     * @param {number} end The end of the view.
-     * @param {Array} transforms The transformations to apply to the view.
-     * @returns {Object} Returns an object containing the `start` and `end`
-     *  positions of the view.
-     */
-    function getView(start, end, transforms) {
-      var index = -1,
-          length = transforms.length;
-
-      while (++index < length) {
-        var data = transforms[index],
-            size = data.size;
-
-        switch (data.type) {
-          case 'drop':      start += size; break;
-          case 'dropRight': end -= size; break;
-          case 'take':      end = nativeMin(end, start + size); break;
-          case 'takeRight': start = nativeMax(start, end - size); break;
-        }
-      }
-      return { 'start': start, 'end': end };
-    }
-
-    /**
-     * Extracts wrapper details from the `source` body comment.
-     *
-     * @private
-     * @param {string} source The source to inspect.
-     * @returns {Array} Returns the wrapper details.
-     */
-    function getWrapDetails(source) {
-      var match = source.match(reWrapDetails);
-      return match ? match[1].split(reSplitDetails) : [];
-    }
-
-    /**
-     * Checks if `path` exists on `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path to check.
-     * @param {Function} hasFunc The function to check properties.
-     * @returns {boolean} Returns `true` if `path` exists, else `false`.
-     */
-    function hasPath(object, path, hasFunc) {
-      path = castPath(path, object);
-
-      var index = -1,
-          length = path.length,
-          result = false;
-
-      while (++index < length) {
-        var key = toKey(path[index]);
-        if (!(result = object != null && hasFunc(object, key))) {
-          break;
-        }
-        object = object[key];
-      }
-      if (result || ++index != length) {
-        return result;
-      }
-      length = object == null ? 0 : object.length;
-      return !!length && isLength(length) && isIndex(key, length) &&
-        (isArray(object) || isArguments(object));
-    }
-
-    /**
-     * Initializes an array clone.
-     *
-     * @private
-     * @param {Array} array The array to clone.
-     * @returns {Array} Returns the initialized clone.
-     */
-    function initCloneArray(array) {
-      var length = array.length,
-          result = new array.constructor(length);
-
-      // Add properties assigned by `RegExp#exec`.
-      if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
-        result.index = array.index;
-        result.input = array.input;
-      }
-      return result;
-    }
-
-    /**
-     * Initializes an object clone.
-     *
-     * @private
-     * @param {Object} object The object to clone.
-     * @returns {Object} Returns the initialized clone.
-     */
-    function initCloneObject(object) {
-      return (typeof object.constructor == 'function' && !isPrototype(object))
-        ? baseCreate(getPrototype(object))
-        : {};
-    }
-
-    /**
-     * Initializes an object clone based on its `toStringTag`.
-     *
-     * **Note:** This function only supports cloning values with tags of
-     * `Boolean`, `Date`, `Error`, `Map`, `Number`, `RegExp`, `Set`, or `String`.
-     *
-     * @private
-     * @param {Object} object The object to clone.
-     * @param {string} tag The `toStringTag` of the object to clone.
-     * @param {boolean} [isDeep] Specify a deep clone.
-     * @returns {Object} Returns the initialized clone.
-     */
-    function initCloneByTag(object, tag, isDeep) {
-      var Ctor = object.constructor;
-      switch (tag) {
-        case arrayBufferTag:
-          return cloneArrayBuffer(object);
-
-        case boolTag:
-        case dateTag:
-          return new Ctor(+object);
-
-        case dataViewTag:
-          return cloneDataView(object, isDeep);
-
-        case float32Tag: case float64Tag:
-        case int8Tag: case int16Tag: case int32Tag:
-        case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
-          return cloneTypedArray(object, isDeep);
-
-        case mapTag:
-          return new Ctor;
-
-        case numberTag:
-        case stringTag:
-          return new Ctor(object);
-
-        case regexpTag:
-          return cloneRegExp(object);
-
-        case setTag:
-          return new Ctor;
-
-        case symbolTag:
-          return cloneSymbol(object);
-      }
-    }
-
-    /**
-     * Inserts wrapper `details` in a comment at the top of the `source` body.
-     *
-     * @private
-     * @param {string} source The source to modify.
-     * @returns {Array} details The details to insert.
-     * @returns {string} Returns the modified source.
-     */
-    function insertWrapDetails(source, details) {
-      var length = details.length;
-      if (!length) {
-        return source;
-      }
-      var lastIndex = length - 1;
-      details[lastIndex] = (length > 1 ? '& ' : '') + details[lastIndex];
-      details = details.join(length > 2 ? ', ' : ' ');
-      return source.replace(reWrapComment, '{\n/* [wrapped with ' + details + '] */\n');
-    }
-
-    /**
-     * Checks if `value` is a flattenable `arguments` object or array.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is flattenable, else `false`.
-     */
-    function isFlattenable(value) {
-      return isArray(value) || isArguments(value) ||
-        !!(spreadableSymbol && value && value[spreadableSymbol]);
-    }
-
-    /**
-     * Checks if `value` is a valid array-like index.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
-     * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
-     */
-    function isIndex(value, length) {
-      var type = typeof value;
-      length = length == null ? MAX_SAFE_INTEGER : length;
-
-      return !!length &&
-        (type == 'number' ||
-          (type != 'symbol' && reIsUint.test(value))) &&
-            (value > -1 && value % 1 == 0 && value < length);
-    }
-
-    /**
-     * Checks if the given arguments are from an iteratee call.
-     *
-     * @private
-     * @param {*} value The potential iteratee value argument.
-     * @param {*} index The potential iteratee index or key argument.
-     * @param {*} object The potential iteratee object argument.
-     * @returns {boolean} Returns `true` if the arguments are from an iteratee call,
-     *  else `false`.
-     */
-    function isIterateeCall(value, index, object) {
-      if (!isObject(object)) {
-        return false;
-      }
-      var type = typeof index;
-      if (type == 'number'
-            ? (isArrayLike(object) && isIndex(index, object.length))
-            : (type == 'string' && index in object)
-          ) {
-        return eq(object[index], value);
-      }
-      return false;
-    }
-
-    /**
-     * Checks if `value` is a property name and not a property path.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @param {Object} [object] The object to query keys on.
-     * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
-     */
-    function isKey(value, object) {
-      if (isArray(value)) {
-        return false;
-      }
-      var type = typeof value;
-      if (type == 'number' || type == 'symbol' || type == 'boolean' ||
-          value == null || isSymbol(value)) {
-        return true;
-      }
-      return reIsPlainProp.test(value) || !reIsDeepProp.test(value) ||
-        (object != null && value in Object(object));
-    }
-
-    /**
-     * Checks if `value` is suitable for use as unique object key.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
-     */
-    function isKeyable(value) {
-      var type = typeof value;
-      return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
-        ? (value !== '__proto__')
-        : (value === null);
-    }
-
-    /**
-     * Checks if `func` has a lazy counterpart.
-     *
-     * @private
-     * @param {Function} func The function to check.
-     * @returns {boolean} Returns `true` if `func` has a lazy counterpart,
-     *  else `false`.
-     */
-    function isLaziable(func) {
-      var funcName = getFuncName(func),
-          other = lodash[funcName];
-
-      if (typeof other != 'function' || !(funcName in LazyWrapper.prototype)) {
-        return false;
-      }
-      if (func === other) {
-        return true;
-      }
-      var data = getData(other);
-      return !!data && func === data[0];
-    }
-
-    /**
-     * Checks if `func` has its source masked.
-     *
-     * @private
-     * @param {Function} func The function to check.
-     * @returns {boolean} Returns `true` if `func` is masked, else `false`.
-     */
-    function isMasked(func) {
-      return !!maskSrcKey && (maskSrcKey in func);
-    }
-
-    /**
-     * Checks if `func` is capable of being masked.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `func` is maskable, else `false`.
-     */
-    var isMaskable = coreJsData ? isFunction : stubFalse;
-
-    /**
-     * Checks if `value` is likely a prototype object.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
-     */
-    function isPrototype(value) {
-      var Ctor = value && value.constructor,
-          proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
-
-      return value === proto;
-    }
-
-    /**
-     * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
-     *
-     * @private
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` if suitable for strict
-     *  equality comparisons, else `false`.
-     */
-    function isStrictComparable(value) {
-      return value === value && !isObject(value);
-    }
-
-    /**
-     * A specialized version of `matchesProperty` for source values suitable
-     * for strict equality comparisons, i.e. `===`.
-     *
-     * @private
-     * @param {string} key The key of the property to get.
-     * @param {*} srcValue The value to match.
-     * @returns {Function} Returns the new spec function.
-     */
-    function matchesStrictComparable(key, srcValue) {
-      return function(object) {
-        if (object == null) {
-          return false;
-        }
-        return object[key] === srcValue &&
-          (srcValue !== undefined || (key in Object(object)));
-      };
-    }
-
-    /**
-     * A specialized version of `_.memoize` which clears the memoized function's
-     * cache when it exceeds `MAX_MEMOIZE_SIZE`.
-     *
-     * @private
-     * @param {Function} func The function to have its output memoized.
-     * @returns {Function} Returns the new memoized function.
-     */
-    function memoizeCapped(func) {
-      var result = memoize(func, function(key) {
-        if (cache.size === MAX_MEMOIZE_SIZE) {
-          cache.clear();
-        }
-        return key;
-      });
-
-      var cache = result.cache;
-      return result;
-    }
-
-    /**
-     * Merges the function metadata of `source` into `data`.
-     *
-     * Merging metadata reduces the number of wrappers used to invoke a function.
-     * This is possible because methods like `_.bind`, `_.curry`, and `_.partial`
-     * may be applied regardless of execution order. Methods like `_.ary` and
-     * `_.rearg` modify function arguments, making the order in which they are
-     * executed important, preventing the merging of metadata. However, we make
-     * an exception for a safe combined case where curried functions have `_.ary`
-     * and or `_.rearg` applied.
-     *
-     * @private
-     * @param {Array} data The destination metadata.
-     * @param {Array} source The source metadata.
-     * @returns {Array} Returns `data`.
-     */
-    function mergeData(data, source) {
-      var bitmask = data[1],
-          srcBitmask = source[1],
-          newBitmask = bitmask | srcBitmask,
-          isCommon = newBitmask < (WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG | WRAP_ARY_FLAG);
-
-      var isCombo =
-        ((srcBitmask == WRAP_ARY_FLAG) && (bitmask == WRAP_CURRY_FLAG)) ||
-        ((srcBitmask == WRAP_ARY_FLAG) && (bitmask == WRAP_REARG_FLAG) && (data[7].length <= source[8])) ||
-        ((srcBitmask == (WRAP_ARY_FLAG | WRAP_REARG_FLAG)) && (source[7].length <= source[8]) && (bitmask == WRAP_CURRY_FLAG));
-
-      // Exit early if metadata can't be merged.
-      if (!(isCommon || isCombo)) {
-        return data;
-      }
-      // Use source `thisArg` if available.
-      if (srcBitmask & WRAP_BIND_FLAG) {
-        data[2] = source[2];
-        // Set when currying a bound function.
-        newBitmask |= bitmask & WRAP_BIND_FLAG ? 0 : WRAP_CURRY_BOUND_FLAG;
-      }
-      // Compose partial arguments.
-      var value = source[3];
-      if (value) {
-        var partials = data[3];
-        data[3] = partials ? composeArgs(partials, value, source[4]) : value;
-        data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : source[4];
-      }
-      // Compose partial right arguments.
-      value = source[5];
-      if (value) {
-        partials = data[5];
-        data[5] = partials ? composeArgsRight(partials, value, source[6]) : value;
-        data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : source[6];
-      }
-      // Use source `argPos` if available.
-      value = source[7];
-      if (value) {
-        data[7] = value;
-      }
-      // Use source `ary` if it's smaller.
-      if (srcBitmask & WRAP_ARY_FLAG) {
-        data[8] = data[8] == null ? source[8] : nativeMin(data[8], source[8]);
-      }
-      // Use source `arity` if one is not provided.
-      if (data[9] == null) {
-        data[9] = source[9];
-      }
-      // Use source `func` and merge bitmasks.
-      data[0] = source[0];
-      data[1] = newBitmask;
-
-      return data;
-    }
-
-    /**
-     * This function is like
-     * [`Object.keys`](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
-     * except that it includes inherited enumerable properties.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names.
-     */
-    function nativeKeysIn(object) {
-      var result = [];
-      if (object != null) {
-        for (var key in Object(object)) {
-          result.push(key);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Converts `value` to a string using `Object.prototype.toString`.
-     *
-     * @private
-     * @param {*} value The value to convert.
-     * @returns {string} Returns the converted string.
-     */
-    function objectToString(value) {
-      return nativeObjectToString.call(value);
-    }
-
-    /**
-     * A specialized version of `baseRest` which transforms the rest array.
-     *
-     * @private
-     * @param {Function} func The function to apply a rest parameter to.
-     * @param {number} [start=func.length-1] The start position of the rest parameter.
-     * @param {Function} transform The rest array transform.
-     * @returns {Function} Returns the new function.
-     */
-    function overRest(func, start, transform) {
-      start = nativeMax(start === undefined ? (func.length - 1) : start, 0);
-      return function() {
-        var args = arguments,
-            index = -1,
-            length = nativeMax(args.length - start, 0),
-            array = Array(length);
-
-        while (++index < length) {
-          array[index] = args[start + index];
-        }
-        index = -1;
-        var otherArgs = Array(start + 1);
-        while (++index < start) {
-          otherArgs[index] = args[index];
-        }
-        otherArgs[start] = transform(array);
-        return apply(func, this, otherArgs);
-      };
-    }
-
-    /**
-     * Gets the parent value at `path` of `object`.
-     *
-     * @private
-     * @param {Object} object The object to query.
-     * @param {Array} path The path to get the parent value of.
-     * @returns {*} Returns the parent value.
-     */
-    function parent(object, path) {
-      return path.length < 2 ? object : baseGet(object, baseSlice(path, 0, -1));
-    }
-
-    /**
-     * Reorder `array` according to the specified indexes where the element at
-     * the first index is assigned as the first element, the element at
-     * the second index is assigned as the second element, and so on.
-     *
-     * @private
-     * @param {Array} array The array to reorder.
-     * @param {Array} indexes The arranged array indexes.
-     * @returns {Array} Returns `array`.
-     */
-    function reorder(array, indexes) {
-      var arrLength = array.length,
-          length = nativeMin(indexes.length, arrLength),
-          oldArray = copyArray(array);
-
-      while (length--) {
-        var index = indexes[length];
-        array[length] = isIndex(index, arrLength) ? oldArray[index] : undefined;
-      }
-      return array;
-    }
-
-    /**
-     * Sets metadata for `func`.
-     *
-     * **Note:** If this function becomes hot, i.e. is invoked a lot in a short
-     * period of time, it will trip its breaker and transition to an identity
-     * function to avoid garbage collection pauses in V8. See
-     * [V8 issue 2070](https://bugs.chromium.org/p/v8/issues/detail?id=2070)
-     * for more details.
-     *
-     * @private
-     * @param {Function} func The function to associate metadata with.
-     * @param {*} data The metadata.
-     * @returns {Function} Returns `func`.
-     */
-    var setData = shortOut(baseSetData);
-
-    /**
-     * A simple wrapper around the global [`setTimeout`](https://mdn.io/setTimeout).
-     *
-     * @private
-     * @param {Function} func The function to delay.
-     * @param {number} wait The number of milliseconds to delay invocation.
-     * @returns {number|Object} Returns the timer id or timeout object.
-     */
-    var setTimeout = ctxSetTimeout || function(func, wait) {
-      return root.setTimeout(func, wait);
-    };
-
-    /**
-     * Sets the `toString` method of `func` to return `string`.
-     *
-     * @private
-     * @param {Function} func The function to modify.
-     * @param {Function} string The `toString` result.
-     * @returns {Function} Returns `func`.
-     */
-    var setToString = shortOut(baseSetToString);
-
-    /**
-     * Sets the `toString` method of `wrapper` to mimic the source of `reference`
-     * with wrapper details in a comment at the top of the source body.
-     *
-     * @private
-     * @param {Function} wrapper The function to modify.
-     * @param {Function} reference The reference function.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @returns {Function} Returns `wrapper`.
-     */
-    function setWrapToString(wrapper, reference, bitmask) {
-      var source = (reference + '');
-      return setToString(wrapper, insertWrapDetails(source, updateWrapDetails(getWrapDetails(source), bitmask)));
-    }
-
-    /**
-     * Creates a function that'll short out and invoke `identity` instead
-     * of `func` when it's called `HOT_COUNT` or more times in `HOT_SPAN`
-     * milliseconds.
-     *
-     * @private
-     * @param {Function} func The function to restrict.
-     * @returns {Function} Returns the new shortable function.
-     */
-    function shortOut(func) {
-      var count = 0,
-          lastCalled = 0;
-
-      return function() {
-        var stamp = nativeNow(),
-            remaining = HOT_SPAN - (stamp - lastCalled);
-
-        lastCalled = stamp;
-        if (remaining > 0) {
-          if (++count >= HOT_COUNT) {
-            return arguments[0];
-          }
-        } else {
-          count = 0;
-        }
-        return func.apply(undefined, arguments);
-      };
-    }
-
-    /**
-     * A specialized version of `_.shuffle` which mutates and sets the size of `array`.
-     *
-     * @private
-     * @param {Array} array The array to shuffle.
-     * @param {number} [size=array.length] The size of `array`.
-     * @returns {Array} Returns `array`.
-     */
-    function shuffleSelf(array, size) {
-      var index = -1,
-          length = array.length,
-          lastIndex = length - 1;
-
-      size = size === undefined ? length : size;
-      while (++index < size) {
-        var rand = baseRandom(index, lastIndex),
-            value = array[rand];
-
-        array[rand] = array[index];
-        array[index] = value;
-      }
-      array.length = size;
-      return array;
-    }
-
-    /**
-     * Converts `string` to a property path array.
-     *
-     * @private
-     * @param {string} string The string to convert.
-     * @returns {Array} Returns the property path array.
-     */
-    var stringToPath = memoizeCapped(function(string) {
-      var result = [];
-      if (string.charCodeAt(0) === 46 /* . */) {
-        result.push('');
-      }
-      string.replace(rePropName, function(match, number, quote, subString) {
-        result.push(quote ? subString.replace(reEscapeChar, '$1') : (number || match));
-      });
-      return result;
-    });
-
-    /**
-     * Converts `value` to a string key if it's not a string or symbol.
-     *
-     * @private
-     * @param {*} value The value to inspect.
-     * @returns {string|symbol} Returns the key.
-     */
-    function toKey(value) {
-      if (typeof value == 'string' || isSymbol(value)) {
-        return value;
-      }
-      var result = (value + '');
-      return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
-    }
-
-    /**
-     * Converts `func` to its source code.
-     *
-     * @private
-     * @param {Function} func The function to convert.
-     * @returns {string} Returns the source code.
-     */
-    function toSource(func) {
-      if (func != null) {
-        try {
-          return funcToString.call(func);
-        } catch (e) {}
-        try {
-          return (func + '');
-        } catch (e) {}
-      }
-      return '';
-    }
-
-    /**
-     * Updates wrapper `details` based on `bitmask` flags.
-     *
-     * @private
-     * @returns {Array} details The details to modify.
-     * @param {number} bitmask The bitmask flags. See `createWrap` for more details.
-     * @returns {Array} Returns `details`.
-     */
-    function updateWrapDetails(details, bitmask) {
-      arrayEach(wrapFlags, function(pair) {
-        var value = '_.' + pair[0];
-        if ((bitmask & pair[1]) && !arrayIncludes(details, value)) {
-          details.push(value);
-        }
-      });
-      return details.sort();
-    }
-
-    /**
-     * Creates a clone of `wrapper`.
-     *
-     * @private
-     * @param {Object} wrapper The wrapper to clone.
-     * @returns {Object} Returns the cloned wrapper.
-     */
-    function wrapperClone(wrapper) {
-      if (wrapper instanceof LazyWrapper) {
-        return wrapper.clone();
-      }
-      var result = new LodashWrapper(wrapper.__wrapped__, wrapper.__chain__);
-      result.__actions__ = copyArray(wrapper.__actions__);
-      result.__index__  = wrapper.__index__;
-      result.__values__ = wrapper.__values__;
-      return result;
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates an array of elements split into groups the length of `size`.
-     * If `array` can't be split evenly, the final chunk will be the remaining
-     * elements.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to process.
-     * @param {number} [size=1] The length of each chunk
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the new array of chunks.
-     * @example
-     *
-     * _.chunk(['a', 'b', 'c', 'd'], 2);
-     * // => [['a', 'b'], ['c', 'd']]
-     *
-     * _.chunk(['a', 'b', 'c', 'd'], 3);
-     * // => [['a', 'b', 'c'], ['d']]
-     */
-    function chunk(array, size, guard) {
-      if ((guard ? isIterateeCall(array, size, guard) : size === undefined)) {
-        size = 1;
-      } else {
-        size = nativeMax(toInteger(size), 0);
-      }
-      var length = array == null ? 0 : array.length;
-      if (!length || size < 1) {
-        return [];
-      }
-      var index = 0,
-          resIndex = 0,
-          result = Array(nativeCeil(length / size));
-
-      while (index < length) {
-        result[resIndex++] = baseSlice(array, index, (index += size));
-      }
-      return result;
-    }
-
-    /**
-     * Creates an array with all falsey values removed. The values `false`, `null`,
-     * `0`, `""`, `undefined`, and `NaN` are falsey.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to compact.
-     * @returns {Array} Returns the new array of filtered values.
-     * @example
-     *
-     * _.compact([0, 1, false, 2, '', 3]);
-     * // => [1, 2, 3]
-     */
-    function compact(array) {
-      var index = -1,
-          length = array == null ? 0 : array.length,
-          resIndex = 0,
-          result = [];
-
-      while (++index < length) {
-        var value = array[index];
-        if (value) {
-          result[resIndex++] = value;
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Creates a new array concatenating `array` with any additional arrays
-     * and/or values.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to concatenate.
-     * @param {...*} [values] The values to concatenate.
-     * @returns {Array} Returns the new concatenated array.
-     * @example
-     *
-     * var array = [1];
-     * var other = _.concat(array, 2, [3], [[4]]);
-     *
-     * console.log(other);
-     * // => [1, 2, 3, [4]]
-     *
-     * console.log(array);
-     * // => [1]
-     */
-    function concat() {
-      var length = arguments.length;
-      if (!length) {
-        return [];
-      }
-      var args = Array(length - 1),
-          array = arguments[0],
-          index = length;
-
-      while (index--) {
-        args[index - 1] = arguments[index];
-      }
-      return arrayPush(isArray(array) ? copyArray(array) : [array], baseFlatten(args, 1));
-    }
-
-    /**
-     * Creates an array of `array` values not included in the other given arrays
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons. The order and references of result values are
-     * determined by the first array.
-     *
-     * **Note:** Unlike `_.pullAll`, this method returns a new array.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {...Array} [values] The values to exclude.
-     * @returns {Array} Returns the new array of filtered values.
-     * @see _.without, _.xor
-     * @example
-     *
-     * _.difference([2, 1], [2, 3]);
-     * // => [1]
-     */
-    var difference = baseRest(function(array, values) {
-      return isArrayLikeObject(array)
-        ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true))
-        : [];
-    });
-
-    /**
-     * This method is like `_.difference` except that it accepts `iteratee` which
-     * is invoked for each element of `array` and `values` to generate the criterion
-     * by which they're compared. The order and references of result values are
-     * determined by the first array. The iteratee is invoked with one argument:
-     * (value).
-     *
-     * **Note:** Unlike `_.pullAllBy`, this method returns a new array.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {...Array} [values] The values to exclude.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Array} Returns the new array of filtered values.
-     * @example
-     *
-     * _.differenceBy([2.1, 1.2], [2.3, 3.4], Math.floor);
-     * // => [1.2]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.differenceBy([{ 'x': 2 }, { 'x': 1 }], [{ 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    var differenceBy = baseRest(function(array, values) {
-      var iteratee = last(values);
-      if (isArrayLikeObject(iteratee)) {
-        iteratee = undefined;
-      }
-      return isArrayLikeObject(array)
-        ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true), getIteratee(iteratee, 2))
-        : [];
-    });
-
-    /**
-     * This method is like `_.difference` except that it accepts `comparator`
-     * which is invoked to compare elements of `array` to `values`. The order and
-     * references of result values are determined by the first array. The comparator
-     * is invoked with two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.pullAllWith`, this method returns a new array.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {...Array} [values] The values to exclude.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     *
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    var differenceWith = baseRest(function(array, values) {
-      var comparator = last(values);
-      if (isArrayLikeObject(comparator)) {
-        comparator = undefined;
-      }
-      return isArrayLikeObject(array)
-        ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true), undefined, comparator)
-        : [];
-    });
-
-    /**
-     * Creates a slice of `array` with `n` elements dropped from the beginning.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.5.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {number} [n=1] The number of elements to drop.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * _.drop([1, 2, 3]);
-     * // => [2, 3]
-     *
-     * _.drop([1, 2, 3], 2);
-     * // => [3]
-     *
-     * _.drop([1, 2, 3], 5);
-     * // => []
-     *
-     * _.drop([1, 2, 3], 0);
-     * // => [1, 2, 3]
-     */
-    function drop(array, n, guard) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return [];
-      }
-      n = (guard || n === undefined) ? 1 : toInteger(n);
-      return baseSlice(array, n < 0 ? 0 : n, length);
-    }
-
-    /**
-     * Creates a slice of `array` with `n` elements dropped from the end.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {number} [n=1] The number of elements to drop.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * _.dropRight([1, 2, 3]);
-     * // => [1, 2]
-     *
-     * _.dropRight([1, 2, 3], 2);
-     * // => [1]
-     *
-     * _.dropRight([1, 2, 3], 5);
-     * // => []
-     *
-     * _.dropRight([1, 2, 3], 0);
-     * // => [1, 2, 3]
-     */
-    function dropRight(array, n, guard) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return [];
-      }
-      n = (guard || n === undefined) ? 1 : toInteger(n);
-      n = length - n;
-      return baseSlice(array, 0, n < 0 ? 0 : n);
-    }
-
-    /**
-     * Creates a slice of `array` excluding elements dropped from the end.
-     * Elements are dropped until `predicate` returns falsey. The predicate is
-     * invoked with three arguments: (value, index, array).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'active': true },
-     *   { 'user': 'fred',    'active': false },
-     *   { 'user': 'pebbles', 'active': false }
-     * ];
-     *
-     * _.dropRightWhile(users, function(o) { return !o.active; });
-     * // => objects for ['barney']
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.dropRightWhile(users, { 'user': 'pebbles', 'active': false });
-     * // => objects for ['barney', 'fred']
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.dropRightWhile(users, ['active', false]);
-     * // => objects for ['barney']
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.dropRightWhile(users, 'active');
-     * // => objects for ['barney', 'fred', 'pebbles']
-     */
-    function dropRightWhile(array, predicate) {
-      return (array && array.length)
-        ? baseWhile(array, getIteratee(predicate, 3), true, true)
-        : [];
-    }
-
-    /**
-     * Creates a slice of `array` excluding elements dropped from the beginning.
-     * Elements are dropped until `predicate` returns falsey. The predicate is
-     * invoked with three arguments: (value, index, array).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'active': false },
-     *   { 'user': 'fred',    'active': false },
-     *   { 'user': 'pebbles', 'active': true }
-     * ];
-     *
-     * _.dropWhile(users, function(o) { return !o.active; });
-     * // => objects for ['pebbles']
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.dropWhile(users, { 'user': 'barney', 'active': false });
-     * // => objects for ['fred', 'pebbles']
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.dropWhile(users, ['active', false]);
-     * // => objects for ['pebbles']
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.dropWhile(users, 'active');
-     * // => objects for ['barney', 'fred', 'pebbles']
-     */
-    function dropWhile(array, predicate) {
-      return (array && array.length)
-        ? baseWhile(array, getIteratee(predicate, 3), true)
-        : [];
-    }
-
-    /**
-     * Fills elements of `array` with `value` from `start` up to, but not
-     * including, `end`.
-     *
-     * **Note:** This method mutates `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.2.0
-     * @category Array
-     * @param {Array} array The array to fill.
-     * @param {*} value The value to fill `array` with.
-     * @param {number} [start=0] The start position.
-     * @param {number} [end=array.length] The end position.
-     * @returns {Array} Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3];
-     *
-     * _.fill(array, 'a');
-     * console.log(array);
-     * // => ['a', 'a', 'a']
-     *
-     * _.fill(Array(3), 2);
-     * // => [2, 2, 2]
-     *
-     * _.fill([4, 6, 8, 10], '*', 1, 3);
-     * // => [4, '*', '*', 10]
-     */
-    function fill(array, value, start, end) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return [];
-      }
-      if (start && typeof start != 'number' && isIterateeCall(array, value, start)) {
-        start = 0;
-        end = length;
-      }
-      return baseFill(array, value, start, end);
-    }
-
-    /**
-     * This method is like `_.find` except that it returns the index of the first
-     * element `predicate` returns truthy for instead of the element itself.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.1.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @param {number} [fromIndex=0] The index to search from.
-     * @returns {number} Returns the index of the found element, else `-1`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'active': false },
-     *   { 'user': 'fred',    'active': false },
-     *   { 'user': 'pebbles', 'active': true }
-     * ];
-     *
-     * _.findIndex(users, function(o) { return o.user == 'barney'; });
-     * // => 0
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.findIndex(users, { 'user': 'fred', 'active': false });
-     * // => 1
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.findIndex(users, ['active', false]);
-     * // => 0
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.findIndex(users, 'active');
-     * // => 2
-     */
-    function findIndex(array, predicate, fromIndex) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return -1;
-      }
-      var index = fromIndex == null ? 0 : toInteger(fromIndex);
-      if (index < 0) {
-        index = nativeMax(length + index, 0);
-      }
-      return baseFindIndex(array, getIteratee(predicate, 3), index);
-    }
-
-    /**
-     * This method is like `_.findIndex` except that it iterates over elements
-     * of `collection` from right to left.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @param {number} [fromIndex=array.length-1] The index to search from.
-     * @returns {number} Returns the index of the found element, else `-1`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'active': true },
-     *   { 'user': 'fred',    'active': false },
-     *   { 'user': 'pebbles', 'active': false }
-     * ];
-     *
-     * _.findLastIndex(users, function(o) { return o.user == 'pebbles'; });
-     * // => 2
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.findLastIndex(users, { 'user': 'barney', 'active': true });
-     * // => 0
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.findLastIndex(users, ['active', false]);
-     * // => 2
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.findLastIndex(users, 'active');
-     * // => 0
-     */
-    function findLastIndex(array, predicate, fromIndex) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return -1;
-      }
-      var index = length - 1;
-      if (fromIndex !== undefined) {
-        index = toInteger(fromIndex);
-        index = fromIndex < 0
-          ? nativeMax(length + index, 0)
-          : nativeMin(index, length - 1);
-      }
-      return baseFindIndex(array, getIteratee(predicate, 3), index, true);
-    }
-
-    /**
-     * Flattens `array` a single level deep.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to flatten.
-     * @returns {Array} Returns the new flattened array.
-     * @example
-     *
-     * _.flatten([1, [2, [3, [4]], 5]]);
-     * // => [1, 2, [3, [4]], 5]
-     */
-    function flatten(array) {
-      var length = array == null ? 0 : array.length;
-      return length ? baseFlatten(array, 1) : [];
-    }
-
-    /**
-     * Recursively flattens `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to flatten.
-     * @returns {Array} Returns the new flattened array.
-     * @example
-     *
-     * _.flattenDeep([1, [2, [3, [4]], 5]]);
-     * // => [1, 2, 3, 4, 5]
-     */
-    function flattenDeep(array) {
-      var length = array == null ? 0 : array.length;
-      return length ? baseFlatten(array, INFINITY) : [];
-    }
-
-    /**
-     * Recursively flatten `array` up to `depth` times.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.4.0
-     * @category Array
-     * @param {Array} array The array to flatten.
-     * @param {number} [depth=1] The maximum recursion depth.
-     * @returns {Array} Returns the new flattened array.
-     * @example
-     *
-     * var array = [1, [2, [3, [4]], 5]];
-     *
-     * _.flattenDepth(array, 1);
-     * // => [1, 2, [3, [4]], 5]
-     *
-     * _.flattenDepth(array, 2);
-     * // => [1, 2, 3, [4], 5]
-     */
-    function flattenDepth(array, depth) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return [];
-      }
-      depth = depth === undefined ? 1 : toInteger(depth);
-      return baseFlatten(array, depth);
-    }
-
-    /**
-     * The inverse of `_.toPairs`; this method returns an object composed
-     * from key-value `pairs`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} pairs The key-value pairs.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * _.fromPairs([['a', 1], ['b', 2]]);
-     * // => { 'a': 1, 'b': 2 }
-     */
-    function fromPairs(pairs) {
-      var index = -1,
-          length = pairs == null ? 0 : pairs.length,
-          result = {};
-
-      while (++index < length) {
-        var pair = pairs[index];
-        result[pair[0]] = pair[1];
-      }
-      return result;
-    }
-
-    /**
-     * Gets the first element of `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @alias first
-     * @category Array
-     * @param {Array} array The array to query.
-     * @returns {*} Returns the first element of `array`.
-     * @example
-     *
-     * _.head([1, 2, 3]);
-     * // => 1
-     *
-     * _.head([]);
-     * // => undefined
-     */
-    function head(array) {
-      return (array && array.length) ? array[0] : undefined;
-    }
-
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the
-     * offset from the end of `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {*} value The value to search for.
-     * @param {number} [fromIndex=0] The index to search from.
-     * @returns {number} Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // Search from the `fromIndex`.
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    function indexOf(array, value, fromIndex) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return -1;
-      }
-      var index = fromIndex == null ? 0 : toInteger(fromIndex);
-      if (index < 0) {
-        index = nativeMax(length + index, 0);
-      }
-      return baseIndexOf(array, value, index);
-    }
-
-    /**
-     * Gets all but the last element of `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * _.initial([1, 2, 3]);
-     * // => [1, 2]
-     */
-    function initial(array) {
-      var length = array == null ? 0 : array.length;
-      return length ? baseSlice(array, 0, -1) : [];
-    }
-
-    /**
-     * Creates an array of unique values that are included in all given arrays
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons. The order and references of result values are
-     * determined by the first array.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @returns {Array} Returns the new array of intersecting values.
-     * @example
-     *
-     * _.intersection([2, 1], [2, 3]);
-     * // => [2]
-     */
-    var intersection = baseRest(function(arrays) {
-      var mapped = arrayMap(arrays, castArrayLikeObject);
-      return (mapped.length && mapped[0] === arrays[0])
-        ? baseIntersection(mapped)
-        : [];
-    });
-
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which they're compared. The order and references of result values are
-     * determined by the first array. The iteratee is invoked with one argument:
-     * (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Array} Returns the new array of intersecting values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [2.3, 3.4], Math.floor);
-     * // => [2.1]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    var intersectionBy = baseRest(function(arrays) {
-      var iteratee = last(arrays),
-          mapped = arrayMap(arrays, castArrayLikeObject);
-
-      if (iteratee === last(mapped)) {
-        iteratee = undefined;
-      } else {
-        mapped.pop();
-      }
-      return (mapped.length && mapped[0] === arrays[0])
-        ? baseIntersection(mapped, getIteratee(iteratee, 2))
-        : [];
-    });
-
-    /**
-     * This method is like `_.intersection` except that it accepts `comparator`
-     * which is invoked to compare elements of `arrays`. The order and references
-     * of result values are determined by the first array. The comparator is
-     * invoked with two arguments: (arrVal, othVal).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of intersecting values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    var intersectionWith = baseRest(function(arrays) {
-      var comparator = last(arrays),
-          mapped = arrayMap(arrays, castArrayLikeObject);
-
-      comparator = typeof comparator == 'function' ? comparator : undefined;
-      if (comparator) {
-        mapped.pop();
-      }
-      return (mapped.length && mapped[0] === arrays[0])
-        ? baseIntersection(mapped, undefined, comparator)
-        : [];
-    });
-
-    /**
-     * Converts all elements in `array` into a string separated by `separator`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to convert.
-     * @param {string} [separator=','] The element separator.
-     * @returns {string} Returns the joined string.
-     * @example
-     *
-     * _.join(['a', 'b', 'c'], '~');
-     * // => 'a~b~c'
-     */
-    function join(array, separator) {
-      return array == null ? '' : nativeJoin.call(array, separator);
-    }
-
-    /**
-     * Gets the last element of `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @returns {*} Returns the last element of `array`.
-     * @example
-     *
-     * _.last([1, 2, 3]);
-     * // => 3
-     */
-    function last(array) {
-      var length = array == null ? 0 : array.length;
-      return length ? array[length - 1] : undefined;
-    }
-
-    /**
-     * This method is like `_.indexOf` except that it iterates over elements of
-     * `array` from right to left.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {*} value The value to search for.
-     * @param {number} [fromIndex=array.length-1] The index to search from.
-     * @returns {number} Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.lastIndexOf([1, 2, 1, 2], 2);
-     * // => 3
-     *
-     * // Search from the `fromIndex`.
-     * _.lastIndexOf([1, 2, 1, 2], 2, 2);
-     * // => 1
-     */
-    function lastIndexOf(array, value, fromIndex) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return -1;
-      }
-      var index = length;
-      if (fromIndex !== undefined) {
-        index = toInteger(fromIndex);
-        index = index < 0 ? nativeMax(length + index, 0) : nativeMin(index, length - 1);
-      }
-      return value === value
-        ? strictLastIndexOf(array, value, index)
-        : baseFindIndex(array, baseIsNaN, index, true);
-    }
-
-    /**
-     * Gets the element at index `n` of `array`. If `n` is negative, the nth
-     * element from the end is returned.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.11.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {number} [n=0] The index of the element to return.
-     * @returns {*} Returns the nth element of `array`.
-     * @example
-     *
-     * var array = ['a', 'b', 'c', 'd'];
-     *
-     * _.nth(array, 1);
-     * // => 'b'
-     *
-     * _.nth(array, -2);
-     * // => 'c';
-     */
-    function nth(array, n) {
-      return (array && array.length) ? baseNth(array, toInteger(n)) : undefined;
-    }
-
-    /**
-     * Removes all given values from `array` using
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * **Note:** Unlike `_.without`, this method mutates `array`. Use `_.remove`
-     * to remove elements from an array by predicate.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @param {...*} [values] The values to remove.
-     * @returns {Array} Returns `array`.
-     * @example
-     *
-     * var array = ['a', 'b', 'c', 'a', 'b', 'c'];
-     *
-     * _.pull(array, 'a', 'c');
-     * console.log(array);
-     * // => ['b', 'b']
-     */
-    var pull = baseRest(pullAll);
-
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @param {Array} values The values to remove.
-     * @returns {Array} Returns `array`.
-     * @example
-     *
-     * var array = ['a', 'b', 'c', 'a', 'b', 'c'];
-     *
-     * _.pullAll(array, ['a', 'c']);
-     * console.log(array);
-     * // => ['b', 'b']
-     */
-    function pullAll(array, values) {
-      return (array && array.length && values && values.length)
-        ? basePullAll(array, values)
-        : array;
-    }
-
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to generate the criterion
-     * by which they're compared. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @param {Array} values The values to remove.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Array} Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    function pullAllBy(array, values, iteratee) {
-      return (array && array.length && values && values.length)
-        ? basePullAll(array, values, getIteratee(iteratee, 2))
-        : array;
-    }
-
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which
-     * is invoked to compare elements of `array` to `values`. The comparator is
-     * invoked with two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.6.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @param {Array} values The values to remove.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    function pullAllWith(array, values, comparator) {
-      return (array && array.length && values && values.length)
-        ? basePullAll(array, values, undefined, comparator)
-        : array;
-    }
-
-    /**
-     * Removes elements from `array` corresponding to `indexes` and returns an
-     * array of removed elements.
-     *
-     * **Note:** Unlike `_.at`, this method mutates `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @param {...(number|number[])} [indexes] The indexes of elements to remove.
-     * @returns {Array} Returns the new array of removed elements.
-     * @example
-     *
-     * var array = ['a', 'b', 'c', 'd'];
-     * var pulled = _.pullAt(array, [1, 3]);
-     *
-     * console.log(array);
-     * // => ['a', 'c']
-     *
-     * console.log(pulled);
-     * // => ['b', 'd']
-     */
-    var pullAt = flatRest(function(array, indexes) {
-      var length = array == null ? 0 : array.length,
-          result = baseAt(array, indexes);
-
-      basePullAt(array, arrayMap(indexes, function(index) {
-        return isIndex(index, length) ? +index : index;
-      }).sort(compareAscending));
-
-      return result;
-    });
-
-    /**
-     * Removes all elements from `array` that `predicate` returns truthy for
-     * and returns an array of the removed elements. The predicate is invoked
-     * with three arguments: (value, index, array).
-     *
-     * **Note:** Unlike `_.filter`, this method mutates `array`. Use `_.pull`
-     * to pull elements from an array by value.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the new array of removed elements.
-     * @example
-     *
-     * var array = [1, 2, 3, 4];
-     * var evens = _.remove(array, function(n) {
-     *   return n % 2 == 0;
-     * });
-     *
-     * console.log(array);
-     * // => [1, 3]
-     *
-     * console.log(evens);
-     * // => [2, 4]
-     */
-    function remove(array, predicate) {
-      var result = [];
-      if (!(array && array.length)) {
-        return result;
-      }
-      var index = -1,
-          indexes = [],
-          length = array.length;
-
-      predicate = getIteratee(predicate, 3);
-      while (++index < length) {
-        var value = array[index];
-        if (predicate(value, index, array)) {
-          result.push(value);
-          indexes.push(index);
-        }
-      }
-      basePullAt(array, indexes);
-      return result;
-    }
-
-    /**
-     * Reverses `array` so that the first element becomes the last, the second
-     * element becomes the second to last, and so on.
-     *
-     * **Note:** This method mutates `array` and is based on
-     * [`Array#reverse`](https://mdn.io/Array/reverse).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to modify.
-     * @returns {Array} Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3];
-     *
-     * _.reverse(array);
-     * // => [3, 2, 1]
-     *
-     * console.log(array);
-     * // => [3, 2, 1]
-     */
-    function reverse(array) {
-      return array == null ? array : nativeReverse.call(array);
-    }
-
-    /**
-     * Creates a slice of `array` from `start` up to, but not including, `end`.
-     *
-     * **Note:** This method is used instead of
-     * [`Array#slice`](https://mdn.io/Array/slice) to ensure dense arrays are
-     * returned.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to slice.
-     * @param {number} [start=0] The start position.
-     * @param {number} [end=array.length] The end position.
-     * @returns {Array} Returns the slice of `array`.
-     */
-    function slice(array, start, end) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return [];
-      }
-      if (end && typeof end != 'number' && isIterateeCall(array, start, end)) {
-        start = 0;
-        end = length;
-      }
-      else {
-        start = start == null ? 0 : toInteger(start);
-        end = end === undefined ? length : toInteger(end);
-      }
-      return baseSlice(array, start, end);
-    }
-
-    /**
-     * Uses a binary search to determine the lowest index at which `value`
-     * should be inserted into `array` in order to maintain its sort order.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The sorted array to inspect.
-     * @param {*} value The value to evaluate.
-     * @returns {number} Returns the index at which `value` should be inserted
-     *  into `array`.
-     * @example
-     *
-     * _.sortedIndex([30, 50], 40);
-     * // => 1
-     */
-    function sortedIndex(array, value) {
-      return baseSortedIndex(array, value);
-    }
-
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The sorted array to inspect.
-     * @param {*} value The value to evaluate.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {number} Returns the index at which `value` should be inserted
-     *  into `array`.
-     * @example
-     *
-     * var objects = [{ 'x': 4 }, { 'x': 5 }];
-     *
-     * _.sortedIndexBy(objects, { 'x': 4 }, function(o) { return o.x; });
-     * // => 0
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.sortedIndexBy(objects, { 'x': 4 }, 'x');
-     * // => 0
-     */
-    function sortedIndexBy(array, value, iteratee) {
-      return baseSortedIndexBy(array, value, getIteratee(iteratee, 2));
-    }
-
-    /**
-     * This method is like `_.indexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {*} value The value to search for.
-     * @returns {number} Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedIndexOf([4, 5, 5, 5, 6], 5);
-     * // => 1
-     */
-    function sortedIndexOf(array, value) {
-      var length = array == null ? 0 : array.length;
-      if (length) {
-        var index = baseSortedIndex(array, value);
-        if (index < length && eq(array[index], value)) {
-          return index;
-        }
-      }
-      return -1;
-    }
-
-    /**
-     * This method is like `_.sortedIndex` except that it returns the highest
-     * index at which `value` should be inserted into `array` in order to
-     * maintain its sort order.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The sorted array to inspect.
-     * @param {*} value The value to evaluate.
-     * @returns {number} Returns the index at which `value` should be inserted
-     *  into `array`.
-     * @example
-     *
-     * _.sortedLastIndex([4, 5, 5, 5, 6], 5);
-     * // => 4
-     */
-    function sortedLastIndex(array, value) {
-      return baseSortedIndex(array, value, true);
-    }
-
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The sorted array to inspect.
-     * @param {*} value The value to evaluate.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {number} Returns the index at which `value` should be inserted
-     *  into `array`.
-     * @example
-     *
-     * var objects = [{ 'x': 4 }, { 'x': 5 }];
-     *
-     * _.sortedLastIndexBy(objects, { 'x': 4 }, function(o) { return o.x; });
-     * // => 1
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.sortedLastIndexBy(objects, { 'x': 4 }, 'x');
-     * // => 1
-     */
-    function sortedLastIndexBy(array, value, iteratee) {
-      return baseSortedIndexBy(array, value, getIteratee(iteratee, 2), true);
-    }
-
-    /**
-     * This method is like `_.lastIndexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {*} value The value to search for.
-     * @returns {number} Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedLastIndexOf([4, 5, 5, 5, 6], 5);
-     * // => 3
-     */
-    function sortedLastIndexOf(array, value) {
-      var length = array == null ? 0 : array.length;
-      if (length) {
-        var index = baseSortedIndex(array, value, true) - 1;
-        if (eq(array[index], value)) {
-          return index;
-        }
-      }
-      return -1;
-    }
-
-    /**
-     * This method is like `_.uniq` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @returns {Array} Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniq([1, 1, 2]);
-     * // => [1, 2]
-     */
-    function sortedUniq(array) {
-      return (array && array.length)
-        ? baseSortedUniq(array)
-        : [];
-    }
-
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {Function} [iteratee] The iteratee invoked per element.
-     * @returns {Array} Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.3]
-     */
-    function sortedUniqBy(array, iteratee) {
-      return (array && array.length)
-        ? baseSortedUniq(array, getIteratee(iteratee, 2))
-        : [];
-    }
-
-    /**
-     * Gets all but the first element of `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * _.tail([1, 2, 3]);
-     * // => [2, 3]
-     */
-    function tail(array) {
-      var length = array == null ? 0 : array.length;
-      return length ? baseSlice(array, 1, length) : [];
-    }
-
-    /**
-     * Creates a slice of `array` with `n` elements taken from the beginning.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {number} [n=1] The number of elements to take.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * _.take([1, 2, 3]);
-     * // => [1]
-     *
-     * _.take([1, 2, 3], 2);
-     * // => [1, 2]
-     *
-     * _.take([1, 2, 3], 5);
-     * // => [1, 2, 3]
-     *
-     * _.take([1, 2, 3], 0);
-     * // => []
-     */
-    function take(array, n, guard) {
-      if (!(array && array.length)) {
-        return [];
-      }
-      n = (guard || n === undefined) ? 1 : toInteger(n);
-      return baseSlice(array, 0, n < 0 ? 0 : n);
-    }
-
-    /**
-     * Creates a slice of `array` with `n` elements taken from the end.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {number} [n=1] The number of elements to take.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * _.takeRight([1, 2, 3]);
-     * // => [3]
-     *
-     * _.takeRight([1, 2, 3], 2);
-     * // => [2, 3]
-     *
-     * _.takeRight([1, 2, 3], 5);
-     * // => [1, 2, 3]
-     *
-     * _.takeRight([1, 2, 3], 0);
-     * // => []
-     */
-    function takeRight(array, n, guard) {
-      var length = array == null ? 0 : array.length;
-      if (!length) {
-        return [];
-      }
-      n = (guard || n === undefined) ? 1 : toInteger(n);
-      n = length - n;
-      return baseSlice(array, n < 0 ? 0 : n, length);
-    }
-
-    /**
-     * Creates a slice of `array` with elements taken from the end. Elements are
-     * taken until `predicate` returns falsey. The predicate is invoked with
-     * three arguments: (value, index, array).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'active': true },
-     *   { 'user': 'fred',    'active': false },
-     *   { 'user': 'pebbles', 'active': false }
-     * ];
-     *
-     * _.takeRightWhile(users, function(o) { return !o.active; });
-     * // => objects for ['fred', 'pebbles']
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.takeRightWhile(users, { 'user': 'pebbles', 'active': false });
-     * // => objects for ['pebbles']
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.takeRightWhile(users, ['active', false]);
-     * // => objects for ['fred', 'pebbles']
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.takeRightWhile(users, 'active');
-     * // => []
-     */
-    function takeRightWhile(array, predicate) {
-      return (array && array.length)
-        ? baseWhile(array, getIteratee(predicate, 3), false, true)
-        : [];
-    }
-
-    /**
-     * Creates a slice of `array` with elements taken from the beginning. Elements
-     * are taken until `predicate` returns falsey. The predicate is invoked with
-     * three arguments: (value, index, array).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Array
-     * @param {Array} array The array to query.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the slice of `array`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'active': false },
-     *   { 'user': 'fred',    'active': false },
-     *   { 'user': 'pebbles', 'active': true }
-     * ];
-     *
-     * _.takeWhile(users, function(o) { return !o.active; });
-     * // => objects for ['barney', 'fred']
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.takeWhile(users, { 'user': 'barney', 'active': false });
-     * // => objects for ['barney']
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.takeWhile(users, ['active', false]);
-     * // => objects for ['barney', 'fred']
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.takeWhile(users, 'active');
-     * // => []
-     */
-    function takeWhile(array, predicate) {
-      return (array && array.length)
-        ? baseWhile(array, getIteratee(predicate, 3))
-        : [];
-    }
-
-    /**
-     * Creates an array of unique values, in order, from all given arrays using
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @returns {Array} Returns the new array of combined values.
-     * @example
-     *
-     * _.union([2], [1, 2]);
-     * // => [2, 1]
-     */
-    var union = baseRest(function(arrays) {
-      return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true));
-    });
-
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by
-     * which uniqueness is computed. Result values are chosen from the first
-     * array in which the value occurs. The iteratee is invoked with one argument:
-     * (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Array} Returns the new array of combined values.
-     * @example
-     *
-     * _.unionBy([2.1], [1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.unionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    var unionBy = baseRest(function(arrays) {
-      var iteratee = last(arrays);
-      if (isArrayLikeObject(iteratee)) {
-        iteratee = undefined;
-      }
-      return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true), getIteratee(iteratee, 2));
-    });
-
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. Result values are chosen from
-     * the first array in which the value occurs. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    var unionWith = baseRest(function(arrays) {
-      var comparator = last(arrays);
-      comparator = typeof comparator == 'function' ? comparator : undefined;
-      return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true), undefined, comparator);
-    });
-
-    /**
-     * Creates a duplicate-free version of an array, using
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons, in which only the first occurrence of each element
-     * is kept. The order of result values is determined by the order they occur
-     * in the array.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @returns {Array} Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniq([2, 1, 2]);
-     * // => [2, 1]
-     */
-    function uniq(array) {
-      return (array && array.length) ? baseUniq(array) : [];
-    }
-
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The order of result values is determined by the
-     * order they occur in the array. The iteratee is invoked with one argument:
-     * (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Array} Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    function uniqBy(array, iteratee) {
-      return (array && array.length) ? baseUniq(array, getIteratee(iteratee, 2)) : [];
-    }
-
-    /**
-     * This method is like `_.uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The order of result values is
-     * determined by the order they occur in the array.The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new duplicate free array.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.uniqWith(objects, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    function uniqWith(array, comparator) {
-      comparator = typeof comparator == 'function' ? comparator : undefined;
-      return (array && array.length) ? baseUniq(array, undefined, comparator) : [];
-    }
-
-    /**
-     * This method is like `_.zip` except that it accepts an array of grouped
-     * elements and creates an array regrouping the elements to their pre-zip
-     * configuration.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.2.0
-     * @category Array
-     * @param {Array} array The array of grouped elements to process.
-     * @returns {Array} Returns the new array of regrouped elements.
-     * @example
-     *
-     * var zipped = _.zip(['a', 'b'], [1, 2], [true, false]);
-     * // => [['a', 1, true], ['b', 2, false]]
-     *
-     * _.unzip(zipped);
-     * // => [['a', 'b'], [1, 2], [true, false]]
-     */
-    function unzip(array) {
-      if (!(array && array.length)) {
-        return [];
-      }
-      var length = 0;
-      array = arrayFilter(array, function(group) {
-        if (isArrayLikeObject(group)) {
-          length = nativeMax(group.length, length);
-          return true;
-        }
-      });
-      return baseTimes(length, function(index) {
-        return arrayMap(array, baseProperty(index));
-      });
-    }
-
-    /**
-     * This method is like `_.unzip` except that it accepts `iteratee` to specify
-     * how regrouped values should be combined. The iteratee is invoked with the
-     * elements of each group: (...group).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.8.0
-     * @category Array
-     * @param {Array} array The array of grouped elements to process.
-     * @param {Function} [iteratee=_.identity] The function to combine
-     *  regrouped values.
-     * @returns {Array} Returns the new array of regrouped elements.
-     * @example
-     *
-     * var zipped = _.zip([1, 2], [10, 20], [100, 200]);
-     * // => [[1, 10, 100], [2, 20, 200]]
-     *
-     * _.unzipWith(zipped, _.add);
-     * // => [3, 30, 300]
-     */
-    function unzipWith(array, iteratee) {
-      if (!(array && array.length)) {
-        return [];
-      }
-      var result = unzip(array);
-      if (iteratee == null) {
-        return result;
-      }
-      return arrayMap(result, function(group) {
-        return apply(iteratee, undefined, group);
-      });
-    }
-
-    /**
-     * Creates an array excluding all given values using
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * **Note:** Unlike `_.pull`, this method returns a new array.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {...*} [values] The values to exclude.
-     * @returns {Array} Returns the new array of filtered values.
-     * @see _.difference, _.xor
-     * @example
-     *
-     * _.without([2, 1, 2, 3], 1, 2);
-     * // => [3]
-     */
-    var without = baseRest(function(array, values) {
-      return isArrayLikeObject(array)
-        ? baseDifference(array, values)
-        : [];
-    });
-
-    /**
-     * Creates an array of unique values that is the
-     * [symmetric difference](https://en.wikipedia.org/wiki/Symmetric_difference)
-     * of the given arrays. The order of result values is determined by the order
-     * they occur in the arrays.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.4.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @returns {Array} Returns the new array of filtered values.
-     * @see _.difference, _.without
-     * @example
-     *
-     * _.xor([2, 1], [2, 3]);
-     * // => [1, 3]
-     */
-    var xor = baseRest(function(arrays) {
-      return baseXor(arrayFilter(arrays, isArrayLikeObject));
-    });
-
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by
-     * which by which they're compared. The order of result values is determined
-     * by the order they occur in the arrays. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Array} Returns the new array of filtered values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [2.3, 3.4], Math.floor);
-     * // => [1.2, 3.4]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    var xorBy = baseRest(function(arrays) {
-      var iteratee = last(arrays);
-      if (isArrayLikeObject(iteratee)) {
-        iteratee = undefined;
-      }
-      return baseXor(arrayFilter(arrays, isArrayLikeObject), getIteratee(iteratee, 2));
-    });
-
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The order of result values is
-     * determined by the order they occur in the arrays. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to inspect.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    var xorWith = baseRest(function(arrays) {
-      var comparator = last(arrays);
-      comparator = typeof comparator == 'function' ? comparator : undefined;
-      return baseXor(arrayFilter(arrays, isArrayLikeObject), undefined, comparator);
-    });
-
-    /**
-     * Creates an array of grouped elements, the first of which contains the
-     * first elements of the given arrays, the second of which contains the
-     * second elements of the given arrays, and so on.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to process.
-     * @returns {Array} Returns the new array of grouped elements.
-     * @example
-     *
-     * _.zip(['a', 'b'], [1, 2], [true, false]);
-     * // => [['a', 1, true], ['b', 2, false]]
-     */
-    var zip = baseRest(unzip);
-
-    /**
-     * This method is like `_.fromPairs` except that it accepts two arrays,
-     * one of property identifiers and one of corresponding values.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.4.0
-     * @category Array
-     * @param {Array} [props=[]] The property identifiers.
-     * @param {Array} [values=[]] The property values.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * _.zipObject(['a', 'b'], [1, 2]);
-     * // => { 'a': 1, 'b': 2 }
-     */
-    function zipObject(props, values) {
-      return baseZipObject(props || [], values || [], assignValue);
-    }
-
-    /**
-     * This method is like `_.zipObject` except that it supports property paths.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.1.0
-     * @category Array
-     * @param {Array} [props=[]] The property identifiers.
-     * @param {Array} [values=[]] The property values.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * _.zipObjectDeep(['a.b[0].c', 'a.b[1].d'], [1, 2]);
-     * // => { 'a': { 'b': [{ 'c': 1 }, { 'd': 2 }] } }
-     */
-    function zipObjectDeep(props, values) {
-      return baseZipObject(props || [], values || [], baseSet);
-    }
-
-    /**
-     * This method is like `_.zip` except that it accepts `iteratee` to specify
-     * how grouped values should be combined. The iteratee is invoked with the
-     * elements of each group: (...group).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.8.0
-     * @category Array
-     * @param {...Array} [arrays] The arrays to process.
-     * @param {Function} [iteratee=_.identity] The function to combine
-     *  grouped values.
-     * @returns {Array} Returns the new array of grouped elements.
-     * @example
-     *
-     * _.zipWith([1, 2], [10, 20], [100, 200], function(a, b, c) {
-     *   return a + b + c;
-     * });
-     * // => [111, 222]
-     */
-    var zipWith = baseRest(function(arrays) {
-      var length = arrays.length,
-          iteratee = length > 1 ? arrays[length - 1] : undefined;
-
-      iteratee = typeof iteratee == 'function' ? (arrays.pop(), iteratee) : undefined;
-      return unzipWith(arrays, iteratee);
-    });
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates a `lodash` wrapper instance that wraps `value` with explicit method
-     * chain sequences enabled. The result of such sequences must be unwrapped
-     * with `_#value`.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.3.0
-     * @category Seq
-     * @param {*} value The value to wrap.
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'age': 36 },
-     *   { 'user': 'fred',    'age': 40 },
-     *   { 'user': 'pebbles', 'age': 1 }
-     * ];
-     *
-     * var youngest = _
-     *   .chain(users)
-     *   .sortBy('age')
-     *   .map(function(o) {
-     *     return o.user + ' is ' + o.age;
-     *   })
-     *   .head()
-     *   .value();
-     * // => 'pebbles is 1'
-     */
-    function chain(value) {
-      var result = lodash(value);
-      result.__chain__ = true;
-      return result;
-    }
-
-    /**
-     * This method invokes `interceptor` and returns `value`. The interceptor
-     * is invoked with one argument; (value). The purpose of this method is to
-     * "tap into" a method chain sequence in order to modify intermediate results.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Seq
-     * @param {*} value The value to provide to `interceptor`.
-     * @param {Function} interceptor The function to invoke.
-     * @returns {*} Returns `value`.
-     * @example
-     *
-     * _([1, 2, 3])
-     *  .tap(function(array) {
-     *    // Mutate input array.
-     *    array.pop();
-     *  })
-     *  .reverse()
-     *  .value();
-     * // => [2, 1]
-     */
-    function tap(value, interceptor) {
-      interceptor(value);
-      return value;
-    }
-
-    /**
-     * This method is like `_.tap` except that it returns the result of `interceptor`.
-     * The purpose of this method is to "pass thru" values replacing intermediate
-     * results in a method chain sequence.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Seq
-     * @param {*} value The value to provide to `interceptor`.
-     * @param {Function} interceptor The function to invoke.
-     * @returns {*} Returns the result of `interceptor`.
-     * @example
-     *
-     * _('  abc  ')
-     *  .chain()
-     *  .trim()
-     *  .thru(function(value) {
-     *    return [value];
-     *  })
-     *  .value();
-     * // => ['abc']
-     */
-    function thru(value, interceptor) {
-      return interceptor(value);
-    }
-
-    /**
-     * This method is the wrapper version of `_.at`.
-     *
-     * @name at
-     * @memberOf _
-     * @since 1.0.0
-     * @category Seq
-     * @param {...(string|string[])} [paths] The property paths to pick.
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': 3 } }, 4] };
-     *
-     * _(object).at(['a[0].b.c', 'a[1]']).value();
-     * // => [3, 4]
-     */
-    var wrapperAt = flatRest(function(paths) {
-      var length = paths.length,
-          start = length ? paths[0] : 0,
-          value = this.__wrapped__,
-          interceptor = function(object) { return baseAt(object, paths); };
-
-      if (length > 1 || this.__actions__.length ||
-          !(value instanceof LazyWrapper) || !isIndex(start)) {
-        return this.thru(interceptor);
-      }
-      value = value.slice(start, +start + (length ? 1 : 0));
-      value.__actions__.push({
-        'func': thru,
-        'args': [interceptor],
-        'thisArg': undefined
-      });
-      return new LodashWrapper(value, this.__chain__).thru(function(array) {
-        if (length && !array.length) {
-          array.push(undefined);
-        }
-        return array;
-      });
-    });
-
-    /**
-     * Creates a `lodash` wrapper instance with explicit method chain sequences enabled.
-     *
-     * @name chain
-     * @memberOf _
-     * @since 0.1.0
-     * @category Seq
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 40 }
-     * ];
-     *
-     * // A sequence without explicit chaining.
-     * _(users).head();
-     * // => { 'user': 'barney', 'age': 36 }
-     *
-     * // A sequence with explicit chaining.
-     * _(users)
-     *   .chain()
-     *   .head()
-     *   .pick('user')
-     *   .value();
-     * // => { 'user': 'barney' }
-     */
-    function wrapperChain() {
-      return chain(this);
-    }
-
-    /**
-     * Executes the chain sequence and returns the wrapped result.
-     *
-     * @name commit
-     * @memberOf _
-     * @since 3.2.0
-     * @category Seq
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * var array = [1, 2];
-     * var wrapped = _(array).push(3);
-     *
-     * console.log(array);
-     * // => [1, 2]
-     *
-     * wrapped = wrapped.commit();
-     * console.log(array);
-     * // => [1, 2, 3]
-     *
-     * wrapped.last();
-     * // => 3
-     *
-     * console.log(array);
-     * // => [1, 2, 3]
-     */
-    function wrapperCommit() {
-      return new LodashWrapper(this.value(), this.__chain__);
-    }
-
-    /**
-     * Gets the next value on a wrapped object following the
-     * [iterator protocol](https://mdn.io/iteration_protocols#iterator).
-     *
-     * @name next
-     * @memberOf _
-     * @since 4.0.0
-     * @category Seq
-     * @returns {Object} Returns the next iterator value.
-     * @example
-     *
-     * var wrapped = _([1, 2]);
-     *
-     * wrapped.next();
-     * // => { 'done': false, 'value': 1 }
-     *
-     * wrapped.next();
-     * // => { 'done': false, 'value': 2 }
-     *
-     * wrapped.next();
-     * // => { 'done': true, 'value': undefined }
-     */
-    function wrapperNext() {
-      if (this.__values__ === undefined) {
-        this.__values__ = toArray(this.value());
-      }
-      var done = this.__index__ >= this.__values__.length,
-          value = done ? undefined : this.__values__[this.__index__++];
-
-      return { 'done': done, 'value': value };
-    }
-
-    /**
-     * Enables the wrapper to be iterable.
-     *
-     * @name Symbol.iterator
-     * @memberOf _
-     * @since 4.0.0
-     * @category Seq
-     * @returns {Object} Returns the wrapper object.
-     * @example
-     *
-     * var wrapped = _([1, 2]);
-     *
-     * wrapped[Symbol.iterator]() === wrapped;
-     * // => true
-     *
-     * Array.from(wrapped);
-     * // => [1, 2]
-     */
-    function wrapperToIterator() {
-      return this;
-    }
-
-    /**
-     * Creates a clone of the chain sequence planting `value` as the wrapped value.
-     *
-     * @name plant
-     * @memberOf _
-     * @since 3.2.0
-     * @category Seq
-     * @param {*} value The value to plant.
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * function square(n) {
-     *   return n * n;
-     * }
-     *
-     * var wrapped = _([1, 2]).map(square);
-     * var other = wrapped.plant([3, 4]);
-     *
-     * other.value();
-     * // => [9, 16]
-     *
-     * wrapped.value();
-     * // => [1, 4]
-     */
-    function wrapperPlant(value) {
-      var result,
-          parent = this;
-
-      while (parent instanceof baseLodash) {
-        var clone = wrapperClone(parent);
-        clone.__index__ = 0;
-        clone.__values__ = undefined;
-        if (result) {
-          previous.__wrapped__ = clone;
-        } else {
-          result = clone;
-        }
-        var previous = clone;
-        parent = parent.__wrapped__;
-      }
-      previous.__wrapped__ = value;
-      return result;
-    }
-
-    /**
-     * This method is the wrapper version of `_.reverse`.
-     *
-     * **Note:** This method mutates the wrapped array.
-     *
-     * @name reverse
-     * @memberOf _
-     * @since 0.1.0
-     * @category Seq
-     * @returns {Object} Returns the new `lodash` wrapper instance.
-     * @example
-     *
-     * var array = [1, 2, 3];
-     *
-     * _(array).reverse().value()
-     * // => [3, 2, 1]
-     *
-     * console.log(array);
-     * // => [3, 2, 1]
-     */
-    function wrapperReverse() {
-      var value = this.__wrapped__;
-      if (value instanceof LazyWrapper) {
-        var wrapped = value;
-        if (this.__actions__.length) {
-          wrapped = new LazyWrapper(this);
-        }
-        wrapped = wrapped.reverse();
-        wrapped.__actions__.push({
-          'func': thru,
-          'args': [reverse],
-          'thisArg': undefined
-        });
-        return new LodashWrapper(wrapped, this.__chain__);
-      }
-      return this.thru(reverse);
-    }
-
-    /**
-     * Executes the chain sequence to resolve the unwrapped value.
-     *
-     * @name value
-     * @memberOf _
-     * @since 0.1.0
-     * @alias toJSON, valueOf
-     * @category Seq
-     * @returns {*} Returns the resolved unwrapped value.
-     * @example
-     *
-     * _([1, 2, 3]).value();
-     * // => [1, 2, 3]
-     */
-    function wrapperValue() {
-      return baseWrapperValue(this.__wrapped__, this.__actions__);
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Creates an object composed of keys generated from the results of running
-     * each element of `collection` thru `iteratee`. The corresponding value of
-     * each key is the number of times the key was returned by `iteratee`. The
-     * iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.5.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee to transform keys.
-     * @returns {Object} Returns the composed aggregate object.
-     * @example
-     *
-     * _.countBy([6.1, 4.2, 6.3], Math.floor);
-     * // => { '4': 1, '6': 2 }
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.countBy(['one', 'two', 'three'], 'length');
-     * // => { '3': 2, '5': 1 }
-     */
-    var countBy = createAggregator(function(result, value, key) {
-      if (hasOwnProperty.call(result, key)) {
-        ++result[key];
-      } else {
-        baseAssignValue(result, key, 1);
-      }
-    });
-
-    /**
-     * Checks if `predicate` returns truthy for **all** elements of `collection`.
-     * Iteration is stopped once `predicate` returns falsey. The predicate is
-     * invoked with three arguments: (value, index|key, collection).
-     *
-     * **Note:** This method returns `true` for
-     * [empty collections](https://en.wikipedia.org/wiki/Empty_set) because
-     * [everything is true](https://en.wikipedia.org/wiki/Vacuous_truth) of
-     * elements of empty collections.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {boolean} Returns `true` if all elements pass the predicate check,
-     *  else `false`.
-     * @example
-     *
-     * _.every([true, 1, null, 'yes'], Boolean);
-     * // => false
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36, 'active': false },
-     *   { 'user': 'fred',   'age': 40, 'active': false }
-     * ];
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.every(users, { 'user': 'barney', 'active': false });
-     * // => false
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.every(users, ['active', false]);
-     * // => true
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.every(users, 'active');
-     * // => false
-     */
-    function every(collection, predicate, guard) {
-      var func = isArray(collection) ? arrayEvery : baseEvery;
-      if (guard && isIterateeCall(collection, predicate, guard)) {
-        predicate = undefined;
-      }
-      return func(collection, getIteratee(predicate, 3));
-    }
-
-    /**
-     * Iterates over elements of `collection`, returning an array of all elements
-     * `predicate` returns truthy for. The predicate is invoked with three
-     * arguments: (value, index|key, collection).
-     *
-     * **Note:** Unlike `_.remove`, this method returns a new array.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the new filtered array.
-     * @see _.reject
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36, 'active': true },
-     *   { 'user': 'fred',   'age': 40, 'active': false }
-     * ];
-     *
-     * _.filter(users, function(o) { return !o.active; });
-     * // => objects for ['fred']
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.filter(users, { 'age': 36, 'active': true });
-     * // => objects for ['barney']
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.filter(users, ['active', false]);
-     * // => objects for ['fred']
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.filter(users, 'active');
-     * // => objects for ['barney']
-     */
-    function filter(collection, predicate) {
-      var func = isArray(collection) ? arrayFilter : baseFilter;
-      return func(collection, getIteratee(predicate, 3));
-    }
-
-    /**
-     * Iterates over elements of `collection`, returning the first element
-     * `predicate` returns truthy for. The predicate is invoked with three
-     * arguments: (value, index|key, collection).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to inspect.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @param {number} [fromIndex=0] The index to search from.
-     * @returns {*} Returns the matched element, else `undefined`.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'age': 36, 'active': true },
-     *   { 'user': 'fred',    'age': 40, 'active': false },
-     *   { 'user': 'pebbles', 'age': 1,  'active': true }
-     * ];
-     *
-     * _.find(users, function(o) { return o.age < 40; });
-     * // => object for 'barney'
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.find(users, { 'age': 1, 'active': true });
-     * // => object for 'pebbles'
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.find(users, ['active', false]);
-     * // => object for 'fred'
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.find(users, 'active');
-     * // => object for 'barney'
-     */
-    var find = createFind(findIndex);
-
-    /**
-     * This method is like `_.find` except that it iterates over elements of
-     * `collection` from right to left.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to inspect.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @param {number} [fromIndex=collection.length-1] The index to search from.
-     * @returns {*} Returns the matched element, else `undefined`.
-     * @example
-     *
-     * _.findLast([1, 2, 3, 4], function(n) {
-     *   return n % 2 == 1;
-     * });
-     * // => 3
-     */
-    var findLast = createFind(findLastIndex);
-
-    /**
-     * Creates a flattened array of values by running each element in `collection`
-     * thru `iteratee` and flattening the mapped results. The iteratee is invoked
-     * with three arguments: (value, index|key, collection).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [n, n];
-     * }
-     *
-     * _.flatMap([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    function flatMap(collection, iteratee) {
-      return baseFlatten(map(collection, iteratee), 1);
-    }
-
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.7.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    function flatMapDeep(collection, iteratee) {
-      return baseFlatten(map(collection, iteratee), INFINITY);
-    }
-
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.7.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @param {number} [depth=1] The maximum recursion depth.
-     * @returns {Array} Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    function flatMapDepth(collection, iteratee, depth) {
-      depth = depth === undefined ? 1 : toInteger(depth);
-      return baseFlatten(map(collection, iteratee), depth);
-    }
-
-    /**
-     * Iterates over elements of `collection` and invokes `iteratee` for each element.
-     * The iteratee is invoked with three arguments: (value, index|key, collection).
-     * Iteratee functions may exit iteration early by explicitly returning `false`.
-     *
-     * **Note:** As with other "Collections" methods, objects with a "length"
-     * property are iterated like arrays. To avoid this behavior use `_.forIn`
-     * or `_.forOwn` for object iteration.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @alias each
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Array|Object} Returns `collection`.
-     * @see _.forEachRight
-     * @example
-     *
-     * _.forEach([1, 2], function(value) {
-     *   console.log(value);
-     * });
-     * // => Logs `1` then `2`.
-     *
-     * _.forEach({ 'a': 1, 'b': 2 }, function(value, key) {
-     *   console.log(key);
-     * });
-     * // => Logs 'a' then 'b' (iteration order is not guaranteed).
-     */
-    function forEach(collection, iteratee) {
-      var func = isArray(collection) ? arrayEach : baseEach;
-      return func(collection, getIteratee(iteratee, 3));
-    }
-
-    /**
-     * This method is like `_.forEach` except that it iterates over elements of
-     * `collection` from right to left.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @alias eachRight
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Array|Object} Returns `collection`.
-     * @see _.forEach
-     * @example
-     *
-     * _.forEachRight([1, 2], function(value) {
-     *   console.log(value);
-     * });
-     * // => Logs `2` then `1`.
-     */
-    function forEachRight(collection, iteratee) {
-      var func = isArray(collection) ? arrayEachRight : baseEachRight;
-      return func(collection, getIteratee(iteratee, 3));
-    }
-
-    /**
-     * Creates an object composed of keys generated from the results of running
-     * each element of `collection` thru `iteratee`. The order of grouped values
-     * is determined by the order they occur in `collection`. The corresponding
-     * value of each key is an array of elements responsible for generating the
-     * key. The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee to transform keys.
-     * @returns {Object} Returns the composed aggregate object.
-     * @example
-     *
-     * _.groupBy([6.1, 4.2, 6.3], Math.floor);
-     * // => { '4': [4.2], '6': [6.1, 6.3] }
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.groupBy(['one', 'two', 'three'], 'length');
-     * // => { '3': ['one', 'two'], '5': ['three'] }
-     */
-    var groupBy = createAggregator(function(result, value, key) {
-      if (hasOwnProperty.call(result, key)) {
-        result[key].push(value);
-      } else {
-        baseAssignValue(result, key, [value]);
-      }
-    });
-
-    /**
-     * Checks if `value` is in `collection`. If `collection` is a string, it's
-     * checked for a substring of `value`, otherwise
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * is used for equality comparisons. If `fromIndex` is negative, it's used as
-     * the offset from the end of `collection`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object|string} collection The collection to inspect.
-     * @param {*} value The value to search for.
-     * @param {number} [fromIndex=0] The index to search from.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.reduce`.
-     * @returns {boolean} Returns `true` if `value` is found, else `false`.
-     * @example
-     *
-     * _.includes([1, 2, 3], 1);
-     * // => true
-     *
-     * _.includes([1, 2, 3], 1, 2);
-     * // => false
-     *
-     * _.includes({ 'a': 1, 'b': 2 }, 1);
-     * // => true
-     *
-     * _.includes('abcd', 'bc');
-     * // => true
-     */
-    function includes(collection, value, fromIndex, guard) {
-      collection = isArrayLike(collection) ? collection : values(collection);
-      fromIndex = (fromIndex && !guard) ? toInteger(fromIndex) : 0;
-
-      var length = collection.length;
-      if (fromIndex < 0) {
-        fromIndex = nativeMax(length + fromIndex, 0);
-      }
-      return isString(collection)
-        ? (fromIndex <= length && collection.indexOf(value, fromIndex) > -1)
-        : (!!length && baseIndexOf(collection, value, fromIndex) > -1);
-    }
-
-    /**
-     * Invokes the method at `path` of each element in `collection`, returning
-     * an array of the results of each invoked method. Any additional arguments
-     * are provided to each invoked method. If `path` is a function, it's invoked
-     * for, and `this` bound to, each element in `collection`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Array|Function|string} path The path of the method to invoke or
-     *  the function invoked per iteration.
-     * @param {...*} [args] The arguments to invoke each method with.
-     * @returns {Array} Returns the array of results.
-     * @example
-     *
-     * _.invokeMap([[5, 1, 7], [3, 2, 1]], 'sort');
-     * // => [[1, 5, 7], [1, 2, 3]]
-     *
-     * _.invokeMap([123, 456], String.prototype.split, '');
-     * // => [['1', '2', '3'], ['4', '5', '6']]
-     */
-    var invokeMap = baseRest(function(collection, path, args) {
-      var index = -1,
-          isFunc = typeof path == 'function',
-          result = isArrayLike(collection) ? Array(collection.length) : [];
-
-      baseEach(collection, function(value) {
-        result[++index] = isFunc ? apply(path, value, args) : baseInvoke(value, path, args);
-      });
-      return result;
-    });
-
-    /**
-     * Creates an object composed of keys generated from the results of running
-     * each element of `collection` thru `iteratee`. The corresponding value of
-     * each key is the last element responsible for generating the key. The
-     * iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee to transform keys.
-     * @returns {Object} Returns the composed aggregate object.
-     * @example
-     *
-     * var array = [
-     *   { 'dir': 'left', 'code': 97 },
-     *   { 'dir': 'right', 'code': 100 }
-     * ];
-     *
-     * _.keyBy(array, function(o) {
-     *   return String.fromCharCode(o.code);
-     * });
-     * // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } }
-     *
-     * _.keyBy(array, 'dir');
-     * // => { 'left': { 'dir': 'left', 'code': 97 }, 'right': { 'dir': 'right', 'code': 100 } }
-     */
-    var keyBy = createAggregator(function(result, value, key) {
-      baseAssignValue(result, key, value);
-    });
-
-    /**
-     * Creates an array of values by running each element in `collection` thru
-     * `iteratee`. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * Many lodash methods are guarded to work as iteratees for methods like
-     * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.
-     *
-     * The guarded methods are:
-     * `ary`, `chunk`, `curry`, `curryRight`, `drop`, `dropRight`, `every`,
-     * `fill`, `invert`, `parseInt`, `random`, `range`, `rangeRight`, `repeat`,
-     * `sampleSize`, `slice`, `some`, `sortBy`, `split`, `take`, `takeRight`,
-     * `template`, `trim`, `trimEnd`, `trimStart`, and `words`
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the new mapped array.
-     * @example
-     *
-     * function square(n) {
-     *   return n * n;
-     * }
-     *
-     * _.map([4, 8], square);
-     * // => [16, 64]
-     *
-     * _.map({ 'a': 4, 'b': 8 }, square);
-     * // => [16, 64] (iteration order is not guaranteed)
-     *
-     * var users = [
-     *   { 'user': 'barney' },
-     *   { 'user': 'fred' }
-     * ];
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.map(users, 'user');
-     * // => ['barney', 'fred']
-     */
-    function map(collection, iteratee) {
-      var func = isArray(collection) ? arrayMap : baseMap;
-      return func(collection, getIteratee(iteratee, 3));
-    }
-
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Array[]|Function[]|Object[]|string[]} [iteratees=[_.identity]]
-     *  The iteratees to sort by.
-     * @param {string[]} [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.reduce`.
-     * @returns {Array} Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 40 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // Sort by `user` in ascending order and by `age` in descending order.
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
-     */
-    function orderBy(collection, iteratees, orders, guard) {
-      if (collection == null) {
-        return [];
-      }
-      if (!isArray(iteratees)) {
-        iteratees = iteratees == null ? [] : [iteratees];
-      }
-      orders = guard ? undefined : orders;
-      if (!isArray(orders)) {
-        orders = orders == null ? [] : [orders];
-      }
-      return baseOrderBy(collection, iteratees, orders);
-    }
-
-    /**
-     * Creates an array of elements split into two groups, the first of which
-     * contains elements `predicate` returns truthy for, the second of which
-     * contains elements `predicate` returns falsey for. The predicate is
-     * invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the array of grouped elements.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney',  'age': 36, 'active': false },
-     *   { 'user': 'fred',    'age': 40, 'active': true },
-     *   { 'user': 'pebbles', 'age': 1,  'active': false }
-     * ];
-     *
-     * _.partition(users, function(o) { return o.active; });
-     * // => objects for [['fred'], ['barney', 'pebbles']]
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.partition(users, { 'age': 1, 'active': false });
-     * // => objects for [['pebbles'], ['barney', 'fred']]
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.partition(users, ['active', false]);
-     * // => objects for [['barney', 'pebbles'], ['fred']]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.partition(users, 'active');
-     * // => objects for [['fred'], ['barney', 'pebbles']]
-     */
-    var partition = createAggregator(function(result, value, key) {
-      result[key ? 0 : 1].push(value);
-    }, function() { return [[], []]; });
-
-    /**
-     * Reduces `collection` to a value which is the accumulated result of running
-     * each element in `collection` thru `iteratee`, where each successive
-     * invocation is supplied the return value of the previous. If `accumulator`
-     * is not given, the first element of `collection` is used as the initial
-     * value. The iteratee is invoked with four arguments:
-     * (accumulator, value, index|key, collection).
-     *
-     * Many lodash methods are guarded to work as iteratees for methods like
-     * `_.reduce`, `_.reduceRight`, and `_.transform`.
-     *
-     * The guarded methods are:
-     * `assign`, `defaults`, `defaultsDeep`, `includes`, `merge`, `orderBy`,
-     * and `sortBy`
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @param {*} [accumulator] The initial value.
-     * @returns {*} Returns the accumulated value.
-     * @see _.reduceRight
-     * @example
-     *
-     * _.reduce([1, 2], function(sum, n) {
-     *   return sum + n;
-     * }, 0);
-     * // => 3
-     *
-     * _.reduce({ 'a': 1, 'b': 2, 'c': 1 }, function(result, value, key) {
-     *   (result[value] || (result[value] = [])).push(key);
-     *   return result;
-     * }, {});
-     * // => { '1': ['a', 'c'], '2': ['b'] } (iteration order is not guaranteed)
-     */
-    function reduce(collection, iteratee, accumulator) {
-      var func = isArray(collection) ? arrayReduce : baseReduce,
-          initAccum = arguments.length < 3;
-
-      return func(collection, getIteratee(iteratee, 4), accumulator, initAccum, baseEach);
-    }
-
-    /**
-     * This method is like `_.reduce` except that it iterates over elements of
-     * `collection` from right to left.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @param {*} [accumulator] The initial value.
-     * @returns {*} Returns the accumulated value.
-     * @see _.reduce
-     * @example
-     *
-     * var array = [[0, 1], [2, 3], [4, 5]];
-     *
-     * _.reduceRight(array, function(flattened, other) {
-     *   return flattened.concat(other);
-     * }, []);
-     * // => [4, 5, 2, 3, 0, 1]
-     */
-    function reduceRight(collection, iteratee, accumulator) {
-      var func = isArray(collection) ? arrayReduceRight : baseReduce,
-          initAccum = arguments.length < 3;
-
-      return func(collection, getIteratee(iteratee, 4), accumulator, initAccum, baseEachRight);
-    }
-
-    /**
-     * The opposite of `_.filter`; this method returns the elements of `collection`
-     * that `predicate` does **not** return truthy for.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the new filtered array.
-     * @see _.filter
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36, 'active': false },
-     *   { 'user': 'fred',   'age': 40, 'active': true }
-     * ];
-     *
-     * _.reject(users, function(o) { return !o.active; });
-     * // => objects for ['fred']
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.reject(users, { 'age': 40, 'active': true });
-     * // => objects for ['barney']
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.reject(users, ['active', false]);
-     * // => objects for ['fred']
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.reject(users, 'active');
-     * // => objects for ['barney']
-     */
-    function reject(collection, predicate) {
-      var func = isArray(collection) ? arrayFilter : baseFilter;
-      return func(collection, negate(getIteratee(predicate, 3)));
-    }
-
-    /**
-     * Gets a random element from `collection`.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to sample.
-     * @returns {*} Returns the random element.
-     * @example
-     *
-     * _.sample([1, 2, 3, 4]);
-     * // => 2
-     */
-    function sample(collection) {
-      var func = isArray(collection) ? arraySample : baseSample;
-      return func(collection);
-    }
-
-    /**
-     * Gets `n` random elements at unique keys from `collection` up to the
-     * size of `collection`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to sample.
-     * @param {number} [n=1] The number of elements to sample.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the random elements.
-     * @example
-     *
-     * _.sampleSize([1, 2, 3], 2);
-     * // => [3, 1]
-     *
-     * _.sampleSize([1, 2, 3], 4);
-     * // => [2, 3, 1]
-     */
-    function sampleSize(collection, n, guard) {
-      if ((guard ? isIterateeCall(collection, n, guard) : n === undefined)) {
-        n = 1;
-      } else {
-        n = toInteger(n);
-      }
-      var func = isArray(collection) ? arraySampleSize : baseSampleSize;
-      return func(collection, n);
-    }
-
-    /**
-     * Creates an array of shuffled values, using a version of the
-     * [Fisher-Yates shuffle](https://en.wikipedia.org/wiki/Fisher-Yates_shuffle).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to shuffle.
-     * @returns {Array} Returns the new shuffled array.
-     * @example
-     *
-     * _.shuffle([1, 2, 3, 4]);
-     * // => [4, 1, 3, 2]
-     */
-    function shuffle(collection) {
-      var func = isArray(collection) ? arrayShuffle : baseShuffle;
-      return func(collection);
-    }
-
-    /**
-     * Gets the size of `collection` by returning its length for array-like
-     * values or the number of own enumerable string keyed properties for objects.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object|string} collection The collection to inspect.
-     * @returns {number} Returns the collection size.
-     * @example
-     *
-     * _.size([1, 2, 3]);
-     * // => 3
-     *
-     * _.size({ 'a': 1, 'b': 2 });
-     * // => 2
-     *
-     * _.size('pebbles');
-     * // => 7
-     */
-    function size(collection) {
-      if (collection == null) {
-        return 0;
-      }
-      if (isArrayLike(collection)) {
-        return isString(collection) ? stringSize(collection) : collection.length;
-      }
-      var tag = getTag(collection);
-      if (tag == mapTag || tag == setTag) {
-        return collection.size;
-      }
-      return baseKeys(collection).length;
-    }
-
-    /**
-     * Checks if `predicate` returns truthy for **any** element of `collection`.
-     * Iteration is stopped once `predicate` returns truthy. The predicate is
-     * invoked with three arguments: (value, index|key, collection).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {boolean} Returns `true` if any element passes the predicate check,
-     *  else `false`.
-     * @example
-     *
-     * _.some([null, 0, 'yes', false], Boolean);
-     * // => true
-     *
-     * var users = [
-     *   { 'user': 'barney', 'active': true },
-     *   { 'user': 'fred',   'active': false }
-     * ];
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.some(users, { 'user': 'barney', 'active': false });
-     * // => false
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.some(users, ['active', false]);
-     * // => true
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.some(users, 'active');
-     * // => true
-     */
-    function some(collection, predicate, guard) {
-      var func = isArray(collection) ? arraySome : baseSome;
-      if (guard && isIterateeCall(collection, predicate, guard)) {
-        predicate = undefined;
-      }
-      return func(collection, getIteratee(predicate, 3));
-    }
-
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection thru each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Collection
-     * @param {Array|Object} collection The collection to iterate over.
-     * @param {...(Function|Function[])} [iteratees=[_.identity]]
-     *  The iteratees to sort by.
-     * @returns {Array} Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 40 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, [function(o) { return o.user; }]);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 40], ['fred', 48]]
-     */
-    var sortBy = baseRest(function(collection, iteratees) {
-      if (collection == null) {
-        return [];
-      }
-      var length = iteratees.length;
-      if (length > 1 && isIterateeCall(collection, iteratees[0], iteratees[1])) {
-        iteratees = [];
-      } else if (length > 2 && isIterateeCall(iteratees[0], iteratees[1], iteratees[2])) {
-        iteratees = [iteratees[0]];
-      }
-      return baseOrderBy(collection, baseFlatten(iteratees, 1), []);
-    });
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Gets the timestamp of the number of milliseconds that have elapsed since
-     * the Unix epoch (1 January 1970 00:00:00 UTC).
-     *
-     * @static
-     * @memberOf _
-     * @since 2.4.0
-     * @category Date
-     * @returns {number} Returns the timestamp.
-     * @example
-     *
-     * _.defer(function(stamp) {
-     *   console.log(_.now() - stamp);
-     * }, _.now());
-     * // => Logs the number of milliseconds it took for the deferred invocation.
-     */
-    var now = ctxNow || function() {
-      return root.Date.now();
-    };
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * The opposite of `_.before`; this method creates a function that invokes
-     * `func` once it's called `n` or more times.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {number} n The number of calls before `func` is invoked.
-     * @param {Function} func The function to restrict.
-     * @returns {Function} Returns the new restricted function.
-     * @example
-     *
-     * var saves = ['profile', 'settings'];
-     *
-     * var done = _.after(saves.length, function() {
-     *   console.log('done saving!');
-     * });
-     *
-     * _.forEach(saves, function(type) {
-     *   asyncSave({ 'type': type, 'complete': done });
-     * });
-     * // => Logs 'done saving!' after the two async saves have completed.
-     */
-    function after(n, func) {
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      n = toInteger(n);
-      return function() {
-        if (--n < 1) {
-          return func.apply(this, arguments);
-        }
-      };
-    }
-
-    /**
-     * Creates a function that invokes `func`, with up to `n` arguments,
-     * ignoring any additional arguments.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Function
-     * @param {Function} func The function to cap arguments for.
-     * @param {number} [n=func.length] The arity cap.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Function} Returns the new capped function.
-     * @example
-     *
-     * _.map(['6', '8', '10'], _.ary(parseInt, 1));
-     * // => [6, 8, 10]
-     */
-    function ary(func, n, guard) {
-      n = guard ? undefined : n;
-      n = (func && n == null) ? func.length : n;
-      return createWrap(func, WRAP_ARY_FLAG, undefined, undefined, undefined, undefined, n);
-    }
-
-    /**
-     * Creates a function that invokes `func`, with the `this` binding and arguments
-     * of the created function, while it's called less than `n` times. Subsequent
-     * calls to the created function return the result of the last `func` invocation.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Function
-     * @param {number} n The number of calls at which `func` is no longer invoked.
-     * @param {Function} func The function to restrict.
-     * @returns {Function} Returns the new restricted function.
-     * @example
-     *
-     * jQuery(element).on('click', _.before(5, addContactToList));
-     * // => Allows adding up to 4 contacts to the list.
-     */
-    function before(n, func) {
-      var result;
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      n = toInteger(n);
-      return function() {
-        if (--n > 0) {
-          result = func.apply(this, arguments);
-        }
-        if (n <= 1) {
-          func = undefined;
-        }
-        return result;
-      };
-    }
-
-    /**
-     * Creates a function that invokes `func` with the `this` binding of `thisArg`
-     * and `partials` prepended to the arguments it receives.
-     *
-     * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,
-     * may be used as a placeholder for partially applied arguments.
-     *
-     * **Note:** Unlike native `Function#bind`, this method doesn't set the "length"
-     * property of bound functions.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to bind.
-     * @param {*} thisArg The `this` binding of `func`.
-     * @param {...*} [partials] The arguments to be partially applied.
-     * @returns {Function} Returns the new bound function.
-     * @example
-     *
-     * function greet(greeting, punctuation) {
-     *   return greeting + ' ' + this.user + punctuation;
-     * }
-     *
-     * var object = { 'user': 'fred' };
-     *
-     * var bound = _.bind(greet, object, 'hi');
-     * bound('!');
-     * // => 'hi fred!'
-     *
-     * // Bound with placeholders.
-     * var bound = _.bind(greet, object, _, '!');
-     * bound('hi');
-     * // => 'hi fred!'
-     */
-    var bind = baseRest(function(func, thisArg, partials) {
-      var bitmask = WRAP_BIND_FLAG;
-      if (partials.length) {
-        var holders = replaceHolders(partials, getHolder(bind));
-        bitmask |= WRAP_PARTIAL_FLAG;
-      }
-      return createWrap(func, bitmask, thisArg, partials, holders);
-    });
-
-    /**
-     * Creates a function that invokes the method at `object[key]` with `partials`
-     * prepended to the arguments it receives.
-     *
-     * This method differs from `_.bind` by allowing bound functions to reference
-     * methods that may be redefined or don't yet exist. See
-     * [Peter Michaux's article](http://peter.michaux.ca/articles/lazy-function-definition-pattern)
-     * for more details.
-     *
-     * The `_.bindKey.placeholder` value, which defaults to `_` in monolithic
-     * builds, may be used as a placeholder for partially applied arguments.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.10.0
-     * @category Function
-     * @param {Object} object The object to invoke the method on.
-     * @param {string} key The key of the method.
-     * @param {...*} [partials] The arguments to be partially applied.
-     * @returns {Function} Returns the new bound function.
-     * @example
-     *
-     * var object = {
-     *   'user': 'fred',
-     *   'greet': function(greeting, punctuation) {
-     *     return greeting + ' ' + this.user + punctuation;
-     *   }
-     * };
-     *
-     * var bound = _.bindKey(object, 'greet', 'hi');
-     * bound('!');
-     * // => 'hi fred!'
-     *
-     * object.greet = function(greeting, punctuation) {
-     *   return greeting + 'ya ' + this.user + punctuation;
-     * };
-     *
-     * bound('!');
-     * // => 'hiya fred!'
-     *
-     * // Bound with placeholders.
-     * var bound = _.bindKey(object, 'greet', _, '!');
-     * bound('hi');
-     * // => 'hiya fred!'
-     */
-    var bindKey = baseRest(function(object, key, partials) {
-      var bitmask = WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG;
-      if (partials.length) {
-        var holders = replaceHolders(partials, getHolder(bindKey));
-        bitmask |= WRAP_PARTIAL_FLAG;
-      }
-      return createWrap(key, bitmask, object, partials, holders);
-    });
-
-    /**
-     * Creates a function that accepts arguments of `func` and either invokes
-     * `func` returning its result, if at least `arity` number of arguments have
-     * been provided, or returns a function that accepts the remaining `func`
-     * arguments, and so on. The arity of `func` may be specified if `func.length`
-     * is not sufficient.
-     *
-     * The `_.curry.placeholder` value, which defaults to `_` in monolithic builds,
-     * may be used as a placeholder for provided arguments.
-     *
-     * **Note:** This method doesn't set the "length" property of curried functions.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Function
-     * @param {Function} func The function to curry.
-     * @param {number} [arity=func.length] The arity of `func`.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Function} Returns the new curried function.
-     * @example
-     *
-     * var abc = function(a, b, c) {
-     *   return [a, b, c];
-     * };
-     *
-     * var curried = _.curry(abc);
-     *
-     * curried(1)(2)(3);
-     * // => [1, 2, 3]
-     *
-     * curried(1, 2)(3);
-     * // => [1, 2, 3]
-     *
-     * curried(1, 2, 3);
-     * // => [1, 2, 3]
-     *
-     * // Curried with placeholders.
-     * curried(1)(_, 3)(2);
-     * // => [1, 2, 3]
-     */
-    function curry(func, arity, guard) {
-      arity = guard ? undefined : arity;
-      var result = createWrap(func, WRAP_CURRY_FLAG, undefined, undefined, undefined, undefined, undefined, arity);
-      result.placeholder = curry.placeholder;
-      return result;
-    }
-
-    /**
-     * This method is like `_.curry` except that arguments are applied to `func`
-     * in the manner of `_.partialRight` instead of `_.partial`.
-     *
-     * The `_.curryRight.placeholder` value, which defaults to `_` in monolithic
-     * builds, may be used as a placeholder for provided arguments.
-     *
-     * **Note:** This method doesn't set the "length" property of curried functions.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Function
-     * @param {Function} func The function to curry.
-     * @param {number} [arity=func.length] The arity of `func`.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Function} Returns the new curried function.
-     * @example
-     *
-     * var abc = function(a, b, c) {
-     *   return [a, b, c];
-     * };
-     *
-     * var curried = _.curryRight(abc);
-     *
-     * curried(3)(2)(1);
-     * // => [1, 2, 3]
-     *
-     * curried(2, 3)(1);
-     * // => [1, 2, 3]
-     *
-     * curried(1, 2, 3);
-     * // => [1, 2, 3]
-     *
-     * // Curried with placeholders.
-     * curried(3)(1, _)(2);
-     * // => [1, 2, 3]
-     */
-    function curryRight(func, arity, guard) {
-      arity = guard ? undefined : arity;
-      var result = createWrap(func, WRAP_CURRY_RIGHT_FLAG, undefined, undefined, undefined, undefined, undefined, arity);
-      result.placeholder = curryRight.placeholder;
-      return result;
-    }
-
-    /**
-     * Creates a debounced function that delays invoking `func` until after `wait`
-     * milliseconds have elapsed since the last time the debounced function was
-     * invoked. The debounced function comes with a `cancel` method to cancel
-     * delayed `func` invocations and a `flush` method to immediately invoke them.
-     * Provide `options` to indicate whether `func` should be invoked on the
-     * leading and/or trailing edge of the `wait` timeout. The `func` is invoked
-     * with the last arguments provided to the debounced function. Subsequent
-     * calls to the debounced function return the result of the last `func`
-     * invocation.
-     *
-     * **Note:** If `leading` and `trailing` options are `true`, `func` is
-     * invoked on the trailing edge of the timeout only if the debounced function
-     * is invoked more than once during the `wait` timeout.
-     *
-     * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred
-     * until to the next tick, similar to `setTimeout` with a timeout of `0`.
-     *
-     * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)
-     * for details over the differences between `_.debounce` and `_.throttle`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to debounce.
-     * @param {number} [wait=0] The number of milliseconds to delay.
-     * @param {Object} [options={}] The options object.
-     * @param {boolean} [options.leading=false]
-     *  Specify invoking on the leading edge of the timeout.
-     * @param {number} [options.maxWait]
-     *  The maximum time `func` is allowed to be delayed before it's invoked.
-     * @param {boolean} [options.trailing=true]
-     *  Specify invoking on the trailing edge of the timeout.
-     * @returns {Function} Returns the new debounced function.
-     * @example
-     *
-     * // Avoid costly calculations while the window size is in flux.
-     * jQuery(window).on('resize', _.debounce(calculateLayout, 150));
-     *
-     * // Invoke `sendMail` when clicked, debouncing subsequent calls.
-     * jQuery(element).on('click', _.debounce(sendMail, 300, {
-     *   'leading': true,
-     *   'trailing': false
-     * }));
-     *
-     * // Ensure `batchLog` is invoked once after 1 second of debounced calls.
-     * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });
-     * var source = new EventSource('/stream');
-     * jQuery(source).on('message', debounced);
-     *
-     * // Cancel the trailing debounced invocation.
-     * jQuery(window).on('popstate', debounced.cancel);
-     */
-    function debounce(func, wait, options) {
-      var lastArgs,
-          lastThis,
-          maxWait,
-          result,
-          timerId,
-          lastCallTime,
-          lastInvokeTime = 0,
-          leading = false,
-          maxing = false,
-          trailing = true;
-
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      wait = toNumber(wait) || 0;
-      if (isObject(options)) {
-        leading = !!options.leading;
-        maxing = 'maxWait' in options;
-        maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;
-        trailing = 'trailing' in options ? !!options.trailing : trailing;
-      }
-
-      function invokeFunc(time) {
-        var args = lastArgs,
-            thisArg = lastThis;
-
-        lastArgs = lastThis = undefined;
-        lastInvokeTime = time;
-        result = func.apply(thisArg, args);
-        return result;
-      }
-
-      function leadingEdge(time) {
-        // Reset any `maxWait` timer.
-        lastInvokeTime = time;
-        // Start the timer for the trailing edge.
-        timerId = setTimeout(timerExpired, wait);
-        // Invoke the leading edge.
-        return leading ? invokeFunc(time) : result;
-      }
-
-      function remainingWait(time) {
-        var timeSinceLastCall = time - lastCallTime,
-            timeSinceLastInvoke = time - lastInvokeTime,
-            timeWaiting = wait - timeSinceLastCall;
-
-        return maxing
-          ? nativeMin(timeWaiting, maxWait - timeSinceLastInvoke)
-          : timeWaiting;
-      }
-
-      function shouldInvoke(time) {
-        var timeSinceLastCall = time - lastCallTime,
-            timeSinceLastInvoke = time - lastInvokeTime;
-
-        // Either this is the first call, activity has stopped and we're at the
-        // trailing edge, the system time has gone backwards and we're treating
-        // it as the trailing edge, or we've hit the `maxWait` limit.
-        return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||
-          (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));
-      }
-
-      function timerExpired() {
-        var time = now();
-        if (shouldInvoke(time)) {
-          return trailingEdge(time);
-        }
-        // Restart the timer.
-        timerId = setTimeout(timerExpired, remainingWait(time));
-      }
-
-      function trailingEdge(time) {
-        timerId = undefined;
-
-        // Only invoke if we have `lastArgs` which means `func` has been
-        // debounced at least once.
-        if (trailing && lastArgs) {
-          return invokeFunc(time);
-        }
-        lastArgs = lastThis = undefined;
-        return result;
-      }
-
-      function cancel() {
-        if (timerId !== undefined) {
-          clearTimeout(timerId);
-        }
-        lastInvokeTime = 0;
-        lastArgs = lastCallTime = lastThis = timerId = undefined;
-      }
-
-      function flush() {
-        return timerId === undefined ? result : trailingEdge(now());
-      }
-
-      function debounced() {
-        var time = now(),
-            isInvoking = shouldInvoke(time);
-
-        lastArgs = arguments;
-        lastThis = this;
-        lastCallTime = time;
-
-        if (isInvoking) {
-          if (timerId === undefined) {
-            return leadingEdge(lastCallTime);
-          }
-          if (maxing) {
-            // Handle invocations in a tight loop.
-            timerId = setTimeout(timerExpired, wait);
-            return invokeFunc(lastCallTime);
-          }
-        }
-        if (timerId === undefined) {
-          timerId = setTimeout(timerExpired, wait);
-        }
-        return result;
-      }
-      debounced.cancel = cancel;
-      debounced.flush = flush;
-      return debounced;
-    }
-
-    /**
-     * Defers invoking the `func` until the current call stack has cleared. Any
-     * additional arguments are provided to `func` when it's invoked.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to defer.
-     * @param {...*} [args] The arguments to invoke `func` with.
-     * @returns {number} Returns the timer id.
-     * @example
-     *
-     * _.defer(function(text) {
-     *   console.log(text);
-     * }, 'deferred');
-     * // => Logs 'deferred' after one millisecond.
-     */
-    var defer = baseRest(function(func, args) {
-      return baseDelay(func, 1, args);
-    });
-
-    /**
-     * Invokes `func` after `wait` milliseconds. Any additional arguments are
-     * provided to `func` when it's invoked.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to delay.
-     * @param {number} wait The number of milliseconds to delay invocation.
-     * @param {...*} [args] The arguments to invoke `func` with.
-     * @returns {number} Returns the timer id.
-     * @example
-     *
-     * _.delay(function(text) {
-     *   console.log(text);
-     * }, 1000, 'later');
-     * // => Logs 'later' after one second.
-     */
-    var delay = baseRest(function(func, wait, args) {
-      return baseDelay(func, toNumber(wait) || 0, args);
-    });
-
-    /**
-     * Creates a function that invokes `func` with arguments reversed.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Function
-     * @param {Function} func The function to flip arguments for.
-     * @returns {Function} Returns the new flipped function.
-     * @example
-     *
-     * var flipped = _.flip(function() {
-     *   return _.toArray(arguments);
-     * });
-     *
-     * flipped('a', 'b', 'c', 'd');
-     * // => ['d', 'c', 'b', 'a']
-     */
-    function flip(func) {
-      return createWrap(func, WRAP_FLIP_FLAG);
-    }
-
-    /**
-     * Creates a function that memoizes the result of `func`. If `resolver` is
-     * provided, it determines the cache key for storing the result based on the
-     * arguments provided to the memoized function. By default, the first argument
-     * provided to the memoized function is used as the map cache key. The `func`
-     * is invoked with the `this` binding of the memoized function.
-     *
-     * **Note:** The cache is exposed as the `cache` property on the memoized
-     * function. Its creation may be customized by replacing the `_.memoize.Cache`
-     * constructor with one whose instances implement the
-     * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
-     * method interface of `clear`, `delete`, `get`, `has`, and `set`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to have its output memoized.
-     * @param {Function} [resolver] The function to resolve the cache key.
-     * @returns {Function} Returns the new memoized function.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': 2 };
-     * var other = { 'c': 3, 'd': 4 };
-     *
-     * var values = _.memoize(_.values);
-     * values(object);
-     * // => [1, 2]
-     *
-     * values(other);
-     * // => [3, 4]
-     *
-     * object.a = 2;
-     * values(object);
-     * // => [1, 2]
-     *
-     * // Modify the result cache.
-     * values.cache.set(object, ['a', 'b']);
-     * values(object);
-     * // => ['a', 'b']
-     *
-     * // Replace `_.memoize.Cache`.
-     * _.memoize.Cache = WeakMap;
-     */
-    function memoize(func, resolver) {
-      if (typeof func != 'function' || (resolver != null && typeof resolver != 'function')) {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      var memoized = function() {
-        var args = arguments,
-            key = resolver ? resolver.apply(this, args) : args[0],
-            cache = memoized.cache;
-
-        if (cache.has(key)) {
-          return cache.get(key);
-        }
-        var result = func.apply(this, args);
-        memoized.cache = cache.set(key, result) || cache;
-        return result;
-      };
-      memoized.cache = new (memoize.Cache || MapCache);
-      return memoized;
-    }
-
-    // Expose `MapCache`.
-    memoize.Cache = MapCache;
-
-    /**
-     * Creates a function that negates the result of the predicate `func`. The
-     * `func` predicate is invoked with the `this` binding and arguments of the
-     * created function.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Function
-     * @param {Function} predicate The predicate to negate.
-     * @returns {Function} Returns the new negated function.
-     * @example
-     *
-     * function isEven(n) {
-     *   return n % 2 == 0;
-     * }
-     *
-     * _.filter([1, 2, 3, 4, 5, 6], _.negate(isEven));
-     * // => [1, 3, 5]
-     */
-    function negate(predicate) {
-      if (typeof predicate != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      return function() {
-        var args = arguments;
-        switch (args.length) {
-          case 0: return !predicate.call(this);
-          case 1: return !predicate.call(this, args[0]);
-          case 2: return !predicate.call(this, args[0], args[1]);
-          case 3: return !predicate.call(this, args[0], args[1], args[2]);
-        }
-        return !predicate.apply(this, args);
-      };
-    }
-
-    /**
-     * Creates a function that is restricted to invoking `func` once. Repeat calls
-     * to the function return the value of the first invocation. The `func` is
-     * invoked with the `this` binding and arguments of the created function.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to restrict.
-     * @returns {Function} Returns the new restricted function.
-     * @example
-     *
-     * var initialize = _.once(createApplication);
-     * initialize();
-     * initialize();
-     * // => `createApplication` is invoked once
-     */
-    function once(func) {
-      return before(2, func);
-    }
-
-    /**
-     * Creates a function that invokes `func` with its arguments transformed.
-     *
-     * @static
-     * @since 4.0.0
-     * @memberOf _
-     * @category Function
-     * @param {Function} func The function to wrap.
-     * @param {...(Function|Function[])} [transforms=[_.identity]]
-     *  The argument transforms.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * function doubled(n) {
-     *   return n * 2;
-     * }
-     *
-     * function square(n) {
-     *   return n * n;
-     * }
-     *
-     * var func = _.overArgs(function(x, y) {
-     *   return [x, y];
-     * }, [square, doubled]);
-     *
-     * func(9, 3);
-     * // => [81, 6]
-     *
-     * func(10, 5);
-     * // => [100, 10]
-     */
-    var overArgs = castRest(function(func, transforms) {
-      transforms = (transforms.length == 1 && isArray(transforms[0]))
-        ? arrayMap(transforms[0], baseUnary(getIteratee()))
-        : arrayMap(baseFlatten(transforms, 1), baseUnary(getIteratee()));
-
-      var funcsLength = transforms.length;
-      return baseRest(function(args) {
-        var index = -1,
-            length = nativeMin(args.length, funcsLength);
-
-        while (++index < length) {
-          args[index] = transforms[index].call(this, args[index]);
-        }
-        return apply(func, this, args);
-      });
-    });
-
-    /**
-     * Creates a function that invokes `func` with `partials` prepended to the
-     * arguments it receives. This method is like `_.bind` except it does **not**
-     * alter the `this` binding.
-     *
-     * The `_.partial.placeholder` value, which defaults to `_` in monolithic
-     * builds, may be used as a placeholder for partially applied arguments.
-     *
-     * **Note:** This method doesn't set the "length" property of partially
-     * applied functions.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.2.0
-     * @category Function
-     * @param {Function} func The function to partially apply arguments to.
-     * @param {...*} [partials] The arguments to be partially applied.
-     * @returns {Function} Returns the new partially applied function.
-     * @example
-     *
-     * function greet(greeting, name) {
-     *   return greeting + ' ' + name;
-     * }
-     *
-     * var sayHelloTo = _.partial(greet, 'hello');
-     * sayHelloTo('fred');
-     * // => 'hello fred'
-     *
-     * // Partially applied with placeholders.
-     * var greetFred = _.partial(greet, _, 'fred');
-     * greetFred('hi');
-     * // => 'hi fred'
-     */
-    var partial = baseRest(function(func, partials) {
-      var holders = replaceHolders(partials, getHolder(partial));
-      return createWrap(func, WRAP_PARTIAL_FLAG, undefined, partials, holders);
-    });
-
-    /**
-     * This method is like `_.partial` except that partially applied arguments
-     * are appended to the arguments it receives.
-     *
-     * The `_.partialRight.placeholder` value, which defaults to `_` in monolithic
-     * builds, may be used as a placeholder for partially applied arguments.
-     *
-     * **Note:** This method doesn't set the "length" property of partially
-     * applied functions.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.0.0
-     * @category Function
-     * @param {Function} func The function to partially apply arguments to.
-     * @param {...*} [partials] The arguments to be partially applied.
-     * @returns {Function} Returns the new partially applied function.
-     * @example
-     *
-     * function greet(greeting, name) {
-     *   return greeting + ' ' + name;
-     * }
-     *
-     * var greetFred = _.partialRight(greet, 'fred');
-     * greetFred('hi');
-     * // => 'hi fred'
-     *
-     * // Partially applied with placeholders.
-     * var sayHelloTo = _.partialRight(greet, 'hello', _);
-     * sayHelloTo('fred');
-     * // => 'hello fred'
-     */
-    var partialRight = baseRest(function(func, partials) {
-      var holders = replaceHolders(partials, getHolder(partialRight));
-      return createWrap(func, WRAP_PARTIAL_RIGHT_FLAG, undefined, partials, holders);
-    });
-
-    /**
-     * Creates a function that invokes `func` with arguments arranged according
-     * to the specified `indexes` where the argument value at the first index is
-     * provided as the first argument, the argument value at the second index is
-     * provided as the second argument, and so on.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Function
-     * @param {Function} func The function to rearrange arguments for.
-     * @param {...(number|number[])} indexes The arranged argument indexes.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var rearged = _.rearg(function(a, b, c) {
-     *   return [a, b, c];
-     * }, [2, 0, 1]);
-     *
-     * rearged('b', 'c', 'a')
-     * // => ['a', 'b', 'c']
-     */
-    var rearg = flatRest(function(func, indexes) {
-      return createWrap(func, WRAP_REARG_FLAG, undefined, undefined, undefined, indexes);
-    });
-
-    /**
-     * Creates a function that invokes `func` with the `this` binding of the
-     * created function and arguments from `start` and beyond provided as
-     * an array.
-     *
-     * **Note:** This method is based on the
-     * [rest parameter](https://mdn.io/rest_parameters).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Function
-     * @param {Function} func The function to apply a rest parameter to.
-     * @param {number} [start=func.length-1] The start position of the rest parameter.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var say = _.rest(function(what, names) {
-     *   return what + ' ' + _.initial(names).join(', ') +
-     *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);
-     * });
-     *
-     * say('hello', 'fred', 'barney', 'pebbles');
-     * // => 'hello fred, barney, & pebbles'
-     */
-    function rest(func, start) {
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      start = start === undefined ? start : toInteger(start);
-      return baseRest(func, start);
-    }
-
-    /**
-     * Creates a function that invokes `func` with the `this` binding of the
-     * create function and an array of arguments much like
-     * [`Function#apply`](http://www.ecma-international.org/ecma-262/7.0/#sec-function.prototype.apply).
-     *
-     * **Note:** This method is based on the
-     * [spread operator](https://mdn.io/spread_operator).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.2.0
-     * @category Function
-     * @param {Function} func The function to spread arguments over.
-     * @param {number} [start=0] The start position of the spread.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var say = _.spread(function(who, what) {
-     *   return who + ' says ' + what;
-     * });
-     *
-     * say(['fred', 'hello']);
-     * // => 'fred says hello'
-     *
-     * var numbers = Promise.all([
-     *   Promise.resolve(40),
-     *   Promise.resolve(36)
-     * ]);
-     *
-     * numbers.then(_.spread(function(x, y) {
-     *   return x + y;
-     * }));
-     * // => a Promise of 76
-     */
-    function spread(func, start) {
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      start = start == null ? 0 : nativeMax(toInteger(start), 0);
-      return baseRest(function(args) {
-        var array = args[start],
-            otherArgs = castSlice(args, 0, start);
-
-        if (array) {
-          arrayPush(otherArgs, array);
-        }
-        return apply(func, this, otherArgs);
-      });
-    }
-
-    /**
-     * Creates a throttled function that only invokes `func` at most once per
-     * every `wait` milliseconds. The throttled function comes with a `cancel`
-     * method to cancel delayed `func` invocations and a `flush` method to
-     * immediately invoke them. Provide `options` to indicate whether `func`
-     * should be invoked on the leading and/or trailing edge of the `wait`
-     * timeout. The `func` is invoked with the last arguments provided to the
-     * throttled function. Subsequent calls to the throttled function return the
-     * result of the last `func` invocation.
-     *
-     * **Note:** If `leading` and `trailing` options are `true`, `func` is
-     * invoked on the trailing edge of the timeout only if the throttled function
-     * is invoked more than once during the `wait` timeout.
-     *
-     * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred
-     * until to the next tick, similar to `setTimeout` with a timeout of `0`.
-     *
-     * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)
-     * for details over the differences between `_.throttle` and `_.debounce`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {Function} func The function to throttle.
-     * @param {number} [wait=0] The number of milliseconds to throttle invocations to.
-     * @param {Object} [options={}] The options object.
-     * @param {boolean} [options.leading=true]
-     *  Specify invoking on the leading edge of the timeout.
-     * @param {boolean} [options.trailing=true]
-     *  Specify invoking on the trailing edge of the timeout.
-     * @returns {Function} Returns the new throttled function.
-     * @example
-     *
-     * // Avoid excessively updating the position while scrolling.
-     * jQuery(window).on('scroll', _.throttle(updatePosition, 100));
-     *
-     * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.
-     * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });
-     * jQuery(element).on('click', throttled);
-     *
-     * // Cancel the trailing throttled invocation.
-     * jQuery(window).on('popstate', throttled.cancel);
-     */
-    function throttle(func, wait, options) {
-      var leading = true,
-          trailing = true;
-
-      if (typeof func != 'function') {
-        throw new TypeError(FUNC_ERROR_TEXT);
-      }
-      if (isObject(options)) {
-        leading = 'leading' in options ? !!options.leading : leading;
-        trailing = 'trailing' in options ? !!options.trailing : trailing;
-      }
-      return debounce(func, wait, {
-        'leading': leading,
-        'maxWait': wait,
-        'trailing': trailing
-      });
-    }
-
-    /**
-     * Creates a function that accepts up to one argument, ignoring any
-     * additional arguments.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Function
-     * @param {Function} func The function to cap arguments for.
-     * @returns {Function} Returns the new capped function.
-     * @example
-     *
-     * _.map(['6', '8', '10'], _.unary(parseInt));
-     * // => [6, 8, 10]
-     */
-    function unary(func) {
-      return ary(func, 1);
-    }
-
-    /**
-     * Creates a function that provides `value` to `wrapper` as its first
-     * argument. Any additional arguments provided to the function are appended
-     * to those provided to the `wrapper`. The wrapper is invoked with the `this`
-     * binding of the created function.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Function
-     * @param {*} value The value to wrap.
-     * @param {Function} [wrapper=identity] The wrapper function.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var p = _.wrap(_.escape, function(func, text) {
-     *   return '<p>' + func(text) + '</p>';
-     * });
-     *
-     * p('fred, barney, & pebbles');
-     * // => '<p>fred, barney, &amp; pebbles</p>'
-     */
-    function wrap(value, wrapper) {
-      return partial(castFunction(wrapper), value);
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Casts `value` as an array if it's not one.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.4.0
-     * @category Lang
-     * @param {*} value The value to inspect.
-     * @returns {Array} Returns the cast array.
-     * @example
-     *
-     * _.castArray(1);
-     * // => [1]
-     *
-     * _.castArray({ 'a': 1 });
-     * // => [{ 'a': 1 }]
-     *
-     * _.castArray('abc');
-     * // => ['abc']
-     *
-     * _.castArray(null);
-     * // => [null]
-     *
-     * _.castArray(undefined);
-     * // => [undefined]
-     *
-     * _.castArray();
-     * // => []
-     *
-     * var array = [1, 2, 3];
-     * console.log(_.castArray(array) === array);
-     * // => true
-     */
-    function castArray() {
-      if (!arguments.length) {
-        return [];
-      }
-      var value = arguments[0];
-      return isArray(value) ? value : [value];
-    }
-
-    /**
-     * Creates a shallow clone of `value`.
-     *
-     * **Note:** This method is loosely based on the
-     * [structured clone algorithm](https://mdn.io/Structured_clone_algorithm)
-     * and supports cloning arrays, array buffers, booleans, date objects, maps,
-     * numbers, `Object` objects, regexes, sets, strings, symbols, and typed
-     * arrays. The own enumerable properties of `arguments` objects are cloned
-     * as plain objects. An empty object is returned for uncloneable values such
-     * as error objects, functions, DOM nodes, and WeakMaps.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to clone.
-     * @returns {*} Returns the cloned value.
-     * @see _.cloneDeep
-     * @example
-     *
-     * var objects = [{ 'a': 1 }, { 'b': 2 }];
-     *
-     * var shallow = _.clone(objects);
-     * console.log(shallow[0] === objects[0]);
-     * // => true
-     */
-    function clone(value) {
-      return baseClone(value, CLONE_SYMBOLS_FLAG);
-    }
-
-    /**
-     * This method is like `_.clone` except that it accepts `customizer` which
-     * is invoked to produce the cloned value. If `customizer` returns `undefined`,
-     * cloning is handled by the method instead. The `customizer` is invoked with
-     * up to four arguments; (value [, index|key, object, stack]).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to clone.
-     * @param {Function} [customizer] The function to customize cloning.
-     * @returns {*} Returns the cloned value.
-     * @see _.cloneDeepWith
-     * @example
-     *
-     * function customizer(value) {
-     *   if (_.isElement(value)) {
-     *     return value.cloneNode(false);
-     *   }
-     * }
-     *
-     * var el = _.cloneWith(document.body, customizer);
-     *
-     * console.log(el === document.body);
-     * // => false
-     * console.log(el.nodeName);
-     * // => 'BODY'
-     * console.log(el.childNodes.length);
-     * // => 0
-     */
-    function cloneWith(value, customizer) {
-      customizer = typeof customizer == 'function' ? customizer : undefined;
-      return baseClone(value, CLONE_SYMBOLS_FLAG, customizer);
-    }
-
-    /**
-     * This method is like `_.clone` except that it recursively clones `value`.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.0.0
-     * @category Lang
-     * @param {*} value The value to recursively clone.
-     * @returns {*} Returns the deep cloned value.
-     * @see _.clone
-     * @example
-     *
-     * var objects = [{ 'a': 1 }, { 'b': 2 }];
-     *
-     * var deep = _.cloneDeep(objects);
-     * console.log(deep[0] === objects[0]);
-     * // => false
-     */
-    function cloneDeep(value) {
-      return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG);
-    }
-
-    /**
-     * This method is like `_.cloneWith` except that it recursively clones `value`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to recursively clone.
-     * @param {Function} [customizer] The function to customize cloning.
-     * @returns {*} Returns the deep cloned value.
-     * @see _.cloneWith
-     * @example
-     *
-     * function customizer(value) {
-     *   if (_.isElement(value)) {
-     *     return value.cloneNode(true);
-     *   }
-     * }
-     *
-     * var el = _.cloneDeepWith(document.body, customizer);
-     *
-     * console.log(el === document.body);
-     * // => false
-     * console.log(el.nodeName);
-     * // => 'BODY'
-     * console.log(el.childNodes.length);
-     * // => 20
-     */
-    function cloneDeepWith(value, customizer) {
-      customizer = typeof customizer == 'function' ? customizer : undefined;
-      return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG, customizer);
-    }
-
-    /**
-     * Checks if `object` conforms to `source` by invoking the predicate
-     * properties of `source` with the corresponding property values of `object`.
-     *
-     * **Note:** This method is equivalent to `_.conforms` when `source` is
-     * partially applied.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.14.0
-     * @category Lang
-     * @param {Object} object The object to inspect.
-     * @param {Object} source The object of property predicates to conform to.
-     * @returns {boolean} Returns `true` if `object` conforms, else `false`.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': 2 };
-     *
-     * _.conformsTo(object, { 'b': function(n) { return n > 1; } });
-     * // => true
-     *
-     * _.conformsTo(object, { 'b': function(n) { return n > 2; } });
-     * // => false
-     */
-    function conformsTo(object, source) {
-      return source == null || baseConformsTo(object, source, keys(source));
-    }
-
-    /**
-     * Performs a
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'a': 1 };
-     * var other = { 'a': 1 };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    function eq(value, other) {
-      return value === other || (value !== value && other !== other);
-    }
-
-    /**
-     * Checks if `value` is greater than `other`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.9.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if `value` is greater than `other`,
-     *  else `false`.
-     * @see _.lt
-     * @example
-     *
-     * _.gt(3, 1);
-     * // => true
-     *
-     * _.gt(3, 3);
-     * // => false
-     *
-     * _.gt(1, 3);
-     * // => false
-     */
-    var gt = createRelationalOperation(baseGt);
-
-    /**
-     * Checks if `value` is greater than or equal to `other`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.9.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if `value` is greater than or equal to
-     *  `other`, else `false`.
-     * @see _.lte
-     * @example
-     *
-     * _.gte(3, 1);
-     * // => true
-     *
-     * _.gte(3, 3);
-     * // => true
-     *
-     * _.gte(1, 3);
-     * // => false
-     */
-    var gte = createRelationalOperation(function(value, other) {
-      return value >= other;
-    });
-
-    /**
-     * Checks if `value` is likely an `arguments` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an `arguments` object,
-     *  else `false`.
-     * @example
-     *
-     * _.isArguments(function() { return arguments; }());
-     * // => true
-     *
-     * _.isArguments([1, 2, 3]);
-     * // => false
-     */
-    var isArguments = baseIsArguments(function() { return arguments; }()) ? baseIsArguments : function(value) {
-      return isObjectLike(value) && hasOwnProperty.call(value, 'callee') &&
-        !propertyIsEnumerable.call(value, 'callee');
-    };
-
-    /**
-     * Checks if `value` is classified as an `Array` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an array, else `false`.
-     * @example
-     *
-     * _.isArray([1, 2, 3]);
-     * // => true
-     *
-     * _.isArray(document.body.children);
-     * // => false
-     *
-     * _.isArray('abc');
-     * // => false
-     *
-     * _.isArray(_.noop);
-     * // => false
-     */
-    var isArray = Array.isArray;
-
-    /**
-     * Checks if `value` is classified as an `ArrayBuffer` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.3.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an array buffer, else `false`.
-     * @example
-     *
-     * _.isArrayBuffer(new ArrayBuffer(2));
-     * // => true
-     *
-     * _.isArrayBuffer(new Array(2));
-     * // => false
-     */
-    var isArrayBuffer = nodeIsArrayBuffer ? baseUnary(nodeIsArrayBuffer) : baseIsArrayBuffer;
-
-    /**
-     * Checks if `value` is array-like. A value is considered array-like if it's
-     * not a function and has a `value.length` that's an integer greater than or
-     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
-     * @example
-     *
-     * _.isArrayLike([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLike(document.body.children);
-     * // => true
-     *
-     * _.isArrayLike('abc');
-     * // => true
-     *
-     * _.isArrayLike(_.noop);
-     * // => false
-     */
-    function isArrayLike(value) {
-      return value != null && isLength(value.length) && !isFunction(value);
-    }
-
-    /**
-     * This method is like `_.isArrayLike` except that it also checks if `value`
-     * is an object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an array-like object,
-     *  else `false`.
-     * @example
-     *
-     * _.isArrayLikeObject([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLikeObject(document.body.children);
-     * // => true
-     *
-     * _.isArrayLikeObject('abc');
-     * // => false
-     *
-     * _.isArrayLikeObject(_.noop);
-     * // => false
-     */
-    function isArrayLikeObject(value) {
-      return isObjectLike(value) && isArrayLike(value);
-    }
-
-    /**
-     * Checks if `value` is classified as a boolean primitive or object.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a boolean, else `false`.
-     * @example
-     *
-     * _.isBoolean(false);
-     * // => true
-     *
-     * _.isBoolean(null);
-     * // => false
-     */
-    function isBoolean(value) {
-      return value === true || value === false ||
-        (isObjectLike(value) && baseGetTag(value) == boolTag);
-    }
-
-    /**
-     * Checks if `value` is a buffer.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.3.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
-     * @example
-     *
-     * _.isBuffer(new Buffer(2));
-     * // => true
-     *
-     * _.isBuffer(new Uint8Array(2));
-     * // => false
-     */
-    var isBuffer = nativeIsBuffer || stubFalse;
-
-    /**
-     * Checks if `value` is classified as a `Date` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a date object, else `false`.
-     * @example
-     *
-     * _.isDate(new Date);
-     * // => true
-     *
-     * _.isDate('Mon April 23 2012');
-     * // => false
-     */
-    var isDate = nodeIsDate ? baseUnary(nodeIsDate) : baseIsDate;
-
-    /**
-     * Checks if `value` is likely a DOM element.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a DOM element, else `false`.
-     * @example
-     *
-     * _.isElement(document.body);
-     * // => true
-     *
-     * _.isElement('<body>');
-     * // => false
-     */
-    function isElement(value) {
-      return isObjectLike(value) && value.nodeType === 1 && !isPlainObject(value);
-    }
-
-    /**
-     * Checks if `value` is an empty object, collection, map, or set.
-     *
-     * Objects are considered empty if they have no own enumerable string keyed
-     * properties.
-     *
-     * Array-like values such as `arguments` objects, arrays, buffers, strings, or
-     * jQuery-like collections are considered empty if they have a `length` of `0`.
-     * Similarly, maps and sets are considered empty if they have a `size` of `0`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is empty, else `false`.
-     * @example
-     *
-     * _.isEmpty(null);
-     * // => true
-     *
-     * _.isEmpty(true);
-     * // => true
-     *
-     * _.isEmpty(1);
-     * // => true
-     *
-     * _.isEmpty([1, 2, 3]);
-     * // => false
-     *
-     * _.isEmpty({ 'a': 1 });
-     * // => false
-     */
-    function isEmpty(value) {
-      if (value == null) {
-        return true;
-      }
-      if (isArrayLike(value) &&
-          (isArray(value) || typeof value == 'string' || typeof value.splice == 'function' ||
-            isBuffer(value) || isTypedArray(value) || isArguments(value))) {
-        return !value.length;
-      }
-      var tag = getTag(value);
-      if (tag == mapTag || tag == setTag) {
-        return !value.size;
-      }
-      if (isPrototype(value)) {
-        return !baseKeys(value).length;
-      }
-      for (var key in value) {
-        if (hasOwnProperty.call(value, key)) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are compared by strict equality, i.e. `===`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'a': 1 };
-     * var other = { 'a': 1 };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    function isEqual(value, other) {
-      return baseIsEqual(value, other);
-    }
-
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined`, comparisons
-     * are handled by the method instead. The `customizer` is invoked with up to
-     * six arguments: (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @param {Function} [customizer] The function to customize comparisons.
-     * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     *     return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    function isEqualWith(value, other, customizer) {
-      customizer = typeof customizer == 'function' ? customizer : undefined;
-      var result = customizer ? customizer(value, other) : undefined;
-      return result === undefined ? baseIsEqual(value, other, undefined, customizer) : !!result;
-    }
-
-    /**
-     * Checks if `value` is an `Error`, `EvalError`, `RangeError`, `ReferenceError`,
-     * `SyntaxError`, `TypeError`, or `URIError` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an error object, else `false`.
-     * @example
-     *
-     * _.isError(new Error);
-     * // => true
-     *
-     * _.isError(Error);
-     * // => false
-     */
-    function isError(value) {
-      if (!isObjectLike(value)) {
-        return false;
-      }
-      var tag = baseGetTag(value);
-      return tag == errorTag || tag == domExcTag ||
-        (typeof value.message == 'string' && typeof value.name == 'string' && !isPlainObject(value));
-    }
-
-    /**
-     * Checks if `value` is a finite primitive number.
-     *
-     * **Note:** This method is based on
-     * [`Number.isFinite`](https://mdn.io/Number/isFinite).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a finite number, else `false`.
-     * @example
-     *
-     * _.isFinite(3);
-     * // => true
-     *
-     * _.isFinite(Number.MIN_VALUE);
-     * // => true
-     *
-     * _.isFinite(Infinity);
-     * // => false
-     *
-     * _.isFinite('3');
-     * // => false
-     */
-    function isFinite(value) {
-      return typeof value == 'number' && nativeIsFinite(value);
-    }
-
-    /**
-     * Checks if `value` is classified as a `Function` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a function, else `false`.
-     * @example
-     *
-     * _.isFunction(_);
-     * // => true
-     *
-     * _.isFunction(/abc/);
-     * // => false
-     */
-    function isFunction(value) {
-      if (!isObject(value)) {
-        return false;
-      }
-      // The use of `Object#toString` avoids issues with the `typeof` operator
-      // in Safari 9 which returns 'object' for typed arrays and other constructors.
-      var tag = baseGetTag(value);
-      return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
-    }
-
-    /**
-     * Checks if `value` is an integer.
-     *
-     * **Note:** This method is based on
-     * [`Number.isInteger`](https://mdn.io/Number/isInteger).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an integer, else `false`.
-     * @example
-     *
-     * _.isInteger(3);
-     * // => true
-     *
-     * _.isInteger(Number.MIN_VALUE);
-     * // => false
-     *
-     * _.isInteger(Infinity);
-     * // => false
-     *
-     * _.isInteger('3');
-     * // => false
-     */
-    function isInteger(value) {
-      return typeof value == 'number' && value == toInteger(value);
-    }
-
-    /**
-     * Checks if `value` is a valid array-like length.
-     *
-     * **Note:** This method is loosely based on
-     * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
-     * @example
-     *
-     * _.isLength(3);
-     * // => true
-     *
-     * _.isLength(Number.MIN_VALUE);
-     * // => false
-     *
-     * _.isLength(Infinity);
-     * // => false
-     *
-     * _.isLength('3');
-     * // => false
-     */
-    function isLength(value) {
-      return typeof value == 'number' &&
-        value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
-    }
-
-    /**
-     * Checks if `value` is the
-     * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
-     * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is an object, else `false`.
-     * @example
-     *
-     * _.isObject({});
-     * // => true
-     *
-     * _.isObject([1, 2, 3]);
-     * // => true
-     *
-     * _.isObject(_.noop);
-     * // => true
-     *
-     * _.isObject(null);
-     * // => false
-     */
-    function isObject(value) {
-      var type = typeof value;
-      return value != null && (type == 'object' || type == 'function');
-    }
-
-    /**
-     * Checks if `value` is object-like. A value is object-like if it's not `null`
-     * and has a `typeof` result of "object".
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
-     * @example
-     *
-     * _.isObjectLike({});
-     * // => true
-     *
-     * _.isObjectLike([1, 2, 3]);
-     * // => true
-     *
-     * _.isObjectLike(_.noop);
-     * // => false
-     *
-     * _.isObjectLike(null);
-     * // => false
-     */
-    function isObjectLike(value) {
-      return value != null && typeof value == 'object';
-    }
-
-    /**
-     * Checks if `value` is classified as a `Map` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.3.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a map, else `false`.
-     * @example
-     *
-     * _.isMap(new Map);
-     * // => true
-     *
-     * _.isMap(new WeakMap);
-     * // => false
-     */
-    var isMap = nodeIsMap ? baseUnary(nodeIsMap) : baseIsMap;
-
-    /**
-     * Performs a partial deep comparison between `object` and `source` to
-     * determine if `object` contains equivalent property values.
-     *
-     * **Note:** This method is equivalent to `_.matches` when `source` is
-     * partially applied.
-     *
-     * Partial comparisons will match empty array and empty object `source`
-     * values against any array or object value, respectively. See `_.isEqual`
-     * for a list of supported value comparisons.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Lang
-     * @param {Object} object The object to inspect.
-     * @param {Object} source The object of property values to match.
-     * @returns {boolean} Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': 2 };
-     *
-     * _.isMatch(object, { 'b': 2 });
-     * // => true
-     *
-     * _.isMatch(object, { 'b': 1 });
-     * // => false
-     */
-    function isMatch(object, source) {
-      return object === source || baseIsMatch(object, source, getMatchData(source));
-    }
-
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined`, comparisons
-     * are handled by the method instead. The `customizer` is invoked with five
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {Object} object The object to inspect.
-     * @param {Object} source The object of property values to match.
-     * @param {Function} [customizer] The function to customize comparisons.
-     * @returns {boolean} Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     *     return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    function isMatchWith(object, source, customizer) {
-      customizer = typeof customizer == 'function' ? customizer : undefined;
-      return baseIsMatch(object, source, getMatchData(source), customizer);
-    }
-
-    /**
-     * Checks if `value` is `NaN`.
-     *
-     * **Note:** This method is based on
-     * [`Number.isNaN`](https://mdn.io/Number/isNaN) and is not the same as
-     * global [`isNaN`](https://mdn.io/isNaN) which returns `true` for
-     * `undefined` and other non-number values.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is `NaN`, else `false`.
-     * @example
-     *
-     * _.isNaN(NaN);
-     * // => true
-     *
-     * _.isNaN(new Number(NaN));
-     * // => true
-     *
-     * isNaN(undefined);
-     * // => true
-     *
-     * _.isNaN(undefined);
-     * // => false
-     */
-    function isNaN(value) {
-      // An `NaN` primitive is the only value that is not equal to itself.
-      // Perform the `toStringTag` check first to avoid errors with some
-      // ActiveX objects in IE.
-      return isNumber(value) && value != +value;
-    }
-
-    /**
-     * Checks if `value` is a pristine native function.
-     *
-     * **Note:** This method can't reliably detect native functions in the presence
-     * of the core-js package because core-js circumvents this kind of detection.
-     * Despite multiple requests, the core-js maintainer has made it clear: any
-     * attempt to fix the detection will be obstructed. As a result, we're left
-     * with little choice but to throw an error. Unfortunately, this also affects
-     * packages, like [babel-polyfill](https://www.npmjs.com/package/babel-polyfill),
-     * which rely on core-js.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a native function,
-     *  else `false`.
-     * @example
-     *
-     * _.isNative(Array.prototype.push);
-     * // => true
-     *
-     * _.isNative(_);
-     * // => false
-     */
-    function isNative(value) {
-      if (isMaskable(value)) {
-        throw new Error(CORE_ERROR_TEXT);
-      }
-      return baseIsNative(value);
-    }
-
-    /**
-     * Checks if `value` is `null`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is `null`, else `false`.
-     * @example
-     *
-     * _.isNull(null);
-     * // => true
-     *
-     * _.isNull(void 0);
-     * // => false
-     */
-    function isNull(value) {
-      return value === null;
-    }
-
-    /**
-     * Checks if `value` is `null` or `undefined`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
-     * @example
-     *
-     * _.isNil(null);
-     * // => true
-     *
-     * _.isNil(void 0);
-     * // => true
-     *
-     * _.isNil(NaN);
-     * // => false
-     */
-    function isNil(value) {
-      return value == null;
-    }
-
-    /**
-     * Checks if `value` is classified as a `Number` primitive or object.
-     *
-     * **Note:** To exclude `Infinity`, `-Infinity`, and `NaN`, which are
-     * classified as numbers, use the `_.isFinite` method.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a number, else `false`.
-     * @example
-     *
-     * _.isNumber(3);
-     * // => true
-     *
-     * _.isNumber(Number.MIN_VALUE);
-     * // => true
-     *
-     * _.isNumber(Infinity);
-     * // => true
-     *
-     * _.isNumber('3');
-     * // => false
-     */
-    function isNumber(value) {
-      return typeof value == 'number' ||
-        (isObjectLike(value) && baseGetTag(value) == numberTag);
-    }
-
-    /**
-     * Checks if `value` is a plain object, that is, an object created by the
-     * `Object` constructor or one with a `[[Prototype]]` of `null`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.8.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     * }
-     *
-     * _.isPlainObject(new Foo);
-     * // => false
-     *
-     * _.isPlainObject([1, 2, 3]);
-     * // => false
-     *
-     * _.isPlainObject({ 'x': 0, 'y': 0 });
-     * // => true
-     *
-     * _.isPlainObject(Object.create(null));
-     * // => true
-     */
-    function isPlainObject(value) {
-      if (!isObjectLike(value) || baseGetTag(value) != objectTag) {
-        return false;
-      }
-      var proto = getPrototype(value);
-      if (proto === null) {
-        return true;
-      }
-      var Ctor = hasOwnProperty.call(proto, 'constructor') && proto.constructor;
-      return typeof Ctor == 'function' && Ctor instanceof Ctor &&
-        funcToString.call(Ctor) == objectCtorString;
-    }
-
-    /**
-     * Checks if `value` is classified as a `RegExp` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.1.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a regexp, else `false`.
-     * @example
-     *
-     * _.isRegExp(/abc/);
-     * // => true
-     *
-     * _.isRegExp('/abc/');
-     * // => false
-     */
-    var isRegExp = nodeIsRegExp ? baseUnary(nodeIsRegExp) : baseIsRegExp;
-
-    /**
-     * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
-     * double precision number which isn't the result of a rounded unsafe integer.
-     *
-     * **Note:** This method is based on
-     * [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a safe integer, else `false`.
-     * @example
-     *
-     * _.isSafeInteger(3);
-     * // => true
-     *
-     * _.isSafeInteger(Number.MIN_VALUE);
-     * // => false
-     *
-     * _.isSafeInteger(Infinity);
-     * // => false
-     *
-     * _.isSafeInteger('3');
-     * // => false
-     */
-    function isSafeInteger(value) {
-      return isInteger(value) && value >= -MAX_SAFE_INTEGER && value <= MAX_SAFE_INTEGER;
-    }
-
-    /**
-     * Checks if `value` is classified as a `Set` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.3.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a set, else `false`.
-     * @example
-     *
-     * _.isSet(new Set);
-     * // => true
-     *
-     * _.isSet(new WeakSet);
-     * // => false
-     */
-    var isSet = nodeIsSet ? baseUnary(nodeIsSet) : baseIsSet;
-
-    /**
-     * Checks if `value` is classified as a `String` primitive or object.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a string, else `false`.
-     * @example
-     *
-     * _.isString('abc');
-     * // => true
-     *
-     * _.isString(1);
-     * // => false
-     */
-    function isString(value) {
-      return typeof value == 'string' ||
-        (!isArray(value) && isObjectLike(value) && baseGetTag(value) == stringTag);
-    }
-
-    /**
-     * Checks if `value` is classified as a `Symbol` primitive or object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
-     * @example
-     *
-     * _.isSymbol(Symbol.iterator);
-     * // => true
-     *
-     * _.isSymbol('abc');
-     * // => false
-     */
-    function isSymbol(value) {
-      return typeof value == 'symbol' ||
-        (isObjectLike(value) && baseGetTag(value) == symbolTag);
-    }
-
-    /**
-     * Checks if `value` is classified as a typed array.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
-     * @example
-     *
-     * _.isTypedArray(new Uint8Array);
-     * // => true
-     *
-     * _.isTypedArray([]);
-     * // => false
-     */
-    var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
-
-    /**
-     * Checks if `value` is `undefined`.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is `undefined`, else `false`.
-     * @example
-     *
-     * _.isUndefined(void 0);
-     * // => true
-     *
-     * _.isUndefined(null);
-     * // => false
-     */
-    function isUndefined(value) {
-      return value === undefined;
-    }
-
-    /**
-     * Checks if `value` is classified as a `WeakMap` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.3.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a weak map, else `false`.
-     * @example
-     *
-     * _.isWeakMap(new WeakMap);
-     * // => true
-     *
-     * _.isWeakMap(new Map);
-     * // => false
-     */
-    function isWeakMap(value) {
-      return isObjectLike(value) && getTag(value) == weakMapTag;
-    }
-
-    /**
-     * Checks if `value` is classified as a `WeakSet` object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.3.0
-     * @category Lang
-     * @param {*} value The value to check.
-     * @returns {boolean} Returns `true` if `value` is a weak set, else `false`.
-     * @example
-     *
-     * _.isWeakSet(new WeakSet);
-     * // => true
-     *
-     * _.isWeakSet(new Set);
-     * // => false
-     */
-    function isWeakSet(value) {
-      return isObjectLike(value) && baseGetTag(value) == weakSetTag;
-    }
-
-    /**
-     * Checks if `value` is less than `other`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.9.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if `value` is less than `other`,
-     *  else `false`.
-     * @see _.gt
-     * @example
-     *
-     * _.lt(1, 3);
-     * // => true
-     *
-     * _.lt(3, 3);
-     * // => false
-     *
-     * _.lt(3, 1);
-     * // => false
-     */
-    var lt = createRelationalOperation(baseLt);
-
-    /**
-     * Checks if `value` is less than or equal to `other`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.9.0
-     * @category Lang
-     * @param {*} value The value to compare.
-     * @param {*} other The other value to compare.
-     * @returns {boolean} Returns `true` if `value` is less than or equal to
-     *  `other`, else `false`.
-     * @see _.gte
-     * @example
-     *
-     * _.lte(1, 3);
-     * // => true
-     *
-     * _.lte(3, 3);
-     * // => true
-     *
-     * _.lte(3, 1);
-     * // => false
-     */
-    var lte = createRelationalOperation(function(value, other) {
-      return value <= other;
-    });
-
-    /**
-     * Converts `value` to an array.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {Array} Returns the converted array.
-     * @example
-     *
-     * _.toArray({ 'a': 1, 'b': 2 });
-     * // => [1, 2]
-     *
-     * _.toArray('abc');
-     * // => ['a', 'b', 'c']
-     *
-     * _.toArray(1);
-     * // => []
-     *
-     * _.toArray(null);
-     * // => []
-     */
-    function toArray(value) {
-      if (!value) {
-        return [];
-      }
-      if (isArrayLike(value)) {
-        return isString(value) ? stringToArray(value) : copyArray(value);
-      }
-      if (symIterator && value[symIterator]) {
-        return iteratorToArray(value[symIterator]());
-      }
-      var tag = getTag(value),
-          func = tag == mapTag ? mapToArray : (tag == setTag ? setToArray : values);
-
-      return func(value);
-    }
-
-    /**
-     * Converts `value` to a finite number.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.12.0
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {number} Returns the converted number.
-     * @example
-     *
-     * _.toFinite(3.2);
-     * // => 3.2
-     *
-     * _.toFinite(Number.MIN_VALUE);
-     * // => 5e-324
-     *
-     * _.toFinite(Infinity);
-     * // => 1.7976931348623157e+308
-     *
-     * _.toFinite('3.2');
-     * // => 3.2
-     */
-    function toFinite(value) {
-      if (!value) {
-        return value === 0 ? value : 0;
-      }
-      value = toNumber(value);
-      if (value === INFINITY || value === -INFINITY) {
-        var sign = (value < 0 ? -1 : 1);
-        return sign * MAX_INTEGER;
-      }
-      return value === value ? value : 0;
-    }
-
-    /**
-     * Converts `value` to an integer.
-     *
-     * **Note:** This method is loosely based on
-     * [`ToInteger`](http://www.ecma-international.org/ecma-262/7.0/#sec-tointeger).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {number} Returns the converted integer.
-     * @example
-     *
-     * _.toInteger(3.2);
-     * // => 3
-     *
-     * _.toInteger(Number.MIN_VALUE);
-     * // => 0
-     *
-     * _.toInteger(Infinity);
-     * // => 1.7976931348623157e+308
-     *
-     * _.toInteger('3.2');
-     * // => 3
-     */
-    function toInteger(value) {
-      var result = toFinite(value),
-          remainder = result % 1;
-
-      return result === result ? (remainder ? result - remainder : result) : 0;
-    }
-
-    /**
-     * Converts `value` to an integer suitable for use as the length of an
-     * array-like object.
-     *
-     * **Note:** This method is based on
-     * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {number} Returns the converted integer.
-     * @example
-     *
-     * _.toLength(3.2);
-     * // => 3
-     *
-     * _.toLength(Number.MIN_VALUE);
-     * // => 0
-     *
-     * _.toLength(Infinity);
-     * // => 4294967295
-     *
-     * _.toLength('3.2');
-     * // => 3
-     */
-    function toLength(value) {
-      return value ? baseClamp(toInteger(value), 0, MAX_ARRAY_LENGTH) : 0;
-    }
-
-    /**
-     * Converts `value` to a number.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to process.
-     * @returns {number} Returns the number.
-     * @example
-     *
-     * _.toNumber(3.2);
-     * // => 3.2
-     *
-     * _.toNumber(Number.MIN_VALUE);
-     * // => 5e-324
-     *
-     * _.toNumber(Infinity);
-     * // => Infinity
-     *
-     * _.toNumber('3.2');
-     * // => 3.2
-     */
-    function toNumber(value) {
-      if (typeof value == 'number') {
-        return value;
-      }
-      if (isSymbol(value)) {
-        return NAN;
-      }
-      if (isObject(value)) {
-        var other = typeof value.valueOf == 'function' ? value.valueOf() : value;
-        value = isObject(other) ? (other + '') : other;
-      }
-      if (typeof value != 'string') {
-        return value === 0 ? value : +value;
-      }
-      value = value.replace(reTrim, '');
-      var isBinary = reIsBinary.test(value);
-      return (isBinary || reIsOctal.test(value))
-        ? freeParseInt(value.slice(2), isBinary ? 2 : 8)
-        : (reIsBadHex.test(value) ? NAN : +value);
-    }
-
-    /**
-     * Converts `value` to a plain object flattening inherited enumerable string
-     * keyed properties of `value` to own properties of the plain object.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {Object} Returns the converted plain object.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.assign({ 'a': 1 }, new Foo);
-     * // => { 'a': 1, 'b': 2 }
-     *
-     * _.assign({ 'a': 1 }, _.toPlainObject(new Foo));
-     * // => { 'a': 1, 'b': 2, 'c': 3 }
-     */
-    function toPlainObject(value) {
-      return copyObject(value, keysIn(value));
-    }
-
-    /**
-     * Converts `value` to a safe integer. A safe integer can be compared and
-     * represented correctly.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {number} Returns the converted integer.
-     * @example
-     *
-     * _.toSafeInteger(3.2);
-     * // => 3
-     *
-     * _.toSafeInteger(Number.MIN_VALUE);
-     * // => 0
-     *
-     * _.toSafeInteger(Infinity);
-     * // => 9007199254740991
-     *
-     * _.toSafeInteger('3.2');
-     * // => 3
-     */
-    function toSafeInteger(value) {
-      return value
-        ? baseClamp(toInteger(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER)
-        : (value === 0 ? value : 0);
-    }
-
-    /**
-     * Converts `value` to a string. An empty string is returned for `null`
-     * and `undefined` values. The sign of `-0` is preserved.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Lang
-     * @param {*} value The value to convert.
-     * @returns {string} Returns the converted string.
-     * @example
-     *
-     * _.toString(null);
-     * // => ''
-     *
-     * _.toString(-0);
-     * // => '-0'
-     *
-     * _.toString([1, 2, 3]);
-     * // => '1,2,3'
-     */
-    function toString(value) {
-      return value == null ? '' : baseToString(value);
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Assigns own enumerable string keyed properties of source objects to the
-     * destination object. Source objects are applied from left to right.
-     * Subsequent sources overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.10.0
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} [sources] The source objects.
-     * @returns {Object} Returns `object`.
-     * @see _.assignIn
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     * }
-     *
-     * function Bar() {
-     *   this.c = 3;
-     * }
-     *
-     * Foo.prototype.b = 2;
-     * Bar.prototype.d = 4;
-     *
-     * _.assign({ 'a': 0 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    var assign = createAssigner(function(object, source) {
-      if (isPrototype(source) || isArrayLike(source)) {
-        copyObject(source, keys(source), object);
-        return;
-      }
-      for (var key in source) {
-        if (hasOwnProperty.call(source, key)) {
-          assignValue(object, key, source[key]);
-        }
-      }
-    });
-
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @alias extend
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} [sources] The source objects.
-     * @returns {Object} Returns `object`.
-     * @see _.assign
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     * }
-     *
-     * function Bar() {
-     *   this.c = 3;
-     * }
-     *
-     * Foo.prototype.b = 2;
-     * Bar.prototype.d = 4;
-     *
-     * _.assignIn({ 'a': 0 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4 }
-     */
-    var assignIn = createAssigner(function(object, source) {
-      copyObject(source, keysIn(source), object);
-    });
-
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer`
-     * which is invoked to produce the assigned values. If `customizer` returns
-     * `undefined`, assignment is handled by the method instead. The `customizer`
-     * is invoked with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @alias extendWith
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} sources The source objects.
-     * @param {Function} [customizer] The function to customize assigned values.
-     * @returns {Object} Returns `object`.
-     * @see _.assignWith
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    var assignInWith = createAssigner(function(object, source, srcIndex, customizer) {
-      copyObject(source, keysIn(source), object, customizer);
-    });
-
-    /**
-     * This method is like `_.assign` except that it accepts `customizer`
-     * which is invoked to produce the assigned values. If `customizer` returns
-     * `undefined`, assignment is handled by the method instead. The `customizer`
-     * is invoked with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} sources The source objects.
-     * @param {Function} [customizer] The function to customize assigned values.
-     * @returns {Object} Returns `object`.
-     * @see _.assignInWith
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    var assignWith = createAssigner(function(object, source, srcIndex, customizer) {
-      copyObject(source, keys(source), object, customizer);
-    });
-
-    /**
-     * Creates an array of values corresponding to `paths` of `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.0.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {...(string|string[])} [paths] The property paths to pick.
-     * @returns {Array} Returns the picked values.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': 3 } }, 4] };
-     *
-     * _.at(object, ['a[0].b.c', 'a[1]']);
-     * // => [3, 4]
-     */
-    var at = flatRest(baseAt);
-
-    /**
-     * Creates an object that inherits from the `prototype` object. If a
-     * `properties` object is given, its own enumerable string keyed properties
-     * are assigned to the created object.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.3.0
-     * @category Object
-     * @param {Object} prototype The object to inherit from.
-     * @param {Object} [properties] The properties to assign to the object.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * function Shape() {
-     *   this.x = 0;
-     *   this.y = 0;
-     * }
-     *
-     * function Circle() {
-     *   Shape.call(this);
-     * }
-     *
-     * Circle.prototype = _.create(Shape.prototype, {
-     *   'constructor': Circle
-     * });
-     *
-     * var circle = new Circle;
-     * circle instanceof Circle;
-     * // => true
-     *
-     * circle instanceof Shape;
-     * // => true
-     */
-    function create(prototype, properties) {
-      var result = baseCreate(prototype);
-      return properties == null ? result : baseAssign(result, properties);
-    }
-
-    /**
-     * Assigns own and inherited enumerable string keyed properties of source
-     * objects to the destination object for all destination properties that
-     * resolve to `undefined`. Source objects are applied from left to right.
-     * Once a property is set, additional values of the same property are ignored.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} [sources] The source objects.
-     * @returns {Object} Returns `object`.
-     * @see _.defaultsDeep
-     * @example
-     *
-     * _.defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    var defaults = baseRest(function(object, sources) {
-      object = Object(object);
-
-      var index = -1;
-      var length = sources.length;
-      var guard = length > 2 ? sources[2] : undefined;
-
-      if (guard && isIterateeCall(sources[0], sources[1], guard)) {
-        length = 1;
-      }
-
-      while (++index < length) {
-        var source = sources[index];
-        var props = keysIn(source);
-        var propsIndex = -1;
-        var propsLength = props.length;
-
-        while (++propsIndex < propsLength) {
-          var key = props[propsIndex];
-          var value = object[key];
-
-          if (value === undefined ||
-              (eq(value, objectProto[key]) && !hasOwnProperty.call(object, key))) {
-            object[key] = source[key];
-          }
-        }
-      }
-
-      return object;
-    });
-
-    /**
-     * This method is like `_.defaults` except that it recursively assigns
-     * default properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.10.0
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} [sources] The source objects.
-     * @returns {Object} Returns `object`.
-     * @see _.defaults
-     * @example
-     *
-     * _.defaultsDeep({ 'a': { 'b': 2 } }, { 'a': { 'b': 1, 'c': 3 } });
-     * // => { 'a': { 'b': 2, 'c': 3 } }
-     */
-    var defaultsDeep = baseRest(function(args) {
-      args.push(undefined, customDefaultsMerge);
-      return apply(mergeWith, undefined, args);
-    });
-
-    /**
-     * This method is like `_.find` except that it returns the key of the first
-     * element `predicate` returns truthy for instead of the element itself.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.1.0
-     * @category Object
-     * @param {Object} object The object to inspect.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {string|undefined} Returns the key of the matched element,
-     *  else `undefined`.
-     * @example
-     *
-     * var users = {
-     *   'barney':  { 'age': 36, 'active': true },
-     *   'fred':    { 'age': 40, 'active': false },
-     *   'pebbles': { 'age': 1,  'active': true }
-     * };
-     *
-     * _.findKey(users, function(o) { return o.age < 40; });
-     * // => 'barney' (iteration order is not guaranteed)
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.findKey(users, { 'age': 1, 'active': true });
-     * // => 'pebbles'
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.findKey(users, ['active', false]);
-     * // => 'fred'
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.findKey(users, 'active');
-     * // => 'barney'
-     */
-    function findKey(object, predicate) {
-      return baseFindKey(object, getIteratee(predicate, 3), baseForOwn);
-    }
-
-    /**
-     * This method is like `_.findKey` except that it iterates over elements of
-     * a collection in the opposite order.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Object
-     * @param {Object} object The object to inspect.
-     * @param {Function} [predicate=_.identity] The function invoked per iteration.
-     * @returns {string|undefined} Returns the key of the matched element,
-     *  else `undefined`.
-     * @example
-     *
-     * var users = {
-     *   'barney':  { 'age': 36, 'active': true },
-     *   'fred':    { 'age': 40, 'active': false },
-     *   'pebbles': { 'age': 1,  'active': true }
-     * };
-     *
-     * _.findLastKey(users, function(o) { return o.age < 40; });
-     * // => returns 'pebbles' assuming `_.findKey` returns 'barney'
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.findLastKey(users, { 'age': 36, 'active': true });
-     * // => 'barney'
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.findLastKey(users, ['active', false]);
-     * // => 'fred'
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.findLastKey(users, 'active');
-     * // => 'pebbles'
-     */
-    function findLastKey(object, predicate) {
-      return baseFindKey(object, getIteratee(predicate, 3), baseForOwnRight);
-    }
-
-    /**
-     * Iterates over own and inherited enumerable string keyed properties of an
-     * object and invokes `iteratee` for each property. The iteratee is invoked
-     * with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning `false`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.3.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Object} Returns `object`.
-     * @see _.forInRight
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.forIn(new Foo, function(value, key) {
-     *   console.log(key);
-     * });
-     * // => Logs 'a', 'b', then 'c' (iteration order is not guaranteed).
-     */
-    function forIn(object, iteratee) {
-      return object == null
-        ? object
-        : baseFor(object, getIteratee(iteratee, 3), keysIn);
-    }
-
-    /**
-     * This method is like `_.forIn` except that it iterates over properties of
-     * `object` in the opposite order.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Object} Returns `object`.
-     * @see _.forIn
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.forInRight(new Foo, function(value, key) {
-     *   console.log(key);
-     * });
-     * // => Logs 'c', 'b', then 'a' assuming `_.forIn` logs 'a', 'b', then 'c'.
-     */
-    function forInRight(object, iteratee) {
-      return object == null
-        ? object
-        : baseForRight(object, getIteratee(iteratee, 3), keysIn);
-    }
-
-    /**
-     * Iterates over own enumerable string keyed properties of an object and
-     * invokes `iteratee` for each property. The iteratee is invoked with three
-     * arguments: (value, key, object). Iteratee functions may exit iteration
-     * early by explicitly returning `false`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.3.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Object} Returns `object`.
-     * @see _.forOwnRight
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.forOwn(new Foo, function(value, key) {
-     *   console.log(key);
-     * });
-     * // => Logs 'a' then 'b' (iteration order is not guaranteed).
-     */
-    function forOwn(object, iteratee) {
-      return object && baseForOwn(object, getIteratee(iteratee, 3));
-    }
-
-    /**
-     * This method is like `_.forOwn` except that it iterates over properties of
-     * `object` in the opposite order.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.0.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Object} Returns `object`.
-     * @see _.forOwn
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.forOwnRight(new Foo, function(value, key) {
-     *   console.log(key);
-     * });
-     * // => Logs 'b' then 'a' assuming `_.forOwn` logs 'a' then 'b'.
-     */
-    function forOwnRight(object, iteratee) {
-      return object && baseForOwnRight(object, getIteratee(iteratee, 3));
-    }
-
-    /**
-     * Creates an array of function property names from own enumerable properties
-     * of `object`.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The object to inspect.
-     * @returns {Array} Returns the function names.
-     * @see _.functionsIn
-     * @example
-     *
-     * function Foo() {
-     *   this.a = _.constant('a');
-     *   this.b = _.constant('b');
-     * }
-     *
-     * Foo.prototype.c = _.constant('c');
-     *
-     * _.functions(new Foo);
-     * // => ['a', 'b']
-     */
-    function functions(object) {
-      return object == null ? [] : baseFunctions(object, keys(object));
-    }
-
-    /**
-     * Creates an array of function property names from own and inherited
-     * enumerable properties of `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The object to inspect.
-     * @returns {Array} Returns the function names.
-     * @see _.functions
-     * @example
-     *
-     * function Foo() {
-     *   this.a = _.constant('a');
-     *   this.b = _.constant('b');
-     * }
-     *
-     * Foo.prototype.c = _.constant('c');
-     *
-     * _.functionsIn(new Foo);
-     * // => ['a', 'b', 'c']
-     */
-    function functionsIn(object) {
-      return object == null ? [] : baseFunctions(object, keysIn(object));
-    }
-
-    /**
-     * Gets the value at `path` of `object`. If the resolved value is
-     * `undefined`, the `defaultValue` is returned in its place.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.7.0
-     * @category Object
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path of the property to get.
-     * @param {*} [defaultValue] The value returned for `undefined` resolved values.
-     * @returns {*} Returns the resolved value.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': 3 } }] };
-     *
-     * _.get(object, 'a[0].b.c');
-     * // => 3
-     *
-     * _.get(object, ['a', '0', 'b', 'c']);
-     * // => 3
-     *
-     * _.get(object, 'a.b.c', 'default');
-     * // => 'default'
-     */
-    function get(object, path, defaultValue) {
-      var result = object == null ? undefined : baseGet(object, path);
-      return result === undefined ? defaultValue : result;
-    }
-
-    /**
-     * Checks if `path` is a direct property of `object`.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path to check.
-     * @returns {boolean} Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = { 'a': { 'b': 2 } };
-     * var other = _.create({ 'a': _.create({ 'b': 2 }) });
-     *
-     * _.has(object, 'a');
-     * // => true
-     *
-     * _.has(object, 'a.b');
-     * // => true
-     *
-     * _.has(object, ['a', 'b']);
-     * // => true
-     *
-     * _.has(other, 'a');
-     * // => false
-     */
-    function has(object, path) {
-      return object != null && hasPath(object, path, baseHas);
-    }
-
-    /**
-     * Checks if `path` is a direct or inherited property of `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path to check.
-     * @returns {boolean} Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = _.create({ 'a': _.create({ 'b': 2 }) });
-     *
-     * _.hasIn(object, 'a');
-     * // => true
-     *
-     * _.hasIn(object, 'a.b');
-     * // => true
-     *
-     * _.hasIn(object, ['a', 'b']);
-     * // => true
-     *
-     * _.hasIn(object, 'b');
-     * // => false
-     */
-    function hasIn(object, path) {
-      return object != null && hasPath(object, path, baseHasIn);
-    }
-
-    /**
-     * Creates an object composed of the inverted keys and values of `object`.
-     * If `object` contains duplicate values, subsequent values overwrite
-     * property assignments of previous values.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.7.0
-     * @category Object
-     * @param {Object} object The object to invert.
-     * @returns {Object} Returns the new inverted object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': 2, 'c': 1 };
-     *
-     * _.invert(object);
-     * // => { '1': 'c', '2': 'b' }
-     */
-    var invert = createInverter(function(result, value, key) {
-      if (value != null &&
-          typeof value.toString != 'function') {
-        value = nativeObjectToString.call(value);
-      }
-
-      result[value] = key;
-    }, constant(identity));
-
-    /**
-     * This method is like `_.invert` except that the inverted object is generated
-     * from the results of running each element of `object` thru `iteratee`. The
-     * corresponding inverted value of each inverted key is an array of keys
-     * responsible for generating the inverted value. The iteratee is invoked
-     * with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.1.0
-     * @category Object
-     * @param {Object} object The object to invert.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {Object} Returns the new inverted object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': 2, 'c': 1 };
-     *
-     * _.invertBy(object);
-     * // => { '1': ['a', 'c'], '2': ['b'] }
-     *
-     * _.invertBy(object, function(value) {
-     *   return 'group' + value;
-     * });
-     * // => { 'group1': ['a', 'c'], 'group2': ['b'] }
-     */
-    var invertBy = createInverter(function(result, value, key) {
-      if (value != null &&
-          typeof value.toString != 'function') {
-        value = nativeObjectToString.call(value);
-      }
-
-      if (hasOwnProperty.call(result, value)) {
-        result[value].push(key);
-      } else {
-        result[value] = [key];
-      }
-    }, getIteratee);
-
-    /**
-     * Invokes the method at `path` of `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path of the method to invoke.
-     * @param {...*} [args] The arguments to invoke the method with.
-     * @returns {*} Returns the result of the invoked method.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': [1, 2, 3, 4] } }] };
-     *
-     * _.invoke(object, 'a[0].b.c.slice', 1, 3);
-     * // => [2, 3]
-     */
-    var invoke = baseRest(baseInvoke);
-
-    /**
-     * Creates an array of the own enumerable property names of `object`.
-     *
-     * **Note:** Non-object values are coerced to objects. See the
-     * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
-     * for more details.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.keys(new Foo);
-     * // => ['a', 'b'] (iteration order is not guaranteed)
-     *
-     * _.keys('hi');
-     * // => ['0', '1']
-     */
-    function keys(object) {
-      return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
-    }
-
-    /**
-     * Creates an array of the own and inherited enumerable property names of `object`.
-     *
-     * **Note:** Non-object values are coerced to objects.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Object
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property names.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.keysIn(new Foo);
-     * // => ['a', 'b', 'c'] (iteration order is not guaranteed)
-     */
-    function keysIn(object) {
-      return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
-    }
-
-    /**
-     * The opposite of `_.mapValues`; this method creates an object with the
-     * same values as `object` and keys generated by running each own enumerable
-     * string keyed property of `object` thru `iteratee`. The iteratee is invoked
-     * with three arguments: (value, key, object).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.8.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Object} Returns the new mapped object.
-     * @see _.mapValues
-     * @example
-     *
-     * _.mapKeys({ 'a': 1, 'b': 2 }, function(value, key) {
-     *   return key + value;
-     * });
-     * // => { 'a1': 1, 'b2': 2 }
-     */
-    function mapKeys(object, iteratee) {
-      var result = {};
-      iteratee = getIteratee(iteratee, 3);
-
-      baseForOwn(object, function(value, key, object) {
-        baseAssignValue(result, iteratee(value, key, object), value);
-      });
-      return result;
-    }
-
-    /**
-     * Creates an object with the same keys as `object` and values generated
-     * by running each own enumerable string keyed property of `object` thru
-     * `iteratee`. The iteratee is invoked with three arguments:
-     * (value, key, object).
-     *
-     * @static
-     * @memberOf _
-     * @since 2.4.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Object} Returns the new mapped object.
-     * @see _.mapKeys
-     * @example
-     *
-     * var users = {
-     *   'fred':    { 'user': 'fred',    'age': 40 },
-     *   'pebbles': { 'user': 'pebbles', 'age': 1 }
-     * };
-     *
-     * _.mapValues(users, function(o) { return o.age; });
-     * // => { 'fred': 40, 'pebbles': 1 } (iteration order is not guaranteed)
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.mapValues(users, 'age');
-     * // => { 'fred': 40, 'pebbles': 1 } (iteration order is not guaranteed)
-     */
-    function mapValues(object, iteratee) {
-      var result = {};
-      iteratee = getIteratee(iteratee, 3);
-
-      baseForOwn(object, function(value, key, object) {
-        baseAssignValue(result, key, iteratee(value, key, object));
-      });
-      return result;
-    }
-
-    /**
-     * This method is like `_.assign` except that it recursively merges own and
-     * inherited enumerable string keyed properties of source objects into the
-     * destination object. Source properties that resolve to `undefined` are
-     * skipped if a destination value exists. Array and plain object properties
-     * are merged recursively. Other objects and value types are overridden by
-     * assignment. Source objects are applied from left to right. Subsequent
-     * sources overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.5.0
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} [sources] The source objects.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * var object = {
-     *   'a': [{ 'b': 2 }, { 'd': 4 }]
-     * };
-     *
-     * var other = {
-     *   'a': [{ 'c': 3 }, { 'e': 5 }]
-     * };
-     *
-     * _.merge(object, other);
-     * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
-     */
-    var merge = createAssigner(function(object, source, srcIndex) {
-      baseMerge(object, source, srcIndex);
-    });
-
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined`, merging is handled by the
-     * method instead. The `customizer` is invoked with six arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The destination object.
-     * @param {...Object} sources The source objects.
-     * @param {Function} customizer The function to customize assigned values.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     *     return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = { 'a': [1], 'b': [2] };
-     * var other = { 'a': [3], 'b': [4] };
-     *
-     * _.mergeWith(object, other, customizer);
-     * // => { 'a': [1, 3], 'b': [2, 4] }
-     */
-    var mergeWith = createAssigner(function(object, source, srcIndex, customizer) {
-      baseMerge(object, source, srcIndex, customizer);
-    });
-
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable property paths of `object` that are not omitted.
-     *
-     * **Note:** This method is considerably slower than `_.pick`.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The source object.
-     * @param {...(string|string[])} [paths] The property paths to omit.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    var omit = flatRest(function(object, paths) {
-      var result = {};
-      if (object == null) {
-        return result;
-      }
-      var isDeep = false;
-      paths = arrayMap(paths, function(path) {
-        path = castPath(path, object);
-        isDeep || (isDeep = path.length > 1);
-        return path;
-      });
-      copyObject(object, getAllKeysIn(object), result);
-      if (isDeep) {
-        result = baseClone(result, CLONE_DEEP_FLAG | CLONE_FLAT_FLAG | CLONE_SYMBOLS_FLAG, customOmitClone);
-      }
-      var length = paths.length;
-      while (length--) {
-        baseUnset(result, paths[length]);
-      }
-      return result;
-    });
-
-    /**
-     * The opposite of `_.pickBy`; this method creates an object composed of
-     * the own and inherited enumerable string keyed properties of `object` that
-     * `predicate` doesn't return truthy for. The predicate is invoked with two
-     * arguments: (value, key).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The source object.
-     * @param {Function} [predicate=_.identity] The function invoked per property.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omitBy(object, _.isNumber);
-     * // => { 'b': '2' }
-     */
-    function omitBy(object, predicate) {
-      return pickBy(object, negate(getIteratee(predicate)));
-    }
-
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The source object.
-     * @param {...(string|string[])} [paths] The property paths to pick.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    var pick = flatRest(function(object, paths) {
-      return object == null ? {} : basePick(object, paths);
-    });
-
-    /**
-     * Creates an object composed of the `object` properties `predicate` returns
-     * truthy for. The predicate is invoked with two arguments: (value, key).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The source object.
-     * @param {Function} [predicate=_.identity] The function invoked per property.
-     * @returns {Object} Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pickBy(object, _.isNumber);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    function pickBy(object, predicate) {
-      if (object == null) {
-        return {};
-      }
-      var props = arrayMap(getAllKeysIn(object), function(prop) {
-        return [prop];
-      });
-      predicate = getIteratee(predicate);
-      return basePickBy(object, props, function(value, path) {
-        return predicate(value, path[0]);
-      });
-    }
-
-    /**
-     * This method is like `_.get` except that if the resolved value is a
-     * function it's invoked with the `this` binding of its parent object and
-     * its result is returned.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The object to query.
-     * @param {Array|string} path The path of the property to resolve.
-     * @param {*} [defaultValue] The value returned for `undefined` resolved values.
-     * @returns {*} Returns the resolved value.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c1': 3, 'c2': _.constant(4) } }] };
-     *
-     * _.result(object, 'a[0].b.c1');
-     * // => 3
-     *
-     * _.result(object, 'a[0].b.c2');
-     * // => 4
-     *
-     * _.result(object, 'a[0].b.c3', 'default');
-     * // => 'default'
-     *
-     * _.result(object, 'a[0].b.c3', _.constant('default'));
-     * // => 'default'
-     */
-    function result(object, path, defaultValue) {
-      path = castPath(path, object);
-
-      var index = -1,
-          length = path.length;
-
-      // Ensure the loop is entered when path is empty.
-      if (!length) {
-        length = 1;
-        object = undefined;
-      }
-      while (++index < length) {
-        var value = object == null ? undefined : object[toKey(path[index])];
-        if (value === undefined) {
-          index = length;
-          value = defaultValue;
-        }
-        object = isFunction(value) ? value.call(object) : value;
-      }
-      return object;
-    }
-
-    /**
-     * Sets the value at `path` of `object`. If a portion of `path` doesn't exist,
-     * it's created. Arrays are created for missing index properties while objects
-     * are created for all other missing properties. Use `_.setWith` to customize
-     * `path` creation.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.7.0
-     * @category Object
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to set.
-     * @param {*} value The value to set.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': 3 } }] };
-     *
-     * _.set(object, 'a[0].b.c', 4);
-     * console.log(object.a[0].b.c);
-     * // => 4
-     *
-     * _.set(object, ['x', '0', 'y', 'z'], 5);
-     * console.log(object.x[0].y.z);
-     * // => 5
-     */
-    function set(object, path, value) {
-      return object == null ? object : baseSet(object, path, value);
-    }
-
-    /**
-     * This method is like `_.set` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to set.
-     * @param {*} value The value to set.
-     * @param {Function} [customizer] The function to customize assigned values.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.setWith(object, '[0][1]', 'a', Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    function setWith(object, path, value, customizer) {
-      customizer = typeof customizer == 'function' ? customizer : undefined;
-      return object == null ? object : baseSet(object, path, value, customizer);
-    }
-
-    /**
-     * Creates an array of own enumerable string keyed-value pairs for `object`
-     * which can be consumed by `_.fromPairs`. If `object` is a map or set, its
-     * entries are returned.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @alias entries
-     * @category Object
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the key-value pairs.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.toPairs(new Foo);
-     * // => [['a', 1], ['b', 2]] (iteration order is not guaranteed)
-     */
-    var toPairs = createToPairs(keys);
-
-    /**
-     * Creates an array of own and inherited enumerable string keyed-value pairs
-     * for `object` which can be consumed by `_.fromPairs`. If `object` is a map
-     * or set, its entries are returned.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @alias entriesIn
-     * @category Object
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the key-value pairs.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.toPairsIn(new Foo);
-     * // => [['a', 1], ['b', 2], ['c', 3]] (iteration order is not guaranteed)
-     */
-    var toPairsIn = createToPairs(keysIn);
-
-    /**
-     * An alternative to `_.reduce`; this method transforms `object` to a new
-     * `accumulator` object which is the result of running each of its own
-     * enumerable string keyed properties thru `iteratee`, with each invocation
-     * potentially mutating the `accumulator` object. If `accumulator` is not
-     * provided, a new object with the same `[[Prototype]]` will be used. The
-     * iteratee is invoked with four arguments: (accumulator, value, key, object).
-     * Iteratee functions may exit iteration early by explicitly returning `false`.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.3.0
-     * @category Object
-     * @param {Object} object The object to iterate over.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @param {*} [accumulator] The custom accumulator value.
-     * @returns {*} Returns the accumulated value.
-     * @example
-     *
-     * _.transform([2, 3, 4], function(result, n) {
-     *   result.push(n *= n);
-     *   return n % 2 == 0;
-     * }, []);
-     * // => [4, 9]
-     *
-     * _.transform({ 'a': 1, 'b': 2, 'c': 1 }, function(result, value, key) {
-     *   (result[value] || (result[value] = [])).push(key);
-     * }, {});
-     * // => { '1': ['a', 'c'], '2': ['b'] }
-     */
-    function transform(object, iteratee, accumulator) {
-      var isArr = isArray(object),
-          isArrLike = isArr || isBuffer(object) || isTypedArray(object);
-
-      iteratee = getIteratee(iteratee, 4);
-      if (accumulator == null) {
-        var Ctor = object && object.constructor;
-        if (isArrLike) {
-          accumulator = isArr ? new Ctor : [];
-        }
-        else if (isObject(object)) {
-          accumulator = isFunction(Ctor) ? baseCreate(getPrototype(object)) : {};
-        }
-        else {
-          accumulator = {};
-        }
-      }
-      (isArrLike ? arrayEach : baseForOwn)(object, function(value, index, object) {
-        return iteratee(accumulator, value, index, object);
-      });
-      return accumulator;
-    }
-
-    /**
-     * Removes the property at `path` of `object`.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Object
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to unset.
-     * @returns {boolean} Returns `true` if the property is deleted, else `false`.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': 7 } }] };
-     * _.unset(object, 'a[0].b.c');
-     * // => true
-     *
-     * console.log(object);
-     * // => { 'a': [{ 'b': {} }] };
-     *
-     * _.unset(object, ['a', '0', 'b', 'c']);
-     * // => true
-     *
-     * console.log(object);
-     * // => { 'a': [{ 'b': {} }] };
-     */
-    function unset(object, path) {
-      return object == null ? true : baseUnset(object, path);
-    }
-
-    /**
-     * This method is like `_.set` except that accepts `updater` to produce the
-     * value to set. Use `_.updateWith` to customize `path` creation. The `updater`
-     * is invoked with one argument: (value).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.6.0
-     * @category Object
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to set.
-     * @param {Function} updater The function to produce the updated value.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * var object = { 'a': [{ 'b': { 'c': 3 } }] };
-     *
-     * _.update(object, 'a[0].b.c', function(n) { return n * n; });
-     * console.log(object.a[0].b.c);
-     * // => 9
-     *
-     * _.update(object, 'x[0].y.z', function(n) { return n ? n + 1 : 0; });
-     * console.log(object.x[0].y.z);
-     * // => 0
-     */
-    function update(object, path, updater) {
-      return object == null ? object : baseUpdate(object, path, castFunction(updater));
-    }
-
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.6.0
-     * @category Object
-     * @param {Object} object The object to modify.
-     * @param {Array|string} path The path of the property to set.
-     * @param {Function} updater The function to produce the updated value.
-     * @param {Function} [customizer] The function to customize assigned values.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    function updateWith(object, path, updater, customizer) {
-      customizer = typeof customizer == 'function' ? customizer : undefined;
-      return object == null ? object : baseUpdate(object, path, castFunction(updater), customizer);
-    }
-
-    /**
-     * Creates an array of the own enumerable string keyed property values of `object`.
-     *
-     * **Note:** Non-object values are coerced to objects.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Object
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property values.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.values(new Foo);
-     * // => [1, 2] (iteration order is not guaranteed)
-     *
-     * _.values('hi');
-     * // => ['h', 'i']
-     */
-    function values(object) {
-      return object == null ? [] : baseValues(object, keys(object));
-    }
-
-    /**
-     * Creates an array of the own and inherited enumerable string keyed property
-     * values of `object`.
-     *
-     * **Note:** Non-object values are coerced to objects.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Object
-     * @param {Object} object The object to query.
-     * @returns {Array} Returns the array of property values.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = 1;
-     *   this.b = 2;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     *
-     * _.valuesIn(new Foo);
-     * // => [1, 2, 3] (iteration order is not guaranteed)
-     */
-    function valuesIn(object) {
-      return object == null ? [] : baseValues(object, keysIn(object));
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Number
-     * @param {number} number The number to clamp.
-     * @param {number} [lower] The lower bound.
-     * @param {number} upper The upper bound.
-     * @returns {number} Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    function clamp(number, lower, upper) {
-      if (upper === undefined) {
-        upper = lower;
-        lower = undefined;
-      }
-      if (upper !== undefined) {
-        upper = toNumber(upper);
-        upper = upper === upper ? upper : 0;
-      }
-      if (lower !== undefined) {
-        lower = toNumber(lower);
-        lower = lower === lower ? lower : 0;
-      }
-      return baseClamp(toNumber(number), lower, upper);
-    }
-
-    /**
-     * Checks if `n` is between `start` and up to, but not including, `end`. If
-     * `end` is not specified, it's set to `start` with `start` then set to `0`.
-     * If `start` is greater than `end` the params are swapped to support
-     * negative ranges.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.3.0
-     * @category Number
-     * @param {number} number The number to check.
-     * @param {number} [start=0] The start of the range.
-     * @param {number} end The end of the range.
-     * @returns {boolean} Returns `true` if `number` is in the range, else `false`.
-     * @see _.range, _.rangeRight
-     * @example
-     *
-     * _.inRange(3, 2, 4);
-     * // => true
-     *
-     * _.inRange(4, 8);
-     * // => true
-     *
-     * _.inRange(4, 2);
-     * // => false
-     *
-     * _.inRange(2, 2);
-     * // => false
-     *
-     * _.inRange(1.2, 2);
-     * // => true
-     *
-     * _.inRange(5.2, 4);
-     * // => false
-     *
-     * _.inRange(-3, -2, -6);
-     * // => true
-     */
-    function inRange(number, start, end) {
-      start = toFinite(start);
-      if (end === undefined) {
-        end = start;
-        start = 0;
-      } else {
-        end = toFinite(end);
-      }
-      number = toNumber(number);
-      return baseInRange(number, start, end);
-    }
-
-    /**
-     * Produces a random number between the inclusive `lower` and `upper` bounds.
-     * If only one argument is provided a number between `0` and the given number
-     * is returned. If `floating` is `true`, or either `lower` or `upper` are
-     * floats, a floating-point number is returned instead of an integer.
-     *
-     * **Note:** JavaScript follows the IEEE-754 standard for resolving
-     * floating-point values which can produce unexpected results.
-     *
-     * @static
-     * @memberOf _
-     * @since 0.7.0
-     * @category Number
-     * @param {number} [lower=0] The lower bound.
-     * @param {number} [upper=1] The upper bound.
-     * @param {boolean} [floating] Specify returning a floating-point number.
-     * @returns {number} Returns the random number.
-     * @example
-     *
-     * _.random(0, 5);
-     * // => an integer between 0 and 5
-     *
-     * _.random(5);
-     * // => also an integer between 0 and 5
-     *
-     * _.random(5, true);
-     * // => a floating-point number between 0 and 5
-     *
-     * _.random(1.2, 5.2);
-     * // => a floating-point number between 1.2 and 5.2
-     */
-    function random(lower, upper, floating) {
-      if (floating && typeof floating != 'boolean' && isIterateeCall(lower, upper, floating)) {
-        upper = floating = undefined;
-      }
-      if (floating === undefined) {
-        if (typeof upper == 'boolean') {
-          floating = upper;
-          upper = undefined;
-        }
-        else if (typeof lower == 'boolean') {
-          floating = lower;
-          lower = undefined;
-        }
-      }
-      if (lower === undefined && upper === undefined) {
-        lower = 0;
-        upper = 1;
-      }
-      else {
-        lower = toFinite(lower);
-        if (upper === undefined) {
-          upper = lower;
-          lower = 0;
-        } else {
-          upper = toFinite(upper);
-        }
-      }
-      if (lower > upper) {
-        var temp = lower;
-        lower = upper;
-        upper = temp;
-      }
-      if (floating || lower % 1 || upper % 1) {
-        var rand = nativeRandom();
-        return nativeMin(lower + (rand * (upper - lower + freeParseFloat('1e-' + ((rand + '').length - 1)))), upper);
-      }
-      return baseRandom(lower, upper);
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Converts `string` to [camel case](https://en.wikipedia.org/wiki/CamelCase).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the camel cased string.
-     * @example
-     *
-     * _.camelCase('Foo Bar');
-     * // => 'fooBar'
-     *
-     * _.camelCase('--foo-bar--');
-     * // => 'fooBar'
-     *
-     * _.camelCase('__FOO_BAR__');
-     * // => 'fooBar'
-     */
-    var camelCase = createCompounder(function(result, word, index) {
-      word = word.toLowerCase();
-      return result + (index ? capitalize(word) : word);
-    });
-
-    /**
-     * Converts the first character of `string` to upper case and the remaining
-     * to lower case.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to capitalize.
-     * @returns {string} Returns the capitalized string.
-     * @example
-     *
-     * _.capitalize('FRED');
-     * // => 'Fred'
-     */
-    function capitalize(string) {
-      return upperFirst(toString(string).toLowerCase());
-    }
-
-    /**
-     * Deburrs `string` by converting
-     * [Latin-1 Supplement](https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)#Character_table)
-     * and [Latin Extended-A](https://en.wikipedia.org/wiki/Latin_Extended-A)
-     * letters to basic Latin letters and removing
-     * [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to deburr.
-     * @returns {string} Returns the deburred string.
-     * @example
-     *
-     * _.deburr('déjà vu');
-     * // => 'deja vu'
-     */
-    function deburr(string) {
-      string = toString(string);
-      return string && string.replace(reLatin, deburrLetter).replace(reComboMark, '');
-    }
-
-    /**
-     * Checks if `string` ends with the given target string.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to inspect.
-     * @param {string} [target] The string to search for.
-     * @param {number} [position=string.length] The position to search up to.
-     * @returns {boolean} Returns `true` if `string` ends with `target`,
-     *  else `false`.
-     * @example
-     *
-     * _.endsWith('abc', 'c');
-     * // => true
-     *
-     * _.endsWith('abc', 'b');
-     * // => false
-     *
-     * _.endsWith('abc', 'b', 2);
-     * // => true
-     */
-    function endsWith(string, target, position) {
-      string = toString(string);
-      target = baseToString(target);
-
-      var length = string.length;
-      position = position === undefined
-        ? length
-        : baseClamp(toInteger(position), 0, length);
-
-      var end = position;
-      position -= target.length;
-      return position >= 0 && string.slice(position, end) == target;
-    }
-
-    /**
-     * Converts the characters "&", "<", ">", '"', and "'" in `string` to their
-     * corresponding HTML entities.
-     *
-     * **Note:** No other characters are escaped. To escape additional
-     * characters use a third-party library like [_he_](https://mths.be/he).
-     *
-     * Though the ">" character is escaped for symmetry, characters like
-     * ">" and "/" don't need escaping in HTML and have no special meaning
-     * unless they're part of a tag or unquoted attribute value. See
-     * [Mathias Bynens's article](https://mathiasbynens.be/notes/ambiguous-ampersands)
-     * (under "semi-related fun fact") for more details.
-     *
-     * When working with HTML you should always
-     * [quote attribute values](http://wonko.com/post/html-escaping) to reduce
-     * XSS vectors.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category String
-     * @param {string} [string=''] The string to escape.
-     * @returns {string} Returns the escaped string.
-     * @example
-     *
-     * _.escape('fred, barney, & pebbles');
-     * // => 'fred, barney, &amp; pebbles'
-     */
-    function escape(string) {
-      string = toString(string);
-      return (string && reHasUnescapedHtml.test(string))
-        ? string.replace(reUnescapedHtml, escapeHtmlChar)
-        : string;
-    }
-
-    /**
-     * Escapes the `RegExp` special characters "^", "$", "\", ".", "*", "+",
-     * "?", "(", ")", "[", "]", "{", "}", and "|" in `string`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to escape.
-     * @returns {string} Returns the escaped string.
-     * @example
-     *
-     * _.escapeRegExp('[lodash](https://lodash.com/)');
-     * // => '\[lodash\]\(https://lodash\.com/\)'
-     */
-    function escapeRegExp(string) {
-      string = toString(string);
-      return (string && reHasRegExpChar.test(string))
-        ? string.replace(reRegExpChar, '\\$&')
-        : string;
-    }
-
-    /**
-     * Converts `string` to
-     * [kebab case](https://en.wikipedia.org/wiki/Letter_case#Special_case_styles).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the kebab cased string.
-     * @example
-     *
-     * _.kebabCase('Foo Bar');
-     * // => 'foo-bar'
-     *
-     * _.kebabCase('fooBar');
-     * // => 'foo-bar'
-     *
-     * _.kebabCase('__FOO_BAR__');
-     * // => 'foo-bar'
-     */
-    var kebabCase = createCompounder(function(result, word, index) {
-      return result + (index ? '-' : '') + word.toLowerCase();
-    });
-
-    /**
-     * Converts `string`, as space separated words, to lower case.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the lower cased string.
-     * @example
-     *
-     * _.lowerCase('--Foo-Bar--');
-     * // => 'foo bar'
-     *
-     * _.lowerCase('fooBar');
-     * // => 'foo bar'
-     *
-     * _.lowerCase('__FOO_BAR__');
-     * // => 'foo bar'
-     */
-    var lowerCase = createCompounder(function(result, word, index) {
-      return result + (index ? ' ' : '') + word.toLowerCase();
-    });
-
-    /**
-     * Converts the first character of `string` to lower case.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the converted string.
-     * @example
-     *
-     * _.lowerFirst('Fred');
-     * // => 'fred'
-     *
-     * _.lowerFirst('FRED');
-     * // => 'fRED'
-     */
-    var lowerFirst = createCaseFirst('toLowerCase');
-
-    /**
-     * Pads `string` on the left and right sides if it's shorter than `length`.
-     * Padding characters are truncated if they can't be evenly divided by `length`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to pad.
-     * @param {number} [length=0] The padding length.
-     * @param {string} [chars=' '] The string used as padding.
-     * @returns {string} Returns the padded string.
-     * @example
-     *
-     * _.pad('abc', 8);
-     * // => '  abc   '
-     *
-     * _.pad('abc', 8, '_-');
-     * // => '_-abc_-_'
-     *
-     * _.pad('abc', 3);
-     * // => 'abc'
-     */
-    function pad(string, length, chars) {
-      string = toString(string);
-      length = toInteger(length);
-
-      var strLength = length ? stringSize(string) : 0;
-      if (!length || strLength >= length) {
-        return string;
-      }
-      var mid = (length - strLength) / 2;
-      return (
-        createPadding(nativeFloor(mid), chars) +
-        string +
-        createPadding(nativeCeil(mid), chars)
-      );
-    }
-
-    /**
-     * Pads `string` on the right side if it's shorter than `length`. Padding
-     * characters are truncated if they exceed `length`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to pad.
-     * @param {number} [length=0] The padding length.
-     * @param {string} [chars=' '] The string used as padding.
-     * @returns {string} Returns the padded string.
-     * @example
-     *
-     * _.padEnd('abc', 6);
-     * // => 'abc   '
-     *
-     * _.padEnd('abc', 6, '_-');
-     * // => 'abc_-_'
-     *
-     * _.padEnd('abc', 3);
-     * // => 'abc'
-     */
-    function padEnd(string, length, chars) {
-      string = toString(string);
-      length = toInteger(length);
-
-      var strLength = length ? stringSize(string) : 0;
-      return (length && strLength < length)
-        ? (string + createPadding(length - strLength, chars))
-        : string;
-    }
-
-    /**
-     * Pads `string` on the left side if it's shorter than `length`. Padding
-     * characters are truncated if they exceed `length`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to pad.
-     * @param {number} [length=0] The padding length.
-     * @param {string} [chars=' '] The string used as padding.
-     * @returns {string} Returns the padded string.
-     * @example
-     *
-     * _.padStart('abc', 6);
-     * // => '   abc'
-     *
-     * _.padStart('abc', 6, '_-');
-     * // => '_-_abc'
-     *
-     * _.padStart('abc', 3);
-     * // => 'abc'
-     */
-    function padStart(string, length, chars) {
-      string = toString(string);
-      length = toInteger(length);
-
-      var strLength = length ? stringSize(string) : 0;
-      return (length && strLength < length)
-        ? (createPadding(length - strLength, chars) + string)
-        : string;
-    }
-
-    /**
-     * Converts `string` to an integer of the specified radix. If `radix` is
-     * `undefined` or `0`, a `radix` of `10` is used unless `value` is a
-     * hexadecimal, in which case a `radix` of `16` is used.
-     *
-     * **Note:** This method aligns with the
-     * [ES5 implementation](https://es5.github.io/#x15.1.2.2) of `parseInt`.
-     *
-     * @static
-     * @memberOf _
-     * @since 1.1.0
-     * @category String
-     * @param {string} string The string to convert.
-     * @param {number} [radix=10] The radix to interpret `value` by.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {number} Returns the converted integer.
-     * @example
-     *
-     * _.parseInt('08');
-     * // => 8
-     *
-     * _.map(['6', '08', '10'], _.parseInt);
-     * // => [6, 8, 10]
-     */
-    function parseInt(string, radix, guard) {
-      if (guard || radix == null) {
-        radix = 0;
-      } else if (radix) {
-        radix = +radix;
-      }
-      return nativeParseInt(toString(string).replace(reTrimStart, ''), radix || 0);
-    }
-
-    /**
-     * Repeats the given string `n` times.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to repeat.
-     * @param {number} [n=1] The number of times to repeat the string.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {string} Returns the repeated string.
-     * @example
-     *
-     * _.repeat('*', 3);
-     * // => '***'
-     *
-     * _.repeat('abc', 2);
-     * // => 'abcabc'
-     *
-     * _.repeat('abc', 0);
-     * // => ''
-     */
-    function repeat(string, n, guard) {
-      if ((guard ? isIterateeCall(string, n, guard) : n === undefined)) {
-        n = 1;
-      } else {
-        n = toInteger(n);
-      }
-      return baseRepeat(toString(string), n);
-    }
-
-    /**
-     * Replaces matches for `pattern` in `string` with `replacement`.
-     *
-     * **Note:** This method is based on
-     * [`String#replace`](https://mdn.io/String/replace).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to modify.
-     * @param {RegExp|string} pattern The pattern to replace.
-     * @param {Function|string} replacement The match replacement.
-     * @returns {string} Returns the modified string.
-     * @example
-     *
-     * _.replace('Hi Fred', 'Fred', 'Barney');
-     * // => 'Hi Barney'
-     */
-    function replace() {
-      var args = arguments,
-          string = toString(args[0]);
-
-      return args.length < 3 ? string : string.replace(args[1], args[2]);
-    }
-
-    /**
-     * Converts `string` to
-     * [snake case](https://en.wikipedia.org/wiki/Snake_case).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the snake cased string.
-     * @example
-     *
-     * _.snakeCase('Foo Bar');
-     * // => 'foo_bar'
-     *
-     * _.snakeCase('fooBar');
-     * // => 'foo_bar'
-     *
-     * _.snakeCase('--FOO-BAR--');
-     * // => 'foo_bar'
-     */
-    var snakeCase = createCompounder(function(result, word, index) {
-      return result + (index ? '_' : '') + word.toLowerCase();
-    });
-
-    /**
-     * Splits `string` by `separator`.
-     *
-     * **Note:** This method is based on
-     * [`String#split`](https://mdn.io/String/split).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to split.
-     * @param {RegExp|string} separator The separator pattern to split by.
-     * @param {number} [limit] The length to truncate results to.
-     * @returns {Array} Returns the string segments.
-     * @example
-     *
-     * _.split('a-b-c', '-', 2);
-     * // => ['a', 'b']
-     */
-    function split(string, separator, limit) {
-      if (limit && typeof limit != 'number' && isIterateeCall(string, separator, limit)) {
-        separator = limit = undefined;
-      }
-      limit = limit === undefined ? MAX_ARRAY_LENGTH : limit >>> 0;
-      if (!limit) {
-        return [];
-      }
-      string = toString(string);
-      if (string && (
-            typeof separator == 'string' ||
-            (separator != null && !isRegExp(separator))
-          )) {
-        separator = baseToString(separator);
-        if (!separator && hasUnicode(string)) {
-          return castSlice(stringToArray(string), 0, limit);
-        }
-      }
-      return string.split(separator, limit);
-    }
-
-    /**
-     * Converts `string` to
-     * [start case](https://en.wikipedia.org/wiki/Letter_case#Stylistic_or_specialised_usage).
-     *
-     * @static
-     * @memberOf _
-     * @since 3.1.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the start cased string.
-     * @example
-     *
-     * _.startCase('--foo-bar--');
-     * // => 'Foo Bar'
-     *
-     * _.startCase('fooBar');
-     * // => 'Foo Bar'
-     *
-     * _.startCase('__FOO_BAR__');
-     * // => 'FOO BAR'
-     */
-    var startCase = createCompounder(function(result, word, index) {
-      return result + (index ? ' ' : '') + upperFirst(word);
-    });
-
-    /**
-     * Checks if `string` starts with the given target string.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to inspect.
-     * @param {string} [target] The string to search for.
-     * @param {number} [position=0] The position to search from.
-     * @returns {boolean} Returns `true` if `string` starts with `target`,
-     *  else `false`.
-     * @example
-     *
-     * _.startsWith('abc', 'a');
-     * // => true
-     *
-     * _.startsWith('abc', 'b');
-     * // => false
-     *
-     * _.startsWith('abc', 'b', 1);
-     * // => true
-     */
-    function startsWith(string, target, position) {
-      string = toString(string);
-      position = position == null
-        ? 0
-        : baseClamp(toInteger(position), 0, string.length);
-
-      target = baseToString(target);
-      return string.slice(position, position + target.length) == target;
-    }
-
-    /**
-     * Creates a compiled template function that can interpolate data properties
-     * in "interpolate" delimiters, HTML-escape interpolated data properties in
-     * "escape" delimiters, and execute JavaScript in "evaluate" delimiters. Data
-     * properties may be accessed as free variables in the template. If a setting
-     * object is given, it takes precedence over `_.templateSettings` values.
-     *
-     * **Note:** In the development build `_.template` utilizes
-     * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl)
-     * for easier debugging.
-     *
-     * For more information on precompiling templates see
-     * [lodash's custom builds documentation](https://lodash.com/custom-builds).
-     *
-     * For more information on Chrome extension sandboxes see
-     * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category String
-     * @param {string} [string=''] The template string.
-     * @param {Object} [options={}] The options object.
-     * @param {RegExp} [options.escape=_.templateSettings.escape]
-     *  The HTML "escape" delimiter.
-     * @param {RegExp} [options.evaluate=_.templateSettings.evaluate]
-     *  The "evaluate" delimiter.
-     * @param {Object} [options.imports=_.templateSettings.imports]
-     *  An object to import into the template as free variables.
-     * @param {RegExp} [options.interpolate=_.templateSettings.interpolate]
-     *  The "interpolate" delimiter.
-     * @param {string} [options.sourceURL='lodash.templateSources[n]']
-     *  The sourceURL of the compiled template.
-     * @param {string} [options.variable='obj']
-     *  The data object variable name.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Function} Returns the compiled template function.
-     * @example
-     *
-     * // Use the "interpolate" delimiter to create a compiled template.
-     * var compiled = _.template('hello <%= user %>!');
-     * compiled({ 'user': 'fred' });
-     * // => 'hello fred!'
-     *
-     * // Use the HTML "escape" delimiter to escape data property values.
-     * var compiled = _.template('<b><%- value %></b>');
-     * compiled({ 'value': '<script>' });
-     * // => '<b>&lt;script&gt;</b>'
-     *
-     * // Use the "evaluate" delimiter to execute JavaScript and generate HTML.
-     * var compiled = _.template('<% _.forEach(users, function(user) { %><li><%- user %></li><% }); %>');
-     * compiled({ 'users': ['fred', 'barney'] });
-     * // => '<li>fred</li><li>barney</li>'
-     *
-     * // Use the internal `print` function in "evaluate" delimiters.
-     * var compiled = _.template('<% print("hello " + user); %>!');
-     * compiled({ 'user': 'barney' });
-     * // => 'hello barney!'
-     *
-     * // Use the ES template literal delimiter as an "interpolate" delimiter.
-     * // Disable support by replacing the "interpolate" delimiter.
-     * var compiled = _.template('hello ${ user }!');
-     * compiled({ 'user': 'pebbles' });
-     * // => 'hello pebbles!'
-     *
-     * // Use backslashes to treat delimiters as plain text.
-     * var compiled = _.template('<%= "\\<%- value %\\>" %>');
-     * compiled({ 'value': 'ignored' });
-     * // => '<%- value %>'
-     *
-     * // Use the `imports` option to import `jQuery` as `jq`.
-     * var text = '<% jq.each(users, function(user) { %><li><%- user %></li><% }); %>';
-     * var compiled = _.template(text, { 'imports': { 'jq': jQuery } });
-     * compiled({ 'users': ['fred', 'barney'] });
-     * // => '<li>fred</li><li>barney</li>'
-     *
-     * // Use the `sourceURL` option to specify a custom sourceURL for the template.
-     * var compiled = _.template('hello <%= user %>!', { 'sourceURL': '/basic/greeting.jst' });
-     * compiled(data);
-     * // => Find the source of "greeting.jst" under the Sources tab or Resources panel of the web inspector.
-     *
-     * // Use the `variable` option to ensure a with-statement isn't used in the compiled template.
-     * var compiled = _.template('hi <%= data.user %>!', { 'variable': 'data' });
-     * compiled.source;
-     * // => function(data) {
-     * //   var __t, __p = '';
-     * //   __p += 'hi ' + ((__t = ( data.user )) == null ? '' : __t) + '!';
-     * //   return __p;
-     * // }
-     *
-     * // Use custom template delimiters.
-     * _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
-     * var compiled = _.template('hello {{ user }}!');
-     * compiled({ 'user': 'mustache' });
-     * // => 'hello mustache!'
-     *
-     * // Use the `source` property to inline compiled templates for meaningful
-     * // line numbers in error messages and stack traces.
-     * fs.writeFileSync(path.join(process.cwd(), 'jst.js'), '\
-     *   var JST = {\
-     *     "main": ' + _.template(mainText).source + '\
-     *   };\
-     * ');
-     */
-    function template(string, options, guard) {
-      // Based on John Resig's `tmpl` implementation
-      // (http://ejohn.org/blog/javascript-micro-templating/)
-      // and Laura Doktorova's doT.js (https://github.com/olado/doT).
-      var settings = lodash.templateSettings;
-
-      if (guard && isIterateeCall(string, options, guard)) {
-        options = undefined;
-      }
-      string = toString(string);
-      options = assignInWith({}, options, settings, customDefaultsAssignIn);
-
-      var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn),
-          importsKeys = keys(imports),
-          importsValues = baseValues(imports, importsKeys);
-
-      var isEscaping,
-          isEvaluating,
-          index = 0,
-          interpolate = options.interpolate || reNoMatch,
-          source = "__p += '";
-
-      // Compile the regexp to match each delimiter.
-      var reDelimiters = RegExp(
-        (options.escape || reNoMatch).source + '|' +
-        interpolate.source + '|' +
-        (interpolate === reInterpolate ? reEsTemplate : reNoMatch).source + '|' +
-        (options.evaluate || reNoMatch).source + '|$'
-      , 'g');
-
-      // Use a sourceURL for easier debugging.
-      var sourceURL = '//# sourceURL=' +
-        ('sourceURL' in options
-          ? options.sourceURL
-          : ('lodash.templateSources[' + (++templateCounter) + ']')
-        ) + '\n';
-
-      string.replace(reDelimiters, function(match, escapeValue, interpolateValue, esTemplateValue, evaluateValue, offset) {
-        interpolateValue || (interpolateValue = esTemplateValue);
-
-        // Escape characters that can't be included in string literals.
-        source += string.slice(index, offset).replace(reUnescapedString, escapeStringChar);
-
-        // Replace delimiters with snippets.
-        if (escapeValue) {
-          isEscaping = true;
-          source += "' +\n__e(" + escapeValue + ") +\n'";
-        }
-        if (evaluateValue) {
-          isEvaluating = true;
-          source += "';\n" + evaluateValue + ";\n__p += '";
-        }
-        if (interpolateValue) {
-          source += "' +\n((__t = (" + interpolateValue + ")) == null ? '' : __t) +\n'";
-        }
-        index = offset + match.length;
-
-        // The JS engine embedded in Adobe products needs `match` returned in
-        // order to produce the correct `offset` value.
-        return match;
-      });
-
-      source += "';\n";
-
-      // If `variable` is not specified wrap a with-statement around the generated
-      // code to add the data object to the top of the scope chain.
-      var variable = options.variable;
-      if (!variable) {
-        source = 'with (obj) {\n' + source + '\n}\n';
-      }
-      // Cleanup code by stripping empty strings.
-      source = (isEvaluating ? source.replace(reEmptyStringLeading, '') : source)
-        .replace(reEmptyStringMiddle, '$1')
-        .replace(reEmptyStringTrailing, '$1;');
-
-      // Frame code as the function body.
-      source = 'function(' + (variable || 'obj') + ') {\n' +
-        (variable
-          ? ''
-          : 'obj || (obj = {});\n'
-        ) +
-        "var __t, __p = ''" +
-        (isEscaping
-           ? ', __e = _.escape'
-           : ''
-        ) +
-        (isEvaluating
-          ? ', __j = Array.prototype.join;\n' +
-            "function print() { __p += __j.call(arguments, '') }\n"
-          : ';\n'
-        ) +
-        source +
-        'return __p\n}';
-
-      var result = attempt(function() {
-        return Function(importsKeys, sourceURL + 'return ' + source)
-          .apply(undefined, importsValues);
-      });
-
-      // Provide the compiled function's source by its `toString` method or
-      // the `source` property as a convenience for inlining compiled templates.
-      result.source = source;
-      if (isError(result)) {
-        throw result;
-      }
-      return result;
-    }
-
-    /**
-     * Converts `string`, as a whole, to lower case just like
-     * [String#toLowerCase](https://mdn.io/toLowerCase).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the lower cased string.
-     * @example
-     *
-     * _.toLower('--Foo-Bar--');
-     * // => '--foo-bar--'
-     *
-     * _.toLower('fooBar');
-     * // => 'foobar'
-     *
-     * _.toLower('__FOO_BAR__');
-     * // => '__foo_bar__'
-     */
-    function toLower(value) {
-      return toString(value).toLowerCase();
-    }
-
-    /**
-     * Converts `string`, as a whole, to upper case just like
-     * [String#toUpperCase](https://mdn.io/toUpperCase).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the upper cased string.
-     * @example
-     *
-     * _.toUpper('--foo-bar--');
-     * // => '--FOO-BAR--'
-     *
-     * _.toUpper('fooBar');
-     * // => 'FOOBAR'
-     *
-     * _.toUpper('__foo_bar__');
-     * // => '__FOO_BAR__'
-     */
-    function toUpper(value) {
-      return toString(value).toUpperCase();
-    }
-
-    /**
-     * Removes leading and trailing whitespace or specified characters from `string`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to trim.
-     * @param {string} [chars=whitespace] The characters to trim.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {string} Returns the trimmed string.
-     * @example
-     *
-     * _.trim('  abc  ');
-     * // => 'abc'
-     *
-     * _.trim('-_-abc-_-', '_-');
-     * // => 'abc'
-     *
-     * _.map(['  foo  ', '  bar  '], _.trim);
-     * // => ['foo', 'bar']
-     */
-    function trim(string, chars, guard) {
-      string = toString(string);
-      if (string && (guard || chars === undefined)) {
-        return string.replace(reTrim, '');
-      }
-      if (!string || !(chars = baseToString(chars))) {
-        return string;
-      }
-      var strSymbols = stringToArray(string),
-          chrSymbols = stringToArray(chars),
-          start = charsStartIndex(strSymbols, chrSymbols),
-          end = charsEndIndex(strSymbols, chrSymbols) + 1;
-
-      return castSlice(strSymbols, start, end).join('');
-    }
-
-    /**
-     * Removes trailing whitespace or specified characters from `string`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to trim.
-     * @param {string} [chars=whitespace] The characters to trim.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {string} Returns the trimmed string.
-     * @example
-     *
-     * _.trimEnd('  abc  ');
-     * // => '  abc'
-     *
-     * _.trimEnd('-_-abc-_-', '_-');
-     * // => '-_-abc'
-     */
-    function trimEnd(string, chars, guard) {
-      string = toString(string);
-      if (string && (guard || chars === undefined)) {
-        return string.replace(reTrimEnd, '');
-      }
-      if (!string || !(chars = baseToString(chars))) {
-        return string;
-      }
-      var strSymbols = stringToArray(string),
-          end = charsEndIndex(strSymbols, stringToArray(chars)) + 1;
-
-      return castSlice(strSymbols, 0, end).join('');
-    }
-
-    /**
-     * Removes leading whitespace or specified characters from `string`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to trim.
-     * @param {string} [chars=whitespace] The characters to trim.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {string} Returns the trimmed string.
-     * @example
-     *
-     * _.trimStart('  abc  ');
-     * // => 'abc  '
-     *
-     * _.trimStart('-_-abc-_-', '_-');
-     * // => 'abc-_-'
-     */
-    function trimStart(string, chars, guard) {
-      string = toString(string);
-      if (string && (guard || chars === undefined)) {
-        return string.replace(reTrimStart, '');
-      }
-      if (!string || !(chars = baseToString(chars))) {
-        return string;
-      }
-      var strSymbols = stringToArray(string),
-          start = charsStartIndex(strSymbols, stringToArray(chars));
-
-      return castSlice(strSymbols, start).join('');
-    }
-
-    /**
-     * Truncates `string` if it's longer than the given maximum string length.
-     * The last characters of the truncated string are replaced with the omission
-     * string which defaults to "...".
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to truncate.
-     * @param {Object} [options={}] The options object.
-     * @param {number} [options.length=30] The maximum string length.
-     * @param {string} [options.omission='...'] The string to indicate text is omitted.
-     * @param {RegExp|string} [options.separator] The separator pattern to truncate to.
-     * @returns {string} Returns the truncated string.
-     * @example
-     *
-     * _.truncate('hi-diddly-ho there, neighborino');
-     * // => 'hi-diddly-ho there, neighbo...'
-     *
-     * _.truncate('hi-diddly-ho there, neighborino', {
-     *   'length': 24,
-     *   'separator': ' '
-     * });
-     * // => 'hi-diddly-ho there,...'
-     *
-     * _.truncate('hi-diddly-ho there, neighborino', {
-     *   'length': 24,
-     *   'separator': /,? +/
-     * });
-     * // => 'hi-diddly-ho there...'
-     *
-     * _.truncate('hi-diddly-ho there, neighborino', {
-     *   'omission': ' [...]'
-     * });
-     * // => 'hi-diddly-ho there, neig [...]'
-     */
-    function truncate(string, options) {
-      var length = DEFAULT_TRUNC_LENGTH,
-          omission = DEFAULT_TRUNC_OMISSION;
-
-      if (isObject(options)) {
-        var separator = 'separator' in options ? options.separator : separator;
-        length = 'length' in options ? toInteger(options.length) : length;
-        omission = 'omission' in options ? baseToString(options.omission) : omission;
-      }
-      string = toString(string);
-
-      var strLength = string.length;
-      if (hasUnicode(string)) {
-        var strSymbols = stringToArray(string);
-        strLength = strSymbols.length;
-      }
-      if (length >= strLength) {
-        return string;
-      }
-      var end = length - stringSize(omission);
-      if (end < 1) {
-        return omission;
-      }
-      var result = strSymbols
-        ? castSlice(strSymbols, 0, end).join('')
-        : string.slice(0, end);
-
-      if (separator === undefined) {
-        return result + omission;
-      }
-      if (strSymbols) {
-        end += (result.length - end);
-      }
-      if (isRegExp(separator)) {
-        if (string.slice(end).search(separator)) {
-          var match,
-              substring = result;
-
-          if (!separator.global) {
-            separator = RegExp(separator.source, toString(reFlags.exec(separator)) + 'g');
-          }
-          separator.lastIndex = 0;
-          while ((match = separator.exec(substring))) {
-            var newEnd = match.index;
-          }
-          result = result.slice(0, newEnd === undefined ? end : newEnd);
-        }
-      } else if (string.indexOf(baseToString(separator), end) != end) {
-        var index = result.lastIndexOf(separator);
-        if (index > -1) {
-          result = result.slice(0, index);
-        }
-      }
-      return result + omission;
-    }
-
-    /**
-     * The inverse of `_.escape`; this method converts the HTML entities
-     * `&amp;`, `&lt;`, `&gt;`, `&quot;`, and `&#39;` in `string` to
-     * their corresponding characters.
-     *
-     * **Note:** No other HTML entities are unescaped. To unescape additional
-     * HTML entities use a third-party library like [_he_](https://mths.be/he).
-     *
-     * @static
-     * @memberOf _
-     * @since 0.6.0
-     * @category String
-     * @param {string} [string=''] The string to unescape.
-     * @returns {string} Returns the unescaped string.
-     * @example
-     *
-     * _.unescape('fred, barney, &amp; pebbles');
-     * // => 'fred, barney, & pebbles'
-     */
-    function unescape(string) {
-      string = toString(string);
-      return (string && reHasEscapedHtml.test(string))
-        ? string.replace(reEscapedHtml, unescapeHtmlChar)
-        : string;
-    }
-
-    /**
-     * Converts `string`, as space separated words, to upper case.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the upper cased string.
-     * @example
-     *
-     * _.upperCase('--foo-bar');
-     * // => 'FOO BAR'
-     *
-     * _.upperCase('fooBar');
-     * // => 'FOO BAR'
-     *
-     * _.upperCase('__foo_bar__');
-     * // => 'FOO BAR'
-     */
-    var upperCase = createCompounder(function(result, word, index) {
-      return result + (index ? ' ' : '') + word.toUpperCase();
-    });
-
-    /**
-     * Converts the first character of `string` to upper case.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category String
-     * @param {string} [string=''] The string to convert.
-     * @returns {string} Returns the converted string.
-     * @example
-     *
-     * _.upperFirst('fred');
-     * // => 'Fred'
-     *
-     * _.upperFirst('FRED');
-     * // => 'FRED'
-     */
-    var upperFirst = createCaseFirst('toUpperCase');
-
-    /**
-     * Splits `string` into an array of its words.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category String
-     * @param {string} [string=''] The string to inspect.
-     * @param {RegExp|string} [pattern] The pattern to match words.
-     * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
-     * @returns {Array} Returns the words of `string`.
-     * @example
-     *
-     * _.words('fred, barney, & pebbles');
-     * // => ['fred', 'barney', 'pebbles']
-     *
-     * _.words('fred, barney, & pebbles', /[^, ]+/g);
-     * // => ['fred', 'barney', '&', 'pebbles']
-     */
-    function words(string, pattern, guard) {
-      string = toString(string);
-      pattern = guard ? undefined : pattern;
-
-      if (pattern === undefined) {
-        return hasUnicodeWord(string) ? unicodeWords(string) : asciiWords(string);
-      }
-      return string.match(pattern) || [];
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Attempts to invoke `func`, returning either the result or the caught error
-     * object. Any additional arguments are provided to `func` when it's invoked.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Util
-     * @param {Function} func The function to attempt.
-     * @param {...*} [args] The arguments to invoke `func` with.
-     * @returns {*} Returns the `func` result or error object.
-     * @example
-     *
-     * // Avoid throwing errors for invalid selectors.
-     * var elements = _.attempt(function(selector) {
-     *   return document.querySelectorAll(selector);
-     * }, '>_>');
-     *
-     * if (_.isError(elements)) {
-     *   elements = [];
-     * }
-     */
-    var attempt = baseRest(function(func, args) {
-      try {
-        return apply(func, undefined, args);
-      } catch (e) {
-        return isError(e) ? e : new Error(e);
-      }
-    });
-
-    /**
-     * Binds methods of an object to the object itself, overwriting the existing
-     * method.
-     *
-     * **Note:** This method doesn't set the "length" property of bound functions.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @param {Object} object The object to bind and assign the bound methods to.
-     * @param {...(string|string[])} methodNames The object method names to bind.
-     * @returns {Object} Returns `object`.
-     * @example
-     *
-     * var view = {
-     *   'label': 'docs',
-     *   'click': function() {
-     *     console.log('clicked ' + this.label);
-     *   }
-     * };
-     *
-     * _.bindAll(view, ['click']);
-     * jQuery(element).on('click', view.click);
-     * // => Logs 'clicked docs' when clicked.
-     */
-    var bindAll = flatRest(function(object, methodNames) {
-      arrayEach(methodNames, function(key) {
-        key = toKey(key);
-        baseAssignValue(object, key, bind(object[key], object));
-      });
-      return object;
-    });
-
-    /**
-     * Creates a function that iterates over `pairs` and invokes the corresponding
-     * function of the first predicate to return truthy. The predicate-function
-     * pairs are invoked with the `this` binding and arguments of the created
-     * function.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {Array} pairs The predicate-function pairs.
-     * @returns {Function} Returns the new composite function.
-     * @example
-     *
-     * var func = _.cond([
-     *   [_.matches({ 'a': 1 }),           _.constant('matches A')],
-     *   [_.conforms({ 'b': _.isNumber }), _.constant('matches B')],
-     *   [_.stubTrue,                      _.constant('no match')]
-     * ]);
-     *
-     * func({ 'a': 1, 'b': 2 });
-     * // => 'matches A'
-     *
-     * func({ 'a': 0, 'b': 1 });
-     * // => 'matches B'
-     *
-     * func({ 'a': '1', 'b': '2' });
-     * // => 'no match'
-     */
-    function cond(pairs) {
-      var length = pairs == null ? 0 : pairs.length,
-          toIteratee = getIteratee();
-
-      pairs = !length ? [] : arrayMap(pairs, function(pair) {
-        if (typeof pair[1] != 'function') {
-          throw new TypeError(FUNC_ERROR_TEXT);
-        }
-        return [toIteratee(pair[0]), pair[1]];
-      });
-
-      return baseRest(function(args) {
-        var index = -1;
-        while (++index < length) {
-          var pair = pairs[index];
-          if (apply(pair[0], this, args)) {
-            return apply(pair[1], this, args);
-          }
-        }
-      });
-    }
-
-    /**
-     * Creates a function that invokes the predicate properties of `source` with
-     * the corresponding property values of a given object, returning `true` if
-     * all predicates return truthy, else `false`.
-     *
-     * **Note:** The created function is equivalent to `_.conformsTo` with
-     * `source` partially applied.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {Object} source The object of property predicates to conform to.
-     * @returns {Function} Returns the new spec function.
-     * @example
-     *
-     * var objects = [
-     *   { 'a': 2, 'b': 1 },
-     *   { 'a': 1, 'b': 2 }
-     * ];
-     *
-     * _.filter(objects, _.conforms({ 'b': function(n) { return n > 1; } }));
-     * // => [{ 'a': 1, 'b': 2 }]
-     */
-    function conforms(source) {
-      return baseConforms(baseClone(source, CLONE_DEEP_FLAG));
-    }
-
-    /**
-     * Creates a function that returns `value`.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.4.0
-     * @category Util
-     * @param {*} value The value to return from the new function.
-     * @returns {Function} Returns the new constant function.
-     * @example
-     *
-     * var objects = _.times(2, _.constant({ 'a': 1 }));
-     *
-     * console.log(objects);
-     * // => [{ 'a': 1 }, { 'a': 1 }]
-     *
-     * console.log(objects[0] === objects[1]);
-     * // => true
-     */
-    function constant(value) {
-      return function() {
-        return value;
-      };
-    }
-
-    /**
-     * Checks `value` to determine whether a default value should be returned in
-     * its place. The `defaultValue` is returned if `value` is `NaN`, `null`,
-     * or `undefined`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.14.0
-     * @category Util
-     * @param {*} value The value to check.
-     * @param {*} defaultValue The default value.
-     * @returns {*} Returns the resolved value.
-     * @example
-     *
-     * _.defaultTo(1, 10);
-     * // => 1
-     *
-     * _.defaultTo(undefined, 10);
-     * // => 10
-     */
-    function defaultTo(value, defaultValue) {
-      return (value == null || value !== value) ? defaultValue : value;
-    }
-
-    /**
-     * Creates a function that returns the result of invoking the given functions
-     * with the `this` binding of the created function, where each successive
-     * invocation is supplied the return value of the previous.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Util
-     * @param {...(Function|Function[])} [funcs] The functions to invoke.
-     * @returns {Function} Returns the new composite function.
-     * @see _.flowRight
-     * @example
-     *
-     * function square(n) {
-     *   return n * n;
-     * }
-     *
-     * var addSquare = _.flow([_.add, square]);
-     * addSquare(1, 2);
-     * // => 9
-     */
-    var flow = createFlow();
-
-    /**
-     * This method is like `_.flow` except that it creates a function that
-     * invokes the given functions from right to left.
-     *
-     * @static
-     * @since 3.0.0
-     * @memberOf _
-     * @category Util
-     * @param {...(Function|Function[])} [funcs] The functions to invoke.
-     * @returns {Function} Returns the new composite function.
-     * @see _.flow
-     * @example
-     *
-     * function square(n) {
-     *   return n * n;
-     * }
-     *
-     * var addSquare = _.flowRight([square, _.add]);
-     * addSquare(1, 2);
-     * // => 9
-     */
-    var flowRight = createFlow(true);
-
-    /**
-     * This method returns the first argument it receives.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @param {*} value Any value.
-     * @returns {*} Returns `value`.
-     * @example
-     *
-     * var object = { 'a': 1 };
-     *
-     * console.log(_.identity(object) === object);
-     * // => true
-     */
-    function identity(value) {
-      return value;
-    }
-
-    /**
-     * Creates a function that invokes `func` with the arguments of the created
-     * function. If `func` is a property name, the created function returns the
-     * property value for a given element. If `func` is an array or object, the
-     * created function returns `true` for elements that contain the equivalent
-     * source properties, otherwise it returns `false`.
-     *
-     * @static
-     * @since 4.0.0
-     * @memberOf _
-     * @category Util
-     * @param {*} [func=_.identity] The value to convert to a callback.
-     * @returns {Function} Returns the callback.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36, 'active': true },
-     *   { 'user': 'fred',   'age': 40, 'active': false }
-     * ];
-     *
-     * // The `_.matches` iteratee shorthand.
-     * _.filter(users, _.iteratee({ 'user': 'barney', 'active': true }));
-     * // => [{ 'user': 'barney', 'age': 36, 'active': true }]
-     *
-     * // The `_.matchesProperty` iteratee shorthand.
-     * _.filter(users, _.iteratee(['user', 'fred']));
-     * // => [{ 'user': 'fred', 'age': 40 }]
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.map(users, _.iteratee('user'));
-     * // => ['barney', 'fred']
-     *
-     * // Create custom iteratee shorthands.
-     * _.iteratee = _.wrap(_.iteratee, function(iteratee, func) {
-     *   return !_.isRegExp(func) ? iteratee(func) : function(string) {
-     *     return func.test(string);
-     *   };
-     * });
-     *
-     * _.filter(['abc', 'def'], /ef/);
-     * // => ['def']
-     */
-    function iteratee(func) {
-      return baseIteratee(typeof func == 'function' ? func : baseClone(func, CLONE_DEEP_FLAG));
-    }
-
-    /**
-     * Creates a function that performs a partial deep comparison between a given
-     * object and `source`, returning `true` if the given object has equivalent
-     * property values, else `false`.
-     *
-     * **Note:** The created function is equivalent to `_.isMatch` with `source`
-     * partially applied.
-     *
-     * Partial comparisons will match empty array and empty object `source`
-     * values against any array or object value, respectively. See `_.isEqual`
-     * for a list of supported value comparisons.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Util
-     * @param {Object} source The object of property values to match.
-     * @returns {Function} Returns the new spec function.
-     * @example
-     *
-     * var objects = [
-     *   { 'a': 1, 'b': 2, 'c': 3 },
-     *   { 'a': 4, 'b': 5, 'c': 6 }
-     * ];
-     *
-     * _.filter(objects, _.matches({ 'a': 4, 'c': 6 }));
-     * // => [{ 'a': 4, 'b': 5, 'c': 6 }]
-     */
-    function matches(source) {
-      return baseMatches(baseClone(source, CLONE_DEEP_FLAG));
-    }
-
-    /**
-     * Creates a function that performs a partial deep comparison between the
-     * value at `path` of a given object to `srcValue`, returning `true` if the
-     * object value is equivalent, else `false`.
-     *
-     * **Note:** Partial comparisons will match empty array and empty object
-     * `srcValue` values against any array or object value, respectively. See
-     * `_.isEqual` for a list of supported value comparisons.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.2.0
-     * @category Util
-     * @param {Array|string} path The path of the property to get.
-     * @param {*} srcValue The value to match.
-     * @returns {Function} Returns the new spec function.
-     * @example
-     *
-     * var objects = [
-     *   { 'a': 1, 'b': 2, 'c': 3 },
-     *   { 'a': 4, 'b': 5, 'c': 6 }
-     * ];
-     *
-     * _.find(objects, _.matchesProperty('a', 4));
-     * // => { 'a': 4, 'b': 5, 'c': 6 }
-     */
-    function matchesProperty(path, srcValue) {
-      return baseMatchesProperty(path, baseClone(srcValue, CLONE_DEEP_FLAG));
-    }
-
-    /**
-     * Creates a function that invokes the method at `path` of a given object.
-     * Any additional arguments are provided to the invoked method.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.7.0
-     * @category Util
-     * @param {Array|string} path The path of the method to invoke.
-     * @param {...*} [args] The arguments to invoke the method with.
-     * @returns {Function} Returns the new invoker function.
-     * @example
-     *
-     * var objects = [
-     *   { 'a': { 'b': _.constant(2) } },
-     *   { 'a': { 'b': _.constant(1) } }
-     * ];
-     *
-     * _.map(objects, _.method('a.b'));
-     * // => [2, 1]
-     *
-     * _.map(objects, _.method(['a', 'b']));
-     * // => [2, 1]
-     */
-    var method = baseRest(function(path, args) {
-      return function(object) {
-        return baseInvoke(object, path, args);
-      };
-    });
-
-    /**
-     * The opposite of `_.method`; this method creates a function that invokes
-     * the method at a given path of `object`. Any additional arguments are
-     * provided to the invoked method.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.7.0
-     * @category Util
-     * @param {Object} object The object to query.
-     * @param {...*} [args] The arguments to invoke the method with.
-     * @returns {Function} Returns the new invoker function.
-     * @example
-     *
-     * var array = _.times(3, _.constant),
-     *     object = { 'a': array, 'b': array, 'c': array };
-     *
-     * _.map(['a[2]', 'c[0]'], _.methodOf(object));
-     * // => [2, 0]
-     *
-     * _.map([['a', '2'], ['c', '0']], _.methodOf(object));
-     * // => [2, 0]
-     */
-    var methodOf = baseRest(function(object, args) {
-      return function(path) {
-        return baseInvoke(object, path, args);
-      };
-    });
-
-    /**
-     * Adds all own enumerable string keyed function properties of a source
-     * object to the destination object. If `object` is a function, then methods
-     * are added to its prototype as well.
-     *
-     * **Note:** Use `_.runInContext` to create a pristine `lodash` function to
-     * avoid conflicts caused by modifying the original.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @param {Function|Object} [object=lodash] The destination object.
-     * @param {Object} source The object of functions to add.
-     * @param {Object} [options={}] The options object.
-     * @param {boolean} [options.chain=true] Specify whether mixins are chainable.
-     * @returns {Function|Object} Returns `object`.
-     * @example
-     *
-     * function vowels(string) {
-     *   return _.filter(string, function(v) {
-     *     return /[aeiou]/i.test(v);
-     *   });
-     * }
-     *
-     * _.mixin({ 'vowels': vowels });
-     * _.vowels('fred');
-     * // => ['e']
-     *
-     * _('fred').vowels().value();
-     * // => ['e']
-     *
-     * _.mixin({ 'vowels': vowels }, { 'chain': false });
-     * _('fred').vowels();
-     * // => ['e']
-     */
-    function mixin(object, source, options) {
-      var props = keys(source),
-          methodNames = baseFunctions(source, props);
-
-      if (options == null &&
-          !(isObject(source) && (methodNames.length || !props.length))) {
-        options = source;
-        source = object;
-        object = this;
-        methodNames = baseFunctions(source, keys(source));
-      }
-      var chain = !(isObject(options) && 'chain' in options) || !!options.chain,
-          isFunc = isFunction(object);
-
-      arrayEach(methodNames, function(methodName) {
-        var func = source[methodName];
-        object[methodName] = func;
-        if (isFunc) {
-          object.prototype[methodName] = function() {
-            var chainAll = this.__chain__;
-            if (chain || chainAll) {
-              var result = object(this.__wrapped__),
-                  actions = result.__actions__ = copyArray(this.__actions__);
-
-              actions.push({ 'func': func, 'args': arguments, 'thisArg': object });
-              result.__chain__ = chainAll;
-              return result;
-            }
-            return func.apply(object, arrayPush([this.value()], arguments));
-          };
-        }
-      });
-
-      return object;
-    }
-
-    /**
-     * Reverts the `_` variable to its previous value and returns a reference to
-     * the `lodash` function.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @returns {Function} Returns the `lodash` function.
-     * @example
-     *
-     * var lodash = _.noConflict();
-     */
-    function noConflict() {
-      if (root._ === this) {
-        root._ = oldDash;
-      }
-      return this;
-    }
-
-    /**
-     * This method returns `undefined`.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.3.0
-     * @category Util
-     * @example
-     *
-     * _.times(2, _.noop);
-     * // => [undefined, undefined]
-     */
-    function noop() {
-      // No operation performed.
-    }
-
-    /**
-     * Creates a function that gets the argument at index `n`. If `n` is negative,
-     * the nth argument from the end is returned.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {number} [n=0] The index of the argument to return.
-     * @returns {Function} Returns the new pass-thru function.
-     * @example
-     *
-     * var func = _.nthArg(1);
-     * func('a', 'b', 'c', 'd');
-     * // => 'b'
-     *
-     * var func = _.nthArg(-2);
-     * func('a', 'b', 'c', 'd');
-     * // => 'c'
-     */
-    function nthArg(n) {
-      n = toInteger(n);
-      return baseRest(function(args) {
-        return baseNth(args, n);
-      });
-    }
-
-    /**
-     * Creates a function that invokes `iteratees` with the arguments it receives
-     * and returns their results.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {...(Function|Function[])} [iteratees=[_.identity]]
-     *  The iteratees to invoke.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var func = _.over([Math.max, Math.min]);
-     *
-     * func(1, 2, 3, 4);
-     * // => [4, 1]
-     */
-    var over = createOver(arrayMap);
-
-    /**
-     * Creates a function that checks if **all** of the `predicates` return
-     * truthy when invoked with the arguments it receives.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {...(Function|Function[])} [predicates=[_.identity]]
-     *  The predicates to check.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var func = _.overEvery([Boolean, isFinite]);
-     *
-     * func('1');
-     * // => true
-     *
-     * func(null);
-     * // => false
-     *
-     * func(NaN);
-     * // => false
-     */
-    var overEvery = createOver(arrayEvery);
-
-    /**
-     * Creates a function that checks if **any** of the `predicates` return
-     * truthy when invoked with the arguments it receives.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {...(Function|Function[])} [predicates=[_.identity]]
-     *  The predicates to check.
-     * @returns {Function} Returns the new function.
-     * @example
-     *
-     * var func = _.overSome([Boolean, isFinite]);
-     *
-     * func('1');
-     * // => true
-     *
-     * func(null);
-     * // => true
-     *
-     * func(NaN);
-     * // => false
-     */
-    var overSome = createOver(arraySome);
-
-    /**
-     * Creates a function that returns the value at `path` of a given object.
-     *
-     * @static
-     * @memberOf _
-     * @since 2.4.0
-     * @category Util
-     * @param {Array|string} path The path of the property to get.
-     * @returns {Function} Returns the new accessor function.
-     * @example
-     *
-     * var objects = [
-     *   { 'a': { 'b': 2 } },
-     *   { 'a': { 'b': 1 } }
-     * ];
-     *
-     * _.map(objects, _.property('a.b'));
-     * // => [2, 1]
-     *
-     * _.map(_.sortBy(objects, _.property(['a', 'b'])), 'a.b');
-     * // => [1, 2]
-     */
-    function property(path) {
-      return isKey(path) ? baseProperty(toKey(path)) : basePropertyDeep(path);
-    }
-
-    /**
-     * The opposite of `_.property`; this method creates a function that returns
-     * the value at a given path of `object`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.0.0
-     * @category Util
-     * @param {Object} object The object to query.
-     * @returns {Function} Returns the new accessor function.
-     * @example
-     *
-     * var array = [0, 1, 2],
-     *     object = { 'a': array, 'b': array, 'c': array };
-     *
-     * _.map(['a[2]', 'c[0]'], _.propertyOf(object));
-     * // => [2, 0]
-     *
-     * _.map([['a', '2'], ['c', '0']], _.propertyOf(object));
-     * // => [2, 0]
-     */
-    function propertyOf(object) {
-      return function(path) {
-        return object == null ? undefined : baseGet(object, path);
-      };
-    }
-
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from
-     * `start` up to, but not including, `end`. A step of `-1` is used if a negative
-     * `start` is specified without an `end` or `step`. If `end` is not specified,
-     * it's set to `start` with `start` then set to `0`.
-     *
-     * **Note:** JavaScript follows the IEEE-754 standard for resolving
-     * floating-point values which can produce unexpected results.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @param {number} [start=0] The start of the range.
-     * @param {number} end The end of the range.
-     * @param {number} [step=1] The value to increment or decrement by.
-     * @returns {Array} Returns the range of numbers.
-     * @see _.inRange, _.rangeRight
-     * @example
-     *
-     * _.range(4);
-     * // => [0, 1, 2, 3]
-     *
-     * _.range(-4);
-     * // => [0, -1, -2, -3]
-     *
-     * _.range(1, 5);
-     * // => [1, 2, 3, 4]
-     *
-     * _.range(0, 20, 5);
-     * // => [0, 5, 10, 15]
-     *
-     * _.range(0, -4, -1);
-     * // => [0, -1, -2, -3]
-     *
-     * _.range(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.range(0);
-     * // => []
-     */
-    var range = createRange();
-
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {number} [start=0] The start of the range.
-     * @param {number} end The end of the range.
-     * @param {number} [step=1] The value to increment or decrement by.
-     * @returns {Array} Returns the range of numbers.
-     * @see _.inRange, _.range
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    var rangeRight = createRange(true);
-
-    /**
-     * This method returns a new empty array.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.13.0
-     * @category Util
-     * @returns {Array} Returns the new empty array.
-     * @example
-     *
-     * var arrays = _.times(2, _.stubArray);
-     *
-     * console.log(arrays);
-     * // => [[], []]
-     *
-     * console.log(arrays[0] === arrays[1]);
-     * // => false
-     */
-    function stubArray() {
-      return [];
-    }
-
-    /**
-     * This method returns `false`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.13.0
-     * @category Util
-     * @returns {boolean} Returns `false`.
-     * @example
-     *
-     * _.times(2, _.stubFalse);
-     * // => [false, false]
-     */
-    function stubFalse() {
-      return false;
-    }
-
-    /**
-     * This method returns a new empty object.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.13.0
-     * @category Util
-     * @returns {Object} Returns the new empty object.
-     * @example
-     *
-     * var objects = _.times(2, _.stubObject);
-     *
-     * console.log(objects);
-     * // => [{}, {}]
-     *
-     * console.log(objects[0] === objects[1]);
-     * // => false
-     */
-    function stubObject() {
-      return {};
-    }
-
-    /**
-     * This method returns an empty string.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.13.0
-     * @category Util
-     * @returns {string} Returns the empty string.
-     * @example
-     *
-     * _.times(2, _.stubString);
-     * // => ['', '']
-     */
-    function stubString() {
-      return '';
-    }
-
-    /**
-     * This method returns `true`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.13.0
-     * @category Util
-     * @returns {boolean} Returns `true`.
-     * @example
-     *
-     * _.times(2, _.stubTrue);
-     * // => [true, true]
-     */
-    function stubTrue() {
-      return true;
-    }
-
-    /**
-     * Invokes the iteratee `n` times, returning an array of the results of
-     * each invocation. The iteratee is invoked with one argument; (index).
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @param {number} n The number of times to invoke `iteratee`.
-     * @param {Function} [iteratee=_.identity] The function invoked per iteration.
-     * @returns {Array} Returns the array of results.
-     * @example
-     *
-     * _.times(3, String);
-     * // => ['0', '1', '2']
-     *
-     *  _.times(4, _.constant(0));
-     * // => [0, 0, 0, 0]
-     */
-    function times(n, iteratee) {
-      n = toInteger(n);
-      if (n < 1 || n > MAX_SAFE_INTEGER) {
-        return [];
-      }
-      var index = MAX_ARRAY_LENGTH,
-          length = nativeMin(n, MAX_ARRAY_LENGTH);
-
-      iteratee = getIteratee(iteratee);
-      n -= MAX_ARRAY_LENGTH;
-
-      var result = baseTimes(length, iteratee);
-      while (++index < n) {
-        iteratee(index);
-      }
-      return result;
-    }
-
-    /**
-     * Converts `value` to a property path array.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Util
-     * @param {*} value The value to convert.
-     * @returns {Array} Returns the new property path array.
-     * @example
-     *
-     * _.toPath('a.b.c');
-     * // => ['a', 'b', 'c']
-     *
-     * _.toPath('a[0].b.c');
-     * // => ['a', '0', 'b', 'c']
-     */
-    function toPath(value) {
-      if (isArray(value)) {
-        return arrayMap(value, toKey);
-      }
-      return isSymbol(value) ? [value] : copyArray(stringToPath(toString(value)));
-    }
-
-    /**
-     * Generates a unique ID. If `prefix` is given, the ID is appended to it.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Util
-     * @param {string} [prefix=''] The value to prefix the ID with.
-     * @returns {string} Returns the unique ID.
-     * @example
-     *
-     * _.uniqueId('contact_');
-     * // => 'contact_104'
-     *
-     * _.uniqueId();
-     * // => '105'
-     */
-    function uniqueId(prefix) {
-      var id = ++idCounter;
-      return toString(prefix) + id;
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * Adds two numbers.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.4.0
-     * @category Math
-     * @param {number} augend The first number in an addition.
-     * @param {number} addend The second number in an addition.
-     * @returns {number} Returns the total.
-     * @example
-     *
-     * _.add(6, 4);
-     * // => 10
-     */
-    var add = createMathOperation(function(augend, addend) {
-      return augend + addend;
-    }, 0);
-
-    /**
-     * Computes `number` rounded up to `precision`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.10.0
-     * @category Math
-     * @param {number} number The number to round up.
-     * @param {number} [precision=0] The precision to round up to.
-     * @returns {number} Returns the rounded up number.
-     * @example
-     *
-     * _.ceil(4.006);
-     * // => 5
-     *
-     * _.ceil(6.004, 2);
-     * // => 6.01
-     *
-     * _.ceil(6040, -2);
-     * // => 6100
-     */
-    var ceil = createRound('ceil');
-
-    /**
-     * Divide two numbers.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.7.0
-     * @category Math
-     * @param {number} dividend The first number in a division.
-     * @param {number} divisor The second number in a division.
-     * @returns {number} Returns the quotient.
-     * @example
-     *
-     * _.divide(6, 4);
-     * // => 1.5
-     */
-    var divide = createMathOperation(function(dividend, divisor) {
-      return dividend / divisor;
-    }, 1);
-
-    /**
-     * Computes `number` rounded down to `precision`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.10.0
-     * @category Math
-     * @param {number} number The number to round down.
-     * @param {number} [precision=0] The precision to round down to.
-     * @returns {number} Returns the rounded down number.
-     * @example
-     *
-     * _.floor(4.006);
-     * // => 4
-     *
-     * _.floor(0.046, 2);
-     * // => 0.04
-     *
-     * _.floor(4060, -2);
-     * // => 4000
-     */
-    var floor = createRound('floor');
-
-    /**
-     * Computes the maximum value of `array`. If `array` is empty or falsey,
-     * `undefined` is returned.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @returns {*} Returns the maximum value.
-     * @example
-     *
-     * _.max([4, 2, 8, 6]);
-     * // => 8
-     *
-     * _.max([]);
-     * // => undefined
-     */
-    function max(array) {
-      return (array && array.length)
-        ? baseExtremum(array, identity, baseGt)
-        : undefined;
-    }
-
-    /**
-     * This method is like `_.max` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {*} Returns the maximum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.maxBy(objects, function(o) { return o.n; });
-     * // => { 'n': 2 }
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.maxBy(objects, 'n');
-     * // => { 'n': 2 }
-     */
-    function maxBy(array, iteratee) {
-      return (array && array.length)
-        ? baseExtremum(array, getIteratee(iteratee, 2), baseGt)
-        : undefined;
-    }
-
-    /**
-     * Computes the mean of the values in `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @returns {number} Returns the mean.
-     * @example
-     *
-     * _.mean([4, 2, 8, 6]);
-     * // => 5
-     */
-    function mean(array) {
-      return baseMean(array, identity);
-    }
-
-    /**
-     * This method is like `_.mean` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be averaged.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.7.0
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {number} Returns the mean.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.meanBy(objects, function(o) { return o.n; });
-     * // => 5
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.meanBy(objects, 'n');
-     * // => 5
-     */
-    function meanBy(array, iteratee) {
-      return baseMean(array, getIteratee(iteratee, 2));
-    }
-
-    /**
-     * Computes the minimum value of `array`. If `array` is empty or falsey,
-     * `undefined` is returned.
-     *
-     * @static
-     * @since 0.1.0
-     * @memberOf _
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @returns {*} Returns the minimum value.
-     * @example
-     *
-     * _.min([4, 2, 8, 6]);
-     * // => 2
-     *
-     * _.min([]);
-     * // => undefined
-     */
-    function min(array) {
-      return (array && array.length)
-        ? baseExtremum(array, identity, baseLt)
-        : undefined;
-    }
-
-    /**
-     * This method is like `_.min` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {*} Returns the minimum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.minBy(objects, function(o) { return o.n; });
-     * // => { 'n': 1 }
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.minBy(objects, 'n');
-     * // => { 'n': 1 }
-     */
-    function minBy(array, iteratee) {
-      return (array && array.length)
-        ? baseExtremum(array, getIteratee(iteratee, 2), baseLt)
-        : undefined;
-    }
-
-    /**
-     * Multiply two numbers.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.7.0
-     * @category Math
-     * @param {number} multiplier The first number in a multiplication.
-     * @param {number} multiplicand The second number in a multiplication.
-     * @returns {number} Returns the product.
-     * @example
-     *
-     * _.multiply(6, 4);
-     * // => 24
-     */
-    var multiply = createMathOperation(function(multiplier, multiplicand) {
-      return multiplier * multiplicand;
-    }, 1);
-
-    /**
-     * Computes `number` rounded to `precision`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.10.0
-     * @category Math
-     * @param {number} number The number to round.
-     * @param {number} [precision=0] The precision to round to.
-     * @returns {number} Returns the rounded number.
-     * @example
-     *
-     * _.round(4.006);
-     * // => 4
-     *
-     * _.round(4.006, 2);
-     * // => 4.01
-     *
-     * _.round(4060, -2);
-     * // => 4100
-     */
-    var round = createRound('round');
-
-    /**
-     * Subtract two numbers.
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Math
-     * @param {number} minuend The first number in a subtraction.
-     * @param {number} subtrahend The second number in a subtraction.
-     * @returns {number} Returns the difference.
-     * @example
-     *
-     * _.subtract(6, 4);
-     * // => 2
-     */
-    var subtract = createMathOperation(function(minuend, subtrahend) {
-      return minuend - subtrahend;
-    }, 0);
-
-    /**
-     * Computes the sum of the values in `array`.
-     *
-     * @static
-     * @memberOf _
-     * @since 3.4.0
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @returns {number} Returns the sum.
-     * @example
-     *
-     * _.sum([4, 2, 8, 6]);
-     * // => 20
-     */
-    function sum(array) {
-      return (array && array.length)
-        ? baseSum(array, identity)
-        : 0;
-    }
-
-    /**
-     * This method is like `_.sum` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be summed.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @static
-     * @memberOf _
-     * @since 4.0.0
-     * @category Math
-     * @param {Array} array The array to iterate over.
-     * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
-     * @returns {number} Returns the sum.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.sumBy(objects, function(o) { return o.n; });
-     * // => 20
-     *
-     * // The `_.property` iteratee shorthand.
-     * _.sumBy(objects, 'n');
-     * // => 20
-     */
-    function sumBy(array, iteratee) {
-      return (array && array.length)
-        ? baseSum(array, getIteratee(iteratee, 2))
-        : 0;
-    }
-
-    /*------------------------------------------------------------------------*/
-
-    // Add methods that return wrapped values in chain sequences.
-    lodash.after = after;
-    lodash.ary = ary;
-    lodash.assign = assign;
-    lodash.assignIn = assignIn;
-    lodash.assignInWith = assignInWith;
-    lodash.assignWith = assignWith;
-    lodash.at = at;
-    lodash.before = before;
-    lodash.bind = bind;
-    lodash.bindAll = bindAll;
-    lodash.bindKey = bindKey;
-    lodash.castArray = castArray;
-    lodash.chain = chain;
-    lodash.chunk = chunk;
-    lodash.compact = compact;
-    lodash.concat = concat;
-    lodash.cond = cond;
-    lodash.conforms = conforms;
-    lodash.constant = constant;
-    lodash.countBy = countBy;
-    lodash.create = create;
-    lodash.curry = curry;
-    lodash.curryRight = curryRight;
-    lodash.debounce = debounce;
-    lodash.defaults = defaults;
-    lodash.defaultsDeep = defaultsDeep;
-    lodash.defer = defer;
-    lodash.delay = delay;
-    lodash.difference = difference;
-    lodash.differenceBy = differenceBy;
-    lodash.differenceWith = differenceWith;
-    lodash.drop = drop;
-    lodash.dropRight = dropRight;
-    lodash.dropRightWhile = dropRightWhile;
-    lodash.dropWhile = dropWhile;
-    lodash.fill = fill;
-    lodash.filter = filter;
-    lodash.flatMap = flatMap;
-    lodash.flatMapDeep = flatMapDeep;
-    lodash.flatMapDepth = flatMapDepth;
-    lodash.flatten = flatten;
-    lodash.flattenDeep = flattenDeep;
-    lodash.flattenDepth = flattenDepth;
-    lodash.flip = flip;
-    lodash.flow = flow;
-    lodash.flowRight = flowRight;
-    lodash.fromPairs = fromPairs;
-    lodash.functions = functions;
-    lodash.functionsIn = functionsIn;
-    lodash.groupBy = groupBy;
-    lodash.initial = initial;
-    lodash.intersection = intersection;
-    lodash.intersectionBy = intersectionBy;
-    lodash.intersectionWith = intersectionWith;
-    lodash.invert = invert;
-    lodash.invertBy = invertBy;
-    lodash.invokeMap = invokeMap;
-    lodash.iteratee = iteratee;
-    lodash.keyBy = keyBy;
-    lodash.keys = keys;
-    lodash.keysIn = keysIn;
-    lodash.map = map;
-    lodash.mapKeys = mapKeys;
-    lodash.mapValues = mapValues;
-    lodash.matches = matches;
-    lodash.matchesProperty = matchesProperty;
-    lodash.memoize = memoize;
-    lodash.merge = merge;
-    lodash.mergeWith = mergeWith;
-    lodash.method = method;
-    lodash.methodOf = methodOf;
-    lodash.mixin = mixin;
-    lodash.negate = negate;
-    lodash.nthArg = nthArg;
-    lodash.omit = omit;
-    lodash.omitBy = omitBy;
-    lodash.once = once;
-    lodash.orderBy = orderBy;
-    lodash.over = over;
-    lodash.overArgs = overArgs;
-    lodash.overEvery = overEvery;
-    lodash.overSome = overSome;
-    lodash.partial = partial;
-    lodash.partialRight = partialRight;
-    lodash.partition = partition;
-    lodash.pick = pick;
-    lodash.pickBy = pickBy;
-    lodash.property = property;
-    lodash.propertyOf = propertyOf;
-    lodash.pull = pull;
-    lodash.pullAll = pullAll;
-    lodash.pullAllBy = pullAllBy;
-    lodash.pullAllWith = pullAllWith;
-    lodash.pullAt = pullAt;
-    lodash.range = range;
-    lodash.rangeRight = rangeRight;
-    lodash.rearg = rearg;
-    lodash.reject = reject;
-    lodash.remove = remove;
-    lodash.rest = rest;
-    lodash.reverse = reverse;
-    lodash.sampleSize = sampleSize;
-    lodash.set = set;
-    lodash.setWith = setWith;
-    lodash.shuffle = shuffle;
-    lodash.slice = slice;
-    lodash.sortBy = sortBy;
-    lodash.sortedUniq = sortedUniq;
-    lodash.sortedUniqBy = sortedUniqBy;
-    lodash.split = split;
-    lodash.spread = spread;
-    lodash.tail = tail;
-    lodash.take = take;
-    lodash.takeRight = takeRight;
-    lodash.takeRightWhile = takeRightWhile;
-    lodash.takeWhile = takeWhile;
-    lodash.tap = tap;
-    lodash.throttle = throttle;
-    lodash.thru = thru;
-    lodash.toArray = toArray;
-    lodash.toPairs = toPairs;
-    lodash.toPairsIn = toPairsIn;
-    lodash.toPath = toPath;
-    lodash.toPlainObject = toPlainObject;
-    lodash.transform = transform;
-    lodash.unary = unary;
-    lodash.union = union;
-    lodash.unionBy = unionBy;
-    lodash.unionWith = unionWith;
-    lodash.uniq = uniq;
-    lodash.uniqBy = uniqBy;
-    lodash.uniqWith = uniqWith;
-    lodash.unset = unset;
-    lodash.unzip = unzip;
-    lodash.unzipWith = unzipWith;
-    lodash.update = update;
-    lodash.updateWith = updateWith;
-    lodash.values = values;
-    lodash.valuesIn = valuesIn;
-    lodash.without = without;
-    lodash.words = words;
-    lodash.wrap = wrap;
-    lodash.xor = xor;
-    lodash.xorBy = xorBy;
-    lodash.xorWith = xorWith;
-    lodash.zip = zip;
-    lodash.zipObject = zipObject;
-    lodash.zipObjectDeep = zipObjectDeep;
-    lodash.zipWith = zipWith;
-
-    // Add aliases.
-    lodash.entries = toPairs;
-    lodash.entriesIn = toPairsIn;
-    lodash.extend = assignIn;
-    lodash.extendWith = assignInWith;
-
-    // Add methods to `lodash.prototype`.
-    mixin(lodash, lodash);
-
-    /*------------------------------------------------------------------------*/
-
-    // Add methods that return unwrapped values in chain sequences.
-    lodash.add = add;
-    lodash.attempt = attempt;
-    lodash.camelCase = camelCase;
-    lodash.capitalize = capitalize;
-    lodash.ceil = ceil;
-    lodash.clamp = clamp;
-    lodash.clone = clone;
-    lodash.cloneDeep = cloneDeep;
-    lodash.cloneDeepWith = cloneDeepWith;
-    lodash.cloneWith = cloneWith;
-    lodash.conformsTo = conformsTo;
-    lodash.deburr = deburr;
-    lodash.defaultTo = defaultTo;
-    lodash.divide = divide;
-    lodash.endsWith = endsWith;
-    lodash.eq = eq;
-    lodash.escape = escape;
-    lodash.escapeRegExp = escapeRegExp;
-    lodash.every = every;
-    lodash.find = find;
-    lodash.findIndex = findIndex;
-    lodash.findKey = findKey;
-    lodash.findLast = findLast;
-    lodash.findLastIndex = findLastIndex;
-    lodash.findLastKey = findLastKey;
-    lodash.floor = floor;
-    lodash.forEach = forEach;
-    lodash.forEachRight = forEachRight;
-    lodash.forIn = forIn;
-    lodash.forInRight = forInRight;
-    lodash.forOwn = forOwn;
-    lodash.forOwnRight = forOwnRight;
-    lodash.get = get;
-    lodash.gt = gt;
-    lodash.gte = gte;
-    lodash.has = has;
-    lodash.hasIn = hasIn;
-    lodash.head = head;
-    lodash.identity = identity;
-    lodash.includes = includes;
-    lodash.indexOf = indexOf;
-    lodash.inRange = inRange;
-    lodash.invoke = invoke;
-    lodash.isArguments = isArguments;
-    lodash.isArray = isArray;
-    lodash.isArrayBuffer = isArrayBuffer;
-    lodash.isArrayLike = isArrayLike;
-    lodash.isArrayLikeObject = isArrayLikeObject;
-    lodash.isBoolean = isBoolean;
-    lodash.isBuffer = isBuffer;
-    lodash.isDate = isDate;
-    lodash.isElement = isElement;
-    lodash.isEmpty = isEmpty;
-    lodash.isEqual = isEqual;
-    lodash.isEqualWith = isEqualWith;
-    lodash.isError = isError;
-    lodash.isFinite = isFinite;
-    lodash.isFunction = isFunction;
-    lodash.isInteger = isInteger;
-    lodash.isLength = isLength;
-    lodash.isMap = isMap;
-    lodash.isMatch = isMatch;
-    lodash.isMatchWith = isMatchWith;
-    lodash.isNaN = isNaN;
-    lodash.isNative = isNative;
-    lodash.isNil = isNil;
-    lodash.isNull = isNull;
-    lodash.isNumber = isNumber;
-    lodash.isObject = isObject;
-    lodash.isObjectLike = isObjectLike;
-    lodash.isPlainObject = isPlainObject;
-    lodash.isRegExp = isRegExp;
-    lodash.isSafeInteger = isSafeInteger;
-    lodash.isSet = isSet;
-    lodash.isString = isString;
-    lodash.isSymbol = isSymbol;
-    lodash.isTypedArray = isTypedArray;
-    lodash.isUndefined = isUndefined;
-    lodash.isWeakMap = isWeakMap;
-    lodash.isWeakSet = isWeakSet;
-    lodash.join = join;
-    lodash.kebabCase = kebabCase;
-    lodash.last = last;
-    lodash.lastIndexOf = lastIndexOf;
-    lodash.lowerCase = lowerCase;
-    lodash.lowerFirst = lowerFirst;
-    lodash.lt = lt;
-    lodash.lte = lte;
-    lodash.max = max;
-    lodash.maxBy = maxBy;
-    lodash.mean = mean;
-    lodash.meanBy = meanBy;
-    lodash.min = min;
-    lodash.minBy = minBy;
-    lodash.stubArray = stubArray;
-    lodash.stubFalse = stubFalse;
-    lodash.stubObject = stubObject;
-    lodash.stubString = stubString;
-    lodash.stubTrue = stubTrue;
-    lodash.multiply = multiply;
-    lodash.nth = nth;
-    lodash.noConflict = noConflict;
-    lodash.noop = noop;
-    lodash.now = now;
-    lodash.pad = pad;
-    lodash.padEnd = padEnd;
-    lodash.padStart = padStart;
-    lodash.parseInt = parseInt;
-    lodash.random = random;
-    lodash.reduce = reduce;
-    lodash.reduceRight = reduceRight;
-    lodash.repeat = repeat;
-    lodash.replace = replace;
-    lodash.result = result;
-    lodash.round = round;
-    lodash.runInContext = runInContext;
-    lodash.sample = sample;
-    lodash.size = size;
-    lodash.snakeCase = snakeCase;
-    lodash.some = some;
-    lodash.sortedIndex = sortedIndex;
-    lodash.sortedIndexBy = sortedIndexBy;
-    lodash.sortedIndexOf = sortedIndexOf;
-    lodash.sortedLastIndex = sortedLastIndex;
-    lodash.sortedLastIndexBy = sortedLastIndexBy;
-    lodash.sortedLastIndexOf = sortedLastIndexOf;
-    lodash.startCase = startCase;
-    lodash.startsWith = startsWith;
-    lodash.subtract = subtract;
-    lodash.sum = sum;
-    lodash.sumBy = sumBy;
-    lodash.template = template;
-    lodash.times = times;
-    lodash.toFinite = toFinite;
-    lodash.toInteger = toInteger;
-    lodash.toLength = toLength;
-    lodash.toLower = toLower;
-    lodash.toNumber = toNumber;
-    lodash.toSafeInteger = toSafeInteger;
-    lodash.toString = toString;
-    lodash.toUpper = toUpper;
-    lodash.trim = trim;
-    lodash.trimEnd = trimEnd;
-    lodash.trimStart = trimStart;
-    lodash.truncate = truncate;
-    lodash.unescape = unescape;
-    lodash.uniqueId = uniqueId;
-    lodash.upperCase = upperCase;
-    lodash.upperFirst = upperFirst;
-
-    // Add aliases.
-    lodash.each = forEach;
-    lodash.eachRight = forEachRight;
-    lodash.first = head;
-
-    mixin(lodash, (function() {
-      var source = {};
-      baseForOwn(lodash, function(func, methodName) {
-        if (!hasOwnProperty.call(lodash.prototype, methodName)) {
-          source[methodName] = func;
-        }
-      });
-      return source;
-    }()), { 'chain': false });
-
-    /*------------------------------------------------------------------------*/
-
-    /**
-     * The semantic version number.
-     *
-     * @static
-     * @memberOf _
-     * @type {string}
-     */
-    lodash.VERSION = VERSION;
-
-    // Assign default placeholders.
-    arrayEach(['bind', 'bindKey', 'curry', 'curryRight', 'partial', 'partialRight'], function(methodName) {
-      lodash[methodName].placeholder = lodash;
-    });
-
-    // Add `LazyWrapper` methods for `_.drop` and `_.take` variants.
-    arrayEach(['drop', 'take'], function(methodName, index) {
-      LazyWrapper.prototype[methodName] = function(n) {
-        n = n === undefined ? 1 : nativeMax(toInteger(n), 0);
-
-        var result = (this.__filtered__ && !index)
-          ? new LazyWrapper(this)
-          : this.clone();
-
-        if (result.__filtered__) {
-          result.__takeCount__ = nativeMin(n, result.__takeCount__);
-        } else {
-          result.__views__.push({
-            'size': nativeMin(n, MAX_ARRAY_LENGTH),
-            'type': methodName + (result.__dir__ < 0 ? 'Right' : '')
-          });
-        }
-        return result;
-      };
-
-      LazyWrapper.prototype[methodName + 'Right'] = function(n) {
-        return this.reverse()[methodName](n).reverse();
-      };
-    });
-
-    // Add `LazyWrapper` methods that accept an `iteratee` value.
-    arrayEach(['filter', 'map', 'takeWhile'], function(methodName, index) {
-      var type = index + 1,
-          isFilter = type == LAZY_FILTER_FLAG || type == LAZY_WHILE_FLAG;
-
-      LazyWrapper.prototype[methodName] = function(iteratee) {
-        var result = this.clone();
-        result.__iteratees__.push({
-          'iteratee': getIteratee(iteratee, 3),
-          'type': type
-        });
-        result.__filtered__ = result.__filtered__ || isFilter;
-        return result;
-      };
-    });
-
-    // Add `LazyWrapper` methods for `_.head` and `_.last`.
-    arrayEach(['head', 'last'], function(methodName, index) {
-      var takeName = 'take' + (index ? 'Right' : '');
-
-      LazyWrapper.prototype[methodName] = function() {
-        return this[takeName](1).value()[0];
-      };
-    });
-
-    // Add `LazyWrapper` methods for `_.initial` and `_.tail`.
-    arrayEach(['initial', 'tail'], function(methodName, index) {
-      var dropName = 'drop' + (index ? '' : 'Right');
-
-      LazyWrapper.prototype[methodName] = function() {
-        return this.__filtered__ ? new LazyWrapper(this) : this[dropName](1);
-      };
-    });
-
-    LazyWrapper.prototype.compact = function() {
-      return this.filter(identity);
-    };
-
-    LazyWrapper.prototype.find = function(predicate) {
-      return this.filter(predicate).head();
-    };
-
-    LazyWrapper.prototype.findLast = function(predicate) {
-      return this.reverse().find(predicate);
-    };
-
-    LazyWrapper.prototype.invokeMap = baseRest(function(path, args) {
-      if (typeof path == 'function') {
-        return new LazyWrapper(this);
-      }
-      return this.map(function(value) {
-        return baseInvoke(value, path, args);
-      });
-    });
-
-    LazyWrapper.prototype.reject = function(predicate) {
-      return this.filter(negate(getIteratee(predicate)));
-    };
-
-    LazyWrapper.prototype.slice = function(start, end) {
-      start = toInteger(start);
-
-      var result = this;
-      if (result.__filtered__ && (start > 0 || end < 0)) {
-        return new LazyWrapper(result);
-      }
-      if (start < 0) {
-        result = result.takeRight(-start);
-      } else if (start) {
-        result = result.drop(start);
-      }
-      if (end !== undefined) {
-        end = toInteger(end);
-        result = end < 0 ? result.dropRight(-end) : result.take(end - start);
-      }
-      return result;
-    };
-
-    LazyWrapper.prototype.takeRightWhile = function(predicate) {
-      return this.reverse().takeWhile(predicate).reverse();
-    };
-
-    LazyWrapper.prototype.toArray = function() {
-      return this.take(MAX_ARRAY_LENGTH);
-    };
-
-    // Add `LazyWrapper` methods to `lodash.prototype`.
-    baseForOwn(LazyWrapper.prototype, function(func, methodName) {
-      var checkIteratee = /^(?:filter|find|map|reject)|While$/.test(methodName),
-          isTaker = /^(?:head|last)$/.test(methodName),
-          lodashFunc = lodash[isTaker ? ('take' + (methodName == 'last' ? 'Right' : '')) : methodName],
-          retUnwrapped = isTaker || /^find/.test(methodName);
-
-      if (!lodashFunc) {
-        return;
-      }
-      lodash.prototype[methodName] = function() {
-        var value = this.__wrapped__,
-            args = isTaker ? [1] : arguments,
-            isLazy = value instanceof LazyWrapper,
-            iteratee = args[0],
-            useLazy = isLazy || isArray(value);
-
-        var interceptor = function(value) {
-          var result = lodashFunc.apply(lodash, arrayPush([value], args));
-          return (isTaker && chainAll) ? result[0] : result;
-        };
-
-        if (useLazy && checkIteratee && typeof iteratee == 'function' && iteratee.length != 1) {
-          // Avoid lazy use if the iteratee has a "length" value other than `1`.
-          isLazy = useLazy = false;
-        }
-        var chainAll = this.__chain__,
-            isHybrid = !!this.__actions__.length,
-            isUnwrapped = retUnwrapped && !chainAll,
-            onlyLazy = isLazy && !isHybrid;
-
-        if (!retUnwrapped && useLazy) {
-          value = onlyLazy ? value : new LazyWrapper(this);
-          var result = func.apply(value, args);
-          result.__actions__.push({ 'func': thru, 'args': [interceptor], 'thisArg': undefined });
-          return new LodashWrapper(result, chainAll);
-        }
-        if (isUnwrapped && onlyLazy) {
-          return func.apply(this, args);
-        }
-        result = this.thru(interceptor);
-        return isUnwrapped ? (isTaker ? result.value()[0] : result.value()) : result;
-      };
-    });
-
-    // Add `Array` methods to `lodash.prototype`.
-    arrayEach(['pop', 'push', 'shift', 'sort', 'splice', 'unshift'], function(methodName) {
-      var func = arrayProto[methodName],
-          chainName = /^(?:push|sort|unshift)$/.test(methodName) ? 'tap' : 'thru',
-          retUnwrapped = /^(?:pop|shift)$/.test(methodName);
-
-      lodash.prototype[methodName] = function() {
-        var args = arguments;
-        if (retUnwrapped && !this.__chain__) {
-          var value = this.value();
-          return func.apply(isArray(value) ? value : [], args);
-        }
-        return this[chainName](function(value) {
-          return func.apply(isArray(value) ? value : [], args);
-        });
-      };
-    });
-
-    // Map minified method names to their real names.
-    baseForOwn(LazyWrapper.prototype, function(func, methodName) {
-      var lodashFunc = lodash[methodName];
-      if (lodashFunc) {
-        var key = (lodashFunc.name + ''),
-            names = realNames[key] || (realNames[key] = []);
-
-        names.push({ 'name': methodName, 'func': lodashFunc });
-      }
-    });
-
-    realNames[createHybrid(undefined, WRAP_BIND_KEY_FLAG).name] = [{
-      'name': 'wrapper',
-      'func': undefined
-    }];
-
-    // Add methods to `LazyWrapper`.
-    LazyWrapper.prototype.clone = lazyClone;
-    LazyWrapper.prototype.reverse = lazyReverse;
-    LazyWrapper.prototype.value = lazyValue;
-
-    // Add chain sequence methods to the `lodash` wrapper.
-    lodash.prototype.at = wrapperAt;
-    lodash.prototype.chain = wrapperChain;
-    lodash.prototype.commit = wrapperCommit;
-    lodash.prototype.next = wrapperNext;
-    lodash.prototype.plant = wrapperPlant;
-    lodash.prototype.reverse = wrapperReverse;
-    lodash.prototype.toJSON = lodash.prototype.valueOf = lodash.prototype.value = wrapperValue;
-
-    // Add lazy aliases.
-    lodash.prototype.first = lodash.prototype.head;
-
-    if (symIterator) {
-      lodash.prototype[symIterator] = wrapperToIterator;
-    }
-    return lodash;
-  });
-
-  /*--------------------------------------------------------------------------*/
-
-  // Export lodash.
-  var _ = runInContext();
-
-  // Some AMD build optimizers, like r.js, check for condition patterns like:
-  if (true) {
-    // Expose Lodash on the global object to prevent errors when Lodash is
-    // loaded by a script tag in the presence of an AMD loader.
-    // See http://requirejs.org/docs/errors.html#mismatch for more details.
-    // Use `_.noConflict` to remove Lodash from the global object.
-    root._ = _;
-
-    // Define as an anonymous module so, through path mapping, it can be
-    // referenced as the "underscore" module.
-    !(__WEBPACK_AMD_DEFINE_RESULT__ = function() {
-      return _;
-    }.call(exports, __webpack_require__, exports, module),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-  }
-  // Check for `exports` after `define` in case a build optimizer adds it.
-  else if (freeModule) {
-    // Export for Node.js.
-    (freeModule.exports = _)._ = _;
-    // Export for CommonJS support.
-    freeExports._ = _;
-  }
-  else {
-    // Export to the global object.
-    root._ = _;
-  }
-}.call(this));
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
-
-/***/ }),
-/* 39 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return EMPTY; });
-/* harmony export (immutable) */ __webpack_exports__["a"] = empty;
-/* unused harmony export emptyScheduled */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-var EMPTY = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.complete(); });
-function empty(scheduler) {
-    return scheduler ? emptyScheduled(scheduler) : EMPTY;
-}
-function emptyScheduled(scheduler) {
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
-}
-//# sourceMappingURL=empty.js.map
-
-
-/***/ }),
-/* 40 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return async; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncAction__ = __webpack_require__(149);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
-/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
-
-
-var async = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */](__WEBPACK_IMPORTED_MODULE_0__AsyncAction__["a" /* AsyncAction */]);
-//# sourceMappingURL=async.js.map
-
-
-/***/ }),
-/* 41 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArray; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var isArray = Array.isArray || (function (x) { return x && typeof x.length === 'number'; });
-//# sourceMappingURL=isArray.js.map
-
-
-/***/ }),
-/* 42 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var dP = __webpack_require__(71);
-var createDesc = __webpack_require__(132);
-module.exports = __webpack_require__(51) ? function (object, key, value) {
-  return dP.f(object, key, createDesc(1, value));
-} : function (object, key, value) {
-  object[key] = value;
-  return object;
-};
-
-
-/***/ }),
-/* 43 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-function isNothing(subject) {
-  return (typeof subject === 'undefined') || (subject === null);
-}
-
-
-function isObject(subject) {
-  return (typeof subject === 'object') && (subject !== null);
-}
-
-
-function toArray(sequence) {
-  if (Array.isArray(sequence)) return sequence;
-  else if (isNothing(sequence)) return [];
-
-  return [ sequence ];
-}
-
-
-function extend(target, source) {
-  var index, length, key, sourceKeys;
-
-  if (source) {
-    sourceKeys = Object.keys(source);
-
-    for (index = 0, length = sourceKeys.length; index < length; index += 1) {
-      key = sourceKeys[index];
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
-
-function repeat(string, count) {
-  var result = '', cycle;
-
-  for (cycle = 0; cycle < count; cycle += 1) {
-    result += string;
-  }
-
-  return result;
-}
-
-
-function isNegativeZero(number) {
-  return (number === 0) && (Number.NEGATIVE_INFINITY === 1 / number);
-}
-
-
-module.exports.isNothing      = isNothing;
-module.exports.isObject       = isObject;
-module.exports.toArray        = toArray;
-module.exports.repeat         = repeat;
-module.exports.isNegativeZero = isNegativeZero;
-module.exports.extend         = extend;
-
-
-/***/ }),
-/* 44 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/*eslint-disable max-len*/
-
-var common        = __webpack_require__(43);
-var YAMLException = __webpack_require__(54);
-var Type          = __webpack_require__(10);
-
-
-function compileList(schema, name, result) {
-  var exclude = [];
-
-  schema.include.forEach(function (includedSchema) {
-    result = compileList(includedSchema, name, result);
-  });
-
-  schema[name].forEach(function (currentType) {
-    result.forEach(function (previousType, previousIndex) {
-      if (previousType.tag === currentType.tag && previousType.kind === currentType.kind) {
-        exclude.push(previousIndex);
-      }
-    });
-
-    result.push(currentType);
-  });
-
-  return result.filter(function (type, index) {
-    return exclude.indexOf(index) === -1;
-  });
-}
-
-
-function compileMap(/* lists... */) {
-  var result = {
-        scalar: {},
-        sequence: {},
-        mapping: {},
-        fallback: {}
-      }, index, length;
-
-  function collectType(type) {
-    result[type.kind][type.tag] = result['fallback'][type.tag] = type;
-  }
-
-  for (index = 0, length = arguments.length; index < length; index += 1) {
-    arguments[index].forEach(collectType);
-  }
-  return result;
-}
-
-
-function Schema(definition) {
-  this.include  = definition.include  || [];
-  this.implicit = definition.implicit || [];
-  this.explicit = definition.explicit || [];
-
-  this.implicit.forEach(function (type) {
-    if (type.loadKind && type.loadKind !== 'scalar') {
-      throw new YAMLException('There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.');
-    }
-  });
-
-  this.compiledImplicit = compileList(this, 'implicit', []);
-  this.compiledExplicit = compileList(this, 'explicit', []);
-  this.compiledTypeMap  = compileMap(this.compiledImplicit, this.compiledExplicit);
-}
-
-
-Schema.DEFAULT = null;
-
-
-Schema.create = function createSchema() {
-  var schemas, types;
-
-  switch (arguments.length) {
-    case 1:
-      schemas = Schema.DEFAULT;
-      types = arguments[0];
-      break;
-
-    case 2:
-      schemas = arguments[0];
-      types = arguments[1];
-      break;
-
-    default:
-      throw new YAMLException('Wrong number of arguments for Schema.create function');
-  }
-
-  schemas = common.toArray(schemas);
-  types = common.toArray(types);
-
-  if (!schemas.every(function (schema) { return schema instanceof Schema; })) {
-    throw new YAMLException('Specified list of super schemas (or a single Schema object) contains a non-Schema object.');
-  }
-
-  if (!types.every(function (type) { return type instanceof Type; })) {
-    throw new YAMLException('Specified list of YAML types (or a single Type object) contains a non-Type object.');
-  }
-
-  return new Schema({
-    include: schemas,
-    explicit: types
-  });
-};
-
-
-module.exports = Schema;
-
-
-/***/ }),
-/* 45 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* eslint-disable node/no-deprecated-api */
-var buffer = __webpack_require__(64)
-var Buffer = buffer.Buffer
-
-// alternative to using Object.keys for old browsers
-function copyProps (src, dst) {
-  for (var key in src) {
-    dst[key] = src[key]
-  }
-}
-if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
-  module.exports = buffer
-} else {
-  // Copy properties from require('buffer')
-  copyProps(buffer, exports)
-  exports.Buffer = SafeBuffer
-}
-
-function SafeBuffer (arg, encodingOrOffset, length) {
-  return Buffer(arg, encodingOrOffset, length)
-}
-
-// Copy static methods from Buffer
-copyProps(Buffer, SafeBuffer)
-
-SafeBuffer.from = function (arg, encodingOrOffset, length) {
-  if (typeof arg === 'number') {
-    throw new TypeError('Argument must not be a number')
-  }
-  return Buffer(arg, encodingOrOffset, length)
-}
-
-SafeBuffer.alloc = function (size, fill, encoding) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  var buf = Buffer(size)
-  if (fill !== undefined) {
-    if (typeof encoding === 'string') {
-      buf.fill(fill, encoding)
-    } else {
-      buf.fill(fill)
-    }
-  } else {
-    buf.fill(0)
-  }
-  return buf
-}
-
-SafeBuffer.allocUnsafe = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return Buffer(size)
-}
-
-SafeBuffer.allocUnsafeSlow = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return buffer.SlowBuffer(size)
-}
-
-
-/***/ }),
-/* 46 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = map;
-/* unused harmony export MapOperator */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function map(project, thisArg) {
-    return function mapOperation(source) {
-        if (typeof project !== 'function') {
-            throw new TypeError('argument is not a function. Are you looking for `mapTo()`?');
-        }
-        return source.lift(new MapOperator(project, thisArg));
-    };
-}
-var MapOperator = /*@__PURE__*/ (function () {
-    function MapOperator(project, thisArg) {
-        this.project = project;
-        this.thisArg = thisArg;
-    }
-    MapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg));
-    };
-    return MapOperator;
-}());
-
-var MapSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MapSubscriber, _super);
-    function MapSubscriber(destination, project, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.count = 0;
-        _this.thisArg = thisArg || _this;
-        return _this;
-    }
-    MapSubscriber.prototype._next = function (value) {
-        var result;
-        try {
-            result = this.project.call(this.thisArg, value, this.count++);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return MapSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=map.js.map
-
-
-/***/ }),
-/* 47 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return errorObject; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var errorObject = { e: {} };
-//# sourceMappingURL=errorObject.js.map
-
-
-/***/ }),
-/* 48 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isScheduler;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isScheduler(value) {
-    return value && typeof value.schedule === 'function';
-}
-//# sourceMappingURL=isScheduler.js.map
-
-
-/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
-
-module.exports = require("os");
-
-/***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.wait = wait;
-exports.promisify = promisify;
-exports.queue = queue;
-function wait(delay) {
-  return new Promise(resolve => {
-    setTimeout(resolve, delay);
-  });
-}
-
-function promisify(fn, firstData) {
-  return function (...args) {
-    return new Promise(function (resolve, reject) {
-      args.push(function (err, ...result) {
-        let res = result;
-
-        if (result.length <= 1) {
-          res = result[0];
-        }
-
-        if (firstData) {
-          res = err;
-          err = null;
-        }
-
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
-        }
-      });
-
-      fn.apply(null, args);
-    });
-  };
-}
-
-function queue(arr, promiseProducer, concurrency = Infinity) {
-  concurrency = Math.min(concurrency, arr.length);
-
-  // clone
-  arr = arr.slice();
-
-  const results = [];
-  let total = arr.length;
-  if (!total) {
-    return Promise.resolve(results);
-  }
-
-  return new Promise((resolve, reject) => {
-    for (let i = 0; i < concurrency; i++) {
-      next();
-    }
-
-    function next() {
-      const item = arr.shift();
-      const promise = promiseProducer(item);
-
-      promise.then(function (result) {
-        results.push(result);
-
-        total--;
-        if (total === 0) {
-          resolve(results);
-        } else {
-          if (arr.length) {
-            next();
-          }
-        }
-      }, reject);
-    }
-  });
-}
-
-/***/ }),
-/* 51 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Thank's IE8 for his funny defineProperty
-module.exports = !__webpack_require__(112)(function () {
-  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
-});
-
-
-/***/ }),
-/* 52 */
-/***/ (function(module, exports) {
-
-module.exports = function (it) {
-  return typeof it === 'object' ? it !== null : typeof it === 'function';
-};
-
-
-/***/ }),
-/* 53 */
-/***/ (function(module, exports) {
-
-module.exports = {};
-
-
-/***/ }),
-/* 54 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// YAML error class. http://stackoverflow.com/questions/8458984
-//
-
-
-function YAMLException(reason, mark) {
-  // Super constructor
-  Error.call(this);
-
-  this.name = 'YAMLException';
-  this.reason = reason;
-  this.mark = mark;
-  this.message = (this.reason || '(unknown reason)') + (this.mark ? ' ' + this.mark.toString() : '');
-
-  // Include stack trace in error object
-  if (Error.captureStackTrace) {
-    // Chrome and NodeJS
-    Error.captureStackTrace(this, this.constructor);
-  } else {
-    // FF, IE 10+ and Safari 6+. Fallback for others
-    this.stack = (new Error()).stack || '';
-  }
-}
-
-
-// Inherit from Error
-YAMLException.prototype = Object.create(Error.prototype);
-YAMLException.prototype.constructor = YAMLException;
-
-
-YAMLException.prototype.toString = function toString(compact) {
-  var result = this.name + ': ';
-
-  result += this.reason || '(unknown reason)';
-
-  if (!compact && this.mark) {
-    result += ' ' + this.mark.toString();
-  }
-
-  return result;
-};
-
-
-module.exports = YAMLException;
-
-
-/***/ }),
-/* 55 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// JS-YAML's default schema for `safeLoad` function.
-// It is not described in the YAML specification.
-//
-// This schema is based on standard YAML's Core schema and includes most of
-// extra types described at YAML tag repository. (http://yaml.org/type/)
-
-
-
-
-
-var Schema = __webpack_require__(44);
-
-
-module.exports = new Schema({
-  include: [
-    __webpack_require__(143)
-  ],
-  implicit: [
-    __webpack_require__(299),
-    __webpack_require__(292)
-  ],
-  explicit: [
-    __webpack_require__(284),
-    __webpack_require__(294),
-    __webpack_require__(295),
-    __webpack_require__(297)
-  ]
-});
-
-
-/***/ }),
-/* 56 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = tryCatch;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(47);
-/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */
-
-var tryCatchTarget;
-function tryCatcher() {
-    try {
-        return tryCatchTarget.apply(this, arguments);
-    }
-    catch (e) {
-        __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */].e = e;
-        return __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */];
-    }
-}
-function tryCatch(fn) {
-    tryCatchTarget = fn;
-    return tryCatcher;
-}
-//# sourceMappingURL=tryCatch.js.map
-
-
-/***/ }),
-/* 57 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.registryNames = exports.registries = undefined;
-
-var _yarnRegistry;
-
-function _load_yarnRegistry() {
-  return _yarnRegistry = _interopRequireDefault(__webpack_require__(559));
-}
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const registries = exports.registries = {
-  npm: (_npmRegistry || _load_npmRegistry()).default,
-  yarn: (_yarnRegistry || _load_yarnRegistry()).default
-};
-
-const registryNames = exports.registryNames = Object.keys(registries);
-
-/***/ }),
-/* 58 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.exec = exports.queue = undefined;
-exports.forkp = forkp;
-exports.spawnp = spawnp;
-exports.forwardSignalToSpawnedProcesses = forwardSignalToSpawnedProcesses;
-exports.spawn = spawn;
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _promise;
-
-function _load_promise() {
-  return _promise = __webpack_require__(50);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-/* global child_process$spawnOpts */
-
-const child = __webpack_require__(331);
-
-const queue = exports.queue = new (_blockingQueue || _load_blockingQueue()).default('child', (_constants || _load_constants()).CHILD_CONCURRENCY);
-
-// TODO: this uid check is kinda whack
-let uid = 0;
-
-const exec = exports.exec = (0, (_promise || _load_promise()).promisify)(child.exec);
-
-function forkp(program, args, opts) {
-  return new Promise((resolve, reject) => {
-    const proc = child.fork(program, args, opts);
-
-    proc.on('error', error => {
-      reject(error);
-    });
-
-    proc.on('close', exitCode => {
-      resolve(exitCode);
-    });
-  });
-}
-
-function spawnp(program, args, opts) {
-  return new Promise((resolve, reject) => {
-    const proc = child.spawn(program, args, opts);
-
-    proc.on('error', error => {
-      reject(error);
-    });
-
-    proc.on('close', exitCode => {
-      resolve(exitCode);
-    });
-  });
-}
-
-const spawnedProcesses = {};
-
-function forwardSignalToSpawnedProcesses(signal) {
-  for (var _iterator = Object.keys(spawnedProcesses), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const key = _ref;
-
-    spawnedProcesses[key].kill(signal);
-  }
-}
-
-function spawn(program, args, opts = {}, onData) {
-  const key = opts.cwd || String(++uid);
-  return queue.push(key, () => new Promise((resolve, reject) => {
-    const proc = child.spawn(program, args, opts);
-    spawnedProcesses[key] = proc;
-
-    let processingDone = false;
-    let processClosed = false;
-    let err = null;
-
-    let stdout = '';
-
-    proc.on('error', err => {
-      if (err.code === 'ENOENT') {
-        reject(new (_errors || _load_errors()).ProcessSpawnError(`Couldn't find the binary ${program}`, err.code, program));
-      } else {
-        reject(err);
-      }
-    });
-
-    function updateStdout(chunk) {
-      stdout += chunk;
-      if (onData) {
-        onData(chunk);
-      }
-    }
-
-    function finish() {
-      delete spawnedProcesses[key];
-      if (err) {
-        reject(err);
-      } else {
-        resolve(stdout.trim());
-      }
-    }
-
-    if (typeof opts.process === 'function') {
-      opts.process(proc, updateStdout, reject, function () {
-        if (processClosed) {
-          finish();
-        } else {
-          processingDone = true;
-        }
-      });
-    } else {
-      if (proc.stderr) {
-        proc.stderr.on('data', updateStdout);
-      }
-
-      if (proc.stdout) {
-        proc.stdout.on('data', updateStdout);
-      }
-
-      processingDone = true;
-    }
-
-    proc.on('close', (code, signal) => {
-      if (signal || code >= 1) {
-        err = new (_errors || _load_errors()).ProcessTermError(['Command failed.', signal ? `Exit signal: ${signal}` : `Exit code: ${code}`, `Command: ${program}`, `Arguments: ${args.join(' ')}`, `Directory: ${opts.cwd || process.cwd()}`, `Output:\n${stdout.trim()}`].join('\n'));
-        err.EXIT_SIGNAL = signal;
-        err.EXIT_CODE = code;
-      }
-
-      if (processingDone || err) {
-        finish();
-      } else {
-        processClosed = true;
-      }
-    });
-  }));
-}
-
-/***/ }),
-/* 59 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-exports.default = function (rootCommandName, subCommands, usage = []) {
-  let run = (() => {
-    var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-      const subName = (0, (_misc || _load_misc()).camelCase)(args.shift() || '');
-      if (subName && subCommands[subName]) {
-        const command = subCommands[subName];
-        const res = yield command(config, reporter, flags, args);
-        if (res !== false) {
-          return Promise.resolve();
-        }
-      }
-
-      if (usage && usage.length) {
-        reporter.error(`${reporter.lang('usage')}:`);
-        for (var _iterator = usage, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-          var _ref2;
-
-          if (_isArray) {
-            if (_i >= _iterator.length) break;
-            _ref2 = _iterator[_i++];
-          } else {
-            _i = _iterator.next();
-            if (_i.done) break;
-            _ref2 = _i.value;
-          }
-
-          const msg = _ref2;
-
-          reporter.error(`yarn ${rootCommandName} ${msg}`);
-        }
-      }
-      return Promise.reject(new (_errors || _load_errors()).MessageError(reporter.lang('invalidCommand', subCommandNames.join(', '))));
-    });
-
-    return function run(_x, _x2, _x3, _x4) {
-      return _ref.apply(this, arguments);
-    };
-  })();
-
-  const subCommandNames = Object.keys(subCommands).map((_misc || _load_misc()).hyphenate);
-
-  function setFlags(commander) {
-    commander.usage(`${rootCommandName} [${subCommandNames.join('|')}] [flags]`);
-  }
-
-  function hasWrapper(commander, args) {
-    return true;
-  }
-
-  const examples = usage.map(cmd => {
-    return `${rootCommandName} ${cmd}`;
-  });
-
-  return { run, setFlags, hasWrapper, examples };
-};
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/***/ }),
-/* 60 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var global = __webpack_require__(17);
-var core = __webpack_require__(31);
-var ctx = __webpack_require__(69);
-var hide = __webpack_require__(42);
-var has = __webpack_require__(70);
-var PROTOTYPE = 'prototype';
-
-var $export = function (type, name, source) {
-  var IS_FORCED = type & $export.F;
-  var IS_GLOBAL = type & $export.G;
-  var IS_STATIC = type & $export.S;
-  var IS_PROTO = type & $export.P;
-  var IS_BIND = type & $export.B;
-  var IS_WRAP = type & $export.W;
-  var exports = IS_GLOBAL ? core : core[name] || (core[name] = {});
-  var expProto = exports[PROTOTYPE];
-  var target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE];
-  var key, own, out;
-  if (IS_GLOBAL) source = name;
-  for (key in source) {
-    // contains in native
-    own = !IS_FORCED && target && target[key] !== undefined;
-    if (own && has(exports, key)) continue;
-    // export native or passed
-    out = own ? target[key] : source[key];
-    // prevent global pollution for namespaces
-    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
-    // bind timers to global for call from export context
-    : IS_BIND && own ? ctx(out, global)
-    // wrap global constructors for prevent change them in library
-    : IS_WRAP && target[key] == out ? (function (C) {
-      var F = function (a, b, c) {
-        if (this instanceof C) {
-          switch (arguments.length) {
-            case 0: return new C();
-            case 1: return new C(a);
-            case 2: return new C(a, b);
-          } return new C(a, b, c);
-        } return C.apply(this, arguments);
-      };
-      F[PROTOTYPE] = C[PROTOTYPE];
-      return F;
-    // make static versions for prototype methods
-    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
-    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
-    if (IS_PROTO) {
-      (exports.virtual || (exports.virtual = {}))[key] = out;
-      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
-      if (type & $export.R && expProto && !expProto[key]) hide(expProto, key, out);
-    }
-  }
-};
-// type bitmap
-$export.F = 1;   // forced
-$export.G = 2;   // global
-$export.S = 4;   // static
-$export.P = 8;   // proto
-$export.B = 16;  // bind
-$export.W = 32;  // wrap
-$export.U = 64;  // safe
-$export.R = 128; // real proto method for `library`
-module.exports = $export;
-
-
-/***/ }),
-/* 61 */
-/***/ (function(module, exports, __webpack_require__) {
-
-try {
-  var util = __webpack_require__(3);
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  module.exports = __webpack_require__(275);
-}
-
-
-/***/ }),
-/* 62 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = from;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isPromise__ = __webpack_require__(445);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__ = __webpack_require__(442);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__ = __webpack_require__(928);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isIterable__ = __webpack_require__(929);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(85);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fromPromise__ = __webpack_require__(830);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fromIterable__ = __webpack_require__(828);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fromObservable__ = __webpack_require__(829);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__ = __webpack_require__(446);
-/** PURE_IMPORTS_START _Observable,_util_isPromise,_util_isArrayLike,_util_isInteropObservable,_util_isIterable,_fromArray,_fromPromise,_fromIterable,_fromObservable,_util_subscribeTo PURE_IMPORTS_END */
-
-
-
-
-
-
-
-
-
-
-function from(input, scheduler) {
-    if (!scheduler) {
-        if (input instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) {
-            return input;
-        }
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__["a" /* subscribeTo */])(input));
-    }
-    if (input != null) {
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__["a" /* isInteropObservable */])(input)) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_8__fromObservable__["a" /* fromObservable */])(input, scheduler);
-        }
-        else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isPromise__["a" /* isPromise */])(input)) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__fromPromise__["a" /* fromPromise */])(input, scheduler);
-        }
-        else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__["a" /* isArrayLike */])(input)) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(input, scheduler);
-        }
-        else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isIterable__["a" /* isIterable */])(input) || typeof input === 'string') {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_7__fromIterable__["a" /* fromIterable */])(input, scheduler);
-        }
-    }
-    throw new TypeError((input !== null && typeof input || input) + ' is not observable');
-}
-//# sourceMappingURL=from.js.map
-
-
-/***/ }),
-/* 63 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__ = __webpack_require__(428);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__ = __webpack_require__(838);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__ = __webpack_require__(839);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__ = __webpack_require__(840);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__ = __webpack_require__(841);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__ = __webpack_require__(842);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__ = __webpack_require__(843);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__ = __webpack_require__(844);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__ = __webpack_require__(845);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__ = __webpack_require__(846);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__ = __webpack_require__(847);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__ = __webpack_require__(429);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__ = __webpack_require__(430);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__ = __webpack_require__(848);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__ = __webpack_require__(849);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__ = __webpack_require__(850);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__ = __webpack_require__(851);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__ = __webpack_require__(146);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__ = __webpack_require__(852);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__ = __webpack_require__(853);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__ = __webpack_require__(854);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__ = __webpack_require__(855);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__ = __webpack_require__(431);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__ = __webpack_require__(856);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__ = __webpack_require__(857);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__ = __webpack_require__(858);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__ = __webpack_require__(859);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__ = __webpack_require__(860);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__ = __webpack_require__(861);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__ = __webpack_require__(862);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__ = __webpack_require__(147);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__ = __webpack_require__(863);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__ = __webpack_require__(432);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__ = __webpack_require__(864);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__ = __webpack_require__(865);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__ = __webpack_require__(433);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__["b"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__ = __webpack_require__(866);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__ = __webpack_require__(867);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__ = __webpack_require__(868);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(46);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__ = __webpack_require__(869);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__ = __webpack_require__(870);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__ = __webpack_require__(871);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__ = __webpack_require__(872);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__ = __webpack_require__(315);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__ = __webpack_require__(148);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__["a"]; });
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__ = __webpack_require__(873);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__ = __webpack_require__(874);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__ = __webpack_require__(875);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__ = __webpack_require__(116);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__ = __webpack_require__(434);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__["b"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__ = __webpack_require__(876);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__ = __webpack_require__(877);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__ = __webpack_require__(878);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__ = __webpack_require__(879);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__ = __webpack_require__(880);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__ = __webpack_require__(881);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__ = __webpack_require__(882);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__ = __webpack_require__(883);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__ = __webpack_require__(884);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__ = __webpack_require__(187);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__ = __webpack_require__(885);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__ = __webpack_require__(886);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__ = __webpack_require__(887);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__ = __webpack_require__(888);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__ = __webpack_require__(316);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__ = __webpack_require__(889);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__ = __webpack_require__(890);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__ = __webpack_require__(317);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__ = __webpack_require__(891);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__ = __webpack_require__(892);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__ = __webpack_require__(893);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__ = __webpack_require__(894);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__ = __webpack_require__(895);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__ = __webpack_require__(896);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__ = __webpack_require__(897);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__ = __webpack_require__(898);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__ = __webpack_require__(899);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__ = __webpack_require__(900);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__ = __webpack_require__(901);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__ = __webpack_require__(318);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__ = __webpack_require__(902);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__ = __webpack_require__(319);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__ = __webpack_require__(320);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__ = __webpack_require__(903);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__ = __webpack_require__(904);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__ = __webpack_require__(435);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__ = __webpack_require__(436);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__ = __webpack_require__(905);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__ = __webpack_require__(188);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__ = __webpack_require__(906);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__ = __webpack_require__(907);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__ = __webpack_require__(437);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__ = __webpack_require__(908);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__ = __webpack_require__(909);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__ = __webpack_require__(910);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__ = __webpack_require__(911);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__ = __webpack_require__(912);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__ = __webpack_require__(913);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__ = __webpack_require__(914);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__ = __webpack_require__(915);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__ = __webpack_require__(916);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__ = __webpack_require__(917);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__["a"]; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-/* 64 */
-/***/ (function(module, exports) {
-
-module.exports = require("buffer");
-
-/***/ }),
-/* 65 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
-
-// If you have no idea what ASN.1 or BER is, see this:
-// ftp://ftp.rsa.com/pub/pkcs/ascii/layman.asc
-
-var Ber = __webpack_require__(514);
-
-
-
-// --- Exported API
-
-module.exports = {
-
-  Ber: Ber,
-
-  BerReader: Ber.Reader,
-
-  BerWriter: Ber.Writer
-
-};
-
-
-/***/ }),
-/* 66 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.home = undefined;
-
-var _rootUser;
-
-function _load_rootUser() {
-  return _rootUser = _interopRequireDefault(__webpack_require__(223));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-const home = exports.home = __webpack_require__(49).homedir();
-
-const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
-
-exports.default = userHomeDir;
-
-/***/ }),
-/* 67 */
-/***/ (function(module, exports) {
-
-module.exports = function (it) {
-  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
-  return it;
-};
-
-
-/***/ }),
-/* 68 */
-/***/ (function(module, exports) {
-
-var toString = {}.toString;
-
-module.exports = function (it) {
-  return toString.call(it).slice(8, -1);
-};
-
-
-/***/ }),
-/* 69 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// optional / simple context binding
-var aFunction = __webpack_require__(67);
-module.exports = function (fn, that, length) {
-  aFunction(fn);
-  if (that === undefined) return fn;
-  switch (length) {
-    case 1: return function (a) {
-      return fn.call(that, a);
-    };
-    case 2: return function (a, b) {
-      return fn.call(that, a, b);
-    };
-    case 3: return function (a, b, c) {
-      return fn.call(that, a, b, c);
-    };
-  }
-  return function (/* ...args */) {
-    return fn.apply(that, arguments);
-  };
-};
-
-
-/***/ }),
-/* 70 */
-/***/ (function(module, exports) {
-
-var hasOwnProperty = {}.hasOwnProperty;
-module.exports = function (it, key) {
-  return hasOwnProperty.call(it, key);
-};
-
-
-/***/ }),
-/* 71 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var anObject = __webpack_require__(35);
-var IE8_DOM_DEFINE = __webpack_require__(238);
-var toPrimitive = __webpack_require__(255);
-var dP = Object.defineProperty;
-
-exports.f = __webpack_require__(51) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
-  anObject(O);
-  P = toPrimitive(P, true);
-  anObject(Attributes);
-  if (IE8_DOM_DEFINE) try {
-    return dP(O, P, Attributes);
-  } catch (e) { /* empty */ }
-  if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported!');
-  if ('value' in Attributes) O[P] = Attributes.value;
-  return O;
-};
-
-
-/***/ }),
-/* 72 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// JS-YAML's default schema for `load` function.
-// It is not described in the YAML specification.
-//
-// This schema is based on JS-YAML's default safe schema and includes
-// JavaScript-specific types: !!js/undefined, !!js/regexp and !!js/function.
-//
-// Also this schema is used as default base schema at `Schema.create` function.
-
-
-
-
-
-var Schema = __webpack_require__(44);
-
-
-module.exports = Schema.DEFAULT = new Schema({
-  include: [
-    __webpack_require__(55)
-  ],
-  explicit: [
-    __webpack_require__(290),
-    __webpack_require__(289),
-    __webpack_require__(288)
-  ]
-});
-
-
-/***/ }),
-/* 73 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-var assert = __webpack_require__(16);
-var util = __webpack_require__(3);
-
-function FingerprintFormatError(fp, format) {
-	if (Error.captureStackTrace)
-		Error.captureStackTrace(this, FingerprintFormatError);
-	this.name = 'FingerprintFormatError';
-	this.fingerprint = fp;
-	this.format = format;
-	this.message = 'Fingerprint format is not supported, or is invalid: ';
-	if (fp !== undefined)
-		this.message += ' fingerprint = ' + fp;
-	if (format !== undefined)
-		this.message += ' format = ' + format;
-}
-util.inherits(FingerprintFormatError, Error);
-
-function InvalidAlgorithmError(alg) {
-	if (Error.captureStackTrace)
-		Error.captureStackTrace(this, InvalidAlgorithmError);
-	this.name = 'InvalidAlgorithmError';
-	this.algorithm = alg;
-	this.message = 'Algorithm "' + alg + '" is not supported';
-}
-util.inherits(InvalidAlgorithmError, Error);
-
-function KeyParseError(name, format, innerErr) {
-	if (Error.captureStackTrace)
-		Error.captureStackTrace(this, KeyParseError);
-	this.name = 'KeyParseError';
-	this.format = format;
-	this.keyName = name;
-	this.innerErr = innerErr;
-	this.message = 'Failed to parse ' + name + ' as a valid ' + format +
-	    ' format key: ' + innerErr.message;
-}
-util.inherits(KeyParseError, Error);
-
-function SignatureParseError(type, format, innerErr) {
-	if (Error.captureStackTrace)
-		Error.captureStackTrace(this, SignatureParseError);
-	this.name = 'SignatureParseError';
-	this.type = type;
-	this.format = format;
-	this.innerErr = innerErr;
-	this.message = 'Failed to parse the given data as a ' + type +
-	    ' signature in ' + format + ' format: ' + innerErr.message;
-}
-util.inherits(SignatureParseError, Error);
-
-function CertificateParseError(name, format, innerErr) {
-	if (Error.captureStackTrace)
-		Error.captureStackTrace(this, CertificateParseError);
-	this.name = 'CertificateParseError';
-	this.format = format;
-	this.certName = name;
-	this.innerErr = innerErr;
-	this.message = 'Failed to parse ' + name + ' as a valid ' + format +
-	    ' format certificate: ' + innerErr.message;
-}
-util.inherits(CertificateParseError, Error);
-
-function KeyEncryptedError(name, format) {
-	if (Error.captureStackTrace)
-		Error.captureStackTrace(this, KeyEncryptedError);
-	this.name = 'KeyEncryptedError';
-	this.format = format;
-	this.keyName = name;
-	this.message = 'The ' + format + ' format key ' + name + ' is ' +
-	    'encrypted (password-protected), and no passphrase was ' +
-	    'provided in `options`';
-}
-util.inherits(KeyEncryptedError, Error);
-
-module.exports = {
-	FingerprintFormatError: FingerprintFormatError,
-	InvalidAlgorithmError: InvalidAlgorithmError,
-	KeyParseError: KeyParseError,
-	SignatureParseError: SignatureParseError,
-	KeyEncryptedError: KeyEncryptedError,
-	CertificateParseError: CertificateParseError
-};
-
-
-/***/ }),
-/* 74 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = Signature;
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var crypto = __webpack_require__(12);
-var errs = __webpack_require__(73);
-var utils = __webpack_require__(26);
-var asn1 = __webpack_require__(65);
-var SSHBuffer = __webpack_require__(159);
-
-var InvalidAlgorithmError = errs.InvalidAlgorithmError;
-var SignatureParseError = errs.SignatureParseError;
-
-function Signature(opts) {
-	assert.object(opts, 'options');
-	assert.arrayOfObject(opts.parts, 'options.parts');
-	assert.string(opts.type, 'options.type');
-
-	var partLookup = {};
-	for (var i = 0; i < opts.parts.length; ++i) {
-		var part = opts.parts[i];
-		partLookup[part.name] = part;
-	}
-
-	this.type = opts.type;
-	this.hashAlgorithm = opts.hashAlgo;
-	this.curve = opts.curve;
-	this.parts = opts.parts;
-	this.part = partLookup;
-}
-
-Signature.prototype.toBuffer = function (format) {
-	if (format === undefined)
-		format = 'asn1';
-	assert.string(format, 'format');
-
-	var buf;
-	var stype = 'ssh-' + this.type;
-
-	switch (this.type) {
-	case 'rsa':
-		switch (this.hashAlgorithm) {
-		case 'sha256':
-			stype = 'rsa-sha2-256';
-			break;
-		case 'sha512':
-			stype = 'rsa-sha2-512';
-			break;
-		case 'sha1':
-		case undefined:
-			break;
-		default:
-			throw (new Error('SSH signature ' +
-			    'format does not support hash ' +
-			    'algorithm ' + this.hashAlgorithm));
-		}
-		if (format === 'ssh') {
-			buf = new SSHBuffer({});
-			buf.writeString(stype);
-			buf.writePart(this.part.sig);
-			return (buf.toBuffer());
-		} else {
-			return (this.part.sig.data);
-		}
-		break;
-
-	case 'ed25519':
-		if (format === 'ssh') {
-			buf = new SSHBuffer({});
-			buf.writeString(stype);
-			buf.writePart(this.part.sig);
-			return (buf.toBuffer());
-		} else {
-			return (this.part.sig.data);
-		}
-		break;
-
-	case 'dsa':
-	case 'ecdsa':
-		var r, s;
-		if (format === 'asn1') {
-			var der = new asn1.BerWriter();
-			der.startSequence();
-			r = utils.mpNormalize(this.part.r.data);
-			s = utils.mpNormalize(this.part.s.data);
-			der.writeBuffer(r, asn1.Ber.Integer);
-			der.writeBuffer(s, asn1.Ber.Integer);
-			der.endSequence();
-			return (der.buffer);
-		} else if (format === 'ssh' && this.type === 'dsa') {
-			buf = new SSHBuffer({});
-			buf.writeString('ssh-dss');
-			r = this.part.r.data;
-			if (r.length > 20 && r[0] === 0x00)
-				r = r.slice(1);
-			s = this.part.s.data;
-			if (s.length > 20 && s[0] === 0x00)
-				s = s.slice(1);
-			if ((this.hashAlgorithm &&
-			    this.hashAlgorithm !== 'sha1') ||
-			    r.length + s.length !== 40) {
-				throw (new Error('OpenSSH only supports ' +
-				    'DSA signatures with SHA1 hash'));
-			}
-			buf.writeBuffer(Buffer.concat([r, s]));
-			return (buf.toBuffer());
-		} else if (format === 'ssh' && this.type === 'ecdsa') {
-			var inner = new SSHBuffer({});
-			r = this.part.r.data;
-			inner.writeBuffer(r);
-			inner.writePart(this.part.s);
-
-			buf = new SSHBuffer({});
-			/* XXX: find a more proper way to do this? */
-			var curve;
-			if (r[0] === 0x00)
-				r = r.slice(1);
-			var sz = r.length * 8;
-			if (sz === 256)
-				curve = 'nistp256';
-			else if (sz === 384)
-				curve = 'nistp384';
-			else if (sz === 528)
-				curve = 'nistp521';
-			buf.writeString('ecdsa-sha2-' + curve);
-			buf.writeBuffer(inner.toBuffer());
-			return (buf.toBuffer());
-		}
-		throw (new Error('Invalid signature format'));
-	default:
-		throw (new Error('Invalid signature data'));
-	}
-};
-
-Signature.prototype.toString = function (format) {
-	assert.optionalString(format, 'format');
-	return (this.toBuffer(format).toString('base64'));
-};
-
-Signature.parse = function (data, type, format) {
-	if (typeof (data) === 'string')
-		data = Buffer.from(data, 'base64');
-	assert.buffer(data, 'data');
-	assert.string(format, 'format');
-	assert.string(type, 'type');
-
-	var opts = {};
-	opts.type = type.toLowerCase();
-	opts.parts = [];
-
-	try {
-		assert.ok(data.length > 0, 'signature must not be empty');
-		switch (opts.type) {
-		case 'rsa':
-			return (parseOneNum(data, type, format, opts));
-		case 'ed25519':
-			return (parseOneNum(data, type, format, opts));
-
-		case 'dsa':
-		case 'ecdsa':
-			if (format === 'asn1')
-				return (parseDSAasn1(data, type, format, opts));
-			else if (opts.type === 'dsa')
-				return (parseDSA(data, type, format, opts));
-			else
-				return (parseECDSA(data, type, format, opts));
-
-		default:
-			throw (new InvalidAlgorithmError(type));
-		}
-
-	} catch (e) {
-		if (e instanceof InvalidAlgorithmError)
-			throw (e);
-		throw (new SignatureParseError(type, format, e));
-	}
-};
-
-function parseOneNum(data, type, format, opts) {
-	if (format === 'ssh') {
-		try {
-			var buf = new SSHBuffer({buffer: data});
-			var head = buf.readString();
-		} catch (e) {
-			/* fall through */
-		}
-		if (buf !== undefined) {
-			var msg = 'SSH signature does not match expected ' +
-			    'type (expected ' + type + ', got ' + head + ')';
-			switch (head) {
-			case 'ssh-rsa':
-				assert.strictEqual(type, 'rsa', msg);
-				opts.hashAlgo = 'sha1';
-				break;
-			case 'rsa-sha2-256':
-				assert.strictEqual(type, 'rsa', msg);
-				opts.hashAlgo = 'sha256';
-				break;
-			case 'rsa-sha2-512':
-				assert.strictEqual(type, 'rsa', msg);
-				opts.hashAlgo = 'sha512';
-				break;
-			case 'ssh-ed25519':
-				assert.strictEqual(type, 'ed25519', msg);
-				opts.hashAlgo = 'sha512';
-				break;
-			default:
-				throw (new Error('Unknown SSH signature ' +
-				    'type: ' + head));
-			}
-			var sig = buf.readPart();
-			assert.ok(buf.atEnd(), 'extra trailing bytes');
-			sig.name = 'sig';
-			opts.parts.push(sig);
-			return (new Signature(opts));
-		}
-	}
-	opts.parts.push({name: 'sig', data: data});
-	return (new Signature(opts));
-}
-
-function parseDSAasn1(data, type, format, opts) {
-	var der = new asn1.BerReader(data);
-	der.readSequence();
-	var r = der.readString(asn1.Ber.Integer, true);
-	var s = der.readString(asn1.Ber.Integer, true);
-
-	opts.parts.push({name: 'r', data: utils.mpNormalize(r)});
-	opts.parts.push({name: 's', data: utils.mpNormalize(s)});
-
-	return (new Signature(opts));
-}
-
-function parseDSA(data, type, format, opts) {
-	if (data.length != 40) {
-		var buf = new SSHBuffer({buffer: data});
-		var d = buf.readBuffer();
-		if (d.toString('ascii') === 'ssh-dss')
-			d = buf.readBuffer();
-		assert.ok(buf.atEnd(), 'extra trailing bytes');
-		assert.strictEqual(d.length, 40, 'invalid inner length');
-		data = d;
-	}
-	opts.parts.push({name: 'r', data: data.slice(0, 20)});
-	opts.parts.push({name: 's', data: data.slice(20, 40)});
-	return (new Signature(opts));
-}
-
-function parseECDSA(data, type, format, opts) {
-	var buf = new SSHBuffer({buffer: data});
-
-	var r, s;
-	var inner = buf.readBuffer();
-	var stype = inner.toString('ascii');
-	if (stype.slice(0, 6) === 'ecdsa-') {
-		var parts = stype.split('-');
-		assert.strictEqual(parts[0], 'ecdsa');
-		assert.strictEqual(parts[1], 'sha2');
-		opts.curve = parts[2];
-		switch (opts.curve) {
-		case 'nistp256':
-			opts.hashAlgo = 'sha256';
-			break;
-		case 'nistp384':
-			opts.hashAlgo = 'sha384';
-			break;
-		case 'nistp521':
-			opts.hashAlgo = 'sha512';
-			break;
-		default:
-			throw (new Error('Unsupported ECDSA curve: ' +
-			    opts.curve));
-		}
-		inner = buf.readBuffer();
-		assert.ok(buf.atEnd(), 'extra trailing bytes on outer');
-		buf = new SSHBuffer({buffer: inner});
-		r = buf.readPart();
-	} else {
-		r = {data: inner};
-	}
-
-	s = buf.readPart();
-	assert.ok(buf.atEnd(), 'extra trailing bytes');
-
-	r.name = 'r';
-	s.name = 's';
-
-	opts.parts.push(r);
-	opts.parts.push(s);
-	return (new Signature(opts));
-}
-
-Signature.isSignature = function (obj, ver) {
-	return (utils.isCompatible(obj, Signature, ver));
-};
-
-/*
- * API versions for Signature:
- * [1,0] -- initial ver
- * [2,0] -- support for rsa in full ssh format, compat with sshpk-agent
- *          hashAlgorithm property
- * [2,1] -- first tagged version
- */
-Signature.prototype._sshpkApiVersion = [2, 1];
-
-Signature._oldVersionDetect = function (obj) {
-	assert.func(obj.toBuffer);
-	if (obj.hasOwnProperty('hashAlgorithm'))
-		return ([2, 0]);
-	return ([1, 0]);
-};
-
-
-/***/ }),
-/* 75 */
-/***/ (function(module, exports, __webpack_require__) {
-
-(function(nacl) {
-'use strict';
-
-// Ported in 2014 by Dmitry Chestnykh and Devi Mandiri.
-// Public domain.
-//
-// Implementation derived from TweetNaCl version 20140427.
-// See for details: http://tweetnacl.cr.yp.to/
-
-var gf = function(init) {
-  var i, r = new Float64Array(16);
-  if (init) for (i = 0; i < init.length; i++) r[i] = init[i];
-  return r;
-};
-
-//  Pluggable, initialized in high-level API below.
-var randombytes = function(/* x, n */) { throw new Error('no PRNG'); };
-
-var _0 = new Uint8Array(16);
-var _9 = new Uint8Array(32); _9[0] = 9;
-
-var gf0 = gf(),
-    gf1 = gf([1]),
-    _121665 = gf([0xdb41, 1]),
-    D = gf([0x78a3, 0x1359, 0x4dca, 0x75eb, 0xd8ab, 0x4141, 0x0a4d, 0x0070, 0xe898, 0x7779, 0x4079, 0x8cc7, 0xfe73, 0x2b6f, 0x6cee, 0x5203]),
-    D2 = gf([0xf159, 0x26b2, 0x9b94, 0xebd6, 0xb156, 0x8283, 0x149a, 0x00e0, 0xd130, 0xeef3, 0x80f2, 0x198e, 0xfce7, 0x56df, 0xd9dc, 0x2406]),
-    X = gf([0xd51a, 0x8f25, 0x2d60, 0xc956, 0xa7b2, 0x9525, 0xc760, 0x692c, 0xdc5c, 0xfdd6, 0xe231, 0xc0a4, 0x53fe, 0xcd6e, 0x36d3, 0x2169]),
-    Y = gf([0x6658, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666]),
-    I = gf([0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83]);
-
-function ts64(x, i, h, l) {
-  x[i]   = (h >> 24) & 0xff;
-  x[i+1] = (h >> 16) & 0xff;
-  x[i+2] = (h >>  8) & 0xff;
-  x[i+3] = h & 0xff;
-  x[i+4] = (l >> 24)  & 0xff;
-  x[i+5] = (l >> 16)  & 0xff;
-  x[i+6] = (l >>  8)  & 0xff;
-  x[i+7] = l & 0xff;
-}
-
-function vn(x, xi, y, yi, n) {
-  var i,d = 0;
-  for (i = 0; i < n; i++) d |= x[xi+i]^y[yi+i];
-  return (1 & ((d - 1) >>> 8)) - 1;
-}
-
-function crypto_verify_16(x, xi, y, yi) {
-  return vn(x,xi,y,yi,16);
-}
-
-function crypto_verify_32(x, xi, y, yi) {
-  return vn(x,xi,y,yi,32);
-}
-
-function core_salsa20(o, p, k, c) {
-  var j0  = c[ 0] & 0xff | (c[ 1] & 0xff)<<8 | (c[ 2] & 0xff)<<16 | (c[ 3] & 0xff)<<24,
-      j1  = k[ 0] & 0xff | (k[ 1] & 0xff)<<8 | (k[ 2] & 0xff)<<16 | (k[ 3] & 0xff)<<24,
-      j2  = k[ 4] & 0xff | (k[ 5] & 0xff)<<8 | (k[ 6] & 0xff)<<16 | (k[ 7] & 0xff)<<24,
-      j3  = k[ 8] & 0xff | (k[ 9] & 0xff)<<8 | (k[10] & 0xff)<<16 | (k[11] & 0xff)<<24,
-      j4  = k[12] & 0xff | (k[13] & 0xff)<<8 | (k[14] & 0xff)<<16 | (k[15] & 0xff)<<24,
-      j5  = c[ 4] & 0xff | (c[ 5] & 0xff)<<8 | (c[ 6] & 0xff)<<16 | (c[ 7] & 0xff)<<24,
-      j6  = p[ 0] & 0xff | (p[ 1] & 0xff)<<8 | (p[ 2] & 0xff)<<16 | (p[ 3] & 0xff)<<24,
-      j7  = p[ 4] & 0xff | (p[ 5] & 0xff)<<8 | (p[ 6] & 0xff)<<16 | (p[ 7] & 0xff)<<24,
-      j8  = p[ 8] & 0xff | (p[ 9] & 0xff)<<8 | (p[10] & 0xff)<<16 | (p[11] & 0xff)<<24,
-      j9  = p[12] & 0xff | (p[13] & 0xff)<<8 | (p[14] & 0xff)<<16 | (p[15] & 0xff)<<24,
-      j10 = c[ 8] & 0xff | (c[ 9] & 0xff)<<8 | (c[10] & 0xff)<<16 | (c[11] & 0xff)<<24,
-      j11 = k[16] & 0xff | (k[17] & 0xff)<<8 | (k[18] & 0xff)<<16 | (k[19] & 0xff)<<24,
-      j12 = k[20] & 0xff | (k[21] & 0xff)<<8 | (k[22] & 0xff)<<16 | (k[23] & 0xff)<<24,
-      j13 = k[24] & 0xff | (k[25] & 0xff)<<8 | (k[26] & 0xff)<<16 | (k[27] & 0xff)<<24,
-      j14 = k[28] & 0xff | (k[29] & 0xff)<<8 | (k[30] & 0xff)<<16 | (k[31] & 0xff)<<24,
-      j15 = c[12] & 0xff | (c[13] & 0xff)<<8 | (c[14] & 0xff)<<16 | (c[15] & 0xff)<<24;
-
-  var x0 = j0, x1 = j1, x2 = j2, x3 = j3, x4 = j4, x5 = j5, x6 = j6, x7 = j7,
-      x8 = j8, x9 = j9, x10 = j10, x11 = j11, x12 = j12, x13 = j13, x14 = j14,
-      x15 = j15, u;
-
-  for (var i = 0; i < 20; i += 2) {
-    u = x0 + x12 | 0;
-    x4 ^= u<<7 | u>>>(32-7);
-    u = x4 + x0 | 0;
-    x8 ^= u<<9 | u>>>(32-9);
-    u = x8 + x4 | 0;
-    x12 ^= u<<13 | u>>>(32-13);
-    u = x12 + x8 | 0;
-    x0 ^= u<<18 | u>>>(32-18);
-
-    u = x5 + x1 | 0;
-    x9 ^= u<<7 | u>>>(32-7);
-    u = x9 + x5 | 0;
-    x13 ^= u<<9 | u>>>(32-9);
-    u = x13 + x9 | 0;
-    x1 ^= u<<13 | u>>>(32-13);
-    u = x1 + x13 | 0;
-    x5 ^= u<<18 | u>>>(32-18);
-
-    u = x10 + x6 | 0;
-    x14 ^= u<<7 | u>>>(32-7);
-    u = x14 + x10 | 0;
-    x2 ^= u<<9 | u>>>(32-9);
-    u = x2 + x14 | 0;
-    x6 ^= u<<13 | u>>>(32-13);
-    u = x6 + x2 | 0;
-    x10 ^= u<<18 | u>>>(32-18);
-
-    u = x15 + x11 | 0;
-    x3 ^= u<<7 | u>>>(32-7);
-    u = x3 + x15 | 0;
-    x7 ^= u<<9 | u>>>(32-9);
-    u = x7 + x3 | 0;
-    x11 ^= u<<13 | u>>>(32-13);
-    u = x11 + x7 | 0;
-    x15 ^= u<<18 | u>>>(32-18);
-
-    u = x0 + x3 | 0;
-    x1 ^= u<<7 | u>>>(32-7);
-    u = x1 + x0 | 0;
-    x2 ^= u<<9 | u>>>(32-9);
-    u = x2 + x1 | 0;
-    x3 ^= u<<13 | u>>>(32-13);
-    u = x3 + x2 | 0;
-    x0 ^= u<<18 | u>>>(32-18);
-
-    u = x5 + x4 | 0;
-    x6 ^= u<<7 | u>>>(32-7);
-    u = x6 + x5 | 0;
-    x7 ^= u<<9 | u>>>(32-9);
-    u = x7 + x6 | 0;
-    x4 ^= u<<13 | u>>>(32-13);
-    u = x4 + x7 | 0;
-    x5 ^= u<<18 | u>>>(32-18);
-
-    u = x10 + x9 | 0;
-    x11 ^= u<<7 | u>>>(32-7);
-    u = x11 + x10 | 0;
-    x8 ^= u<<9 | u>>>(32-9);
-    u = x8 + x11 | 0;
-    x9 ^= u<<13 | u>>>(32-13);
-    u = x9 + x8 | 0;
-    x10 ^= u<<18 | u>>>(32-18);
-
-    u = x15 + x14 | 0;
-    x12 ^= u<<7 | u>>>(32-7);
-    u = x12 + x15 | 0;
-    x13 ^= u<<9 | u>>>(32-9);
-    u = x13 + x12 | 0;
-    x14 ^= u<<13 | u>>>(32-13);
-    u = x14 + x13 | 0;
-    x15 ^= u<<18 | u>>>(32-18);
-  }
-   x0 =  x0 +  j0 | 0;
-   x1 =  x1 +  j1 | 0;
-   x2 =  x2 +  j2 | 0;
-   x3 =  x3 +  j3 | 0;
-   x4 =  x4 +  j4 | 0;
-   x5 =  x5 +  j5 | 0;
-   x6 =  x6 +  j6 | 0;
-   x7 =  x7 +  j7 | 0;
-   x8 =  x8 +  j8 | 0;
-   x9 =  x9 +  j9 | 0;
-  x10 = x10 + j10 | 0;
-  x11 = x11 + j11 | 0;
-  x12 = x12 + j12 | 0;
-  x13 = x13 + j13 | 0;
-  x14 = x14 + j14 | 0;
-  x15 = x15 + j15 | 0;
-
-  o[ 0] = x0 >>>  0 & 0xff;
-  o[ 1] = x0 >>>  8 & 0xff;
-  o[ 2] = x0 >>> 16 & 0xff;
-  o[ 3] = x0 >>> 24 & 0xff;
-
-  o[ 4] = x1 >>>  0 & 0xff;
-  o[ 5] = x1 >>>  8 & 0xff;
-  o[ 6] = x1 >>> 16 & 0xff;
-  o[ 7] = x1 >>> 24 & 0xff;
-
-  o[ 8] = x2 >>>  0 & 0xff;
-  o[ 9] = x2 >>>  8 & 0xff;
-  o[10] = x2 >>> 16 & 0xff;
-  o[11] = x2 >>> 24 & 0xff;
-
-  o[12] = x3 >>>  0 & 0xff;
-  o[13] = x3 >>>  8 & 0xff;
-  o[14] = x3 >>> 16 & 0xff;
-  o[15] = x3 >>> 24 & 0xff;
-
-  o[16] = x4 >>>  0 & 0xff;
-  o[17] = x4 >>>  8 & 0xff;
-  o[18] = x4 >>> 16 & 0xff;
-  o[19] = x4 >>> 24 & 0xff;
-
-  o[20] = x5 >>>  0 & 0xff;
-  o[21] = x5 >>>  8 & 0xff;
-  o[22] = x5 >>> 16 & 0xff;
-  o[23] = x5 >>> 24 & 0xff;
-
-  o[24] = x6 >>>  0 & 0xff;
-  o[25] = x6 >>>  8 & 0xff;
-  o[26] = x6 >>> 16 & 0xff;
-  o[27] = x6 >>> 24 & 0xff;
-
-  o[28] = x7 >>>  0 & 0xff;
-  o[29] = x7 >>>  8 & 0xff;
-  o[30] = x7 >>> 16 & 0xff;
-  o[31] = x7 >>> 24 & 0xff;
-
-  o[32] = x8 >>>  0 & 0xff;
-  o[33] = x8 >>>  8 & 0xff;
-  o[34] = x8 >>> 16 & 0xff;
-  o[35] = x8 >>> 24 & 0xff;
-
-  o[36] = x9 >>>  0 & 0xff;
-  o[37] = x9 >>>  8 & 0xff;
-  o[38] = x9 >>> 16 & 0xff;
-  o[39] = x9 >>> 24 & 0xff;
-
-  o[40] = x10 >>>  0 & 0xff;
-  o[41] = x10 >>>  8 & 0xff;
-  o[42] = x10 >>> 16 & 0xff;
-  o[43] = x10 >>> 24 & 0xff;
-
-  o[44] = x11 >>>  0 & 0xff;
-  o[45] = x11 >>>  8 & 0xff;
-  o[46] = x11 >>> 16 & 0xff;
-  o[47] = x11 >>> 24 & 0xff;
-
-  o[48] = x12 >>>  0 & 0xff;
-  o[49] = x12 >>>  8 & 0xff;
-  o[50] = x12 >>> 16 & 0xff;
-  o[51] = x12 >>> 24 & 0xff;
-
-  o[52] = x13 >>>  0 & 0xff;
-  o[53] = x13 >>>  8 & 0xff;
-  o[54] = x13 >>> 16 & 0xff;
-  o[55] = x13 >>> 24 & 0xff;
-
-  o[56] = x14 >>>  0 & 0xff;
-  o[57] = x14 >>>  8 & 0xff;
-  o[58] = x14 >>> 16 & 0xff;
-  o[59] = x14 >>> 24 & 0xff;
-
-  o[60] = x15 >>>  0 & 0xff;
-  o[61] = x15 >>>  8 & 0xff;
-  o[62] = x15 >>> 16 & 0xff;
-  o[63] = x15 >>> 24 & 0xff;
-}
-
-function core_hsalsa20(o,p,k,c) {
-  var j0  = c[ 0] & 0xff | (c[ 1] & 0xff)<<8 | (c[ 2] & 0xff)<<16 | (c[ 3] & 0xff)<<24,
-      j1  = k[ 0] & 0xff | (k[ 1] & 0xff)<<8 | (k[ 2] & 0xff)<<16 | (k[ 3] & 0xff)<<24,
-      j2  = k[ 4] & 0xff | (k[ 5] & 0xff)<<8 | (k[ 6] & 0xff)<<16 | (k[ 7] & 0xff)<<24,
-      j3  = k[ 8] & 0xff | (k[ 9] & 0xff)<<8 | (k[10] & 0xff)<<16 | (k[11] & 0xff)<<24,
-      j4  = k[12] & 0xff | (k[13] & 0xff)<<8 | (k[14] & 0xff)<<16 | (k[15] & 0xff)<<24,
-      j5  = c[ 4] & 0xff | (c[ 5] & 0xff)<<8 | (c[ 6] & 0xff)<<16 | (c[ 7] & 0xff)<<24,
-      j6  = p[ 0] & 0xff | (p[ 1] & 0xff)<<8 | (p[ 2] & 0xff)<<16 | (p[ 3] & 0xff)<<24,
-      j7  = p[ 4] & 0xff | (p[ 5] & 0xff)<<8 | (p[ 6] & 0xff)<<16 | (p[ 7] & 0xff)<<24,
-      j8  = p[ 8] & 0xff | (p[ 9] & 0xff)<<8 | (p[10] & 0xff)<<16 | (p[11] & 0xff)<<24,
-      j9  = p[12] & 0xff | (p[13] & 0xff)<<8 | (p[14] & 0xff)<<16 | (p[15] & 0xff)<<24,
-      j10 = c[ 8] & 0xff | (c[ 9] & 0xff)<<8 | (c[10] & 0xff)<<16 | (c[11] & 0xff)<<24,
-      j11 = k[16] & 0xff | (k[17] & 0xff)<<8 | (k[18] & 0xff)<<16 | (k[19] & 0xff)<<24,
-      j12 = k[20] & 0xff | (k[21] & 0xff)<<8 | (k[22] & 0xff)<<16 | (k[23] & 0xff)<<24,
-      j13 = k[24] & 0xff | (k[25] & 0xff)<<8 | (k[26] & 0xff)<<16 | (k[27] & 0xff)<<24,
-      j14 = k[28] & 0xff | (k[29] & 0xff)<<8 | (k[30] & 0xff)<<16 | (k[31] & 0xff)<<24,
-      j15 = c[12] & 0xff | (c[13] & 0xff)<<8 | (c[14] & 0xff)<<16 | (c[15] & 0xff)<<24;
-
-  var x0 = j0, x1 = j1, x2 = j2, x3 = j3, x4 = j4, x5 = j5, x6 = j6, x7 = j7,
-      x8 = j8, x9 = j9, x10 = j10, x11 = j11, x12 = j12, x13 = j13, x14 = j14,
-      x15 = j15, u;
-
-  for (var i = 0; i < 20; i += 2) {
-    u = x0 + x12 | 0;
-    x4 ^= u<<7 | u>>>(32-7);
-    u = x4 + x0 | 0;
-    x8 ^= u<<9 | u>>>(32-9);
-    u = x8 + x4 | 0;
-    x12 ^= u<<13 | u>>>(32-13);
-    u = x12 + x8 | 0;
-    x0 ^= u<<18 | u>>>(32-18);
-
-    u = x5 + x1 | 0;
-    x9 ^= u<<7 | u>>>(32-7);
-    u = x9 + x5 | 0;
-    x13 ^= u<<9 | u>>>(32-9);
-    u = x13 + x9 | 0;
-    x1 ^= u<<13 | u>>>(32-13);
-    u = x1 + x13 | 0;
-    x5 ^= u<<18 | u>>>(32-18);
-
-    u = x10 + x6 | 0;
-    x14 ^= u<<7 | u>>>(32-7);
-    u = x14 + x10 | 0;
-    x2 ^= u<<9 | u>>>(32-9);
-    u = x2 + x14 | 0;
-    x6 ^= u<<13 | u>>>(32-13);
-    u = x6 + x2 | 0;
-    x10 ^= u<<18 | u>>>(32-18);
-
-    u = x15 + x11 | 0;
-    x3 ^= u<<7 | u>>>(32-7);
-    u = x3 + x15 | 0;
-    x7 ^= u<<9 | u>>>(32-9);
-    u = x7 + x3 | 0;
-    x11 ^= u<<13 | u>>>(32-13);
-    u = x11 + x7 | 0;
-    x15 ^= u<<18 | u>>>(32-18);
-
-    u = x0 + x3 | 0;
-    x1 ^= u<<7 | u>>>(32-7);
-    u = x1 + x0 | 0;
-    x2 ^= u<<9 | u>>>(32-9);
-    u = x2 + x1 | 0;
-    x3 ^= u<<13 | u>>>(32-13);
-    u = x3 + x2 | 0;
-    x0 ^= u<<18 | u>>>(32-18);
-
-    u = x5 + x4 | 0;
-    x6 ^= u<<7 | u>>>(32-7);
-    u = x6 + x5 | 0;
-    x7 ^= u<<9 | u>>>(32-9);
-    u = x7 + x6 | 0;
-    x4 ^= u<<13 | u>>>(32-13);
-    u = x4 + x7 | 0;
-    x5 ^= u<<18 | u>>>(32-18);
-
-    u = x10 + x9 | 0;
-    x11 ^= u<<7 | u>>>(32-7);
-    u = x11 + x10 | 0;
-    x8 ^= u<<9 | u>>>(32-9);
-    u = x8 + x11 | 0;
-    x9 ^= u<<13 | u>>>(32-13);
-    u = x9 + x8 | 0;
-    x10 ^= u<<18 | u>>>(32-18);
-
-    u = x15 + x14 | 0;
-    x12 ^= u<<7 | u>>>(32-7);
-    u = x12 + x15 | 0;
-    x13 ^= u<<9 | u>>>(32-9);
-    u = x13 + x12 | 0;
-    x14 ^= u<<13 | u>>>(32-13);
-    u = x14 + x13 | 0;
-    x15 ^= u<<18 | u>>>(32-18);
-  }
-
-  o[ 0] = x0 >>>  0 & 0xff;
-  o[ 1] = x0 >>>  8 & 0xff;
-  o[ 2] = x0 >>> 16 & 0xff;
-  o[ 3] = x0 >>> 24 & 0xff;
-
-  o[ 4] = x5 >>>  0 & 0xff;
-  o[ 5] = x5 >>>  8 & 0xff;
-  o[ 6] = x5 >>> 16 & 0xff;
-  o[ 7] = x5 >>> 24 & 0xff;
-
-  o[ 8] = x10 >>>  0 & 0xff;
-  o[ 9] = x10 >>>  8 & 0xff;
-  o[10] = x10 >>> 16 & 0xff;
-  o[11] = x10 >>> 24 & 0xff;
-
-  o[12] = x15 >>>  0 & 0xff;
-  o[13] = x15 >>>  8 & 0xff;
-  o[14] = x15 >>> 16 & 0xff;
-  o[15] = x15 >>> 24 & 0xff;
-
-  o[16] = x6 >>>  0 & 0xff;
-  o[17] = x6 >>>  8 & 0xff;
-  o[18] = x6 >>> 16 & 0xff;
-  o[19] = x6 >>> 24 & 0xff;
-
-  o[20] = x7 >>>  0 & 0xff;
-  o[21] = x7 >>>  8 & 0xff;
-  o[22] = x7 >>> 16 & 0xff;
-  o[23] = x7 >>> 24 & 0xff;
-
-  o[24] = x8 >>>  0 & 0xff;
-  o[25] = x8 >>>  8 & 0xff;
-  o[26] = x8 >>> 16 & 0xff;
-  o[27] = x8 >>> 24 & 0xff;
-
-  o[28] = x9 >>>  0 & 0xff;
-  o[29] = x9 >>>  8 & 0xff;
-  o[30] = x9 >>> 16 & 0xff;
-  o[31] = x9 >>> 24 & 0xff;
-}
-
-function crypto_core_salsa20(out,inp,k,c) {
-  core_salsa20(out,inp,k,c);
-}
-
-function crypto_core_hsalsa20(out,inp,k,c) {
-  core_hsalsa20(out,inp,k,c);
-}
-
-var sigma = new Uint8Array([101, 120, 112, 97, 110, 100, 32, 51, 50, 45, 98, 121, 116, 101, 32, 107]);
-            // "expand 32-byte k"
-
-function crypto_stream_salsa20_xor(c,cpos,m,mpos,b,n,k) {
-  var z = new Uint8Array(16), x = new Uint8Array(64);
-  var u, i;
-  for (i = 0; i < 16; i++) z[i] = 0;
-  for (i = 0; i < 8; i++) z[i] = n[i];
-  while (b >= 64) {
-    crypto_core_salsa20(x,z,k,sigma);
-    for (i = 0; i < 64; i++) c[cpos+i] = m[mpos+i] ^ x[i];
-    u = 1;
-    for (i = 8; i < 16; i++) {
-      u = u + (z[i] & 0xff) | 0;
-      z[i] = u & 0xff;
-      u >>>= 8;
-    }
-    b -= 64;
-    cpos += 64;
-    mpos += 64;
-  }
-  if (b > 0) {
-    crypto_core_salsa20(x,z,k,sigma);
-    for (i = 0; i < b; i++) c[cpos+i] = m[mpos+i] ^ x[i];
-  }
-  return 0;
-}
-
-function crypto_stream_salsa20(c,cpos,b,n,k) {
-  var z = new Uint8Array(16), x = new Uint8Array(64);
-  var u, i;
-  for (i = 0; i < 16; i++) z[i] = 0;
-  for (i = 0; i < 8; i++) z[i] = n[i];
-  while (b >= 64) {
-    crypto_core_salsa20(x,z,k,sigma);
-    for (i = 0; i < 64; i++) c[cpos+i] = x[i];
-    u = 1;
-    for (i = 8; i < 16; i++) {
-      u = u + (z[i] & 0xff) | 0;
-      z[i] = u & 0xff;
-      u >>>= 8;
-    }
-    b -= 64;
-    cpos += 64;
-  }
-  if (b > 0) {
-    crypto_core_salsa20(x,z,k,sigma);
-    for (i = 0; i < b; i++) c[cpos+i] = x[i];
-  }
-  return 0;
-}
-
-function crypto_stream(c,cpos,d,n,k) {
-  var s = new Uint8Array(32);
-  crypto_core_hsalsa20(s,n,k,sigma);
-  var sn = new Uint8Array(8);
-  for (var i = 0; i < 8; i++) sn[i] = n[i+16];
-  return crypto_stream_salsa20(c,cpos,d,sn,s);
-}
-
-function crypto_stream_xor(c,cpos,m,mpos,d,n,k) {
-  var s = new Uint8Array(32);
-  crypto_core_hsalsa20(s,n,k,sigma);
-  var sn = new Uint8Array(8);
-  for (var i = 0; i < 8; i++) sn[i] = n[i+16];
-  return crypto_stream_salsa20_xor(c,cpos,m,mpos,d,sn,s);
-}
-
-/*
-* Port of Andrew Moon's Poly1305-donna-16. Public domain.
-* https://github.com/floodyberry/poly1305-donna
-*/
-
-var poly1305 = function(key) {
-  this.buffer = new Uint8Array(16);
-  this.r = new Uint16Array(10);
-  this.h = new Uint16Array(10);
-  this.pad = new Uint16Array(8);
-  this.leftover = 0;
-  this.fin = 0;
-
-  var t0, t1, t2, t3, t4, t5, t6, t7;
-
-  t0 = key[ 0] & 0xff | (key[ 1] & 0xff) << 8; this.r[0] = ( t0                     ) & 0x1fff;
-  t1 = key[ 2] & 0xff | (key[ 3] & 0xff) << 8; this.r[1] = ((t0 >>> 13) | (t1 <<  3)) & 0x1fff;
-  t2 = key[ 4] & 0xff | (key[ 5] & 0xff) << 8; this.r[2] = ((t1 >>> 10) | (t2 <<  6)) & 0x1f03;
-  t3 = key[ 6] & 0xff | (key[ 7] & 0xff) << 8; this.r[3] = ((t2 >>>  7) | (t3 <<  9)) & 0x1fff;
-  t4 = key[ 8] & 0xff | (key[ 9] & 0xff) << 8; this.r[4] = ((t3 >>>  4) | (t4 << 12)) & 0x00ff;
-  this.r[5] = ((t4 >>>  1)) & 0x1ffe;
-  t5 = key[10] & 0xff | (key[11] & 0xff) << 8; this.r[6] = ((t4 >>> 14) | (t5 <<  2)) & 0x1fff;
-  t6 = key[12] & 0xff | (key[13] & 0xff) << 8; this.r[7] = ((t5 >>> 11) | (t6 <<  5)) & 0x1f81;
-  t7 = key[14] & 0xff | (key[15] & 0xff) << 8; this.r[8] = ((t6 >>>  8) | (t7 <<  8)) & 0x1fff;
-  this.r[9] = ((t7 >>>  5)) & 0x007f;
-
-  this.pad[0] = key[16] & 0xff | (key[17] & 0xff) << 8;
-  this.pad[1] = key[18] & 0xff | (key[19] & 0xff) << 8;
-  this.pad[2] = key[20] & 0xff | (key[21] & 0xff) << 8;
-  this.pad[3] = key[22] & 0xff | (key[23] & 0xff) << 8;
-  this.pad[4] = key[24] & 0xff | (key[25] & 0xff) << 8;
-  this.pad[5] = key[26] & 0xff | (key[27] & 0xff) << 8;
-  this.pad[6] = key[28] & 0xff | (key[29] & 0xff) << 8;
-  this.pad[7] = key[30] & 0xff | (key[31] & 0xff) << 8;
-};
-
-poly1305.prototype.blocks = function(m, mpos, bytes) {
-  var hibit = this.fin ? 0 : (1 << 11);
-  var t0, t1, t2, t3, t4, t5, t6, t7, c;
-  var d0, d1, d2, d3, d4, d5, d6, d7, d8, d9;
-
-  var h0 = this.h[0],
-      h1 = this.h[1],
-      h2 = this.h[2],
-      h3 = this.h[3],
-      h4 = this.h[4],
-      h5 = this.h[5],
-      h6 = this.h[6],
-      h7 = this.h[7],
-      h8 = this.h[8],
-      h9 = this.h[9];
-
-  var r0 = this.r[0],
-      r1 = this.r[1],
-      r2 = this.r[2],
-      r3 = this.r[3],
-      r4 = this.r[4],
-      r5 = this.r[5],
-      r6 = this.r[6],
-      r7 = this.r[7],
-      r8 = this.r[8],
-      r9 = this.r[9];
-
-  while (bytes >= 16) {
-    t0 = m[mpos+ 0] & 0xff | (m[mpos+ 1] & 0xff) << 8; h0 += ( t0                     ) & 0x1fff;
-    t1 = m[mpos+ 2] & 0xff | (m[mpos+ 3] & 0xff) << 8; h1 += ((t0 >>> 13) | (t1 <<  3)) & 0x1fff;
-    t2 = m[mpos+ 4] & 0xff | (m[mpos+ 5] & 0xff) << 8; h2 += ((t1 >>> 10) | (t2 <<  6)) & 0x1fff;
-    t3 = m[mpos+ 6] & 0xff | (m[mpos+ 7] & 0xff) << 8; h3 += ((t2 >>>  7) | (t3 <<  9)) & 0x1fff;
-    t4 = m[mpos+ 8] & 0xff | (m[mpos+ 9] & 0xff) << 8; h4 += ((t3 >>>  4) | (t4 << 12)) & 0x1fff;
-    h5 += ((t4 >>>  1)) & 0x1fff;
-    t5 = m[mpos+10] & 0xff | (m[mpos+11] & 0xff) << 8; h6 += ((t4 >>> 14) | (t5 <<  2)) & 0x1fff;
-    t6 = m[mpos+12] & 0xff | (m[mpos+13] & 0xff) << 8; h7 += ((t5 >>> 11) | (t6 <<  5)) & 0x1fff;
-    t7 = m[mpos+14] & 0xff | (m[mpos+15] & 0xff) << 8; h8 += ((t6 >>>  8) | (t7 <<  8)) & 0x1fff;
-    h9 += ((t7 >>> 5)) | hibit;
-
-    c = 0;
-
-    d0 = c;
-    d0 += h0 * r0;
-    d0 += h1 * (5 * r9);
-    d0 += h2 * (5 * r8);
-    d0 += h3 * (5 * r7);
-    d0 += h4 * (5 * r6);
-    c = (d0 >>> 13); d0 &= 0x1fff;
-    d0 += h5 * (5 * r5);
-    d0 += h6 * (5 * r4);
-    d0 += h7 * (5 * r3);
-    d0 += h8 * (5 * r2);
-    d0 += h9 * (5 * r1);
-    c += (d0 >>> 13); d0 &= 0x1fff;
-
-    d1 = c;
-    d1 += h0 * r1;
-    d1 += h1 * r0;
-    d1 += h2 * (5 * r9);
-    d1 += h3 * (5 * r8);
-    d1 += h4 * (5 * r7);
-    c = (d1 >>> 13); d1 &= 0x1fff;
-    d1 += h5 * (5 * r6);
-    d1 += h6 * (5 * r5);
-    d1 += h7 * (5 * r4);
-    d1 += h8 * (5 * r3);
-    d1 += h9 * (5 * r2);
-    c += (d1 >>> 13); d1 &= 0x1fff;
-
-    d2 = c;
-    d2 += h0 * r2;
-    d2 += h1 * r1;
-    d2 += h2 * r0;
-    d2 += h3 * (5 * r9);
-    d2 += h4 * (5 * r8);
-    c = (d2 >>> 13); d2 &= 0x1fff;
-    d2 += h5 * (5 * r7);
-    d2 += h6 * (5 * r6);
-    d2 += h7 * (5 * r5);
-    d2 += h8 * (5 * r4);
-    d2 += h9 * (5 * r3);
-    c += (d2 >>> 13); d2 &= 0x1fff;
-
-    d3 = c;
-    d3 += h0 * r3;
-    d3 += h1 * r2;
-    d3 += h2 * r1;
-    d3 += h3 * r0;
-    d3 += h4 * (5 * r9);
-    c = (d3 >>> 13); d3 &= 0x1fff;
-    d3 += h5 * (5 * r8);
-    d3 += h6 * (5 * r7);
-    d3 += h7 * (5 * r6);
-    d3 += h8 * (5 * r5);
-    d3 += h9 * (5 * r4);
-    c += (d3 >>> 13); d3 &= 0x1fff;
-
-    d4 = c;
-    d4 += h0 * r4;
-    d4 += h1 * r3;
-    d4 += h2 * r2;
-    d4 += h3 * r1;
-    d4 += h4 * r0;
-    c = (d4 >>> 13); d4 &= 0x1fff;
-    d4 += h5 * (5 * r9);
-    d4 += h6 * (5 * r8);
-    d4 += h7 * (5 * r7);
-    d4 += h8 * (5 * r6);
-    d4 += h9 * (5 * r5);
-    c += (d4 >>> 13); d4 &= 0x1fff;
-
-    d5 = c;
-    d5 += h0 * r5;
-    d5 += h1 * r4;
-    d5 += h2 * r3;
-    d5 += h3 * r2;
-    d5 += h4 * r1;
-    c = (d5 >>> 13); d5 &= 0x1fff;
-    d5 += h5 * r0;
-    d5 += h6 * (5 * r9);
-    d5 += h7 * (5 * r8);
-    d5 += h8 * (5 * r7);
-    d5 += h9 * (5 * r6);
-    c += (d5 >>> 13); d5 &= 0x1fff;
-
-    d6 = c;
-    d6 += h0 * r6;
-    d6 += h1 * r5;
-    d6 += h2 * r4;
-    d6 += h3 * r3;
-    d6 += h4 * r2;
-    c = (d6 >>> 13); d6 &= 0x1fff;
-    d6 += h5 * r1;
-    d6 += h6 * r0;
-    d6 += h7 * (5 * r9);
-    d6 += h8 * (5 * r8);
-    d6 += h9 * (5 * r7);
-    c += (d6 >>> 13); d6 &= 0x1fff;
-
-    d7 = c;
-    d7 += h0 * r7;
-    d7 += h1 * r6;
-    d7 += h2 * r5;
-    d7 += h3 * r4;
-    d7 += h4 * r3;
-    c = (d7 >>> 13); d7 &= 0x1fff;
-    d7 += h5 * r2;
-    d7 += h6 * r1;
-    d7 += h7 * r0;
-    d7 += h8 * (5 * r9);
-    d7 += h9 * (5 * r8);
-    c += (d7 >>> 13); d7 &= 0x1fff;
-
-    d8 = c;
-    d8 += h0 * r8;
-    d8 += h1 * r7;
-    d8 += h2 * r6;
-    d8 += h3 * r5;
-    d8 += h4 * r4;
-    c = (d8 >>> 13); d8 &= 0x1fff;
-    d8 += h5 * r3;
-    d8 += h6 * r2;
-    d8 += h7 * r1;
-    d8 += h8 * r0;
-    d8 += h9 * (5 * r9);
-    c += (d8 >>> 13); d8 &= 0x1fff;
-
-    d9 = c;
-    d9 += h0 * r9;
-    d9 += h1 * r8;
-    d9 += h2 * r7;
-    d9 += h3 * r6;
-    d9 += h4 * r5;
-    c = (d9 >>> 13); d9 &= 0x1fff;
-    d9 += h5 * r4;
-    d9 += h6 * r3;
-    d9 += h7 * r2;
-    d9 += h8 * r1;
-    d9 += h9 * r0;
-    c += (d9 >>> 13); d9 &= 0x1fff;
-
-    c = (((c << 2) + c)) | 0;
-    c = (c + d0) | 0;
-    d0 = c & 0x1fff;
-    c = (c >>> 13);
-    d1 += c;
-
-    h0 = d0;
-    h1 = d1;
-    h2 = d2;
-    h3 = d3;
-    h4 = d4;
-    h5 = d5;
-    h6 = d6;
-    h7 = d7;
-    h8 = d8;
-    h9 = d9;
-
-    mpos += 16;
-    bytes -= 16;
-  }
-  this.h[0] = h0;
-  this.h[1] = h1;
-  this.h[2] = h2;
-  this.h[3] = h3;
-  this.h[4] = h4;
-  this.h[5] = h5;
-  this.h[6] = h6;
-  this.h[7] = h7;
-  this.h[8] = h8;
-  this.h[9] = h9;
-};
-
-poly1305.prototype.finish = function(mac, macpos) {
-  var g = new Uint16Array(10);
-  var c, mask, f, i;
-
-  if (this.leftover) {
-    i = this.leftover;
-    this.buffer[i++] = 1;
-    for (; i < 16; i++) this.buffer[i] = 0;
-    this.fin = 1;
-    this.blocks(this.buffer, 0, 16);
-  }
-
-  c = this.h[1] >>> 13;
-  this.h[1] &= 0x1fff;
-  for (i = 2; i < 10; i++) {
-    this.h[i] += c;
-    c = this.h[i] >>> 13;
-    this.h[i] &= 0x1fff;
-  }
-  this.h[0] += (c * 5);
-  c = this.h[0] >>> 13;
-  this.h[0] &= 0x1fff;
-  this.h[1] += c;
-  c = this.h[1] >>> 13;
-  this.h[1] &= 0x1fff;
-  this.h[2] += c;
-
-  g[0] = this.h[0] + 5;
-  c = g[0] >>> 13;
-  g[0] &= 0x1fff;
-  for (i = 1; i < 10; i++) {
-    g[i] = this.h[i] + c;
-    c = g[i] >>> 13;
-    g[i] &= 0x1fff;
-  }
-  g[9] -= (1 << 13);
-
-  mask = (c ^ 1) - 1;
-  for (i = 0; i < 10; i++) g[i] &= mask;
-  mask = ~mask;
-  for (i = 0; i < 10; i++) this.h[i] = (this.h[i] & mask) | g[i];
-
-  this.h[0] = ((this.h[0]       ) | (this.h[1] << 13)                    ) & 0xffff;
-  this.h[1] = ((this.h[1] >>>  3) | (this.h[2] << 10)                    ) & 0xffff;
-  this.h[2] = ((this.h[2] >>>  6) | (this.h[3] <<  7)                    ) & 0xffff;
-  this.h[3] = ((this.h[3] >>>  9) | (this.h[4] <<  4)                    ) & 0xffff;
-  this.h[4] = ((this.h[4] >>> 12) | (this.h[5] <<  1) | (this.h[6] << 14)) & 0xffff;
-  this.h[5] = ((this.h[6] >>>  2) | (this.h[7] << 11)                    ) & 0xffff;
-  this.h[6] = ((this.h[7] >>>  5) | (this.h[8] <<  8)                    ) & 0xffff;
-  this.h[7] = ((this.h[8] >>>  8) | (this.h[9] <<  5)                    ) & 0xffff;
-
-  f = this.h[0] + this.pad[0];
-  this.h[0] = f & 0xffff;
-  for (i = 1; i < 8; i++) {
-    f = (((this.h[i] + this.pad[i]) | 0) + (f >>> 16)) | 0;
-    this.h[i] = f & 0xffff;
-  }
-
-  mac[macpos+ 0] = (this.h[0] >>> 0) & 0xff;
-  mac[macpos+ 1] = (this.h[0] >>> 8) & 0xff;
-  mac[macpos+ 2] = (this.h[1] >>> 0) & 0xff;
-  mac[macpos+ 3] = (this.h[1] >>> 8) & 0xff;
-  mac[macpos+ 4] = (this.h[2] >>> 0) & 0xff;
-  mac[macpos+ 5] = (this.h[2] >>> 8) & 0xff;
-  mac[macpos+ 6] = (this.h[3] >>> 0) & 0xff;
-  mac[macpos+ 7] = (this.h[3] >>> 8) & 0xff;
-  mac[macpos+ 8] = (this.h[4] >>> 0) & 0xff;
-  mac[macpos+ 9] = (this.h[4] >>> 8) & 0xff;
-  mac[macpos+10] = (this.h[5] >>> 0) & 0xff;
-  mac[macpos+11] = (this.h[5] >>> 8) & 0xff;
-  mac[macpos+12] = (this.h[6] >>> 0) & 0xff;
-  mac[macpos+13] = (this.h[6] >>> 8) & 0xff;
-  mac[macpos+14] = (this.h[7] >>> 0) & 0xff;
-  mac[macpos+15] = (this.h[7] >>> 8) & 0xff;
-};
-
-poly1305.prototype.update = function(m, mpos, bytes) {
-  var i, want;
-
-  if (this.leftover) {
-    want = (16 - this.leftover);
-    if (want > bytes)
-      want = bytes;
-    for (i = 0; i < want; i++)
-      this.buffer[this.leftover + i] = m[mpos+i];
-    bytes -= want;
-    mpos += want;
-    this.leftover += want;
-    if (this.leftover < 16)
-      return;
-    this.blocks(this.buffer, 0, 16);
-    this.leftover = 0;
-  }
-
-  if (bytes >= 16) {
-    want = bytes - (bytes % 16);
-    this.blocks(m, mpos, want);
-    mpos += want;
-    bytes -= want;
-  }
-
-  if (bytes) {
-    for (i = 0; i < bytes; i++)
-      this.buffer[this.leftover + i] = m[mpos+i];
-    this.leftover += bytes;
-  }
-};
-
-function crypto_onetimeauth(out, outpos, m, mpos, n, k) {
-  var s = new poly1305(k);
-  s.update(m, mpos, n);
-  s.finish(out, outpos);
-  return 0;
-}
-
-function crypto_onetimeauth_verify(h, hpos, m, mpos, n, k) {
-  var x = new Uint8Array(16);
-  crypto_onetimeauth(x,0,m,mpos,n,k);
-  return crypto_verify_16(h,hpos,x,0);
-}
-
-function crypto_secretbox(c,m,d,n,k) {
-  var i;
-  if (d < 32) return -1;
-  crypto_stream_xor(c,0,m,0,d,n,k);
-  crypto_onetimeauth(c, 16, c, 32, d - 32, c);
-  for (i = 0; i < 16; i++) c[i] = 0;
-  return 0;
-}
-
-function crypto_secretbox_open(m,c,d,n,k) {
-  var i;
-  var x = new Uint8Array(32);
-  if (d < 32) return -1;
-  crypto_stream(x,0,32,n,k);
-  if (crypto_onetimeauth_verify(c, 16,c, 32,d - 32,x) !== 0) return -1;
-  crypto_stream_xor(m,0,c,0,d,n,k);
-  for (i = 0; i < 32; i++) m[i] = 0;
-  return 0;
-}
-
-function set25519(r, a) {
-  var i;
-  for (i = 0; i < 16; i++) r[i] = a[i]|0;
-}
-
-function car25519(o) {
-  var i, v, c = 1;
-  for (i = 0; i < 16; i++) {
-    v = o[i] + c + 65535;
-    c = Math.floor(v / 65536);
-    o[i] = v - c * 65536;
-  }
-  o[0] += c-1 + 37 * (c-1);
-}
-
-function sel25519(p, q, b) {
-  var t, c = ~(b-1);
-  for (var i = 0; i < 16; i++) {
-    t = c & (p[i] ^ q[i]);
-    p[i] ^= t;
-    q[i] ^= t;
-  }
-}
-
-function pack25519(o, n) {
-  var i, j, b;
-  var m = gf(), t = gf();
-  for (i = 0; i < 16; i++) t[i] = n[i];
-  car25519(t);
-  car25519(t);
-  car25519(t);
-  for (j = 0; j < 2; j++) {
-    m[0] = t[0] - 0xffed;
-    for (i = 1; i < 15; i++) {
-      m[i] = t[i] - 0xffff - ((m[i-1]>>16) & 1);
-      m[i-1] &= 0xffff;
-    }
-    m[15] = t[15] - 0x7fff - ((m[14]>>16) & 1);
-    b = (m[15]>>16) & 1;
-    m[14] &= 0xffff;
-    sel25519(t, m, 1-b);
-  }
-  for (i = 0; i < 16; i++) {
-    o[2*i] = t[i] & 0xff;
-    o[2*i+1] = t[i]>>8;
-  }
-}
-
-function neq25519(a, b) {
-  var c = new Uint8Array(32), d = new Uint8Array(32);
-  pack25519(c, a);
-  pack25519(d, b);
-  return crypto_verify_32(c, 0, d, 0);
-}
-
-function par25519(a) {
-  var d = new Uint8Array(32);
-  pack25519(d, a);
-  return d[0] & 1;
-}
-
-function unpack25519(o, n) {
-  var i;
-  for (i = 0; i < 16; i++) o[i] = n[2*i] + (n[2*i+1] << 8);
-  o[15] &= 0x7fff;
-}
-
-function A(o, a, b) {
-  for (var i = 0; i < 16; i++) o[i] = a[i] + b[i];
-}
-
-function Z(o, a, b) {
-  for (var i = 0; i < 16; i++) o[i] = a[i] - b[i];
-}
-
-function M(o, a, b) {
-  var v, c,
-     t0 = 0,  t1 = 0,  t2 = 0,  t3 = 0,  t4 = 0,  t5 = 0,  t6 = 0,  t7 = 0,
-     t8 = 0,  t9 = 0, t10 = 0, t11 = 0, t12 = 0, t13 = 0, t14 = 0, t15 = 0,
-    t16 = 0, t17 = 0, t18 = 0, t19 = 0, t20 = 0, t21 = 0, t22 = 0, t23 = 0,
-    t24 = 0, t25 = 0, t26 = 0, t27 = 0, t28 = 0, t29 = 0, t30 = 0,
-    b0 = b[0],
-    b1 = b[1],
-    b2 = b[2],
-    b3 = b[3],
-    b4 = b[4],
-    b5 = b[5],
-    b6 = b[6],
-    b7 = b[7],
-    b8 = b[8],
-    b9 = b[9],
-    b10 = b[10],
-    b11 = b[11],
-    b12 = b[12],
-    b13 = b[13],
-    b14 = b[14],
-    b15 = b[15];
-
-  v = a[0];
-  t0 += v * b0;
-  t1 += v * b1;
-  t2 += v * b2;
-  t3 += v * b3;
-  t4 += v * b4;
-  t5 += v * b5;
-  t6 += v * b6;
-  t7 += v * b7;
-  t8 += v * b8;
-  t9 += v * b9;
-  t10 += v * b10;
-  t11 += v * b11;
-  t12 += v * b12;
-  t13 += v * b13;
-  t14 += v * b14;
-  t15 += v * b15;
-  v = a[1];
-  t1 += v * b0;
-  t2 += v * b1;
-  t3 += v * b2;
-  t4 += v * b3;
-  t5 += v * b4;
-  t6 += v * b5;
-  t7 += v * b6;
-  t8 += v * b7;
-  t9 += v * b8;
-  t10 += v * b9;
-  t11 += v * b10;
-  t12 += v * b11;
-  t13 += v * b12;
-  t14 += v * b13;
-  t15 += v * b14;
-  t16 += v * b15;
-  v = a[2];
-  t2 += v * b0;
-  t3 += v * b1;
-  t4 += v * b2;
-  t5 += v * b3;
-  t6 += v * b4;
-  t7 += v * b5;
-  t8 += v * b6;
-  t9 += v * b7;
-  t10 += v * b8;
-  t11 += v * b9;
-  t12 += v * b10;
-  t13 += v * b11;
-  t14 += v * b12;
-  t15 += v * b13;
-  t16 += v * b14;
-  t17 += v * b15;
-  v = a[3];
-  t3 += v * b0;
-  t4 += v * b1;
-  t5 += v * b2;
-  t6 += v * b3;
-  t7 += v * b4;
-  t8 += v * b5;
-  t9 += v * b6;
-  t10 += v * b7;
-  t11 += v * b8;
-  t12 += v * b9;
-  t13 += v * b10;
-  t14 += v * b11;
-  t15 += v * b12;
-  t16 += v * b13;
-  t17 += v * b14;
-  t18 += v * b15;
-  v = a[4];
-  t4 += v * b0;
-  t5 += v * b1;
-  t6 += v * b2;
-  t7 += v * b3;
-  t8 += v * b4;
-  t9 += v * b5;
-  t10 += v * b6;
-  t11 += v * b7;
-  t12 += v * b8;
-  t13 += v * b9;
-  t14 += v * b10;
-  t15 += v * b11;
-  t16 += v * b12;
-  t17 += v * b13;
-  t18 += v * b14;
-  t19 += v * b15;
-  v = a[5];
-  t5 += v * b0;
-  t6 += v * b1;
-  t7 += v * b2;
-  t8 += v * b3;
-  t9 += v * b4;
-  t10 += v * b5;
-  t11 += v * b6;
-  t12 += v * b7;
-  t13 += v * b8;
-  t14 += v * b9;
-  t15 += v * b10;
-  t16 += v * b11;
-  t17 += v * b12;
-  t18 += v * b13;
-  t19 += v * b14;
-  t20 += v * b15;
-  v = a[6];
-  t6 += v * b0;
-  t7 += v * b1;
-  t8 += v * b2;
-  t9 += v * b3;
-  t10 += v * b4;
-  t11 += v * b5;
-  t12 += v * b6;
-  t13 += v * b7;
-  t14 += v * b8;
-  t15 += v * b9;
-  t16 += v * b10;
-  t17 += v * b11;
-  t18 += v * b12;
-  t19 += v * b13;
-  t20 += v * b14;
-  t21 += v * b15;
-  v = a[7];
-  t7 += v * b0;
-  t8 += v * b1;
-  t9 += v * b2;
-  t10 += v * b3;
-  t11 += v * b4;
-  t12 += v * b5;
-  t13 += v * b6;
-  t14 += v * b7;
-  t15 += v * b8;
-  t16 += v * b9;
-  t17 += v * b10;
-  t18 += v * b11;
-  t19 += v * b12;
-  t20 += v * b13;
-  t21 += v * b14;
-  t22 += v * b15;
-  v = a[8];
-  t8 += v * b0;
-  t9 += v * b1;
-  t10 += v * b2;
-  t11 += v * b3;
-  t12 += v * b4;
-  t13 += v * b5;
-  t14 += v * b6;
-  t15 += v * b7;
-  t16 += v * b8;
-  t17 += v * b9;
-  t18 += v * b10;
-  t19 += v * b11;
-  t20 += v * b12;
-  t21 += v * b13;
-  t22 += v * b14;
-  t23 += v * b15;
-  v = a[9];
-  t9 += v * b0;
-  t10 += v * b1;
-  t11 += v * b2;
-  t12 += v * b3;
-  t13 += v * b4;
-  t14 += v * b5;
-  t15 += v * b6;
-  t16 += v * b7;
-  t17 += v * b8;
-  t18 += v * b9;
-  t19 += v * b10;
-  t20 += v * b11;
-  t21 += v * b12;
-  t22 += v * b13;
-  t23 += v * b14;
-  t24 += v * b15;
-  v = a[10];
-  t10 += v * b0;
-  t11 += v * b1;
-  t12 += v * b2;
-  t13 += v * b3;
-  t14 += v * b4;
-  t15 += v * b5;
-  t16 += v * b6;
-  t17 += v * b7;
-  t18 += v * b8;
-  t19 += v * b9;
-  t20 += v * b10;
-  t21 += v * b11;
-  t22 += v * b12;
-  t23 += v * b13;
-  t24 += v * b14;
-  t25 += v * b15;
-  v = a[11];
-  t11 += v * b0;
-  t12 += v * b1;
-  t13 += v * b2;
-  t14 += v * b3;
-  t15 += v * b4;
-  t16 += v * b5;
-  t17 += v * b6;
-  t18 += v * b7;
-  t19 += v * b8;
-  t20 += v * b9;
-  t21 += v * b10;
-  t22 += v * b11;
-  t23 += v * b12;
-  t24 += v * b13;
-  t25 += v * b14;
-  t26 += v * b15;
-  v = a[12];
-  t12 += v * b0;
-  t13 += v * b1;
-  t14 += v * b2;
-  t15 += v * b3;
-  t16 += v * b4;
-  t17 += v * b5;
-  t18 += v * b6;
-  t19 += v * b7;
-  t20 += v * b8;
-  t21 += v * b9;
-  t22 += v * b10;
-  t23 += v * b11;
-  t24 += v * b12;
-  t25 += v * b13;
-  t26 += v * b14;
-  t27 += v * b15;
-  v = a[13];
-  t13 += v * b0;
-  t14 += v * b1;
-  t15 += v * b2;
-  t16 += v * b3;
-  t17 += v * b4;
-  t18 += v * b5;
-  t19 += v * b6;
-  t20 += v * b7;
-  t21 += v * b8;
-  t22 += v * b9;
-  t23 += v * b10;
-  t24 += v * b11;
-  t25 += v * b12;
-  t26 += v * b13;
-  t27 += v * b14;
-  t28 += v * b15;
-  v = a[14];
-  t14 += v * b0;
-  t15 += v * b1;
-  t16 += v * b2;
-  t17 += v * b3;
-  t18 += v * b4;
-  t19 += v * b5;
-  t20 += v * b6;
-  t21 += v * b7;
-  t22 += v * b8;
-  t23 += v * b9;
-  t24 += v * b10;
-  t25 += v * b11;
-  t26 += v * b12;
-  t27 += v * b13;
-  t28 += v * b14;
-  t29 += v * b15;
-  v = a[15];
-  t15 += v * b0;
-  t16 += v * b1;
-  t17 += v * b2;
-  t18 += v * b3;
-  t19 += v * b4;
-  t20 += v * b5;
-  t21 += v * b6;
-  t22 += v * b7;
-  t23 += v * b8;
-  t24 += v * b9;
-  t25 += v * b10;
-  t26 += v * b11;
-  t27 += v * b12;
-  t28 += v * b13;
-  t29 += v * b14;
-  t30 += v * b15;
-
-  t0  += 38 * t16;
-  t1  += 38 * t17;
-  t2  += 38 * t18;
-  t3  += 38 * t19;
-  t4  += 38 * t20;
-  t5  += 38 * t21;
-  t6  += 38 * t22;
-  t7  += 38 * t23;
-  t8  += 38 * t24;
-  t9  += 38 * t25;
-  t10 += 38 * t26;
-  t11 += 38 * t27;
-  t12 += 38 * t28;
-  t13 += 38 * t29;
-  t14 += 38 * t30;
-  // t15 left as is
-
-  // first car
-  c = 1;
-  v =  t0 + c + 65535; c = Math.floor(v / 65536);  t0 = v - c * 65536;
-  v =  t1 + c + 65535; c = Math.floor(v / 65536);  t1 = v - c * 65536;
-  v =  t2 + c + 65535; c = Math.floor(v / 65536);  t2 = v - c * 65536;
-  v =  t3 + c + 65535; c = Math.floor(v / 65536);  t3 = v - c * 65536;
-  v =  t4 + c + 65535; c = Math.floor(v / 65536);  t4 = v - c * 65536;
-  v =  t5 + c + 65535; c = Math.floor(v / 65536);  t5 = v - c * 65536;
-  v =  t6 + c + 65535; c = Math.floor(v / 65536);  t6 = v - c * 65536;
-  v =  t7 + c + 65535; c = Math.floor(v / 65536);  t7 = v - c * 65536;
-  v =  t8 + c + 65535; c = Math.floor(v / 65536);  t8 = v - c * 65536;
-  v =  t9 + c + 65535; c = Math.floor(v / 65536);  t9 = v - c * 65536;
-  v = t10 + c + 65535; c = Math.floor(v / 65536); t10 = v - c * 65536;
-  v = t11 + c + 65535; c = Math.floor(v / 65536); t11 = v - c * 65536;
-  v = t12 + c + 65535; c = Math.floor(v / 65536); t12 = v - c * 65536;
-  v = t13 + c + 65535; c = Math.floor(v / 65536); t13 = v - c * 65536;
-  v = t14 + c + 65535; c = Math.floor(v / 65536); t14 = v - c * 65536;
-  v = t15 + c + 65535; c = Math.floor(v / 65536); t15 = v - c * 65536;
-  t0 += c-1 + 37 * (c-1);
-
-  // second car
-  c = 1;
-  v =  t0 + c + 65535; c = Math.floor(v / 65536);  t0 = v - c * 65536;
-  v =  t1 + c + 65535; c = Math.floor(v / 65536);  t1 = v - c * 65536;
-  v =  t2 + c + 65535; c = Math.floor(v / 65536);  t2 = v - c * 65536;
-  v =  t3 + c + 65535; c = Math.floor(v / 65536);  t3 = v - c * 65536;
-  v =  t4 + c + 65535; c = Math.floor(v / 65536);  t4 = v - c * 65536;
-  v =  t5 + c + 65535; c = Math.floor(v / 65536);  t5 = v - c * 65536;
-  v =  t6 + c + 65535; c = Math.floor(v / 65536);  t6 = v - c * 65536;
-  v =  t7 + c + 65535; c = Math.floor(v / 65536);  t7 = v - c * 65536;
-  v =  t8 + c + 65535; c = Math.floor(v / 65536);  t8 = v - c * 65536;
-  v =  t9 + c + 65535; c = Math.floor(v / 65536);  t9 = v - c * 65536;
-  v = t10 + c + 65535; c = Math.floor(v / 65536); t10 = v - c * 65536;
-  v = t11 + c + 65535; c = Math.floor(v / 65536); t11 = v - c * 65536;
-  v = t12 + c + 65535; c = Math.floor(v / 65536); t12 = v - c * 65536;
-  v = t13 + c + 65535; c = Math.floor(v / 65536); t13 = v - c * 65536;
-  v = t14 + c + 65535; c = Math.floor(v / 65536); t14 = v - c * 65536;
-  v = t15 + c + 65535; c = Math.floor(v / 65536); t15 = v - c * 65536;
-  t0 += c-1 + 37 * (c-1);
-
-  o[ 0] = t0;
-  o[ 1] = t1;
-  o[ 2] = t2;
-  o[ 3] = t3;
-  o[ 4] = t4;
-  o[ 5] = t5;
-  o[ 6] = t6;
-  o[ 7] = t7;
-  o[ 8] = t8;
-  o[ 9] = t9;
-  o[10] = t10;
-  o[11] = t11;
-  o[12] = t12;
-  o[13] = t13;
-  o[14] = t14;
-  o[15] = t15;
-}
-
-function S(o, a) {
-  M(o, a, a);
-}
-
-function inv25519(o, i) {
-  var c = gf();
-  var a;
-  for (a = 0; a < 16; a++) c[a] = i[a];
-  for (a = 253; a >= 0; a--) {
-    S(c, c);
-    if(a !== 2 && a !== 4) M(c, c, i);
-  }
-  for (a = 0; a < 16; a++) o[a] = c[a];
-}
-
-function pow2523(o, i) {
-  var c = gf();
-  var a;
-  for (a = 0; a < 16; a++) c[a] = i[a];
-  for (a = 250; a >= 0; a--) {
-      S(c, c);
-      if(a !== 1) M(c, c, i);
-  }
-  for (a = 0; a < 16; a++) o[a] = c[a];
-}
-
-function crypto_scalarmult(q, n, p) {
-  var z = new Uint8Array(32);
-  var x = new Float64Array(80), r, i;
-  var a = gf(), b = gf(), c = gf(),
-      d = gf(), e = gf(), f = gf();
-  for (i = 0; i < 31; i++) z[i] = n[i];
-  z[31]=(n[31]&127)|64;
-  z[0]&=248;
-  unpack25519(x,p);
-  for (i = 0; i < 16; i++) {
-    b[i]=x[i];
-    d[i]=a[i]=c[i]=0;
-  }
-  a[0]=d[0]=1;
-  for (i=254; i>=0; --i) {
-    r=(z[i>>>3]>>>(i&7))&1;
-    sel25519(a,b,r);
-    sel25519(c,d,r);
-    A(e,a,c);
-    Z(a,a,c);
-    A(c,b,d);
-    Z(b,b,d);
-    S(d,e);
-    S(f,a);
-    M(a,c,a);
-    M(c,b,e);
-    A(e,a,c);
-    Z(a,a,c);
-    S(b,a);
-    Z(c,d,f);
-    M(a,c,_121665);
-    A(a,a,d);
-    M(c,c,a);
-    M(a,d,f);
-    M(d,b,x);
-    S(b,e);
-    sel25519(a,b,r);
-    sel25519(c,d,r);
-  }
-  for (i = 0; i < 16; i++) {
-    x[i+16]=a[i];
-    x[i+32]=c[i];
-    x[i+48]=b[i];
-    x[i+64]=d[i];
-  }
-  var x32 = x.subarray(32);
-  var x16 = x.subarray(16);
-  inv25519(x32,x32);
-  M(x16,x16,x32);
-  pack25519(q,x16);
-  return 0;
-}
-
-function crypto_scalarmult_base(q, n) {
-  return crypto_scalarmult(q, n, _9);
-}
-
-function crypto_box_keypair(y, x) {
-  randombytes(x, 32);
-  return crypto_scalarmult_base(y, x);
-}
-
-function crypto_box_beforenm(k, y, x) {
-  var s = new Uint8Array(32);
-  crypto_scalarmult(s, x, y);
-  return crypto_core_hsalsa20(k, _0, s, sigma);
-}
-
-var crypto_box_afternm = crypto_secretbox;
-var crypto_box_open_afternm = crypto_secretbox_open;
-
-function crypto_box(c, m, d, n, y, x) {
-  var k = new Uint8Array(32);
-  crypto_box_beforenm(k, y, x);
-  return crypto_box_afternm(c, m, d, n, k);
-}
-
-function crypto_box_open(m, c, d, n, y, x) {
-  var k = new Uint8Array(32);
-  crypto_box_beforenm(k, y, x);
-  return crypto_box_open_afternm(m, c, d, n, k);
-}
-
-var K = [
-  0x428a2f98, 0xd728ae22, 0x71374491, 0x23ef65cd,
-  0xb5c0fbcf, 0xec4d3b2f, 0xe9b5dba5, 0x8189dbbc,
-  0x3956c25b, 0xf348b538, 0x59f111f1, 0xb605d019,
-  0x923f82a4, 0xaf194f9b, 0xab1c5ed5, 0xda6d8118,
-  0xd807aa98, 0xa3030242, 0x12835b01, 0x45706fbe,
-  0x243185be, 0x4ee4b28c, 0x550c7dc3, 0xd5ffb4e2,
-  0x72be5d74, 0xf27b896f, 0x80deb1fe, 0x3b1696b1,
-  0x9bdc06a7, 0x25c71235, 0xc19bf174, 0xcf692694,
-  0xe49b69c1, 0x9ef14ad2, 0xefbe4786, 0x384f25e3,
-  0x0fc19dc6, 0x8b8cd5b5, 0x240ca1cc, 0x77ac9c65,
-  0x2de92c6f, 0x592b0275, 0x4a7484aa, 0x6ea6e483,
-  0x5cb0a9dc, 0xbd41fbd4, 0x76f988da, 0x831153b5,
-  0x983e5152, 0xee66dfab, 0xa831c66d, 0x2db43210,
-  0xb00327c8, 0x98fb213f, 0xbf597fc7, 0xbeef0ee4,
-  0xc6e00bf3, 0x3da88fc2, 0xd5a79147, 0x930aa725,
-  0x06ca6351, 0xe003826f, 0x14292967, 0x0a0e6e70,
-  0x27b70a85, 0x46d22ffc, 0x2e1b2138, 0x5c26c926,
-  0x4d2c6dfc, 0x5ac42aed, 0x53380d13, 0x9d95b3df,
-  0x650a7354, 0x8baf63de, 0x766a0abb, 0x3c77b2a8,
-  0x81c2c92e, 0x47edaee6, 0x92722c85, 0x1482353b,
-  0xa2bfe8a1, 0x4cf10364, 0xa81a664b, 0xbc423001,
-  0xc24b8b70, 0xd0f89791, 0xc76c51a3, 0x0654be30,
-  0xd192e819, 0xd6ef5218, 0xd6990624, 0x5565a910,
-  0xf40e3585, 0x5771202a, 0x106aa070, 0x32bbd1b8,
-  0x19a4c116, 0xb8d2d0c8, 0x1e376c08, 0x5141ab53,
-  0x2748774c, 0xdf8eeb99, 0x34b0bcb5, 0xe19b48a8,
-  0x391c0cb3, 0xc5c95a63, 0x4ed8aa4a, 0xe3418acb,
-  0x5b9cca4f, 0x7763e373, 0x682e6ff3, 0xd6b2b8a3,
-  0x748f82ee, 0x5defb2fc, 0x78a5636f, 0x43172f60,
-  0x84c87814, 0xa1f0ab72, 0x8cc70208, 0x1a6439ec,
-  0x90befffa, 0x23631e28, 0xa4506ceb, 0xde82bde9,
-  0xbef9a3f7, 0xb2c67915, 0xc67178f2, 0xe372532b,
-  0xca273ece, 0xea26619c, 0xd186b8c7, 0x21c0c207,
-  0xeada7dd6, 0xcde0eb1e, 0xf57d4f7f, 0xee6ed178,
-  0x06f067aa, 0x72176fba, 0x0a637dc5, 0xa2c898a6,
-  0x113f9804, 0xbef90dae, 0x1b710b35, 0x131c471b,
-  0x28db77f5, 0x23047d84, 0x32caab7b, 0x40c72493,
-  0x3c9ebe0a, 0x15c9bebc, 0x431d67c4, 0x9c100d4c,
-  0x4cc5d4be, 0xcb3e42b6, 0x597f299c, 0xfc657e2a,
-  0x5fcb6fab, 0x3ad6faec, 0x6c44198c, 0x4a475817
-];
-
-function crypto_hashblocks_hl(hh, hl, m, n) {
-  var wh = new Int32Array(16), wl = new Int32Array(16),
-      bh0, bh1, bh2, bh3, bh4, bh5, bh6, bh7,
-      bl0, bl1, bl2, bl3, bl4, bl5, bl6, bl7,
-      th, tl, i, j, h, l, a, b, c, d;
-
-  var ah0 = hh[0],
-      ah1 = hh[1],
-      ah2 = hh[2],
-      ah3 = hh[3],
-      ah4 = hh[4],
-      ah5 = hh[5],
-      ah6 = hh[6],
-      ah7 = hh[7],
-
-      al0 = hl[0],
-      al1 = hl[1],
-      al2 = hl[2],
-      al3 = hl[3],
-      al4 = hl[4],
-      al5 = hl[5],
-      al6 = hl[6],
-      al7 = hl[7];
-
-  var pos = 0;
-  while (n >= 128) {
-    for (i = 0; i < 16; i++) {
-      j = 8 * i + pos;
-      wh[i] = (m[j+0] << 24) | (m[j+1] << 16) | (m[j+2] << 8) | m[j+3];
-      wl[i] = (m[j+4] << 24) | (m[j+5] << 16) | (m[j+6] << 8) | m[j+7];
-    }
-    for (i = 0; i < 80; i++) {
-      bh0 = ah0;
-      bh1 = ah1;
-      bh2 = ah2;
-      bh3 = ah3;
-      bh4 = ah4;
-      bh5 = ah5;
-      bh6 = ah6;
-      bh7 = ah7;
-
-      bl0 = al0;
-      bl1 = al1;
-      bl2 = al2;
-      bl3 = al3;
-      bl4 = al4;
-      bl5 = al5;
-      bl6 = al6;
-      bl7 = al7;
-
-      // add
-      h = ah7;
-      l = al7;
-
-      a = l & 0xffff; b = l >>> 16;
-      c = h & 0xffff; d = h >>> 16;
-
-      // Sigma1
-      h = ((ah4 >>> 14) | (al4 << (32-14))) ^ ((ah4 >>> 18) | (al4 << (32-18))) ^ ((al4 >>> (41-32)) | (ah4 << (32-(41-32))));
-      l = ((al4 >>> 14) | (ah4 << (32-14))) ^ ((al4 >>> 18) | (ah4 << (32-18))) ^ ((ah4 >>> (41-32)) | (al4 << (32-(41-32))));
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      // Ch
-      h = (ah4 & ah5) ^ (~ah4 & ah6);
-      l = (al4 & al5) ^ (~al4 & al6);
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      // K
-      h = K[i*2];
-      l = K[i*2+1];
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      // w
-      h = wh[i%16];
-      l = wl[i%16];
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      b += a >>> 16;
-      c += b >>> 16;
-      d += c >>> 16;
-
-      th = c & 0xffff | d << 16;
-      tl = a & 0xffff | b << 16;
-
-      // add
-      h = th;
-      l = tl;
-
-      a = l & 0xffff; b = l >>> 16;
-      c = h & 0xffff; d = h >>> 16;
-
-      // Sigma0
-      h = ((ah0 >>> 28) | (al0 << (32-28))) ^ ((al0 >>> (34-32)) | (ah0 << (32-(34-32)))) ^ ((al0 >>> (39-32)) | (ah0 << (32-(39-32))));
-      l = ((al0 >>> 28) | (ah0 << (32-28))) ^ ((ah0 >>> (34-32)) | (al0 << (32-(34-32)))) ^ ((ah0 >>> (39-32)) | (al0 << (32-(39-32))));
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      // Maj
-      h = (ah0 & ah1) ^ (ah0 & ah2) ^ (ah1 & ah2);
-      l = (al0 & al1) ^ (al0 & al2) ^ (al1 & al2);
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      b += a >>> 16;
-      c += b >>> 16;
-      d += c >>> 16;
-
-      bh7 = (c & 0xffff) | (d << 16);
-      bl7 = (a & 0xffff) | (b << 16);
-
-      // add
-      h = bh3;
-      l = bl3;
-
-      a = l & 0xffff; b = l >>> 16;
-      c = h & 0xffff; d = h >>> 16;
-
-      h = th;
-      l = tl;
-
-      a += l & 0xffff; b += l >>> 16;
-      c += h & 0xffff; d += h >>> 16;
-
-      b += a >>> 16;
-      c += b >>> 16;
-      d += c >>> 16;
-
-      bh3 = (c & 0xffff) | (d << 16);
-      bl3 = (a & 0xffff) | (b << 16);
-
-      ah1 = bh0;
-      ah2 = bh1;
-      ah3 = bh2;
-      ah4 = bh3;
-      ah5 = bh4;
-      ah6 = bh5;
-      ah7 = bh6;
-      ah0 = bh7;
-
-      al1 = bl0;
-      al2 = bl1;
-      al3 = bl2;
-      al4 = bl3;
-      al5 = bl4;
-      al6 = bl5;
-      al7 = bl6;
-      al0 = bl7;
-
-      if (i%16 === 15) {
-        for (j = 0; j < 16; j++) {
-          // add
-          h = wh[j];
-          l = wl[j];
-
-          a = l & 0xffff; b = l >>> 16;
-          c = h & 0xffff; d = h >>> 16;
-
-          h = wh[(j+9)%16];
-          l = wl[(j+9)%16];
-
-          a += l & 0xffff; b += l >>> 16;
-          c += h & 0xffff; d += h >>> 16;
-
-          // sigma0
-          th = wh[(j+1)%16];
-          tl = wl[(j+1)%16];
-          h = ((th >>> 1) | (tl << (32-1))) ^ ((th >>> 8) | (tl << (32-8))) ^ (th >>> 7);
-          l = ((tl >>> 1) | (th << (32-1))) ^ ((tl >>> 8) | (th << (32-8))) ^ ((tl >>> 7) | (th << (32-7)));
-
-          a += l & 0xffff; b += l >>> 16;
-          c += h & 0xffff; d += h >>> 16;
-
-          // sigma1
-          th = wh[(j+14)%16];
-          tl = wl[(j+14)%16];
-          h = ((th >>> 19) | (tl << (32-19))) ^ ((tl >>> (61-32)) | (th << (32-(61-32)))) ^ (th >>> 6);
-          l = ((tl >>> 19) | (th << (32-19))) ^ ((th >>> (61-32)) | (tl << (32-(61-32)))) ^ ((tl >>> 6) | (th << (32-6)));
-
-          a += l & 0xffff; b += l >>> 16;
-          c += h & 0xffff; d += h >>> 16;
-
-          b += a >>> 16;
-          c += b >>> 16;
-          d += c >>> 16;
-
-          wh[j] = (c & 0xffff) | (d << 16);
-          wl[j] = (a & 0xffff) | (b << 16);
-        }
-      }
-    }
-
-    // add
-    h = ah0;
-    l = al0;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[0];
-    l = hl[0];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[0] = ah0 = (c & 0xffff) | (d << 16);
-    hl[0] = al0 = (a & 0xffff) | (b << 16);
-
-    h = ah1;
-    l = al1;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[1];
-    l = hl[1];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[1] = ah1 = (c & 0xffff) | (d << 16);
-    hl[1] = al1 = (a & 0xffff) | (b << 16);
-
-    h = ah2;
-    l = al2;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[2];
-    l = hl[2];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[2] = ah2 = (c & 0xffff) | (d << 16);
-    hl[2] = al2 = (a & 0xffff) | (b << 16);
-
-    h = ah3;
-    l = al3;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[3];
-    l = hl[3];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[3] = ah3 = (c & 0xffff) | (d << 16);
-    hl[3] = al3 = (a & 0xffff) | (b << 16);
-
-    h = ah4;
-    l = al4;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[4];
-    l = hl[4];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[4] = ah4 = (c & 0xffff) | (d << 16);
-    hl[4] = al4 = (a & 0xffff) | (b << 16);
-
-    h = ah5;
-    l = al5;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[5];
-    l = hl[5];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[5] = ah5 = (c & 0xffff) | (d << 16);
-    hl[5] = al5 = (a & 0xffff) | (b << 16);
-
-    h = ah6;
-    l = al6;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[6];
-    l = hl[6];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[6] = ah6 = (c & 0xffff) | (d << 16);
-    hl[6] = al6 = (a & 0xffff) | (b << 16);
-
-    h = ah7;
-    l = al7;
-
-    a = l & 0xffff; b = l >>> 16;
-    c = h & 0xffff; d = h >>> 16;
-
-    h = hh[7];
-    l = hl[7];
-
-    a += l & 0xffff; b += l >>> 16;
-    c += h & 0xffff; d += h >>> 16;
-
-    b += a >>> 16;
-    c += b >>> 16;
-    d += c >>> 16;
-
-    hh[7] = ah7 = (c & 0xffff) | (d << 16);
-    hl[7] = al7 = (a & 0xffff) | (b << 16);
-
-    pos += 128;
-    n -= 128;
-  }
-
-  return n;
-}
-
-function crypto_hash(out, m, n) {
-  var hh = new Int32Array(8),
-      hl = new Int32Array(8),
-      x = new Uint8Array(256),
-      i, b = n;
-
-  hh[0] = 0x6a09e667;
-  hh[1] = 0xbb67ae85;
-  hh[2] = 0x3c6ef372;
-  hh[3] = 0xa54ff53a;
-  hh[4] = 0x510e527f;
-  hh[5] = 0x9b05688c;
-  hh[6] = 0x1f83d9ab;
-  hh[7] = 0x5be0cd19;
-
-  hl[0] = 0xf3bcc908;
-  hl[1] = 0x84caa73b;
-  hl[2] = 0xfe94f82b;
-  hl[3] = 0x5f1d36f1;
-  hl[4] = 0xade682d1;
-  hl[5] = 0x2b3e6c1f;
-  hl[6] = 0xfb41bd6b;
-  hl[7] = 0x137e2179;
-
-  crypto_hashblocks_hl(hh, hl, m, n);
-  n %= 128;
-
-  for (i = 0; i < n; i++) x[i] = m[b-n+i];
-  x[n] = 128;
-
-  n = 256-128*(n<112?1:0);
-  x[n-9] = 0;
-  ts64(x, n-8,  (b / 0x20000000) | 0, b << 3);
-  crypto_hashblocks_hl(hh, hl, x, n);
-
-  for (i = 0; i < 8; i++) ts64(out, 8*i, hh[i], hl[i]);
-
-  return 0;
-}
-
-function add(p, q) {
-  var a = gf(), b = gf(), c = gf(),
-      d = gf(), e = gf(), f = gf(),
-      g = gf(), h = gf(), t = gf();
-
-  Z(a, p[1], p[0]);
-  Z(t, q[1], q[0]);
-  M(a, a, t);
-  A(b, p[0], p[1]);
-  A(t, q[0], q[1]);
-  M(b, b, t);
-  M(c, p[3], q[3]);
-  M(c, c, D2);
-  M(d, p[2], q[2]);
-  A(d, d, d);
-  Z(e, b, a);
-  Z(f, d, c);
-  A(g, d, c);
-  A(h, b, a);
-
-  M(p[0], e, f);
-  M(p[1], h, g);
-  M(p[2], g, f);
-  M(p[3], e, h);
-}
-
-function cswap(p, q, b) {
-  var i;
-  for (i = 0; i < 4; i++) {
-    sel25519(p[i], q[i], b);
-  }
-}
-
-function pack(r, p) {
-  var tx = gf(), ty = gf(), zi = gf();
-  inv25519(zi, p[2]);
-  M(tx, p[0], zi);
-  M(ty, p[1], zi);
-  pack25519(r, ty);
-  r[31] ^= par25519(tx) << 7;
-}
-
-function scalarmult(p, q, s) {
-  var b, i;
-  set25519(p[0], gf0);
-  set25519(p[1], gf1);
-  set25519(p[2], gf1);
-  set25519(p[3], gf0);
-  for (i = 255; i >= 0; --i) {
-    b = (s[(i/8)|0] >> (i&7)) & 1;
-    cswap(p, q, b);
-    add(q, p);
-    add(p, p);
-    cswap(p, q, b);
-  }
-}
-
-function scalarbase(p, s) {
-  var q = [gf(), gf(), gf(), gf()];
-  set25519(q[0], X);
-  set25519(q[1], Y);
-  set25519(q[2], gf1);
-  M(q[3], X, Y);
-  scalarmult(p, q, s);
-}
-
-function crypto_sign_keypair(pk, sk, seeded) {
-  var d = new Uint8Array(64);
-  var p = [gf(), gf(), gf(), gf()];
-  var i;
-
-  if (!seeded) randombytes(sk, 32);
-  crypto_hash(d, sk, 32);
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
-
-  scalarbase(p, d);
-  pack(pk, p);
-
-  for (i = 0; i < 32; i++) sk[i+32] = pk[i];
-  return 0;
-}
-
-var L = new Float64Array([0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10]);
-
-function modL(r, x) {
-  var carry, i, j, k;
-  for (i = 63; i >= 32; --i) {
-    carry = 0;
-    for (j = i - 32, k = i - 12; j < k; ++j) {
-      x[j] += carry - 16 * x[i] * L[j - (i - 32)];
-      carry = (x[j] + 128) >> 8;
-      x[j] -= carry * 256;
-    }
-    x[j] += carry;
-    x[i] = 0;
-  }
-  carry = 0;
-  for (j = 0; j < 32; j++) {
-    x[j] += carry - (x[31] >> 4) * L[j];
-    carry = x[j] >> 8;
-    x[j] &= 255;
-  }
-  for (j = 0; j < 32; j++) x[j] -= carry * L[j];
-  for (i = 0; i < 32; i++) {
-    x[i+1] += x[i] >> 8;
-    r[i] = x[i] & 255;
-  }
-}
-
-function reduce(r) {
-  var x = new Float64Array(64), i;
-  for (i = 0; i < 64; i++) x[i] = r[i];
-  for (i = 0; i < 64; i++) r[i] = 0;
-  modL(r, x);
-}
-
-// Note: difference from C - smlen returned, not passed as argument.
-function crypto_sign(sm, m, n, sk) {
-  var d = new Uint8Array(64), h = new Uint8Array(64), r = new Uint8Array(64);
-  var i, j, x = new Float64Array(64);
-  var p = [gf(), gf(), gf(), gf()];
-
-  crypto_hash(d, sk, 32);
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
-
-  var smlen = n + 64;
-  for (i = 0; i < n; i++) sm[64 + i] = m[i];
-  for (i = 0; i < 32; i++) sm[32 + i] = d[32 + i];
-
-  crypto_hash(r, sm.subarray(32), n+32);
-  reduce(r);
-  scalarbase(p, r);
-  pack(sm, p);
-
-  for (i = 32; i < 64; i++) sm[i] = sk[i];
-  crypto_hash(h, sm, n + 64);
-  reduce(h);
-
-  for (i = 0; i < 64; i++) x[i] = 0;
-  for (i = 0; i < 32; i++) x[i] = r[i];
-  for (i = 0; i < 32; i++) {
-    for (j = 0; j < 32; j++) {
-      x[i+j] += h[i] * d[j];
-    }
-  }
-
-  modL(sm.subarray(32), x);
-  return smlen;
-}
-
-function unpackneg(r, p) {
-  var t = gf(), chk = gf(), num = gf(),
-      den = gf(), den2 = gf(), den4 = gf(),
-      den6 = gf();
-
-  set25519(r[2], gf1);
-  unpack25519(r[1], p);
-  S(num, r[1]);
-  M(den, num, D);
-  Z(num, num, r[2]);
-  A(den, r[2], den);
-
-  S(den2, den);
-  S(den4, den2);
-  M(den6, den4, den2);
-  M(t, den6, num);
-  M(t, t, den);
-
-  pow2523(t, t);
-  M(t, t, num);
-  M(t, t, den);
-  M(t, t, den);
-  M(r[0], t, den);
-
-  S(chk, r[0]);
-  M(chk, chk, den);
-  if (neq25519(chk, num)) M(r[0], r[0], I);
-
-  S(chk, r[0]);
-  M(chk, chk, den);
-  if (neq25519(chk, num)) return -1;
-
-  if (par25519(r[0]) === (p[31]>>7)) Z(r[0], gf0, r[0]);
-
-  M(r[3], r[0], r[1]);
-  return 0;
-}
-
-function crypto_sign_open(m, sm, n, pk) {
-  var i, mlen;
-  var t = new Uint8Array(32), h = new Uint8Array(64);
-  var p = [gf(), gf(), gf(), gf()],
-      q = [gf(), gf(), gf(), gf()];
-
-  mlen = -1;
-  if (n < 64) return -1;
-
-  if (unpackneg(q, pk)) return -1;
-
-  for (i = 0; i < n; i++) m[i] = sm[i];
-  for (i = 0; i < 32; i++) m[i+32] = pk[i];
-  crypto_hash(h, m, n);
-  reduce(h);
-  scalarmult(p, q, h);
-
-  scalarbase(q, sm.subarray(32));
-  add(p, q);
-  pack(t, p);
-
-  n -= 64;
-  if (crypto_verify_32(sm, 0, t, 0)) {
-    for (i = 0; i < n; i++) m[i] = 0;
-    return -1;
-  }
-
-  for (i = 0; i < n; i++) m[i] = sm[i + 64];
-  mlen = n;
-  return mlen;
-}
-
-var crypto_secretbox_KEYBYTES = 32,
-    crypto_secretbox_NONCEBYTES = 24,
-    crypto_secretbox_ZEROBYTES = 32,
-    crypto_secretbox_BOXZEROBYTES = 16,
-    crypto_scalarmult_BYTES = 32,
-    crypto_scalarmult_SCALARBYTES = 32,
-    crypto_box_PUBLICKEYBYTES = 32,
-    crypto_box_SECRETKEYBYTES = 32,
-    crypto_box_BEFORENMBYTES = 32,
-    crypto_box_NONCEBYTES = crypto_secretbox_NONCEBYTES,
-    crypto_box_ZEROBYTES = crypto_secretbox_ZEROBYTES,
-    crypto_box_BOXZEROBYTES = crypto_secretbox_BOXZEROBYTES,
-    crypto_sign_BYTES = 64,
-    crypto_sign_PUBLICKEYBYTES = 32,
-    crypto_sign_SECRETKEYBYTES = 64,
-    crypto_sign_SEEDBYTES = 32,
-    crypto_hash_BYTES = 64;
-
-nacl.lowlevel = {
-  crypto_core_hsalsa20: crypto_core_hsalsa20,
-  crypto_stream_xor: crypto_stream_xor,
-  crypto_stream: crypto_stream,
-  crypto_stream_salsa20_xor: crypto_stream_salsa20_xor,
-  crypto_stream_salsa20: crypto_stream_salsa20,
-  crypto_onetimeauth: crypto_onetimeauth,
-  crypto_onetimeauth_verify: crypto_onetimeauth_verify,
-  crypto_verify_16: crypto_verify_16,
-  crypto_verify_32: crypto_verify_32,
-  crypto_secretbox: crypto_secretbox,
-  crypto_secretbox_open: crypto_secretbox_open,
-  crypto_scalarmult: crypto_scalarmult,
-  crypto_scalarmult_base: crypto_scalarmult_base,
-  crypto_box_beforenm: crypto_box_beforenm,
-  crypto_box_afternm: crypto_box_afternm,
-  crypto_box: crypto_box,
-  crypto_box_open: crypto_box_open,
-  crypto_box_keypair: crypto_box_keypair,
-  crypto_hash: crypto_hash,
-  crypto_sign: crypto_sign,
-  crypto_sign_keypair: crypto_sign_keypair,
-  crypto_sign_open: crypto_sign_open,
-
-  crypto_secretbox_KEYBYTES: crypto_secretbox_KEYBYTES,
-  crypto_secretbox_NONCEBYTES: crypto_secretbox_NONCEBYTES,
-  crypto_secretbox_ZEROBYTES: crypto_secretbox_ZEROBYTES,
-  crypto_secretbox_BOXZEROBYTES: crypto_secretbox_BOXZEROBYTES,
-  crypto_scalarmult_BYTES: crypto_scalarmult_BYTES,
-  crypto_scalarmult_SCALARBYTES: crypto_scalarmult_SCALARBYTES,
-  crypto_box_PUBLICKEYBYTES: crypto_box_PUBLICKEYBYTES,
-  crypto_box_SECRETKEYBYTES: crypto_box_SECRETKEYBYTES,
-  crypto_box_BEFORENMBYTES: crypto_box_BEFORENMBYTES,
-  crypto_box_NONCEBYTES: crypto_box_NONCEBYTES,
-  crypto_box_ZEROBYTES: crypto_box_ZEROBYTES,
-  crypto_box_BOXZEROBYTES: crypto_box_BOXZEROBYTES,
-  crypto_sign_BYTES: crypto_sign_BYTES,
-  crypto_sign_PUBLICKEYBYTES: crypto_sign_PUBLICKEYBYTES,
-  crypto_sign_SECRETKEYBYTES: crypto_sign_SECRETKEYBYTES,
-  crypto_sign_SEEDBYTES: crypto_sign_SEEDBYTES,
-  crypto_hash_BYTES: crypto_hash_BYTES
-};
-
-/* High-level API */
-
-function checkLengths(k, n) {
-  if (k.length !== crypto_secretbox_KEYBYTES) throw new Error('bad key size');
-  if (n.length !== crypto_secretbox_NONCEBYTES) throw new Error('bad nonce size');
-}
-
-function checkBoxLengths(pk, sk) {
-  if (pk.length !== crypto_box_PUBLICKEYBYTES) throw new Error('bad public key size');
-  if (sk.length !== crypto_box_SECRETKEYBYTES) throw new Error('bad secret key size');
-}
-
-function checkArrayTypes() {
-  var t, i;
-  for (i = 0; i < arguments.length; i++) {
-     if ((t = Object.prototype.toString.call(arguments[i])) !== '[object Uint8Array]')
-       throw new TypeError('unexpected type ' + t + ', use Uint8Array');
-  }
-}
-
-function cleanup(arr) {
-  for (var i = 0; i < arr.length; i++) arr[i] = 0;
-}
-
-// TODO: Completely remove this in v0.15.
-if (!nacl.util) {
-  nacl.util = {};
-  nacl.util.decodeUTF8 = nacl.util.encodeUTF8 = nacl.util.encodeBase64 = nacl.util.decodeBase64 = function() {
-    throw new Error('nacl.util moved into separate package: https://github.com/dchest/tweetnacl-util-js');
-  };
-}
-
-nacl.randomBytes = function(n) {
-  var b = new Uint8Array(n);
-  randombytes(b, n);
-  return b;
-};
-
-nacl.secretbox = function(msg, nonce, key) {
-  checkArrayTypes(msg, nonce, key);
-  checkLengths(key, nonce);
-  var m = new Uint8Array(crypto_secretbox_ZEROBYTES + msg.length);
-  var c = new Uint8Array(m.length);
-  for (var i = 0; i < msg.length; i++) m[i+crypto_secretbox_ZEROBYTES] = msg[i];
-  crypto_secretbox(c, m, m.length, nonce, key);
-  return c.subarray(crypto_secretbox_BOXZEROBYTES);
-};
-
-nacl.secretbox.open = function(box, nonce, key) {
-  checkArrayTypes(box, nonce, key);
-  checkLengths(key, nonce);
-  var c = new Uint8Array(crypto_secretbox_BOXZEROBYTES + box.length);
-  var m = new Uint8Array(c.length);
-  for (var i = 0; i < box.length; i++) c[i+crypto_secretbox_BOXZEROBYTES] = box[i];
-  if (c.length < 32) return false;
-  if (crypto_secretbox_open(m, c, c.length, nonce, key) !== 0) return false;
-  return m.subarray(crypto_secretbox_ZEROBYTES);
-};
-
-nacl.secretbox.keyLength = crypto_secretbox_KEYBYTES;
-nacl.secretbox.nonceLength = crypto_secretbox_NONCEBYTES;
-nacl.secretbox.overheadLength = crypto_secretbox_BOXZEROBYTES;
-
-nacl.scalarMult = function(n, p) {
-  checkArrayTypes(n, p);
-  if (n.length !== crypto_scalarmult_SCALARBYTES) throw new Error('bad n size');
-  if (p.length !== crypto_scalarmult_BYTES) throw new Error('bad p size');
-  var q = new Uint8Array(crypto_scalarmult_BYTES);
-  crypto_scalarmult(q, n, p);
-  return q;
-};
-
-nacl.scalarMult.base = function(n) {
-  checkArrayTypes(n);
-  if (n.length !== crypto_scalarmult_SCALARBYTES) throw new Error('bad n size');
-  var q = new Uint8Array(crypto_scalarmult_BYTES);
-  crypto_scalarmult_base(q, n);
-  return q;
-};
-
-nacl.scalarMult.scalarLength = crypto_scalarmult_SCALARBYTES;
-nacl.scalarMult.groupElementLength = crypto_scalarmult_BYTES;
-
-nacl.box = function(msg, nonce, publicKey, secretKey) {
-  var k = nacl.box.before(publicKey, secretKey);
-  return nacl.secretbox(msg, nonce, k);
-};
-
-nacl.box.before = function(publicKey, secretKey) {
-  checkArrayTypes(publicKey, secretKey);
-  checkBoxLengths(publicKey, secretKey);
-  var k = new Uint8Array(crypto_box_BEFORENMBYTES);
-  crypto_box_beforenm(k, publicKey, secretKey);
-  return k;
-};
-
-nacl.box.after = nacl.secretbox;
-
-nacl.box.open = function(msg, nonce, publicKey, secretKey) {
-  var k = nacl.box.before(publicKey, secretKey);
-  return nacl.secretbox.open(msg, nonce, k);
-};
-
-nacl.box.open.after = nacl.secretbox.open;
-
-nacl.box.keyPair = function() {
-  var pk = new Uint8Array(crypto_box_PUBLICKEYBYTES);
-  var sk = new Uint8Array(crypto_box_SECRETKEYBYTES);
-  crypto_box_keypair(pk, sk);
-  return {publicKey: pk, secretKey: sk};
-};
-
-nacl.box.keyPair.fromSecretKey = function(secretKey) {
-  checkArrayTypes(secretKey);
-  if (secretKey.length !== crypto_box_SECRETKEYBYTES)
-    throw new Error('bad secret key size');
-  var pk = new Uint8Array(crypto_box_PUBLICKEYBYTES);
-  crypto_scalarmult_base(pk, secretKey);
-  return {publicKey: pk, secretKey: new Uint8Array(secretKey)};
-};
-
-nacl.box.publicKeyLength = crypto_box_PUBLICKEYBYTES;
-nacl.box.secretKeyLength = crypto_box_SECRETKEYBYTES;
-nacl.box.sharedKeyLength = crypto_box_BEFORENMBYTES;
-nacl.box.nonceLength = crypto_box_NONCEBYTES;
-nacl.box.overheadLength = nacl.secretbox.overheadLength;
-
-nacl.sign = function(msg, secretKey) {
-  checkArrayTypes(msg, secretKey);
-  if (secretKey.length !== crypto_sign_SECRETKEYBYTES)
-    throw new Error('bad secret key size');
-  var signedMsg = new Uint8Array(crypto_sign_BYTES+msg.length);
-  crypto_sign(signedMsg, msg, msg.length, secretKey);
-  return signedMsg;
-};
-
-nacl.sign.open = function(signedMsg, publicKey) {
-  if (arguments.length !== 2)
-    throw new Error('nacl.sign.open accepts 2 arguments; did you mean to use nacl.sign.detached.verify?');
-  checkArrayTypes(signedMsg, publicKey);
-  if (publicKey.length !== crypto_sign_PUBLICKEYBYTES)
-    throw new Error('bad public key size');
-  var tmp = new Uint8Array(signedMsg.length);
-  var mlen = crypto_sign_open(tmp, signedMsg, signedMsg.length, publicKey);
-  if (mlen < 0) return null;
-  var m = new Uint8Array(mlen);
-  for (var i = 0; i < m.length; i++) m[i] = tmp[i];
-  return m;
-};
-
-nacl.sign.detached = function(msg, secretKey) {
-  var signedMsg = nacl.sign(msg, secretKey);
-  var sig = new Uint8Array(crypto_sign_BYTES);
-  for (var i = 0; i < sig.length; i++) sig[i] = signedMsg[i];
-  return sig;
-};
-
-nacl.sign.detached.verify = function(msg, sig, publicKey) {
-  checkArrayTypes(msg, sig, publicKey);
-  if (sig.length !== crypto_sign_BYTES)
-    throw new Error('bad signature size');
-  if (publicKey.length !== crypto_sign_PUBLICKEYBYTES)
-    throw new Error('bad public key size');
-  var sm = new Uint8Array(crypto_sign_BYTES + msg.length);
-  var m = new Uint8Array(crypto_sign_BYTES + msg.length);
-  var i;
-  for (i = 0; i < crypto_sign_BYTES; i++) sm[i] = sig[i];
-  for (i = 0; i < msg.length; i++) sm[i+crypto_sign_BYTES] = msg[i];
-  return (crypto_sign_open(m, sm, sm.length, publicKey) >= 0);
-};
-
-nacl.sign.keyPair = function() {
-  var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
-  var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
-  crypto_sign_keypair(pk, sk);
-  return {publicKey: pk, secretKey: sk};
-};
-
-nacl.sign.keyPair.fromSecretKey = function(secretKey) {
-  checkArrayTypes(secretKey);
-  if (secretKey.length !== crypto_sign_SECRETKEYBYTES)
-    throw new Error('bad secret key size');
-  var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
-  for (var i = 0; i < pk.length; i++) pk[i] = secretKey[32+i];
-  return {publicKey: pk, secretKey: new Uint8Array(secretKey)};
-};
-
-nacl.sign.keyPair.fromSeed = function(seed) {
-  checkArrayTypes(seed);
-  if (seed.length !== crypto_sign_SEEDBYTES)
-    throw new Error('bad seed size');
-  var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
-  var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
-  for (var i = 0; i < 32; i++) sk[i] = seed[i];
-  crypto_sign_keypair(pk, sk, true);
-  return {publicKey: pk, secretKey: sk};
-};
-
-nacl.sign.publicKeyLength = crypto_sign_PUBLICKEYBYTES;
-nacl.sign.secretKeyLength = crypto_sign_SECRETKEYBYTES;
-nacl.sign.seedLength = crypto_sign_SEEDBYTES;
-nacl.sign.signatureLength = crypto_sign_BYTES;
-
-nacl.hash = function(msg) {
-  checkArrayTypes(msg);
-  var h = new Uint8Array(crypto_hash_BYTES);
-  crypto_hash(h, msg, msg.length);
-  return h;
-};
-
-nacl.hash.hashLength = crypto_hash_BYTES;
-
-nacl.verify = function(x, y) {
-  checkArrayTypes(x, y);
-  // Zero length arguments are considered not equal.
-  if (x.length === 0 || y.length === 0) return false;
-  if (x.length !== y.length) return false;
-  return (vn(x, 0, y, 0, x.length) === 0) ? true : false;
-};
-
-nacl.setPRNG = function(fn) {
-  randombytes = fn;
-};
-
-(function() {
-  // Initialize PRNG if environment provides CSPRNG.
-  // If not, methods calling randombytes will throw.
-  var crypto = typeof self !== 'undefined' ? (self.crypto || self.msCrypto) : null;
-  if (crypto && crypto.getRandomValues) {
-    // Browsers.
-    var QUOTA = 65536;
-    nacl.setPRNG(function(x, n) {
-      var i, v = new Uint8Array(n);
-      for (i = 0; i < n; i += QUOTA) {
-        crypto.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
-      }
-      for (i = 0; i < n; i++) x[i] = v[i];
-      cleanup(v);
-    });
-  } else if (true) {
-    // Node.js.
-    crypto = __webpack_require__(12);
-    if (crypto && crypto.randomBytes) {
-      nacl.setPRNG(function(x, n) {
-        var i, v = crypto.randomBytes(n);
-        for (i = 0; i < n; i++) x[i] = v[i];
-        cleanup(v);
-      });
-    }
-  }
-})();
-
-})(typeof module !== 'undefined' && module.exports ? module.exports : (self.nacl = self.nacl || {}));
-
-
-/***/ }),
-/* 76 */
-/***/ (function(module, exports) {
-
-module.exports = require("events");
-
-/***/ }),
-/* 77 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const Buffer = __webpack_require__(45).Buffer
-
-const crypto = __webpack_require__(12)
-const Transform = __webpack_require__(23).Transform
-
-const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
-
-const BASE64_REGEX = /^[a-z0-9+/]+(?:=?=?)$/i
-const SRI_REGEX = /^([^-]+)-([^?]+)([?\S*]*)$/
-const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/
-const VCHAR_REGEX = /^[\x21-\x7E]+$/
-
-class Hash {
-  get isHash () { return true }
-  constructor (hash, opts) {
-    const strict = !!(opts && opts.strict)
-    this.source = hash.trim()
-    // 3.1. Integrity metadata (called "Hash" by ssri)
-    // https://w3c.github.io/webappsec-subresource-integrity/#integrity-metadata-description
-    const match = this.source.match(
-      strict
-      ? STRICT_SRI_REGEX
-      : SRI_REGEX
-    )
-    if (!match) { return }
-    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) { return }
-    this.algorithm = match[1]
-    this.digest = match[2]
-
-    const rawOpts = match[3]
-    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
-  }
-  hexDigest () {
-    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
-  }
-  toJSON () {
-    return this.toString()
-  }
-  toString (opts) {
-    if (opts && opts.strict) {
-      // Strict mode enforces the standard as close to the foot of the
-      // letter as it can.
-      if (!(
-        // The spec has very restricted productions for algorithms.
-        // https://www.w3.org/TR/CSP2/#source-list-syntax
-        SPEC_ALGORITHMS.some(x => x === this.algorithm) &&
-        // Usually, if someone insists on using a "different" base64, we
-        // leave it as-is, since there's multiple standards, and the
-        // specified is not a URL-safe variant.
-        // https://www.w3.org/TR/CSP2/#base64_value
-        this.digest.match(BASE64_REGEX) &&
-        // Option syntax is strictly visual chars.
-        // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-option-expression
-        // https://tools.ietf.org/html/rfc5234#appendix-B.1
-        (this.options || []).every(opt => opt.match(VCHAR_REGEX))
-      )) {
-        return ''
-      }
-    }
-    const options = this.options && this.options.length
-    ? `?${this.options.join('?')}`
-    : ''
-    return `${this.algorithm}-${this.digest}${options}`
-  }
-}
-
-class Integrity {
-  get isIntegrity () { return true }
-  toJSON () {
-    return this.toString()
-  }
-  toString (opts) {
-    opts = opts || {}
-    let sep = opts.sep || ' '
-    if (opts.strict) {
-      // Entries must be separated by whitespace, according to spec.
-      sep = sep.replace(/\S+/g, ' ')
-    }
-    return Object.keys(this).map(k => {
-      return this[k].map(hash => {
-        return Hash.prototype.toString.call(hash, opts)
-      }).filter(x => x.length).join(sep)
-    }).filter(x => x.length).join(sep)
-  }
-  concat (integrity, opts) {
-    const other = typeof integrity === 'string'
-    ? integrity
-    : stringify(integrity, opts)
-    return parse(`${this.toString(opts)} ${other}`, opts)
-  }
-  hexDigest () {
-    return parse(this, {single: true}).hexDigest()
-  }
-  match (integrity, opts) {
-    const other = parse(integrity, opts)
-    const algo = other.pickAlgorithm(opts)
-    return (
-      this[algo] &&
-      other[algo] &&
-      this[algo].find(hash =>
-        other[algo].find(otherhash =>
-          hash.digest === otherhash.digest
-        )
-      )
-    ) || false
-  }
-  pickAlgorithm (opts) {
-    const pickAlgorithm = (opts && opts.pickAlgorithm) || getPrioritizedHash
-    const keys = Object.keys(this)
-    if (!keys.length) {
-      throw new Error(`No algorithms available for ${
-        JSON.stringify(this.toString())
-      }`)
-    }
-    return keys.reduce((acc, algo) => {
-      return pickAlgorithm(acc, algo) || acc
-    })
-  }
-}
-
-module.exports.parse = parse
-function parse (sri, opts) {
-  opts = opts || {}
-  if (typeof sri === 'string') {
-    return _parse(sri, opts)
-  } else if (sri.algorithm && sri.digest) {
-    const fullSri = new Integrity()
-    fullSri[sri.algorithm] = [sri]
-    return _parse(stringify(fullSri, opts), opts)
-  } else {
-    return _parse(stringify(sri, opts), opts)
-  }
-}
-
-function _parse (integrity, opts) {
-  // 3.4.3. Parse metadata
-  // https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
-  if (opts.single) {
-    return new Hash(integrity, opts)
-  }
-  return integrity.trim().split(/\s+/).reduce((acc, string) => {
-    const hash = new Hash(string, opts)
-    if (hash.algorithm && hash.digest) {
-      const algo = hash.algorithm
-      if (!acc[algo]) { acc[algo] = [] }
-      acc[algo].push(hash)
-    }
-    return acc
-  }, new Integrity())
-}
-
-module.exports.stringify = stringify
-function stringify (obj, opts) {
-  if (obj.algorithm && obj.digest) {
-    return Hash.prototype.toString.call(obj, opts)
-  } else if (typeof obj === 'string') {
-    return stringify(parse(obj, opts), opts)
-  } else {
-    return Integrity.prototype.toString.call(obj, opts)
-  }
-}
-
-module.exports.fromHex = fromHex
-function fromHex (hexDigest, algorithm, opts) {
-  const optString = (opts && opts.options && opts.options.length)
-  ? `?${opts.options.join('?')}`
-  : ''
-  return parse(
-    `${algorithm}-${
-      Buffer.from(hexDigest, 'hex').toString('base64')
-    }${optString}`, opts
-  )
-}
-
-module.exports.fromData = fromData
-function fromData (data, opts) {
-  opts = opts || {}
-  const algorithms = opts.algorithms || ['sha512']
-  const optString = opts.options && opts.options.length
-  ? `?${opts.options.join('?')}`
-  : ''
-  return algorithms.reduce((acc, algo) => {
-    const digest = crypto.createHash(algo).update(data).digest('base64')
-    const hash = new Hash(
-      `${algo}-${digest}${optString}`,
-       opts
-    )
-    if (hash.algorithm && hash.digest) {
-      const algo = hash.algorithm
-      if (!acc[algo]) { acc[algo] = [] }
-      acc[algo].push(hash)
-    }
-    return acc
-  }, new Integrity())
-}
-
-module.exports.fromStream = fromStream
-function fromStream (stream, opts) {
-  opts = opts || {}
-  const P = opts.Promise || Promise
-  const istream = integrityStream(opts)
-  return new P((resolve, reject) => {
-    stream.pipe(istream)
-    stream.on('error', reject)
-    istream.on('error', reject)
-    let sri
-    istream.on('integrity', s => { sri = s })
-    istream.on('end', () => resolve(sri))
-    istream.on('data', () => {})
-  })
-}
-
-module.exports.checkData = checkData
-function checkData (data, sri, opts) {
-  opts = opts || {}
-  sri = parse(sri, opts)
-  if (!Object.keys(sri).length) {
-    if (opts.error) {
-      throw Object.assign(
-        new Error('No valid integrity hashes to check against'), {
-          code: 'EINTEGRITY'
-        }
-      )
-    } else {
-      return false
-    }
-  }
-  const algorithm = sri.pickAlgorithm(opts)
-  const digest = crypto.createHash(algorithm).update(data).digest('base64')
-  const newSri = parse({algorithm, digest})
-  const match = newSri.match(sri, opts)
-  if (match || !opts.error) {
-    return match
-  } else if (typeof opts.size === 'number' && (data.length !== opts.size)) {
-    const err = new Error(`data size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${data.length}`)
-    err.code = 'EBADSIZE'
-    err.found = data.length
-    err.expected = opts.size
-    err.sri = sri
-    throw err
-  } else {
-    const err = new Error(`Integrity checksum failed when using ${algorithm}: Wanted ${sri}, but got ${newSri}. (${data.length} bytes)`)
-    err.code = 'EINTEGRITY'
-    err.found = newSri
-    err.expected = sri
-    err.algorithm = algorithm
-    err.sri = sri
-    throw err
-  }
-}
-
-module.exports.checkStream = checkStream
-function checkStream (stream, sri, opts) {
-  opts = opts || {}
-  const P = opts.Promise || Promise
-  const checker = integrityStream(Object.assign({}, opts, {
-    integrity: sri
-  }))
-  return new P((resolve, reject) => {
-    stream.pipe(checker)
-    stream.on('error', reject)
-    checker.on('error', reject)
-    let sri
-    checker.on('verified', s => { sri = s })
-    checker.on('end', () => resolve(sri))
-    checker.on('data', () => {})
-  })
-}
-
-module.exports.integrityStream = integrityStream
-function integrityStream (opts) {
-  opts = opts || {}
-  // For verification
-  const sri = opts.integrity && parse(opts.integrity, opts)
-  const goodSri = sri && Object.keys(sri).length
-  const algorithm = goodSri && sri.pickAlgorithm(opts)
-  const digests = goodSri && sri[algorithm]
-  // Calculating stream
-  const algorithms = Array.from(
-    new Set(
-      (opts.algorithms || ['sha512'])
-      .concat(algorithm ? [algorithm] : [])
-    )
-  )
-  const hashes = algorithms.map(crypto.createHash)
-  let streamSize = 0
-  const stream = new Transform({
-    transform (chunk, enc, cb) {
-      streamSize += chunk.length
-      hashes.forEach(h => h.update(chunk, enc))
-      cb(null, chunk, enc)
-    }
-  }).on('end', () => {
-    const optString = (opts.options && opts.options.length)
-    ? `?${opts.options.join('?')}`
-    : ''
-    const newSri = parse(hashes.map((h, i) => {
-      return `${algorithms[i]}-${h.digest('base64')}${optString}`
-    }).join(' '), opts)
-    // Integrity verification mode
-    const match = goodSri && newSri.match(sri, opts)
-    if (typeof opts.size === 'number' && streamSize !== opts.size) {
-      const err = new Error(`stream size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${streamSize}`)
-      err.code = 'EBADSIZE'
-      err.found = streamSize
-      err.expected = opts.size
-      err.sri = sri
-      stream.emit('error', err)
-    } else if (opts.integrity && !match) {
-      const err = new Error(`${sri} integrity checksum failed when using ${algorithm}: wanted ${digests} but got ${newSri}. (${streamSize} bytes)`)
-      err.code = 'EINTEGRITY'
-      err.found = newSri
-      err.expected = digests
-      err.algorithm = algorithm
-      err.sri = sri
-      stream.emit('error', err)
-    } else {
-      stream.emit('size', streamSize)
-      stream.emit('integrity', newSri)
-      match && stream.emit('verified', match)
-    }
-  })
-  return stream
-}
-
-module.exports.create = createIntegrity
-function createIntegrity (opts) {
-  opts = opts || {}
-  const algorithms = opts.algorithms || ['sha512']
-  const optString = opts.options && opts.options.length
-  ? `?${opts.options.join('?')}`
-  : ''
-
-  const hashes = algorithms.map(crypto.createHash)
-
-  return {
-    update: function (chunk, enc) {
-      hashes.forEach(h => h.update(chunk, enc))
-      return this
-    },
-    digest: function (enc) {
-      const integrity = algorithms.reduce((acc, algo) => {
-        const digest = hashes.shift().digest('base64')
-        const hash = new Hash(
-          `${algo}-${digest}${optString}`,
-          opts
-        )
-        if (hash.algorithm && hash.digest) {
-          const algo = hash.algorithm
-          if (!acc[algo]) { acc[algo] = [] }
-          acc[algo].push(hash)
-        }
-        return acc
-      }, new Integrity())
-
-      return integrity
-    }
-  }
-}
-
-const NODE_HASHES = new Set(crypto.getHashes())
-
-// This is a Best Effort™ at a reasonable priority for hash algos
-const DEFAULT_PRIORITY = [
-  'md5', 'whirlpool', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512',
-  // TODO - it's unclear _which_ of these Node will actually use as its name
-  //        for the algorithm, so we guesswork it based on the OpenSSL names.
-  'sha3',
-  'sha3-256', 'sha3-384', 'sha3-512',
-  'sha3_256', 'sha3_384', 'sha3_512'
-].filter(algo => NODE_HASHES.has(algo))
-
-function getPrioritizedHash (algo1, algo2) {
-  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
-  ? algo1
-  : algo2
-}
-
-
-/***/ }),
-/* 78 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hostedGit = exports.registries = undefined;
-exports.getExoticResolver = getExoticResolver;
-exports.hostedGitFragmentToGitUrl = hostedGitFragmentToGitUrl;
-
-var _baseResolver;
-
-function _load_baseResolver() {
-  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
-}
-
-var _npmResolver;
-
-function _load_npmResolver() {
-  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
-}
-
-var _yarnResolver;
-
-function _load_yarnResolver() {
-  return _yarnResolver = _interopRequireDefault(__webpack_require__(576));
-}
-
-var _gitResolver;
-
-function _load_gitResolver() {
-  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
-}
-
-var _tarballResolver;
-
-function _load_tarballResolver() {
-  return _tarballResolver = _interopRequireDefault(__webpack_require__(574));
-}
-
-var _githubResolver;
-
-function _load_githubResolver() {
-  return _githubResolver = _interopRequireDefault(__webpack_require__(367));
-}
-
-var _fileResolver;
-
-function _load_fileResolver() {
-  return _fileResolver = _interopRequireDefault(__webpack_require__(215));
-}
-
-var _linkResolver;
-
-function _load_linkResolver() {
-  return _linkResolver = _interopRequireDefault(__webpack_require__(368));
-}
-
-var _gitlabResolver;
-
-function _load_gitlabResolver() {
-  return _gitlabResolver = _interopRequireDefault(__webpack_require__(572));
-}
-
-var _gistResolver;
-
-function _load_gistResolver() {
-  return _gistResolver = _interopRequireDefault(__webpack_require__(216));
-}
-
-var _bitbucketResolver;
-
-function _load_bitbucketResolver() {
-  return _bitbucketResolver = _interopRequireDefault(__webpack_require__(571));
-}
-
-var _hostedGitResolver;
-
-function _load_hostedGitResolver() {
-  return _hostedGitResolver = __webpack_require__(109);
-}
-
-var _registryResolver;
-
-function _load_registryResolver() {
-  return _registryResolver = _interopRequireDefault(__webpack_require__(573));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const registries = exports.registries = {
-  npm: (_npmResolver || _load_npmResolver()).default,
-  yarn: (_yarnResolver || _load_yarnResolver()).default
-};
-
-//
-
-const exotics = new Set([(_gitResolver || _load_gitResolver()).default, (_tarballResolver || _load_tarballResolver()).default, (_githubResolver || _load_githubResolver()).default, (_fileResolver || _load_fileResolver()).default, (_linkResolver || _load_linkResolver()).default, (_gitlabResolver || _load_gitlabResolver()).default, (_gistResolver || _load_gistResolver()).default, (_bitbucketResolver || _load_bitbucketResolver()).default]);
-
-function getExoticResolver(pattern) {
-  for (var _iterator = exotics, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const Resolver = _ref;
-
-    if (Resolver.isVersion(pattern)) {
-      return Resolver;
-    }
-  }
-  return null;
-}
-
-//
-
-const hostedGit = exports.hostedGit = {
-  github: (_githubResolver || _load_githubResolver()).default,
-  gitlab: (_gitlabResolver || _load_gitlabResolver()).default,
-  bitbucket: (_bitbucketResolver || _load_bitbucketResolver()).default
-};
-
-function hostedGitFragmentToGitUrl(fragment, reporter) {
-  for (const key in hostedGit) {
-    const Resolver = hostedGit[key];
-    if (Resolver.isVersion(fragment)) {
-      return Resolver.getGitHTTPUrl((0, (_hostedGitResolver || _load_hostedGitResolver()).explodeHostedGitFragment)(fragment, reporter));
-    }
-  }
-
-  return fragment;
-}
-
-//
-
-for (const key in registries) {
-  var _class, _temp;
-
-  const RegistryResolver = registries[key];
-
-  exotics.add((_temp = _class = class extends (_registryResolver || _load_registryResolver()).default {}, _class.protocol = key, _class.factory = RegistryResolver, _temp));
-}
-
-/***/ }),
-/* 79 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * Base prompt implementation
- * Should be extended by prompt types.
- */
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-var runAsync = __webpack_require__(181);
-var { filter, flatMap, share, take, takeUntil } = __webpack_require__(63);
-var Choices = __webpack_require__(686);
-var ScreenManager = __webpack_require__(697);
-
-class Prompt {
-  constructor(question, rl, answers) {
-    // Setup instance defaults property
-    _.assign(this, {
-      answers: answers,
-      status: 'pending'
-    });
-
-    // Set defaults prompt options
-    this.opt = _.defaults(_.clone(question), {
-      validate: () => true,
-      filter: val => val,
-      when: () => true,
-      suffix: '',
-      prefix: chalk.green('?')
-    });
-
-    // Make sure name is present
-    if (!this.opt.name) {
-      this.throwParamError('name');
-    }
-
-    // Set default message if no message defined
-    if (!this.opt.message) {
-      this.opt.message = this.opt.name + ':';
-    }
-
-    // Normalize choices
-    if (Array.isArray(this.opt.choices)) {
-      this.opt.choices = new Choices(this.opt.choices, answers);
-    }
-
-    this.rl = rl;
-    this.screen = new ScreenManager(this.rl);
-  }
-
-  /**
-   * Start the Inquiry session and manage output value filtering
-   * @return {Promise}
-   */
-
-  run() {
-    return new Promise(resolve => {
-      this._run(value => resolve(value));
-    });
-  }
-
-  // Default noop (this one should be overwritten in prompts)
-  _run(cb) {
-    cb();
-  }
-
-  /**
-   * Throw an error telling a required parameter is missing
-   * @param  {String} name Name of the missing param
-   * @return {Throw Error}
-   */
-
-  throwParamError(name) {
-    throw new Error('You must provide a `' + name + '` parameter');
-  }
-
-  /**
-   * Called when the UI closes. Override to do any specific cleanup necessary
-   */
-  close() {
-    this.screen.releaseCursor();
-  }
-
-  /**
-   * Run the provided validation method each time a submit event occur.
-   * @param  {Rx.Observable} submit - submit event flow
-   * @return {Object}        Object containing two observables: `success` and `error`
-   */
-  handleSubmitEvents(submit) {
-    var self = this;
-    var validate = runAsync(this.opt.validate);
-    var asyncFilter = runAsync(this.opt.filter);
-    var validation = submit.pipe(
-      flatMap(value =>
-        asyncFilter(value, self.answers).then(
-          filteredValue =>
-            validate(filteredValue, self.answers).then(
-              isValid => ({ isValid: isValid, value: filteredValue }),
-              err => ({ isValid: err })
-            ),
-          err => ({ isValid: err })
-        )
-      ),
-      share()
-    );
-
-    var success = validation.pipe(
-      filter(state => state.isValid === true),
-      take(1)
-    );
-    var error = validation.pipe(
-      filter(state => state.isValid !== true),
-      takeUntil(success)
-    );
-
-    return {
-      success: success,
-      error: error
-    };
-  }
-
-  /**
-   * Generate the prompt question string
-   * @return {String} prompt question string
-   */
-
-  getQuestion() {
-    var message =
-      this.opt.prefix +
-      ' ' +
-      chalk.bold(this.opt.message) +
-      this.opt.suffix +
-      chalk.reset(' ');
-
-    // Append the default if available, and if question isn't answered
-    if (this.opt.default != null && this.status !== 'answered') {
-      // If default password is supplied, hide it
-      if (this.opt.type === 'password') {
-        message += chalk.italic.dim('[hidden] ');
-      } else {
-        message += chalk.dim('(' + this.opt.default + ') ');
-      }
-    }
-
-    return message;
-  }
-}
-
-module.exports = Prompt;
-
-
-/***/ }),
-/* 80 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var { fromEvent } = __webpack_require__(182);
-var { filter, map, share } = __webpack_require__(63);
-
-function normalizeKeypressEvents(value, key) {
-  return { value: value, key: key || {} };
-}
-
-module.exports = function(rl) {
-  var keypress = fromEvent(rl.input, 'keypress', normalizeKeypressEvents)
-    // Ignore `enter` key. On the readline, we only care about the `line` event.
-    .pipe(filter(({ key }) => key.name !== 'enter' && key.name !== 'return'));
-
-  return {
-    line: fromEvent(rl, 'line'),
-    keypress: keypress,
-
-    normalizedUpKey: keypress.pipe(
-      filter(
-        ({ key }) =>
-          key.name === 'up' || key.name === 'k' || (key.name === 'p' && key.ctrl)
-      ),
-      share()
-    ),
-
-    normalizedDownKey: keypress.pipe(
-      filter(
-        ({ key }) =>
-          key.name === 'down' || key.name === 'j' || (key.name === 'n' && key.ctrl)
-      ),
-      share()
-    ),
-
-    numberKey: keypress.pipe(
-      filter(e => e.value && '123456789'.indexOf(e.value) >= 0),
-      map(e => Number(e.value)),
-      share()
-    ),
-
-    spaceKey: keypress.pipe(
-      filter(({ key }) => key && key.name === 'space'),
-      share()
-    ),
-    aKey: keypress.pipe(
-      filter(({ key }) => key && key.name === 'a'),
-      share()
-    ),
-    iKey: keypress.pipe(
-      filter(({ key }) => key && key.name === 'i'),
-      share()
-    )
-  };
-};
-
-
-/***/ }),
-/* 81 */
-/***/ (function(module, exports, __webpack_require__) {
-
-(function(){
-
-    // Copyright (c) 2005  Tom Wu
-    // All Rights Reserved.
-    // See "LICENSE" for details.
-
-    // Basic JavaScript BN library - subset useful for RSA encryption.
-
-    // Bits per digit
-    var dbits;
-
-    // JavaScript engine analysis
-    var canary = 0xdeadbeefcafe;
-    var j_lm = ((canary&0xffffff)==0xefcafe);
-
-    // (public) Constructor
-    function BigInteger(a,b,c) {
-      if(a != null)
-        if("number" == typeof a) this.fromNumber(a,b,c);
-        else if(b == null && "string" != typeof a) this.fromString(a,256);
-        else this.fromString(a,b);
-    }
-
-    // return new, unset BigInteger
-    function nbi() { return new BigInteger(null); }
-
-    // am: Compute w_j += (x*this_i), propagate carries,
-    // c is initial carry, returns final carry.
-    // c < 3*dvalue, x < 2*dvalue, this_i < dvalue
-    // We need to select the fastest one that works in this environment.
-
-    // am1: use a single mult and divide to get the high bits,
-    // max digit bits should be 26 because
-    // max internal value = 2*dvalue^2-2*dvalue (< 2^53)
-    function am1(i,x,w,j,c,n) {
-      while(--n >= 0) {
-        var v = x*this[i++]+w[j]+c;
-        c = Math.floor(v/0x4000000);
-        w[j++] = v&0x3ffffff;
-      }
-      return c;
-    }
-    // am2 avoids a big mult-and-extract completely.
-    // Max digit bits should be <= 30 because we do bitwise ops
-    // on values up to 2*hdvalue^2-hdvalue-1 (< 2^31)
-    function am2(i,x,w,j,c,n) {
-      var xl = x&0x7fff, xh = x>>15;
-      while(--n >= 0) {
-        var l = this[i]&0x7fff;
-        var h = this[i++]>>15;
-        var m = xh*l+h*xl;
-        l = xl*l+((m&0x7fff)<<15)+w[j]+(c&0x3fffffff);
-        c = (l>>>30)+(m>>>15)+xh*h+(c>>>30);
-        w[j++] = l&0x3fffffff;
-      }
-      return c;
-    }
-    // Alternately, set max digit bits to 28 since some
-    // browsers slow down when dealing with 32-bit numbers.
-    function am3(i,x,w,j,c,n) {
-      var xl = x&0x3fff, xh = x>>14;
-      while(--n >= 0) {
-        var l = this[i]&0x3fff;
-        var h = this[i++]>>14;
-        var m = xh*l+h*xl;
-        l = xl*l+((m&0x3fff)<<14)+w[j]+c;
-        c = (l>>28)+(m>>14)+xh*h;
-        w[j++] = l&0xfffffff;
-      }
-      return c;
-    }
-    var inBrowser = typeof navigator !== "undefined";
-    if(inBrowser && j_lm && (navigator.appName == "Microsoft Internet Explorer")) {
-      BigInteger.prototype.am = am2;
-      dbits = 30;
-    }
-    else if(inBrowser && j_lm && (navigator.appName != "Netscape")) {
-      BigInteger.prototype.am = am1;
-      dbits = 26;
-    }
-    else { // Mozilla/Netscape seems to prefer am3
-      BigInteger.prototype.am = am3;
-      dbits = 28;
-    }
-
-    BigInteger.prototype.DB = dbits;
-    BigInteger.prototype.DM = ((1<<dbits)-1);
-    BigInteger.prototype.DV = (1<<dbits);
-
-    var BI_FP = 52;
-    BigInteger.prototype.FV = Math.pow(2,BI_FP);
-    BigInteger.prototype.F1 = BI_FP-dbits;
-    BigInteger.prototype.F2 = 2*dbits-BI_FP;
-
-    // Digit conversions
-    var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
-    var BI_RC = new Array();
-    var rr,vv;
-    rr = "0".charCodeAt(0);
-    for(vv = 0; vv <= 9; ++vv) BI_RC[rr++] = vv;
-    rr = "a".charCodeAt(0);
-    for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
-    rr = "A".charCodeAt(0);
-    for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
-
-    function int2char(n) { return BI_RM.charAt(n); }
-    function intAt(s,i) {
-      var c = BI_RC[s.charCodeAt(i)];
-      return (c==null)?-1:c;
-    }
-
-    // (protected) copy this to r
-    function bnpCopyTo(r) {
-      for(var i = this.t-1; i >= 0; --i) r[i] = this[i];
-      r.t = this.t;
-      r.s = this.s;
-    }
-
-    // (protected) set from integer value x, -DV <= x < DV
-    function bnpFromInt(x) {
-      this.t = 1;
-      this.s = (x<0)?-1:0;
-      if(x > 0) this[0] = x;
-      else if(x < -1) this[0] = x+this.DV;
-      else this.t = 0;
-    }
-
-    // return bigint initialized to value
-    function nbv(i) { var r = nbi(); r.fromInt(i); return r; }
-
-    // (protected) set from string and radix
-    function bnpFromString(s,b) {
-      var k;
-      if(b == 16) k = 4;
-      else if(b == 8) k = 3;
-      else if(b == 256) k = 8; // byte array
-      else if(b == 2) k = 1;
-      else if(b == 32) k = 5;
-      else if(b == 4) k = 2;
-      else { this.fromRadix(s,b); return; }
-      this.t = 0;
-      this.s = 0;
-      var i = s.length, mi = false, sh = 0;
-      while(--i >= 0) {
-        var x = (k==8)?s[i]&0xff:intAt(s,i);
-        if(x < 0) {
-          if(s.charAt(i) == "-") mi = true;
-          continue;
-        }
-        mi = false;
-        if(sh == 0)
-          this[this.t++] = x;
-        else if(sh+k > this.DB) {
-          this[this.t-1] |= (x&((1<<(this.DB-sh))-1))<<sh;
-          this[this.t++] = (x>>(this.DB-sh));
-        }
-        else
-          this[this.t-1] |= x<<sh;
-        sh += k;
-        if(sh >= this.DB) sh -= this.DB;
-      }
-      if(k == 8 && (s[0]&0x80) != 0) {
-        this.s = -1;
-        if(sh > 0) this[this.t-1] |= ((1<<(this.DB-sh))-1)<<sh;
-      }
-      this.clamp();
-      if(mi) BigInteger.ZERO.subTo(this,this);
-    }
-
-    // (protected) clamp off excess high words
-    function bnpClamp() {
-      var c = this.s&this.DM;
-      while(this.t > 0 && this[this.t-1] == c) --this.t;
-    }
-
-    // (public) return string representation in given radix
-    function bnToString(b) {
-      if(this.s < 0) return "-"+this.negate().toString(b);
-      var k;
-      if(b == 16) k = 4;
-      else if(b == 8) k = 3;
-      else if(b == 2) k = 1;
-      else if(b == 32) k = 5;
-      else if(b == 4) k = 2;
-      else return this.toRadix(b);
-      var km = (1<<k)-1, d, m = false, r = "", i = this.t;
-      var p = this.DB-(i*this.DB)%k;
-      if(i-- > 0) {
-        if(p < this.DB && (d = this[i]>>p) > 0) { m = true; r = int2char(d); }
-        while(i >= 0) {
-          if(p < k) {
-            d = (this[i]&((1<<p)-1))<<(k-p);
-            d |= this[--i]>>(p+=this.DB-k);
-          }
-          else {
-            d = (this[i]>>(p-=k))&km;
-            if(p <= 0) { p += this.DB; --i; }
-          }
-          if(d > 0) m = true;
-          if(m) r += int2char(d);
-        }
-      }
-      return m?r:"0";
-    }
-
-    // (public) -this
-    function bnNegate() { var r = nbi(); BigInteger.ZERO.subTo(this,r); return r; }
-
-    // (public) |this|
-    function bnAbs() { return (this.s<0)?this.negate():this; }
-
-    // (public) return + if this > a, - if this < a, 0 if equal
-    function bnCompareTo(a) {
-      var r = this.s-a.s;
-      if(r != 0) return r;
-      var i = this.t;
-      r = i-a.t;
-      if(r != 0) return (this.s<0)?-r:r;
-      while(--i >= 0) if((r=this[i]-a[i]) != 0) return r;
-      return 0;
-    }
-
-    // returns bit length of the integer x
-    function nbits(x) {
-      var r = 1, t;
-      if((t=x>>>16) != 0) { x = t; r += 16; }
-      if((t=x>>8) != 0) { x = t; r += 8; }
-      if((t=x>>4) != 0) { x = t; r += 4; }
-      if((t=x>>2) != 0) { x = t; r += 2; }
-      if((t=x>>1) != 0) { x = t; r += 1; }
-      return r;
-    }
-
-    // (public) return the number of bits in "this"
-    function bnBitLength() {
-      if(this.t <= 0) return 0;
-      return this.DB*(this.t-1)+nbits(this[this.t-1]^(this.s&this.DM));
-    }
-
-    // (protected) r = this << n*DB
-    function bnpDLShiftTo(n,r) {
-      var i;
-      for(i = this.t-1; i >= 0; --i) r[i+n] = this[i];
-      for(i = n-1; i >= 0; --i) r[i] = 0;
-      r.t = this.t+n;
-      r.s = this.s;
-    }
-
-    // (protected) r = this >> n*DB
-    function bnpDRShiftTo(n,r) {
-      for(var i = n; i < this.t; ++i) r[i-n] = this[i];
-      r.t = Math.max(this.t-n,0);
-      r.s = this.s;
-    }
-
-    // (protected) r = this << n
-    function bnpLShiftTo(n,r) {
-      var bs = n%this.DB;
-      var cbs = this.DB-bs;
-      var bm = (1<<cbs)-1;
-      var ds = Math.floor(n/this.DB), c = (this.s<<bs)&this.DM, i;
-      for(i = this.t-1; i >= 0; --i) {
-        r[i+ds+1] = (this[i]>>cbs)|c;
-        c = (this[i]&bm)<<bs;
-      }
-      for(i = ds-1; i >= 0; --i) r[i] = 0;
-      r[ds] = c;
-      r.t = this.t+ds+1;
-      r.s = this.s;
-      r.clamp();
-    }
-
-    // (protected) r = this >> n
-    function bnpRShiftTo(n,r) {
-      r.s = this.s;
-      var ds = Math.floor(n/this.DB);
-      if(ds >= this.t) { r.t = 0; return; }
-      var bs = n%this.DB;
-      var cbs = this.DB-bs;
-      var bm = (1<<bs)-1;
-      r[0] = this[ds]>>bs;
-      for(var i = ds+1; i < this.t; ++i) {
-        r[i-ds-1] |= (this[i]&bm)<<cbs;
-        r[i-ds] = this[i]>>bs;
-      }
-      if(bs > 0) r[this.t-ds-1] |= (this.s&bm)<<cbs;
-      r.t = this.t-ds;
-      r.clamp();
-    }
-
-    // (protected) r = this - a
-    function bnpSubTo(a,r) {
-      var i = 0, c = 0, m = Math.min(a.t,this.t);
-      while(i < m) {
-        c += this[i]-a[i];
-        r[i++] = c&this.DM;
-        c >>= this.DB;
-      }
-      if(a.t < this.t) {
-        c -= a.s;
-        while(i < this.t) {
-          c += this[i];
-          r[i++] = c&this.DM;
-          c >>= this.DB;
-        }
-        c += this.s;
-      }
-      else {
-        c += this.s;
-        while(i < a.t) {
-          c -= a[i];
-          r[i++] = c&this.DM;
-          c >>= this.DB;
-        }
-        c -= a.s;
-      }
-      r.s = (c<0)?-1:0;
-      if(c < -1) r[i++] = this.DV+c;
-      else if(c > 0) r[i++] = c;
-      r.t = i;
-      r.clamp();
-    }
-
-    // (protected) r = this * a, r != this,a (HAC 14.12)
-    // "this" should be the larger one if appropriate.
-    function bnpMultiplyTo(a,r) {
-      var x = this.abs(), y = a.abs();
-      var i = x.t;
-      r.t = i+y.t;
-      while(--i >= 0) r[i] = 0;
-      for(i = 0; i < y.t; ++i) r[i+x.t] = x.am(0,y[i],r,i,0,x.t);
-      r.s = 0;
-      r.clamp();
-      if(this.s != a.s) BigInteger.ZERO.subTo(r,r);
-    }
-
-    // (protected) r = this^2, r != this (HAC 14.16)
-    function bnpSquareTo(r) {
-      var x = this.abs();
-      var i = r.t = 2*x.t;
-      while(--i >= 0) r[i] = 0;
-      for(i = 0; i < x.t-1; ++i) {
-        var c = x.am(i,x[i],r,2*i,0,1);
-        if((r[i+x.t]+=x.am(i+1,2*x[i],r,2*i+1,c,x.t-i-1)) >= x.DV) {
-          r[i+x.t] -= x.DV;
-          r[i+x.t+1] = 1;
-        }
-      }
-      if(r.t > 0) r[r.t-1] += x.am(i,x[i],r,2*i,0,1);
-      r.s = 0;
-      r.clamp();
-    }
-
-    // (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
-    // r != q, this != m.  q or r may be null.
-    function bnpDivRemTo(m,q,r) {
-      var pm = m.abs();
-      if(pm.t <= 0) return;
-      var pt = this.abs();
-      if(pt.t < pm.t) {
-        if(q != null) q.fromInt(0);
-        if(r != null) this.copyTo(r);
-        return;
-      }
-      if(r == null) r = nbi();
-      var y = nbi(), ts = this.s, ms = m.s;
-      var nsh = this.DB-nbits(pm[pm.t-1]);   // normalize modulus
-      if(nsh > 0) { pm.lShiftTo(nsh,y); pt.lShiftTo(nsh,r); }
-      else { pm.copyTo(y); pt.copyTo(r); }
-      var ys = y.t;
-      var y0 = y[ys-1];
-      if(y0 == 0) return;
-      var yt = y0*(1<<this.F1)+((ys>1)?y[ys-2]>>this.F2:0);
-      var d1 = this.FV/yt, d2 = (1<<this.F1)/yt, e = 1<<this.F2;
-      var i = r.t, j = i-ys, t = (q==null)?nbi():q;
-      y.dlShiftTo(j,t);
-      if(r.compareTo(t) >= 0) {
-        r[r.t++] = 1;
-        r.subTo(t,r);
-      }
-      BigInteger.ONE.dlShiftTo(ys,t);
-      t.subTo(y,y);  // "negative" y so we can replace sub with am later
-      while(y.t < ys) y[y.t++] = 0;
-      while(--j >= 0) {
-        // Estimate quotient digit
-        var qd = (r[--i]==y0)?this.DM:Math.floor(r[i]*d1+(r[i-1]+e)*d2);
-        if((r[i]+=y.am(0,qd,r,j,0,ys)) < qd) {   // Try it out
-          y.dlShiftTo(j,t);
-          r.subTo(t,r);
-          while(r[i] < --qd) r.subTo(t,r);
-        }
-      }
-      if(q != null) {
-        r.drShiftTo(ys,q);
-        if(ts != ms) BigInteger.ZERO.subTo(q,q);
-      }
-      r.t = ys;
-      r.clamp();
-      if(nsh > 0) r.rShiftTo(nsh,r); // Denormalize remainder
-      if(ts < 0) BigInteger.ZERO.subTo(r,r);
-    }
-
-    // (public) this mod a
-    function bnMod(a) {
-      var r = nbi();
-      this.abs().divRemTo(a,null,r);
-      if(this.s < 0 && r.compareTo(BigInteger.ZERO) > 0) a.subTo(r,r);
-      return r;
-    }
-
-    // Modular reduction using "classic" algorithm
-    function Classic(m) { this.m = m; }
-    function cConvert(x) {
-      if(x.s < 0 || x.compareTo(this.m) >= 0) return x.mod(this.m);
-      else return x;
-    }
-    function cRevert(x) { return x; }
-    function cReduce(x) { x.divRemTo(this.m,null,x); }
-    function cMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
-    function cSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
-
-    Classic.prototype.convert = cConvert;
-    Classic.prototype.revert = cRevert;
-    Classic.prototype.reduce = cReduce;
-    Classic.prototype.mulTo = cMulTo;
-    Classic.prototype.sqrTo = cSqrTo;
-
-    // (protected) return "-1/this % 2^DB"; useful for Mont. reduction
-    // justification:
-    //         xy == 1 (mod m)
-    //         xy =  1+km
-    //   xy(2-xy) = (1+km)(1-km)
-    // x[y(2-xy)] = 1-k^2m^2
-    // x[y(2-xy)] == 1 (mod m^2)
-    // if y is 1/x mod m, then y(2-xy) is 1/x mod m^2
-    // should reduce x and y(2-xy) by m^2 at each step to keep size bounded.
-    // JS multiply "overflows" differently from C/C++, so care is needed here.
-    function bnpInvDigit() {
-      if(this.t < 1) return 0;
-      var x = this[0];
-      if((x&1) == 0) return 0;
-      var y = x&3;       // y == 1/x mod 2^2
-      y = (y*(2-(x&0xf)*y))&0xf; // y == 1/x mod 2^4
-      y = (y*(2-(x&0xff)*y))&0xff;   // y == 1/x mod 2^8
-      y = (y*(2-(((x&0xffff)*y)&0xffff)))&0xffff;    // y == 1/x mod 2^16
-      // last step - calculate inverse mod DV directly;
-      // assumes 16 < DB <= 32 and assumes ability to handle 48-bit ints
-      y = (y*(2-x*y%this.DV))%this.DV;       // y == 1/x mod 2^dbits
-      // we really want the negative inverse, and -DV < y < DV
-      return (y>0)?this.DV-y:-y;
-    }
-
-    // Montgomery reduction
-    function Montgomery(m) {
-      this.m = m;
-      this.mp = m.invDigit();
-      this.mpl = this.mp&0x7fff;
-      this.mph = this.mp>>15;
-      this.um = (1<<(m.DB-15))-1;
-      this.mt2 = 2*m.t;
-    }
-
-    // xR mod m
-    function montConvert(x) {
-      var r = nbi();
-      x.abs().dlShiftTo(this.m.t,r);
-      r.divRemTo(this.m,null,r);
-      if(x.s < 0 && r.compareTo(BigInteger.ZERO) > 0) this.m.subTo(r,r);
-      return r;
-    }
-
-    // x/R mod m
-    function montRevert(x) {
-      var r = nbi();
-      x.copyTo(r);
-      this.reduce(r);
-      return r;
-    }
-
-    // x = x/R mod m (HAC 14.32)
-    function montReduce(x) {
-      while(x.t <= this.mt2) // pad x so am has enough room later
-        x[x.t++] = 0;
-      for(var i = 0; i < this.m.t; ++i) {
-        // faster way of calculating u0 = x[i]*mp mod DV
-        var j = x[i]&0x7fff;
-        var u0 = (j*this.mpl+(((j*this.mph+(x[i]>>15)*this.mpl)&this.um)<<15))&x.DM;
-        // use am to combine the multiply-shift-add into one call
-        j = i+this.m.t;
-        x[j] += this.m.am(0,u0,x,i,0,this.m.t);
-        // propagate carry
-        while(x[j] >= x.DV) { x[j] -= x.DV; x[++j]++; }
-      }
-      x.clamp();
-      x.drShiftTo(this.m.t,x);
-      if(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
-    }
-
-    // r = "x^2/R mod m"; x != r
-    function montSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
-
-    // r = "xy/R mod m"; x,y != r
-    function montMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
-
-    Montgomery.prototype.convert = montConvert;
-    Montgomery.prototype.revert = montRevert;
-    Montgomery.prototype.reduce = montReduce;
-    Montgomery.prototype.mulTo = montMulTo;
-    Montgomery.prototype.sqrTo = montSqrTo;
-
-    // (protected) true iff this is even
-    function bnpIsEven() { return ((this.t>0)?(this[0]&1):this.s) == 0; }
-
-    // (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
-    function bnpExp(e,z) {
-      if(e > 0xffffffff || e < 1) return BigInteger.ONE;
-      var r = nbi(), r2 = nbi(), g = z.convert(this), i = nbits(e)-1;
-      g.copyTo(r);
-      while(--i >= 0) {
-        z.sqrTo(r,r2);
-        if((e&(1<<i)) > 0) z.mulTo(r2,g,r);
-        else { var t = r; r = r2; r2 = t; }
-      }
-      return z.revert(r);
-    }
-
-    // (public) this^e % m, 0 <= e < 2^32
-    function bnModPowInt(e,m) {
-      var z;
-      if(e < 256 || m.isEven()) z = new Classic(m); else z = new Montgomery(m);
-      return this.exp(e,z);
-    }
-
-    // protected
-    BigInteger.prototype.copyTo = bnpCopyTo;
-    BigInteger.prototype.fromInt = bnpFromInt;
-    BigInteger.prototype.fromString = bnpFromString;
-    BigInteger.prototype.clamp = bnpClamp;
-    BigInteger.prototype.dlShiftTo = bnpDLShiftTo;
-    BigInteger.prototype.drShiftTo = bnpDRShiftTo;
-    BigInteger.prototype.lShiftTo = bnpLShiftTo;
-    BigInteger.prototype.rShiftTo = bnpRShiftTo;
-    BigInteger.prototype.subTo = bnpSubTo;
-    BigInteger.prototype.multiplyTo = bnpMultiplyTo;
-    BigInteger.prototype.squareTo = bnpSquareTo;
-    BigInteger.prototype.divRemTo = bnpDivRemTo;
-    BigInteger.prototype.invDigit = bnpInvDigit;
-    BigInteger.prototype.isEven = bnpIsEven;
-    BigInteger.prototype.exp = bnpExp;
-
-    // public
-    BigInteger.prototype.toString = bnToString;
-    BigInteger.prototype.negate = bnNegate;
-    BigInteger.prototype.abs = bnAbs;
-    BigInteger.prototype.compareTo = bnCompareTo;
-    BigInteger.prototype.bitLength = bnBitLength;
-    BigInteger.prototype.mod = bnMod;
-    BigInteger.prototype.modPowInt = bnModPowInt;
-
-    // "constants"
-    BigInteger.ZERO = nbv(0);
-    BigInteger.ONE = nbv(1);
-
-    // Copyright (c) 2005-2009  Tom Wu
-    // All Rights Reserved.
-    // See "LICENSE" for details.
-
-    // Extended JavaScript BN functions, required for RSA private ops.
-
-    // Version 1.1: new BigInteger("0", 10) returns "proper" zero
-    // Version 1.2: square() API, isProbablePrime fix
-
-    // (public)
-    function bnClone() { var r = nbi(); this.copyTo(r); return r; }
-
-    // (public) return value as integer
-    function bnIntValue() {
-      if(this.s < 0) {
-        if(this.t == 1) return this[0]-this.DV;
-        else if(this.t == 0) return -1;
-      }
-      else if(this.t == 1) return this[0];
-      else if(this.t == 0) return 0;
-      // assumes 16 < DB < 32
-      return ((this[1]&((1<<(32-this.DB))-1))<<this.DB)|this[0];
-    }
-
-    // (public) return value as byte
-    function bnByteValue() { return (this.t==0)?this.s:(this[0]<<24)>>24; }
-
-    // (public) return value as short (assumes DB>=16)
-    function bnShortValue() { return (this.t==0)?this.s:(this[0]<<16)>>16; }
-
-    // (protected) return x s.t. r^x < DV
-    function bnpChunkSize(r) { return Math.floor(Math.LN2*this.DB/Math.log(r)); }
-
-    // (public) 0 if this == 0, 1 if this > 0
-    function bnSigNum() {
-      if(this.s < 0) return -1;
-      else if(this.t <= 0 || (this.t == 1 && this[0] <= 0)) return 0;
-      else return 1;
-    }
-
-    // (protected) convert to radix string
-    function bnpToRadix(b) {
-      if(b == null) b = 10;
-      if(this.signum() == 0 || b < 2 || b > 36) return "0";
-      var cs = this.chunkSize(b);
-      var a = Math.pow(b,cs);
-      var d = nbv(a), y = nbi(), z = nbi(), r = "";
-      this.divRemTo(d,y,z);
-      while(y.signum() > 0) {
-        r = (a+z.intValue()).toString(b).substr(1) + r;
-        y.divRemTo(d,y,z);
-      }
-      return z.intValue().toString(b) + r;
-    }
-
-    // (protected) convert from radix string
-    function bnpFromRadix(s,b) {
-      this.fromInt(0);
-      if(b == null) b = 10;
-      var cs = this.chunkSize(b);
-      var d = Math.pow(b,cs), mi = false, j = 0, w = 0;
-      for(var i = 0; i < s.length; ++i) {
-        var x = intAt(s,i);
-        if(x < 0) {
-          if(s.charAt(i) == "-" && this.signum() == 0) mi = true;
-          continue;
-        }
-        w = b*w+x;
-        if(++j >= cs) {
-          this.dMultiply(d);
-          this.dAddOffset(w,0);
-          j = 0;
-          w = 0;
-        }
-      }
-      if(j > 0) {
-        this.dMultiply(Math.pow(b,j));
-        this.dAddOffset(w,0);
-      }
-      if(mi) BigInteger.ZERO.subTo(this,this);
-    }
-
-    // (protected) alternate constructor
-    function bnpFromNumber(a,b,c) {
-      if("number" == typeof b) {
-        // new BigInteger(int,int,RNG)
-        if(a < 2) this.fromInt(1);
-        else {
-          this.fromNumber(a,c);
-          if(!this.testBit(a-1))	// force MSB set
-            this.bitwiseTo(BigInteger.ONE.shiftLeft(a-1),op_or,this);
-          if(this.isEven()) this.dAddOffset(1,0); // force odd
-          while(!this.isProbablePrime(b)) {
-            this.dAddOffset(2,0);
-            if(this.bitLength() > a) this.subTo(BigInteger.ONE.shiftLeft(a-1),this);
-          }
-        }
-      }
-      else {
-        // new BigInteger(int,RNG)
-        var x = new Array(), t = a&7;
-        x.length = (a>>3)+1;
-        b.nextBytes(x);
-        if(t > 0) x[0] &= ((1<<t)-1); else x[0] = 0;
-        this.fromString(x,256);
-      }
-    }
-
-    // (public) convert to bigendian byte array
-    function bnToByteArray() {
-      var i = this.t, r = new Array();
-      r[0] = this.s;
-      var p = this.DB-(i*this.DB)%8, d, k = 0;
-      if(i-- > 0) {
-        if(p < this.DB && (d = this[i]>>p) != (this.s&this.DM)>>p)
-          r[k++] = d|(this.s<<(this.DB-p));
-        while(i >= 0) {
-          if(p < 8) {
-            d = (this[i]&((1<<p)-1))<<(8-p);
-            d |= this[--i]>>(p+=this.DB-8);
-          }
-          else {
-            d = (this[i]>>(p-=8))&0xff;
-            if(p <= 0) { p += this.DB; --i; }
-          }
-          if((d&0x80) != 0) d |= -256;
-          if(k == 0 && (this.s&0x80) != (d&0x80)) ++k;
-          if(k > 0 || d != this.s) r[k++] = d;
-        }
-      }
-      return r;
-    }
-
-    function bnEquals(a) { return(this.compareTo(a)==0); }
-    function bnMin(a) { return(this.compareTo(a)<0)?this:a; }
-    function bnMax(a) { return(this.compareTo(a)>0)?this:a; }
-
-    // (protected) r = this op a (bitwise)
-    function bnpBitwiseTo(a,op,r) {
-      var i, f, m = Math.min(a.t,this.t);
-      for(i = 0; i < m; ++i) r[i] = op(this[i],a[i]);
-      if(a.t < this.t) {
-        f = a.s&this.DM;
-        for(i = m; i < this.t; ++i) r[i] = op(this[i],f);
-        r.t = this.t;
-      }
-      else {
-        f = this.s&this.DM;
-        for(i = m; i < a.t; ++i) r[i] = op(f,a[i]);
-        r.t = a.t;
-      }
-      r.s = op(this.s,a.s);
-      r.clamp();
-    }
-
-    // (public) this & a
-    function op_and(x,y) { return x&y; }
-    function bnAnd(a) { var r = nbi(); this.bitwiseTo(a,op_and,r); return r; }
-
-    // (public) this | a
-    function op_or(x,y) { return x|y; }
-    function bnOr(a) { var r = nbi(); this.bitwiseTo(a,op_or,r); return r; }
-
-    // (public) this ^ a
-    function op_xor(x,y) { return x^y; }
-    function bnXor(a) { var r = nbi(); this.bitwiseTo(a,op_xor,r); return r; }
-
-    // (public) this & ~a
-    function op_andnot(x,y) { return x&~y; }
-    function bnAndNot(a) { var r = nbi(); this.bitwiseTo(a,op_andnot,r); return r; }
-
-    // (public) ~this
-    function bnNot() {
-      var r = nbi();
-      for(var i = 0; i < this.t; ++i) r[i] = this.DM&~this[i];
-      r.t = this.t;
-      r.s = ~this.s;
-      return r;
-    }
-
-    // (public) this << n
-    function bnShiftLeft(n) {
-      var r = nbi();
-      if(n < 0) this.rShiftTo(-n,r); else this.lShiftTo(n,r);
-      return r;
-    }
-
-    // (public) this >> n
-    function bnShiftRight(n) {
-      var r = nbi();
-      if(n < 0) this.lShiftTo(-n,r); else this.rShiftTo(n,r);
-      return r;
-    }
-
-    // return index of lowest 1-bit in x, x < 2^31
-    function lbit(x) {
-      if(x == 0) return -1;
-      var r = 0;
-      if((x&0xffff) == 0) { x >>= 16; r += 16; }
-      if((x&0xff) == 0) { x >>= 8; r += 8; }
-      if((x&0xf) == 0) { x >>= 4; r += 4; }
-      if((x&3) == 0) { x >>= 2; r += 2; }
-      if((x&1) == 0) ++r;
-      return r;
-    }
-
-    // (public) returns index of lowest 1-bit (or -1 if none)
-    function bnGetLowestSetBit() {
-      for(var i = 0; i < this.t; ++i)
-        if(this[i] != 0) return i*this.DB+lbit(this[i]);
-      if(this.s < 0) return this.t*this.DB;
-      return -1;
-    }
-
-    // return number of 1 bits in x
-    function cbit(x) {
-      var r = 0;
-      while(x != 0) { x &= x-1; ++r; }
-      return r;
-    }
-
-    // (public) return number of set bits
-    function bnBitCount() {
-      var r = 0, x = this.s&this.DM;
-      for(var i = 0; i < this.t; ++i) r += cbit(this[i]^x);
-      return r;
-    }
-
-    // (public) true iff nth bit is set
-    function bnTestBit(n) {
-      var j = Math.floor(n/this.DB);
-      if(j >= this.t) return(this.s!=0);
-      return((this[j]&(1<<(n%this.DB)))!=0);
-    }
-
-    // (protected) this op (1<<n)
-    function bnpChangeBit(n,op) {
-      var r = BigInteger.ONE.shiftLeft(n);
-      this.bitwiseTo(r,op,r);
-      return r;
-    }
-
-    // (public) this | (1<<n)
-    function bnSetBit(n) { return this.changeBit(n,op_or); }
-
-    // (public) this & ~(1<<n)
-    function bnClearBit(n) { return this.changeBit(n,op_andnot); }
-
-    // (public) this ^ (1<<n)
-    function bnFlipBit(n) { return this.changeBit(n,op_xor); }
-
-    // (protected) r = this + a
-    function bnpAddTo(a,r) {
-      var i = 0, c = 0, m = Math.min(a.t,this.t);
-      while(i < m) {
-        c += this[i]+a[i];
-        r[i++] = c&this.DM;
-        c >>= this.DB;
-      }
-      if(a.t < this.t) {
-        c += a.s;
-        while(i < this.t) {
-          c += this[i];
-          r[i++] = c&this.DM;
-          c >>= this.DB;
-        }
-        c += this.s;
-      }
-      else {
-        c += this.s;
-        while(i < a.t) {
-          c += a[i];
-          r[i++] = c&this.DM;
-          c >>= this.DB;
-        }
-        c += a.s;
-      }
-      r.s = (c<0)?-1:0;
-      if(c > 0) r[i++] = c;
-      else if(c < -1) r[i++] = this.DV+c;
-      r.t = i;
-      r.clamp();
-    }
-
-    // (public) this + a
-    function bnAdd(a) { var r = nbi(); this.addTo(a,r); return r; }
-
-    // (public) this - a
-    function bnSubtract(a) { var r = nbi(); this.subTo(a,r); return r; }
-
-    // (public) this * a
-    function bnMultiply(a) { var r = nbi(); this.multiplyTo(a,r); return r; }
-
-    // (public) this^2
-    function bnSquare() { var r = nbi(); this.squareTo(r); return r; }
-
-    // (public) this / a
-    function bnDivide(a) { var r = nbi(); this.divRemTo(a,r,null); return r; }
-
-    // (public) this % a
-    function bnRemainder(a) { var r = nbi(); this.divRemTo(a,null,r); return r; }
-
-    // (public) [this/a,this%a]
-    function bnDivideAndRemainder(a) {
-      var q = nbi(), r = nbi();
-      this.divRemTo(a,q,r);
-      return new Array(q,r);
-    }
-
-    // (protected) this *= n, this >= 0, 1 < n < DV
-    function bnpDMultiply(n) {
-      this[this.t] = this.am(0,n-1,this,0,0,this.t);
-      ++this.t;
-      this.clamp();
-    }
-
-    // (protected) this += n << w words, this >= 0
-    function bnpDAddOffset(n,w) {
-      if(n == 0) return;
-      while(this.t <= w) this[this.t++] = 0;
-      this[w] += n;
-      while(this[w] >= this.DV) {
-        this[w] -= this.DV;
-        if(++w >= this.t) this[this.t++] = 0;
-        ++this[w];
-      }
-    }
-
-    // A "null" reducer
-    function NullExp() {}
-    function nNop(x) { return x; }
-    function nMulTo(x,y,r) { x.multiplyTo(y,r); }
-    function nSqrTo(x,r) { x.squareTo(r); }
-
-    NullExp.prototype.convert = nNop;
-    NullExp.prototype.revert = nNop;
-    NullExp.prototype.mulTo = nMulTo;
-    NullExp.prototype.sqrTo = nSqrTo;
-
-    // (public) this^e
-    function bnPow(e) { return this.exp(e,new NullExp()); }
-
-    // (protected) r = lower n words of "this * a", a.t <= n
-    // "this" should be the larger one if appropriate.
-    function bnpMultiplyLowerTo(a,n,r) {
-      var i = Math.min(this.t+a.t,n);
-      r.s = 0; // assumes a,this >= 0
-      r.t = i;
-      while(i > 0) r[--i] = 0;
-      var j;
-      for(j = r.t-this.t; i < j; ++i) r[i+this.t] = this.am(0,a[i],r,i,0,this.t);
-      for(j = Math.min(a.t,n); i < j; ++i) this.am(0,a[i],r,i,0,n-i);
-      r.clamp();
-    }
-
-    // (protected) r = "this * a" without lower n words, n > 0
-    // "this" should be the larger one if appropriate.
-    function bnpMultiplyUpperTo(a,n,r) {
-      --n;
-      var i = r.t = this.t+a.t-n;
-      r.s = 0; // assumes a,this >= 0
-      while(--i >= 0) r[i] = 0;
-      for(i = Math.max(n-this.t,0); i < a.t; ++i)
-        r[this.t+i-n] = this.am(n-i,a[i],r,0,0,this.t+i-n);
-      r.clamp();
-      r.drShiftTo(1,r);
-    }
-
-    // Barrett modular reduction
-    function Barrett(m) {
-      // setup Barrett
-      this.r2 = nbi();
-      this.q3 = nbi();
-      BigInteger.ONE.dlShiftTo(2*m.t,this.r2);
-      this.mu = this.r2.divide(m);
-      this.m = m;
-    }
-
-    function barrettConvert(x) {
-      if(x.s < 0 || x.t > 2*this.m.t) return x.mod(this.m);
-      else if(x.compareTo(this.m) < 0) return x;
-      else { var r = nbi(); x.copyTo(r); this.reduce(r); return r; }
-    }
-
-    function barrettRevert(x) { return x; }
-
-    // x = x mod m (HAC 14.42)
-    function barrettReduce(x) {
-      x.drShiftTo(this.m.t-1,this.r2);
-      if(x.t > this.m.t+1) { x.t = this.m.t+1; x.clamp(); }
-      this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3);
-      this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);
-      while(x.compareTo(this.r2) < 0) x.dAddOffset(1,this.m.t+1);
-      x.subTo(this.r2,x);
-      while(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
-    }
-
-    // r = x^2 mod m; x != r
-    function barrettSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
-
-    // r = x*y mod m; x,y != r
-    function barrettMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
-
-    Barrett.prototype.convert = barrettConvert;
-    Barrett.prototype.revert = barrettRevert;
-    Barrett.prototype.reduce = barrettReduce;
-    Barrett.prototype.mulTo = barrettMulTo;
-    Barrett.prototype.sqrTo = barrettSqrTo;
-
-    // (public) this^e % m (HAC 14.85)
-    function bnModPow(e,m) {
-      var i = e.bitLength(), k, r = nbv(1), z;
-      if(i <= 0) return r;
-      else if(i < 18) k = 1;
-      else if(i < 48) k = 3;
-      else if(i < 144) k = 4;
-      else if(i < 768) k = 5;
-      else k = 6;
-      if(i < 8)
-        z = new Classic(m);
-      else if(m.isEven())
-        z = new Barrett(m);
-      else
-        z = new Montgomery(m);
-
-      // precomputation
-      var g = new Array(), n = 3, k1 = k-1, km = (1<<k)-1;
-      g[1] = z.convert(this);
-      if(k > 1) {
-        var g2 = nbi();
-        z.sqrTo(g[1],g2);
-        while(n <= km) {
-          g[n] = nbi();
-          z.mulTo(g2,g[n-2],g[n]);
-          n += 2;
-        }
-      }
-
-      var j = e.t-1, w, is1 = true, r2 = nbi(), t;
-      i = nbits(e[j])-1;
-      while(j >= 0) {
-        if(i >= k1) w = (e[j]>>(i-k1))&km;
-        else {
-          w = (e[j]&((1<<(i+1))-1))<<(k1-i);
-          if(j > 0) w |= e[j-1]>>(this.DB+i-k1);
-        }
-
-        n = k;
-        while((w&1) == 0) { w >>= 1; --n; }
-        if((i -= n) < 0) { i += this.DB; --j; }
-        if(is1) {	// ret == 1, don't bother squaring or multiplying it
-          g[w].copyTo(r);
-          is1 = false;
-        }
-        else {
-          while(n > 1) { z.sqrTo(r,r2); z.sqrTo(r2,r); n -= 2; }
-          if(n > 0) z.sqrTo(r,r2); else { t = r; r = r2; r2 = t; }
-          z.mulTo(r2,g[w],r);
-        }
-
-        while(j >= 0 && (e[j]&(1<<i)) == 0) {
-          z.sqrTo(r,r2); t = r; r = r2; r2 = t;
-          if(--i < 0) { i = this.DB-1; --j; }
-        }
-      }
-      return z.revert(r);
-    }
-
-    // (public) gcd(this,a) (HAC 14.54)
-    function bnGCD(a) {
-      var x = (this.s<0)?this.negate():this.clone();
-      var y = (a.s<0)?a.negate():a.clone();
-      if(x.compareTo(y) < 0) { var t = x; x = y; y = t; }
-      var i = x.getLowestSetBit(), g = y.getLowestSetBit();
-      if(g < 0) return x;
-      if(i < g) g = i;
-      if(g > 0) {
-        x.rShiftTo(g,x);
-        y.rShiftTo(g,y);
-      }
-      while(x.signum() > 0) {
-        if((i = x.getLowestSetBit()) > 0) x.rShiftTo(i,x);
-        if((i = y.getLowestSetBit()) > 0) y.rShiftTo(i,y);
-        if(x.compareTo(y) >= 0) {
-          x.subTo(y,x);
-          x.rShiftTo(1,x);
-        }
-        else {
-          y.subTo(x,y);
-          y.rShiftTo(1,y);
-        }
-      }
-      if(g > 0) y.lShiftTo(g,y);
-      return y;
-    }
-
-    // (protected) this % n, n < 2^26
-    function bnpModInt(n) {
-      if(n <= 0) return 0;
-      var d = this.DV%n, r = (this.s<0)?n-1:0;
-      if(this.t > 0)
-        if(d == 0) r = this[0]%n;
-        else for(var i = this.t-1; i >= 0; --i) r = (d*r+this[i])%n;
-      return r;
-    }
-
-    // (public) 1/this % m (HAC 14.61)
-    function bnModInverse(m) {
-      var ac = m.isEven();
-      if((this.isEven() && ac) || m.signum() == 0) return BigInteger.ZERO;
-      var u = m.clone(), v = this.clone();
-      var a = nbv(1), b = nbv(0), c = nbv(0), d = nbv(1);
-      while(u.signum() != 0) {
-        while(u.isEven()) {
-          u.rShiftTo(1,u);
-          if(ac) {
-            if(!a.isEven() || !b.isEven()) { a.addTo(this,a); b.subTo(m,b); }
-            a.rShiftTo(1,a);
-          }
-          else if(!b.isEven()) b.subTo(m,b);
-          b.rShiftTo(1,b);
-        }
-        while(v.isEven()) {
-          v.rShiftTo(1,v);
-          if(ac) {
-            if(!c.isEven() || !d.isEven()) { c.addTo(this,c); d.subTo(m,d); }
-            c.rShiftTo(1,c);
-          }
-          else if(!d.isEven()) d.subTo(m,d);
-          d.rShiftTo(1,d);
-        }
-        if(u.compareTo(v) >= 0) {
-          u.subTo(v,u);
-          if(ac) a.subTo(c,a);
-          b.subTo(d,b);
-        }
-        else {
-          v.subTo(u,v);
-          if(ac) c.subTo(a,c);
-          d.subTo(b,d);
-        }
-      }
-      if(v.compareTo(BigInteger.ONE) != 0) return BigInteger.ZERO;
-      if(d.compareTo(m) >= 0) return d.subtract(m);
-      if(d.signum() < 0) d.addTo(m,d); else return d;
-      if(d.signum() < 0) return d.add(m); else return d;
-    }
-
-    var lowprimes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997];
-    var lplim = (1<<26)/lowprimes[lowprimes.length-1];
-
-    // (public) test primality with certainty >= 1-.5^t
-    function bnIsProbablePrime(t) {
-      var i, x = this.abs();
-      if(x.t == 1 && x[0] <= lowprimes[lowprimes.length-1]) {
-        for(i = 0; i < lowprimes.length; ++i)
-          if(x[0] == lowprimes[i]) return true;
-        return false;
-      }
-      if(x.isEven()) return false;
-      i = 1;
-      while(i < lowprimes.length) {
-        var m = lowprimes[i], j = i+1;
-        while(j < lowprimes.length && m < lplim) m *= lowprimes[j++];
-        m = x.modInt(m);
-        while(i < j) if(m%lowprimes[i++] == 0) return false;
-      }
-      return x.millerRabin(t);
-    }
-
-    // (protected) true if probably prime (HAC 4.24, Miller-Rabin)
-    function bnpMillerRabin(t) {
-      var n1 = this.subtract(BigInteger.ONE);
-      var k = n1.getLowestSetBit();
-      if(k <= 0) return false;
-      var r = n1.shiftRight(k);
-      t = (t+1)>>1;
-      if(t > lowprimes.length) t = lowprimes.length;
-      var a = nbi();
-      for(var i = 0; i < t; ++i) {
-        //Pick bases at random, instead of starting at 2
-        a.fromInt(lowprimes[Math.floor(Math.random()*lowprimes.length)]);
-        var y = a.modPow(r,this);
-        if(y.compareTo(BigInteger.ONE) != 0 && y.compareTo(n1) != 0) {
-          var j = 1;
-          while(j++ < k && y.compareTo(n1) != 0) {
-            y = y.modPowInt(2,this);
-            if(y.compareTo(BigInteger.ONE) == 0) return false;
-          }
-          if(y.compareTo(n1) != 0) return false;
-        }
-      }
-      return true;
-    }
-
-    // protected
-    BigInteger.prototype.chunkSize = bnpChunkSize;
-    BigInteger.prototype.toRadix = bnpToRadix;
-    BigInteger.prototype.fromRadix = bnpFromRadix;
-    BigInteger.prototype.fromNumber = bnpFromNumber;
-    BigInteger.prototype.bitwiseTo = bnpBitwiseTo;
-    BigInteger.prototype.changeBit = bnpChangeBit;
-    BigInteger.prototype.addTo = bnpAddTo;
-    BigInteger.prototype.dMultiply = bnpDMultiply;
-    BigInteger.prototype.dAddOffset = bnpDAddOffset;
-    BigInteger.prototype.multiplyLowerTo = bnpMultiplyLowerTo;
-    BigInteger.prototype.multiplyUpperTo = bnpMultiplyUpperTo;
-    BigInteger.prototype.modInt = bnpModInt;
-    BigInteger.prototype.millerRabin = bnpMillerRabin;
-
-    // public
-    BigInteger.prototype.clone = bnClone;
-    BigInteger.prototype.intValue = bnIntValue;
-    BigInteger.prototype.byteValue = bnByteValue;
-    BigInteger.prototype.shortValue = bnShortValue;
-    BigInteger.prototype.signum = bnSigNum;
-    BigInteger.prototype.toByteArray = bnToByteArray;
-    BigInteger.prototype.equals = bnEquals;
-    BigInteger.prototype.min = bnMin;
-    BigInteger.prototype.max = bnMax;
-    BigInteger.prototype.and = bnAnd;
-    BigInteger.prototype.or = bnOr;
-    BigInteger.prototype.xor = bnXor;
-    BigInteger.prototype.andNot = bnAndNot;
-    BigInteger.prototype.not = bnNot;
-    BigInteger.prototype.shiftLeft = bnShiftLeft;
-    BigInteger.prototype.shiftRight = bnShiftRight;
-    BigInteger.prototype.getLowestSetBit = bnGetLowestSetBit;
-    BigInteger.prototype.bitCount = bnBitCount;
-    BigInteger.prototype.testBit = bnTestBit;
-    BigInteger.prototype.setBit = bnSetBit;
-    BigInteger.prototype.clearBit = bnClearBit;
-    BigInteger.prototype.flipBit = bnFlipBit;
-    BigInteger.prototype.add = bnAdd;
-    BigInteger.prototype.subtract = bnSubtract;
-    BigInteger.prototype.multiply = bnMultiply;
-    BigInteger.prototype.divide = bnDivide;
-    BigInteger.prototype.remainder = bnRemainder;
-    BigInteger.prototype.divideAndRemainder = bnDivideAndRemainder;
-    BigInteger.prototype.modPow = bnModPow;
-    BigInteger.prototype.modInverse = bnModInverse;
-    BigInteger.prototype.pow = bnPow;
-    BigInteger.prototype.gcd = bnGCD;
-    BigInteger.prototype.isProbablePrime = bnIsProbablePrime;
-
-    // JSBN-specific extension
-    BigInteger.prototype.square = bnSquare;
-
-    // Expose the Barrett function
-    BigInteger.prototype.Barrett = Barrett
-
-    // BigInteger interfaces not implemented in jsbn:
-
-    // BigInteger(int signum, byte[] magnitude)
-    // double doubleValue()
-    // float floatValue()
-    // int hashCode()
-    // long longValue()
-    // static BigInteger valueOf(long val)
-
-	// Random number generator - requires a PRNG backend, e.g. prng4.js
-
-	// For best results, put code like
-	// <body onClick='rng_seed_time();' onKeyPress='rng_seed_time();'>
-	// in your main HTML document.
-
-	var rng_state;
-	var rng_pool;
-	var rng_pptr;
-
-	// Mix in a 32-bit integer into the pool
-	function rng_seed_int(x) {
-	  rng_pool[rng_pptr++] ^= x & 255;
-	  rng_pool[rng_pptr++] ^= (x >> 8) & 255;
-	  rng_pool[rng_pptr++] ^= (x >> 16) & 255;
-	  rng_pool[rng_pptr++] ^= (x >> 24) & 255;
-	  if(rng_pptr >= rng_psize) rng_pptr -= rng_psize;
-	}
-
-	// Mix in the current time (w/milliseconds) into the pool
-	function rng_seed_time() {
-	  rng_seed_int(new Date().getTime());
-	}
-
-	// Initialize the pool with junk if needed.
-	if(rng_pool == null) {
-	  rng_pool = new Array();
-	  rng_pptr = 0;
-	  var t;
-	  if(typeof window !== "undefined" && window.crypto) {
-		if (window.crypto.getRandomValues) {
-		  // Use webcrypto if available
-		  var ua = new Uint8Array(32);
-		  window.crypto.getRandomValues(ua);
-		  for(t = 0; t < 32; ++t)
-			rng_pool[rng_pptr++] = ua[t];
-		}
-		else if(navigator.appName == "Netscape" && navigator.appVersion < "5") {
-		  // Extract entropy (256 bits) from NS4 RNG if available
-		  var z = window.crypto.random(32);
-		  for(t = 0; t < z.length; ++t)
-			rng_pool[rng_pptr++] = z.charCodeAt(t) & 255;
-		}
-	  }
-	  while(rng_pptr < rng_psize) {  // extract some randomness from Math.random()
-		t = Math.floor(65536 * Math.random());
-		rng_pool[rng_pptr++] = t >>> 8;
-		rng_pool[rng_pptr++] = t & 255;
-	  }
-	  rng_pptr = 0;
-	  rng_seed_time();
-	  //rng_seed_int(window.screenX);
-	  //rng_seed_int(window.screenY);
-	}
-
-	function rng_get_byte() {
-	  if(rng_state == null) {
-		rng_seed_time();
-		rng_state = prng_newstate();
-		rng_state.init(rng_pool);
-		for(rng_pptr = 0; rng_pptr < rng_pool.length; ++rng_pptr)
-		  rng_pool[rng_pptr] = 0;
-		rng_pptr = 0;
-		//rng_pool = null;
-	  }
-	  // TODO: allow reseeding after first request
-	  return rng_state.next();
-	}
-
-	function rng_get_bytes(ba) {
-	  var i;
-	  for(i = 0; i < ba.length; ++i) ba[i] = rng_get_byte();
-	}
-
-	function SecureRandom() {}
-
-	SecureRandom.prototype.nextBytes = rng_get_bytes;
-
-	// prng4.js - uses Arcfour as a PRNG
-
-	function Arcfour() {
-	  this.i = 0;
-	  this.j = 0;
-	  this.S = new Array();
-	}
-
-	// Initialize arcfour context from key, an array of ints, each from [0..255]
-	function ARC4init(key) {
-	  var i, j, t;
-	  for(i = 0; i < 256; ++i)
-		this.S[i] = i;
-	  j = 0;
-	  for(i = 0; i < 256; ++i) {
-		j = (j + this.S[i] + key[i % key.length]) & 255;
-		t = this.S[i];
-		this.S[i] = this.S[j];
-		this.S[j] = t;
-	  }
-	  this.i = 0;
-	  this.j = 0;
-	}
-
-	function ARC4next() {
-	  var t;
-	  this.i = (this.i + 1) & 255;
-	  this.j = (this.j + this.S[this.i]) & 255;
-	  t = this.S[this.i];
-	  this.S[this.i] = this.S[this.j];
-	  this.S[this.j] = t;
-	  return this.S[(t + this.S[this.i]) & 255];
-	}
-
-	Arcfour.prototype.init = ARC4init;
-	Arcfour.prototype.next = ARC4next;
-
-	// Plug in your RNG constructor here
-	function prng_newstate() {
-	  return new Arcfour();
-	}
-
-	// Pool size must be a multiple of 4 and greater than 32.
-	// An array of bytes the size of the pool will be passed to init()
-	var rng_psize = 256;
-
-  BigInteger.SecureRandom = SecureRandom;
-  BigInteger.BigInteger = BigInteger;
-  if (true) {
-    exports = module.exports = BigInteger;
-  } else {
-    this.BigInteger = BigInteger;
-    this.SecureRandom = SecureRandom;
-  }
-
-}).call(this);
-
-
-/***/ }),
-/* 82 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
-
-var path = { sep: '/' }
-try {
-  path = __webpack_require__(0)
-} catch (er) {}
-
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(229)
-
-var plTypes = {
-  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
-  '?': { open: '(?:', close: ')?' },
-  '+': { open: '(?:', close: ')+' },
-  '*': { open: '(?:', close: ')*' },
-  '@': { open: '(?:', close: ')' }
-}
-
-// any single thing other than /
-// don't need to escape / when using new RegExp()
-var qmark = '[^/]'
-
-// * => any number of characters
-var star = qmark + '*?'
-
-// ** when dots are allowed.  Anything goes, except .. and .
-// not (^ or / followed by one or two dots followed by $ or /),
-// followed by anything, any number of times.
-var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
-
-// not a ^ or / followed by a dot,
-// followed by anything, any number of times.
-var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
-
-// characters that need to be escaped in RegExp.
-var reSpecials = charSet('().*{}+?[]^$\\!')
-
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
-}
-
-// normalizes slashes.
-var slashSplit = /\/+/
-
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
-  }
-}
-
-function ext (a, b) {
-  a = a || {}
-  b = b || {}
-  var t = {}
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k]
-  })
-  Object.keys(a).forEach(function (k) {
-    t[k] = a[k]
-  })
-  return t
-}
-
-minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return minimatch
-
-  var orig = minimatch
-
-  var m = function minimatch (p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options))
-  }
-
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
-  }
-
-  return m
-}
-
-Minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return Minimatch
-  return minimatch.defaults(def).Minimatch
-}
-
-function minimatch (p, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
-
-  if (!options) options = {}
-
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
-  }
-
-  // "" only matches ""
-  if (pattern.trim() === '') return p === ''
-
-  return new Minimatch(pattern, options).match(p)
-}
-
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
-  }
-
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
-
-  if (!options) options = {}
-  pattern = pattern.trim()
-
-  // windows support: need to use /, not \
-  if (path.sep !== '/') {
-    pattern = pattern.split(path.sep).join('/')
-  }
-
-  this.options = options
-  this.set = []
-  this.pattern = pattern
-  this.regexp = null
-  this.negate = false
-  this.comment = false
-  this.empty = false
-
-  // make the set of regexps etc.
-  this.make()
-}
-
-Minimatch.prototype.debug = function () {}
-
-Minimatch.prototype.make = make
-function make () {
-  // don't do it more than once.
-  if (this._made) return
-
-  var pattern = this.pattern
-  var options = this.options
-
-  // empty patterns and comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    this.comment = true
-    return
-  }
-  if (!pattern) {
-    this.empty = true
-    return
-  }
-
-  // step 1: figure out negation, etc.
-  this.parseNegate()
-
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
-
-  if (options.debug) this.debug = console.error
-
-  this.debug(this.pattern, set)
-
-  // step 3: now we have a set, so turn each one into a series of path-portion
-  // matching patterns.
-  // These will be regexps, except in the case of "**", which is
-  // set to the GLOBSTAR object for globstar behavior,
-  // and will not contain any / characters
-  set = this.globParts = set.map(function (s) {
-    return s.split(slashSplit)
-  })
-
-  this.debug(this.pattern, set)
-
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
-
-  this.debug(this.pattern, set)
-
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
-  })
-
-  this.debug(this.pattern, set)
-
-  this.set = set
-}
-
-Minimatch.prototype.parseNegate = parseNegate
-function parseNegate () {
-  var pattern = this.pattern
-  var negate = false
-  var options = this.options
-  var negateOffset = 0
-
-  if (options.nonegate) return
-
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
-  }
-
-  if (negateOffset) this.pattern = pattern.substr(negateOffset)
-  this.negate = negate
-}
-
-// Brace expansion:
-// a{b,c}d -> abd acd
-// a{b,}c -> abc ac
-// a{0..3}d -> a0d a1d a2d a3d
-// a{b,c{d,e}f}g -> abg acdfg acefg
-// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
-//
-// Invalid sets are not expanded.
-// a{2..}b -> a{2..}b
-// a{b}c -> a{b}c
-minimatch.braceExpand = function (pattern, options) {
-  return braceExpand(pattern, options)
-}
-
-Minimatch.prototype.braceExpand = braceExpand
-
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
-    } else {
-      options = {}
-    }
-  }
-
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
-
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern')
-  }
-
-  if (options.nobrace ||
-    !pattern.match(/\{.*\}/)) {
-    // shortcut. no need to expand.
-    return [pattern]
-  }
-
-  return expand(pattern)
-}
-
-// parse a component of the expanded set.
-// At this point, no pattern may contain "/" in it
-// so we're going to return a 2d array, where each entry is the full
-// pattern, split on '/', and then turned into a regular expression.
-// A regexp is made at the end which joins each array with an
-// escaped /, and another full one which joins each regexp with |.
-//
-// Following the lead of Bash 4.1, note that "**" only has special meaning
-// when it is the *only* thing in a path portion.  Otherwise, any series
-// of * is equivalent to a single *.  Globstar behavior is enabled by
-// default, and can be disabled by setting options.noglobstar.
-Minimatch.prototype.parse = parse
-var SUBPARSE = {}
-function parse (pattern, isSub) {
-  if (pattern.length > 1024 * 64) {
-    throw new TypeError('pattern is too long')
-  }
-
-  var options = this.options
-
-  // shortcuts
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR
-  if (pattern === '') return ''
-
-  var re = ''
-  var hasMagic = !!options.nocase
-  var escaping = false
-  // ? => one single character
-  var patternListStack = []
-  var negativeLists = []
-  var stateChar
-  var inClass = false
-  var reClassStart = -1
-  var classStart = -1
-  // . and .. never match anything that doesn't start with .,
-  // even when options.dot is set.
-  var patternStart = pattern.charAt(0) === '.' ? '' // anything
-  // not (start or / followed by . or .. followed by / or end)
-  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
-  : '(?!\\.)'
-  var self = this
-
-  function clearStateChar () {
-    if (stateChar) {
-      // we had some state-tracking character
-      // that wasn't consumed by this pass.
-      switch (stateChar) {
-        case '*':
-          re += star
-          hasMagic = true
-        break
-        case '?':
-          re += qmark
-          hasMagic = true
-        break
-        default:
-          re += '\\' + stateChar
-        break
-      }
-      self.debug('clearStateChar %j %j', stateChar, re)
-      stateChar = false
-    }
-  }
-
-  for (var i = 0, len = pattern.length, c
-    ; (i < len) && (c = pattern.charAt(i))
-    ; i++) {
-    this.debug('%s\t%s %s %j', pattern, i, re, c)
-
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
-    }
-
-    switch (c) {
-      case '/':
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
-
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
-
-      // the various stateChar values
-      // for the "extglob" stuff.
-      case '?':
-      case '*':
-      case '+':
-      case '@':
-      case '!':
-        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
-
-        // all of those are literals inside a class, except that
-        // the glob [!a] means [^a] in regexp
-        if (inClass) {
-          this.debug('  in class')
-          if (c === '!' && i === classStart + 1) c = '^'
-          re += c
-          continue
-        }
-
-        // if we already have a stateChar, then it means
-        // that there was something like ** or +? in there.
-        // Handle the stateChar, then proceed with this one.
-        self.debug('call clearStateChar %j', stateChar)
-        clearStateChar()
-        stateChar = c
-        // if extglob is disabled, then +(asdf|foo) isn't a thing.
-        // just clear the statechar *now*, rather than even diving into
-        // the patternList stuff.
-        if (options.noext) clearStateChar()
-      continue
-
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
-        }
-
-        if (!stateChar) {
-          re += '\\('
-          continue
-        }
-
-        patternListStack.push({
-          type: stateChar,
-          start: i - 1,
-          reStart: re.length,
-          open: plTypes[stateChar].open,
-          close: plTypes[stateChar].close
-        })
-        // negation is (?:(?!js)[^/]*)
-        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
-        this.debug('plType %j %j', stateChar, re)
-        stateChar = false
-      continue
-
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
-        }
-
-        clearStateChar()
-        hasMagic = true
-        var pl = patternListStack.pop()
-        // negation is (?:(?!js)[^/]*)
-        // The others are (?:<pattern>)<type>
-        re += pl.close
-        if (pl.type === '!') {
-          negativeLists.push(pl)
-        }
-        pl.reEnd = re.length
-      continue
-
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
-        }
-
-        clearStateChar()
-        re += '|'
-      continue
-
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
-
-        if (inClass) {
-          re += '\\' + c
-          continue
-        }
-
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
-
-      case ']':
-        //  a right bracket shall lose its special
-        //  meaning and represent itself in
-        //  a bracket expression if it occurs
-        //  first in the list.  -- POSIX.2 2.8.3.2
-        if (i === classStart + 1 || !inClass) {
-          re += '\\' + c
-          escaping = false
-          continue
-        }
-
-        // handle the case where we left a class open.
-        // "[z-a]" is valid, equivalent to "\[z-a\]"
-        if (inClass) {
-          // split where the last [ was, make sure we don't have
-          // an invalid re. if so, re-walk the contents of the
-          // would-be class to re-translate any characters that
-          // were passed through as-is
-          // TODO: It would probably be faster to determine this
-          // without a try/catch and a new RegExp, but it's tricky
-          // to do safely.  For now, this is safe and works.
-          var cs = pattern.substring(classStart + 1, i)
-          try {
-            RegExp('[' + cs + ']')
-          } catch (er) {
-            // not a valid class!
-            var sp = this.parse(cs, SUBPARSE)
-            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
-            hasMagic = hasMagic || sp[1]
-            inClass = false
-            continue
-          }
-        }
-
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
-
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
-
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
-        }
-
-        re += c
-
-    } // switch
-  } // for
-
-  // handle the case where we left a class open.
-  // "[abc" is valid, equivalent to "\[abc"
-  if (inClass) {
-    // split where the last [ was, and escape it
-    // this is a huge pita.  We now have to re-walk
-    // the contents of the would-be class to re-translate
-    // any characters that were passed through as-is
-    cs = pattern.substr(classStart + 1)
-    sp = this.parse(cs, SUBPARSE)
-    re = re.substr(0, reClassStart) + '\\[' + sp[0]
-    hasMagic = hasMagic || sp[1]
-  }
-
-  // handle the case where we had a +( thing at the *end*
-  // of the pattern.
-  // each pattern list stack adds 3 chars, and we need to go through
-  // and escape any | chars that were passed through as-is for the regexp.
-  // Go through and escape them, taking care not to double-escape any
-  // | chars that were already escaped.
-  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
-    var tail = re.slice(pl.reStart + pl.open.length)
-    this.debug('setting tail', re, pl)
-    // maybe some even number of \, then maybe 1 \, followed by a |
-    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
-      if (!$2) {
-        // the | isn't already escaped, so escape it.
-        $2 = '\\'
-      }
-
-      // need to escape all those slashes *again*, without escaping the
-      // one that we need for escaping the | character.  As it works out,
-      // escaping an even number of slashes can be done by simply repeating
-      // it exactly after itself.  That's why this trick works.
-      //
-      // I am sorry that you have to see this.
-      return $1 + $1 + $2 + '|'
-    })
-
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
-
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
-  }
-
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
-  }
-
-  // only need to apply the nodot start if the re starts with
-  // something that could conceivably capture a dot
-  var addPatternStart = false
-  switch (re.charAt(0)) {
-    case '.':
-    case '[':
-    case '(': addPatternStart = true
-  }
-
-  // Hack to work around lack of negative lookbehind in JS
-  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
-  // like 'a.xyz.yz' doesn't match.  So, the first negative
-  // lookahead, has to look ALL the way ahead, to the end of
-  // the pattern.
-  for (var n = negativeLists.length - 1; n > -1; n--) {
-    var nl = negativeLists[n]
-
-    var nlBefore = re.slice(0, nl.reStart)
-    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
-    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
-    var nlAfter = re.slice(nl.reEnd)
-
-    nlLast += nlAfter
-
-    // Handle nested stuff like *(*.js|!(*.json)), where open parens
-    // mean that we should *not* include the ) in the bit that is considered
-    // "after" the negated section.
-    var openParensBefore = nlBefore.split('(').length - 1
-    var cleanAfter = nlAfter
-    for (i = 0; i < openParensBefore; i++) {
-      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
-    }
-    nlAfter = cleanAfter
-
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
-    }
-    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
-    re = newRe
-  }
-
-  // if the re is not "" at this point, then we need to make sure
-  // it doesn't match against an empty path part.
-  // Otherwise a/* will match a/, which it should not.
-  if (re !== '' && hasMagic) {
-    re = '(?=.)' + re
-  }
-
-  if (addPatternStart) {
-    re = patternStart + re
-  }
-
-  // parsing just a piece of a larger pattern.
-  if (isSub === SUBPARSE) {
-    return [re, hasMagic]
-  }
-
-  // skip the regexp for non-magical patterns
-  // unescape anything in it, though, so that it'll be
-  // an exact match against a file etc.
-  if (!hasMagic) {
-    return globUnescape(pattern)
-  }
-
-  var flags = options.nocase ? 'i' : ''
-  try {
-    var regExp = new RegExp('^' + re + '$', flags)
-  } catch (er) {
-    // If it was an invalid regular expression, then it can't match
-    // anything.  This trick looks for a character after the end of
-    // the string, which is of course impossible, except in multi-line
-    // mode, but it's not a /m regex.
-    return new RegExp('$.')
-  }
-
-  regExp._glob = pattern
-  regExp._src = re
-
-  return regExp
-}
-
-minimatch.makeRe = function (pattern, options) {
-  return new Minimatch(pattern, options || {}).makeRe()
-}
-
-Minimatch.prototype.makeRe = makeRe
-function makeRe () {
-  if (this.regexp || this.regexp === false) return this.regexp
-
-  // at this point, this.set is a 2d array of partial
-  // pattern strings, or "**".
-  //
-  // It's better to use .match().  This function shouldn't
-  // be used, really, but it's pretty convenient sometimes,
-  // when you just want to work with a regex.
-  var set = this.set
-
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
-  }
-  var options = this.options
-
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
-
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
-
-  // must match entire pattern
-  // ending in a * or ** will make it less strict.
-  re = '^(?:' + re + ')$'
-
-  // can match anything, as long as it's not this.
-  if (this.negate) re = '^(?!' + re + ').*$'
-
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) {
-    this.regexp = false
-  }
-  return this.regexp
-}
-
-minimatch.match = function (list, pattern, options) {
-  options = options || {}
-  var mm = new Minimatch(pattern, options)
-  list = list.filter(function (f) {
-    return mm.match(f)
-  })
-  if (mm.options.nonull && !list.length) {
-    list.push(pattern)
-  }
-  return list
-}
-
-Minimatch.prototype.match = match
-function match (f, partial) {
-  this.debug('match', f, this.pattern)
-  // short-circuit in the case of busted things.
-  // comments, etc.
-  if (this.comment) return false
-  if (this.empty) return f === ''
-
-  if (f === '/' && partial) return true
-
-  var options = this.options
-
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
-
-  // treat the test path as a set of pathparts.
-  f = f.split(slashSplit)
-  this.debug(this.pattern, 'split', f)
-
-  // just ONE of the pattern sets in this.set needs to match
-  // in order for it to be valid.  If negating, then just one
-  // match means that we have failed.
-  // Either way, return on the first hit.
-
-  var set = this.set
-  this.debug(this.pattern, 'set', set)
-
-  // Find the basename of the path by looking for the last non-empty segment
-  var filename
-  var i
-  for (i = f.length - 1; i >= 0; i--) {
-    filename = f[i]
-    if (filename) break
-  }
-
-  for (i = 0; i < set.length; i++) {
-    var pattern = set[i]
-    var file = f
-    if (options.matchBase && pattern.length === 1) {
-      file = [filename]
-    }
-    var hit = this.matchOne(file, pattern, partial)
-    if (hit) {
-      if (options.flipNegate) return true
-      return !this.negate
-    }
-  }
-
-  // didn't get any hits.  this is success if it's a negative
-  // pattern, failure otherwise.
-  if (options.flipNegate) return false
-  return this.negate
-}
-
-// set partial to true to test if, for example,
-// "/a/b" matches the start of "/*/b/*/d"
-// Partial means, if you run out of file before you run
-// out of pattern, then that's fine, as long as all
-// the parts match.
-Minimatch.prototype.matchOne = function (file, pattern, partial) {
-  var options = this.options
-
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
-
-  this.debug('matchOne', file.length, pattern.length)
-
-  for (var fi = 0,
-      pi = 0,
-      fl = file.length,
-      pl = pattern.length
-      ; (fi < fl) && (pi < pl)
-      ; fi++, pi++) {
-    this.debug('matchOne loop')
-    var p = pattern[pi]
-    var f = file[fi]
-
-    this.debug(pattern, p, f)
-
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    if (p === false) return false
-
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
-
-      // "**"
-      // a/**/b/**/c would match the following:
-      // a/b/x/y/z/c
-      // a/x/y/z/b/c
-      // a/b/x/b/x/c
-      // a/b/c
-      // To do this, take the rest of the pattern after
-      // the **, and see if it would match the file remainder.
-      // If so, return success.
-      // If not, the ** "swallows" a segment, and try again.
-      // This is recursively awful.
-      //
-      // a/**/b/**/c matching a/b/x/y/z/c
-      // - a matches a
-      // - doublestar
-      //   - matchOne(b/x/y/z/c, b/**/c)
-      //     - b matches b
-      //     - doublestar
-      //       - matchOne(x/y/z/c, c) -> no
-      //       - matchOne(y/z/c, c) -> no
-      //       - matchOne(z/c, c) -> no
-      //       - matchOne(c, c) yes, hit
-      var fr = fi
-      var pr = pi + 1
-      if (pr === pl) {
-        this.debug('** at the end')
-        // a ** at the end will just swallow the rest.
-        // We have found a match.
-        // however, it will not swallow /.x, unless
-        // options.dot is set.
-        // . and .. are *never* matched by **, for explosively
-        // exponential reasons.
-        for (; fi < fl; fi++) {
-          if (file[fi] === '.' || file[fi] === '..' ||
-            (!options.dot && file[fi].charAt(0) === '.')) return false
-        }
-        return true
-      }
-
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
-
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
-
-        // XXX remove this slice.  Just pass the start index.
-        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
-          this.debug('globstar found match!', fr, fl, swallowee)
-          // found a match.
-          return true
-        } else {
-          // can't swallow "." or ".." ever.
-          // can only swallow ".foo" when explicitly asked.
-          if (swallowee === '.' || swallowee === '..' ||
-            (!options.dot && swallowee.charAt(0) === '.')) {
-            this.debug('dot detected!', file, fr, pattern, pr)
-            break
-          }
-
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
-        }
-      }
-
-      // no match was found.
-      // However, in partial mode, we can't say this is necessarily over.
-      // If there's more *pattern* left, then
-      if (partial) {
-        // ran out of file
-        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
-        if (fr === fl) return true
-      }
-      return false
-    }
-
-    // something other than **
-    // non-magic patterns just have to match exactly
-    // patterns with magic have been turned into regexps.
-    var hit
-    if (typeof p === 'string') {
-      if (options.nocase) {
-        hit = f.toLowerCase() === p.toLowerCase()
-      } else {
-        hit = f === p
-      }
-      this.debug('string match', p, f, hit)
-    } else {
-      hit = f.match(p)
-      this.debug('pattern match', p, f, hit)
-    }
-
-    if (!hit) return false
-  }
-
-  // Note: ending in / means that we'll get a final ""
-  // at the end of the pattern.  This can only match a
-  // corresponding "" at the end of the file.
-  // If the file ends in /, then it can only match a
-  // a pattern that ends in /, unless the pattern just
-  // doesn't have any more for it. But, a/b/ should *not*
-  // match "a/b/*", even though "" matches against the
-  // [^/]*? pattern, except in partial mode, where it might
-  // simply not be reached yet.
-  // However, a/b/ should still satisfy a/*
-
-  // now either we fell off the end of the pattern, or we're done.
-  if (fi === fl && pi === pl) {
-    // ran out of pattern and filename at the same time.
-    // an exact hit!
-    return true
-  } else if (fi === fl) {
-    // ran out of file, but still had pattern left.
-    // this is ok if we're doing the match as part of
-    // a glob fs traversal.
-    return partial
-  } else if (pi === pl) {
-    // ran out of pattern, still have file left.
-    // this is only acceptable if we're on the very last
-    // empty segment of a file with a trailing slash.
-    // a/* should match a/b/
-    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
-    return emptyFileEnd
-  }
-
-  // should be unreachable.
-  throw new Error('wtf?')
-}
-
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
-}
-
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
-}
-
-
-/***/ }),
-/* 83 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var wrappy = __webpack_require__(161)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
-
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
-
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
-
-function once (fn) {
-  var f = function () {
-    if (f.called) return f.value
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  f.called = false
-  return f
-}
-
-function onceStrict (fn) {
-  var f = function () {
-    if (f.called)
-      throw new Error(f.onceError)
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  var name = fn.name || 'Function wrapped with `once`'
-  f.onceError = name + " shouldn't be called more than once"
-  f.called = false
-  return f
-}
-
-
-/***/ }),
-/* 84 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return InnerSubscriber; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-var InnerSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](InnerSubscriber, _super);
-    function InnerSubscriber(parent, outerValue, outerIndex) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.outerValue = outerValue;
-        _this.outerIndex = outerIndex;
-        _this.index = 0;
-        return _this;
-    }
-    InnerSubscriber.prototype._next = function (value) {
-        this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this);
-    };
-    InnerSubscriber.prototype._error = function (error) {
-        this.parent.notifyError(error, this);
-        this.unsubscribe();
-    };
-    InnerSubscriber.prototype._complete = function () {
-        this.parent.notifyComplete(this);
-        this.unsubscribe();
-    };
-    return InnerSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-
-//# sourceMappingURL=InnerSubscriber.js.map
-
-
-/***/ }),
-/* 85 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = fromArray;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__ = __webpack_require__(447);
-/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToArray PURE_IMPORTS_END */
-
-
-
-function fromArray(input, scheduler) {
-    if (!scheduler) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__["a" /* subscribeToArray */])(input));
-    }
-    else {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-            var i = 0;
-            sub.add(scheduler.schedule(function () {
-                if (i === input.length) {
-                    subscriber.complete();
-                    return;
-                }
-                subscriber.next(input[i++]);
-                if (!subscriber.closed) {
-                    sub.add(this.schedule());
-                }
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromArray.js.map
-
-
-/***/ }),
-/* 86 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var asn1 = __webpack_require__(65);
-var crypto = __webpack_require__(12);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-
-var pkcs1 = __webpack_require__(327);
-var pkcs8 = __webpack_require__(157);
-var sshpriv = __webpack_require__(192);
-var rfc4253 = __webpack_require__(103);
-
-var errors = __webpack_require__(73);
-
-/*
- * For reading we support both PKCS#1 and PKCS#8. If we find a private key,
- * we just take the public component of it and use that.
- */
-function read(buf, options, forceType) {
-	var input = buf;
-	if (typeof (buf) !== 'string') {
-		assert.buffer(buf, 'buf');
-		buf = buf.toString('ascii');
-	}
-
-	var lines = buf.trim().split('\n');
-
-	var m = lines[0].match(/*JSSTYLED*/
-	    /[-]+[ ]*BEGIN ([A-Z0-9][A-Za-z0-9]+ )?(PUBLIC|PRIVATE) KEY[ ]*[-]+/);
-	assert.ok(m, 'invalid PEM header');
-
-	var m2 = lines[lines.length - 1].match(/*JSSTYLED*/
-	    /[-]+[ ]*END ([A-Z0-9][A-Za-z0-9]+ )?(PUBLIC|PRIVATE) KEY[ ]*[-]+/);
-	assert.ok(m2, 'invalid PEM footer');
-
-	/* Begin and end banners must match key type */
-	assert.equal(m[2], m2[2]);
-	var type = m[2].toLowerCase();
-
-	var alg;
-	if (m[1]) {
-		/* They also must match algorithms, if given */
-		assert.equal(m[1], m2[1], 'PEM header and footer mismatch');
-		alg = m[1].trim();
-	}
-
-	var headers = {};
-	while (true) {
-		lines = lines.slice(1);
-		m = lines[0].match(/*JSSTYLED*/
-		    /^([A-Za-z0-9-]+): (.+)$/);
-		if (!m)
-			break;
-		headers[m[1].toLowerCase()] = m[2];
-	}
-
-	var cipher, key, iv;
-	if (headers['proc-type']) {
-		var parts = headers['proc-type'].split(',');
-		if (parts[0] === '4' && parts[1] === 'ENCRYPTED') {
-			if (typeof (options.passphrase) === 'string') {
-				options.passphrase = Buffer.from(
-				    options.passphrase, 'utf-8');
-			}
-			if (!Buffer.isBuffer(options.passphrase)) {
-				throw (new errors.KeyEncryptedError(
-				    options.filename, 'PEM'));
-			} else {
-				parts = headers['dek-info'].split(',');
-				assert.ok(parts.length === 2);
-				cipher = parts[0].toLowerCase();
-				iv = Buffer.from(parts[1], 'hex');
-				key = utils.opensslKeyDeriv(cipher, iv,
-				    options.passphrase, 1).key;
-			}
-		}
-	}
-
-	/* Chop off the first and last lines */
-	lines = lines.slice(0, -1).join('');
-	buf = Buffer.from(lines, 'base64');
-
-	if (cipher && key && iv) {
-		var cipherStream = crypto.createDecipheriv(cipher, key, iv);
-		var chunk, chunks = [];
-		cipherStream.once('error', function (e) {
-			if (e.toString().indexOf('bad decrypt') !== -1) {
-				throw (new Error('Incorrect passphrase ' +
-				    'supplied, could not decrypt key'));
-			}
-			throw (e);
-		});
-		cipherStream.write(buf);
-		cipherStream.end();
-		while ((chunk = cipherStream.read()) !== null)
-			chunks.push(chunk);
-		buf = Buffer.concat(chunks);
-	}
-
-	/* The new OpenSSH internal format abuses PEM headers */
-	if (alg && alg.toLowerCase() === 'openssh')
-		return (sshpriv.readSSHPrivate(type, buf, options));
-	if (alg && alg.toLowerCase() === 'ssh2')
-		return (rfc4253.readType(type, buf, options));
-
-	var der = new asn1.BerReader(buf);
-	der.originalInput = input;
-
-	/*
-	 * All of the PEM file types start with a sequence tag, so chop it
-	 * off here
-	 */
-	der.readSequence();
-
-	/* PKCS#1 type keys name an algorithm in the banner explicitly */
-	if (alg) {
-		if (forceType)
-			assert.strictEqual(forceType, 'pkcs1');
-		return (pkcs1.readPkcs1(alg, type, der));
-	} else {
-		if (forceType)
-			assert.strictEqual(forceType, 'pkcs8');
-		return (pkcs8.readPkcs8(alg, type, der));
-	}
-}
-
-function write(key, options, type) {
-	assert.object(key);
-
-	var alg = {
-	    'ecdsa': 'EC',
-	    'rsa': 'RSA',
-	    'dsa': 'DSA',
-	    'ed25519': 'EdDSA'
-	}[key.type];
-	var header;
-
-	var der = new asn1.BerWriter();
-
-	if (PrivateKey.isPrivateKey(key)) {
-		if (type && type === 'pkcs8') {
-			header = 'PRIVATE KEY';
-			pkcs8.writePkcs8(der, key);
-		} else {
-			if (type)
-				assert.strictEqual(type, 'pkcs1');
-			header = alg + ' PRIVATE KEY';
-			pkcs1.writePkcs1(der, key);
-		}
-
-	} else if (Key.isKey(key)) {
-		if (type && type === 'pkcs1') {
-			header = alg + ' PUBLIC KEY';
-			pkcs1.writePkcs1(der, key);
-		} else {
-			if (type)
-				assert.strictEqual(type, 'pkcs8');
-			header = 'PUBLIC KEY';
-			pkcs8.writePkcs8(der, key);
-		}
-
-	} else {
-		throw (new Error('key is not a Key or PrivateKey'));
-	}
-
-	var tmp = der.buffer.toString('base64');
-	var len = tmp.length + (tmp.length / 64) +
-	    18 + 16 + header.length*2 + 10;
-	var buf = Buffer.alloc(len);
-	var o = 0;
-	o += buf.write('-----BEGIN ' + header + '-----\n', o);
-	for (var i = 0; i < tmp.length; ) {
-		var limit = i + 64;
-		if (limit > tmp.length)
-			limit = tmp.length;
-		o += buf.write(tmp.slice(i, limit), o);
-		buf[o++] = 10;
-		i = limit;
-	}
-	o += buf.write('-----END ' + header + '-----\n', o);
-
-	return (buf.slice(0, o));
-}
-
-
-/***/ }),
-/* 87 */
-/***/ (function(module, exports) {
-
-module.exports = require("http");
-
-/***/ }),
-/* 88 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SCOPE_SEPARATOR = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _npmResolver;
-
-function _load_npmResolver() {
-  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
-}
-
-var _envReplace;
-
-function _load_envReplace() {
-  return _envReplace = _interopRequireDefault(__webpack_require__(577));
-}
-
-var _baseRegistry;
-
-function _load_baseRegistry() {
-  return _baseRegistry = _interopRequireDefault(__webpack_require__(558));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _path;
-
-function _load_path() {
-  return _path = __webpack_require__(377);
-}
-
-var _normalizeUrl;
-
-function _load_normalizeUrl() {
-  return _normalizeUrl = _interopRequireDefault(__webpack_require__(402));
-}
-
-var _userHomeDir;
-
-function _load_userHomeDir() {
-  return _userHomeDir = _interopRequireDefault(__webpack_require__(66));
-}
-
-var _userHomeDir2;
-
-function _load_userHomeDir2() {
-  return _userHomeDir2 = __webpack_require__(66);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _login;
-
-function _load_login() {
-  return _login = __webpack_require__(107);
-}
-
-var _path2;
-
-function _load_path2() {
-  return _path2 = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _url;
-
-function _load_url() {
-  return _url = _interopRequireDefault(__webpack_require__(24));
-}
-
-var _ini;
-
-function _load_ini() {
-  return _ini = _interopRequireDefault(__webpack_require__(684));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const DEFAULT_REGISTRY = 'https://registry.npmjs.org/';
-const REGEX_REGISTRY_ENFORCED_HTTPS = /^https?:\/\/([^\/]+\.)?(yarnpkg\.com|npmjs\.(org|com))(\/|$)/;
-const REGEX_REGISTRY_HTTP_PROTOCOL = /^https?:/i;
-const REGEX_REGISTRY_PREFIX = /^(https?:)?\/\//i;
-const REGEX_REGISTRY_SUFFIX = /registry\/?$/;
-
-const SCOPE_SEPARATOR = exports.SCOPE_SEPARATOR = '%2f';
-// All scoped package names are of the format `@scope%2fpkg` from the use of NpmRegistry.escapeName
-// `(?:^|\/)` Match either the start of the string or a `/` but don't capture
-// `[^\/?]+?` Match any character that is not '/' or '?' and capture, up until the first occurrence of:
-// `(?=%2f|\/)` Match SCOPE_SEPARATOR, the escaped '/', or a raw `/` and don't capture
-// The reason for matching a plain `/` is NPM registry being inconsistent about escaping `/` in
-// scoped package names: when you're fetching a tarball, it is not escaped, when you want info
-// about the package, it is escaped.
-const SCOPED_PKG_REGEXP = /(?:^|\/)(@[^\/?]+?)(?=%2f|\/)/;
-
-// TODO: Use the method from src/cli/commands/global.js for this instead
-function getGlobalPrefix() {
-  if (process.env.PREFIX) {
-    return process.env.PREFIX;
-  } else if (process.platform === 'win32') {
-    // c:\node\node.exe --> prefix=c:\node\
-    return (_path2 || _load_path2()).default.dirname(process.execPath);
-  } else {
-    // /usr/local/bin/node --> prefix=/usr/local
-    let prefix = (_path2 || _load_path2()).default.dirname((_path2 || _load_path2()).default.dirname(process.execPath));
-
-    // destdir only is respected on Unix
-    if (process.env.DESTDIR) {
-      prefix = (_path2 || _load_path2()).default.join(process.env.DESTDIR, prefix);
-    }
-
-    return prefix;
-  }
-}
-
-const PATH_CONFIG_OPTIONS = new Set(['cache', 'cafile', 'prefix', 'userconfig']);
-
-function isPathConfigOption(key) {
-  return PATH_CONFIG_OPTIONS.has(key);
-}
-
-function normalizePath(val) {
-  if (val === undefined) {
-    return undefined;
-  }
-
-  if (typeof val !== 'string') {
-    val = String(val);
-  }
-
-  return (0, (_path || _load_path()).resolveWithHome)(val);
-}
-
-function urlParts(requestUrl) {
-  const normalizedUrl = (0, (_normalizeUrl || _load_normalizeUrl()).default)(requestUrl);
-  const parsed = (_url || _load_url()).default.parse(normalizedUrl);
-  const host = parsed.host || '';
-  const path = parsed.path || '';
-  return { host, path };
-}
-
-class NpmRegistry extends (_baseRegistry || _load_baseRegistry()).default {
-  constructor(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles) {
-    super(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles);
-    this.folder = 'node_modules';
-  }
-
-  static escapeName(name) {
-    // scoped packages contain slashes and the npm registry expects them to be escaped
-    return name.replace('/', SCOPE_SEPARATOR);
-  }
-
-  isScopedPackage(packageIdent) {
-    return SCOPED_PKG_REGEXP.test(packageIdent);
-  }
-
-  getRequestUrl(registry, pathname) {
-    let resolved = pathname;
-
-    if (!REGEX_REGISTRY_PREFIX.test(pathname)) {
-      resolved = (_url || _load_url()).default.resolve((0, (_misc || _load_misc()).addSuffix)(registry, '/'), pathname);
-    }
-
-    if (REGEX_REGISTRY_ENFORCED_HTTPS.test(resolved)) {
-      resolved = resolved.replace(/^http:\/\//, 'https://');
-    }
-
-    return resolved;
-  }
-
-  isRequestToRegistry(requestUrl, registryUrl) {
-    const request = urlParts(requestUrl);
-    const registry = urlParts(registryUrl);
-    const customHostSuffix = this.getRegistryOrGlobalOption(registryUrl, 'custom-host-suffix');
-
-    const requestToRegistryHost = request.host === registry.host;
-    const requestToYarn = (_constants || _load_constants()).YARN_REGISTRY.includes(request.host) && DEFAULT_REGISTRY.includes(registry.host);
-    const requestToRegistryPath = request.path.startsWith(registry.path);
-    // For some registries, the package path does not prefix with the registry path
-    const customHostSuffixInUse = typeof customHostSuffix === 'string' && request.host.endsWith(customHostSuffix);
-
-    return (requestToRegistryHost || requestToYarn) && (requestToRegistryPath || customHostSuffixInUse);
-  }
-
-  request(pathname, opts = {}, packageName) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // packageName needs to be escaped when if it is passed
-      const packageIdent = packageName && NpmRegistry.escapeName(packageName) || pathname;
-      const registry = opts.registry || _this.getRegistry(packageIdent);
-      const requestUrl = _this.getRequestUrl(registry, pathname);
-
-      const alwaysAuth = _this.getRegistryOrGlobalOption(registry, 'always-auth');
-
-      const headers = (0, (_extends2 || _load_extends()).default)({
-        Accept:
-        // This is to use less bandwidth unless we really need to get the full response.
-        // See https://github.com/npm/npm-registry-client#requests
-        opts.unfiltered ? 'application/json' : 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*'
-      }, opts.headers);
-
-      const isToRegistry = _this.isRequestToRegistry(requestUrl, registry) || _this.requestNeedsAuth(requestUrl);
-
-      // this.token must be checked to account for publish requests on non-scoped packages
-      if (_this.token || isToRegistry && (alwaysAuth || _this.isScopedPackage(packageIdent))) {
-        const authorization = _this.getAuth(packageIdent);
-        if (authorization) {
-          headers.authorization = authorization;
-        }
-      }
-
-      if (_this.otp) {
-        headers['npm-otp'] = _this.otp;
-      }
-
-      try {
-        return yield _this.requestManager.request({
-          url: requestUrl,
-          method: opts.method,
-          body: opts.body,
-          auth: opts.auth,
-          headers,
-          json: !opts.buffer,
-          buffer: opts.buffer,
-          process: opts.process,
-          gzip: true
-        });
-      } catch (error) {
-        if (error instanceof (_errors || _load_errors()).OneTimePasswordError) {
-          if (_this.otp) {
-            throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('incorrectOneTimePassword'));
-          }
-
-          _this.reporter.info(_this.reporter.lang('twoFactorAuthenticationEnabled'));
-          _this.otp = yield (0, (_login || _load_login()).getOneTimePassword)(_this.reporter);
-
-          _this.requestManager.clearCache();
-
-          return _this.request(pathname, opts, packageName);
-        } else {
-          throw error;
-        }
-      }
-    })();
-  }
-
-  requestNeedsAuth(requestUrl) {
-    const config = this.config;
-    const requestParts = urlParts(requestUrl);
-    return !!Object.keys(config).find(option => {
-      const parts = option.split(':');
-      if (parts.length === 2 && parts[1] === '_authToken' || parts[1] === '_password') {
-        const registryParts = urlParts(parts[0]);
-        if (requestParts.host === registryParts.host && requestParts.path.startsWith(registryParts.path)) {
-          return true;
-        }
-      }
-      return false;
-    });
-  }
-
-  checkOutdated(config, name, range) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const escapedName = NpmRegistry.escapeName(name);
-      const req = yield _this2.request(escapedName, { unfiltered: true });
-      if (!req) {
-        throw new Error(`couldn't find ${name}`);
-      }
-
-      // By default use top level 'repository' and 'homepage' values
-      let repository = req.repository,
-          homepage = req.homepage;
-
-      const wantedPkg = yield (_npmResolver || _load_npmResolver()).default.findVersionInRegistryResponse(config, escapedName, range, req);
-
-      // But some local repositories like Verdaccio do not return 'repository' nor 'homepage'
-      // in top level data structure, so we fallback to wanted package manifest
-      if (!repository && !homepage) {
-        repository = wantedPkg.repository;
-        homepage = wantedPkg.homepage;
-      }
-
-      let latest = req['dist-tags'].latest;
-      // In certain cases, registries do not return a 'latest' tag.
-      if (!latest) {
-        latest = wantedPkg.version;
-      }
-
-      const url = homepage || repository && repository.url || '';
-
-      return {
-        latest,
-        wanted: wantedPkg.version,
-        url
-      };
-    })();
-  }
-
-  getPossibleConfigLocations(filename, reporter) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let possibles = [];
-
-      for (var _iterator = _this3.extraneousRcFiles.slice().reverse(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const rcFile = _ref;
-
-        possibles.push([false, (_path2 || _load_path2()).default.resolve(process.cwd(), rcFile)]);
-      }
-
-      if (_this3.enableDefaultRc) {
-        // npmrc --> ./.npmrc, ~/.npmrc, ${prefix}/etc/npmrc
-        const localfile = '.' + filename;
-        possibles = possibles.concat([[false, (_path2 || _load_path2()).default.join(_this3.cwd, localfile)], [true, _this3.config.userconfig || (_path2 || _load_path2()).default.join((_userHomeDir || _load_userHomeDir()).default, localfile)], [false, (_path2 || _load_path2()).default.join(getGlobalPrefix(), 'etc', filename)]]);
-
-        // When home directory for global install is different from where $HOME/npmrc is stored,
-        // E.g. /usr/local/share vs /root on linux machines, check the additional location
-        if ((_userHomeDir2 || _load_userHomeDir2()).home !== (_userHomeDir || _load_userHomeDir()).default) {
-          possibles.push([true, (_path2 || _load_path2()).default.join((_userHomeDir2 || _load_userHomeDir2()).home, localfile)]);
-        }
-
-        // npmrc --> ../.npmrc, ../../.npmrc, etc.
-        const foldersFromRootToCwd = (0, (_path || _load_path()).getPosixPath)(_this3.cwd).split('/');
-        while (foldersFromRootToCwd.length > 1) {
-          possibles.push([false, (_path2 || _load_path2()).default.join(foldersFromRootToCwd.join((_path2 || _load_path2()).default.sep), localfile)]);
-          foldersFromRootToCwd.pop();
-        }
-      }
-
-      const actuals = [];
-      for (var _iterator2 = possibles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const _ref2 = _ref3;
-        const isHome = _ref2[0];
-        const loc = _ref2[1];
-
-        reporter.verbose(reporter.lang('configPossibleFile', loc));
-        if (yield (_fs || _load_fs()).exists(loc)) {
-          reporter.verbose(reporter.lang('configFileFound', loc));
-          actuals.push([isHome, loc, yield (_fs || _load_fs()).readFile(loc)]);
-        }
-      }
-
-      return actuals;
-    })();
-  }
-
-  static getConfigEnv(env = process.env) {
-    // To match NPM's behavior, HOME is always the user's home directory.
-    const overrideEnv = {
-      HOME: (_userHomeDir2 || _load_userHomeDir2()).home
-    };
-    return Object.assign({}, env, overrideEnv);
-  }
-
-  static normalizeConfig(config) {
-    const env = NpmRegistry.getConfigEnv();
-    config = (_baseRegistry || _load_baseRegistry()).default.normalizeConfig(config);
-
-    for (const key in config) {
-      config[key] = (0, (_envReplace || _load_envReplace()).default)(config[key], env);
-      if (isPathConfigOption(key)) {
-        config[key] = normalizePath(config[key]);
-      }
-    }
-
-    return config;
-  }
-
-  loadConfig() {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // docs: https://docs.npmjs.com/misc/config
-      _this4.mergeEnv('npm_config_');
-
-      for (var _iterator3 = yield _this4.getPossibleConfigLocations('npmrc', _this4.reporter), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref5;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref5 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref5 = _i3.value;
-        }
-
-        const _ref4 = _ref5;
-        const loc = _ref4[1];
-        const file = _ref4[2];
-
-        const config = NpmRegistry.normalizeConfig((_ini || _load_ini()).default.parse(file));
-
-        // normalize offline mirror path relative to the current npmrc
-        const offlineLoc = config['yarn-offline-mirror'];
-        // don't normalize if we already have a mirror path
-        if (!_this4.config['yarn-offline-mirror'] && offlineLoc) {
-          const mirrorLoc = config['yarn-offline-mirror'] = (_path2 || _load_path2()).default.resolve((_path2 || _load_path2()).default.dirname(loc), offlineLoc);
-          yield (_fs || _load_fs()).mkdirp(mirrorLoc);
-        }
-
-        _this4.config = Object.assign({}, config, _this4.config);
-      }
-    })();
-  }
-
-  getScope(packageIdent) {
-    const match = packageIdent.match(SCOPED_PKG_REGEXP);
-    return match && match[1] || '';
-  }
-
-  getRegistry(packageIdent) {
-    // Try extracting registry from the url, then scoped registry, and default registry
-    if (packageIdent.match(REGEX_REGISTRY_PREFIX)) {
-      const availableRegistries = this.getAvailableRegistries();
-      const registry = availableRegistries.find(registry => packageIdent.startsWith(registry));
-      if (registry) {
-        return String(registry);
-      }
-    }
-
-    var _arr = [this.getScope(packageIdent), ''];
-    for (var _i4 = 0; _i4 < _arr.length; _i4++) {
-      const scope = _arr[_i4];
-      const registry = this.getScopedOption(scope, 'registry') || this.registries.yarn.getScopedOption(scope, 'registry');
-      if (registry) {
-        return String(registry);
-      }
-    }
-
-    return DEFAULT_REGISTRY;
-  }
-
-  getAuthByRegistry(registry) {
-    // Check for bearer token.
-    const authToken = this.getRegistryOrGlobalOption(registry, '_authToken');
-    if (authToken) {
-      return `Bearer ${String(authToken)}`;
-    }
-
-    // Check for basic auth token.
-    const auth = this.getRegistryOrGlobalOption(registry, '_auth');
-    if (auth) {
-      return `Basic ${String(auth)}`;
-    }
-
-    // Check for basic username/password auth.
-    const username = this.getRegistryOrGlobalOption(registry, 'username');
-    const password = this.getRegistryOrGlobalOption(registry, '_password');
-    if (username && password) {
-      const pw = Buffer.from(String(password), 'base64').toString();
-      return 'Basic ' + Buffer.from(String(username) + ':' + pw).toString('base64');
-    }
-
-    return '';
-  }
-
-  getAuth(packageIdent) {
-    if (this.token) {
-      return this.token;
-    }
-
-    const baseRegistry = this.getRegistry(packageIdent);
-    const registries = [baseRegistry];
-
-    // If sending a request to the Yarn registry, we must also send it the auth token for the npm registry
-    if (baseRegistry === (_constants || _load_constants()).YARN_REGISTRY) {
-      registries.push(DEFAULT_REGISTRY);
-    }
-
-    for (var _iterator4 = registries, _isArray4 = Array.isArray(_iterator4), _i5 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref6;
-
-      if (_isArray4) {
-        if (_i5 >= _iterator4.length) break;
-        _ref6 = _iterator4[_i5++];
-      } else {
-        _i5 = _iterator4.next();
-        if (_i5.done) break;
-        _ref6 = _i5.value;
-      }
-
-      const registry = _ref6;
-
-      const auth = this.getAuthByRegistry(registry);
-
-      if (auth) {
-        return auth;
-      }
-    }
-
-    return '';
-  }
-
-  getScopedOption(scope, option) {
-    return this.getOption(scope + (scope ? ':' : '') + option);
-  }
-
-  getRegistryOption(registry, option) {
-    const pre = REGEX_REGISTRY_HTTP_PROTOCOL;
-    const suf = REGEX_REGISTRY_SUFFIX;
-
-    // When registry is used config scope, the trailing '/' is required
-    const reg = (0, (_misc || _load_misc()).addSuffix)(registry, '/');
-
-    // 1st attempt, try to get option for the given registry URL
-    // 2nd attempt, remove the 'https?:' prefix of the registry URL
-    // 3nd attempt, remove the 'registry/?' suffix of the registry URL
-    return this.getScopedOption(reg, option) || pre.test(reg) && this.getRegistryOption(reg.replace(pre, ''), option) || suf.test(reg) && this.getRegistryOption(reg.replace(suf, ''), option);
-  }
-
-  getRegistryOrGlobalOption(registry, option) {
-    return this.getRegistryOption(registry, option) || this.getOption(option);
-  }
-}
-exports.default = NpmRegistry;
-NpmRegistry.filename = 'package.json';
-
-/***/ }),
-/* 89 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _baseResolver;
-
-function _load_baseResolver() {
-  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class ExoticResolver extends (_baseResolver || _load_baseResolver()).default {
-
-  static isVersion(pattern) {
-    const proto = this.protocol;
-    if (proto) {
-      return pattern.startsWith(`${proto}:`);
-    } else {
-      throw new Error('No protocol specified');
-    }
-  }
-}
-exports.default = ExoticResolver;
-
-/***/ }),
-/* 90 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-const semver = __webpack_require__(21);
-
-class WorkspaceLayout {
-  constructor(workspaces, config) {
-    this.workspaces = workspaces;
-    this.config = config;
-  }
-
-  getWorkspaceManifest(key) {
-    return this.workspaces[key];
-  }
-
-  getManifestByPattern(pattern) {
-    var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern);
-
-    const name = _normalizePattern.name,
-          range = _normalizePattern.range;
-
-    const workspace = this.getWorkspaceManifest(name);
-    if (!workspace || !semver.satisfies(workspace.manifest.version, range, this.config.looseSemver)) {
-      return null;
-    }
-    return workspace;
-  }
-}
-exports.default = WorkspaceLayout;
-
-/***/ }),
-/* 91 */
-/***/ (function(module, exports) {
-
-// 7.2.1 RequireObjectCoercible(argument)
-module.exports = function (it) {
-  if (it == undefined) throw TypeError("Can't call method on  " + it);
-  return it;
-};
-
-
-/***/ }),
-/* 92 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isObject = __webpack_require__(52);
-var document = __webpack_require__(17).document;
-// typeof document.createElement is 'object' in old IE
-var is = isObject(document) && isObject(document.createElement);
-module.exports = function (it) {
-  return is ? document.createElement(it) : {};
-};
-
-
-/***/ }),
-/* 93 */
-/***/ (function(module, exports) {
-
-module.exports = true;
-
-
-/***/ }),
-/* 94 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-// 25.4.1.5 NewPromiseCapability(C)
-var aFunction = __webpack_require__(67);
-
-function PromiseCapability(C) {
-  var resolve, reject;
-  this.promise = new C(function ($$resolve, $$reject) {
-    if (resolve !== undefined || reject !== undefined) throw TypeError('Bad Promise constructor');
-    resolve = $$resolve;
-    reject = $$reject;
-  });
-  this.resolve = aFunction(resolve);
-  this.reject = aFunction(reject);
-}
-
-module.exports.f = function (C) {
-  return new PromiseCapability(C);
-};
-
-
-/***/ }),
-/* 95 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var def = __webpack_require__(71).f;
-var has = __webpack_require__(70);
-var TAG = __webpack_require__(20)('toStringTag');
-
-module.exports = function (it, tag, stat) {
-  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
-};
-
-
-/***/ }),
-/* 96 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var shared = __webpack_require__(133)('keys');
-var uid = __webpack_require__(137);
-module.exports = function (key) {
-  return shared[key] || (shared[key] = uid(key));
-};
-
-
-/***/ }),
-/* 97 */
-/***/ (function(module, exports) {
-
-// 7.1.4 ToInteger
-var ceil = Math.ceil;
-var floor = Math.floor;
-module.exports = function (it) {
-  return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
-};
-
-
-/***/ }),
-/* 98 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// to indexed object, toObject with fallback for non-array-like ES3 strings
-var IObject = __webpack_require__(170);
-var defined = __webpack_require__(91);
-module.exports = function (it) {
-  return IObject(defined(it));
-};
-
-
-/***/ }),
-/* 99 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Approach:
-//
-// 1. Get the minimatch set
-// 2. For each pattern in the set, PROCESS(pattern, false)
-// 3. Store matches per-set, then uniq them
-//
-// PROCESS(pattern, inGlobStar)
-// Get the first [n] items from pattern that are all strings
-// Join these together.  This is PREFIX.
-//   If there is no more remaining, then stat(PREFIX) and
-//   add to matches if it succeeds.  END.
-//
-// If inGlobStar and PREFIX is symlink and points to dir
-//   set ENTRIES = []
-// else readdir(PREFIX) as ENTRIES
-//   If fail, END
-//
-// with ENTRIES
-//   If pattern[n] is GLOBSTAR
-//     // handle the case where the globstar match is empty
-//     // by pruning it out, and testing the resulting pattern
-//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
-//     // handle other cases.
-//     for ENTRY in ENTRIES (not dotfiles)
-//       // attach globstar + tail onto the entry
-//       // Mark that this entry is a globstar match
-//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
-//
-//   else // not globstar
-//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
-//       Test ENTRY against pattern[n]
-//       If fails, continue
-//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
-//
-// Caveat:
-//   Cache all stats and readdirs results to minimize syscall.  Since all
-//   we ever care about is existence and directory-ness, we can just keep
-//   `true` for files, and [children,...] for directories, or `false` for
-//   things that don't exist.
-
-module.exports = glob
-
-var fs = __webpack_require__(5)
-var rp = __webpack_require__(140)
-var minimatch = __webpack_require__(82)
-var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(61)
-var EE = __webpack_require__(76).EventEmitter
-var path = __webpack_require__(0)
-var assert = __webpack_require__(28)
-var isAbsolute = __webpack_require__(101)
-var globSync = __webpack_require__(272)
-var common = __webpack_require__(141)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
-var setopts = common.setopts
-var ownProp = common.ownProp
-var inflight = __webpack_require__(274)
-var util = __webpack_require__(3)
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
-
-var once = __webpack_require__(83)
-
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
-
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
-  }
-
-  return new Glob(pattern, options, cb)
-}
-
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
-
-// old api surface
-glob.glob = glob
-
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
-  }
-
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
-  }
-  return origin
-}
-
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
-
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
-
-  if (!pattern)
-    return false
-
-  if (set.length > 1)
-    return true
-
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
-  }
-
-  return false
-}
-
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
-  }
-
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
-  }
-
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
-
-  setopts(this, pattern, options)
-  this._didRealPath = false
-
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
-
-  // The matches are stored as {<filename>: true,...} so that
-  // duplicates are automagically pruned.
-  // Later, we do an Object.keys() on these.
-  // Keep them as a list so we can fill in when nonull is set.
-  this.matches = new Array(n)
-
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
-  }
-
-  var self = this
-  this._processing = 0
-
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
-
-  if (this.noprocess)
-    return this
-
-  if (n === 0)
-    return done()
-
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
-  }
-  sync = false
-
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
-      } else {
-        self._finish()
-      }
-    }
-  }
-}
-
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
-
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
-
-  common.finish(this)
-  this.emit('end', this.found)
-}
-
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
-
-  this._didRealpath = true
-
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
-
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
-
-  function next () {
-    if (--n === 0)
-      self._finish()
-  }
-}
-
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
-
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
-
-  if (n === 0)
-    return cb()
-
-  var set = this.matches[index] = Object.create(null)
-  found.forEach(function (p, i) {
-    // If there's a problem with the stat, then it means that
-    // one or more of the links in the realpath couldn't be
-    // resolved.  just return the abs value in that case.
-    p = self._makeAbs(p)
-    rp.realpath(p, self.realpathCache, function (er, real) {
-      if (!er)
-        set[real] = true
-      else if (er.syscall === 'stat')
-        set[p] = true
-      else
-        self.emit('error', er) // srsly wtf right here
-
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
-      }
-    })
-  })
-}
-
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
-
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
-
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
-
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
-  }
-}
-
-Glob.prototype.resume = function () {
-  if (this.paused) {
-    this.emit('resume')
-    this.paused = false
-    if (this._emitQueue.length) {
-      var eq = this._emitQueue.slice(0)
-      this._emitQueue.length = 0
-      for (var i = 0; i < eq.length; i ++) {
-        var e = eq[i]
-        this._emitMatch(e[0], e[1])
-      }
-    }
-    if (this._processQueue.length) {
-      var pq = this._processQueue.slice(0)
-      this._processQueue.length = 0
-      for (var i = 0; i < pq.length; i ++) {
-        var p = pq[i]
-        this._processing--
-        this._process(p[0], p[1], p[2], p[3])
-      }
-    }
-  }
-}
-
-Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
-  assert(this instanceof Glob)
-  assert(typeof cb === 'function')
-
-  if (this.aborted)
-    return
-
-  this._processing++
-  if (this.paused) {
-    this._processQueue.push([pattern, index, inGlobStar, cb])
-    return
-  }
-
-  //console.error('PROCESS %d', this._processing, pattern)
-
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
-  }
-  // now n is the index of the first one that is *not* a string.
-
-  // see if there's anything else
-  var prefix
-  switch (n) {
-    // if not, then this is rather simple
-    case pattern.length:
-      this._processSimple(pattern.join('/'), index, cb)
-      return
-
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
-
-    default:
-      // pattern has some string bits in the front.
-      // whatever it starts with, whether that's 'absolute' like /foo/bar,
-      // or 'relative' like '../baz'
-      prefix = pattern.slice(0, n).join('/')
-      break
-  }
-
-  var remain = pattern.slice(n)
-
-  // get the list of entries.
-  var read
-  if (prefix === null)
-    read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
-    if (!prefix || !isAbsolute(prefix))
-      prefix = '/' + prefix
-    read = prefix
-  } else
-    read = prefix
-
-  var abs = this._makeAbs(read)
-
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
-
-  var isGlobStar = remain[0] === minimatch.GLOBSTAR
-  if (isGlobStar)
-    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
-  else
-    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
-}
-
-Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
-  var self = this
-  this._readdir(abs, inGlobStar, function (er, entries) {
-    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
-  })
-}
-
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
-
-  // It will only match dot entries if it starts with a dot, or if
-  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
-  var pn = remain[0]
-  var negate = !!this.minimatch.negate
-  var rawGlob = pn._glob
-  var dotOk = this.dot || rawGlob.charAt(0) === '.'
-
-  var matchedEntries = []
-  for (var i = 0; i < entries.length; i++) {
-    var e = entries[i]
-    if (e.charAt(0) !== '.' || dotOk) {
-      var m
-      if (negate && !prefix) {
-        m = !e.match(pn)
-      } else {
-        m = e.match(pn)
-      }
-      if (m)
-        matchedEntries.push(e)
-    }
-  }
-
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
-
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
-
-  // if this is the last remaining pattern bit, then no need for
-  // an additional stat *unless* the user has specified mark or
-  // stat explicitly.  We know they exist, since readdir returned
-  // them.
-
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
-
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
-
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
-    }
-    // This was the last one, and no stats were needed
-    return cb()
-  }
-
-  // now test all matched entries as stand-ins for that part
-  // of the pattern.
-  remain.shift()
-  for (var i = 0; i < len; i ++) {
-    var e = matchedEntries[i]
-    var newPattern
-    if (prefix) {
-      if (prefix !== '/')
-        e = prefix + '/' + e
-      else
-        e = prefix + e
-    }
-    this._process([e].concat(remain), index, inGlobStar, cb)
-  }
-  cb()
-}
-
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
-
-  if (isIgnored(this, e))
-    return
-
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
-  }
-
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
-
-  if (this.mark)
-    e = this._mark(e)
-
-  if (this.absolute)
-    e = abs
-
-  if (this.matches[index][e])
-    return
-
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
-
-  this.matches[index][e] = true
-
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
-
-  this.emit('match', e)
-}
-
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
-
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false, cb)
-
-  var lstatkey = 'lstat\0' + abs
-  var self = this
-  var lstatcb = inflight(lstatkey, lstatcb_)
-
-  if (lstatcb)
-    fs.lstat(abs, lstatcb)
-
-  function lstatcb_ (er, lstat) {
-    if (er && er.code === 'ENOENT')
-      return cb()
-
-    var isSym = lstat && lstat.isSymbolicLink()
-    self.symlinks[abs] = isSym
-
-    // If it's not a symlink or a dir, then it's definitely a regular file.
-    // don't bother doing a readdir in that case.
-    if (!isSym && lstat && !lstat.isDirectory()) {
-      self.cache[abs] = 'FILE'
-      cb()
-    } else
-      self._readdir(abs, false, cb)
-  }
-}
-
-Glob.prototype._readdir = function (abs, inGlobStar, cb) {
-  if (this.aborted)
-    return
-
-  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
-  if (!cb)
-    return
-
-  //console.error('RD %j %j', +inGlobStar, abs)
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs, cb)
-
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return cb()
-
-    if (Array.isArray(c))
-      return cb(null, c)
-  }
-
-  var self = this
-  fs.readdir(abs, readdirCb(this, abs, cb))
-}
-
-function readdirCb (self, abs, cb) {
-  return function (er, entries) {
-    if (er)
-      self._readdirError(abs, er, cb)
-    else
-      self._readdirEntries(abs, entries, cb)
-  }
-}
-
-Glob.prototype._readdirEntries = function (abs, entries, cb) {
-  if (this.aborted)
-    return
-
-  // if we haven't asked to stat everything, then just
-  // assume that everything in there exists, so we can avoid
-  // having to stat it a second time.
-  if (!this.mark && !this.stat) {
-    for (var i = 0; i < entries.length; i ++) {
-      var e = entries[i]
-      if (abs === '/')
-        e = abs + e
-      else
-        e = abs + '/' + e
-      this.cache[e] = true
-    }
-  }
-
-  this.cache[abs] = entries
-  return cb(null, entries)
-}
-
-Glob.prototype._readdirError = function (f, er, cb) {
-  if (this.aborted)
-    return
-
-  // handle errors, and cache the information
-  switch (er.code) {
-    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
-    case 'ENOTDIR': // totally normal. means it *does* exist.
-      var abs = this._makeAbs(f)
-      this.cache[abs] = 'FILE'
-      if (abs === this.cwdAbs) {
-        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
-        error.path = this.cwd
-        error.code = er.code
-        this.emit('error', error)
-        this.abort()
-      }
-      break
-
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
-
-    default: // some unusual error.  Treat as failure.
-      this.cache[this._makeAbs(f)] = false
-      if (this.strict) {
-        this.emit('error', er)
-        // If the error is handled, then we abort
-        // if not, we threw out of here
-        this.abort()
-      }
-      if (!this.silent)
-        console.error('glob error', er)
-      break
-  }
-
-  return cb()
-}
-
-Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
-  var self = this
-  this._readdir(abs, inGlobStar, function (er, entries) {
-    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
-  })
-}
-
-
-Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-  //console.error('pgs2', prefix, remain[0], entries)
-
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return cb()
-
-  // test without the globstar, and with every child both below
-  // and replacing the globstar.
-  var remainWithoutGlobStar = remain.slice(1)
-  var gspref = prefix ? [ prefix ] : []
-  var noGlobStar = gspref.concat(remainWithoutGlobStar)
-
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false, cb)
-
-  var isSym = this.symlinks[abs]
-  var len = entries.length
-
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return cb()
-
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
-
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true, cb)
-
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true, cb)
-  }
-
-  cb()
-}
-
-Glob.prototype._processSimple = function (prefix, index, cb) {
-  // XXX review this.  Shouldn't it be doing the mounting etc
-  // before doing stat?  kinda weird?
-  var self = this
-  this._stat(prefix, function (er, exists) {
-    self._processSimple2(prefix, index, er, exists, cb)
-  })
-}
-Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
-
-  //console.error('ps2', prefix, exists)
-
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
-
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return cb()
-
-  if (prefix && isAbsolute(prefix) && !this.nomount) {
-    var trail = /[\/\\]$/.test(prefix)
-    if (prefix.charAt(0) === '/') {
-      prefix = path.join(this.root, prefix)
-    } else {
-      prefix = path.resolve(this.root, prefix)
-      if (trail)
-        prefix += '/'
-    }
-  }
-
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
-
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-  cb()
-}
-
-// Returns either 'DIR', 'FILE', or false
-Glob.prototype._stat = function (f, cb) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
-
-  if (f.length > this.maxLength)
-    return cb()
-
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-
-    if (Array.isArray(c))
-      c = 'DIR'
-
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return cb(null, c)
-
-    if (needDir && c === 'FILE')
-      return cb()
-
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
-
-  var exists
-  var stat = this.statCache[abs]
-  if (stat !== undefined) {
-    if (stat === false)
-      return cb(null, stat)
-    else {
-      var type = stat.isDirectory() ? 'DIR' : 'FILE'
-      if (needDir && type === 'FILE')
-        return cb()
-      else
-        return cb(null, type, stat)
-    }
-  }
-
-  var self = this
-  var statcb = inflight('stat\0' + abs, lstatcb_)
-  if (statcb)
-    fs.lstat(abs, statcb)
-
-  function lstatcb_ (er, lstat) {
-    if (lstat && lstat.isSymbolicLink()) {
-      // If it's a symlink, then treat it as the target, unless
-      // the target does not exist, then treat it as a file.
-      return fs.stat(abs, function (er, stat) {
-        if (er)
-          self._stat2(f, abs, null, lstat, cb)
-        else
-          self._stat2(f, abs, er, stat, cb)
-      })
-    } else {
-      self._stat2(f, abs, er, lstat, cb)
-    }
-  }
-}
-
-Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
-  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-    this.statCache[abs] = false
-    return cb()
-  }
-
-  var needDir = f.slice(-1) === '/'
-  this.statCache[abs] = stat
-
-  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
-    return cb(null, false, stat)
-
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-  this.cache[abs] = this.cache[abs] || c
-
-  if (needDir && c === 'FILE')
-    return cb()
-
-  return cb(null, c, stat)
-}
-
-
-/***/ }),
-/* 100 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Standard YAML's Failsafe schema.
-// http://www.yaml.org/spec/1.2/spec.html#id2802346
-
-
-
-
-
-var Schema = __webpack_require__(44);
-
-
-module.exports = new Schema({
-  explicit: [
-    __webpack_require__(298),
-    __webpack_require__(296),
-    __webpack_require__(291)
-  ]
-});
-
-
-/***/ }),
-/* 101 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function posix(path) {
-	return path.charAt(0) === '/';
-}
-
-function win32(path) {
-	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
-	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
-	var result = splitDeviceRe.exec(path);
-	var device = result[1] || '';
-	var isUnc = Boolean(device && device.charAt(1) !== ':');
-
-	// UNC paths are always absolute
-	return Boolean(result[2] || isUnc);
-}
-
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
-
-
-/***/ }),
-/* 102 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(23);
-if (process.env.READABLE_STREAM === 'disable' && Stream) {
-  module.exports = Stream;
-  exports = module.exports = Stream.Readable;
-  exports.Readable = Stream.Readable;
-  exports.Writable = Stream.Writable;
-  exports.Duplex = Stream.Duplex;
-  exports.Transform = Stream.Transform;
-  exports.PassThrough = Stream.PassThrough;
-  exports.Stream = Stream;
-} else {
-  exports = module.exports = __webpack_require__(406);
-  exports.Stream = Stream || exports;
-  exports.Readable = exports;
-  exports.Writable = __webpack_require__(408);
-  exports.Duplex = __webpack_require__(115);
-  exports.Transform = __webpack_require__(407);
-  exports.PassThrough = __webpack_require__(792);
-}
-
-
-/***/ }),
-/* 103 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read.bind(undefined, false, undefined),
-	readType: read.bind(undefined, false),
-	write: write,
-	/* semi-private api, used by sshpk-agent */
-	readPartial: read.bind(undefined, true),
-
-	/* shared with ssh format */
-	readInternal: read,
-	keyTypeToAlg: keyTypeToAlg,
-	algToKeyType: algToKeyType
-};
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var SSHBuffer = __webpack_require__(159);
-
-function algToKeyType(alg) {
-	assert.string(alg);
-	if (alg === 'ssh-dss')
-		return ('dsa');
-	else if (alg === 'ssh-rsa')
-		return ('rsa');
-	else if (alg === 'ssh-ed25519')
-		return ('ed25519');
-	else if (alg === 'ssh-curve25519')
-		return ('curve25519');
-	else if (alg.match(/^ecdsa-sha2-/))
-		return ('ecdsa');
-	else
-		throw (new Error('Unknown algorithm ' + alg));
-}
-
-function keyTypeToAlg(key) {
-	assert.object(key);
-	if (key.type === 'dsa')
-		return ('ssh-dss');
-	else if (key.type === 'rsa')
-		return ('ssh-rsa');
-	else if (key.type === 'ed25519')
-		return ('ssh-ed25519');
-	else if (key.type === 'curve25519')
-		return ('ssh-curve25519');
-	else if (key.type === 'ecdsa')
-		return ('ecdsa-sha2-' + key.part.curve.data.toString());
-	else
-		throw (new Error('Unknown key type ' + key.type));
-}
-
-function read(partial, type, buf, options) {
-	if (typeof (buf) === 'string')
-		buf = Buffer.from(buf);
-	assert.buffer(buf, 'buf');
-
-	var key = {};
-
-	var parts = key.parts = [];
-	var sshbuf = new SSHBuffer({buffer: buf});
-
-	var alg = sshbuf.readString();
-	assert.ok(!sshbuf.atEnd(), 'key must have at least one part');
-
-	key.type = algToKeyType(alg);
-
-	var partCount = algs.info[key.type].parts.length;
-	if (type && type === 'private')
-		partCount = algs.privInfo[key.type].parts.length;
-
-	while (!sshbuf.atEnd() && parts.length < partCount)
-		parts.push(sshbuf.readPart());
-	while (!partial && !sshbuf.atEnd())
-		parts.push(sshbuf.readPart());
-
-	assert.ok(parts.length >= 1,
-	    'key must have at least one part');
-	assert.ok(partial || sshbuf.atEnd(),
-	    'leftover bytes at end of key');
-
-	var Constructor = Key;
-	var algInfo = algs.info[key.type];
-	if (type === 'private' || algInfo.parts.length !== parts.length) {
-		algInfo = algs.privInfo[key.type];
-		Constructor = PrivateKey;
-	}
-	assert.strictEqual(algInfo.parts.length, parts.length);
-
-	if (key.type === 'ecdsa') {
-		var res = /^ecdsa-sha2-(.+)$/.exec(alg);
-		assert.ok(res !== null);
-		assert.strictEqual(res[1], parts[0].data.toString());
-	}
-
-	var normalized = true;
-	for (var i = 0; i < algInfo.parts.length; ++i) {
-		var p = parts[i];
-		p.name = algInfo.parts[i];
-		/*
-		 * OpenSSH stores ed25519 "private" keys as seed + public key
-		 * concat'd together (k followed by A). We want to keep them
-		 * separate for other formats that don't do this.
-		 */
-		if (key.type === 'ed25519' && p.name === 'k')
-			p.data = p.data.slice(0, 32);
-
-		if (p.name !== 'curve' && algInfo.normalize !== false) {
-			var nd;
-			if (key.type === 'ed25519') {
-				nd = utils.zeroPadToLength(p.data, 32);
-			} else {
-				nd = utils.mpNormalize(p.data);
-			}
-			if (nd.toString('binary') !==
-			    p.data.toString('binary')) {
-				p.data = nd;
-				normalized = false;
-			}
-		}
-	}
-
-	if (normalized)
-		key._rfc4253Cache = sshbuf.toBuffer();
-
-	if (partial && typeof (partial) === 'object') {
-		partial.remainder = sshbuf.remainder();
-		partial.consumed = sshbuf._offset;
-	}
-
-	return (new Constructor(key));
-}
-
-function write(key, options) {
-	assert.object(key);
-
-	var alg = keyTypeToAlg(key);
-	var i;
-
-	var algInfo = algs.info[key.type];
-	if (PrivateKey.isPrivateKey(key))
-		algInfo = algs.privInfo[key.type];
-	var parts = algInfo.parts;
-
-	var buf = new SSHBuffer({});
-
-	buf.writeString(alg);
-
-	for (i = 0; i < parts.length; ++i) {
-		var data = key.part[parts[i]].data;
-		if (algInfo.normalize !== false) {
-			if (key.type === 'ed25519')
-				data = utils.zeroPadToLength(data, 32);
-			else
-				data = utils.mpNormalize(data);
-		}
-		if (key.type === 'ed25519' && parts[i] === 'k')
-			data = Buffer.concat([data, key.part.A.data]);
-		buf.writeBuffer(data);
-	}
-
-	return (buf.toBuffer());
-}
-
-
-/***/ }),
-/* 104 */
-/***/ (function(module, exports) {
-
-module.exports = require("tty");
-
-/***/ }),
-/* 105 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-exports.default = function (str, fileLoc = 'lockfile') {
-  str = (0, (_stripBom || _load_stripBom()).default)(str);
-  return hasMergeConflicts(str) ? parseWithConflict(str, fileLoc) : { type: 'success', object: parse(str, fileLoc) };
-};
-
-var _util;
-
-function _load_util() {
-  return _util = _interopRequireDefault(__webpack_require__(3));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _stripBom;
-
-function _load_stripBom() {
-  return _stripBom = _interopRequireDefault(__webpack_require__(160));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint quotes: 0 */
-
-var _require = __webpack_require__(279);
-
-const safeLoad = _require.safeLoad,
-      FAILSAFE_SCHEMA = _require.FAILSAFE_SCHEMA;
-
-
-const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
-
-const TOKEN_TYPES = {
-  boolean: 'BOOLEAN',
-  string: 'STRING',
-  identifier: 'IDENTIFIER',
-  eof: 'EOF',
-  colon: 'COLON',
-  newline: 'NEWLINE',
-  comment: 'COMMENT',
-  indent: 'INDENT',
-  invalid: 'INVALID',
-  number: 'NUMBER',
-  comma: 'COMMA'
-};
-
-const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
-
-function isValidPropValueToken(token) {
-  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
-}
-
-function* tokenise(input) {
-  let lastNewline = false;
-  let line = 1;
-  let col = 0;
-
-  function buildToken(type, value) {
-    return { line, col, type, value };
-  }
-
-  while (input.length) {
-    let chop = 0;
-
-    if (input[0] === '\n' || input[0] === '\r') {
-      chop++;
-      // If this is a \r\n line, ignore both chars but only add one new line
-      if (input[1] === '\n') {
-        chop++;
-      }
-      line++;
-      col = 0;
-      yield buildToken(TOKEN_TYPES.newline);
-    } else if (input[0] === '#') {
-      chop++;
-
-      let nextNewline = input.indexOf('\n', chop);
-      if (nextNewline === -1) {
-        nextNewline = input.length;
-      }
-      const val = input.substring(chop, nextNewline);
-      chop = nextNewline;
-      yield buildToken(TOKEN_TYPES.comment, val);
-    } else if (input[0] === ' ') {
-      if (lastNewline) {
-        let indentSize = 1;
-        for (let i = 1; input[i] === ' '; i++) {
-          indentSize++;
-        }
-
-        if (indentSize % 2) {
-          throw new TypeError('Invalid number of spaces');
-        } else {
-          chop = indentSize;
-          yield buildToken(TOKEN_TYPES.indent, indentSize / 2);
-        }
-      } else {
-        chop++;
-      }
-    } else if (input[0] === '"') {
-      let i = 1;
-      for (; i < input.length; i++) {
-        if (input[i] === '"') {
-          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
-          if (!isEscaped) {
-            i++;
-            break;
-          }
-        }
-      }
-      const val = input.substring(0, i);
-
-      chop = i;
-
-      try {
-        yield buildToken(TOKEN_TYPES.string, JSON.parse(val));
-      } catch (err) {
-        if (err instanceof SyntaxError) {
-          yield buildToken(TOKEN_TYPES.invalid);
-        } else {
-          throw err;
-        }
-      }
-    } else if (/^[0-9]/.test(input)) {
-      const val = /^[0-9]+/.exec(input)[0];
-      chop = val.length;
-
-      yield buildToken(TOKEN_TYPES.number, +val);
-    } else if (/^true/.test(input)) {
-      yield buildToken(TOKEN_TYPES.boolean, true);
-      chop = 4;
-    } else if (/^false/.test(input)) {
-      yield buildToken(TOKEN_TYPES.boolean, false);
-      chop = 5;
-    } else if (input[0] === ':') {
-      yield buildToken(TOKEN_TYPES.colon);
-      chop++;
-    } else if (input[0] === ',') {
-      yield buildToken(TOKEN_TYPES.comma);
-      chop++;
-    } else if (/^[a-zA-Z\/.-]/g.test(input)) {
-      let i = 0;
-      for (; i < input.length; i++) {
-        const char = input[i];
-        if (char === ':' || char === ' ' || char === '\n' || char === '\r' || char === ',') {
-          break;
-        }
-      }
-      const name = input.substring(0, i);
-      chop = i;
-
-      yield buildToken(TOKEN_TYPES.string, name);
-    } else {
-      yield buildToken(TOKEN_TYPES.invalid);
-    }
-
-    if (!chop) {
-      // will trigger infinite recursion
-      yield buildToken(TOKEN_TYPES.invalid);
-    }
-
-    col += chop;
-    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
-    input = input.slice(chop);
-  }
-
-  yield buildToken(TOKEN_TYPES.eof);
-}
-
-class Parser {
-  constructor(input, fileLoc = 'lockfile') {
-    this.comments = [];
-    this.tokens = tokenise(input);
-    this.fileLoc = fileLoc;
-  }
-
-  onComment(token) {
-    const value = token.value;
-    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
-
-    const comment = value.trim();
-
-    const versionMatch = comment.match(VERSION_REGEX);
-    if (versionMatch) {
-      const version = +versionMatch[1];
-      if (version > (_constants || _load_constants()).LOCKFILE_VERSION) {
-        throw new (_errors || _load_errors()).MessageError(`Can't install from a lockfile of version ${version} as you're on an old yarn version that only supports ` + `versions up to ${(_constants || _load_constants()).LOCKFILE_VERSION}. Run \`$ yarn self-update\` to upgrade to the latest version.`);
-      }
-    }
-
-    this.comments.push(comment);
-  }
-
-  next() {
-    const item = this.tokens.next();
-    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
-
-    const done = item.done,
-          value = item.value;
-
-    if (done || !value) {
-      throw new Error('No more tokens');
-    } else if (value.type === TOKEN_TYPES.comment) {
-      this.onComment(value);
-      return this.next();
-    } else {
-      return this.token = value;
-    }
-  }
-
-  unexpected(msg = 'Unexpected token') {
-    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
-  }
-
-  expect(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
-    } else {
-      this.unexpected();
-    }
-  }
-
-  eat(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  parse(indent = 0) {
-    const obj = (0, (_map || _load_map()).default)();
-
-    while (true) {
-      const propToken = this.token;
-
-      if (propToken.type === TOKEN_TYPES.newline) {
-        const nextToken = this.next();
-        if (!indent) {
-          // if we have 0 indentation then the next token doesn't matter
-          continue;
-        }
-
-        if (nextToken.type !== TOKEN_TYPES.indent) {
-          // if we have no indentation after a newline then we've gone down a level
-          break;
-        }
-
-        if (nextToken.value === indent) {
-          // all is good, the indent is on our level
-          this.next();
-        } else {
-          // the indentation is less than our level
-          break;
-        }
-      } else if (propToken.type === TOKEN_TYPES.indent) {
-        if (propToken.value === indent) {
-          this.next();
-        } else {
-          break;
-        }
-      } else if (propToken.type === TOKEN_TYPES.eof) {
-        break;
-      } else if (propToken.type === TOKEN_TYPES.string) {
-        // property key
-        const key = propToken.value;
-        (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
-
-        const keys = [key];
-        this.next();
-
-        // support multiple keys
-        while (this.token.type === TOKEN_TYPES.comma) {
-          this.next(); // skip comma
-
-          const keyToken = this.token;
-          if (keyToken.type !== TOKEN_TYPES.string) {
-            this.unexpected('Expected string');
-          }
-
-          const key = keyToken.value;
-          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
-          keys.push(key);
-          this.next();
-        }
-
-        const wasColon = this.token.type === TOKEN_TYPES.colon;
-        if (wasColon) {
-          this.next();
-        }
-
-        if (isValidPropValueToken(this.token)) {
-          // plain value
-          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-            var _ref;
-
-            if (_isArray) {
-              if (_i >= _iterator.length) break;
-              _ref = _iterator[_i++];
-            } else {
-              _i = _iterator.next();
-              if (_i.done) break;
-              _ref = _i.value;
-            }
-
-            const key = _ref;
-
-            obj[key] = this.token.value;
-          }
-
-          this.next();
-        } else if (wasColon) {
-          // parse object
-          const val = this.parse(indent + 1);
-
-          for (var _iterator2 = keys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-            var _ref2;
-
-            if (_isArray2) {
-              if (_i2 >= _iterator2.length) break;
-              _ref2 = _iterator2[_i2++];
-            } else {
-              _i2 = _iterator2.next();
-              if (_i2.done) break;
-              _ref2 = _i2.value;
-            }
-
-            const key = _ref2;
-
-            obj[key] = val;
-          }
-
-          if (indent && this.token.type !== TOKEN_TYPES.indent) {
-            break;
-          }
-        } else {
-          this.unexpected('Invalid value type');
-        }
-      } else {
-        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
-      }
-    }
-
-    return obj;
-  }
-}
-
-const MERGE_CONFLICT_ANCESTOR = '|||||||';
-const MERGE_CONFLICT_END = '>>>>>>>';
-const MERGE_CONFLICT_SEP = '=======';
-const MERGE_CONFLICT_START = '<<<<<<<';
-
-/**
- * Extract the two versions of the lockfile from a merge conflict.
- */
-function extractConflictVariants(str) {
-  const variants = [[], []];
-  const lines = str.split(/\r?\n/g);
-  let skip = false;
-
-  while (lines.length) {
-    const line = lines.shift();
-    if (line.startsWith(MERGE_CONFLICT_START)) {
-      // get the first variant
-      while (lines.length) {
-        const conflictLine = lines.shift();
-        if (conflictLine === MERGE_CONFLICT_SEP) {
-          skip = false;
-          break;
-        } else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
-          skip = true;
-          continue;
-        } else {
-          variants[0].push(conflictLine);
-        }
-      }
-
-      // get the second variant
-      while (lines.length) {
-        const conflictLine = lines.shift();
-        if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
-          break;
-        } else {
-          variants[1].push(conflictLine);
-        }
-      }
-    } else {
-      variants[0].push(line);
-      variants[1].push(line);
-    }
-  }
-
-  return [variants[0].join('\n'), variants[1].join('\n')];
-}
-
-/**
- * Check if a lockfile has merge conflicts.
- */
-function hasMergeConflicts(str) {
-  return str.includes(MERGE_CONFLICT_START) && str.includes(MERGE_CONFLICT_SEP) && str.includes(MERGE_CONFLICT_END);
-}
-
-/**
- * Parse the lockfile.
- */
-function parse(str, fileLoc) {
-  const parser = new Parser(str, fileLoc);
-  parser.next();
-  try {
-    return parser.parse();
-  } catch (error1) {
-    try {
-      return safeLoad(str, {
-        schema: FAILSAFE_SCHEMA
-      });
-    } catch (error2) {
-      throw error1;
-    }
-  }
-}
-
-/**
- * Parse and merge the two variants in a conflicted lockfile.
- */
-function parseWithConflict(str, fileLoc) {
-  const variants = extractConflictVariants(str);
-  try {
-    return { type: 'merge', object: Object.assign({}, parse(variants[0], fileLoc), parse(variants[1], fileLoc)) };
-  } catch (err) {
-    if (err instanceof SyntaxError) {
-      return { type: 'conflict', object: {} };
-    } else {
-      throw err;
-    }
-  }
-}
-
-/***/ }),
-/* 106 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-module.exports = {
-  copy: copy,
-  checkDataType: checkDataType,
-  checkDataTypes: checkDataTypes,
-  coerceToTypes: coerceToTypes,
-  toHash: toHash,
-  getProperty: getProperty,
-  escapeQuotes: escapeQuotes,
-  equal: __webpack_require__(204),
-  ucs2length: __webpack_require__(480),
-  varOccurences: varOccurences,
-  varReplace: varReplace,
-  cleanUpCode: cleanUpCode,
-  finalCleanUpCode: finalCleanUpCode,
-  schemaHasRules: schemaHasRules,
-  schemaHasRulesExcept: schemaHasRulesExcept,
-  toQuotedString: toQuotedString,
-  getPathExpr: getPathExpr,
-  getPath: getPath,
-  getData: getData,
-  unescapeFragment: unescapeFragment,
-  unescapeJsonPointer: unescapeJsonPointer,
-  escapeFragment: escapeFragment,
-  escapeJsonPointer: escapeJsonPointer
-};
-
-
-function copy(o, to) {
-  to = to || {};
-  for (var key in o) to[key] = o[key];
-  return to;
-}
-
-
-function checkDataType(dataType, data, negate) {
-  var EQUAL = negate ? ' !== ' : ' === '
-    , AND = negate ? ' || ' : ' && '
-    , OK = negate ? '!' : ''
-    , NOT = negate ? '' : '!';
-  switch (dataType) {
-    case 'null': return data + EQUAL + 'null';
-    case 'array': return OK + 'Array.isArray(' + data + ')';
-    case 'object': return '(' + OK + data + AND +
-                          'typeof ' + data + EQUAL + '"object"' + AND +
-                          NOT + 'Array.isArray(' + data + '))';
-    case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
-                           NOT + '(' + data + ' % 1)' +
-                           AND + data + EQUAL + data + ')';
-    default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
-  }
-}
-
-
-function checkDataTypes(dataTypes, data) {
-  switch (dataTypes.length) {
-    case 1: return checkDataType(dataTypes[0], data, true);
-    default:
-      var code = '';
-      var types = toHash(dataTypes);
-      if (types.array && types.object) {
-        code = types.null ? '(': '(!' + data + ' || ';
-        code += 'typeof ' + data + ' !== "object")';
-        delete types.null;
-        delete types.array;
-        delete types.object;
-      }
-      if (types.number) delete types.integer;
-      for (var t in types)
-        code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
-
-      return code;
-  }
-}
-
-
-var COERCE_TO_TYPES = toHash([ 'string', 'number', 'integer', 'boolean', 'null' ]);
-function coerceToTypes(optionCoerceTypes, dataTypes) {
-  if (Array.isArray(dataTypes)) {
-    var types = [];
-    for (var i=0; i<dataTypes.length; i++) {
-      var t = dataTypes[i];
-      if (COERCE_TO_TYPES[t]) types[types.length] = t;
-      else if (optionCoerceTypes === 'array' && t === 'array') types[types.length] = t;
-    }
-    if (types.length) return types;
-  } else if (COERCE_TO_TYPES[dataTypes]) {
-    return [dataTypes];
-  } else if (optionCoerceTypes === 'array' && dataTypes === 'array') {
-    return ['array'];
-  }
-}
-
-
-function toHash(arr) {
-  var hash = {};
-  for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
-  return hash;
-}
-
-
-var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
-var SINGLE_QUOTE = /'|\\/g;
-function getProperty(key) {
-  return typeof key == 'number'
-          ? '[' + key + ']'
-          : IDENTIFIER.test(key)
-            ? '.' + key
-            : "['" + escapeQuotes(key) + "']";
-}
-
-
-function escapeQuotes(str) {
-  return str.replace(SINGLE_QUOTE, '\\$&')
-            .replace(/\n/g, '\\n')
-            .replace(/\r/g, '\\r')
-            .replace(/\f/g, '\\f')
-            .replace(/\t/g, '\\t');
-}
-
-
-function varOccurences(str, dataVar) {
-  dataVar += '[^0-9]';
-  var matches = str.match(new RegExp(dataVar, 'g'));
-  return matches ? matches.length : 0;
-}
-
-
-function varReplace(str, dataVar, expr) {
-  dataVar += '([^0-9])';
-  expr = expr.replace(/\$/g, '$$$$');
-  return str.replace(new RegExp(dataVar, 'g'), expr + '$1');
-}
-
-
-var EMPTY_ELSE = /else\s*{\s*}/g
-  , EMPTY_IF_NO_ELSE = /if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g
-  , EMPTY_IF_WITH_ELSE = /if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;
-function cleanUpCode(out) {
-  return out.replace(EMPTY_ELSE, '')
-            .replace(EMPTY_IF_NO_ELSE, '')
-            .replace(EMPTY_IF_WITH_ELSE, 'if (!($1))');
-}
-
-
-var ERRORS_REGEXP = /[^v.]errors/g
-  , REMOVE_ERRORS = /var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g
-  , REMOVE_ERRORS_ASYNC = /var errors = 0;|var vErrors = null;/g
-  , RETURN_VALID = 'return errors === 0;'
-  , RETURN_TRUE = 'validate.errors = null; return true;'
-  , RETURN_ASYNC = /if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/
-  , RETURN_DATA_ASYNC = 'return data;'
-  , ROOTDATA_REGEXP = /[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g
-  , REMOVE_ROOTDATA = /if \(rootData === undefined\) rootData = data;/;
-
-function finalCleanUpCode(out, async) {
-  var matches = out.match(ERRORS_REGEXP);
-  if (matches && matches.length == 2) {
-    out = async
-          ? out.replace(REMOVE_ERRORS_ASYNC, '')
-               .replace(RETURN_ASYNC, RETURN_DATA_ASYNC)
-          : out.replace(REMOVE_ERRORS, '')
-               .replace(RETURN_VALID, RETURN_TRUE);
-  }
-
-  matches = out.match(ROOTDATA_REGEXP);
-  if (!matches || matches.length !== 3) return out;
-  return out.replace(REMOVE_ROOTDATA, '');
-}
-
-
-function schemaHasRules(schema, rules) {
-  if (typeof schema == 'boolean') return !schema;
-  for (var key in schema) if (rules[key]) return true;
-}
-
-
-function schemaHasRulesExcept(schema, rules, exceptKeyword) {
-  if (typeof schema == 'boolean') return !schema && exceptKeyword != 'not';
-  for (var key in schema) if (key != exceptKeyword && rules[key]) return true;
-}
-
-
-function toQuotedString(str) {
-  return '\'' + escapeQuotes(str) + '\'';
-}
-
-
-function getPathExpr(currentPath, expr, jsonPointers, isNumber) {
-  var path = jsonPointers // false by default
-              ? '\'/\' + ' + expr + (isNumber ? '' : '.replace(/~/g, \'~0\').replace(/\\//g, \'~1\')')
-              : (isNumber ? '\'[\' + ' + expr + ' + \']\'' : '\'[\\\'\' + ' + expr + ' + \'\\\']\'');
-  return joinPaths(currentPath, path);
-}
-
-
-function getPath(currentPath, prop, jsonPointers) {
-  var path = jsonPointers // false by default
-              ? toQuotedString('/' + escapeJsonPointer(prop))
-              : toQuotedString(getProperty(prop));
-  return joinPaths(currentPath, path);
-}
-
-
-var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
-var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
-function getData($data, lvl, paths) {
-  var up, jsonPointer, data, matches;
-  if ($data === '') return 'rootData';
-  if ($data[0] == '/') {
-    if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
-    jsonPointer = $data;
-    data = 'rootData';
-  } else {
-    matches = $data.match(RELATIVE_JSON_POINTER);
-    if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
-    up = +matches[1];
-    jsonPointer = matches[2];
-    if (jsonPointer == '#') {
-      if (up >= lvl) throw new Error('Cannot access property/index ' + up + ' levels up, current level is ' + lvl);
-      return paths[lvl - up];
-    }
-
-    if (up > lvl) throw new Error('Cannot access data ' + up + ' levels up, current level is ' + lvl);
-    data = 'data' + ((lvl - up) || '');
-    if (!jsonPointer) return data;
-  }
-
-  var expr = data;
-  var segments = jsonPointer.split('/');
-  for (var i=0; i<segments.length; i++) {
-    var segment = segments[i];
-    if (segment) {
-      data += getProperty(unescapeJsonPointer(segment));
-      expr += ' && ' + data;
-    }
-  }
-  return expr;
-}
-
-
-function joinPaths (a, b) {
-  if (a == '""') return b;
-  return (a + ' + ' + b).replace(/' \+ '/g, '');
-}
-
-
-function unescapeFragment(str) {
-  return unescapeJsonPointer(decodeURIComponent(str));
-}
-
-
-function escapeFragment(str) {
-  return encodeURIComponent(escapeJsonPointer(str));
-}
-
-
-function escapeJsonPointer(str) {
-  return str.replace(/~/g, '~0').replace(/\//g, '~1');
-}
-
-
-function unescapeJsonPointer(str) {
-  return str.replace(/~1/g, '/').replace(/~0/g, '~');
-}
-
-
-/***/ }),
-/* 107 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.getToken = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getCredentials = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter) {
-    var _config$registries$ya = config.registries.yarn.config;
-    let username = _config$registries$ya.username,
-        email = _config$registries$ya.email;
-
-
-    if (username) {
-      reporter.info(`${reporter.lang('npmUsername')}: ${username}`);
-    } else {
-      username = yield reporter.question(reporter.lang('npmUsername'));
-      if (!username) {
-        return null;
-      }
-    }
-
-    if (email) {
-      reporter.info(`${reporter.lang('npmEmail')}: ${email}`);
-    } else {
-      email = yield reporter.question(reporter.lang('npmEmail'));
-      if (!email) {
-        return null;
-      }
-    }
-
-    yield config.registries.yarn.saveHomeConfig({ username, email });
-
-    return { username, email };
-  });
-
-  return function getCredentials(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let getToken = exports.getToken = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, name = '', flags = {}, registry = '') {
-    const auth = registry ? config.registries.npm.getAuthByRegistry(registry) : config.registries.npm.getAuth(name);
-
-    if (config.otp) {
-      config.registries.npm.setOtp(config.otp);
-    }
-
-    if (auth) {
-      config.registries.npm.setToken(auth);
-      return function revoke() {
-        reporter.info(reporter.lang('notRevokingConfigToken'));
-        return Promise.resolve();
-      };
-    }
-
-    const env = process.env.YARN_AUTH_TOKEN || process.env.NPM_AUTH_TOKEN;
-    if (env) {
-      config.registries.npm.setToken(`Bearer ${env}`);
-      return function revoke() {
-        reporter.info(reporter.lang('notRevokingEnvToken'));
-        return Promise.resolve();
-      };
-    }
-
-    // make sure we're not running in non-interactive mode before asking for login
-    if (flags.nonInteractive || config.nonInteractive) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('nonInteractiveNoToken'));
-    }
-
-    //
-    const creds = yield getCredentials(config, reporter);
-    if (!creds) {
-      reporter.warn(reporter.lang('loginAsPublic'));
-      return function revoke() {
-        reporter.info(reporter.lang('noTokenToRevoke'));
-        return Promise.resolve();
-      };
-    }
-
-    const username = creds.username,
-          email = creds.email;
-
-    const password = yield reporter.question(reporter.lang('npmPassword'), {
-      password: true,
-      required: true
-    });
-
-    //
-    const userobj = {
-      _id: `org.couchdb.user:${username}`,
-      name: username,
-      password,
-      email,
-      type: 'user',
-      roles: [],
-      date: new Date().toISOString()
-    };
-
-    //
-    const res = yield config.registries.npm.request(`-/user/org.couchdb.user:${encodeURIComponent(username)}`, {
-      method: 'PUT',
-      registry,
-      body: userobj,
-      auth: { username, password, email }
-    });
-
-    if (res && res.ok) {
-      reporter.success(reporter.lang('loggedIn'));
-
-      const token = res.token;
-      config.registries.npm.setToken(`Bearer ${token}`);
-
-      return (() => {
-        var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-          reporter.success(reporter.lang('revokedToken'));
-          yield config.registries.npm.request(`-/user/token/${token}`, {
-            method: 'DELETE',
-            registry
-          });
-        });
-
-        function revoke() {
-          return _ref3.apply(this, arguments);
-        }
-
-        return revoke;
-      })();
-    } else {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('incorrectCredentials'));
-    }
-  });
-
-  return function getToken(_x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    yield getCredentials(config, reporter);
-  });
-
-  return function run(_x5, _x6, _x7, _x8) {
-    return _ref4.apply(this, arguments);
-  };
-})();
-
-exports.getOneTimePassword = getOneTimePassword;
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function getOneTimePassword(reporter) {
-  return reporter.question(reporter.lang('npmOneTimePassword'));
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Stores registry username and email.');
-}
-
-/***/ }),
-/* 108 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-exports.stringifyLangArgs = stringifyLangArgs;
-
-var _format;
-
-function _load_format() {
-  return _format = __webpack_require__(566);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = _interopRequireWildcard(__webpack_require__(568));
-}
-
-var _isCi;
-
-function _load_isCi() {
-  return _isCi = _interopRequireDefault(__webpack_require__(397));
-}
-
-var _os;
-
-function _load_os() {
-  return _os = _interopRequireDefault(__webpack_require__(49));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint no-unused-vars: 0 */
-
-const util = __webpack_require__(3);
-const EventEmitter = __webpack_require__(76).EventEmitter;
-
-function stringifyLangArgs(args) {
-  return args.map(function (val) {
-    if (val != null && val.inspect) {
-      return val.inspect();
-    } else {
-      try {
-        const str = JSON.stringify(val) || val + '';
-        // should match all literal line breaks and
-        // "u001b" that follow an odd number of backslashes and convert them to ESC
-        // we do this because the JSON.stringify process has escaped these characters
-        return str.replace(/((?:^|[^\\])(?:\\{2})*)\\u001[bB]/g, '$1\u001b').replace(/[\\]r[\\]n|([\\])?[\\]n/g, (match, precededBacklash) => {
-          // precededBacklash not null when "\n" is preceded by a backlash ("\\n")
-          // match will be "\\n" and we don't replace it with os.EOL
-          return precededBacklash ? match : (_os || _load_os()).default.EOL;
-        });
-      } catch (e) {
-        return util.inspect(val);
-      }
-    }
-  });
-}
-
-class BaseReporter {
-  constructor(opts = {}) {
-    const lang = 'en';
-    this.language = lang;
-
-    this.stdout = opts.stdout || process.stdout;
-    this.stderr = opts.stderr || process.stderr;
-    this.stdin = opts.stdin || this._getStandardInput();
-    this.emoji = !!opts.emoji;
-    this.nonInteractive = !!opts.nonInteractive;
-    this.noProgress = !!opts.noProgress || (_isCi || _load_isCi()).default;
-    this.isVerbose = !!opts.verbose;
-
-    // $FlowFixMe: this is valid!
-    this.isTTY = this.stdout.isTTY;
-
-    this.peakMemory = 0;
-    this.startTime = Date.now();
-    this.format = (_format || _load_format()).defaultFormatter;
-  }
-
-  lang(key, ...args) {
-    const msg = (_index || _load_index())[this.language][key] || (_index || _load_index()).en[key];
-    if (!msg) {
-      throw new ReferenceError(`No message defined for language key ${key}`);
-    }
-
-    // stringify args
-    const stringifiedArgs = stringifyLangArgs(args);
-
-    // replace $0 placeholders with args
-    return msg.replace(/\$(\d+)/g, (str, i) => {
-      return stringifiedArgs[i];
-    });
-  }
-
-  /**
-   * `stringifyLangArgs` run `JSON.stringify` on strings too causing
-   * them to appear quoted. This marks them as "raw" and prevents
-   * the quoting and escaping
-   */
-  rawText(str) {
-    return {
-      inspect() {
-        return str;
-      }
-    };
-  }
-
-  verbose(msg) {
-    if (this.isVerbose) {
-      this._verbose(msg);
-    }
-  }
-
-  verboseInspect(val) {
-    if (this.isVerbose) {
-      this._verboseInspect(val);
-    }
-  }
-
-  _verbose(msg) {}
-  _verboseInspect(val) {}
-
-  _getStandardInput() {
-    let standardInput;
-
-    // Accessing stdin in a win32 headless process (e.g., Visual Studio) may throw an exception.
-    try {
-      standardInput = process.stdin;
-    } catch (e) {
-      console.warn(e.message);
-      delete process.stdin;
-      // $FlowFixMe: this is valid!
-      process.stdin = new EventEmitter();
-      standardInput = process.stdin;
-    }
-
-    return standardInput;
-  }
-
-  initPeakMemoryCounter() {
-    this.checkPeakMemory();
-    this.peakMemoryInterval = setInterval(() => {
-      this.checkPeakMemory();
-    }, 1000);
-    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
-    this.peakMemoryInterval.unref();
-  }
-
-  checkPeakMemory() {
-    var _process$memoryUsage = process.memoryUsage();
-
-    const heapTotal = _process$memoryUsage.heapTotal;
-
-    if (heapTotal > this.peakMemory) {
-      this.peakMemory = heapTotal;
-    }
-  }
-
-  close() {
-    if (this.peakMemoryInterval) {
-      clearInterval(this.peakMemoryInterval);
-      this.peakMemoryInterval = null;
-    }
-  }
-
-  getTotalTime() {
-    return Date.now() - this.startTime;
-  }
-
-  // TODO
-  list(key, items, hints) {}
-
-  // Outputs basic tree structure to console
-  tree(key, obj, { force = false } = {}) {}
-
-  // called whenever we begin a step in the CLI.
-  step(current, total, message, emoji) {}
-
-  // a error message has been triggered. this however does not always meant an abrupt
-  // program end.
-  error(message) {}
-
-  // an info message has been triggered. this provides things like stats and diagnostics.
-  info(message) {}
-
-  // a warning message has been triggered.
-  warn(message) {}
-
-  // a success message has been triggered.
-  success(message) {}
-
-  // a simple log message
-  // TODO: rethink the {force} parameter. In the meantime, please don't use it (cf comments in #4143).
-  log(message, { force = false } = {}) {}
-
-  // a shell command has been executed
-  command(command) {}
-
-  // inspect and pretty-print any value
-  inspect(value) {}
-
-  // the screen shown at the very start of the CLI
-  header(command, pkg) {}
-
-  // the screen shown at the very end of the CLI
-  footer(showPeakMemory) {}
-
-  // a table structure
-  table(head, body) {}
-
-  // security audit action to resolve advisories
-  auditAction(recommendation) {}
-
-  // security audit requires manual review
-  auditManualReview() {}
-
-  // security audit advisory
-  auditAdvisory(resolution, auditAdvisory) {}
-
-  // summary for security audit report
-  auditSummary(auditMetadata) {}
-
-  // render an activity spinner and return a function that will trigger an update
-  activity() {
-    return {
-      tick(name) {},
-      end() {}
-    };
-  }
-
-  //
-  activitySet(total, workers) {
-    return {
-      spinners: Array(workers).fill({
-        clear() {},
-        setPrefix() {},
-        tick() {},
-        end() {}
-      }),
-      end() {}
-    };
-  }
-
-  //
-  question(question, options = {}) {
-    return Promise.reject(new Error('Not implemented'));
-  }
-
-  //
-  questionAffirm(question) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const condition = true; // trick eslint
-      if (_this.nonInteractive) {
-        return true;
-      }
-
-      while (condition) {
-        let answer = yield _this.question(question);
-        answer = answer.toLowerCase();
-
-        if (answer === 'y' || answer === 'yes') {
-          return true;
-        }
-        if (answer === 'n' || answer === 'no') {
-          return false;
-        }
-
-        _this.error('Invalid answer for question');
-      }
-
-      return false;
-    })();
-  }
-
-  // prompt the user to select an option from an array
-  select(header, question, options) {
-    return Promise.reject(new Error('Not implemented'));
-  }
-
-  // render a progress bar and return a function which when called will trigger an update
-  progress(total) {
-    return function () {};
-  }
-
-  // utility function to disable progress bar
-  disableProgress() {
-    this.noProgress = true;
-  }
-
-  //
-  prompt(message, choices, options = {}) {
-    return Promise.reject(new Error('Not implemented'));
-  }
-}
-exports.default = BaseReporter;
-
-/***/ }),
-/* 109 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-exports.explodeHostedGitFragment = explodeHostedGitFragment;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(57);
-}
-
-var _gitResolver;
-
-function _load_gitResolver() {
-  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-var _git;
-
-function _load_git() {
-  return _git = _interopRequireDefault(__webpack_require__(219));
-}
-
-var _guessName;
-
-function _load_guessName() {
-  return _guessName = _interopRequireDefault(__webpack_require__(169));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function parseHash(fragment) {
-  const hashPosition = fragment.indexOf('#');
-  return hashPosition === -1 ? '' : fragment.substr(hashPosition + 1);
-}
-
-function explodeHostedGitFragment(fragment, reporter) {
-  const hash = parseHash(fragment);
-
-  const preParts = fragment.split('@');
-  if (preParts.length > 2) {
-    fragment = preParts[1] + '@' + preParts[2];
-  }
-
-  const parts = fragment.replace(/(.*?)#.*/, '$1') // Strip hash
-  .replace(/.*:(.*)/, '$1') // Strip prefixed protocols
-  .replace(/.git$/, '') // Strip the .git suffix
-  .split('/');
-
-  const user = parts[parts.length - 2];
-  const repo = parts[parts.length - 1];
-
-  if (user === undefined || repo === undefined) {
-    throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidHostedGitFragment', fragment));
-  }
-
-  return {
-    user,
-    repo,
-    hash
-  };
-}
-
-class HostedGitResolver extends (_exoticResolver || _load_exoticResolver()).default {
-  constructor(request, fragment) {
-    super(request, fragment);
-
-    const exploded = this.exploded = explodeHostedGitFragment(fragment, this.reporter);
-    const user = exploded.user,
-          repo = exploded.repo,
-          hash = exploded.hash;
-
-    this.user = user;
-    this.repo = repo;
-    this.hash = hash;
-  }
-
-  static getTarballUrl(exploded, commit) {
-    exploded;
-    commit;
-    throw new Error('Not implemented');
-  }
-
-  static getGitHTTPUrl(exploded) {
-    exploded;
-    throw new Error('Not implemented');
-  }
-
-  static getGitHTTPBaseUrl(exploded) {
-    exploded;
-    throw new Error('Not implemented');
-  }
-
-  static getGitSSHUrl(exploded) {
-    exploded;
-    throw new Error('Not implemented');
-  }
-
-  static getHTTPFileUrl(exploded, filename, commit) {
-    exploded;
-    filename;
-    commit;
-    throw new Error('Not implemented');
-  }
-
-  getRefOverHTTP(url) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const gitUrl = (_git || _load_git()).default.npmUrlToGitUrl(url);
-      const client = new (_git || _load_git()).default(_this.config, gitUrl, _this.hash);
-
-      let out = yield _this.config.requestManager.request({
-        url: `${url}/info/refs?service=git-upload-pack`,
-        queue: _this.resolver.fetchingQueue
-      });
-
-      if (out) {
-        // clean up output
-        let lines = out.trim().split('\n');
-
-        // remove first two lines which contains compatibility info etc
-        lines = lines.slice(2);
-
-        // remove last line which contains the terminator "0000"
-        lines.pop();
-
-        // remove line lengths from start of each line
-        lines = lines.map(function (line) {
-          return line.slice(4);
-        });
-
-        out = lines.join('\n');
-      } else {
-        throw new Error(_this.reporter.lang('hostedGitResolveError'));
-      }
-
-      return client.setRefHosted(out);
-    })();
-  }
-
-  resolveOverHTTP(url) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const commit = yield _this2.getRefOverHTTP(url);
-      const config = _this2.config;
-
-
-      const tarballUrl = _this2.constructor.getTarballUrl(_this2.exploded, commit);
-
-      const tryRegistry = (() => {
-        var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (registry) {
-          const filename = (_index || _load_index()).registries[registry].filename;
-
-          const href = _this2.constructor.getHTTPFileUrl(_this2.exploded, filename, commit);
-          const file = yield config.requestManager.request({
-            url: href,
-            queue: _this2.resolver.fetchingQueue
-          });
-          if (!file) {
-            return null;
-          }
-
-          const json = yield config.readJson(href, function () {
-            return JSON.parse(file);
-          });
-          json._uid = commit;
-          json._remote = {
-            resolved: tarballUrl,
-            type: 'tarball',
-            reference: tarballUrl,
-            registry
-          };
-          return json;
-        });
-
-        return function tryRegistry(_x) {
-          return _ref.apply(this, arguments);
-        };
-      })();
-
-      const file = yield tryRegistry(_this2.registry);
-      if (file) {
-        return file;
-      }
-
-      for (const registry in (_index || _load_index()).registries) {
-        if (registry === _this2.registry) {
-          continue;
-        }
-
-        const file = yield tryRegistry(registry);
-        if (file) {
-          return file;
-        }
-      }
-
-      return {
-        name: (0, (_guessName || _load_guessName()).default)(url),
-        version: '0.0.0',
-        _uid: commit,
-        _remote: {
-          resolved: tarballUrl,
-          type: 'tarball',
-          reference: tarballUrl,
-          registry: 'npm',
-          hash: undefined
-        }
-      };
-    })();
-  }
-
-  hasHTTPCapability(url) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      return (yield _this3.config.requestManager.request({
-        url,
-        method: 'HEAD',
-        queue: _this3.resolver.fetchingQueue,
-        followRedirect: false
-      })) !== false;
-    })();
-  }
-
-  resolve() {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // If we already have the tarball, just return it without having to make any HTTP requests.
-      const shrunk = _this4.request.getLocked('tarball');
-      if (shrunk) {
-        return shrunk;
-      }
-
-      const httpUrl = _this4.constructor.getGitHTTPUrl(_this4.exploded);
-      const httpBaseUrl = _this4.constructor.getGitHTTPBaseUrl(_this4.exploded);
-      const sshUrl = _this4.constructor.getGitSSHUrl(_this4.exploded);
-
-      // If we can access the files over HTTP then we should as it's MUCH faster than git
-      // archive and tarball unarchiving. The HTTP API is only available for public repos
-      // though.
-      if (yield _this4.hasHTTPCapability(httpBaseUrl)) {
-        return _this4.resolveOverHTTP(httpUrl);
-      }
-
-      // If the url is accessible over git archive then we should immediately delegate to
-      // the git resolver.
-      //
-      // NOTE: Here we use a different url than when we delegate to the git resolver later on.
-      // This is because `git archive` requires access over ssh and github only allows that
-      // if you have write permissions
-      const sshGitUrl = (_git || _load_git()).default.npmUrlToGitUrl(sshUrl);
-      if (yield (_git || _load_git()).default.hasArchiveCapability(sshGitUrl)) {
-        const archiveClient = new (_git || _load_git()).default(_this4.config, sshGitUrl, _this4.hash);
-        const commit = yield archiveClient.init();
-        return _this4.fork((_gitResolver || _load_gitResolver()).default, true, `${sshUrl}#${commit}`);
-      }
-
-      // fallback to the plain git resolver
-      return _this4.fork((_gitResolver || _load_gitResolver()).default, true, sshUrl);
-    })();
-  }
-}
-exports.default = HostedGitResolver;
-
-/***/ }),
-/* 110 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const debug = __webpack_require__(266)('yarn');
-
-class BlockingQueue {
-  constructor(alias, maxConcurrency = Infinity) {
-    this.concurrencyQueue = [];
-    this.maxConcurrency = maxConcurrency;
-    this.runningCount = 0;
-    this.warnedStuck = false;
-    this.alias = alias;
-    this.first = true;
-
-    this.running = (0, (_map || _load_map()).default)();
-    this.queue = (0, (_map || _load_map()).default)();
-
-    this.stuckTick = this.stuckTick.bind(this);
-  }
-
-  stillActive() {
-    if (this.stuckTimer) {
-      clearTimeout(this.stuckTimer);
-    }
-
-    this.stuckTimer = setTimeout(this.stuckTick, 5000);
-
-    // We need to check the existence of unref because of https://github.com/facebook/jest/issues/4559
-    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
-    this.stuckTimer.unref && this.stuckTimer.unref();
-  }
-
-  stuckTick() {
-    if (this.runningCount === 1) {
-      this.warnedStuck = true;
-      debug(`The ${JSON.stringify(this.alias)} blocking queue may be stuck. 5 seconds ` + `without any activity with 1 worker: ${Object.keys(this.running)[0]}`);
-    }
-  }
-
-  push(key, factory) {
-    if (this.first) {
-      this.first = false;
-    } else {
-      this.stillActive();
-    }
-
-    return new Promise((resolve, reject) => {
-      // we're already running so push ourselves to the queue
-      const queue = this.queue[key] = this.queue[key] || [];
-      queue.push({ factory, resolve, reject });
-
-      if (!this.running[key]) {
-        this.shift(key);
-      }
-    });
-  }
-
-  shift(key) {
-    if (this.running[key]) {
-      delete this.running[key];
-      this.runningCount--;
-
-      if (this.stuckTimer) {
-        clearTimeout(this.stuckTimer);
-        this.stuckTimer = null;
-      }
-
-      if (this.warnedStuck) {
-        this.warnedStuck = false;
-        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
-      }
-    }
-
-    const queue = this.queue[key];
-    if (!queue) {
-      return;
-    }
-
-    var _queue$shift = queue.shift();
-
-    const resolve = _queue$shift.resolve,
-          reject = _queue$shift.reject,
-          factory = _queue$shift.factory;
-
-    if (!queue.length) {
-      delete this.queue[key];
-    }
-
-    const next = () => {
-      this.shift(key);
-      this.shiftConcurrencyQueue();
-    };
-
-    const run = () => {
-      this.running[key] = true;
-      this.runningCount++;
-
-      factory().then(function (val) {
-        resolve(val);
-        next();
-        return null;
-      }).catch(function (err) {
-        reject(err);
-        next();
-      });
-    };
-
-    this.maybePushConcurrencyQueue(run);
-  }
-
-  maybePushConcurrencyQueue(run) {
-    if (this.runningCount < this.maxConcurrency) {
-      run();
-    } else {
-      this.concurrencyQueue.push(run);
-    }
-  }
-
-  shiftConcurrencyQueue() {
-    if (this.runningCount < this.maxConcurrency) {
-      const fn = this.concurrencyQueue.shift();
-      if (fn) {
-        fn();
-      }
-    }
-  }
-}
-exports.default = BlockingQueue;
-
-/***/ }),
-/* 111 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.execCommand = exports.execFromManifest = exports.executeLifecycleScript = exports.makeEnv = exports.getWrappersFolder = exports.IGNORE_MANIFEST_KEYS = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getWrappersFolder = exports.getWrappersFolder = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    if (wrappersFolder) {
-      return wrappersFolder;
-    }
-
-    wrappersFolder = yield (_fs || _load_fs()).makeTempDir();
-
-    yield (0, (_portableScript || _load_portableScript()).makePortableProxyScript)(process.execPath, wrappersFolder, {
-      proxyBasename: 'node'
-    });
-
-    yield (0, (_portableScript || _load_portableScript()).makePortableProxyScript)(process.execPath, wrappersFolder, {
-      proxyBasename: 'yarn',
-      prependArguments: [process.argv[1]]
-    });
-
-    return wrappersFolder;
-  });
-
-  return function getWrappersFolder(_x) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let makeEnv = exports.makeEnv = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (stage, cwd, config) {
-    const env = (0, (_extends2 || _load_extends()).default)({
-      NODE: process.execPath,
-      INIT_CWD: process.cwd()
-    }, process.env);
-
-    // Merge in the `env` object specified in .yarnrc
-    const customEnv = config.getOption('env');
-    if (customEnv && typeof customEnv === 'object') {
-      Object.assign(env, customEnv);
-    }
-
-    env.npm_lifecycle_event = stage;
-    env.npm_node_execpath = env.NODE;
-    env.npm_execpath = env.npm_execpath || process.mainModule && process.mainModule.filename;
-
-    // Set the env to production for npm compat if production mode.
-    // https://github.com/npm/npm/blob/30d75e738b9cb7a6a3f9b50e971adcbe63458ed3/lib/utils/lifecycle.js#L336
-    if (config.production) {
-      env.NODE_ENV = 'production';
-    }
-
-    // Note: npm_config_argv environment variable contains output of nopt - command-line
-    // parser used by npm. Since we use other parser, we just roughly emulate it's output. (See: #684)
-    env.npm_config_argv = JSON.stringify({
-      remain: [],
-      cooked: config.commandName === 'run' ? [config.commandName, stage] : [config.commandName],
-      original: process.argv.slice(2)
-    });
-
-    const manifest = yield config.maybeReadManifest(cwd);
-    if (manifest) {
-      if (manifest.scripts && Object.prototype.hasOwnProperty.call(manifest.scripts, stage)) {
-        env.npm_lifecycle_script = manifest.scripts[stage];
-      }
-
-      // add npm_package_*
-      const queue = [['', manifest]];
-      while (queue.length) {
-        var _queue$pop = queue.pop();
-
-        const key = _queue$pop[0],
-              val = _queue$pop[1];
-
-        if (typeof val === 'object') {
-          for (const subKey in val) {
-            const fullKey = [key, subKey].filter(Boolean).join('_');
-            if (fullKey && fullKey[0] !== '_' && !IGNORE_MANIFEST_KEYS.has(fullKey)) {
-              queue.push([fullKey, val[subKey]]);
-            }
-          }
-        } else {
-          let cleanVal = String(val);
-          if (cleanVal.indexOf('\n') >= 0) {
-            cleanVal = JSON.stringify(cleanVal);
-          }
-
-          //replacing invalid chars with underscore
-          const cleanKey = key.replace(INVALID_CHAR_REGEX, '_');
-
-          env[`npm_package_${cleanKey}`] = cleanVal;
-        }
-      }
-    }
-
-    // add npm_config_* and npm_package_config_* from yarn config
-    const keys = new Set([...Object.keys(config.registries.yarn.config), ...Object.keys(config.registries.npm.config)]);
-    const cleaned = Array.from(keys).filter(function (key) {
-      return !key.match(/:_/) && IGNORE_CONFIG_KEYS.indexOf(key) === -1;
-    }).map(function (key) {
-      let val = config.getOption(key);
-      if (!val) {
-        val = '';
-      } else if (typeof val === 'number') {
-        val = '' + val;
-      } else if (typeof val !== 'string') {
-        val = JSON.stringify(val);
-      }
-
-      if (val.indexOf('\n') >= 0) {
-        val = JSON.stringify(val);
-      }
-      return [key, val];
-    });
-    // add npm_config_*
-    for (var _iterator = cleaned, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref4 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref4 = _i.value;
-      }
-
-      const _ref3 = _ref4;
-      const key = _ref3[0];
-      const val = _ref3[1];
-
-      const cleanKey = key.replace(/^_+/, '');
-      const envKey = `npm_config_${cleanKey}`.replace(INVALID_CHAR_REGEX, '_');
-      env[envKey] = val;
-    }
-    // add npm_package_config_*
-    if (manifest && manifest.name) {
-      const packageConfigPrefix = `${manifest.name}:`;
-      for (var _iterator2 = cleaned, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref6 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref6 = _i2.value;
-        }
-
-        const _ref5 = _ref6;
-        const key = _ref5[0];
-        const val = _ref5[1];
-
-        if (key.indexOf(packageConfigPrefix) !== 0) {
-          continue;
-        }
-        const cleanKey = key.replace(/^_+/, '').replace(packageConfigPrefix, '');
-        const envKey = `npm_package_config_${cleanKey}`.replace(INVALID_CHAR_REGEX, '_');
-        env[envKey] = val;
-      }
-    }
-
-    // split up the path
-    const envPath = env[(_constants || _load_constants()).ENV_PATH_KEY];
-    const pathParts = envPath ? envPath.split(path.delimiter) : [];
-
-    // Include node-gyp version that was bundled with the current Node.js version,
-    // if available.
-    pathParts.unshift(path.join(path.dirname(process.execPath), 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
-    pathParts.unshift(path.join(path.dirname(process.execPath), '..', 'lib', 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
-    // Include node-gyp version from homebrew managed npm, if available.
-    pathParts.unshift(path.join(path.dirname(process.execPath), '..', 'libexec', 'lib', 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
-
-    // Add global bin folder if it is not present already, as some packages depend
-    // on a globally-installed version of node-gyp.
-    const globalBin = yield (0, (_global || _load_global()).getBinFolder)(config, {});
-    if (pathParts.indexOf(globalBin) === -1) {
-      pathParts.unshift(globalBin);
-    }
-
-    // Add node_modules .bin folders to the PATH
-    for (var _iterator3 = config.registryFolders, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref7 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref7 = _i3.value;
-      }
-
-      const registryFolder = _ref7;
-
-      const binFolder = path.join(registryFolder, '.bin');
-      if (config.workspacesEnabled && config.workspaceRootFolder) {
-        pathParts.unshift(path.join(config.workspaceRootFolder, binFolder));
-      }
-      pathParts.unshift(path.join(config.linkFolder, binFolder));
-      pathParts.unshift(path.join(cwd, binFolder));
-    }
-
-    let pnpFile;
-
-    if (process.versions.pnp) {
-      pnpFile = (_dynamicRequire || _load_dynamicRequire()).dynamicRequire.resolve('pnpapi');
-    } else {
-      const candidate = `${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`;
-      if (yield (_fs || _load_fs()).exists(candidate)) {
-        pnpFile = candidate;
-      }
-    }
-
-    if (pnpFile) {
-      const pnpApi = (0, (_dynamicRequire || _load_dynamicRequire()).dynamicRequire)(pnpFile);
-
-      const packageLocator = pnpApi.findPackageLocator(`${cwd}/`);
-      const packageInformation = pnpApi.getPackageInformation(packageLocator);
-
-      for (var _iterator4 = packageInformation.packageDependencies.entries(), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref9;
-
-        if (_isArray4) {
-          if (_i4 >= _iterator4.length) break;
-          _ref9 = _iterator4[_i4++];
-        } else {
-          _i4 = _iterator4.next();
-          if (_i4.done) break;
-          _ref9 = _i4.value;
-        }
-
-        const _ref8 = _ref9;
-        const name = _ref8[0];
-        const reference = _ref8[1];
-
-        const dependencyInformation = pnpApi.getPackageInformation({ name, reference });
-
-        if (!dependencyInformation || !dependencyInformation.packageLocation) {
-          continue;
-        }
-
-        const binFolder = `${dependencyInformation.packageLocation}/.bin`;
-        if (yield (_fs || _load_fs()).exists(binFolder)) {
-          pathParts.unshift(binFolder);
-        }
-      }
-
-      // Note that NODE_OPTIONS doesn't support any style of quoting its arguments at the moment
-      // For this reason, it won't work if the user has a space inside its $PATH
-      env.NODE_OPTIONS = env.NODE_OPTIONS || '';
-      env.NODE_OPTIONS = `--require ${pnpFile} ${env.NODE_OPTIONS}`;
-    }
-
-    pathParts.unshift((yield getWrappersFolder(config)));
-
-    // join path back together
-    env[(_constants || _load_constants()).ENV_PATH_KEY] = pathParts.join(path.delimiter);
-
-    return env;
-  });
-
-  return function makeEnv(_x2, _x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let executeLifecycleScript = exports.executeLifecycleScript = (() => {
-  var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({
-    stage,
-    config,
-    cwd,
-    cmd,
-    isInteractive,
-    onProgress,
-    customShell
-  }) {
-    const env = yield makeEnv(stage, cwd, config);
-
-    yield checkForGypIfNeeded(config, cmd, env[(_constants || _load_constants()).ENV_PATH_KEY].split(path.delimiter));
-
-    if (process.platform === 'win32' && (!customShell || customShell === 'cmd')) {
-      // handle windows run scripts starting with a relative path
-      cmd = (0, (_fixCmdWinSlashes || _load_fixCmdWinSlashes()).fixCmdWinSlashes)(cmd);
-    }
-
-    // By default (non-interactive), pipe everything to the terminal and run child process detached
-    // as long as it's not Windows (since windows does not have /dev/tty)
-    let stdio = ['ignore', 'pipe', 'pipe'];
-    let detached = process.platform !== 'win32';
-
-    if (isInteractive) {
-      stdio = 'inherit';
-      detached = false;
-    }
-
-    const shell = customShell || true;
-    const stdout = yield (_child || _load_child()).spawn(cmd, [], { cwd, env, stdio, detached, shell }, onProgress);
-
-    return { cwd, command: cmd, stdout };
-  });
-
-  return function executeLifecycleScript(_x5) {
-    return _ref10.apply(this, arguments);
-  };
-})();
-
-let _checkForGyp = (() => {
-  var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, paths) {
-    const reporter = config.reporter;
-
-    // Check every directory in the PATH
-
-    const allChecks = yield Promise.all(paths.map(function (dir) {
-      return (_fs || _load_fs()).exists(path.join(dir, 'node-gyp'));
-    }));
-    if (allChecks.some(Boolean)) {
-      // node-gyp is available somewhere
-      return;
-    }
-
-    reporter.info(reporter.lang('packageRequiresNodeGyp'));
-
-    try {
-      yield (0, (_global || _load_global()).run)(config, reporter, {}, ['add', 'node-gyp']);
-    } catch (e) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('nodeGypAutoInstallFailed', e.message));
-    }
-  });
-
-  return function _checkForGyp(_x6, _x7) {
-    return _ref11.apply(this, arguments);
-  };
-})();
-
-let execFromManifest = exports.execFromManifest = (() => {
-  var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, commandName, cwd) {
-    const pkg = yield config.maybeReadManifest(cwd);
-    if (!pkg || !pkg.scripts) {
-      return;
-    }
-
-    const cmd = pkg.scripts[commandName];
-    if (cmd) {
-      yield execCommand({ stage: commandName, config, cmd, cwd, isInteractive: true });
-    }
-  });
-
-  return function execFromManifest(_x8, _x9, _x10) {
-    return _ref12.apply(this, arguments);
-  };
-})();
-
-let execCommand = exports.execCommand = (() => {
-  var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({
-    stage,
-    config,
-    cmd,
-    cwd,
-    isInteractive,
-    customShell
-  }) {
-    const reporter = config.reporter;
-
-    try {
-      reporter.command(cmd);
-      yield executeLifecycleScript({ stage, config, cwd, cmd, isInteractive, customShell });
-      return Promise.resolve();
-    } catch (err) {
-      if (err instanceof (_errors || _load_errors()).ProcessTermError) {
-        const formattedError = new (_errors || _load_errors()).ProcessTermError(err.EXIT_SIGNAL ? reporter.lang('commandFailedWithSignal', err.EXIT_SIGNAL) : reporter.lang('commandFailedWithCode', err.EXIT_CODE));
-        formattedError.EXIT_CODE = err.EXIT_CODE;
-        formattedError.EXIT_SIGNAL = err.EXIT_SIGNAL;
-        throw formattedError;
-      } else {
-        throw err;
-      }
-    }
-  });
-
-  return function execCommand(_x11) {
-    return _ref13.apply(this, arguments);
-  };
-})();
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _dynamicRequire;
-
-function _load_dynamicRequire() {
-  return _dynamicRequire = __webpack_require__(371);
-}
-
-var _portableScript;
-
-function _load_portableScript() {
-  return _portableScript = __webpack_require__(589);
-}
-
-var _fixCmdWinSlashes;
-
-function _load_fixCmdWinSlashes() {
-  return _fixCmdWinSlashes = __webpack_require__(578);
-}
-
-var _global;
-
-function _load_global() {
-  return _global = __webpack_require__(121);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-const IGNORE_MANIFEST_KEYS = exports.IGNORE_MANIFEST_KEYS = new Set(['readme', 'notice', 'licenseText', 'activationEvents', 'contributes']);
-
-// We treat these configs as internal, thus not expose them to process.env.
-// This helps us avoid some gyp issues when building native modules.
-// See https://github.com/yarnpkg/yarn/issues/2286.
-const IGNORE_CONFIG_KEYS = ['lastUpdateCheck'];
-
-let wrappersFolder = null;
-
-const INVALID_CHAR_REGEX = /\W/g;
-
-exports.default = executeLifecycleScript;
-
-
-let checkGypPromise = null;
-/**
- * Special case: Some packages depend on node-gyp, but don't specify this in
- * their package.json dependencies. They assume that node-gyp is available
- * globally. We need to detect this case and show an error message.
- */
-function checkForGypIfNeeded(config, cmd, paths) {
-  if (cmd.substr(0, cmd.indexOf(' ')) !== 'node-gyp') {
-    return Promise.resolve();
-  }
-
-  // Ensure this only runs once, rather than multiple times in parallel.
-  if (!checkGypPromise) {
-    checkGypPromise = _checkForGyp(config, paths);
-  }
-  return checkGypPromise;
-}
-
-/***/ }),
-/* 112 */
-/***/ (function(module, exports) {
-
-module.exports = function (exec) {
-  try {
-    return !!exec();
-  } catch (e) {
-    return true;
-  }
-};
-
-
-/***/ }),
-/* 113 */
-/***/ (function(module, exports) {
-
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-
-function isArray(arg) {
-  if (Array.isArray) {
-    return Array.isArray(arg);
-  }
-  return objectToString(arg) === '[object Array]';
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return (objectToString(e) === '[object Error]' || e instanceof Error);
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-exports.isBuffer = Buffer.isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
-
-
-/***/ }),
-/* 114 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * micromatch <https://github.com/jonschlinkert/micromatch>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var expand = __webpack_require__(753);
-var utils = __webpack_require__(300);
-
-/**
- * The main function. Pass an array of filepaths,
- * and a string or array of glob patterns
- *
- * @param  {Array|String} `files`
- * @param  {Array|String} `patterns`
- * @param  {Object} `opts`
- * @return {Array} Array of matches
- */
-
-function micromatch(files, patterns, opts) {
-  if (!files || !patterns) return [];
-  opts = opts || {};
-
-  if (typeof opts.cache === 'undefined') {
-    opts.cache = true;
-  }
-
-  if (!Array.isArray(patterns)) {
-    return match(files, patterns, opts);
-  }
-
-  var len = patterns.length, i = 0;
-  var omit = [], keep = [];
-
-  while (len--) {
-    var glob = patterns[i++];
-    if (typeof glob === 'string' && glob.charCodeAt(0) === 33 /* ! */) {
-      omit.push.apply(omit, match(files, glob.slice(1), opts));
-    } else {
-      keep.push.apply(keep, match(files, glob, opts));
-    }
-  }
-  return utils.diff(keep, omit);
-}
-
-/**
- * Return an array of files that match the given glob pattern.
- *
- * This function is called by the main `micromatch` function If you only
- * need to pass a single pattern you might get very minor speed improvements
- * using this function.
- *
- * @param  {Array} `files`
- * @param  {String} `pattern`
- * @param  {Object} `options`
- * @return {Array}
- */
-
-function match(files, pattern, opts) {
-  if (utils.typeOf(files) !== 'string' && !Array.isArray(files)) {
-    throw new Error(msg('match', 'files', 'a string or array'));
-  }
-
-  files = utils.arrayify(files);
-  opts = opts || {};
-
-  var negate = opts.negate || false;
-  var orig = pattern;
-
-  if (typeof pattern === 'string') {
-    negate = pattern.charAt(0) === '!';
-    if (negate) {
-      pattern = pattern.slice(1);
-    }
-
-    // we need to remove the character regardless,
-    // so the above logic is still needed
-    if (opts.nonegate === true) {
-      negate = false;
-    }
-  }
-
-  var _isMatch = matcher(pattern, opts);
-  var len = files.length, i = 0;
-  var res = [];
-
-  while (i < len) {
-    var file = files[i++];
-    var fp = utils.unixify(file, opts);
-
-    if (!_isMatch(fp)) { continue; }
-    res.push(fp);
-  }
-
-  if (res.length === 0) {
-    if (opts.failglob === true) {
-      throw new Error('micromatch.match() found no matches for: "' + orig + '".');
-    }
-
-    if (opts.nonull || opts.nullglob) {
-      res.push(utils.unescapeGlob(orig));
-    }
-  }
-
-  // if `negate` was defined, diff negated files
-  if (negate) { res = utils.diff(files, res); }
-
-  // if `ignore` was defined, diff ignored filed
-  if (opts.ignore && opts.ignore.length) {
-    pattern = opts.ignore;
-    opts = utils.omit(opts, ['ignore']);
-    res = utils.diff(res, micromatch(res, pattern, opts));
-  }
-
-  if (opts.nodupes) {
-    return utils.unique(res);
-  }
-  return res;
-}
-
-/**
- * Returns a function that takes a glob pattern or array of glob patterns
- * to be used with `Array#filter()`. (Internally this function generates
- * the matching function using the [matcher] method).
- *
- * ```js
- * var fn = mm.filter('[a-c]');
- * ['a', 'b', 'c', 'd', 'e'].filter(fn);
- * //=> ['a', 'b', 'c']
- * ```
- * @param  {String|Array} `patterns` Can be a glob or array of globs.
- * @param  {Options} `opts` Options to pass to the [matcher] method.
- * @return {Function} Filter function to be passed to `Array#filter()`.
- */
-
-function filter(patterns, opts) {
-  if (!Array.isArray(patterns) && typeof patterns !== 'string') {
-    throw new TypeError(msg('filter', 'patterns', 'a string or array'));
-  }
-
-  patterns = utils.arrayify(patterns);
-  var len = patterns.length, i = 0;
-  var patternMatchers = Array(len);
-  while (i < len) {
-    patternMatchers[i] = matcher(patterns[i++], opts);
-  }
-
-  return function(fp) {
-    if (fp == null) return [];
-    var len = patternMatchers.length, i = 0;
-    var res = true;
-
-    fp = utils.unixify(fp, opts);
-    while (i < len) {
-      var fn = patternMatchers[i++];
-      if (!fn(fp)) {
-        res = false;
-        break;
-      }
-    }
-    return res;
-  };
-}
-
-/**
- * Returns true if the filepath contains the given
- * pattern. Can also return a function for matching.
- *
- * ```js
- * isMatch('foo.md', '*.md', {});
- * //=> true
- *
- * isMatch('*.md', {})('foo.md')
- * //=> true
- * ```
- * @param  {String} `fp`
- * @param  {String} `pattern`
- * @param  {Object} `opts`
- * @return {Boolean}
- */
-
-function isMatch(fp, pattern, opts) {
-  if (typeof fp !== 'string') {
-    throw new TypeError(msg('isMatch', 'filepath', 'a string'));
-  }
-
-  fp = utils.unixify(fp, opts);
-  if (utils.typeOf(pattern) === 'object') {
-    return matcher(fp, pattern);
-  }
-  return matcher(pattern, opts)(fp);
-}
-
-/**
- * Returns true if the filepath matches the
- * given pattern.
- */
-
-function contains(fp, pattern, opts) {
-  if (typeof fp !== 'string') {
-    throw new TypeError(msg('contains', 'pattern', 'a string'));
-  }
-
-  opts = opts || {};
-  opts.contains = (pattern !== '');
-  fp = utils.unixify(fp, opts);
-
-  if (opts.contains && !utils.isGlob(pattern)) {
-    return fp.indexOf(pattern) !== -1;
-  }
-  return matcher(pattern, opts)(fp);
-}
-
-/**
- * Returns true if a file path matches any of the
- * given patterns.
- *
- * @param  {String} `fp` The filepath to test.
- * @param  {String|Array} `patterns` Glob patterns to use.
- * @param  {Object} `opts` Options to pass to the `matcher()` function.
- * @return {String}
- */
-
-function any(fp, patterns, opts) {
-  if (!Array.isArray(patterns) && typeof patterns !== 'string') {
-    throw new TypeError(msg('any', 'patterns', 'a string or array'));
-  }
-
-  patterns = utils.arrayify(patterns);
-  var len = patterns.length;
-
-  fp = utils.unixify(fp, opts);
-  while (len--) {
-    var isMatch = matcher(patterns[len], opts);
-    if (isMatch(fp)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Filter the keys of an object with the given `glob` pattern
- * and `options`
- *
- * @param  {Object} `object`
- * @param  {Pattern} `object`
- * @return {Array}
- */
-
-function matchKeys(obj, glob, options) {
-  if (utils.typeOf(obj) !== 'object') {
-    throw new TypeError(msg('matchKeys', 'first argument', 'an object'));
-  }
-
-  var fn = matcher(glob, options);
-  var res = {};
-
-  for (var key in obj) {
-    if (obj.hasOwnProperty(key) && fn(key)) {
-      res[key] = obj[key];
-    }
-  }
-  return res;
-}
-
-/**
- * Return a function for matching based on the
- * given `pattern` and `options`.
- *
- * @param  {String} `pattern`
- * @param  {Object} `options`
- * @return {Function}
- */
-
-function matcher(pattern, opts) {
-  // pattern is a function
-  if (typeof pattern === 'function') {
-    return pattern;
-  }
-  // pattern is a regex
-  if (pattern instanceof RegExp) {
-    return function(fp) {
-      return pattern.test(fp);
-    };
-  }
-
-  if (typeof pattern !== 'string') {
-    throw new TypeError(msg('matcher', 'pattern', 'a string, regex, or function'));
-  }
-
-  // strings, all the way down...
-  pattern = utils.unixify(pattern, opts);
-
-  // pattern is a non-glob string
-  if (!utils.isGlob(pattern)) {
-    return utils.matchPath(pattern, opts);
-  }
-  // pattern is a glob string
-  var re = makeRe(pattern, opts);
-
-  // `matchBase` is defined
-  if (opts && opts.matchBase) {
-    return utils.hasFilename(re, opts);
-  }
-  // `matchBase` is not defined
-  return function(fp) {
-    fp = utils.unixify(fp, opts);
-    return re.test(fp);
-  };
-}
-
-/**
- * Create and cache a regular expression for matching
- * file paths.
- *
- * If the leading character in the `glob` is `!`, a negation
- * regex is returned.
- *
- * @param  {String} `glob`
- * @param  {Object} `options`
- * @return {RegExp}
- */
-
-function toRegex(glob, options) {
-  // clone options to prevent  mutating the original object
-  var opts = Object.create(options || {});
-  var flags = opts.flags || '';
-  if (opts.nocase && flags.indexOf('i') === -1) {
-    flags += 'i';
-  }
-
-  var parsed = expand(glob, opts);
-
-  // pass in tokens to avoid parsing more than once
-  opts.negated = opts.negated || parsed.negated;
-  opts.negate = opts.negated;
-  glob = wrapGlob(parsed.pattern, opts);
-  var re;
-
-  try {
-    re = new RegExp(glob, flags);
-    return re;
-  } catch (err) {
-    err.reason = 'micromatch invalid regex: (' + re + ')';
-    if (opts.strict) throw new SyntaxError(err);
-  }
-
-  // we're only here if a bad pattern was used and the user
-  // passed `options.silent`, so match nothing
-  return /$^/;
-}
-
-/**
- * Create the regex to do the matching. If the leading
- * character in the `glob` is `!` a negation regex is returned.
- *
- * @param {String} `glob`
- * @param {Boolean} `negate`
- */
-
-function wrapGlob(glob, opts) {
-  var prefix = (opts && !opts.contains) ? '^' : '';
-  var after = (opts && !opts.contains) ? '$' : '';
-  glob = ('(?:' + glob + ')' + after);
-  if (opts && opts.negate) {
-    return prefix + ('(?!^' + glob + ').*$');
-  }
-  return prefix + glob;
-}
-
-/**
- * Create and cache a regular expression for matching file paths.
- * If the leading character in the `glob` is `!`, a negation
- * regex is returned.
- *
- * @param  {String} `glob`
- * @param  {Object} `options`
- * @return {RegExp}
- */
-
-function makeRe(glob, opts) {
-  if (utils.typeOf(glob) !== 'string') {
-    throw new Error(msg('makeRe', 'glob', 'a string'));
-  }
-  return utils.cache(toRegex, glob, opts);
-}
-
-/**
- * Make error messages consistent. Follows this format:
- *
- * ```js
- * msg(methodName, argNumber, nativeType);
- * // example:
- * msg('matchKeys', 'first', 'an object');
- * ```
- *
- * @param  {String} `method`
- * @param  {String} `num`
- * @param  {String} `type`
- * @return {String}
- */
-
-function msg(method, what, type) {
-  return 'micromatch.' + method + '(): ' + what + ' should be ' + type + '.';
-}
-
-/**
- * Public methods
- */
-
-/* eslint no-multi-spaces: 0 */
-micromatch.any       = any;
-micromatch.braces    = micromatch.braceExpand = utils.braces;
-micromatch.contains  = contains;
-micromatch.expand    = expand;
-micromatch.filter    = filter;
-micromatch.isMatch   = isMatch;
-micromatch.makeRe    = makeRe;
-micromatch.match     = match;
-micromatch.matcher   = matcher;
-micromatch.matchKeys = matchKeys;
-
-/**
- * Expose `micromatch`
- */
-
-module.exports = micromatch;
-
-
-/***/ }),
-/* 115 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// a duplex stream is just a stream that is both readable and writable.
-// Since JS doesn't have multiple prototypal inheritance, this class
-// prototypally inherits from Readable, and then parasitically from
-// Writable.
-
-
-
-/*<replacement>*/
-
-var pna = __webpack_require__(180);
-/*</replacement>*/
-
-/*<replacement>*/
-var objectKeys = Object.keys || function (obj) {
-  var keys = [];
-  for (var key in obj) {
-    keys.push(key);
-  }return keys;
-};
-/*</replacement>*/
-
-module.exports = Duplex;
-
-/*<replacement>*/
-var util = __webpack_require__(113);
-util.inherits = __webpack_require__(61);
-/*</replacement>*/
-
-var Readable = __webpack_require__(406);
-var Writable = __webpack_require__(408);
-
-util.inherits(Duplex, Readable);
-
-{
-  // avoid scope creep, the keys array can then be collected
-  var keys = objectKeys(Writable.prototype);
-  for (var v = 0; v < keys.length; v++) {
-    var method = keys[v];
-    if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method];
-  }
-}
-
-function Duplex(options) {
-  if (!(this instanceof Duplex)) return new Duplex(options);
-
-  Readable.call(this, options);
-  Writable.call(this, options);
-
-  if (options && options.readable === false) this.readable = false;
-
-  if (options && options.writable === false) this.writable = false;
-
-  this.allowHalfOpen = true;
-  if (options && options.allowHalfOpen === false) this.allowHalfOpen = false;
-
-  this.once('end', onend);
-}
-
-Object.defineProperty(Duplex.prototype, 'writableHighWaterMark', {
-  // making it explicit this property is not enumerable
-  // because otherwise some prototype manipulation in
-  // userland will fail
-  enumerable: false,
-  get: function () {
-    return this._writableState.highWaterMark;
-  }
-});
-
-// the no-half-open enforcer
-function onend() {
-  // if we allow half-open state, or if the writable side ended,
-  // then we're ok.
-  if (this.allowHalfOpen || this._writableState.ended) return;
-
-  // no more data can be written.
-  // But allow more writes to happen in this tick.
-  pna.nextTick(onEndNT, this);
-}
-
-function onEndNT(self) {
-  self.end();
-}
-
-Object.defineProperty(Duplex.prototype, 'destroyed', {
-  get: function () {
-    if (this._readableState === undefined || this._writableState === undefined) {
-      return false;
-    }
-    return this._readableState.destroyed && this._writableState.destroyed;
-  },
-  set: function (value) {
-    // we ignore the value if the stream
-    // has not been initialized yet
-    if (this._readableState === undefined || this._writableState === undefined) {
-      return;
-    }
-
-    // backward compatibility, the user is explicitly
-    // managing destroyed
-    this._readableState.destroyed = value;
-    this._writableState.destroyed = value;
-  }
-});
-
-Duplex.prototype._destroy = function (err, cb) {
-  this.push(null);
-  this.end();
-
-  pna.nextTick(cb, err);
-};
-
-/***/ }),
-/* 116 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = multicast;
-/* unused harmony export MulticastOperator */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__ = __webpack_require__(423);
-/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */
-
-function multicast(subjectOrSubjectFactory, selector) {
-    return function multicastOperatorFunction(source) {
-        var subjectFactory;
-        if (typeof subjectOrSubjectFactory === 'function') {
-            subjectFactory = subjectOrSubjectFactory;
-        }
-        else {
-            subjectFactory = function subjectFactory() {
-                return subjectOrSubjectFactory;
-            };
-        }
-        if (typeof selector === 'function') {
-            return source.lift(new MulticastOperator(subjectFactory, selector));
-        }
-        var connectable = Object.create(source, __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__["b" /* connectableObservableDescriptor */]);
-        connectable.source = source;
-        connectable.subjectFactory = subjectFactory;
-        return connectable;
-    };
-}
-var MulticastOperator = /*@__PURE__*/ (function () {
-    function MulticastOperator(subjectFactory, selector) {
-        this.subjectFactory = subjectFactory;
-        this.selector = selector;
-    }
-    MulticastOperator.prototype.call = function (subscriber, source) {
-        var selector = this.selector;
-        var subject = this.subjectFactory();
-        var subscription = selector(subject).subscribe(subscriber);
-        subscription.add(source.subscribe(subject));
-        return subscription;
-    };
-    return MulticastOperator;
-}());
-
-//# sourceMappingURL=multicast.js.map
-
-
-/***/ }),
-/* 117 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observable; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var observable = typeof Symbol === 'function' && Symbol.observable || '@@observable';
-//# sourceMappingURL=observable.js.map
-
-
-/***/ }),
-/* 118 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = identity;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function identity(x) {
-    return x;
-}
-//# sourceMappingURL=identity.js.map
-
-
-/***/ }),
-/* 119 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var v1 = __webpack_require__(957);
-var v4 = __webpack_require__(958);
-
-var uuid = v4;
-uuid.v1 = v1;
-uuid.v4 = v4;
-
-module.exports = uuid;
-
-
-/***/ }),
-/* 120 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getInstallationMethod = exports.version = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getInstallationMethod = exports.getInstallationMethod = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-    let installationMethod = originalInstallationMethod;
-
-    // If there's a package.json in the parent directory, it could have an
-    // override for the installation method, so we should prefer that over
-    // whatever was originally in Yarn's package.json. This is the case with
-    // systems such as Homebrew, which take the tarball and modify the
-    // installation method so we're aware of the fact that Yarn was installed via
-    // Homebrew (so things like update notifications can point out the correct
-    // command to upgrade).
-    try {
-      const manifestPath = (_path || _load_path()).default.join(__dirname, '..', 'package.json');
-      if ((_fs2 || _load_fs2()).default.existsSync(manifestPath)) {
-        // non-async version is deprecated
-        const manifest = yield (0, (_fs || _load_fs()).readJson)(manifestPath);
-        if (manifest.installationMethod) {
-          installationMethod = manifest.installationMethod;
-        }
-      }
-    } catch (e) {
-      // Ignore any errors; this is not critical functionality.
-    }
-    return installationMethod;
-  });
-
-  return function getInstallationMethod() {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-var _fs;
-
-function _load_fs() {
-  return _fs = __webpack_require__(4);
-}
-
-var _fs2;
-
-function _load_fs2() {
-  return _fs2 = _interopRequireDefault(__webpack_require__(5));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// This will be bundled directly in the .js file for production builds
-var _require = __webpack_require__(194); /**
-                                               * Determines the current version of Yarn itself.
-                                               * 
-                                               */
-
-const version = _require.version,
-      originalInstallationMethod = _require.installationMethod;
-exports.version = version;
-
-/***/ }),
-/* 121 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.getBinFolder = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let updateCwd = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    yield (_fs || _load_fs()).mkdirp(config.globalFolder);
-
-    yield config.init({
-      cwd: config.globalFolder,
-      offline: config.offline,
-      binLinks: true,
-      globalFolder: config.globalFolder,
-      cacheFolder: config._cacheRootFolder,
-      linkFolder: config.linkFolder,
-      enableDefaultRc: config.enableDefaultRc,
-      extraneousYarnrcFiles: config.extraneousYarnrcFiles
-    });
-  });
-
-  return function updateCwd(_x) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let getBins = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    // build up list of registry folders to search for binaries
-    const dirs = [];
-    for (var _iterator2 = Object.keys((_index || _load_index()).registries), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref4 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref4 = _i2.value;
-      }
-
-      const registryName = _ref4;
-
-      const registry = config.registries[registryName];
-      dirs.push(registry.loc);
-    }
-
-    // build up list of binary files
-    const paths = new Set();
-    for (var _iterator3 = dirs, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref5;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref5 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref5 = _i3.value;
-      }
-
-      const dir = _ref5;
-
-      const binDir = path.join(dir, '.bin');
-      if (!(yield (_fs || _load_fs()).exists(binDir))) {
-        continue;
-      }
-
-      for (var _iterator4 = yield (_fs || _load_fs()).readdir(binDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray4) {
-          if (_i4 >= _iterator4.length) break;
-          _ref6 = _iterator4[_i4++];
-        } else {
-          _i4 = _iterator4.next();
-          if (_i4.done) break;
-          _ref6 = _i4.value;
-        }
-
-        const name = _ref6;
-
-        paths.add(path.join(binDir, name));
-      }
-    }
-    return paths;
-  });
-
-  return function getBins(_x2) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-let getGlobalPrefix = (() => {
-  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags) {
-    if (flags.prefix) {
-      return flags.prefix;
-    } else if (config.getOption('prefix', true)) {
-      return String(config.getOption('prefix', true));
-    } else if (process.env.PREFIX) {
-      return process.env.PREFIX;
-    }
-
-    const potentialPrefixFolders = [(_constants || _load_constants()).FALLBACK_GLOBAL_PREFIX];
-    if (process.platform === 'win32') {
-      // %LOCALAPPDATA%\Yarn --> C:\Users\Alice\AppData\Local\Yarn
-      if (process.env.LOCALAPPDATA) {
-        potentialPrefixFolders.unshift(path.join(process.env.LOCALAPPDATA, 'Yarn'));
-      }
-    } else {
-      potentialPrefixFolders.unshift((_constants || _load_constants()).POSIX_GLOBAL_PREFIX);
-    }
-
-    const binFolders = potentialPrefixFolders.map(function (prefix) {
-      return path.join(prefix, 'bin');
-    });
-    const prefixFolderQueryResult = yield (_fs || _load_fs()).getFirstSuitableFolder(binFolders);
-    const prefix = prefixFolderQueryResult.folder && path.dirname(prefixFolderQueryResult.folder);
-
-    if (!prefix) {
-      config.reporter.warn(config.reporter.lang('noGlobalFolder', prefixFolderQueryResult.skipped.map(function (item) {
-        return path.dirname(item.folder);
-      }).join(', ')));
-
-      return (_constants || _load_constants()).FALLBACK_GLOBAL_PREFIX;
-    }
-
-    return prefix;
-  });
-
-  return function getGlobalPrefix(_x3, _x4) {
-    return _ref7.apply(this, arguments);
-  };
-})();
-
-let getBinFolder = exports.getBinFolder = (() => {
-  var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags) {
-    const prefix = yield getGlobalPrefix(config, flags);
-    return path.resolve(prefix, 'bin');
-  });
-
-  return function getBinFolder(_x5, _x6) {
-    return _ref8.apply(this, arguments);
-  };
-})();
-
-let initUpdateBins = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags) {
-    const beforeBins = yield getBins(config);
-    const binFolder = yield getBinFolder(config, flags);
-
-    function throwPermError(err, dest) {
-      if (err.code === 'EACCES') {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('noPermission', dest));
-      } else {
-        throw err;
-      }
-    }
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      try {
-        yield (_fs || _load_fs()).mkdirp(binFolder);
-      } catch (err) {
-        throwPermError(err, binFolder);
-      }
-
-      const afterBins = yield getBins(config);
-
-      // remove old bins
-      for (var _iterator5 = beforeBins, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref11;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref11 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref11 = _i5.value;
-        }
-
-        const src = _ref11;
-
-        if (afterBins.has(src)) {
-          // not old
-          continue;
-        }
-
-        // remove old bin
-        const dest = path.join(binFolder, path.basename(src));
-        try {
-          yield (_fs || _load_fs()).unlink(dest);
-        } catch (err) {
-          throwPermError(err, dest);
-        }
-      }
-
-      // add new bins
-      for (var _iterator6 = afterBins, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-        var _ref12;
-
-        if (_isArray6) {
-          if (_i6 >= _iterator6.length) break;
-          _ref12 = _iterator6[_i6++];
-        } else {
-          _i6 = _iterator6.next();
-          if (_i6.done) break;
-          _ref12 = _i6.value;
-        }
-
-        const src = _ref12;
-
-        // insert new bin
-        const dest = path.join(binFolder, path.basename(src));
-        try {
-          yield (_fs || _load_fs()).unlink(dest);
-          yield (0, (_packageLinker || _load_packageLinker()).linkBin)(src, dest);
-          if (process.platform === 'win32' && dest.indexOf('.cmd') !== -1) {
-            yield (_fs || _load_fs()).rename(dest + '.cmd', dest);
-          }
-        } catch (err) {
-          throwPermError(err, dest);
-        }
-      }
-    });
-  });
-
-  return function initUpdateBins(_x7, _x8, _x9) {
-    return _ref9.apply(this, arguments);
-  };
-})();
-
-let list = (() => {
-  var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    yield updateCwd(config);
-
-    // install so we get hard file paths
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
-    const install = new (_install || _load_install()).Install({}, config, new (_baseReporter || _load_baseReporter()).default(), lockfile);
-    const patterns = yield install.getFlattenedDeps();
-
-    // dump global modules
-    for (var _iterator7 = patterns, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-      var _ref14;
-
-      if (_isArray7) {
-        if (_i7 >= _iterator7.length) break;
-        _ref14 = _iterator7[_i7++];
-      } else {
-        _i7 = _iterator7.next();
-        if (_i7.done) break;
-        _ref14 = _i7.value;
-      }
-
-      const pattern = _ref14;
-
-      const manifest = install.resolver.getStrictResolvedPattern(pattern);
-      ls(manifest, reporter, false);
-    }
-  });
-
-  return function list(_x10, _x11, _x12, _x13) {
-    return _ref13.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(57);
-}
-
-var _baseReporter;
-
-function _load_baseReporter() {
-  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
-}
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _add;
-
-function _load_add() {
-  return _add = __webpack_require__(165);
-}
-
-var _remove;
-
-function _load_remove() {
-  return _remove = __webpack_require__(359);
-}
-
-var _upgrade;
-
-function _load_upgrade() {
-  return _upgrade = __webpack_require__(207);
-}
-
-var _upgradeInteractive;
-
-function _load_upgradeInteractive() {
-  return _upgradeInteractive = __webpack_require__(362);
-}
-
-var _packageLinker;
-
-function _load_packageLinker() {
-  return _packageLinker = __webpack_require__(211);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class GlobalAdd extends (_add || _load_add()).Add {
-  constructor(args, flags, config, reporter, lockfile) {
-    super(args, flags, config, reporter, lockfile);
-
-    this.linker.setTopLevelBinLinking(false);
-  }
-
-  maybeOutputSaveTree() {
-    for (var _iterator = this.addedPatterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const pattern = _ref;
-
-      const manifest = this.resolver.getStrictResolvedPattern(pattern);
-      ls(manifest, this.reporter, true);
-    }
-    return Promise.resolve();
-  }
-
-  _logSuccessSaveLockfile() {
-    // noop
-  }
-}
-
-const path = __webpack_require__(0);
-
-function hasWrapper(flags, args) {
-  return args[0] !== 'bin' && args[0] !== 'dir';
-}
-
-function ls(manifest, reporter, saved) {
-  const bins = manifest.bin ? Object.keys(manifest.bin) : [];
-  const human = `${manifest.name}@${manifest.version}`;
-  if (bins.length) {
-    if (saved) {
-      reporter.success(reporter.lang('packageInstalledWithBinaries', human));
-    } else {
-      reporter.info(reporter.lang('packageHasBinaries', human));
-    }
-    reporter.list(`bins-${manifest.name}`, bins);
-  } else if (saved) {
-    reporter.warn(reporter.lang('packageHasNoBinaries', human));
-  }
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('global', {
-  add(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield updateCwd(config);
-
-      const updateBins = yield initUpdateBins(config, reporter, flags);
-      if (args.indexOf('yarn') !== -1) {
-        reporter.warn(reporter.lang('packageContainsYarnAsGlobal'));
-      }
-
-      // install module
-      const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
-      const install = new GlobalAdd(args, flags, config, reporter, lockfile);
-      yield install.init();
-
-      // link binaries
-      yield updateBins();
-    })();
-  },
-
-  bin(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      reporter.log((yield getBinFolder(config, flags)), { force: true });
-    })();
-  },
-
-  dir(config, reporter, flags, args) {
-    reporter.log(config.globalFolder, { force: true });
-    return Promise.resolve();
-  },
-
-  ls(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      reporter.warn(`\`yarn global ls\` is deprecated. Please use \`yarn global list\`.`);
-      yield list(config, reporter, flags, args);
-    })();
-  },
-
-  list(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield list(config, reporter, flags, args);
-    })();
-  },
-
-  remove(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield updateCwd(config);
-
-      const updateBins = yield initUpdateBins(config, reporter, flags);
-
-      // remove module
-      yield (0, (_remove || _load_remove()).run)(config, reporter, flags, args);
-
-      // remove binaries
-      yield updateBins();
-    })();
-  },
-
-  upgrade(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield updateCwd(config);
-
-      const updateBins = yield initUpdateBins(config, reporter, flags);
-
-      // upgrade module
-      yield (0, (_upgrade || _load_upgrade()).run)(config, reporter, flags, args);
-
-      // update binaries
-      yield updateBins();
-    })();
-  },
-
-  upgradeInteractive(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield updateCwd(config);
-
-      const updateBins = yield initUpdateBins(config, reporter, flags);
-
-      // upgrade module
-      yield (0, (_upgradeInteractive || _load_upgradeInteractive()).run)(config, reporter, flags, args);
-
-      // update binaries
-      yield updateBins();
-    })();
-  }
-});
-
-const run = _buildSubCommands.run,
-      _setFlags = _buildSubCommands.setFlags;
-exports.run = run;
-function setFlags(commander) {
-  _setFlags(commander);
-  commander.description('Installs packages globally on your operating system.');
-  commander.option('--prefix <prefix>', 'bin prefix to use to install binaries');
-  commander.option('--latest', 'upgrade to the latest version of packages');
-}
-
-/***/ }),
-/* 122 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-var _validate;
-
-function _load_validate() {
-  return _validate = __webpack_require__(125);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _packageReference;
-
-function _load_packageReference() {
-  return _packageReference = _interopRequireDefault(__webpack_require__(365));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(78);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _version;
-
-function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(226));
-}
-
-var _workspaceResolver;
-
-function _load_workspaceResolver() {
-  return _workspaceResolver = _interopRequireDefault(__webpack_require__(570));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _normalizePattern4;
-
-function _load_normalizePattern() {
-  return _normalizePattern4 = __webpack_require__(37);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const micromatch = __webpack_require__(114);
-
-class PackageRequest {
-  constructor(req, resolver) {
-    this.parentRequest = req.parentRequest;
-    this.parentNames = req.parentNames || [];
-    this.lockfile = resolver.lockfile;
-    this.registry = req.registry;
-    this.reporter = resolver.reporter;
-    this.resolver = resolver;
-    this.optional = req.optional;
-    this.hint = req.hint;
-    this.pattern = req.pattern;
-    this.config = resolver.config;
-    this.foundInfo = null;
-  }
-
-  init() {
-    this.resolver.usedRegistries.add(this.registry);
-  }
-
-  getLocked(remoteType) {
-    // always prioritise root lockfile
-    const shrunk = this.lockfile.getLocked(this.pattern);
-
-    if (shrunk && shrunk.resolved) {
-      const resolvedParts = (_version || _load_version()).explodeHashedUrl(shrunk.resolved);
-
-      // Detect Git protocols (git://HOST/PATH or git+PROTOCOL://HOST/PATH)
-      const preferredRemoteType = /^git(\+[a-z0-9]+)?:\/\//.test(resolvedParts.url) ? 'git' : remoteType;
-
-      return {
-        name: shrunk.name,
-        version: shrunk.version,
-        _uid: shrunk.uid,
-        _remote: {
-          resolved: shrunk.resolved,
-          type: preferredRemoteType,
-          reference: resolvedParts.url,
-          hash: resolvedParts.hash,
-          integrity: shrunk.integrity,
-          registry: shrunk.registry,
-          packageName: shrunk.name
-        },
-        optionalDependencies: shrunk.optionalDependencies || {},
-        dependencies: shrunk.dependencies || {},
-        prebuiltVariants: shrunk.prebuiltVariants || {}
-      };
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * If the input pattern matches a registry one then attempt to find it on the registry.
-   * Otherwise fork off to an exotic resolver if one matches.
-   */
-
-  findVersionOnRegistry(pattern) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _ref = yield _this.normalize(pattern);
-
-      const range = _ref.range,
-            name = _ref.name;
-
-
-      const exoticResolver = (0, (_index || _load_index()).getExoticResolver)(range);
-      if (exoticResolver) {
-        let data = yield _this.findExoticVersionInfo(exoticResolver, range);
-
-        // clone data as we're manipulating it in place and this could be resolved multiple
-        // times
-        data = Object.assign({}, data);
-
-        // this is so the returned package response uses the overridden name. ie. if the
-        // package's actual name is `bar`, but it's been specified in the manifest like:
-        //   "foo": "http://foo.com/bar.tar.gz"
-        // then we use the foo name
-        data.name = name;
-        return data;
-      }
-
-      const Resolver = _this.getRegistryResolver();
-      const resolver = new Resolver(_this, name, range);
-      try {
-        return yield resolver.resolve();
-      } catch (err) {
-        // if it is not an error thrown by yarn and it has a parent request,
-        // thow a more readable error
-        if (!(err instanceof (_errors || _load_errors()).MessageError) && _this.parentRequest && _this.parentRequest.pattern) {
-          throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('requiredPackageNotFoundRegistry', pattern, _this.parentRequest.pattern, _this.registry));
-        }
-        throw err;
-      }
-    })();
-  }
-
-  /**
-   * Get the registry resolver associated with this package request.
-   */
-
-  getRegistryResolver() {
-    const Resolver = (_index || _load_index()).registries[this.registry];
-    if (Resolver) {
-      return Resolver;
-    } else {
-      throw new (_errors || _load_errors()).MessageError(this.reporter.lang('unknownRegistryResolver', this.registry));
-    }
-  }
-
-  normalizeRange(pattern) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (pattern.indexOf(':') > -1 || pattern.indexOf('@') > -1 || (0, (_index || _load_index()).getExoticResolver)(pattern)) {
-        return pattern;
-      }
-
-      if (!(_semver || _load_semver()).default.validRange(pattern)) {
-        try {
-          if (yield (_fs || _load_fs()).exists((_path || _load_path()).default.join(_this2.config.cwd, pattern, (_constants || _load_constants()).NODE_PACKAGE_JSON))) {
-            _this2.reporter.warn(_this2.reporter.lang('implicitFileDeprecated', pattern));
-            return `file:${pattern}`;
-          }
-        } catch (err) {
-          // pass
-        }
-      }
-
-      return pattern;
-    })();
-  }
-
-  normalize(pattern) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _normalizePattern = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern);
-
-      const name = _normalizePattern.name,
-            range = _normalizePattern.range,
-            hasVersion = _normalizePattern.hasVersion;
-
-      const newRange = yield _this3.normalizeRange(range);
-      return { name, range: newRange, hasVersion };
-    })();
-  }
-
-  /**
-   * Construct an exotic resolver instance with the input `ExoticResolver` and `range`.
-   */
-
-  findExoticVersionInfo(ExoticResolver, range) {
-    const resolver = new ExoticResolver(this, range);
-    return resolver.resolve();
-  }
-
-  /**
-   * If the current pattern matches an exotic resolver then delegate to it or else try
-   * the registry.
-   */
-
-  findVersionInfo() {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const exoticResolver = (0, (_index || _load_index()).getExoticResolver)(_this4.pattern);
-      if (exoticResolver) {
-        return _this4.findExoticVersionInfo(exoticResolver, _this4.pattern);
-      } else if ((_workspaceResolver || _load_workspaceResolver()).default.isWorkspace(_this4.pattern, _this4.resolver.workspaceLayout)) {
-        (0, (_invariant || _load_invariant()).default)(_this4.resolver.workspaceLayout, 'expected workspaceLayout');
-        const resolver = new (_workspaceResolver || _load_workspaceResolver()).default(_this4, _this4.pattern, _this4.resolver.workspaceLayout);
-        let manifest;
-        if (_this4.config.focus && !_this4.pattern.includes(_this4.resolver.workspaceLayout.virtualManifestName) && !_this4.pattern.startsWith(_this4.config.focusedWorkspaceName + '@')) {
-          const localInfo = _this4.resolver.workspaceLayout.getManifestByPattern(_this4.pattern);
-          (0, (_invariant || _load_invariant()).default)(localInfo, 'expected local info for ' + _this4.pattern);
-          const localManifest = localInfo.manifest;
-          const requestPattern = localManifest.name + '@' + localManifest.version;
-          manifest = yield _this4.findVersionOnRegistry(requestPattern);
-        }
-        return resolver.resolve(manifest);
-      } else {
-        return _this4.findVersionOnRegistry(_this4.pattern);
-      }
-    })();
-  }
-
-  reportResolvedRangeMatch(info, resolved) {}
-
-  /**
-   * Do the final resolve of a package that had a match with an existing version.
-   * After all unique versions have been discovered, so the best available version
-   * is found.
-   */
-  resolveToExistingVersion(info) {
-    // get final resolved version
-    var _normalizePattern2 = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(this.pattern);
-
-    const range = _normalizePattern2.range,
-          name = _normalizePattern2.name;
-
-    const solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range;
-    const resolved = this.resolver.getHighestRangeVersionMatch(name, solvedRange, info);
-    (0, (_invariant || _load_invariant()).default)(resolved, 'should have a resolved reference');
-
-    this.reportResolvedRangeMatch(info, resolved);
-    const ref = resolved._reference;
-    (0, (_invariant || _load_invariant()).default)(ref, 'Resolved package info has no package reference');
-    ref.addRequest(this);
-    ref.addPattern(this.pattern, resolved);
-    ref.addOptional(this.optional);
-  }
-
-  /**
-   * TODO description
-   */
-  find({ fresh, frozen }) {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // find version info for this package pattern
-      const info = yield _this5.findVersionInfo();
-
-      if (!(_semver || _load_semver()).default.valid(info.version)) {
-        throw new (_errors || _load_errors()).MessageError(_this5.reporter.lang('invalidPackageVersion', info.name, info.version));
-      }
-
-      info.fresh = fresh;
-      (0, (_validate || _load_validate()).cleanDependencies)(info, false, _this5.reporter, function () {
-        // swallow warnings
-      });
-
-      // check if while we were resolving this dep we've already resolved one that satisfies
-      // the same range
-
-      var _normalizePattern3 = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(_this5.pattern);
-
-      const range = _normalizePattern3.range,
-            name = _normalizePattern3.name;
-
-      const solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range;
-      const resolved = !info.fresh || frozen ? _this5.resolver.getExactVersionMatch(name, solvedRange, info) : _this5.resolver.getHighestRangeVersionMatch(name, solvedRange, info);
-
-      if (resolved) {
-        _this5.resolver.reportPackageWithExistingVersion(_this5, info);
-        return;
-      }
-
-      if (info.flat && !_this5.resolver.flat) {
-        throw new (_errors || _load_errors()).MessageError(_this5.reporter.lang('flatGlobalError', `${info.name}@${info.version}`));
-      }
-
-      // validate version info
-      PackageRequest.validateVersionInfo(info, _this5.reporter);
-
-      //
-      const remote = info._remote;
-      (0, (_invariant || _load_invariant()).default)(remote, 'Missing remote');
-
-      // set package reference
-      const ref = new (_packageReference || _load_packageReference()).default(_this5, info, remote);
-      ref.addPattern(_this5.pattern, info);
-      ref.addOptional(_this5.optional);
-      ref.setFresh(fresh);
-      info._reference = ref;
-      info._remote = remote;
-      // start installation of dependencies
-      const promises = [];
-      const deps = [];
-      const parentNames = [..._this5.parentNames, name];
-      // normal deps
-      for (const depName in info.dependencies) {
-        const depPattern = depName + '@' + info.dependencies[depName];
-        deps.push(depPattern);
-        promises.push(_this5.resolver.find({
-          pattern: depPattern,
-          registry: remote.registry,
-          // dependencies of optional dependencies should themselves be optional
-          optional: _this5.optional,
-          parentRequest: _this5,
-          parentNames
-        }));
-      }
-
-      // optional deps
-      for (const depName in info.optionalDependencies) {
-        const depPattern = depName + '@' + info.optionalDependencies[depName];
-        deps.push(depPattern);
-        promises.push(_this5.resolver.find({
-          hint: 'optional',
-          pattern: depPattern,
-          registry: remote.registry,
-          optional: true,
-          parentRequest: _this5,
-          parentNames
-        }));
-      }
-      if (remote.type === 'workspace' && !_this5.config.production) {
-        // workspaces support dev dependencies
-        for (const depName in info.devDependencies) {
-          const depPattern = depName + '@' + info.devDependencies[depName];
-          deps.push(depPattern);
-          promises.push(_this5.resolver.find({
-            hint: 'dev',
-            pattern: depPattern,
-            registry: remote.registry,
-            optional: false,
-            parentRequest: _this5,
-            parentNames
-          }));
-        }
-      }
-
-      for (var _iterator = promises, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref2 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref2 = _i.value;
-        }
-
-        const promise = _ref2;
-
-        yield promise;
-      }
-
-      ref.addDependencies(deps);
-
-      // Now that we have all dependencies, it's safe to propagate optional
-      for (var _iterator2 = ref.requests.slice(1), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const otherRequest = _ref3;
-
-        ref.addOptional(otherRequest.optional);
-      }
-    })();
-  }
-
-  /**
-   * TODO description
-   */
-
-  static validateVersionInfo(info, reporter) {
-    // human readable name to use in errors
-    const human = `${info.name}@${info.version}`;
-
-    info.version = PackageRequest.getPackageVersion(info);
-
-    for (var _iterator3 = (_constants || _load_constants()).REQUIRED_PACKAGE_KEYS, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
-
-      const key = _ref4;
-
-      if (!info[key]) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('missingRequiredPackageKey', human, key));
-      }
-    }
-  }
-
-  /**
-   * Returns the package version if present, else defaults to the uid
-   */
-
-  static getPackageVersion(info) {
-    // TODO possibly reconsider this behaviour
-    return info.version === undefined ? info._uid : info.version;
-  }
-
-  /**
-   * Gets all of the outdated packages and sorts them appropriately
-   */
-
-  static getOutdatedPackages(lockfile, install, config, reporter, filterByPatterns, flags) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _ref5 = yield install.fetchRequestFromCwd();
-
-      const reqPatterns = _ref5.requests,
-            workspaceLayout = _ref5.workspaceLayout;
-
-      // Filter out workspace patterns if necessary
-
-      let depReqPatterns = workspaceLayout ? reqPatterns.filter(function (p) {
-        return !workspaceLayout.getManifestByPattern(p.pattern);
-      }) : reqPatterns;
-
-      // filter the list down to just the packages requested.
-      // prevents us from having to query the metadata for all packages.
-      if (filterByPatterns && filterByPatterns.length || flags && flags.pattern) {
-        const filterByNames = filterByPatterns && filterByPatterns.length ? filterByPatterns.map(function (pattern) {
-          return (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern).name;
-        }) : [];
-        depReqPatterns = depReqPatterns.filter(function (dep) {
-          return filterByNames.indexOf((0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(dep.pattern).name) >= 0 || flags && flags.pattern && micromatch.contains((0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(dep.pattern).name, flags.pattern);
-        });
-      }
-
-      const deps = yield Promise.all(depReqPatterns.map((() => {
-        var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({ pattern, hint, workspaceName, workspaceLoc }) {
-          const locked = lockfile.getLocked(pattern);
-          if (!locked) {
-            throw new (_errors || _load_errors()).MessageError(reporter.lang('lockfileOutdated'));
-          }
-
-          const name = locked.name,
-                current = locked.version;
-
-          let latest = '';
-          let wanted = '';
-          let url = '';
-
-          const normalized = (0, (_normalizePattern4 || _load_normalizePattern()).normalizePattern)(pattern);
-
-          if ((0, (_index || _load_index()).getExoticResolver)(pattern) || (0, (_index || _load_index()).getExoticResolver)(normalized.range)) {
-            latest = wanted = 'exotic';
-            url = normalized.range;
-          } else {
-            const registry = config.registries[locked.registry];
-
-            var _ref7 = yield registry.checkOutdated(config, name, normalized.range);
-
-            latest = _ref7.latest;
-            wanted = _ref7.wanted;
-            url = _ref7.url;
-          }
-
-          return {
-            name,
-            current,
-            wanted,
-            latest,
-            url,
-            hint,
-            range: normalized.range,
-            upgradeTo: '',
-            workspaceName: workspaceName || '',
-            workspaceLoc: workspaceLoc || ''
-          };
-        });
-
-        return function (_x) {
-          return _ref6.apply(this, arguments);
-        };
-      })()));
-
-      // Make sure to always output `exotic` versions to be compatible with npm
-      const isDepOld = function isDepOld({ current, latest, wanted }) {
-        return latest === 'exotic' || (_semver || _load_semver()).default.lt(current, wanted) || (_semver || _load_semver()).default.lt(current, latest);
-      };
-      const orderByName = function orderByName(depA, depB) {
-        return depA.name.localeCompare(depB.name);
-      };
-      return deps.filter(isDepOld).sort(orderByName);
-    })();
-  }
-}
-exports.default = PackageRequest;
-
-/***/ }),
-/* 123 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-class BaseResolver {
-  constructor(request, fragment) {
-    this.resolver = request.resolver;
-    this.reporter = request.reporter;
-    this.fragment = fragment;
-    this.registry = request.registry;
-    this.request = request;
-    this.pattern = request.pattern;
-    this.config = request.config;
-  }
-
-  fork(Resolver, resolveArg, ...args) {
-    const resolver = new Resolver(this.request, ...args);
-    resolver.registry = this.registry;
-    return resolver.resolve(resolveArg);
-  }
-
-  resolve(resolveArg) {
-    throw new Error('Not implemented');
-  }
-}
-exports.default = BaseResolver;
-
-/***/ }),
-/* 124 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(78);
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = _interopRequireWildcard(__webpack_require__(18));
-}
-
-var _version;
-
-function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(226));
-}
-
-var _guessName;
-
-function _load_guessName() {
-  return _guessName = _interopRequireDefault(__webpack_require__(169));
-}
-
-var _index2;
-
-function _load_index2() {
-  return _index2 = __webpack_require__(57);
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-var _git;
-
-function _load_git() {
-  return _git = _interopRequireDefault(__webpack_require__(219));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const urlParse = __webpack_require__(24).parse;
-
-const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org'];
-
-const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/];
-
-class GitResolver extends (_exoticResolver || _load_exoticResolver()).default {
-  constructor(request, fragment) {
-    super(request, fragment);
-
-    var _versionUtil$explodeH = (_version || _load_version()).explodeHashedUrl(fragment);
-
-    const url = _versionUtil$explodeH.url,
-          hash = _versionUtil$explodeH.hash;
-
-    this.url = url;
-    this.hash = hash;
-  }
-
-  static isVersion(pattern) {
-    for (var _iterator = GIT_PATTERN_MATCHERS, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const matcher = _ref;
-
-      if (matcher.test(pattern)) {
-        return true;
-      }
-    }
-
-    var _urlParse = urlParse(pattern);
-
-    const hostname = _urlParse.hostname,
-          path = _urlParse.path;
-
-    if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0) {
-      // only if dependency is pointing to a git repo,
-      // e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz
-      return path.split('/').filter(p => !!p).length === 2;
-    }
-
-    return false;
-  }
-
-  resolve(forked) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let tryRegistry = (() => {
-        var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (registry) {
-          const filename = (_index2 || _load_index2()).registries[registry].filename;
-
-          const file = yield client.getFile(filename);
-          if (!file) {
-            return null;
-          }
-
-          const json = yield config.readJson(`${url}/${filename}`, function () {
-            return JSON.parse(file);
-          });
-          json._uid = commit;
-          json._remote = {
-            resolved: `${url}#${commit}`,
-            type: 'git',
-            reference: url,
-            hash: commit,
-            registry
-          };
-          return json;
-        });
-
-        return function tryRegistry(_x) {
-          return _ref2.apply(this, arguments);
-        };
-      })();
-
-      const url = _this.url;
-
-      // shortcut for hosted git. we will fallback to a GitResolver if the hosted git
-      // optimisations fail which the `forked` flag indicates so we don't get into an
-      // infinite loop
-
-      const parts = urlParse(url);
-      if (false) {
-        // check if this git url uses any of the hostnames defined in our hosted git resolvers
-        for (const name in (_index || _load_index()).hostedGit) {
-          const Resolver = (_index || _load_index()).hostedGit[name];
-          if (Resolver.hostname !== parts.hostname) {
-            continue;
-          }
-
-          // we have a match! clean up the pathname of url artifacts
-          let pathname = parts.pathname;
-          pathname = (_misc || _load_misc()).removePrefix(pathname, '/'); // remove prefixed slash
-          pathname = (_misc || _load_misc()).removeSuffix(pathname, '.git'); // remove .git suffix if present
-
-          const url = `${pathname}${_this.hash ? '#' + decodeURIComponent(_this.hash) : ''}`;
-          return _this.fork(Resolver, false, url);
-        }
-      }
-
-      // get from lockfile
-      const shrunk = _this.request.getLocked('git');
-      if (shrunk) {
-        return shrunk;
-      }
-
-      const config = _this.config;
-
-
-      const gitUrl = (_git || _load_git()).default.npmUrlToGitUrl(url);
-      const client = new (_git || _load_git()).default(config, gitUrl, _this.hash);
-      const commit = yield client.init();
-
-      const file = yield tryRegistry(_this.registry);
-      if (file) {
-        return file;
-      }
-
-      for (const registry in (_index2 || _load_index2()).registries) {
-        if (registry === _this.registry) {
-          continue;
-        }
-
-        const file = yield tryRegistry(registry);
-        if (file) {
-          return file;
-        }
-      }
-
-      return {
-        // This is just the default, it can be overridden with key of dependencies
-        name: (0, (_guessName || _load_guessName()).default)(url),
-        version: '0.0.0',
-        _uid: commit,
-        _remote: {
-          resolved: `${url}#${commit}`,
-          type: 'git',
-          reference: url,
-          hash: commit,
-          registry: 'npm'
-        }
-      };
-    })();
-  }
-}
-exports.default = GitResolver;
-
-/***/ }),
-/* 125 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isValidPackageName = isValidPackageName;
-
-exports.default = function (info, isRoot, reporter, warn) {
-  if (isRoot) {
-    for (const key in (_typos || _load_typos()).default) {
-      if (key in info) {
-        warn(reporter.lang('manifestPotentialTypo', key, (_typos || _load_typos()).default[key]));
-      }
-    }
-  }
-
-  // validate name
-  const name = info.name;
-
-  if (typeof name === 'string') {
-    if (isRoot && isBuiltinModule(name)) {
-      warn(reporter.lang('manifestBuiltinModule', name));
-    }
-
-    // cannot start with a dot
-    if (name[0] === '.') {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestNameDot'));
-    }
-
-    // cannot contain the following characters
-    if (!isValidPackageName(name)) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestNameIllegalChars'));
-    }
-
-    // cannot equal node_modules or favicon.ico
-    const lower = name.toLowerCase();
-    if (lower === 'node_modules' || lower === 'favicon.ico') {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestNameBlacklisted'));
-    }
-  }
-
-  // validate license
-  if (isRoot && !info.private) {
-    if (typeof info.license === 'string') {
-      const license = info.license.replace(/\*$/g, '');
-      if (!(0, (_util || _load_util()).isValidLicense)(license)) {
-        warn(reporter.lang('manifestLicenseInvalid'));
-      }
-    } else {
-      warn(reporter.lang('manifestLicenseNone'));
-    }
-  }
-
-  // validate strings
-  for (var _iterator = strings, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const key = _ref;
-
-    const val = info[key];
-    if (val && typeof val !== 'string') {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('manifestStringExpected', key));
-    }
-  }
-
-  cleanDependencies(info, isRoot, reporter, warn);
-};
-
-exports.cleanDependencies = cleanDependencies;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _util;
-
-function _load_util() {
-  return _util = __webpack_require__(221);
-}
-
-var _typos;
-
-function _load_typos() {
-  return _typos = _interopRequireDefault(__webpack_require__(587));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const isBuiltinModule = __webpack_require__(730);
-
-const strings = ['name', 'version'];
-
-const dependencyKeys = [
-// npm registry will include optionalDependencies in dependencies and we'll want to dedupe them from the
-// other fields first
-'optionalDependencies',
-
-// it's seemingly common to include a dependency in dependencies and devDependencies of the same name but
-// different ranges, this can cause a lot of issues with our determinism and the behaviour of npm is
-// currently unspecified.
-'dependencies', 'devDependencies'];
-
-function isValidName(name) {
-  return !name.match(/[\/@\s\+%:]/) && encodeURIComponent(name) === name;
-}
-
-function isValidScopedName(name) {
-  if (name[0] !== '@') {
-    return false;
-  }
-
-  const parts = name.slice(1).split('/');
-  return parts.length === 2 && isValidName(parts[0]) && isValidName(parts[1]);
-}
-
-function isValidPackageName(name) {
-  return isValidName(name) || isValidScopedName(name);
-}
-
-function cleanDependencies(info, isRoot, reporter, warn) {
-  // get dependency objects
-  const depTypes = [];
-  for (var _iterator2 = dependencyKeys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-    var _ref2;
-
-    if (_isArray2) {
-      if (_i2 >= _iterator2.length) break;
-      _ref2 = _iterator2[_i2++];
-    } else {
-      _i2 = _iterator2.next();
-      if (_i2.done) break;
-      _ref2 = _i2.value;
-    }
-
-    const type = _ref2;
-
-    const deps = info[type];
-    if (!deps || typeof deps !== 'object') {
-      continue;
-    }
-    depTypes.push([type, deps]);
-  }
-
-  // aggregate all non-trivial deps (not '' or '*')
-  const nonTrivialDeps = new Map();
-  for (var _iterator3 = depTypes, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-    var _ref4;
-
-    if (_isArray3) {
-      if (_i3 >= _iterator3.length) break;
-      _ref4 = _iterator3[_i3++];
-    } else {
-      _i3 = _iterator3.next();
-      if (_i3.done) break;
-      _ref4 = _i3.value;
-    }
-
-    const _ref3 = _ref4;
-    const type = _ref3[0];
-    const deps = _ref3[1];
-
-    for (var _iterator5 = Object.keys(deps), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray5) {
-        if (_i5 >= _iterator5.length) break;
-        _ref7 = _iterator5[_i5++];
-      } else {
-        _i5 = _iterator5.next();
-        if (_i5.done) break;
-        _ref7 = _i5.value;
-      }
-
-      const name = _ref7;
-
-      const version = deps[name];
-      if (!nonTrivialDeps.has(name) && version && version !== '*') {
-        nonTrivialDeps.set(name, { type, version });
-      }
-    }
-  }
-
-  // overwrite first dep of package with non-trivial version, remove the rest
-  const setDeps = new Set();
-  for (var _iterator4 = depTypes, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-    var _ref6;
-
-    if (_isArray4) {
-      if (_i4 >= _iterator4.length) break;
-      _ref6 = _iterator4[_i4++];
-    } else {
-      _i4 = _iterator4.next();
-      if (_i4.done) break;
-      _ref6 = _i4.value;
-    }
-
-    const _ref5 = _ref6;
-    const type = _ref5[0];
-    const deps = _ref5[1];
-
-    for (var _iterator6 = Object.keys(deps), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-      var _ref8;
-
-      if (_isArray6) {
-        if (_i6 >= _iterator6.length) break;
-        _ref8 = _iterator6[_i6++];
-      } else {
-        _i6 = _iterator6.next();
-        if (_i6.done) break;
-        _ref8 = _i6.value;
-      }
-
-      const name = _ref8;
-
-      let version = deps[name];
-
-      const dep = nonTrivialDeps.get(name);
-      if (dep) {
-        if (version && version !== '*' && version !== dep.version && isRoot) {
-          // only throw a warning when at the root
-          warn(reporter.lang('manifestDependencyCollision', dep.type, name, dep.version, type, version));
-        }
-        version = dep.version;
-      }
-
-      if (setDeps.has(name)) {
-        delete deps[name];
-      } else {
-        deps[name] = version;
-        setDeps.add(name);
-      }
-    }
-  }
-}
-
-/***/ }),
-/* 126 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// getting tag from 19.1.3.6 Object.prototype.toString()
-var cof = __webpack_require__(68);
-var TAG = __webpack_require__(20)('toStringTag');
-// ES3 wrong here
-var ARG = cof(function () { return arguments; }()) == 'Arguments';
-
-// fallback for IE11 Script Access Denied error
-var tryGet = function (it, key) {
-  try {
-    return it[key];
-  } catch (e) { /* empty */ }
-};
-
-module.exports = function (it) {
-  var O, T, B;
-  return it === undefined ? 'Undefined' : it === null ? 'Null'
-    // @@toStringTag case
-    : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T
-    // builtinTag case
-    : ARG ? cof(O)
-    // ES3 arguments fallback
-    : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
-};
-
-
-/***/ }),
-/* 127 */
-/***/ (function(module, exports) {
-
-// IE 8- don't enum bug keys
-module.exports = (
-  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
-).split(',');
-
-
-/***/ }),
-/* 128 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var document = __webpack_require__(17).document;
-module.exports = document && document.documentElement;
-
-
-/***/ }),
-/* 129 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var LIBRARY = __webpack_require__(93);
-var $export = __webpack_require__(60);
-var redefine = __webpack_require__(251);
-var hide = __webpack_require__(42);
-var Iterators = __webpack_require__(53);
-var $iterCreate = __webpack_require__(242);
-var setToStringTag = __webpack_require__(95);
-var getPrototypeOf = __webpack_require__(248);
-var ITERATOR = __webpack_require__(20)('iterator');
-var BUGGY = !([].keys && 'next' in [].keys()); // Safari has buggy iterators w/o `next`
-var FF_ITERATOR = '@@iterator';
-var KEYS = 'keys';
-var VALUES = 'values';
-
-var returnThis = function () { return this; };
-
-module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
-  $iterCreate(Constructor, NAME, next);
-  var getMethod = function (kind) {
-    if (!BUGGY && kind in proto) return proto[kind];
-    switch (kind) {
-      case KEYS: return function keys() { return new Constructor(this, kind); };
-      case VALUES: return function values() { return new Constructor(this, kind); };
-    } return function entries() { return new Constructor(this, kind); };
-  };
-  var TAG = NAME + ' Iterator';
-  var DEF_VALUES = DEFAULT == VALUES;
-  var VALUES_BUG = false;
-  var proto = Base.prototype;
-  var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
-  var $default = $native || getMethod(DEFAULT);
-  var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
-  var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
-  var methods, key, IteratorPrototype;
-  // Fix native
-  if ($anyNative) {
-    IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
-    if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
-      // Set @@toStringTag to native iterators
-      setToStringTag(IteratorPrototype, TAG, true);
-      // fix for some old engines
-      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
-    }
-  }
-  // fix Array#{values, @@iterator}.name in V8 / FF
-  if (DEF_VALUES && $native && $native.name !== VALUES) {
-    VALUES_BUG = true;
-    $default = function values() { return $native.call(this); };
-  }
-  // Define iterator
-  if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
-    hide(proto, ITERATOR, $default);
-  }
-  // Plug for library
-  Iterators[NAME] = $default;
-  Iterators[TAG] = returnThis;
-  if (DEFAULT) {
-    methods = {
-      values: DEF_VALUES ? $default : getMethod(VALUES),
-      keys: IS_SET ? $default : getMethod(KEYS),
-      entries: $entries
-    };
-    if (FORCED) for (key in methods) {
-      if (!(key in proto)) redefine(proto, key, methods[key]);
-    } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
-  }
-  return methods;
-};
-
-
-/***/ }),
-/* 130 */
-/***/ (function(module, exports) {
-
-module.exports = function (exec) {
-  try {
-    return { e: false, v: exec() };
-  } catch (e) {
-    return { e: true, v: e };
-  }
-};
-
-
-/***/ }),
-/* 131 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var anObject = __webpack_require__(35);
-var isObject = __webpack_require__(52);
-var newPromiseCapability = __webpack_require__(94);
-
-module.exports = function (C, x) {
-  anObject(C);
-  if (isObject(x) && x.constructor === C) return x;
-  var promiseCapability = newPromiseCapability.f(C);
-  var resolve = promiseCapability.resolve;
-  resolve(x);
-  return promiseCapability.promise;
-};
-
-
-/***/ }),
-/* 132 */
-/***/ (function(module, exports) {
-
-module.exports = function (bitmap, value) {
-  return {
-    enumerable: !(bitmap & 1),
-    configurable: !(bitmap & 2),
-    writable: !(bitmap & 4),
-    value: value
-  };
-};
-
-
-/***/ }),
-/* 133 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var core = __webpack_require__(31);
-var global = __webpack_require__(17);
-var SHARED = '__core-js_shared__';
-var store = global[SHARED] || (global[SHARED] = {});
-
-(module.exports = function (key, value) {
-  return store[key] || (store[key] = value !== undefined ? value : {});
-})('versions', []).push({
-  version: core.version,
-  mode: __webpack_require__(93) ? 'pure' : 'global',
-  copyright: '© 2018 Denis Pushkarev (zloirock.ru)'
-});
-
-
-/***/ }),
-/* 134 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 7.3.20 SpeciesConstructor(O, defaultConstructor)
-var anObject = __webpack_require__(35);
-var aFunction = __webpack_require__(67);
-var SPECIES = __webpack_require__(20)('species');
-module.exports = function (O, D) {
-  var C = anObject(O).constructor;
-  var S;
-  return C === undefined || (S = anObject(C)[SPECIES]) == undefined ? D : aFunction(S);
-};
-
-
-/***/ }),
-/* 135 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var ctx = __webpack_require__(69);
-var invoke = __webpack_require__(239);
-var html = __webpack_require__(128);
-var cel = __webpack_require__(92);
-var global = __webpack_require__(17);
-var process = global.process;
-var setTask = global.setImmediate;
-var clearTask = global.clearImmediate;
-var MessageChannel = global.MessageChannel;
-var Dispatch = global.Dispatch;
-var counter = 0;
-var queue = {};
-var ONREADYSTATECHANGE = 'onreadystatechange';
-var defer, channel, port;
-var run = function () {
-  var id = +this;
-  // eslint-disable-next-line no-prototype-builtins
-  if (queue.hasOwnProperty(id)) {
-    var fn = queue[id];
-    delete queue[id];
-    fn();
-  }
-};
-var listener = function (event) {
-  run.call(event.data);
-};
-// Node.js 0.9+ & IE10+ has setImmediate, otherwise:
-if (!setTask || !clearTask) {
-  setTask = function setImmediate(fn) {
-    var args = [];
-    var i = 1;
-    while (arguments.length > i) args.push(arguments[i++]);
-    queue[++counter] = function () {
-      // eslint-disable-next-line no-new-func
-      invoke(typeof fn == 'function' ? fn : Function(fn), args);
-    };
-    defer(counter);
-    return counter;
-  };
-  clearTask = function clearImmediate(id) {
-    delete queue[id];
-  };
-  // Node.js 0.8-
-  if (__webpack_require__(68)(process) == 'process') {
-    defer = function (id) {
-      process.nextTick(ctx(run, id, 1));
-    };
-  // Sphere (JS game engine) Dispatch API
-  } else if (Dispatch && Dispatch.now) {
-    defer = function (id) {
-      Dispatch.now(ctx(run, id, 1));
-    };
-  // Browsers with MessageChannel, includes WebWorkers
-  } else if (MessageChannel) {
-    channel = new MessageChannel();
-    port = channel.port2;
-    channel.port1.onmessage = listener;
-    defer = ctx(port.postMessage, port, 1);
-  // Browsers with postMessage, skip WebWorkers
-  // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
-  } else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) {
-    defer = function (id) {
-      global.postMessage(id + '', '*');
-    };
-    global.addEventListener('message', listener, false);
-  // IE8-
-  } else if (ONREADYSTATECHANGE in cel('script')) {
-    defer = function (id) {
-      html.appendChild(cel('script'))[ONREADYSTATECHANGE] = function () {
-        html.removeChild(this);
-        run.call(id);
-      };
-    };
-  // Rest old browsers
-  } else {
-    defer = function (id) {
-      setTimeout(ctx(run, id, 1), 0);
-    };
-  }
-}
-module.exports = {
-  set: setTask,
-  clear: clearTask
-};
-
-
-/***/ }),
-/* 136 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 7.1.15 ToLength
-var toInteger = __webpack_require__(97);
-var min = Math.min;
-module.exports = function (it) {
-  return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991
-};
-
-
-/***/ }),
-/* 137 */
-/***/ (function(module, exports) {
-
-var id = 0;
-var px = Math.random();
-module.exports = function (key) {
-  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
-};
-
-
-/***/ }),
-/* 138 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-/**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
-exports.coerce = coerce;
-exports.disable = disable;
-exports.enable = enable;
-exports.enabled = enabled;
-exports.humanize = __webpack_require__(301);
-
-/**
- * Active `debug` instances.
- */
-exports.instances = [];
-
-/**
- * The currently active debug mode names, and names to skip.
- */
-
-exports.names = [];
-exports.skips = [];
-
-/**
- * Map of special "%n" handling functions, for the debug "format" argument.
- *
- * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
- */
-
-exports.formatters = {};
-
-/**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
- */
-
-function selectColor(namespace) {
-  var hash = 0, i;
-
-  for (i in namespace) {
-    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
-    hash |= 0; // Convert to 32bit integer
-  }
-
-  return exports.colors[Math.abs(hash) % exports.colors.length];
-}
-
-/**
- * Create a debugger with the given `namespace`.
- *
- * @param {String} namespace
- * @return {Function}
- * @api public
- */
-
-function createDebug(namespace) {
-
-  var prevTime;
-
-  function debug() {
-    // disabled?
-    if (!debug.enabled) return;
-
-    var self = debug;
-
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
-
-    // turn the `arguments` into a proper Array
-    var args = new Array(arguments.length);
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i];
-    }
-
-    args[0] = exports.coerce(args[0]);
-
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %O
-      args.unshift('%O');
-    }
-
-    // apply any `formatters` transformations
-    var index = 0;
-    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
-      // if we encounter an escaped % then don't increase the array index
-      if (match === '%%') return match;
-      index++;
-      var formatter = exports.formatters[format];
-      if ('function' === typeof formatter) {
-        var val = args[index];
-        match = formatter.call(self, val);
-
-        // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
-      }
-      return match;
-    });
-
-    // apply env-specific formatting (colors, etc.)
-    exports.formatArgs.call(self, args);
-
-    var logFn = debug.log || exports.log || console.log.bind(console);
-    logFn.apply(self, args);
-  }
-
-  debug.namespace = namespace;
-  debug.enabled = exports.enabled(namespace);
-  debug.useColors = exports.useColors();
-  debug.color = selectColor(namespace);
-  debug.destroy = destroy;
-
-  // env-specific initialization logic for debug instances
-  if ('function' === typeof exports.init) {
-    exports.init(debug);
-  }
-
-  exports.instances.push(debug);
-
-  return debug;
-}
-
-function destroy () {
-  var index = exports.instances.indexOf(this);
-  if (index !== -1) {
-    exports.instances.splice(index, 1);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
-
-function enable(namespaces) {
-  exports.save(namespaces);
-
-  exports.names = [];
-  exports.skips = [];
-
-  var i;
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
-
-  for (i = 0; i < len; i++) {
-    if (!split[i]) continue; // ignore empty strings
-    namespaces = split[i].replace(/\*/g, '.*?');
-    if (namespaces[0] === '-') {
-      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
-    } else {
-      exports.names.push(new RegExp('^' + namespaces + '$'));
-    }
-  }
-
-  for (i = 0; i < exports.instances.length; i++) {
-    var instance = exports.instances[i];
-    instance.enabled = exports.enabled(instance.namespace);
-  }
-}
-
-/**
- * Disable debug output.
- *
- * @api public
- */
-
-function disable() {
-  exports.enable('');
-}
-
-/**
- * Returns true if the given mode name is enabled, false otherwise.
- *
- * @param {String} name
- * @return {Boolean}
- * @api public
- */
-
-function enabled(name) {
-  if (name[name.length - 1] === '*') {
-    return true;
-  }
-  var i, len;
-  for (i = 0, len = exports.skips.length; i < len; i++) {
-    if (exports.skips[i].test(name)) {
-      return false;
-    }
-  }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
-
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
-
-
-/***/ }),
-/* 139 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Basic Javascript Elliptic Curve implementation
-// Ported loosely from BouncyCastle's Java EC code
-// Only Fp curves implemented for now
-
-// Requires jsbn.js and jsbn2.js
-var BigInteger = __webpack_require__(81).BigInteger
-var Barrett = BigInteger.prototype.Barrett
-
-// ----------------
-// ECFieldElementFp
-
-// constructor
-function ECFieldElementFp(q,x) {
-    this.x = x;
-    // TODO if(x.compareTo(q) >= 0) error
-    this.q = q;
-}
-
-function feFpEquals(other) {
-    if(other == this) return true;
-    return (this.q.equals(other.q) && this.x.equals(other.x));
-}
-
-function feFpToBigInteger() {
-    return this.x;
-}
-
-function feFpNegate() {
-    return new ECFieldElementFp(this.q, this.x.negate().mod(this.q));
-}
-
-function feFpAdd(b) {
-    return new ECFieldElementFp(this.q, this.x.add(b.toBigInteger()).mod(this.q));
-}
-
-function feFpSubtract(b) {
-    return new ECFieldElementFp(this.q, this.x.subtract(b.toBigInteger()).mod(this.q));
-}
-
-function feFpMultiply(b) {
-    return new ECFieldElementFp(this.q, this.x.multiply(b.toBigInteger()).mod(this.q));
-}
-
-function feFpSquare() {
-    return new ECFieldElementFp(this.q, this.x.square().mod(this.q));
-}
-
-function feFpDivide(b) {
-    return new ECFieldElementFp(this.q, this.x.multiply(b.toBigInteger().modInverse(this.q)).mod(this.q));
-}
-
-ECFieldElementFp.prototype.equals = feFpEquals;
-ECFieldElementFp.prototype.toBigInteger = feFpToBigInteger;
-ECFieldElementFp.prototype.negate = feFpNegate;
-ECFieldElementFp.prototype.add = feFpAdd;
-ECFieldElementFp.prototype.subtract = feFpSubtract;
-ECFieldElementFp.prototype.multiply = feFpMultiply;
-ECFieldElementFp.prototype.square = feFpSquare;
-ECFieldElementFp.prototype.divide = feFpDivide;
-
-// ----------------
-// ECPointFp
-
-// constructor
-function ECPointFp(curve,x,y,z) {
-    this.curve = curve;
-    this.x = x;
-    this.y = y;
-    // Projective coordinates: either zinv == null or z * zinv == 1
-    // z and zinv are just BigIntegers, not fieldElements
-    if(z == null) {
-      this.z = BigInteger.ONE;
-    }
-    else {
-      this.z = z;
-    }
-    this.zinv = null;
-    //TODO: compression flag
-}
-
-function pointFpGetX() {
-    if(this.zinv == null) {
-      this.zinv = this.z.modInverse(this.curve.q);
-    }
-    var r = this.x.toBigInteger().multiply(this.zinv);
-    this.curve.reduce(r);
-    return this.curve.fromBigInteger(r);
-}
-
-function pointFpGetY() {
-    if(this.zinv == null) {
-      this.zinv = this.z.modInverse(this.curve.q);
-    }
-    var r = this.y.toBigInteger().multiply(this.zinv);
-    this.curve.reduce(r);
-    return this.curve.fromBigInteger(r);
-}
-
-function pointFpEquals(other) {
-    if(other == this) return true;
-    if(this.isInfinity()) return other.isInfinity();
-    if(other.isInfinity()) return this.isInfinity();
-    var u, v;
-    // u = Y2 * Z1 - Y1 * Z2
-    u = other.y.toBigInteger().multiply(this.z).subtract(this.y.toBigInteger().multiply(other.z)).mod(this.curve.q);
-    if(!u.equals(BigInteger.ZERO)) return false;
-    // v = X2 * Z1 - X1 * Z2
-    v = other.x.toBigInteger().multiply(this.z).subtract(this.x.toBigInteger().multiply(other.z)).mod(this.curve.q);
-    return v.equals(BigInteger.ZERO);
-}
-
-function pointFpIsInfinity() {
-    if((this.x == null) && (this.y == null)) return true;
-    return this.z.equals(BigInteger.ZERO) && !this.y.toBigInteger().equals(BigInteger.ZERO);
-}
-
-function pointFpNegate() {
-    return new ECPointFp(this.curve, this.x, this.y.negate(), this.z);
-}
-
-function pointFpAdd(b) {
-    if(this.isInfinity()) return b;
-    if(b.isInfinity()) return this;
-
-    // u = Y2 * Z1 - Y1 * Z2
-    var u = b.y.toBigInteger().multiply(this.z).subtract(this.y.toBigInteger().multiply(b.z)).mod(this.curve.q);
-    // v = X2 * Z1 - X1 * Z2
-    var v = b.x.toBigInteger().multiply(this.z).subtract(this.x.toBigInteger().multiply(b.z)).mod(this.curve.q);
-
-    if(BigInteger.ZERO.equals(v)) {
-        if(BigInteger.ZERO.equals(u)) {
-            return this.twice(); // this == b, so double
-        }
-	return this.curve.getInfinity(); // this = -b, so infinity
-    }
-
-    var THREE = new BigInteger("3");
-    var x1 = this.x.toBigInteger();
-    var y1 = this.y.toBigInteger();
-    var x2 = b.x.toBigInteger();
-    var y2 = b.y.toBigInteger();
-
-    var v2 = v.square();
-    var v3 = v2.multiply(v);
-    var x1v2 = x1.multiply(v2);
-    var zu2 = u.square().multiply(this.z);
-
-    // x3 = v * (z2 * (z1 * u^2 - 2 * x1 * v^2) - v^3)
-    var x3 = zu2.subtract(x1v2.shiftLeft(1)).multiply(b.z).subtract(v3).multiply(v).mod(this.curve.q);
-    // y3 = z2 * (3 * x1 * u * v^2 - y1 * v^3 - z1 * u^3) + u * v^3
-    var y3 = x1v2.multiply(THREE).multiply(u).subtract(y1.multiply(v3)).subtract(zu2.multiply(u)).multiply(b.z).add(u.multiply(v3)).mod(this.curve.q);
-    // z3 = v^3 * z1 * z2
-    var z3 = v3.multiply(this.z).multiply(b.z).mod(this.curve.q);
-
-    return new ECPointFp(this.curve, this.curve.fromBigInteger(x3), this.curve.fromBigInteger(y3), z3);
-}
-
-function pointFpTwice() {
-    if(this.isInfinity()) return this;
-    if(this.y.toBigInteger().signum() == 0) return this.curve.getInfinity();
-
-    // TODO: optimized handling of constants
-    var THREE = new BigInteger("3");
-    var x1 = this.x.toBigInteger();
-    var y1 = this.y.toBigInteger();
-
-    var y1z1 = y1.multiply(this.z);
-    var y1sqz1 = y1z1.multiply(y1).mod(this.curve.q);
-    var a = this.curve.a.toBigInteger();
-
-    // w = 3 * x1^2 + a * z1^2
-    var w = x1.square().multiply(THREE);
-    if(!BigInteger.ZERO.equals(a)) {
-      w = w.add(this.z.square().multiply(a));
-    }
-    w = w.mod(this.curve.q);
-    //this.curve.reduce(w);
-    // x3 = 2 * y1 * z1 * (w^2 - 8 * x1 * y1^2 * z1)
-    var x3 = w.square().subtract(x1.shiftLeft(3).multiply(y1sqz1)).shiftLeft(1).multiply(y1z1).mod(this.curve.q);
-    // y3 = 4 * y1^2 * z1 * (3 * w * x1 - 2 * y1^2 * z1) - w^3
-    var y3 = w.multiply(THREE).multiply(x1).subtract(y1sqz1.shiftLeft(1)).shiftLeft(2).multiply(y1sqz1).subtract(w.square().multiply(w)).mod(this.curve.q);
-    // z3 = 8 * (y1 * z1)^3
-    var z3 = y1z1.square().multiply(y1z1).shiftLeft(3).mod(this.curve.q);
-
-    return new ECPointFp(this.curve, this.curve.fromBigInteger(x3), this.curve.fromBigInteger(y3), z3);
-}
-
-// Simple NAF (Non-Adjacent Form) multiplication algorithm
-// TODO: modularize the multiplication algorithm
-function pointFpMultiply(k) {
-    if(this.isInfinity()) return this;
-    if(k.signum() == 0) return this.curve.getInfinity();
-
-    var e = k;
-    var h = e.multiply(new BigInteger("3"));
-
-    var neg = this.negate();
-    var R = this;
-
-    var i;
-    for(i = h.bitLength() - 2; i > 0; --i) {
-	R = R.twice();
-
-	var hBit = h.testBit(i);
-	var eBit = e.testBit(i);
-
-	if (hBit != eBit) {
-	    R = R.add(hBit ? this : neg);
-	}
-    }
-
-    return R;
-}
-
-// Compute this*j + x*k (simultaneous multiplication)
-function pointFpMultiplyTwo(j,x,k) {
-  var i;
-  if(j.bitLength() > k.bitLength())
-    i = j.bitLength() - 1;
-  else
-    i = k.bitLength() - 1;
-
-  var R = this.curve.getInfinity();
-  var both = this.add(x);
-  while(i >= 0) {
-    R = R.twice();
-    if(j.testBit(i)) {
-      if(k.testBit(i)) {
-        R = R.add(both);
-      }
-      else {
-        R = R.add(this);
-      }
-    }
-    else {
-      if(k.testBit(i)) {
-        R = R.add(x);
-      }
-    }
-    --i;
-  }
-
-  return R;
-}
-
-ECPointFp.prototype.getX = pointFpGetX;
-ECPointFp.prototype.getY = pointFpGetY;
-ECPointFp.prototype.equals = pointFpEquals;
-ECPointFp.prototype.isInfinity = pointFpIsInfinity;
-ECPointFp.prototype.negate = pointFpNegate;
-ECPointFp.prototype.add = pointFpAdd;
-ECPointFp.prototype.twice = pointFpTwice;
-ECPointFp.prototype.multiply = pointFpMultiply;
-ECPointFp.prototype.multiplyTwo = pointFpMultiplyTwo;
-
-// ----------------
-// ECCurveFp
-
-// constructor
-function ECCurveFp(q,a,b) {
-    this.q = q;
-    this.a = this.fromBigInteger(a);
-    this.b = this.fromBigInteger(b);
-    this.infinity = new ECPointFp(this, null, null);
-    this.reducer = new Barrett(this.q);
-}
-
-function curveFpGetQ() {
-    return this.q;
-}
-
-function curveFpGetA() {
-    return this.a;
-}
-
-function curveFpGetB() {
-    return this.b;
-}
-
-function curveFpEquals(other) {
-    if(other == this) return true;
-    return(this.q.equals(other.q) && this.a.equals(other.a) && this.b.equals(other.b));
-}
-
-function curveFpGetInfinity() {
-    return this.infinity;
-}
-
-function curveFpFromBigInteger(x) {
-    return new ECFieldElementFp(this.q, x);
-}
-
-function curveReduce(x) {
-    this.reducer.reduce(x);
-}
-
-// for now, work with hex strings because they're easier in JS
-function curveFpDecodePointHex(s) {
-    switch(parseInt(s.substr(0,2), 16)) { // first byte
-    case 0:
-	return this.infinity;
-    case 2:
-    case 3:
-	// point compression not supported yet
-	return null;
-    case 4:
-    case 6:
-    case 7:
-	var len = (s.length - 2) / 2;
-	var xHex = s.substr(2, len);
-	var yHex = s.substr(len+2, len);
-
-	return new ECPointFp(this,
-			     this.fromBigInteger(new BigInteger(xHex, 16)),
-			     this.fromBigInteger(new BigInteger(yHex, 16)));
-
-    default: // unsupported
-	return null;
-    }
-}
-
-function curveFpEncodePointHex(p) {
-	if (p.isInfinity()) return "00";
-	var xHex = p.getX().toBigInteger().toString(16);
-	var yHex = p.getY().toBigInteger().toString(16);
-	var oLen = this.getQ().toString(16).length;
-	if ((oLen % 2) != 0) oLen++;
-	while (xHex.length < oLen) {
-		xHex = "0" + xHex;
-	}
-	while (yHex.length < oLen) {
-		yHex = "0" + yHex;
-	}
-	return "04" + xHex + yHex;
-}
-
-ECCurveFp.prototype.getQ = curveFpGetQ;
-ECCurveFp.prototype.getA = curveFpGetA;
-ECCurveFp.prototype.getB = curveFpGetB;
-ECCurveFp.prototype.equals = curveFpEquals;
-ECCurveFp.prototype.getInfinity = curveFpGetInfinity;
-ECCurveFp.prototype.fromBigInteger = curveFpFromBigInteger;
-ECCurveFp.prototype.reduce = curveReduce;
-//ECCurveFp.prototype.decodePointHex = curveFpDecodePointHex;
-ECCurveFp.prototype.encodePointHex = curveFpEncodePointHex;
-
-// from: https://github.com/kaielvin/jsbn-ec-point-compression
-ECCurveFp.prototype.decodePointHex = function(s)
-{
-	var yIsEven;
-    switch(parseInt(s.substr(0,2), 16)) { // first byte
-    case 0:
-	return this.infinity;
-    case 2:
-	yIsEven = false;
-    case 3:
-	if(yIsEven == undefined) yIsEven = true;
-	var len = s.length - 2;
-	var xHex = s.substr(2, len);
-	var x = this.fromBigInteger(new BigInteger(xHex,16));
-	var alpha = x.multiply(x.square().add(this.getA())).add(this.getB());
-	var beta = alpha.sqrt();
-
-    if (beta == null) throw "Invalid point compression";
-
-    var betaValue = beta.toBigInteger();
-    if (betaValue.testBit(0) != yIsEven)
-    {
-        // Use the other root
-        beta = this.fromBigInteger(this.getQ().subtract(betaValue));
-    }
-    return new ECPointFp(this,x,beta);
-    case 4:
-    case 6:
-    case 7:
-	var len = (s.length - 2) / 2;
-	var xHex = s.substr(2, len);
-	var yHex = s.substr(len+2, len);
-
-	return new ECPointFp(this,
-			     this.fromBigInteger(new BigInteger(xHex, 16)),
-			     this.fromBigInteger(new BigInteger(yHex, 16)));
-
-    default: // unsupported
-	return null;
-    }
-}
-ECCurveFp.prototype.encodeCompressedPointHex = function(p)
-{
-	if (p.isInfinity()) return "00";
-	var xHex = p.getX().toBigInteger().toString(16);
-	var oLen = this.getQ().toString(16).length;
-	if ((oLen % 2) != 0) oLen++;
-	while (xHex.length < oLen)
-		xHex = "0" + xHex;
-	var yPrefix;
-	if(p.getY().toBigInteger().isEven()) yPrefix = "02";
-	else                                 yPrefix = "03";
-
-	return yPrefix + xHex;
-}
-
-
-ECFieldElementFp.prototype.getR = function()
-{
-	if(this.r != undefined) return this.r;
-
-    this.r = null;
-    var bitLength = this.q.bitLength();
-    if (bitLength > 128)
-    {
-        var firstWord = this.q.shiftRight(bitLength - 64);
-        if (firstWord.intValue() == -1)
-        {
-            this.r = BigInteger.ONE.shiftLeft(bitLength).subtract(this.q);
-        }
-    }
-    return this.r;
-}
-ECFieldElementFp.prototype.modMult = function(x1,x2)
-{
-    return this.modReduce(x1.multiply(x2));
-}
-ECFieldElementFp.prototype.modReduce = function(x)
-{
-    if (this.getR() != null)
-    {
-        var qLen = q.bitLength();
-        while (x.bitLength() > (qLen + 1))
-        {
-            var u = x.shiftRight(qLen);
-            var v = x.subtract(u.shiftLeft(qLen));
-            if (!this.getR().equals(BigInteger.ONE))
-            {
-                u = u.multiply(this.getR());
-            }
-            x = u.add(v); 
-        }
-        while (x.compareTo(q) >= 0)
-        {
-            x = x.subtract(q);
-        }
-    }
-    else
-    {
-        x = x.mod(q);
-    }
-    return x;
-}
-ECFieldElementFp.prototype.sqrt = function()
-{
-    if (!this.q.testBit(0)) throw "unsupported";
-
-    // p mod 4 == 3
-    if (this.q.testBit(1))
-    {
-    	var z = new ECFieldElementFp(this.q,this.x.modPow(this.q.shiftRight(2).add(BigInteger.ONE),this.q));
-    	return z.square().equals(this) ? z : null;
-    }
-
-    // p mod 4 == 1
-    var qMinusOne = this.q.subtract(BigInteger.ONE);
-
-    var legendreExponent = qMinusOne.shiftRight(1);
-    if (!(this.x.modPow(legendreExponent, this.q).equals(BigInteger.ONE)))
-    {
-        return null;
-    }
-
-    var u = qMinusOne.shiftRight(2);
-    var k = u.shiftLeft(1).add(BigInteger.ONE);
-
-    var Q = this.x;
-    var fourQ = modDouble(modDouble(Q));
-
-    var U, V;
-    do
-    {
-        var P;
-        do
-        {
-            P = new BigInteger(this.q.bitLength(), new SecureRandom());
-        }
-        while (P.compareTo(this.q) >= 0
-            || !(P.multiply(P).subtract(fourQ).modPow(legendreExponent, this.q).equals(qMinusOne)));
-
-        var result = this.lucasSequence(P, Q, k);
-        U = result[0];
-        V = result[1];
-
-        if (this.modMult(V, V).equals(fourQ))
-        {
-            // Integer division by 2, mod q
-            if (V.testBit(0))
-            {
-                V = V.add(q);
-            }
-
-            V = V.shiftRight(1);
-
-            return new ECFieldElementFp(q,V);
-        }
-    }
-    while (U.equals(BigInteger.ONE) || U.equals(qMinusOne));
-
-    return null;
-}
-ECFieldElementFp.prototype.lucasSequence = function(P,Q,k)
-{
-    var n = k.bitLength();
-    var s = k.getLowestSetBit();
-
-    var Uh = BigInteger.ONE;
-    var Vl = BigInteger.TWO;
-    var Vh = P;
-    var Ql = BigInteger.ONE;
-    var Qh = BigInteger.ONE;
-
-    for (var j = n - 1; j >= s + 1; --j)
-    {
-        Ql = this.modMult(Ql, Qh);
-
-        if (k.testBit(j))
-        {
-            Qh = this.modMult(Ql, Q);
-            Uh = this.modMult(Uh, Vh);
-            Vl = this.modReduce(Vh.multiply(Vl).subtract(P.multiply(Ql)));
-            Vh = this.modReduce(Vh.multiply(Vh).subtract(Qh.shiftLeft(1)));
-        }
-        else
-        {
-            Qh = Ql;
-            Uh = this.modReduce(Uh.multiply(Vl).subtract(Ql));
-            Vh = this.modReduce(Vh.multiply(Vl).subtract(P.multiply(Ql)));
-            Vl = this.modReduce(Vl.multiply(Vl).subtract(Ql.shiftLeft(1)));
-        }
-    }
-
-    Ql = this.modMult(Ql, Qh);
-    Qh = this.modMult(Ql, Q);
-    Uh = this.modReduce(Uh.multiply(Vl).subtract(Ql));
-    Vl = this.modReduce(Vh.multiply(Vl).subtract(P.multiply(Ql)));
-    Ql = this.modMult(Ql, Qh);
-
-    for (var j = 1; j <= s; ++j)
-    {
-        Uh = this.modMult(Uh, Vl);
-        Vl = this.modReduce(Vl.multiply(Vl).subtract(Ql.shiftLeft(1)));
-        Ql = this.modMult(Ql, Ql);
-    }
-
-    return [ Uh, Vl ];
-}
-
-var exports = {
-  ECCurveFp: ECCurveFp,
-  ECPointFp: ECPointFp,
-  ECFieldElementFp: ECFieldElementFp
-}
-
-module.exports = exports
-
-
-/***/ }),
-/* 140 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = realpath
-realpath.realpath = realpath
-realpath.sync = realpathSync
-realpath.realpathSync = realpathSync
-realpath.monkeypatch = monkeypatch
-realpath.unmonkeypatch = unmonkeypatch
-
-var fs = __webpack_require__(5)
-var origRealpath = fs.realpath
-var origRealpathSync = fs.realpathSync
-
-var version = process.version
-var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(271)
-
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
-}
-
-function realpath (p, cache, cb) {
-  if (ok) {
-    return origRealpath(p, cache, cb)
-  }
-
-  if (typeof cache === 'function') {
-    cb = cache
-    cache = null
-  }
-  origRealpath(p, cache, function (er, result) {
-    if (newError(er)) {
-      old.realpath(p, cache, cb)
-    } else {
-      cb(er, result)
-    }
-  })
-}
-
-function realpathSync (p, cache) {
-  if (ok) {
-    return origRealpathSync(p, cache)
-  }
-
-  try {
-    return origRealpathSync(p, cache)
-  } catch (er) {
-    if (newError(er)) {
-      return old.realpathSync(p, cache)
-    } else {
-      throw er
-    }
-  }
-}
-
-function monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
-}
-
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
-}
-
-
-/***/ }),
-/* 141 */
-/***/ (function(module, exports, __webpack_require__) {
-
-exports.alphasort = alphasort
-exports.alphasorti = alphasorti
-exports.setopts = setopts
-exports.ownProp = ownProp
-exports.makeAbs = makeAbs
-exports.finish = finish
-exports.mark = mark
-exports.isIgnored = isIgnored
-exports.childrenIgnored = childrenIgnored
-
-function ownProp (obj, field) {
-  return Object.prototype.hasOwnProperty.call(obj, field)
-}
-
-var path = __webpack_require__(0)
-var minimatch = __webpack_require__(82)
-var isAbsolute = __webpack_require__(101)
-var Minimatch = minimatch.Minimatch
-
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
-}
-
-function alphasort (a, b) {
-  return a.localeCompare(b)
-}
-
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
-
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
-
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
-}
-
-// ignore patterns are always in dot:true mode.
-function ignoreMap (pattern) {
-  var gmatcher = null
-  if (pattern.slice(-3) === '/**') {
-    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
-    gmatcher = new Minimatch(gpattern, { dot: true })
-  }
-
-  return {
-    matcher: new Minimatch(pattern, { dot: true }),
-    gmatcher: gmatcher
-  }
-}
-
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
-
-  // base-matching: just use globstar for that.
-  if (options.matchBase && -1 === pattern.indexOf("/")) {
-    if (options.noglobstar) {
-      throw new Error("base matching requires globstar")
-    }
-    pattern = "**/" + pattern
-  }
-
-  self.silent = !!options.silent
-  self.pattern = pattern
-  self.strict = options.strict !== false
-  self.realpath = !!options.realpath
-  self.realpathCache = options.realpathCache || Object.create(null)
-  self.follow = !!options.follow
-  self.dot = !!options.dot
-  self.mark = !!options.mark
-  self.nodir = !!options.nodir
-  if (self.nodir)
-    self.mark = true
-  self.sync = !!options.sync
-  self.nounique = !!options.nounique
-  self.nonull = !!options.nonull
-  self.nosort = !!options.nosort
-  self.nocase = !!options.nocase
-  self.stat = !!options.stat
-  self.noprocess = !!options.noprocess
-  self.absolute = !!options.absolute
-
-  self.maxLength = options.maxLength || Infinity
-  self.cache = options.cache || Object.create(null)
-  self.statCache = options.statCache || Object.create(null)
-  self.symlinks = options.symlinks || Object.create(null)
-
-  setupIgnores(self, options)
-
-  self.changedCwd = false
-  var cwd = process.cwd()
-  if (!ownProp(options, "cwd"))
-    self.cwd = cwd
-  else {
-    self.cwd = path.resolve(options.cwd)
-    self.changedCwd = self.cwd !== cwd
-  }
-
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
-
-  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
-  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
-  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
-  if (process.platform === "win32")
-    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
-  self.nomount = !!options.nomount
-
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
-
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
-}
-
-function finish (self) {
-  var nou = self.nounique
-  var all = nou ? [] : Object.create(null)
-
-  for (var i = 0, l = self.matches.length; i < l; i ++) {
-    var matches = self.matches[i]
-    if (!matches || Object.keys(matches).length === 0) {
-      if (self.nonull) {
-        // do like the shell, and spit out the literal glob
-        var literal = self.minimatch.globSet[i]
-        if (nou)
-          all.push(literal)
-        else
-          all[literal] = true
-      }
-    } else {
-      // had matches
-      var m = Object.keys(matches)
-      if (nou)
-        all.push.apply(all, m)
-      else
-        m.forEach(function (m) {
-          all[m] = true
-        })
-    }
-  }
-
-  if (!nou)
-    all = Object.keys(all)
-
-  if (!self.nosort)
-    all = all.sort(self.nocase ? alphasorti : alphasort)
-
-  // at *some* point we statted all of these
-  if (self.mark) {
-    for (var i = 0; i < all.length; i++) {
-      all[i] = self._mark(all[i])
-    }
-    if (self.nodir) {
-      all = all.filter(function (e) {
-        var notDir = !(/\/$/.test(e))
-        var c = self.cache[e] || self.cache[makeAbs(self, e)]
-        if (notDir && c)
-          notDir = c !== 'DIR' && !Array.isArray(c)
-        return notDir
-      })
-    }
-  }
-
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
-
-  self.found = all
-}
-
-function mark (self, p) {
-  var abs = makeAbs(self, p)
-  var c = self.cache[abs]
-  var m = p
-  if (c) {
-    var isDir = c === 'DIR' || Array.isArray(c)
-    var slash = p.slice(-1) === '/'
-
-    if (isDir && !slash)
-      m += '/'
-    else if (!isDir && slash)
-      m = m.slice(0, -1)
-
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
-    }
-  }
-
-  return m
-}
-
-// lotta situps...
-function makeAbs (self, f) {
-  var abs = f
-  if (f.charAt(0) === '/') {
-    abs = path.join(self.root, f)
-  } else if (isAbsolute(f) || f === '') {
-    abs = f
-  } else if (self.changedCwd) {
-    abs = path.resolve(self.cwd, f)
-  } else {
-    abs = path.resolve(f)
-  }
-
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
-
-  return abs
-}
-
-
-// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
-// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
-function isIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
-
-  return self.ignore.some(function(item) {
-    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
-
-function childrenIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
-
-  return self.ignore.some(function(item) {
-    return !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
-
-
-/***/ }),
-/* 142 */
-/***/ (function(module, exports) {
-
-
-module.exports = function(det, rec, confidence, name, lang) {
-  this.confidence = confidence;
-  this.name = name || rec.name(det);
-  this.lang = lang;
-};
-
-
-/***/ }),
-/* 143 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Standard YAML's Core schema.
-// http://www.yaml.org/spec/1.2/spec.html#id2804923
-//
-// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.
-// So, Core schema has no distinctions from JSON schema is JS-YAML.
-
-
-
-
-
-var Schema = __webpack_require__(44);
-
-
-module.exports = new Schema({
-  include: [
-    __webpack_require__(144)
-  ]
-});
-
-
-/***/ }),
-/* 144 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Standard YAML's JSON schema.
-// http://www.yaml.org/spec/1.2/spec.html#id2803231
-//
-// NOTE: JS-YAML does not support schema-specific tag resolution restrictions.
-// So, this schema is not such strict as defined in the YAML specification.
-// It allows numbers in binary notaion, use `Null` and `NULL` as `null`, etc.
-
-
-
-
-
-var Schema = __webpack_require__(44);
-
-
-module.exports = new Schema({
-  include: [
-    __webpack_require__(100)
-  ],
-  implicit: [
-    __webpack_require__(293),
-    __webpack_require__(285),
-    __webpack_require__(287),
-    __webpack_require__(286)
-  ]
-});
-
-
-/***/ }),
-/* 145 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var path = __webpack_require__(0);
-var fs = __webpack_require__(5);
-var _0777 = parseInt('0777', 8);
-
-module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
-
-function mkdirP (p, opts, f, made) {
-    if (typeof opts === 'function') {
-        f = opts;
-        opts = {};
-    }
-    else if (!opts || typeof opts !== 'object') {
-        opts = { mode: opts };
-    }
-    
-    var mode = opts.mode;
-    var xfs = opts.fs || fs;
-    
-    if (mode === undefined) {
-        mode = _0777 & (~process.umask());
-    }
-    if (!made) made = null;
-    
-    var cb = f || function () {};
-    p = path.resolve(p);
-    
-    xfs.mkdir(p, mode, function (er) {
-        if (!er) {
-            made = made || p;
-            return cb(null, made);
-        }
-        switch (er.code) {
-            case 'ENOENT':
-                mkdirP(path.dirname(p), opts, function (er, made) {
-                    if (er) cb(er, made);
-                    else mkdirP(p, opts, cb, made);
-                });
-                break;
-
-            // In the case of any other error, just see if there's a dir
-            // there already.  If so, then hooray!  If not, then something
-            // is borked.
-            default:
-                xfs.stat(p, function (er2, stat) {
-                    // if the stat fails, then that's super weird.
-                    // let the original error be the failure reason.
-                    if (er2 || !stat.isDirectory()) cb(er, made)
-                    else cb(null, made);
-                });
-                break;
-        }
-    });
-}
-
-mkdirP.sync = function sync (p, opts, made) {
-    if (!opts || typeof opts !== 'object') {
-        opts = { mode: opts };
-    }
-    
-    var mode = opts.mode;
-    var xfs = opts.fs || fs;
-    
-    if (mode === undefined) {
-        mode = _0777 & (~process.umask());
-    }
-    if (!made) made = null;
-
-    p = path.resolve(p);
-
-    try {
-        xfs.mkdirSync(p, mode);
-        made = made || p;
-    }
-    catch (err0) {
-        switch (err0.code) {
-            case 'ENOENT' :
-                made = sync(path.dirname(p), opts, made);
-                sync(p, opts, made);
-                break;
-
-            // In the case of any other error, just see if there's a dir
-            // there already.  If so, then hooray!  If not, then something
-            // is borked.
-            default:
-                var stat;
-                try {
-                    stat = xfs.statSync(p);
-                }
-                catch (err1) {
-                    throw err0;
-                }
-                if (!stat.isDirectory()) throw err0;
-                break;
-        }
-    }
-
-    return made;
-};
-
-
-/***/ }),
-/* 146 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = defaultIfEmpty;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function defaultIfEmpty(defaultValue) {
-    if (defaultValue === void 0) {
-        defaultValue = null;
-    }
-    return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); };
-}
-var DefaultIfEmptyOperator = /*@__PURE__*/ (function () {
-    function DefaultIfEmptyOperator(defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-    DefaultIfEmptyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue));
-    };
-    return DefaultIfEmptyOperator;
-}());
-var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DefaultIfEmptySubscriber, _super);
-    function DefaultIfEmptySubscriber(destination, defaultValue) {
-        var _this = _super.call(this, destination) || this;
-        _this.defaultValue = defaultValue;
-        _this.isEmpty = true;
-        return _this;
-    }
-    DefaultIfEmptySubscriber.prototype._next = function (value) {
-        this.isEmpty = false;
-        this.destination.next(value);
-    };
-    DefaultIfEmptySubscriber.prototype._complete = function () {
-        if (this.isEmpty) {
-            this.destination.next(this.defaultValue);
-        }
-        this.destination.complete();
-    };
-    return DefaultIfEmptySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=defaultIfEmpty.js.map
-
-
-/***/ }),
-/* 147 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = filter;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function filter(predicate, thisArg) {
-    return function filterOperatorFunction(source) {
-        return source.lift(new FilterOperator(predicate, thisArg));
-    };
-}
-var FilterOperator = /*@__PURE__*/ (function () {
-    function FilterOperator(predicate, thisArg) {
-        this.predicate = predicate;
-        this.thisArg = thisArg;
-    }
-    FilterOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg));
-    };
-    return FilterOperator;
-}());
-var FilterSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FilterSubscriber, _super);
-    function FilterSubscriber(destination, predicate, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.thisArg = thisArg;
-        _this.count = 0;
-        return _this;
-    }
-    FilterSubscriber.prototype._next = function (value) {
-        var result;
-        try {
-            result = this.predicate.call(this.thisArg, value, this.count++);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (result) {
-            this.destination.next(value);
-        }
-    };
-    return FilterSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=filter.js.map
-
-
-/***/ }),
-/* 148 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = mergeMap;
-/* unused harmony export MergeMapOperator */
-/* unused harmony export MergeMapSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
-/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */
-
-
-
-
-
-
-function mergeMap(project, resultSelector, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (typeof resultSelector === 'function') {
-        return function (source) { return source.pipe(mergeMap(function (a, i) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__observable_from__["a" /* from */])(project(a, i)).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); };
-    }
-    else if (typeof resultSelector === 'number') {
-        concurrent = resultSelector;
-    }
-    return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); };
-}
-var MergeMapOperator = /*@__PURE__*/ (function () {
-    function MergeMapOperator(project, concurrent) {
-        if (concurrent === void 0) {
-            concurrent = Number.POSITIVE_INFINITY;
-        }
-        this.project = project;
-        this.concurrent = concurrent;
-    }
-    MergeMapOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent));
-    };
-    return MergeMapOperator;
-}());
-
-var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MergeMapSubscriber, _super);
-    function MergeMapSubscriber(destination, project, concurrent) {
-        if (concurrent === void 0) {
-            concurrent = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.concurrent = concurrent;
-        _this.hasCompleted = false;
-        _this.buffer = [];
-        _this.active = 0;
-        _this.index = 0;
-        return _this;
-    }
-    MergeMapSubscriber.prototype._next = function (value) {
-        if (this.active < this.concurrent) {
-            this._tryNext(value);
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    MergeMapSubscriber.prototype._tryNext = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.active++;
-        this._innerSub(result, value, index);
-    };
-    MergeMapSubscriber.prototype._innerSub = function (ish, value, index) {
-        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_3__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__["a" /* subscribeToResult */])(this, ish, value, index, innerSubscriber);
-    };
-    MergeMapSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (this.active === 0 && this.buffer.length === 0) {
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    MergeMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        var buffer = this.buffer;
-        this.remove(innerSub);
-        this.active--;
-        if (buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        else if (this.active === 0 && this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return MergeMapSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__["a" /* OuterSubscriber */]));
-
-//# sourceMappingURL=mergeMap.js.map
-
-
-/***/ }),
-/* 149 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncAction; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Action__ = __webpack_require__(918);
-/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */
-
-
-var AsyncAction = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncAction, _super);
-    function AsyncAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.pending = false;
-        return _this;
-    }
-    AsyncAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (this.closed) {
-            return this;
-        }
-        this.state = state;
-        var id = this.id;
-        var scheduler = this.scheduler;
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, delay);
-        }
-        this.pending = true;
-        this.delay = delay;
-        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
-        return this;
-    };
-    AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return setInterval(scheduler.flush.bind(scheduler, this), delay);
-    };
-    AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && this.delay === delay && this.pending === false) {
-            return id;
-        }
-        clearInterval(id);
-    };
-    AsyncAction.prototype.execute = function (state, delay) {
-        if (this.closed) {
-            return new Error('executing a cancelled action');
-        }
-        this.pending = false;
-        var error = this._execute(state, delay);
-        if (error) {
-            return error;
-        }
-        else if (this.pending === false && this.id != null) {
-            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
-        }
-    };
-    AsyncAction.prototype._execute = function (state, delay) {
-        var errored = false;
-        var errorValue = undefined;
-        try {
-            this.work(state);
-        }
-        catch (e) {
-            errored = true;
-            errorValue = !!e && e || new Error(e);
-        }
-        if (errored) {
-            this.unsubscribe();
-            return errorValue;
-        }
-    };
-    AsyncAction.prototype._unsubscribe = function () {
-        var id = this.id;
-        var scheduler = this.scheduler;
-        var actions = scheduler.actions;
-        var index = actions.indexOf(this);
-        this.work = null;
-        this.state = null;
-        this.pending = false;
-        this.scheduler = null;
-        if (index !== -1) {
-            actions.splice(index, 1);
-        }
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, null);
-        }
-        this.delay = null;
-    };
-    return AsyncAction;
-}(__WEBPACK_IMPORTED_MODULE_1__Action__["a" /* Action */]));
-
-//# sourceMappingURL=AsyncAction.js.map
-
-
-/***/ }),
-/* 150 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncScheduler; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Scheduler__ = __webpack_require__(421);
-/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */
-
-
-var AsyncScheduler = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncScheduler, _super);
-    function AsyncScheduler(SchedulerAction, now) {
-        if (now === void 0) {
-            now = __WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */].now;
-        }
-        var _this = _super.call(this, SchedulerAction, function () {
-            if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) {
-                return AsyncScheduler.delegate.now();
-            }
-            else {
-                return now();
-            }
-        }) || this;
-        _this.actions = [];
-        _this.active = false;
-        _this.scheduled = undefined;
-        return _this;
-    }
-    AsyncScheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) {
-            return AsyncScheduler.delegate.schedule(work, delay, state);
-        }
-        else {
-            return _super.prototype.schedule.call(this, work, delay, state);
-        }
-    };
-    AsyncScheduler.prototype.flush = function (action) {
-        var actions = this.actions;
-        if (this.active) {
-            actions.push(action);
-            return;
-        }
-        var error;
-        this.active = true;
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (action = actions.shift());
-        this.active = false;
-        if (error) {
-            while (action = actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsyncScheduler;
-}(__WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */]));
-
-//# sourceMappingURL=AsyncScheduler.js.map
-
-
-/***/ }),
-/* 151 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* unused harmony export getSymbolIterator */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iterator; });
-/* unused harmony export $$iterator */
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function getSymbolIterator() {
-    if (typeof Symbol !== 'function' || !Symbol.iterator) {
-        return '@@iterator';
-    }
-    return Symbol.iterator;
-}
-var iterator = /*@__PURE__*/ getSymbolIterator();
-var $$iterator = iterator;
-//# sourceMappingURL=iterator.js.map
-
-
-/***/ }),
-/* 152 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ArgumentOutOfRangeError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function ArgumentOutOfRangeErrorImpl() {
-    Error.call(this);
-    this.message = 'argument out of range';
-    this.name = 'ArgumentOutOfRangeError';
-    return this;
-}
-ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl;
-//# sourceMappingURL=ArgumentOutOfRangeError.js.map
-
-
-/***/ }),
-/* 153 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EmptyError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function EmptyErrorImpl() {
-    Error.call(this);
-    this.message = 'no elements in sequence';
-    this.name = 'EmptyError';
-    return this;
-}
-EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-var EmptyError = EmptyErrorImpl;
-//# sourceMappingURL=EmptyError.js.map
-
-
-/***/ }),
-/* 154 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isFunction;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isFunction(x) {
-    return typeof x === 'function';
-}
-//# sourceMappingURL=isFunction.js.map
-
-
-/***/ }),
-/* 155 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2016 Joyent, Inc.
-
-module.exports = Certificate;
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var crypto = __webpack_require__(12);
-var Fingerprint = __webpack_require__(156);
-var Signature = __webpack_require__(74);
-var errs = __webpack_require__(73);
-var util = __webpack_require__(3);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var Identity = __webpack_require__(158);
-
-var formats = {};
-formats['openssh'] = __webpack_require__(940);
-formats['x509'] = __webpack_require__(457);
-formats['pem'] = __webpack_require__(941);
-
-var CertificateParseError = errs.CertificateParseError;
-var InvalidAlgorithmError = errs.InvalidAlgorithmError;
-
-function Certificate(opts) {
-	assert.object(opts, 'options');
-	assert.arrayOfObject(opts.subjects, 'options.subjects');
-	utils.assertCompatible(opts.subjects[0], Identity, [1, 0],
-	    'options.subjects');
-	utils.assertCompatible(opts.subjectKey, Key, [1, 0],
-	    'options.subjectKey');
-	utils.assertCompatible(opts.issuer, Identity, [1, 0], 'options.issuer');
-	if (opts.issuerKey !== undefined) {
-		utils.assertCompatible(opts.issuerKey, Key, [1, 0],
-		    'options.issuerKey');
-	}
-	assert.object(opts.signatures, 'options.signatures');
-	assert.buffer(opts.serial, 'options.serial');
-	assert.date(opts.validFrom, 'options.validFrom');
-	assert.date(opts.validUntil, 'optons.validUntil');
-
-	assert.optionalArrayOfString(opts.purposes, 'options.purposes');
-
-	this._hashCache = {};
-
-	this.subjects = opts.subjects;
-	this.issuer = opts.issuer;
-	this.subjectKey = opts.subjectKey;
-	this.issuerKey = opts.issuerKey;
-	this.signatures = opts.signatures;
-	this.serial = opts.serial;
-	this.validFrom = opts.validFrom;
-	this.validUntil = opts.validUntil;
-	this.purposes = opts.purposes;
-}
-
-Certificate.formats = formats;
-
-Certificate.prototype.toBuffer = function (format, options) {
-	if (format === undefined)
-		format = 'x509';
-	assert.string(format, 'format');
-	assert.object(formats[format], 'formats[format]');
-	assert.optionalObject(options, 'options');
-
-	return (formats[format].write(this, options));
-};
-
-Certificate.prototype.toString = function (format, options) {
-	if (format === undefined)
-		format = 'pem';
-	return (this.toBuffer(format, options).toString());
-};
-
-Certificate.prototype.fingerprint = function (algo) {
-	if (algo === undefined)
-		algo = 'sha256';
-	assert.string(algo, 'algorithm');
-	var opts = {
-		type: 'certificate',
-		hash: this.hash(algo),
-		algorithm: algo
-	};
-	return (new Fingerprint(opts));
-};
-
-Certificate.prototype.hash = function (algo) {
-	assert.string(algo, 'algorithm');
-	algo = algo.toLowerCase();
-	if (algs.hashAlgs[algo] === undefined)
-		throw (new InvalidAlgorithmError(algo));
-
-	if (this._hashCache[algo])
-		return (this._hashCache[algo]);
-
-	var hash = crypto.createHash(algo).
-	    update(this.toBuffer('x509')).digest();
-	this._hashCache[algo] = hash;
-	return (hash);
-};
-
-Certificate.prototype.isExpired = function (when) {
-	if (when === undefined)
-		when = new Date();
-	return (!((when.getTime() >= this.validFrom.getTime()) &&
-		(when.getTime() < this.validUntil.getTime())));
-};
-
-Certificate.prototype.isSignedBy = function (issuerCert) {
-	utils.assertCompatible(issuerCert, Certificate, [1, 0], 'issuer');
-
-	if (!this.issuer.equals(issuerCert.subjects[0]))
-		return (false);
-	if (this.issuer.purposes && this.issuer.purposes.length > 0 &&
-	    this.issuer.purposes.indexOf('ca') === -1) {
-		return (false);
-	}
-
-	return (this.isSignedByKey(issuerCert.subjectKey));
-};
-
-Certificate.prototype.isSignedByKey = function (issuerKey) {
-	utils.assertCompatible(issuerKey, Key, [1, 2], 'issuerKey');
-
-	if (this.issuerKey !== undefined) {
-		return (this.issuerKey.
-		    fingerprint('sha512').matches(issuerKey));
-	}
-
-	var fmt = Object.keys(this.signatures)[0];
-	var valid = formats[fmt].verify(this, issuerKey);
-	if (valid)
-		this.issuerKey = issuerKey;
-	return (valid);
-};
-
-Certificate.prototype.signWith = function (key) {
-	utils.assertCompatible(key, PrivateKey, [1, 2], 'key');
-	var fmts = Object.keys(formats);
-	var didOne = false;
-	for (var i = 0; i < fmts.length; ++i) {
-		if (fmts[i] !== 'pem') {
-			var ret = formats[fmts[i]].sign(this, key);
-			if (ret === true)
-				didOne = true;
-		}
-	}
-	if (!didOne) {
-		throw (new Error('Failed to sign the certificate for any ' +
-		    'available certificate formats'));
-	}
-};
-
-Certificate.createSelfSigned = function (subjectOrSubjects, key, options) {
-	var subjects;
-	if (Array.isArray(subjectOrSubjects))
-		subjects = subjectOrSubjects;
-	else
-		subjects = [subjectOrSubjects];
-
-	assert.arrayOfObject(subjects);
-	subjects.forEach(function (subject) {
-		utils.assertCompatible(subject, Identity, [1, 0], 'subject');
-	});
-
-	utils.assertCompatible(key, PrivateKey, [1, 2], 'private key');
-
-	assert.optionalObject(options, 'options');
-	if (options === undefined)
-		options = {};
-	assert.optionalObject(options.validFrom, 'options.validFrom');
-	assert.optionalObject(options.validUntil, 'options.validUntil');
-	var validFrom = options.validFrom;
-	var validUntil = options.validUntil;
-	if (validFrom === undefined)
-		validFrom = new Date();
-	if (validUntil === undefined) {
-		assert.optionalNumber(options.lifetime, 'options.lifetime');
-		var lifetime = options.lifetime;
-		if (lifetime === undefined)
-			lifetime = 10*365*24*3600;
-		validUntil = new Date();
-		validUntil.setTime(validUntil.getTime() + lifetime*1000);
-	}
-	assert.optionalBuffer(options.serial, 'options.serial');
-	var serial = options.serial;
-	if (serial === undefined)
-		serial = Buffer.from('0000000000000001', 'hex');
-
-	var purposes = options.purposes;
-	if (purposes === undefined)
-		purposes = [];
-
-	if (purposes.indexOf('signature') === -1)
-		purposes.push('signature');
-
-	/* Self-signed certs are always CAs. */
-	if (purposes.indexOf('ca') === -1)
-		purposes.push('ca');
-	if (purposes.indexOf('crl') === -1)
-		purposes.push('crl');
-
-	/*
-	 * If we weren't explicitly given any other purposes, do the sensible
-	 * thing and add some basic ones depending on the subject type.
-	 */
-	if (purposes.length <= 3) {
-		var hostSubjects = subjects.filter(function (subject) {
-			return (subject.type === 'host');
-		});
-		var userSubjects = subjects.filter(function (subject) {
-			return (subject.type === 'user');
-		});
-		if (hostSubjects.length > 0) {
-			if (purposes.indexOf('serverAuth') === -1)
-				purposes.push('serverAuth');
-		}
-		if (userSubjects.length > 0) {
-			if (purposes.indexOf('clientAuth') === -1)
-				purposes.push('clientAuth');
-		}
-		if (userSubjects.length > 0 || hostSubjects.length > 0) {
-			if (purposes.indexOf('keyAgreement') === -1)
-				purposes.push('keyAgreement');
-			if (key.type === 'rsa' &&
-			    purposes.indexOf('encryption') === -1)
-				purposes.push('encryption');
-		}
-	}
-
-	var cert = new Certificate({
-		subjects: subjects,
-		issuer: subjects[0],
-		subjectKey: key.toPublic(),
-		issuerKey: key.toPublic(),
-		signatures: {},
-		serial: serial,
-		validFrom: validFrom,
-		validUntil: validUntil,
-		purposes: purposes
-	});
-	cert.signWith(key);
-
-	return (cert);
-};
-
-Certificate.create =
-    function (subjectOrSubjects, key, issuer, issuerKey, options) {
-	var subjects;
-	if (Array.isArray(subjectOrSubjects))
-		subjects = subjectOrSubjects;
-	else
-		subjects = [subjectOrSubjects];
-
-	assert.arrayOfObject(subjects);
-	subjects.forEach(function (subject) {
-		utils.assertCompatible(subject, Identity, [1, 0], 'subject');
-	});
-
-	utils.assertCompatible(key, Key, [1, 0], 'key');
-	if (PrivateKey.isPrivateKey(key))
-		key = key.toPublic();
-	utils.assertCompatible(issuer, Identity, [1, 0], 'issuer');
-	utils.assertCompatible(issuerKey, PrivateKey, [1, 2], 'issuer key');
-
-	assert.optionalObject(options, 'options');
-	if (options === undefined)
-		options = {};
-	assert.optionalObject(options.validFrom, 'options.validFrom');
-	assert.optionalObject(options.validUntil, 'options.validUntil');
-	var validFrom = options.validFrom;
-	var validUntil = options.validUntil;
-	if (validFrom === undefined)
-		validFrom = new Date();
-	if (validUntil === undefined) {
-		assert.optionalNumber(options.lifetime, 'options.lifetime');
-		var lifetime = options.lifetime;
-		if (lifetime === undefined)
-			lifetime = 10*365*24*3600;
-		validUntil = new Date();
-		validUntil.setTime(validUntil.getTime() + lifetime*1000);
-	}
-	assert.optionalBuffer(options.serial, 'options.serial');
-	var serial = options.serial;
-	if (serial === undefined)
-		serial = Buffer.from('0000000000000001', 'hex');
-
-	var purposes = options.purposes;
-	if (purposes === undefined)
-		purposes = [];
-
-	if (purposes.indexOf('signature') === -1)
-		purposes.push('signature');
-
-	if (options.ca === true) {
-		if (purposes.indexOf('ca') === -1)
-			purposes.push('ca');
-		if (purposes.indexOf('crl') === -1)
-			purposes.push('crl');
-	}
-
-	var hostSubjects = subjects.filter(function (subject) {
-		return (subject.type === 'host');
-	});
-	var userSubjects = subjects.filter(function (subject) {
-		return (subject.type === 'user');
-	});
-	if (hostSubjects.length > 0) {
-		if (purposes.indexOf('serverAuth') === -1)
-			purposes.push('serverAuth');
-	}
-	if (userSubjects.length > 0) {
-		if (purposes.indexOf('clientAuth') === -1)
-			purposes.push('clientAuth');
-	}
-	if (userSubjects.length > 0 || hostSubjects.length > 0) {
-		if (purposes.indexOf('keyAgreement') === -1)
-			purposes.push('keyAgreement');
-		if (key.type === 'rsa' &&
-		    purposes.indexOf('encryption') === -1)
-			purposes.push('encryption');
-	}
-
-	var cert = new Certificate({
-		subjects: subjects,
-		issuer: issuer,
-		subjectKey: key,
-		issuerKey: issuerKey.toPublic(),
-		signatures: {},
-		serial: serial,
-		validFrom: validFrom,
-		validUntil: validUntil,
-		purposes: purposes
-	});
-	cert.signWith(issuerKey);
-
-	return (cert);
-};
-
-Certificate.parse = function (data, format, options) {
-	if (typeof (data) !== 'string')
-		assert.buffer(data, 'data');
-	if (format === undefined)
-		format = 'auto';
-	assert.string(format, 'format');
-	if (typeof (options) === 'string')
-		options = { filename: options };
-	assert.optionalObject(options, 'options');
-	if (options === undefined)
-		options = {};
-	assert.optionalString(options.filename, 'options.filename');
-	if (options.filename === undefined)
-		options.filename = '(unnamed)';
-
-	assert.object(formats[format], 'formats[format]');
-
-	try {
-		var k = formats[format].read(data, options);
-		return (k);
-	} catch (e) {
-		throw (new CertificateParseError(options.filename, format, e));
-	}
-};
-
-Certificate.isCertificate = function (obj, ver) {
-	return (utils.isCompatible(obj, Certificate, ver));
-};
-
-/*
- * API versions for Certificate:
- * [1,0] -- initial ver
- */
-Certificate.prototype._sshpkApiVersion = [1, 0];
-
-Certificate._oldVersionDetect = function (obj) {
-	return ([1, 0]);
-};
-
-
-/***/ }),
-/* 156 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = Fingerprint;
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var crypto = __webpack_require__(12);
-var errs = __webpack_require__(73);
-var Key = __webpack_require__(27);
-var Certificate = __webpack_require__(155);
-var utils = __webpack_require__(26);
-
-var FingerprintFormatError = errs.FingerprintFormatError;
-var InvalidAlgorithmError = errs.InvalidAlgorithmError;
-
-function Fingerprint(opts) {
-	assert.object(opts, 'options');
-	assert.string(opts.type, 'options.type');
-	assert.buffer(opts.hash, 'options.hash');
-	assert.string(opts.algorithm, 'options.algorithm');
-
-	this.algorithm = opts.algorithm.toLowerCase();
-	if (algs.hashAlgs[this.algorithm] !== true)
-		throw (new InvalidAlgorithmError(this.algorithm));
-
-	this.hash = opts.hash;
-	this.type = opts.type;
-}
-
-Fingerprint.prototype.toString = function (format) {
-	if (format === undefined) {
-		if (this.algorithm === 'md5')
-			format = 'hex';
-		else
-			format = 'base64';
-	}
-	assert.string(format);
-
-	switch (format) {
-	case 'hex':
-		return (addColons(this.hash.toString('hex')));
-	case 'base64':
-		return (sshBase64Format(this.algorithm,
-		    this.hash.toString('base64')));
-	default:
-		throw (new FingerprintFormatError(undefined, format));
-	}
-};
-
-Fingerprint.prototype.matches = function (other) {
-	assert.object(other, 'key or certificate');
-	if (this.type === 'key') {
-		utils.assertCompatible(other, Key, [1, 0], 'key');
-	} else {
-		utils.assertCompatible(other, Certificate, [1, 0],
-		    'certificate');
-	}
-
-	var theirHash = other.hash(this.algorithm);
-	var theirHash2 = crypto.createHash(this.algorithm).
-	    update(theirHash).digest('base64');
-
-	if (this.hash2 === undefined)
-		this.hash2 = crypto.createHash(this.algorithm).
-		    update(this.hash).digest('base64');
-
-	return (this.hash2 === theirHash2);
-};
-
-Fingerprint.parse = function (fp, options) {
-	assert.string(fp, 'fingerprint');
-
-	var alg, hash, enAlgs;
-	if (Array.isArray(options)) {
-		enAlgs = options;
-		options = {};
-	}
-	assert.optionalObject(options, 'options');
-	if (options === undefined)
-		options = {};
-	if (options.enAlgs !== undefined)
-		enAlgs = options.enAlgs;
-	assert.optionalArrayOfString(enAlgs, 'algorithms');
-
-	var parts = fp.split(':');
-	if (parts.length == 2) {
-		alg = parts[0].toLowerCase();
-		/*JSSTYLED*/
-		var base64RE = /^[A-Za-z0-9+\/=]+$/;
-		if (!base64RE.test(parts[1]))
-			throw (new FingerprintFormatError(fp));
-		try {
-			hash = Buffer.from(parts[1], 'base64');
-		} catch (e) {
-			throw (new FingerprintFormatError(fp));
-		}
-	} else if (parts.length > 2) {
-		alg = 'md5';
-		if (parts[0].toLowerCase() === 'md5')
-			parts = parts.slice(1);
-		parts = parts.join('');
-		/*JSSTYLED*/
-		var md5RE = /^[a-fA-F0-9]+$/;
-		if (!md5RE.test(parts))
-			throw (new FingerprintFormatError(fp));
-		try {
-			hash = Buffer.from(parts, 'hex');
-		} catch (e) {
-			throw (new FingerprintFormatError(fp));
-		}
-	}
-
-	if (alg === undefined)
-		throw (new FingerprintFormatError(fp));
-
-	if (algs.hashAlgs[alg] === undefined)
-		throw (new InvalidAlgorithmError(alg));
-
-	if (enAlgs !== undefined) {
-		enAlgs = enAlgs.map(function (a) { return a.toLowerCase(); });
-		if (enAlgs.indexOf(alg) === -1)
-			throw (new InvalidAlgorithmError(alg));
-	}
-
-	return (new Fingerprint({
-		algorithm: alg,
-		hash: hash,
-		type: options.type || 'key'
-	}));
-};
-
-function addColons(s) {
-	/*JSSTYLED*/
-	return (s.replace(/(.{2})(?=.)/g, '$1:'));
-}
-
-function base64Strip(s) {
-	/*JSSTYLED*/
-	return (s.replace(/=*$/, ''));
-}
-
-function sshBase64Format(alg, h) {
-	return (alg.toUpperCase() + ':' + base64Strip(h));
-}
-
-Fingerprint.isFingerprint = function (obj, ver) {
-	return (utils.isCompatible(obj, Fingerprint, ver));
-};
-
-/*
- * API versions for Fingerprint:
- * [1,0] -- initial ver
- * [1,1] -- first tagged ver
- */
-Fingerprint.prototype._sshpkApiVersion = [1, 1];
-
-Fingerprint._oldVersionDetect = function (obj) {
-	assert.func(obj.toString);
-	assert.func(obj.matches);
-	return ([1, 0]);
-};
-
-
-/***/ }),
-/* 157 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	readPkcs8: readPkcs8,
-	write: write,
-	writePkcs8: writePkcs8,
-
-	readECDSACurve: readECDSACurve,
-	writeECDSACurve: writeECDSACurve
-};
-
-var assert = __webpack_require__(16);
-var asn1 = __webpack_require__(65);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var pem = __webpack_require__(86);
-
-function read(buf, options) {
-	return (pem.read(buf, options, 'pkcs8'));
-}
-
-function write(key, options) {
-	return (pem.write(key, options, 'pkcs8'));
-}
-
-/* Helper to read in a single mpint */
-function readMPInt(der, nm) {
-	assert.strictEqual(der.peek(), asn1.Ber.Integer,
-	    nm + ' is not an Integer');
-	return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
-}
-
-function readPkcs8(alg, type, der) {
-	/* Private keys in pkcs#8 format have a weird extra int */
-	if (der.peek() === asn1.Ber.Integer) {
-		assert.strictEqual(type, 'private',
-		    'unexpected Integer at start of public key');
-		der.readString(asn1.Ber.Integer, true);
-	}
-
-	der.readSequence();
-	var next = der.offset + der.length;
-
-	var oid = der.readOID();
-	switch (oid) {
-	case '1.2.840.113549.1.1.1':
-		der._offset = next;
-		if (type === 'public')
-			return (readPkcs8RSAPublic(der));
-		else
-			return (readPkcs8RSAPrivate(der));
-	case '1.2.840.10040.4.1':
-		if (type === 'public')
-			return (readPkcs8DSAPublic(der));
-		else
-			return (readPkcs8DSAPrivate(der));
-	case '1.2.840.10045.2.1':
-		if (type === 'public')
-			return (readPkcs8ECDSAPublic(der));
-		else
-			return (readPkcs8ECDSAPrivate(der));
-	case '1.3.101.112':
-		if (type === 'public') {
-			return (readPkcs8EdDSAPublic(der));
-		} else {
-			return (readPkcs8EdDSAPrivate(der));
-		}
-	case '1.3.101.110':
-		if (type === 'public') {
-			return (readPkcs8X25519Public(der));
-		} else {
-			return (readPkcs8X25519Private(der));
-		}
-	default:
-		throw (new Error('Unknown key type OID ' + oid));
-	}
-}
-
-function readPkcs8RSAPublic(der) {
-	// bit string sequence
-	der.readSequence(asn1.Ber.BitString);
-	der.readByte();
-	der.readSequence();
-
-	// modulus
-	var n = readMPInt(der, 'modulus');
-	var e = readMPInt(der, 'exponent');
-
-	// now, make the key
-	var key = {
-		type: 'rsa',
-		source: der.originalInput,
-		parts: [
-			{ name: 'e', data: e },
-			{ name: 'n', data: n }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs8RSAPrivate(der) {
-	der.readSequence(asn1.Ber.OctetString);
-	der.readSequence();
-
-	var ver = readMPInt(der, 'version');
-	assert.equal(ver[0], 0x0, 'unknown RSA private key version');
-
-	// modulus then public exponent
-	var n = readMPInt(der, 'modulus');
-	var e = readMPInt(der, 'public exponent');
-	var d = readMPInt(der, 'private exponent');
-	var p = readMPInt(der, 'prime1');
-	var q = readMPInt(der, 'prime2');
-	var dmodp = readMPInt(der, 'exponent1');
-	var dmodq = readMPInt(der, 'exponent2');
-	var iqmp = readMPInt(der, 'iqmp');
-
-	// now, make the key
-	var key = {
-		type: 'rsa',
-		parts: [
-			{ name: 'n', data: n },
-			{ name: 'e', data: e },
-			{ name: 'd', data: d },
-			{ name: 'iqmp', data: iqmp },
-			{ name: 'p', data: p },
-			{ name: 'q', data: q },
-			{ name: 'dmodp', data: dmodp },
-			{ name: 'dmodq', data: dmodq }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readPkcs8DSAPublic(der) {
-	der.readSequence();
-
-	var p = readMPInt(der, 'p');
-	var q = readMPInt(der, 'q');
-	var g = readMPInt(der, 'g');
-
-	// bit string sequence
-	der.readSequence(asn1.Ber.BitString);
-	der.readByte();
-
-	var y = readMPInt(der, 'y');
-
-	// now, make the key
-	var key = {
-		type: 'dsa',
-		parts: [
-			{ name: 'p', data: p },
-			{ name: 'q', data: q },
-			{ name: 'g', data: g },
-			{ name: 'y', data: y }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs8DSAPrivate(der) {
-	der.readSequence();
-
-	var p = readMPInt(der, 'p');
-	var q = readMPInt(der, 'q');
-	var g = readMPInt(der, 'g');
-
-	der.readSequence(asn1.Ber.OctetString);
-	var x = readMPInt(der, 'x');
-
-	/* The pkcs#8 format does not include the public key */
-	var y = utils.calculateDSAPublic(g, p, x);
-
-	var key = {
-		type: 'dsa',
-		parts: [
-			{ name: 'p', data: p },
-			{ name: 'q', data: q },
-			{ name: 'g', data: g },
-			{ name: 'y', data: y },
-			{ name: 'x', data: x }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readECDSACurve(der) {
-	var curveName, curveNames;
-	var j, c, cd;
-
-	if (der.peek() === asn1.Ber.OID) {
-		var oid = der.readOID();
-
-		curveNames = Object.keys(algs.curves);
-		for (j = 0; j < curveNames.length; ++j) {
-			c = curveNames[j];
-			cd = algs.curves[c];
-			if (cd.pkcs8oid === oid) {
-				curveName = c;
-				break;
-			}
-		}
-
-	} else {
-		// ECParameters sequence
-		der.readSequence();
-		var version = der.readString(asn1.Ber.Integer, true);
-		assert.strictEqual(version[0], 1, 'ECDSA key not version 1');
-
-		var curve = {};
-
-		// FieldID sequence
-		der.readSequence();
-		var fieldTypeOid = der.readOID();
-		assert.strictEqual(fieldTypeOid, '1.2.840.10045.1.1',
-		    'ECDSA key is not from a prime-field');
-		var p = curve.p = utils.mpNormalize(
-		    der.readString(asn1.Ber.Integer, true));
-		/*
-		 * p always starts with a 1 bit, so count the zeros to get its
-		 * real size.
-		 */
-		curve.size = p.length * 8 - utils.countZeros(p);
-
-		// Curve sequence
-		der.readSequence();
-		curve.a = utils.mpNormalize(
-		    der.readString(asn1.Ber.OctetString, true));
-		curve.b = utils.mpNormalize(
-		    der.readString(asn1.Ber.OctetString, true));
-		if (der.peek() === asn1.Ber.BitString)
-			curve.s = der.readString(asn1.Ber.BitString, true);
-
-		// Combined Gx and Gy
-		curve.G = der.readString(asn1.Ber.OctetString, true);
-		assert.strictEqual(curve.G[0], 0x4,
-		    'uncompressed G is required');
-
-		curve.n = utils.mpNormalize(
-		    der.readString(asn1.Ber.Integer, true));
-		curve.h = utils.mpNormalize(
-		    der.readString(asn1.Ber.Integer, true));
-		assert.strictEqual(curve.h[0], 0x1, 'a cofactor=1 curve is ' +
-		    'required');
-
-		curveNames = Object.keys(algs.curves);
-		var ks = Object.keys(curve);
-		for (j = 0; j < curveNames.length; ++j) {
-			c = curveNames[j];
-			cd = algs.curves[c];
-			var equal = true;
-			for (var i = 0; i < ks.length; ++i) {
-				var k = ks[i];
-				if (cd[k] === undefined)
-					continue;
-				if (typeof (cd[k]) === 'object' &&
-				    cd[k].equals !== undefined) {
-					if (!cd[k].equals(curve[k])) {
-						equal = false;
-						break;
-					}
-				} else if (Buffer.isBuffer(cd[k])) {
-					if (cd[k].toString('binary')
-					    !== curve[k].toString('binary')) {
-						equal = false;
-						break;
-					}
-				} else {
-					if (cd[k] !== curve[k]) {
-						equal = false;
-						break;
-					}
-				}
-			}
-			if (equal) {
-				curveName = c;
-				break;
-			}
-		}
-	}
-	return (curveName);
-}
-
-function readPkcs8ECDSAPrivate(der) {
-	var curveName = readECDSACurve(der);
-	assert.string(curveName, 'a known elliptic curve');
-
-	der.readSequence(asn1.Ber.OctetString);
-	der.readSequence();
-
-	var version = readMPInt(der, 'version');
-	assert.equal(version[0], 1, 'unknown version of ECDSA key');
-
-	var d = der.readString(asn1.Ber.OctetString, true);
-	der.readSequence(0xa1);
-
-	var Q = der.readString(asn1.Ber.BitString, true);
-	Q = utils.ecNormalize(Q);
-
-	var key = {
-		type: 'ecdsa',
-		parts: [
-			{ name: 'curve', data: Buffer.from(curveName) },
-			{ name: 'Q', data: Q },
-			{ name: 'd', data: d }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readPkcs8ECDSAPublic(der) {
-	var curveName = readECDSACurve(der);
-	assert.string(curveName, 'a known elliptic curve');
-
-	var Q = der.readString(asn1.Ber.BitString, true);
-	Q = utils.ecNormalize(Q);
-
-	var key = {
-		type: 'ecdsa',
-		parts: [
-			{ name: 'curve', data: Buffer.from(curveName) },
-			{ name: 'Q', data: Q }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs8EdDSAPublic(der) {
-	if (der.peek() === 0x00)
-		der.readByte();
-
-	var A = utils.readBitString(der);
-
-	var key = {
-		type: 'ed25519',
-		parts: [
-			{ name: 'A', data: utils.zeroPadToLength(A, 32) }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs8X25519Public(der) {
-	var A = utils.readBitString(der);
-
-	var key = {
-		type: 'curve25519',
-		parts: [
-			{ name: 'A', data: utils.zeroPadToLength(A, 32) }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs8EdDSAPrivate(der) {
-	if (der.peek() === 0x00)
-		der.readByte();
-
-	der.readSequence(asn1.Ber.OctetString);
-	var k = der.readString(asn1.Ber.OctetString, true);
-	k = utils.zeroPadToLength(k, 32);
-
-	var A;
-	if (der.peek() === asn1.Ber.BitString) {
-		A = utils.readBitString(der);
-		A = utils.zeroPadToLength(A, 32);
-	} else {
-		A = utils.calculateED25519Public(k);
-	}
-
-	var key = {
-		type: 'ed25519',
-		parts: [
-			{ name: 'A', data: utils.zeroPadToLength(A, 32) },
-			{ name: 'k', data: utils.zeroPadToLength(k, 32) }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readPkcs8X25519Private(der) {
-	if (der.peek() === 0x00)
-		der.readByte();
-
-	der.readSequence(asn1.Ber.OctetString);
-	var k = der.readString(asn1.Ber.OctetString, true);
-	k = utils.zeroPadToLength(k, 32);
-
-	var A = utils.calculateX25519Public(k);
-
-	var key = {
-		type: 'curve25519',
-		parts: [
-			{ name: 'A', data: utils.zeroPadToLength(A, 32) },
-			{ name: 'k', data: utils.zeroPadToLength(k, 32) }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function writePkcs8(der, key) {
-	der.startSequence();
-
-	if (PrivateKey.isPrivateKey(key)) {
-		var sillyInt = Buffer.from([0]);
-		der.writeBuffer(sillyInt, asn1.Ber.Integer);
-	}
-
-	der.startSequence();
-	switch (key.type) {
-	case 'rsa':
-		der.writeOID('1.2.840.113549.1.1.1');
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs8RSAPrivate(key, der);
-		else
-			writePkcs8RSAPublic(key, der);
-		break;
-	case 'dsa':
-		der.writeOID('1.2.840.10040.4.1');
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs8DSAPrivate(key, der);
-		else
-			writePkcs8DSAPublic(key, der);
-		break;
-	case 'ecdsa':
-		der.writeOID('1.2.840.10045.2.1');
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs8ECDSAPrivate(key, der);
-		else
-			writePkcs8ECDSAPublic(key, der);
-		break;
-	case 'ed25519':
-		der.writeOID('1.3.101.112');
-		if (PrivateKey.isPrivateKey(key))
-			throw (new Error('Ed25519 private keys in pkcs8 ' +
-			    'format are not supported'));
-		writePkcs8EdDSAPublic(key, der);
-		break;
-	default:
-		throw (new Error('Unsupported key type: ' + key.type));
-	}
-
-	der.endSequence();
-}
-
-function writePkcs8RSAPrivate(key, der) {
-	der.writeNull();
-	der.endSequence();
-
-	der.startSequence(asn1.Ber.OctetString);
-	der.startSequence();
-
-	var version = Buffer.from([0]);
-	der.writeBuffer(version, asn1.Ber.Integer);
-
-	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.d.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
-	if (!key.part.dmodp || !key.part.dmodq)
-		utils.addRSAMissing(key);
-	der.writeBuffer(key.part.dmodp.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.dmodq.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.iqmp.data, asn1.Ber.Integer);
-
-	der.endSequence();
-	der.endSequence();
-}
-
-function writePkcs8RSAPublic(key, der) {
-	der.writeNull();
-	der.endSequence();
-
-	der.startSequence(asn1.Ber.BitString);
-	der.writeByte(0x00);
-
-	der.startSequence();
-	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
-	der.endSequence();
-
-	der.endSequence();
-}
-
-function writePkcs8DSAPrivate(key, der) {
-	der.startSequence();
-	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
-	der.endSequence();
-
-	der.endSequence();
-
-	der.startSequence(asn1.Ber.OctetString);
-	der.writeBuffer(key.part.x.data, asn1.Ber.Integer);
-	der.endSequence();
-}
-
-function writePkcs8DSAPublic(key, der) {
-	der.startSequence();
-	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
-	der.endSequence();
-	der.endSequence();
-
-	der.startSequence(asn1.Ber.BitString);
-	der.writeByte(0x00);
-	der.writeBuffer(key.part.y.data, asn1.Ber.Integer);
-	der.endSequence();
-}
-
-function writeECDSACurve(key, der) {
-	var curve = algs.curves[key.curve];
-	if (curve.pkcs8oid) {
-		/* This one has a name in pkcs#8, so just write the oid */
-		der.writeOID(curve.pkcs8oid);
-
-	} else {
-		// ECParameters sequence
-		der.startSequence();
-
-		var version = Buffer.from([1]);
-		der.writeBuffer(version, asn1.Ber.Integer);
-
-		// FieldID sequence
-		der.startSequence();
-		der.writeOID('1.2.840.10045.1.1'); // prime-field
-		der.writeBuffer(curve.p, asn1.Ber.Integer);
-		der.endSequence();
-
-		// Curve sequence
-		der.startSequence();
-		var a = curve.p;
-		if (a[0] === 0x0)
-			a = a.slice(1);
-		der.writeBuffer(a, asn1.Ber.OctetString);
-		der.writeBuffer(curve.b, asn1.Ber.OctetString);
-		der.writeBuffer(curve.s, asn1.Ber.BitString);
-		der.endSequence();
-
-		der.writeBuffer(curve.G, asn1.Ber.OctetString);
-		der.writeBuffer(curve.n, asn1.Ber.Integer);
-		var h = curve.h;
-		if (!h) {
-			h = Buffer.from([1]);
-		}
-		der.writeBuffer(h, asn1.Ber.Integer);
-
-		// ECParameters
-		der.endSequence();
-	}
-}
-
-function writePkcs8ECDSAPublic(key, der) {
-	writeECDSACurve(key, der);
-	der.endSequence();
-
-	var Q = utils.ecNormalize(key.part.Q.data, true);
-	der.writeBuffer(Q, asn1.Ber.BitString);
-}
-
-function writePkcs8ECDSAPrivate(key, der) {
-	writeECDSACurve(key, der);
-	der.endSequence();
-
-	der.startSequence(asn1.Ber.OctetString);
-	der.startSequence();
-
-	var version = Buffer.from([1]);
-	der.writeBuffer(version, asn1.Ber.Integer);
-
-	der.writeBuffer(key.part.d.data, asn1.Ber.OctetString);
-
-	der.startSequence(0xa1);
-	var Q = utils.ecNormalize(key.part.Q.data, true);
-	der.writeBuffer(Q, asn1.Ber.BitString);
-	der.endSequence();
-
-	der.endSequence();
-	der.endSequence();
-}
-
-function writePkcs8EdDSAPublic(key, der) {
-	der.endSequence();
-
-	utils.writeBitString(der, key.part.A.data);
-}
-
-function writePkcs8EdDSAPrivate(key, der) {
-	der.endSequence();
-
-	var k = utils.mpNormalize(key.part.k.data, true);
-	der.startSequence(asn1.Ber.OctetString);
-	der.writeBuffer(k, asn1.Ber.OctetString);
-	der.endSequence();
-}
-
-
-/***/ }),
-/* 158 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = Identity;
-
-var assert = __webpack_require__(16);
-var algs = __webpack_require__(32);
-var crypto = __webpack_require__(12);
-var Fingerprint = __webpack_require__(156);
-var Signature = __webpack_require__(74);
-var errs = __webpack_require__(73);
-var util = __webpack_require__(3);
-var utils = __webpack_require__(26);
-var asn1 = __webpack_require__(65);
-var Buffer = __webpack_require__(15).Buffer;
-
-/*JSSTYLED*/
-var DNS_NAME_RE = /^([*]|[a-z0-9][a-z0-9\-]{0,62})(?:\.([*]|[a-z0-9][a-z0-9\-]{0,62}))*$/i;
-
-var oids = {};
-oids.cn = '2.5.4.3';
-oids.o = '2.5.4.10';
-oids.ou = '2.5.4.11';
-oids.l = '2.5.4.7';
-oids.s = '2.5.4.8';
-oids.c = '2.5.4.6';
-oids.sn = '2.5.4.4';
-oids.dc = '0.9.2342.19200300.100.1.25';
-oids.uid = '0.9.2342.19200300.100.1.1';
-oids.mail = '0.9.2342.19200300.100.1.3';
-
-var unoids = {};
-Object.keys(oids).forEach(function (k) {
-	unoids[oids[k]] = k;
-});
-
-function Identity(opts) {
-	var self = this;
-	assert.object(opts, 'options');
-	assert.arrayOfObject(opts.components, 'options.components');
-	this.components = opts.components;
-	this.componentLookup = {};
-	this.components.forEach(function (c) {
-		if (c.name && !c.oid)
-			c.oid = oids[c.name];
-		if (c.oid && !c.name)
-			c.name = unoids[c.oid];
-		if (self.componentLookup[c.name] === undefined)
-			self.componentLookup[c.name] = [];
-		self.componentLookup[c.name].push(c);
-	});
-	if (this.componentLookup.cn && this.componentLookup.cn.length > 0) {
-		this.cn = this.componentLookup.cn[0].value;
-	}
-	assert.optionalString(opts.type, 'options.type');
-	if (opts.type === undefined) {
-		if (this.components.length === 1 &&
-		    this.componentLookup.cn &&
-		    this.componentLookup.cn.length === 1 &&
-		    this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
-			this.type = 'host';
-			this.hostname = this.componentLookup.cn[0].value;
-
-		} else if (this.componentLookup.dc &&
-		    this.components.length === this.componentLookup.dc.length) {
-			this.type = 'host';
-			this.hostname = this.componentLookup.dc.map(
-			    function (c) {
-				return (c.value);
-			}).join('.');
-
-		} else if (this.componentLookup.uid &&
-		    this.components.length ===
-		    this.componentLookup.uid.length) {
-			this.type = 'user';
-			this.uid = this.componentLookup.uid[0].value;
-
-		} else if (this.componentLookup.cn &&
-		    this.componentLookup.cn.length === 1 &&
-		    this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
-			this.type = 'host';
-			this.hostname = this.componentLookup.cn[0].value;
-
-		} else if (this.componentLookup.uid &&
-		    this.componentLookup.uid.length === 1) {
-			this.type = 'user';
-			this.uid = this.componentLookup.uid[0].value;
-
-		} else if (this.componentLookup.mail &&
-		    this.componentLookup.mail.length === 1) {
-			this.type = 'email';
-			this.email = this.componentLookup.mail[0].value;
-
-		} else if (this.componentLookup.cn &&
-		    this.componentLookup.cn.length === 1) {
-			this.type = 'user';
-			this.uid = this.componentLookup.cn[0].value;
-
-		} else {
-			this.type = 'unknown';
-		}
-	} else {
-		this.type = opts.type;
-		if (this.type === 'host')
-			this.hostname = opts.hostname;
-		else if (this.type === 'user')
-			this.uid = opts.uid;
-		else if (this.type === 'email')
-			this.email = opts.email;
-		else
-			throw (new Error('Unknown type ' + this.type));
-	}
-}
-
-Identity.prototype.toString = function () {
-	return (this.components.map(function (c) {
-		return (c.name.toUpperCase() + '=' + c.value);
-	}).join(', '));
-};
-
-/*
- * These are from X.680 -- PrintableString allowed chars are in section 37.4
- * table 8. Spec for IA5Strings is "1,6 + SPACE + DEL" where 1 refers to
- * ISO IR #001 (standard ASCII control characters) and 6 refers to ISO IR #006
- * (the basic ASCII character set).
- */
-/* JSSTYLED */
-var NOT_PRINTABLE = /[^a-zA-Z0-9 '(),+.\/:=?-]/;
-/* JSSTYLED */
-var NOT_IA5 = /[^\x00-\x7f]/;
-
-Identity.prototype.toAsn1 = function (der, tag) {
-	der.startSequence(tag);
-	this.components.forEach(function (c) {
-		der.startSequence(asn1.Ber.Constructor | asn1.Ber.Set);
-		der.startSequence();
-		der.writeOID(c.oid);
-		/*
-		 * If we fit in a PrintableString, use that. Otherwise use an
-		 * IA5String or UTF8String.
-		 *
-		 * If this identity was parsed from a DN, use the ASN.1 types
-		 * from the original representation (otherwise this might not
-		 * be a full match for the original in some validators).
-		 */
-		if (c.asn1type === asn1.Ber.Utf8String ||
-		    c.value.match(NOT_IA5)) {
-			var v = Buffer.from(c.value, 'utf8');
-			der.writeBuffer(v, asn1.Ber.Utf8String);
-
-		} else if (c.asn1type === asn1.Ber.IA5String ||
-		    c.value.match(NOT_PRINTABLE)) {
-			der.writeString(c.value, asn1.Ber.IA5String);
-
-		} else {
-			var type = asn1.Ber.PrintableString;
-			if (c.asn1type !== undefined)
-				type = c.asn1type;
-			der.writeString(c.value, type);
-		}
-		der.endSequence();
-		der.endSequence();
-	});
-	der.endSequence();
-};
-
-function globMatch(a, b) {
-	if (a === '**' || b === '**')
-		return (true);
-	var aParts = a.split('.');
-	var bParts = b.split('.');
-	if (aParts.length !== bParts.length)
-		return (false);
-	for (var i = 0; i < aParts.length; ++i) {
-		if (aParts[i] === '*' || bParts[i] === '*')
-			continue;
-		if (aParts[i] !== bParts[i])
-			return (false);
-	}
-	return (true);
-}
-
-Identity.prototype.equals = function (other) {
-	if (!Identity.isIdentity(other, [1, 0]))
-		return (false);
-	if (other.components.length !== this.components.length)
-		return (false);
-	for (var i = 0; i < this.components.length; ++i) {
-		if (this.components[i].oid !== other.components[i].oid)
-			return (false);
-		if (!globMatch(this.components[i].value,
-		    other.components[i].value)) {
-			return (false);
-		}
-	}
-	return (true);
-};
-
-Identity.forHost = function (hostname) {
-	assert.string(hostname, 'hostname');
-	return (new Identity({
-		type: 'host',
-		hostname: hostname,
-		components: [ { name: 'cn', value: hostname } ]
-	}));
-};
-
-Identity.forUser = function (uid) {
-	assert.string(uid, 'uid');
-	return (new Identity({
-		type: 'user',
-		uid: uid,
-		components: [ { name: 'uid', value: uid } ]
-	}));
-};
-
-Identity.forEmail = function (email) {
-	assert.string(email, 'email');
-	return (new Identity({
-		type: 'email',
-		email: email,
-		components: [ { name: 'mail', value: email } ]
-	}));
-};
-
-Identity.parseDN = function (dn) {
-	assert.string(dn, 'dn');
-	var parts = dn.split(',');
-	var cmps = parts.map(function (c) {
-		c = c.trim();
-		var eqPos = c.indexOf('=');
-		var name = c.slice(0, eqPos).toLowerCase();
-		var value = c.slice(eqPos + 1);
-		return ({ name: name, value: value });
-	});
-	return (new Identity({ components: cmps }));
-};
-
-Identity.parseAsn1 = function (der, top) {
-	var components = [];
-	der.readSequence(top);
-	var end = der.offset + der.length;
-	while (der.offset < end) {
-		der.readSequence(asn1.Ber.Constructor | asn1.Ber.Set);
-		var after = der.offset + der.length;
-		der.readSequence();
-		var oid = der.readOID();
-		var type = der.peek();
-		var value;
-		switch (type) {
-		case asn1.Ber.PrintableString:
-		case asn1.Ber.IA5String:
-		case asn1.Ber.OctetString:
-		case asn1.Ber.T61String:
-			value = der.readString(type);
-			break;
-		case asn1.Ber.Utf8String:
-			value = der.readString(type, true);
-			value = value.toString('utf8');
-			break;
-		case asn1.Ber.CharacterString:
-		case asn1.Ber.BMPString:
-			value = der.readString(type, true);
-			value = value.toString('utf16le');
-			break;
-		default:
-			throw (new Error('Unknown asn1 type ' + type));
-		}
-		components.push({ oid: oid, asn1type: type, value: value });
-		der._offset = after;
-	}
-	der._offset = end;
-	return (new Identity({
-		components: components
-	}));
-};
-
-Identity.isIdentity = function (obj, ver) {
-	return (utils.isCompatible(obj, Identity, ver));
-};
-
-/*
- * API versions for Identity:
- * [1,0] -- initial ver
- */
-Identity.prototype._sshpkApiVersion = [1, 0];
-
-Identity._oldVersionDetect = function (obj) {
-	return ([1, 0]);
-};
-
-
-/***/ }),
-/* 159 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = SSHBuffer;
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-
-function SSHBuffer(opts) {
-	assert.object(opts, 'options');
-	if (opts.buffer !== undefined)
-		assert.buffer(opts.buffer, 'options.buffer');
-
-	this._size = opts.buffer ? opts.buffer.length : 1024;
-	this._buffer = opts.buffer || Buffer.alloc(this._size);
-	this._offset = 0;
-}
-
-SSHBuffer.prototype.toBuffer = function () {
-	return (this._buffer.slice(0, this._offset));
-};
-
-SSHBuffer.prototype.atEnd = function () {
-	return (this._offset >= this._buffer.length);
-};
-
-SSHBuffer.prototype.remainder = function () {
-	return (this._buffer.slice(this._offset));
-};
-
-SSHBuffer.prototype.skip = function (n) {
-	this._offset += n;
-};
-
-SSHBuffer.prototype.expand = function () {
-	this._size *= 2;
-	var buf = Buffer.alloc(this._size);
-	this._buffer.copy(buf, 0);
-	this._buffer = buf;
-};
-
-SSHBuffer.prototype.readPart = function () {
-	return ({data: this.readBuffer()});
-};
-
-SSHBuffer.prototype.readBuffer = function () {
-	var len = this._buffer.readUInt32BE(this._offset);
-	this._offset += 4;
-	assert.ok(this._offset + len <= this._buffer.length,
-	    'length out of bounds at +0x' + this._offset.toString(16) +
-	    ' (data truncated?)');
-	var buf = this._buffer.slice(this._offset, this._offset + len);
-	this._offset += len;
-	return (buf);
-};
-
-SSHBuffer.prototype.readString = function () {
-	return (this.readBuffer().toString());
-};
-
-SSHBuffer.prototype.readCString = function () {
-	var offset = this._offset;
-	while (offset < this._buffer.length &&
-	    this._buffer[offset] !== 0x00)
-		offset++;
-	assert.ok(offset < this._buffer.length, 'c string does not terminate');
-	var str = this._buffer.slice(this._offset, offset).toString();
-	this._offset = offset + 1;
-	return (str);
-};
-
-SSHBuffer.prototype.readInt = function () {
-	var v = this._buffer.readUInt32BE(this._offset);
-	this._offset += 4;
-	return (v);
-};
-
-SSHBuffer.prototype.readInt64 = function () {
-	assert.ok(this._offset + 8 < this._buffer.length,
-	    'buffer not long enough to read Int64');
-	var v = this._buffer.slice(this._offset, this._offset + 8);
-	this._offset += 8;
-	return (v);
-};
-
-SSHBuffer.prototype.readChar = function () {
-	var v = this._buffer[this._offset++];
-	return (v);
-};
-
-SSHBuffer.prototype.writeBuffer = function (buf) {
-	while (this._offset + 4 + buf.length > this._size)
-		this.expand();
-	this._buffer.writeUInt32BE(buf.length, this._offset);
-	this._offset += 4;
-	buf.copy(this._buffer, this._offset);
-	this._offset += buf.length;
-};
-
-SSHBuffer.prototype.writeString = function (str) {
-	this.writeBuffer(Buffer.from(str, 'utf8'));
-};
-
-SSHBuffer.prototype.writeCString = function (str) {
-	while (this._offset + 1 + str.length > this._size)
-		this.expand();
-	this._buffer.write(str, this._offset);
-	this._offset += str.length;
-	this._buffer[this._offset++] = 0;
-};
-
-SSHBuffer.prototype.writeInt = function (v) {
-	while (this._offset + 4 > this._size)
-		this.expand();
-	this._buffer.writeUInt32BE(v, this._offset);
-	this._offset += 4;
-};
-
-SSHBuffer.prototype.writeInt64 = function (v) {
-	assert.buffer(v, 'value');
-	if (v.length > 8) {
-		var lead = v.slice(0, v.length - 8);
-		for (var i = 0; i < lead.length; ++i) {
-			assert.strictEqual(lead[i], 0,
-			    'must fit in 64 bits of precision');
-		}
-		v = v.slice(v.length - 8, v.length);
-	}
-	while (this._offset + 8 > this._size)
-		this.expand();
-	v.copy(this._buffer, this._offset);
-	this._offset += 8;
-};
-
-SSHBuffer.prototype.writeChar = function (v) {
-	while (this._offset + 1 > this._size)
-		this.expand();
-	this._buffer[this._offset++] = v;
-};
-
-SSHBuffer.prototype.writePart = function (p) {
-	this.writeBuffer(p.data);
-};
-
-SSHBuffer.prototype.write = function (buf) {
-	while (this._offset + buf.length > this._size)
-		this.expand();
-	buf.copy(this._buffer, this._offset);
-	this._offset += buf.length;
-};
-
-
-/***/ }),
-/* 160 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = x => {
-	if (typeof x !== 'string') {
-		throw new TypeError('Expected a string, got ' + typeof x);
-	}
-
-	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
-	// conversion translates it to FEFF (UTF-16 BOM)
-	if (x.charCodeAt(0) === 0xFEFF) {
-		return x.slice(1);
-	}
-
-	return x;
-};
-
-
-/***/ }),
-/* 161 */
-/***/ (function(module, exports) {
-
-// Returns a wrapper function that returns a wrapped callback
-// The wrapper function should do some stuff, and return a
-// presumably different callback function.
-// This makes sure that own properties are retained, so that
-// decorations and such are not lost along the way.
-module.exports = wrappy
-function wrappy (fn, cb) {
-  if (fn && cb) return wrappy(fn)(cb)
-
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
-
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
-
-  return wrapper
-
-  function wrapper() {
-    var args = new Array(arguments.length)
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i]
-    }
-    var ret = fn.apply(this, args)
-    var cb = args[args.length-1]
-    if (typeof ret === 'function' && ret !== cb) {
-      Object.keys(cb).forEach(function (k) {
-        ret[k] = cb[k]
-      })
-    }
-    return ret
-  }
-}
-
-
-/***/ }),
-/* 162 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-exports.extractWorkspaces = extractWorkspaces;
-
-var _executeLifecycleScript;
-
-function _load_executeLifecycleScript() {
-  return _executeLifecycleScript = __webpack_require__(111);
-}
-
-var _path;
-
-function _load_path() {
-  return _path = __webpack_require__(377);
-}
-
-var _conversion;
-
-function _load_conversion() {
-  return _conversion = __webpack_require__(336);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(220));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _packageConstraintResolver;
-
-function _load_packageConstraintResolver() {
-  return _packageConstraintResolver = _interopRequireDefault(__webpack_require__(555));
-}
-
-var _requestManager;
-
-function _load_requestManager() {
-  return _requestManager = _interopRequireDefault(__webpack_require__(378));
-}
-
-var _index2;
-
-function _load_index2() {
-  return _index2 = __webpack_require__(57);
-}
-
-var _index3;
-
-function _load_index3() {
-  return _index3 = __webpack_require__(200);
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const detectIndent = __webpack_require__(635);
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-const micromatch = __webpack_require__(114);
-const isCi = __webpack_require__(397);
-
-function sortObject(object) {
-  const sortedObject = {};
-  Object.keys(object).sort().forEach(item => {
-    sortedObject[item] = object[item];
-  });
-  return sortedObject;
-}
-
-class Config {
-  constructor(reporter) {
-    this.constraintResolver = new (_packageConstraintResolver || _load_packageConstraintResolver()).default(this, reporter);
-    this.requestManager = new (_requestManager || _load_requestManager()).default(reporter);
-    this.reporter = reporter;
-    this._init({});
-  }
-
-  //
-
-
-  //
-
-
-  // cache packages in offline mirror folder as new .tgz files
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  // Whether we should ignore executing lifecycle scripts
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  /**
-   * Execute a promise produced by factory if it doesn't exist in our cache with
-   * the associated key.
-   */
-
-  getCache(key, factory) {
-    const cached = this.cache[key];
-    if (cached) {
-      return cached;
-    }
-
-    return this.cache[key] = factory().catch(err => {
-      this.cache[key] = null;
-      throw err;
-    });
-  }
-
-  /**
-   * Get a config option from our yarn config.
-   */
-
-  getOption(key, resolve = false) {
-    const value = this.registries.yarn.getOption(key);
-
-    if (resolve && typeof value === 'string' && value.length) {
-      return (0, (_path || _load_path()).resolveWithHome)(value);
-    }
-
-    return value;
-  }
-
-  /**
-   * Reduce a list of versions to a single one based on an input range.
-   */
-
-  resolveConstraints(versions, range) {
-    return this.constraintResolver.reduce(versions, range);
-  }
-
-  /**
-   * Initialise config. Fetch registry options, find package roots.
-   */
-
-  init(opts = {}) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this._init(opts);
-
-      _this.workspaceRootFolder = yield _this.findWorkspaceRoot(_this.cwd);
-      _this.lockfileFolder = _this.workspaceRootFolder || _this.cwd;
-
-      // using focus in a workspace root is not allowed
-      if (_this.focus && (!_this.workspaceRootFolder || _this.cwd === _this.workspaceRootFolder)) {
-        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('workspacesFocusRootCheck'));
-      }
-
-      if (_this.focus) {
-        const focusedWorkspaceManifest = yield _this.readRootManifest();
-        _this.focusedWorkspaceName = focusedWorkspaceManifest.name;
-      }
-
-      _this.linkedModules = [];
-
-      let linkedModules;
-      try {
-        linkedModules = yield (_fs || _load_fs()).readdir(_this.linkFolder);
-      } catch (err) {
-        if (err.code === 'ENOENT') {
-          linkedModules = [];
-        } else {
-          throw err;
-        }
-      }
-
-      for (var _iterator = linkedModules, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const dir = _ref;
-
-        const linkedPath = path.join(_this.linkFolder, dir);
-
-        if (dir[0] === '@') {
-          // it's a scope, not a package
-          const scopedLinked = yield (_fs || _load_fs()).readdir(linkedPath);
-          _this.linkedModules.push(...scopedLinked.map(function (scopedDir) {
-            return path.join(dir, scopedDir);
-          }));
-        } else {
-          _this.linkedModules.push(dir);
-        }
-      }
-
-      for (var _iterator2 = Object.keys((_index2 || _load_index2()).registries), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref2 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref2 = _i2.value;
-        }
-
-        const key = _ref2;
-
-        const Registry = (_index2 || _load_index2()).registries[key];
-
-        const extraneousRcFiles = Registry === (_index2 || _load_index2()).registries.yarn ? _this.extraneousYarnrcFiles : [];
-
-        // instantiate registry
-        const registry = new Registry(_this.cwd, _this.registries, _this.requestManager, _this.reporter, _this.enableDefaultRc, extraneousRcFiles);
-        yield registry.init({
-          registry: opts.registry
-        });
-
-        _this.registries[key] = registry;
-        if (_this.registryFolders.indexOf(registry.folder) === -1) {
-          _this.registryFolders.push(registry.folder);
-        }
-      }
-
-      if (_this.modulesFolder) {
-        _this.registryFolders = [_this.modulesFolder];
-      }
-
-      _this.networkConcurrency = opts.networkConcurrency || Number(_this.getOption('network-concurrency')) || (_constants || _load_constants()).NETWORK_CONCURRENCY;
-
-      _this.childConcurrency = opts.childConcurrency || Number(_this.getOption('child-concurrency')) || Number(process.env.CHILD_CONCURRENCY) || (_constants || _load_constants()).CHILD_CONCURRENCY;
-
-      _this.networkTimeout = opts.networkTimeout || Number(_this.getOption('network-timeout')) || (_constants || _load_constants()).NETWORK_TIMEOUT;
-
-      const httpProxy = opts.httpProxy || _this.getOption('proxy');
-      const httpsProxy = opts.httpsProxy || _this.getOption('https-proxy');
-      _this.requestManager.setOptions({
-        userAgent: String(_this.getOption('user-agent')),
-        httpProxy: httpProxy === false ? false : String(httpProxy || ''),
-        httpsProxy: httpsProxy === false ? false : String(httpsProxy || ''),
-        strictSSL: Boolean(_this.getOption('strict-ssl')),
-        ca: Array.prototype.concat(opts.ca || _this.getOption('ca') || []).map(String),
-        cafile: String(opts.cafile || _this.getOption('cafile', true) || ''),
-        cert: String(opts.cert || _this.getOption('cert') || ''),
-        key: String(opts.key || _this.getOption('key') || ''),
-        networkConcurrency: _this.networkConcurrency,
-        networkTimeout: _this.networkTimeout
-      });
-
-      _this.globalFolder = opts.globalFolder || String(_this.getOption('global-folder', true));
-      if (_this.globalFolder === 'undefined') {
-        _this.globalFolder = (_constants || _load_constants()).GLOBAL_MODULE_DIRECTORY;
-      }
-
-      let cacheRootFolder = opts.cacheFolder || _this.getOption('cache-folder', true);
-
-      if (!cacheRootFolder) {
-        let preferredCacheFolders = (_constants || _load_constants()).PREFERRED_MODULE_CACHE_DIRECTORIES;
-        const preferredCacheFolder = opts.preferredCacheFolder || _this.getOption('preferred-cache-folder', true);
-
-        if (preferredCacheFolder) {
-          preferredCacheFolders = [String(preferredCacheFolder)].concat(preferredCacheFolders);
-        }
-
-        const cacheFolderQuery = yield (_fs || _load_fs()).getFirstSuitableFolder(preferredCacheFolders, (_fs || _load_fs()).constants.W_OK | (_fs || _load_fs()).constants.X_OK | (_fs || _load_fs()).constants.R_OK // eslint-disable-line no-bitwise
-        );
-        for (var _iterator3 = cacheFolderQuery.skipped, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-          var _ref3;
-
-          if (_isArray3) {
-            if (_i3 >= _iterator3.length) break;
-            _ref3 = _iterator3[_i3++];
-          } else {
-            _i3 = _iterator3.next();
-            if (_i3.done) break;
-            _ref3 = _i3.value;
-          }
-
-          const skippedEntry = _ref3;
-
-          _this.reporter.warn(_this.reporter.lang('cacheFolderSkipped', skippedEntry.folder));
-        }
-
-        cacheRootFolder = cacheFolderQuery.folder;
-        if (cacheRootFolder && cacheFolderQuery.skipped.length > 0) {
-          _this.reporter.warn(_this.reporter.lang('cacheFolderSelected', cacheRootFolder));
-        }
-      }
-
-      if (!cacheRootFolder) {
-        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('cacheFolderMissing'));
-      } else {
-        _this._cacheRootFolder = String(cacheRootFolder);
-      }
-
-      const manifest = yield _this.maybeReadManifest(_this.lockfileFolder);
-
-      const plugnplayByEnv = _this.getOption('plugnplay-override');
-      if (plugnplayByEnv != null) {
-        _this.plugnplayEnabled = plugnplayByEnv !== 'false' && plugnplayByEnv !== '0';
-        _this.plugnplayPersist = false;
-      } else if (opts.enablePnp || opts.disablePnp) {
-        _this.plugnplayEnabled = !!opts.enablePnp;
-        _this.plugnplayPersist = true;
-      } else if (manifest && manifest.installConfig && manifest.installConfig.pnp) {
-        _this.plugnplayEnabled = !!manifest.installConfig.pnp;
-        _this.plugnplayPersist = false;
-      } else {
-        _this.plugnplayEnabled = false;
-        _this.plugnplayPersist = false;
-      }
-
-      if (process.platform === 'win32') {
-        const cacheRootFolderDrive = path.parse(_this._cacheRootFolder).root.toLowerCase();
-        const lockfileFolderDrive = path.parse(_this.lockfileFolder).root.toLowerCase();
-
-        if (cacheRootFolderDrive !== lockfileFolderDrive) {
-          if (_this.plugnplayEnabled) {
-            _this.reporter.warn(_this.reporter.lang('plugnplayWindowsSupport'));
-          }
-          _this.plugnplayEnabled = false;
-          _this.plugnplayPersist = false;
-        }
-      }
-
-      _this.plugnplayShebang = String(_this.getOption('plugnplay-shebang') || '') || '/usr/bin/env node';
-      _this.plugnplayBlacklist = String(_this.getOption('plugnplay-blacklist') || '') || null;
-
-      _this.ignoreScripts = opts.ignoreScripts || Boolean(_this.getOption('ignore-scripts', false));
-
-      _this.workspacesEnabled = _this.getOption('workspaces-experimental') !== false;
-      _this.workspacesNohoistEnabled = _this.getOption('workspaces-nohoist-experimental') !== false;
-
-      _this.offlineCacheFolder = String(_this.getOption('offline-cache-folder') || '') || null;
-
-      _this.pruneOfflineMirror = Boolean(_this.getOption('yarn-offline-mirror-pruning'));
-      _this.enableMetaFolder = Boolean(_this.getOption('enable-meta-folder'));
-      _this.enableLockfileVersions = Boolean(_this.getOption('yarn-enable-lockfile-versions'));
-      _this.linkFileDependencies = Boolean(_this.getOption('yarn-link-file-dependencies'));
-      _this.packBuiltPackages = Boolean(_this.getOption('experimental-pack-script-packages-in-mirror'));
-
-      _this.autoAddIntegrity = !(0, (_conversion || _load_conversion()).boolifyWithDefault)(String(_this.getOption('unsafe-disable-integrity-migration')), true);
-
-      //init & create cacheFolder, tempFolder
-      _this.cacheFolder = path.join(_this._cacheRootFolder, 'v' + String((_constants || _load_constants()).CACHE_VERSION));
-      _this.tempFolder = opts.tempFolder || path.join(_this.cacheFolder, '.tmp');
-      yield (_fs || _load_fs()).mkdirp(_this.cacheFolder);
-      yield (_fs || _load_fs()).mkdirp(_this.tempFolder);
-
-      if (opts.production !== undefined) {
-        _this.production = Boolean(opts.production);
-      } else {
-        _this.production = Boolean(_this.getOption('production')) || process.env.NODE_ENV === 'production' && process.env.NPM_CONFIG_PRODUCTION !== 'false' && process.env.YARN_PRODUCTION !== 'false';
-      }
-
-      if (_this.workspaceRootFolder && !_this.workspacesEnabled) {
-        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('workspacesDisabled'));
-      }
-    })();
-  }
-
-  _init(opts) {
-    this.registryFolders = [];
-    this.linkedModules = [];
-
-    this.registries = (0, (_map || _load_map()).default)();
-    this.cache = (0, (_map || _load_map()).default)();
-
-    // Ensure the cwd is always an absolute path.
-    this.cwd = path.resolve(opts.cwd || this.cwd || process.cwd());
-
-    this.looseSemver = opts.looseSemver == undefined ? true : opts.looseSemver;
-
-    this.commandName = opts.commandName || '';
-
-    this.enableDefaultRc = opts.enableDefaultRc !== false;
-    this.extraneousYarnrcFiles = opts.extraneousYarnrcFiles || [];
-
-    this.preferOffline = !!opts.preferOffline;
-    this.modulesFolder = opts.modulesFolder;
-    this.linkFolder = opts.linkFolder || (_constants || _load_constants()).LINK_REGISTRY_DIRECTORY;
-    this.offline = !!opts.offline;
-    this.binLinks = !!opts.binLinks;
-    this.updateChecksums = !!opts.updateChecksums;
-    this.plugnplayUnplugged = [];
-    this.plugnplayPurgeUnpluggedPackages = false;
-
-    this.ignorePlatform = !!opts.ignorePlatform;
-    this.ignoreScripts = !!opts.ignoreScripts;
-
-    this.disablePrepublish = !!opts.disablePrepublish;
-
-    // $FlowFixMe$
-    this.nonInteractive = !!opts.nonInteractive || isCi || !process.stdout.isTTY;
-
-    this.requestManager.setOptions({
-      offline: !!opts.offline && !opts.preferOffline,
-      captureHar: !!opts.captureHar
-    });
-
-    this.focus = !!opts.focus;
-    this.focusedWorkspaceName = '';
-
-    this.otp = opts.otp || '';
-  }
-
-  /**
-   * Generate a name suitable as unique filesystem identifier for the specified package.
-   */
-
-  generateUniquePackageSlug(pkg) {
-    let slug = pkg.name;
-
-    slug = slug.replace(/[^@a-z0-9]+/g, '-');
-    slug = slug.replace(/^-+|-+$/g, '');
-
-    if (pkg.registry) {
-      slug = `${pkg.registry}-${slug}`;
-    } else {
-      slug = `unknown-${slug}`;
-    }
-
-    const hash = pkg.remote.hash;
-
-
-    if (pkg.version) {
-      slug += `-${pkg.version}`;
-    }
-
-    if (pkg.uid && pkg.version !== pkg.uid) {
-      slug += `-${pkg.uid}`;
-    } else if (hash) {
-      slug += `-${hash}`;
-    }
-
-    return slug;
-  }
-
-  /**
-   * Generate an absolute module path.
-   */
-
-  generateModuleCachePath(pkg) {
-    invariant(this.cacheFolder, 'No package root');
-    invariant(pkg, 'Undefined package');
-
-    const slug = this.generateUniquePackageSlug(pkg);
-    return path.join(this.cacheFolder, slug, 'node_modules', pkg.name);
-  }
-
-  /**
-   */
-
-  getUnpluggedPath() {
-    return path.join(this.lockfileFolder, '.pnp', 'unplugged');
-  }
-
-  /**
-    */
-
-  generatePackageUnpluggedPath(pkg) {
-    const slug = this.generateUniquePackageSlug(pkg);
-    return path.join(this.getUnpluggedPath(), slug, 'node_modules', pkg.name);
-  }
-
-  /**
-   */
-
-  listUnpluggedPackageFolders() {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const unpluggedPackages = new Map();
-      const unpluggedPath = _this2.getUnpluggedPath();
-
-      if (!(yield (_fs || _load_fs()).exists(unpluggedPath))) {
-        return unpluggedPackages;
-      }
-
-      for (var _iterator4 = yield (_fs || _load_fs()).readdir(unpluggedPath), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray4) {
-          if (_i4 >= _iterator4.length) break;
-          _ref4 = _iterator4[_i4++];
-        } else {
-          _i4 = _iterator4.next();
-          if (_i4.done) break;
-          _ref4 = _i4.value;
-        }
-
-        const unpluggedName = _ref4;
-
-        const nmListing = yield (_fs || _load_fs()).readdir(path.join(unpluggedPath, unpluggedName, 'node_modules'));
-        invariant(nmListing.length === 1, 'A single folder should be in the unplugged directory');
-
-        const target = path.join(unpluggedPath, unpluggedName, `node_modules`, nmListing[0]);
-        unpluggedPackages.set(unpluggedName, target);
-      }
-
-      return unpluggedPackages;
-    })();
-  }
-
-  /**
-   * Execute lifecycle scripts in the specified directory. Ignoring when the --ignore-scripts flag has been
-   * passed.
-   */
-
-  executeLifecycleScript(commandName, cwd) {
-    if (this.ignoreScripts) {
-      return Promise.resolve();
-    } else {
-      return (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execFromManifest)(this, commandName, cwd || this.cwd);
-    }
-  }
-
-  /**
-   * Generate an absolute temporary filename location based on the input filename.
-   */
-
-  getTemp(filename) {
-    invariant(this.tempFolder, 'No temp folder');
-    return path.join(this.tempFolder, filename);
-  }
-
-  /**
-   * Remote packages may be cached in a file system to be available for offline installation.
-   * Second time the same package needs to be installed it will be loaded from there.
-   * Given a package's filename, return a path in the offline mirror location.
-   */
-
-  getOfflineMirrorPath(packageFilename) {
-    let mirrorPath;
-
-    var _arr = ['npm', 'yarn'];
-    for (var _i5 = 0; _i5 < _arr.length; _i5++) {
-      const key = _arr[_i5];
-      const registry = this.registries[key];
-
-      if (registry == null) {
-        continue;
-      }
-
-      const registryMirrorPath = registry.config['yarn-offline-mirror'];
-
-      if (registryMirrorPath === false) {
-        return null;
-      }
-
-      if (registryMirrorPath == null) {
-        continue;
-      }
-
-      mirrorPath = registryMirrorPath;
-    }
-
-    if (mirrorPath == null) {
-      return null;
-    }
-
-    if (packageFilename == null) {
-      return mirrorPath;
-    }
-
-    return path.join(mirrorPath, path.basename(packageFilename));
-  }
-
-  /**
-   * Checker whether the folder input is a valid module folder. We output a yarn metadata
-   * file when we've successfully setup a folder so use this as a marker.
-   */
-
-  isValidModuleDest(dest) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (!(yield (_fs || _load_fs()).exists(dest))) {
-        return false;
-      }
-
-      if (!(yield (_fs || _load_fs()).exists(path.join(dest, (_constants || _load_constants()).METADATA_FILENAME)))) {
-        return false;
-      }
-
-      return true;
-    })();
-  }
-
-  /**
-   * Read package metadata and normalized package info.
-   */
-
-  readPackageMetadata(dir) {
-    var _this3 = this;
-
-    return this.getCache(`metadata-${dir}`, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const metadata = yield _this3.readJson(path.join(dir, (_constants || _load_constants()).METADATA_FILENAME));
-      const pkg = yield _this3.readManifest(dir, metadata.registry);
-
-      return {
-        package: pkg,
-        artifacts: metadata.artifacts || [],
-        hash: metadata.hash,
-        remote: metadata.remote,
-        registry: metadata.registry
-      };
-    }));
-  }
-
-  /**
-   * Read normalized package info according yarn-metadata.json
-   * throw an error if package.json was not found
-   */
-
-  readManifest(dir, priorityRegistry, isRoot = false) {
-    var _this4 = this;
-
-    return this.getCache(`manifest-${dir}`, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const manifest = yield _this4.maybeReadManifest(dir, priorityRegistry, isRoot);
-
-      if (manifest) {
-        return manifest;
-      } else {
-        throw new (_errors || _load_errors()).MessageError(_this4.reporter.lang('couldntFindPackagejson', dir), 'ENOENT');
-      }
-    }));
-  }
-
-  /**
-   * try get the manifest file by looking
-   * 1. manifest file in cache
-   * 2. manifest file in registry
-   */
-  maybeReadManifest(dir, priorityRegistry, isRoot = false) {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const metadataLoc = path.join(dir, (_constants || _load_constants()).METADATA_FILENAME);
-
-      if (yield (_fs || _load_fs()).exists(metadataLoc)) {
-        const metadata = yield _this5.readJson(metadataLoc);
-
-        if (!priorityRegistry) {
-          priorityRegistry = metadata.priorityRegistry;
-        }
-
-        if (typeof metadata.manifest !== 'undefined') {
-          return metadata.manifest;
-        }
-      }
-
-      if (priorityRegistry) {
-        const file = yield _this5.tryManifest(dir, priorityRegistry, isRoot);
-        if (file) {
-          return file;
-        }
-      }
-
-      for (var _iterator5 = Object.keys((_index2 || _load_index2()).registries), _isArray5 = Array.isArray(_iterator5), _i6 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray5) {
-          if (_i6 >= _iterator5.length) break;
-          _ref7 = _iterator5[_i6++];
-        } else {
-          _i6 = _iterator5.next();
-          if (_i6.done) break;
-          _ref7 = _i6.value;
-        }
-
-        const registry = _ref7;
-
-        if (priorityRegistry === registry) {
-          continue;
-        }
-
-        const file = yield _this5.tryManifest(dir, registry, isRoot);
-        if (file) {
-          return file;
-        }
-      }
-
-      return null;
-    })();
-  }
-
-  /**
-   * Read the root manifest.
-   */
-
-  readRootManifest() {
-    return this.readManifest(this.cwd, 'npm', true);
-  }
-
-  /**
-   * Try and find package info with the input directory and registry.
-   */
-
-  tryManifest(dir, registry, isRoot) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const filename = (_index2 || _load_index2()).registries[registry].filename;
-
-      const loc = path.join(dir, filename);
-      if (yield (_fs || _load_fs()).exists(loc)) {
-        const data = yield _this6.readJson(loc);
-        data._registry = registry;
-        data._loc = loc;
-        return (0, (_index || _load_index()).default)(data, dir, _this6, isRoot);
-      } else {
-        return null;
-      }
-    })();
-  }
-
-  findManifest(dir, isRoot) {
-    var _this7 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      for (var _iterator6 = (_index2 || _load_index2()).registryNames, _isArray6 = Array.isArray(_iterator6), _i7 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-        var _ref8;
-
-        if (_isArray6) {
-          if (_i7 >= _iterator6.length) break;
-          _ref8 = _iterator6[_i7++];
-        } else {
-          _i7 = _iterator6.next();
-          if (_i7.done) break;
-          _ref8 = _i7.value;
-        }
-
-        const registry = _ref8;
-
-        const manifest = yield _this7.tryManifest(dir, registry, isRoot);
-
-        if (manifest) {
-          return manifest;
-        }
-      }
-
-      return null;
-    })();
-  }
-
-  findWorkspaceRoot(initial) {
-    var _this8 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let previous = null;
-      let current = path.normalize(initial);
-      if (!(yield (_fs || _load_fs()).exists(current))) {
-        throw new (_errors || _load_errors()).MessageError(_this8.reporter.lang('folderMissing', current));
-      }
-
-      do {
-        const manifest = yield _this8.findManifest(current, true);
-        const ws = extractWorkspaces(manifest);
-        if (ws && ws.packages) {
-          const relativePath = path.relative(current, initial);
-          if (relativePath === '' || micromatch([relativePath], ws.packages).length > 0) {
-            return current;
-          } else {
-            return null;
-          }
-        }
-
-        previous = current;
-        current = path.dirname(current);
-      } while (current !== previous);
-
-      return null;
-    })();
-  }
-
-  resolveWorkspaces(root, rootManifest) {
-    var _this9 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const workspaces = {};
-      if (!_this9.workspacesEnabled) {
-        return workspaces;
-      }
-
-      const ws = _this9.getWorkspaces(rootManifest, true);
-      const patterns = ws && ws.packages ? ws.packages : [];
-
-      if (!Array.isArray(patterns)) {
-        throw new (_errors || _load_errors()).MessageError(_this9.reporter.lang('workspacesSettingMustBeArray'));
-      }
-
-      const registryFilenames = (_index2 || _load_index2()).registryNames.map(function (registryName) {
-        return _this9.registries[registryName].constructor.filename;
-      }).join('|');
-      const trailingPattern = `/+(${registryFilenames})`;
-      // anything under folder (node_modules) should be ignored, thus use the '**' instead of shallow match "*"
-      const ignorePatterns = _this9.registryFolders.map(function (folder) {
-        return `/${folder}/**/+(${registryFilenames})`;
-      });
-
-      const files = yield Promise.all(patterns.map(function (pattern) {
-        return (_fs || _load_fs()).glob(pattern.replace(/\/?$/, trailingPattern), {
-          cwd: root,
-          ignore: ignorePatterns.map(function (ignorePattern) {
-            return pattern.replace(/\/?$/, ignorePattern);
-          })
-        });
-      }));
-
-      for (var _iterator7 = new Set([].concat(...files)), _isArray7 = Array.isArray(_iterator7), _i8 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-        var _ref9;
-
-        if (_isArray7) {
-          if (_i8 >= _iterator7.length) break;
-          _ref9 = _iterator7[_i8++];
-        } else {
-          _i8 = _iterator7.next();
-          if (_i8.done) break;
-          _ref9 = _i8.value;
-        }
-
-        const file = _ref9;
-
-        const loc = path.join(root, path.dirname(file));
-        const manifest = yield _this9.findManifest(loc, false);
-
-        if (!manifest) {
-          continue;
-        }
-
-        if (!manifest.name) {
-          _this9.reporter.warn(_this9.reporter.lang('workspaceNameMandatory', loc));
-          continue;
-        }
-        if (!manifest.version) {
-          _this9.reporter.warn(_this9.reporter.lang('workspaceVersionMandatory', loc));
-          continue;
-        }
-
-        if (Object.prototype.hasOwnProperty.call(workspaces, manifest.name)) {
-          throw new (_errors || _load_errors()).MessageError(_this9.reporter.lang('workspaceNameDuplicate', manifest.name));
-        }
-
-        workspaces[manifest.name] = { loc, manifest };
-      }
-
-      return workspaces;
-    })();
-  }
-
-  // workspaces functions
-  getWorkspaces(manifest, shouldThrow = false) {
-    if (!manifest || !this.workspacesEnabled) {
-      return undefined;
-    }
-
-    const ws = extractWorkspaces(manifest);
-
-    if (!ws) {
-      return ws;
-    }
-
-    // validate eligibility
-    let wsCopy = (0, (_extends2 || _load_extends()).default)({}, ws);
-    const warnings = [];
-    const errors = [];
-
-    // packages
-    if (wsCopy.packages && wsCopy.packages.length > 0 && !manifest.private) {
-      errors.push(this.reporter.lang('workspacesRequirePrivateProjects'));
-      wsCopy = undefined;
-    }
-    // nohoist
-    if (wsCopy && wsCopy.nohoist && wsCopy.nohoist.length > 0) {
-      if (!this.workspacesNohoistEnabled) {
-        warnings.push(this.reporter.lang('workspacesNohoistDisabled', manifest.name));
-        wsCopy.nohoist = undefined;
-      } else if (!manifest.private) {
-        errors.push(this.reporter.lang('workspacesNohoistRequirePrivatePackages', manifest.name));
-        wsCopy.nohoist = undefined;
-      }
-    }
-
-    if (errors.length > 0 && shouldThrow) {
-      throw new (_errors || _load_errors()).MessageError(errors.join('\n'));
-    }
-
-    const msg = errors.concat(warnings).join('\n');
-    if (msg.length > 0) {
-      this.reporter.warn(msg);
-    }
-
-    return wsCopy;
-  }
-
-  /**
-   * Description
-   */
-
-  getFolder(pkg) {
-    let registryName = pkg._registry;
-    if (!registryName) {
-      const ref = pkg._reference;
-      invariant(ref, 'expected reference');
-      registryName = ref.registry;
-    }
-    return this.registries[registryName].folder;
-  }
-
-  /**
-   * Get root manifests.
-   */
-
-  getRootManifests() {
-    var _this10 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const manifests = {};
-      for (var _iterator8 = (_index2 || _load_index2()).registryNames, _isArray8 = Array.isArray(_iterator8), _i9 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-        var _ref10;
-
-        if (_isArray8) {
-          if (_i9 >= _iterator8.length) break;
-          _ref10 = _iterator8[_i9++];
-        } else {
-          _i9 = _iterator8.next();
-          if (_i9.done) break;
-          _ref10 = _i9.value;
-        }
-
-        const registryName = _ref10;
-
-        const registry = (_index2 || _load_index2()).registries[registryName];
-        const jsonLoc = path.join(_this10.cwd, registry.filename);
-
-        let object = {};
-        let exists = false;
-        let indent;
-        if (yield (_fs || _load_fs()).exists(jsonLoc)) {
-          exists = true;
-
-          const info = yield _this10.readJson(jsonLoc, (_fs || _load_fs()).readJsonAndFile);
-          object = info.object;
-          indent = detectIndent(info.content).indent || undefined;
-        }
-        manifests[registryName] = { loc: jsonLoc, object, exists, indent };
-      }
-      return manifests;
-    })();
-  }
-
-  /**
-   * Save root manifests.
-   */
-
-  saveRootManifests(manifests) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      for (var _iterator9 = (_index2 || _load_index2()).registryNames, _isArray9 = Array.isArray(_iterator9), _i10 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-        var _ref11;
-
-        if (_isArray9) {
-          if (_i10 >= _iterator9.length) break;
-          _ref11 = _iterator9[_i10++];
-        } else {
-          _i10 = _iterator9.next();
-          if (_i10.done) break;
-          _ref11 = _i10.value;
-        }
-
-        const registryName = _ref11;
-        var _manifests$registryNa = manifests[registryName];
-        const loc = _manifests$registryNa.loc,
-              object = _manifests$registryNa.object,
-              exists = _manifests$registryNa.exists,
-              indent = _manifests$registryNa.indent;
-
-        if (!exists && !Object.keys(object).length) {
-          continue;
-        }
-
-        for (var _iterator10 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray10 = Array.isArray(_iterator10), _i11 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-          var _ref12;
-
-          if (_isArray10) {
-            if (_i11 >= _iterator10.length) break;
-            _ref12 = _iterator10[_i11++];
-          } else {
-            _i11 = _iterator10.next();
-            if (_i11.done) break;
-            _ref12 = _i11.value;
-          }
-
-          const field = _ref12;
-
-          if (object[field]) {
-            object[field] = sortObject(object[field]);
-          }
-        }
-
-        yield (_fs || _load_fs()).writeFilePreservingEol(loc, JSON.stringify(object, null, indent || (_constants || _load_constants()).DEFAULT_INDENT) + '\n');
-      }
-    })();
-  }
-
-  /**
-   * Call the passed factory (defaults to fs.readJson) and rethrow a pretty error message if it was the result
-   * of a syntax error.
-   */
-
-  readJson(loc, factory = (_fs || _load_fs()).readJson) {
-    try {
-      return factory(loc);
-    } catch (err) {
-      if (err instanceof SyntaxError) {
-        throw new (_errors || _load_errors()).MessageError(this.reporter.lang('jsonError', loc, err.message));
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  static create(opts = {}, reporter = new (_index3 || _load_index3()).NoopReporter()) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const config = new Config(reporter);
-      yield config.init(opts);
-      return config;
-    })();
-  }
-}
-
-exports.default = Config;
-function extractWorkspaces(manifest) {
-  if (!manifest || !manifest.workspaces) {
-    return undefined;
-  }
-
-  if (Array.isArray(manifest.workspaces)) {
-    return { packages: manifest.workspaces };
-  }
-
-  if (manifest.workspaces.packages && Array.isArray(manifest.workspaces.packages) || manifest.workspaces.nohoist && Array.isArray(manifest.workspaces.nohoist)) {
-    return manifest.workspaces;
-  }
-
-  return undefined;
-}
-
-/***/ }),
-/* 163 */
-/***/ (function(module, exports) {
-
-module.exports = function(module) {
-	if(!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if(!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
-};
-
-
-/***/ }),
-/* 164 */
-/***/ (function(module, exports) {
-
-module.exports = require("net");
-
-/***/ }),
-/* 165 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.Add = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-let run = exports.run = (() => {
-  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (!args.length) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('missingAddDependencies'));
-    }
-
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-
-    yield (0, (_install || _load_install()).wrapLifecycle)(config, flags, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const install = new Add(args, flags, config, reporter, lockfile);
-      yield install.init();
-    }));
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref7.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-var _workspaceLayout;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(78);
-}
-
-var _list;
-
-function _load_list() {
-  return _list = __webpack_require__(358);
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const SILENCE_DEPENDENCY_TYPE_WARNINGS = ['upgrade', 'upgrade-interactive'];
-
-class Add extends (_install || _load_install()).Install {
-  constructor(args, flags, config, reporter, lockfile) {
-    const workspaceRootIsCwd = config.cwd === config.lockfileFolder;
-    const _flags = flags ? (0, (_extends2 || _load_extends()).default)({}, flags, { workspaceRootIsCwd }) : { workspaceRootIsCwd };
-    super(_flags, config, reporter, lockfile);
-    this.args = args;
-    // only one flag is supported, so we can figure out which one was passed to `yarn add`
-    this.flagToOrigin = [flags.dev && 'devDependencies', flags.optional && 'optionalDependencies', flags.peer && 'peerDependencies', 'dependencies'].filter(Boolean).shift();
-  }
-
-  /**
-   * TODO
-   */
-
-  prepareRequests(requests) {
-    const requestsWithArgs = requests.slice();
-
-    for (var _iterator = this.args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const pattern = _ref;
-
-      requestsWithArgs.push({
-        pattern,
-        registry: 'npm',
-        optional: false
-      });
-    }
-    return requestsWithArgs;
-  }
-
-  /**
-   * returns version for a pattern based on Manifest
-   */
-  getPatternVersion(pattern, pkg) {
-    const tilde = this.flags.tilde;
-    const configPrefix = String(this.config.getOption('save-prefix'));
-    const exact = this.flags.exact || Boolean(this.config.getOption('save-exact')) || configPrefix === '';
-
-    var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern);
-
-    const hasVersion = _normalizePattern.hasVersion,
-          range = _normalizePattern.range;
-
-    let version;
-
-    if ((0, (_index || _load_index()).getExoticResolver)(pattern)) {
-      // wasn't a name/range tuple so this is just a raw exotic pattern
-      version = pattern;
-    } else if (hasVersion && range && ((_semver || _load_semver()).default.satisfies(pkg.version, range) || (0, (_index || _load_index()).getExoticResolver)(range))) {
-      // if the user specified a range then use it verbatim
-      version = range;
-    }
-
-    if (!version || (_semver || _load_semver()).default.valid(version)) {
-      let prefix = configPrefix || '^';
-
-      if (tilde) {
-        prefix = '~';
-      } else if (version || exact) {
-        prefix = '';
-      }
-      version = `${prefix}${pkg.version}`;
-    }
-
-    return version;
-  }
-
-  preparePatterns(patterns) {
-    const preparedPatterns = patterns.slice();
-    for (var _iterator2 = this.resolver.dedupePatterns(this.args), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref2 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref2 = _i2.value;
-      }
-
-      const pattern = _ref2;
-
-      const pkg = this.resolver.getResolvedPattern(pattern);
-      (0, (_invariant || _load_invariant()).default)(pkg, `missing package ${pattern}`);
-      const version = this.getPatternVersion(pattern, pkg);
-      const newPattern = `${pkg.name}@${version}`;
-      preparedPatterns.push(newPattern);
-      this.addedPatterns.push(newPattern);
-      if (newPattern === pattern) {
-        continue;
-      }
-      this.resolver.replacePattern(pattern, newPattern);
-    }
-    return preparedPatterns;
-  }
-
-  preparePatternsForLinking(patterns, cwdManifest, cwdIsRoot) {
-    // remove the newly added patterns if cwd != root and update the in-memory package dependency instead
-    if (cwdIsRoot) {
-      return patterns;
-    }
-
-    let manifest;
-    const cwdPackage = `${cwdManifest.name}@${cwdManifest.version}`;
-    try {
-      manifest = this.resolver.getStrictResolvedPattern(cwdPackage);
-    } catch (e) {
-      this.reporter.warn(this.reporter.lang('unknownPackage', cwdPackage));
-      return patterns;
-    }
-
-    let newPatterns = patterns;
-    this._iterateAddedPackages((pattern, registry, dependencyType, pkgName, version) => {
-      // remove added package from patterns list
-      const filtered = newPatterns.filter(p => p !== pattern);
-      (0, (_invariant || _load_invariant()).default)(newPatterns.length - filtered.length > 0, `expect added pattern '${pattern}' in the list: ${patterns.toString()}`);
-      newPatterns = filtered;
-
-      // add new package into in-memory manifest so they can be linked properly
-      manifest[dependencyType] = manifest[dependencyType] || {};
-      if (manifest[dependencyType][pkgName] === version) {
-        // package already existed
-        return;
-      }
-
-      // update dependencies in the manifest
-      (0, (_invariant || _load_invariant()).default)(manifest._reference, 'manifest._reference should not be null');
-      const ref = manifest._reference;
-
-      ref['dependencies'] = ref['dependencies'] || [];
-      ref['dependencies'].push(pattern);
-    });
-
-    return newPatterns;
-  }
-
-  bailout(patterns, workspaceLayout) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const lockfileCache = _this.lockfile.cache;
-      if (!lockfileCache) {
-        return false;
-      }
-      const match = yield _this.integrityChecker.check(patterns, lockfileCache, _this.flags, workspaceLayout);
-      const haveLockfile = yield (_fs || _load_fs()).exists((_path || _load_path()).default.join(_this.config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME));
-      if (match.integrityFileMissing && haveLockfile) {
-        // Integrity file missing, force script installations
-        _this.scripts.setForce(true);
-      }
-      return false;
-    })();
-  }
-
-  /**
-   * Description
-   */
-
-  init() {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const isWorkspaceRoot = _this2.config.workspaceRootFolder && _this2.config.cwd === _this2.config.workspaceRootFolder;
-
-      // running "yarn add something" in a workspace root is often a mistake
-      if (isWorkspaceRoot && !_this2.flags.ignoreWorkspaceRootCheck) {
-        throw new (_errors || _load_errors()).MessageError(_this2.reporter.lang('workspacesAddRootCheck'));
-      }
-
-      _this2.addedPatterns = [];
-      const patterns = yield (_install || _load_install()).Install.prototype.init.call(_this2);
-      yield _this2.maybeOutputSaveTree(patterns);
-      return patterns;
-    })();
-  }
-
-  applyChanges(manifests) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield (_install || _load_install()).Install.prototype.applyChanges.call(_this3, manifests);
-
-      // fill rootPatternsToOrigin without `excludePatterns`
-      yield (_install || _load_install()).Install.prototype.fetchRequestFromCwd.call(_this3);
-
-      _this3._iterateAddedPackages(function (pattern, registry, dependencyType, pkgName, version) {
-        // add it to manifest
-        const object = manifests[registry].object;
-
-
-        object[dependencyType] = object[dependencyType] || {};
-        object[dependencyType][pkgName] = version;
-        if (SILENCE_DEPENDENCY_TYPE_WARNINGS.indexOf(_this3.config.commandName) === -1 && dependencyType !== _this3.flagToOrigin) {
-          _this3.reporter.warn(_this3.reporter.lang('moduleAlreadyInManifest', pkgName, dependencyType, _this3.flagToOrigin));
-        }
-      });
-
-      return true;
-    })();
-  }
-
-  /**
-   * Description
-   */
-
-  fetchRequestFromCwd() {
-    return (_install || _load_install()).Install.prototype.fetchRequestFromCwd.call(this, this.args);
-  }
-
-  /**
-   * Output a tree of any newly added dependencies.
-   */
-
-  maybeOutputSaveTree(patterns) {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // don't limit the shown tree depth
-      const opts = {
-        reqDepth: 0
-      };
-
-      // restore the original patterns
-      const merged = [...patterns, ..._this4.addedPatterns];
-
-      var _ref3 = yield (0, (_list || _load_list()).buildTree)(_this4.resolver, _this4.linker, merged, opts, true, true);
-
-      const trees = _ref3.trees,
-            count = _ref3.count;
-
-
-      if (count === 1) {
-        _this4.reporter.success(_this4.reporter.lang('savedNewDependency'));
-      } else {
-        _this4.reporter.success(_this4.reporter.lang('savedNewDependencies', count));
-      }
-
-      if (!count) {
-        return;
-      }
-
-      const resolverPatterns = new Set();
-      for (var _iterator3 = patterns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref4 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref4 = _i3.value;
-        }
-
-        const pattern = _ref4;
-
-        var _ref5 = _this4.resolver.getResolvedPattern(pattern) || {};
-
-        const version = _ref5.version,
-              name = _ref5.name;
-
-        resolverPatterns.add(`${name}@${version}`);
-      }
-      const directRequireDependencies = trees.filter(function ({ name }) {
-        return resolverPatterns.has(name);
-      });
-
-      _this4.reporter.info(_this4.reporter.lang('directDependencies'));
-      _this4.reporter.tree('newDirectDependencies', directRequireDependencies);
-      _this4.reporter.info(_this4.reporter.lang('allDependencies'));
-      _this4.reporter.tree('newAllDependencies', trees);
-    })();
-  }
-
-  /**
-   * Save added packages to manifest if any of the --save flags were used.
-   */
-
-  savePackages() {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {})();
-  }
-
-  _iterateAddedPackages(f) {
-    const patternOrigins = Object.keys(this.rootPatternsToOrigin);
-
-    // add new patterns to their appropriate registry manifest
-    for (var _iterator4 = this.addedPatterns, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref6;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref6 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref6 = _i4.value;
-      }
-
-      const pattern = _ref6;
-
-      const pkg = this.resolver.getResolvedPattern(pattern);
-      (0, (_invariant || _load_invariant()).default)(pkg, `missing package ${pattern}`);
-      const version = this.getPatternVersion(pattern, pkg);
-      const ref = pkg._reference;
-      (0, (_invariant || _load_invariant()).default)(ref, 'expected package reference');
-      // lookup the package to determine dependency type; used during `yarn upgrade`
-      const depType = patternOrigins.reduce((acc, prev) => {
-        if (prev.indexOf(`${pkg.name}@`) === 0) {
-          return this.rootPatternsToOrigin[prev];
-        }
-        return acc;
-      }, null);
-
-      // depType is calculated when `yarn upgrade` command is used
-      const target = depType || this.flagToOrigin;
-
-      f(pattern, ref.registry, target, pkg.name, version);
-    }
-  }
-}
-
-exports.Add = Add;
-function hasWrapper(commander) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Installs a package and any packages that it depends on.');
-  commander.usage('add [packages ...] [flags]');
-  commander.option('-W, --ignore-workspace-root-check', 'required to run yarn add inside a workspace root');
-  commander.option('-D, --dev', 'save package to your `devDependencies`');
-  commander.option('-P, --peer', 'save package to your `peerDependencies`');
-  commander.option('-O, --optional', 'save package to your `optionalDependencies`');
-  commander.option('-E, --exact', 'install exact version');
-  commander.option('-T, --tilde', 'install most recent release with the same minor version');
-  commander.option('-A, --audit', 'Run vulnerability audit on installed packages');
-}
-
-/***/ }),
-/* 166 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.pack = exports.packTarball = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let packTarball = exports.packTarball = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, { mapHeader } = {}) {
-    const pkg = yield config.readRootManifest();
-    const bundleDependencies = pkg.bundleDependencies,
-          main = pkg.main,
-          onlyFiles = pkg.files;
-
-    // include required files
-
-    let filters = NEVER_IGNORE.slice();
-    // include default filters unless `files` is used
-    if (!onlyFiles) {
-      filters = filters.concat(DEFAULT_IGNORE);
-    }
-    if (main) {
-      filters = filters.concat((0, (_filter || _load_filter()).ignoreLinesToRegex)(['!/' + main]));
-    }
-
-    // include bundleDependencies
-    let bundleDependenciesFiles = [];
-    if (bundleDependencies) {
-      for (var _iterator = bundleDependencies, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref2 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref2 = _i.value;
-        }
-
-        const dependency = _ref2;
-
-        const dependencyList = depsFor(dependency, config.cwd);
-
-        for (var _iterator2 = dependencyList, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-          var _ref3;
-
-          if (_isArray2) {
-            if (_i2 >= _iterator2.length) break;
-            _ref3 = _iterator2[_i2++];
-          } else {
-            _i2 = _iterator2.next();
-            if (_i2.done) break;
-            _ref3 = _i2.value;
-          }
-
-          const dep = _ref3;
-
-          const filesForBundledDep = yield (_fs || _load_fs()).walk(dep.baseDir, null, new Set(FOLDERS_IGNORE));
-          bundleDependenciesFiles = bundleDependenciesFiles.concat(filesForBundledDep);
-        }
-      }
-    }
-
-    // `files` field
-    if (onlyFiles) {
-      let lines = ['*'];
-      lines = lines.concat(onlyFiles.map(function (filename) {
-        return `!${filename}`;
-      }), onlyFiles.map(function (filename) {
-        return `!${path.join(filename, '**')}`;
-      }));
-      const regexes = (0, (_filter || _load_filter()).ignoreLinesToRegex)(lines, './');
-      filters = filters.concat(regexes);
-    }
-
-    const files = yield (_fs || _load_fs()).walk(config.cwd, null, new Set(FOLDERS_IGNORE));
-    const dotIgnoreFiles = (0, (_filter || _load_filter()).filterOverridenGitignores)(files);
-
-    // create ignores
-    for (var _iterator3 = dotIgnoreFiles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
-
-      const file = _ref4;
-
-      const raw = yield (_fs || _load_fs()).readFile(file.absolute);
-      const lines = raw.split('\n');
-
-      const regexes = (0, (_filter || _load_filter()).ignoreLinesToRegex)(lines, path.dirname(file.relative));
-      filters = filters.concat(regexes);
-    }
-
-    // files to definitely keep, takes precedence over ignore filter
-    const keepFiles = new Set();
-
-    // files to definitely ignore
-    const ignoredFiles = new Set();
-
-    // list of files that didn't match any of our patterns, if a directory in the chain above was matched
-    // then we should inherit it
-    const possibleKeepFiles = new Set();
-
-    // apply filters
-    (0, (_filter || _load_filter()).sortFilter)(files, filters, keepFiles, possibleKeepFiles, ignoredFiles);
-
-    // add the files for the bundled dependencies to the set of files to keep
-    for (var _iterator4 = bundleDependenciesFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref5;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref5 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref5 = _i4.value;
-      }
-
-      const file = _ref5;
-
-      const realPath = yield (_fs || _load_fs()).realpath(config.cwd);
-      keepFiles.add(path.relative(realPath, file.absolute));
-    }
-
-    return packWithIgnoreAndHeaders(config.cwd, function (name) {
-      const relative = path.relative(config.cwd, name);
-      // Don't ignore directories, since we need to recurse inside them to check for unignored files.
-      if (fs2.lstatSync(name).isDirectory()) {
-        const isParentOfKeptFile = Array.from(keepFiles).some(function (name) {
-          return !path.relative(relative, name).startsWith('..');
-        });
-        return !isParentOfKeptFile;
-      }
-      // Otherwise, ignore a file if we're not supposed to keep it.
-      return !keepFiles.has(relative);
-    }, { mapHeader });
-  });
-
-  return function packTarball(_x) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let pack = exports.pack = (() => {
-  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    const packer = yield packTarball(config);
-    const compressor = packer.pipe(new zlib.Gzip());
-
-    return compressor;
-  });
-
-  return function pack(_x2) {
-    return _ref6.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const pkg = yield config.readRootManifest();
-    if (!pkg.name) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('noName'));
-    }
-    if (!pkg.version) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('noVersion'));
-    }
-
-    const normaliseScope = function normaliseScope(name) {
-      return name[0] === '@' ? name.substr(1).replace('/', '-') : name;
-    };
-    const filename = flags.filename || path.join(config.cwd, `${normaliseScope(pkg.name)}-v${pkg.version}.tgz`);
-
-    yield config.executeLifecycleScript('prepack');
-
-    const stream = yield pack(config);
-
-    yield new Promise(function (resolve, reject) {
-      stream.pipe(fs2.createWriteStream(filename));
-      stream.on('error', reject);
-      stream.on('close', resolve);
-    });
-
-    yield config.executeLifecycleScript('postpack');
-
-    reporter.success(reporter.lang('packWroteTarball', filename));
-  });
-
-  return function run(_x3, _x4, _x5, _x6) {
-    return _ref7.apply(this, arguments);
-  };
-})();
-
-exports.packWithIgnoreAndHeaders = packWithIgnoreAndHeaders;
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _filter;
-
-function _load_filter() {
-  return _filter = __webpack_require__(372);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const zlib = __webpack_require__(198);
-const path = __webpack_require__(0);
-const tar = __webpack_require__(193);
-const fs2 = __webpack_require__(5);
-const depsFor = __webpack_require__(678);
-
-const FOLDERS_IGNORE = [
-// never allow version control folders
-'.git', 'CVS', '.svn', '.hg', 'node_modules'];
-
-const DEFAULT_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([...FOLDERS_IGNORE,
-
-// ignore cruft
-'yarn.lock', '.lock-wscript', '.wafpickle-{0..9}', '*.swp', '._*', 'npm-debug.log', 'yarn-error.log', '.npmrc', '.yarnrc', '.npmignore', '.gitignore', '.DS_Store']);
-
-const NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([
-// never ignore these files
-'!/package.json', '!/readme*', '!/+(license|licence)*', '!/+(changes|changelog|history)*']);
-
-function packWithIgnoreAndHeaders(cwd, ignoreFunction, { mapHeader } = {}) {
-  return tar.pack(cwd, {
-    ignore: ignoreFunction,
-    map: header => {
-      const suffix = header.name === '.' ? '' : `/${header.name}`;
-      header.name = `package${suffix}`;
-      delete header.uid;
-      delete header.gid;
-      return mapHeader ? mapHeader(header) : header;
-    }
-  });
-}
-
-function setFlags(commander) {
-  commander.description('Creates a compressed gzip archive of package dependencies.');
-  commander.option('-f, --filename <filename>', 'filename');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 167 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(220));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _mutex;
-
-function _load_mutex() {
-  return _mutex = _interopRequireDefault(__webpack_require__(375));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint no-unused-vars: 0 */
-
-const cmdShim = __webpack_require__(201);
-const path = __webpack_require__(0);
-
-class BaseFetcher {
-  constructor(dest, remote, config) {
-    this.reporter = config.reporter;
-    this.packageName = remote.packageName;
-    this.reference = remote.reference;
-    this.registry = remote.registry;
-    this.hash = remote.hash;
-    this.remote = remote;
-    this.config = config;
-    this.dest = dest;
-  }
-
-  setupMirrorFromCache() {
-    // fetcher subclasses may use this to perform actions such as copying over a cached tarball to the offline
-    // mirror etc
-    return Promise.resolve();
-  }
-
-  _fetch() {
-    return Promise.reject(new Error('Not implemented'));
-  }
-
-  fetch(defaultManifest) {
-    var _this = this;
-
-    return (_fs || _load_fs()).lockQueue.push(this.dest, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield (_fs || _load_fs()).mkdirp(_this.dest);
-
-      // fetch package and get the hash
-
-      var _ref2 = yield _this._fetch();
-
-      const hash = _ref2.hash;
-
-
-      const pkg = yield (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-        // load the new normalized manifest
-        try {
-          return yield _this.config.readManifest(_this.dest, _this.registry);
-        } catch (e) {
-          if (e.code === 'ENOENT' && defaultManifest) {
-            return (0, (_index || _load_index()).default)(defaultManifest, _this.dest, _this.config, false);
-          } else {
-            throw e;
-          }
-        }
-      })();
-
-      if (pkg.bin) {
-        for (var _iterator = Object.keys(pkg.bin), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-          var _ref4;
-
-          if (_isArray) {
-            if (_i >= _iterator.length) break;
-            _ref4 = _iterator[_i++];
-          } else {
-            _i = _iterator.next();
-            if (_i.done) break;
-            _ref4 = _i.value;
-          }
-
-          const binName = _ref4;
-
-          const binDest = `${_this.dest}/.bin`;
-
-          // Using any sort of absolute path here would prevent makePortableProxyScript from preserving symlinks when
-          // calling the binary
-          const src = path.resolve(_this.dest, pkg.bin[binName]);
-
-          if (yield (_fs || _load_fs()).exists(src)) {
-            // We ensure that the target is executable
-            yield (_fs || _load_fs()).chmod(src, 0o755);
-          }
-
-          yield (_fs || _load_fs()).mkdirp(binDest);
-          if (process.platform === 'win32') {
-            const unlockMutex = yield (0, (_mutex || _load_mutex()).default)(src);
-            try {
-              yield cmdShim.ifExists(src, `${binDest}/${binName}`, { createPwshFile: false });
-            } finally {
-              unlockMutex();
-            }
-          } else {
-            yield (_fs || _load_fs()).symlink(src, `${binDest}/${binName}`);
-          }
-        }
-      }
-
-      yield (_fs || _load_fs()).writeFile(path.join(_this.dest, (_constants || _load_constants()).METADATA_FILENAME), JSON.stringify({
-        manifest: pkg,
-        artifacts: [],
-        remote: _this.remote,
-        registry: _this.registry,
-        hash
-      }, null, '  '));
-
-      return {
-        hash,
-        dest: _this.dest,
-        package: pkg,
-        cached: false
-      };
-    }));
-  }
-}
-exports.default = BaseFetcher;
-
-/***/ }),
-/* 168 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hash = hash;
-const crypto = __webpack_require__(12);
-const stream = __webpack_require__(23);
-
-function hash(content, type = 'md5') {
-  return crypto.createHash(type).update(content).digest('hex');
-}
-
-class HashStream extends stream.Transform {
-  constructor(options) {
-    super(options);
-    this._hash = crypto.createHash('sha1');
-    this._updated = false;
-  }
-
-  _transform(chunk, encoding, callback) {
-    this._updated = true;
-    this._hash.update(chunk);
-    callback(null, chunk);
-  }
-
-  getHash() {
-    return this._hash.digest('hex');
-  }
-
-  test(sum) {
-    return this._updated && sum === this.getHash();
-  }
-}
-exports.HashStream = HashStream;
-
-/***/ }),
-/* 169 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = guessName;
-
-var _url;
-
-function _load_url() {
-  return _url = _interopRequireDefault(__webpack_require__(24));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function cleanup(name) {
-  name = name.replace(/-\d+\.\d+\.\d+/, '');
-  return name.replace(/\.git$|\.zip$|\.tar\.gz$|\.tar\.bz2$/, '');
-}
-
-function guessNameFallback(source) {
-  // If cannot parse as url, just return cleaned up last part
-  const parts = source.split('/');
-  return cleanup(parts[parts.length - 1]);
-}
-
-function guessName(source) {
-  try {
-    const parsed = (_url || _load_url()).default.parse(source);
-
-    if (!parsed.pathname) {
-      return guessNameFallback(source);
-    }
-
-    const parts = parsed.pathname.split('/');
-
-    // Priority goes to part that ends with .git
-    for (var _iterator = parts, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const part = _ref;
-
-      if (part.match(/\.git$/)) {
-        return cleanup(part);
-      }
-    }
-
-    // Most likely a directory
-    if (parsed.host == null) {
-      return cleanup(parts[parts.length - 1]);
-    }
-
-    // A site like github or gitlab
-    if (parts.length > 2) {
-      return cleanup(parts[2]);
-    }
-
-    // Privately hosted package?
-    if (parts.length > 1) {
-      return cleanup(parts[1]);
-    }
-
-    return guessNameFallback(source);
-  } catch (e) {
-    return guessNameFallback(source);
-  }
-}
-
-/***/ }),
-/* 170 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// fallback for non-array-like ES3 and non-enumerable old V8 strings
-var cof = __webpack_require__(68);
-// eslint-disable-next-line no-prototype-builtins
-module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
-  return cof(it) == 'String' ? it.split('') : Object(it);
-};
-
-
-/***/ }),
-/* 171 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 19.1.2.14 / 15.2.3.14 Object.keys(O)
-var $keys = __webpack_require__(249);
-var enumBugKeys = __webpack_require__(127);
-
-module.exports = Object.keys || function keys(O) {
-  return $keys(O, enumBugKeys);
-};
-
-
-/***/ }),
-/* 172 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 7.1.13 ToObject(argument)
-var defined = __webpack_require__(91);
-module.exports = function (it) {
-  return Object(defined(it));
-};
-
-
-/***/ }),
-/* 173 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var once = __webpack_require__(83);
-
-var noop = function() {};
-
-var isRequest = function(stream) {
-	return stream.setHeader && typeof stream.abort === 'function';
-};
-
-var isChildProcess = function(stream) {
-	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
-};
-
-var eos = function(stream, opts, callback) {
-	if (typeof opts === 'function') return eos(stream, null, opts);
-	if (!opts) opts = {};
-
-	callback = once(callback || noop);
-
-	var ws = stream._writableState;
-	var rs = stream._readableState;
-	var readable = opts.readable || (opts.readable !== false && stream.readable);
-	var writable = opts.writable || (opts.writable !== false && stream.writable);
-
-	var onlegacyfinish = function() {
-		if (!stream.writable) onfinish();
-	};
-
-	var onfinish = function() {
-		writable = false;
-		if (!readable) callback.call(stream);
-	};
-
-	var onend = function() {
-		readable = false;
-		if (!writable) callback.call(stream);
-	};
-
-	var onexit = function(exitCode) {
-		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
-	};
-
-	var onerror = function(err) {
-		callback.call(stream, err);
-	};
-
-	var onclose = function() {
-		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
-		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
-	};
-
-	var onrequest = function() {
-		stream.req.on('finish', onfinish);
-	};
-
-	if (isRequest(stream)) {
-		stream.on('complete', onfinish);
-		stream.on('abort', onclose);
-		if (stream.req) onrequest();
-		else stream.on('request', onrequest);
-	} else if (writable && !ws) { // legacy streams
-		stream.on('end', onlegacyfinish);
-		stream.on('close', onlegacyfinish);
-	}
-
-	if (isChildProcess(stream)) stream.on('exit', onexit);
-
-	stream.on('end', onend);
-	stream.on('finish', onfinish);
-	if (opts.error !== false) stream.on('error', onerror);
-	stream.on('close', onclose);
-
-	return function() {
-		stream.removeListener('complete', onfinish);
-		stream.removeListener('abort', onclose);
-		stream.removeListener('request', onrequest);
-		if (stream.req) stream.req.removeListener('finish', onfinish);
-		stream.removeListener('end', onlegacyfinish);
-		stream.removeListener('close', onlegacyfinish);
-		stream.removeListener('finish', onfinish);
-		stream.removeListener('exit', onexit);
-		stream.removeListener('end', onend);
-		stream.removeListener('error', onerror);
-		stream.removeListener('close', onclose);
-	};
-};
-
-module.exports = eos;
-
-
-/***/ }),
-/* 174 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2012 Joyent, Inc.  All rights reserved.
-
-var assert = __webpack_require__(16);
-var sshpk = __webpack_require__(328);
-var util = __webpack_require__(3);
-
-var HASH_ALGOS = {
-  'sha1': true,
-  'sha256': true,
-  'sha512': true
-};
-
-var PK_ALGOS = {
-  'rsa': true,
-  'dsa': true,
-  'ecdsa': true
-};
-
-function HttpSignatureError(message, caller) {
-  if (Error.captureStackTrace)
-    Error.captureStackTrace(this, caller || HttpSignatureError);
-
-  this.message = message;
-  this.name = caller.name;
-}
-util.inherits(HttpSignatureError, Error);
-
-function InvalidAlgorithmError(message) {
-  HttpSignatureError.call(this, message, InvalidAlgorithmError);
-}
-util.inherits(InvalidAlgorithmError, HttpSignatureError);
-
-function validateAlgorithm(algorithm) {
-  var alg = algorithm.toLowerCase().split('-');
-
-  if (alg.length !== 2) {
-    throw (new InvalidAlgorithmError(alg[0].toUpperCase() + ' is not a ' +
-      'valid algorithm'));
-  }
-
-  if (alg[0] !== 'hmac' && !PK_ALGOS[alg[0]]) {
-    throw (new InvalidAlgorithmError(alg[0].toUpperCase() + ' type keys ' +
-      'are not supported'));
-  }
-
-  if (!HASH_ALGOS[alg[1]]) {
-    throw (new InvalidAlgorithmError(alg[1].toUpperCase() + ' is not a ' +
-      'supported hash algorithm'));
-  }
-
-  return (alg);
-}
-
-///--- API
-
-module.exports = {
-
-  HASH_ALGOS: HASH_ALGOS,
-  PK_ALGOS: PK_ALGOS,
-
-  HttpSignatureError: HttpSignatureError,
-  InvalidAlgorithmError: InvalidAlgorithmError,
-
-  validateAlgorithm: validateAlgorithm,
-
-  /**
-   * Converts an OpenSSH public key (rsa only) to a PKCS#8 PEM file.
-   *
-   * The intent of this module is to interoperate with OpenSSL only,
-   * specifically the node crypto module's `verify` method.
-   *
-   * @param {String} key an OpenSSH public key.
-   * @return {String} PEM encoded form of the RSA public key.
-   * @throws {TypeError} on bad input.
-   * @throws {Error} on invalid ssh key formatted data.
-   */
-  sshKeyToPEM: function sshKeyToPEM(key) {
-    assert.string(key, 'ssh_key');
-
-    var k = sshpk.parseKey(key, 'ssh');
-    return (k.toString('pem'));
-  },
-
-
-  /**
-   * Generates an OpenSSH fingerprint from an ssh public key.
-   *
-   * @param {String} key an OpenSSH public key.
-   * @return {String} key fingerprint.
-   * @throws {TypeError} on bad input.
-   * @throws {Error} if what you passed doesn't look like an ssh public key.
-   */
-  fingerprint: function fingerprint(key) {
-    assert.string(key, 'ssh_key');
-
-    var k = sshpk.parseKey(key, 'ssh');
-    return (k.fingerprint('md5').toString('hex'));
-  },
-
-  /**
-   * Converts a PKGCS#8 PEM file to an OpenSSH public key (rsa)
-   *
-   * The reverse of the above function.
-   */
-  pemToRsaSSHKey: function pemToRsaSSHKey(pem, comment) {
-    assert.equal('string', typeof (pem), 'typeof pem');
-
-    var k = sshpk.parseKey(pem, 'pem');
-    k.comment = comment;
-    return (k.toString('ssh'));
-  }
-};
-
-
-/***/ }),
-/* 175 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var chalk = __webpack_require__(30);
-var figures = __webpack_require__(270);
-
-/**
- * Separator object
- * Used to space/separate choices group
- * @constructor
- * @param {String} line   Separation line content (facultative)
- */
-
-class Separator {
-  constructor(line) {
-    this.type = 'separator';
-    this.line = chalk.dim(line || new Array(15).join(figures.line));
-  }
-
-  /**
-   * Stringify separator
-   * @return {String} the separator display string
-   */
-  toString() {
-    return this.line;
-  }
-}
-
-/**
- * Helper function returning false if object is a separator
- * @param  {Object} obj object to test against
- * @return {Boolean}    `false` if object is a separator
- */
-
-Separator.exclude = function(obj) {
-  return obj.type !== 'separator';
-};
-
-module.exports = Separator;
-
-
-/***/ }),
-/* 176 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-
-/**
- * The paginator keeps track of a pointer index in a list and returns
- * a subset of the choices if the list is too long.
- */
-
-class Paginator {
-  constructor(screen) {
-    this.pointer = 0;
-    this.lastIndex = 0;
-    this.screen = screen;
-  }
-
-  paginate(output, active, pageSize) {
-    pageSize = pageSize || 7;
-    var middleOfList = Math.floor(pageSize / 2);
-    var lines = output.split('\n');
-
-    if (this.screen) {
-      lines = this.screen.breakLines(lines);
-      active = _.sum(lines.map(lineParts => lineParts.length).splice(0, active));
-      lines = _.flatten(lines);
-    }
-
-    // Make sure there's enough lines to paginate
-    if (lines.length <= pageSize) {
-      return output;
-    }
-
-    // Move the pointer only when the user go down and limit it to the middle of the list
-    if (
-      this.pointer < middleOfList &&
-      this.lastIndex < active &&
-      active - this.lastIndex < pageSize
-    ) {
-      this.pointer = Math.min(middleOfList, this.pointer + active - this.lastIndex);
-    }
-    this.lastIndex = active;
-
-    // Duplicate the lines so it give an infinite list look
-    var infinite = _.flatten([lines, lines, lines]);
-    var topIndex = Math.max(0, active + lines.length - this.pointer);
-
-    var section = infinite.splice(topIndex, pageSize).join('\n');
-    return section + '\n' + chalk.dim('(Move up and down to reveal more choices)');
-  }
-}
-
-module.exports = Paginator;
-
-
-/***/ }),
-/* 177 */
-/***/ (function(module, exports) {
-
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-module.exports = function isExtglob(str) {
-  return typeof str === 'string'
-    && /[@?!+*]\(/.test(str);
-};
-
-
-/***/ }),
-/* 178 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-var isExtglob = __webpack_require__(177);
-
-module.exports = function isGlob(str) {
-  return typeof str === 'string'
-    && (/[*!?{}(|)[\]]/.test(str)
-     || isExtglob(str));
-};
-
-/***/ }),
-/* 179 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(729);
-var toString = Object.prototype.toString;
-
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
-
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
-
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
-
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
-
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
-
-  // other objects
-  var type = toString.call(val);
-
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
-
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
-
-  // must be a plain object
-  return 'object';
-};
-
-
-/***/ }),
-/* 180 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-if (!process.version ||
-    process.version.indexOf('v0.') === 0 ||
-    process.version.indexOf('v1.') === 0 && process.version.indexOf('v1.8.') !== 0) {
-  module.exports = { nextTick: nextTick };
-} else {
-  module.exports = process
-}
-
-function nextTick(fn, arg1, arg2, arg3) {
-  if (typeof fn !== 'function') {
-    throw new TypeError('"callback" argument must be a function');
-  }
-  var len = arguments.length;
-  var args, i;
-  switch (len) {
-  case 0:
-  case 1:
-    return process.nextTick(fn);
-  case 2:
-    return process.nextTick(function afterTickOne() {
-      fn.call(null, arg1);
-    });
-  case 3:
-    return process.nextTick(function afterTickTwo() {
-      fn.call(null, arg1, arg2);
-    });
-  case 4:
-    return process.nextTick(function afterTickThree() {
-      fn.call(null, arg1, arg2, arg3);
-    });
-  default:
-    args = new Array(len - 1);
-    i = 0;
-    while (i < args.length) {
-      args[i++] = arguments[i];
-    }
-    return process.nextTick(function afterTick() {
-      fn.apply(null, args);
-    });
-  }
-}
-
-
-
-/***/ }),
-/* 181 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isPromise = __webpack_require__(741);
-
-/**
- * Return a function that will run a function asynchronously or synchronously
- *
- * example:
- * runAsync(wrappedFunction, callback)(...args);
- *
- * @param   {Function} func  Function to run
- * @param   {Function} cb    Callback function passed the `func` returned value
- * @return  {Function(arguments)} Arguments to pass to `func`. This function will in turn
- *                                return a Promise (Node >= 0.12) or call the callbacks.
- */
-
-var runAsync = module.exports = function (func, cb) {
-  cb = cb || function () {};
-
-  return function () {
-    var async = false;
-    var args = arguments;
-
-    var promise = new Promise(function (resolve, reject) {
-      var answer = func.apply({
-        async: function () {
-          async = true;
-          return function (err, value) {
-            if (err) {
-              reject(err);
-            } else {
-              resolve(value);
-            }
-          };
-        }
-      }, Array.prototype.slice.call(args));
-
-      if (!async) {
-        if (isPromise(answer)) {
-          answer.then(resolve, reject);
-        } else {
-          resolve(answer);
-        }
-      }
-    });
-
-    promise.then(cb.bind(null, null), cb);
-
-    return promise;
-  }
-};
-
-runAsync.cb = function (func, cb) {
-  return runAsync(function () {
-    var args = Array.prototype.slice.call(arguments);
-    if (args.length === func.length - 1) {
-      args.push(this.async());
-    }
-    return func.apply(this, args);
-  }, cb);
-};
-
-
-/***/ }),
-/* 182 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_Observable__ = __webpack_require__(11);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return __WEBPACK_IMPORTED_MODULE_0__internal_Observable__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__ = __webpack_require__(423);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__ = __webpack_require__(433);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__ = __webpack_require__(117);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_Subject__ = __webpack_require__(36);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_Subject__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__ = __webpack_require__(419);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__ = __webpack_require__(308);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__ = __webpack_require__(183);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__ = __webpack_require__(438);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__ = __webpack_require__(40);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__ = __webpack_require__(439);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__ = __webpack_require__(926);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__ = __webpack_require__(925);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__["a"]; });
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__["b"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__ = __webpack_require__(421);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__ = __webpack_require__(25);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__ = __webpack_require__(7);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_Notification__ = __webpack_require__(184);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_Notification__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__ = __webpack_require__(324);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__ = __webpack_require__(191);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__ = __webpack_require__(118);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__ = __webpack_require__(930);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__ = __webpack_require__(152);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__ = __webpack_require__(153);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__ = __webpack_require__(189);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__ = __webpack_require__(441);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__ = __webpack_require__(440);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__ = __webpack_require__(823);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__ = __webpack_require__(824);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__ = __webpack_require__(309);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__ = __webpack_require__(186);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__ = __webpack_require__(310);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__ = __webpack_require__(39);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__ = __webpack_require__(825);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__ = __webpack_require__(62);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__ = __webpack_require__(826);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__ = __webpack_require__(827);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__ = __webpack_require__(831);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__ = __webpack_require__(832);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__ = __webpack_require__(833);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__ = __webpack_require__(424);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__ = __webpack_require__(425);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__ = __webpack_require__(311);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__ = __webpack_require__(834);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__ = __webpack_require__(835);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__ = __webpack_require__(426);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__ = __webpack_require__(836);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__ = __webpack_require__(313);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__ = __webpack_require__(427);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__ = __webpack_require__(837);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__ = __webpack_require__(314);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__["a"]; });
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["b"]; });
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["b"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_config__ = __webpack_require__(185);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_config__["a"]; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-/* 183 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncSubject; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
-/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */
-
-
-
-var AsyncSubject = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncSubject, _super);
-    function AsyncSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.value = null;
-        _this.hasNext = false;
-        _this.hasCompleted = false;
-        return _this;
-    }
-    AsyncSubject.prototype._subscribe = function (subscriber) {
-        if (this.hasError) {
-            subscriber.error(this.thrownError);
-            return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY;
-        }
-        else if (this.hasCompleted && this.hasNext) {
-            subscriber.next(this.value);
-            subscriber.complete();
-            return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY;
-        }
-        return _super.prototype._subscribe.call(this, subscriber);
-    };
-    AsyncSubject.prototype.next = function (value) {
-        if (!this.hasCompleted) {
-            this.value = value;
-            this.hasNext = true;
-        }
-    };
-    AsyncSubject.prototype.error = function (error) {
-        if (!this.hasCompleted) {
-            _super.prototype.error.call(this, error);
-        }
-    };
-    AsyncSubject.prototype.complete = function () {
-        this.hasCompleted = true;
-        if (this.hasNext) {
-            _super.prototype.next.call(this, this.value);
-        }
-        _super.prototype.complete.call(this);
-    };
-    return AsyncSubject;
-}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
-
-//# sourceMappingURL=AsyncSubject.js.map
-
-
-/***/ }),
-/* 184 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Notification; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_of__ = __webpack_require__(311);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_throwError__ = __webpack_require__(313);
-/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */
-
-
-
-var Notification = /*@__PURE__*/ (function () {
-    function Notification(kind, value, error) {
-        this.kind = kind;
-        this.value = value;
-        this.error = error;
-        this.hasValue = kind === 'N';
-    }
-    Notification.prototype.observe = function (observer) {
-        switch (this.kind) {
-            case 'N':
-                return observer.next && observer.next(this.value);
-            case 'E':
-                return observer.error && observer.error(this.error);
-            case 'C':
-                return observer.complete && observer.complete();
-        }
-    };
-    Notification.prototype.do = function (next, error, complete) {
-        var kind = this.kind;
-        switch (kind) {
-            case 'N':
-                return next && next(this.value);
-            case 'E':
-                return error && error(this.error);
-            case 'C':
-                return complete && complete();
-        }
-    };
-    Notification.prototype.accept = function (nextOrObserver, error, complete) {
-        if (nextOrObserver && typeof nextOrObserver.next === 'function') {
-            return this.observe(nextOrObserver);
-        }
-        else {
-            return this.do(nextOrObserver, error, complete);
-        }
-    };
-    Notification.prototype.toObservable = function () {
-        var kind = this.kind;
-        switch (kind) {
-            case 'N':
-                return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_of__["a" /* of */])(this.value);
-            case 'E':
-                return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_throwError__["a" /* throwError */])(this.error);
-            case 'C':
-                return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__observable_empty__["a" /* empty */])();
-        }
-        throw new Error('unexpected notification kind value');
-    };
-    Notification.createNext = function (value) {
-        if (typeof value !== 'undefined') {
-            return new Notification('N', value);
-        }
-        return Notification.undefinedValueNotification;
-    };
-    Notification.createError = function (err) {
-        return new Notification('E', undefined, err);
-    };
-    Notification.createComplete = function () {
-        return Notification.completeNotification;
-    };
-    Notification.completeNotification = new Notification('C');
-    Notification.undefinedValueNotification = new Notification('N', undefined);
-    return Notification;
-}());
-
-//# sourceMappingURL=Notification.js.map
-
-
-/***/ }),
-/* 185 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var _enable_super_gross_mode_that_will_cause_bad_things = false;
-var config = {
-    Promise: undefined,
-    set useDeprecatedSynchronousErrorHandling(value) {
-        if (value) {
-            var error = /*@__PURE__*/ new Error();
-            /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack);
-        }
-        else if (_enable_super_gross_mode_that_will_cause_bad_things) {
-            /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3');
-        }
-        _enable_super_gross_mode_that_will_cause_bad_things = value;
-    },
-    get useDeprecatedSynchronousErrorHandling() {
-        return _enable_super_gross_mode_that_will_cause_bad_things;
-    },
-};
-//# sourceMappingURL=config.js.map
-
-
-/***/ }),
-/* 186 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = concat;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__of__ = __webpack_require__(311);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__from__ = __webpack_require__(62);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_concatAll__ = __webpack_require__(429);
-/** PURE_IMPORTS_START _util_isScheduler,_of,_from,_operators_concatAll PURE_IMPORTS_END */
-
-
-
-
-function concat() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    if (observables.length === 1 || (observables.length === 2 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(observables[1]))) {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__from__["a" /* from */])(observables[0]);
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__operators_concatAll__["a" /* concatAll */])()(__WEBPACK_IMPORTED_MODULE_1__of__["a" /* of */].apply(void 0, observables));
-}
-//# sourceMappingURL=concat.js.map
-
-
-/***/ }),
-/* 187 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = reduce;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scan__ = __webpack_require__(317);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__takeLast__ = __webpack_require__(320);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__ = __webpack_require__(146);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(324);
-/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
-
-
-
-
-function reduce(accumulator, seed) {
-    if (arguments.length >= 2) {
-        return function reduceOperatorFunctionWithSeed(source) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(accumulator, seed), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__["a" /* defaultIfEmpty */])(seed))(source);
-        };
-    }
-    return function reduceOperatorFunction(source) {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1))(source);
-    };
-}
-//# sourceMappingURL=reduce.js.map
-
-
-/***/ }),
-/* 188 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwIfEmpty; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__tap__ = __webpack_require__(435);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__ = __webpack_require__(153);
-/** PURE_IMPORTS_START _tap,_util_EmptyError PURE_IMPORTS_END */
-
-
-var throwIfEmpty = function (errorFactory) {
-    if (errorFactory === void 0) {
-        errorFactory = defaultErrorFactory;
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__tap__["a" /* tap */])({
-        hasValue: false,
-        next: function () { this.hasValue = true; },
-        complete: function () {
-            if (!this.hasValue) {
-                throw errorFactory();
-            }
-        }
-    });
-};
-function defaultErrorFactory() {
-    return new __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__["a" /* EmptyError */]();
-}
-//# sourceMappingURL=throwIfEmpty.js.map
-
-
-/***/ }),
-/* 189 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObjectUnsubscribedError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function ObjectUnsubscribedErrorImpl() {
-    Error.call(this);
-    this.message = 'object unsubscribed';
-    this.name = 'ObjectUnsubscribedError';
-    return this;
-}
-ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
-//# sourceMappingURL=ObjectUnsubscribedError.js.map
-
-
-/***/ }),
-/* 190 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isNumeric;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__isArray__ = __webpack_require__(41);
-/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */
-
-function isNumeric(val) {
-    return !__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__isArray__["a" /* isArray */])(val) && (val - parseFloat(val) + 1) >= 0;
-}
-//# sourceMappingURL=isNumeric.js.map
-
-
-/***/ }),
-/* 191 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = noop;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function noop() { }
-//# sourceMappingURL=noop.js.map
-
-
-/***/ }),
-/* 192 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	readSSHPrivate: readSSHPrivate,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var asn1 = __webpack_require__(65);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var crypto = __webpack_require__(12);
-
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var pem = __webpack_require__(86);
-var rfc4253 = __webpack_require__(103);
-var SSHBuffer = __webpack_require__(159);
-var errors = __webpack_require__(73);
-
-var bcrypt;
-
-function read(buf, options) {
-	return (pem.read(buf, options));
-}
-
-var MAGIC = 'openssh-key-v1';
-
-function readSSHPrivate(type, buf, options) {
-	buf = new SSHBuffer({buffer: buf});
-
-	var magic = buf.readCString();
-	assert.strictEqual(magic, MAGIC, 'bad magic string');
-
-	var cipher = buf.readString();
-	var kdf = buf.readString();
-	var kdfOpts = buf.readBuffer();
-
-	var nkeys = buf.readInt();
-	if (nkeys !== 1) {
-		throw (new Error('OpenSSH-format key file contains ' +
-		    'multiple keys: this is unsupported.'));
-	}
-
-	var pubKey = buf.readBuffer();
-
-	if (type === 'public') {
-		assert.ok(buf.atEnd(), 'excess bytes left after key');
-		return (rfc4253.read(pubKey));
-	}
-
-	var privKeyBlob = buf.readBuffer();
-	assert.ok(buf.atEnd(), 'excess bytes left after key');
-
-	var kdfOptsBuf = new SSHBuffer({ buffer: kdfOpts });
-	switch (kdf) {
-	case 'none':
-		if (cipher !== 'none') {
-			throw (new Error('OpenSSH-format key uses KDF "none" ' +
-			     'but specifies a cipher other than "none"'));
-		}
-		break;
-	case 'bcrypt':
-		var salt = kdfOptsBuf.readBuffer();
-		var rounds = kdfOptsBuf.readInt();
-		var cinf = utils.opensshCipherInfo(cipher);
-		if (bcrypt === undefined) {
-			bcrypt = __webpack_require__(379);
-		}
-
-		if (typeof (options.passphrase) === 'string') {
-			options.passphrase = Buffer.from(options.passphrase,
-			    'utf-8');
-		}
-		if (!Buffer.isBuffer(options.passphrase)) {
-			throw (new errors.KeyEncryptedError(
-			    options.filename, 'OpenSSH'));
-		}
-
-		var pass = new Uint8Array(options.passphrase);
-		var salti = new Uint8Array(salt);
-		/* Use the pbkdf to derive both the key and the IV. */
-		var out = new Uint8Array(cinf.keySize + cinf.blockSize);
-		var res = bcrypt.pbkdf(pass, pass.length, salti, salti.length,
-		    out, out.length, rounds);
-		if (res !== 0) {
-			throw (new Error('bcrypt_pbkdf function returned ' +
-			    'failure, parameters invalid'));
-		}
-		out = Buffer.from(out);
-		var ckey = out.slice(0, cinf.keySize);
-		var iv = out.slice(cinf.keySize, cinf.keySize + cinf.blockSize);
-		var cipherStream = crypto.createDecipheriv(cinf.opensslName,
-		    ckey, iv);
-		cipherStream.setAutoPadding(false);
-		var chunk, chunks = [];
-		cipherStream.once('error', function (e) {
-			if (e.toString().indexOf('bad decrypt') !== -1) {
-				throw (new Error('Incorrect passphrase ' +
-				    'supplied, could not decrypt key'));
-			}
-			throw (e);
-		});
-		cipherStream.write(privKeyBlob);
-		cipherStream.end();
-		while ((chunk = cipherStream.read()) !== null)
-			chunks.push(chunk);
-		privKeyBlob = Buffer.concat(chunks);
-		break;
-	default:
-		throw (new Error(
-		    'OpenSSH-format key uses unknown KDF "' + kdf + '"'));
-	}
-
-	buf = new SSHBuffer({buffer: privKeyBlob});
-
-	var checkInt1 = buf.readInt();
-	var checkInt2 = buf.readInt();
-	if (checkInt1 !== checkInt2) {
-		throw (new Error('Incorrect passphrase supplied, could not ' +
-		    'decrypt key'));
-	}
-
-	var ret = {};
-	var key = rfc4253.readInternal(ret, 'private', buf.remainder());
-
-	buf.skip(ret.consumed);
-
-	var comment = buf.readString();
-	key.comment = comment;
-
-	return (key);
-}
-
-function write(key, options) {
-	var pubKey;
-	if (PrivateKey.isPrivateKey(key))
-		pubKey = key.toPublic();
-	else
-		pubKey = key;
-
-	var cipher = 'none';
-	var kdf = 'none';
-	var kdfopts = Buffer.alloc(0);
-	var cinf = { blockSize: 8 };
-	var passphrase;
-	if (options !== undefined) {
-		passphrase = options.passphrase;
-		if (typeof (passphrase) === 'string')
-			passphrase = Buffer.from(passphrase, 'utf-8');
-		if (passphrase !== undefined) {
-			assert.buffer(passphrase, 'options.passphrase');
-			assert.optionalString(options.cipher, 'options.cipher');
-			cipher = options.cipher;
-			if (cipher === undefined)
-				cipher = 'aes128-ctr';
-			cinf = utils.opensshCipherInfo(cipher);
-			kdf = 'bcrypt';
-		}
-	}
-
-	var privBuf;
-	if (PrivateKey.isPrivateKey(key)) {
-		privBuf = new SSHBuffer({});
-		var checkInt = crypto.randomBytes(4).readUInt32BE(0);
-		privBuf.writeInt(checkInt);
-		privBuf.writeInt(checkInt);
-		privBuf.write(key.toBuffer('rfc4253'));
-		privBuf.writeString(key.comment || '');
-
-		var n = 1;
-		while (privBuf._offset % cinf.blockSize !== 0)
-			privBuf.writeChar(n++);
-		privBuf = privBuf.toBuffer();
-	}
-
-	switch (kdf) {
-	case 'none':
-		break;
-	case 'bcrypt':
-		var salt = crypto.randomBytes(16);
-		var rounds = 16;
-		var kdfssh = new SSHBuffer({});
-		kdfssh.writeBuffer(salt);
-		kdfssh.writeInt(rounds);
-		kdfopts = kdfssh.toBuffer();
-
-		if (bcrypt === undefined) {
-			bcrypt = __webpack_require__(379);
-		}
-		var pass = new Uint8Array(passphrase);
-		var salti = new Uint8Array(salt);
-		/* Use the pbkdf to derive both the key and the IV. */
-		var out = new Uint8Array(cinf.keySize + cinf.blockSize);
-		var res = bcrypt.pbkdf(pass, pass.length, salti, salti.length,
-		    out, out.length, rounds);
-		if (res !== 0) {
-			throw (new Error('bcrypt_pbkdf function returned ' +
-			    'failure, parameters invalid'));
-		}
-		out = Buffer.from(out);
-		var ckey = out.slice(0, cinf.keySize);
-		var iv = out.slice(cinf.keySize, cinf.keySize + cinf.blockSize);
-
-		var cipherStream = crypto.createCipheriv(cinf.opensslName,
-		    ckey, iv);
-		cipherStream.setAutoPadding(false);
-		var chunk, chunks = [];
-		cipherStream.once('error', function (e) {
-			throw (e);
-		});
-		cipherStream.write(privBuf);
-		cipherStream.end();
-		while ((chunk = cipherStream.read()) !== null)
-			chunks.push(chunk);
-		privBuf = Buffer.concat(chunks);
-		break;
-	default:
-		throw (new Error('Unsupported kdf ' + kdf));
-	}
-
-	var buf = new SSHBuffer({});
-
-	buf.writeCString(MAGIC);
-	buf.writeString(cipher);	/* cipher */
-	buf.writeString(kdf);		/* kdf */
-	buf.writeBuffer(kdfopts);	/* kdfoptions */
-
-	buf.writeInt(1);		/* nkeys */
-	buf.writeBuffer(pubKey.toBuffer('rfc4253'));
-
-	if (privBuf)
-		buf.writeBuffer(privBuf);
-
-	buf = buf.toBuffer();
-
-	var header;
-	if (PrivateKey.isPrivateKey(key))
-		header = 'OPENSSH PRIVATE KEY';
-	else
-		header = 'OPENSSH PUBLIC KEY';
-
-	var tmp = buf.toString('base64');
-	var len = tmp.length + (tmp.length / 70) +
-	    18 + 16 + header.length*2 + 10;
-	buf = Buffer.alloc(len);
-	var o = 0;
-	o += buf.write('-----BEGIN ' + header + '-----\n', o);
-	for (var i = 0; i < tmp.length; ) {
-		var limit = i + 70;
-		if (limit > tmp.length)
-			limit = tmp.length;
-		o += buf.write(tmp.slice(i, limit), o);
-		buf[o++] = 10;
-		i = limit;
-	}
-	o += buf.write('-----END ' + header + '-----\n', o);
-
-	return (buf.slice(0, o));
-}
-
-
-/***/ }),
-/* 193 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var chownr = __webpack_require__(600)
-var tar = __webpack_require__(460)
-var pump = __webpack_require__(781)
-var mkdirp = __webpack_require__(145)
-var fs = __webpack_require__(5)
-var path = __webpack_require__(0)
-var os = __webpack_require__(49)
-
-var win32 = os.platform() === 'win32'
-
-var noop = function () {}
-
-var echo = function (name) {
-  return name
-}
-
-var normalize = !win32 ? echo : function (name) {
-  return name.replace(/\\/g, '/').replace(/[:?<>|]/g, '_')
-}
-
-var statAll = function (fs, stat, cwd, ignore, entries, sort) {
-  var queue = entries || ['.']
-
-  return function loop (callback) {
-    if (!queue.length) return callback()
-    var next = queue.shift()
-    var nextAbs = path.join(cwd, next)
-
-    stat(nextAbs, function (err, stat) {
-      if (err) return callback(err)
-
-      if (!stat.isDirectory()) return callback(null, next, stat)
-
-      fs.readdir(nextAbs, function (err, files) {
-        if (err) return callback(err)
-
-        if (sort) files.sort()
-        for (var i = 0; i < files.length; i++) {
-          if (!ignore(path.join(cwd, next, files[i]))) queue.push(path.join(next, files[i]))
-        }
-
-        callback(null, next, stat)
-      })
-    })
-  }
-}
-
-var strip = function (map, level) {
-  return function (header) {
-    header.name = header.name.split('/').slice(level).join('/')
-
-    var linkname = header.linkname
-    if (linkname && (header.type === 'link' || path.isAbsolute(linkname))) {
-      header.linkname = linkname.split('/').slice(level).join('/')
-    }
-
-    return map(header)
-  }
-}
-
-exports.pack = function (cwd, opts) {
-  if (!cwd) cwd = '.'
-  if (!opts) opts = {}
-
-  var xfs = opts.fs || fs
-  var ignore = opts.ignore || opts.filter || noop
-  var map = opts.map || noop
-  var mapStream = opts.mapStream || echo
-  var statNext = statAll(xfs, opts.dereference ? xfs.stat : xfs.lstat, cwd, ignore, opts.entries, opts.sort)
-  var strict = opts.strict !== false
-  var umask = typeof opts.umask === 'number' ? ~opts.umask : ~processUmask()
-  var dmode = typeof opts.dmode === 'number' ? opts.dmode : 0
-  var fmode = typeof opts.fmode === 'number' ? opts.fmode : 0
-  var pack = opts.pack || tar.pack()
-  var finish = opts.finish || noop
-
-  if (opts.strip) map = strip(map, opts.strip)
-
-  if (opts.readable) {
-    dmode |= parseInt(555, 8)
-    fmode |= parseInt(444, 8)
-  }
-  if (opts.writable) {
-    dmode |= parseInt(333, 8)
-    fmode |= parseInt(222, 8)
-  }
-
-  var onsymlink = function (filename, header) {
-    xfs.readlink(path.join(cwd, filename), function (err, linkname) {
-      if (err) return pack.destroy(err)
-      header.linkname = normalize(linkname)
-      pack.entry(header, onnextentry)
-    })
-  }
-
-  var onstat = function (err, filename, stat) {
-    if (err) return pack.destroy(err)
-    if (!filename) {
-      if (opts.finalize !== false) pack.finalize()
-      return finish(pack)
-    }
-
-    if (stat.isSocket()) return onnextentry() // tar does not support sockets...
-
-    var header = {
-      name: normalize(filename),
-      mode: (stat.mode | (stat.isDirectory() ? dmode : fmode)) & umask,
-      mtime: stat.mtime,
-      size: stat.size,
-      type: 'file',
-      uid: stat.uid,
-      gid: stat.gid
-    }
-
-    if (stat.isDirectory()) {
-      header.size = 0
-      header.type = 'directory'
-      header = map(header) || header
-      return pack.entry(header, onnextentry)
-    }
-
-    if (stat.isSymbolicLink()) {
-      header.size = 0
-      header.type = 'symlink'
-      header = map(header) || header
-      return onsymlink(filename, header)
-    }
-
-    // TODO: add fifo etc...
-
-    header = map(header) || header
-
-    if (!stat.isFile()) {
-      if (strict) return pack.destroy(new Error('unsupported type for ' + filename))
-      return onnextentry()
-    }
-
-    var entry = pack.entry(header, onnextentry)
-    if (!entry) return
-
-    var rs = mapStream(xfs.createReadStream(path.join(cwd, filename)), header)
-
-    rs.on('error', function (err) { // always forward errors on destroy
-      entry.destroy(err)
-    })
-
-    pump(rs, entry)
-  }
-
-  var onnextentry = function (err) {
-    if (err) return pack.destroy(err)
-    statNext(onstat)
-  }
-
-  onnextentry()
-
-  return pack
-}
-
-var head = function (list) {
-  return list.length ? list[list.length - 1] : null
-}
-
-var processGetuid = function () {
-  return process.getuid ? process.getuid() : -1
-}
-
-var processUmask = function () {
-  return process.umask ? process.umask() : 0
-}
-
-exports.extract = function (cwd, opts) {
-  if (!cwd) cwd = '.'
-  if (!opts) opts = {}
-
-  var xfs = opts.fs || fs
-  var ignore = opts.ignore || opts.filter || noop
-  var map = opts.map || noop
-  var mapStream = opts.mapStream || echo
-  var own = opts.chown !== false && !win32 && processGetuid() === 0
-  var extract = opts.extract || tar.extract()
-  var stack = []
-  var now = new Date()
-  var umask = typeof opts.umask === 'number' ? ~opts.umask : ~processUmask()
-  var dmode = typeof opts.dmode === 'number' ? opts.dmode : 0
-  var fmode = typeof opts.fmode === 'number' ? opts.fmode : 0
-  var strict = opts.strict !== false
-
-  if (opts.strip) map = strip(map, opts.strip)
-
-  if (opts.readable) {
-    dmode |= parseInt(555, 8)
-    fmode |= parseInt(444, 8)
-  }
-  if (opts.writable) {
-    dmode |= parseInt(333, 8)
-    fmode |= parseInt(222, 8)
-  }
-
-  var utimesParent = function (name, cb) { // we just set the mtime on the parent dir again everytime we write an entry
-    var top
-    while ((top = head(stack)) && name.slice(0, top[0].length) !== top[0]) stack.pop()
-    if (!top) return cb()
-    xfs.utimes(top[0], now, top[1], cb)
-  }
-
-  var utimes = function (name, header, cb) {
-    if (opts.utimes === false) return cb()
-
-    if (header.type === 'directory') return xfs.utimes(name, now, header.mtime, cb)
-    if (header.type === 'symlink') return utimesParent(name, cb) // TODO: how to set mtime on link?
-
-    xfs.utimes(name, now, header.mtime, function (err) {
-      if (err) return cb(err)
-      utimesParent(name, cb)
-    })
-  }
-
-  var chperm = function (name, header, cb) {
-    var link = header.type === 'symlink'
-    var chmod = link ? xfs.lchmod : xfs.chmod
-    var chown = link ? xfs.lchown : xfs.chown
-
-    if (!chmod) return cb()
-
-    var mode = (header.mode | (header.type === 'directory' ? dmode : fmode)) & umask
-    chmod(name, mode, function (err) {
-      if (err) return cb(err)
-      if (!own) return cb()
-      if (!chown) return cb()
-      chown(name, header.uid, header.gid, cb)
-    })
-  }
-
-  extract.on('entry', function (header, stream, next) {
-    header = map(header) || header
-    header.name = normalize(header.name)
-    var name = path.join(cwd, path.join('/', header.name))
-
-    if (ignore(name, header)) {
-      stream.resume()
-      return next()
-    }
-
-    var stat = function (err) {
-      if (err) return next(err)
-      utimes(name, header, function (err) {
-        if (err) return next(err)
-        if (win32) return next()
-        chperm(name, header, next)
-      })
-    }
-
-    var onsymlink = function () {
-      if (win32) return next() // skip symlinks on win for now before it can be tested
-      xfs.unlink(name, function () {
-        xfs.symlink(header.linkname, name, stat)
-      })
-    }
-
-    var onlink = function () {
-      if (win32) return next() // skip links on win for now before it can be tested
-      xfs.unlink(name, function () {
-        var srcpath = path.join(cwd, path.join('/', header.linkname))
-
-        xfs.link(srcpath, name, function (err) {
-          if (err && err.code === 'EPERM' && opts.hardlinkAsFilesFallback) {
-            stream = xfs.createReadStream(srcpath)
-            return onfile()
-          }
-
-          stat(err)
-        })
-      })
-    }
-
-    var onfile = function () {
-      var ws = xfs.createWriteStream(name)
-      var rs = mapStream(stream, header)
-
-      ws.on('error', function (err) { // always forward errors on destroy
-        rs.destroy(err)
-      })
-
-      pump(rs, ws, function (err) {
-        if (err) return next(err)
-        ws.on('close', stat)
-      })
-    }
-
-    if (header.type === 'directory') {
-      stack.push([name, header.mtime])
-      return mkdirfix(name, {
-        fs: xfs, own: own, uid: header.uid, gid: header.gid
-      }, stat)
-    }
-
-    var dir = path.dirname(name)
-
-    validate(xfs, dir, path.join(cwd, '.'), function (err, valid) {
-      if (err) return next(err)
-      if (!valid) return next(new Error(dir + ' is not a valid path'))
-
-      mkdirfix(dir, {
-        fs: xfs, own: own, uid: header.uid, gid: header.gid
-      }, function (err) {
-        if (err) return next(err)
-
-        switch (header.type) {
-          case 'file': return onfile()
-          case 'link': return onlink()
-          case 'symlink': return onsymlink()
-        }
-
-        if (strict) return next(new Error('unsupported type for ' + name + ' (' + header.type + ')'))
-
-        stream.resume()
-        next()
-      })
-    })
-  })
-
-  if (opts.finish) extract.on('finish', opts.finish)
-
-  return extract
-}
-
-function validate (fs, name, root, cb) {
-  if (name === root) return cb(null, true)
-  fs.lstat(name, function (err, st) {
-    if (err && err.code !== 'ENOENT') return cb(err)
-    if (err || st.isDirectory()) return validate(fs, path.join(name, '..'), root, cb)
-    cb(null, false)
-  })
-}
-
-function mkdirfix (name, opts, cb) {
-  mkdirp(name, {fs: opts.fs}, function (err, made) {
-    if (!err && made && opts.own) {
-      chownr(made, opts.uid, opts.gid, cb)
-    } else {
-      cb(err)
-    }
-  })
-}
-
-
-/***/ }),
-/* 194 */
-/***/ (function(module, exports) {
-
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.18.0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
-
-/***/ }),
-/* 195 */
-/***/ (function(module, exports) {
-
-module.exports = require("https");
-
-/***/ }),
-/* 196 */
-/***/ (function(module, exports) {
-
-module.exports = require("querystring");
-
-/***/ }),
-/* 197 */
-/***/ (function(module, exports) {
-
-module.exports = require("readline");
-
-/***/ }),
-/* 198 */
-/***/ (function(module, exports) {
-
-module.exports = require("zlib");
-
-/***/ }),
-/* 199 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = stringify;
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _package;
-
-function _load_package() {
-  return _package = __webpack_require__(194);
-}
-
-const NODE_VERSION = process.version;
-
-function shouldWrapKey(str) {
-  return str.indexOf('true') === 0 || str.indexOf('false') === 0 || /[:\s\n\\",\[\]]/g.test(str) || /^[0-9]/g.test(str) || !/^[a-zA-Z]/g.test(str);
-}
-
-function maybeWrap(str) {
-  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
-    return JSON.stringify(str);
-  } else {
-    return str;
-  }
-}
-
-const priorities = {
-  name: 1,
-  version: 2,
-  uid: 3,
-  resolved: 4,
-  integrity: 5,
-  registry: 6,
-  dependencies: 7
-};
-
-function priorityThenAlphaSort(a, b) {
-  if (priorities[a] || priorities[b]) {
-    return (priorities[a] || 100) > (priorities[b] || 100) ? 1 : -1;
-  } else {
-    return (0, (_misc || _load_misc()).sortAlpha)(a, b);
-  }
-}
-
-function _stringify(obj, options) {
-  if (typeof obj !== 'object') {
-    throw new TypeError();
-  }
-
-  const indent = options.indent;
-  const lines = [];
-
-  // Sorting order needs to be consistent between runs, we run native sort by name because there are no
-  // problems with it being unstable because there are no to keys the same
-  // However priorities can be duplicated and native sort can shuffle things from run to run
-  const keys = Object.keys(obj).sort(priorityThenAlphaSort);
-
-  let addedKeys = [];
-
-  for (let i = 0; i < keys.length; i++) {
-    const key = keys[i];
-    const val = obj[key];
-    if (val == null || addedKeys.indexOf(key) >= 0) {
-      continue;
-    }
-
-    const valKeys = [key];
-
-    // get all keys that have the same value equality, we only want this for objects
-    if (typeof val === 'object') {
-      for (let j = i + 1; j < keys.length; j++) {
-        const key = keys[j];
-        if (val === obj[key]) {
-          valKeys.push(key);
-        }
-      }
-    }
-
-    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
-
-    if (typeof val === 'string' || typeof val === 'boolean' || typeof val === 'number') {
-      lines.push(`${keyLine} ${maybeWrap(val)}`);
-    } else if (typeof val === 'object') {
-      lines.push(`${keyLine}:\n${_stringify(val, { indent: indent + '  ' })}` + (options.topLevel ? '\n' : ''));
-    } else {
-      throw new TypeError();
-    }
-
-    addedKeys = addedKeys.concat(valKeys);
-  }
-
-  return indent + lines.join(`\n${indent}`);
-}
-
-function stringify(obj, noHeader, enableVersions) {
-  const val = _stringify(obj, {
-    indent: '',
-    topLevel: true
-  });
-  if (noHeader) {
-    return val;
-  }
-
-  const lines = [];
-  lines.push('# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.');
-  lines.push(`# yarn lockfile v${(_constants || _load_constants()).LOCKFILE_VERSION}`);
-  if (enableVersions) {
-    lines.push(`# yarn v${(_package || _load_package()).version}`);
-    lines.push(`# node ${NODE_VERSION}`);
-  }
-  lines.push('\n');
-  lines.push(val);
-
-  return lines.join('\n');
-}
-
-/***/ }),
-/* 200 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _consoleReporter;
-
-function _load_consoleReporter() {
-  return _consoleReporter = __webpack_require__(561);
-}
-
-Object.defineProperty(exports, 'ConsoleReporter', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_consoleReporter || _load_consoleReporter()).default;
-  }
-});
-
-var _bufferReporter;
-
-function _load_bufferReporter() {
-  return _bufferReporter = __webpack_require__(560);
-}
-
-Object.defineProperty(exports, 'BufferReporter', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_bufferReporter || _load_bufferReporter()).default;
-  }
-});
-
-var _eventReporter;
-
-function _load_eventReporter() {
-  return _eventReporter = __webpack_require__(565);
-}
-
-Object.defineProperty(exports, 'EventReporter', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_eventReporter || _load_eventReporter()).default;
-  }
-});
-
-var _jsonReporter;
-
-function _load_jsonReporter() {
-  return _jsonReporter = __webpack_require__(213);
-}
-
-Object.defineProperty(exports, 'JSONReporter', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_jsonReporter || _load_jsonReporter()).default;
-  }
-});
-
-var _noopReporter;
-
-function _load_noopReporter() {
-  return _noopReporter = __webpack_require__(569);
-}
-
-Object.defineProperty(exports, 'NoopReporter', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_noopReporter || _load_noopReporter()).default;
-  }
-});
-
-var _baseReporter;
-
-function _load_baseReporter() {
-  return _baseReporter = __webpack_require__(108);
-}
-
-Object.defineProperty(exports, 'Reporter', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_baseReporter || _load_baseReporter()).default;
-  }
-});
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/***/ }),
-/* 201 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-// On windows, create a .cmd file.
-// Read the #! in the file to see what it uses.  The vast majority
-// of the time, this will be either:
-// "#!/usr/bin/env <prog> <args...>"
-// or:
-// "#!<prog> <args...>"
-//
-// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
-// @<prog> <args...> %~dp0<target> %*
-
-module.exports = cmdShim
-cmdShim.ifExists = cmdShimIfExists
-
-const fs = __webpack_require__(762)
-
-const mkdir = __webpack_require__(761)
-const path = __webpack_require__(0)
-const isWindows = __webpack_require__(743)
-const shebangExpr = /^#!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/
-const DEFAULT_OPTIONS = {
-  // Create PowerShell file by default if the option hasn't been specified
-  createPwshFile: true,
-  createCmdFile: isWindows()
-}
-
-function cmdShimIfExists (src, to, opts) {
-  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
-  return fs.stat(src)
-    .then(() => cmdShim(src, to, opts))
-    .catch(() => {})
-}
-
-// Try to unlink, but ignore errors.
-// Any problems will surface later.
-function rm (path) {
-  return fs.unlink(path).catch(() => {})
-}
-
-function cmdShim (src, to, opts) {
-  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
-  return fs.stat(src)
-    .then(() => cmdShim_(src, to, opts))
-}
-
-function cmdShim_ (src, to, opts) {
-  return Promise.all([
-    rm(to),
-    rm(`${to}.ps1`),
-    opts.createCmdFile && rm(`${to}.cmd`)
-  ])
-    .then(() => writeShim(src, to, opts))
-}
-
-function writeShim (src, to, opts) {
-  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
-  const defaultArgs = opts.preserveSymlinks ? '--preserve-symlinks' : ''
-  // make a cmd file and a sh script
-  // First, check if the bin is a #! of some sort.
-  // If not, then assume it's something that'll be compiled, or some other
-  // sort of script, and just call it directly.
-  return mkdir(path.dirname(to))
-    .then(() => {
-      return fs.readFile(src, 'utf8')
-        .then(data => {
-          const firstLine = data.trim().split(/\r*\n/)[0]
-          const shebang = firstLine.match(shebangExpr)
-          if (!shebang) return writeShim_(src, to, Object.assign({}, opts, {args: defaultArgs}))
-          const prog = shebang[1]
-          const args = (shebang[2] && ((defaultArgs && (shebang[2] + ' ' + defaultArgs)) || shebang[2])) || defaultArgs
-          return writeShim_(src, to, Object.assign({}, opts, {prog, args}))
-        })
-        .catch(() => writeShim_(src, to, Object.assign({}, opts, {args: defaultArgs})))
-    })
-}
-
-function writeShim_ (src, to, opts) {
-  opts = Object.assign({}, DEFAULT_OPTIONS, opts)
-  let shTarget = path.relative(path.dirname(to), src)
-  let target = shTarget.split('/').join('\\')
-  let longProg
-  let prog = opts.prog
-  let shProg = prog && prog.split('\\').join('/')
-  let shLongProg
-  let pwshProg = shProg && `"${shProg}$exe"`
-  let pwshLongProg
-  shTarget = shTarget.split('\\').join('/')
-  let args = opts.args || ''
-  let {
-    win32: nodePath,
-    posix: shNodePath
-  } = normalizePathEnvVar(opts.nodePath)
-  if (!prog) {
-    prog = `"%~dp0\\${target}"`
-    shProg = `"$basedir/${shTarget}"`
-    pwshProg = shProg
-    args = ''
-    target = ''
-    shTarget = ''
-  } else {
-    longProg = `"%~dp0\\${prog}.exe"`
-    shLongProg = '"$basedir/' + prog + '"'
-    pwshLongProg = `"$basedir/${prog}$exe"`
-    target = `"%~dp0\\${target}"`
-    shTarget = `"$basedir/${shTarget}"`
-  }
-
-  let cmd
-  if (opts.createCmdFile) {
-    // @IF EXIST "%~dp0\node.exe" (
-    //   "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-    // ) ELSE (
-    //   SETLOCAL
-    //   SET PATHEXT=%PATHEXT:;.JS;=;%
-    //   node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-    // )
-    cmd = nodePath ? `@SET NODE_PATH=${nodePath}\r\n` : ''
-    if (longProg) {
-      cmd += '@IF EXIST ' + longProg + ' (\r\n' +
-        '  ' + longProg + ' ' + args + ' ' + target + ' %*\r\n' +
-        ') ELSE (\r\n' +
-        '  @SETLOCAL\r\n' +
-        '  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n' +
-        '  ' + prog + ' ' + args + ' ' + target + ' %*\r\n' +
-        ')'
-    } else {
-      cmd += `@${prog} ${args} ${target} %*\r\n`
-    }
-  }
-
-  // #!/bin/sh
-  // basedir=`dirname "$0"`
-  //
-  // case `uname` in
-  //     *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-  // esac
-  //
-  // if [ -x "$basedir/node.exe" ]; then
-  //   "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-  //   ret=$?
-  // else
-  //   node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-  //   ret=$?
-  // fi
-  // exit $ret
-
-  let sh = '#!/bin/sh\n'
-  sh = sh +
-    "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n" +
-    '\n' +
-    'case `uname` in\n' +
-    '    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;\n' +
-    'esac\n' +
-    '\n'
-  const env = opts.nodePath ? `NODE_PATH="${shNodePath}" ` : ''
-
-  if (shLongProg) {
-    sh = sh +
-      'if [ -x ' + shLongProg + ' ]; then\n' +
-      '  ' + env + shLongProg + ' ' + args + ' ' + shTarget + ' "$@"\n' +
-      '  ret=$?\n' +
-      'else \n' +
-      '  ' + env + shProg + ' ' + args + ' ' + shTarget + ' "$@"\n' +
-      '  ret=$?\n' +
-      'fi\n' +
-      'exit $ret\n'
-  } else {
-    sh = sh + env + shProg + ' ' + args + ' ' + shTarget + ' "$@"\n' +
-      'exit $?\n'
-  }
-
-  // #!/usr/bin/env pwsh
-  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-  //
-  // $ret=0
-  // $exe = ""
-  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  //   # Fix case when both the Windows and Linux builds of Node
-  //   # are installed in the same directory
-  //   $exe = ".exe"
-  // }
-  // if (Test-Path "$basedir/node") {
-  //   & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
-  //   $ret=$LASTEXITCODE
-  // } else {
-  //   & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
-  //   $ret=$LASTEXITCODE
-  // }
-  // exit $ret
-  let pwsh = '#!/usr/bin/env pwsh\n' +
-    '$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n' +
-    '\n' +
-    '$exe=""\n' +
-    (opts.nodePath ? '$env_node_path=$env:NODE_PATH\n' +
-      `$env:NODE_PATH="${nodePath}"\n` : '') +
-    'if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {\n' +
-    '  # Fix case when both the Windows and Linux builds of Node\n' +
-    '  # are installed in the same directory\n' +
-    '  $exe=".exe"\n' +
-    '}'
-  if (opts.nodePath) {
-    pwsh = pwsh +
-      ' else {\n' +
-      `  $env:NODE_PATH="${shNodePath}"\n` +
-      '}'
-  }
-  pwsh += '\n'
-  if (shLongProg) {
-    pwsh = pwsh +
-      '$ret=0\n' +
-      `if (Test-Path ${pwshLongProg}) {\n` +
-      `  & ${pwshLongProg} ${args} ${shTarget} $args\n` +
-      '  $ret=$LASTEXITCODE\n' +
-      '} else {\n' +
-      `  & ${pwshProg} ${args} ${shTarget} $args\n` +
-      '  $ret=$LASTEXITCODE\n' +
-      '}\n' +
-      (opts.nodePath ? '$env:NODE_PATH=$env_node_path\n' : '') +
-      'exit $ret\n'
-  } else {
-    pwsh = pwsh +
-      `& ${pwshProg} ${args} ${shTarget} $args\n` +
-      (opts.nodePath ? '$env:NODE_PATH=$env_node_path\n' : '') +
-      'exit $LASTEXITCODE\n'
-  }
-
-  return Promise.all([
-    opts.createCmdFile && fs.writeFile(to + '.cmd', cmd, 'utf8'),
-    opts.createPwshFile && fs.writeFile(`${to}.ps1`, pwsh, 'utf8'),
-    fs.writeFile(to, sh, 'utf8')
-  ])
-    .then(() => chmodShim(to, opts))
-}
-
-function chmodShim (to, {createCmdFile, createPwshFile}) {
-  return Promise.all([
-    fs.chmod(to, 0o755),
-    createPwshFile && fs.chmod(`${to}.ps1`, 0o755),
-    createCmdFile && fs.chmod(`${to}.cmd`, 0o755)
-  ])
-}
-
-/**
- * @param {string|string[]} nodePath
- * @returns {{win32:string,posix:string}}
- */
-function normalizePathEnvVar (nodePath) {
-  if (!nodePath) {
-    return {
-      win32: nodePath,
-      posix: nodePath
-    }
-  }
-  let split = (typeof nodePath === 'string' ? nodePath.split(path.delimiter) : Array.from(nodePath))
-  let result = {}
-  for (let i = 0; i < split.length; i++) {
-    const win32 = split[i].split('/').join('\\')
-    const posix = isWindows() ? split[i].split('\\').join('/').replace(/^([^:\\/]*):/, (_, $1) => `/mnt/${$1.toLowerCase()}`) : split[i]
-
-    result.win32 = result.win32 ? `${result.win32};${win32}` : win32
-    result.posix = result.posix ? `${result.posix}:${posix}` : posix
-
-    result[i] = {win32, posix}
-  }
-  return result
-}
-
-
-/***/ }),
-/* 202 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var resolve = __webpack_require__(203);
-
-module.exports = {
-  Validation: errorSubclass(ValidationError),
-  MissingRef: errorSubclass(MissingRefError)
-};
-
-
-function ValidationError(errors) {
-  this.message = 'validation failed';
-  this.errors = errors;
-  this.ajv = this.validation = true;
-}
-
-
-MissingRefError.message = function (baseId, ref) {
-  return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
-};
-
-
-function MissingRefError(baseId, ref, message) {
-  this.message = message || MissingRefError.message(baseId, ref);
-  this.missingRef = resolve.url(baseId, ref);
-  this.missingSchema = resolve.normalizeId(resolve.fullPath(this.missingRef));
-}
-
-
-function errorSubclass(Subclass) {
-  Subclass.prototype = Object.create(Error.prototype);
-  Subclass.prototype.constructor = Subclass;
-  return Subclass;
-}
-
-
-/***/ }),
-/* 203 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var url = __webpack_require__(24)
-  , equal = __webpack_require__(204)
-  , util = __webpack_require__(106)
-  , SchemaObject = __webpack_require__(339)
-  , traverse = __webpack_require__(503);
-
-module.exports = resolve;
-
-resolve.normalizeId = normalizeId;
-resolve.fullPath = getFullPath;
-resolve.url = resolveUrl;
-resolve.ids = resolveIds;
-resolve.inlineRef = inlineRef;
-resolve.schema = resolveSchema;
-
-/**
- * [resolve and compile the references ($ref)]
- * @this   Ajv
- * @param  {Function} compile reference to schema compilation funciton (localCompile)
- * @param  {Object} root object with information about the root schema for the current schema
- * @param  {String} ref reference to resolve
- * @return {Object|Function} schema object (if the schema can be inlined) or validation function
- */
-function resolve(compile, root, ref) {
-  /* jshint validthis: true */
-  var refVal = this._refs[ref];
-  if (typeof refVal == 'string') {
-    if (this._refs[refVal]) refVal = this._refs[refVal];
-    else return resolve.call(this, compile, root, refVal);
-  }
-
-  refVal = refVal || this._schemas[ref];
-  if (refVal instanceof SchemaObject) {
-    return inlineRef(refVal.schema, this._opts.inlineRefs)
-            ? refVal.schema
-            : refVal.validate || this._compile(refVal);
-  }
-
-  var res = resolveSchema.call(this, root, ref);
-  var schema, v, baseId;
-  if (res) {
-    schema = res.schema;
-    root = res.root;
-    baseId = res.baseId;
-  }
-
-  if (schema instanceof SchemaObject) {
-    v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
-  } else if (schema !== undefined) {
-    v = inlineRef(schema, this._opts.inlineRefs)
-        ? schema
-        : compile.call(this, schema, root, undefined, baseId);
-  }
-
-  return v;
-}
-
-
-/**
- * Resolve schema, its root and baseId
- * @this Ajv
- * @param  {Object} root root object with properties schema, refVal, refs
- * @param  {String} ref  reference to resolve
- * @return {Object} object with properties schema, root, baseId
- */
-function resolveSchema(root, ref) {
-  /* jshint validthis: true */
-  var p = url.parse(ref, false, true)
-    , refPath = _getFullPath(p)
-    , baseId = getFullPath(this._getId(root.schema));
-  if (refPath !== baseId) {
-    var id = normalizeId(refPath);
-    var refVal = this._refs[id];
-    if (typeof refVal == 'string') {
-      return resolveRecursive.call(this, root, refVal, p);
-    } else if (refVal instanceof SchemaObject) {
-      if (!refVal.validate) this._compile(refVal);
-      root = refVal;
-    } else {
-      refVal = this._schemas[id];
-      if (refVal instanceof SchemaObject) {
-        if (!refVal.validate) this._compile(refVal);
-        if (id == normalizeId(ref))
-          return { schema: refVal, root: root, baseId: baseId };
-        root = refVal;
-      } else {
-        return;
-      }
-    }
-    if (!root.schema) return;
-    baseId = getFullPath(this._getId(root.schema));
-  }
-  return getJsonPointer.call(this, p, baseId, root.schema, root);
-}
-
-
-/* @this Ajv */
-function resolveRecursive(root, ref, parsedRef) {
-  /* jshint validthis: true */
-  var res = resolveSchema.call(this, root, ref);
-  if (res) {
-    var schema = res.schema;
-    var baseId = res.baseId;
-    root = res.root;
-    var id = this._getId(schema);
-    if (id) baseId = resolveUrl(baseId, id);
-    return getJsonPointer.call(this, parsedRef, baseId, schema, root);
-  }
-}
-
-
-var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
-/* @this Ajv */
-function getJsonPointer(parsedRef, baseId, schema, root) {
-  /* jshint validthis: true */
-  parsedRef.hash = parsedRef.hash || '';
-  if (parsedRef.hash.slice(0,2) != '#/') return;
-  var parts = parsedRef.hash.split('/');
-
-  for (var i = 1; i < parts.length; i++) {
-    var part = parts[i];
-    if (part) {
-      part = util.unescapeFragment(part);
-      schema = schema[part];
-      if (schema === undefined) break;
-      var id;
-      if (!PREVENT_SCOPE_CHANGE[part]) {
-        id = this._getId(schema);
-        if (id) baseId = resolveUrl(baseId, id);
-        if (schema.$ref) {
-          var $ref = resolveUrl(baseId, schema.$ref);
-          var res = resolveSchema.call(this, root, $ref);
-          if (res) {
-            schema = res.schema;
-            root = res.root;
-            baseId = res.baseId;
-          }
-        }
-      }
-    }
-  }
-  if (schema !== undefined && schema !== root.schema)
-    return { schema: schema, root: root, baseId: baseId };
-}
-
-
-var SIMPLE_INLINED = util.toHash([
-  'type', 'format', 'pattern',
-  'maxLength', 'minLength',
-  'maxProperties', 'minProperties',
-  'maxItems', 'minItems',
-  'maximum', 'minimum',
-  'uniqueItems', 'multipleOf',
-  'required', 'enum'
-]);
-function inlineRef(schema, limit) {
-  if (limit === false) return false;
-  if (limit === undefined || limit === true) return checkNoRef(schema);
-  else if (limit) return countKeys(schema) <= limit;
-}
-
-
-function checkNoRef(schema) {
-  var item;
-  if (Array.isArray(schema)) {
-    for (var i=0; i<schema.length; i++) {
-      item = schema[i];
-      if (typeof item == 'object' && !checkNoRef(item)) return false;
-    }
-  } else {
-    for (var key in schema) {
-      if (key == '$ref') return false;
-      item = schema[key];
-      if (typeof item == 'object' && !checkNoRef(item)) return false;
-    }
-  }
-  return true;
-}
-
-
-function countKeys(schema) {
-  var count = 0, item;
-  if (Array.isArray(schema)) {
-    for (var i=0; i<schema.length; i++) {
-      item = schema[i];
-      if (typeof item == 'object') count += countKeys(item);
-      if (count == Infinity) return Infinity;
-    }
-  } else {
-    for (var key in schema) {
-      if (key == '$ref') return Infinity;
-      if (SIMPLE_INLINED[key]) {
-        count++;
-      } else {
-        item = schema[key];
-        if (typeof item == 'object') count += countKeys(item) + 1;
-        if (count == Infinity) return Infinity;
-      }
-    }
-  }
-  return count;
-}
-
-
-function getFullPath(id, normalize) {
-  if (normalize !== false) id = normalizeId(id);
-  var p = url.parse(id, false, true);
-  return _getFullPath(p);
-}
-
-
-function _getFullPath(p) {
-  var protocolSeparator = p.protocol || p.href.slice(0,2) == '//' ? '//' : '';
-  return (p.protocol||'') + protocolSeparator + (p.host||'') + (p.path||'')  + '#';
-}
-
-
-var TRAILING_SLASH_HASH = /#\/?$/;
-function normalizeId(id) {
-  return id ? id.replace(TRAILING_SLASH_HASH, '') : '';
-}
-
-
-function resolveUrl(baseId, id) {
-  id = normalizeId(id);
-  return url.resolve(baseId, id);
-}
-
-
-/* @this Ajv */
-function resolveIds(schema) {
-  var schemaId = normalizeId(this._getId(schema));
-  var baseIds = {'': schemaId};
-  var fullPaths = {'': getFullPath(schemaId, false)};
-  var localRefs = {};
-  var self = this;
-
-  traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
-    if (jsonPtr === '') return;
-    var id = self._getId(sch);
-    var baseId = baseIds[parentJsonPtr];
-    var fullPath = fullPaths[parentJsonPtr] + '/' + parentKeyword;
-    if (keyIndex !== undefined)
-      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
-
-    if (typeof id == 'string') {
-      id = baseId = normalizeId(baseId ? url.resolve(baseId, id) : id);
-
-      var refVal = self._refs[id];
-      if (typeof refVal == 'string') refVal = self._refs[refVal];
-      if (refVal && refVal.schema) {
-        if (!equal(sch, refVal.schema))
-          throw new Error('id "' + id + '" resolves to more than one schema');
-      } else if (id != normalizeId(fullPath)) {
-        if (id[0] == '#') {
-          if (localRefs[id] && !equal(sch, localRefs[id]))
-            throw new Error('id "' + id + '" resolves to more than one schema');
-          localRefs[id] = sch;
-        } else {
-          self._refs[id] = fullPath;
-        }
-      }
-    }
-    baseIds[jsonPtr] = baseId;
-    fullPaths[jsonPtr] = fullPath;
-  });
-
-  return localRefs;
-}
-
-
-/***/ }),
-/* 204 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isArray = Array.isArray;
-var keyList = Object.keys;
-var hasProp = Object.prototype.hasOwnProperty;
-
-module.exports = function equal(a, b) {
-  if (a === b) return true;
-
-  var arrA = isArray(a)
-    , arrB = isArray(b)
-    , i
-    , length
-    , key;
-
-  if (arrA && arrB) {
-    length = a.length;
-    if (length != b.length) return false;
-    for (i = 0; i < length; i++)
-      if (!equal(a[i], b[i])) return false;
-    return true;
-  }
-
-  if (arrA != arrB) return false;
-
-  var dateA = a instanceof Date
-    , dateB = b instanceof Date;
-  if (dateA != dateB) return false;
-  if (dateA && dateB) return a.getTime() == b.getTime();
-
-  var regexpA = a instanceof RegExp
-    , regexpB = b instanceof RegExp;
-  if (regexpA != regexpB) return false;
-  if (regexpA && regexpB) return a.toString() == b.toString();
-
-  if (a instanceof Object && b instanceof Object) {
-    var keys = keyList(a);
-    length = keys.length;
-
-    if (length !== keyList(b).length)
-      return false;
-
-    for (i = 0; i < length; i++)
-      if (!hasProp.call(b, keys[i])) return false;
-
-    for (i = 0; i < length; i++) {
-      key = keys[i];
-      if (!equal(a[key], b[key])) return false;
-    }
-
-    return true;
-  }
-
-  return false;
-};
-
-
-/***/ }),
-/* 205 */
-/***/ (function(module, exports) {
-
-// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
-
-
-module.exports = {
-
-  newInvalidAsn1Error: function (msg) {
-    var e = new Error();
-    e.name = 'InvalidAsn1Error';
-    e.message = msg || '';
-    return e;
-  }
-
-};
-
-
-/***/ }),
-/* 206 */
-/***/ (function(module, exports) {
-
-// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
-
-
-module.exports = {
-  EOC: 0,
-  Boolean: 1,
-  Integer: 2,
-  BitString: 3,
-  OctetString: 4,
-  Null: 5,
-  OID: 6,
-  ObjectDescriptor: 7,
-  External: 8,
-  Real: 9, // float
-  Enumeration: 10,
-  PDV: 11,
-  Utf8String: 12,
-  RelativeOID: 13,
-  Sequence: 16,
-  Set: 17,
-  NumericString: 18,
-  PrintableString: 19,
-  T61String: 20,
-  VideotexString: 21,
-  IA5String: 22,
-  UTCTime: 23,
-  GeneralizedTime: 24,
-  GraphicString: 25,
-  VisibleString: 26,
-  GeneralString: 28,
-  UniversalString: 29,
-  CharacterString: 30,
-  BMPString: 31,
-  Constructor: 32,
-  Context: 128
-};
-
-
-/***/ }),
-/* 207 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getOutdated = exports.run = exports.requireLockfile = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    let addArgs = [];
-    const upgradeAll = args.length === 0 && typeof flags.scope === 'undefined' && typeof flags.pattern === 'undefined';
-    const addFlags = Object.assign({}, flags, {
-      force: true,
-      ignoreWorkspaceRootCheck: true,
-      workspaceRootIsCwd: config.cwd === config.lockfileFolder
-    });
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-    const deps = yield getOutdated(config, reporter, flags, lockfile, args);
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-
-    var _ref2 = yield install.fetchRequestFromCwd();
-
-    const packagePatterns = _ref2.requests;
-
-
-    setUserRequestedPackageVersions(deps, args, flags.latest, packagePatterns, reporter);
-    cleanLockfile(lockfile, deps, packagePatterns, reporter);
-    addArgs = deps.map(function (dep) {
-      return dep.upgradeTo;
-    });
-
-    if (flags.scope && validScopeRegex.test(flags.scope)) {
-      addArgs = addArgs.filter(function (depName) {
-        return depName.startsWith(flags.scope);
-      });
-    }
-
-    const add = new (_add || _load_add()).Add(addArgs, addFlags, config, reporter, upgradeAll ? new (_lockfile || _load_lockfile()).default() : lockfile);
-    yield add.init();
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let getOutdated = exports.getOutdated = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, lockfile, patterns) {
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-    const outdatedFieldName = flags.latest ? 'latest' : 'wanted';
-
-    // ensure scope is of the form `@scope/`
-    const normalizeScope = function normalizeScope() {
-      if (flags.scope) {
-        if (!flags.scope.startsWith('@')) {
-          flags.scope = '@' + flags.scope;
-        }
-
-        if (!flags.scope.endsWith('/')) {
-          flags.scope += '/';
-        }
-      }
-    };
-
-    const versionFilter = function versionFilter(dep) {
-      return dep.current !== dep[outdatedFieldName];
-    };
-
-    if (!flags.latest) {
-      // these flags only have an affect when --latest is used
-      flags.tilde = false;
-      flags.exact = false;
-      flags.caret = false;
-    }
-
-    normalizeScope();
-
-    const deps = (yield (_packageRequest || _load_packageRequest()).default.getOutdatedPackages(lockfile, install, config, reporter, patterns, flags)).filter(versionFilter).filter(scopeFilter.bind(this, flags));
-    deps.forEach(function (dep) {
-      dep.upgradeTo = buildPatternToUpgradeTo(dep, flags);
-      reporter.verbose(reporter.lang('verboseUpgradeBecauseOutdated', dep.name, dep.upgradeTo));
-    });
-
-    return deps;
-  });
-
-  return function getOutdated(_x5, _x6, _x7, _x8, _x9) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-exports.cleanLockfile = cleanLockfile;
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _add;
-
-function _load_add() {
-  return _add = __webpack_require__(165);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _packageRequest;
-
-function _load_packageRequest() {
-  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
-}
-
-var _normalizePattern;
-
-function _load_normalizePattern() {
-  return _normalizePattern = __webpack_require__(37);
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// used to detect whether a semver range is simple enough to preserve when doing a --latest upgrade.
-// when not matched, the upgraded version range will default to `^` the same as the `add` command would.
-const basicSemverOperatorRegex = new RegExp('^(\\^|~|>=|<=)?[^ |&,]+$');
-
-// used to detect if a passed parameter is a scope or a package name.
-
-
-const validScopeRegex = /^@[a-zA-Z0-9-][a-zA-Z0-9_.-]*\/$/;
-
-// If specific versions were requested for packages, override what getOutdated reported as the latest to install
-// Also add ones that are missing, since the requested packages may not have been outdated at all.
-function setUserRequestedPackageVersions(deps, args, latest, packagePatterns, reporter) {
-  args.forEach(requestedPattern => {
-    let found = false;
-    let normalized = (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(requestedPattern);
-
-    // if the user specified a package name without a version range, then that implies "latest"
-    // but if the latest flag is not passed then we need to use the version range from package.json
-    if (!normalized.hasVersion && !latest) {
-      packagePatterns.forEach(packagePattern => {
-        const packageNormalized = (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(packagePattern.pattern);
-        if (packageNormalized.name === normalized.name) {
-          normalized = packageNormalized;
-        }
-      });
-    }
-
-    const newPattern = `${normalized.name}@${normalized.range}`;
-
-    // if this dependency is already in the outdated list,
-    // just update the upgradeTo to whatever version the user requested.
-    deps.forEach(dep => {
-      if (normalized.hasVersion && dep.name === normalized.name) {
-        found = true;
-        dep.upgradeTo = newPattern;
-        reporter.verbose(reporter.lang('verboseUpgradeBecauseRequested', requestedPattern, newPattern));
-      }
-    });
-
-    // if this dependency was not in the outdated list,
-    // then add a new entry
-    if (normalized.hasVersion && !found) {
-      deps.push({
-        name: normalized.name,
-        wanted: '',
-        latest: '',
-        url: '',
-        hint: '',
-        range: '',
-        current: '',
-        upgradeTo: newPattern,
-        workspaceName: '',
-        workspaceLoc: ''
-      });
-      reporter.verbose(reporter.lang('verboseUpgradeBecauseRequested', requestedPattern, newPattern));
-    }
-  });
-}
-
-// this function attempts to determine the range operator on the semver range.
-// this will only handle the simple cases of a semver starting with '^', '~', '>=', '<=', or an exact version.
-// "exotic" semver ranges will not be handled.
-function getRangeOperator(version) {
-  const result = basicSemverOperatorRegex.exec(version);
-  return result ? result[1] || '' : '^';
-}
-
-// Attempt to preserve the range operator from the package.json specified semver range.
-// If an explicit operator was specified using --exact, --tilde, --caret, then that will take precedence.
-function buildPatternToUpgradeTo(dep, flags) {
-  if (dep.latest === 'exotic') {
-    return `${dep.name}@${dep.url}`;
-  }
-
-  const toLatest = flags.latest;
-  const toVersion = toLatest ? dep.latest : dep.range;
-  let rangeOperator = '';
-
-  if (toLatest) {
-    if (flags.caret) {
-      rangeOperator = '^';
-    } else if (flags.tilde) {
-      rangeOperator = '~';
-    } else if (flags.exact) {
-      rangeOperator = '';
-    } else {
-      rangeOperator = getRangeOperator(dep.range);
-    }
-  }
-
-  return `${dep.name}@${rangeOperator}${toVersion}`;
-}
-
-function scopeFilter(flags, dep) {
-  if (validScopeRegex.test(flags.scope)) {
-    return dep.name.startsWith(flags.scope);
-  }
-  return true;
-}
-
-// Remove deps being upgraded from the lockfile, or else Add will use the already-installed version
-// instead of the latest for the range.
-// We do this recursively so that when Yarn installs the potentially updated transitive deps,
-// it may upgrade them too instead of just using the "locked" version from the lockfile.
-// Transitive dependencies that are also a direct dependency are skipped.
-function cleanLockfile(lockfile, deps, packagePatterns, reporter) {
-  function cleanDepFromLockfile(pattern, depth) {
-    const lockManifest = lockfile.getLocked(pattern);
-    if (!lockManifest || depth > 1 && packagePatterns.some(packagePattern => packagePattern.pattern === pattern)) {
-      reporter.verbose(reporter.lang('verboseUpgradeNotUnlocking', pattern));
-      return;
-    }
-
-    const dependencies = Object.assign({}, lockManifest.dependencies || {}, lockManifest.optionalDependencies || {});
-    const depPatterns = Object.keys(dependencies).map(key => `${key}@${dependencies[key]}`);
-    reporter.verbose(reporter.lang('verboseUpgradeUnlocking', pattern));
-    lockfile.removePattern(pattern);
-    depPatterns.forEach(pattern => cleanDepFromLockfile(pattern, depth + 1));
-  }
-
-  const patterns = deps.map(dep => dep.upgradeTo);
-  patterns.forEach(pattern => cleanDepFromLockfile(pattern, 1));
-}
-
-function setFlags(commander) {
-  commander.description('Upgrades packages to their latest version based on the specified range.');
-  commander.usage('upgrade [flags]');
-  commander.option('-S, --scope <scope>', 'upgrade packages under the specified scope');
-  commander.option('-L, --latest', 'list the latest version of packages, ignoring version ranges in package.json');
-  commander.option('-E, --exact', 'install exact version. Only used when --latest is specified.');
-  commander.option('-P, --pattern [pattern]', 'upgrade packages that match pattern');
-  commander.option('-T, --tilde', 'install most recent release with the same minor version. Only used when --latest is specified.');
-  commander.option('-C, --caret', 'install most recent release with the same major version. Only used when --latest is specified.');
-  commander.option('-A, --audit', 'Run vulnerability audit on installed packages');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-const requireLockfile = exports.requireLockfile = true;
-
-/***/ }),
-/* 208 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.integrityErrors = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _packageNameUtils;
-
-function _load_packageNameUtils() {
-  return _packageNameUtils = __webpack_require__(222);
-}
-
-var _workspaceLayout;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const path = __webpack_require__(0);
-
-const integrityErrors = exports.integrityErrors = {
-  EXPECTED_IS_NOT_A_JSON: 'integrityFailedExpectedIsNotAJSON',
-  FILES_MISSING: 'integrityFailedFilesMissing',
-  LOCKFILE_DONT_MATCH: 'integrityLockfilesDontMatch',
-  FLAGS_DONT_MATCH: 'integrityFlagsDontMatch',
-  LINKED_MODULES_DONT_MATCH: 'integrityCheckLinkedModulesDontMatch',
-  PATTERNS_DONT_MATCH: 'integrityPatternsDontMatch',
-  MODULES_FOLDERS_MISSING: 'integrityModulesFoldersMissing',
-  SYSTEM_PARAMS_DONT_MATCH: 'integritySystemParamsDontMatch'
-};
-
-const INTEGRITY_FILE_DEFAULTS = () => ({
-  systemParams: (0, (_packageNameUtils || _load_packageNameUtils()).getSystemParams)(),
-  modulesFolders: [],
-  flags: [],
-  linkedModules: [],
-  topLevelPatterns: [],
-  lockfileEntries: {},
-  files: []
-});
-
-/**
- *
- */
-class InstallationIntegrityChecker {
-  constructor(config) {
-    this.config = config;
-  }
-
-  /**
-   * Get the common ancestor of every node_modules - it may be a node_modules directory itself, but isn't required to.
-   */
-
-  _getModulesRootFolder() {
-    if (this.config.modulesFolder) {
-      return this.config.modulesFolder;
-    } else if (this.config.workspaceRootFolder) {
-      return this.config.workspaceRootFolder;
-    } else {
-      return path.join(this.config.lockfileFolder, (_constants || _load_constants()).NODE_MODULES_FOLDER);
-    }
-  }
-
-  /**
-   * Get the directory in which the yarn-integrity file should be written.
-   */
-
-  _getIntegrityFileFolder() {
-    if (this.config.modulesFolder) {
-      return this.config.modulesFolder;
-    } else if (this.config.enableMetaFolder) {
-      return path.join(this.config.lockfileFolder, (_constants || _load_constants()).META_FOLDER);
-    } else {
-      return path.join(this.config.lockfileFolder, (_constants || _load_constants()).NODE_MODULES_FOLDER);
-    }
-  }
-
-  /**
-   * Get the full path of the yarn-integrity file.
-   */
-
-  _getIntegrityFileLocation() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const locationFolder = _this._getIntegrityFileFolder();
-      const locationPath = path.join(locationFolder, (_constants || _load_constants()).INTEGRITY_FILENAME);
-
-      const exists = yield (_fs || _load_fs()).exists(locationPath);
-
-      return {
-        locationFolder,
-        locationPath,
-        exists
-      };
-    })();
-  }
-
-  /**
-   * Get the list of the directories that contain our modules (there might be multiple such folders b/c of workspaces).
-   */
-
-  _getModulesFolders({ workspaceLayout } = {}) {
-    const locations = [];
-
-    if (this.config.modulesFolder) {
-      locations.push(this.config.modulesFolder);
-    } else {
-      locations.push(path.join(this.config.lockfileFolder, (_constants || _load_constants()).NODE_MODULES_FOLDER));
-    }
-
-    if (workspaceLayout) {
-      for (var _iterator = Object.keys(workspaceLayout.workspaces), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const workspaceName = _ref;
-
-        const loc = workspaceLayout.workspaces[workspaceName].loc;
-
-        if (loc) {
-          locations.push(path.join(loc, (_constants || _load_constants()).NODE_MODULES_FOLDER));
-        }
-      }
-    }
-
-    return locations.sort((_misc || _load_misc()).sortAlpha);
-  }
-
-  /**
-   * Get a list of the files that are located inside our module folders.
-   */
-  _getIntegrityListing({ workspaceLayout } = {}) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const files = [];
-
-      const recurse = (() => {
-        var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
-          for (var _iterator2 = yield (_fs || _load_fs()).readdir(dir), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-            var _ref3;
-
-            if (_isArray2) {
-              if (_i2 >= _iterator2.length) break;
-              _ref3 = _iterator2[_i2++];
-            } else {
-              _i2 = _iterator2.next();
-              if (_i2.done) break;
-              _ref3 = _i2.value;
-            }
-
-            const file = _ref3;
-
-            const entry = path.join(dir, file);
-            const stat = yield (_fs || _load_fs()).lstat(entry);
-
-            if (stat.isDirectory()) {
-              yield recurse(entry);
-            } else {
-              files.push(entry);
-            }
-          }
-        });
-
-        return function recurse(_x) {
-          return _ref2.apply(this, arguments);
-        };
-      })();
-
-      for (var _iterator3 = _this2._getModulesFolders({ workspaceLayout }), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref4 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref4 = _i3.value;
-        }
-
-        const modulesFolder = _ref4;
-
-        if (yield (_fs || _load_fs()).exists(modulesFolder)) {
-          yield recurse(modulesFolder);
-        }
-      }
-
-      return files;
-    })();
-  }
-
-  /**
-   * Generate integrity hash of input lockfile.
-   */
-
-  _generateIntegrityFile(lockfile, patterns, flags, workspaceLayout, artifacts) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const result = (0, (_extends2 || _load_extends()).default)({}, INTEGRITY_FILE_DEFAULTS(), {
-        artifacts
-      });
-
-      result.topLevelPatterns = patterns;
-
-      // If using workspaces, we also need to add the workspaces patterns to the top-level, so that we'll know if a
-      // dependency is added or removed into one of them. We must take care not to read the aggregator (if !loc).
-      //
-      // Also note that we can't use of workspaceLayout.workspaces[].manifest._reference.patterns, because when
-      // doing a "yarn check", the _reference property hasn't yet been properly initialized.
-
-      if (workspaceLayout) {
-        result.topLevelPatterns = result.topLevelPatterns.filter(function (p) {
-          // $FlowFixMe
-          return !workspaceLayout.getManifestByPattern(p);
-        });
-
-        for (var _iterator4 = Object.keys(workspaceLayout.workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref5;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref5 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref5 = _i4.value;
-          }
-
-          const name = _ref5;
-
-          if (!workspaceLayout.workspaces[name].loc) {
-            continue;
-          }
-
-          const manifest = workspaceLayout.workspaces[name].manifest;
-
-          if (manifest) {
-            for (var _iterator5 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-              var _ref6;
-
-              if (_isArray5) {
-                if (_i5 >= _iterator5.length) break;
-                _ref6 = _iterator5[_i5++];
-              } else {
-                _i5 = _iterator5.next();
-                if (_i5.done) break;
-                _ref6 = _i5.value;
-              }
-
-              const dependencyType = _ref6;
-
-              const dependencies = manifest[dependencyType];
-
-              if (!dependencies) {
-                continue;
-              }
-
-              for (var _iterator6 = Object.keys(dependencies), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-                var _ref7;
-
-                if (_isArray6) {
-                  if (_i6 >= _iterator6.length) break;
-                  _ref7 = _iterator6[_i6++];
-                } else {
-                  _i6 = _iterator6.next();
-                  if (_i6.done) break;
-                  _ref7 = _i6.value;
-                }
-
-                const dep = _ref7;
-
-                result.topLevelPatterns.push(`${dep}@${dependencies[dep]}`);
-              }
-            }
-          }
-        }
-      }
-
-      result.topLevelPatterns.sort((_misc || _load_misc()).sortAlpha);
-
-      if (flags.checkFiles) {
-        result.flags.push('checkFiles');
-      }
-
-      if (flags.flat) {
-        result.flags.push('flat');
-      }
-
-      if (_this3.config.ignoreScripts) {
-        result.flags.push('ignoreScripts');
-      }
-      if (_this3.config.focus) {
-        result.flags.push('focus: ' + _this3.config.focusedWorkspaceName);
-      }
-
-      if (_this3.config.production) {
-        result.flags.push('production');
-      }
-
-      if (_this3.config.plugnplayEnabled) {
-        result.flags.push('plugnplay');
-      }
-
-      const linkedModules = _this3.config.linkedModules;
-
-      if (linkedModules.length) {
-        result.linkedModules = linkedModules.sort((_misc || _load_misc()).sortAlpha);
-      }
-
-      for (var _iterator7 = Object.keys(lockfile), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-        var _ref8;
-
-        if (_isArray7) {
-          if (_i7 >= _iterator7.length) break;
-          _ref8 = _iterator7[_i7++];
-        } else {
-          _i7 = _iterator7.next();
-          if (_i7.done) break;
-          _ref8 = _i7.value;
-        }
-
-        const key = _ref8;
-
-        result.lockfileEntries[key] = lockfile[key].resolved || '';
-      }
-
-      for (var _iterator8 = _this3._getModulesFolders({ workspaceLayout }), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-        var _ref9;
-
-        if (_isArray8) {
-          if (_i8 >= _iterator8.length) break;
-          _ref9 = _iterator8[_i8++];
-        } else {
-          _i8 = _iterator8.next();
-          if (_i8.done) break;
-          _ref9 = _i8.value;
-        }
-
-        const modulesFolder = _ref9;
-
-        if (yield (_fs || _load_fs()).exists(modulesFolder)) {
-          result.modulesFolders.push(path.relative(_this3.config.lockfileFolder, modulesFolder));
-        }
-      }
-
-      if (flags.checkFiles) {
-        const modulesRoot = _this3._getModulesRootFolder();
-
-        result.files = (yield _this3._getIntegrityListing({ workspaceLayout })).map(function (entry) {
-          return path.relative(modulesRoot, entry);
-        }).sort((_misc || _load_misc()).sortAlpha);
-      }
-
-      return result;
-    })();
-  }
-
-  _getIntegrityFile(locationPath) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const expectedRaw = yield (_fs || _load_fs()).readFile(locationPath);
-      try {
-        return (0, (_extends2 || _load_extends()).default)({}, INTEGRITY_FILE_DEFAULTS(), JSON.parse(expectedRaw));
-      } catch (e) {
-        // ignore JSON parsing for legacy text integrity files compatibility
-      }
-      return null;
-    })();
-  }
-
-  _compareIntegrityFiles(actual, expected, checkFiles, workspaceLayout) {
-    if (!expected) {
-      return 'EXPECTED_IS_NOT_A_JSON';
-    }
-
-    if (!(0, (_misc || _load_misc()).compareSortedArrays)(actual.linkedModules, expected.linkedModules)) {
-      return 'LINKED_MODULES_DONT_MATCH';
-    }
-
-    if (actual.systemParams !== expected.systemParams) {
-      return 'SYSTEM_PARAMS_DONT_MATCH';
-    }
-
-    let relevantExpectedFlags = expected.flags.slice();
-
-    // If we run "yarn" after "yarn --check-files", we shouldn't fail the less strict validation
-    if (actual.flags.indexOf('checkFiles') === -1) {
-      relevantExpectedFlags = relevantExpectedFlags.filter(flag => flag !== 'checkFiles');
-    }
-
-    if (!(0, (_misc || _load_misc()).compareSortedArrays)(actual.flags, relevantExpectedFlags)) {
-      return 'FLAGS_DONT_MATCH';
-    }
-
-    if (!(0, (_misc || _load_misc()).compareSortedArrays)(actual.topLevelPatterns, expected.topLevelPatterns || [])) {
-      return 'PATTERNS_DONT_MATCH';
-    }
-
-    for (var _iterator9 = Object.keys(actual.lockfileEntries), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref10;
-
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref10 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref10 = _i9.value;
-      }
-
-      const key = _ref10;
-
-      if (actual.lockfileEntries[key] !== expected.lockfileEntries[key]) {
-        return 'LOCKFILE_DONT_MATCH';
-      }
-    }
-
-    for (var _iterator10 = Object.keys(expected.lockfileEntries), _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray10) {
-        if (_i10 >= _iterator10.length) break;
-        _ref11 = _iterator10[_i10++];
-      } else {
-        _i10 = _iterator10.next();
-        if (_i10.done) break;
-        _ref11 = _i10.value;
-      }
-
-      const key = _ref11;
-
-      if (actual.lockfileEntries[key] !== expected.lockfileEntries[key]) {
-        return 'LOCKFILE_DONT_MATCH';
-      }
-    }
-
-    if (checkFiles) {
-      // Early bailout if we expect more files than what we have
-      if (expected.files.length > actual.files.length) {
-        return 'FILES_MISSING';
-      }
-
-      // Since we know the "files" array is sorted (alphabetically), we can optimize the thing
-      // Instead of storing the files in a Set, we can just iterate both arrays at once. O(n)!
-      for (let u = 0, v = 0; u < expected.files.length; ++u) {
-        // Index that, if reached, means that we won't have enough food to match the remaining expected entries anyway
-        const max = v + (actual.files.length - v) - (expected.files.length - u) + 1;
-
-        // Skip over files that have been added (ie not present in 'expected')
-        while (v < max && actual.files[v] !== expected.files[u]) {
-          v += 1;
-        }
-
-        // If we've reached the index defined above, the file is either missing or we can early exit
-        if (v === max) {
-          return 'FILES_MISSING';
-        }
-      }
-    }
-    return 'OK';
-  }
-
-  check(patterns, lockfile, flags, workspaceLayout) {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // check if patterns exist in lockfile
-      const missingPatterns = patterns.filter(function (p) {
-        return !lockfile[p] && (!workspaceLayout || !workspaceLayout.getManifestByPattern(p));
-      });
-
-      const loc = yield _this4._getIntegrityFileLocation();
-      if (missingPatterns.length || !loc.exists) {
-        return {
-          integrityFileMissing: !loc.exists,
-          missingPatterns
-        };
-      }
-
-      const actual = yield _this4._generateIntegrityFile(lockfile, patterns, flags, workspaceLayout);
-
-      const expected = yield _this4._getIntegrityFile(loc.locationPath);
-      let integrityMatches = _this4._compareIntegrityFiles(actual, expected, flags.checkFiles, workspaceLayout);
-
-      if (integrityMatches === 'OK') {
-        invariant(expected, "The integrity shouldn't pass without integrity file");
-        for (var _iterator11 = expected.modulesFolders, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-          var _ref12;
-
-          if (_isArray11) {
-            if (_i11 >= _iterator11.length) break;
-            _ref12 = _iterator11[_i11++];
-          } else {
-            _i11 = _iterator11.next();
-            if (_i11.done) break;
-            _ref12 = _i11.value;
-          }
-
-          const modulesFolder = _ref12;
-
-          if (!(yield (_fs || _load_fs()).exists(path.join(_this4.config.lockfileFolder, modulesFolder)))) {
-            integrityMatches = 'MODULES_FOLDERS_MISSING';
-          }
-        }
-      }
-
-      return {
-        integrityFileMissing: false,
-        integrityMatches: integrityMatches === 'OK',
-        integrityError: integrityMatches === 'OK' ? undefined : integrityMatches,
-        missingPatterns,
-        hardRefreshRequired: integrityMatches === 'SYSTEM_PARAMS_DONT_MATCH'
-      };
-    })();
-  }
-
-  /**
-   * Get artifacts from integrity file if it exists.
-   */
-  getArtifacts() {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const loc = yield _this5._getIntegrityFileLocation();
-      if (!loc.exists) {
-        return null;
-      }
-
-      const expectedRaw = yield (_fs || _load_fs()).readFile(loc.locationPath);
-      let expected;
-      try {
-        expected = JSON.parse(expectedRaw);
-      } catch (e) {
-        // ignore JSON parsing for legacy text integrity files compatibility
-      }
-
-      return expected ? expected.artifacts : null;
-    })();
-  }
-
-  /**
-   * Write the integrity hash of the current install to disk.
-   */
-  save(patterns, lockfile, flags, workspaceLayout, artifacts) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const integrityFile = yield _this6._generateIntegrityFile(lockfile, patterns, flags, workspaceLayout, artifacts);
-
-      const loc = yield _this6._getIntegrityFileLocation();
-      invariant(loc.locationPath, 'expected integrity hash location');
-
-      yield (_fs || _load_fs()).mkdirp(path.dirname(loc.locationPath));
-      yield (_fs || _load_fs()).writeFile(loc.locationPath, JSON.stringify(integrityFile, null, 2));
-    })();
-  }
-
-  removeIntegrityFile() {
-    var _this7 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const loc = yield _this7._getIntegrityFileLocation();
-      if (loc.exists) {
-        yield (_fs || _load_fs()).unlink(loc.locationPath);
-      }
-    })();
-  }
-}
-exports.default = InstallationIntegrityChecker;
-
-/***/ }),
-/* 209 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.testEngine = testEngine;
-exports.checkOne = checkOne;
-exports.check = check;
-exports.shouldCheck = shouldCheck;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _yarnVersion;
-
-function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
-}
-
-var _semver;
-
-function _load_semver() {
-  return _semver = __webpack_require__(224);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const semver = __webpack_require__(21);
-
-const VERSIONS = Object.assign({}, process.versions, {
-  yarn: (_yarnVersion || _load_yarnVersion()).version
-});
-
-function isValid(items, actual) {
-  let isNotWhitelist = true;
-  let isBlacklist = false;
-
-  for (var _iterator = items, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const item = _ref;
-
-    // blacklist
-    if (item[0] === '!') {
-      isBlacklist = true;
-
-      if (actual === item.slice(1)) {
-        return false;
-      }
-      // whitelist
-    } else {
-      isNotWhitelist = false;
-
-      if (item === actual) {
-        return true;
-      }
-    }
-  }
-
-  // npm allows blacklists and whitelists to be mixed. Blacklists with
-  // whitelisted items should be treated as whitelists.
-  return isBlacklist && isNotWhitelist;
-}
-
-const aliases = (0, (_map || _load_map()).default)({
-  iojs: 'node' // we should probably prompt these libraries to fix this
-});
-
-const ignore = ['npm', // we'll never satisfy this for obvious reasons
-'teleport', // a module bundler used by some modules
-'rhino', // once a target for older modules
-'cordovaDependencies', // http://bit.ly/2tkUePg
-'parcel'];
-
-function testEngine(name, range, versions, looseSemver) {
-  const actual = versions[name];
-  if (!actual) {
-    return false;
-  }
-
-  if (!semver.valid(actual, looseSemver)) {
-    return false;
-  }
-
-  if (semver.satisfies(actual, range, looseSemver)) {
-    return true;
-  }
-
-  if (name === 'yarn' && (0, (_semver || _load_semver()).satisfiesWithPrereleases)(actual, range, looseSemver)) {
-    return true;
-  }
-
-  if (name === 'node' && semver.gt(actual, '1.0.0', looseSemver)) {
-    // WARNING: this is a massive hack and is super gross but necessary for compatibility
-    // some modules have the `engines.node` field set to a caret version below semver major v1
-    // eg. ^0.12.0. this is problematic as we enforce engines checks and node is now on version >=1
-    // to allow this pattern we transform the node version to fake ones in the minor range 10-13
-    const major = semver.major(actual, looseSemver);
-    const fakes = [`0.10.${major}`, `0.11.${major}`, `0.12.${major}`, `0.13.${major}`];
-    for (var _iterator2 = fakes, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref2 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref2 = _i2.value;
-      }
-
-      const actualFake = _ref2;
-
-      if (semver.satisfies(actualFake, range, looseSemver)) {
-        return true;
-      }
-    }
-  }
-
-  // incompatible version
-  return false;
-}
-
-function isValidArch(archs) {
-  return isValid(archs, process.arch);
-}
-
-function isValidPlatform(platforms) {
-  return isValid(platforms, process.platform);
-}
-
-function checkOne(info, config, ignoreEngines) {
-  let didIgnore = false;
-  let didError = false;
-  const reporter = config.reporter;
-  const human = `${info.name}@${info.version}`;
-
-  const pushError = msg => {
-    const ref = info._reference;
-
-    if (ref && ref.optional) {
-      ref.ignore = true;
-      ref.incompatible = true;
-
-      reporter.info(`${human}: ${msg}`);
-      if (!didIgnore) {
-        reporter.info(reporter.lang('optionalCompatibilityExcluded', human));
-        didIgnore = true;
-      }
-    } else {
-      reporter.error(`${human}: ${msg}`);
-      didError = true;
-    }
-  };
-
-  const os = info.os,
-        cpu = info.cpu,
-        engines = info.engines;
-
-
-  if (shouldCheckPlatform(os, config.ignorePlatform) && !isValidPlatform(os)) {
-    pushError(reporter.lang('incompatibleOS', process.platform));
-  }
-
-  if (shouldCheckCpu(cpu, config.ignorePlatform) && !isValidArch(cpu)) {
-    pushError(reporter.lang('incompatibleCPU', process.arch));
-  }
-
-  if (shouldCheckEngines(engines, ignoreEngines)) {
-    for (var _iterator3 = (0, (_misc || _load_misc()).entries)(info.engines), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref3 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref3 = _i3.value;
-      }
-
-      const entry = _ref3;
-
-      let name = entry[0];
-      const range = entry[1];
-
-      if (aliases[name]) {
-        name = aliases[name];
-      }
-
-      if (VERSIONS[name]) {
-        if (!testEngine(name, range, VERSIONS, config.looseSemver)) {
-          pushError(reporter.lang('incompatibleEngine', name, range, VERSIONS[name]));
-        }
-      } else if (ignore.indexOf(name) < 0) {
-        reporter.warn(`${human}: ${reporter.lang('invalidEngine', name)}`);
-      }
-    }
-  }
-
-  if (didError) {
-    throw new (_errors || _load_errors()).MessageError(reporter.lang('foundIncompatible'));
-  }
-}
-
-function check(infos, config, ignoreEngines) {
-  for (var _iterator4 = infos, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-    var _ref4;
-
-    if (_isArray4) {
-      if (_i4 >= _iterator4.length) break;
-      _ref4 = _iterator4[_i4++];
-    } else {
-      _i4 = _iterator4.next();
-      if (_i4.done) break;
-      _ref4 = _i4.value;
-    }
-
-    const info = _ref4;
-
-    checkOne(info, config, ignoreEngines);
-  }
-}
-
-function shouldCheckCpu(cpu, ignorePlatform) {
-  return !ignorePlatform && Array.isArray(cpu) && cpu.length > 0;
-}
-
-function shouldCheckPlatform(os, ignorePlatform) {
-  return !ignorePlatform && Array.isArray(os) && os.length > 0;
-}
-
-function shouldCheckEngines(engines, ignoreEngines) {
-  return !ignoreEngines && typeof engines === 'object';
-}
-
-function shouldCheck(manifest, options) {
-  return shouldCheckCpu(manifest.cpu, options.ignorePlatform) || shouldCheckPlatform(manifest.os, options.ignorePlatform) || shouldCheckEngines(manifest.engines, options.ignoreEngines);
-}
-
-/***/ }),
-/* 210 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fetchOneRemote = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let fetchCache = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dest, fetcher, config) {
-    var _ref2 = yield config.readPackageMetadata(dest);
-
-    const hash = _ref2.hash,
-          pkg = _ref2.package;
-
-    yield fetcher.setupMirrorFromCache();
-    return {
-      package: pkg,
-      hash,
-      dest,
-      cached: true
-    };
-  });
-
-  return function fetchCache(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let fetchOneRemote = exports.fetchOneRemote = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (remote, name, version, dest, config) {
-    // Mock metadata for symlinked dependencies
-    if (remote.type === 'link') {
-      const mockPkg = { _uid: '', name: '', version: '0.0.0' };
-      return Promise.resolve({ resolved: null, hash: '', dest, package: mockPkg, cached: false });
-    }
-
-    const Fetcher = (_index || _load_index())[remote.type];
-    if (!Fetcher) {
-      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('unknownFetcherFor', remote.type));
-    }
-
-    const fetcher = new Fetcher(dest, remote, config);
-    if (yield config.isValidModuleDest(dest)) {
-      return fetchCache(dest, fetcher, config);
-    }
-
-    // remove as the module may be invalid
-    yield (_fs || _load_fs()).unlink(dest);
-
-    try {
-      return yield fetcher.fetch({
-        name,
-        version
-      });
-    } catch (err) {
-      try {
-        yield (_fs || _load_fs()).unlink(dest);
-      } catch (err2) {
-        // what do?
-      }
-      throw err;
-    }
-  });
-
-  return function fetchOneRemote(_x4, _x5, _x6, _x7, _x8) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-let maybeFetchOne = (() => {
-  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (ref, config) {
-    try {
-      return yield fetchOne(ref, config);
-    } catch (err) {
-      if (ref.optional) {
-        config.reporter.error(err.message);
-        return null;
-      } else {
-        throw err;
-      }
-    }
-  });
-
-  return function maybeFetchOne(_x9, _x10) {
-    return _ref4.apply(this, arguments);
-  };
-})();
-
-exports.fetch = fetch;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = _interopRequireWildcard(__webpack_require__(552));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _promise;
-
-function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(50));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function fetchOne(ref, config) {
-  const dest = config.generateModuleCachePath(ref);
-
-  return fetchOneRemote(ref.remote, ref.name, ref.version, dest, config);
-}
-
-function fetch(pkgs, config) {
-  const pkgsPerDest = new Map();
-  pkgs = pkgs.filter(pkg => {
-    const ref = pkg._reference;
-    if (!ref) {
-      return false;
-    }
-    const dest = config.generateModuleCachePath(ref);
-    const otherPkg = pkgsPerDest.get(dest);
-    if (otherPkg) {
-      config.reporter.warn(config.reporter.lang('multiplePackagesCantUnpackInSameDestination', ref.patterns, dest, otherPkg.patterns));
-      return false;
-    }
-    pkgsPerDest.set(dest, ref);
-    return true;
-  });
-  const tick = config.reporter.progress(pkgs.length);
-
-  return (_promise || _load_promise()).queue(pkgs, (() => {
-    var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (pkg) {
-      const ref = pkg._reference;
-      if (!ref) {
-        return pkg;
-      }
-
-      const res = yield maybeFetchOne(ref, config);
-      let newPkg;
-
-      if (res) {
-        newPkg = res.package;
-
-        // update with new remote
-        // but only if there was a hash previously as the tarball fetcher does not provide a hash.
-        if (ref.remote.hash) {
-          // if the checksum was updated, also update resolved and cache
-          if (ref.remote.hash !== res.hash && config.updateChecksums) {
-            const oldHash = ref.remote.hash;
-            if (ref.remote.resolved) {
-              ref.remote.resolved = ref.remote.resolved.replace(oldHash, res.hash);
-            }
-            ref.config.cache = Object.keys(ref.config.cache).reduce(function (cache, entry) {
-              const entryWithNewHash = entry.replace(oldHash, res.hash);
-              cache[entryWithNewHash] = ref.config.cache[entry];
-              return cache;
-            }, {});
-          }
-          ref.remote.hash = res.hash || ref.remote.hash;
-        }
-      }
-
-      if (tick) {
-        tick();
-      }
-
-      if (newPkg) {
-        newPkg._reference = ref;
-        newPkg._remote = ref.remote;
-        newPkg.name = pkg.name;
-        newPkg.fresh = pkg.fresh;
-        return newPkg;
-      }
-
-      return pkg;
-    });
-
-    return function (_x11) {
-      return _ref5.apply(this, arguments);
-    };
-  })(), config.networkConcurrency);
-}
-
-/***/ }),
-/* 211 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.linkBin = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let linkBin = exports.linkBin = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
-    if (process.platform === 'win32') {
-      const unlockMutex = yield (0, (_mutex || _load_mutex()).default)(src);
-      try {
-        yield cmdShim(src, dest, { createPwshFile: false });
-      } finally {
-        unlockMutex();
-      }
-    } else {
-      yield (_fs || _load_fs()).mkdirp(path.dirname(dest));
-      yield (_fs || _load_fs()).symlink(src, dest);
-      yield (_fs || _load_fs()).chmod(dest, '755');
-    }
-  });
-
-  return function linkBin(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-var _packageHoister;
-
-function _load_packageHoister() {
-  return _packageHoister = _interopRequireDefault(__webpack_require__(556));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _promise;
-
-function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(50));
-}
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _mutex;
-
-function _load_mutex() {
-  return _mutex = _interopRequireDefault(__webpack_require__(375));
-}
-
-var _semver;
-
-function _load_semver() {
-  return _semver = __webpack_require__(224);
-}
-
-var _workspaceLayout;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const cmdShim = __webpack_require__(201);
-const path = __webpack_require__(0);
-const semver = __webpack_require__(21);
-// Concurrency for creating bin links disabled because of the issue #1961
-const linkBinConcurrency = 1;
-
-class PackageLinker {
-  constructor(config, resolver) {
-    this.resolver = resolver;
-    this.reporter = config.reporter;
-    this.config = config;
-    this.artifacts = {};
-    this.topLevelBinLinking = true;
-    this.unplugged = [];
-  }
-
-  setArtifacts(artifacts) {
-    this.artifacts = artifacts;
-  }
-
-  setTopLevelBinLinking(topLevelBinLinking) {
-    this.topLevelBinLinking = topLevelBinLinking;
-  }
-
-  linkSelfDependencies(pkg, pkgLoc, targetBinLoc, override = false) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      targetBinLoc = path.join(targetBinLoc, '.bin');
-      yield (_fs || _load_fs()).mkdirp(targetBinLoc);
-      targetBinLoc = yield (_fs || _load_fs()).realpath(targetBinLoc);
-      pkgLoc = yield (_fs || _load_fs()).realpath(pkgLoc);
-      for (var _iterator = (0, (_misc || _load_misc()).entries)(pkg.bin), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref3 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref3 = _i.value;
-        }
-
-        const _ref2 = _ref3;
-        const scriptName = _ref2[0];
-        const scriptCmd = _ref2[1];
-
-        const dest = path.join(targetBinLoc, scriptName);
-        const src = path.join(pkgLoc, scriptCmd);
-        if (!(yield (_fs || _load_fs()).exists(src))) {
-          if (!override) {
-            // TODO maybe throw an error
-            continue;
-          }
-        }
-        yield linkBin(src, dest);
-      }
-    })();
-  }
-
-  linkBinDependencies(pkg, dir) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const deps = [];
-
-      const ref = pkg._reference;
-      invariant(ref, 'Package reference is missing');
-
-      const remote = pkg._remote;
-      invariant(remote, 'Package remote is missing');
-
-      // link up `bin scripts` in `dependencies`
-      for (var _iterator2 = ref.dependencies, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref4 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref4 = _i2.value;
-        }
-
-        const pattern = _ref4;
-
-        const dep = _this.resolver.getStrictResolvedPattern(pattern);
-        if (
-        // Missing locations means not installed inside node_modules
-        dep._reference && dep._reference.locations.length && dep.bin && Object.keys(dep.bin).length) {
-          const loc = yield _this.findNearestInstalledVersionOfPackage(dep, dir);
-          deps.push({ dep, loc });
-        }
-      }
-
-      // link up the `bin` scripts in bundled dependencies
-      if (pkg.bundleDependencies) {
-        for (var _iterator3 = pkg.bundleDependencies, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-          var _ref5;
-
-          if (_isArray3) {
-            if (_i3 >= _iterator3.length) break;
-            _ref5 = _iterator3[_i3++];
-          } else {
-            _i3 = _iterator3.next();
-            if (_i3.done) break;
-            _ref5 = _i3.value;
-          }
-
-          const depName = _ref5;
-
-          const locs = ref.locations.map(function (loc) {
-            return path.join(loc, _this.config.getFolder(pkg), depName);
-          });
-          try {
-            const dep = yield _this.config.readManifest(locs[0], remote.registry); //all of them should be the same
-
-            if (dep.bin && Object.keys(dep.bin).length) {
-              deps.push(...locs.map(function (loc) {
-                return { dep, loc };
-              }));
-            }
-          } catch (ex) {
-            if (ex.code !== 'ENOENT') {
-              throw ex;
-            }
-            // intentionally ignoring ENOENT error.
-            // bundledDependency either does not exist or does not contain a package.json
-          }
-        }
-      }
-
-      // no deps to link
-      if (!deps.length) {
-        return;
-      }
-
-      // write the executables
-      for (var _iterator4 = deps, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray4) {
-          if (_i4 >= _iterator4.length) break;
-          _ref7 = _iterator4[_i4++];
-        } else {
-          _i4 = _iterator4.next();
-          if (_i4.done) break;
-          _ref7 = _i4.value;
-        }
-
-        const _ref6 = _ref7;
-        const dep = _ref6.dep,
-              loc = _ref6.loc;
-
-        if (dep._reference && dep._reference.locations.length) {
-          invariant(!dep._reference.isPlugnplay, "Plug'n'play packages should not be referenced here");
-          yield _this.linkSelfDependencies(dep, loc, dir);
-        }
-      }
-    })();
-  }
-
-  //find the installation location of ref that would be used in binLoc based on node module resolution
-  findNearestInstalledVersionOfPackage(pkg, binLoc) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const ref = pkg._reference;
-      invariant(ref, 'expected pkg reference for ' + pkg.name);
-      const moduleFolder = _this2.config.getFolder(pkg);
-      yield (_fs || _load_fs()).mkdirp(binLoc);
-      const realBinLoc = yield (_fs || _load_fs()).realpath(binLoc);
-
-      const allLocations = [...ref.locations];
-      const realLocations = yield Promise.all(ref.locations.map(function (loc) {
-        return (_fs || _load_fs()).realpath(loc);
-      }));
-      realLocations.forEach(function (loc) {
-        return allLocations.indexOf(loc) !== -1 || allLocations.push(loc);
-      });
-
-      const locationBinLocPairs = allLocations.map(function (loc) {
-        return [loc, binLoc];
-      });
-      if (binLoc !== realBinLoc) {
-        locationBinLocPairs.push(...allLocations.map(function (loc) {
-          return [loc, realBinLoc];
-        }));
-      }
-
-      const distancePairs = locationBinLocPairs.map(function ([loc, curBinLoc]) {
-        let distance = 0;
-        let curLoc = curBinLoc;
-        let notFound = false;
-
-        while (path.join(curLoc, ref.name) !== loc && path.join(curLoc, moduleFolder, ref.name) !== loc) {
-          const next = path.dirname(curLoc);
-          if (curLoc === next) {
-            notFound = true;
-            break;
-          }
-
-          distance++;
-          curLoc = next;
-        }
-        return notFound ? null : [loc, distance];
-      });
-
-      //remove items where path was not found
-      const filteredDistancePairs = distancePairs.filter(function (d) {
-        return d;
-      });
-      filteredDistancePairs;
-
-      invariant(filteredDistancePairs.length > 0, `could not find a copy of ${pkg.name} to link in ${binLoc}`);
-
-      //get smallest distance from package location
-      const minItem = filteredDistancePairs.reduce(function (min, cur) {
-        return cur[1] < min[1] ? cur : min;
-      });
-
-      invariant(minItem[1] >= 0, 'could not find a target for bin dir of ' + minItem.toString());
-      return minItem[0];
-    })();
-  }
-
-  getFlatHoistedTree(patterns, workspaceLayout, { ignoreOptional } = {}) {
-    const hoister = new (_packageHoister || _load_packageHoister()).default(this.config, this.resolver, { ignoreOptional, workspaceLayout });
-    hoister.seed(patterns);
-    if (this.config.focus) {
-      hoister.markShallowWorkspaceEntries();
-    }
-    return hoister.init();
-  }
-
-  copyModules(patterns, workspaceLayout, { linkDuplicates, ignoreOptional } = {}) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let flatTree = _this3.getFlatHoistedTree(patterns, workspaceLayout, { ignoreOptional });
-      // sorted tree makes file creation and copying not to interfere with each other
-      flatTree = flatTree.sort(function (dep1, dep2) {
-        return dep1[0].localeCompare(dep2[0]);
-      });
-
-      // list of artifacts in modules to remove from extraneous removal
-      const artifactFiles = [];
-
-      const copyQueue = new Map();
-      const hardlinkQueue = new Map();
-      const hardlinksEnabled = linkDuplicates && (yield (_fs || _load_fs()).hardlinksWork(_this3.config.cwd));
-
-      const copiedSrcs = new Map();
-      const symlinkPaths = new Map();
-      for (var _iterator5 = flatTree, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref9;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref9 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref9 = _i5.value;
-        }
-
-        const _ref8 = _ref9;
-        const folder = _ref8[0];
-        var _ref8$ = _ref8[1];
-        const pkg = _ref8$.pkg;
-        const loc = _ref8$.loc;
-        const isShallow = _ref8$.isShallow;
-
-        const remote = pkg._remote || { type: '' };
-        const ref = pkg._reference;
-        let dest = folder;
-        invariant(ref, 'expected package reference');
-
-        let src = loc;
-        let type = '';
-        if (remote.type === 'link') {
-          // replace package source from incorrect cache location (workspaces and link: are not cached)
-          // with a symlink source
-          src = remote.reference;
-          type = 'symlink';
-        } else if (workspaceLayout && remote.type === 'workspace' && !isShallow) {
-          src = remote.reference;
-          type = 'symlink';
-          if (dest.indexOf(workspaceLayout.virtualManifestName) !== -1) {
-            // we don't need to install virtual manifest
-            continue;
-          }
-          // to get real path for non hoisted dependencies
-          symlinkPaths.set(dest, src);
-        } else {
-          // backwards compatibility: get build artifacts from metadata
-          // does not apply to symlinked dependencies
-          const metadata = yield _this3.config.readPackageMetadata(src);
-          for (var _iterator15 = metadata.artifacts, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
-            var _ref23;
-
-            if (_isArray15) {
-              if (_i15 >= _iterator15.length) break;
-              _ref23 = _iterator15[_i15++];
-            } else {
-              _i15 = _iterator15.next();
-              if (_i15.done) break;
-              _ref23 = _i15.value;
-            }
-
-            const file = _ref23;
-
-            artifactFiles.push(path.join(dest, file));
-          }
-        }
-
-        for (var _iterator16 = symlinkPaths.entries(), _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
-          var _ref25;
-
-          if (_isArray16) {
-            if (_i16 >= _iterator16.length) break;
-            _ref25 = _iterator16[_i16++];
-          } else {
-            _i16 = _iterator16.next();
-            if (_i16.done) break;
-            _ref25 = _i16.value;
-          }
-
-          const _ref24 = _ref25;
-          const symlink = _ref24[0];
-          const realpath = _ref24[1];
-
-          if (dest.indexOf(symlink + path.sep) === 0) {
-            // after hoisting we end up with this structure
-            // root/node_modules/workspace-package(symlink)/node_modules/package-a
-            // fs.copy operations can't copy files through a symlink, so all the paths under workspace-package
-            // need to be replaced with a real path, except for the symlink root/node_modules/workspace-package
-            dest = dest.replace(symlink, realpath);
-          }
-        }
-
-        if (_this3.config.plugnplayEnabled) {
-          ref.isPlugnplay = true;
-          if (yield _this3._isUnplugged(pkg, ref)) {
-            dest = _this3.config.generatePackageUnpluggedPath(ref);
-
-            // We don't skip the copy if the unplugged package isn't materialized yet
-            if (yield (_fs || _load_fs()).exists(dest)) {
-              ref.addLocation(dest);
-              continue;
-            }
-          } else {
-            ref.addLocation(src);
-            continue;
-          }
-        }
-
-        ref.addLocation(dest);
-
-        const integrityArtifacts = _this3.artifacts[`${pkg.name}@${pkg.version}`];
-        if (integrityArtifacts) {
-          for (var _iterator17 = integrityArtifacts, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : _iterator17[Symbol.iterator]();;) {
-            var _ref26;
-
-            if (_isArray17) {
-              if (_i17 >= _iterator17.length) break;
-              _ref26 = _iterator17[_i17++];
-            } else {
-              _i17 = _iterator17.next();
-              if (_i17.done) break;
-              _ref26 = _i17.value;
-            }
-
-            const file = _ref26;
-
-            artifactFiles.push(path.join(dest, file));
-          }
-        }
-
-        const copiedDest = copiedSrcs.get(src);
-        if (!copiedDest) {
-          // no point to hardlink to a symlink
-          if (hardlinksEnabled && type !== 'symlink') {
-            copiedSrcs.set(src, dest);
-          }
-          copyQueue.set(dest, {
-            src,
-            dest,
-            type,
-            onFresh() {
-              if (ref) {
-                ref.setFresh(true);
-              }
-            }
-          });
-        } else {
-          hardlinkQueue.set(dest, {
-            src: copiedDest,
-            dest,
-            onFresh() {
-              if (ref) {
-                ref.setFresh(true);
-              }
-            }
-          });
-        }
-      }
-
-      const possibleExtraneous = new Set();
-      const scopedPaths = new Set();
-
-      const findExtraneousFiles = (() => {
-        var _ref10 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (basePath) {
-          for (var _iterator6 = _this3.config.registryFolders, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-            var _ref11;
-
-            if (_isArray6) {
-              if (_i6 >= _iterator6.length) break;
-              _ref11 = _iterator6[_i6++];
-            } else {
-              _i6 = _iterator6.next();
-              if (_i6.done) break;
-              _ref11 = _i6.value;
-            }
-
-            const folder = _ref11;
-
-            const loc = path.resolve(basePath, folder);
-
-            if (yield (_fs || _load_fs()).exists(loc)) {
-              const files = yield (_fs || _load_fs()).readdir(loc);
-
-              for (var _iterator7 = files, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-                var _ref12;
-
-                if (_isArray7) {
-                  if (_i7 >= _iterator7.length) break;
-                  _ref12 = _iterator7[_i7++];
-                } else {
-                  _i7 = _iterator7.next();
-                  if (_i7.done) break;
-                  _ref12 = _i7.value;
-                }
-
-                const file = _ref12;
-
-                const filepath = path.join(loc, file);
-
-                // it's a scope, not a package
-                if (file[0] === '@') {
-                  scopedPaths.add(filepath);
-
-                  for (var _iterator8 = yield (_fs || _load_fs()).readdir(filepath), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-                    var _ref13;
-
-                    if (_isArray8) {
-                      if (_i8 >= _iterator8.length) break;
-                      _ref13 = _iterator8[_i8++];
-                    } else {
-                      _i8 = _iterator8.next();
-                      if (_i8.done) break;
-                      _ref13 = _i8.value;
-                    }
-
-                    const subfile = _ref13;
-
-                    possibleExtraneous.add(path.join(filepath, subfile));
-                  }
-                } else {
-                  possibleExtraneous.add(filepath);
-                }
-              }
-            }
-          }
-        });
-
-        return function findExtraneousFiles(_x3) {
-          return _ref10.apply(this, arguments);
-        };
-      })();
-
-      yield findExtraneousFiles(_this3.config.lockfileFolder);
-      if (workspaceLayout) {
-        for (var _iterator9 = Object.keys(workspaceLayout.workspaces), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-          var _ref14;
-
-          if (_isArray9) {
-            if (_i9 >= _iterator9.length) break;
-            _ref14 = _iterator9[_i9++];
-          } else {
-            _i9 = _iterator9.next();
-            if (_i9.done) break;
-            _ref14 = _i9.value;
-          }
-
-          const workspaceName = _ref14;
-
-          yield findExtraneousFiles(workspaceLayout.workspaces[workspaceName].loc);
-        }
-      }
-
-      // If an Extraneous is an entry created via "yarn link", we prevent it from being overwritten.
-      // Unfortunately, the only way we can know if they have been created this way is to check if they
-      // are symlinks - problem is that it then conflicts with the newly introduced "link:" protocol,
-      // which also creates symlinks :( a somewhat weak fix is to check if the symlink target is registered
-      // inside the linkFolder, in which case we assume it has been created via "yarn link". Otherwise, we
-      // assume it's a link:-managed dependency, and overwrite it as usual.
-      const linkTargets = new Map();
-
-      let linkedModules;
-      try {
-        linkedModules = yield (_fs || _load_fs()).readdir(_this3.config.linkFolder);
-      } catch (err) {
-        if (err.code === 'ENOENT') {
-          linkedModules = [];
-        } else {
-          throw err;
-        }
-      }
-
-      // TODO: Consolidate this logic with `this.config.linkedModules` logic
-      for (var _iterator10 = linkedModules, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-        var _ref15;
-
-        if (_isArray10) {
-          if (_i10 >= _iterator10.length) break;
-          _ref15 = _iterator10[_i10++];
-        } else {
-          _i10 = _iterator10.next();
-          if (_i10.done) break;
-          _ref15 = _i10.value;
-        }
-
-        const entry = _ref15;
-
-        const entryPath = path.join(_this3.config.linkFolder, entry);
-        const stat = yield (_fs || _load_fs()).lstat(entryPath);
-
-        if (stat.isSymbolicLink()) {
-          try {
-            const entryTarget = yield (_fs || _load_fs()).realpath(entryPath);
-            linkTargets.set(entry, entryTarget);
-          } catch (err) {
-            _this3.reporter.warn(_this3.reporter.lang('linkTargetMissing', entry));
-            yield (_fs || _load_fs()).unlink(entryPath);
-          }
-        } else if (stat.isDirectory() && entry[0] === '@') {
-          // if the entry is directory beginning with '@', then we're dealing with a package scope, which
-          // means we must iterate inside to retrieve the package names it contains
-          const scopeName = entry;
-
-          for (var _iterator18 = yield (_fs || _load_fs()).readdir(entryPath), _isArray18 = Array.isArray(_iterator18), _i18 = 0, _iterator18 = _isArray18 ? _iterator18 : _iterator18[Symbol.iterator]();;) {
-            var _ref27;
-
-            if (_isArray18) {
-              if (_i18 >= _iterator18.length) break;
-              _ref27 = _iterator18[_i18++];
-            } else {
-              _i18 = _iterator18.next();
-              if (_i18.done) break;
-              _ref27 = _i18.value;
-            }
-
-            const entry2 = _ref27;
-
-            const entryPath2 = path.join(entryPath, entry2);
-            const stat2 = yield (_fs || _load_fs()).lstat(entryPath2);
-
-            if (stat2.isSymbolicLink()) {
-              const packageName = `${scopeName}/${entry2}`;
-              try {
-                const entryTarget = yield (_fs || _load_fs()).realpath(entryPath2);
-                linkTargets.set(packageName, entryTarget);
-              } catch (err) {
-                _this3.reporter.warn(_this3.reporter.lang('linkTargetMissing', packageName));
-                yield (_fs || _load_fs()).unlink(entryPath2);
-              }
-            }
-          }
-        }
-      }
-
-      for (var _iterator11 = possibleExtraneous, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-        var _ref16;
-
-        if (_isArray11) {
-          if (_i11 >= _iterator11.length) break;
-          _ref16 = _iterator11[_i11++];
-        } else {
-          _i11 = _iterator11.next();
-          if (_i11.done) break;
-          _ref16 = _i11.value;
-        }
-
-        const loc = _ref16;
-
-        let packageName = path.basename(loc);
-        const scopeName = path.basename(path.dirname(loc));
-
-        if (scopeName[0] === `@`) {
-          packageName = `${scopeName}/${packageName}`;
-        }
-
-        if ((yield (_fs || _load_fs()).lstat(loc)).isSymbolicLink() && linkTargets.has(packageName) && linkTargets.get(packageName) === (yield (_fs || _load_fs()).realpath(loc))) {
-          possibleExtraneous.delete(loc);
-          copyQueue.delete(loc);
-        }
-      }
-
-      //
-      let tick;
-      yield (_fs || _load_fs()).copyBulk(Array.from(copyQueue.values()), _this3.reporter, {
-        possibleExtraneous,
-        artifactFiles,
-
-        ignoreBasenames: [(_constants || _load_constants()).METADATA_FILENAME, (_constants || _load_constants()).TARBALL_FILENAME, '.bin'],
-
-        onStart: function onStart(num) {
-          tick = _this3.reporter.progress(num);
-        },
-
-        onProgress(src) {
-          if (tick) {
-            tick();
-          }
-        }
-      });
-
-      yield (_fs || _load_fs()).hardlinkBulk(Array.from(hardlinkQueue.values()), _this3.reporter, {
-        possibleExtraneous,
-        artifactFiles,
-
-        onStart: function onStart(num) {
-          tick = _this3.reporter.progress(num);
-        },
-
-        onProgress(src) {
-          if (tick) {
-            tick();
-          }
-        }
-      });
-
-      // remove all extraneous files that weren't in the tree
-      for (var _iterator12 = possibleExtraneous, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-        var _ref17;
-
-        if (_isArray12) {
-          if (_i12 >= _iterator12.length) break;
-          _ref17 = _iterator12[_i12++];
-        } else {
-          _i12 = _iterator12.next();
-          if (_i12.done) break;
-          _ref17 = _i12.value;
-        }
-
-        const loc = _ref17;
-
-        _this3.reporter.verbose(_this3.reporter.lang('verboseFileRemoveExtraneous', loc));
-        yield (_fs || _load_fs()).unlink(loc);
-      }
-
-      // remove any empty scoped directories
-      for (var _iterator13 = scopedPaths, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
-        var _ref18;
-
-        if (_isArray13) {
-          if (_i13 >= _iterator13.length) break;
-          _ref18 = _iterator13[_i13++];
-        } else {
-          _i13 = _iterator13.next();
-          if (_i13.done) break;
-          _ref18 = _i13.value;
-        }
-
-        const scopedPath = _ref18;
-
-        const files = yield (_fs || _load_fs()).readdir(scopedPath);
-        if (files.length === 0) {
-          yield (_fs || _load_fs()).unlink(scopedPath);
-        }
-      }
-
-      // create binary links
-      if (_this3.config.getOption('bin-links') && _this3.config.binLinks !== false) {
-        const topLevelDependencies = _this3.determineTopLevelBinLinkOrder(flatTree);
-        const tickBin = _this3.reporter.progress(flatTree.length + topLevelDependencies.length);
-
-        // create links in transient dependencies
-        yield (_promise || _load_promise()).queue(flatTree, (() => {
-          var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ([dest, { pkg, isNohoist, parts }]) {
-            if (pkg._reference && pkg._reference.locations.length && !pkg._reference.isPlugnplay) {
-              const binLoc = path.join(dest, _this3.config.getFolder(pkg));
-              yield _this3.linkBinDependencies(pkg, binLoc);
-              if (isNohoist) {
-                // if nohoist, we need to override the binLink to point to the local destination
-                const parentBinLoc = _this3.getParentBinLoc(parts, flatTree);
-                yield _this3.linkSelfDependencies(pkg, dest, parentBinLoc, true);
-              }
-              tickBin();
-            }
-            tickBin();
-          });
-
-          return function (_x4) {
-            return _ref19.apply(this, arguments);
-          };
-        })(), linkBinConcurrency);
-
-        // create links at top level for all dependencies.
-        yield (_promise || _load_promise()).queue(topLevelDependencies, (() => {
-          var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ([dest, { pkg }]) {
-            if (pkg._reference && pkg._reference.locations.length && !pkg._reference.isPlugnplay && pkg.bin && Object.keys(pkg.bin).length) {
-              let binLoc;
-              if (_this3.config.modulesFolder) {
-                binLoc = path.join(_this3.config.modulesFolder);
-              } else {
-                binLoc = path.join(_this3.config.lockfileFolder, _this3.config.getFolder(pkg));
-              }
-              yield _this3.linkSelfDependencies(pkg, dest, binLoc);
-            }
-            tickBin();
-          });
-
-          return function (_x5) {
-            return _ref20.apply(this, arguments);
-          };
-        })(), linkBinConcurrency);
-      }
-
-      for (var _iterator14 = flatTree, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-        var _ref22;
-
-        if (_isArray14) {
-          if (_i14 >= _iterator14.length) break;
-          _ref22 = _iterator14[_i14++];
-        } else {
-          _i14 = _iterator14.next();
-          if (_i14.done) break;
-          _ref22 = _i14.value;
-        }
-
-        const _ref21 = _ref22;
-        const pkg = _ref21[1].pkg;
-
-        yield _this3._warnForMissingBundledDependencies(pkg);
-      }
-    })();
-  }
-
-  _buildTreeHash(flatTree) {
-    const hash = new Map();
-    for (var _iterator19 = flatTree, _isArray19 = Array.isArray(_iterator19), _i19 = 0, _iterator19 = _isArray19 ? _iterator19 : _iterator19[Symbol.iterator]();;) {
-      var _ref29;
-
-      if (_isArray19) {
-        if (_i19 >= _iterator19.length) break;
-        _ref29 = _iterator19[_i19++];
-      } else {
-        _i19 = _iterator19.next();
-        if (_i19.done) break;
-        _ref29 = _i19.value;
-      }
-
-      const _ref28 = _ref29;
-      const dest = _ref28[0];
-      const hoistManifest = _ref28[1];
-
-      const key = hoistManifest.parts.join('#');
-      hash.set(key, [dest, hoistManifest]);
-    }
-    this._treeHash = hash;
-    return hash;
-  }
-
-  getParentBinLoc(parts, flatTree) {
-    const hash = this._treeHash || this._buildTreeHash(flatTree);
-    const parent = parts.slice(0, -1).join('#');
-    const tuple = hash.get(parent);
-    if (!tuple) {
-      throw new Error(`failed to get parent '${parent}' binLoc`);
-    }
-    const dest = tuple[0],
-          hoistManifest = tuple[1];
-
-    const parentBinLoc = path.join(dest, this.config.getFolder(hoistManifest.pkg));
-
-    return parentBinLoc;
-  }
-
-  determineTopLevelBinLinkOrder(flatTree) {
-    const linksToCreate = new Map();
-    for (var _iterator20 = flatTree, _isArray20 = Array.isArray(_iterator20), _i20 = 0, _iterator20 = _isArray20 ? _iterator20 : _iterator20[Symbol.iterator]();;) {
-      var _ref31;
-
-      if (_isArray20) {
-        if (_i20 >= _iterator20.length) break;
-        _ref31 = _iterator20[_i20++];
-      } else {
-        _i20 = _iterator20.next();
-        if (_i20.done) break;
-        _ref31 = _i20.value;
-      }
-
-      const _ref30 = _ref31;
-      const dest = _ref30[0];
-      const hoistManifest = _ref30[1];
-      const pkg = hoistManifest.pkg,
-            isDirectRequire = hoistManifest.isDirectRequire,
-            isNohoist = hoistManifest.isNohoist,
-            isShallow = hoistManifest.isShallow;
-      const name = pkg.name;
-
-      // nohoist and shallow packages should not be linked at topLevel bin
-
-      if (!isNohoist && !isShallow && (isDirectRequire || this.topLevelBinLinking && !linksToCreate.has(name))) {
-        linksToCreate.set(name, [dest, hoistManifest]);
-      }
-    }
-
-    // Sort the array so that direct dependencies will be linked last.
-    // Bin links are overwritten if they already exist, so this will cause direct deps to take precedence.
-    // If someone finds this to be incorrect later, you could also consider sorting descending by
-    //   `linkToCreate.level` which is the dependency tree depth. Direct deps will have level 0 and transitive
-    //   deps will have level > 0.
-    const transientBins = [];
-    const topLevelBins = [];
-    for (var _iterator21 = Array.from(linksToCreate.values()), _isArray21 = Array.isArray(_iterator21), _i21 = 0, _iterator21 = _isArray21 ? _iterator21 : _iterator21[Symbol.iterator]();;) {
-      var _ref32;
-
-      if (_isArray21) {
-        if (_i21 >= _iterator21.length) break;
-        _ref32 = _iterator21[_i21++];
-      } else {
-        _i21 = _iterator21.next();
-        if (_i21.done) break;
-        _ref32 = _i21.value;
-      }
-
-      const linkToCreate = _ref32;
-
-      if (linkToCreate[1].isDirectRequire) {
-        topLevelBins.push(linkToCreate);
-      } else {
-        transientBins.push(linkToCreate);
-      }
-    }
-    return [...transientBins, ...topLevelBins];
-  }
-
-  resolvePeerModules() {
-    for (var _iterator22 = this.resolver.getManifests(), _isArray22 = Array.isArray(_iterator22), _i22 = 0, _iterator22 = _isArray22 ? _iterator22 : _iterator22[Symbol.iterator]();;) {
-      var _ref33;
-
-      if (_isArray22) {
-        if (_i22 >= _iterator22.length) break;
-        _ref33 = _iterator22[_i22++];
-      } else {
-        _i22 = _iterator22.next();
-        if (_i22.done) break;
-        _ref33 = _i22.value;
-      }
-
-      const pkg = _ref33;
-
-      const peerDeps = pkg.peerDependencies;
-      const peerDepsMeta = pkg.peerDependenciesMeta;
-
-      if (!peerDeps) {
-        continue;
-      }
-
-      const ref = pkg._reference;
-      invariant(ref, 'Package reference is missing');
-
-      // TODO: We are taking the "shortest" ref tree but there may be multiple ref trees with the same length
-      const refTree = ref.requests.map(req => req.parentNames).sort((arr1, arr2) => arr1.length - arr2.length)[0];
-
-      const getLevelDistance = pkgRef => {
-        let minDistance = Infinity;
-        for (var _iterator23 = pkgRef.requests, _isArray23 = Array.isArray(_iterator23), _i23 = 0, _iterator23 = _isArray23 ? _iterator23 : _iterator23[Symbol.iterator]();;) {
-          var _ref34;
-
-          if (_isArray23) {
-            if (_i23 >= _iterator23.length) break;
-            _ref34 = _iterator23[_i23++];
-          } else {
-            _i23 = _iterator23.next();
-            if (_i23.done) break;
-            _ref34 = _i23.value;
-          }
-
-          const req = _ref34;
-
-          const distance = refTree.length - req.parentNames.length;
-
-          if (distance >= 0 && distance < minDistance && req.parentNames.every((name, idx) => name === refTree[idx])) {
-            minDistance = distance;
-          }
-        }
-
-        return minDistance;
-      };
-
-      for (const peerDepName in peerDeps) {
-        const range = peerDeps[peerDepName];
-        const meta = peerDepsMeta && peerDepsMeta[peerDepName];
-
-        const isOptional = !!(meta && meta.optional);
-
-        const peerPkgs = this.resolver.getAllInfoForPackageName(peerDepName);
-
-        let peerError = 'unmetPeer';
-        let resolvedLevelDistance = Infinity;
-        let resolvedPeerPkg;
-        for (var _iterator24 = peerPkgs, _isArray24 = Array.isArray(_iterator24), _i24 = 0, _iterator24 = _isArray24 ? _iterator24 : _iterator24[Symbol.iterator]();;) {
-          var _ref35;
-
-          if (_isArray24) {
-            if (_i24 >= _iterator24.length) break;
-            _ref35 = _iterator24[_i24++];
-          } else {
-            _i24 = _iterator24.next();
-            if (_i24.done) break;
-            _ref35 = _i24.value;
-          }
-
-          const peerPkg = _ref35;
-
-          const peerPkgRef = peerPkg._reference;
-          if (!(peerPkgRef && peerPkgRef.patterns)) {
-            continue;
-          }
-          const levelDistance = getLevelDistance(peerPkgRef);
-          if (isFinite(levelDistance) && levelDistance < resolvedLevelDistance) {
-            if (this._satisfiesPeerDependency(range, peerPkgRef.version)) {
-              resolvedLevelDistance = levelDistance;
-              resolvedPeerPkg = peerPkgRef;
-            } else {
-              peerError = 'incorrectPeer';
-            }
-          }
-        }
-
-        if (resolvedPeerPkg) {
-          ref.addDependencies(resolvedPeerPkg.patterns);
-          this.reporter.verbose(this.reporter.lang('selectedPeer', `${pkg.name}@${pkg.version}`, `${peerDepName}@${resolvedPeerPkg.version}`, resolvedPeerPkg.level));
-        } else if (!isOptional) {
-          this.reporter.warn(this.reporter.lang(peerError, `${refTree.join(' > ')} > ${pkg.name}@${pkg.version}`, `${peerDepName}@${range}`));
-        }
-      }
-    }
-  }
-
-  _satisfiesPeerDependency(range, version) {
-    return range === '*' || (0, (_semver || _load_semver()).satisfiesWithPrereleases)(version, range, this.config.looseSemver);
-  }
-
-  _warnForMissingBundledDependencies(pkg) {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const ref = pkg._reference;
-      invariant(ref, 'missing package ref ' + pkg.name);
-
-      if (pkg.bundleDependencies) {
-        for (var _iterator25 = pkg.bundleDependencies, _isArray25 = Array.isArray(_iterator25), _i25 = 0, _iterator25 = _isArray25 ? _iterator25 : _iterator25[Symbol.iterator]();;) {
-          var _ref36;
-
-          if (_isArray25) {
-            if (_i25 >= _iterator25.length) break;
-            _ref36 = _iterator25[_i25++];
-          } else {
-            _i25 = _iterator25.next();
-            if (_i25.done) break;
-            _ref36 = _i25.value;
-          }
-
-          const depName = _ref36;
-
-          const locs = ref.locations.map(function (loc) {
-            return path.join(loc, _this4.config.getFolder(pkg), depName);
-          });
-          const locsExist = yield Promise.all(locs.map(function (loc) {
-            return (_fs || _load_fs()).exists(loc);
-          }));
-          if (locsExist.some(function (e) {
-            return !e;
-          })) {
-            //if any of the locs do not exist
-            const pkgHuman = `${pkg.name}@${pkg.version}`;
-            _this4.reporter.warn(_this4.reporter.lang('missingBundledDependency', pkgHuman, depName));
-          }
-        }
-      }
-    })();
-  }
-
-  _isUnplugged(pkg, ref) {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // If an unplugged folder exists for the specified package, we simply use it
-      if (yield (_fs || _load_fs()).exists(_this5.config.generatePackageUnpluggedPath(ref))) {
-        return true;
-      }
-
-      // If the package has a postinstall script, we also unplug it (otherwise they would run into the cache)
-      if (!_this5.config.ignoreScripts && pkg.scripts && (pkg.scripts.preinstall || pkg.scripts.install || pkg.scripts.postinstall)) {
-        return true;
-      }
-
-      // Check whether the user explicitly requested for the package to be unplugged
-      return _this5.unplugged.some(function (patternToUnplug) {
-        var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(patternToUnplug);
-
-        const name = _normalizePattern.name,
-              range = _normalizePattern.range,
-              hasVersion = _normalizePattern.hasVersion;
-
-        const satisfiesSemver = hasVersion ? semver.satisfies(ref.version, range) : true;
-        return name === ref.name && satisfiesSemver;
-      });
-    })();
-  }
-
-  init(patterns, workspaceLayout, { linkDuplicates, ignoreOptional } = {}) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this6.resolvePeerModules();
-      yield _this6.copyModules(patterns, workspaceLayout, { linkDuplicates, ignoreOptional });
-
-      if (!_this6.config.plugnplayEnabled) {
-        yield (_fs || _load_fs()).unlink(`${_this6.config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`);
-      }
-    })();
-  }
-}
-exports.default = PackageLinker;
-
-/***/ }),
-/* 212 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.clearLine = clearLine;
-exports.toStartOfLine = toStartOfLine;
-exports.writeOnNthLine = writeOnNthLine;
-exports.clearNthLine = clearNthLine;
-
-var _tty;
-
-function _load_tty() {
-  return _tty = _interopRequireDefault(__webpack_require__(104));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const readline = __webpack_require__(197);
-
-var _require = __webpack_require__(30);
-
-const supportsColor = _require.supportsColor;
-
-
-const CLEAR_WHOLE_LINE = 0;
-const CLEAR_RIGHT_OF_CURSOR = 1;
-
-function clearLine(stdout) {
-  if (!supportsColor) {
-    if (stdout instanceof (_tty || _load_tty()).default.WriteStream) {
-      if (stdout.columns > 0) {
-        stdout.write(`\r${' '.repeat(stdout.columns - 1)}`);
-      }
-      stdout.write(`\r`);
-    }
-    return;
-  }
-
-  readline.clearLine(stdout, CLEAR_WHOLE_LINE);
-  readline.cursorTo(stdout, 0);
-}
-
-function toStartOfLine(stdout) {
-  if (!supportsColor) {
-    stdout.write('\r');
-    return;
-  }
-
-  readline.cursorTo(stdout, 0);
-}
-
-function writeOnNthLine(stdout, n, msg) {
-  if (!supportsColor) {
-    return;
-  }
-
-  if (n == 0) {
-    readline.cursorTo(stdout, 0);
-    stdout.write(msg);
-    readline.clearLine(stdout, CLEAR_RIGHT_OF_CURSOR);
-    return;
-  }
-  readline.cursorTo(stdout, 0);
-  readline.moveCursor(stdout, 0, -n);
-  stdout.write(msg);
-  readline.clearLine(stdout, CLEAR_RIGHT_OF_CURSOR);
-  readline.cursorTo(stdout, 0);
-  readline.moveCursor(stdout, 0, n);
-}
-
-function clearNthLine(stdout, n) {
-  if (!supportsColor) {
-    return;
-  }
-
-  if (n == 0) {
-    clearLine(stdout);
-    return;
-  }
-  readline.cursorTo(stdout, 0);
-  readline.moveCursor(stdout, 0, -n);
-  readline.clearLine(stdout, CLEAR_WHOLE_LINE);
-  readline.moveCursor(stdout, 0, n);
-}
-
-/***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _baseReporter;
-
-function _load_baseReporter() {
-  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class JSONReporter extends (_baseReporter || _load_baseReporter()).default {
-  constructor(opts) {
-    super(opts);
-
-    this._activityId = 0;
-    this._progressId = 0;
-  }
-
-  _dump(type, data, error) {
-    let stdout = this.stdout;
-    if (error) {
-      stdout = this.stderr;
-    }
-    stdout.write(`${JSON.stringify({ type, data })}\n`);
-  }
-
-  _verbose(msg) {
-    this._dump('verbose', msg);
-  }
-
-  list(type, items, hints) {
-    this._dump('list', { type, items, hints });
-  }
-
-  tree(type, trees) {
-    this._dump('tree', { type, trees });
-  }
-
-  step(current, total, message) {
-    this._dump('step', { message, current, total });
-  }
-
-  inspect(value) {
-    this._dump('inspect', value);
-  }
-
-  footer(showPeakMemory) {
-    this._dump('finished', this.getTotalTime());
-  }
-
-  log(msg) {
-    this._dump('log', msg);
-  }
-
-  command(msg) {
-    this._dump('command', msg);
-  }
-
-  table(head, body) {
-    this._dump('table', { head, body });
-  }
-
-  success(msg) {
-    this._dump('success', msg);
-  }
-
-  error(msg) {
-    this._dump('error', msg, true);
-  }
-
-  warn(msg) {
-    this._dump('warning', msg, true);
-  }
-
-  info(msg) {
-    this._dump('info', msg);
-  }
-
-  activitySet(total, workers) {
-    if (!this.isTTY || this.noProgress) {
-      return super.activitySet(total, workers);
-    }
-
-    const id = this._activityId++;
-    this._dump('activitySetStart', { id, total, workers });
-
-    const spinners = [];
-    for (let i = 0; i < workers; i++) {
-      let current = 0;
-      let header = '';
-
-      spinners.push({
-        clear() {},
-        setPrefix(_current, _header) {
-          current = _current;
-          header = _header;
-        },
-        tick: msg => {
-          this._dump('activitySetTick', {
-            id,
-            header,
-            current,
-            worker: i,
-            message: msg
-          });
-        },
-        end() {}
-      });
-    }
-
-    return {
-      spinners,
-      end: () => {
-        this._dump('activitySetEnd', { id });
-      }
-    };
-  }
-
-  activity() {
-    return this._activity({});
-  }
-
-  _activity(data) {
-    if (!this.isTTY || this.noProgress) {
-      return {
-        tick() {},
-        end() {}
-      };
-    }
-
-    const id = this._activityId++;
-    this._dump('activityStart', (0, (_extends2 || _load_extends()).default)({ id }, data));
-
-    return {
-      tick: name => {
-        this._dump('activityTick', { id, name });
-      },
-
-      end: () => {
-        this._dump('activityEnd', { id });
-      }
-    };
-  }
-
-  progress(total) {
-    if (this.noProgress) {
-      return function () {
-        // noop
-      };
-    }
-
-    const id = this._progressId++;
-    let current = 0;
-    this._dump('progressStart', { id, total });
-
-    return () => {
-      current++;
-      this._dump('progressTick', { id, current });
-
-      if (current === total) {
-        this._dump('progressFinish', { id });
-      }
-    };
-  }
-
-  auditAction(recommendation) {
-    this._dump('auditAction', recommendation);
-  }
-
-  auditAdvisory(resolution, auditAdvisory) {
-    this._dump('auditAdvisory', { resolution, advisory: auditAdvisory });
-  }
-
-  auditSummary(auditMetadata) {
-    this._dump('auditSummary', auditMetadata);
-  }
-}
-exports.default = JSONReporter;
-
-/***/ }),
-/* 214 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.shouldUpdateLockfile = undefined;
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-var _minimatch;
-
-function _load_minimatch() {
-  return _minimatch = _interopRequireDefault(__webpack_require__(82));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-var _parsePackagePath;
-
-function _load_parsePackagePath() {
-  return _parsePackagePath = _interopRequireDefault(__webpack_require__(376));
-}
-
-var _parsePackagePath2;
-
-function _load_parsePackagePath2() {
-  return _parsePackagePath2 = __webpack_require__(376);
-}
-
-var _resolvers;
-
-function _load_resolvers() {
-  return _resolvers = __webpack_require__(78);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const DIRECTORY_SEPARATOR = '/';
-const GLOBAL_NESTED_DEP_PATTERN = '**/';
-
-class ResolutionMap {
-  constructor(config) {
-    this.resolutionsByPackage = (0, (_map || _load_map()).default)();
-    this.config = config;
-    this.reporter = config.reporter;
-    this.delayQueue = new Set();
-  }
-
-  init(resolutions = {}) {
-    for (const globPattern in resolutions) {
-      const info = this.parsePatternInfo(globPattern, resolutions[globPattern]);
-
-      if (info) {
-        const resolution = this.resolutionsByPackage[info.name] || [];
-        this.resolutionsByPackage[info.name] = [...resolution, info];
-      }
-    }
-  }
-
-  addToDelayQueue(req) {
-    this.delayQueue.add(req);
-  }
-
-  parsePatternInfo(globPattern, range) {
-    if (!(0, (_parsePackagePath2 || _load_parsePackagePath2()).isValidPackagePath)(globPattern)) {
-      this.reporter.warn(this.reporter.lang('invalidResolutionName', globPattern));
-      return null;
-    }
-
-    const directories = (0, (_parsePackagePath || _load_parsePackagePath()).default)(globPattern);
-    const name = directories.pop();
-
-    if (!(_semver || _load_semver()).default.validRange(range) && !(0, (_resolvers || _load_resolvers()).getExoticResolver)(range)) {
-      this.reporter.warn(this.reporter.lang('invalidResolutionVersion', range));
-      return null;
-    }
-
-    // For legacy support of resolutions, replace `name` with `**/name`
-    if (name === globPattern) {
-      globPattern = `${GLOBAL_NESTED_DEP_PATTERN}${name}`;
-    }
-
-    return {
-      name,
-      range,
-      globPattern,
-      pattern: `${name}@${range}`
-    };
-  }
-
-  find(reqPattern, parentNames) {
-    var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(reqPattern);
-
-    const name = _normalizePattern.name,
-          reqRange = _normalizePattern.range;
-
-    const resolutions = this.resolutionsByPackage[name];
-
-    if (!resolutions) {
-      return '';
-    }
-
-    const modulePath = [...parentNames, name].join(DIRECTORY_SEPARATOR);
-
-    var _ref = resolutions.find(({ globPattern }) => (0, (_minimatch || _load_minimatch()).default)(modulePath, globPattern)) || {};
-
-    const pattern = _ref.pattern,
-          range = _ref.range;
-
-
-    if (pattern) {
-      if ((_semver || _load_semver()).default.validRange(reqRange) && (_semver || _load_semver()).default.valid(range) && !(_semver || _load_semver()).default.satisfies(range, reqRange)) {
-        this.reporter.warn(this.reporter.lang('incompatibleResolutionVersion', pattern, reqPattern));
-      }
-    }
-
-    return pattern;
-  }
-}
-
-exports.default = ResolutionMap;
-const shouldUpdateLockfile = exports.shouldUpdateLockfile = (lockfileEntry, resolutionEntry) => {
-  if (!lockfileEntry || !resolutionEntry) {
-    return false;
-  }
-
-  return lockfileEntry.resolved !== resolutionEntry.remote.resolved;
-};
-
-/***/ }),
-/* 215 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FILE_PROTOCOL_PREFIX = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _uuid;
-
-function _load_uuid() {
-  return _uuid = _interopRequireDefault(__webpack_require__(119));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = _interopRequireWildcard(__webpack_require__(18));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const FILE_PROTOCOL_PREFIX = exports.FILE_PROTOCOL_PREFIX = 'file:';
-
-class FileResolver extends (_exoticResolver || _load_exoticResolver()).default {
-  constructor(request, fragment) {
-    super(request, fragment);
-    this.loc = (_misc || _load_misc()).removePrefix(fragment, FILE_PROTOCOL_PREFIX);
-  }
-
-  static isVersion(pattern) {
-    return super.isVersion.call(this, pattern) || this.prefixMatcher.test(pattern) || (_path || _load_path()).default.isAbsolute(pattern);
-  }
-
-  resolve() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let loc = _this.loc;
-      if (!(_path || _load_path()).default.isAbsolute(loc)) {
-        loc = (_path || _load_path()).default.resolve(_this.config.lockfileFolder, loc);
-      }
-
-      if (_this.config.linkFileDependencies) {
-        const registry = 'npm';
-        const manifest = { _uid: '', name: '', version: '0.0.0', _registry: registry };
-        manifest._remote = {
-          type: 'link',
-          registry,
-          hash: null,
-          reference: loc
-        };
-        manifest._uid = manifest.version;
-        return manifest;
-      }
-      if (!(yield (_fs || _load_fs()).exists(loc))) {
-        throw new (_errors || _load_errors()).MessageError(_this.reporter.lang('doesntExist', loc, _this.pattern.split('@')[0]));
-      }
-
-      const manifest = yield (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-        try {
-          return yield _this.config.readManifest(loc, _this.registry);
-        } catch (e) {
-          if (e.code === 'ENOENT') {
-            return {
-              // This is just the default, it can be overridden with key of dependencies
-              name: (_path || _load_path()).default.dirname(loc),
-              version: '0.0.0',
-              _uid: '0.0.0',
-              _registry: 'npm'
-            };
-          }
-
-          throw e;
-        }
-      })();
-      const registry = manifest._registry;
-      (0, (_invariant || _load_invariant()).default)(registry, 'expected registry');
-
-      manifest._remote = {
-        type: 'copy',
-        registry,
-        hash: `${(_uuid || _load_uuid()).default.v4()}-${new Date().getTime()}`,
-        reference: loc
-      };
-
-      manifest._uid = manifest.version;
-
-      return manifest;
-    })();
-  }
-}
-exports.default = FileResolver;
-FileResolver.protocol = 'file';
-FileResolver.prefixMatcher = /^\.{1,2}\//;
-
-/***/ }),
-/* 216 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.explodeGistFragment = explodeGistFragment;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _gitResolver;
-
-function _load_gitResolver() {
-  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = _interopRequireWildcard(__webpack_require__(18));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function explodeGistFragment(fragment, reporter) {
-  fragment = (_misc || _load_misc()).removePrefix(fragment, 'gist:');
-
-  const parts = fragment.split('#');
-
-  if (parts.length <= 2) {
-    return {
-      id: parts[0],
-      hash: parts[1] || ''
-    };
-  } else {
-    throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidGistFragment', fragment));
-  }
-}
-
-class GistResolver extends (_exoticResolver || _load_exoticResolver()).default {
-
-  constructor(request, fragment) {
-    super(request, fragment);
-
-    var _explodeGistFragment = explodeGistFragment(fragment, this.reporter);
-
-    const id = _explodeGistFragment.id,
-          hash = _explodeGistFragment.hash;
-
-    this.id = id;
-    this.hash = hash;
-  }
-
-  resolve() {
-    return this.fork((_gitResolver || _load_gitResolver()).default, false, `https://gist.github.com/${this.id}.git#${this.hash}`);
-  }
-}
-exports.default = GistResolver;
-GistResolver.protocol = 'gist';
-
-/***/ }),
-/* 217 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _cache;
-
-function _load_cache() {
-  return _cache = __webpack_require__(355);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _registryResolver;
-
-function _load_registryResolver() {
-  return _registryResolver = _interopRequireDefault(__webpack_require__(575));
-}
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _packageNameUtils;
-
-function _load_packageNameUtils() {
-  return _packageNameUtils = __webpack_require__(222);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const inquirer = __webpack_require__(276);
-const tty = __webpack_require__(104);
-const path = __webpack_require__(0);
-const semver = __webpack_require__(21);
-const ssri = __webpack_require__(77);
-
-const NPM_REGISTRY_ID = 'npm';
-
-class NpmResolver extends (_registryResolver || _load_registryResolver()).default {
-
-  static findVersionInRegistryResponse(config, name, range, body, request) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (body.versions && Object.keys(body.versions).length === 0) {
-        throw new (_errors || _load_errors()).MessageError(config.reporter.lang('registryNoVersions', body.name));
-      }
-
-      if (!body['dist-tags'] || !body.versions) {
-        throw new (_errors || _load_errors()).MessageError(config.reporter.lang('malformedRegistryResponse', name));
-      }
-
-      if (range in body['dist-tags']) {
-        range = body['dist-tags'][range];
-      }
-
-      // If the latest tag in the registry satisfies the requested range, then use that.
-      // Otherwise we will fall back to semver maxSatisfying.
-      // This mimics logic in NPM. See issue #3560
-      const latestVersion = body['dist-tags'] ? body['dist-tags'].latest : undefined;
-      if (latestVersion && semver.satisfies(latestVersion, range)) {
-        return body.versions[latestVersion];
-      }
-
-      const satisfied = yield config.resolveConstraints(Object.keys(body.versions), range);
-      if (satisfied) {
-        return body.versions[satisfied];
-      } else if (request && !config.nonInteractive) {
-        if (request.resolver && request.resolver.activity) {
-          request.resolver.activity.end();
-        }
-        config.reporter.log(config.reporter.lang('couldntFindVersionThatMatchesRange', body.name, range));
-        let pageSize;
-        if (process.stdout instanceof tty.WriteStream) {
-          pageSize = process.stdout.rows - 2;
-        }
-        const response = yield inquirer.prompt([{
-          name: 'package',
-          type: 'list',
-          message: config.reporter.lang('chooseVersionFromList', body.name),
-          choices: semver.rsort(Object.keys(body.versions)),
-          pageSize
-        }]);
-        if (response && response.package) {
-          return body.versions[response.package];
-        }
-      }
-      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('couldntFindVersionThatMatchesRange', body.name, range));
-    })();
-  }
-
-  resolveRequest(desiredVersion) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (_this.config.offline) {
-        const res = yield _this.resolveRequestOffline();
-        if (res != null) {
-          return res;
-        }
-      }
-
-      const escapedName = (_npmRegistry || _load_npmRegistry()).default.escapeName(_this.name);
-      const desiredRange = desiredVersion || _this.range;
-      const body = yield _this.config.registries.npm.request(escapedName);
-
-      if (body) {
-        return NpmResolver.findVersionInRegistryResponse(_this.config, escapedName, desiredRange, body, _this.request);
-      } else {
-        return null;
-      }
-    })();
-  }
-
-  resolveRequestOffline() {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const packageDirs = yield _this2.config.getCache('cachedPackages', function () {
-        return (0, (_cache || _load_cache()).getCachedPackagesDirs)(_this2.config, _this2.config.cacheFolder);
-      });
-
-      const versions = (0, (_map || _load_map()).default)();
-
-      for (var _iterator = packageDirs, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const dir = _ref;
-
-        // check if folder contains the registry prefix
-        if (dir.indexOf(`${NPM_REGISTRY_ID}-`) === -1) {
-          continue;
-        }
-
-        // read manifest and validate correct name
-        const pkg = yield _this2.config.readManifest(dir, NPM_REGISTRY_ID);
-        if (pkg.name !== _this2.name) {
-          continue;
-        }
-
-        // read package metadata
-        const metadata = yield _this2.config.readPackageMetadata(dir);
-        if (!metadata.remote) {
-          continue; // old yarn metadata
-        }
-
-        versions[pkg.version] = Object.assign({}, pkg, {
-          _remote: metadata.remote
-        });
-      }
-
-      const satisfied = yield _this2.config.resolveConstraints(Object.keys(versions), _this2.range);
-      if (satisfied) {
-        return versions[satisfied];
-      } else if (!_this2.config.preferOffline) {
-        throw new (_errors || _load_errors()).MessageError(_this2.reporter.lang('couldntFindPackageInCache', _this2.name, _this2.range, Object.keys(versions).join(', ')));
-      } else {
-        return null;
-      }
-    })();
-  }
-
-  cleanRegistry(url) {
-    if (this.config.getOption('registry') === (_constants || _load_constants()).YARN_REGISTRY) {
-      return url.replace((_constants || _load_constants()).NPM_REGISTRY_RE, (_constants || _load_constants()).YARN_REGISTRY);
-    } else {
-      return url;
-    }
-  }
-
-  resolve() {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // lockfile
-      const shrunk = _this3.request.getLocked('tarball');
-      if (shrunk) {
-        if (_this3.config.packBuiltPackages && shrunk.prebuiltVariants && shrunk._remote) {
-          const prebuiltVariants = shrunk.prebuiltVariants;
-          const prebuiltName = (0, (_packageNameUtils || _load_packageNameUtils()).getPlatformSpecificPackageFilename)(shrunk);
-          const offlineMirrorPath = _this3.config.getOfflineMirrorPath();
-          if (prebuiltVariants[prebuiltName] && offlineMirrorPath) {
-            const filename = path.join(offlineMirrorPath, 'prebuilt', prebuiltName + '.tgz');
-            const _remote = shrunk._remote;
-
-            if (_remote && (yield (_fs || _load_fs()).exists(filename))) {
-              _remote.reference = `file:${filename}`;
-              _remote.hash = prebuiltVariants[prebuiltName];
-              _remote.integrity = ssri.fromHex(_remote.hash, 'sha1').toString();
-            }
-          }
-        }
-      }
-      if (shrunk && shrunk._remote && (shrunk._remote.integrity || _this3.config.offline || !_this3.config.autoAddIntegrity)) {
-        // if the integrity field does not exist, we're not network-restricted, and the
-        // migration hasn't been disabled, it needs to be created
-        return shrunk;
-      }
-
-      const desiredVersion = shrunk && shrunk.version ? shrunk.version : null;
-      const info = yield _this3.resolveRequest(desiredVersion);
-      if (info == null) {
-        throw new (_errors || _load_errors()).MessageError(_this3.reporter.lang('packageNotFoundRegistry', _this3.name, NPM_REGISTRY_ID));
-      }
-
-      const deprecated = info.deprecated,
-            dist = info.dist;
-
-      if (shrunk && shrunk._remote) {
-        shrunk._remote.integrity = dist && dist.integrity ? ssri.parse(dist.integrity) : ssri.fromHex(dist && dist.shasum ? dist.shasum : '', 'sha1');
-        return shrunk;
-      }
-
-      if (typeof deprecated === 'string') {
-        let human = `${info.name}@${info.version}`;
-        const parentNames = _this3.request.parentNames;
-        if (parentNames.length) {
-          human = parentNames.concat(human).join(' > ');
-        }
-        _this3.reporter.warn(`${human}: ${deprecated}`);
-      }
-
-      if (dist != null && dist.tarball) {
-        info._remote = {
-          resolved: `${_this3.cleanRegistry(dist.tarball)}#${dist.shasum}`,
-          type: 'tarball',
-          reference: _this3.cleanRegistry(dist.tarball),
-          hash: dist.shasum,
-          integrity: dist.integrity ? ssri.parse(dist.integrity) : ssri.fromHex(dist.shasum, 'sha1'),
-          registry: NPM_REGISTRY_ID,
-          packageName: info.name
-        };
-      }
-
-      info._uid = info.version;
-
-      return info;
-    })();
-  }
-}
-exports.default = NpmResolver;
-NpmResolver.registry = NPM_REGISTRY_ID;
-
-/***/ }),
-/* 218 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-// We want to preserve file timestamps when copying a file, since yarn uses them to decide if a file has
-// changed compared to the cache.
-// There are some OS specific cases here:
-// * On linux, fs.copyFile does not preserve timestamps, but does on OSX and Win.
-// * On windows, you must open a file with write permissions to call `fs.futimes`.
-// * On OSX you can open with read permissions and still call `fs.futimes`.
-let fixTimes = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (fd, dest, data) {
-    const doOpen = fd === undefined;
-    let openfd = fd ? fd : -1;
-
-    if (disableTimestampCorrection === undefined) {
-      // if timestamps match already, no correction is needed.
-      // the need to correct timestamps varies based on OS and node versions.
-      const destStat = yield lstat(dest);
-      disableTimestampCorrection = fileDatesEqual(destStat.mtime, data.mtime);
-    }
-
-    if (disableTimestampCorrection) {
-      return;
-    }
-
-    if (doOpen) {
-      try {
-        openfd = yield open(dest, 'a', data.mode);
-      } catch (er) {
-        // file is likely read-only
-        try {
-          openfd = yield open(dest, 'r', data.mode);
-        } catch (err) {
-          // We can't even open this file for reading.
-          return;
-        }
-      }
-    }
-
-    try {
-      if (openfd) {
-        yield futimes(openfd, data.atime, data.mtime);
-      }
-    } catch (er) {
-      // If `futimes` throws an exception, we probably have a case of a read-only file on Windows.
-      // In this case we can just return. The incorrect timestamp will just cause that file to be recopied
-      // on subsequent installs, which will effect yarn performance but not break anything.
-    } finally {
-      if (doOpen && openfd) {
-        yield close(openfd);
-      }
-    }
-  });
-
-  return function fixTimes(_x7, _x8, _x9) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-// Compare file timestamps.
-// Some versions of Node on windows zero the milliseconds when utime is used.
-
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
-}
-
-var _promise;
-
-function _load_promise() {
-  return _promise = __webpack_require__(50);
-}
-
-var _fs2;
-
-function _load_fs2() {
-  return _fs2 = __webpack_require__(4);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
-
-// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
-
-const readFileBuffer = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.readFile);
-const close = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.close);
-const lstat = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.lstat);
-const open = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.open);
-const futimes = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.futimes);
-
-const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
-
-const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(307));
-
-/**
- * Unlinks the destination to force a recreation. This is needed on case-insensitive file systems
- * to force the correct naming when the filename has changed only in character-casing. (Jest -> jest).
- */
-const copyFile = exports.copyFile = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data, cleanup) {
-    // $FlowFixMe: Flow doesn't currently support COPYFILE_FICLONE
-    const ficloneFlag = (_fs2 || _load_fs2()).constants.COPYFILE_FICLONE || 0;
-    try {
-      yield unlink(data.dest);
-      yield copyFilePoly(data.src, data.dest, ficloneFlag, data);
-    } finally {
-      if (cleanup) {
-        cleanup();
-      }
-    }
-  });
-
-  return function copyFile(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-// Node 8.5.0 introduced `fs.copyFile` which is much faster, so use that when available.
-// Otherwise we fall back to reading and writing files as buffers.
-const copyFilePoly = (src, dest, flags, data) => {
-  if ((_fs || _load_fs()).default.copyFile) {
-    return new Promise((resolve, reject) => (_fs || _load_fs()).default.copyFile(src, dest, flags, err => {
-      if (err) {
-        reject(err);
-      } else {
-        fixTimes(undefined, dest, data).then(() => resolve()).catch(ex => reject(ex));
-      }
-    }));
-  } else {
-    return copyWithBuffer(src, dest, flags, data);
-  }
-};
-
-const copyWithBuffer = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest, flags, data) {
-    // Use open -> write -> futimes -> close sequence to avoid opening the file twice:
-    // one with writeFile and one with utimes
-    const fd = yield open(dest, 'w', data.mode);
-    try {
-      const buffer = yield readFileBuffer(src);
-      yield write(fd, buffer, 0, buffer.length);
-      yield fixTimes(fd, dest, data);
-    } finally {
-      yield close(fd);
-    }
-  });
-
-  return function copyWithBuffer(_x3, _x4, _x5, _x6) {
-    return _ref2.apply(this, arguments);
-  };
-})();const fileDatesEqual = exports.fileDatesEqual = (a, b) => {
-  const aTime = a.getTime();
-  const bTime = b.getTime();
-
-  if (process.platform !== 'win32') {
-    return aTime === bTime;
-  }
-
-  // See https://github.com/nodejs/node/pull/12607
-  // Submillisecond times from stat and utimes are truncated on Windows,
-  // causing a file with mtime 8.0079998 and 8.0081144 to become 8.007 and 8.008
-  // and making it impossible to update these files to their correct timestamps.
-  if (Math.abs(aTime - bTime) <= 1) {
-    return true;
-  }
-
-  const aTimeSec = Math.floor(aTime / 1000);
-  const bTimeSec = Math.floor(bTime / 1000);
-
-  // See https://github.com/nodejs/node/issues/2069
-  // Some versions of Node on windows zero the milliseconds when utime is used
-  // So if any of the time has a milliseconds part of zero we suspect that the
-  // bug is present and compare only seconds.
-  if (aTime - aTimeSec * 1000 === 0 || bTime - bTimeSec * 1000 === 0) {
-    return aTimeSec === bTimeSec;
-  }
-
-  return aTime === bTime;
-};
-
-/***/ }),
-/* 219 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _string_decoder;
-
-function _load_string_decoder() {
-  return _string_decoder = __webpack_require__(333);
-}
-
-var _tarFs;
-
-function _load_tarFs() {
-  return _tarFs = _interopRequireDefault(__webpack_require__(193));
-}
-
-var _tarStream;
-
-function _load_tarStream() {
-  return _tarStream = _interopRequireDefault(__webpack_require__(460));
-}
-
-var _url;
-
-function _load_url() {
-  return _url = _interopRequireDefault(__webpack_require__(24));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = __webpack_require__(5);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _gitSpawn;
-
-function _load_gitSpawn() {
-  return _gitSpawn = __webpack_require__(373);
-}
-
-var _gitRefResolver;
-
-function _load_gitRefResolver() {
-  return _gitRefResolver = __webpack_require__(581);
-}
-
-var _crypto;
-
-function _load_crypto() {
-  return _crypto = _interopRequireWildcard(__webpack_require__(168));
-}
-
-var _fs2;
-
-function _load_fs2() {
-  return _fs2 = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const GIT_PROTOCOL_PREFIX = 'git+';
-
-const SSH_PROTOCOL = 'ssh:';
-const SCP_PATH_PREFIX = '/:';
-const FILE_PROTOCOL = 'file:';
-const GIT_VALID_REF_LINE_REGEXP = /^([a-fA-F0-9]+|ref)/;
-
-const validRef = line => {
-  return GIT_VALID_REF_LINE_REGEXP.exec(line);
-};
-
-const supportsArchiveCache = (0, (_map || _load_map()).default)({
-  'github.com': false // not support, doubt they will ever support it
-});
-
-const handleSpawnError = err => {
-  if (err instanceof (_errors || _load_errors()).ProcessSpawnError) {
-    throw err;
-  }
-};
-
-const SHORTHAND_SERVICES = (0, (_map || _load_map()).default)({
-  'github:': parsedUrl => (0, (_extends2 || _load_extends()).default)({}, parsedUrl, {
-    slashes: true,
-    auth: 'git',
-    protocol: SSH_PROTOCOL,
-    host: 'github.com',
-    hostname: 'github.com',
-    pathname: `/${parsedUrl.hostname}${parsedUrl.pathname}`
-  }),
-  'bitbucket:': parsedUrl => (0, (_extends2 || _load_extends()).default)({}, parsedUrl, {
-    slashes: true,
-    auth: 'git',
-    protocol: SSH_PROTOCOL,
-    host: 'bitbucket.com',
-    hostname: 'bitbucket.com',
-    pathname: `/${parsedUrl.hostname}${parsedUrl.pathname}`
-  })
-});
-
-class Git {
-  constructor(config, gitUrl, hash) {
-    this.supportsArchive = false;
-    this.fetched = false;
-    this.config = config;
-    this.reporter = config.reporter;
-    this.hash = hash;
-    this.ref = hash;
-    this.gitUrl = gitUrl;
-    this.cwd = this.config.getTemp((_crypto || _load_crypto()).hash(this.gitUrl.repository));
-  }
-
-  /**
-   * npm URLs contain a 'git+' scheme prefix, which is not understood by git.
-   * git "URLs" also allow an alternative scp-like syntax, so they're not standard URLs.
-   */
-  static npmUrlToGitUrl(npmUrl) {
-    npmUrl = (0, (_misc || _load_misc()).removePrefix)(npmUrl, GIT_PROTOCOL_PREFIX);
-
-    let parsed = (_url || _load_url()).default.parse(npmUrl);
-    const expander = parsed.protocol && SHORTHAND_SERVICES[parsed.protocol];
-
-    if (expander) {
-      parsed = expander(parsed);
-    }
-
-    // Special case in npm, where ssh:// prefix is stripped to pass scp-like syntax
-    // which in git works as remote path only if there are no slashes before ':'.
-    // See #3146.
-    if (parsed.protocol === SSH_PROTOCOL && parsed.hostname && parsed.path && parsed.path.startsWith(SCP_PATH_PREFIX) && parsed.port === null) {
-      const auth = parsed.auth ? parsed.auth + '@' : '';
-      const pathname = parsed.path.slice(SCP_PATH_PREFIX.length);
-      return {
-        hostname: parsed.hostname,
-        protocol: parsed.protocol,
-        repository: `${auth}${parsed.hostname}:${pathname}`
-      };
-    }
-
-    // git local repos are specified as `git+file:` and a filesystem path, not a url.
-    let repository;
-    if (parsed.protocol === FILE_PROTOCOL) {
-      repository = parsed.path;
-    } else {
-      repository = (_url || _load_url()).default.format((0, (_extends2 || _load_extends()).default)({}, parsed, { hash: '' }));
-    }
-
-    return {
-      hostname: parsed.hostname || null,
-      protocol: parsed.protocol || FILE_PROTOCOL,
-      repository: repository || ''
-    };
-  }
-
-  /**
-   * Check if the host specified in the input `gitUrl` has archive capability.
-   */
-
-  static hasArchiveCapability(ref) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const hostname = ref.hostname;
-      if (ref.protocol !== 'ssh:' || hostname == null) {
-        return false;
-      }
-
-      if (hostname in supportsArchiveCache) {
-        return supportsArchiveCache[hostname];
-      }
-
-      try {
-        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${ref.repository}`, 'HEAD', Date.now() + '']);
-        throw new Error();
-      } catch (err) {
-        handleSpawnError(err);
-        const supports = err.message.indexOf('did not match any files') >= 0;
-        return supportsArchiveCache[hostname] = supports;
-      }
-    })();
-  }
-
-  /**
-   * Check if the input `target` is a 5-40 character hex commit hash.
-   */
-
-  static repoExists(ref) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const isLocal = ref.protocol === FILE_PROTOCOL;
-
-      try {
-        if (isLocal) {
-          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show-ref', '-t'], { cwd: ref.repository });
-        } else {
-          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', '-t', ref.repository]);
-        }
-        return true;
-      } catch (err) {
-        handleSpawnError(err);
-        return false;
-      }
-    })();
-  }
-
-  static replaceProtocol(ref, protocol) {
-    return {
-      hostname: ref.hostname,
-      protocol,
-      repository: ref.repository.replace(/^(?:git|http):/, protocol)
-    };
-  }
-
-  /**
-   * Attempt to upgrade insecure protocols to secure protocol
-   */
-  static secureGitUrl(ref, hash, reporter) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if ((0, (_gitRefResolver || _load_gitRefResolver()).isCommitSha)(hash)) {
-        // this is cryptographically secure
-        return ref;
-      }
-
-      if (ref.protocol === 'git:') {
-        const secureUrl = Git.replaceProtocol(ref, 'https:');
-        if (yield Git.repoExists(secureUrl)) {
-          return secureUrl;
-        } else {
-          reporter.warn(reporter.lang('downloadGitWithoutCommit', ref.repository));
-          return ref;
-        }
-      }
-
-      if (ref.protocol === 'http:') {
-        const secureRef = Git.replaceProtocol(ref, 'https:');
-        if (yield Git.repoExists(secureRef)) {
-          return secureRef;
-        } else {
-          reporter.warn(reporter.lang('downloadHTTPWithoutCommit', ref.repository));
-          return ref;
-        }
-      }
-
-      return ref;
-    })();
-  }
-
-  /**
-   * Archive a repo to destination
-   */
-
-  archive(dest) {
-    if (this.supportsArchive) {
-      return this._archiveViaRemoteArchive(dest);
-    } else {
-      return this._archiveViaLocalFetched(dest);
-    }
-  }
-
-  _archiveViaRemoteArchive(dest) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const hashStream = new (_crypto || _load_crypto()).HashStream();
-      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${_this.gitUrl.repository}`, _this.ref], {
-        process(proc, resolve, reject, done) {
-          const writeStream = (0, (_fs || _load_fs()).createWriteStream)(dest);
-          proc.on('error', reject);
-          writeStream.on('error', reject);
-          writeStream.on('end', done);
-          writeStream.on('open', function () {
-            proc.stdout.pipe(hashStream).pipe(writeStream);
-          });
-          writeStream.once('finish', done);
-        }
-      });
-      return hashStream.getHash();
-    })();
-  }
-
-  _archiveViaLocalFetched(dest) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const hashStream = new (_crypto || _load_crypto()).HashStream();
-      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', _this2.hash], {
-        cwd: _this2.cwd,
-        process(proc, resolve, reject, done) {
-          const writeStream = (0, (_fs || _load_fs()).createWriteStream)(dest);
-          proc.on('error', reject);
-          writeStream.on('error', reject);
-          writeStream.on('open', function () {
-            proc.stdout.pipe(hashStream).pipe(writeStream);
-          });
-          writeStream.once('finish', done);
-        }
-      });
-      return hashStream.getHash();
-    })();
-  }
-
-  /**
-   * Clone a repo to the input `dest`. Use `git archive` if it's available, otherwise fall
-   * back to `git clone`.
-   */
-
-  clone(dest) {
-    if (this.supportsArchive) {
-      return this._cloneViaRemoteArchive(dest);
-    } else {
-      return this._cloneViaLocalFetched(dest);
-    }
-  }
-
-  _cloneViaRemoteArchive(dest) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${_this3.gitUrl.repository}`, _this3.ref], {
-        process(proc, update, reject, done) {
-          const extractor = (_tarFs || _load_tarFs()).default.extract(dest, {
-            dmode: 0o555, // all dirs should be readable
-            fmode: 0o444 // all files should be readable
-          });
-          extractor.on('error', reject);
-          extractor.on('finish', done);
-
-          proc.stdout.pipe(extractor);
-          proc.on('error', reject);
-        }
-      });
-    })();
-  }
-
-  _cloneViaLocalFetched(dest) {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', _this4.hash], {
-        cwd: _this4.cwd,
-        process(proc, resolve, reject, done) {
-          const extractor = (_tarFs || _load_tarFs()).default.extract(dest, {
-            dmode: 0o555, // all dirs should be readable
-            fmode: 0o444 // all files should be readable
-          });
-
-          extractor.on('error', reject);
-          extractor.on('finish', done);
-
-          proc.stdout.pipe(extractor);
-        }
-      });
-    })();
-  }
-
-  /**
-   * Clone this repo.
-   */
-
-  fetch() {
-    var _this5 = this;
-
-    const gitUrl = this.gitUrl,
-          cwd = this.cwd;
-
-
-    return (_fs2 || _load_fs2()).lockQueue.push(gitUrl.repository, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (yield (_fs2 || _load_fs2()).exists(cwd)) {
-        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['fetch', '--tags'], { cwd });
-        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['pull'], { cwd });
-      } else {
-        yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['clone', gitUrl.repository, cwd]);
-      }
-
-      _this5.fetched = true;
-    }));
-  }
-
-  /**
-   * Fetch the file by cloning the repo and reading it.
-   */
-
-  getFile(filename) {
-    if (this.supportsArchive) {
-      return this._getFileFromArchive(filename);
-    } else {
-      return this._getFileFromClone(filename);
-    }
-  }
-
-  _getFileFromArchive(filename) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      try {
-        return yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['archive', `--remote=${_this6.gitUrl.repository}`, _this6.ref, filename], {
-          process(proc, update, reject, done) {
-            const parser = (_tarStream || _load_tarStream()).default.extract();
-
-            parser.on('error', reject);
-            parser.on('finish', done);
-
-            parser.on('entry', (header, stream, next) => {
-              const decoder = new (_string_decoder || _load_string_decoder()).StringDecoder('utf8');
-              let fileContent = '';
-
-              stream.on('data', buffer => {
-                fileContent += decoder.write(buffer);
-              });
-              stream.on('end', () => {
-                const remaining = decoder.end();
-                update(fileContent + remaining);
-                next();
-              });
-              stream.resume();
-            });
-
-            proc.stdout.pipe(parser);
-          }
-        });
-      } catch (err) {
-        if (err.message.indexOf('did not match any files') >= 0) {
-          return false;
-        } else {
-          throw err;
-        }
-      }
-    })();
-  }
-
-  _getFileFromClone(filename) {
-    var _this7 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      (0, (_invariant || _load_invariant()).default)(_this7.fetched, 'Repo not fetched');
-
-      try {
-        return yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show', `${_this7.hash}:${filename}`], {
-          cwd: _this7.cwd
-        });
-      } catch (err) {
-        handleSpawnError(err);
-        // file doesn't exist
-        return false;
-      }
-    })();
-  }
-
-  /**
-   * Initialize the repo, find a secure url to use and
-   * set the ref to match an input `target`.
-   */
-  init() {
-    var _this8 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this8.gitUrl = yield Git.secureGitUrl(_this8.gitUrl, _this8.hash, _this8.reporter);
-
-      yield _this8.setRefRemote();
-
-      // check capabilities
-      if (_this8.ref !== '' && (yield Git.hasArchiveCapability(_this8.gitUrl))) {
-        _this8.supportsArchive = true;
-      } else {
-        yield _this8.fetch();
-      }
-
-      return _this8.hash;
-    })();
-  }
-
-  setRefRemote() {
-    var _this9 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const isLocal = _this9.gitUrl.protocol === FILE_PROTOCOL;
-      let stdout;
-
-      if (isLocal) {
-        stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show-ref', '--tags', '--heads'], { cwd: _this9.gitUrl.repository });
-      } else {
-        stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', '--tags', '--heads', _this9.gitUrl.repository]);
-      }
-
-      const refs = (0, (_gitRefResolver || _load_gitRefResolver()).parseRefs)(stdout);
-      return _this9.setRef(refs);
-    })();
-  }
-
-  setRefHosted(hostedRefsList) {
-    const refs = (0, (_gitRefResolver || _load_gitRefResolver()).parseRefs)(hostedRefsList);
-    return this.setRef(refs);
-  }
-
-  /**
-   * Resolves the default branch of a remote repository (not always "master")
-   */
-
-  resolveDefaultBranch() {
-    var _this10 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const isLocal = _this10.gitUrl.protocol === FILE_PROTOCOL;
-
-      try {
-        let stdout;
-        if (isLocal) {
-          stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['show-ref', 'HEAD'], { cwd: _this10.gitUrl.repository });
-          const refs = (0, (_gitRefResolver || _load_gitRefResolver()).parseRefs)(stdout);
-          const sha = refs.values().next().value;
-          if (sha) {
-            return { sha, ref: undefined };
-          } else {
-            throw new Error('Unable to find SHA for git HEAD');
-          }
-        } else {
-          stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', '--symref', _this10.gitUrl.repository, 'HEAD']);
-          const lines = stdout.split('\n').filter(validRef);
-
-          var _lines$0$split = lines[0].split(/\s+/);
-
-          const ref = _lines$0$split[1];
-
-          var _lines$1$split = lines[1].split(/\s+/);
-
-          const sha = _lines$1$split[0];
-
-          return { sha, ref };
-        }
-      } catch (err) {
-        handleSpawnError(err);
-        // older versions of git don't support "--symref"
-        const stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['ls-remote', _this10.gitUrl.repository, 'HEAD']);
-        const lines = stdout.split('\n').filter(validRef);
-
-        var _lines$0$split2 = lines[0].split(/\s+/);
-
-        const sha = _lines$0$split2[0];
-
-        return { sha, ref: undefined };
-      }
-    })();
-  }
-
-  /**
-   * Resolve a git commit to it's 40-chars format and ensure it exists in the repository
-   * We need to use the 40-chars format to avoid multiple folders in the cache
-   */
-
-  resolveCommit(shaToResolve) {
-    var _this11 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      try {
-        yield _this11.fetch();
-        const revListArgs = ['rev-list', '-n', '1', '--no-abbrev-commit', '--format=oneline', shaToResolve];
-        const stdout = yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(revListArgs, { cwd: _this11.cwd });
-
-        var _stdout$split = stdout.split(/\s+/);
-
-        const sha = _stdout$split[0];
-
-        return { sha, ref: undefined };
-      } catch (err) {
-        handleSpawnError(err);
-        // assuming commit not found, let's try something else
-        return null;
-      }
-    })();
-  }
-
-  /**
-   * Resolves the input hash / ref / semver range to a valid commit sha
-   * If possible also resolves the sha to a valid ref in order to use "git archive"
-   */
-
-  setRef(refs) {
-    var _this12 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // get commit ref
-      const version = _this12.hash;
-
-
-      const resolvedResult = yield (0, (_gitRefResolver || _load_gitRefResolver()).resolveVersion)({
-        config: _this12.config,
-        git: _this12,
-        version,
-        refs
-      });
-      if (!resolvedResult) {
-        throw new (_errors || _load_errors()).MessageError(_this12.reporter.lang('couldntFindMatch', version, Array.from(refs.keys()).join(','), _this12.gitUrl.repository));
-      }
-
-      _this12.hash = resolvedResult.sha;
-      _this12.ref = resolvedResult.ref || '';
-      return _this12.hash;
-    })();
-  }
-}
-exports.default = Git;
-
-/***/ }),
-/* 220 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _resolveRelative;
-
-function _load_resolveRelative() {
-  return _resolveRelative = _interopRequireDefault(__webpack_require__(586));
-}
-
-var _validate;
-
-function _load_validate() {
-  return _validate = _interopRequireDefault(__webpack_require__(125));
-}
-
-var _fix;
-
-function _load_fix() {
-  return _fix = _interopRequireDefault(__webpack_require__(583));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-exports.default = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (info, moduleLoc, config, isRoot) {
-    // create human readable name
-    const name = info.name,
-          version = info.version;
-
-    let human;
-    if (typeof name === 'string') {
-      human = name;
-    }
-    if (human && typeof version === 'string' && version) {
-      human += `@${version}`;
-    }
-    if (isRoot && info._loc) {
-      human = path.relative(config.cwd, info._loc);
-    }
-
-    function warn(msg) {
-      if (human) {
-        msg = `${human}: ${msg}`;
-      }
-      config.reporter.warn(msg);
-    }
-
-    yield (0, (_fix || _load_fix()).default)(info, moduleLoc, config.reporter, warn, config.looseSemver);
-    (0, (_resolveRelative || _load_resolveRelative()).default)(info, moduleLoc, config.lockfileFolder);
-
-    if (config.cwd === config.globalFolder) {
-      return info;
-    }
-
-    try {
-      (0, (_validate || _load_validate()).default)(info, isRoot, config.reporter, warn);
-    } catch (err) {
-      if (human) {
-        err.message = `${human}: ${err.message}`;
-      }
-      throw err;
-    }
-
-    return info;
-  });
-
-  return function (_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-/***/ }),
-/* 221 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isValidLicense = isValidLicense;
-exports.stringifyPerson = stringifyPerson;
-exports.parsePerson = parsePerson;
-exports.normalizePerson = normalizePerson;
-exports.extractDescription = extractDescription;
-exports.extractRepositoryUrl = extractRepositoryUrl;
-
-
-const validateLicense = __webpack_require__(959);
-
-function isValidLicense(license) {
-  return !!license && validateLicense(license).validForNewPackages;
-}
-
-function stringifyPerson(person) {
-  if (!person || typeof person !== 'object') {
-    return person;
-  }
-
-  const parts = [];
-  if (person.name) {
-    parts.push(person.name);
-  }
-
-  const email = person.email || person.mail;
-  if (typeof email === 'string') {
-    parts.push(`<${email}>`);
-  }
-
-  const url = person.url || person.web;
-  if (typeof url === 'string') {
-    parts.push(`(${url})`);
-  }
-
-  return parts.join(' ');
-}
-
-function parsePerson(person) {
-  if (typeof person !== 'string') {
-    return person;
-  }
-
-  // format: name (url) <email>
-  const obj = {};
-
-  let name = person.match(/^([^\(<]+)/);
-  if (name) {
-    name = name[0].trim();
-    if (name) {
-      obj.name = name;
-    }
-  }
-
-  const email = person.match(/<([^>]+)>/);
-  if (email) {
-    obj.email = email[1];
-  }
-
-  const url = person.match(/\(([^\)]+)\)/);
-  if (url) {
-    obj.url = url[1];
-  }
-
-  return obj;
-}
-
-function normalizePerson(person) {
-  return parsePerson(stringifyPerson(person));
-}
-
-function extractDescription(readme) {
-  if (typeof readme !== 'string' || readme === '') {
-    return undefined;
-  }
-
-  // split into lines
-  const lines = readme.trim().split('\n').map(line => line.trim());
-
-  // find the start of the first paragraph, ignore headings
-  let start = 0;
-  for (; start < lines.length; start++) {
-    const line = lines[start];
-    if (line && line.match(/^(#|$)/)) {
-      // line isn't empty and isn't a heading so this is the start of a paragraph
-      start++;
-      break;
-    }
-  }
-
-  // skip newlines from the header to the first line
-  while (start < lines.length && !lines[start]) {
-    start++;
-  }
-
-  // continue to the first non empty line
-  let end = start;
-  while (end < lines.length && lines[end]) {
-    end++;
-  }
-
-  return lines.slice(start, end).join(' ');
-}
-
-function extractRepositoryUrl(repository) {
-  if (!repository || typeof repository !== 'object') {
-    return repository;
-  }
-  return repository.url;
-}
-
-/***/ }),
-/* 222 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getPlatformSpecificPackageFilename = getPlatformSpecificPackageFilename;
-exports.getSystemParams = getSystemParams;
-function getPlatformSpecificPackageFilename(pkg) {
-  // TODO support hash for all subdependencies that have installs scripts
-  const normalizeScope = name => name[0] === '@' ? name.substr(1).replace('/', '-') : name;
-  const suffix = getSystemParams();
-  return `${normalizeScope(pkg.name)}-v${pkg.version}-${suffix}`;
-}
-
-function getSystemParams() {
-  // TODO support platform variant for linux
-  return `${process.platform}-${process.arch}-${process.versions.modules || ''}`;
-}
-
-/***/ }),
-/* 223 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isFakeRoot = isFakeRoot;
-exports.isRootUser = isRootUser;
-function getUid() {
-  if (process.platform !== 'win32' && process.getuid) {
-    return process.getuid();
-  }
-  return null;
-}
-
-exports.default = isRootUser(getUid()) && !isFakeRoot();
-function isFakeRoot() {
-  return Boolean(process.env.FAKEROOTKEY);
-}
-
-function isRootUser(uid) {
-  return uid === 0;
-}
-
-/***/ }),
-/* 224 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.satisfiesWithPrereleases = satisfiesWithPrereleases;
-exports.diffWithUnstable = diffWithUnstable;
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Returns whether the given semver version satisfies the given range. Notably this supports
- * prerelease versions so that "2.0.0-rc.0" satisfies the range ">=1.0.0", for example.
- */
-
-function satisfiesWithPrereleases(version, range, loose = false) {
-  let semverRange;
-  try {
-    // $FlowFixMe: Add a definition for the Range class
-    semverRange = new (_semver || _load_semver()).default.Range(range, loose);
-  } catch (err) {
-    return false;
-  }
-
-  if (!version) {
-    return false;
-  }
-  let semverVersion;
-  try {
-    semverVersion = new (_semver || _load_semver()).default.SemVer(version, semverRange.loose);
-  } catch (err) {
-    return false;
-  }
-
-  // A range has multiple sets of comparators. A version must satisfy all comparators in a set
-  // and at least one set to satisfy the range.
-  return semverRange.set.some(comparatorSet => {
-    // node-semver converts ~ and ^ ranges into pairs of >= and < ranges but the upper bounds don't
-    // properly exclude prerelease versions. For example, "^1.0.0" is converted to ">=1.0.0 <2.0.0",
-    // which includes "2.0.0-pre" since prerelease versions are lower than their non-prerelease
-    // counterparts. As a practical workaround we make upper-bound ranges exclude prereleases and
-    // convert "<2.0.0" to "<2.0.0-0", for example.
-    comparatorSet = comparatorSet.map(comparator => {
-      if (comparator.operator !== '<' || !comparator.value || comparator.semver.prerelease.length) {
-        return comparator;
-      }
-
-      // "0" is the lowest prerelease version
-      comparator.semver.inc('pre', 0);
-
-      const comparatorString = comparator.operator + comparator.semver.version;
-      // $FlowFixMe: Add a definition for the Comparator class
-      return new (_semver || _load_semver()).default.Comparator(comparatorString, comparator.loose);
-    });
-
-    return !comparatorSet.some(comparator => !comparator.test(semverVersion));
-  });
-}
-
-const PRE_RELEASES = {
-  major: 'premajor',
-  minor: 'preminor',
-  patch: 'prepatch'
-};
-
-/**
- * Returns the difference between two versions as a semantic string representation.
- * Similar to the `diff` method in node-semver, but it also accounts for unstable versions,
- * like 0.x.x or 0.0.x.
- */
-
-function diffWithUnstable(version1, version2) {
-  if ((_semver || _load_semver()).default.eq(version1, version2) === false) {
-    const v1 = (_semver || _load_semver()).default.parse(version1);
-    const v2 = (_semver || _load_semver()).default.parse(version2);
-
-    if (v1 != null && v2 != null) {
-      const isPreRelease = v1.prerelease.length > 0 || v2.prerelease.length > 0;
-      const preMajor = v1.major === 0 || v2.major === 0;
-      const preMinor = preMajor && (v1.minor === 0 || v2.minor === 0);
-
-      let diff = null;
-
-      if (v1.major !== v2.major) {
-        diff = 'major';
-      } else if (v1.minor !== v2.minor) {
-        if (preMajor) {
-          // If the major version number is zero (0.x.x), treat a change
-          // of the minor version number as a major change.
-          diff = 'major';
-        } else {
-          diff = 'minor';
-        }
-      } else if (v1.patch !== v2.patch) {
-        if (preMinor) {
-          // If the major & minor version numbers are zero (0.0.x), treat a change
-          // of the patch version number as a major change.
-          diff = 'major';
-        } else if (preMajor) {
-          // If the major version number is zero (0.x.x), treat a change
-          // of the patch version number as a minor change.
-          diff = 'minor';
-        } else {
-          diff = 'patch';
-        }
-      }
-
-      if (isPreRelease) {
-        if (diff != null) {
-          diff = PRE_RELEASES[diff];
-        } else {
-          diff = 'prerelease';
-        }
-      }
-
-      return diff;
-    }
-  }
-
-  return null;
-}
-
-/***/ }),
-/* 225 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDataDir = getDataDir;
-exports.getCacheDir = getCacheDir;
-exports.getConfigDir = getConfigDir;
-const path = __webpack_require__(0);
-const userHome = __webpack_require__(66).default;
-
-const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
-const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
-
-function getDataDir() {
-  if (process.platform === 'win32') {
-    const WIN32_APPDATA_DIR = getLocalAppDataDir();
-    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Data');
-  } else if (process.env.XDG_DATA_HOME) {
-    return path.join(process.env.XDG_DATA_HOME, 'yarn');
-  } else {
-    // This could arguably be ~/Library/Application Support/Yarn on Macs,
-    // but that feels unintuitive for a cli tool
-
-    // Instead, use our prior fallback. Some day this could be
-    // path.join(userHome, '.local', 'share', 'yarn')
-    // or return path.join(WIN32_APPDATA_DIR, 'Data') on win32
-    return FALLBACK_CONFIG_DIR;
-  }
-}
-
-function getCacheDir() {
-  if (process.platform === 'win32') {
-    // process.env.TEMP also exists, but most apps put caches here
-    return path.join(getLocalAppDataDir() || path.join(userHome, 'AppData', 'Local', 'Yarn'), 'Cache');
-  } else if (process.env.XDG_CACHE_HOME) {
-    return path.join(process.env.XDG_CACHE_HOME, 'yarn');
-  } else if (process.platform === 'darwin') {
-    return path.join(userHome, 'Library', 'Caches', 'Yarn');
-  } else {
-    return FALLBACK_CACHE_DIR;
-  }
-}
-
-function getConfigDir() {
-  if (process.platform === 'win32') {
-    // Use our prior fallback. Some day this could be
-    // return path.join(WIN32_APPDATA_DIR, 'Config')
-    const WIN32_APPDATA_DIR = getLocalAppDataDir();
-    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Config');
-  } else if (process.env.XDG_CONFIG_HOME) {
-    return path.join(process.env.XDG_CONFIG_HOME, 'yarn');
-  } else {
-    return FALLBACK_CONFIG_DIR;
-  }
-}
-
-function getLocalAppDataDir() {
-  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
-}
-
-/***/ }),
-/* 226 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.explodeHashedUrl = explodeHashedUrl;
-function explodeHashedUrl(url) {
-  const parts = url.split('#');
-
-  return {
-    hash: parts[1] || '',
-    url: parts[0]
-  };
-}
-
-/***/ }),
-/* 227 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = { "default": __webpack_require__(233), __esModule: true };
-
-/***/ }),
-/* 228 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
-
-  var r = range(a, b, str);
-
-  return r && {
-    start: r[0],
-    end: r[1],
-    pre: str.slice(0, r[0]),
-    body: str.slice(r[0] + a.length, r[1]),
-    post: str.slice(r[1] + b.length)
-  };
-}
-
-function maybeMatch(reg, str) {
-  var m = str.match(reg);
-  return m ? m[0] : null;
-}
-
-balanced.range = range;
-function range(a, b, str) {
-  var begs, beg, left, right, result;
-  var ai = str.indexOf(a);
-  var bi = str.indexOf(b, ai + 1);
-  var i = ai;
-
-  if (ai >= 0 && bi > 0) {
-    begs = [];
-    left = str.length;
-
-    while (i >= 0 && !result) {
-      if (i == ai) {
-        begs.push(i);
-        ai = str.indexOf(a, i + 1);
-      } else if (begs.length == 1) {
-        result = [ begs.pop(), bi ];
-      } else {
-        beg = begs.pop();
-        if (beg < left) {
-          left = beg;
-          right = bi;
-        }
-
-        bi = str.indexOf(b, i + 1);
-      }
-
-      i = ai < bi && ai >= 0 ? ai : bi;
-    }
-
-    if (begs.length) {
-      result = [ left, right ];
-    }
-  }
-
-  return result;
-}
-
-
-/***/ }),
-/* 229 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var concatMap = __webpack_require__(232);
-var balanced = __webpack_require__(228);
-
-module.exports = expandTop;
-
-var escSlash = '\0SLASH'+Math.random()+'\0';
-var escOpen = '\0OPEN'+Math.random()+'\0';
-var escClose = '\0CLOSE'+Math.random()+'\0';
-var escComma = '\0COMMA'+Math.random()+'\0';
-var escPeriod = '\0PERIOD'+Math.random()+'\0';
-
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
-
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
-}
-
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
-}
-
-
-// Basically just str.split(","), but handling cases
-// where we have nested braced sections, which should be
-// treated as individual members, like {a,{b,c},d}
-function parseCommaParts(str) {
-  if (!str)
-    return [''];
-
-  var parts = [];
-  var m = balanced('{', '}', str);
-
-  if (!m)
-    return str.split(',');
-
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
-
-  p[p.length-1] += '{' + body + '}';
-  var postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length-1] += postParts.shift();
-    p.push.apply(p, postParts);
-  }
-
-  parts.push.apply(parts, p);
-
-  return parts;
-}
-
-function expandTop(str) {
-  if (!str)
-    return [];
-
-  // I don't know why Bash 4.3 does this, but it does.
-  // Anything starting with {} will have the first two bytes preserved
-  // but *only* at the top level, so {},a}b will not expand to anything,
-  // but a{},b}c will be expanded to [a}c,abc].
-  // One could argue that this is a bug in Bash, but since the goal of
-  // this module is to match Bash's rules, we escape a leading {}
-  if (str.substr(0, 2) === '{}') {
-    str = '\\{\\}' + str.substr(2);
-  }
-
-  return expand(escapeBraces(str), true).map(unescapeBraces);
-}
-
-function identity(e) {
-  return e;
-}
-
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
-
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
-
-function expand(str, isTop) {
-  var expansions = [];
-
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
-
-  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-  var isSequence = isNumericSequence || isAlphaSequence;
-  var isOptions = m.body.indexOf(',') >= 0;
-  if (!isSequence && !isOptions) {
-    // {a},b}
-    if (m.post.match(/,.*\}/)) {
-      str = m.pre + '{' + m.body + escClose + m.post;
-      return expand(str);
-    }
-    return [str];
-  }
-
-  var n;
-  if (isSequence) {
-    n = m.body.split(/\.\./);
-  } else {
-    n = parseCommaParts(m.body);
-    if (n.length === 1) {
-      // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand(n[0], false).map(embrace);
-      if (n.length === 1) {
-        var post = m.post.length
-          ? expand(m.post, false)
-          : [''];
-        return post.map(function(p) {
-          return m.pre + n[0] + p;
-        });
-      }
-    }
-  }
-
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
-
-  // no need to expand pre, since it is guaranteed to be free of brace-sets
-  var pre = m.pre;
-  var post = m.post.length
-    ? expand(m.post, false)
-    : [''];
-
-  var N;
-
-  if (isSequence) {
-    var x = numeric(n[0]);
-    var y = numeric(n[1]);
-    var width = Math.max(n[0].length, n[1].length)
-    var incr = n.length == 3
-      ? Math.abs(numeric(n[2]))
-      : 1;
-    var test = lte;
-    var reverse = y < x;
-    if (reverse) {
-      incr *= -1;
-      test = gte;
-    }
-    var pad = n.some(isPadded);
-
-    N = [];
-
-    for (var i = x; test(i, y); i += incr) {
-      var c;
-      if (isAlphaSequence) {
-        c = String.fromCharCode(i);
-        if (c === '\\')
-          c = '';
-      } else {
-        c = String(i);
-        if (pad) {
-          var need = width - c.length;
-          if (need > 0) {
-            var z = new Array(need + 1).join('0');
-            if (i < 0)
-              c = '-' + z + c.slice(1);
-            else
-              c = z + c;
-          }
-        }
-      }
-      N.push(c);
-    }
-  } else {
-    N = concatMap(n, function(el) { return expand(el, false) });
-  }
-
-  for (var j = 0; j < N.length; j++) {
-    for (var k = 0; k < post.length; k++) {
-      var expansion = pre + N[j] + post[k];
-      if (!isTop || isSequence || expansion)
-        expansions.push(expansion);
-    }
-  }
-
-  return expansions;
-}
-
-
-
-/***/ }),
-/* 230 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function preserveCamelCase(str) {
-	let isLastCharLower = false;
-	let isLastCharUpper = false;
-	let isLastLastCharUpper = false;
-
-	for (let i = 0; i < str.length; i++) {
-		const c = str[i];
-
-		if (isLastCharLower && /[a-zA-Z]/.test(c) && c.toUpperCase() === c) {
-			str = str.substr(0, i) + '-' + str.substr(i);
-			isLastCharLower = false;
-			isLastLastCharUpper = isLastCharUpper;
-			isLastCharUpper = true;
-			i++;
-		} else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(c) && c.toLowerCase() === c) {
-			str = str.substr(0, i - 1) + '-' + str.substr(i - 1);
-			isLastLastCharUpper = isLastCharUpper;
-			isLastCharUpper = false;
-			isLastCharLower = true;
-		} else {
-			isLastCharLower = c.toLowerCase() === c;
-			isLastLastCharUpper = isLastCharUpper;
-			isLastCharUpper = c.toUpperCase() === c;
-		}
-	}
-
-	return str;
-}
-
-module.exports = function (str) {
-	if (arguments.length > 1) {
-		str = Array.from(arguments)
-			.map(x => x.trim())
-			.filter(x => x.length)
-			.join('-');
-	} else {
-		str = str.trim();
-	}
-
-	if (str.length === 0) {
-		return '';
-	}
-
-	if (str.length === 1) {
-		return str.toLowerCase();
-	}
-
-	if (/^[a-z0-9]+$/.test(str)) {
-		return str;
-	}
-
-	const hasUpperCase = str !== str.toLowerCase();
-
-	if (hasUpperCase) {
-		str = preserveCamelCase(str);
-	}
-
-	return str
-		.replace(/^[_.\- ]+/, '')
-		.toLowerCase()
-		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
-};
-
-
-/***/ }),
-/* 231 */
-/***/ (function(module, exports) {
-
-function Caseless (dict) {
-  this.dict = dict || {}
-}
-Caseless.prototype.set = function (name, value, clobber) {
-  if (typeof name === 'object') {
-    for (var i in name) {
-      this.set(i, name[i], value)
-    }
-  } else {
-    if (typeof clobber === 'undefined') clobber = true
-    var has = this.has(name)
-
-    if (!clobber && has) this.dict[has] = this.dict[has] + ',' + value
-    else this.dict[has || name] = value
-    return has
-  }
-}
-Caseless.prototype.has = function (name) {
-  var keys = Object.keys(this.dict)
-    , name = name.toLowerCase()
-    ;
-  for (var i=0;i<keys.length;i++) {
-    if (keys[i].toLowerCase() === name) return keys[i]
-  }
-  return false
-}
-Caseless.prototype.get = function (name) {
-  name = name.toLowerCase()
-  var result, _key
-  var headers = this.dict
-  Object.keys(headers).forEach(function (key) {
-    _key = key.toLowerCase()
-    if (name === _key) result = headers[key]
-  })
-  return result
-}
-Caseless.prototype.swap = function (name) {
-  var has = this.has(name)
-  if (has === name) return
-  if (!has) throw new Error('There is no header than matches "'+name+'"')
-  this.dict[name] = this.dict[has]
-  delete this.dict[has]
-}
-Caseless.prototype.del = function (name) {
-  var has = this.has(name)
-  return delete this.dict[has || name]
-}
-
-module.exports = function (dict) {return new Caseless(dict)}
-module.exports.httpify = function (resp, headers) {
-  var c = new Caseless(headers)
-  resp.setHeader = function (key, value, clobber) {
-    if (typeof value === 'undefined') return
-    return c.set(key, value, clobber)
-  }
-  resp.hasHeader = function (key) {
-    return c.has(key)
-  }
-  resp.getHeader = function (key) {
-    return c.get(key)
-  }
-  resp.removeHeader = function (key) {
-    return c.del(key)
-  }
-  resp.headers = c.dict
-  return c
-}
-
-
-/***/ }),
-/* 232 */
-/***/ (function(module, exports) {
-
-module.exports = function (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        var x = fn(xs[i], i);
-        if (isArray(x)) res.push.apply(res, x);
-        else res.push(x);
-    }
-    return res;
-};
-
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
-
-
-/***/ }),
-/* 233 */
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__(259);
-__webpack_require__(261);
-__webpack_require__(264);
-__webpack_require__(260);
-__webpack_require__(262);
-__webpack_require__(263);
-module.exports = __webpack_require__(31).Promise;
-
-
-/***/ }),
-/* 234 */
-/***/ (function(module, exports) {
-
-module.exports = function () { /* empty */ };
-
-
-/***/ }),
-/* 235 */
-/***/ (function(module, exports) {
-
-module.exports = function (it, Constructor, name, forbiddenField) {
-  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
-    throw TypeError(name + ': incorrect invocation!');
-  } return it;
-};
-
-
-/***/ }),
-/* 236 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// false -> Array#indexOf
-// true  -> Array#includes
-var toIObject = __webpack_require__(98);
-var toLength = __webpack_require__(136);
-var toAbsoluteIndex = __webpack_require__(254);
-module.exports = function (IS_INCLUDES) {
-  return function ($this, el, fromIndex) {
-    var O = toIObject($this);
-    var length = toLength(O.length);
-    var index = toAbsoluteIndex(fromIndex, length);
-    var value;
-    // Array#includes uses SameValueZero equality algorithm
-    // eslint-disable-next-line no-self-compare
-    if (IS_INCLUDES && el != el) while (length > index) {
-      value = O[index++];
-      // eslint-disable-next-line no-self-compare
-      if (value != value) return true;
-    // Array#indexOf ignores holes, Array#includes - not
-    } else for (;length > index; index++) if (IS_INCLUDES || index in O) {
-      if (O[index] === el) return IS_INCLUDES || index || 0;
-    } return !IS_INCLUDES && -1;
-  };
-};
-
-
-/***/ }),
-/* 237 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var ctx = __webpack_require__(69);
-var call = __webpack_require__(241);
-var isArrayIter = __webpack_require__(240);
-var anObject = __webpack_require__(35);
-var toLength = __webpack_require__(136);
-var getIterFn = __webpack_require__(257);
-var BREAK = {};
-var RETURN = {};
-var exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
-  var iterFn = ITERATOR ? function () { return iterable; } : getIterFn(iterable);
-  var f = ctx(fn, that, entries ? 2 : 1);
-  var index = 0;
-  var length, step, iterator, result;
-  if (typeof iterFn != 'function') throw TypeError(iterable + ' is not iterable!');
-  // fast case for arrays with default iterator
-  if (isArrayIter(iterFn)) for (length = toLength(iterable.length); length > index; index++) {
-    result = entries ? f(anObject(step = iterable[index])[0], step[1]) : f(iterable[index]);
-    if (result === BREAK || result === RETURN) return result;
-  } else for (iterator = iterFn.call(iterable); !(step = iterator.next()).done;) {
-    result = call(iterator, f, step.value, entries);
-    if (result === BREAK || result === RETURN) return result;
-  }
-};
-exports.BREAK = BREAK;
-exports.RETURN = RETURN;
-
-
-/***/ }),
-/* 238 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = !__webpack_require__(51) && !__webpack_require__(112)(function () {
-  return Object.defineProperty(__webpack_require__(92)('div'), 'a', { get: function () { return 7; } }).a != 7;
-});
-
-
-/***/ }),
-/* 239 */
-/***/ (function(module, exports) {
-
-// fast apply, http://jsperf.lnkit.com/fast-apply/5
-module.exports = function (fn, args, that) {
-  var un = that === undefined;
-  switch (args.length) {
-    case 0: return un ? fn()
-                      : fn.call(that);
-    case 1: return un ? fn(args[0])
-                      : fn.call(that, args[0]);
-    case 2: return un ? fn(args[0], args[1])
-                      : fn.call(that, args[0], args[1]);
-    case 3: return un ? fn(args[0], args[1], args[2])
-                      : fn.call(that, args[0], args[1], args[2]);
-    case 4: return un ? fn(args[0], args[1], args[2], args[3])
-                      : fn.call(that, args[0], args[1], args[2], args[3]);
-  } return fn.apply(that, args);
-};
-
-
-/***/ }),
-/* 240 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// check on default Array iterator
-var Iterators = __webpack_require__(53);
-var ITERATOR = __webpack_require__(20)('iterator');
-var ArrayProto = Array.prototype;
-
-module.exports = function (it) {
-  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
-};
-
-
-/***/ }),
-/* 241 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// call something on iterator step with safe closing on error
-var anObject = __webpack_require__(35);
-module.exports = function (iterator, fn, value, entries) {
-  try {
-    return entries ? fn(anObject(value)[0], value[1]) : fn(value);
-  // 7.4.6 IteratorClose(iterator, completion)
-  } catch (e) {
-    var ret = iterator['return'];
-    if (ret !== undefined) anObject(ret.call(iterator));
-    throw e;
-  }
-};
-
-
-/***/ }),
-/* 242 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var create = __webpack_require__(246);
-var descriptor = __webpack_require__(132);
-var setToStringTag = __webpack_require__(95);
-var IteratorPrototype = {};
-
-// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
-__webpack_require__(42)(IteratorPrototype, __webpack_require__(20)('iterator'), function () { return this; });
-
-module.exports = function (Constructor, NAME, next) {
-  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
-  setToStringTag(Constructor, NAME + ' Iterator');
-};
-
-
-/***/ }),
-/* 243 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var ITERATOR = __webpack_require__(20)('iterator');
-var SAFE_CLOSING = false;
-
-try {
-  var riter = [7][ITERATOR]();
-  riter['return'] = function () { SAFE_CLOSING = true; };
-  // eslint-disable-next-line no-throw-literal
-  Array.from(riter, function () { throw 2; });
-} catch (e) { /* empty */ }
-
-module.exports = function (exec, skipClosing) {
-  if (!skipClosing && !SAFE_CLOSING) return false;
-  var safe = false;
-  try {
-    var arr = [7];
-    var iter = arr[ITERATOR]();
-    iter.next = function () { return { done: safe = true }; };
-    arr[ITERATOR] = function () { return iter; };
-    exec(arr);
-  } catch (e) { /* empty */ }
-  return safe;
-};
-
-
-/***/ }),
-/* 244 */
-/***/ (function(module, exports) {
-
-module.exports = function (done, value) {
-  return { value: value, done: !!done };
-};
-
-
-/***/ }),
-/* 245 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var global = __webpack_require__(17);
-var macrotask = __webpack_require__(135).set;
-var Observer = global.MutationObserver || global.WebKitMutationObserver;
-var process = global.process;
-var Promise = global.Promise;
-var isNode = __webpack_require__(68)(process) == 'process';
-
-module.exports = function () {
-  var head, last, notify;
-
-  var flush = function () {
-    var parent, fn;
-    if (isNode && (parent = process.domain)) parent.exit();
-    while (head) {
-      fn = head.fn;
-      head = head.next;
-      try {
-        fn();
-      } catch (e) {
-        if (head) notify();
-        else last = undefined;
-        throw e;
-      }
-    } last = undefined;
-    if (parent) parent.enter();
-  };
-
-  // Node.js
-  if (isNode) {
-    notify = function () {
-      process.nextTick(flush);
-    };
-  // browsers with MutationObserver, except iOS Safari - https://github.com/zloirock/core-js/issues/339
-  } else if (Observer && !(global.navigator && global.navigator.standalone)) {
-    var toggle = true;
-    var node = document.createTextNode('');
-    new Observer(flush).observe(node, { characterData: true }); // eslint-disable-line no-new
-    notify = function () {
-      node.data = toggle = !toggle;
-    };
-  // environments with maybe non-completely correct, but existent Promise
-  } else if (Promise && Promise.resolve) {
-    // Promise.resolve without an argument throws an error in LG WebOS 2
-    var promise = Promise.resolve(undefined);
-    notify = function () {
-      promise.then(flush);
-    };
-  // for other environments - macrotask based on:
-  // - setImmediate
-  // - MessageChannel
-  // - window.postMessag
-  // - onreadystatechange
-  // - setTimeout
-  } else {
-    notify = function () {
-      // strange IE + webpack dev server bug - use .call(global)
-      macrotask.call(global, flush);
-    };
-  }
-
-  return function (fn) {
-    var task = { fn: fn, next: undefined };
-    if (last) last.next = task;
-    if (!head) {
-      head = task;
-      notify();
-    } last = task;
-  };
-};
-
-
-/***/ }),
-/* 246 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-var anObject = __webpack_require__(35);
-var dPs = __webpack_require__(247);
-var enumBugKeys = __webpack_require__(127);
-var IE_PROTO = __webpack_require__(96)('IE_PROTO');
-var Empty = function () { /* empty */ };
-var PROTOTYPE = 'prototype';
-
-// Create object with fake `null` prototype: use iframe Object with cleared prototype
-var createDict = function () {
-  // Thrash, waste and sodomy: IE GC bug
-  var iframe = __webpack_require__(92)('iframe');
-  var i = enumBugKeys.length;
-  var lt = '<';
-  var gt = '>';
-  var iframeDocument;
-  iframe.style.display = 'none';
-  __webpack_require__(128).appendChild(iframe);
-  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
-  // createDict = iframe.contentWindow.Object;
-  // html.removeChild(iframe);
-  iframeDocument = iframe.contentWindow.document;
-  iframeDocument.open();
-  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
-  iframeDocument.close();
-  createDict = iframeDocument.F;
-  while (i--) delete createDict[PROTOTYPE][enumBugKeys[i]];
-  return createDict();
-};
-
-module.exports = Object.create || function create(O, Properties) {
-  var result;
-  if (O !== null) {
-    Empty[PROTOTYPE] = anObject(O);
-    result = new Empty();
-    Empty[PROTOTYPE] = null;
-    // add "__proto__" for Object.getPrototypeOf polyfill
-    result[IE_PROTO] = O;
-  } else result = createDict();
-  return Properties === undefined ? result : dPs(result, Properties);
-};
-
-
-/***/ }),
-/* 247 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var dP = __webpack_require__(71);
-var anObject = __webpack_require__(35);
-var getKeys = __webpack_require__(171);
-
-module.exports = __webpack_require__(51) ? Object.defineProperties : function defineProperties(O, Properties) {
-  anObject(O);
-  var keys = getKeys(Properties);
-  var length = keys.length;
-  var i = 0;
-  var P;
-  while (length > i) dP.f(O, P = keys[i++], Properties[P]);
-  return O;
-};
-
-
-/***/ }),
-/* 248 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
-var has = __webpack_require__(70);
-var toObject = __webpack_require__(172);
-var IE_PROTO = __webpack_require__(96)('IE_PROTO');
-var ObjectProto = Object.prototype;
-
-module.exports = Object.getPrototypeOf || function (O) {
-  O = toObject(O);
-  if (has(O, IE_PROTO)) return O[IE_PROTO];
-  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
-    return O.constructor.prototype;
-  } return O instanceof Object ? ObjectProto : null;
-};
-
-
-/***/ }),
-/* 249 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var has = __webpack_require__(70);
-var toIObject = __webpack_require__(98);
-var arrayIndexOf = __webpack_require__(236)(false);
-var IE_PROTO = __webpack_require__(96)('IE_PROTO');
-
-module.exports = function (object, names) {
-  var O = toIObject(object);
-  var i = 0;
-  var result = [];
-  var key;
-  for (key in O) if (key != IE_PROTO) has(O, key) && result.push(key);
-  // Don't enum bug & hidden keys
-  while (names.length > i) if (has(O, key = names[i++])) {
-    ~arrayIndexOf(result, key) || result.push(key);
-  }
-  return result;
-};
-
-
-/***/ }),
-/* 250 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var hide = __webpack_require__(42);
-module.exports = function (target, src, safe) {
-  for (var key in src) {
-    if (safe && target[key]) target[key] = src[key];
-    else hide(target, key, src[key]);
-  } return target;
-};
-
-
-/***/ }),
-/* 251 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(42);
-
-
-/***/ }),
-/* 252 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var global = __webpack_require__(17);
-var core = __webpack_require__(31);
-var dP = __webpack_require__(71);
-var DESCRIPTORS = __webpack_require__(51);
-var SPECIES = __webpack_require__(20)('species');
-
-module.exports = function (KEY) {
-  var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
-  if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
-    configurable: true,
-    get: function () { return this; }
-  });
-};
-
-
-/***/ }),
-/* 253 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var toInteger = __webpack_require__(97);
-var defined = __webpack_require__(91);
-// true  -> String#at
-// false -> String#codePointAt
-module.exports = function (TO_STRING) {
-  return function (that, pos) {
-    var s = String(defined(that));
-    var i = toInteger(pos);
-    var l = s.length;
-    var a, b;
-    if (i < 0 || i >= l) return TO_STRING ? '' : undefined;
-    a = s.charCodeAt(i);
-    return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff
-      ? TO_STRING ? s.charAt(i) : a
-      : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000;
-  };
-};
-
-
-/***/ }),
-/* 254 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var toInteger = __webpack_require__(97);
-var max = Math.max;
-var min = Math.min;
-module.exports = function (index, length) {
-  index = toInteger(index);
-  return index < 0 ? max(index + length, 0) : min(index, length);
-};
-
-
-/***/ }),
-/* 255 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 7.1.1 ToPrimitive(input [, PreferredType])
-var isObject = __webpack_require__(52);
-// instead of the ES6 spec version, we didn't implement @@toPrimitive case
-// and the second argument - flag - preferred type is a string
-module.exports = function (it, S) {
-  if (!isObject(it)) return it;
-  var fn, val;
-  if (S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
-  if (typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it))) return val;
-  if (!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
-  throw TypeError("Can't convert object to primitive value");
-};
-
-
-/***/ }),
-/* 256 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var global = __webpack_require__(17);
-var navigator = global.navigator;
-
-module.exports = navigator && navigator.userAgent || '';
-
-
-/***/ }),
-/* 257 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var classof = __webpack_require__(126);
-var ITERATOR = __webpack_require__(20)('iterator');
-var Iterators = __webpack_require__(53);
-module.exports = __webpack_require__(31).getIteratorMethod = function (it) {
-  if (it != undefined) return it[ITERATOR]
-    || it['@@iterator']
-    || Iterators[classof(it)];
-};
-
-
-/***/ }),
-/* 258 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var addToUnscopables = __webpack_require__(234);
-var step = __webpack_require__(244);
-var Iterators = __webpack_require__(53);
-var toIObject = __webpack_require__(98);
-
-// 22.1.3.4 Array.prototype.entries()
-// 22.1.3.13 Array.prototype.keys()
-// 22.1.3.29 Array.prototype.values()
-// 22.1.3.30 Array.prototype[@@iterator]()
-module.exports = __webpack_require__(129)(Array, 'Array', function (iterated, kind) {
-  this._t = toIObject(iterated); // target
-  this._i = 0;                   // next index
-  this._k = kind;                // kind
-// 22.1.5.2.1 %ArrayIteratorPrototype%.next()
-}, function () {
-  var O = this._t;
-  var kind = this._k;
-  var index = this._i++;
-  if (!O || index >= O.length) {
-    this._t = undefined;
-    return step(1);
-  }
-  if (kind == 'keys') return step(0, index);
-  if (kind == 'values') return step(0, O[index]);
-  return step(0, [index, O[index]]);
-}, 'values');
-
-// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
-Iterators.Arguments = Iterators.Array;
-
-addToUnscopables('keys');
-addToUnscopables('values');
-addToUnscopables('entries');
-
-
-/***/ }),
-/* 259 */
-/***/ (function(module, exports) {
-
-
-
-/***/ }),
-/* 260 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var LIBRARY = __webpack_require__(93);
-var global = __webpack_require__(17);
-var ctx = __webpack_require__(69);
-var classof = __webpack_require__(126);
-var $export = __webpack_require__(60);
-var isObject = __webpack_require__(52);
-var aFunction = __webpack_require__(67);
-var anInstance = __webpack_require__(235);
-var forOf = __webpack_require__(237);
-var speciesConstructor = __webpack_require__(134);
-var task = __webpack_require__(135).set;
-var microtask = __webpack_require__(245)();
-var newPromiseCapabilityModule = __webpack_require__(94);
-var perform = __webpack_require__(130);
-var userAgent = __webpack_require__(256);
-var promiseResolve = __webpack_require__(131);
-var PROMISE = 'Promise';
-var TypeError = global.TypeError;
-var process = global.process;
-var versions = process && process.versions;
-var v8 = versions && versions.v8 || '';
-var $Promise = global[PROMISE];
-var isNode = classof(process) == 'process';
-var empty = function () { /* empty */ };
-var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
-var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
-
-var USE_NATIVE = !!function () {
-  try {
-    // correct subclassing with @@species support
-    var promise = $Promise.resolve(1);
-    var FakePromise = (promise.constructor = {})[__webpack_require__(20)('species')] = function (exec) {
-      exec(empty, empty);
-    };
-    // unhandled rejections tracking support, NodeJS Promise without it fails @@species test
-    return (isNode || typeof PromiseRejectionEvent == 'function')
-      && promise.then(empty) instanceof FakePromise
-      // v8 6.6 (Node 10 and Chrome 66) have a bug with resolving custom thenables
-      // https://bugs.chromium.org/p/chromium/issues/detail?id=830565
-      // we can't detect it synchronously, so just check versions
-      && v8.indexOf('6.6') !== 0
-      && userAgent.indexOf('Chrome/66') === -1;
-  } catch (e) { /* empty */ }
-}();
-
-// helpers
-var isThenable = function (it) {
-  var then;
-  return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
-};
-var notify = function (promise, isReject) {
-  if (promise._n) return;
-  promise._n = true;
-  var chain = promise._c;
-  microtask(function () {
-    var value = promise._v;
-    var ok = promise._s == 1;
-    var i = 0;
-    var run = function (reaction) {
-      var handler = ok ? reaction.ok : reaction.fail;
-      var resolve = reaction.resolve;
-      var reject = reaction.reject;
-      var domain = reaction.domain;
-      var result, then, exited;
-      try {
-        if (handler) {
-          if (!ok) {
-            if (promise._h == 2) onHandleUnhandled(promise);
-            promise._h = 1;
-          }
-          if (handler === true) result = value;
-          else {
-            if (domain) domain.enter();
-            result = handler(value); // may throw
-            if (domain) {
-              domain.exit();
-              exited = true;
-            }
-          }
-          if (result === reaction.promise) {
-            reject(TypeError('Promise-chain cycle'));
-          } else if (then = isThenable(result)) {
-            then.call(result, resolve, reject);
-          } else resolve(result);
-        } else reject(value);
-      } catch (e) {
-        if (domain && !exited) domain.exit();
-        reject(e);
-      }
-    };
-    while (chain.length > i) run(chain[i++]); // variable length - can't use forEach
-    promise._c = [];
-    promise._n = false;
-    if (isReject && !promise._h) onUnhandled(promise);
-  });
-};
-var onUnhandled = function (promise) {
-  task.call(global, function () {
-    var value = promise._v;
-    var unhandled = isUnhandled(promise);
-    var result, handler, console;
-    if (unhandled) {
-      result = perform(function () {
-        if (isNode) {
-          process.emit('unhandledRejection', value, promise);
-        } else if (handler = global.onunhandledrejection) {
-          handler({ promise: promise, reason: value });
-        } else if ((console = global.console) && console.error) {
-          console.error('Unhandled promise rejection', value);
-        }
-      });
-      // Browsers should not trigger `rejectionHandled` event if it was handled here, NodeJS - should
-      promise._h = isNode || isUnhandled(promise) ? 2 : 1;
-    } promise._a = undefined;
-    if (unhandled && result.e) throw result.v;
-  });
-};
-var isUnhandled = function (promise) {
-  return promise._h !== 1 && (promise._a || promise._c).length === 0;
-};
-var onHandleUnhandled = function (promise) {
-  task.call(global, function () {
-    var handler;
-    if (isNode) {
-      process.emit('rejectionHandled', promise);
-    } else if (handler = global.onrejectionhandled) {
-      handler({ promise: promise, reason: promise._v });
-    }
-  });
-};
-var $reject = function (value) {
-  var promise = this;
-  if (promise._d) return;
-  promise._d = true;
-  promise = promise._w || promise; // unwrap
-  promise._v = value;
-  promise._s = 2;
-  if (!promise._a) promise._a = promise._c.slice();
-  notify(promise, true);
-};
-var $resolve = function (value) {
-  var promise = this;
-  var then;
-  if (promise._d) return;
-  promise._d = true;
-  promise = promise._w || promise; // unwrap
-  try {
-    if (promise === value) throw TypeError("Promise can't be resolved itself");
-    if (then = isThenable(value)) {
-      microtask(function () {
-        var wrapper = { _w: promise, _d: false }; // wrap
-        try {
-          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
-        } catch (e) {
-          $reject.call(wrapper, e);
-        }
-      });
-    } else {
-      promise._v = value;
-      promise._s = 1;
-      notify(promise, false);
-    }
-  } catch (e) {
-    $reject.call({ _w: promise, _d: false }, e); // wrap
-  }
-};
-
-// constructor polyfill
-if (!USE_NATIVE) {
-  // 25.4.3.1 Promise(executor)
-  $Promise = function Promise(executor) {
-    anInstance(this, $Promise, PROMISE, '_h');
-    aFunction(executor);
-    Internal.call(this);
-    try {
-      executor(ctx($resolve, this, 1), ctx($reject, this, 1));
-    } catch (err) {
-      $reject.call(this, err);
-    }
-  };
-  // eslint-disable-next-line no-unused-vars
-  Internal = function Promise(executor) {
-    this._c = [];             // <- awaiting reactions
-    this._a = undefined;      // <- checked in isUnhandled reactions
-    this._s = 0;              // <- state
-    this._d = false;          // <- done
-    this._v = undefined;      // <- value
-    this._h = 0;              // <- rejection state, 0 - default, 1 - handled, 2 - unhandled
-    this._n = false;          // <- notify
-  };
-  Internal.prototype = __webpack_require__(250)($Promise.prototype, {
-    // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected)
-    then: function then(onFulfilled, onRejected) {
-      var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
-      reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
-      reaction.fail = typeof onRejected == 'function' && onRejected;
-      reaction.domain = isNode ? process.domain : undefined;
-      this._c.push(reaction);
-      if (this._a) this._a.push(reaction);
-      if (this._s) notify(this, false);
-      return reaction.promise;
-    },
-    // 25.4.5.1 Promise.prototype.catch(onRejected)
-    'catch': function (onRejected) {
-      return this.then(undefined, onRejected);
-    }
-  });
-  OwnPromiseCapability = function () {
-    var promise = new Internal();
-    this.promise = promise;
-    this.resolve = ctx($resolve, promise, 1);
-    this.reject = ctx($reject, promise, 1);
-  };
-  newPromiseCapabilityModule.f = newPromiseCapability = function (C) {
-    return C === $Promise || C === Wrapper
-      ? new OwnPromiseCapability(C)
-      : newGenericPromiseCapability(C);
-  };
-}
-
-$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
-__webpack_require__(95)($Promise, PROMISE);
-__webpack_require__(252)(PROMISE);
-Wrapper = __webpack_require__(31)[PROMISE];
-
-// statics
-$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
-  // 25.4.4.5 Promise.reject(r)
-  reject: function reject(r) {
-    var capability = newPromiseCapability(this);
-    var $$reject = capability.reject;
-    $$reject(r);
-    return capability.promise;
-  }
-});
-$export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
-  // 25.4.4.6 Promise.resolve(x)
-  resolve: function resolve(x) {
-    return promiseResolve(LIBRARY && this === Wrapper ? $Promise : this, x);
-  }
-});
-$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(243)(function (iter) {
-  $Promise.all(iter)['catch'](empty);
-})), PROMISE, {
-  // 25.4.4.1 Promise.all(iterable)
-  all: function all(iterable) {
-    var C = this;
-    var capability = newPromiseCapability(C);
-    var resolve = capability.resolve;
-    var reject = capability.reject;
-    var result = perform(function () {
-      var values = [];
-      var index = 0;
-      var remaining = 1;
-      forOf(iterable, false, function (promise) {
-        var $index = index++;
-        var alreadyCalled = false;
-        values.push(undefined);
-        remaining++;
-        C.resolve(promise).then(function (value) {
-          if (alreadyCalled) return;
-          alreadyCalled = true;
-          values[$index] = value;
-          --remaining || resolve(values);
-        }, reject);
-      });
-      --remaining || resolve(values);
-    });
-    if (result.e) reject(result.v);
-    return capability.promise;
-  },
-  // 25.4.4.4 Promise.race(iterable)
-  race: function race(iterable) {
-    var C = this;
-    var capability = newPromiseCapability(C);
-    var reject = capability.reject;
-    var result = perform(function () {
-      forOf(iterable, false, function (promise) {
-        C.resolve(promise).then(capability.resolve, reject);
-      });
-    });
-    if (result.e) reject(result.v);
-    return capability.promise;
-  }
-});
-
-
-/***/ }),
-/* 261 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var $at = __webpack_require__(253)(true);
-
-// 21.1.3.27 String.prototype[@@iterator]()
-__webpack_require__(129)(String, 'String', function (iterated) {
-  this._t = String(iterated); // target
-  this._i = 0;                // next index
-// 21.1.5.2.1 %StringIteratorPrototype%.next()
-}, function () {
-  var O = this._t;
-  var index = this._i;
-  var point;
-  if (index >= O.length) return { value: undefined, done: true };
-  point = $at(O, index);
-  this._i += point.length;
-  return { value: point, done: false };
-});
-
-
-/***/ }),
-/* 262 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// https://github.com/tc39/proposal-promise-finally
-
-var $export = __webpack_require__(60);
-var core = __webpack_require__(31);
-var global = __webpack_require__(17);
-var speciesConstructor = __webpack_require__(134);
-var promiseResolve = __webpack_require__(131);
-
-$export($export.P + $export.R, 'Promise', { 'finally': function (onFinally) {
-  var C = speciesConstructor(this, core.Promise || global.Promise);
-  var isFunction = typeof onFinally == 'function';
-  return this.then(
-    isFunction ? function (x) {
-      return promiseResolve(C, onFinally()).then(function () { return x; });
-    } : onFinally,
-    isFunction ? function (e) {
-      return promiseResolve(C, onFinally()).then(function () { throw e; });
-    } : onFinally
-  );
-} });
-
-
-/***/ }),
-/* 263 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-// https://github.com/tc39/proposal-promise-try
-var $export = __webpack_require__(60);
-var newPromiseCapability = __webpack_require__(94);
-var perform = __webpack_require__(130);
-
-$export($export.S, 'Promise', { 'try': function (callbackfn) {
-  var promiseCapability = newPromiseCapability.f(this);
-  var result = perform(callbackfn);
-  (result.e ? promiseCapability.reject : promiseCapability.resolve)(result.v);
-  return promiseCapability.promise;
-} });
-
-
-/***/ }),
-/* 264 */
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__(258);
-var global = __webpack_require__(17);
-var hide = __webpack_require__(42);
-var Iterators = __webpack_require__(53);
-var TO_STRING_TAG = __webpack_require__(20)('toStringTag');
-
-var DOMIterables = ('CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,' +
-  'DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,' +
-  'MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,' +
-  'SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,' +
-  'TextTrackList,TouchList').split(',');
-
-for (var i = 0; i < DOMIterables.length; i++) {
-  var NAME = DOMIterables[i];
-  var Collection = global[NAME];
-  var proto = Collection && Collection.prototype;
-  if (proto && !proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
-  Iterators[NAME] = Iterators.Array;
-}
-
-
-/***/ }),
-/* 265 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/**
- * This is the web browser implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = __webpack_require__(138);
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-exports.storage = 'undefined' != typeof chrome
-               && 'undefined' != typeof chrome.storage
-                  ? chrome.storage.local
-                  : localstorage();
-
-/**
- * Colors.
- */
-
-exports.colors = [
-  '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC',
-  '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF',
-  '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC',
-  '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF',
-  '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC',
-  '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033',
-  '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366',
-  '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933',
-  '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC',
-  '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF',
-  '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33'
-];
-
-/**
- * Currently only WebKit-based Web Inspectors, Firefox >= v31,
- * and the Firebug extension (any Firefox version) are known
- * to support "%c" CSS customizations.
- *
- * TODO: add a `localStorage` variable to explicitly enable/disable colors
- */
-
-function useColors() {
-  // NB: In an Electron preload script, document will be defined but not fully
-  // initialized. Since we know we're in Chrome, we'll just detect this case
-  // explicitly
-  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
-    return true;
-  }
-
-  // Internet Explorer and Edge do not support colors.
-  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
-    return false;
-  }
-
-  // is webkit? http://stackoverflow.com/a/16459606/376773
-  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
-  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
-    // is firebug? http://stackoverflow.com/a/398120/376773
-    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
-    // is firefox >= v31?
-    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
-    // double check webkit in userAgent just in case we are in a worker
-    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
-}
-
-/**
- * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
- */
-
-exports.formatters.j = function(v) {
-  try {
-    return JSON.stringify(v);
-  } catch (err) {
-    return '[UnexpectedJSONParseError]: ' + err.message;
-  }
-};
-
-
-/**
- * Colorize log arguments if enabled.
- *
- * @api public
- */
-
-function formatArgs(args) {
-  var useColors = this.useColors;
-
-  args[0] = (useColors ? '%c' : '')
-    + this.namespace
-    + (useColors ? ' %c' : ' ')
-    + args[0]
-    + (useColors ? '%c ' : ' ')
-    + '+' + exports.humanize(this.diff);
-
-  if (!useColors) return;
-
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit')
-
-  // the final "%c" is somewhat tricky, because there could be other
-  // arguments passed either before or after the %c, so we need to
-  // figure out the correct index to insert the CSS into
-  var index = 0;
-  var lastC = 0;
-  args[0].replace(/%[a-zA-Z%]/g, function(match) {
-    if ('%%' === match) return;
-    index++;
-    if ('%c' === match) {
-      // we only are interested in the *last* %c
-      // (the user may have provided their own)
-      lastC = index;
-    }
-  });
-
-  args.splice(lastC, 0, c);
-}
-
-/**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
- */
-
-function log() {
-  // this hackery is required for IE8/9, where
-  // the `console.log` function doesn't have 'apply'
-  return 'object' === typeof console
-    && console.log
-    && Function.prototype.apply.call(console.log, console, arguments);
-}
-
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
-    } else {
-      exports.storage.debug = namespaces;
-    }
-  } catch(e) {}
-}
-
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-function load() {
-  var r;
-  try {
-    r = exports.storage.debug;
-  } catch(e) {}
-
-  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
-  if (!r && typeof process !== 'undefined' && 'env' in process) {
-    r = process.env.DEBUG;
-  }
-
-  return r;
-}
-
-/**
- * Enable namespaces listed in `localStorage.debug` initially.
- */
-
-exports.enable(load());
-
-/**
- * Localstorage attempts to return the localstorage.
- *
- * This is necessary because safari throws
- * when a user disables cookies/localstorage
- * and you attempt to access it.
- *
- * @return {LocalStorage}
- * @api private
- */
-
-function localstorage() {
-  try {
-    return window.localStorage;
-  } catch (e) {}
-}
-
-
-/***/ }),
-/* 266 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/**
- * Detect Electron renderer process, which is node, but we should
- * treat as a browser.
- */
-
-if (typeof process === 'undefined' || process.type === 'renderer') {
-  module.exports = __webpack_require__(265);
-} else {
-  module.exports = __webpack_require__(267);
-}
-
-
-/***/ }),
-/* 267 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/**
- * Module dependencies.
- */
-
-var tty = __webpack_require__(104);
-var util = __webpack_require__(3);
-
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = __webpack_require__(138);
-exports.init = init;
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-
-/**
- * Colors.
- */
-
-exports.colors = [ 6, 2, 3, 4, 5, 1 ];
-
-try {
-  var supportsColor = __webpack_require__(330);
-  if (supportsColor && supportsColor.level >= 2) {
-    exports.colors = [
-      20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
-      69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134,
-      135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
-      172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204,
-      205, 206, 207, 208, 209, 214, 215, 220, 221
-    ];
-  }
-} catch (err) {
-  // swallow - we only care if `supports-color` is available; it doesn't have to be.
-}
-
-/**
- * Build up the default `inspectOpts` object from the environment variables.
- *
- *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
- */
-
-exports.inspectOpts = Object.keys(process.env).filter(function (key) {
-  return /^debug_/i.test(key);
-}).reduce(function (obj, key) {
-  // camel-case
-  var prop = key
-    .substring(6)
-    .toLowerCase()
-    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
-
-  // coerce string value into JS value
-  var val = process.env[key];
-  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
-  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
-  else if (val === 'null') val = null;
-  else val = Number(val);
-
-  obj[prop] = val;
-  return obj;
-}, {});
-
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
-
-function useColors() {
-  return 'colors' in exports.inspectOpts
-    ? Boolean(exports.inspectOpts.colors)
-    : tty.isatty(process.stderr.fd);
-}
-
-/**
- * Map %o to `util.inspect()`, all on a single line.
- */
-
-exports.formatters.o = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts)
-    .split('\n').map(function(str) {
-      return str.trim()
-    }).join(' ');
-};
-
-/**
- * Map %o to `util.inspect()`, allowing multiple lines if needed.
- */
-
-exports.formatters.O = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts);
-};
-
-/**
- * Adds ANSI color escape codes if enabled.
- *
- * @api public
- */
-
-function formatArgs(args) {
-  var name = this.namespace;
-  var useColors = this.useColors;
-
-  if (useColors) {
-    var c = this.color;
-    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
-    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
-
-    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
-    args.push(colorCode + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
-  } else {
-    args[0] = getDate() + name + ' ' + args[0];
-  }
-}
-
-function getDate() {
-  if (exports.inspectOpts.hideDate) {
-    return '';
-  } else {
-    return new Date().toISOString() + ' ';
-  }
-}
-
-/**
- * Invokes `util.format()` with the specified arguments and writes to stderr.
- */
-
-function log() {
-  return process.stderr.write(util.format.apply(util, arguments) + '\n');
-}
-
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-function save(namespaces) {
-  if (null == namespaces) {
-    // If you set a process.env field to null or undefined, it gets cast to the
-    // string 'null' or 'undefined'. Just delete instead.
-    delete process.env.DEBUG;
-  } else {
-    process.env.DEBUG = namespaces;
-  }
-}
-
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-function load() {
-  return process.env.DEBUG;
-}
-
-/**
- * Init logic for `debug` instances.
- *
- * Create a new `inspectOpts` object in case `useColors` is set
- * differently for a particular `debug` instance.
- */
-
-function init (debug) {
-  debug.inspectOpts = {};
-
-  var keys = Object.keys(exports.inspectOpts);
-  for (var i = 0; i < keys.length; i++) {
-    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
-  }
-}
-
-/**
- * Enable namespaces listed in `process.env.DEBUG` initially.
- */
-
-exports.enable(load());
-
-
-/***/ }),
-/* 268 */
-/***/ (function(module, exports, __webpack_require__) {
-
-(function webpackUniversalModuleDefinition(root, factory) {
-/* istanbul ignore next */
-	if(true)
-		module.exports = factory();
-	else if(typeof define === 'function' && define.amd)
-		define([], factory);
-/* istanbul ignore next */
-	else if(typeof exports === 'object')
-		exports["esprima"] = factory();
-	else
-		root["esprima"] = factory();
-})(this, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/* istanbul ignore if */
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			exports: {},
-/******/ 			id: moduleId,
-/******/ 			loaded: false
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	/*
-	  Copyright JS Foundation and other contributors, https://js.foundation/
-
-	  Redistribution and use in source and binary forms, with or without
-	  modification, are permitted provided that the following conditions are met:
-
-	    * Redistributions of source code must retain the above copyright
-	      notice, this list of conditions and the following disclaimer.
-	    * Redistributions in binary form must reproduce the above copyright
-	      notice, this list of conditions and the following disclaimer in the
-	      documentation and/or other materials provided with the distribution.
-
-	  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-	  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-	  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-	  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-	  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	*/
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var comment_handler_1 = __webpack_require__(1);
-	var jsx_parser_1 = __webpack_require__(3);
-	var parser_1 = __webpack_require__(8);
-	var tokenizer_1 = __webpack_require__(15);
-	function parse(code, options, delegate) {
-	    var commentHandler = null;
-	    var proxyDelegate = function (node, metadata) {
-	        if (delegate) {
-	            delegate(node, metadata);
-	        }
-	        if (commentHandler) {
-	            commentHandler.visit(node, metadata);
-	        }
-	    };
-	    var parserDelegate = (typeof delegate === 'function') ? proxyDelegate : null;
-	    var collectComment = false;
-	    if (options) {
-	        collectComment = (typeof options.comment === 'boolean' && options.comment);
-	        var attachComment = (typeof options.attachComment === 'boolean' && options.attachComment);
-	        if (collectComment || attachComment) {
-	            commentHandler = new comment_handler_1.CommentHandler();
-	            commentHandler.attach = attachComment;
-	            options.comment = true;
-	            parserDelegate = proxyDelegate;
-	        }
-	    }
-	    var isModule = false;
-	    if (options && typeof options.sourceType === 'string') {
-	        isModule = (options.sourceType === 'module');
-	    }
-	    var parser;
-	    if (options && typeof options.jsx === 'boolean' && options.jsx) {
-	        parser = new jsx_parser_1.JSXParser(code, options, parserDelegate);
-	    }
-	    else {
-	        parser = new parser_1.Parser(code, options, parserDelegate);
-	    }
-	    var program = isModule ? parser.parseModule() : parser.parseScript();
-	    var ast = program;
-	    if (collectComment && commentHandler) {
-	        ast.comments = commentHandler.comments;
-	    }
-	    if (parser.config.tokens) {
-	        ast.tokens = parser.tokens;
-	    }
-	    if (parser.config.tolerant) {
-	        ast.errors = parser.errorHandler.errors;
-	    }
-	    return ast;
-	}
-	exports.parse = parse;
-	function parseModule(code, options, delegate) {
-	    var parsingOptions = options || {};
-	    parsingOptions.sourceType = 'module';
-	    return parse(code, parsingOptions, delegate);
-	}
-	exports.parseModule = parseModule;
-	function parseScript(code, options, delegate) {
-	    var parsingOptions = options || {};
-	    parsingOptions.sourceType = 'script';
-	    return parse(code, parsingOptions, delegate);
-	}
-	exports.parseScript = parseScript;
-	function tokenize(code, options, delegate) {
-	    var tokenizer = new tokenizer_1.Tokenizer(code, options);
-	    var tokens;
-	    tokens = [];
-	    try {
-	        while (true) {
-	            var token = tokenizer.getNextToken();
-	            if (!token) {
-	                break;
-	            }
-	            if (delegate) {
-	                token = delegate(token);
-	            }
-	            tokens.push(token);
-	        }
-	    }
-	    catch (e) {
-	        tokenizer.errorHandler.tolerate(e);
-	    }
-	    if (tokenizer.errorHandler.tolerant) {
-	        tokens.errors = tokenizer.errors();
-	    }
-	    return tokens;
-	}
-	exports.tokenize = tokenize;
-	var syntax_1 = __webpack_require__(2);
-	exports.Syntax = syntax_1.Syntax;
-	// Sync with *.json manifests.
-	exports.version = '4.0.1';
-
-
-/***/ },
-/* 1 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var syntax_1 = __webpack_require__(2);
-	var CommentHandler = (function () {
-	    function CommentHandler() {
-	        this.attach = false;
-	        this.comments = [];
-	        this.stack = [];
-	        this.leading = [];
-	        this.trailing = [];
-	    }
-	    CommentHandler.prototype.insertInnerComments = function (node, metadata) {
-	        //  innnerComments for properties empty block
-	        //  `function a() {/** comments **\/}`
-	        if (node.type === syntax_1.Syntax.BlockStatement && node.body.length === 0) {
-	            var innerComments = [];
-	            for (var i = this.leading.length - 1; i >= 0; --i) {
-	                var entry = this.leading[i];
-	                if (metadata.end.offset >= entry.start) {
-	                    innerComments.unshift(entry.comment);
-	                    this.leading.splice(i, 1);
-	                    this.trailing.splice(i, 1);
-	                }
-	            }
-	            if (innerComments.length) {
-	                node.innerComments = innerComments;
-	            }
-	        }
-	    };
-	    CommentHandler.prototype.findTrailingComments = function (metadata) {
-	        var trailingComments = [];
-	        if (this.trailing.length > 0) {
-	            for (var i = this.trailing.length - 1; i >= 0; --i) {
-	                var entry_1 = this.trailing[i];
-	                if (entry_1.start >= metadata.end.offset) {
-	                    trailingComments.unshift(entry_1.comment);
-	                }
-	            }
-	            this.trailing.length = 0;
-	            return trailingComments;
-	        }
-	        var entry = this.stack[this.stack.length - 1];
-	        if (entry && entry.node.trailingComments) {
-	            var firstComment = entry.node.trailingComments[0];
-	            if (firstComment && firstComment.range[0] >= metadata.end.offset) {
-	                trailingComments = entry.node.trailingComments;
-	                delete entry.node.trailingComments;
-	            }
-	        }
-	        return trailingComments;
-	    };
-	    CommentHandler.prototype.findLeadingComments = function (metadata) {
-	        var leadingComments = [];
-	        var target;
-	        while (this.stack.length > 0) {
-	            var entry = this.stack[this.stack.length - 1];
-	            if (entry && entry.start >= metadata.start.offset) {
-	                target = entry.node;
-	                this.stack.pop();
-	            }
-	            else {
-	                break;
-	            }
-	        }
-	        if (target) {
-	            var count = target.leadingComments ? target.leadingComments.length : 0;
-	            for (var i = count - 1; i >= 0; --i) {
-	                var comment = target.leadingComments[i];
-	                if (comment.range[1] <= metadata.start.offset) {
-	                    leadingComments.unshift(comment);
-	                    target.leadingComments.splice(i, 1);
-	                }
-	            }
-	            if (target.leadingComments && target.leadingComments.length === 0) {
-	                delete target.leadingComments;
-	            }
-	            return leadingComments;
-	        }
-	        for (var i = this.leading.length - 1; i >= 0; --i) {
-	            var entry = this.leading[i];
-	            if (entry.start <= metadata.start.offset) {
-	                leadingComments.unshift(entry.comment);
-	                this.leading.splice(i, 1);
-	            }
-	        }
-	        return leadingComments;
-	    };
-	    CommentHandler.prototype.visitNode = function (node, metadata) {
-	        if (node.type === syntax_1.Syntax.Program && node.body.length > 0) {
-	            return;
-	        }
-	        this.insertInnerComments(node, metadata);
-	        var trailingComments = this.findTrailingComments(metadata);
-	        var leadingComments = this.findLeadingComments(metadata);
-	        if (leadingComments.length > 0) {
-	            node.leadingComments = leadingComments;
-	        }
-	        if (trailingComments.length > 0) {
-	            node.trailingComments = trailingComments;
-	        }
-	        this.stack.push({
-	            node: node,
-	            start: metadata.start.offset
-	        });
-	    };
-	    CommentHandler.prototype.visitComment = function (node, metadata) {
-	        var type = (node.type[0] === 'L') ? 'Line' : 'Block';
-	        var comment = {
-	            type: type,
-	            value: node.value
-	        };
-	        if (node.range) {
-	            comment.range = node.range;
-	        }
-	        if (node.loc) {
-	            comment.loc = node.loc;
-	        }
-	        this.comments.push(comment);
-	        if (this.attach) {
-	            var entry = {
-	                comment: {
-	                    type: type,
-	                    value: node.value,
-	                    range: [metadata.start.offset, metadata.end.offset]
-	                },
-	                start: metadata.start.offset
-	            };
-	            if (node.loc) {
-	                entry.comment.loc = node.loc;
-	            }
-	            node.type = type;
-	            this.leading.push(entry);
-	            this.trailing.push(entry);
-	        }
-	    };
-	    CommentHandler.prototype.visit = function (node, metadata) {
-	        if (node.type === 'LineComment') {
-	            this.visitComment(node, metadata);
-	        }
-	        else if (node.type === 'BlockComment') {
-	            this.visitComment(node, metadata);
-	        }
-	        else if (this.attach) {
-	            this.visitNode(node, metadata);
-	        }
-	    };
-	    return CommentHandler;
-	}());
-	exports.CommentHandler = CommentHandler;
-
-
-/***/ },
-/* 2 */
-/***/ function(module, exports) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.Syntax = {
-	    AssignmentExpression: 'AssignmentExpression',
-	    AssignmentPattern: 'AssignmentPattern',
-	    ArrayExpression: 'ArrayExpression',
-	    ArrayPattern: 'ArrayPattern',
-	    ArrowFunctionExpression: 'ArrowFunctionExpression',
-	    AwaitExpression: 'AwaitExpression',
-	    BlockStatement: 'BlockStatement',
-	    BinaryExpression: 'BinaryExpression',
-	    BreakStatement: 'BreakStatement',
-	    CallExpression: 'CallExpression',
-	    CatchClause: 'CatchClause',
-	    ClassBody: 'ClassBody',
-	    ClassDeclaration: 'ClassDeclaration',
-	    ClassExpression: 'ClassExpression',
-	    ConditionalExpression: 'ConditionalExpression',
-	    ContinueStatement: 'ContinueStatement',
-	    DoWhileStatement: 'DoWhileStatement',
-	    DebuggerStatement: 'DebuggerStatement',
-	    EmptyStatement: 'EmptyStatement',
-	    ExportAllDeclaration: 'ExportAllDeclaration',
-	    ExportDefaultDeclaration: 'ExportDefaultDeclaration',
-	    ExportNamedDeclaration: 'ExportNamedDeclaration',
-	    ExportSpecifier: 'ExportSpecifier',
-	    ExpressionStatement: 'ExpressionStatement',
-	    ForStatement: 'ForStatement',
-	    ForOfStatement: 'ForOfStatement',
-	    ForInStatement: 'ForInStatement',
-	    FunctionDeclaration: 'FunctionDeclaration',
-	    FunctionExpression: 'FunctionExpression',
-	    Identifier: 'Identifier',
-	    IfStatement: 'IfStatement',
-	    ImportDeclaration: 'ImportDeclaration',
-	    ImportDefaultSpecifier: 'ImportDefaultSpecifier',
-	    ImportNamespaceSpecifier: 'ImportNamespaceSpecifier',
-	    ImportSpecifier: 'ImportSpecifier',
-	    Literal: 'Literal',
-	    LabeledStatement: 'LabeledStatement',
-	    LogicalExpression: 'LogicalExpression',
-	    MemberExpression: 'MemberExpression',
-	    MetaProperty: 'MetaProperty',
-	    MethodDefinition: 'MethodDefinition',
-	    NewExpression: 'NewExpression',
-	    ObjectExpression: 'ObjectExpression',
-	    ObjectPattern: 'ObjectPattern',
-	    Program: 'Program',
-	    Property: 'Property',
-	    RestElement: 'RestElement',
-	    ReturnStatement: 'ReturnStatement',
-	    SequenceExpression: 'SequenceExpression',
-	    SpreadElement: 'SpreadElement',
-	    Super: 'Super',
-	    SwitchCase: 'SwitchCase',
-	    SwitchStatement: 'SwitchStatement',
-	    TaggedTemplateExpression: 'TaggedTemplateExpression',
-	    TemplateElement: 'TemplateElement',
-	    TemplateLiteral: 'TemplateLiteral',
-	    ThisExpression: 'ThisExpression',
-	    ThrowStatement: 'ThrowStatement',
-	    TryStatement: 'TryStatement',
-	    UnaryExpression: 'UnaryExpression',
-	    UpdateExpression: 'UpdateExpression',
-	    VariableDeclaration: 'VariableDeclaration',
-	    VariableDeclarator: 'VariableDeclarator',
-	    WhileStatement: 'WhileStatement',
-	    WithStatement: 'WithStatement',
-	    YieldExpression: 'YieldExpression'
-	};
-
-
-/***/ },
-/* 3 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-/* istanbul ignore next */
-	var __extends = (this && this.__extends) || (function () {
-	    var extendStatics = Object.setPrototypeOf ||
-	        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-	        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-	    return function (d, b) {
-	        extendStatics(d, b);
-	        function __() { this.constructor = d; }
-	        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-	    };
-	})();
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var character_1 = __webpack_require__(4);
-	var JSXNode = __webpack_require__(5);
-	var jsx_syntax_1 = __webpack_require__(6);
-	var Node = __webpack_require__(7);
-	var parser_1 = __webpack_require__(8);
-	var token_1 = __webpack_require__(13);
-	var xhtml_entities_1 = __webpack_require__(14);
-	token_1.TokenName[100 /* Identifier */] = 'JSXIdentifier';
-	token_1.TokenName[101 /* Text */] = 'JSXText';
-	// Fully qualified element name, e.g. <svg:path> returns "svg:path"
-	function getQualifiedElementName(elementName) {
-	    var qualifiedName;
-	    switch (elementName.type) {
-	        case jsx_syntax_1.JSXSyntax.JSXIdentifier:
-	            var id = elementName;
-	            qualifiedName = id.name;
-	            break;
-	        case jsx_syntax_1.JSXSyntax.JSXNamespacedName:
-	            var ns = elementName;
-	            qualifiedName = getQualifiedElementName(ns.namespace) + ':' +
-	                getQualifiedElementName(ns.name);
-	            break;
-	        case jsx_syntax_1.JSXSyntax.JSXMemberExpression:
-	            var expr = elementName;
-	            qualifiedName = getQualifiedElementName(expr.object) + '.' +
-	                getQualifiedElementName(expr.property);
-	            break;
-	        /* istanbul ignore next */
-	        default:
-	            break;
-	    }
-	    return qualifiedName;
-	}
-	var JSXParser = (function (_super) {
-	    __extends(JSXParser, _super);
-	    function JSXParser(code, options, delegate) {
-	        return _super.call(this, code, options, delegate) || this;
-	    }
-	    JSXParser.prototype.parsePrimaryExpression = function () {
-	        return this.match('<') ? this.parseJSXRoot() : _super.prototype.parsePrimaryExpression.call(this);
-	    };
-	    JSXParser.prototype.startJSX = function () {
-	        // Unwind the scanner before the lookahead token.
-	        this.scanner.index = this.startMarker.index;
-	        this.scanner.lineNumber = this.startMarker.line;
-	        this.scanner.lineStart = this.startMarker.index - this.startMarker.column;
-	    };
-	    JSXParser.prototype.finishJSX = function () {
-	        // Prime the next lookahead.
-	        this.nextToken();
-	    };
-	    JSXParser.prototype.reenterJSX = function () {
-	        this.startJSX();
-	        this.expectJSX('}');
-	        // Pop the closing '}' added from the lookahead.
-	        if (this.config.tokens) {
-	            this.tokens.pop();
-	        }
-	    };
-	    JSXParser.prototype.createJSXNode = function () {
-	        this.collectComments();
-	        return {
-	            index: this.scanner.index,
-	            line: this.scanner.lineNumber,
-	            column: this.scanner.index - this.scanner.lineStart
-	        };
-	    };
-	    JSXParser.prototype.createJSXChildNode = function () {
-	        return {
-	            index: this.scanner.index,
-	            line: this.scanner.lineNumber,
-	            column: this.scanner.index - this.scanner.lineStart
-	        };
-	    };
-	    JSXParser.prototype.scanXHTMLEntity = function (quote) {
-	        var result = '&';
-	        var valid = true;
-	        var terminated = false;
-	        var numeric = false;
-	        var hex = false;
-	        while (!this.scanner.eof() && valid && !terminated) {
-	            var ch = this.scanner.source[this.scanner.index];
-	            if (ch === quote) {
-	                break;
-	            }
-	            terminated = (ch === ';');
-	            result += ch;
-	            ++this.scanner.index;
-	            if (!terminated) {
-	                switch (result.length) {
-	                    case 2:
-	                        // e.g. '&#123;'
-	                        numeric = (ch === '#');
-	                        break;
-	                    case 3:
-	                        if (numeric) {
-	                            // e.g. '&#x41;'
-	                            hex = (ch === 'x');
-	                            valid = hex || character_1.Character.isDecimalDigit(ch.charCodeAt(0));
-	                            numeric = numeric && !hex;
-	                        }
-	                        break;
-	                    default:
-	                        valid = valid && !(numeric && !character_1.Character.isDecimalDigit(ch.charCodeAt(0)));
-	                        valid = valid && !(hex && !character_1.Character.isHexDigit(ch.charCodeAt(0)));
-	                        break;
-	                }
-	            }
-	        }
-	        if (valid && terminated && result.length > 2) {
-	            // e.g. '&#x41;' becomes just '#x41'
-	            var str = result.substr(1, result.length - 2);
-	            if (numeric && str.length > 1) {
-	                result = String.fromCharCode(parseInt(str.substr(1), 10));
-	            }
-	            else if (hex && str.length > 2) {
-	                result = String.fromCharCode(parseInt('0' + str.substr(1), 16));
-	            }
-	            else if (!numeric && !hex && xhtml_entities_1.XHTMLEntities[str]) {
-	                result = xhtml_entities_1.XHTMLEntities[str];
-	            }
-	        }
-	        return result;
-	    };
-	    // Scan the next JSX token. This replaces Scanner#lex when in JSX mode.
-	    JSXParser.prototype.lexJSX = function () {
-	        var cp = this.scanner.source.charCodeAt(this.scanner.index);
-	        // < > / : = { }
-	        if (cp === 60 || cp === 62 || cp === 47 || cp === 58 || cp === 61 || cp === 123 || cp === 125) {
-	            var value = this.scanner.source[this.scanner.index++];
-	            return {
-	                type: 7 /* Punctuator */,
-	                value: value,
-	                lineNumber: this.scanner.lineNumber,
-	                lineStart: this.scanner.lineStart,
-	                start: this.scanner.index - 1,
-	                end: this.scanner.index
-	            };
-	        }
-	        // " '
-	        if (cp === 34 || cp === 39) {
-	            var start = this.scanner.index;
-	            var quote = this.scanner.source[this.scanner.index++];
-	            var str = '';
-	            while (!this.scanner.eof()) {
-	                var ch = this.scanner.source[this.scanner.index++];
-	                if (ch === quote) {
-	                    break;
-	                }
-	                else if (ch === '&') {
-	                    str += this.scanXHTMLEntity(quote);
-	                }
-	                else {
-	                    str += ch;
-	                }
-	            }
-	            return {
-	                type: 8 /* StringLiteral */,
-	                value: str,
-	                lineNumber: this.scanner.lineNumber,
-	                lineStart: this.scanner.lineStart,
-	                start: start,
-	                end: this.scanner.index
-	            };
-	        }
-	        // ... or .
-	        if (cp === 46) {
-	            var n1 = this.scanner.source.charCodeAt(this.scanner.index + 1);
-	            var n2 = this.scanner.source.charCodeAt(this.scanner.index + 2);
-	            var value = (n1 === 46 && n2 === 46) ? '...' : '.';
-	            var start = this.scanner.index;
-	            this.scanner.index += value.length;
-	            return {
-	                type: 7 /* Punctuator */,
-	                value: value,
-	                lineNumber: this.scanner.lineNumber,
-	                lineStart: this.scanner.lineStart,
-	                start: start,
-	                end: this.scanner.index
-	            };
-	        }
-	        // `
-	        if (cp === 96) {
-	            // Only placeholder, since it will be rescanned as a real assignment expression.
-	            return {
-	                type: 10 /* Template */,
-	                value: '',
-	                lineNumber: this.scanner.lineNumber,
-	                lineStart: this.scanner.lineStart,
-	                start: this.scanner.index,
-	                end: this.scanner.index
-	            };
-	        }
-	        // Identifer can not contain backslash (char code 92).
-	        if (character_1.Character.isIdentifierStart(cp) && (cp !== 92)) {
-	            var start = this.scanner.index;
-	            ++this.scanner.index;
-	            while (!this.scanner.eof()) {
-	                var ch = this.scanner.source.charCodeAt(this.scanner.index);
-	                if (character_1.Character.isIdentifierPart(ch) && (ch !== 92)) {
-	                    ++this.scanner.index;
-	                }
-	                else if (ch === 45) {
-	                    // Hyphen (char code 45) can be part of an identifier.
-	                    ++this.scanner.index;
-	                }
-	                else {
-	                    break;
-	                }
-	            }
-	            var id = this.scanner.source.slice(start, this.scanner.index);
-	            return {
-	                type: 100 /* Identifier */,
-	                value: id,
-	                lineNumber: this.scanner.lineNumber,
-	                lineStart: this.scanner.lineStart,
-	                start: start,
-	                end: this.scanner.index
-	            };
-	        }
-	        return this.scanner.lex();
-	    };
-	    JSXParser.prototype.nextJSXToken = function () {
-	        this.collectComments();
-	        this.startMarker.index = this.scanner.index;
-	        this.startMarker.line = this.scanner.lineNumber;
-	        this.startMarker.column = this.scanner.index - this.scanner.lineStart;
-	        var token = this.lexJSX();
-	        this.lastMarker.index = this.scanner.index;
-	        this.lastMarker.line = this.scanner.lineNumber;
-	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
-	        if (this.config.tokens) {
-	            this.tokens.push(this.convertToken(token));
-	        }
-	        return token;
-	    };
-	    JSXParser.prototype.nextJSXText = function () {
-	        this.startMarker.index = this.scanner.index;
-	        this.startMarker.line = this.scanner.lineNumber;
-	        this.startMarker.column = this.scanner.index - this.scanner.lineStart;
-	        var start = this.scanner.index;
-	        var text = '';
-	        while (!this.scanner.eof()) {
-	            var ch = this.scanner.source[this.scanner.index];
-	            if (ch === '{' || ch === '<') {
-	                break;
-	            }
-	            ++this.scanner.index;
-	            text += ch;
-	            if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                ++this.scanner.lineNumber;
-	                if (ch === '\r' && this.scanner.source[this.scanner.index] === '\n') {
-	                    ++this.scanner.index;
-	                }
-	                this.scanner.lineStart = this.scanner.index;
-	            }
-	        }
-	        this.lastMarker.index = this.scanner.index;
-	        this.lastMarker.line = this.scanner.lineNumber;
-	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
-	        var token = {
-	            type: 101 /* Text */,
-	            value: text,
-	            lineNumber: this.scanner.lineNumber,
-	            lineStart: this.scanner.lineStart,
-	            start: start,
-	            end: this.scanner.index
-	        };
-	        if ((text.length > 0) && this.config.tokens) {
-	            this.tokens.push(this.convertToken(token));
-	        }
-	        return token;
-	    };
-	    JSXParser.prototype.peekJSXToken = function () {
-	        var state = this.scanner.saveState();
-	        this.scanner.scanComments();
-	        var next = this.lexJSX();
-	        this.scanner.restoreState(state);
-	        return next;
-	    };
-	    // Expect the next JSX token to match the specified punctuator.
-	    // If not, an exception will be thrown.
-	    JSXParser.prototype.expectJSX = function (value) {
-	        var token = this.nextJSXToken();
-	        if (token.type !== 7 /* Punctuator */ || token.value !== value) {
-	            this.throwUnexpectedToken(token);
-	        }
-	    };
-	    // Return true if the next JSX token matches the specified punctuator.
-	    JSXParser.prototype.matchJSX = function (value) {
-	        var next = this.peekJSXToken();
-	        return next.type === 7 /* Punctuator */ && next.value === value;
-	    };
-	    JSXParser.prototype.parseJSXIdentifier = function () {
-	        var node = this.createJSXNode();
-	        var token = this.nextJSXToken();
-	        if (token.type !== 100 /* Identifier */) {
-	            this.throwUnexpectedToken(token);
-	        }
-	        return this.finalize(node, new JSXNode.JSXIdentifier(token.value));
-	    };
-	    JSXParser.prototype.parseJSXElementName = function () {
-	        var node = this.createJSXNode();
-	        var elementName = this.parseJSXIdentifier();
-	        if (this.matchJSX(':')) {
-	            var namespace = elementName;
-	            this.expectJSX(':');
-	            var name_1 = this.parseJSXIdentifier();
-	            elementName = this.finalize(node, new JSXNode.JSXNamespacedName(namespace, name_1));
-	        }
-	        else if (this.matchJSX('.')) {
-	            while (this.matchJSX('.')) {
-	                var object = elementName;
-	                this.expectJSX('.');
-	                var property = this.parseJSXIdentifier();
-	                elementName = this.finalize(node, new JSXNode.JSXMemberExpression(object, property));
-	            }
-	        }
-	        return elementName;
-	    };
-	    JSXParser.prototype.parseJSXAttributeName = function () {
-	        var node = this.createJSXNode();
-	        var attributeName;
-	        var identifier = this.parseJSXIdentifier();
-	        if (this.matchJSX(':')) {
-	            var namespace = identifier;
-	            this.expectJSX(':');
-	            var name_2 = this.parseJSXIdentifier();
-	            attributeName = this.finalize(node, new JSXNode.JSXNamespacedName(namespace, name_2));
-	        }
-	        else {
-	            attributeName = identifier;
-	        }
-	        return attributeName;
-	    };
-	    JSXParser.prototype.parseJSXStringLiteralAttribute = function () {
-	        var node = this.createJSXNode();
-	        var token = this.nextJSXToken();
-	        if (token.type !== 8 /* StringLiteral */) {
-	            this.throwUnexpectedToken(token);
-	        }
-	        var raw = this.getTokenRaw(token);
-	        return this.finalize(node, new Node.Literal(token.value, raw));
-	    };
-	    JSXParser.prototype.parseJSXExpressionAttribute = function () {
-	        var node = this.createJSXNode();
-	        this.expectJSX('{');
-	        this.finishJSX();
-	        if (this.match('}')) {
-	            this.tolerateError('JSX attributes must only be assigned a non-empty expression');
-	        }
-	        var expression = this.parseAssignmentExpression();
-	        this.reenterJSX();
-	        return this.finalize(node, new JSXNode.JSXExpressionContainer(expression));
-	    };
-	    JSXParser.prototype.parseJSXAttributeValue = function () {
-	        return this.matchJSX('{') ? this.parseJSXExpressionAttribute() :
-	            this.matchJSX('<') ? this.parseJSXElement() : this.parseJSXStringLiteralAttribute();
-	    };
-	    JSXParser.prototype.parseJSXNameValueAttribute = function () {
-	        var node = this.createJSXNode();
-	        var name = this.parseJSXAttributeName();
-	        var value = null;
-	        if (this.matchJSX('=')) {
-	            this.expectJSX('=');
-	            value = this.parseJSXAttributeValue();
-	        }
-	        return this.finalize(node, new JSXNode.JSXAttribute(name, value));
-	    };
-	    JSXParser.prototype.parseJSXSpreadAttribute = function () {
-	        var node = this.createJSXNode();
-	        this.expectJSX('{');
-	        this.expectJSX('...');
-	        this.finishJSX();
-	        var argument = this.parseAssignmentExpression();
-	        this.reenterJSX();
-	        return this.finalize(node, new JSXNode.JSXSpreadAttribute(argument));
-	    };
-	    JSXParser.prototype.parseJSXAttributes = function () {
-	        var attributes = [];
-	        while (!this.matchJSX('/') && !this.matchJSX('>')) {
-	            var attribute = this.matchJSX('{') ? this.parseJSXSpreadAttribute() :
-	                this.parseJSXNameValueAttribute();
-	            attributes.push(attribute);
-	        }
-	        return attributes;
-	    };
-	    JSXParser.prototype.parseJSXOpeningElement = function () {
-	        var node = this.createJSXNode();
-	        this.expectJSX('<');
-	        var name = this.parseJSXElementName();
-	        var attributes = this.parseJSXAttributes();
-	        var selfClosing = this.matchJSX('/');
-	        if (selfClosing) {
-	            this.expectJSX('/');
-	        }
-	        this.expectJSX('>');
-	        return this.finalize(node, new JSXNode.JSXOpeningElement(name, selfClosing, attributes));
-	    };
-	    JSXParser.prototype.parseJSXBoundaryElement = function () {
-	        var node = this.createJSXNode();
-	        this.expectJSX('<');
-	        if (this.matchJSX('/')) {
-	            this.expectJSX('/');
-	            var name_3 = this.parseJSXElementName();
-	            this.expectJSX('>');
-	            return this.finalize(node, new JSXNode.JSXClosingElement(name_3));
-	        }
-	        var name = this.parseJSXElementName();
-	        var attributes = this.parseJSXAttributes();
-	        var selfClosing = this.matchJSX('/');
-	        if (selfClosing) {
-	            this.expectJSX('/');
-	        }
-	        this.expectJSX('>');
-	        return this.finalize(node, new JSXNode.JSXOpeningElement(name, selfClosing, attributes));
-	    };
-	    JSXParser.prototype.parseJSXEmptyExpression = function () {
-	        var node = this.createJSXChildNode();
-	        this.collectComments();
-	        this.lastMarker.index = this.scanner.index;
-	        this.lastMarker.line = this.scanner.lineNumber;
-	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
-	        return this.finalize(node, new JSXNode.JSXEmptyExpression());
-	    };
-	    JSXParser.prototype.parseJSXExpressionContainer = function () {
-	        var node = this.createJSXNode();
-	        this.expectJSX('{');
-	        var expression;
-	        if (this.matchJSX('}')) {
-	            expression = this.parseJSXEmptyExpression();
-	            this.expectJSX('}');
-	        }
-	        else {
-	            this.finishJSX();
-	            expression = this.parseAssignmentExpression();
-	            this.reenterJSX();
-	        }
-	        return this.finalize(node, new JSXNode.JSXExpressionContainer(expression));
-	    };
-	    JSXParser.prototype.parseJSXChildren = function () {
-	        var children = [];
-	        while (!this.scanner.eof()) {
-	            var node = this.createJSXChildNode();
-	            var token = this.nextJSXText();
-	            if (token.start < token.end) {
-	                var raw = this.getTokenRaw(token);
-	                var child = this.finalize(node, new JSXNode.JSXText(token.value, raw));
-	                children.push(child);
-	            }
-	            if (this.scanner.source[this.scanner.index] === '{') {
-	                var container = this.parseJSXExpressionContainer();
-	                children.push(container);
-	            }
-	            else {
-	                break;
-	            }
-	        }
-	        return children;
-	    };
-	    JSXParser.prototype.parseComplexJSXElement = function (el) {
-	        var stack = [];
-	        while (!this.scanner.eof()) {
-	            el.children = el.children.concat(this.parseJSXChildren());
-	            var node = this.createJSXChildNode();
-	            var element = this.parseJSXBoundaryElement();
-	            if (element.type === jsx_syntax_1.JSXSyntax.JSXOpeningElement) {
-	                var opening = element;
-	                if (opening.selfClosing) {
-	                    var child = this.finalize(node, new JSXNode.JSXElement(opening, [], null));
-	                    el.children.push(child);
-	                }
-	                else {
-	                    stack.push(el);
-	                    el = { node: node, opening: opening, closing: null, children: [] };
-	                }
-	            }
-	            if (element.type === jsx_syntax_1.JSXSyntax.JSXClosingElement) {
-	                el.closing = element;
-	                var open_1 = getQualifiedElementName(el.opening.name);
-	                var close_1 = getQualifiedElementName(el.closing.name);
-	                if (open_1 !== close_1) {
-	                    this.tolerateError('Expected corresponding JSX closing tag for %0', open_1);
-	                }
-	                if (stack.length > 0) {
-	                    var child = this.finalize(el.node, new JSXNode.JSXElement(el.opening, el.children, el.closing));
-	                    el = stack[stack.length - 1];
-	                    el.children.push(child);
-	                    stack.pop();
-	                }
-	                else {
-	                    break;
-	                }
-	            }
-	        }
-	        return el;
-	    };
-	    JSXParser.prototype.parseJSXElement = function () {
-	        var node = this.createJSXNode();
-	        var opening = this.parseJSXOpeningElement();
-	        var children = [];
-	        var closing = null;
-	        if (!opening.selfClosing) {
-	            var el = this.parseComplexJSXElement({ node: node, opening: opening, closing: closing, children: children });
-	            children = el.children;
-	            closing = el.closing;
-	        }
-	        return this.finalize(node, new JSXNode.JSXElement(opening, children, closing));
-	    };
-	    JSXParser.prototype.parseJSXRoot = function () {
-	        // Pop the opening '<' added from the lookahead.
-	        if (this.config.tokens) {
-	            this.tokens.pop();
-	        }
-	        this.startJSX();
-	        var element = this.parseJSXElement();
-	        this.finishJSX();
-	        return element;
-	    };
-	    JSXParser.prototype.isStartOfExpression = function () {
-	        return _super.prototype.isStartOfExpression.call(this) || this.match('<');
-	    };
-	    return JSXParser;
-	}(parser_1.Parser));
-	exports.JSXParser = JSXParser;
-
-
-/***/ },
-/* 4 */
-/***/ function(module, exports) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	// See also tools/generate-unicode-regex.js.
-	var Regex = {
-	    // Unicode v8.0.0 NonAsciiIdentifierStart:
-	    NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/,
-	    // Unicode v8.0.0 NonAsciiIdentifierPart:
-	    NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
-	};
-	exports.Character = {
-	    /* tslint:disable:no-bitwise */
-	    fromCodePoint: function (cp) {
-	        return (cp < 0x10000) ? String.fromCharCode(cp) :
-	            String.fromCharCode(0xD800 + ((cp - 0x10000) >> 10)) +
-	                String.fromCharCode(0xDC00 + ((cp - 0x10000) & 1023));
-	    },
-	    // https://tc39.github.io/ecma262/#sec-white-space
-	    isWhiteSpace: function (cp) {
-	        return (cp === 0x20) || (cp === 0x09) || (cp === 0x0B) || (cp === 0x0C) || (cp === 0xA0) ||
-	            (cp >= 0x1680 && [0x1680, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000, 0xFEFF].indexOf(cp) >= 0);
-	    },
-	    // https://tc39.github.io/ecma262/#sec-line-terminators
-	    isLineTerminator: function (cp) {
-	        return (cp === 0x0A) || (cp === 0x0D) || (cp === 0x2028) || (cp === 0x2029);
-	    },
-	    // https://tc39.github.io/ecma262/#sec-names-and-keywords
-	    isIdentifierStart: function (cp) {
-	        return (cp === 0x24) || (cp === 0x5F) ||
-	            (cp >= 0x41 && cp <= 0x5A) ||
-	            (cp >= 0x61 && cp <= 0x7A) ||
-	            (cp === 0x5C) ||
-	            ((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(exports.Character.fromCodePoint(cp)));
-	    },
-	    isIdentifierPart: function (cp) {
-	        return (cp === 0x24) || (cp === 0x5F) ||
-	            (cp >= 0x41 && cp <= 0x5A) ||
-	            (cp >= 0x61 && cp <= 0x7A) ||
-	            (cp >= 0x30 && cp <= 0x39) ||
-	            (cp === 0x5C) ||
-	            ((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(exports.Character.fromCodePoint(cp)));
-	    },
-	    // https://tc39.github.io/ecma262/#sec-literals-numeric-literals
-	    isDecimalDigit: function (cp) {
-	        return (cp >= 0x30 && cp <= 0x39); // 0..9
-	    },
-	    isHexDigit: function (cp) {
-	        return (cp >= 0x30 && cp <= 0x39) ||
-	            (cp >= 0x41 && cp <= 0x46) ||
-	            (cp >= 0x61 && cp <= 0x66); // a..f
-	    },
-	    isOctalDigit: function (cp) {
-	        return (cp >= 0x30 && cp <= 0x37); // 0..7
-	    }
-	};
-
-
-/***/ },
-/* 5 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var jsx_syntax_1 = __webpack_require__(6);
-	/* tslint:disable:max-classes-per-file */
-	var JSXClosingElement = (function () {
-	    function JSXClosingElement(name) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXClosingElement;
-	        this.name = name;
-	    }
-	    return JSXClosingElement;
-	}());
-	exports.JSXClosingElement = JSXClosingElement;
-	var JSXElement = (function () {
-	    function JSXElement(openingElement, children, closingElement) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXElement;
-	        this.openingElement = openingElement;
-	        this.children = children;
-	        this.closingElement = closingElement;
-	    }
-	    return JSXElement;
-	}());
-	exports.JSXElement = JSXElement;
-	var JSXEmptyExpression = (function () {
-	    function JSXEmptyExpression() {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXEmptyExpression;
-	    }
-	    return JSXEmptyExpression;
-	}());
-	exports.JSXEmptyExpression = JSXEmptyExpression;
-	var JSXExpressionContainer = (function () {
-	    function JSXExpressionContainer(expression) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXExpressionContainer;
-	        this.expression = expression;
-	    }
-	    return JSXExpressionContainer;
-	}());
-	exports.JSXExpressionContainer = JSXExpressionContainer;
-	var JSXIdentifier = (function () {
-	    function JSXIdentifier(name) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXIdentifier;
-	        this.name = name;
-	    }
-	    return JSXIdentifier;
-	}());
-	exports.JSXIdentifier = JSXIdentifier;
-	var JSXMemberExpression = (function () {
-	    function JSXMemberExpression(object, property) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXMemberExpression;
-	        this.object = object;
-	        this.property = property;
-	    }
-	    return JSXMemberExpression;
-	}());
-	exports.JSXMemberExpression = JSXMemberExpression;
-	var JSXAttribute = (function () {
-	    function JSXAttribute(name, value) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXAttribute;
-	        this.name = name;
-	        this.value = value;
-	    }
-	    return JSXAttribute;
-	}());
-	exports.JSXAttribute = JSXAttribute;
-	var JSXNamespacedName = (function () {
-	    function JSXNamespacedName(namespace, name) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXNamespacedName;
-	        this.namespace = namespace;
-	        this.name = name;
-	    }
-	    return JSXNamespacedName;
-	}());
-	exports.JSXNamespacedName = JSXNamespacedName;
-	var JSXOpeningElement = (function () {
-	    function JSXOpeningElement(name, selfClosing, attributes) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXOpeningElement;
-	        this.name = name;
-	        this.selfClosing = selfClosing;
-	        this.attributes = attributes;
-	    }
-	    return JSXOpeningElement;
-	}());
-	exports.JSXOpeningElement = JSXOpeningElement;
-	var JSXSpreadAttribute = (function () {
-	    function JSXSpreadAttribute(argument) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXSpreadAttribute;
-	        this.argument = argument;
-	    }
-	    return JSXSpreadAttribute;
-	}());
-	exports.JSXSpreadAttribute = JSXSpreadAttribute;
-	var JSXText = (function () {
-	    function JSXText(value, raw) {
-	        this.type = jsx_syntax_1.JSXSyntax.JSXText;
-	        this.value = value;
-	        this.raw = raw;
-	    }
-	    return JSXText;
-	}());
-	exports.JSXText = JSXText;
-
-
-/***/ },
-/* 6 */
-/***/ function(module, exports) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.JSXSyntax = {
-	    JSXAttribute: 'JSXAttribute',
-	    JSXClosingElement: 'JSXClosingElement',
-	    JSXElement: 'JSXElement',
-	    JSXEmptyExpression: 'JSXEmptyExpression',
-	    JSXExpressionContainer: 'JSXExpressionContainer',
-	    JSXIdentifier: 'JSXIdentifier',
-	    JSXMemberExpression: 'JSXMemberExpression',
-	    JSXNamespacedName: 'JSXNamespacedName',
-	    JSXOpeningElement: 'JSXOpeningElement',
-	    JSXSpreadAttribute: 'JSXSpreadAttribute',
-	    JSXText: 'JSXText'
-	};
-
-
-/***/ },
-/* 7 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var syntax_1 = __webpack_require__(2);
-	/* tslint:disable:max-classes-per-file */
-	var ArrayExpression = (function () {
-	    function ArrayExpression(elements) {
-	        this.type = syntax_1.Syntax.ArrayExpression;
-	        this.elements = elements;
-	    }
-	    return ArrayExpression;
-	}());
-	exports.ArrayExpression = ArrayExpression;
-	var ArrayPattern = (function () {
-	    function ArrayPattern(elements) {
-	        this.type = syntax_1.Syntax.ArrayPattern;
-	        this.elements = elements;
-	    }
-	    return ArrayPattern;
-	}());
-	exports.ArrayPattern = ArrayPattern;
-	var ArrowFunctionExpression = (function () {
-	    function ArrowFunctionExpression(params, body, expression) {
-	        this.type = syntax_1.Syntax.ArrowFunctionExpression;
-	        this.id = null;
-	        this.params = params;
-	        this.body = body;
-	        this.generator = false;
-	        this.expression = expression;
-	        this.async = false;
-	    }
-	    return ArrowFunctionExpression;
-	}());
-	exports.ArrowFunctionExpression = ArrowFunctionExpression;
-	var AssignmentExpression = (function () {
-	    function AssignmentExpression(operator, left, right) {
-	        this.type = syntax_1.Syntax.AssignmentExpression;
-	        this.operator = operator;
-	        this.left = left;
-	        this.right = right;
-	    }
-	    return AssignmentExpression;
-	}());
-	exports.AssignmentExpression = AssignmentExpression;
-	var AssignmentPattern = (function () {
-	    function AssignmentPattern(left, right) {
-	        this.type = syntax_1.Syntax.AssignmentPattern;
-	        this.left = left;
-	        this.right = right;
-	    }
-	    return AssignmentPattern;
-	}());
-	exports.AssignmentPattern = AssignmentPattern;
-	var AsyncArrowFunctionExpression = (function () {
-	    function AsyncArrowFunctionExpression(params, body, expression) {
-	        this.type = syntax_1.Syntax.ArrowFunctionExpression;
-	        this.id = null;
-	        this.params = params;
-	        this.body = body;
-	        this.generator = false;
-	        this.expression = expression;
-	        this.async = true;
-	    }
-	    return AsyncArrowFunctionExpression;
-	}());
-	exports.AsyncArrowFunctionExpression = AsyncArrowFunctionExpression;
-	var AsyncFunctionDeclaration = (function () {
-	    function AsyncFunctionDeclaration(id, params, body) {
-	        this.type = syntax_1.Syntax.FunctionDeclaration;
-	        this.id = id;
-	        this.params = params;
-	        this.body = body;
-	        this.generator = false;
-	        this.expression = false;
-	        this.async = true;
-	    }
-	    return AsyncFunctionDeclaration;
-	}());
-	exports.AsyncFunctionDeclaration = AsyncFunctionDeclaration;
-	var AsyncFunctionExpression = (function () {
-	    function AsyncFunctionExpression(id, params, body) {
-	        this.type = syntax_1.Syntax.FunctionExpression;
-	        this.id = id;
-	        this.params = params;
-	        this.body = body;
-	        this.generator = false;
-	        this.expression = false;
-	        this.async = true;
-	    }
-	    return AsyncFunctionExpression;
-	}());
-	exports.AsyncFunctionExpression = AsyncFunctionExpression;
-	var AwaitExpression = (function () {
-	    function AwaitExpression(argument) {
-	        this.type = syntax_1.Syntax.AwaitExpression;
-	        this.argument = argument;
-	    }
-	    return AwaitExpression;
-	}());
-	exports.AwaitExpression = AwaitExpression;
-	var BinaryExpression = (function () {
-	    function BinaryExpression(operator, left, right) {
-	        var logical = (operator === '||' || operator === '&&');
-	        this.type = logical ? syntax_1.Syntax.LogicalExpression : syntax_1.Syntax.BinaryExpression;
-	        this.operator = operator;
-	        this.left = left;
-	        this.right = right;
-	    }
-	    return BinaryExpression;
-	}());
-	exports.BinaryExpression = BinaryExpression;
-	var BlockStatement = (function () {
-	    function BlockStatement(body) {
-	        this.type = syntax_1.Syntax.BlockStatement;
-	        this.body = body;
-	    }
-	    return BlockStatement;
-	}());
-	exports.BlockStatement = BlockStatement;
-	var BreakStatement = (function () {
-	    function BreakStatement(label) {
-	        this.type = syntax_1.Syntax.BreakStatement;
-	        this.label = label;
-	    }
-	    return BreakStatement;
-	}());
-	exports.BreakStatement = BreakStatement;
-	var CallExpression = (function () {
-	    function CallExpression(callee, args) {
-	        this.type = syntax_1.Syntax.CallExpression;
-	        this.callee = callee;
-	        this.arguments = args;
-	    }
-	    return CallExpression;
-	}());
-	exports.CallExpression = CallExpression;
-	var CatchClause = (function () {
-	    function CatchClause(param, body) {
-	        this.type = syntax_1.Syntax.CatchClause;
-	        this.param = param;
-	        this.body = body;
-	    }
-	    return CatchClause;
-	}());
-	exports.CatchClause = CatchClause;
-	var ClassBody = (function () {
-	    function ClassBody(body) {
-	        this.type = syntax_1.Syntax.ClassBody;
-	        this.body = body;
-	    }
-	    return ClassBody;
-	}());
-	exports.ClassBody = ClassBody;
-	var ClassDeclaration = (function () {
-	    function ClassDeclaration(id, superClass, body) {
-	        this.type = syntax_1.Syntax.ClassDeclaration;
-	        this.id = id;
-	        this.superClass = superClass;
-	        this.body = body;
-	    }
-	    return ClassDeclaration;
-	}());
-	exports.ClassDeclaration = ClassDeclaration;
-	var ClassExpression = (function () {
-	    function ClassExpression(id, superClass, body) {
-	        this.type = syntax_1.Syntax.ClassExpression;
-	        this.id = id;
-	        this.superClass = superClass;
-	        this.body = body;
-	    }
-	    return ClassExpression;
-	}());
-	exports.ClassExpression = ClassExpression;
-	var ComputedMemberExpression = (function () {
-	    function ComputedMemberExpression(object, property) {
-	        this.type = syntax_1.Syntax.MemberExpression;
-	        this.computed = true;
-	        this.object = object;
-	        this.property = property;
-	    }
-	    return ComputedMemberExpression;
-	}());
-	exports.ComputedMemberExpression = ComputedMemberExpression;
-	var ConditionalExpression = (function () {
-	    function ConditionalExpression(test, consequent, alternate) {
-	        this.type = syntax_1.Syntax.ConditionalExpression;
-	        this.test = test;
-	        this.consequent = consequent;
-	        this.alternate = alternate;
-	    }
-	    return ConditionalExpression;
-	}());
-	exports.ConditionalExpression = ConditionalExpression;
-	var ContinueStatement = (function () {
-	    function ContinueStatement(label) {
-	        this.type = syntax_1.Syntax.ContinueStatement;
-	        this.label = label;
-	    }
-	    return ContinueStatement;
-	}());
-	exports.ContinueStatement = ContinueStatement;
-	var DebuggerStatement = (function () {
-	    function DebuggerStatement() {
-	        this.type = syntax_1.Syntax.DebuggerStatement;
-	    }
-	    return DebuggerStatement;
-	}());
-	exports.DebuggerStatement = DebuggerStatement;
-	var Directive = (function () {
-	    function Directive(expression, directive) {
-	        this.type = syntax_1.Syntax.ExpressionStatement;
-	        this.expression = expression;
-	        this.directive = directive;
-	    }
-	    return Directive;
-	}());
-	exports.Directive = Directive;
-	var DoWhileStatement = (function () {
-	    function DoWhileStatement(body, test) {
-	        this.type = syntax_1.Syntax.DoWhileStatement;
-	        this.body = body;
-	        this.test = test;
-	    }
-	    return DoWhileStatement;
-	}());
-	exports.DoWhileStatement = DoWhileStatement;
-	var EmptyStatement = (function () {
-	    function EmptyStatement() {
-	        this.type = syntax_1.Syntax.EmptyStatement;
-	    }
-	    return EmptyStatement;
-	}());
-	exports.EmptyStatement = EmptyStatement;
-	var ExportAllDeclaration = (function () {
-	    function ExportAllDeclaration(source) {
-	        this.type = syntax_1.Syntax.ExportAllDeclaration;
-	        this.source = source;
-	    }
-	    return ExportAllDeclaration;
-	}());
-	exports.ExportAllDeclaration = ExportAllDeclaration;
-	var ExportDefaultDeclaration = (function () {
-	    function ExportDefaultDeclaration(declaration) {
-	        this.type = syntax_1.Syntax.ExportDefaultDeclaration;
-	        this.declaration = declaration;
-	    }
-	    return ExportDefaultDeclaration;
-	}());
-	exports.ExportDefaultDeclaration = ExportDefaultDeclaration;
-	var ExportNamedDeclaration = (function () {
-	    function ExportNamedDeclaration(declaration, specifiers, source) {
-	        this.type = syntax_1.Syntax.ExportNamedDeclaration;
-	        this.declaration = declaration;
-	        this.specifiers = specifiers;
-	        this.source = source;
-	    }
-	    return ExportNamedDeclaration;
-	}());
-	exports.ExportNamedDeclaration = ExportNamedDeclaration;
-	var ExportSpecifier = (function () {
-	    function ExportSpecifier(local, exported) {
-	        this.type = syntax_1.Syntax.ExportSpecifier;
-	        this.exported = exported;
-	        this.local = local;
-	    }
-	    return ExportSpecifier;
-	}());
-	exports.ExportSpecifier = ExportSpecifier;
-	var ExpressionStatement = (function () {
-	    function ExpressionStatement(expression) {
-	        this.type = syntax_1.Syntax.ExpressionStatement;
-	        this.expression = expression;
-	    }
-	    return ExpressionStatement;
-	}());
-	exports.ExpressionStatement = ExpressionStatement;
-	var ForInStatement = (function () {
-	    function ForInStatement(left, right, body) {
-	        this.type = syntax_1.Syntax.ForInStatement;
-	        this.left = left;
-	        this.right = right;
-	        this.body = body;
-	        this.each = false;
-	    }
-	    return ForInStatement;
-	}());
-	exports.ForInStatement = ForInStatement;
-	var ForOfStatement = (function () {
-	    function ForOfStatement(left, right, body) {
-	        this.type = syntax_1.Syntax.ForOfStatement;
-	        this.left = left;
-	        this.right = right;
-	        this.body = body;
-	    }
-	    return ForOfStatement;
-	}());
-	exports.ForOfStatement = ForOfStatement;
-	var ForStatement = (function () {
-	    function ForStatement(init, test, update, body) {
-	        this.type = syntax_1.Syntax.ForStatement;
-	        this.init = init;
-	        this.test = test;
-	        this.update = update;
-	        this.body = body;
-	    }
-	    return ForStatement;
-	}());
-	exports.ForStatement = ForStatement;
-	var FunctionDeclaration = (function () {
-	    function FunctionDeclaration(id, params, body, generator) {
-	        this.type = syntax_1.Syntax.FunctionDeclaration;
-	        this.id = id;
-	        this.params = params;
-	        this.body = body;
-	        this.generator = generator;
-	        this.expression = false;
-	        this.async = false;
-	    }
-	    return FunctionDeclaration;
-	}());
-	exports.FunctionDeclaration = FunctionDeclaration;
-	var FunctionExpression = (function () {
-	    function FunctionExpression(id, params, body, generator) {
-	        this.type = syntax_1.Syntax.FunctionExpression;
-	        this.id = id;
-	        this.params = params;
-	        this.body = body;
-	        this.generator = generator;
-	        this.expression = false;
-	        this.async = false;
-	    }
-	    return FunctionExpression;
-	}());
-	exports.FunctionExpression = FunctionExpression;
-	var Identifier = (function () {
-	    function Identifier(name) {
-	        this.type = syntax_1.Syntax.Identifier;
-	        this.name = name;
-	    }
-	    return Identifier;
-	}());
-	exports.Identifier = Identifier;
-	var IfStatement = (function () {
-	    function IfStatement(test, consequent, alternate) {
-	        this.type = syntax_1.Syntax.IfStatement;
-	        this.test = test;
-	        this.consequent = consequent;
-	        this.alternate = alternate;
-	    }
-	    return IfStatement;
-	}());
-	exports.IfStatement = IfStatement;
-	var ImportDeclaration = (function () {
-	    function ImportDeclaration(specifiers, source) {
-	        this.type = syntax_1.Syntax.ImportDeclaration;
-	        this.specifiers = specifiers;
-	        this.source = source;
-	    }
-	    return ImportDeclaration;
-	}());
-	exports.ImportDeclaration = ImportDeclaration;
-	var ImportDefaultSpecifier = (function () {
-	    function ImportDefaultSpecifier(local) {
-	        this.type = syntax_1.Syntax.ImportDefaultSpecifier;
-	        this.local = local;
-	    }
-	    return ImportDefaultSpecifier;
-	}());
-	exports.ImportDefaultSpecifier = ImportDefaultSpecifier;
-	var ImportNamespaceSpecifier = (function () {
-	    function ImportNamespaceSpecifier(local) {
-	        this.type = syntax_1.Syntax.ImportNamespaceSpecifier;
-	        this.local = local;
-	    }
-	    return ImportNamespaceSpecifier;
-	}());
-	exports.ImportNamespaceSpecifier = ImportNamespaceSpecifier;
-	var ImportSpecifier = (function () {
-	    function ImportSpecifier(local, imported) {
-	        this.type = syntax_1.Syntax.ImportSpecifier;
-	        this.local = local;
-	        this.imported = imported;
-	    }
-	    return ImportSpecifier;
-	}());
-	exports.ImportSpecifier = ImportSpecifier;
-	var LabeledStatement = (function () {
-	    function LabeledStatement(label, body) {
-	        this.type = syntax_1.Syntax.LabeledStatement;
-	        this.label = label;
-	        this.body = body;
-	    }
-	    return LabeledStatement;
-	}());
-	exports.LabeledStatement = LabeledStatement;
-	var Literal = (function () {
-	    function Literal(value, raw) {
-	        this.type = syntax_1.Syntax.Literal;
-	        this.value = value;
-	        this.raw = raw;
-	    }
-	    return Literal;
-	}());
-	exports.Literal = Literal;
-	var MetaProperty = (function () {
-	    function MetaProperty(meta, property) {
-	        this.type = syntax_1.Syntax.MetaProperty;
-	        this.meta = meta;
-	        this.property = property;
-	    }
-	    return MetaProperty;
-	}());
-	exports.MetaProperty = MetaProperty;
-	var MethodDefinition = (function () {
-	    function MethodDefinition(key, computed, value, kind, isStatic) {
-	        this.type = syntax_1.Syntax.MethodDefinition;
-	        this.key = key;
-	        this.computed = computed;
-	        this.value = value;
-	        this.kind = kind;
-	        this.static = isStatic;
-	    }
-	    return MethodDefinition;
-	}());
-	exports.MethodDefinition = MethodDefinition;
-	var Module = (function () {
-	    function Module(body) {
-	        this.type = syntax_1.Syntax.Program;
-	        this.body = body;
-	        this.sourceType = 'module';
-	    }
-	    return Module;
-	}());
-	exports.Module = Module;
-	var NewExpression = (function () {
-	    function NewExpression(callee, args) {
-	        this.type = syntax_1.Syntax.NewExpression;
-	        this.callee = callee;
-	        this.arguments = args;
-	    }
-	    return NewExpression;
-	}());
-	exports.NewExpression = NewExpression;
-	var ObjectExpression = (function () {
-	    function ObjectExpression(properties) {
-	        this.type = syntax_1.Syntax.ObjectExpression;
-	        this.properties = properties;
-	    }
-	    return ObjectExpression;
-	}());
-	exports.ObjectExpression = ObjectExpression;
-	var ObjectPattern = (function () {
-	    function ObjectPattern(properties) {
-	        this.type = syntax_1.Syntax.ObjectPattern;
-	        this.properties = properties;
-	    }
-	    return ObjectPattern;
-	}());
-	exports.ObjectPattern = ObjectPattern;
-	var Property = (function () {
-	    function Property(kind, key, computed, value, method, shorthand) {
-	        this.type = syntax_1.Syntax.Property;
-	        this.key = key;
-	        this.computed = computed;
-	        this.value = value;
-	        this.kind = kind;
-	        this.method = method;
-	        this.shorthand = shorthand;
-	    }
-	    return Property;
-	}());
-	exports.Property = Property;
-	var RegexLiteral = (function () {
-	    function RegexLiteral(value, raw, pattern, flags) {
-	        this.type = syntax_1.Syntax.Literal;
-	        this.value = value;
-	        this.raw = raw;
-	        this.regex = { pattern: pattern, flags: flags };
-	    }
-	    return RegexLiteral;
-	}());
-	exports.RegexLiteral = RegexLiteral;
-	var RestElement = (function () {
-	    function RestElement(argument) {
-	        this.type = syntax_1.Syntax.RestElement;
-	        this.argument = argument;
-	    }
-	    return RestElement;
-	}());
-	exports.RestElement = RestElement;
-	var ReturnStatement = (function () {
-	    function ReturnStatement(argument) {
-	        this.type = syntax_1.Syntax.ReturnStatement;
-	        this.argument = argument;
-	    }
-	    return ReturnStatement;
-	}());
-	exports.ReturnStatement = ReturnStatement;
-	var Script = (function () {
-	    function Script(body) {
-	        this.type = syntax_1.Syntax.Program;
-	        this.body = body;
-	        this.sourceType = 'script';
-	    }
-	    return Script;
-	}());
-	exports.Script = Script;
-	var SequenceExpression = (function () {
-	    function SequenceExpression(expressions) {
-	        this.type = syntax_1.Syntax.SequenceExpression;
-	        this.expressions = expressions;
-	    }
-	    return SequenceExpression;
-	}());
-	exports.SequenceExpression = SequenceExpression;
-	var SpreadElement = (function () {
-	    function SpreadElement(argument) {
-	        this.type = syntax_1.Syntax.SpreadElement;
-	        this.argument = argument;
-	    }
-	    return SpreadElement;
-	}());
-	exports.SpreadElement = SpreadElement;
-	var StaticMemberExpression = (function () {
-	    function StaticMemberExpression(object, property) {
-	        this.type = syntax_1.Syntax.MemberExpression;
-	        this.computed = false;
-	        this.object = object;
-	        this.property = property;
-	    }
-	    return StaticMemberExpression;
-	}());
-	exports.StaticMemberExpression = StaticMemberExpression;
-	var Super = (function () {
-	    function Super() {
-	        this.type = syntax_1.Syntax.Super;
-	    }
-	    return Super;
-	}());
-	exports.Super = Super;
-	var SwitchCase = (function () {
-	    function SwitchCase(test, consequent) {
-	        this.type = syntax_1.Syntax.SwitchCase;
-	        this.test = test;
-	        this.consequent = consequent;
-	    }
-	    return SwitchCase;
-	}());
-	exports.SwitchCase = SwitchCase;
-	var SwitchStatement = (function () {
-	    function SwitchStatement(discriminant, cases) {
-	        this.type = syntax_1.Syntax.SwitchStatement;
-	        this.discriminant = discriminant;
-	        this.cases = cases;
-	    }
-	    return SwitchStatement;
-	}());
-	exports.SwitchStatement = SwitchStatement;
-	var TaggedTemplateExpression = (function () {
-	    function TaggedTemplateExpression(tag, quasi) {
-	        this.type = syntax_1.Syntax.TaggedTemplateExpression;
-	        this.tag = tag;
-	        this.quasi = quasi;
-	    }
-	    return TaggedTemplateExpression;
-	}());
-	exports.TaggedTemplateExpression = TaggedTemplateExpression;
-	var TemplateElement = (function () {
-	    function TemplateElement(value, tail) {
-	        this.type = syntax_1.Syntax.TemplateElement;
-	        this.value = value;
-	        this.tail = tail;
-	    }
-	    return TemplateElement;
-	}());
-	exports.TemplateElement = TemplateElement;
-	var TemplateLiteral = (function () {
-	    function TemplateLiteral(quasis, expressions) {
-	        this.type = syntax_1.Syntax.TemplateLiteral;
-	        this.quasis = quasis;
-	        this.expressions = expressions;
-	    }
-	    return TemplateLiteral;
-	}());
-	exports.TemplateLiteral = TemplateLiteral;
-	var ThisExpression = (function () {
-	    function ThisExpression() {
-	        this.type = syntax_1.Syntax.ThisExpression;
-	    }
-	    return ThisExpression;
-	}());
-	exports.ThisExpression = ThisExpression;
-	var ThrowStatement = (function () {
-	    function ThrowStatement(argument) {
-	        this.type = syntax_1.Syntax.ThrowStatement;
-	        this.argument = argument;
-	    }
-	    return ThrowStatement;
-	}());
-	exports.ThrowStatement = ThrowStatement;
-	var TryStatement = (function () {
-	    function TryStatement(block, handler, finalizer) {
-	        this.type = syntax_1.Syntax.TryStatement;
-	        this.block = block;
-	        this.handler = handler;
-	        this.finalizer = finalizer;
-	    }
-	    return TryStatement;
-	}());
-	exports.TryStatement = TryStatement;
-	var UnaryExpression = (function () {
-	    function UnaryExpression(operator, argument) {
-	        this.type = syntax_1.Syntax.UnaryExpression;
-	        this.operator = operator;
-	        this.argument = argument;
-	        this.prefix = true;
-	    }
-	    return UnaryExpression;
-	}());
-	exports.UnaryExpression = UnaryExpression;
-	var UpdateExpression = (function () {
-	    function UpdateExpression(operator, argument, prefix) {
-	        this.type = syntax_1.Syntax.UpdateExpression;
-	        this.operator = operator;
-	        this.argument = argument;
-	        this.prefix = prefix;
-	    }
-	    return UpdateExpression;
-	}());
-	exports.UpdateExpression = UpdateExpression;
-	var VariableDeclaration = (function () {
-	    function VariableDeclaration(declarations, kind) {
-	        this.type = syntax_1.Syntax.VariableDeclaration;
-	        this.declarations = declarations;
-	        this.kind = kind;
-	    }
-	    return VariableDeclaration;
-	}());
-	exports.VariableDeclaration = VariableDeclaration;
-	var VariableDeclarator = (function () {
-	    function VariableDeclarator(id, init) {
-	        this.type = syntax_1.Syntax.VariableDeclarator;
-	        this.id = id;
-	        this.init = init;
-	    }
-	    return VariableDeclarator;
-	}());
-	exports.VariableDeclarator = VariableDeclarator;
-	var WhileStatement = (function () {
-	    function WhileStatement(test, body) {
-	        this.type = syntax_1.Syntax.WhileStatement;
-	        this.test = test;
-	        this.body = body;
-	    }
-	    return WhileStatement;
-	}());
-	exports.WhileStatement = WhileStatement;
-	var WithStatement = (function () {
-	    function WithStatement(object, body) {
-	        this.type = syntax_1.Syntax.WithStatement;
-	        this.object = object;
-	        this.body = body;
-	    }
-	    return WithStatement;
-	}());
-	exports.WithStatement = WithStatement;
-	var YieldExpression = (function () {
-	    function YieldExpression(argument, delegate) {
-	        this.type = syntax_1.Syntax.YieldExpression;
-	        this.argument = argument;
-	        this.delegate = delegate;
-	    }
-	    return YieldExpression;
-	}());
-	exports.YieldExpression = YieldExpression;
-
-
-/***/ },
-/* 8 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var assert_1 = __webpack_require__(9);
-	var error_handler_1 = __webpack_require__(10);
-	var messages_1 = __webpack_require__(11);
-	var Node = __webpack_require__(7);
-	var scanner_1 = __webpack_require__(12);
-	var syntax_1 = __webpack_require__(2);
-	var token_1 = __webpack_require__(13);
-	var ArrowParameterPlaceHolder = 'ArrowParameterPlaceHolder';
-	var Parser = (function () {
-	    function Parser(code, options, delegate) {
-	        if (options === void 0) { options = {}; }
-	        this.config = {
-	            range: (typeof options.range === 'boolean') && options.range,
-	            loc: (typeof options.loc === 'boolean') && options.loc,
-	            source: null,
-	            tokens: (typeof options.tokens === 'boolean') && options.tokens,
-	            comment: (typeof options.comment === 'boolean') && options.comment,
-	            tolerant: (typeof options.tolerant === 'boolean') && options.tolerant
-	        };
-	        if (this.config.loc && options.source && options.source !== null) {
-	            this.config.source = String(options.source);
-	        }
-	        this.delegate = delegate;
-	        this.errorHandler = new error_handler_1.ErrorHandler();
-	        this.errorHandler.tolerant = this.config.tolerant;
-	        this.scanner = new scanner_1.Scanner(code, this.errorHandler);
-	        this.scanner.trackComment = this.config.comment;
-	        this.operatorPrecedence = {
-	            ')': 0,
-	            ';': 0,
-	            ',': 0,
-	            '=': 0,
-	            ']': 0,
-	            '||': 1,
-	            '&&': 2,
-	            '|': 3,
-	            '^': 4,
-	            '&': 5,
-	            '==': 6,
-	            '!=': 6,
-	            '===': 6,
-	            '!==': 6,
-	            '<': 7,
-	            '>': 7,
-	            '<=': 7,
-	            '>=': 7,
-	            '<<': 8,
-	            '>>': 8,
-	            '>>>': 8,
-	            '+': 9,
-	            '-': 9,
-	            '*': 11,
-	            '/': 11,
-	            '%': 11
-	        };
-	        this.lookahead = {
-	            type: 2 /* EOF */,
-	            value: '',
-	            lineNumber: this.scanner.lineNumber,
-	            lineStart: 0,
-	            start: 0,
-	            end: 0
-	        };
-	        this.hasLineTerminator = false;
-	        this.context = {
-	            isModule: false,
-	            await: false,
-	            allowIn: true,
-	            allowStrictDirective: true,
-	            allowYield: true,
-	            firstCoverInitializedNameError: null,
-	            isAssignmentTarget: false,
-	            isBindingElement: false,
-	            inFunctionBody: false,
-	            inIteration: false,
-	            inSwitch: false,
-	            labelSet: {},
-	            strict: false
-	        };
-	        this.tokens = [];
-	        this.startMarker = {
-	            index: 0,
-	            line: this.scanner.lineNumber,
-	            column: 0
-	        };
-	        this.lastMarker = {
-	            index: 0,
-	            line: this.scanner.lineNumber,
-	            column: 0
-	        };
-	        this.nextToken();
-	        this.lastMarker = {
-	            index: this.scanner.index,
-	            line: this.scanner.lineNumber,
-	            column: this.scanner.index - this.scanner.lineStart
-	        };
-	    }
-	    Parser.prototype.throwError = function (messageFormat) {
-	        var values = [];
-	        for (var _i = 1; _i < arguments.length; _i++) {
-	            values[_i - 1] = arguments[_i];
-	        }
-	        var args = Array.prototype.slice.call(arguments, 1);
-	        var msg = messageFormat.replace(/%(\d)/g, function (whole, idx) {
-	            assert_1.assert(idx < args.length, 'Message reference must be in range');
-	            return args[idx];
-	        });
-	        var index = this.lastMarker.index;
-	        var line = this.lastMarker.line;
-	        var column = this.lastMarker.column + 1;
-	        throw this.errorHandler.createError(index, line, column, msg);
-	    };
-	    Parser.prototype.tolerateError = function (messageFormat) {
-	        var values = [];
-	        for (var _i = 1; _i < arguments.length; _i++) {
-	            values[_i - 1] = arguments[_i];
-	        }
-	        var args = Array.prototype.slice.call(arguments, 1);
-	        var msg = messageFormat.replace(/%(\d)/g, function (whole, idx) {
-	            assert_1.assert(idx < args.length, 'Message reference must be in range');
-	            return args[idx];
-	        });
-	        var index = this.lastMarker.index;
-	        var line = this.scanner.lineNumber;
-	        var column = this.lastMarker.column + 1;
-	        this.errorHandler.tolerateError(index, line, column, msg);
-	    };
-	    // Throw an exception because of the token.
-	    Parser.prototype.unexpectedTokenError = function (token, message) {
-	        var msg = message || messages_1.Messages.UnexpectedToken;
-	        var value;
-	        if (token) {
-	            if (!message) {
-	                msg = (token.type === 2 /* EOF */) ? messages_1.Messages.UnexpectedEOS :
-	                    (token.type === 3 /* Identifier */) ? messages_1.Messages.UnexpectedIdentifier :
-	                        (token.type === 6 /* NumericLiteral */) ? messages_1.Messages.UnexpectedNumber :
-	                            (token.type === 8 /* StringLiteral */) ? messages_1.Messages.UnexpectedString :
-	                                (token.type === 10 /* Template */) ? messages_1.Messages.UnexpectedTemplate :
-	                                    messages_1.Messages.UnexpectedToken;
-	                if (token.type === 4 /* Keyword */) {
-	                    if (this.scanner.isFutureReservedWord(token.value)) {
-	                        msg = messages_1.Messages.UnexpectedReserved;
-	                    }
-	                    else if (this.context.strict && this.scanner.isStrictModeReservedWord(token.value)) {
-	                        msg = messages_1.Messages.StrictReservedWord;
-	                    }
-	                }
-	            }
-	            value = token.value;
-	        }
-	        else {
-	            value = 'ILLEGAL';
-	        }
-	        msg = msg.replace('%0', value);
-	        if (token && typeof token.lineNumber === 'number') {
-	            var index = token.start;
-	            var line = token.lineNumber;
-	            var lastMarkerLineStart = this.lastMarker.index - this.lastMarker.column;
-	            var column = token.start - lastMarkerLineStart + 1;
-	            return this.errorHandler.createError(index, line, column, msg);
-	        }
-	        else {
-	            var index = this.lastMarker.index;
-	            var line = this.lastMarker.line;
-	            var column = this.lastMarker.column + 1;
-	            return this.errorHandler.createError(index, line, column, msg);
-	        }
-	    };
-	    Parser.prototype.throwUnexpectedToken = function (token, message) {
-	        throw this.unexpectedTokenError(token, message);
-	    };
-	    Parser.prototype.tolerateUnexpectedToken = function (token, message) {
-	        this.errorHandler.tolerate(this.unexpectedTokenError(token, message));
-	    };
-	    Parser.prototype.collectComments = function () {
-	        if (!this.config.comment) {
-	            this.scanner.scanComments();
-	        }
-	        else {
-	            var comments = this.scanner.scanComments();
-	            if (comments.length > 0 && this.delegate) {
-	                for (var i = 0; i < comments.length; ++i) {
-	                    var e = comments[i];
-	                    var node = void 0;
-	                    node = {
-	                        type: e.multiLine ? 'BlockComment' : 'LineComment',
-	                        value: this.scanner.source.slice(e.slice[0], e.slice[1])
-	                    };
-	                    if (this.config.range) {
-	                        node.range = e.range;
-	                    }
-	                    if (this.config.loc) {
-	                        node.loc = e.loc;
-	                    }
-	                    var metadata = {
-	                        start: {
-	                            line: e.loc.start.line,
-	                            column: e.loc.start.column,
-	                            offset: e.range[0]
-	                        },
-	                        end: {
-	                            line: e.loc.end.line,
-	                            column: e.loc.end.column,
-	                            offset: e.range[1]
-	                        }
-	                    };
-	                    this.delegate(node, metadata);
-	                }
-	            }
-	        }
-	    };
-	    // From internal representation to an external structure
-	    Parser.prototype.getTokenRaw = function (token) {
-	        return this.scanner.source.slice(token.start, token.end);
-	    };
-	    Parser.prototype.convertToken = function (token) {
-	        var t = {
-	            type: token_1.TokenName[token.type],
-	            value: this.getTokenRaw(token)
-	        };
-	        if (this.config.range) {
-	            t.range = [token.start, token.end];
-	        }
-	        if (this.config.loc) {
-	            t.loc = {
-	                start: {
-	                    line: this.startMarker.line,
-	                    column: this.startMarker.column
-	                },
-	                end: {
-	                    line: this.scanner.lineNumber,
-	                    column: this.scanner.index - this.scanner.lineStart
-	                }
-	            };
-	        }
-	        if (token.type === 9 /* RegularExpression */) {
-	            var pattern = token.pattern;
-	            var flags = token.flags;
-	            t.regex = { pattern: pattern, flags: flags };
-	        }
-	        return t;
-	    };
-	    Parser.prototype.nextToken = function () {
-	        var token = this.lookahead;
-	        this.lastMarker.index = this.scanner.index;
-	        this.lastMarker.line = this.scanner.lineNumber;
-	        this.lastMarker.column = this.scanner.index - this.scanner.lineStart;
-	        this.collectComments();
-	        if (this.scanner.index !== this.startMarker.index) {
-	            this.startMarker.index = this.scanner.index;
-	            this.startMarker.line = this.scanner.lineNumber;
-	            this.startMarker.column = this.scanner.index - this.scanner.lineStart;
-	        }
-	        var next = this.scanner.lex();
-	        this.hasLineTerminator = (token.lineNumber !== next.lineNumber);
-	        if (next && this.context.strict && next.type === 3 /* Identifier */) {
-	            if (this.scanner.isStrictModeReservedWord(next.value)) {
-	                next.type = 4 /* Keyword */;
-	            }
-	        }
-	        this.lookahead = next;
-	        if (this.config.tokens && next.type !== 2 /* EOF */) {
-	            this.tokens.push(this.convertToken(next));
-	        }
-	        return token;
-	    };
-	    Parser.prototype.nextRegexToken = function () {
-	        this.collectComments();
-	        var token = this.scanner.scanRegExp();
-	        if (this.config.tokens) {
-	            // Pop the previous token, '/' or '/='
-	            // This is added from the lookahead token.
-	            this.tokens.pop();
-	            this.tokens.push(this.convertToken(token));
-	        }
-	        // Prime the next lookahead.
-	        this.lookahead = token;
-	        this.nextToken();
-	        return token;
-	    };
-	    Parser.prototype.createNode = function () {
-	        return {
-	            index: this.startMarker.index,
-	            line: this.startMarker.line,
-	            column: this.startMarker.column
-	        };
-	    };
-	    Parser.prototype.startNode = function (token, lastLineStart) {
-	        if (lastLineStart === void 0) { lastLineStart = 0; }
-	        var column = token.start - token.lineStart;
-	        var line = token.lineNumber;
-	        if (column < 0) {
-	            column += lastLineStart;
-	            line--;
-	        }
-	        return {
-	            index: token.start,
-	            line: line,
-	            column: column
-	        };
-	    };
-	    Parser.prototype.finalize = function (marker, node) {
-	        if (this.config.range) {
-	            node.range = [marker.index, this.lastMarker.index];
-	        }
-	        if (this.config.loc) {
-	            node.loc = {
-	                start: {
-	                    line: marker.line,
-	                    column: marker.column,
-	                },
-	                end: {
-	                    line: this.lastMarker.line,
-	                    column: this.lastMarker.column
-	                }
-	            };
-	            if (this.config.source) {
-	                node.loc.source = this.config.source;
-	            }
-	        }
-	        if (this.delegate) {
-	            var metadata = {
-	                start: {
-	                    line: marker.line,
-	                    column: marker.column,
-	                    offset: marker.index
-	                },
-	                end: {
-	                    line: this.lastMarker.line,
-	                    column: this.lastMarker.column,
-	                    offset: this.lastMarker.index
-	                }
-	            };
-	            this.delegate(node, metadata);
-	        }
-	        return node;
-	    };
-	    // Expect the next token to match the specified punctuator.
-	    // If not, an exception will be thrown.
-	    Parser.prototype.expect = function (value) {
-	        var token = this.nextToken();
-	        if (token.type !== 7 /* Punctuator */ || token.value !== value) {
-	            this.throwUnexpectedToken(token);
-	        }
-	    };
-	    // Quietly expect a comma when in tolerant mode, otherwise delegates to expect().
-	    Parser.prototype.expectCommaSeparator = function () {
-	        if (this.config.tolerant) {
-	            var token = this.lookahead;
-	            if (token.type === 7 /* Punctuator */ && token.value === ',') {
-	                this.nextToken();
-	            }
-	            else if (token.type === 7 /* Punctuator */ && token.value === ';') {
-	                this.nextToken();
-	                this.tolerateUnexpectedToken(token);
-	            }
-	            else {
-	                this.tolerateUnexpectedToken(token, messages_1.Messages.UnexpectedToken);
-	            }
-	        }
-	        else {
-	            this.expect(',');
-	        }
-	    };
-	    // Expect the next token to match the specified keyword.
-	    // If not, an exception will be thrown.
-	    Parser.prototype.expectKeyword = function (keyword) {
-	        var token = this.nextToken();
-	        if (token.type !== 4 /* Keyword */ || token.value !== keyword) {
-	            this.throwUnexpectedToken(token);
-	        }
-	    };
-	    // Return true if the next token matches the specified punctuator.
-	    Parser.prototype.match = function (value) {
-	        return this.lookahead.type === 7 /* Punctuator */ && this.lookahead.value === value;
-	    };
-	    // Return true if the next token matches the specified keyword
-	    Parser.prototype.matchKeyword = function (keyword) {
-	        return this.lookahead.type === 4 /* Keyword */ && this.lookahead.value === keyword;
-	    };
-	    // Return true if the next token matches the specified contextual keyword
-	    // (where an identifier is sometimes a keyword depending on the context)
-	    Parser.prototype.matchContextualKeyword = function (keyword) {
-	        return this.lookahead.type === 3 /* Identifier */ && this.lookahead.value === keyword;
-	    };
-	    // Return true if the next token is an assignment operator
-	    Parser.prototype.matchAssign = function () {
-	        if (this.lookahead.type !== 7 /* Punctuator */) {
-	            return false;
-	        }
-	        var op = this.lookahead.value;
-	        return op === '=' ||
-	            op === '*=' ||
-	            op === '**=' ||
-	            op === '/=' ||
-	            op === '%=' ||
-	            op === '+=' ||
-	            op === '-=' ||
-	            op === '<<=' ||
-	            op === '>>=' ||
-	            op === '>>>=' ||
-	            op === '&=' ||
-	            op === '^=' ||
-	            op === '|=';
-	    };
-	    // Cover grammar support.
-	    //
-	    // When an assignment expression position starts with an left parenthesis, the determination of the type
-	    // of the syntax is to be deferred arbitrarily long until the end of the parentheses pair (plus a lookahead)
-	    // or the first comma. This situation also defers the determination of all the expressions nested in the pair.
-	    //
-	    // There are three productions that can be parsed in a parentheses pair that needs to be determined
-	    // after the outermost pair is closed. They are:
-	    //
-	    //   1. AssignmentExpression
-	    //   2. BindingElements
-	    //   3. AssignmentTargets
-	    //
-	    // In order to avoid exponential backtracking, we use two flags to denote if the production can be
-	    // binding element or assignment target.
-	    //
-	    // The three productions have the relationship:
-	    //
-	    //   BindingElements ⊆ AssignmentTargets ⊆ AssignmentExpression
-	    //
-	    // with a single exception that CoverInitializedName when used directly in an Expression, generates
-	    // an early error. Therefore, we need the third state, firstCoverInitializedNameError, to track the
-	    // first usage of CoverInitializedName and report it when we reached the end of the parentheses pair.
-	    //
-	    // isolateCoverGrammar function runs the given parser function with a new cover grammar context, and it does not
-	    // effect the current flags. This means the production the parser parses is only used as an expression. Therefore
-	    // the CoverInitializedName check is conducted.
-	    //
-	    // inheritCoverGrammar function runs the given parse function with a new cover grammar context, and it propagates
-	    // the flags outside of the parser. This means the production the parser parses is used as a part of a potential
-	    // pattern. The CoverInitializedName check is deferred.
-	    Parser.prototype.isolateCoverGrammar = function (parseFunction) {
-	        var previousIsBindingElement = this.context.isBindingElement;
-	        var previousIsAssignmentTarget = this.context.isAssignmentTarget;
-	        var previousFirstCoverInitializedNameError = this.context.firstCoverInitializedNameError;
-	        this.context.isBindingElement = true;
-	        this.context.isAssignmentTarget = true;
-	        this.context.firstCoverInitializedNameError = null;
-	        var result = parseFunction.call(this);
-	        if (this.context.firstCoverInitializedNameError !== null) {
-	            this.throwUnexpectedToken(this.context.firstCoverInitializedNameError);
-	        }
-	        this.context.isBindingElement = previousIsBindingElement;
-	        this.context.isAssignmentTarget = previousIsAssignmentTarget;
-	        this.context.firstCoverInitializedNameError = previousFirstCoverInitializedNameError;
-	        return result;
-	    };
-	    Parser.prototype.inheritCoverGrammar = function (parseFunction) {
-	        var previousIsBindingElement = this.context.isBindingElement;
-	        var previousIsAssignmentTarget = this.context.isAssignmentTarget;
-	        var previousFirstCoverInitializedNameError = this.context.firstCoverInitializedNameError;
-	        this.context.isBindingElement = true;
-	        this.context.isAssignmentTarget = true;
-	        this.context.firstCoverInitializedNameError = null;
-	        var result = parseFunction.call(this);
-	        this.context.isBindingElement = this.context.isBindingElement && previousIsBindingElement;
-	        this.context.isAssignmentTarget = this.context.isAssignmentTarget && previousIsAssignmentTarget;
-	        this.context.firstCoverInitializedNameError = previousFirstCoverInitializedNameError || this.context.firstCoverInitializedNameError;
-	        return result;
-	    };
-	    Parser.prototype.consumeSemicolon = function () {
-	        if (this.match(';')) {
-	            this.nextToken();
-	        }
-	        else if (!this.hasLineTerminator) {
-	            if (this.lookahead.type !== 2 /* EOF */ && !this.match('}')) {
-	                this.throwUnexpectedToken(this.lookahead);
-	            }
-	            this.lastMarker.index = this.startMarker.index;
-	            this.lastMarker.line = this.startMarker.line;
-	            this.lastMarker.column = this.startMarker.column;
-	        }
-	    };
-	    // https://tc39.github.io/ecma262/#sec-primary-expression
-	    Parser.prototype.parsePrimaryExpression = function () {
-	        var node = this.createNode();
-	        var expr;
-	        var token, raw;
-	        switch (this.lookahead.type) {
-	            case 3 /* Identifier */:
-	                if ((this.context.isModule || this.context.await) && this.lookahead.value === 'await') {
-	                    this.tolerateUnexpectedToken(this.lookahead);
-	                }
-	                expr = this.matchAsyncFunction() ? this.parseFunctionExpression() : this.finalize(node, new Node.Identifier(this.nextToken().value));
-	                break;
-	            case 6 /* NumericLiteral */:
-	            case 8 /* StringLiteral */:
-	                if (this.context.strict && this.lookahead.octal) {
-	                    this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.StrictOctalLiteral);
-	                }
-	                this.context.isAssignmentTarget = false;
-	                this.context.isBindingElement = false;
-	                token = this.nextToken();
-	                raw = this.getTokenRaw(token);
-	                expr = this.finalize(node, new Node.Literal(token.value, raw));
-	                break;
-	            case 1 /* BooleanLiteral */:
-	                this.context.isAssignmentTarget = false;
-	                this.context.isBindingElement = false;
-	                token = this.nextToken();
-	                raw = this.getTokenRaw(token);
-	                expr = this.finalize(node, new Node.Literal(token.value === 'true', raw));
-	                break;
-	            case 5 /* NullLiteral */:
-	                this.context.isAssignmentTarget = false;
-	                this.context.isBindingElement = false;
-	                token = this.nextToken();
-	                raw = this.getTokenRaw(token);
-	                expr = this.finalize(node, new Node.Literal(null, raw));
-	                break;
-	            case 10 /* Template */:
-	                expr = this.parseTemplateLiteral();
-	                break;
-	            case 7 /* Punctuator */:
-	                switch (this.lookahead.value) {
-	                    case '(':
-	                        this.context.isBindingElement = false;
-	                        expr = this.inheritCoverGrammar(this.parseGroupExpression);
-	                        break;
-	                    case '[':
-	                        expr = this.inheritCoverGrammar(this.parseArrayInitializer);
-	                        break;
-	                    case '{':
-	                        expr = this.inheritCoverGrammar(this.parseObjectInitializer);
-	                        break;
-	                    case '/':
-	                    case '/=':
-	                        this.context.isAssignmentTarget = false;
-	                        this.context.isBindingElement = false;
-	                        this.scanner.index = this.startMarker.index;
-	                        token = this.nextRegexToken();
-	                        raw = this.getTokenRaw(token);
-	                        expr = this.finalize(node, new Node.RegexLiteral(token.regex, raw, token.pattern, token.flags));
-	                        break;
-	                    default:
-	                        expr = this.throwUnexpectedToken(this.nextToken());
-	                }
-	                break;
-	            case 4 /* Keyword */:
-	                if (!this.context.strict && this.context.allowYield && this.matchKeyword('yield')) {
-	                    expr = this.parseIdentifierName();
-	                }
-	                else if (!this.context.strict && this.matchKeyword('let')) {
-	                    expr = this.finalize(node, new Node.Identifier(this.nextToken().value));
-	                }
-	                else {
-	                    this.context.isAssignmentTarget = false;
-	                    this.context.isBindingElement = false;
-	                    if (this.matchKeyword('function')) {
-	                        expr = this.parseFunctionExpression();
-	                    }
-	                    else if (this.matchKeyword('this')) {
-	                        this.nextToken();
-	                        expr = this.finalize(node, new Node.ThisExpression());
-	                    }
-	                    else if (this.matchKeyword('class')) {
-	                        expr = this.parseClassExpression();
-	                    }
-	                    else {
-	                        expr = this.throwUnexpectedToken(this.nextToken());
-	                    }
-	                }
-	                break;
-	            default:
-	                expr = this.throwUnexpectedToken(this.nextToken());
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-array-initializer
-	    Parser.prototype.parseSpreadElement = function () {
-	        var node = this.createNode();
-	        this.expect('...');
-	        var arg = this.inheritCoverGrammar(this.parseAssignmentExpression);
-	        return this.finalize(node, new Node.SpreadElement(arg));
-	    };
-	    Parser.prototype.parseArrayInitializer = function () {
-	        var node = this.createNode();
-	        var elements = [];
-	        this.expect('[');
-	        while (!this.match(']')) {
-	            if (this.match(',')) {
-	                this.nextToken();
-	                elements.push(null);
-	            }
-	            else if (this.match('...')) {
-	                var element = this.parseSpreadElement();
-	                if (!this.match(']')) {
-	                    this.context.isAssignmentTarget = false;
-	                    this.context.isBindingElement = false;
-	                    this.expect(',');
-	                }
-	                elements.push(element);
-	            }
-	            else {
-	                elements.push(this.inheritCoverGrammar(this.parseAssignmentExpression));
-	                if (!this.match(']')) {
-	                    this.expect(',');
-	                }
-	            }
-	        }
-	        this.expect(']');
-	        return this.finalize(node, new Node.ArrayExpression(elements));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-object-initializer
-	    Parser.prototype.parsePropertyMethod = function (params) {
-	        this.context.isAssignmentTarget = false;
-	        this.context.isBindingElement = false;
-	        var previousStrict = this.context.strict;
-	        var previousAllowStrictDirective = this.context.allowStrictDirective;
-	        this.context.allowStrictDirective = params.simple;
-	        var body = this.isolateCoverGrammar(this.parseFunctionSourceElements);
-	        if (this.context.strict && params.firstRestricted) {
-	            this.tolerateUnexpectedToken(params.firstRestricted, params.message);
-	        }
-	        if (this.context.strict && params.stricted) {
-	            this.tolerateUnexpectedToken(params.stricted, params.message);
-	        }
-	        this.context.strict = previousStrict;
-	        this.context.allowStrictDirective = previousAllowStrictDirective;
-	        return body;
-	    };
-	    Parser.prototype.parsePropertyMethodFunction = function () {
-	        var isGenerator = false;
-	        var node = this.createNode();
-	        var previousAllowYield = this.context.allowYield;
-	        this.context.allowYield = true;
-	        var params = this.parseFormalParameters();
-	        var method = this.parsePropertyMethod(params);
-	        this.context.allowYield = previousAllowYield;
-	        return this.finalize(node, new Node.FunctionExpression(null, params.params, method, isGenerator));
-	    };
-	    Parser.prototype.parsePropertyMethodAsyncFunction = function () {
-	        var node = this.createNode();
-	        var previousAllowYield = this.context.allowYield;
-	        var previousAwait = this.context.await;
-	        this.context.allowYield = false;
-	        this.context.await = true;
-	        var params = this.parseFormalParameters();
-	        var method = this.parsePropertyMethod(params);
-	        this.context.allowYield = previousAllowYield;
-	        this.context.await = previousAwait;
-	        return this.finalize(node, new Node.AsyncFunctionExpression(null, params.params, method));
-	    };
-	    Parser.prototype.parseObjectPropertyKey = function () {
-	        var node = this.createNode();
-	        var token = this.nextToken();
-	        var key;
-	        switch (token.type) {
-	            case 8 /* StringLiteral */:
-	            case 6 /* NumericLiteral */:
-	                if (this.context.strict && token.octal) {
-	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictOctalLiteral);
-	                }
-	                var raw = this.getTokenRaw(token);
-	                key = this.finalize(node, new Node.Literal(token.value, raw));
-	                break;
-	            case 3 /* Identifier */:
-	            case 1 /* BooleanLiteral */:
-	            case 5 /* NullLiteral */:
-	            case 4 /* Keyword */:
-	                key = this.finalize(node, new Node.Identifier(token.value));
-	                break;
-	            case 7 /* Punctuator */:
-	                if (token.value === '[') {
-	                    key = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	                    this.expect(']');
-	                }
-	                else {
-	                    key = this.throwUnexpectedToken(token);
-	                }
-	                break;
-	            default:
-	                key = this.throwUnexpectedToken(token);
-	        }
-	        return key;
-	    };
-	    Parser.prototype.isPropertyKey = function (key, value) {
-	        return (key.type === syntax_1.Syntax.Identifier && key.name === value) ||
-	            (key.type === syntax_1.Syntax.Literal && key.value === value);
-	    };
-	    Parser.prototype.parseObjectProperty = function (hasProto) {
-	        var node = this.createNode();
-	        var token = this.lookahead;
-	        var kind;
-	        var key = null;
-	        var value = null;
-	        var computed = false;
-	        var method = false;
-	        var shorthand = false;
-	        var isAsync = false;
-	        if (token.type === 3 /* Identifier */) {
-	            var id = token.value;
-	            this.nextToken();
-	            computed = this.match('[');
-	            isAsync = !this.hasLineTerminator && (id === 'async') &&
-	                !this.match(':') && !this.match('(') && !this.match('*') && !this.match(',');
-	            key = isAsync ? this.parseObjectPropertyKey() : this.finalize(node, new Node.Identifier(id));
-	        }
-	        else if (this.match('*')) {
-	            this.nextToken();
-	        }
-	        else {
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	        }
-	        var lookaheadPropertyKey = this.qualifiedPropertyName(this.lookahead);
-	        if (token.type === 3 /* Identifier */ && !isAsync && token.value === 'get' && lookaheadPropertyKey) {
-	            kind = 'get';
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	            this.context.allowYield = false;
-	            value = this.parseGetterMethod();
-	        }
-	        else if (token.type === 3 /* Identifier */ && !isAsync && token.value === 'set' && lookaheadPropertyKey) {
-	            kind = 'set';
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	            value = this.parseSetterMethod();
-	        }
-	        else if (token.type === 7 /* Punctuator */ && token.value === '*' && lookaheadPropertyKey) {
-	            kind = 'init';
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	            value = this.parseGeneratorMethod();
-	            method = true;
-	        }
-	        else {
-	            if (!key) {
-	                this.throwUnexpectedToken(this.lookahead);
-	            }
-	            kind = 'init';
-	            if (this.match(':') && !isAsync) {
-	                if (!computed && this.isPropertyKey(key, '__proto__')) {
-	                    if (hasProto.value) {
-	                        this.tolerateError(messages_1.Messages.DuplicateProtoProperty);
-	                    }
-	                    hasProto.value = true;
-	                }
-	                this.nextToken();
-	                value = this.inheritCoverGrammar(this.parseAssignmentExpression);
-	            }
-	            else if (this.match('(')) {
-	                value = isAsync ? this.parsePropertyMethodAsyncFunction() : this.parsePropertyMethodFunction();
-	                method = true;
-	            }
-	            else if (token.type === 3 /* Identifier */) {
-	                var id = this.finalize(node, new Node.Identifier(token.value));
-	                if (this.match('=')) {
-	                    this.context.firstCoverInitializedNameError = this.lookahead;
-	                    this.nextToken();
-	                    shorthand = true;
-	                    var init = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	                    value = this.finalize(node, new Node.AssignmentPattern(id, init));
-	                }
-	                else {
-	                    shorthand = true;
-	                    value = id;
-	                }
-	            }
-	            else {
-	                this.throwUnexpectedToken(this.nextToken());
-	            }
-	        }
-	        return this.finalize(node, new Node.Property(kind, key, computed, value, method, shorthand));
-	    };
-	    Parser.prototype.parseObjectInitializer = function () {
-	        var node = this.createNode();
-	        this.expect('{');
-	        var properties = [];
-	        var hasProto = { value: false };
-	        while (!this.match('}')) {
-	            properties.push(this.parseObjectProperty(hasProto));
-	            if (!this.match('}')) {
-	                this.expectCommaSeparator();
-	            }
-	        }
-	        this.expect('}');
-	        return this.finalize(node, new Node.ObjectExpression(properties));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-template-literals
-	    Parser.prototype.parseTemplateHead = function () {
-	        assert_1.assert(this.lookahead.head, 'Template literal must start with a template head');
-	        var node = this.createNode();
-	        var token = this.nextToken();
-	        var raw = token.value;
-	        var cooked = token.cooked;
-	        return this.finalize(node, new Node.TemplateElement({ raw: raw, cooked: cooked }, token.tail));
-	    };
-	    Parser.prototype.parseTemplateElement = function () {
-	        if (this.lookahead.type !== 10 /* Template */) {
-	            this.throwUnexpectedToken();
-	        }
-	        var node = this.createNode();
-	        var token = this.nextToken();
-	        var raw = token.value;
-	        var cooked = token.cooked;
-	        return this.finalize(node, new Node.TemplateElement({ raw: raw, cooked: cooked }, token.tail));
-	    };
-	    Parser.prototype.parseTemplateLiteral = function () {
-	        var node = this.createNode();
-	        var expressions = [];
-	        var quasis = [];
-	        var quasi = this.parseTemplateHead();
-	        quasis.push(quasi);
-	        while (!quasi.tail) {
-	            expressions.push(this.parseExpression());
-	            quasi = this.parseTemplateElement();
-	            quasis.push(quasi);
-	        }
-	        return this.finalize(node, new Node.TemplateLiteral(quasis, expressions));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-grouping-operator
-	    Parser.prototype.reinterpretExpressionAsPattern = function (expr) {
-	        switch (expr.type) {
-	            case syntax_1.Syntax.Identifier:
-	            case syntax_1.Syntax.MemberExpression:
-	            case syntax_1.Syntax.RestElement:
-	            case syntax_1.Syntax.AssignmentPattern:
-	                break;
-	            case syntax_1.Syntax.SpreadElement:
-	                expr.type = syntax_1.Syntax.RestElement;
-	                this.reinterpretExpressionAsPattern(expr.argument);
-	                break;
-	            case syntax_1.Syntax.ArrayExpression:
-	                expr.type = syntax_1.Syntax.ArrayPattern;
-	                for (var i = 0; i < expr.elements.length; i++) {
-	                    if (expr.elements[i] !== null) {
-	                        this.reinterpretExpressionAsPattern(expr.elements[i]);
-	                    }
-	                }
-	                break;
-	            case syntax_1.Syntax.ObjectExpression:
-	                expr.type = syntax_1.Syntax.ObjectPattern;
-	                for (var i = 0; i < expr.properties.length; i++) {
-	                    this.reinterpretExpressionAsPattern(expr.properties[i].value);
-	                }
-	                break;
-	            case syntax_1.Syntax.AssignmentExpression:
-	                expr.type = syntax_1.Syntax.AssignmentPattern;
-	                delete expr.operator;
-	                this.reinterpretExpressionAsPattern(expr.left);
-	                break;
-	            default:
-	                // Allow other node type for tolerant parsing.
-	                break;
-	        }
-	    };
-	    Parser.prototype.parseGroupExpression = function () {
-	        var expr;
-	        this.expect('(');
-	        if (this.match(')')) {
-	            this.nextToken();
-	            if (!this.match('=>')) {
-	                this.expect('=>');
-	            }
-	            expr = {
-	                type: ArrowParameterPlaceHolder,
-	                params: [],
-	                async: false
-	            };
-	        }
-	        else {
-	            var startToken = this.lookahead;
-	            var params = [];
-	            if (this.match('...')) {
-	                expr = this.parseRestElement(params);
-	                this.expect(')');
-	                if (!this.match('=>')) {
-	                    this.expect('=>');
-	                }
-	                expr = {
-	                    type: ArrowParameterPlaceHolder,
-	                    params: [expr],
-	                    async: false
-	                };
-	            }
-	            else {
-	                var arrow = false;
-	                this.context.isBindingElement = true;
-	                expr = this.inheritCoverGrammar(this.parseAssignmentExpression);
-	                if (this.match(',')) {
-	                    var expressions = [];
-	                    this.context.isAssignmentTarget = false;
-	                    expressions.push(expr);
-	                    while (this.lookahead.type !== 2 /* EOF */) {
-	                        if (!this.match(',')) {
-	                            break;
-	                        }
-	                        this.nextToken();
-	                        if (this.match(')')) {
-	                            this.nextToken();
-	                            for (var i = 0; i < expressions.length; i++) {
-	                                this.reinterpretExpressionAsPattern(expressions[i]);
-	                            }
-	                            arrow = true;
-	                            expr = {
-	                                type: ArrowParameterPlaceHolder,
-	                                params: expressions,
-	                                async: false
-	                            };
-	                        }
-	                        else if (this.match('...')) {
-	                            if (!this.context.isBindingElement) {
-	                                this.throwUnexpectedToken(this.lookahead);
-	                            }
-	                            expressions.push(this.parseRestElement(params));
-	                            this.expect(')');
-	                            if (!this.match('=>')) {
-	                                this.expect('=>');
-	                            }
-	                            this.context.isBindingElement = false;
-	                            for (var i = 0; i < expressions.length; i++) {
-	                                this.reinterpretExpressionAsPattern(expressions[i]);
-	                            }
-	                            arrow = true;
-	                            expr = {
-	                                type: ArrowParameterPlaceHolder,
-	                                params: expressions,
-	                                async: false
-	                            };
-	                        }
-	                        else {
-	                            expressions.push(this.inheritCoverGrammar(this.parseAssignmentExpression));
-	                        }
-	                        if (arrow) {
-	                            break;
-	                        }
-	                    }
-	                    if (!arrow) {
-	                        expr = this.finalize(this.startNode(startToken), new Node.SequenceExpression(expressions));
-	                    }
-	                }
-	                if (!arrow) {
-	                    this.expect(')');
-	                    if (this.match('=>')) {
-	                        if (expr.type === syntax_1.Syntax.Identifier && expr.name === 'yield') {
-	                            arrow = true;
-	                            expr = {
-	                                type: ArrowParameterPlaceHolder,
-	                                params: [expr],
-	                                async: false
-	                            };
-	                        }
-	                        if (!arrow) {
-	                            if (!this.context.isBindingElement) {
-	                                this.throwUnexpectedToken(this.lookahead);
-	                            }
-	                            if (expr.type === syntax_1.Syntax.SequenceExpression) {
-	                                for (var i = 0; i < expr.expressions.length; i++) {
-	                                    this.reinterpretExpressionAsPattern(expr.expressions[i]);
-	                                }
-	                            }
-	                            else {
-	                                this.reinterpretExpressionAsPattern(expr);
-	                            }
-	                            var parameters = (expr.type === syntax_1.Syntax.SequenceExpression ? expr.expressions : [expr]);
-	                            expr = {
-	                                type: ArrowParameterPlaceHolder,
-	                                params: parameters,
-	                                async: false
-	                            };
-	                        }
-	                    }
-	                    this.context.isBindingElement = false;
-	                }
-	            }
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-left-hand-side-expressions
-	    Parser.prototype.parseArguments = function () {
-	        this.expect('(');
-	        var args = [];
-	        if (!this.match(')')) {
-	            while (true) {
-	                var expr = this.match('...') ? this.parseSpreadElement() :
-	                    this.isolateCoverGrammar(this.parseAssignmentExpression);
-	                args.push(expr);
-	                if (this.match(')')) {
-	                    break;
-	                }
-	                this.expectCommaSeparator();
-	                if (this.match(')')) {
-	                    break;
-	                }
-	            }
-	        }
-	        this.expect(')');
-	        return args;
-	    };
-	    Parser.prototype.isIdentifierName = function (token) {
-	        return token.type === 3 /* Identifier */ ||
-	            token.type === 4 /* Keyword */ ||
-	            token.type === 1 /* BooleanLiteral */ ||
-	            token.type === 5 /* NullLiteral */;
-	    };
-	    Parser.prototype.parseIdentifierName = function () {
-	        var node = this.createNode();
-	        var token = this.nextToken();
-	        if (!this.isIdentifierName(token)) {
-	            this.throwUnexpectedToken(token);
-	        }
-	        return this.finalize(node, new Node.Identifier(token.value));
-	    };
-	    Parser.prototype.parseNewExpression = function () {
-	        var node = this.createNode();
-	        var id = this.parseIdentifierName();
-	        assert_1.assert(id.name === 'new', 'New expression must start with `new`');
-	        var expr;
-	        if (this.match('.')) {
-	            this.nextToken();
-	            if (this.lookahead.type === 3 /* Identifier */ && this.context.inFunctionBody && this.lookahead.value === 'target') {
-	                var property = this.parseIdentifierName();
-	                expr = new Node.MetaProperty(id, property);
-	            }
-	            else {
-	                this.throwUnexpectedToken(this.lookahead);
-	            }
-	        }
-	        else {
-	            var callee = this.isolateCoverGrammar(this.parseLeftHandSideExpression);
-	            var args = this.match('(') ? this.parseArguments() : [];
-	            expr = new Node.NewExpression(callee, args);
-	            this.context.isAssignmentTarget = false;
-	            this.context.isBindingElement = false;
-	        }
-	        return this.finalize(node, expr);
-	    };
-	    Parser.prototype.parseAsyncArgument = function () {
-	        var arg = this.parseAssignmentExpression();
-	        this.context.firstCoverInitializedNameError = null;
-	        return arg;
-	    };
-	    Parser.prototype.parseAsyncArguments = function () {
-	        this.expect('(');
-	        var args = [];
-	        if (!this.match(')')) {
-	            while (true) {
-	                var expr = this.match('...') ? this.parseSpreadElement() :
-	                    this.isolateCoverGrammar(this.parseAsyncArgument);
-	                args.push(expr);
-	                if (this.match(')')) {
-	                    break;
-	                }
-	                this.expectCommaSeparator();
-	                if (this.match(')')) {
-	                    break;
-	                }
-	            }
-	        }
-	        this.expect(')');
-	        return args;
-	    };
-	    Parser.prototype.parseLeftHandSideExpressionAllowCall = function () {
-	        var startToken = this.lookahead;
-	        var maybeAsync = this.matchContextualKeyword('async');
-	        var previousAllowIn = this.context.allowIn;
-	        this.context.allowIn = true;
-	        var expr;
-	        if (this.matchKeyword('super') && this.context.inFunctionBody) {
-	            expr = this.createNode();
-	            this.nextToken();
-	            expr = this.finalize(expr, new Node.Super());
-	            if (!this.match('(') && !this.match('.') && !this.match('[')) {
-	                this.throwUnexpectedToken(this.lookahead);
-	            }
-	        }
-	        else {
-	            expr = this.inheritCoverGrammar(this.matchKeyword('new') ? this.parseNewExpression : this.parsePrimaryExpression);
-	        }
-	        while (true) {
-	            if (this.match('.')) {
-	                this.context.isBindingElement = false;
-	                this.context.isAssignmentTarget = true;
-	                this.expect('.');
-	                var property = this.parseIdentifierName();
-	                expr = this.finalize(this.startNode(startToken), new Node.StaticMemberExpression(expr, property));
-	            }
-	            else if (this.match('(')) {
-	                var asyncArrow = maybeAsync && (startToken.lineNumber === this.lookahead.lineNumber);
-	                this.context.isBindingElement = false;
-	                this.context.isAssignmentTarget = false;
-	                var args = asyncArrow ? this.parseAsyncArguments() : this.parseArguments();
-	                expr = this.finalize(this.startNode(startToken), new Node.CallExpression(expr, args));
-	                if (asyncArrow && this.match('=>')) {
-	                    for (var i = 0; i < args.length; ++i) {
-	                        this.reinterpretExpressionAsPattern(args[i]);
-	                    }
-	                    expr = {
-	                        type: ArrowParameterPlaceHolder,
-	                        params: args,
-	                        async: true
-	                    };
-	                }
-	            }
-	            else if (this.match('[')) {
-	                this.context.isBindingElement = false;
-	                this.context.isAssignmentTarget = true;
-	                this.expect('[');
-	                var property = this.isolateCoverGrammar(this.parseExpression);
-	                this.expect(']');
-	                expr = this.finalize(this.startNode(startToken), new Node.ComputedMemberExpression(expr, property));
-	            }
-	            else if (this.lookahead.type === 10 /* Template */ && this.lookahead.head) {
-	                var quasi = this.parseTemplateLiteral();
-	                expr = this.finalize(this.startNode(startToken), new Node.TaggedTemplateExpression(expr, quasi));
-	            }
-	            else {
-	                break;
-	            }
-	        }
-	        this.context.allowIn = previousAllowIn;
-	        return expr;
-	    };
-	    Parser.prototype.parseSuper = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('super');
-	        if (!this.match('[') && !this.match('.')) {
-	            this.throwUnexpectedToken(this.lookahead);
-	        }
-	        return this.finalize(node, new Node.Super());
-	    };
-	    Parser.prototype.parseLeftHandSideExpression = function () {
-	        assert_1.assert(this.context.allowIn, 'callee of new expression always allow in keyword.');
-	        var node = this.startNode(this.lookahead);
-	        var expr = (this.matchKeyword('super') && this.context.inFunctionBody) ? this.parseSuper() :
-	            this.inheritCoverGrammar(this.matchKeyword('new') ? this.parseNewExpression : this.parsePrimaryExpression);
-	        while (true) {
-	            if (this.match('[')) {
-	                this.context.isBindingElement = false;
-	                this.context.isAssignmentTarget = true;
-	                this.expect('[');
-	                var property = this.isolateCoverGrammar(this.parseExpression);
-	                this.expect(']');
-	                expr = this.finalize(node, new Node.ComputedMemberExpression(expr, property));
-	            }
-	            else if (this.match('.')) {
-	                this.context.isBindingElement = false;
-	                this.context.isAssignmentTarget = true;
-	                this.expect('.');
-	                var property = this.parseIdentifierName();
-	                expr = this.finalize(node, new Node.StaticMemberExpression(expr, property));
-	            }
-	            else if (this.lookahead.type === 10 /* Template */ && this.lookahead.head) {
-	                var quasi = this.parseTemplateLiteral();
-	                expr = this.finalize(node, new Node.TaggedTemplateExpression(expr, quasi));
-	            }
-	            else {
-	                break;
-	            }
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-update-expressions
-	    Parser.prototype.parseUpdateExpression = function () {
-	        var expr;
-	        var startToken = this.lookahead;
-	        if (this.match('++') || this.match('--')) {
-	            var node = this.startNode(startToken);
-	            var token = this.nextToken();
-	            expr = this.inheritCoverGrammar(this.parseUnaryExpression);
-	            if (this.context.strict && expr.type === syntax_1.Syntax.Identifier && this.scanner.isRestrictedWord(expr.name)) {
-	                this.tolerateError(messages_1.Messages.StrictLHSPrefix);
-	            }
-	            if (!this.context.isAssignmentTarget) {
-	                this.tolerateError(messages_1.Messages.InvalidLHSInAssignment);
-	            }
-	            var prefix = true;
-	            expr = this.finalize(node, new Node.UpdateExpression(token.value, expr, prefix));
-	            this.context.isAssignmentTarget = false;
-	            this.context.isBindingElement = false;
-	        }
-	        else {
-	            expr = this.inheritCoverGrammar(this.parseLeftHandSideExpressionAllowCall);
-	            if (!this.hasLineTerminator && this.lookahead.type === 7 /* Punctuator */) {
-	                if (this.match('++') || this.match('--')) {
-	                    if (this.context.strict && expr.type === syntax_1.Syntax.Identifier && this.scanner.isRestrictedWord(expr.name)) {
-	                        this.tolerateError(messages_1.Messages.StrictLHSPostfix);
-	                    }
-	                    if (!this.context.isAssignmentTarget) {
-	                        this.tolerateError(messages_1.Messages.InvalidLHSInAssignment);
-	                    }
-	                    this.context.isAssignmentTarget = false;
-	                    this.context.isBindingElement = false;
-	                    var operator = this.nextToken().value;
-	                    var prefix = false;
-	                    expr = this.finalize(this.startNode(startToken), new Node.UpdateExpression(operator, expr, prefix));
-	                }
-	            }
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-unary-operators
-	    Parser.prototype.parseAwaitExpression = function () {
-	        var node = this.createNode();
-	        this.nextToken();
-	        var argument = this.parseUnaryExpression();
-	        return this.finalize(node, new Node.AwaitExpression(argument));
-	    };
-	    Parser.prototype.parseUnaryExpression = function () {
-	        var expr;
-	        if (this.match('+') || this.match('-') || this.match('~') || this.match('!') ||
-	            this.matchKeyword('delete') || this.matchKeyword('void') || this.matchKeyword('typeof')) {
-	            var node = this.startNode(this.lookahead);
-	            var token = this.nextToken();
-	            expr = this.inheritCoverGrammar(this.parseUnaryExpression);
-	            expr = this.finalize(node, new Node.UnaryExpression(token.value, expr));
-	            if (this.context.strict && expr.operator === 'delete' && expr.argument.type === syntax_1.Syntax.Identifier) {
-	                this.tolerateError(messages_1.Messages.StrictDelete);
-	            }
-	            this.context.isAssignmentTarget = false;
-	            this.context.isBindingElement = false;
-	        }
-	        else if (this.context.await && this.matchContextualKeyword('await')) {
-	            expr = this.parseAwaitExpression();
-	        }
-	        else {
-	            expr = this.parseUpdateExpression();
-	        }
-	        return expr;
-	    };
-	    Parser.prototype.parseExponentiationExpression = function () {
-	        var startToken = this.lookahead;
-	        var expr = this.inheritCoverGrammar(this.parseUnaryExpression);
-	        if (expr.type !== syntax_1.Syntax.UnaryExpression && this.match('**')) {
-	            this.nextToken();
-	            this.context.isAssignmentTarget = false;
-	            this.context.isBindingElement = false;
-	            var left = expr;
-	            var right = this.isolateCoverGrammar(this.parseExponentiationExpression);
-	            expr = this.finalize(this.startNode(startToken), new Node.BinaryExpression('**', left, right));
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-exp-operator
-	    // https://tc39.github.io/ecma262/#sec-multiplicative-operators
-	    // https://tc39.github.io/ecma262/#sec-additive-operators
-	    // https://tc39.github.io/ecma262/#sec-bitwise-shift-operators
-	    // https://tc39.github.io/ecma262/#sec-relational-operators
-	    // https://tc39.github.io/ecma262/#sec-equality-operators
-	    // https://tc39.github.io/ecma262/#sec-binary-bitwise-operators
-	    // https://tc39.github.io/ecma262/#sec-binary-logical-operators
-	    Parser.prototype.binaryPrecedence = function (token) {
-	        var op = token.value;
-	        var precedence;
-	        if (token.type === 7 /* Punctuator */) {
-	            precedence = this.operatorPrecedence[op] || 0;
-	        }
-	        else if (token.type === 4 /* Keyword */) {
-	            precedence = (op === 'instanceof' || (this.context.allowIn && op === 'in')) ? 7 : 0;
-	        }
-	        else {
-	            precedence = 0;
-	        }
-	        return precedence;
-	    };
-	    Parser.prototype.parseBinaryExpression = function () {
-	        var startToken = this.lookahead;
-	        var expr = this.inheritCoverGrammar(this.parseExponentiationExpression);
-	        var token = this.lookahead;
-	        var prec = this.binaryPrecedence(token);
-	        if (prec > 0) {
-	            this.nextToken();
-	            this.context.isAssignmentTarget = false;
-	            this.context.isBindingElement = false;
-	            var markers = [startToken, this.lookahead];
-	            var left = expr;
-	            var right = this.isolateCoverGrammar(this.parseExponentiationExpression);
-	            var stack = [left, token.value, right];
-	            var precedences = [prec];
-	            while (true) {
-	                prec = this.binaryPrecedence(this.lookahead);
-	                if (prec <= 0) {
-	                    break;
-	                }
-	                // Reduce: make a binary expression from the three topmost entries.
-	                while ((stack.length > 2) && (prec <= precedences[precedences.length - 1])) {
-	                    right = stack.pop();
-	                    var operator = stack.pop();
-	                    precedences.pop();
-	                    left = stack.pop();
-	                    markers.pop();
-	                    var node = this.startNode(markers[markers.length - 1]);
-	                    stack.push(this.finalize(node, new Node.BinaryExpression(operator, left, right)));
-	                }
-	                // Shift.
-	                stack.push(this.nextToken().value);
-	                precedences.push(prec);
-	                markers.push(this.lookahead);
-	                stack.push(this.isolateCoverGrammar(this.parseExponentiationExpression));
-	            }
-	            // Final reduce to clean-up the stack.
-	            var i = stack.length - 1;
-	            expr = stack[i];
-	            var lastMarker = markers.pop();
-	            while (i > 1) {
-	                var marker = markers.pop();
-	                var lastLineStart = lastMarker && lastMarker.lineStart;
-	                var node = this.startNode(marker, lastLineStart);
-	                var operator = stack[i - 1];
-	                expr = this.finalize(node, new Node.BinaryExpression(operator, stack[i - 2], expr));
-	                i -= 2;
-	                lastMarker = marker;
-	            }
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-conditional-operator
-	    Parser.prototype.parseConditionalExpression = function () {
-	        var startToken = this.lookahead;
-	        var expr = this.inheritCoverGrammar(this.parseBinaryExpression);
-	        if (this.match('?')) {
-	            this.nextToken();
-	            var previousAllowIn = this.context.allowIn;
-	            this.context.allowIn = true;
-	            var consequent = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	            this.context.allowIn = previousAllowIn;
-	            this.expect(':');
-	            var alternate = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	            expr = this.finalize(this.startNode(startToken), new Node.ConditionalExpression(expr, consequent, alternate));
-	            this.context.isAssignmentTarget = false;
-	            this.context.isBindingElement = false;
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-assignment-operators
-	    Parser.prototype.checkPatternParam = function (options, param) {
-	        switch (param.type) {
-	            case syntax_1.Syntax.Identifier:
-	                this.validateParam(options, param, param.name);
-	                break;
-	            case syntax_1.Syntax.RestElement:
-	                this.checkPatternParam(options, param.argument);
-	                break;
-	            case syntax_1.Syntax.AssignmentPattern:
-	                this.checkPatternParam(options, param.left);
-	                break;
-	            case syntax_1.Syntax.ArrayPattern:
-	                for (var i = 0; i < param.elements.length; i++) {
-	                    if (param.elements[i] !== null) {
-	                        this.checkPatternParam(options, param.elements[i]);
-	                    }
-	                }
-	                break;
-	            case syntax_1.Syntax.ObjectPattern:
-	                for (var i = 0; i < param.properties.length; i++) {
-	                    this.checkPatternParam(options, param.properties[i].value);
-	                }
-	                break;
-	            default:
-	                break;
-	        }
-	        options.simple = options.simple && (param instanceof Node.Identifier);
-	    };
-	    Parser.prototype.reinterpretAsCoverFormalsList = function (expr) {
-	        var params = [expr];
-	        var options;
-	        var asyncArrow = false;
-	        switch (expr.type) {
-	            case syntax_1.Syntax.Identifier:
-	                break;
-	            case ArrowParameterPlaceHolder:
-	                params = expr.params;
-	                asyncArrow = expr.async;
-	                break;
-	            default:
-	                return null;
-	        }
-	        options = {
-	            simple: true,
-	            paramSet: {}
-	        };
-	        for (var i = 0; i < params.length; ++i) {
-	            var param = params[i];
-	            if (param.type === syntax_1.Syntax.AssignmentPattern) {
-	                if (param.right.type === syntax_1.Syntax.YieldExpression) {
-	                    if (param.right.argument) {
-	                        this.throwUnexpectedToken(this.lookahead);
-	                    }
-	                    param.right.type = syntax_1.Syntax.Identifier;
-	                    param.right.name = 'yield';
-	                    delete param.right.argument;
-	                    delete param.right.delegate;
-	                }
-	            }
-	            else if (asyncArrow && param.type === syntax_1.Syntax.Identifier && param.name === 'await') {
-	                this.throwUnexpectedToken(this.lookahead);
-	            }
-	            this.checkPatternParam(options, param);
-	            params[i] = param;
-	        }
-	        if (this.context.strict || !this.context.allowYield) {
-	            for (var i = 0; i < params.length; ++i) {
-	                var param = params[i];
-	                if (param.type === syntax_1.Syntax.YieldExpression) {
-	                    this.throwUnexpectedToken(this.lookahead);
-	                }
-	            }
-	        }
-	        if (options.message === messages_1.Messages.StrictParamDupe) {
-	            var token = this.context.strict ? options.stricted : options.firstRestricted;
-	            this.throwUnexpectedToken(token, options.message);
-	        }
-	        return {
-	            simple: options.simple,
-	            params: params,
-	            stricted: options.stricted,
-	            firstRestricted: options.firstRestricted,
-	            message: options.message
-	        };
-	    };
-	    Parser.prototype.parseAssignmentExpression = function () {
-	        var expr;
-	        if (!this.context.allowYield && this.matchKeyword('yield')) {
-	            expr = this.parseYieldExpression();
-	        }
-	        else {
-	            var startToken = this.lookahead;
-	            var token = startToken;
-	            expr = this.parseConditionalExpression();
-	            if (token.type === 3 /* Identifier */ && (token.lineNumber === this.lookahead.lineNumber) && token.value === 'async') {
-	                if (this.lookahead.type === 3 /* Identifier */ || this.matchKeyword('yield')) {
-	                    var arg = this.parsePrimaryExpression();
-	                    this.reinterpretExpressionAsPattern(arg);
-	                    expr = {
-	                        type: ArrowParameterPlaceHolder,
-	                        params: [arg],
-	                        async: true
-	                    };
-	                }
-	            }
-	            if (expr.type === ArrowParameterPlaceHolder || this.match('=>')) {
-	                // https://tc39.github.io/ecma262/#sec-arrow-function-definitions
-	                this.context.isAssignmentTarget = false;
-	                this.context.isBindingElement = false;
-	                var isAsync = expr.async;
-	                var list = this.reinterpretAsCoverFormalsList(expr);
-	                if (list) {
-	                    if (this.hasLineTerminator) {
-	                        this.tolerateUnexpectedToken(this.lookahead);
-	                    }
-	                    this.context.firstCoverInitializedNameError = null;
-	                    var previousStrict = this.context.strict;
-	                    var previousAllowStrictDirective = this.context.allowStrictDirective;
-	                    this.context.allowStrictDirective = list.simple;
-	                    var previousAllowYield = this.context.allowYield;
-	                    var previousAwait = this.context.await;
-	                    this.context.allowYield = true;
-	                    this.context.await = isAsync;
-	                    var node = this.startNode(startToken);
-	                    this.expect('=>');
-	                    var body = void 0;
-	                    if (this.match('{')) {
-	                        var previousAllowIn = this.context.allowIn;
-	                        this.context.allowIn = true;
-	                        body = this.parseFunctionSourceElements();
-	                        this.context.allowIn = previousAllowIn;
-	                    }
-	                    else {
-	                        body = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	                    }
-	                    var expression = body.type !== syntax_1.Syntax.BlockStatement;
-	                    if (this.context.strict && list.firstRestricted) {
-	                        this.throwUnexpectedToken(list.firstRestricted, list.message);
-	                    }
-	                    if (this.context.strict && list.stricted) {
-	                        this.tolerateUnexpectedToken(list.stricted, list.message);
-	                    }
-	                    expr = isAsync ? this.finalize(node, new Node.AsyncArrowFunctionExpression(list.params, body, expression)) :
-	                        this.finalize(node, new Node.ArrowFunctionExpression(list.params, body, expression));
-	                    this.context.strict = previousStrict;
-	                    this.context.allowStrictDirective = previousAllowStrictDirective;
-	                    this.context.allowYield = previousAllowYield;
-	                    this.context.await = previousAwait;
-	                }
-	            }
-	            else {
-	                if (this.matchAssign()) {
-	                    if (!this.context.isAssignmentTarget) {
-	                        this.tolerateError(messages_1.Messages.InvalidLHSInAssignment);
-	                    }
-	                    if (this.context.strict && expr.type === syntax_1.Syntax.Identifier) {
-	                        var id = expr;
-	                        if (this.scanner.isRestrictedWord(id.name)) {
-	                            this.tolerateUnexpectedToken(token, messages_1.Messages.StrictLHSAssignment);
-	                        }
-	                        if (this.scanner.isStrictModeReservedWord(id.name)) {
-	                            this.tolerateUnexpectedToken(token, messages_1.Messages.StrictReservedWord);
-	                        }
-	                    }
-	                    if (!this.match('=')) {
-	                        this.context.isAssignmentTarget = false;
-	                        this.context.isBindingElement = false;
-	                    }
-	                    else {
-	                        this.reinterpretExpressionAsPattern(expr);
-	                    }
-	                    token = this.nextToken();
-	                    var operator = token.value;
-	                    var right = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	                    expr = this.finalize(this.startNode(startToken), new Node.AssignmentExpression(operator, expr, right));
-	                    this.context.firstCoverInitializedNameError = null;
-	                }
-	            }
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-comma-operator
-	    Parser.prototype.parseExpression = function () {
-	        var startToken = this.lookahead;
-	        var expr = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	        if (this.match(',')) {
-	            var expressions = [];
-	            expressions.push(expr);
-	            while (this.lookahead.type !== 2 /* EOF */) {
-	                if (!this.match(',')) {
-	                    break;
-	                }
-	                this.nextToken();
-	                expressions.push(this.isolateCoverGrammar(this.parseAssignmentExpression));
-	            }
-	            expr = this.finalize(this.startNode(startToken), new Node.SequenceExpression(expressions));
-	        }
-	        return expr;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-block
-	    Parser.prototype.parseStatementListItem = function () {
-	        var statement;
-	        this.context.isAssignmentTarget = true;
-	        this.context.isBindingElement = true;
-	        if (this.lookahead.type === 4 /* Keyword */) {
-	            switch (this.lookahead.value) {
-	                case 'export':
-	                    if (!this.context.isModule) {
-	                        this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.IllegalExportDeclaration);
-	                    }
-	                    statement = this.parseExportDeclaration();
-	                    break;
-	                case 'import':
-	                    if (!this.context.isModule) {
-	                        this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.IllegalImportDeclaration);
-	                    }
-	                    statement = this.parseImportDeclaration();
-	                    break;
-	                case 'const':
-	                    statement = this.parseLexicalDeclaration({ inFor: false });
-	                    break;
-	                case 'function':
-	                    statement = this.parseFunctionDeclaration();
-	                    break;
-	                case 'class':
-	                    statement = this.parseClassDeclaration();
-	                    break;
-	                case 'let':
-	                    statement = this.isLexicalDeclaration() ? this.parseLexicalDeclaration({ inFor: false }) : this.parseStatement();
-	                    break;
-	                default:
-	                    statement = this.parseStatement();
-	                    break;
-	            }
-	        }
-	        else {
-	            statement = this.parseStatement();
-	        }
-	        return statement;
-	    };
-	    Parser.prototype.parseBlock = function () {
-	        var node = this.createNode();
-	        this.expect('{');
-	        var block = [];
-	        while (true) {
-	            if (this.match('}')) {
-	                break;
-	            }
-	            block.push(this.parseStatementListItem());
-	        }
-	        this.expect('}');
-	        return this.finalize(node, new Node.BlockStatement(block));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-let-and-const-declarations
-	    Parser.prototype.parseLexicalBinding = function (kind, options) {
-	        var node = this.createNode();
-	        var params = [];
-	        var id = this.parsePattern(params, kind);
-	        if (this.context.strict && id.type === syntax_1.Syntax.Identifier) {
-	            if (this.scanner.isRestrictedWord(id.name)) {
-	                this.tolerateError(messages_1.Messages.StrictVarName);
-	            }
-	        }
-	        var init = null;
-	        if (kind === 'const') {
-	            if (!this.matchKeyword('in') && !this.matchContextualKeyword('of')) {
-	                if (this.match('=')) {
-	                    this.nextToken();
-	                    init = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	                }
-	                else {
-	                    this.throwError(messages_1.Messages.DeclarationMissingInitializer, 'const');
-	                }
-	            }
-	        }
-	        else if ((!options.inFor && id.type !== syntax_1.Syntax.Identifier) || this.match('=')) {
-	            this.expect('=');
-	            init = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	        }
-	        return this.finalize(node, new Node.VariableDeclarator(id, init));
-	    };
-	    Parser.prototype.parseBindingList = function (kind, options) {
-	        var list = [this.parseLexicalBinding(kind, options)];
-	        while (this.match(',')) {
-	            this.nextToken();
-	            list.push(this.parseLexicalBinding(kind, options));
-	        }
-	        return list;
-	    };
-	    Parser.prototype.isLexicalDeclaration = function () {
-	        var state = this.scanner.saveState();
-	        this.scanner.scanComments();
-	        var next = this.scanner.lex();
-	        this.scanner.restoreState(state);
-	        return (next.type === 3 /* Identifier */) ||
-	            (next.type === 7 /* Punctuator */ && next.value === '[') ||
-	            (next.type === 7 /* Punctuator */ && next.value === '{') ||
-	            (next.type === 4 /* Keyword */ && next.value === 'let') ||
-	            (next.type === 4 /* Keyword */ && next.value === 'yield');
-	    };
-	    Parser.prototype.parseLexicalDeclaration = function (options) {
-	        var node = this.createNode();
-	        var kind = this.nextToken().value;
-	        assert_1.assert(kind === 'let' || kind === 'const', 'Lexical declaration must be either let or const');
-	        var declarations = this.parseBindingList(kind, options);
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.VariableDeclaration(declarations, kind));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-destructuring-binding-patterns
-	    Parser.prototype.parseBindingRestElement = function (params, kind) {
-	        var node = this.createNode();
-	        this.expect('...');
-	        var arg = this.parsePattern(params, kind);
-	        return this.finalize(node, new Node.RestElement(arg));
-	    };
-	    Parser.prototype.parseArrayPattern = function (params, kind) {
-	        var node = this.createNode();
-	        this.expect('[');
-	        var elements = [];
-	        while (!this.match(']')) {
-	            if (this.match(',')) {
-	                this.nextToken();
-	                elements.push(null);
-	            }
-	            else {
-	                if (this.match('...')) {
-	                    elements.push(this.parseBindingRestElement(params, kind));
-	                    break;
-	                }
-	                else {
-	                    elements.push(this.parsePatternWithDefault(params, kind));
-	                }
-	                if (!this.match(']')) {
-	                    this.expect(',');
-	                }
-	            }
-	        }
-	        this.expect(']');
-	        return this.finalize(node, new Node.ArrayPattern(elements));
-	    };
-	    Parser.prototype.parsePropertyPattern = function (params, kind) {
-	        var node = this.createNode();
-	        var computed = false;
-	        var shorthand = false;
-	        var method = false;
-	        var key;
-	        var value;
-	        if (this.lookahead.type === 3 /* Identifier */) {
-	            var keyToken = this.lookahead;
-	            key = this.parseVariableIdentifier();
-	            var init = this.finalize(node, new Node.Identifier(keyToken.value));
-	            if (this.match('=')) {
-	                params.push(keyToken);
-	                shorthand = true;
-	                this.nextToken();
-	                var expr = this.parseAssignmentExpression();
-	                value = this.finalize(this.startNode(keyToken), new Node.AssignmentPattern(init, expr));
-	            }
-	            else if (!this.match(':')) {
-	                params.push(keyToken);
-	                shorthand = true;
-	                value = init;
-	            }
-	            else {
-	                this.expect(':');
-	                value = this.parsePatternWithDefault(params, kind);
-	            }
-	        }
-	        else {
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	            this.expect(':');
-	            value = this.parsePatternWithDefault(params, kind);
-	        }
-	        return this.finalize(node, new Node.Property('init', key, computed, value, method, shorthand));
-	    };
-	    Parser.prototype.parseObjectPattern = function (params, kind) {
-	        var node = this.createNode();
-	        var properties = [];
-	        this.expect('{');
-	        while (!this.match('}')) {
-	            properties.push(this.parsePropertyPattern(params, kind));
-	            if (!this.match('}')) {
-	                this.expect(',');
-	            }
-	        }
-	        this.expect('}');
-	        return this.finalize(node, new Node.ObjectPattern(properties));
-	    };
-	    Parser.prototype.parsePattern = function (params, kind) {
-	        var pattern;
-	        if (this.match('[')) {
-	            pattern = this.parseArrayPattern(params, kind);
-	        }
-	        else if (this.match('{')) {
-	            pattern = this.parseObjectPattern(params, kind);
-	        }
-	        else {
-	            if (this.matchKeyword('let') && (kind === 'const' || kind === 'let')) {
-	                this.tolerateUnexpectedToken(this.lookahead, messages_1.Messages.LetInLexicalBinding);
-	            }
-	            params.push(this.lookahead);
-	            pattern = this.parseVariableIdentifier(kind);
-	        }
-	        return pattern;
-	    };
-	    Parser.prototype.parsePatternWithDefault = function (params, kind) {
-	        var startToken = this.lookahead;
-	        var pattern = this.parsePattern(params, kind);
-	        if (this.match('=')) {
-	            this.nextToken();
-	            var previousAllowYield = this.context.allowYield;
-	            this.context.allowYield = true;
-	            var right = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	            this.context.allowYield = previousAllowYield;
-	            pattern = this.finalize(this.startNode(startToken), new Node.AssignmentPattern(pattern, right));
-	        }
-	        return pattern;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-variable-statement
-	    Parser.prototype.parseVariableIdentifier = function (kind) {
-	        var node = this.createNode();
-	        var token = this.nextToken();
-	        if (token.type === 4 /* Keyword */ && token.value === 'yield') {
-	            if (this.context.strict) {
-	                this.tolerateUnexpectedToken(token, messages_1.Messages.StrictReservedWord);
-	            }
-	            else if (!this.context.allowYield) {
-	                this.throwUnexpectedToken(token);
-	            }
-	        }
-	        else if (token.type !== 3 /* Identifier */) {
-	            if (this.context.strict && token.type === 4 /* Keyword */ && this.scanner.isStrictModeReservedWord(token.value)) {
-	                this.tolerateUnexpectedToken(token, messages_1.Messages.StrictReservedWord);
-	            }
-	            else {
-	                if (this.context.strict || token.value !== 'let' || kind !== 'var') {
-	                    this.throwUnexpectedToken(token);
-	                }
-	            }
-	        }
-	        else if ((this.context.isModule || this.context.await) && token.type === 3 /* Identifier */ && token.value === 'await') {
-	            this.tolerateUnexpectedToken(token);
-	        }
-	        return this.finalize(node, new Node.Identifier(token.value));
-	    };
-	    Parser.prototype.parseVariableDeclaration = function (options) {
-	        var node = this.createNode();
-	        var params = [];
-	        var id = this.parsePattern(params, 'var');
-	        if (this.context.strict && id.type === syntax_1.Syntax.Identifier) {
-	            if (this.scanner.isRestrictedWord(id.name)) {
-	                this.tolerateError(messages_1.Messages.StrictVarName);
-	            }
-	        }
-	        var init = null;
-	        if (this.match('=')) {
-	            this.nextToken();
-	            init = this.isolateCoverGrammar(this.parseAssignmentExpression);
-	        }
-	        else if (id.type !== syntax_1.Syntax.Identifier && !options.inFor) {
-	            this.expect('=');
-	        }
-	        return this.finalize(node, new Node.VariableDeclarator(id, init));
-	    };
-	    Parser.prototype.parseVariableDeclarationList = function (options) {
-	        var opt = { inFor: options.inFor };
-	        var list = [];
-	        list.push(this.parseVariableDeclaration(opt));
-	        while (this.match(',')) {
-	            this.nextToken();
-	            list.push(this.parseVariableDeclaration(opt));
-	        }
-	        return list;
-	    };
-	    Parser.prototype.parseVariableStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('var');
-	        var declarations = this.parseVariableDeclarationList({ inFor: false });
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.VariableDeclaration(declarations, 'var'));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-empty-statement
-	    Parser.prototype.parseEmptyStatement = function () {
-	        var node = this.createNode();
-	        this.expect(';');
-	        return this.finalize(node, new Node.EmptyStatement());
-	    };
-	    // https://tc39.github.io/ecma262/#sec-expression-statement
-	    Parser.prototype.parseExpressionStatement = function () {
-	        var node = this.createNode();
-	        var expr = this.parseExpression();
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.ExpressionStatement(expr));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-if-statement
-	    Parser.prototype.parseIfClause = function () {
-	        if (this.context.strict && this.matchKeyword('function')) {
-	            this.tolerateError(messages_1.Messages.StrictFunction);
-	        }
-	        return this.parseStatement();
-	    };
-	    Parser.prototype.parseIfStatement = function () {
-	        var node = this.createNode();
-	        var consequent;
-	        var alternate = null;
-	        this.expectKeyword('if');
-	        this.expect('(');
-	        var test = this.parseExpression();
-	        if (!this.match(')') && this.config.tolerant) {
-	            this.tolerateUnexpectedToken(this.nextToken());
-	            consequent = this.finalize(this.createNode(), new Node.EmptyStatement());
-	        }
-	        else {
-	            this.expect(')');
-	            consequent = this.parseIfClause();
-	            if (this.matchKeyword('else')) {
-	                this.nextToken();
-	                alternate = this.parseIfClause();
-	            }
-	        }
-	        return this.finalize(node, new Node.IfStatement(test, consequent, alternate));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-do-while-statement
-	    Parser.prototype.parseDoWhileStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('do');
-	        var previousInIteration = this.context.inIteration;
-	        this.context.inIteration = true;
-	        var body = this.parseStatement();
-	        this.context.inIteration = previousInIteration;
-	        this.expectKeyword('while');
-	        this.expect('(');
-	        var test = this.parseExpression();
-	        if (!this.match(')') && this.config.tolerant) {
-	            this.tolerateUnexpectedToken(this.nextToken());
-	        }
-	        else {
-	            this.expect(')');
-	            if (this.match(';')) {
-	                this.nextToken();
-	            }
-	        }
-	        return this.finalize(node, new Node.DoWhileStatement(body, test));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-while-statement
-	    Parser.prototype.parseWhileStatement = function () {
-	        var node = this.createNode();
-	        var body;
-	        this.expectKeyword('while');
-	        this.expect('(');
-	        var test = this.parseExpression();
-	        if (!this.match(')') && this.config.tolerant) {
-	            this.tolerateUnexpectedToken(this.nextToken());
-	            body = this.finalize(this.createNode(), new Node.EmptyStatement());
-	        }
-	        else {
-	            this.expect(')');
-	            var previousInIteration = this.context.inIteration;
-	            this.context.inIteration = true;
-	            body = this.parseStatement();
-	            this.context.inIteration = previousInIteration;
-	        }
-	        return this.finalize(node, new Node.WhileStatement(test, body));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-for-statement
-	    // https://tc39.github.io/ecma262/#sec-for-in-and-for-of-statements
-	    Parser.prototype.parseForStatement = function () {
-	        var init = null;
-	        var test = null;
-	        var update = null;
-	        var forIn = true;
-	        var left, right;
-	        var node = this.createNode();
-	        this.expectKeyword('for');
-	        this.expect('(');
-	        if (this.match(';')) {
-	            this.nextToken();
-	        }
-	        else {
-	            if (this.matchKeyword('var')) {
-	                init = this.createNode();
-	                this.nextToken();
-	                var previousAllowIn = this.context.allowIn;
-	                this.context.allowIn = false;
-	                var declarations = this.parseVariableDeclarationList({ inFor: true });
-	                this.context.allowIn = previousAllowIn;
-	                if (declarations.length === 1 && this.matchKeyword('in')) {
-	                    var decl = declarations[0];
-	                    if (decl.init && (decl.id.type === syntax_1.Syntax.ArrayPattern || decl.id.type === syntax_1.Syntax.ObjectPattern || this.context.strict)) {
-	                        this.tolerateError(messages_1.Messages.ForInOfLoopInitializer, 'for-in');
-	                    }
-	                    init = this.finalize(init, new Node.VariableDeclaration(declarations, 'var'));
-	                    this.nextToken();
-	                    left = init;
-	                    right = this.parseExpression();
-	                    init = null;
-	                }
-	                else if (declarations.length === 1 && declarations[0].init === null && this.matchContextualKeyword('of')) {
-	                    init = this.finalize(init, new Node.VariableDeclaration(declarations, 'var'));
-	                    this.nextToken();
-	                    left = init;
-	                    right = this.parseAssignmentExpression();
-	                    init = null;
-	                    forIn = false;
-	                }
-	                else {
-	                    init = this.finalize(init, new Node.VariableDeclaration(declarations, 'var'));
-	                    this.expect(';');
-	                }
-	            }
-	            else if (this.matchKeyword('const') || this.matchKeyword('let')) {
-	                init = this.createNode();
-	                var kind = this.nextToken().value;
-	                if (!this.context.strict && this.lookahead.value === 'in') {
-	                    init = this.finalize(init, new Node.Identifier(kind));
-	                    this.nextToken();
-	                    left = init;
-	                    right = this.parseExpression();
-	                    init = null;
-	                }
-	                else {
-	                    var previousAllowIn = this.context.allowIn;
-	                    this.context.allowIn = false;
-	                    var declarations = this.parseBindingList(kind, { inFor: true });
-	                    this.context.allowIn = previousAllowIn;
-	                    if (declarations.length === 1 && declarations[0].init === null && this.matchKeyword('in')) {
-	                        init = this.finalize(init, new Node.VariableDeclaration(declarations, kind));
-	                        this.nextToken();
-	                        left = init;
-	                        right = this.parseExpression();
-	                        init = null;
-	                    }
-	                    else if (declarations.length === 1 && declarations[0].init === null && this.matchContextualKeyword('of')) {
-	                        init = this.finalize(init, new Node.VariableDeclaration(declarations, kind));
-	                        this.nextToken();
-	                        left = init;
-	                        right = this.parseAssignmentExpression();
-	                        init = null;
-	                        forIn = false;
-	                    }
-	                    else {
-	                        this.consumeSemicolon();
-	                        init = this.finalize(init, new Node.VariableDeclaration(declarations, kind));
-	                    }
-	                }
-	            }
-	            else {
-	                var initStartToken = this.lookahead;
-	                var previousAllowIn = this.context.allowIn;
-	                this.context.allowIn = false;
-	                init = this.inheritCoverGrammar(this.parseAssignmentExpression);
-	                this.context.allowIn = previousAllowIn;
-	                if (this.matchKeyword('in')) {
-	                    if (!this.context.isAssignmentTarget || init.type === syntax_1.Syntax.AssignmentExpression) {
-	                        this.tolerateError(messages_1.Messages.InvalidLHSInForIn);
-	                    }
-	                    this.nextToken();
-	                    this.reinterpretExpressionAsPattern(init);
-	                    left = init;
-	                    right = this.parseExpression();
-	                    init = null;
-	                }
-	                else if (this.matchContextualKeyword('of')) {
-	                    if (!this.context.isAssignmentTarget || init.type === syntax_1.Syntax.AssignmentExpression) {
-	                        this.tolerateError(messages_1.Messages.InvalidLHSInForLoop);
-	                    }
-	                    this.nextToken();
-	                    this.reinterpretExpressionAsPattern(init);
-	                    left = init;
-	                    right = this.parseAssignmentExpression();
-	                    init = null;
-	                    forIn = false;
-	                }
-	                else {
-	                    if (this.match(',')) {
-	                        var initSeq = [init];
-	                        while (this.match(',')) {
-	                            this.nextToken();
-	                            initSeq.push(this.isolateCoverGrammar(this.parseAssignmentExpression));
-	                        }
-	                        init = this.finalize(this.startNode(initStartToken), new Node.SequenceExpression(initSeq));
-	                    }
-	                    this.expect(';');
-	                }
-	            }
-	        }
-	        if (typeof left === 'undefined') {
-	            if (!this.match(';')) {
-	                test = this.parseExpression();
-	            }
-	            this.expect(';');
-	            if (!this.match(')')) {
-	                update = this.parseExpression();
-	            }
-	        }
-	        var body;
-	        if (!this.match(')') && this.config.tolerant) {
-	            this.tolerateUnexpectedToken(this.nextToken());
-	            body = this.finalize(this.createNode(), new Node.EmptyStatement());
-	        }
-	        else {
-	            this.expect(')');
-	            var previousInIteration = this.context.inIteration;
-	            this.context.inIteration = true;
-	            body = this.isolateCoverGrammar(this.parseStatement);
-	            this.context.inIteration = previousInIteration;
-	        }
-	        return (typeof left === 'undefined') ?
-	            this.finalize(node, new Node.ForStatement(init, test, update, body)) :
-	            forIn ? this.finalize(node, new Node.ForInStatement(left, right, body)) :
-	                this.finalize(node, new Node.ForOfStatement(left, right, body));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-continue-statement
-	    Parser.prototype.parseContinueStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('continue');
-	        var label = null;
-	        if (this.lookahead.type === 3 /* Identifier */ && !this.hasLineTerminator) {
-	            var id = this.parseVariableIdentifier();
-	            label = id;
-	            var key = '$' + id.name;
-	            if (!Object.prototype.hasOwnProperty.call(this.context.labelSet, key)) {
-	                this.throwError(messages_1.Messages.UnknownLabel, id.name);
-	            }
-	        }
-	        this.consumeSemicolon();
-	        if (label === null && !this.context.inIteration) {
-	            this.throwError(messages_1.Messages.IllegalContinue);
-	        }
-	        return this.finalize(node, new Node.ContinueStatement(label));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-break-statement
-	    Parser.prototype.parseBreakStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('break');
-	        var label = null;
-	        if (this.lookahead.type === 3 /* Identifier */ && !this.hasLineTerminator) {
-	            var id = this.parseVariableIdentifier();
-	            var key = '$' + id.name;
-	            if (!Object.prototype.hasOwnProperty.call(this.context.labelSet, key)) {
-	                this.throwError(messages_1.Messages.UnknownLabel, id.name);
-	            }
-	            label = id;
-	        }
-	        this.consumeSemicolon();
-	        if (label === null && !this.context.inIteration && !this.context.inSwitch) {
-	            this.throwError(messages_1.Messages.IllegalBreak);
-	        }
-	        return this.finalize(node, new Node.BreakStatement(label));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-return-statement
-	    Parser.prototype.parseReturnStatement = function () {
-	        if (!this.context.inFunctionBody) {
-	            this.tolerateError(messages_1.Messages.IllegalReturn);
-	        }
-	        var node = this.createNode();
-	        this.expectKeyword('return');
-	        var hasArgument = (!this.match(';') && !this.match('}') &&
-	            !this.hasLineTerminator && this.lookahead.type !== 2 /* EOF */) ||
-	            this.lookahead.type === 8 /* StringLiteral */ ||
-	            this.lookahead.type === 10 /* Template */;
-	        var argument = hasArgument ? this.parseExpression() : null;
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.ReturnStatement(argument));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-with-statement
-	    Parser.prototype.parseWithStatement = function () {
-	        if (this.context.strict) {
-	            this.tolerateError(messages_1.Messages.StrictModeWith);
-	        }
-	        var node = this.createNode();
-	        var body;
-	        this.expectKeyword('with');
-	        this.expect('(');
-	        var object = this.parseExpression();
-	        if (!this.match(')') && this.config.tolerant) {
-	            this.tolerateUnexpectedToken(this.nextToken());
-	            body = this.finalize(this.createNode(), new Node.EmptyStatement());
-	        }
-	        else {
-	            this.expect(')');
-	            body = this.parseStatement();
-	        }
-	        return this.finalize(node, new Node.WithStatement(object, body));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-switch-statement
-	    Parser.prototype.parseSwitchCase = function () {
-	        var node = this.createNode();
-	        var test;
-	        if (this.matchKeyword('default')) {
-	            this.nextToken();
-	            test = null;
-	        }
-	        else {
-	            this.expectKeyword('case');
-	            test = this.parseExpression();
-	        }
-	        this.expect(':');
-	        var consequent = [];
-	        while (true) {
-	            if (this.match('}') || this.matchKeyword('default') || this.matchKeyword('case')) {
-	                break;
-	            }
-	            consequent.push(this.parseStatementListItem());
-	        }
-	        return this.finalize(node, new Node.SwitchCase(test, consequent));
-	    };
-	    Parser.prototype.parseSwitchStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('switch');
-	        this.expect('(');
-	        var discriminant = this.parseExpression();
-	        this.expect(')');
-	        var previousInSwitch = this.context.inSwitch;
-	        this.context.inSwitch = true;
-	        var cases = [];
-	        var defaultFound = false;
-	        this.expect('{');
-	        while (true) {
-	            if (this.match('}')) {
-	                break;
-	            }
-	            var clause = this.parseSwitchCase();
-	            if (clause.test === null) {
-	                if (defaultFound) {
-	                    this.throwError(messages_1.Messages.MultipleDefaultsInSwitch);
-	                }
-	                defaultFound = true;
-	            }
-	            cases.push(clause);
-	        }
-	        this.expect('}');
-	        this.context.inSwitch = previousInSwitch;
-	        return this.finalize(node, new Node.SwitchStatement(discriminant, cases));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-labelled-statements
-	    Parser.prototype.parseLabelledStatement = function () {
-	        var node = this.createNode();
-	        var expr = this.parseExpression();
-	        var statement;
-	        if ((expr.type === syntax_1.Syntax.Identifier) && this.match(':')) {
-	            this.nextToken();
-	            var id = expr;
-	            var key = '$' + id.name;
-	            if (Object.prototype.hasOwnProperty.call(this.context.labelSet, key)) {
-	                this.throwError(messages_1.Messages.Redeclaration, 'Label', id.name);
-	            }
-	            this.context.labelSet[key] = true;
-	            var body = void 0;
-	            if (this.matchKeyword('class')) {
-	                this.tolerateUnexpectedToken(this.lookahead);
-	                body = this.parseClassDeclaration();
-	            }
-	            else if (this.matchKeyword('function')) {
-	                var token = this.lookahead;
-	                var declaration = this.parseFunctionDeclaration();
-	                if (this.context.strict) {
-	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictFunction);
-	                }
-	                else if (declaration.generator) {
-	                    this.tolerateUnexpectedToken(token, messages_1.Messages.GeneratorInLegacyContext);
-	                }
-	                body = declaration;
-	            }
-	            else {
-	                body = this.parseStatement();
-	            }
-	            delete this.context.labelSet[key];
-	            statement = new Node.LabeledStatement(id, body);
-	        }
-	        else {
-	            this.consumeSemicolon();
-	            statement = new Node.ExpressionStatement(expr);
-	        }
-	        return this.finalize(node, statement);
-	    };
-	    // https://tc39.github.io/ecma262/#sec-throw-statement
-	    Parser.prototype.parseThrowStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('throw');
-	        if (this.hasLineTerminator) {
-	            this.throwError(messages_1.Messages.NewlineAfterThrow);
-	        }
-	        var argument = this.parseExpression();
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.ThrowStatement(argument));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-try-statement
-	    Parser.prototype.parseCatchClause = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('catch');
-	        this.expect('(');
-	        if (this.match(')')) {
-	            this.throwUnexpectedToken(this.lookahead);
-	        }
-	        var params = [];
-	        var param = this.parsePattern(params);
-	        var paramMap = {};
-	        for (var i = 0; i < params.length; i++) {
-	            var key = '$' + params[i].value;
-	            if (Object.prototype.hasOwnProperty.call(paramMap, key)) {
-	                this.tolerateError(messages_1.Messages.DuplicateBinding, params[i].value);
-	            }
-	            paramMap[key] = true;
-	        }
-	        if (this.context.strict && param.type === syntax_1.Syntax.Identifier) {
-	            if (this.scanner.isRestrictedWord(param.name)) {
-	                this.tolerateError(messages_1.Messages.StrictCatchVariable);
-	            }
-	        }
-	        this.expect(')');
-	        var body = this.parseBlock();
-	        return this.finalize(node, new Node.CatchClause(param, body));
-	    };
-	    Parser.prototype.parseFinallyClause = function () {
-	        this.expectKeyword('finally');
-	        return this.parseBlock();
-	    };
-	    Parser.prototype.parseTryStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('try');
-	        var block = this.parseBlock();
-	        var handler = this.matchKeyword('catch') ? this.parseCatchClause() : null;
-	        var finalizer = this.matchKeyword('finally') ? this.parseFinallyClause() : null;
-	        if (!handler && !finalizer) {
-	            this.throwError(messages_1.Messages.NoCatchOrFinally);
-	        }
-	        return this.finalize(node, new Node.TryStatement(block, handler, finalizer));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-debugger-statement
-	    Parser.prototype.parseDebuggerStatement = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('debugger');
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.DebuggerStatement());
-	    };
-	    // https://tc39.github.io/ecma262/#sec-ecmascript-language-statements-and-declarations
-	    Parser.prototype.parseStatement = function () {
-	        var statement;
-	        switch (this.lookahead.type) {
-	            case 1 /* BooleanLiteral */:
-	            case 5 /* NullLiteral */:
-	            case 6 /* NumericLiteral */:
-	            case 8 /* StringLiteral */:
-	            case 10 /* Template */:
-	            case 9 /* RegularExpression */:
-	                statement = this.parseExpressionStatement();
-	                break;
-	            case 7 /* Punctuator */:
-	                var value = this.lookahead.value;
-	                if (value === '{') {
-	                    statement = this.parseBlock();
-	                }
-	                else if (value === '(') {
-	                    statement = this.parseExpressionStatement();
-	                }
-	                else if (value === ';') {
-	                    statement = this.parseEmptyStatement();
-	                }
-	                else {
-	                    statement = this.parseExpressionStatement();
-	                }
-	                break;
-	            case 3 /* Identifier */:
-	                statement = this.matchAsyncFunction() ? this.parseFunctionDeclaration() : this.parseLabelledStatement();
-	                break;
-	            case 4 /* Keyword */:
-	                switch (this.lookahead.value) {
-	                    case 'break':
-	                        statement = this.parseBreakStatement();
-	                        break;
-	                    case 'continue':
-	                        statement = this.parseContinueStatement();
-	                        break;
-	                    case 'debugger':
-	                        statement = this.parseDebuggerStatement();
-	                        break;
-	                    case 'do':
-	                        statement = this.parseDoWhileStatement();
-	                        break;
-	                    case 'for':
-	                        statement = this.parseForStatement();
-	                        break;
-	                    case 'function':
-	                        statement = this.parseFunctionDeclaration();
-	                        break;
-	                    case 'if':
-	                        statement = this.parseIfStatement();
-	                        break;
-	                    case 'return':
-	                        statement = this.parseReturnStatement();
-	                        break;
-	                    case 'switch':
-	                        statement = this.parseSwitchStatement();
-	                        break;
-	                    case 'throw':
-	                        statement = this.parseThrowStatement();
-	                        break;
-	                    case 'try':
-	                        statement = this.parseTryStatement();
-	                        break;
-	                    case 'var':
-	                        statement = this.parseVariableStatement();
-	                        break;
-	                    case 'while':
-	                        statement = this.parseWhileStatement();
-	                        break;
-	                    case 'with':
-	                        statement = this.parseWithStatement();
-	                        break;
-	                    default:
-	                        statement = this.parseExpressionStatement();
-	                        break;
-	                }
-	                break;
-	            default:
-	                statement = this.throwUnexpectedToken(this.lookahead);
-	        }
-	        return statement;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-function-definitions
-	    Parser.prototype.parseFunctionSourceElements = function () {
-	        var node = this.createNode();
-	        this.expect('{');
-	        var body = this.parseDirectivePrologues();
-	        var previousLabelSet = this.context.labelSet;
-	        var previousInIteration = this.context.inIteration;
-	        var previousInSwitch = this.context.inSwitch;
-	        var previousInFunctionBody = this.context.inFunctionBody;
-	        this.context.labelSet = {};
-	        this.context.inIteration = false;
-	        this.context.inSwitch = false;
-	        this.context.inFunctionBody = true;
-	        while (this.lookahead.type !== 2 /* EOF */) {
-	            if (this.match('}')) {
-	                break;
-	            }
-	            body.push(this.parseStatementListItem());
-	        }
-	        this.expect('}');
-	        this.context.labelSet = previousLabelSet;
-	        this.context.inIteration = previousInIteration;
-	        this.context.inSwitch = previousInSwitch;
-	        this.context.inFunctionBody = previousInFunctionBody;
-	        return this.finalize(node, new Node.BlockStatement(body));
-	    };
-	    Parser.prototype.validateParam = function (options, param, name) {
-	        var key = '$' + name;
-	        if (this.context.strict) {
-	            if (this.scanner.isRestrictedWord(name)) {
-	                options.stricted = param;
-	                options.message = messages_1.Messages.StrictParamName;
-	            }
-	            if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
-	                options.stricted = param;
-	                options.message = messages_1.Messages.StrictParamDupe;
-	            }
-	        }
-	        else if (!options.firstRestricted) {
-	            if (this.scanner.isRestrictedWord(name)) {
-	                options.firstRestricted = param;
-	                options.message = messages_1.Messages.StrictParamName;
-	            }
-	            else if (this.scanner.isStrictModeReservedWord(name)) {
-	                options.firstRestricted = param;
-	                options.message = messages_1.Messages.StrictReservedWord;
-	            }
-	            else if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
-	                options.stricted = param;
-	                options.message = messages_1.Messages.StrictParamDupe;
-	            }
-	        }
-	        /* istanbul ignore next */
-	        if (typeof Object.defineProperty === 'function') {
-	            Object.defineProperty(options.paramSet, key, { value: true, enumerable: true, writable: true, configurable: true });
-	        }
-	        else {
-	            options.paramSet[key] = true;
-	        }
-	    };
-	    Parser.prototype.parseRestElement = function (params) {
-	        var node = this.createNode();
-	        this.expect('...');
-	        var arg = this.parsePattern(params);
-	        if (this.match('=')) {
-	            this.throwError(messages_1.Messages.DefaultRestParameter);
-	        }
-	        if (!this.match(')')) {
-	            this.throwError(messages_1.Messages.ParameterAfterRestParameter);
-	        }
-	        return this.finalize(node, new Node.RestElement(arg));
-	    };
-	    Parser.prototype.parseFormalParameter = function (options) {
-	        var params = [];
-	        var param = this.match('...') ? this.parseRestElement(params) : this.parsePatternWithDefault(params);
-	        for (var i = 0; i < params.length; i++) {
-	            this.validateParam(options, params[i], params[i].value);
-	        }
-	        options.simple = options.simple && (param instanceof Node.Identifier);
-	        options.params.push(param);
-	    };
-	    Parser.prototype.parseFormalParameters = function (firstRestricted) {
-	        var options;
-	        options = {
-	            simple: true,
-	            params: [],
-	            firstRestricted: firstRestricted
-	        };
-	        this.expect('(');
-	        if (!this.match(')')) {
-	            options.paramSet = {};
-	            while (this.lookahead.type !== 2 /* EOF */) {
-	                this.parseFormalParameter(options);
-	                if (this.match(')')) {
-	                    break;
-	                }
-	                this.expect(',');
-	                if (this.match(')')) {
-	                    break;
-	                }
-	            }
-	        }
-	        this.expect(')');
-	        return {
-	            simple: options.simple,
-	            params: options.params,
-	            stricted: options.stricted,
-	            firstRestricted: options.firstRestricted,
-	            message: options.message
-	        };
-	    };
-	    Parser.prototype.matchAsyncFunction = function () {
-	        var match = this.matchContextualKeyword('async');
-	        if (match) {
-	            var state = this.scanner.saveState();
-	            this.scanner.scanComments();
-	            var next = this.scanner.lex();
-	            this.scanner.restoreState(state);
-	            match = (state.lineNumber === next.lineNumber) && (next.type === 4 /* Keyword */) && (next.value === 'function');
-	        }
-	        return match;
-	    };
-	    Parser.prototype.parseFunctionDeclaration = function (identifierIsOptional) {
-	        var node = this.createNode();
-	        var isAsync = this.matchContextualKeyword('async');
-	        if (isAsync) {
-	            this.nextToken();
-	        }
-	        this.expectKeyword('function');
-	        var isGenerator = isAsync ? false : this.match('*');
-	        if (isGenerator) {
-	            this.nextToken();
-	        }
-	        var message;
-	        var id = null;
-	        var firstRestricted = null;
-	        if (!identifierIsOptional || !this.match('(')) {
-	            var token = this.lookahead;
-	            id = this.parseVariableIdentifier();
-	            if (this.context.strict) {
-	                if (this.scanner.isRestrictedWord(token.value)) {
-	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictFunctionName);
-	                }
-	            }
-	            else {
-	                if (this.scanner.isRestrictedWord(token.value)) {
-	                    firstRestricted = token;
-	                    message = messages_1.Messages.StrictFunctionName;
-	                }
-	                else if (this.scanner.isStrictModeReservedWord(token.value)) {
-	                    firstRestricted = token;
-	                    message = messages_1.Messages.StrictReservedWord;
-	                }
-	            }
-	        }
-	        var previousAllowAwait = this.context.await;
-	        var previousAllowYield = this.context.allowYield;
-	        this.context.await = isAsync;
-	        this.context.allowYield = !isGenerator;
-	        var formalParameters = this.parseFormalParameters(firstRestricted);
-	        var params = formalParameters.params;
-	        var stricted = formalParameters.stricted;
-	        firstRestricted = formalParameters.firstRestricted;
-	        if (formalParameters.message) {
-	            message = formalParameters.message;
-	        }
-	        var previousStrict = this.context.strict;
-	        var previousAllowStrictDirective = this.context.allowStrictDirective;
-	        this.context.allowStrictDirective = formalParameters.simple;
-	        var body = this.parseFunctionSourceElements();
-	        if (this.context.strict && firstRestricted) {
-	            this.throwUnexpectedToken(firstRestricted, message);
-	        }
-	        if (this.context.strict && stricted) {
-	            this.tolerateUnexpectedToken(stricted, message);
-	        }
-	        this.context.strict = previousStrict;
-	        this.context.allowStrictDirective = previousAllowStrictDirective;
-	        this.context.await = previousAllowAwait;
-	        this.context.allowYield = previousAllowYield;
-	        return isAsync ? this.finalize(node, new Node.AsyncFunctionDeclaration(id, params, body)) :
-	            this.finalize(node, new Node.FunctionDeclaration(id, params, body, isGenerator));
-	    };
-	    Parser.prototype.parseFunctionExpression = function () {
-	        var node = this.createNode();
-	        var isAsync = this.matchContextualKeyword('async');
-	        if (isAsync) {
-	            this.nextToken();
-	        }
-	        this.expectKeyword('function');
-	        var isGenerator = isAsync ? false : this.match('*');
-	        if (isGenerator) {
-	            this.nextToken();
-	        }
-	        var message;
-	        var id = null;
-	        var firstRestricted;
-	        var previousAllowAwait = this.context.await;
-	        var previousAllowYield = this.context.allowYield;
-	        this.context.await = isAsync;
-	        this.context.allowYield = !isGenerator;
-	        if (!this.match('(')) {
-	            var token = this.lookahead;
-	            id = (!this.context.strict && !isGenerator && this.matchKeyword('yield')) ? this.parseIdentifierName() : this.parseVariableIdentifier();
-	            if (this.context.strict) {
-	                if (this.scanner.isRestrictedWord(token.value)) {
-	                    this.tolerateUnexpectedToken(token, messages_1.Messages.StrictFunctionName);
-	                }
-	            }
-	            else {
-	                if (this.scanner.isRestrictedWord(token.value)) {
-	                    firstRestricted = token;
-	                    message = messages_1.Messages.StrictFunctionName;
-	                }
-	                else if (this.scanner.isStrictModeReservedWord(token.value)) {
-	                    firstRestricted = token;
-	                    message = messages_1.Messages.StrictReservedWord;
-	                }
-	            }
-	        }
-	        var formalParameters = this.parseFormalParameters(firstRestricted);
-	        var params = formalParameters.params;
-	        var stricted = formalParameters.stricted;
-	        firstRestricted = formalParameters.firstRestricted;
-	        if (formalParameters.message) {
-	            message = formalParameters.message;
-	        }
-	        var previousStrict = this.context.strict;
-	        var previousAllowStrictDirective = this.context.allowStrictDirective;
-	        this.context.allowStrictDirective = formalParameters.simple;
-	        var body = this.parseFunctionSourceElements();
-	        if (this.context.strict && firstRestricted) {
-	            this.throwUnexpectedToken(firstRestricted, message);
-	        }
-	        if (this.context.strict && stricted) {
-	            this.tolerateUnexpectedToken(stricted, message);
-	        }
-	        this.context.strict = previousStrict;
-	        this.context.allowStrictDirective = previousAllowStrictDirective;
-	        this.context.await = previousAllowAwait;
-	        this.context.allowYield = previousAllowYield;
-	        return isAsync ? this.finalize(node, new Node.AsyncFunctionExpression(id, params, body)) :
-	            this.finalize(node, new Node.FunctionExpression(id, params, body, isGenerator));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-directive-prologues-and-the-use-strict-directive
-	    Parser.prototype.parseDirective = function () {
-	        var token = this.lookahead;
-	        var node = this.createNode();
-	        var expr = this.parseExpression();
-	        var directive = (expr.type === syntax_1.Syntax.Literal) ? this.getTokenRaw(token).slice(1, -1) : null;
-	        this.consumeSemicolon();
-	        return this.finalize(node, directive ? new Node.Directive(expr, directive) : new Node.ExpressionStatement(expr));
-	    };
-	    Parser.prototype.parseDirectivePrologues = function () {
-	        var firstRestricted = null;
-	        var body = [];
-	        while (true) {
-	            var token = this.lookahead;
-	            if (token.type !== 8 /* StringLiteral */) {
-	                break;
-	            }
-	            var statement = this.parseDirective();
-	            body.push(statement);
-	            var directive = statement.directive;
-	            if (typeof directive !== 'string') {
-	                break;
-	            }
-	            if (directive === 'use strict') {
-	                this.context.strict = true;
-	                if (firstRestricted) {
-	                    this.tolerateUnexpectedToken(firstRestricted, messages_1.Messages.StrictOctalLiteral);
-	                }
-	                if (!this.context.allowStrictDirective) {
-	                    this.tolerateUnexpectedToken(token, messages_1.Messages.IllegalLanguageModeDirective);
-	                }
-	            }
-	            else {
-	                if (!firstRestricted && token.octal) {
-	                    firstRestricted = token;
-	                }
-	            }
-	        }
-	        return body;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-method-definitions
-	    Parser.prototype.qualifiedPropertyName = function (token) {
-	        switch (token.type) {
-	            case 3 /* Identifier */:
-	            case 8 /* StringLiteral */:
-	            case 1 /* BooleanLiteral */:
-	            case 5 /* NullLiteral */:
-	            case 6 /* NumericLiteral */:
-	            case 4 /* Keyword */:
-	                return true;
-	            case 7 /* Punctuator */:
-	                return token.value === '[';
-	            default:
-	                break;
-	        }
-	        return false;
-	    };
-	    Parser.prototype.parseGetterMethod = function () {
-	        var node = this.createNode();
-	        var isGenerator = false;
-	        var previousAllowYield = this.context.allowYield;
-	        this.context.allowYield = !isGenerator;
-	        var formalParameters = this.parseFormalParameters();
-	        if (formalParameters.params.length > 0) {
-	            this.tolerateError(messages_1.Messages.BadGetterArity);
-	        }
-	        var method = this.parsePropertyMethod(formalParameters);
-	        this.context.allowYield = previousAllowYield;
-	        return this.finalize(node, new Node.FunctionExpression(null, formalParameters.params, method, isGenerator));
-	    };
-	    Parser.prototype.parseSetterMethod = function () {
-	        var node = this.createNode();
-	        var isGenerator = false;
-	        var previousAllowYield = this.context.allowYield;
-	        this.context.allowYield = !isGenerator;
-	        var formalParameters = this.parseFormalParameters();
-	        if (formalParameters.params.length !== 1) {
-	            this.tolerateError(messages_1.Messages.BadSetterArity);
-	        }
-	        else if (formalParameters.params[0] instanceof Node.RestElement) {
-	            this.tolerateError(messages_1.Messages.BadSetterRestParameter);
-	        }
-	        var method = this.parsePropertyMethod(formalParameters);
-	        this.context.allowYield = previousAllowYield;
-	        return this.finalize(node, new Node.FunctionExpression(null, formalParameters.params, method, isGenerator));
-	    };
-	    Parser.prototype.parseGeneratorMethod = function () {
-	        var node = this.createNode();
-	        var isGenerator = true;
-	        var previousAllowYield = this.context.allowYield;
-	        this.context.allowYield = true;
-	        var params = this.parseFormalParameters();
-	        this.context.allowYield = false;
-	        var method = this.parsePropertyMethod(params);
-	        this.context.allowYield = previousAllowYield;
-	        return this.finalize(node, new Node.FunctionExpression(null, params.params, method, isGenerator));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-generator-function-definitions
-	    Parser.prototype.isStartOfExpression = function () {
-	        var start = true;
-	        var value = this.lookahead.value;
-	        switch (this.lookahead.type) {
-	            case 7 /* Punctuator */:
-	                start = (value === '[') || (value === '(') || (value === '{') ||
-	                    (value === '+') || (value === '-') ||
-	                    (value === '!') || (value === '~') ||
-	                    (value === '++') || (value === '--') ||
-	                    (value === '/') || (value === '/='); // regular expression literal
-	                break;
-	            case 4 /* Keyword */:
-	                start = (value === 'class') || (value === 'delete') ||
-	                    (value === 'function') || (value === 'let') || (value === 'new') ||
-	                    (value === 'super') || (value === 'this') || (value === 'typeof') ||
-	                    (value === 'void') || (value === 'yield');
-	                break;
-	            default:
-	                break;
-	        }
-	        return start;
-	    };
-	    Parser.prototype.parseYieldExpression = function () {
-	        var node = this.createNode();
-	        this.expectKeyword('yield');
-	        var argument = null;
-	        var delegate = false;
-	        if (!this.hasLineTerminator) {
-	            var previousAllowYield = this.context.allowYield;
-	            this.context.allowYield = false;
-	            delegate = this.match('*');
-	            if (delegate) {
-	                this.nextToken();
-	                argument = this.parseAssignmentExpression();
-	            }
-	            else if (this.isStartOfExpression()) {
-	                argument = this.parseAssignmentExpression();
-	            }
-	            this.context.allowYield = previousAllowYield;
-	        }
-	        return this.finalize(node, new Node.YieldExpression(argument, delegate));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-class-definitions
-	    Parser.prototype.parseClassElement = function (hasConstructor) {
-	        var token = this.lookahead;
-	        var node = this.createNode();
-	        var kind = '';
-	        var key = null;
-	        var value = null;
-	        var computed = false;
-	        var method = false;
-	        var isStatic = false;
-	        var isAsync = false;
-	        if (this.match('*')) {
-	            this.nextToken();
-	        }
-	        else {
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	            var id = key;
-	            if (id.name === 'static' && (this.qualifiedPropertyName(this.lookahead) || this.match('*'))) {
-	                token = this.lookahead;
-	                isStatic = true;
-	                computed = this.match('[');
-	                if (this.match('*')) {
-	                    this.nextToken();
-	                }
-	                else {
-	                    key = this.parseObjectPropertyKey();
-	                }
-	            }
-	            if ((token.type === 3 /* Identifier */) && !this.hasLineTerminator && (token.value === 'async')) {
-	                var punctuator = this.lookahead.value;
-	                if (punctuator !== ':' && punctuator !== '(' && punctuator !== '*') {
-	                    isAsync = true;
-	                    token = this.lookahead;
-	                    key = this.parseObjectPropertyKey();
-	                    if (token.type === 3 /* Identifier */ && token.value === 'constructor') {
-	                        this.tolerateUnexpectedToken(token, messages_1.Messages.ConstructorIsAsync);
-	                    }
-	                }
-	            }
-	        }
-	        var lookaheadPropertyKey = this.qualifiedPropertyName(this.lookahead);
-	        if (token.type === 3 /* Identifier */) {
-	            if (token.value === 'get' && lookaheadPropertyKey) {
-	                kind = 'get';
-	                computed = this.match('[');
-	                key = this.parseObjectPropertyKey();
-	                this.context.allowYield = false;
-	                value = this.parseGetterMethod();
-	            }
-	            else if (token.value === 'set' && lookaheadPropertyKey) {
-	                kind = 'set';
-	                computed = this.match('[');
-	                key = this.parseObjectPropertyKey();
-	                value = this.parseSetterMethod();
-	            }
-	        }
-	        else if (token.type === 7 /* Punctuator */ && token.value === '*' && lookaheadPropertyKey) {
-	            kind = 'init';
-	            computed = this.match('[');
-	            key = this.parseObjectPropertyKey();
-	            value = this.parseGeneratorMethod();
-	            method = true;
-	        }
-	        if (!kind && key && this.match('(')) {
-	            kind = 'init';
-	            value = isAsync ? this.parsePropertyMethodAsyncFunction() : this.parsePropertyMethodFunction();
-	            method = true;
-	        }
-	        if (!kind) {
-	            this.throwUnexpectedToken(this.lookahead);
-	        }
-	        if (kind === 'init') {
-	            kind = 'method';
-	        }
-	        if (!computed) {
-	            if (isStatic && this.isPropertyKey(key, 'prototype')) {
-	                this.throwUnexpectedToken(token, messages_1.Messages.StaticPrototype);
-	            }
-	            if (!isStatic && this.isPropertyKey(key, 'constructor')) {
-	                if (kind !== 'method' || !method || (value && value.generator)) {
-	                    this.throwUnexpectedToken(token, messages_1.Messages.ConstructorSpecialMethod);
-	                }
-	                if (hasConstructor.value) {
-	                    this.throwUnexpectedToken(token, messages_1.Messages.DuplicateConstructor);
-	                }
-	                else {
-	                    hasConstructor.value = true;
-	                }
-	                kind = 'constructor';
-	            }
-	        }
-	        return this.finalize(node, new Node.MethodDefinition(key, computed, value, kind, isStatic));
-	    };
-	    Parser.prototype.parseClassElementList = function () {
-	        var body = [];
-	        var hasConstructor = { value: false };
-	        this.expect('{');
-	        while (!this.match('}')) {
-	            if (this.match(';')) {
-	                this.nextToken();
-	            }
-	            else {
-	                body.push(this.parseClassElement(hasConstructor));
-	            }
-	        }
-	        this.expect('}');
-	        return body;
-	    };
-	    Parser.prototype.parseClassBody = function () {
-	        var node = this.createNode();
-	        var elementList = this.parseClassElementList();
-	        return this.finalize(node, new Node.ClassBody(elementList));
-	    };
-	    Parser.prototype.parseClassDeclaration = function (identifierIsOptional) {
-	        var node = this.createNode();
-	        var previousStrict = this.context.strict;
-	        this.context.strict = true;
-	        this.expectKeyword('class');
-	        var id = (identifierIsOptional && (this.lookahead.type !== 3 /* Identifier */)) ? null : this.parseVariableIdentifier();
-	        var superClass = null;
-	        if (this.matchKeyword('extends')) {
-	            this.nextToken();
-	            superClass = this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall);
-	        }
-	        var classBody = this.parseClassBody();
-	        this.context.strict = previousStrict;
-	        return this.finalize(node, new Node.ClassDeclaration(id, superClass, classBody));
-	    };
-	    Parser.prototype.parseClassExpression = function () {
-	        var node = this.createNode();
-	        var previousStrict = this.context.strict;
-	        this.context.strict = true;
-	        this.expectKeyword('class');
-	        var id = (this.lookahead.type === 3 /* Identifier */) ? this.parseVariableIdentifier() : null;
-	        var superClass = null;
-	        if (this.matchKeyword('extends')) {
-	            this.nextToken();
-	            superClass = this.isolateCoverGrammar(this.parseLeftHandSideExpressionAllowCall);
-	        }
-	        var classBody = this.parseClassBody();
-	        this.context.strict = previousStrict;
-	        return this.finalize(node, new Node.ClassExpression(id, superClass, classBody));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-scripts
-	    // https://tc39.github.io/ecma262/#sec-modules
-	    Parser.prototype.parseModule = function () {
-	        this.context.strict = true;
-	        this.context.isModule = true;
-	        this.scanner.isModule = true;
-	        var node = this.createNode();
-	        var body = this.parseDirectivePrologues();
-	        while (this.lookahead.type !== 2 /* EOF */) {
-	            body.push(this.parseStatementListItem());
-	        }
-	        return this.finalize(node, new Node.Module(body));
-	    };
-	    Parser.prototype.parseScript = function () {
-	        var node = this.createNode();
-	        var body = this.parseDirectivePrologues();
-	        while (this.lookahead.type !== 2 /* EOF */) {
-	            body.push(this.parseStatementListItem());
-	        }
-	        return this.finalize(node, new Node.Script(body));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-imports
-	    Parser.prototype.parseModuleSpecifier = function () {
-	        var node = this.createNode();
-	        if (this.lookahead.type !== 8 /* StringLiteral */) {
-	            this.throwError(messages_1.Messages.InvalidModuleSpecifier);
-	        }
-	        var token = this.nextToken();
-	        var raw = this.getTokenRaw(token);
-	        return this.finalize(node, new Node.Literal(token.value, raw));
-	    };
-	    // import {<foo as bar>} ...;
-	    Parser.prototype.parseImportSpecifier = function () {
-	        var node = this.createNode();
-	        var imported;
-	        var local;
-	        if (this.lookahead.type === 3 /* Identifier */) {
-	            imported = this.parseVariableIdentifier();
-	            local = imported;
-	            if (this.matchContextualKeyword('as')) {
-	                this.nextToken();
-	                local = this.parseVariableIdentifier();
-	            }
-	        }
-	        else {
-	            imported = this.parseIdentifierName();
-	            local = imported;
-	            if (this.matchContextualKeyword('as')) {
-	                this.nextToken();
-	                local = this.parseVariableIdentifier();
-	            }
-	            else {
-	                this.throwUnexpectedToken(this.nextToken());
-	            }
-	        }
-	        return this.finalize(node, new Node.ImportSpecifier(local, imported));
-	    };
-	    // {foo, bar as bas}
-	    Parser.prototype.parseNamedImports = function () {
-	        this.expect('{');
-	        var specifiers = [];
-	        while (!this.match('}')) {
-	            specifiers.push(this.parseImportSpecifier());
-	            if (!this.match('}')) {
-	                this.expect(',');
-	            }
-	        }
-	        this.expect('}');
-	        return specifiers;
-	    };
-	    // import <foo> ...;
-	    Parser.prototype.parseImportDefaultSpecifier = function () {
-	        var node = this.createNode();
-	        var local = this.parseIdentifierName();
-	        return this.finalize(node, new Node.ImportDefaultSpecifier(local));
-	    };
-	    // import <* as foo> ...;
-	    Parser.prototype.parseImportNamespaceSpecifier = function () {
-	        var node = this.createNode();
-	        this.expect('*');
-	        if (!this.matchContextualKeyword('as')) {
-	            this.throwError(messages_1.Messages.NoAsAfterImportNamespace);
-	        }
-	        this.nextToken();
-	        var local = this.parseIdentifierName();
-	        return this.finalize(node, new Node.ImportNamespaceSpecifier(local));
-	    };
-	    Parser.prototype.parseImportDeclaration = function () {
-	        if (this.context.inFunctionBody) {
-	            this.throwError(messages_1.Messages.IllegalImportDeclaration);
-	        }
-	        var node = this.createNode();
-	        this.expectKeyword('import');
-	        var src;
-	        var specifiers = [];
-	        if (this.lookahead.type === 8 /* StringLiteral */) {
-	            // import 'foo';
-	            src = this.parseModuleSpecifier();
-	        }
-	        else {
-	            if (this.match('{')) {
-	                // import {bar}
-	                specifiers = specifiers.concat(this.parseNamedImports());
-	            }
-	            else if (this.match('*')) {
-	                // import * as foo
-	                specifiers.push(this.parseImportNamespaceSpecifier());
-	            }
-	            else if (this.isIdentifierName(this.lookahead) && !this.matchKeyword('default')) {
-	                // import foo
-	                specifiers.push(this.parseImportDefaultSpecifier());
-	                if (this.match(',')) {
-	                    this.nextToken();
-	                    if (this.match('*')) {
-	                        // import foo, * as foo
-	                        specifiers.push(this.parseImportNamespaceSpecifier());
-	                    }
-	                    else if (this.match('{')) {
-	                        // import foo, {bar}
-	                        specifiers = specifiers.concat(this.parseNamedImports());
-	                    }
-	                    else {
-	                        this.throwUnexpectedToken(this.lookahead);
-	                    }
-	                }
-	            }
-	            else {
-	                this.throwUnexpectedToken(this.nextToken());
-	            }
-	            if (!this.matchContextualKeyword('from')) {
-	                var message = this.lookahead.value ? messages_1.Messages.UnexpectedToken : messages_1.Messages.MissingFromClause;
-	                this.throwError(message, this.lookahead.value);
-	            }
-	            this.nextToken();
-	            src = this.parseModuleSpecifier();
-	        }
-	        this.consumeSemicolon();
-	        return this.finalize(node, new Node.ImportDeclaration(specifiers, src));
-	    };
-	    // https://tc39.github.io/ecma262/#sec-exports
-	    Parser.prototype.parseExportSpecifier = function () {
-	        var node = this.createNode();
-	        var local = this.parseIdentifierName();
-	        var exported = local;
-	        if (this.matchContextualKeyword('as')) {
-	            this.nextToken();
-	            exported = this.parseIdentifierName();
-	        }
-	        return this.finalize(node, new Node.ExportSpecifier(local, exported));
-	    };
-	    Parser.prototype.parseExportDeclaration = function () {
-	        if (this.context.inFunctionBody) {
-	            this.throwError(messages_1.Messages.IllegalExportDeclaration);
-	        }
-	        var node = this.createNode();
-	        this.expectKeyword('export');
-	        var exportDeclaration;
-	        if (this.matchKeyword('default')) {
-	            // export default ...
-	            this.nextToken();
-	            if (this.matchKeyword('function')) {
-	                // export default function foo () {}
-	                // export default function () {}
-	                var declaration = this.parseFunctionDeclaration(true);
-	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
-	            }
-	            else if (this.matchKeyword('class')) {
-	                // export default class foo {}
-	                var declaration = this.parseClassDeclaration(true);
-	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
-	            }
-	            else if (this.matchContextualKeyword('async')) {
-	                // export default async function f () {}
-	                // export default async function () {}
-	                // export default async x => x
-	                var declaration = this.matchAsyncFunction() ? this.parseFunctionDeclaration(true) : this.parseAssignmentExpression();
-	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
-	            }
-	            else {
-	                if (this.matchContextualKeyword('from')) {
-	                    this.throwError(messages_1.Messages.UnexpectedToken, this.lookahead.value);
-	                }
-	                // export default {};
-	                // export default [];
-	                // export default (1 + 2);
-	                var declaration = this.match('{') ? this.parseObjectInitializer() :
-	                    this.match('[') ? this.parseArrayInitializer() : this.parseAssignmentExpression();
-	                this.consumeSemicolon();
-	                exportDeclaration = this.finalize(node, new Node.ExportDefaultDeclaration(declaration));
-	            }
-	        }
-	        else if (this.match('*')) {
-	            // export * from 'foo';
-	            this.nextToken();
-	            if (!this.matchContextualKeyword('from')) {
-	                var message = this.lookahead.value ? messages_1.Messages.UnexpectedToken : messages_1.Messages.MissingFromClause;
-	                this.throwError(message, this.lookahead.value);
-	            }
-	            this.nextToken();
-	            var src = this.parseModuleSpecifier();
-	            this.consumeSemicolon();
-	            exportDeclaration = this.finalize(node, new Node.ExportAllDeclaration(src));
-	        }
-	        else if (this.lookahead.type === 4 /* Keyword */) {
-	            // export var f = 1;
-	            var declaration = void 0;
-	            switch (this.lookahead.value) {
-	                case 'let':
-	                case 'const':
-	                    declaration = this.parseLexicalDeclaration({ inFor: false });
-	                    break;
-	                case 'var':
-	                case 'class':
-	                case 'function':
-	                    declaration = this.parseStatementListItem();
-	                    break;
-	                default:
-	                    this.throwUnexpectedToken(this.lookahead);
-	            }
-	            exportDeclaration = this.finalize(node, new Node.ExportNamedDeclaration(declaration, [], null));
-	        }
-	        else if (this.matchAsyncFunction()) {
-	            var declaration = this.parseFunctionDeclaration();
-	            exportDeclaration = this.finalize(node, new Node.ExportNamedDeclaration(declaration, [], null));
-	        }
-	        else {
-	            var specifiers = [];
-	            var source = null;
-	            var isExportFromIdentifier = false;
-	            this.expect('{');
-	            while (!this.match('}')) {
-	                isExportFromIdentifier = isExportFromIdentifier || this.matchKeyword('default');
-	                specifiers.push(this.parseExportSpecifier());
-	                if (!this.match('}')) {
-	                    this.expect(',');
-	                }
-	            }
-	            this.expect('}');
-	            if (this.matchContextualKeyword('from')) {
-	                // export {default} from 'foo';
-	                // export {foo} from 'foo';
-	                this.nextToken();
-	                source = this.parseModuleSpecifier();
-	                this.consumeSemicolon();
-	            }
-	            else if (isExportFromIdentifier) {
-	                // export {default}; // missing fromClause
-	                var message = this.lookahead.value ? messages_1.Messages.UnexpectedToken : messages_1.Messages.MissingFromClause;
-	                this.throwError(message, this.lookahead.value);
-	            }
-	            else {
-	                // export {foo};
-	                this.consumeSemicolon();
-	            }
-	            exportDeclaration = this.finalize(node, new Node.ExportNamedDeclaration(null, specifiers, source));
-	        }
-	        return exportDeclaration;
-	    };
-	    return Parser;
-	}());
-	exports.Parser = Parser;
-
-
-/***/ },
-/* 9 */
-/***/ function(module, exports) {
-
-	"use strict";
-	// Ensure the condition is true, otherwise throw an error.
-	// This is only to have a better contract semantic, i.e. another safety net
-	// to catch a logic error. The condition shall be fulfilled in normal case.
-	// Do NOT use this to enforce a certain condition on any user input.
-	Object.defineProperty(exports, "__esModule", { value: true });
-	function assert(condition, message) {
-	    /* istanbul ignore if */
-	    if (!condition) {
-	        throw new Error('ASSERT: ' + message);
-	    }
-	}
-	exports.assert = assert;
-
-
-/***/ },
-/* 10 */
-/***/ function(module, exports) {
-
-	"use strict";
-	/* tslint:disable:max-classes-per-file */
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var ErrorHandler = (function () {
-	    function ErrorHandler() {
-	        this.errors = [];
-	        this.tolerant = false;
-	    }
-	    ErrorHandler.prototype.recordError = function (error) {
-	        this.errors.push(error);
-	    };
-	    ErrorHandler.prototype.tolerate = function (error) {
-	        if (this.tolerant) {
-	            this.recordError(error);
-	        }
-	        else {
-	            throw error;
-	        }
-	    };
-	    ErrorHandler.prototype.constructError = function (msg, column) {
-	        var error = new Error(msg);
-	        try {
-	            throw error;
-	        }
-	        catch (base) {
-	            /* istanbul ignore else */
-	            if (Object.create && Object.defineProperty) {
-	                error = Object.create(base);
-	                Object.defineProperty(error, 'column', { value: column });
-	            }
-	        }
-	        /* istanbul ignore next */
-	        return error;
-	    };
-	    ErrorHandler.prototype.createError = function (index, line, col, description) {
-	        var msg = 'Line ' + line + ': ' + description;
-	        var error = this.constructError(msg, col);
-	        error.index = index;
-	        error.lineNumber = line;
-	        error.description = description;
-	        return error;
-	    };
-	    ErrorHandler.prototype.throwError = function (index, line, col, description) {
-	        throw this.createError(index, line, col, description);
-	    };
-	    ErrorHandler.prototype.tolerateError = function (index, line, col, description) {
-	        var error = this.createError(index, line, col, description);
-	        if (this.tolerant) {
-	            this.recordError(error);
-	        }
-	        else {
-	            throw error;
-	        }
-	    };
-	    return ErrorHandler;
-	}());
-	exports.ErrorHandler = ErrorHandler;
-
-
-/***/ },
-/* 11 */
-/***/ function(module, exports) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	// Error messages should be identical to V8.
-	exports.Messages = {
-	    BadGetterArity: 'Getter must not have any formal parameters',
-	    BadSetterArity: 'Setter must have exactly one formal parameter',
-	    BadSetterRestParameter: 'Setter function argument must not be a rest parameter',
-	    ConstructorIsAsync: 'Class constructor may not be an async method',
-	    ConstructorSpecialMethod: 'Class constructor may not be an accessor',
-	    DeclarationMissingInitializer: 'Missing initializer in %0 declaration',
-	    DefaultRestParameter: 'Unexpected token =',
-	    DuplicateBinding: 'Duplicate binding %0',
-	    DuplicateConstructor: 'A class may only have one constructor',
-	    DuplicateProtoProperty: 'Duplicate __proto__ fields are not allowed in object literals',
-	    ForInOfLoopInitializer: '%0 loop variable declaration may not have an initializer',
-	    GeneratorInLegacyContext: 'Generator declarations are not allowed in legacy contexts',
-	    IllegalBreak: 'Illegal break statement',
-	    IllegalContinue: 'Illegal continue statement',
-	    IllegalExportDeclaration: 'Unexpected token',
-	    IllegalImportDeclaration: 'Unexpected token',
-	    IllegalLanguageModeDirective: 'Illegal \'use strict\' directive in function with non-simple parameter list',
-	    IllegalReturn: 'Illegal return statement',
-	    InvalidEscapedReservedWord: 'Keyword must not contain escaped characters',
-	    InvalidHexEscapeSequence: 'Invalid hexadecimal escape sequence',
-	    InvalidLHSInAssignment: 'Invalid left-hand side in assignment',
-	    InvalidLHSInForIn: 'Invalid left-hand side in for-in',
-	    InvalidLHSInForLoop: 'Invalid left-hand side in for-loop',
-	    InvalidModuleSpecifier: 'Unexpected token',
-	    InvalidRegExp: 'Invalid regular expression',
-	    LetInLexicalBinding: 'let is disallowed as a lexically bound name',
-	    MissingFromClause: 'Unexpected token',
-	    MultipleDefaultsInSwitch: 'More than one default clause in switch statement',
-	    NewlineAfterThrow: 'Illegal newline after throw',
-	    NoAsAfterImportNamespace: 'Unexpected token',
-	    NoCatchOrFinally: 'Missing catch or finally after try',
-	    ParameterAfterRestParameter: 'Rest parameter must be last formal parameter',
-	    Redeclaration: '%0 \'%1\' has already been declared',
-	    StaticPrototype: 'Classes may not have static property named prototype',
-	    StrictCatchVariable: 'Catch variable may not be eval or arguments in strict mode',
-	    StrictDelete: 'Delete of an unqualified identifier in strict mode.',
-	    StrictFunction: 'In strict mode code, functions can only be declared at top level or inside a block',
-	    StrictFunctionName: 'Function name may not be eval or arguments in strict mode',
-	    StrictLHSAssignment: 'Assignment to eval or arguments is not allowed in strict mode',
-	    StrictLHSPostfix: 'Postfix increment/decrement may not have eval or arguments operand in strict mode',
-	    StrictLHSPrefix: 'Prefix increment/decrement may not have eval or arguments operand in strict mode',
-	    StrictModeWith: 'Strict mode code may not include a with statement',
-	    StrictOctalLiteral: 'Octal literals are not allowed in strict mode.',
-	    StrictParamDupe: 'Strict mode function may not have duplicate parameter names',
-	    StrictParamName: 'Parameter name eval or arguments is not allowed in strict mode',
-	    StrictReservedWord: 'Use of future reserved word in strict mode',
-	    StrictVarName: 'Variable name may not be eval or arguments in strict mode',
-	    TemplateOctalLiteral: 'Octal literals are not allowed in template strings.',
-	    UnexpectedEOS: 'Unexpected end of input',
-	    UnexpectedIdentifier: 'Unexpected identifier',
-	    UnexpectedNumber: 'Unexpected number',
-	    UnexpectedReserved: 'Unexpected reserved word',
-	    UnexpectedString: 'Unexpected string',
-	    UnexpectedTemplate: 'Unexpected quasi %0',
-	    UnexpectedToken: 'Unexpected token %0',
-	    UnexpectedTokenIllegal: 'Unexpected token ILLEGAL',
-	    UnknownLabel: 'Undefined label \'%0\'',
-	    UnterminatedRegExp: 'Invalid regular expression: missing /'
-	};
-
-
-/***/ },
-/* 12 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var assert_1 = __webpack_require__(9);
-	var character_1 = __webpack_require__(4);
-	var messages_1 = __webpack_require__(11);
-	function hexValue(ch) {
-	    return '0123456789abcdef'.indexOf(ch.toLowerCase());
-	}
-	function octalValue(ch) {
-	    return '01234567'.indexOf(ch);
-	}
-	var Scanner = (function () {
-	    function Scanner(code, handler) {
-	        this.source = code;
-	        this.errorHandler = handler;
-	        this.trackComment = false;
-	        this.isModule = false;
-	        this.length = code.length;
-	        this.index = 0;
-	        this.lineNumber = (code.length > 0) ? 1 : 0;
-	        this.lineStart = 0;
-	        this.curlyStack = [];
-	    }
-	    Scanner.prototype.saveState = function () {
-	        return {
-	            index: this.index,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart
-	        };
-	    };
-	    Scanner.prototype.restoreState = function (state) {
-	        this.index = state.index;
-	        this.lineNumber = state.lineNumber;
-	        this.lineStart = state.lineStart;
-	    };
-	    Scanner.prototype.eof = function () {
-	        return this.index >= this.length;
-	    };
-	    Scanner.prototype.throwUnexpectedToken = function (message) {
-	        if (message === void 0) { message = messages_1.Messages.UnexpectedTokenIllegal; }
-	        return this.errorHandler.throwError(this.index, this.lineNumber, this.index - this.lineStart + 1, message);
-	    };
-	    Scanner.prototype.tolerateUnexpectedToken = function (message) {
-	        if (message === void 0) { message = messages_1.Messages.UnexpectedTokenIllegal; }
-	        this.errorHandler.tolerateError(this.index, this.lineNumber, this.index - this.lineStart + 1, message);
-	    };
-	    // https://tc39.github.io/ecma262/#sec-comments
-	    Scanner.prototype.skipSingleLineComment = function (offset) {
-	        var comments = [];
-	        var start, loc;
-	        if (this.trackComment) {
-	            comments = [];
-	            start = this.index - offset;
-	            loc = {
-	                start: {
-	                    line: this.lineNumber,
-	                    column: this.index - this.lineStart - offset
-	                },
-	                end: {}
-	            };
-	        }
-	        while (!this.eof()) {
-	            var ch = this.source.charCodeAt(this.index);
-	            ++this.index;
-	            if (character_1.Character.isLineTerminator(ch)) {
-	                if (this.trackComment) {
-	                    loc.end = {
-	                        line: this.lineNumber,
-	                        column: this.index - this.lineStart - 1
-	                    };
-	                    var entry = {
-	                        multiLine: false,
-	                        slice: [start + offset, this.index - 1],
-	                        range: [start, this.index - 1],
-	                        loc: loc
-	                    };
-	                    comments.push(entry);
-	                }
-	                if (ch === 13 && this.source.charCodeAt(this.index) === 10) {
-	                    ++this.index;
-	                }
-	                ++this.lineNumber;
-	                this.lineStart = this.index;
-	                return comments;
-	            }
-	        }
-	        if (this.trackComment) {
-	            loc.end = {
-	                line: this.lineNumber,
-	                column: this.index - this.lineStart
-	            };
-	            var entry = {
-	                multiLine: false,
-	                slice: [start + offset, this.index],
-	                range: [start, this.index],
-	                loc: loc
-	            };
-	            comments.push(entry);
-	        }
-	        return comments;
-	    };
-	    Scanner.prototype.skipMultiLineComment = function () {
-	        var comments = [];
-	        var start, loc;
-	        if (this.trackComment) {
-	            comments = [];
-	            start = this.index - 2;
-	            loc = {
-	                start: {
-	                    line: this.lineNumber,
-	                    column: this.index - this.lineStart - 2
-	                },
-	                end: {}
-	            };
-	        }
-	        while (!this.eof()) {
-	            var ch = this.source.charCodeAt(this.index);
-	            if (character_1.Character.isLineTerminator(ch)) {
-	                if (ch === 0x0D && this.source.charCodeAt(this.index + 1) === 0x0A) {
-	                    ++this.index;
-	                }
-	                ++this.lineNumber;
-	                ++this.index;
-	                this.lineStart = this.index;
-	            }
-	            else if (ch === 0x2A) {
-	                // Block comment ends with '*/'.
-	                if (this.source.charCodeAt(this.index + 1) === 0x2F) {
-	                    this.index += 2;
-	                    if (this.trackComment) {
-	                        loc.end = {
-	                            line: this.lineNumber,
-	                            column: this.index - this.lineStart
-	                        };
-	                        var entry = {
-	                            multiLine: true,
-	                            slice: [start + 2, this.index - 2],
-	                            range: [start, this.index],
-	                            loc: loc
-	                        };
-	                        comments.push(entry);
-	                    }
-	                    return comments;
-	                }
-	                ++this.index;
-	            }
-	            else {
-	                ++this.index;
-	            }
-	        }
-	        // Ran off the end of the file - the whole thing is a comment
-	        if (this.trackComment) {
-	            loc.end = {
-	                line: this.lineNumber,
-	                column: this.index - this.lineStart
-	            };
-	            var entry = {
-	                multiLine: true,
-	                slice: [start + 2, this.index],
-	                range: [start, this.index],
-	                loc: loc
-	            };
-	            comments.push(entry);
-	        }
-	        this.tolerateUnexpectedToken();
-	        return comments;
-	    };
-	    Scanner.prototype.scanComments = function () {
-	        var comments;
-	        if (this.trackComment) {
-	            comments = [];
-	        }
-	        var start = (this.index === 0);
-	        while (!this.eof()) {
-	            var ch = this.source.charCodeAt(this.index);
-	            if (character_1.Character.isWhiteSpace(ch)) {
-	                ++this.index;
-	            }
-	            else if (character_1.Character.isLineTerminator(ch)) {
-	                ++this.index;
-	                if (ch === 0x0D && this.source.charCodeAt(this.index) === 0x0A) {
-	                    ++this.index;
-	                }
-	                ++this.lineNumber;
-	                this.lineStart = this.index;
-	                start = true;
-	            }
-	            else if (ch === 0x2F) {
-	                ch = this.source.charCodeAt(this.index + 1);
-	                if (ch === 0x2F) {
-	                    this.index += 2;
-	                    var comment = this.skipSingleLineComment(2);
-	                    if (this.trackComment) {
-	                        comments = comments.concat(comment);
-	                    }
-	                    start = true;
-	                }
-	                else if (ch === 0x2A) {
-	                    this.index += 2;
-	                    var comment = this.skipMultiLineComment();
-	                    if (this.trackComment) {
-	                        comments = comments.concat(comment);
-	                    }
-	                }
-	                else {
-	                    break;
-	                }
-	            }
-	            else if (start && ch === 0x2D) {
-	                // U+003E is '>'
-	                if ((this.source.charCodeAt(this.index + 1) === 0x2D) && (this.source.charCodeAt(this.index + 2) === 0x3E)) {
-	                    // '-->' is a single-line comment
-	                    this.index += 3;
-	                    var comment = this.skipSingleLineComment(3);
-	                    if (this.trackComment) {
-	                        comments = comments.concat(comment);
-	                    }
-	                }
-	                else {
-	                    break;
-	                }
-	            }
-	            else if (ch === 0x3C && !this.isModule) {
-	                if (this.source.slice(this.index + 1, this.index + 4) === '!--') {
-	                    this.index += 4; // `<!--`
-	                    var comment = this.skipSingleLineComment(4);
-	                    if (this.trackComment) {
-	                        comments = comments.concat(comment);
-	                    }
-	                }
-	                else {
-	                    break;
-	                }
-	            }
-	            else {
-	                break;
-	            }
-	        }
-	        return comments;
-	    };
-	    // https://tc39.github.io/ecma262/#sec-future-reserved-words
-	    Scanner.prototype.isFutureReservedWord = function (id) {
-	        switch (id) {
-	            case 'enum':
-	            case 'export':
-	            case 'import':
-	            case 'super':
-	                return true;
-	            default:
-	                return false;
-	        }
-	    };
-	    Scanner.prototype.isStrictModeReservedWord = function (id) {
-	        switch (id) {
-	            case 'implements':
-	            case 'interface':
-	            case 'package':
-	            case 'private':
-	            case 'protected':
-	            case 'public':
-	            case 'static':
-	            case 'yield':
-	            case 'let':
-	                return true;
-	            default:
-	                return false;
-	        }
-	    };
-	    Scanner.prototype.isRestrictedWord = function (id) {
-	        return id === 'eval' || id === 'arguments';
-	    };
-	    // https://tc39.github.io/ecma262/#sec-keywords
-	    Scanner.prototype.isKeyword = function (id) {
-	        switch (id.length) {
-	            case 2:
-	                return (id === 'if') || (id === 'in') || (id === 'do');
-	            case 3:
-	                return (id === 'var') || (id === 'for') || (id === 'new') ||
-	                    (id === 'try') || (id === 'let');
-	            case 4:
-	                return (id === 'this') || (id === 'else') || (id === 'case') ||
-	                    (id === 'void') || (id === 'with') || (id === 'enum');
-	            case 5:
-	                return (id === 'while') || (id === 'break') || (id === 'catch') ||
-	                    (id === 'throw') || (id === 'const') || (id === 'yield') ||
-	                    (id === 'class') || (id === 'super');
-	            case 6:
-	                return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
-	                    (id === 'switch') || (id === 'export') || (id === 'import');
-	            case 7:
-	                return (id === 'default') || (id === 'finally') || (id === 'extends');
-	            case 8:
-	                return (id === 'function') || (id === 'continue') || (id === 'debugger');
-	            case 10:
-	                return (id === 'instanceof');
-	            default:
-	                return false;
-	        }
-	    };
-	    Scanner.prototype.codePointAt = function (i) {
-	        var cp = this.source.charCodeAt(i);
-	        if (cp >= 0xD800 && cp <= 0xDBFF) {
-	            var second = this.source.charCodeAt(i + 1);
-	            if (second >= 0xDC00 && second <= 0xDFFF) {
-	                var first = cp;
-	                cp = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
-	            }
-	        }
-	        return cp;
-	    };
-	    Scanner.prototype.scanHexEscape = function (prefix) {
-	        var len = (prefix === 'u') ? 4 : 2;
-	        var code = 0;
-	        for (var i = 0; i < len; ++i) {
-	            if (!this.eof() && character_1.Character.isHexDigit(this.source.charCodeAt(this.index))) {
-	                code = code * 16 + hexValue(this.source[this.index++]);
-	            }
-	            else {
-	                return null;
-	            }
-	        }
-	        return String.fromCharCode(code);
-	    };
-	    Scanner.prototype.scanUnicodeCodePointEscape = function () {
-	        var ch = this.source[this.index];
-	        var code = 0;
-	        // At least, one hex digit is required.
-	        if (ch === '}') {
-	            this.throwUnexpectedToken();
-	        }
-	        while (!this.eof()) {
-	            ch = this.source[this.index++];
-	            if (!character_1.Character.isHexDigit(ch.charCodeAt(0))) {
-	                break;
-	            }
-	            code = code * 16 + hexValue(ch);
-	        }
-	        if (code > 0x10FFFF || ch !== '}') {
-	            this.throwUnexpectedToken();
-	        }
-	        return character_1.Character.fromCodePoint(code);
-	    };
-	    Scanner.prototype.getIdentifier = function () {
-	        var start = this.index++;
-	        while (!this.eof()) {
-	            var ch = this.source.charCodeAt(this.index);
-	            if (ch === 0x5C) {
-	                // Blackslash (U+005C) marks Unicode escape sequence.
-	                this.index = start;
-	                return this.getComplexIdentifier();
-	            }
-	            else if (ch >= 0xD800 && ch < 0xDFFF) {
-	                // Need to handle surrogate pairs.
-	                this.index = start;
-	                return this.getComplexIdentifier();
-	            }
-	            if (character_1.Character.isIdentifierPart(ch)) {
-	                ++this.index;
-	            }
-	            else {
-	                break;
-	            }
-	        }
-	        return this.source.slice(start, this.index);
-	    };
-	    Scanner.prototype.getComplexIdentifier = function () {
-	        var cp = this.codePointAt(this.index);
-	        var id = character_1.Character.fromCodePoint(cp);
-	        this.index += id.length;
-	        // '\u' (U+005C, U+0075) denotes an escaped character.
-	        var ch;
-	        if (cp === 0x5C) {
-	            if (this.source.charCodeAt(this.index) !== 0x75) {
-	                this.throwUnexpectedToken();
-	            }
-	            ++this.index;
-	            if (this.source[this.index] === '{') {
-	                ++this.index;
-	                ch = this.scanUnicodeCodePointEscape();
-	            }
-	            else {
-	                ch = this.scanHexEscape('u');
-	                if (ch === null || ch === '\\' || !character_1.Character.isIdentifierStart(ch.charCodeAt(0))) {
-	                    this.throwUnexpectedToken();
-	                }
-	            }
-	            id = ch;
-	        }
-	        while (!this.eof()) {
-	            cp = this.codePointAt(this.index);
-	            if (!character_1.Character.isIdentifierPart(cp)) {
-	                break;
-	            }
-	            ch = character_1.Character.fromCodePoint(cp);
-	            id += ch;
-	            this.index += ch.length;
-	            // '\u' (U+005C, U+0075) denotes an escaped character.
-	            if (cp === 0x5C) {
-	                id = id.substr(0, id.length - 1);
-	                if (this.source.charCodeAt(this.index) !== 0x75) {
-	                    this.throwUnexpectedToken();
-	                }
-	                ++this.index;
-	                if (this.source[this.index] === '{') {
-	                    ++this.index;
-	                    ch = this.scanUnicodeCodePointEscape();
-	                }
-	                else {
-	                    ch = this.scanHexEscape('u');
-	                    if (ch === null || ch === '\\' || !character_1.Character.isIdentifierPart(ch.charCodeAt(0))) {
-	                        this.throwUnexpectedToken();
-	                    }
-	                }
-	                id += ch;
-	            }
-	        }
-	        return id;
-	    };
-	    Scanner.prototype.octalToDecimal = function (ch) {
-	        // \0 is not octal escape sequence
-	        var octal = (ch !== '0');
-	        var code = octalValue(ch);
-	        if (!this.eof() && character_1.Character.isOctalDigit(this.source.charCodeAt(this.index))) {
-	            octal = true;
-	            code = code * 8 + octalValue(this.source[this.index++]);
-	            // 3 digits are only allowed when string starts
-	            // with 0, 1, 2, 3
-	            if ('0123'.indexOf(ch) >= 0 && !this.eof() && character_1.Character.isOctalDigit(this.source.charCodeAt(this.index))) {
-	                code = code * 8 + octalValue(this.source[this.index++]);
-	            }
-	        }
-	        return {
-	            code: code,
-	            octal: octal
-	        };
-	    };
-	    // https://tc39.github.io/ecma262/#sec-names-and-keywords
-	    Scanner.prototype.scanIdentifier = function () {
-	        var type;
-	        var start = this.index;
-	        // Backslash (U+005C) starts an escaped character.
-	        var id = (this.source.charCodeAt(start) === 0x5C) ? this.getComplexIdentifier() : this.getIdentifier();
-	        // There is no keyword or literal with only one character.
-	        // Thus, it must be an identifier.
-	        if (id.length === 1) {
-	            type = 3 /* Identifier */;
-	        }
-	        else if (this.isKeyword(id)) {
-	            type = 4 /* Keyword */;
-	        }
-	        else if (id === 'null') {
-	            type = 5 /* NullLiteral */;
-	        }
-	        else if (id === 'true' || id === 'false') {
-	            type = 1 /* BooleanLiteral */;
-	        }
-	        else {
-	            type = 3 /* Identifier */;
-	        }
-	        if (type !== 3 /* Identifier */ && (start + id.length !== this.index)) {
-	            var restore = this.index;
-	            this.index = start;
-	            this.tolerateUnexpectedToken(messages_1.Messages.InvalidEscapedReservedWord);
-	            this.index = restore;
-	        }
-	        return {
-	            type: type,
-	            value: id,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    // https://tc39.github.io/ecma262/#sec-punctuators
-	    Scanner.prototype.scanPunctuator = function () {
-	        var start = this.index;
-	        // Check for most common single-character punctuators.
-	        var str = this.source[this.index];
-	        switch (str) {
-	            case '(':
-	            case '{':
-	                if (str === '{') {
-	                    this.curlyStack.push('{');
-	                }
-	                ++this.index;
-	                break;
-	            case '.':
-	                ++this.index;
-	                if (this.source[this.index] === '.' && this.source[this.index + 1] === '.') {
-	                    // Spread operator: ...
-	                    this.index += 2;
-	                    str = '...';
-	                }
-	                break;
-	            case '}':
-	                ++this.index;
-	                this.curlyStack.pop();
-	                break;
-	            case ')':
-	            case ';':
-	            case ',':
-	            case '[':
-	            case ']':
-	            case ':':
-	            case '?':
-	            case '~':
-	                ++this.index;
-	                break;
-	            default:
-	                // 4-character punctuator.
-	                str = this.source.substr(this.index, 4);
-	                if (str === '>>>=') {
-	                    this.index += 4;
-	                }
-	                else {
-	                    // 3-character punctuators.
-	                    str = str.substr(0, 3);
-	                    if (str === '===' || str === '!==' || str === '>>>' ||
-	                        str === '<<=' || str === '>>=' || str === '**=') {
-	                        this.index += 3;
-	                    }
-	                    else {
-	                        // 2-character punctuators.
-	                        str = str.substr(0, 2);
-	                        if (str === '&&' || str === '||' || str === '==' || str === '!=' ||
-	                            str === '+=' || str === '-=' || str === '*=' || str === '/=' ||
-	                            str === '++' || str === '--' || str === '<<' || str === '>>' ||
-	                            str === '&=' || str === '|=' || str === '^=' || str === '%=' ||
-	                            str === '<=' || str === '>=' || str === '=>' || str === '**') {
-	                            this.index += 2;
-	                        }
-	                        else {
-	                            // 1-character punctuators.
-	                            str = this.source[this.index];
-	                            if ('<>=!+-*%&|^/'.indexOf(str) >= 0) {
-	                                ++this.index;
-	                            }
-	                        }
-	                    }
-	                }
-	        }
-	        if (this.index === start) {
-	            this.throwUnexpectedToken();
-	        }
-	        return {
-	            type: 7 /* Punctuator */,
-	            value: str,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    // https://tc39.github.io/ecma262/#sec-literals-numeric-literals
-	    Scanner.prototype.scanHexLiteral = function (start) {
-	        var num = '';
-	        while (!this.eof()) {
-	            if (!character_1.Character.isHexDigit(this.source.charCodeAt(this.index))) {
-	                break;
-	            }
-	            num += this.source[this.index++];
-	        }
-	        if (num.length === 0) {
-	            this.throwUnexpectedToken();
-	        }
-	        if (character_1.Character.isIdentifierStart(this.source.charCodeAt(this.index))) {
-	            this.throwUnexpectedToken();
-	        }
-	        return {
-	            type: 6 /* NumericLiteral */,
-	            value: parseInt('0x' + num, 16),
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    Scanner.prototype.scanBinaryLiteral = function (start) {
-	        var num = '';
-	        var ch;
-	        while (!this.eof()) {
-	            ch = this.source[this.index];
-	            if (ch !== '0' && ch !== '1') {
-	                break;
-	            }
-	            num += this.source[this.index++];
-	        }
-	        if (num.length === 0) {
-	            // only 0b or 0B
-	            this.throwUnexpectedToken();
-	        }
-	        if (!this.eof()) {
-	            ch = this.source.charCodeAt(this.index);
-	            /* istanbul ignore else */
-	            if (character_1.Character.isIdentifierStart(ch) || character_1.Character.isDecimalDigit(ch)) {
-	                this.throwUnexpectedToken();
-	            }
-	        }
-	        return {
-	            type: 6 /* NumericLiteral */,
-	            value: parseInt(num, 2),
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    Scanner.prototype.scanOctalLiteral = function (prefix, start) {
-	        var num = '';
-	        var octal = false;
-	        if (character_1.Character.isOctalDigit(prefix.charCodeAt(0))) {
-	            octal = true;
-	            num = '0' + this.source[this.index++];
-	        }
-	        else {
-	            ++this.index;
-	        }
-	        while (!this.eof()) {
-	            if (!character_1.Character.isOctalDigit(this.source.charCodeAt(this.index))) {
-	                break;
-	            }
-	            num += this.source[this.index++];
-	        }
-	        if (!octal && num.length === 0) {
-	            // only 0o or 0O
-	            this.throwUnexpectedToken();
-	        }
-	        if (character_1.Character.isIdentifierStart(this.source.charCodeAt(this.index)) || character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
-	            this.throwUnexpectedToken();
-	        }
-	        return {
-	            type: 6 /* NumericLiteral */,
-	            value: parseInt(num, 8),
-	            octal: octal,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    Scanner.prototype.isImplicitOctalLiteral = function () {
-	        // Implicit octal, unless there is a non-octal digit.
-	        // (Annex B.1.1 on Numeric Literals)
-	        for (var i = this.index + 1; i < this.length; ++i) {
-	            var ch = this.source[i];
-	            if (ch === '8' || ch === '9') {
-	                return false;
-	            }
-	            if (!character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
-	                return true;
-	            }
-	        }
-	        return true;
-	    };
-	    Scanner.prototype.scanNumericLiteral = function () {
-	        var start = this.index;
-	        var ch = this.source[start];
-	        assert_1.assert(character_1.Character.isDecimalDigit(ch.charCodeAt(0)) || (ch === '.'), 'Numeric literal must start with a decimal digit or a decimal point');
-	        var num = '';
-	        if (ch !== '.') {
-	            num = this.source[this.index++];
-	            ch = this.source[this.index];
-	            // Hex number starts with '0x'.
-	            // Octal number starts with '0'.
-	            // Octal number in ES6 starts with '0o'.
-	            // Binary number in ES6 starts with '0b'.
-	            if (num === '0') {
-	                if (ch === 'x' || ch === 'X') {
-	                    ++this.index;
-	                    return this.scanHexLiteral(start);
-	                }
-	                if (ch === 'b' || ch === 'B') {
-	                    ++this.index;
-	                    return this.scanBinaryLiteral(start);
-	                }
-	                if (ch === 'o' || ch === 'O') {
-	                    return this.scanOctalLiteral(ch, start);
-	                }
-	                if (ch && character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
-	                    if (this.isImplicitOctalLiteral()) {
-	                        return this.scanOctalLiteral(ch, start);
-	                    }
-	                }
-	            }
-	            while (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
-	                num += this.source[this.index++];
-	            }
-	            ch = this.source[this.index];
-	        }
-	        if (ch === '.') {
-	            num += this.source[this.index++];
-	            while (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
-	                num += this.source[this.index++];
-	            }
-	            ch = this.source[this.index];
-	        }
-	        if (ch === 'e' || ch === 'E') {
-	            num += this.source[this.index++];
-	            ch = this.source[this.index];
-	            if (ch === '+' || ch === '-') {
-	                num += this.source[this.index++];
-	            }
-	            if (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
-	                while (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
-	                    num += this.source[this.index++];
-	                }
-	            }
-	            else {
-	                this.throwUnexpectedToken();
-	            }
-	        }
-	        if (character_1.Character.isIdentifierStart(this.source.charCodeAt(this.index))) {
-	            this.throwUnexpectedToken();
-	        }
-	        return {
-	            type: 6 /* NumericLiteral */,
-	            value: parseFloat(num),
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    // https://tc39.github.io/ecma262/#sec-literals-string-literals
-	    Scanner.prototype.scanStringLiteral = function () {
-	        var start = this.index;
-	        var quote = this.source[start];
-	        assert_1.assert((quote === '\'' || quote === '"'), 'String literal must starts with a quote');
-	        ++this.index;
-	        var octal = false;
-	        var str = '';
-	        while (!this.eof()) {
-	            var ch = this.source[this.index++];
-	            if (ch === quote) {
-	                quote = '';
-	                break;
-	            }
-	            else if (ch === '\\') {
-	                ch = this.source[this.index++];
-	                if (!ch || !character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                    switch (ch) {
-	                        case 'u':
-	                            if (this.source[this.index] === '{') {
-	                                ++this.index;
-	                                str += this.scanUnicodeCodePointEscape();
-	                            }
-	                            else {
-	                                var unescaped_1 = this.scanHexEscape(ch);
-	                                if (unescaped_1 === null) {
-	                                    this.throwUnexpectedToken();
-	                                }
-	                                str += unescaped_1;
-	                            }
-	                            break;
-	                        case 'x':
-	                            var unescaped = this.scanHexEscape(ch);
-	                            if (unescaped === null) {
-	                                this.throwUnexpectedToken(messages_1.Messages.InvalidHexEscapeSequence);
-	                            }
-	                            str += unescaped;
-	                            break;
-	                        case 'n':
-	                            str += '\n';
-	                            break;
-	                        case 'r':
-	                            str += '\r';
-	                            break;
-	                        case 't':
-	                            str += '\t';
-	                            break;
-	                        case 'b':
-	                            str += '\b';
-	                            break;
-	                        case 'f':
-	                            str += '\f';
-	                            break;
-	                        case 'v':
-	                            str += '\x0B';
-	                            break;
-	                        case '8':
-	                        case '9':
-	                            str += ch;
-	                            this.tolerateUnexpectedToken();
-	                            break;
-	                        default:
-	                            if (ch && character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
-	                                var octToDec = this.octalToDecimal(ch);
-	                                octal = octToDec.octal || octal;
-	                                str += String.fromCharCode(octToDec.code);
-	                            }
-	                            else {
-	                                str += ch;
-	                            }
-	                            break;
-	                    }
-	                }
-	                else {
-	                    ++this.lineNumber;
-	                    if (ch === '\r' && this.source[this.index] === '\n') {
-	                        ++this.index;
-	                    }
-	                    this.lineStart = this.index;
-	                }
-	            }
-	            else if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                break;
-	            }
-	            else {
-	                str += ch;
-	            }
-	        }
-	        if (quote !== '') {
-	            this.index = start;
-	            this.throwUnexpectedToken();
-	        }
-	        return {
-	            type: 8 /* StringLiteral */,
-	            value: str,
-	            octal: octal,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    // https://tc39.github.io/ecma262/#sec-template-literal-lexical-components
-	    Scanner.prototype.scanTemplate = function () {
-	        var cooked = '';
-	        var terminated = false;
-	        var start = this.index;
-	        var head = (this.source[start] === '`');
-	        var tail = false;
-	        var rawOffset = 2;
-	        ++this.index;
-	        while (!this.eof()) {
-	            var ch = this.source[this.index++];
-	            if (ch === '`') {
-	                rawOffset = 1;
-	                tail = true;
-	                terminated = true;
-	                break;
-	            }
-	            else if (ch === '$') {
-	                if (this.source[this.index] === '{') {
-	                    this.curlyStack.push('${');
-	                    ++this.index;
-	                    terminated = true;
-	                    break;
-	                }
-	                cooked += ch;
-	            }
-	            else if (ch === '\\') {
-	                ch = this.source[this.index++];
-	                if (!character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                    switch (ch) {
-	                        case 'n':
-	                            cooked += '\n';
-	                            break;
-	                        case 'r':
-	                            cooked += '\r';
-	                            break;
-	                        case 't':
-	                            cooked += '\t';
-	                            break;
-	                        case 'u':
-	                            if (this.source[this.index] === '{') {
-	                                ++this.index;
-	                                cooked += this.scanUnicodeCodePointEscape();
-	                            }
-	                            else {
-	                                var restore = this.index;
-	                                var unescaped_2 = this.scanHexEscape(ch);
-	                                if (unescaped_2 !== null) {
-	                                    cooked += unescaped_2;
-	                                }
-	                                else {
-	                                    this.index = restore;
-	                                    cooked += ch;
-	                                }
-	                            }
-	                            break;
-	                        case 'x':
-	                            var unescaped = this.scanHexEscape(ch);
-	                            if (unescaped === null) {
-	                                this.throwUnexpectedToken(messages_1.Messages.InvalidHexEscapeSequence);
-	                            }
-	                            cooked += unescaped;
-	                            break;
-	                        case 'b':
-	                            cooked += '\b';
-	                            break;
-	                        case 'f':
-	                            cooked += '\f';
-	                            break;
-	                        case 'v':
-	                            cooked += '\v';
-	                            break;
-	                        default:
-	                            if (ch === '0') {
-	                                if (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index))) {
-	                                    // Illegal: \01 \02 and so on
-	                                    this.throwUnexpectedToken(messages_1.Messages.TemplateOctalLiteral);
-	                                }
-	                                cooked += '\0';
-	                            }
-	                            else if (character_1.Character.isOctalDigit(ch.charCodeAt(0))) {
-	                                // Illegal: \1 \2
-	                                this.throwUnexpectedToken(messages_1.Messages.TemplateOctalLiteral);
-	                            }
-	                            else {
-	                                cooked += ch;
-	                            }
-	                            break;
-	                    }
-	                }
-	                else {
-	                    ++this.lineNumber;
-	                    if (ch === '\r' && this.source[this.index] === '\n') {
-	                        ++this.index;
-	                    }
-	                    this.lineStart = this.index;
-	                }
-	            }
-	            else if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                ++this.lineNumber;
-	                if (ch === '\r' && this.source[this.index] === '\n') {
-	                    ++this.index;
-	                }
-	                this.lineStart = this.index;
-	                cooked += '\n';
-	            }
-	            else {
-	                cooked += ch;
-	            }
-	        }
-	        if (!terminated) {
-	            this.throwUnexpectedToken();
-	        }
-	        if (!head) {
-	            this.curlyStack.pop();
-	        }
-	        return {
-	            type: 10 /* Template */,
-	            value: this.source.slice(start + 1, this.index - rawOffset),
-	            cooked: cooked,
-	            head: head,
-	            tail: tail,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    // https://tc39.github.io/ecma262/#sec-literals-regular-expression-literals
-	    Scanner.prototype.testRegExp = function (pattern, flags) {
-	        // The BMP character to use as a replacement for astral symbols when
-	        // translating an ES6 "u"-flagged pattern to an ES5-compatible
-	        // approximation.
-	        // Note: replacing with '\uFFFF' enables false positives in unlikely
-	        // scenarios. For example, `[\u{1044f}-\u{10440}]` is an invalid
-	        // pattern that would not be detected by this substitution.
-	        var astralSubstitute = '\uFFFF';
-	        var tmp = pattern;
-	        var self = this;
-	        if (flags.indexOf('u') >= 0) {
-	            tmp = tmp
-	                .replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g, function ($0, $1, $2) {
-	                var codePoint = parseInt($1 || $2, 16);
-	                if (codePoint > 0x10FFFF) {
-	                    self.throwUnexpectedToken(messages_1.Messages.InvalidRegExp);
-	                }
-	                if (codePoint <= 0xFFFF) {
-	                    return String.fromCharCode(codePoint);
-	                }
-	                return astralSubstitute;
-	            })
-	                .replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, astralSubstitute);
-	        }
-	        // First, detect invalid regular expressions.
-	        try {
-	            RegExp(tmp);
-	        }
-	        catch (e) {
-	            this.throwUnexpectedToken(messages_1.Messages.InvalidRegExp);
-	        }
-	        // Return a regular expression object for this pattern-flag pair, or
-	        // `null` in case the current environment doesn't support the flags it
-	        // uses.
-	        try {
-	            return new RegExp(pattern, flags);
-	        }
-	        catch (exception) {
-	            /* istanbul ignore next */
-	            return null;
-	        }
-	    };
-	    Scanner.prototype.scanRegExpBody = function () {
-	        var ch = this.source[this.index];
-	        assert_1.assert(ch === '/', 'Regular expression literal must start with a slash');
-	        var str = this.source[this.index++];
-	        var classMarker = false;
-	        var terminated = false;
-	        while (!this.eof()) {
-	            ch = this.source[this.index++];
-	            str += ch;
-	            if (ch === '\\') {
-	                ch = this.source[this.index++];
-	                // https://tc39.github.io/ecma262/#sec-literals-regular-expression-literals
-	                if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                    this.throwUnexpectedToken(messages_1.Messages.UnterminatedRegExp);
-	                }
-	                str += ch;
-	            }
-	            else if (character_1.Character.isLineTerminator(ch.charCodeAt(0))) {
-	                this.throwUnexpectedToken(messages_1.Messages.UnterminatedRegExp);
-	            }
-	            else if (classMarker) {
-	                if (ch === ']') {
-	                    classMarker = false;
-	                }
-	            }
-	            else {
-	                if (ch === '/') {
-	                    terminated = true;
-	                    break;
-	                }
-	                else if (ch === '[') {
-	                    classMarker = true;
-	                }
-	            }
-	        }
-	        if (!terminated) {
-	            this.throwUnexpectedToken(messages_1.Messages.UnterminatedRegExp);
-	        }
-	        // Exclude leading and trailing slash.
-	        return str.substr(1, str.length - 2);
-	    };
-	    Scanner.prototype.scanRegExpFlags = function () {
-	        var str = '';
-	        var flags = '';
-	        while (!this.eof()) {
-	            var ch = this.source[this.index];
-	            if (!character_1.Character.isIdentifierPart(ch.charCodeAt(0))) {
-	                break;
-	            }
-	            ++this.index;
-	            if (ch === '\\' && !this.eof()) {
-	                ch = this.source[this.index];
-	                if (ch === 'u') {
-	                    ++this.index;
-	                    var restore = this.index;
-	                    var char = this.scanHexEscape('u');
-	                    if (char !== null) {
-	                        flags += char;
-	                        for (str += '\\u'; restore < this.index; ++restore) {
-	                            str += this.source[restore];
-	                        }
-	                    }
-	                    else {
-	                        this.index = restore;
-	                        flags += 'u';
-	                        str += '\\u';
-	                    }
-	                    this.tolerateUnexpectedToken();
-	                }
-	                else {
-	                    str += '\\';
-	                    this.tolerateUnexpectedToken();
-	                }
-	            }
-	            else {
-	                flags += ch;
-	                str += ch;
-	            }
-	        }
-	        return flags;
-	    };
-	    Scanner.prototype.scanRegExp = function () {
-	        var start = this.index;
-	        var pattern = this.scanRegExpBody();
-	        var flags = this.scanRegExpFlags();
-	        var value = this.testRegExp(pattern, flags);
-	        return {
-	            type: 9 /* RegularExpression */,
-	            value: '',
-	            pattern: pattern,
-	            flags: flags,
-	            regex: value,
-	            lineNumber: this.lineNumber,
-	            lineStart: this.lineStart,
-	            start: start,
-	            end: this.index
-	        };
-	    };
-	    Scanner.prototype.lex = function () {
-	        if (this.eof()) {
-	            return {
-	                type: 2 /* EOF */,
-	                value: '',
-	                lineNumber: this.lineNumber,
-	                lineStart: this.lineStart,
-	                start: this.index,
-	                end: this.index
-	            };
-	        }
-	        var cp = this.source.charCodeAt(this.index);
-	        if (character_1.Character.isIdentifierStart(cp)) {
-	            return this.scanIdentifier();
-	        }
-	        // Very common: ( and ) and ;
-	        if (cp === 0x28 || cp === 0x29 || cp === 0x3B) {
-	            return this.scanPunctuator();
-	        }
-	        // String literal starts with single quote (U+0027) or double quote (U+0022).
-	        if (cp === 0x27 || cp === 0x22) {
-	            return this.scanStringLiteral();
-	        }
-	        // Dot (.) U+002E can also start a floating-point number, hence the need
-	        // to check the next character.
-	        if (cp === 0x2E) {
-	            if (character_1.Character.isDecimalDigit(this.source.charCodeAt(this.index + 1))) {
-	                return this.scanNumericLiteral();
-	            }
-	            return this.scanPunctuator();
-	        }
-	        if (character_1.Character.isDecimalDigit(cp)) {
-	            return this.scanNumericLiteral();
-	        }
-	        // Template literals start with ` (U+0060) for template head
-	        // or } (U+007D) for template middle or template tail.
-	        if (cp === 0x60 || (cp === 0x7D && this.curlyStack[this.curlyStack.length - 1] === '${')) {
-	            return this.scanTemplate();
-	        }
-	        // Possible identifier start in a surrogate pair.
-	        if (cp >= 0xD800 && cp < 0xDFFF) {
-	            if (character_1.Character.isIdentifierStart(this.codePointAt(this.index))) {
-	                return this.scanIdentifier();
-	            }
-	        }
-	        return this.scanPunctuator();
-	    };
-	    return Scanner;
-	}());
-	exports.Scanner = Scanner;
-
-
-/***/ },
-/* 13 */
-/***/ function(module, exports) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.TokenName = {};
-	exports.TokenName[1 /* BooleanLiteral */] = 'Boolean';
-	exports.TokenName[2 /* EOF */] = '<end>';
-	exports.TokenName[3 /* Identifier */] = 'Identifier';
-	exports.TokenName[4 /* Keyword */] = 'Keyword';
-	exports.TokenName[5 /* NullLiteral */] = 'Null';
-	exports.TokenName[6 /* NumericLiteral */] = 'Numeric';
-	exports.TokenName[7 /* Punctuator */] = 'Punctuator';
-	exports.TokenName[8 /* StringLiteral */] = 'String';
-	exports.TokenName[9 /* RegularExpression */] = 'RegularExpression';
-	exports.TokenName[10 /* Template */] = 'Template';
-
-
-/***/ },
-/* 14 */
-/***/ function(module, exports) {
-
-	"use strict";
-	// Generated by generate-xhtml-entities.js. DO NOT MODIFY!
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.XHTMLEntities = {
-	    quot: '\u0022',
-	    amp: '\u0026',
-	    apos: '\u0027',
-	    gt: '\u003E',
-	    nbsp: '\u00A0',
-	    iexcl: '\u00A1',
-	    cent: '\u00A2',
-	    pound: '\u00A3',
-	    curren: '\u00A4',
-	    yen: '\u00A5',
-	    brvbar: '\u00A6',
-	    sect: '\u00A7',
-	    uml: '\u00A8',
-	    copy: '\u00A9',
-	    ordf: '\u00AA',
-	    laquo: '\u00AB',
-	    not: '\u00AC',
-	    shy: '\u00AD',
-	    reg: '\u00AE',
-	    macr: '\u00AF',
-	    deg: '\u00B0',
-	    plusmn: '\u00B1',
-	    sup2: '\u00B2',
-	    sup3: '\u00B3',
-	    acute: '\u00B4',
-	    micro: '\u00B5',
-	    para: '\u00B6',
-	    middot: '\u00B7',
-	    cedil: '\u00B8',
-	    sup1: '\u00B9',
-	    ordm: '\u00BA',
-	    raquo: '\u00BB',
-	    frac14: '\u00BC',
-	    frac12: '\u00BD',
-	    frac34: '\u00BE',
-	    iquest: '\u00BF',
-	    Agrave: '\u00C0',
-	    Aacute: '\u00C1',
-	    Acirc: '\u00C2',
-	    Atilde: '\u00C3',
-	    Auml: '\u00C4',
-	    Aring: '\u00C5',
-	    AElig: '\u00C6',
-	    Ccedil: '\u00C7',
-	    Egrave: '\u00C8',
-	    Eacute: '\u00C9',
-	    Ecirc: '\u00CA',
-	    Euml: '\u00CB',
-	    Igrave: '\u00CC',
-	    Iacute: '\u00CD',
-	    Icirc: '\u00CE',
-	    Iuml: '\u00CF',
-	    ETH: '\u00D0',
-	    Ntilde: '\u00D1',
-	    Ograve: '\u00D2',
-	    Oacute: '\u00D3',
-	    Ocirc: '\u00D4',
-	    Otilde: '\u00D5',
-	    Ouml: '\u00D6',
-	    times: '\u00D7',
-	    Oslash: '\u00D8',
-	    Ugrave: '\u00D9',
-	    Uacute: '\u00DA',
-	    Ucirc: '\u00DB',
-	    Uuml: '\u00DC',
-	    Yacute: '\u00DD',
-	    THORN: '\u00DE',
-	    szlig: '\u00DF',
-	    agrave: '\u00E0',
-	    aacute: '\u00E1',
-	    acirc: '\u00E2',
-	    atilde: '\u00E3',
-	    auml: '\u00E4',
-	    aring: '\u00E5',
-	    aelig: '\u00E6',
-	    ccedil: '\u00E7',
-	    egrave: '\u00E8',
-	    eacute: '\u00E9',
-	    ecirc: '\u00EA',
-	    euml: '\u00EB',
-	    igrave: '\u00EC',
-	    iacute: '\u00ED',
-	    icirc: '\u00EE',
-	    iuml: '\u00EF',
-	    eth: '\u00F0',
-	    ntilde: '\u00F1',
-	    ograve: '\u00F2',
-	    oacute: '\u00F3',
-	    ocirc: '\u00F4',
-	    otilde: '\u00F5',
-	    ouml: '\u00F6',
-	    divide: '\u00F7',
-	    oslash: '\u00F8',
-	    ugrave: '\u00F9',
-	    uacute: '\u00FA',
-	    ucirc: '\u00FB',
-	    uuml: '\u00FC',
-	    yacute: '\u00FD',
-	    thorn: '\u00FE',
-	    yuml: '\u00FF',
-	    OElig: '\u0152',
-	    oelig: '\u0153',
-	    Scaron: '\u0160',
-	    scaron: '\u0161',
-	    Yuml: '\u0178',
-	    fnof: '\u0192',
-	    circ: '\u02C6',
-	    tilde: '\u02DC',
-	    Alpha: '\u0391',
-	    Beta: '\u0392',
-	    Gamma: '\u0393',
-	    Delta: '\u0394',
-	    Epsilon: '\u0395',
-	    Zeta: '\u0396',
-	    Eta: '\u0397',
-	    Theta: '\u0398',
-	    Iota: '\u0399',
-	    Kappa: '\u039A',
-	    Lambda: '\u039B',
-	    Mu: '\u039C',
-	    Nu: '\u039D',
-	    Xi: '\u039E',
-	    Omicron: '\u039F',
-	    Pi: '\u03A0',
-	    Rho: '\u03A1',
-	    Sigma: '\u03A3',
-	    Tau: '\u03A4',
-	    Upsilon: '\u03A5',
-	    Phi: '\u03A6',
-	    Chi: '\u03A7',
-	    Psi: '\u03A8',
-	    Omega: '\u03A9',
-	    alpha: '\u03B1',
-	    beta: '\u03B2',
-	    gamma: '\u03B3',
-	    delta: '\u03B4',
-	    epsilon: '\u03B5',
-	    zeta: '\u03B6',
-	    eta: '\u03B7',
-	    theta: '\u03B8',
-	    iota: '\u03B9',
-	    kappa: '\u03BA',
-	    lambda: '\u03BB',
-	    mu: '\u03BC',
-	    nu: '\u03BD',
-	    xi: '\u03BE',
-	    omicron: '\u03BF',
-	    pi: '\u03C0',
-	    rho: '\u03C1',
-	    sigmaf: '\u03C2',
-	    sigma: '\u03C3',
-	    tau: '\u03C4',
-	    upsilon: '\u03C5',
-	    phi: '\u03C6',
-	    chi: '\u03C7',
-	    psi: '\u03C8',
-	    omega: '\u03C9',
-	    thetasym: '\u03D1',
-	    upsih: '\u03D2',
-	    piv: '\u03D6',
-	    ensp: '\u2002',
-	    emsp: '\u2003',
-	    thinsp: '\u2009',
-	    zwnj: '\u200C',
-	    zwj: '\u200D',
-	    lrm: '\u200E',
-	    rlm: '\u200F',
-	    ndash: '\u2013',
-	    mdash: '\u2014',
-	    lsquo: '\u2018',
-	    rsquo: '\u2019',
-	    sbquo: '\u201A',
-	    ldquo: '\u201C',
-	    rdquo: '\u201D',
-	    bdquo: '\u201E',
-	    dagger: '\u2020',
-	    Dagger: '\u2021',
-	    bull: '\u2022',
-	    hellip: '\u2026',
-	    permil: '\u2030',
-	    prime: '\u2032',
-	    Prime: '\u2033',
-	    lsaquo: '\u2039',
-	    rsaquo: '\u203A',
-	    oline: '\u203E',
-	    frasl: '\u2044',
-	    euro: '\u20AC',
-	    image: '\u2111',
-	    weierp: '\u2118',
-	    real: '\u211C',
-	    trade: '\u2122',
-	    alefsym: '\u2135',
-	    larr: '\u2190',
-	    uarr: '\u2191',
-	    rarr: '\u2192',
-	    darr: '\u2193',
-	    harr: '\u2194',
-	    crarr: '\u21B5',
-	    lArr: '\u21D0',
-	    uArr: '\u21D1',
-	    rArr: '\u21D2',
-	    dArr: '\u21D3',
-	    hArr: '\u21D4',
-	    forall: '\u2200',
-	    part: '\u2202',
-	    exist: '\u2203',
-	    empty: '\u2205',
-	    nabla: '\u2207',
-	    isin: '\u2208',
-	    notin: '\u2209',
-	    ni: '\u220B',
-	    prod: '\u220F',
-	    sum: '\u2211',
-	    minus: '\u2212',
-	    lowast: '\u2217',
-	    radic: '\u221A',
-	    prop: '\u221D',
-	    infin: '\u221E',
-	    ang: '\u2220',
-	    and: '\u2227',
-	    or: '\u2228',
-	    cap: '\u2229',
-	    cup: '\u222A',
-	    int: '\u222B',
-	    there4: '\u2234',
-	    sim: '\u223C',
-	    cong: '\u2245',
-	    asymp: '\u2248',
-	    ne: '\u2260',
-	    equiv: '\u2261',
-	    le: '\u2264',
-	    ge: '\u2265',
-	    sub: '\u2282',
-	    sup: '\u2283',
-	    nsub: '\u2284',
-	    sube: '\u2286',
-	    supe: '\u2287',
-	    oplus: '\u2295',
-	    otimes: '\u2297',
-	    perp: '\u22A5',
-	    sdot: '\u22C5',
-	    lceil: '\u2308',
-	    rceil: '\u2309',
-	    lfloor: '\u230A',
-	    rfloor: '\u230B',
-	    loz: '\u25CA',
-	    spades: '\u2660',
-	    clubs: '\u2663',
-	    hearts: '\u2665',
-	    diams: '\u2666',
-	    lang: '\u27E8',
-	    rang: '\u27E9'
-	};
-
-
-/***/ },
-/* 15 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"use strict";
-	Object.defineProperty(exports, "__esModule", { value: true });
-	var error_handler_1 = __webpack_require__(10);
-	var scanner_1 = __webpack_require__(12);
-	var token_1 = __webpack_require__(13);
-	var Reader = (function () {
-	    function Reader() {
-	        this.values = [];
-	        this.curly = this.paren = -1;
-	    }
-	    // A function following one of those tokens is an expression.
-	    Reader.prototype.beforeFunctionExpression = function (t) {
-	        return ['(', '{', '[', 'in', 'typeof', 'instanceof', 'new',
-	            'return', 'case', 'delete', 'throw', 'void',
-	            // assignment operators
-	            '=', '+=', '-=', '*=', '**=', '/=', '%=', '<<=', '>>=', '>>>=',
-	            '&=', '|=', '^=', ',',
-	            // binary/unary operators
-	            '+', '-', '*', '**', '/', '%', '++', '--', '<<', '>>', '>>>', '&',
-	            '|', '^', '!', '~', '&&', '||', '?', ':', '===', '==', '>=',
-	            '<=', '<', '>', '!=', '!=='].indexOf(t) >= 0;
-	    };
-	    // Determine if forward slash (/) is an operator or part of a regular expression
-	    // https://github.com/mozilla/sweet.js/wiki/design
-	    Reader.prototype.isRegexStart = function () {
-	        var previous = this.values[this.values.length - 1];
-	        var regex = (previous !== null);
-	        switch (previous) {
-	            case 'this':
-	            case ']':
-	                regex = false;
-	                break;
-	            case ')':
-	                var keyword = this.values[this.paren - 1];
-	                regex = (keyword === 'if' || keyword === 'while' || keyword === 'for' || keyword === 'with');
-	                break;
-	            case '}':
-	                // Dividing a function by anything makes little sense,
-	                // but we have to check for that.
-	                regex = false;
-	                if (this.values[this.curly - 3] === 'function') {
-	                    // Anonymous function, e.g. function(){} /42
-	                    var check = this.values[this.curly - 4];
-	                    regex = check ? !this.beforeFunctionExpression(check) : false;
-	                }
-	                else if (this.values[this.curly - 4] === 'function') {
-	                    // Named function, e.g. function f(){} /42/
-	                    var check = this.values[this.curly - 5];
-	                    regex = check ? !this.beforeFunctionExpression(check) : true;
-	                }
-	                break;
-	            default:
-	                break;
-	        }
-	        return regex;
-	    };
-	    Reader.prototype.push = function (token) {
-	        if (token.type === 7 /* Punctuator */ || token.type === 4 /* Keyword */) {
-	            if (token.value === '{') {
-	                this.curly = this.values.length;
-	            }
-	            else if (token.value === '(') {
-	                this.paren = this.values.length;
-	            }
-	            this.values.push(token.value);
-	        }
-	        else {
-	            this.values.push(null);
-	        }
-	    };
-	    return Reader;
-	}());
-	var Tokenizer = (function () {
-	    function Tokenizer(code, config) {
-	        this.errorHandler = new error_handler_1.ErrorHandler();
-	        this.errorHandler.tolerant = config ? (typeof config.tolerant === 'boolean' && config.tolerant) : false;
-	        this.scanner = new scanner_1.Scanner(code, this.errorHandler);
-	        this.scanner.trackComment = config ? (typeof config.comment === 'boolean' && config.comment) : false;
-	        this.trackRange = config ? (typeof config.range === 'boolean' && config.range) : false;
-	        this.trackLoc = config ? (typeof config.loc === 'boolean' && config.loc) : false;
-	        this.buffer = [];
-	        this.reader = new Reader();
-	    }
-	    Tokenizer.prototype.errors = function () {
-	        return this.errorHandler.errors;
-	    };
-	    Tokenizer.prototype.getNextToken = function () {
-	        if (this.buffer.length === 0) {
-	            var comments = this.scanner.scanComments();
-	            if (this.scanner.trackComment) {
-	                for (var i = 0; i < comments.length; ++i) {
-	                    var e = comments[i];
-	                    var value = this.scanner.source.slice(e.slice[0], e.slice[1]);
-	                    var comment = {
-	                        type: e.multiLine ? 'BlockComment' : 'LineComment',
-	                        value: value
-	                    };
-	                    if (this.trackRange) {
-	                        comment.range = e.range;
-	                    }
-	                    if (this.trackLoc) {
-	                        comment.loc = e.loc;
-	                    }
-	                    this.buffer.push(comment);
-	                }
-	            }
-	            if (!this.scanner.eof()) {
-	                var loc = void 0;
-	                if (this.trackLoc) {
-	                    loc = {
-	                        start: {
-	                            line: this.scanner.lineNumber,
-	                            column: this.scanner.index - this.scanner.lineStart
-	                        },
-	                        end: {}
-	                    };
-	                }
-	                var startRegex = (this.scanner.source[this.scanner.index] === '/') && this.reader.isRegexStart();
-	                var token = startRegex ? this.scanner.scanRegExp() : this.scanner.lex();
-	                this.reader.push(token);
-	                var entry = {
-	                    type: token_1.TokenName[token.type],
-	                    value: this.scanner.source.slice(token.start, token.end)
-	                };
-	                if (this.trackRange) {
-	                    entry.range = [token.start, token.end];
-	                }
-	                if (this.trackLoc) {
-	                    loc.end = {
-	                        line: this.scanner.lineNumber,
-	                        column: this.scanner.index - this.scanner.lineStart
-	                    };
-	                    entry.loc = loc;
-	                }
-	                if (token.type === 9 /* RegularExpression */) {
-	                    var pattern = token.pattern;
-	                    var flags = token.flags;
-	                    entry.regex = { pattern: pattern, flags: flags };
-	                }
-	                this.buffer.push(entry);
-	            }
-	        }
-	        return this.buffer.shift();
-	    };
-	    return Tokenizer;
-	}());
-	exports.Tokenizer = Tokenizer;
-
-
-/***/ }
-/******/ ])
-});
-;
-
-/***/ }),
-/* 269 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var hasOwn = Object.prototype.hasOwnProperty;
-var toStr = Object.prototype.toString;
-var defineProperty = Object.defineProperty;
-var gOPD = Object.getOwnPropertyDescriptor;
-
-var isArray = function isArray(arr) {
-	if (typeof Array.isArray === 'function') {
-		return Array.isArray(arr);
-	}
-
-	return toStr.call(arr) === '[object Array]';
-};
-
-var isPlainObject = function isPlainObject(obj) {
-	if (!obj || toStr.call(obj) !== '[object Object]') {
-		return false;
-	}
-
-	var hasOwnConstructor = hasOwn.call(obj, 'constructor');
-	var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
-	// Not own constructor property must be Object
-	if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
-		return false;
-	}
-
-	// Own properties are enumerated firstly, so to speed up,
-	// if last one is own, then all properties are own.
-	var key;
-	for (key in obj) { /**/ }
-
-	return typeof key === 'undefined' || hasOwn.call(obj, key);
-};
-
-// If name is '__proto__', and Object.defineProperty is available, define __proto__ as an own property on target
-var setProperty = function setProperty(target, options) {
-	if (defineProperty && options.name === '__proto__') {
-		defineProperty(target, options.name, {
-			enumerable: true,
-			configurable: true,
-			value: options.newValue,
-			writable: true
-		});
-	} else {
-		target[options.name] = options.newValue;
-	}
-};
-
-// Return undefined instead of __proto__ if '__proto__' is not an own property
-var getProperty = function getProperty(obj, name) {
-	if (name === '__proto__') {
-		if (!hasOwn.call(obj, name)) {
-			return void 0;
-		} else if (gOPD) {
-			// In early versions of node, obj['__proto__'] is buggy when obj has
-			// __proto__ as an own property. Object.getOwnPropertyDescriptor() works.
-			return gOPD(obj, name).value;
-		}
-	}
-
-	return obj[name];
-};
-
-module.exports = function extend() {
-	var options, name, src, copy, copyIsArray, clone;
-	var target = arguments[0];
-	var i = 1;
-	var length = arguments.length;
-	var deep = false;
-
-	// Handle a deep copy situation
-	if (typeof target === 'boolean') {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-	if (target == null || (typeof target !== 'object' && typeof target !== 'function')) {
-		target = {};
-	}
-
-	for (; i < length; ++i) {
-		options = arguments[i];
-		// Only deal with non-null/undefined values
-		if (options != null) {
-			// Extend the base object
-			for (name in options) {
-				src = getProperty(target, name);
-				copy = getProperty(options, name);
-
-				// Prevent never-ending loop
-				if (target !== copy) {
-					// Recurse if we're merging plain objects or arrays
-					if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
-						if (copyIsArray) {
-							copyIsArray = false;
-							clone = src && isArray(src) ? src : [];
-						} else {
-							clone = src && isPlainObject(src) ? src : {};
-						}
-
-						// Never move original objects, clone them
-						setProperty(target, { name: name, newValue: extend(deep, clone, copy) });
-
-					// Don't bring in undefined values
-					} else if (typeof copy !== 'undefined') {
-						setProperty(target, { name: name, newValue: copy });
-					}
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-
-/***/ }),
-/* 270 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const escapeStringRegexp = __webpack_require__(388);
-
-const platform = process.platform;
-
-const main = {
-	tick: '✔',
-	cross: '✖',
-	star: '★',
-	square: '▇',
-	squareSmall: '◻',
-	squareSmallFilled: '◼',
-	play: '▶',
-	circle: '◯',
-	circleFilled: '◉',
-	circleDotted: '◌',
-	circleDouble: '◎',
-	circleCircle: 'ⓞ',
-	circleCross: 'ⓧ',
-	circlePipe: 'Ⓘ',
-	circleQuestionMark: '?⃝',
-	bullet: '●',
-	dot: '․',
-	line: '─',
-	ellipsis: '…',
-	pointer: '❯',
-	pointerSmall: '›',
-	info: 'ℹ',
-	warning: '⚠',
-	hamburger: '☰',
-	smiley: '㋡',
-	mustache: '෴',
-	heart: '♥',
-	arrowUp: '↑',
-	arrowDown: '↓',
-	arrowLeft: '←',
-	arrowRight: '→',
-	radioOn: '◉',
-	radioOff: '◯',
-	checkboxOn: '☒',
-	checkboxOff: '☐',
-	checkboxCircleOn: 'ⓧ',
-	checkboxCircleOff: 'Ⓘ',
-	questionMarkPrefix: '?⃝',
-	oneHalf: '½',
-	oneThird: '⅓',
-	oneQuarter: '¼',
-	oneFifth: '⅕',
-	oneSixth: '⅙',
-	oneSeventh: '⅐',
-	oneEighth: '⅛',
-	oneNinth: '⅑',
-	oneTenth: '⅒',
-	twoThirds: '⅔',
-	twoFifths: '⅖',
-	threeQuarters: '¾',
-	threeFifths: '⅗',
-	threeEighths: '⅜',
-	fourFifths: '⅘',
-	fiveSixths: '⅚',
-	fiveEighths: '⅝',
-	sevenEighths: '⅞'
-};
-
-const win = {
-	tick: '√',
-	cross: '×',
-	star: '*',
-	square: '█',
-	squareSmall: '[ ]',
-	squareSmallFilled: '[█]',
-	play: '►',
-	circle: '( )',
-	circleFilled: '(*)',
-	circleDotted: '( )',
-	circleDouble: '( )',
-	circleCircle: '(○)',
-	circleCross: '(×)',
-	circlePipe: '(│)',
-	circleQuestionMark: '(?)',
-	bullet: '*',
-	dot: '.',
-	line: '─',
-	ellipsis: '...',
-	pointer: '>',
-	pointerSmall: '»',
-	info: 'i',
-	warning: '‼',
-	hamburger: '≡',
-	smiley: '☺',
-	mustache: '┌─┐',
-	heart: main.heart,
-	arrowUp: main.arrowUp,
-	arrowDown: main.arrowDown,
-	arrowLeft: main.arrowLeft,
-	arrowRight: main.arrowRight,
-	radioOn: '(*)',
-	radioOff: '( )',
-	checkboxOn: '[×]',
-	checkboxOff: '[ ]',
-	checkboxCircleOn: '(×)',
-	checkboxCircleOff: '( )',
-	questionMarkPrefix: '？',
-	oneHalf: '1/2',
-	oneThird: '1/3',
-	oneQuarter: '1/4',
-	oneFifth: '1/5',
-	oneSixth: '1/6',
-	oneSeventh: '1/7',
-	oneEighth: '1/8',
-	oneNinth: '1/9',
-	oneTenth: '1/10',
-	twoThirds: '2/3',
-	twoFifths: '2/5',
-	threeQuarters: '3/4',
-	threeFifths: '3/5',
-	threeEighths: '3/8',
-	fourFifths: '4/5',
-	fiveSixths: '5/6',
-	fiveEighths: '5/8',
-	sevenEighths: '7/8'
-};
-
-if (platform === 'linux') {
-	// the main one doesn't look that good on Ubuntu
-	main.questionMarkPrefix = '?';
-}
-
-const figures = platform === 'win32' ? win : main;
-
-const fn = str => {
-	if (figures === main) {
-		return str;
-	}
-
-	Object.keys(main).forEach(key => {
-		if (main[key] === figures[key]) {
-			return;
-		}
-
-		str = str.replace(new RegExp(escapeStringRegexp(main[key]), 'g'), figures[key]);
-	});
-
-	return str;
-};
-
-module.exports = Object.assign(fn, figures);
-
-
-/***/ }),
-/* 271 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var pathModule = __webpack_require__(0);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(5);
-
-// JavaScript implementation of realpath, ported from node pre-v6
-
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
-
-function rethrow() {
-  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
-  // is fairly slow to generate.
-  var callback;
-  if (DEBUG) {
-    var backtrace = new Error;
-    callback = debugCallback;
-  } else
-    callback = missingCallback;
-
-  return callback;
-
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
-    }
-  }
-
-  function missingCallback(err) {
-    if (err) {
-      if (process.throwDeprecation)
-        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
-      else if (!process.noDeprecation) {
-        var msg = 'fs: missing callback ' + (err.stack || err.message);
-        if (process.traceDeprecation)
-          console.trace(msg);
-        else
-          console.error(msg);
-      }
-    }
-  }
-}
-
-function maybeCallback(cb) {
-  return typeof cb === 'function' ? cb : rethrow();
-}
-
-var normalize = pathModule.normalize;
-
-// Regexp that finds the next partion of a (partial) path
-// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
-if (isWindows) {
-  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
-} else {
-  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
-}
-
-// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
-if (isWindows) {
-  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
-} else {
-  var splitRootRe = /^[\/]*/;
-}
-
-exports.realpathSync = function realpathSync(p, cache) {
-  // make p is absolute
-  p = pathModule.resolve(p);
-
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return cache[p];
-  }
-
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
-
-  // current character position in p
-  var pos;
-  // the partial path so far, including a trailing slash if any
-  var current;
-  // the partial path without a trailing slash (except when pointing at a root)
-  var base;
-  // the partial path scanned in the previous round, with slash
-  var previous;
-
-  start();
-
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
-
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstatSync(base);
-      knownHard[base] = true;
-    }
-  }
-
-  // walk down the path, swapping out linked pathparts for their real
-  // values
-  // NB: p.length changes.
-  while (pos < p.length) {
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
-
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
-    }
-
-    var resolvedLink;
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // some known symbolic link.  no need to stat again.
-      resolvedLink = cache[base];
-    } else {
-      var stat = fs.lstatSync(base);
-      if (!stat.isSymbolicLink()) {
-        knownHard[base] = true;
-        if (cache) cache[base] = base;
-        continue;
-      }
-
-      // read the link if it wasn't read before
-      // dev/ino always return 0 on windows, so skip the check.
-      var linkTarget = null;
-      if (!isWindows) {
-        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
-        if (seenLinks.hasOwnProperty(id)) {
-          linkTarget = seenLinks[id];
-        }
-      }
-      if (linkTarget === null) {
-        fs.statSync(base);
-        linkTarget = fs.readlinkSync(base);
-      }
-      resolvedLink = pathModule.resolve(previous, linkTarget);
-      // track this, if given a cache.
-      if (cache) cache[base] = resolvedLink;
-      if (!isWindows) seenLinks[id] = linkTarget;
-    }
-
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
-
-  if (cache) cache[original] = p;
-
-  return p;
-};
-
-
-exports.realpath = function realpath(p, cache, cb) {
-  if (typeof cb !== 'function') {
-    cb = maybeCallback(cache);
-    cache = null;
-  }
-
-  // make p is absolute
-  p = pathModule.resolve(p);
-
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return process.nextTick(cb.bind(null, null, cache[p]));
-  }
-
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
-
-  // current character position in p
-  var pos;
-  // the partial path so far, including a trailing slash if any
-  var current;
-  // the partial path without a trailing slash (except when pointing at a root)
-  var base;
-  // the partial path scanned in the previous round, with slash
-  var previous;
-
-  start();
-
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
-
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstat(base, function(err) {
-        if (err) return cb(err);
-        knownHard[base] = true;
-        LOOP();
-      });
-    } else {
-      process.nextTick(LOOP);
-    }
-  }
-
-  // walk down the path, swapping out linked pathparts for their real
-  // values
-  function LOOP() {
-    // stop if scanned past end of path
-    if (pos >= p.length) {
-      if (cache) cache[original] = p;
-      return cb(null, p);
-    }
-
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
-
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      return process.nextTick(LOOP);
-    }
-
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
-    }
-
-    return fs.lstat(base, gotStat);
-  }
-
-  function gotStat(err, stat) {
-    if (err) return cb(err);
-
-    // if not a symlink, skip to the next path part
-    if (!stat.isSymbolicLink()) {
-      knownHard[base] = true;
-      if (cache) cache[base] = base;
-      return process.nextTick(LOOP);
-    }
-
-    // stat & read the link if not read before
-    // call gotTarget as soon as the link target is known
-    // dev/ino always return 0 on windows, so skip the check.
-    if (!isWindows) {
-      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
-      if (seenLinks.hasOwnProperty(id)) {
-        return gotTarget(null, seenLinks[id], base);
-      }
-    }
-    fs.stat(base, function(err) {
-      if (err) return cb(err);
-
-      fs.readlink(base, function(err, target) {
-        if (!isWindows) seenLinks[id] = target;
-        gotTarget(err, target);
-      });
-    });
-  }
-
-  function gotTarget(err, target, base) {
-    if (err) return cb(err);
-
-    var resolvedLink = pathModule.resolve(previous, target);
-    if (cache) cache[base] = resolvedLink;
-    gotResolvedLink(resolvedLink);
-  }
-
-  function gotResolvedLink(resolvedLink) {
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
-};
-
-
-/***/ }),
-/* 272 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = globSync
-globSync.GlobSync = GlobSync
-
-var fs = __webpack_require__(5)
-var rp = __webpack_require__(140)
-var minimatch = __webpack_require__(82)
-var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(99).Glob
-var util = __webpack_require__(3)
-var path = __webpack_require__(0)
-var assert = __webpack_require__(28)
-var isAbsolute = __webpack_require__(101)
-var common = __webpack_require__(141)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
-var setopts = common.setopts
-var ownProp = common.ownProp
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
-
-function globSync (pattern, options) {
-  if (typeof options === 'function' || arguments.length === 3)
-    throw new TypeError('callback provided to sync glob\n'+
-                        'See: https://github.com/isaacs/node-glob/issues/167')
-
-  return new GlobSync(pattern, options).found
-}
-
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
-
-  if (typeof options === 'function' || arguments.length === 3)
-    throw new TypeError('callback provided to sync glob\n'+
-                        'See: https://github.com/isaacs/node-glob/issues/167')
-
-  if (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
-
-  setopts(this, pattern, options)
-
-  if (this.noprocess)
-    return this
-
-  var n = this.minimatch.set.length
-  this.matches = new Array(n)
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false)
-  }
-  this._finish()
-}
-
-GlobSync.prototype._finish = function () {
-  assert(this instanceof GlobSync)
-  if (this.realpath) {
-    var self = this
-    this.matches.forEach(function (matchset, index) {
-      var set = self.matches[index] = Object.create(null)
-      for (var p in matchset) {
-        try {
-          p = self._makeAbs(p)
-          var real = rp.realpathSync(p, self.realpathCache)
-          set[real] = true
-        } catch (er) {
-          if (er.syscall === 'stat')
-            set[self._makeAbs(p)] = true
-          else
-            throw er
-        }
-      }
-    })
-  }
-  common.finish(this)
-}
-
-
-GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
-
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
-  }
-  // now n is the index of the first one that is *not* a string.
-
-  // See if there's anything else
-  var prefix
-  switch (n) {
-    // if not, then this is rather simple
-    case pattern.length:
-      this._processSimple(pattern.join('/'), index)
-      return
-
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
-
-    default:
-      // pattern has some string bits in the front.
-      // whatever it starts with, whether that's 'absolute' like /foo/bar,
-      // or 'relative' like '../baz'
-      prefix = pattern.slice(0, n).join('/')
-      break
-  }
-
-  var remain = pattern.slice(n)
-
-  // get the list of entries.
-  var read
-  if (prefix === null)
-    read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
-    if (!prefix || !isAbsolute(prefix))
-      prefix = '/' + prefix
-    read = prefix
-  } else
-    read = prefix
-
-  var abs = this._makeAbs(read)
-
-  //if ignored, skip processing
-  if (childrenIgnored(this, read))
-    return
-
-  var isGlobStar = remain[0] === minimatch.GLOBSTAR
-  if (isGlobStar)
-    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
-  else
-    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
-}
-
-
-GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
-  var entries = this._readdir(abs, inGlobStar)
-
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return
-
-  // It will only match dot entries if it starts with a dot, or if
-  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
-  var pn = remain[0]
-  var negate = !!this.minimatch.negate
-  var rawGlob = pn._glob
-  var dotOk = this.dot || rawGlob.charAt(0) === '.'
-
-  var matchedEntries = []
-  for (var i = 0; i < entries.length; i++) {
-    var e = entries[i]
-    if (e.charAt(0) !== '.' || dotOk) {
-      var m
-      if (negate && !prefix) {
-        m = !e.match(pn)
-      } else {
-        m = e.match(pn)
-      }
-      if (m)
-        matchedEntries.push(e)
-    }
-  }
-
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return
-
-  // if this is the last remaining pattern bit, then no need for
-  // an additional stat *unless* the user has specified mark or
-  // stat explicitly.  We know they exist, since readdir returned
-  // them.
-
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
-
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix.slice(-1) !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
-
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
-    }
-    // This was the last one, and no stats were needed
-    return
-  }
-
-  // now test all matched entries as stand-ins for that part
-  // of the pattern.
-  remain.shift()
-  for (var i = 0; i < len; i ++) {
-    var e = matchedEntries[i]
-    var newPattern
-    if (prefix)
-      newPattern = [prefix, e]
-    else
-      newPattern = [e]
-    this._process(newPattern.concat(remain), index, inGlobStar)
-  }
-}
-
-
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
-
-  var abs = this._makeAbs(e)
-
-  if (this.mark)
-    e = this._mark(e)
-
-  if (this.absolute) {
-    e = abs
-  }
-
-  if (this.matches[index][e])
-    return
-
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
-
-  this.matches[index][e] = true
-
-  if (this.stat)
-    this._stat(e)
-}
-
-
-GlobSync.prototype._readdirInGlobStar = function (abs) {
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false)
-
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
-    }
-  }
-
-  var isSym = lstat && lstat.isSymbolicLink()
-  this.symlinks[abs] = isSym
-
-  // If it's not a symlink or a dir, then it's definitely a regular file.
-  // don't bother doing a readdir in that case.
-  if (!isSym && lstat && !lstat.isDirectory())
-    this.cache[abs] = 'FILE'
-  else
-    entries = this._readdir(abs, false)
-
-  return entries
-}
-
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
-
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs)
-
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return null
-
-    if (Array.isArray(c))
-      return c
-  }
-
-  try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
-  }
-}
-
-GlobSync.prototype._readdirEntries = function (abs, entries) {
-  // if we haven't asked to stat everything, then just
-  // assume that everything in there exists, so we can avoid
-  // having to stat it a second time.
-  if (!this.mark && !this.stat) {
-    for (var i = 0; i < entries.length; i ++) {
-      var e = entries[i]
-      if (abs === '/')
-        e = abs + e
-      else
-        e = abs + '/' + e
-      this.cache[e] = true
-    }
-  }
-
-  this.cache[abs] = entries
-
-  // mark and cache dir-ness
-  return entries
-}
-
-GlobSync.prototype._readdirError = function (f, er) {
-  // handle errors, and cache the information
-  switch (er.code) {
-    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
-    case 'ENOTDIR': // totally normal. means it *does* exist.
-      var abs = this._makeAbs(f)
-      this.cache[abs] = 'FILE'
-      if (abs === this.cwdAbs) {
-        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
-        error.path = this.cwd
-        error.code = er.code
-        throw error
-      }
-      break
-
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
-
-    default: // some unusual error.  Treat as failure.
-      this.cache[this._makeAbs(f)] = false
-      if (this.strict)
-        throw er
-      if (!this.silent)
-        console.error('glob error', er)
-      break
-  }
-}
-
-GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
-
-  var entries = this._readdir(abs, inGlobStar)
-
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return
-
-  // test without the globstar, and with every child both below
-  // and replacing the globstar.
-  var remainWithoutGlobStar = remain.slice(1)
-  var gspref = prefix ? [ prefix ] : []
-  var noGlobStar = gspref.concat(remainWithoutGlobStar)
-
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
-
-  var len = entries.length
-  var isSym = this.symlinks[abs]
-
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return
-
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
-
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true)
-
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true)
-  }
-}
-
-GlobSync.prototype._processSimple = function (prefix, index) {
-  // XXX review this.  Shouldn't it be doing the mounting etc
-  // before doing stat?  kinda weird?
-  var exists = this._stat(prefix)
-
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
-
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return
-
-  if (prefix && isAbsolute(prefix) && !this.nomount) {
-    var trail = /[\/\\]$/.test(prefix)
-    if (prefix.charAt(0) === '/') {
-      prefix = path.join(this.root, prefix)
-    } else {
-      prefix = path.resolve(this.root, prefix)
-      if (trail)
-        prefix += '/'
-    }
-  }
-
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
-
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-}
-
-// Returns either 'DIR', 'FILE', or false
-GlobSync.prototype._stat = function (f) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
-
-  if (f.length > this.maxLength)
-    return false
-
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-
-    if (Array.isArray(c))
-      c = 'DIR'
-
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
-
-    if (needDir && c === 'FILE')
-      return false
-
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
-
-  var exists
-  var stat = this.statCache[abs]
-  if (!stat) {
-    var lstat
-    try {
-      lstat = fs.lstatSync(abs)
-    } catch (er) {
-      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-        this.statCache[abs] = false
-        return false
-      }
-    }
-
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
-      }
-    } else {
-      stat = lstat
-    }
-  }
-
-  this.statCache[abs] = stat
-
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-
-  this.cache[abs] = this.cache[abs] || c
-
-  if (needDir && c === 'FILE')
-    return false
-
-  return c
-}
-
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
-
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
-
-
-/***/ }),
-/* 273 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function (flag, argv) {
-	argv = argv || process.argv;
-
-	var terminatorPos = argv.indexOf('--');
-	var prefix = /^--/.test(flag) ? '' : '--';
-	var pos = argv.indexOf(prefix + flag);
-
-	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
-};
-
-
-/***/ }),
-/* 274 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var wrappy = __webpack_require__(161)
-var reqs = Object.create(null)
-var once = __webpack_require__(83)
-
-module.exports = wrappy(inflight)
-
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
-
-function makeres (key) {
-  return once(function RES () {
-    var cbs = reqs[key]
-    var len = cbs.length
-    var args = slice(arguments)
-
-    // XXX It's somewhat ambiguous whether a new callback added in this
-    // pass should be queued for later execution if something in the
-    // list of callbacks throws, or if it should just be discarded.
-    // However, it's such an edge case that it hardly matters, and either
-    // choice is likely as surprising as the other.
-    // As it happens, we do go ahead and schedule it for later execution.
-    try {
-      for (var i = 0; i < len; i++) {
-        cbs[i].apply(null, args)
-      }
-    } finally {
-      if (cbs.length > len) {
-        // added more in the interim.
-        // de-zalgo, just in case, but don't call again.
-        cbs.splice(0, len)
-        process.nextTick(function () {
-          RES.apply(null, args)
-        })
-      } else {
-        delete reqs[key]
-      }
-    }
-  })
-}
-
-function slice (args) {
-  var length = args.length
-  var array = []
-
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
-
-
-/***/ }),
-/* 275 */
-/***/ (function(module, exports) {
-
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    });
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    var TempCtor = function () {}
-    TempCtor.prototype = superCtor.prototype
-    ctor.prototype = new TempCtor()
-    ctor.prototype.constructor = ctor
-  }
-}
-
-
-/***/ }),
-/* 276 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * Inquirer.js
- * A collection of common interactive command line user interfaces.
- */
-
-var inquirer = module.exports;
-
-/**
- * Client interfaces
- */
-
-inquirer.prompts = {};
-
-inquirer.Separator = __webpack_require__(175);
-
-inquirer.ui = {
-  BottomBar: __webpack_require__(695),
-  Prompt: __webpack_require__(696)
-};
-
-/**
- * Create a new self-contained prompt module.
- */
-inquirer.createPromptModule = function(opt) {
-  var promptModule = function(questions) {
-    var ui = new inquirer.ui.Prompt(promptModule.prompts, opt);
-    var promise = ui.run(questions);
-
-    // Monkey patch the UI on the promise object so
-    // that it remains publicly accessible.
-    promise.ui = ui;
-
-    return promise;
-  };
-  promptModule.prompts = {};
-
-  /**
-   * Register a prompt type
-   * @param {String} name     Prompt type name
-   * @param {Function} prompt Prompt constructor
-   * @return {inquirer}
-   */
-
-  promptModule.registerPrompt = function(name, prompt) {
-    promptModule.prompts[name] = prompt;
-    return this;
-  };
-
-  /**
-   * Register the defaults provider prompts
-   */
-
-  promptModule.restoreDefaultPrompts = function() {
-    this.registerPrompt('list', __webpack_require__(691));
-    this.registerPrompt('input', __webpack_require__(392));
-    this.registerPrompt('number', __webpack_require__(692));
-    this.registerPrompt('confirm', __webpack_require__(688));
-    this.registerPrompt('rawlist', __webpack_require__(694));
-    this.registerPrompt('expand', __webpack_require__(690));
-    this.registerPrompt('checkbox', __webpack_require__(687));
-    this.registerPrompt('password', __webpack_require__(693));
-    this.registerPrompt('editor', __webpack_require__(689));
-  };
-
-  promptModule.restoreDefaultPrompts();
-
-  return promptModule;
-};
-
-/**
- * Public CLI helper interface
- * @param  {Array|Object|Rx.Observable} questions - Questions settings array
- * @param  {Function} cb - Callback being passed the user answers
- * @return {inquirer.ui.Prompt}
- */
-
-inquirer.prompt = inquirer.createPromptModule();
-
-// Expose helper functions on the top level for easiest usage by common users
-inquirer.registerPrompt = function(name, prompt) {
-  inquirer.prompt.registerPrompt(name, prompt);
-};
-inquirer.restoreDefaultPrompts = function() {
-  inquirer.prompt.restoreDefaultPrompts();
-};
-
-
-/***/ }),
-/* 277 */
-/***/ (function(module, exports) {
-
-module.exports = [["0","\u0000",127,"€"],["8140","丂丄丅丆丏丒丗丟丠両丣並丩丮丯丱丳丵丷丼乀乁乂乄乆乊乑乕乗乚乛乢乣乤乥乧乨乪",5,"乲乴",9,"乿",6,"亇亊"],["8180","亐亖亗亙亜亝亞亣亪亯亰亱亴亶亷亸亹亼亽亾仈仌仏仐仒仚仛仜仠仢仦仧仩仭仮仯仱仴仸仹仺仼仾伀伂",6,"伋伌伒",4,"伜伝伡伣伨伩伬伭伮伱伳伵伷伹伻伾",4,"佄佅佇",5,"佒佔佖佡佢佦佨佪佫佭佮佱佲併佷佸佹佺佽侀侁侂侅來侇侊侌侎侐侒侓侕侖侘侙侚侜侞侟価侢"],["8240","侤侫侭侰",4,"侶",8,"俀俁係俆俇俈俉俋俌俍俒",4,"俙俛俠俢俤俥俧俫俬俰俲俴俵俶俷俹俻俼俽俿",11],["8280","個倎倐們倓倕倖倗倛倝倞倠倢倣値倧倫倯",10,"倻倽倿偀偁偂偄偅偆偉偊偋偍偐",4,"偖偗偘偙偛偝",7,"偦",5,"偭",8,"偸偹偺偼偽傁傂傃傄傆傇傉傊傋傌傎",20,"傤傦傪傫傭",4,"傳",6,"傼"],["8340","傽",17,"僐",5,"僗僘僙僛",10,"僨僩僪僫僯僰僱僲僴僶",4,"僼",9,"儈"],["8380","儉儊儌",5,"儓",13,"儢",28,"兂兇兊兌兎兏児兒兓兗兘兙兛兝",4,"兣兤兦內兩兪兯兲兺兾兿冃冄円冇冊冋冎冏冐冑冓冔冘冚冝冞冟冡冣冦",4,"冭冮冴冸冹冺冾冿凁凂凃凅凈凊凍凎凐凒",5],["8440","凘凙凚凜凞凟凢凣凥",5,"凬凮凱凲凴凷凾刄刅刉刋刌刏刐刓刔刕刜刞刟刡刢刣別刦刧刪刬刯刱刲刴刵刼刾剄",5,"剋剎剏剒剓剕剗剘"],["8480","剙剚剛剝剟剠剢剣剤剦剨剫剬剭剮剰剱剳",9,"剾劀劃",4,"劉",6,"劑劒劔",6,"劜劤劥劦劧劮劯劰労",9,"勀勁勂勄勅勆勈勊勌勍勎勏勑勓勔動勗務",5,"勠勡勢勣勥",10,"勱",7,"勻勼勽匁匂匃匄匇匉匊匋匌匎"],["8540","匑匒匓匔匘匛匜匞匟匢匤匥匧匨匩匫匬匭匯",9,"匼匽區卂卄卆卋卌卍卐協単卙卛卝卥卨卪卬卭卲卶卹卻卼卽卾厀厁厃厇厈厊厎厏"],["8580","厐",4,"厖厗厙厛厜厞厠厡厤厧厪厫厬厭厯",6,"厷厸厹厺厼厽厾叀參",4,"収叏叐叒叓叕叚叜叝叞叡叢叧叴叺叾叿吀吂吅吇吋吔吘吙吚吜吢吤吥吪吰吳吶吷吺吽吿呁呂呄呅呇呉呌呍呎呏呑呚呝",4,"呣呥呧呩",7,"呴呹呺呾呿咁咃咅咇咈咉咊咍咑咓咗咘咜咞咟咠咡"],["8640","咢咥咮咰咲咵咶咷咹咺咼咾哃哅哊哋哖哘哛哠",4,"哫哬哯哰哱哴",5,"哻哾唀唂唃唄唅唈唊",4,"唒唓唕",5,"唜唝唞唟唡唥唦"],["8680","唨唩唫唭唲唴唵唶唸唹唺唻唽啀啂啅啇啈啋",4,"啑啒啓啔啗",4,"啝啞啟啠啢啣啨啩啫啯",5,"啹啺啽啿喅喆喌喍喎喐喒喓喕喖喗喚喛喞喠",6,"喨",8,"喲喴営喸喺喼喿",4,"嗆嗇嗈嗊嗋嗎嗏嗐嗕嗗",4,"嗞嗠嗢嗧嗩嗭嗮嗰嗱嗴嗶嗸",4,"嗿嘂嘃嘄嘅"],["8740","嘆嘇嘊嘋嘍嘐",7,"嘙嘚嘜嘝嘠嘡嘢嘥嘦嘨嘩嘪嘫嘮嘯嘰嘳嘵嘷嘸嘺嘼嘽嘾噀",11,"噏",4,"噕噖噚噛噝",4],["8780","噣噥噦噧噭噮噯噰噲噳噴噵噷噸噹噺噽",7,"嚇",6,"嚐嚑嚒嚔",14,"嚤",10,"嚰",6,"嚸嚹嚺嚻嚽",12,"囋",8,"囕囖囘囙囜団囥",5,"囬囮囯囲図囶囷囸囻囼圀圁圂圅圇國",6],["8840","園",9,"圝圞圠圡圢圤圥圦圧圫圱圲圴",4,"圼圽圿坁坃坄坅坆坈坉坋坒",4,"坘坙坢坣坥坧坬坮坰坱坲坴坵坸坹坺坽坾坿垀"],["8880","垁垇垈垉垊垍",4,"垔",6,"垜垝垞垟垥垨垪垬垯垰垱垳垵垶垷垹",8,"埄",6,"埌埍埐埑埓埖埗埛埜埞埡埢埣埥",7,"埮埰埱埲埳埵埶執埻埼埾埿堁堃堄堅堈堉堊堌堎堏堐堒堓堔堖堗堘堚堛堜堝堟堢堣堥",4,"堫",4,"報堲堳場堶",7],["8940","堾",5,"塅",6,"塎塏塐塒塓塕塖塗塙",4,"塟",5,"塦",4,"塭",16,"塿墂墄墆墇墈墊墋墌"],["8980","墍",4,"墔",4,"墛墜墝墠",7,"墪",17,"墽墾墿壀壂壃壄壆",10,"壒壓壔壖",13,"壥",5,"壭壯壱売壴壵壷壸壺",7,"夃夅夆夈",4,"夎夐夑夒夓夗夘夛夝夞夠夡夢夣夦夨夬夰夲夳夵夶夻"],["8a40","夽夾夿奀奃奅奆奊奌奍奐奒奓奙奛",4,"奡奣奤奦",12,"奵奷奺奻奼奾奿妀妅妉妋妌妎妏妐妑妔妕妘妚妛妜妝妟妠妡妢妦"],["8a80","妧妬妭妰妱妳",5,"妺妼妽妿",6,"姇姈姉姌姍姎姏姕姖姙姛姞",4,"姤姦姧姩姪姫姭",11,"姺姼姽姾娀娂娊娋娍娎娏娐娒娔娕娖娗娙娚娛娝娞娡娢娤娦娧娨娪",6,"娳娵娷",4,"娽娾娿婁",4,"婇婈婋",9,"婖婗婘婙婛",5],["8b40","婡婣婤婥婦婨婩婫",8,"婸婹婻婼婽婾媀",17,"媓",6,"媜",13,"媫媬"],["8b80","媭",4,"媴媶媷媹",4,"媿嫀嫃",5,"嫊嫋嫍",4,"嫓嫕嫗嫙嫚嫛嫝嫞嫟嫢嫤嫥嫧嫨嫪嫬",4,"嫲",22,"嬊",11,"嬘",25,"嬳嬵嬶嬸",7,"孁",6],["8c40","孈",7,"孒孖孞孠孡孧孨孫孭孮孯孲孴孶孷學孹孻孼孾孿宂宆宊宍宎宐宑宒宔宖実宧宨宩宬宭宮宯宱宲宷宺宻宼寀寁寃寈寉寊寋寍寎寏"],["8c80","寑寔",8,"寠寢寣實寧審",4,"寯寱",6,"寽対尀専尃尅將專尋尌對導尐尒尓尗尙尛尞尟尠尡尣尦尨尩尪尫尭尮尯尰尲尳尵尶尷屃屄屆屇屌屍屒屓屔屖屗屘屚屛屜屝屟屢層屧",6,"屰屲",6,"屻屼屽屾岀岃",4,"岉岊岋岎岏岒岓岕岝",4,"岤",4],["8d40","岪岮岯岰岲岴岶岹岺岻岼岾峀峂峃峅",5,"峌",5,"峓",5,"峚",6,"峢峣峧峩峫峬峮峯峱",9,"峼",4],["8d80","崁崄崅崈",5,"崏",4,"崕崗崘崙崚崜崝崟",4,"崥崨崪崫崬崯",4,"崵",7,"崿",7,"嵈嵉嵍",10,"嵙嵚嵜嵞",10,"嵪嵭嵮嵰嵱嵲嵳嵵",12,"嶃",21,"嶚嶛嶜嶞嶟嶠"],["8e40","嶡",21,"嶸",12,"巆",6,"巎",12,"巜巟巠巣巤巪巬巭"],["8e80","巰巵巶巸",4,"巿帀帄帇帉帊帋帍帎帒帓帗帞",7,"帨",4,"帯帰帲",4,"帹帺帾帿幀幁幃幆",5,"幍",6,"幖",4,"幜幝幟幠幣",14,"幵幷幹幾庁庂広庅庈庉庌庍庎庒庘庛庝庡庢庣庤庨",4,"庮",4,"庴庺庻庼庽庿",6],["8f40","廆廇廈廋",5,"廔廕廗廘廙廚廜",11,"廩廫",8,"廵廸廹廻廼廽弅弆弇弉弌弍弎弐弒弔弖弙弚弜弝弞弡弢弣弤"],["8f80","弨弫弬弮弰弲",6,"弻弽弾弿彁",14,"彑彔彙彚彛彜彞彟彠彣彥彧彨彫彮彯彲彴彵彶彸彺彽彾彿徃徆徍徎徏徑従徔徖徚徛徝從徟徠徢",5,"復徫徬徯",5,"徶徸徹徺徻徾",4,"忇忈忊忋忎忓忔忕忚忛応忞忟忢忣忥忦忨忩忬忯忰忲忳忴忶忷忹忺忼怇"],["9040","怈怉怋怌怐怑怓怗怘怚怞怟怢怣怤怬怭怮怰",4,"怶",4,"怽怾恀恄",6,"恌恎恏恑恓恔恖恗恘恛恜恞恟恠恡恥恦恮恱恲恴恵恷恾悀"],["9080","悁悂悅悆悇悈悊悋悎悏悐悑悓悕悗悘悙悜悞悡悢悤悥悧悩悪悮悰悳悵悶悷悹悺悽",7,"惇惈惉惌",4,"惒惓惔惖惗惙惛惞惡",4,"惪惱惲惵惷惸惻",4,"愂愃愄愅愇愊愋愌愐",4,"愖愗愘愙愛愜愝愞愡愢愥愨愩愪愬",18,"慀",6],["9140","慇慉態慍慏慐慒慓慔慖",6,"慞慟慠慡慣慤慥慦慩",6,"慱慲慳慴慶慸",18,"憌憍憏",4,"憕"],["9180","憖",6,"憞",8,"憪憫憭",9,"憸",5,"憿懀懁懃",4,"應懌",4,"懓懕",16,"懧",13,"懶",8,"戀",5,"戇戉戓戔戙戜戝戞戠戣戦戧戨戩戫戭戯戰戱戲戵戶戸",4,"扂扄扅扆扊"],["9240","扏扐払扖扗扙扚扜",6,"扤扥扨扱扲扴扵扷扸扺扻扽抁抂抃抅抆抇抈抋",5,"抔抙抜抝択抣抦抧抩抪抭抮抯抰抲抳抴抶抷抸抺抾拀拁"],["9280","拃拋拏拑拕拝拞拠拡拤拪拫拰拲拵拸拹拺拻挀挃挄挅挆挊挋挌挍挏挐挒挓挔挕挗挘挙挜挦挧挩挬挭挮挰挱挳",5,"挻挼挾挿捀捁捄捇捈捊捑捒捓捔捖",7,"捠捤捥捦捨捪捫捬捯捰捲捳捴捵捸捹捼捽捾捿掁掃掄掅掆掋掍掑掓掔掕掗掙",6,"採掤掦掫掯掱掲掵掶掹掻掽掿揀"],["9340","揁揂揃揅揇揈揊揋揌揑揓揔揕揗",6,"揟揢揤",4,"揫揬揮揯揰揱揳揵揷揹揺揻揼揾搃搄搆",4,"損搎搑搒搕",5,"搝搟搢搣搤"],["9380","搥搧搨搩搫搮",5,"搵",4,"搻搼搾摀摂摃摉摋",6,"摓摕摖摗摙",4,"摟",7,"摨摪摫摬摮",9,"摻",6,"撃撆撈",8,"撓撔撗撘撚撛撜撝撟",4,"撥撦撧撨撪撫撯撱撲撳撴撶撹撻撽撾撿擁擃擄擆",6,"擏擑擓擔擕擖擙據"],["9440","擛擜擝擟擠擡擣擥擧",24,"攁",7,"攊",7,"攓",4,"攙",8],["9480","攢攣攤攦",4,"攬攭攰攱攲攳攷攺攼攽敀",4,"敆敇敊敋敍敎敐敒敓敔敗敘敚敜敟敠敡敤敥敧敨敩敪敭敮敯敱敳敵敶數",14,"斈斉斊斍斎斏斒斔斕斖斘斚斝斞斠斢斣斦斨斪斬斮斱",7,"斺斻斾斿旀旂旇旈旉旊旍旐旑旓旔旕旘",7,"旡旣旤旪旫"],["9540","旲旳旴旵旸旹旻",4,"昁昄昅昇昈昉昋昍昐昑昒昖昗昘昚昛昜昞昡昢昣昤昦昩昪昫昬昮昰昲昳昷",4,"昽昿晀時晄",6,"晍晎晐晑晘"],["9580","晙晛晜晝晞晠晢晣晥晧晩",4,"晱晲晳晵晸晹晻晼晽晿暀暁暃暅暆暈暉暊暋暍暎暏暐暒暓暔暕暘",4,"暞",8,"暩",4,"暯",4,"暵暶暷暸暺暻暼暽暿",25,"曚曞",7,"曧曨曪",5,"曱曵曶書曺曻曽朁朂會"],["9640","朄朅朆朇朌朎朏朑朒朓朖朘朙朚朜朞朠",5,"朧朩朮朰朲朳朶朷朸朹朻朼朾朿杁杄杅杇杊杋杍杒杔杕杗",4,"杝杢杣杤杦杧杫杬杮東杴杶"],["9680","杸杹杺杻杽枀枂枃枅枆枈枊枌枍枎枏枑枒枓枔枖枙枛枟枠枡枤枦枩枬枮枱枲枴枹",7,"柂柅",9,"柕柖柗柛柟柡柣柤柦柧柨柪柫柭柮柲柵",7,"柾栁栂栃栄栆栍栐栒栔栕栘",4,"栞栟栠栢",6,"栫",6,"栴栵栶栺栻栿桇桋桍桏桒桖",5],["9740","桜桝桞桟桪桬",7,"桵桸",8,"梂梄梇",7,"梐梑梒梔梕梖梘",9,"梣梤梥梩梪梫梬梮梱梲梴梶梷梸"],["9780","梹",6,"棁棃",5,"棊棌棎棏棐棑棓棔棖棗棙棛",4,"棡棢棤",9,"棯棲棳棴棶棷棸棻棽棾棿椀椂椃椄椆",4,"椌椏椑椓",11,"椡椢椣椥",7,"椮椯椱椲椳椵椶椷椸椺椻椼椾楀楁楃",16,"楕楖楘楙楛楜楟"],["9840","楡楢楤楥楧楨楩楪楬業楯楰楲",4,"楺楻楽楾楿榁榃榅榊榋榌榎",5,"榖榗榙榚榝",9,"榩榪榬榮榯榰榲榳榵榶榸榹榺榼榽"],["9880","榾榿槀槂",7,"構槍槏槑槒槓槕",5,"槜槝槞槡",11,"槮槯槰槱槳",9,"槾樀",9,"樋",11,"標",5,"樠樢",5,"権樫樬樭樮樰樲樳樴樶",6,"樿",4,"橅橆橈",7,"橑",6,"橚"],["9940","橜",4,"橢橣橤橦",10,"橲",6,"橺橻橽橾橿檁檂檃檅",8,"檏檒",4,"檘",7,"檡",5],["9980","檧檨檪檭",114,"欥欦欨",6],["9a40","欯欰欱欳欴欵欶欸欻欼欽欿歀歁歂歄歅歈歊歋歍",11,"歚",7,"歨歩歫",13,"歺歽歾歿殀殅殈"],["9a80","殌殎殏殐殑殔殕殗殘殙殜",4,"殢",7,"殫",7,"殶殸",6,"毀毃毄毆",4,"毌毎毐毑毘毚毜",4,"毢",7,"毬毭毮毰毱毲毴毶毷毸毺毻毼毾",6,"氈",4,"氎氒気氜氝氞氠氣氥氫氬氭氱氳氶氷氹氺氻氼氾氿汃汄汅汈汋",4,"汑汒汓汖汘"],["9b40","汙汚汢汣汥汦汧汫",4,"汱汳汵汷汸決汻汼汿沀沄沇沊沋沍沎沑沒沕沖沗沘沚沜沝沞沠沢沨沬沯沰沴沵沶沷沺泀況泂泃泆泇泈泋泍泎泏泑泒泘"],["9b80","泙泚泜泝泟泤泦泧泩泬泭泲泴泹泿洀洂洃洅洆洈洉洊洍洏洐洑洓洔洕洖洘洜洝洟",5,"洦洨洩洬洭洯洰洴洶洷洸洺洿浀浂浄浉浌浐浕浖浗浘浛浝浟浡浢浤浥浧浨浫浬浭浰浱浲浳浵浶浹浺浻浽",4,"涃涄涆涇涊涋涍涏涐涒涖",4,"涜涢涥涬涭涰涱涳涴涶涷涹",5,"淁淂淃淈淉淊"],["9c40","淍淎淏淐淒淓淔淕淗淚淛淜淟淢淣淥淧淨淩淪淭淯淰淲淴淵淶淸淺淽",7,"渆渇済渉渋渏渒渓渕渘渙減渜渞渟渢渦渧渨渪測渮渰渱渳渵"],["9c80","渶渷渹渻",7,"湅",7,"湏湐湑湒湕湗湙湚湜湝湞湠",10,"湬湭湯",14,"満溁溂溄溇溈溊",4,"溑",6,"溙溚溛溝溞溠溡溣溤溦溨溩溫溬溭溮溰溳溵溸溹溼溾溿滀滃滄滅滆滈滉滊滌滍滎滐滒滖滘滙滛滜滝滣滧滪",5],["9d40","滰滱滲滳滵滶滷滸滺",7,"漃漄漅漇漈漊",4,"漐漑漒漖",9,"漡漢漣漥漦漧漨漬漮漰漲漴漵漷",6,"漿潀潁潂"],["9d80","潃潄潅潈潉潊潌潎",9,"潙潚潛潝潟潠潡潣潤潥潧",5,"潯潰潱潳潵潶潷潹潻潽",6,"澅澆澇澊澋澏",12,"澝澞澟澠澢",4,"澨",10,"澴澵澷澸澺",5,"濁濃",5,"濊",6,"濓",10,"濟濢濣濤濥"],["9e40","濦",7,"濰",32,"瀒",7,"瀜",6,"瀤",6],["9e80","瀫",9,"瀶瀷瀸瀺",17,"灍灎灐",13,"灟",11,"灮灱灲灳灴灷灹灺灻災炁炂炃炄炆炇炈炋炌炍炏炐炑炓炗炘炚炛炞",12,"炰炲炴炵炶為炾炿烄烅烆烇烉烋",12,"烚"],["9f40","烜烝烞烠烡烢烣烥烪烮烰",6,"烸烺烻烼烾",10,"焋",4,"焑焒焔焗焛",10,"焧",7,"焲焳焴"],["9f80","焵焷",13,"煆煇煈煉煋煍煏",12,"煝煟",4,"煥煩",4,"煯煰煱煴煵煶煷煹煻煼煾",5,"熅",4,"熋熌熍熎熐熑熒熓熕熖熗熚",4,"熡",6,"熩熪熫熭",5,"熴熶熷熸熺",8,"燄",9,"燏",4],["a040","燖",9,"燡燢燣燤燦燨",5,"燯",9,"燺",11,"爇",19],["a080","爛爜爞",9,"爩爫爭爮爯爲爳爴爺爼爾牀",6,"牉牊牋牎牏牐牑牓牔牕牗牘牚牜牞牠牣牤牥牨牪牫牬牭牰牱牳牴牶牷牸牻牼牽犂犃犅",4,"犌犎犐犑犓",11,"犠",11,"犮犱犲犳犵犺",6,"狅狆狇狉狊狋狌狏狑狓狔狕狖狘狚狛"],["a1a1","　、。·ˉˇ¨〃々—～‖…‘’“”〔〕〈",7,"〖〗【】±×÷∶∧∨∑∏∪∩∈∷√⊥∥∠⌒⊙∫∮≡≌≈∽∝≠≮≯≤≥∞∵∴♂♀°′″℃＄¤￠￡‰§№☆★○●◎◇◆□■△▲※→←↑↓〓"],["a2a1","ⅰ",9],["a2b1","⒈",19,"⑴",19,"①",9],["a2e5","㈠",9],["a2f1","Ⅰ",11],["a3a1","！＂＃￥％",88,"￣"],["a4a1","ぁ",82],["a5a1","ァ",85],["a6a1","Α",16,"Σ",6],["a6c1","α",16,"σ",6],["a6e0","︵︶︹︺︿﹀︽︾﹁﹂﹃﹄"],["a6ee","︻︼︷︸︱"],["a6f4","︳︴"],["a7a1","А",5,"ЁЖ",25],["a7d1","а",5,"ёж",25],["a840","ˊˋ˙–―‥‵℅℉↖↗↘↙∕∟∣≒≦≧⊿═",35,"▁",6],["a880","█",7,"▓▔▕▼▽◢◣◤◥☉⊕〒〝〞"],["a8a1","āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜüêɑ"],["a8bd","ńň"],["a8c0","ɡ"],["a8c5","ㄅ",36],["a940","〡",8,"㊣㎎㎏㎜㎝㎞㎡㏄㏎㏑㏒㏕︰￢￤"],["a959","℡㈱"],["a95c","‐"],["a960","ー゛゜ヽヾ〆ゝゞ﹉",9,"﹔﹕﹖﹗﹙",8],["a980","﹢",4,"﹨﹩﹪﹫"],["a996","〇"],["a9a4","─",75],["aa40","狜狝狟狢",5,"狪狫狵狶狹狽狾狿猀猂猄",5,"猋猌猍猏猐猑猒猔猘猙猚猟猠猣猤猦猧猨猭猯猰猲猳猵猶猺猻猼猽獀",8],["aa80","獉獊獋獌獎獏獑獓獔獕獖獘",7,"獡",10,"獮獰獱"],["ab40","獲",11,"獿",4,"玅玆玈玊玌玍玏玐玒玓玔玕玗玘玙玚玜玝玞玠玡玣",5,"玪玬玭玱玴玵玶玸玹玼玽玾玿珁珃",4],["ab80","珋珌珎珒",6,"珚珛珜珝珟珡珢珣珤珦珨珪珫珬珮珯珰珱珳",4],["ac40","珸",10,"琄琇琈琋琌琍琎琑",8,"琜",5,"琣琤琧琩琫琭琯琱琲琷",4,"琽琾琿瑀瑂",11],["ac80","瑎",6,"瑖瑘瑝瑠",12,"瑮瑯瑱",4,"瑸瑹瑺"],["ad40","瑻瑼瑽瑿璂璄璅璆璈璉璊璌璍璏璑",10,"璝璟",7,"璪",15,"璻",12],["ad80","瓈",9,"瓓",8,"瓝瓟瓡瓥瓧",6,"瓰瓱瓲"],["ae40","瓳瓵瓸",6,"甀甁甂甃甅",7,"甎甐甒甔甕甖甗甛甝甞甠",4,"甦甧甪甮甴甶甹甼甽甿畁畂畃畄畆畇畉畊畍畐畑畒畓畕畖畗畘"],["ae80","畝",7,"畧畨畩畫",6,"畳畵當畷畺",4,"疀疁疂疄疅疇"],["af40","疈疉疊疌疍疎疐疓疕疘疛疜疞疢疦",4,"疭疶疷疺疻疿痀痁痆痋痌痎痏痐痑痓痗痙痚痜痝痟痠痡痥痩痬痭痮痯痲痳痵痶痷痸痺痻痽痾瘂瘄瘆瘇"],["af80","瘈瘉瘋瘍瘎瘏瘑瘒瘓瘔瘖瘚瘜瘝瘞瘡瘣瘧瘨瘬瘮瘯瘱瘲瘶瘷瘹瘺瘻瘽癁療癄"],["b040","癅",6,"癎",5,"癕癗",4,"癝癟癠癡癢癤",6,"癬癭癮癰",7,"癹発發癿皀皁皃皅皉皊皌皍皏皐皒皔皕皗皘皚皛"],["b080","皜",7,"皥",8,"皯皰皳皵",9,"盀盁盃啊阿埃挨哎唉哀皑癌蔼矮艾碍爱隘鞍氨安俺按暗岸胺案肮昂盎凹敖熬翱袄傲奥懊澳芭捌扒叭吧笆八疤巴拔跋靶把耙坝霸罢爸白柏百摆佰败拜稗斑班搬扳般颁板版扮拌伴瓣半办绊邦帮梆榜膀绑棒磅蚌镑傍谤苞胞包褒剥"],["b140","盄盇盉盋盌盓盕盙盚盜盝盞盠",4,"盦",7,"盰盳盵盶盷盺盻盽盿眀眂眃眅眆眊県眎",10,"眛眜眝眞眡眣眤眥眧眪眫"],["b180","眬眮眰",4,"眹眻眽眾眿睂睄睅睆睈",7,"睒",7,"睜薄雹保堡饱宝抱报暴豹鲍爆杯碑悲卑北辈背贝钡倍狈备惫焙被奔苯本笨崩绷甭泵蹦迸逼鼻比鄙笔彼碧蓖蔽毕毙毖币庇痹闭敝弊必辟壁臂避陛鞭边编贬扁便变卞辨辩辫遍标彪膘表鳖憋别瘪彬斌濒滨宾摈兵冰柄丙秉饼炳"],["b240","睝睞睟睠睤睧睩睪睭",11,"睺睻睼瞁瞂瞃瞆",5,"瞏瞐瞓",11,"瞡瞣瞤瞦瞨瞫瞭瞮瞯瞱瞲瞴瞶",4],["b280","瞼瞾矀",12,"矎",8,"矘矙矚矝",4,"矤病并玻菠播拨钵波博勃搏铂箔伯帛舶脖膊渤泊驳捕卜哺补埠不布步簿部怖擦猜裁材才财睬踩采彩菜蔡餐参蚕残惭惨灿苍舱仓沧藏操糙槽曹草厕策侧册测层蹭插叉茬茶查碴搽察岔差诧拆柴豺搀掺蝉馋谗缠铲产阐颤昌猖"],["b340","矦矨矪矯矰矱矲矴矵矷矹矺矻矼砃",5,"砊砋砎砏砐砓砕砙砛砞砠砡砢砤砨砪砫砮砯砱砲砳砵砶砽砿硁硂硃硄硆硈硉硊硋硍硏硑硓硔硘硙硚"],["b380","硛硜硞",11,"硯",7,"硸硹硺硻硽",6,"场尝常长偿肠厂敞畅唱倡超抄钞朝嘲潮巢吵炒车扯撤掣彻澈郴臣辰尘晨忱沉陈趁衬撑称城橙成呈乘程惩澄诚承逞骋秤吃痴持匙池迟弛驰耻齿侈尺赤翅斥炽充冲虫崇宠抽酬畴踌稠愁筹仇绸瞅丑臭初出橱厨躇锄雏滁除楚"],["b440","碄碅碆碈碊碋碏碐碒碔碕碖碙碝碞碠碢碤碦碨",7,"碵碶碷碸確碻碼碽碿磀磂磃磄磆磇磈磌磍磎磏磑磒磓磖磗磘磚",9],["b480","磤磥磦磧磩磪磫磭",4,"磳磵磶磸磹磻",5,"礂礃礄礆",6,"础储矗搐触处揣川穿椽传船喘串疮窗幢床闯创吹炊捶锤垂春椿醇唇淳纯蠢戳绰疵茨磁雌辞慈瓷词此刺赐次聪葱囱匆从丛凑粗醋簇促蹿篡窜摧崔催脆瘁粹淬翠村存寸磋撮搓措挫错搭达答瘩打大呆歹傣戴带殆代贷袋待逮"],["b540","礍",5,"礔",9,"礟",4,"礥",14,"礵",4,"礽礿祂祃祄祅祇祊",8,"祔祕祘祙祡祣"],["b580","祤祦祩祪祫祬祮祰",6,"祹祻",4,"禂禃禆禇禈禉禋禌禍禎禐禑禒怠耽担丹单郸掸胆旦氮但惮淡诞弹蛋当挡党荡档刀捣蹈倒岛祷导到稻悼道盗德得的蹬灯登等瞪凳邓堤低滴迪敌笛狄涤翟嫡抵底地蒂第帝弟递缔颠掂滇碘点典靛垫电佃甸店惦奠淀殿碉叼雕凋刁掉吊钓调跌爹碟蝶迭谍叠"],["b640","禓",6,"禛",11,"禨",10,"禴",4,"禼禿秂秄秅秇秈秊秌秎秏秐秓秔秖秗秙",5,"秠秡秢秥秨秪"],["b680","秬秮秱",6,"秹秺秼秾秿稁稄稅稇稈稉稊稌稏",4,"稕稖稘稙稛稜丁盯叮钉顶鼎锭定订丢东冬董懂动栋侗恫冻洞兜抖斗陡豆逗痘都督毒犊独读堵睹赌杜镀肚度渡妒端短锻段断缎堆兑队对墩吨蹲敦顿囤钝盾遁掇哆多夺垛躲朵跺舵剁惰堕蛾峨鹅俄额讹娥恶厄扼遏鄂饿恩而儿耳尔饵洱二"],["b740","稝稟稡稢稤",14,"稴稵稶稸稺稾穀",5,"穇",9,"穒",4,"穘",16],["b780","穩",6,"穱穲穳穵穻穼穽穾窂窅窇窉窊窋窌窎窏窐窓窔窙窚窛窞窡窢贰发罚筏伐乏阀法珐藩帆番翻樊矾钒繁凡烦反返范贩犯饭泛坊芳方肪房防妨仿访纺放菲非啡飞肥匪诽吠肺废沸费芬酚吩氛分纷坟焚汾粉奋份忿愤粪丰封枫蜂峰锋风疯烽逢冯缝讽奉凤佛否夫敷肤孵扶拂辐幅氟符伏俘服"],["b840","窣窤窧窩窪窫窮",4,"窴",10,"竀",10,"竌",9,"竗竘竚竛竜竝竡竢竤竧",5,"竮竰竱竲竳"],["b880","竴",4,"竻竼竾笀笁笂笅笇笉笌笍笎笐笒笓笖笗笘笚笜笝笟笡笢笣笧笩笭浮涪福袱弗甫抚辅俯釜斧脯腑府腐赴副覆赋复傅付阜父腹负富讣附妇缚咐噶嘎该改概钙盖溉干甘杆柑竿肝赶感秆敢赣冈刚钢缸肛纲岗港杠篙皋高膏羔糕搞镐稿告哥歌搁戈鸽胳疙割革葛格蛤阁隔铬个各给根跟耕更庚羹"],["b940","笯笰笲笴笵笶笷笹笻笽笿",5,"筆筈筊筍筎筓筕筗筙筜筞筟筡筣",10,"筯筰筳筴筶筸筺筼筽筿箁箂箃箄箆",6,"箎箏"],["b980","箑箒箓箖箘箙箚箛箞箟箠箣箤箥箮箯箰箲箳箵箶箷箹",7,"篂篃範埂耿梗工攻功恭龚供躬公宫弓巩汞拱贡共钩勾沟苟狗垢构购够辜菇咕箍估沽孤姑鼓古蛊骨谷股故顾固雇刮瓜剐寡挂褂乖拐怪棺关官冠观管馆罐惯灌贯光广逛瑰规圭硅归龟闺轨鬼诡癸桂柜跪贵刽辊滚棍锅郭国果裹过哈"],["ba40","篅篈築篊篋篍篎篏篐篒篔",4,"篛篜篞篟篠篢篣篤篧篨篩篫篬篭篯篰篲",4,"篸篹篺篻篽篿",7,"簈簉簊簍簎簐",5,"簗簘簙"],["ba80","簚",4,"簠",5,"簨簩簫",12,"簹",5,"籂骸孩海氦亥害骇酣憨邯韩含涵寒函喊罕翰撼捍旱憾悍焊汗汉夯杭航壕嚎豪毫郝好耗号浩呵喝荷菏核禾和何合盒貉阂河涸赫褐鹤贺嘿黑痕很狠恨哼亨横衡恒轰哄烘虹鸿洪宏弘红喉侯猴吼厚候后呼乎忽瑚壶葫胡蝴狐糊湖"],["bb40","籃",9,"籎",36,"籵",5,"籾",9],["bb80","粈粊",6,"粓粔粖粙粚粛粠粡粣粦粧粨粩粫粬粭粯粰粴",4,"粺粻弧虎唬护互沪户花哗华猾滑画划化话槐徊怀淮坏欢环桓还缓换患唤痪豢焕涣宦幻荒慌黄磺蝗簧皇凰惶煌晃幌恍谎灰挥辉徽恢蛔回毁悔慧卉惠晦贿秽会烩汇讳诲绘荤昏婚魂浑混豁活伙火获或惑霍货祸击圾基机畸稽积箕"],["bc40","粿糀糂糃糄糆糉糋糎",6,"糘糚糛糝糞糡",6,"糩",5,"糰",7,"糹糺糼",13,"紋",5],["bc80","紑",14,"紡紣紤紥紦紨紩紪紬紭紮細",6,"肌饥迹激讥鸡姬绩缉吉极棘辑籍集及急疾汲即嫉级挤几脊己蓟技冀季伎祭剂悸济寄寂计记既忌际妓继纪嘉枷夹佳家加荚颊贾甲钾假稼价架驾嫁歼监坚尖笺间煎兼肩艰奸缄茧检柬碱硷拣捡简俭剪减荐槛鉴践贱见键箭件"],["bd40","紷",54,"絯",7],["bd80","絸",32,"健舰剑饯渐溅涧建僵姜将浆江疆蒋桨奖讲匠酱降蕉椒礁焦胶交郊浇骄娇嚼搅铰矫侥脚狡角饺缴绞剿教酵轿较叫窖揭接皆秸街阶截劫节桔杰捷睫竭洁结解姐戒藉芥界借介疥诫届巾筋斤金今津襟紧锦仅谨进靳晋禁近烬浸"],["be40","継",12,"綧",6,"綯",42],["be80","線",32,"尽劲荆兢茎睛晶鲸京惊精粳经井警景颈静境敬镜径痉靖竟竞净炯窘揪究纠玖韭久灸九酒厩救旧臼舅咎就疚鞠拘狙疽居驹菊局咀矩举沮聚拒据巨具距踞锯俱句惧炬剧捐鹃娟倦眷卷绢撅攫抉掘倔爵觉决诀绝均菌钧军君峻"],["bf40","緻",62],["bf80","縺縼",4,"繂",4,"繈",21,"俊竣浚郡骏喀咖卡咯开揩楷凯慨刊堪勘坎砍看康慷糠扛抗亢炕考拷烤靠坷苛柯棵磕颗科壳咳可渴克刻客课肯啃垦恳坑吭空恐孔控抠口扣寇枯哭窟苦酷库裤夸垮挎跨胯块筷侩快宽款匡筐狂框矿眶旷况亏盔岿窥葵奎魁傀"],["c040","繞",35,"纃",23,"纜纝纞"],["c080","纮纴纻纼绖绤绬绹缊缐缞缷缹缻",6,"罃罆",9,"罒罓馈愧溃坤昆捆困括扩廓阔垃拉喇蜡腊辣啦莱来赖蓝婪栏拦篮阑兰澜谰揽览懒缆烂滥琅榔狼廊郎朗浪捞劳牢老佬姥酪烙涝勒乐雷镭蕾磊累儡垒擂肋类泪棱楞冷厘梨犁黎篱狸离漓理李里鲤礼莉荔吏栗丽厉励砾历利傈例俐"],["c140","罖罙罛罜罝罞罠罣",4,"罫罬罭罯罰罳罵罶罷罸罺罻罼罽罿羀羂",7,"羋羍羏",4,"羕",4,"羛羜羠羢羣羥羦羨",6,"羱"],["c180","羳",4,"羺羻羾翀翂翃翄翆翇翈翉翋翍翏",4,"翖翗翙",5,"翢翣痢立粒沥隶力璃哩俩联莲连镰廉怜涟帘敛脸链恋炼练粮凉梁粱良两辆量晾亮谅撩聊僚疗燎寥辽潦了撂镣廖料列裂烈劣猎琳林磷霖临邻鳞淋凛赁吝拎玲菱零龄铃伶羚凌灵陵岭领另令溜琉榴硫馏留刘瘤流柳六龙聋咙笼窿"],["c240","翤翧翨翪翫翬翭翯翲翴",6,"翽翾翿耂耇耈耉耊耎耏耑耓耚耛耝耞耟耡耣耤耫",5,"耲耴耹耺耼耾聀聁聄聅聇聈聉聎聏聐聑聓聕聖聗"],["c280","聙聛",13,"聫",5,"聲",11,"隆垄拢陇楼娄搂篓漏陋芦卢颅庐炉掳卤虏鲁麓碌露路赂鹿潞禄录陆戮驴吕铝侣旅履屡缕虑氯律率滤绿峦挛孪滦卵乱掠略抡轮伦仑沦纶论萝螺罗逻锣箩骡裸落洛骆络妈麻玛码蚂马骂嘛吗埋买麦卖迈脉瞒馒蛮满蔓曼慢漫"],["c340","聾肁肂肅肈肊肍",5,"肔肕肗肙肞肣肦肧肨肬肰肳肵肶肸肹肻胅胇",4,"胏",6,"胘胟胠胢胣胦胮胵胷胹胻胾胿脀脁脃脄脅脇脈脋"],["c380","脌脕脗脙脛脜脝脟",12,"脭脮脰脳脴脵脷脹",4,"脿谩芒茫盲氓忙莽猫茅锚毛矛铆卯茂冒帽貌贸么玫枚梅酶霉煤没眉媒镁每美昧寐妹媚门闷们萌蒙檬盟锰猛梦孟眯醚靡糜迷谜弥米秘觅泌蜜密幂棉眠绵冕免勉娩缅面苗描瞄藐秒渺庙妙蔑灭民抿皿敏悯闽明螟鸣铭名命谬摸"],["c440","腀",5,"腇腉腍腎腏腒腖腗腘腛",4,"腡腢腣腤腦腨腪腫腬腯腲腳腵腶腷腸膁膃",4,"膉膋膌膍膎膐膒",5,"膙膚膞",4,"膤膥"],["c480","膧膩膫",7,"膴",5,"膼膽膾膿臄臅臇臈臉臋臍",6,"摹蘑模膜磨摩魔抹末莫墨默沫漠寞陌谋牟某拇牡亩姆母墓暮幕募慕木目睦牧穆拿哪呐钠那娜纳氖乃奶耐奈南男难囊挠脑恼闹淖呢馁内嫩能妮霓倪泥尼拟你匿腻逆溺蔫拈年碾撵捻念娘酿鸟尿捏聂孽啮镊镍涅您柠狞凝宁"],["c540","臔",14,"臤臥臦臨臩臫臮",4,"臵",5,"臽臿舃與",4,"舎舏舑舓舕",5,"舝舠舤舥舦舧舩舮舲舺舼舽舿"],["c580","艀艁艂艃艅艆艈艊艌艍艎艐",7,"艙艛艜艝艞艠",7,"艩拧泞牛扭钮纽脓浓农弄奴努怒女暖虐疟挪懦糯诺哦欧鸥殴藕呕偶沤啪趴爬帕怕琶拍排牌徘湃派攀潘盘磐盼畔判叛乓庞旁耪胖抛咆刨炮袍跑泡呸胚培裴赔陪配佩沛喷盆砰抨烹澎彭蓬棚硼篷膨朋鹏捧碰坯砒霹批披劈琵毗"],["c640","艪艫艬艭艱艵艶艷艸艻艼芀芁芃芅芆芇芉芌芐芓芔芕芖芚芛芞芠芢芣芧芲芵芶芺芻芼芿苀苂苃苅苆苉苐苖苙苚苝苢苧苨苩苪苬苭苮苰苲苳苵苶苸"],["c680","苺苼",4,"茊茋茍茐茒茓茖茘茙茝",9,"茩茪茮茰茲茷茻茽啤脾疲皮匹痞僻屁譬篇偏片骗飘漂瓢票撇瞥拼频贫品聘乒坪苹萍平凭瓶评屏坡泼颇婆破魄迫粕剖扑铺仆莆葡菩蒲埔朴圃普浦谱曝瀑期欺栖戚妻七凄漆柒沏其棋奇歧畦崎脐齐旗祈祁骑起岂乞企启契砌器气迄弃汽泣讫掐"],["c740","茾茿荁荂荄荅荈荊",4,"荓荕",4,"荝荢荰",6,"荹荺荾",6,"莇莈莊莋莌莍莏莐莑莔莕莖莗莙莚莝莟莡",6,"莬莭莮"],["c780","莯莵莻莾莿菂菃菄菆菈菉菋菍菎菐菑菒菓菕菗菙菚菛菞菢菣菤菦菧菨菫菬菭恰洽牵扦钎铅千迁签仟谦乾黔钱钳前潜遣浅谴堑嵌欠歉枪呛腔羌墙蔷强抢橇锹敲悄桥瞧乔侨巧鞘撬翘峭俏窍切茄且怯窃钦侵亲秦琴勤芹擒禽寝沁青轻氢倾卿清擎晴氰情顷请庆琼穷秋丘邱球求囚酋泅趋区蛆曲躯屈驱渠"],["c840","菮華菳",4,"菺菻菼菾菿萀萂萅萇萈萉萊萐萒",5,"萙萚萛萞",5,"萩",7,"萲",5,"萹萺萻萾",7,"葇葈葉"],["c880","葊",6,"葒",4,"葘葝葞葟葠葢葤",4,"葪葮葯葰葲葴葷葹葻葼取娶龋趣去圈颧权醛泉全痊拳犬券劝缺炔瘸却鹊榷确雀裙群然燃冉染瓤壤攘嚷让饶扰绕惹热壬仁人忍韧任认刃妊纫扔仍日戎茸蓉荣融熔溶容绒冗揉柔肉茹蠕儒孺如辱乳汝入褥软阮蕊瑞锐闰润若弱撒洒萨腮鳃塞赛三叁"],["c940","葽",4,"蒃蒄蒅蒆蒊蒍蒏",7,"蒘蒚蒛蒝蒞蒟蒠蒢",12,"蒰蒱蒳蒵蒶蒷蒻蒼蒾蓀蓂蓃蓅蓆蓇蓈蓋蓌蓎蓏蓒蓔蓕蓗"],["c980","蓘",4,"蓞蓡蓢蓤蓧",4,"蓭蓮蓯蓱",10,"蓽蓾蔀蔁蔂伞散桑嗓丧搔骚扫嫂瑟色涩森僧莎砂杀刹沙纱傻啥煞筛晒珊苫杉山删煽衫闪陕擅赡膳善汕扇缮墒伤商赏晌上尚裳梢捎稍烧芍勺韶少哨邵绍奢赊蛇舌舍赦摄射慑涉社设砷申呻伸身深娠绅神沈审婶甚肾慎渗声生甥牲升绳"],["ca40","蔃",8,"蔍蔎蔏蔐蔒蔔蔕蔖蔘蔙蔛蔜蔝蔞蔠蔢",8,"蔭",9,"蔾",4,"蕄蕅蕆蕇蕋",10],["ca80","蕗蕘蕚蕛蕜蕝蕟",4,"蕥蕦蕧蕩",8,"蕳蕵蕶蕷蕸蕼蕽蕿薀薁省盛剩胜圣师失狮施湿诗尸虱十石拾时什食蚀实识史矢使屎驶始式示士世柿事拭誓逝势是嗜噬适仕侍释饰氏市恃室视试收手首守寿授售受瘦兽蔬枢梳殊抒输叔舒淑疏书赎孰熟薯暑曙署蜀黍鼠属术述树束戍竖墅庶数漱"],["cb40","薂薃薆薈",6,"薐",10,"薝",6,"薥薦薧薩薫薬薭薱",5,"薸薺",6,"藂",6,"藊",4,"藑藒"],["cb80","藔藖",5,"藝",6,"藥藦藧藨藪",14,"恕刷耍摔衰甩帅栓拴霜双爽谁水睡税吮瞬顺舜说硕朔烁斯撕嘶思私司丝死肆寺嗣四伺似饲巳松耸怂颂送宋讼诵搜艘擞嗽苏酥俗素速粟僳塑溯宿诉肃酸蒜算虽隋随绥髓碎岁穗遂隧祟孙损笋蓑梭唆缩琐索锁所塌他它她塔"],["cc40","藹藺藼藽藾蘀",4,"蘆",10,"蘒蘓蘔蘕蘗",15,"蘨蘪",13,"蘹蘺蘻蘽蘾蘿虀"],["cc80","虁",11,"虒虓處",4,"虛虜虝號虠虡虣",7,"獭挞蹋踏胎苔抬台泰酞太态汰坍摊贪瘫滩坛檀痰潭谭谈坦毯袒碳探叹炭汤塘搪堂棠膛唐糖倘躺淌趟烫掏涛滔绦萄桃逃淘陶讨套特藤腾疼誊梯剔踢锑提题蹄啼体替嚏惕涕剃屉天添填田甜恬舔腆挑条迢眺跳贴铁帖厅听烃"],["cd40","虭虯虰虲",6,"蚃",6,"蚎",4,"蚔蚖",5,"蚞",4,"蚥蚦蚫蚭蚮蚲蚳蚷蚸蚹蚻",4,"蛁蛂蛃蛅蛈蛌蛍蛒蛓蛕蛖蛗蛚蛜"],["cd80","蛝蛠蛡蛢蛣蛥蛦蛧蛨蛪蛫蛬蛯蛵蛶蛷蛺蛻蛼蛽蛿蜁蜄蜅蜆蜋蜌蜎蜏蜐蜑蜔蜖汀廷停亭庭挺艇通桐酮瞳同铜彤童桶捅筒统痛偷投头透凸秃突图徒途涂屠土吐兔湍团推颓腿蜕褪退吞屯臀拖托脱鸵陀驮驼椭妥拓唾挖哇蛙洼娃瓦袜歪外豌弯湾玩顽丸烷完碗挽晚皖惋宛婉万腕汪王亡枉网往旺望忘妄威"],["ce40","蜙蜛蜝蜟蜠蜤蜦蜧蜨蜪蜫蜬蜭蜯蜰蜲蜳蜵蜶蜸蜹蜺蜼蜽蝀",6,"蝊蝋蝍蝏蝐蝑蝒蝔蝕蝖蝘蝚",5,"蝡蝢蝦",7,"蝯蝱蝲蝳蝵"],["ce80","蝷蝸蝹蝺蝿螀螁螄螆螇螉螊螌螎",4,"螔螕螖螘",6,"螠",4,"巍微危韦违桅围唯惟为潍维苇萎委伟伪尾纬未蔚味畏胃喂魏位渭谓尉慰卫瘟温蚊文闻纹吻稳紊问嗡翁瓮挝蜗涡窝我斡卧握沃巫呜钨乌污诬屋无芜梧吾吴毋武五捂午舞伍侮坞戊雾晤物勿务悟误昔熙析西硒矽晰嘻吸锡牺"],["cf40","螥螦螧螩螪螮螰螱螲螴螶螷螸螹螻螼螾螿蟁",4,"蟇蟈蟉蟌",4,"蟔",6,"蟜蟝蟞蟟蟡蟢蟣蟤蟦蟧蟨蟩蟫蟬蟭蟯",9],["cf80","蟺蟻蟼蟽蟿蠀蠁蠂蠄",5,"蠋",7,"蠔蠗蠘蠙蠚蠜",4,"蠣稀息希悉膝夕惜熄烯溪汐犀檄袭席习媳喜铣洗系隙戏细瞎虾匣霞辖暇峡侠狭下厦夏吓掀锨先仙鲜纤咸贤衔舷闲涎弦嫌显险现献县腺馅羡宪陷限线相厢镶香箱襄湘乡翔祥详想响享项巷橡像向象萧硝霄削哮嚣销消宵淆晓"],["d040","蠤",13,"蠳",5,"蠺蠻蠽蠾蠿衁衂衃衆",5,"衎",5,"衕衖衘衚",6,"衦衧衪衭衯衱衳衴衵衶衸衹衺"],["d080","衻衼袀袃袆袇袉袊袌袎袏袐袑袓袔袕袗",4,"袝",4,"袣袥",5,"小孝校肖啸笑效楔些歇蝎鞋协挟携邪斜胁谐写械卸蟹懈泄泻谢屑薪芯锌欣辛新忻心信衅星腥猩惺兴刑型形邢行醒幸杏性姓兄凶胸匈汹雄熊休修羞朽嗅锈秀袖绣墟戌需虚嘘须徐许蓄酗叙旭序畜恤絮婿绪续轩喧宣悬旋玄"],["d140","袬袮袯袰袲",4,"袸袹袺袻袽袾袿裀裃裄裇裈裊裋裌裍裏裐裑裓裖裗裚",4,"裠裡裦裧裩",6,"裲裵裶裷裺裻製裿褀褁褃",5],["d180","褉褋",4,"褑褔",4,"褜",4,"褢褣褤褦褧褨褩褬褭褮褯褱褲褳褵褷选癣眩绚靴薛学穴雪血勋熏循旬询寻驯巡殉汛训讯逊迅压押鸦鸭呀丫芽牙蚜崖衙涯雅哑亚讶焉咽阉烟淹盐严研蜒岩延言颜阎炎沿奄掩眼衍演艳堰燕厌砚雁唁彦焰宴谚验殃央鸯秧杨扬佯疡羊洋阳氧仰痒养样漾邀腰妖瑶"],["d240","褸",8,"襂襃襅",24,"襠",5,"襧",19,"襼"],["d280","襽襾覀覂覄覅覇",26,"摇尧遥窑谣姚咬舀药要耀椰噎耶爷野冶也页掖业叶曳腋夜液一壹医揖铱依伊衣颐夷遗移仪胰疑沂宜姨彝椅蚁倚已乙矣以艺抑易邑屹亿役臆逸肄疫亦裔意毅忆义益溢诣议谊译异翼翌绎茵荫因殷音阴姻吟银淫寅饮尹引隐"],["d340","覢",30,"觃觍觓觔觕觗觘觙觛觝觟觠觡觢觤觧觨觩觪觬觭觮觰觱觲觴",6],["d380","觻",4,"訁",5,"計",21,"印英樱婴鹰应缨莹萤营荧蝇迎赢盈影颖硬映哟拥佣臃痈庸雍踊蛹咏泳涌永恿勇用幽优悠忧尤由邮铀犹油游酉有友右佑釉诱又幼迂淤于盂榆虞愚舆余俞逾鱼愉渝渔隅予娱雨与屿禹宇语羽玉域芋郁吁遇喻峪御愈欲狱育誉"],["d440","訞",31,"訿",8,"詉",21],["d480","詟",25,"詺",6,"浴寓裕预豫驭鸳渊冤元垣袁原援辕园员圆猿源缘远苑愿怨院曰约越跃钥岳粤月悦阅耘云郧匀陨允运蕴酝晕韵孕匝砸杂栽哉灾宰载再在咱攒暂赞赃脏葬遭糟凿藻枣早澡蚤躁噪造皂灶燥责择则泽贼怎增憎曾赠扎喳渣札轧"],["d540","誁",7,"誋",7,"誔",46],["d580","諃",32,"铡闸眨栅榨咋乍炸诈摘斋宅窄债寨瞻毡詹粘沾盏斩辗崭展蘸栈占战站湛绽樟章彰漳张掌涨杖丈帐账仗胀瘴障招昭找沼赵照罩兆肇召遮折哲蛰辙者锗蔗这浙珍斟真甄砧臻贞针侦枕疹诊震振镇阵蒸挣睁征狰争怔整拯正政"],["d640","諤",34,"謈",27],["d680","謤謥謧",30,"帧症郑证芝枝支吱蜘知肢脂汁之织职直植殖执值侄址指止趾只旨纸志挚掷至致置帜峙制智秩稚质炙痔滞治窒中盅忠钟衷终种肿重仲众舟周州洲诌粥轴肘帚咒皱宙昼骤珠株蛛朱猪诸诛逐竹烛煮拄瞩嘱主著柱助蛀贮铸筑"],["d740","譆",31,"譧",4,"譭",25],["d780","讇",24,"讬讱讻诇诐诪谉谞住注祝驻抓爪拽专砖转撰赚篆桩庄装妆撞壮状椎锥追赘坠缀谆准捉拙卓桌琢茁酌啄着灼浊兹咨资姿滋淄孜紫仔籽滓子自渍字鬃棕踪宗综总纵邹走奏揍租足卒族祖诅阻组钻纂嘴醉最罪尊遵昨左佐柞做作坐座"],["d840","谸",8,"豂豃豄豅豈豊豋豍",7,"豖豗豘豙豛",5,"豣",6,"豬",6,"豴豵豶豷豻",6,"貃貄貆貇"],["d880","貈貋貍",6,"貕貖貗貙",20,"亍丌兀丐廿卅丕亘丞鬲孬噩丨禺丿匕乇夭爻卮氐囟胤馗毓睾鼗丶亟鼐乜乩亓芈孛啬嘏仄厍厝厣厥厮靥赝匚叵匦匮匾赜卦卣刂刈刎刭刳刿剀剌剞剡剜蒯剽劂劁劐劓冂罔亻仃仉仂仨仡仫仞伛仳伢佤仵伥伧伉伫佞佧攸佚佝"],["d940","貮",62],["d980","賭",32,"佟佗伲伽佶佴侑侉侃侏佾佻侪佼侬侔俦俨俪俅俚俣俜俑俟俸倩偌俳倬倏倮倭俾倜倌倥倨偾偃偕偈偎偬偻傥傧傩傺僖儆僭僬僦僮儇儋仝氽佘佥俎龠汆籴兮巽黉馘冁夔勹匍訇匐凫夙兕亠兖亳衮袤亵脔裒禀嬴蠃羸冫冱冽冼"],["da40","贎",14,"贠赑赒赗赟赥赨赩赪赬赮赯赱赲赸",8,"趂趃趆趇趈趉趌",4,"趒趓趕",9,"趠趡"],["da80","趢趤",12,"趲趶趷趹趻趽跀跁跂跅跇跈跉跊跍跐跒跓跔凇冖冢冥讠讦讧讪讴讵讷诂诃诋诏诎诒诓诔诖诘诙诜诟诠诤诨诩诮诰诳诶诹诼诿谀谂谄谇谌谏谑谒谔谕谖谙谛谘谝谟谠谡谥谧谪谫谮谯谲谳谵谶卩卺阝阢阡阱阪阽阼陂陉陔陟陧陬陲陴隈隍隗隰邗邛邝邙邬邡邴邳邶邺"],["db40","跕跘跙跜跠跡跢跥跦跧跩跭跮跰跱跲跴跶跼跾",6,"踆踇踈踋踍踎踐踑踒踓踕",7,"踠踡踤",4,"踫踭踰踲踳踴踶踷踸踻踼踾"],["db80","踿蹃蹅蹆蹌",4,"蹓",5,"蹚",11,"蹧蹨蹪蹫蹮蹱邸邰郏郅邾郐郄郇郓郦郢郜郗郛郫郯郾鄄鄢鄞鄣鄱鄯鄹酃酆刍奂劢劬劭劾哿勐勖勰叟燮矍廴凵凼鬯厶弁畚巯坌垩垡塾墼壅壑圩圬圪圳圹圮圯坜圻坂坩垅坫垆坼坻坨坭坶坳垭垤垌垲埏垧垴垓垠埕埘埚埙埒垸埴埯埸埤埝"],["dc40","蹳蹵蹷",4,"蹽蹾躀躂躃躄躆躈",6,"躑躒躓躕",6,"躝躟",11,"躭躮躰躱躳",6,"躻",7],["dc80","軃",10,"軏",21,"堋堍埽埭堀堞堙塄堠塥塬墁墉墚墀馨鼙懿艹艽艿芏芊芨芄芎芑芗芙芫芸芾芰苈苊苣芘芷芮苋苌苁芩芴芡芪芟苄苎芤苡茉苷苤茏茇苜苴苒苘茌苻苓茑茚茆茔茕苠苕茜荑荛荜茈莒茼茴茱莛荞茯荏荇荃荟荀茗荠茭茺茳荦荥"],["dd40","軥",62],["dd80","輤",32,"荨茛荩荬荪荭荮莰荸莳莴莠莪莓莜莅荼莶莩荽莸荻莘莞莨莺莼菁萁菥菘堇萘萋菝菽菖萜萸萑萆菔菟萏萃菸菹菪菅菀萦菰菡葜葑葚葙葳蒇蒈葺蒉葸萼葆葩葶蒌蒎萱葭蓁蓍蓐蓦蒽蓓蓊蒿蒺蓠蒡蒹蒴蒗蓥蓣蔌甍蔸蓰蔹蔟蔺"],["de40","轅",32,"轪辀辌辒辝辠辡辢辤辥辦辧辪辬辭辮辯農辳辴辵辷辸辺辻込辿迀迃迆"],["de80","迉",4,"迏迒迖迗迚迠迡迣迧迬迯迱迲迴迵迶迺迻迼迾迿逇逈逌逎逓逕逘蕖蔻蓿蓼蕙蕈蕨蕤蕞蕺瞢蕃蕲蕻薤薨薇薏蕹薮薜薅薹薷薰藓藁藜藿蘧蘅蘩蘖蘼廾弈夼奁耷奕奚奘匏尢尥尬尴扌扪抟抻拊拚拗拮挢拶挹捋捃掭揶捱捺掎掴捭掬掊捩掮掼揲揸揠揿揄揞揎摒揆掾摅摁搋搛搠搌搦搡摞撄摭撖"],["df40","這逜連逤逥逧",5,"逰",4,"逷逹逺逽逿遀遃遅遆遈",4,"過達違遖遙遚遜",5,"遤遦遧適遪遫遬遯",4,"遶",6,"遾邁"],["df80","還邅邆邇邉邊邌",4,"邒邔邖邘邚邜邞邟邠邤邥邧邨邩邫邭邲邷邼邽邿郀摺撷撸撙撺擀擐擗擤擢攉攥攮弋忒甙弑卟叱叽叩叨叻吒吖吆呋呒呓呔呖呃吡呗呙吣吲咂咔呷呱呤咚咛咄呶呦咝哐咭哂咴哒咧咦哓哔呲咣哕咻咿哌哙哚哜咩咪咤哝哏哞唛哧唠哽唔哳唢唣唏唑唧唪啧喏喵啉啭啁啕唿啐唼"],["e040","郂郃郆郈郉郋郌郍郒郔郕郖郘郙郚郞郟郠郣郤郥郩郪郬郮郰郱郲郳郵郶郷郹郺郻郼郿鄀鄁鄃鄅",19,"鄚鄛鄜"],["e080","鄝鄟鄠鄡鄤",10,"鄰鄲",6,"鄺",8,"酄唷啖啵啶啷唳唰啜喋嗒喃喱喹喈喁喟啾嗖喑啻嗟喽喾喔喙嗪嗷嗉嘟嗑嗫嗬嗔嗦嗝嗄嗯嗥嗲嗳嗌嗍嗨嗵嗤辔嘞嘈嘌嘁嘤嘣嗾嘀嘧嘭噘嘹噗嘬噍噢噙噜噌噔嚆噤噱噫噻噼嚅嚓嚯囔囗囝囡囵囫囹囿圄圊圉圜帏帙帔帑帱帻帼"],["e140","酅酇酈酑酓酔酕酖酘酙酛酜酟酠酦酧酨酫酭酳酺酻酼醀",4,"醆醈醊醎醏醓",6,"醜",5,"醤",5,"醫醬醰醱醲醳醶醷醸醹醻"],["e180","醼",10,"釈釋釐釒",9,"針",8,"帷幄幔幛幞幡岌屺岍岐岖岈岘岙岑岚岜岵岢岽岬岫岱岣峁岷峄峒峤峋峥崂崃崧崦崮崤崞崆崛嵘崾崴崽嵬嵛嵯嵝嵫嵋嵊嵩嵴嶂嶙嶝豳嶷巅彳彷徂徇徉後徕徙徜徨徭徵徼衢彡犭犰犴犷犸狃狁狎狍狒狨狯狩狲狴狷猁狳猃狺"],["e240","釦",62],["e280","鈥",32,"狻猗猓猡猊猞猝猕猢猹猥猬猸猱獐獍獗獠獬獯獾舛夥飧夤夂饣饧",5,"饴饷饽馀馄馇馊馍馐馑馓馔馕庀庑庋庖庥庠庹庵庾庳赓廒廑廛廨廪膺忄忉忖忏怃忮怄忡忤忾怅怆忪忭忸怙怵怦怛怏怍怩怫怊怿怡恸恹恻恺恂"],["e340","鉆",45,"鉵",16],["e380","銆",7,"銏",24,"恪恽悖悚悭悝悃悒悌悛惬悻悱惝惘惆惚悴愠愦愕愣惴愀愎愫慊慵憬憔憧憷懔懵忝隳闩闫闱闳闵闶闼闾阃阄阆阈阊阋阌阍阏阒阕阖阗阙阚丬爿戕氵汔汜汊沣沅沐沔沌汨汩汴汶沆沩泐泔沭泷泸泱泗沲泠泖泺泫泮沱泓泯泾"],["e440","銨",5,"銯",24,"鋉",31],["e480","鋩",32,"洹洧洌浃浈洇洄洙洎洫浍洮洵洚浏浒浔洳涑浯涞涠浞涓涔浜浠浼浣渚淇淅淞渎涿淠渑淦淝淙渖涫渌涮渫湮湎湫溲湟溆湓湔渲渥湄滟溱溘滠漭滢溥溧溽溻溷滗溴滏溏滂溟潢潆潇漤漕滹漯漶潋潴漪漉漩澉澍澌潸潲潼潺濑"],["e540","錊",51,"錿",10],["e580","鍊",31,"鍫濉澧澹澶濂濡濮濞濠濯瀚瀣瀛瀹瀵灏灞宀宄宕宓宥宸甯骞搴寤寮褰寰蹇謇辶迓迕迥迮迤迩迦迳迨逅逄逋逦逑逍逖逡逵逶逭逯遄遑遒遐遨遘遢遛暹遴遽邂邈邃邋彐彗彖彘尻咫屐屙孱屣屦羼弪弩弭艴弼鬻屮妁妃妍妩妪妣"],["e640","鍬",34,"鎐",27],["e680","鎬",29,"鏋鏌鏍妗姊妫妞妤姒妲妯姗妾娅娆姝娈姣姘姹娌娉娲娴娑娣娓婀婧婊婕娼婢婵胬媪媛婷婺媾嫫媲嫒嫔媸嫠嫣嫱嫖嫦嫘嫜嬉嬗嬖嬲嬷孀尕尜孚孥孳孑孓孢驵驷驸驺驿驽骀骁骅骈骊骐骒骓骖骘骛骜骝骟骠骢骣骥骧纟纡纣纥纨纩"],["e740","鏎",7,"鏗",54],["e780","鐎",32,"纭纰纾绀绁绂绉绋绌绐绔绗绛绠绡绨绫绮绯绱绲缍绶绺绻绾缁缂缃缇缈缋缌缏缑缒缗缙缜缛缟缡",6,"缪缫缬缭缯",4,"缵幺畿巛甾邕玎玑玮玢玟珏珂珑玷玳珀珉珈珥珙顼琊珩珧珞玺珲琏琪瑛琦琥琨琰琮琬"],["e840","鐯",14,"鐿",43,"鑬鑭鑮鑯"],["e880","鑰",20,"钑钖钘铇铏铓铔铚铦铻锜锠琛琚瑁瑜瑗瑕瑙瑷瑭瑾璜璎璀璁璇璋璞璨璩璐璧瓒璺韪韫韬杌杓杞杈杩枥枇杪杳枘枧杵枨枞枭枋杷杼柰栉柘栊柩枰栌柙枵柚枳柝栀柃枸柢栎柁柽栲栳桠桡桎桢桄桤梃栝桕桦桁桧桀栾桊桉栩梵梏桴桷梓桫棂楮棼椟椠棹"],["e940","锧锳锽镃镈镋镕镚镠镮镴镵長",7,"門",42],["e980","閫",32,"椤棰椋椁楗棣椐楱椹楠楂楝榄楫榀榘楸椴槌榇榈槎榉楦楣楹榛榧榻榫榭槔榱槁槊槟榕槠榍槿樯槭樗樘橥槲橄樾檠橐橛樵檎橹樽樨橘橼檑檐檩檗檫猷獒殁殂殇殄殒殓殍殚殛殡殪轫轭轱轲轳轵轶轸轷轹轺轼轾辁辂辄辇辋"],["ea40","闌",27,"闬闿阇阓阘阛阞阠阣",6,"阫阬阭阯阰阷阸阹阺阾陁陃陊陎陏陑陒陓陖陗"],["ea80","陘陙陚陜陝陞陠陣陥陦陫陭",4,"陳陸",12,"隇隉隊辍辎辏辘辚軎戋戗戛戟戢戡戥戤戬臧瓯瓴瓿甏甑甓攴旮旯旰昊昙杲昃昕昀炅曷昝昴昱昶昵耆晟晔晁晏晖晡晗晷暄暌暧暝暾曛曜曦曩贲贳贶贻贽赀赅赆赈赉赇赍赕赙觇觊觋觌觎觏觐觑牮犟牝牦牯牾牿犄犋犍犏犒挈挲掰"],["eb40","隌階隑隒隓隕隖隚際隝",9,"隨",7,"隱隲隴隵隷隸隺隻隿雂雃雈雊雋雐雑雓雔雖",9,"雡",6,"雫"],["eb80","雬雭雮雰雱雲雴雵雸雺電雼雽雿霂霃霅霊霋霌霐霑霒霔霕霗",4,"霝霟霠搿擘耄毪毳毽毵毹氅氇氆氍氕氘氙氚氡氩氤氪氲攵敕敫牍牒牖爰虢刖肟肜肓肼朊肽肱肫肭肴肷胧胨胩胪胛胂胄胙胍胗朐胝胫胱胴胭脍脎胲胼朕脒豚脶脞脬脘脲腈腌腓腴腙腚腱腠腩腼腽腭腧塍媵膈膂膑滕膣膪臌朦臊膻"],["ec40","霡",8,"霫霬霮霯霱霳",4,"霺霻霼霽霿",18,"靔靕靗靘靚靜靝靟靣靤靦靧靨靪",7],["ec80","靲靵靷",4,"靽",7,"鞆",4,"鞌鞎鞏鞐鞓鞕鞖鞗鞙",4,"臁膦欤欷欹歃歆歙飑飒飓飕飙飚殳彀毂觳斐齑斓於旆旄旃旌旎旒旖炀炜炖炝炻烀炷炫炱烨烊焐焓焖焯焱煳煜煨煅煲煊煸煺熘熳熵熨熠燠燔燧燹爝爨灬焘煦熹戾戽扃扈扉礻祀祆祉祛祜祓祚祢祗祠祯祧祺禅禊禚禧禳忑忐"],["ed40","鞞鞟鞡鞢鞤",6,"鞬鞮鞰鞱鞳鞵",46],["ed80","韤韥韨韮",4,"韴韷",23,"怼恝恚恧恁恙恣悫愆愍慝憩憝懋懑戆肀聿沓泶淼矶矸砀砉砗砘砑斫砭砜砝砹砺砻砟砼砥砬砣砩硎硭硖硗砦硐硇硌硪碛碓碚碇碜碡碣碲碹碥磔磙磉磬磲礅磴礓礤礞礴龛黹黻黼盱眄眍盹眇眈眚眢眙眭眦眵眸睐睑睇睃睚睨"],["ee40","頏",62],["ee80","顎",32,"睢睥睿瞍睽瞀瞌瞑瞟瞠瞰瞵瞽町畀畎畋畈畛畲畹疃罘罡罟詈罨罴罱罹羁罾盍盥蠲钅钆钇钋钊钌钍钏钐钔钗钕钚钛钜钣钤钫钪钭钬钯钰钲钴钶",4,"钼钽钿铄铈",6,"铐铑铒铕铖铗铙铘铛铞铟铠铢铤铥铧铨铪"],["ef40","顯",5,"颋颎颒颕颙颣風",37,"飏飐飔飖飗飛飜飝飠",4],["ef80","飥飦飩",30,"铩铫铮铯铳铴铵铷铹铼铽铿锃锂锆锇锉锊锍锎锏锒",4,"锘锛锝锞锟锢锪锫锩锬锱锲锴锶锷锸锼锾锿镂锵镄镅镆镉镌镎镏镒镓镔镖镗镘镙镛镞镟镝镡镢镤",8,"镯镱镲镳锺矧矬雉秕秭秣秫稆嵇稃稂稞稔"],["f040","餈",4,"餎餏餑",28,"餯",26],["f080","饊",9,"饖",12,"饤饦饳饸饹饻饾馂馃馉稹稷穑黏馥穰皈皎皓皙皤瓞瓠甬鸠鸢鸨",4,"鸲鸱鸶鸸鸷鸹鸺鸾鹁鹂鹄鹆鹇鹈鹉鹋鹌鹎鹑鹕鹗鹚鹛鹜鹞鹣鹦",6,"鹱鹭鹳疒疔疖疠疝疬疣疳疴疸痄疱疰痃痂痖痍痣痨痦痤痫痧瘃痱痼痿瘐瘀瘅瘌瘗瘊瘥瘘瘕瘙"],["f140","馌馎馚",10,"馦馧馩",47],["f180","駙",32,"瘛瘼瘢瘠癀瘭瘰瘿瘵癃瘾瘳癍癞癔癜癖癫癯翊竦穸穹窀窆窈窕窦窠窬窨窭窳衤衩衲衽衿袂袢裆袷袼裉裢裎裣裥裱褚裼裨裾裰褡褙褓褛褊褴褫褶襁襦襻疋胥皲皴矜耒耔耖耜耠耢耥耦耧耩耨耱耋耵聃聆聍聒聩聱覃顸颀颃"],["f240","駺",62],["f280","騹",32,"颉颌颍颏颔颚颛颞颟颡颢颥颦虍虔虬虮虿虺虼虻蚨蚍蚋蚬蚝蚧蚣蚪蚓蚩蚶蛄蚵蛎蚰蚺蚱蚯蛉蛏蚴蛩蛱蛲蛭蛳蛐蜓蛞蛴蛟蛘蛑蜃蜇蛸蜈蜊蜍蜉蜣蜻蜞蜥蜮蜚蜾蝈蜴蜱蜩蜷蜿螂蜢蝽蝾蝻蝠蝰蝌蝮螋蝓蝣蝼蝤蝙蝥螓螯螨蟒"],["f340","驚",17,"驲骃骉骍骎骔骕骙骦骩",6,"骲骳骴骵骹骻骽骾骿髃髄髆",4,"髍髎髏髐髒體髕髖髗髙髚髛髜"],["f380","髝髞髠髢髣髤髥髧髨髩髪髬髮髰",8,"髺髼",6,"鬄鬅鬆蟆螈螅螭螗螃螫蟥螬螵螳蟋蟓螽蟑蟀蟊蟛蟪蟠蟮蠖蠓蟾蠊蠛蠡蠹蠼缶罂罄罅舐竺竽笈笃笄笕笊笫笏筇笸笪笙笮笱笠笥笤笳笾笞筘筚筅筵筌筝筠筮筻筢筲筱箐箦箧箸箬箝箨箅箪箜箢箫箴篑篁篌篝篚篥篦篪簌篾篼簏簖簋"],["f440","鬇鬉",5,"鬐鬑鬒鬔",10,"鬠鬡鬢鬤",10,"鬰鬱鬳",7,"鬽鬾鬿魀魆魊魋魌魎魐魒魓魕",5],["f480","魛",32,"簟簪簦簸籁籀臾舁舂舄臬衄舡舢舣舭舯舨舫舸舻舳舴舾艄艉艋艏艚艟艨衾袅袈裘裟襞羝羟羧羯羰羲籼敉粑粝粜粞粢粲粼粽糁糇糌糍糈糅糗糨艮暨羿翎翕翥翡翦翩翮翳糸絷綦綮繇纛麸麴赳趄趔趑趱赧赭豇豉酊酐酎酏酤"],["f540","魼",62],["f580","鮻",32,"酢酡酰酩酯酽酾酲酴酹醌醅醐醍醑醢醣醪醭醮醯醵醴醺豕鹾趸跫踅蹙蹩趵趿趼趺跄跖跗跚跞跎跏跛跆跬跷跸跣跹跻跤踉跽踔踝踟踬踮踣踯踺蹀踹踵踽踱蹉蹁蹂蹑蹒蹊蹰蹶蹼蹯蹴躅躏躔躐躜躞豸貂貊貅貘貔斛觖觞觚觜"],["f640","鯜",62],["f680","鰛",32,"觥觫觯訾謦靓雩雳雯霆霁霈霏霎霪霭霰霾龀龃龅",5,"龌黾鼋鼍隹隼隽雎雒瞿雠銎銮鋈錾鍪鏊鎏鐾鑫鱿鲂鲅鲆鲇鲈稣鲋鲎鲐鲑鲒鲔鲕鲚鲛鲞",5,"鲥",4,"鲫鲭鲮鲰",7,"鲺鲻鲼鲽鳄鳅鳆鳇鳊鳋"],["f740","鰼",62],["f780","鱻鱽鱾鲀鲃鲄鲉鲊鲌鲏鲓鲖鲗鲘鲙鲝鲪鲬鲯鲹鲾",4,"鳈鳉鳑鳒鳚鳛鳠鳡鳌",4,"鳓鳔鳕鳗鳘鳙鳜鳝鳟鳢靼鞅鞑鞒鞔鞯鞫鞣鞲鞴骱骰骷鹘骶骺骼髁髀髅髂髋髌髑魅魃魇魉魈魍魑飨餍餮饕饔髟髡髦髯髫髻髭髹鬈鬏鬓鬟鬣麽麾縻麂麇麈麋麒鏖麝麟黛黜黝黠黟黢黩黧黥黪黯鼢鼬鼯鼹鼷鼽鼾齄"],["f840","鳣",62],["f880","鴢",32],["f940","鵃",62],["f980","鶂",32],["fa40","鶣",62],["fa80","鷢",32],["fb40","鸃",27,"鸤鸧鸮鸰鸴鸻鸼鹀鹍鹐鹒鹓鹔鹖鹙鹝鹟鹠鹡鹢鹥鹮鹯鹲鹴",9,"麀"],["fb80","麁麃麄麅麆麉麊麌",5,"麔",8,"麞麠",5,"麧麨麩麪"],["fc40","麫",8,"麵麶麷麹麺麼麿",4,"黅黆黇黈黊黋黌黐黒黓黕黖黗黙黚點黡黣黤黦黨黫黬黭黮黰",8,"黺黽黿",6],["fc80","鼆",4,"鼌鼏鼑鼒鼔鼕鼖鼘鼚",5,"鼡鼣",8,"鼭鼮鼰鼱"],["fd40","鼲",4,"鼸鼺鼼鼿",4,"齅",10,"齒",38],["fd80","齹",5,"龁龂龍",11,"龜龝龞龡",4,"郎凉秊裏隣"],["fe40","兀嗀﨎﨏﨑﨓﨔礼﨟蘒﨡﨣﨤﨧﨨﨩"]]
-
-/***/ }),
-/* 278 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// @flow
-
-/*::
-declare var __webpack_require__: mixed;
-*/
-
-module.exports = typeof __webpack_require__ !== "undefined";
-
-
-/***/ }),
-/* 279 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-var yaml = __webpack_require__(280);
-
-
-module.exports = yaml;
-
-
-/***/ }),
-/* 280 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-var loader = __webpack_require__(282);
-var dumper = __webpack_require__(281);
-
-
-function deprecated(name) {
-  return function () {
-    throw new Error('Function ' + name + ' is deprecated and cannot be used.');
-  };
-}
-
-
-module.exports.Type                = __webpack_require__(10);
-module.exports.Schema              = __webpack_require__(44);
-module.exports.FAILSAFE_SCHEMA     = __webpack_require__(100);
-module.exports.JSON_SCHEMA         = __webpack_require__(144);
-module.exports.CORE_SCHEMA         = __webpack_require__(143);
-module.exports.DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
-module.exports.DEFAULT_FULL_SCHEMA = __webpack_require__(72);
-module.exports.load                = loader.load;
-module.exports.loadAll             = loader.loadAll;
-module.exports.safeLoad            = loader.safeLoad;
-module.exports.safeLoadAll         = loader.safeLoadAll;
-module.exports.dump                = dumper.dump;
-module.exports.safeDump            = dumper.safeDump;
-module.exports.YAMLException       = __webpack_require__(54);
-
-// Deprecated schema names from JS-YAML 2.0.x
-module.exports.MINIMAL_SCHEMA = __webpack_require__(100);
-module.exports.SAFE_SCHEMA    = __webpack_require__(55);
-module.exports.DEFAULT_SCHEMA = __webpack_require__(72);
-
-// Deprecated functions from JS-YAML 1.x.x
-module.exports.scan           = deprecated('scan');
-module.exports.parse          = deprecated('parse');
-module.exports.compose        = deprecated('compose');
-module.exports.addConstructor = deprecated('addConstructor');
-
-
-/***/ }),
-/* 281 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/*eslint-disable no-use-before-define*/
-
-var common              = __webpack_require__(43);
-var YAMLException       = __webpack_require__(54);
-var DEFAULT_FULL_SCHEMA = __webpack_require__(72);
-var DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
-
-var _toString       = Object.prototype.toString;
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-
-var CHAR_TAB                  = 0x09; /* Tab */
-var CHAR_LINE_FEED            = 0x0A; /* LF */
-var CHAR_SPACE                = 0x20; /* Space */
-var CHAR_EXCLAMATION          = 0x21; /* ! */
-var CHAR_DOUBLE_QUOTE         = 0x22; /* " */
-var CHAR_SHARP                = 0x23; /* # */
-var CHAR_PERCENT              = 0x25; /* % */
-var CHAR_AMPERSAND            = 0x26; /* & */
-var CHAR_SINGLE_QUOTE         = 0x27; /* ' */
-var CHAR_ASTERISK             = 0x2A; /* * */
-var CHAR_COMMA                = 0x2C; /* , */
-var CHAR_MINUS                = 0x2D; /* - */
-var CHAR_COLON                = 0x3A; /* : */
-var CHAR_GREATER_THAN         = 0x3E; /* > */
-var CHAR_QUESTION             = 0x3F; /* ? */
-var CHAR_COMMERCIAL_AT        = 0x40; /* @ */
-var CHAR_LEFT_SQUARE_BRACKET  = 0x5B; /* [ */
-var CHAR_RIGHT_SQUARE_BRACKET = 0x5D; /* ] */
-var CHAR_GRAVE_ACCENT         = 0x60; /* ` */
-var CHAR_LEFT_CURLY_BRACKET   = 0x7B; /* { */
-var CHAR_VERTICAL_LINE        = 0x7C; /* | */
-var CHAR_RIGHT_CURLY_BRACKET  = 0x7D; /* } */
-
-var ESCAPE_SEQUENCES = {};
-
-ESCAPE_SEQUENCES[0x00]   = '\\0';
-ESCAPE_SEQUENCES[0x07]   = '\\a';
-ESCAPE_SEQUENCES[0x08]   = '\\b';
-ESCAPE_SEQUENCES[0x09]   = '\\t';
-ESCAPE_SEQUENCES[0x0A]   = '\\n';
-ESCAPE_SEQUENCES[0x0B]   = '\\v';
-ESCAPE_SEQUENCES[0x0C]   = '\\f';
-ESCAPE_SEQUENCES[0x0D]   = '\\r';
-ESCAPE_SEQUENCES[0x1B]   = '\\e';
-ESCAPE_SEQUENCES[0x22]   = '\\"';
-ESCAPE_SEQUENCES[0x5C]   = '\\\\';
-ESCAPE_SEQUENCES[0x85]   = '\\N';
-ESCAPE_SEQUENCES[0xA0]   = '\\_';
-ESCAPE_SEQUENCES[0x2028] = '\\L';
-ESCAPE_SEQUENCES[0x2029] = '\\P';
-
-var DEPRECATED_BOOLEANS_SYNTAX = [
-  'y', 'Y', 'yes', 'Yes', 'YES', 'on', 'On', 'ON',
-  'n', 'N', 'no', 'No', 'NO', 'off', 'Off', 'OFF'
-];
-
-function compileStyleMap(schema, map) {
-  var result, keys, index, length, tag, style, type;
-
-  if (map === null) return {};
-
-  result = {};
-  keys = Object.keys(map);
-
-  for (index = 0, length = keys.length; index < length; index += 1) {
-    tag = keys[index];
-    style = String(map[tag]);
-
-    if (tag.slice(0, 2) === '!!') {
-      tag = 'tag:yaml.org,2002:' + tag.slice(2);
-    }
-    type = schema.compiledTypeMap['fallback'][tag];
-
-    if (type && _hasOwnProperty.call(type.styleAliases, style)) {
-      style = type.styleAliases[style];
-    }
-
-    result[tag] = style;
-  }
-
-  return result;
-}
-
-function encodeHex(character) {
-  var string, handle, length;
-
-  string = character.toString(16).toUpperCase();
-
-  if (character <= 0xFF) {
-    handle = 'x';
-    length = 2;
-  } else if (character <= 0xFFFF) {
-    handle = 'u';
-    length = 4;
-  } else if (character <= 0xFFFFFFFF) {
-    handle = 'U';
-    length = 8;
-  } else {
-    throw new YAMLException('code point within a string may not be greater than 0xFFFFFFFF');
-  }
-
-  return '\\' + handle + common.repeat('0', length - string.length) + string;
-}
-
-function State(options) {
-  this.schema        = options['schema'] || DEFAULT_FULL_SCHEMA;
-  this.indent        = Math.max(1, (options['indent'] || 2));
-  this.noArrayIndent = options['noArrayIndent'] || false;
-  this.skipInvalid   = options['skipInvalid'] || false;
-  this.flowLevel     = (common.isNothing(options['flowLevel']) ? -1 : options['flowLevel']);
-  this.styleMap      = compileStyleMap(this.schema, options['styles'] || null);
-  this.sortKeys      = options['sortKeys'] || false;
-  this.lineWidth     = options['lineWidth'] || 80;
-  this.noRefs        = options['noRefs'] || false;
-  this.noCompatMode  = options['noCompatMode'] || false;
-  this.condenseFlow  = options['condenseFlow'] || false;
-
-  this.implicitTypes = this.schema.compiledImplicit;
-  this.explicitTypes = this.schema.compiledExplicit;
-
-  this.tag = null;
-  this.result = '';
-
-  this.duplicates = [];
-  this.usedDuplicates = null;
-}
-
-// Indents every line in a string. Empty lines (\n only) are not indented.
-function indentString(string, spaces) {
-  var ind = common.repeat(' ', spaces),
-      position = 0,
-      next = -1,
-      result = '',
-      line,
-      length = string.length;
-
-  while (position < length) {
-    next = string.indexOf('\n', position);
-    if (next === -1) {
-      line = string.slice(position);
-      position = length;
-    } else {
-      line = string.slice(position, next + 1);
-      position = next + 1;
-    }
-
-    if (line.length && line !== '\n') result += ind;
-
-    result += line;
-  }
-
-  return result;
-}
-
-function generateNextLine(state, level) {
-  return '\n' + common.repeat(' ', state.indent * level);
-}
-
-function testImplicitResolving(state, str) {
-  var index, length, type;
-
-  for (index = 0, length = state.implicitTypes.length; index < length; index += 1) {
-    type = state.implicitTypes[index];
-
-    if (type.resolve(str)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// [33] s-white ::= s-space | s-tab
-function isWhitespace(c) {
-  return c === CHAR_SPACE || c === CHAR_TAB;
-}
-
-// Returns true if the character can be printed without escaping.
-// From YAML 1.2: "any allowed characters known to be non-printable
-// should also be escaped. [However,] This isn’t mandatory"
-// Derived from nb-char - \t - #x85 - #xA0 - #x2028 - #x2029.
-function isPrintable(c) {
-  return  (0x00020 <= c && c <= 0x00007E)
-      || ((0x000A1 <= c && c <= 0x00D7FF) && c !== 0x2028 && c !== 0x2029)
-      || ((0x0E000 <= c && c <= 0x00FFFD) && c !== 0xFEFF /* BOM */)
-      ||  (0x10000 <= c && c <= 0x10FFFF);
-}
-
-// Simplified test for values allowed after the first character in plain style.
-function isPlainSafe(c) {
-  // Uses a subset of nb-char - c-flow-indicator - ":" - "#"
-  // where nb-char ::= c-printable - b-char - c-byte-order-mark.
-  return isPrintable(c) && c !== 0xFEFF
-    // - c-flow-indicator
-    && c !== CHAR_COMMA
-    && c !== CHAR_LEFT_SQUARE_BRACKET
-    && c !== CHAR_RIGHT_SQUARE_BRACKET
-    && c !== CHAR_LEFT_CURLY_BRACKET
-    && c !== CHAR_RIGHT_CURLY_BRACKET
-    // - ":" - "#"
-    && c !== CHAR_COLON
-    && c !== CHAR_SHARP;
-}
-
-// Simplified test for values allowed as the first character in plain style.
-function isPlainSafeFirst(c) {
-  // Uses a subset of ns-char - c-indicator
-  // where ns-char = nb-char - s-white.
-  return isPrintable(c) && c !== 0xFEFF
-    && !isWhitespace(c) // - s-white
-    // - (c-indicator ::=
-    // “-” | “?” | “:” | “,” | “[” | “]” | “{” | “}”
-    && c !== CHAR_MINUS
-    && c !== CHAR_QUESTION
-    && c !== CHAR_COLON
-    && c !== CHAR_COMMA
-    && c !== CHAR_LEFT_SQUARE_BRACKET
-    && c !== CHAR_RIGHT_SQUARE_BRACKET
-    && c !== CHAR_LEFT_CURLY_BRACKET
-    && c !== CHAR_RIGHT_CURLY_BRACKET
-    // | “#” | “&” | “*” | “!” | “|” | “>” | “'” | “"”
-    && c !== CHAR_SHARP
-    && c !== CHAR_AMPERSAND
-    && c !== CHAR_ASTERISK
-    && c !== CHAR_EXCLAMATION
-    && c !== CHAR_VERTICAL_LINE
-    && c !== CHAR_GREATER_THAN
-    && c !== CHAR_SINGLE_QUOTE
-    && c !== CHAR_DOUBLE_QUOTE
-    // | “%” | “@” | “`”)
-    && c !== CHAR_PERCENT
-    && c !== CHAR_COMMERCIAL_AT
-    && c !== CHAR_GRAVE_ACCENT;
-}
-
-// Determines whether block indentation indicator is required.
-function needIndentIndicator(string) {
-  var leadingSpaceRe = /^\n* /;
-  return leadingSpaceRe.test(string);
-}
-
-var STYLE_PLAIN   = 1,
-    STYLE_SINGLE  = 2,
-    STYLE_LITERAL = 3,
-    STYLE_FOLDED  = 4,
-    STYLE_DOUBLE  = 5;
-
-// Determines which scalar styles are possible and returns the preferred style.
-// lineWidth = -1 => no limit.
-// Pre-conditions: str.length > 0.
-// Post-conditions:
-//    STYLE_PLAIN or STYLE_SINGLE => no \n are in the string.
-//    STYLE_LITERAL => no lines are suitable for folding (or lineWidth is -1).
-//    STYLE_FOLDED => a line > lineWidth and can be folded (and lineWidth != -1).
-function chooseScalarStyle(string, singleLineOnly, indentPerLevel, lineWidth, testAmbiguousType) {
-  var i;
-  var char;
-  var hasLineBreak = false;
-  var hasFoldableLine = false; // only checked if shouldTrackWidth
-  var shouldTrackWidth = lineWidth !== -1;
-  var previousLineBreak = -1; // count the first line correctly
-  var plain = isPlainSafeFirst(string.charCodeAt(0))
-          && !isWhitespace(string.charCodeAt(string.length - 1));
-
-  if (singleLineOnly) {
-    // Case: no block styles.
-    // Check for disallowed characters to rule out plain and single.
-    for (i = 0; i < string.length; i++) {
-      char = string.charCodeAt(i);
-      if (!isPrintable(char)) {
-        return STYLE_DOUBLE;
-      }
-      plain = plain && isPlainSafe(char);
-    }
-  } else {
-    // Case: block styles permitted.
-    for (i = 0; i < string.length; i++) {
-      char = string.charCodeAt(i);
-      if (char === CHAR_LINE_FEED) {
-        hasLineBreak = true;
-        // Check if any line can be folded.
-        if (shouldTrackWidth) {
-          hasFoldableLine = hasFoldableLine ||
-            // Foldable line = too long, and not more-indented.
-            (i - previousLineBreak - 1 > lineWidth &&
-             string[previousLineBreak + 1] !== ' ');
-          previousLineBreak = i;
-        }
-      } else if (!isPrintable(char)) {
-        return STYLE_DOUBLE;
-      }
-      plain = plain && isPlainSafe(char);
-    }
-    // in case the end is missing a \n
-    hasFoldableLine = hasFoldableLine || (shouldTrackWidth &&
-      (i - previousLineBreak - 1 > lineWidth &&
-       string[previousLineBreak + 1] !== ' '));
-  }
-  // Although every style can represent \n without escaping, prefer block styles
-  // for multiline, since they're more readable and they don't add empty lines.
-  // Also prefer folding a super-long line.
-  if (!hasLineBreak && !hasFoldableLine) {
-    // Strings interpretable as another type have to be quoted;
-    // e.g. the string 'true' vs. the boolean true.
-    return plain && !testAmbiguousType(string)
-      ? STYLE_PLAIN : STYLE_SINGLE;
-  }
-  // Edge case: block indentation indicator can only have one digit.
-  if (indentPerLevel > 9 && needIndentIndicator(string)) {
-    return STYLE_DOUBLE;
-  }
-  // At this point we know block styles are valid.
-  // Prefer literal style unless we want to fold.
-  return hasFoldableLine ? STYLE_FOLDED : STYLE_LITERAL;
-}
-
-// Note: line breaking/folding is implemented for only the folded style.
-// NB. We drop the last trailing newline (if any) of a returned block scalar
-//  since the dumper adds its own newline. This always works:
-//    • No ending newline => unaffected; already using strip "-" chomping.
-//    • Ending newline    => removed then restored.
-//  Importantly, this keeps the "+" chomp indicator from gaining an extra line.
-function writeScalar(state, string, level, iskey) {
-  state.dump = (function () {
-    if (string.length === 0) {
-      return "''";
-    }
-    if (!state.noCompatMode &&
-        DEPRECATED_BOOLEANS_SYNTAX.indexOf(string) !== -1) {
-      return "'" + string + "'";
-    }
-
-    var indent = state.indent * Math.max(1, level); // no 0-indent scalars
-    // As indentation gets deeper, let the width decrease monotonically
-    // to the lower bound min(state.lineWidth, 40).
-    // Note that this implies
-    //  state.lineWidth ≤ 40 + state.indent: width is fixed at the lower bound.
-    //  state.lineWidth > 40 + state.indent: width decreases until the lower bound.
-    // This behaves better than a constant minimum width which disallows narrower options,
-    // or an indent threshold which causes the width to suddenly increase.
-    var lineWidth = state.lineWidth === -1
-      ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent);
-
-    // Without knowing if keys are implicit/explicit, assume implicit for safety.
-    var singleLineOnly = iskey
-      // No block styles in flow mode.
-      || (state.flowLevel > -1 && level >= state.flowLevel);
-    function testAmbiguity(string) {
-      return testImplicitResolving(state, string);
-    }
-
-    switch (chooseScalarStyle(string, singleLineOnly, state.indent, lineWidth, testAmbiguity)) {
-      case STYLE_PLAIN:
-        return string;
-      case STYLE_SINGLE:
-        return "'" + string.replace(/'/g, "''") + "'";
-      case STYLE_LITERAL:
-        return '|' + blockHeader(string, state.indent)
-          + dropEndingNewline(indentString(string, indent));
-      case STYLE_FOLDED:
-        return '>' + blockHeader(string, state.indent)
-          + dropEndingNewline(indentString(foldString(string, lineWidth), indent));
-      case STYLE_DOUBLE:
-        return '"' + escapeString(string, lineWidth) + '"';
-      default:
-        throw new YAMLException('impossible error: invalid scalar style');
-    }
-  }());
-}
-
-// Pre-conditions: string is valid for a block scalar, 1 <= indentPerLevel <= 9.
-function blockHeader(string, indentPerLevel) {
-  var indentIndicator = needIndentIndicator(string) ? String(indentPerLevel) : '';
-
-  // note the special case: the string '\n' counts as a "trailing" empty line.
-  var clip =          string[string.length - 1] === '\n';
-  var keep = clip && (string[string.length - 2] === '\n' || string === '\n');
-  var chomp = keep ? '+' : (clip ? '' : '-');
-
-  return indentIndicator + chomp + '\n';
-}
-
-// (See the note for writeScalar.)
-function dropEndingNewline(string) {
-  return string[string.length - 1] === '\n' ? string.slice(0, -1) : string;
-}
-
-// Note: a long line without a suitable break point will exceed the width limit.
-// Pre-conditions: every char in str isPrintable, str.length > 0, width > 0.
-function foldString(string, width) {
-  // In folded style, $k$ consecutive newlines output as $k+1$ newlines—
-  // unless they're before or after a more-indented line, or at the very
-  // beginning or end, in which case $k$ maps to $k$.
-  // Therefore, parse each chunk as newline(s) followed by a content line.
-  var lineRe = /(\n+)([^\n]*)/g;
-
-  // first line (possibly an empty line)
-  var result = (function () {
-    var nextLF = string.indexOf('\n');
-    nextLF = nextLF !== -1 ? nextLF : string.length;
-    lineRe.lastIndex = nextLF;
-    return foldLine(string.slice(0, nextLF), width);
-  }());
-  // If we haven't reached the first content line yet, don't add an extra \n.
-  var prevMoreIndented = string[0] === '\n' || string[0] === ' ';
-  var moreIndented;
-
-  // rest of the lines
-  var match;
-  while ((match = lineRe.exec(string))) {
-    var prefix = match[1], line = match[2];
-    moreIndented = (line[0] === ' ');
-    result += prefix
-      + (!prevMoreIndented && !moreIndented && line !== ''
-        ? '\n' : '')
-      + foldLine(line, width);
-    prevMoreIndented = moreIndented;
-  }
-
-  return result;
-}
-
-// Greedy line breaking.
-// Picks the longest line under the limit each time,
-// otherwise settles for the shortest line over the limit.
-// NB. More-indented lines *cannot* be folded, as that would add an extra \n.
-function foldLine(line, width) {
-  if (line === '' || line[0] === ' ') return line;
-
-  // Since a more-indented line adds a \n, breaks can't be followed by a space.
-  var breakRe = / [^ ]/g; // note: the match index will always be <= length-2.
-  var match;
-  // start is an inclusive index. end, curr, and next are exclusive.
-  var start = 0, end, curr = 0, next = 0;
-  var result = '';
-
-  // Invariants: 0 <= start <= length-1.
-  //   0 <= curr <= next <= max(0, length-2). curr - start <= width.
-  // Inside the loop:
-  //   A match implies length >= 2, so curr and next are <= length-2.
-  while ((match = breakRe.exec(line))) {
-    next = match.index;
-    // maintain invariant: curr - start <= width
-    if (next - start > width) {
-      end = (curr > start) ? curr : next; // derive end <= length-2
-      result += '\n' + line.slice(start, end);
-      // skip the space that was output as \n
-      start = end + 1;                    // derive start <= length-1
-    }
-    curr = next;
-  }
-
-  // By the invariants, start <= length-1, so there is something left over.
-  // It is either the whole string or a part starting from non-whitespace.
-  result += '\n';
-  // Insert a break if the remainder is too long and there is a break available.
-  if (line.length - start > width && curr > start) {
-    result += line.slice(start, curr) + '\n' + line.slice(curr + 1);
-  } else {
-    result += line.slice(start);
-  }
-
-  return result.slice(1); // drop extra \n joiner
-}
-
-// Escapes a double-quoted string.
-function escapeString(string) {
-  var result = '';
-  var char, nextChar;
-  var escapeSeq;
-
-  for (var i = 0; i < string.length; i++) {
-    char = string.charCodeAt(i);
-    // Check for surrogate pairs (reference Unicode 3.0 section "3.7 Surrogates").
-    if (char >= 0xD800 && char <= 0xDBFF/* high surrogate */) {
-      nextChar = string.charCodeAt(i + 1);
-      if (nextChar >= 0xDC00 && nextChar <= 0xDFFF/* low surrogate */) {
-        // Combine the surrogate pair and store it escaped.
-        result += encodeHex((char - 0xD800) * 0x400 + nextChar - 0xDC00 + 0x10000);
-        // Advance index one extra since we already used that char here.
-        i++; continue;
-      }
-    }
-    escapeSeq = ESCAPE_SEQUENCES[char];
-    result += !escapeSeq && isPrintable(char)
-      ? string[i]
-      : escapeSeq || encodeHex(char);
-  }
-
-  return result;
-}
-
-function writeFlowSequence(state, level, object) {
-  var _result = '',
-      _tag    = state.tag,
-      index,
-      length;
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    // Write only valid elements.
-    if (writeNode(state, level, object[index], false, false)) {
-      if (index !== 0) _result += ',' + (!state.condenseFlow ? ' ' : '');
-      _result += state.dump;
-    }
-  }
-
-  state.tag = _tag;
-  state.dump = '[' + _result + ']';
-}
-
-function writeBlockSequence(state, level, object, compact) {
-  var _result = '',
-      _tag    = state.tag,
-      index,
-      length;
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    // Write only valid elements.
-    if (writeNode(state, level + 1, object[index], true, true)) {
-      if (!compact || index !== 0) {
-        _result += generateNextLine(state, level);
-      }
-
-      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
-        _result += '-';
-      } else {
-        _result += '- ';
-      }
-
-      _result += state.dump;
-    }
-  }
-
-  state.tag = _tag;
-  state.dump = _result || '[]'; // Empty sequence if no valid values.
-}
-
-function writeFlowMapping(state, level, object) {
-  var _result       = '',
-      _tag          = state.tag,
-      objectKeyList = Object.keys(object),
-      index,
-      length,
-      objectKey,
-      objectValue,
-      pairBuffer;
-
-  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-    pairBuffer = state.condenseFlow ? '"' : '';
-
-    if (index !== 0) pairBuffer += ', ';
-
-    objectKey = objectKeyList[index];
-    objectValue = object[objectKey];
-
-    if (!writeNode(state, level, objectKey, false, false)) {
-      continue; // Skip this pair because of invalid key;
-    }
-
-    if (state.dump.length > 1024) pairBuffer += '? ';
-
-    pairBuffer += state.dump + (state.condenseFlow ? '"' : '') + ':' + (state.condenseFlow ? '' : ' ');
-
-    if (!writeNode(state, level, objectValue, false, false)) {
-      continue; // Skip this pair because of invalid value.
-    }
-
-    pairBuffer += state.dump;
-
-    // Both key and value are valid.
-    _result += pairBuffer;
-  }
-
-  state.tag = _tag;
-  state.dump = '{' + _result + '}';
-}
-
-function writeBlockMapping(state, level, object, compact) {
-  var _result       = '',
-      _tag          = state.tag,
-      objectKeyList = Object.keys(object),
-      index,
-      length,
-      objectKey,
-      objectValue,
-      explicitPair,
-      pairBuffer;
-
-  // Allow sorting keys so that the output file is deterministic
-  if (state.sortKeys === true) {
-    // Default sorting
-    objectKeyList.sort();
-  } else if (typeof state.sortKeys === 'function') {
-    // Custom sort function
-    objectKeyList.sort(state.sortKeys);
-  } else if (state.sortKeys) {
-    // Something is wrong
-    throw new YAMLException('sortKeys must be a boolean or a function');
-  }
-
-  for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-    pairBuffer = '';
-
-    if (!compact || index !== 0) {
-      pairBuffer += generateNextLine(state, level);
-    }
-
-    objectKey = objectKeyList[index];
-    objectValue = object[objectKey];
-
-    if (!writeNode(state, level + 1, objectKey, true, true, true)) {
-      continue; // Skip this pair because of invalid key.
-    }
-
-    explicitPair = (state.tag !== null && state.tag !== '?') ||
-                   (state.dump && state.dump.length > 1024);
-
-    if (explicitPair) {
-      if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
-        pairBuffer += '?';
-      } else {
-        pairBuffer += '? ';
-      }
-    }
-
-    pairBuffer += state.dump;
-
-    if (explicitPair) {
-      pairBuffer += generateNextLine(state, level);
-    }
-
-    if (!writeNode(state, level + 1, objectValue, true, explicitPair)) {
-      continue; // Skip this pair because of invalid value.
-    }
-
-    if (state.dump && CHAR_LINE_FEED === state.dump.charCodeAt(0)) {
-      pairBuffer += ':';
-    } else {
-      pairBuffer += ': ';
-    }
-
-    pairBuffer += state.dump;
-
-    // Both key and value are valid.
-    _result += pairBuffer;
-  }
-
-  state.tag = _tag;
-  state.dump = _result || '{}'; // Empty mapping if no valid pairs.
-}
-
-function detectType(state, object, explicit) {
-  var _result, typeList, index, length, type, style;
-
-  typeList = explicit ? state.explicitTypes : state.implicitTypes;
-
-  for (index = 0, length = typeList.length; index < length; index += 1) {
-    type = typeList[index];
-
-    if ((type.instanceOf  || type.predicate) &&
-        (!type.instanceOf || ((typeof object === 'object') && (object instanceof type.instanceOf))) &&
-        (!type.predicate  || type.predicate(object))) {
-
-      state.tag = explicit ? type.tag : '?';
-
-      if (type.represent) {
-        style = state.styleMap[type.tag] || type.defaultStyle;
-
-        if (_toString.call(type.represent) === '[object Function]') {
-          _result = type.represent(object, style);
-        } else if (_hasOwnProperty.call(type.represent, style)) {
-          _result = type.represent[style](object, style);
-        } else {
-          throw new YAMLException('!<' + type.tag + '> tag resolver accepts not "' + style + '" style');
-        }
-
-        state.dump = _result;
-      }
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// Serializes `object` and writes it to global `result`.
-// Returns true on success, or false on invalid object.
-//
-function writeNode(state, level, object, block, compact, iskey) {
-  state.tag = null;
-  state.dump = object;
-
-  if (!detectType(state, object, false)) {
-    detectType(state, object, true);
-  }
-
-  var type = _toString.call(state.dump);
-
-  if (block) {
-    block = (state.flowLevel < 0 || state.flowLevel > level);
-  }
-
-  var objectOrArray = type === '[object Object]' || type === '[object Array]',
-      duplicateIndex,
-      duplicate;
-
-  if (objectOrArray) {
-    duplicateIndex = state.duplicates.indexOf(object);
-    duplicate = duplicateIndex !== -1;
-  }
-
-  if ((state.tag !== null && state.tag !== '?') || duplicate || (state.indent !== 2 && level > 0)) {
-    compact = false;
-  }
-
-  if (duplicate && state.usedDuplicates[duplicateIndex]) {
-    state.dump = '*ref_' + duplicateIndex;
-  } else {
-    if (objectOrArray && duplicate && !state.usedDuplicates[duplicateIndex]) {
-      state.usedDuplicates[duplicateIndex] = true;
-    }
-    if (type === '[object Object]') {
-      if (block && (Object.keys(state.dump).length !== 0)) {
-        writeBlockMapping(state, level, state.dump, compact);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + state.dump;
-        }
-      } else {
-        writeFlowMapping(state, level, state.dump);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
-        }
-      }
-    } else if (type === '[object Array]') {
-      var arrayLevel = (state.noArrayIndent && (level > 0)) ? level - 1 : level;
-      if (block && (state.dump.length !== 0)) {
-        writeBlockSequence(state, arrayLevel, state.dump, compact);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + state.dump;
-        }
-      } else {
-        writeFlowSequence(state, arrayLevel, state.dump);
-        if (duplicate) {
-          state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;
-        }
-      }
-    } else if (type === '[object String]') {
-      if (state.tag !== '?') {
-        writeScalar(state, state.dump, level, iskey);
-      }
-    } else {
-      if (state.skipInvalid) return false;
-      throw new YAMLException('unacceptable kind of an object to dump ' + type);
-    }
-
-    if (state.tag !== null && state.tag !== '?') {
-      state.dump = '!<' + state.tag + '> ' + state.dump;
-    }
-  }
-
-  return true;
-}
-
-function getDuplicateReferences(object, state) {
-  var objects = [],
-      duplicatesIndexes = [],
-      index,
-      length;
-
-  inspectNode(object, objects, duplicatesIndexes);
-
-  for (index = 0, length = duplicatesIndexes.length; index < length; index += 1) {
-    state.duplicates.push(objects[duplicatesIndexes[index]]);
-  }
-  state.usedDuplicates = new Array(length);
-}
-
-function inspectNode(object, objects, duplicatesIndexes) {
-  var objectKeyList,
-      index,
-      length;
-
-  if (object !== null && typeof object === 'object') {
-    index = objects.indexOf(object);
-    if (index !== -1) {
-      if (duplicatesIndexes.indexOf(index) === -1) {
-        duplicatesIndexes.push(index);
-      }
-    } else {
-      objects.push(object);
-
-      if (Array.isArray(object)) {
-        for (index = 0, length = object.length; index < length; index += 1) {
-          inspectNode(object[index], objects, duplicatesIndexes);
-        }
-      } else {
-        objectKeyList = Object.keys(object);
-
-        for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-          inspectNode(object[objectKeyList[index]], objects, duplicatesIndexes);
-        }
-      }
-    }
-  }
-}
-
-function dump(input, options) {
-  options = options || {};
-
-  var state = new State(options);
-
-  if (!state.noRefs) getDuplicateReferences(input, state);
-
-  if (writeNode(state, 0, input, true, true)) return state.dump + '\n';
-
-  return '';
-}
-
-function safeDump(input, options) {
-  return dump(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-}
-
-module.exports.dump     = dump;
-module.exports.safeDump = safeDump;
-
-
-/***/ }),
-/* 282 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/*eslint-disable max-len,no-use-before-define*/
-
-var common              = __webpack_require__(43);
-var YAMLException       = __webpack_require__(54);
-var Mark                = __webpack_require__(283);
-var DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
-var DEFAULT_FULL_SCHEMA = __webpack_require__(72);
-
-
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-
-
-var CONTEXT_FLOW_IN   = 1;
-var CONTEXT_FLOW_OUT  = 2;
-var CONTEXT_BLOCK_IN  = 3;
-var CONTEXT_BLOCK_OUT = 4;
-
-
-var CHOMPING_CLIP  = 1;
-var CHOMPING_STRIP = 2;
-var CHOMPING_KEEP  = 3;
-
-
-var PATTERN_NON_PRINTABLE         = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/;
-var PATTERN_NON_ASCII_LINE_BREAKS = /[\x85\u2028\u2029]/;
-var PATTERN_FLOW_INDICATORS       = /[,\[\]\{\}]/;
-var PATTERN_TAG_HANDLE            = /^(?:!|!!|![a-z\-]+!)$/i;
-var PATTERN_TAG_URI               = /^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;
-
-
-function _class(obj) { return Object.prototype.toString.call(obj); }
-
-function is_EOL(c) {
-  return (c === 0x0A/* LF */) || (c === 0x0D/* CR */);
-}
-
-function is_WHITE_SPACE(c) {
-  return (c === 0x09/* Tab */) || (c === 0x20/* Space */);
-}
-
-function is_WS_OR_EOL(c) {
-  return (c === 0x09/* Tab */) ||
-         (c === 0x20/* Space */) ||
-         (c === 0x0A/* LF */) ||
-         (c === 0x0D/* CR */);
-}
-
-function is_FLOW_INDICATOR(c) {
-  return c === 0x2C/* , */ ||
-         c === 0x5B/* [ */ ||
-         c === 0x5D/* ] */ ||
-         c === 0x7B/* { */ ||
-         c === 0x7D/* } */;
-}
-
-function fromHexCode(c) {
-  var lc;
-
-  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {
-    return c - 0x30;
-  }
-
-  /*eslint-disable no-bitwise*/
-  lc = c | 0x20;
-
-  if ((0x61/* a */ <= lc) && (lc <= 0x66/* f */)) {
-    return lc - 0x61 + 10;
-  }
-
-  return -1;
-}
-
-function escapedHexLen(c) {
-  if (c === 0x78/* x */) { return 2; }
-  if (c === 0x75/* u */) { return 4; }
-  if (c === 0x55/* U */) { return 8; }
-  return 0;
-}
-
-function fromDecimalCode(c) {
-  if ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) {
-    return c - 0x30;
-  }
-
-  return -1;
-}
-
-function simpleEscapeSequence(c) {
-  /* eslint-disable indent */
-  return (c === 0x30/* 0 */) ? '\x00' :
-        (c === 0x61/* a */) ? '\x07' :
-        (c === 0x62/* b */) ? '\x08' :
-        (c === 0x74/* t */) ? '\x09' :
-        (c === 0x09/* Tab */) ? '\x09' :
-        (c === 0x6E/* n */) ? '\x0A' :
-        (c === 0x76/* v */) ? '\x0B' :
-        (c === 0x66/* f */) ? '\x0C' :
-        (c === 0x72/* r */) ? '\x0D' :
-        (c === 0x65/* e */) ? '\x1B' :
-        (c === 0x20/* Space */) ? ' ' :
-        (c === 0x22/* " */) ? '\x22' :
-        (c === 0x2F/* / */) ? '/' :
-        (c === 0x5C/* \ */) ? '\x5C' :
-        (c === 0x4E/* N */) ? '\x85' :
-        (c === 0x5F/* _ */) ? '\xA0' :
-        (c === 0x4C/* L */) ? '\u2028' :
-        (c === 0x50/* P */) ? '\u2029' : '';
-}
-
-function charFromCodepoint(c) {
-  if (c <= 0xFFFF) {
-    return String.fromCharCode(c);
-  }
-  // Encode UTF-16 surrogate pair
-  // https://en.wikipedia.org/wiki/UTF-16#Code_points_U.2B010000_to_U.2B10FFFF
-  return String.fromCharCode(
-    ((c - 0x010000) >> 10) + 0xD800,
-    ((c - 0x010000) & 0x03FF) + 0xDC00
-  );
-}
-
-var simpleEscapeCheck = new Array(256); // integer, for fast access
-var simpleEscapeMap = new Array(256);
-for (var i = 0; i < 256; i++) {
-  simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;
-  simpleEscapeMap[i] = simpleEscapeSequence(i);
-}
-
-
-function State(input, options) {
-  this.input = input;
-
-  this.filename  = options['filename']  || null;
-  this.schema    = options['schema']    || DEFAULT_FULL_SCHEMA;
-  this.onWarning = options['onWarning'] || null;
-  this.legacy    = options['legacy']    || false;
-  this.json      = options['json']      || false;
-  this.listener  = options['listener']  || null;
-
-  this.implicitTypes = this.schema.compiledImplicit;
-  this.typeMap       = this.schema.compiledTypeMap;
-
-  this.length     = input.length;
-  this.position   = 0;
-  this.line       = 0;
-  this.lineStart  = 0;
-  this.lineIndent = 0;
-
-  this.documents = [];
-
-  /*
-  this.version;
-  this.checkLineBreaks;
-  this.tagMap;
-  this.anchorMap;
-  this.tag;
-  this.anchor;
-  this.kind;
-  this.result;*/
-
-}
-
-
-function generateError(state, message) {
-  return new YAMLException(
-    message,
-    new Mark(state.filename, state.input, state.position, state.line, (state.position - state.lineStart)));
-}
-
-function throwError(state, message) {
-  throw generateError(state, message);
-}
-
-function throwWarning(state, message) {
-  if (state.onWarning) {
-    state.onWarning.call(null, generateError(state, message));
-  }
-}
-
-
-var directiveHandlers = {
-
-  YAML: function handleYamlDirective(state, name, args) {
-
-    var match, major, minor;
-
-    if (state.version !== null) {
-      throwError(state, 'duplication of %YAML directive');
-    }
-
-    if (args.length !== 1) {
-      throwError(state, 'YAML directive accepts exactly one argument');
-    }
-
-    match = /^([0-9]+)\.([0-9]+)$/.exec(args[0]);
-
-    if (match === null) {
-      throwError(state, 'ill-formed argument of the YAML directive');
-    }
-
-    major = parseInt(match[1], 10);
-    minor = parseInt(match[2], 10);
-
-    if (major !== 1) {
-      throwError(state, 'unacceptable YAML version of the document');
-    }
-
-    state.version = args[0];
-    state.checkLineBreaks = (minor < 2);
-
-    if (minor !== 1 && minor !== 2) {
-      throwWarning(state, 'unsupported YAML version of the document');
-    }
-  },
-
-  TAG: function handleTagDirective(state, name, args) {
-
-    var handle, prefix;
-
-    if (args.length !== 2) {
-      throwError(state, 'TAG directive accepts exactly two arguments');
-    }
-
-    handle = args[0];
-    prefix = args[1];
-
-    if (!PATTERN_TAG_HANDLE.test(handle)) {
-      throwError(state, 'ill-formed tag handle (first argument) of the TAG directive');
-    }
-
-    if (_hasOwnProperty.call(state.tagMap, handle)) {
-      throwError(state, 'there is a previously declared suffix for "' + handle + '" tag handle');
-    }
-
-    if (!PATTERN_TAG_URI.test(prefix)) {
-      throwError(state, 'ill-formed tag prefix (second argument) of the TAG directive');
-    }
-
-    state.tagMap[handle] = prefix;
-  }
-};
-
-
-function captureSegment(state, start, end, checkJson) {
-  var _position, _length, _character, _result;
-
-  if (start < end) {
-    _result = state.input.slice(start, end);
-
-    if (checkJson) {
-      for (_position = 0, _length = _result.length; _position < _length; _position += 1) {
-        _character = _result.charCodeAt(_position);
-        if (!(_character === 0x09 ||
-              (0x20 <= _character && _character <= 0x10FFFF))) {
-          throwError(state, 'expected valid JSON character');
-        }
-      }
-    } else if (PATTERN_NON_PRINTABLE.test(_result)) {
-      throwError(state, 'the stream contains non-printable characters');
-    }
-
-    state.result += _result;
-  }
-}
-
-function mergeMappings(state, destination, source, overridableKeys) {
-  var sourceKeys, key, index, quantity;
-
-  if (!common.isObject(source)) {
-    throwError(state, 'cannot merge mappings; the provided source object is unacceptable');
-  }
-
-  sourceKeys = Object.keys(source);
-
-  for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {
-    key = sourceKeys[index];
-
-    if (!_hasOwnProperty.call(destination, key)) {
-      destination[key] = source[key];
-      overridableKeys[key] = true;
-    }
-  }
-}
-
-function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, startLine, startPos) {
-  var index, quantity;
-
-  // The output is a plain object here, so keys can only be strings.
-  // We need to convert keyNode to a string, but doing so can hang the process
-  // (deeply nested arrays that explode exponentially using aliases).
-  if (Array.isArray(keyNode)) {
-    keyNode = Array.prototype.slice.call(keyNode);
-
-    for (index = 0, quantity = keyNode.length; index < quantity; index += 1) {
-      if (Array.isArray(keyNode[index])) {
-        throwError(state, 'nested arrays are not supported inside keys');
-      }
-
-      if (typeof keyNode === 'object' && _class(keyNode[index]) === '[object Object]') {
-        keyNode[index] = '[object Object]';
-      }
-    }
-  }
-
-  // Avoid code execution in load() via toString property
-  // (still use its own toString for arrays, timestamps,
-  // and whatever user schema extensions happen to have @@toStringTag)
-  if (typeof keyNode === 'object' && _class(keyNode) === '[object Object]') {
-    keyNode = '[object Object]';
-  }
-
-
-  keyNode = String(keyNode);
-
-  if (_result === null) {
-    _result = {};
-  }
-
-  if (keyTag === 'tag:yaml.org,2002:merge') {
-    if (Array.isArray(valueNode)) {
-      for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {
-        mergeMappings(state, _result, valueNode[index], overridableKeys);
-      }
-    } else {
-      mergeMappings(state, _result, valueNode, overridableKeys);
-    }
-  } else {
-    if (!state.json &&
-        !_hasOwnProperty.call(overridableKeys, keyNode) &&
-        _hasOwnProperty.call(_result, keyNode)) {
-      state.line = startLine || state.line;
-      state.position = startPos || state.position;
-      throwError(state, 'duplicated mapping key');
-    }
-    _result[keyNode] = valueNode;
-    delete overridableKeys[keyNode];
-  }
-
-  return _result;
-}
-
-function readLineBreak(state) {
-  var ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch === 0x0A/* LF */) {
-    state.position++;
-  } else if (ch === 0x0D/* CR */) {
-    state.position++;
-    if (state.input.charCodeAt(state.position) === 0x0A/* LF */) {
-      state.position++;
-    }
-  } else {
-    throwError(state, 'a line break is expected');
-  }
-
-  state.line += 1;
-  state.lineStart = state.position;
-}
-
-function skipSeparationSpace(state, allowComments, checkIndent) {
-  var lineBreaks = 0,
-      ch = state.input.charCodeAt(state.position);
-
-  while (ch !== 0) {
-    while (is_WHITE_SPACE(ch)) {
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    if (allowComments && ch === 0x23/* # */) {
-      do {
-        ch = state.input.charCodeAt(++state.position);
-      } while (ch !== 0x0A/* LF */ && ch !== 0x0D/* CR */ && ch !== 0);
-    }
-
-    if (is_EOL(ch)) {
-      readLineBreak(state);
-
-      ch = state.input.charCodeAt(state.position);
-      lineBreaks++;
-      state.lineIndent = 0;
-
-      while (ch === 0x20/* Space */) {
-        state.lineIndent++;
-        ch = state.input.charCodeAt(++state.position);
-      }
-    } else {
-      break;
-    }
-  }
-
-  if (checkIndent !== -1 && lineBreaks !== 0 && state.lineIndent < checkIndent) {
-    throwWarning(state, 'deficient indentation');
-  }
-
-  return lineBreaks;
-}
-
-function testDocumentSeparator(state) {
-  var _position = state.position,
-      ch;
-
-  ch = state.input.charCodeAt(_position);
-
-  // Condition state.position === state.lineStart is tested
-  // in parent on each call, for efficiency. No needs to test here again.
-  if ((ch === 0x2D/* - */ || ch === 0x2E/* . */) &&
-      ch === state.input.charCodeAt(_position + 1) &&
-      ch === state.input.charCodeAt(_position + 2)) {
-
-    _position += 3;
-
-    ch = state.input.charCodeAt(_position);
-
-    if (ch === 0 || is_WS_OR_EOL(ch)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-function writeFoldedLines(state, count) {
-  if (count === 1) {
-    state.result += ' ';
-  } else if (count > 1) {
-    state.result += common.repeat('\n', count - 1);
-  }
-}
-
-
-function readPlainScalar(state, nodeIndent, withinFlowCollection) {
-  var preceding,
-      following,
-      captureStart,
-      captureEnd,
-      hasPendingContent,
-      _line,
-      _lineStart,
-      _lineIndent,
-      _kind = state.kind,
-      _result = state.result,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (is_WS_OR_EOL(ch)      ||
-      is_FLOW_INDICATOR(ch) ||
-      ch === 0x23/* # */    ||
-      ch === 0x26/* & */    ||
-      ch === 0x2A/* * */    ||
-      ch === 0x21/* ! */    ||
-      ch === 0x7C/* | */    ||
-      ch === 0x3E/* > */    ||
-      ch === 0x27/* ' */    ||
-      ch === 0x22/* " */    ||
-      ch === 0x25/* % */    ||
-      ch === 0x40/* @ */    ||
-      ch === 0x60/* ` */) {
-    return false;
-  }
-
-  if (ch === 0x3F/* ? */ || ch === 0x2D/* - */) {
-    following = state.input.charCodeAt(state.position + 1);
-
-    if (is_WS_OR_EOL(following) ||
-        withinFlowCollection && is_FLOW_INDICATOR(following)) {
-      return false;
-    }
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-  captureStart = captureEnd = state.position;
-  hasPendingContent = false;
-
-  while (ch !== 0) {
-    if (ch === 0x3A/* : */) {
-      following = state.input.charCodeAt(state.position + 1);
-
-      if (is_WS_OR_EOL(following) ||
-          withinFlowCollection && is_FLOW_INDICATOR(following)) {
-        break;
-      }
-
-    } else if (ch === 0x23/* # */) {
-      preceding = state.input.charCodeAt(state.position - 1);
-
-      if (is_WS_OR_EOL(preceding)) {
-        break;
-      }
-
-    } else if ((state.position === state.lineStart && testDocumentSeparator(state)) ||
-               withinFlowCollection && is_FLOW_INDICATOR(ch)) {
-      break;
-
-    } else if (is_EOL(ch)) {
-      _line = state.line;
-      _lineStart = state.lineStart;
-      _lineIndent = state.lineIndent;
-      skipSeparationSpace(state, false, -1);
-
-      if (state.lineIndent >= nodeIndent) {
-        hasPendingContent = true;
-        ch = state.input.charCodeAt(state.position);
-        continue;
-      } else {
-        state.position = captureEnd;
-        state.line = _line;
-        state.lineStart = _lineStart;
-        state.lineIndent = _lineIndent;
-        break;
-      }
-    }
-
-    if (hasPendingContent) {
-      captureSegment(state, captureStart, captureEnd, false);
-      writeFoldedLines(state, state.line - _line);
-      captureStart = captureEnd = state.position;
-      hasPendingContent = false;
-    }
-
-    if (!is_WHITE_SPACE(ch)) {
-      captureEnd = state.position + 1;
-    }
-
-    ch = state.input.charCodeAt(++state.position);
-  }
-
-  captureSegment(state, captureStart, captureEnd, false);
-
-  if (state.result) {
-    return true;
-  }
-
-  state.kind = _kind;
-  state.result = _result;
-  return false;
-}
-
-function readSingleQuotedScalar(state, nodeIndent) {
-  var ch,
-      captureStart, captureEnd;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x27/* ' */) {
-    return false;
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-  state.position++;
-  captureStart = captureEnd = state.position;
-
-  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
-    if (ch === 0x27/* ' */) {
-      captureSegment(state, captureStart, state.position, true);
-      ch = state.input.charCodeAt(++state.position);
-
-      if (ch === 0x27/* ' */) {
-        captureStart = state.position;
-        state.position++;
-        captureEnd = state.position;
-      } else {
-        return true;
-      }
-
-    } else if (is_EOL(ch)) {
-      captureSegment(state, captureStart, captureEnd, true);
-      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));
-      captureStart = captureEnd = state.position;
-
-    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {
-      throwError(state, 'unexpected end of the document within a single quoted scalar');
-
-    } else {
-      state.position++;
-      captureEnd = state.position;
-    }
-  }
-
-  throwError(state, 'unexpected end of the stream within a single quoted scalar');
-}
-
-function readDoubleQuotedScalar(state, nodeIndent) {
-  var captureStart,
-      captureEnd,
-      hexLength,
-      hexResult,
-      tmp,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x22/* " */) {
-    return false;
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-  state.position++;
-  captureStart = captureEnd = state.position;
-
-  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
-    if (ch === 0x22/* " */) {
-      captureSegment(state, captureStart, state.position, true);
-      state.position++;
-      return true;
-
-    } else if (ch === 0x5C/* \ */) {
-      captureSegment(state, captureStart, state.position, true);
-      ch = state.input.charCodeAt(++state.position);
-
-      if (is_EOL(ch)) {
-        skipSeparationSpace(state, false, nodeIndent);
-
-        // TODO: rework to inline fn with no type cast?
-      } else if (ch < 256 && simpleEscapeCheck[ch]) {
-        state.result += simpleEscapeMap[ch];
-        state.position++;
-
-      } else if ((tmp = escapedHexLen(ch)) > 0) {
-        hexLength = tmp;
-        hexResult = 0;
-
-        for (; hexLength > 0; hexLength--) {
-          ch = state.input.charCodeAt(++state.position);
-
-          if ((tmp = fromHexCode(ch)) >= 0) {
-            hexResult = (hexResult << 4) + tmp;
-
-          } else {
-            throwError(state, 'expected hexadecimal character');
-          }
-        }
-
-        state.result += charFromCodepoint(hexResult);
-
-        state.position++;
-
-      } else {
-        throwError(state, 'unknown escape sequence');
-      }
-
-      captureStart = captureEnd = state.position;
-
-    } else if (is_EOL(ch)) {
-      captureSegment(state, captureStart, captureEnd, true);
-      writeFoldedLines(state, skipSeparationSpace(state, false, nodeIndent));
-      captureStart = captureEnd = state.position;
-
-    } else if (state.position === state.lineStart && testDocumentSeparator(state)) {
-      throwError(state, 'unexpected end of the document within a double quoted scalar');
-
-    } else {
-      state.position++;
-      captureEnd = state.position;
-    }
-  }
-
-  throwError(state, 'unexpected end of the stream within a double quoted scalar');
-}
-
-function readFlowCollection(state, nodeIndent) {
-  var readNext = true,
-      _line,
-      _tag     = state.tag,
-      _result,
-      _anchor  = state.anchor,
-      following,
-      terminator,
-      isPair,
-      isExplicitPair,
-      isMapping,
-      overridableKeys = {},
-      keyNode,
-      keyTag,
-      valueNode,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch === 0x5B/* [ */) {
-    terminator = 0x5D;/* ] */
-    isMapping = false;
-    _result = [];
-  } else if (ch === 0x7B/* { */) {
-    terminator = 0x7D;/* } */
-    isMapping = true;
-    _result = {};
-  } else {
-    return false;
-  }
-
-  if (state.anchor !== null) {
-    state.anchorMap[state.anchor] = _result;
-  }
-
-  ch = state.input.charCodeAt(++state.position);
-
-  while (ch !== 0) {
-    skipSeparationSpace(state, true, nodeIndent);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if (ch === terminator) {
-      state.position++;
-      state.tag = _tag;
-      state.anchor = _anchor;
-      state.kind = isMapping ? 'mapping' : 'sequence';
-      state.result = _result;
-      return true;
-    } else if (!readNext) {
-      throwError(state, 'missed comma between flow collection entries');
-    }
-
-    keyTag = keyNode = valueNode = null;
-    isPair = isExplicitPair = false;
-
-    if (ch === 0x3F/* ? */) {
-      following = state.input.charCodeAt(state.position + 1);
-
-      if (is_WS_OR_EOL(following)) {
-        isPair = isExplicitPair = true;
-        state.position++;
-        skipSeparationSpace(state, true, nodeIndent);
-      }
-    }
-
-    _line = state.line;
-    composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
-    keyTag = state.tag;
-    keyNode = state.result;
-    skipSeparationSpace(state, true, nodeIndent);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if ((isExplicitPair || state.line === _line) && ch === 0x3A/* : */) {
-      isPair = true;
-      ch = state.input.charCodeAt(++state.position);
-      skipSeparationSpace(state, true, nodeIndent);
-      composeNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
-      valueNode = state.result;
-    }
-
-    if (isMapping) {
-      storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode);
-    } else if (isPair) {
-      _result.push(storeMappingPair(state, null, overridableKeys, keyTag, keyNode, valueNode));
-    } else {
-      _result.push(keyNode);
-    }
-
-    skipSeparationSpace(state, true, nodeIndent);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if (ch === 0x2C/* , */) {
-      readNext = true;
-      ch = state.input.charCodeAt(++state.position);
-    } else {
-      readNext = false;
-    }
-  }
-
-  throwError(state, 'unexpected end of the stream within a flow collection');
-}
-
-function readBlockScalar(state, nodeIndent) {
-  var captureStart,
-      folding,
-      chomping       = CHOMPING_CLIP,
-      didReadContent = false,
-      detectedIndent = false,
-      textIndent     = nodeIndent,
-      emptyLines     = 0,
-      atMoreIndented = false,
-      tmp,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch === 0x7C/* | */) {
-    folding = false;
-  } else if (ch === 0x3E/* > */) {
-    folding = true;
-  } else {
-    return false;
-  }
-
-  state.kind = 'scalar';
-  state.result = '';
-
-  while (ch !== 0) {
-    ch = state.input.charCodeAt(++state.position);
-
-    if (ch === 0x2B/* + */ || ch === 0x2D/* - */) {
-      if (CHOMPING_CLIP === chomping) {
-        chomping = (ch === 0x2B/* + */) ? CHOMPING_KEEP : CHOMPING_STRIP;
-      } else {
-        throwError(state, 'repeat of a chomping mode identifier');
-      }
-
-    } else if ((tmp = fromDecimalCode(ch)) >= 0) {
-      if (tmp === 0) {
-        throwError(state, 'bad explicit indentation width of a block scalar; it cannot be less than one');
-      } else if (!detectedIndent) {
-        textIndent = nodeIndent + tmp - 1;
-        detectedIndent = true;
-      } else {
-        throwError(state, 'repeat of an indentation width identifier');
-      }
-
-    } else {
-      break;
-    }
-  }
-
-  if (is_WHITE_SPACE(ch)) {
-    do { ch = state.input.charCodeAt(++state.position); }
-    while (is_WHITE_SPACE(ch));
-
-    if (ch === 0x23/* # */) {
-      do { ch = state.input.charCodeAt(++state.position); }
-      while (!is_EOL(ch) && (ch !== 0));
-    }
-  }
-
-  while (ch !== 0) {
-    readLineBreak(state);
-    state.lineIndent = 0;
-
-    ch = state.input.charCodeAt(state.position);
-
-    while ((!detectedIndent || state.lineIndent < textIndent) &&
-           (ch === 0x20/* Space */)) {
-      state.lineIndent++;
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    if (!detectedIndent && state.lineIndent > textIndent) {
-      textIndent = state.lineIndent;
-    }
-
-    if (is_EOL(ch)) {
-      emptyLines++;
-      continue;
-    }
-
-    // End of the scalar.
-    if (state.lineIndent < textIndent) {
-
-      // Perform the chomping.
-      if (chomping === CHOMPING_KEEP) {
-        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
-      } else if (chomping === CHOMPING_CLIP) {
-        if (didReadContent) { // i.e. only if the scalar is not empty.
-          state.result += '\n';
-        }
-      }
-
-      // Break this `while` cycle and go to the funciton's epilogue.
-      break;
-    }
-
-    // Folded style: use fancy rules to handle line breaks.
-    if (folding) {
-
-      // Lines starting with white space characters (more-indented lines) are not folded.
-      if (is_WHITE_SPACE(ch)) {
-        atMoreIndented = true;
-        // except for the first content line (cf. Example 8.1)
-        state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
-
-      // End of more-indented block.
-      } else if (atMoreIndented) {
-        atMoreIndented = false;
-        state.result += common.repeat('\n', emptyLines + 1);
-
-      // Just one line break - perceive as the same line.
-      } else if (emptyLines === 0) {
-        if (didReadContent) { // i.e. only if we have already read some scalar content.
-          state.result += ' ';
-        }
-
-      // Several line breaks - perceive as different lines.
-      } else {
-        state.result += common.repeat('\n', emptyLines);
-      }
-
-    // Literal style: just add exact number of line breaks between content lines.
-    } else {
-      // Keep all line breaks except the header line break.
-      state.result += common.repeat('\n', didReadContent ? 1 + emptyLines : emptyLines);
-    }
-
-    didReadContent = true;
-    detectedIndent = true;
-    emptyLines = 0;
-    captureStart = state.position;
-
-    while (!is_EOL(ch) && (ch !== 0)) {
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    captureSegment(state, captureStart, state.position, false);
-  }
-
-  return true;
-}
-
-function readBlockSequence(state, nodeIndent) {
-  var _line,
-      _tag      = state.tag,
-      _anchor   = state.anchor,
-      _result   = [],
-      following,
-      detected  = false,
-      ch;
-
-  if (state.anchor !== null) {
-    state.anchorMap[state.anchor] = _result;
-  }
-
-  ch = state.input.charCodeAt(state.position);
-
-  while (ch !== 0) {
-
-    if (ch !== 0x2D/* - */) {
-      break;
-    }
-
-    following = state.input.charCodeAt(state.position + 1);
-
-    if (!is_WS_OR_EOL(following)) {
-      break;
-    }
-
-    detected = true;
-    state.position++;
-
-    if (skipSeparationSpace(state, true, -1)) {
-      if (state.lineIndent <= nodeIndent) {
-        _result.push(null);
-        ch = state.input.charCodeAt(state.position);
-        continue;
-      }
-    }
-
-    _line = state.line;
-    composeNode(state, nodeIndent, CONTEXT_BLOCK_IN, false, true);
-    _result.push(state.result);
-    skipSeparationSpace(state, true, -1);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if ((state.line === _line || state.lineIndent > nodeIndent) && (ch !== 0)) {
-      throwError(state, 'bad indentation of a sequence entry');
-    } else if (state.lineIndent < nodeIndent) {
-      break;
-    }
-  }
-
-  if (detected) {
-    state.tag = _tag;
-    state.anchor = _anchor;
-    state.kind = 'sequence';
-    state.result = _result;
-    return true;
-  }
-  return false;
-}
-
-function readBlockMapping(state, nodeIndent, flowIndent) {
-  var following,
-      allowCompact,
-      _line,
-      _pos,
-      _tag          = state.tag,
-      _anchor       = state.anchor,
-      _result       = {},
-      overridableKeys = {},
-      keyTag        = null,
-      keyNode       = null,
-      valueNode     = null,
-      atExplicitKey = false,
-      detected      = false,
-      ch;
-
-  if (state.anchor !== null) {
-    state.anchorMap[state.anchor] = _result;
-  }
-
-  ch = state.input.charCodeAt(state.position);
-
-  while (ch !== 0) {
-    following = state.input.charCodeAt(state.position + 1);
-    _line = state.line; // Save the current line.
-    _pos = state.position;
-
-    //
-    // Explicit notation case. There are two separate blocks:
-    // first for the key (denoted by "?") and second for the value (denoted by ":")
-    //
-    if ((ch === 0x3F/* ? */ || ch === 0x3A/* : */) && is_WS_OR_EOL(following)) {
-
-      if (ch === 0x3F/* ? */) {
-        if (atExplicitKey) {
-          storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
-          keyTag = keyNode = valueNode = null;
-        }
-
-        detected = true;
-        atExplicitKey = true;
-        allowCompact = true;
-
-      } else if (atExplicitKey) {
-        // i.e. 0x3A/* : */ === character after the explicit key.
-        atExplicitKey = false;
-        allowCompact = true;
-
-      } else {
-        throwError(state, 'incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line');
-      }
-
-      state.position += 1;
-      ch = following;
-
-    //
-    // Implicit notation case. Flow-style node as the key first, then ":", and the value.
-    //
-    } else if (composeNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true)) {
-
-      if (state.line === _line) {
-        ch = state.input.charCodeAt(state.position);
-
-        while (is_WHITE_SPACE(ch)) {
-          ch = state.input.charCodeAt(++state.position);
-        }
-
-        if (ch === 0x3A/* : */) {
-          ch = state.input.charCodeAt(++state.position);
-
-          if (!is_WS_OR_EOL(ch)) {
-            throwError(state, 'a whitespace character is expected after the key-value separator within a block mapping');
-          }
-
-          if (atExplicitKey) {
-            storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
-            keyTag = keyNode = valueNode = null;
-          }
-
-          detected = true;
-          atExplicitKey = false;
-          allowCompact = false;
-          keyTag = state.tag;
-          keyNode = state.result;
-
-        } else if (detected) {
-          throwError(state, 'can not read an implicit mapping pair; a colon is missed');
-
-        } else {
-          state.tag = _tag;
-          state.anchor = _anchor;
-          return true; // Keep the result of `composeNode`.
-        }
-
-      } else if (detected) {
-        throwError(state, 'can not read a block mapping entry; a multiline key may not be an implicit key');
-
-      } else {
-        state.tag = _tag;
-        state.anchor = _anchor;
-        return true; // Keep the result of `composeNode`.
-      }
-
-    } else {
-      break; // Reading is done. Go to the epilogue.
-    }
-
-    //
-    // Common reading code for both explicit and implicit notations.
-    //
-    if (state.line === _line || state.lineIndent > nodeIndent) {
-      if (composeNode(state, nodeIndent, CONTEXT_BLOCK_OUT, true, allowCompact)) {
-        if (atExplicitKey) {
-          keyNode = state.result;
-        } else {
-          valueNode = state.result;
-        }
-      }
-
-      if (!atExplicitKey) {
-        storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, _line, _pos);
-        keyTag = keyNode = valueNode = null;
-      }
-
-      skipSeparationSpace(state, true, -1);
-      ch = state.input.charCodeAt(state.position);
-    }
-
-    if (state.lineIndent > nodeIndent && (ch !== 0)) {
-      throwError(state, 'bad indentation of a mapping entry');
-    } else if (state.lineIndent < nodeIndent) {
-      break;
-    }
-  }
-
-  //
-  // Epilogue.
-  //
-
-  // Special case: last mapping's node contains only the key in explicit notation.
-  if (atExplicitKey) {
-    storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, null);
-  }
-
-  // Expose the resulting mapping.
-  if (detected) {
-    state.tag = _tag;
-    state.anchor = _anchor;
-    state.kind = 'mapping';
-    state.result = _result;
-  }
-
-  return detected;
-}
-
-function readTagProperty(state) {
-  var _position,
-      isVerbatim = false,
-      isNamed    = false,
-      tagHandle,
-      tagName,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x21/* ! */) return false;
-
-  if (state.tag !== null) {
-    throwError(state, 'duplication of a tag property');
-  }
-
-  ch = state.input.charCodeAt(++state.position);
-
-  if (ch === 0x3C/* < */) {
-    isVerbatim = true;
-    ch = state.input.charCodeAt(++state.position);
-
-  } else if (ch === 0x21/* ! */) {
-    isNamed = true;
-    tagHandle = '!!';
-    ch = state.input.charCodeAt(++state.position);
-
-  } else {
-    tagHandle = '!';
-  }
-
-  _position = state.position;
-
-  if (isVerbatim) {
-    do { ch = state.input.charCodeAt(++state.position); }
-    while (ch !== 0 && ch !== 0x3E/* > */);
-
-    if (state.position < state.length) {
-      tagName = state.input.slice(_position, state.position);
-      ch = state.input.charCodeAt(++state.position);
-    } else {
-      throwError(state, 'unexpected end of the stream within a verbatim tag');
-    }
-  } else {
-    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
-
-      if (ch === 0x21/* ! */) {
-        if (!isNamed) {
-          tagHandle = state.input.slice(_position - 1, state.position + 1);
-
-          if (!PATTERN_TAG_HANDLE.test(tagHandle)) {
-            throwError(state, 'named tag handle cannot contain such characters');
-          }
-
-          isNamed = true;
-          _position = state.position + 1;
-        } else {
-          throwError(state, 'tag suffix cannot contain exclamation marks');
-        }
-      }
-
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    tagName = state.input.slice(_position, state.position);
-
-    if (PATTERN_FLOW_INDICATORS.test(tagName)) {
-      throwError(state, 'tag suffix cannot contain flow indicator characters');
-    }
-  }
-
-  if (tagName && !PATTERN_TAG_URI.test(tagName)) {
-    throwError(state, 'tag name cannot contain such characters: ' + tagName);
-  }
-
-  if (isVerbatim) {
-    state.tag = tagName;
-
-  } else if (_hasOwnProperty.call(state.tagMap, tagHandle)) {
-    state.tag = state.tagMap[tagHandle] + tagName;
-
-  } else if (tagHandle === '!') {
-    state.tag = '!' + tagName;
-
-  } else if (tagHandle === '!!') {
-    state.tag = 'tag:yaml.org,2002:' + tagName;
-
-  } else {
-    throwError(state, 'undeclared tag handle "' + tagHandle + '"');
-  }
-
-  return true;
-}
-
-function readAnchorProperty(state) {
-  var _position,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x26/* & */) return false;
-
-  if (state.anchor !== null) {
-    throwError(state, 'duplication of an anchor property');
-  }
-
-  ch = state.input.charCodeAt(++state.position);
-  _position = state.position;
-
-  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
-    ch = state.input.charCodeAt(++state.position);
-  }
-
-  if (state.position === _position) {
-    throwError(state, 'name of an anchor node must contain at least one character');
-  }
-
-  state.anchor = state.input.slice(_position, state.position);
-  return true;
-}
-
-function readAlias(state) {
-  var _position, alias,
-      ch;
-
-  ch = state.input.charCodeAt(state.position);
-
-  if (ch !== 0x2A/* * */) return false;
-
-  ch = state.input.charCodeAt(++state.position);
-  _position = state.position;
-
-  while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
-    ch = state.input.charCodeAt(++state.position);
-  }
-
-  if (state.position === _position) {
-    throwError(state, 'name of an alias node must contain at least one character');
-  }
-
-  alias = state.input.slice(_position, state.position);
-
-  if (!state.anchorMap.hasOwnProperty(alias)) {
-    throwError(state, 'unidentified alias "' + alias + '"');
-  }
-
-  state.result = state.anchorMap[alias];
-  skipSeparationSpace(state, true, -1);
-  return true;
-}
-
-function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact) {
-  var allowBlockStyles,
-      allowBlockScalars,
-      allowBlockCollections,
-      indentStatus = 1, // 1: this>parent, 0: this=parent, -1: this<parent
-      atNewLine  = false,
-      hasContent = false,
-      typeIndex,
-      typeQuantity,
-      type,
-      flowIndent,
-      blockIndent;
-
-  if (state.listener !== null) {
-    state.listener('open', state);
-  }
-
-  state.tag    = null;
-  state.anchor = null;
-  state.kind   = null;
-  state.result = null;
-
-  allowBlockStyles = allowBlockScalars = allowBlockCollections =
-    CONTEXT_BLOCK_OUT === nodeContext ||
-    CONTEXT_BLOCK_IN  === nodeContext;
-
-  if (allowToSeek) {
-    if (skipSeparationSpace(state, true, -1)) {
-      atNewLine = true;
-
-      if (state.lineIndent > parentIndent) {
-        indentStatus = 1;
-      } else if (state.lineIndent === parentIndent) {
-        indentStatus = 0;
-      } else if (state.lineIndent < parentIndent) {
-        indentStatus = -1;
-      }
-    }
-  }
-
-  if (indentStatus === 1) {
-    while (readTagProperty(state) || readAnchorProperty(state)) {
-      if (skipSeparationSpace(state, true, -1)) {
-        atNewLine = true;
-        allowBlockCollections = allowBlockStyles;
-
-        if (state.lineIndent > parentIndent) {
-          indentStatus = 1;
-        } else if (state.lineIndent === parentIndent) {
-          indentStatus = 0;
-        } else if (state.lineIndent < parentIndent) {
-          indentStatus = -1;
-        }
-      } else {
-        allowBlockCollections = false;
-      }
-    }
-  }
-
-  if (allowBlockCollections) {
-    allowBlockCollections = atNewLine || allowCompact;
-  }
-
-  if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {
-    if (CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext) {
-      flowIndent = parentIndent;
-    } else {
-      flowIndent = parentIndent + 1;
-    }
-
-    blockIndent = state.position - state.lineStart;
-
-    if (indentStatus === 1) {
-      if (allowBlockCollections &&
-          (readBlockSequence(state, blockIndent) ||
-           readBlockMapping(state, blockIndent, flowIndent)) ||
-          readFlowCollection(state, flowIndent)) {
-        hasContent = true;
-      } else {
-        if ((allowBlockScalars && readBlockScalar(state, flowIndent)) ||
-            readSingleQuotedScalar(state, flowIndent) ||
-            readDoubleQuotedScalar(state, flowIndent)) {
-          hasContent = true;
-
-        } else if (readAlias(state)) {
-          hasContent = true;
-
-          if (state.tag !== null || state.anchor !== null) {
-            throwError(state, 'alias node should not have any properties');
-          }
-
-        } else if (readPlainScalar(state, flowIndent, CONTEXT_FLOW_IN === nodeContext)) {
-          hasContent = true;
-
-          if (state.tag === null) {
-            state.tag = '?';
-          }
-        }
-
-        if (state.anchor !== null) {
-          state.anchorMap[state.anchor] = state.result;
-        }
-      }
-    } else if (indentStatus === 0) {
-      // Special case: block sequences are allowed to have same indentation level as the parent.
-      // http://www.yaml.org/spec/1.2/spec.html#id2799784
-      hasContent = allowBlockCollections && readBlockSequence(state, blockIndent);
-    }
-  }
-
-  if (state.tag !== null && state.tag !== '!') {
-    if (state.tag === '?') {
-      for (typeIndex = 0, typeQuantity = state.implicitTypes.length; typeIndex < typeQuantity; typeIndex += 1) {
-        type = state.implicitTypes[typeIndex];
-
-        // Implicit resolving is not allowed for non-scalar types, and '?'
-        // non-specific tag is only assigned to plain scalars. So, it isn't
-        // needed to check for 'kind' conformity.
-
-        if (type.resolve(state.result)) { // `state.result` updated in resolver if matched
-          state.result = type.construct(state.result);
-          state.tag = type.tag;
-          if (state.anchor !== null) {
-            state.anchorMap[state.anchor] = state.result;
-          }
-          break;
-        }
-      }
-    } else if (_hasOwnProperty.call(state.typeMap[state.kind || 'fallback'], state.tag)) {
-      type = state.typeMap[state.kind || 'fallback'][state.tag];
-
-      if (state.result !== null && type.kind !== state.kind) {
-        throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');
-      }
-
-      if (!type.resolve(state.result)) { // `state.result` updated in resolver if matched
-        throwError(state, 'cannot resolve a node with !<' + state.tag + '> explicit tag');
-      } else {
-        state.result = type.construct(state.result);
-        if (state.anchor !== null) {
-          state.anchorMap[state.anchor] = state.result;
-        }
-      }
-    } else {
-      throwError(state, 'unknown tag !<' + state.tag + '>');
-    }
-  }
-
-  if (state.listener !== null) {
-    state.listener('close', state);
-  }
-  return state.tag !== null ||  state.anchor !== null || hasContent;
-}
-
-function readDocument(state) {
-  var documentStart = state.position,
-      _position,
-      directiveName,
-      directiveArgs,
-      hasDirectives = false,
-      ch;
-
-  state.version = null;
-  state.checkLineBreaks = state.legacy;
-  state.tagMap = {};
-  state.anchorMap = {};
-
-  while ((ch = state.input.charCodeAt(state.position)) !== 0) {
-    skipSeparationSpace(state, true, -1);
-
-    ch = state.input.charCodeAt(state.position);
-
-    if (state.lineIndent > 0 || ch !== 0x25/* % */) {
-      break;
-    }
-
-    hasDirectives = true;
-    ch = state.input.charCodeAt(++state.position);
-    _position = state.position;
-
-    while (ch !== 0 && !is_WS_OR_EOL(ch)) {
-      ch = state.input.charCodeAt(++state.position);
-    }
-
-    directiveName = state.input.slice(_position, state.position);
-    directiveArgs = [];
-
-    if (directiveName.length < 1) {
-      throwError(state, 'directive name must not be less than one character in length');
-    }
-
-    while (ch !== 0) {
-      while (is_WHITE_SPACE(ch)) {
-        ch = state.input.charCodeAt(++state.position);
-      }
-
-      if (ch === 0x23/* # */) {
-        do { ch = state.input.charCodeAt(++state.position); }
-        while (ch !== 0 && !is_EOL(ch));
-        break;
-      }
-
-      if (is_EOL(ch)) break;
-
-      _position = state.position;
-
-      while (ch !== 0 && !is_WS_OR_EOL(ch)) {
-        ch = state.input.charCodeAt(++state.position);
-      }
-
-      directiveArgs.push(state.input.slice(_position, state.position));
-    }
-
-    if (ch !== 0) readLineBreak(state);
-
-    if (_hasOwnProperty.call(directiveHandlers, directiveName)) {
-      directiveHandlers[directiveName](state, directiveName, directiveArgs);
-    } else {
-      throwWarning(state, 'unknown document directive "' + directiveName + '"');
-    }
-  }
-
-  skipSeparationSpace(state, true, -1);
-
-  if (state.lineIndent === 0 &&
-      state.input.charCodeAt(state.position)     === 0x2D/* - */ &&
-      state.input.charCodeAt(state.position + 1) === 0x2D/* - */ &&
-      state.input.charCodeAt(state.position + 2) === 0x2D/* - */) {
-    state.position += 3;
-    skipSeparationSpace(state, true, -1);
-
-  } else if (hasDirectives) {
-    throwError(state, 'directives end mark is expected');
-  }
-
-  composeNode(state, state.lineIndent - 1, CONTEXT_BLOCK_OUT, false, true);
-  skipSeparationSpace(state, true, -1);
-
-  if (state.checkLineBreaks &&
-      PATTERN_NON_ASCII_LINE_BREAKS.test(state.input.slice(documentStart, state.position))) {
-    throwWarning(state, 'non-ASCII line breaks are interpreted as content');
-  }
-
-  state.documents.push(state.result);
-
-  if (state.position === state.lineStart && testDocumentSeparator(state)) {
-
-    if (state.input.charCodeAt(state.position) === 0x2E/* . */) {
-      state.position += 3;
-      skipSeparationSpace(state, true, -1);
-    }
-    return;
-  }
-
-  if (state.position < (state.length - 1)) {
-    throwError(state, 'end of the stream or a document separator is expected');
-  } else {
-    return;
-  }
-}
-
-
-function loadDocuments(input, options) {
-  input = String(input);
-  options = options || {};
-
-  if (input.length !== 0) {
-
-    // Add tailing `\n` if not exists
-    if (input.charCodeAt(input.length - 1) !== 0x0A/* LF */ &&
-        input.charCodeAt(input.length - 1) !== 0x0D/* CR */) {
-      input += '\n';
-    }
-
-    // Strip BOM
-    if (input.charCodeAt(0) === 0xFEFF) {
-      input = input.slice(1);
-    }
-  }
-
-  var state = new State(input, options);
-
-  // Use 0 as string terminator. That significantly simplifies bounds check.
-  state.input += '\0';
-
-  while (state.input.charCodeAt(state.position) === 0x20/* Space */) {
-    state.lineIndent += 1;
-    state.position += 1;
-  }
-
-  while (state.position < (state.length - 1)) {
-    readDocument(state);
-  }
-
-  return state.documents;
-}
-
-
-function loadAll(input, iterator, options) {
-  var documents = loadDocuments(input, options), index, length;
-
-  if (typeof iterator !== 'function') {
-    return documents;
-  }
-
-  for (index = 0, length = documents.length; index < length; index += 1) {
-    iterator(documents[index]);
-  }
-}
-
-
-function load(input, options) {
-  var documents = loadDocuments(input, options);
-
-  if (documents.length === 0) {
-    /*eslint-disable no-undefined*/
-    return undefined;
-  } else if (documents.length === 1) {
-    return documents[0];
-  }
-  throw new YAMLException('expected a single document in the stream, but found more');
-}
-
-
-function safeLoadAll(input, output, options) {
-  if (typeof output === 'function') {
-    loadAll(input, output, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-  } else {
-    return loadAll(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-  }
-}
-
-
-function safeLoad(input, options) {
-  return load(input, common.extend({ schema: DEFAULT_SAFE_SCHEMA }, options));
-}
-
-
-module.exports.loadAll     = loadAll;
-module.exports.load        = load;
-module.exports.safeLoadAll = safeLoadAll;
-module.exports.safeLoad    = safeLoad;
-
-
-/***/ }),
-/* 283 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-var common = __webpack_require__(43);
-
-
-function Mark(name, buffer, position, line, column) {
-  this.name     = name;
-  this.buffer   = buffer;
-  this.position = position;
-  this.line     = line;
-  this.column   = column;
-}
-
-
-Mark.prototype.getSnippet = function getSnippet(indent, maxLength) {
-  var head, start, tail, end, snippet;
-
-  if (!this.buffer) return null;
-
-  indent = indent || 4;
-  maxLength = maxLength || 75;
-
-  head = '';
-  start = this.position;
-
-  while (start > 0 && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(start - 1)) === -1) {
-    start -= 1;
-    if (this.position - start > (maxLength / 2 - 1)) {
-      head = ' ... ';
-      start += 5;
-      break;
-    }
-  }
-
-  tail = '';
-  end = this.position;
-
-  while (end < this.buffer.length && '\x00\r\n\x85\u2028\u2029'.indexOf(this.buffer.charAt(end)) === -1) {
-    end += 1;
-    if (end - this.position > (maxLength / 2 - 1)) {
-      tail = ' ... ';
-      end -= 5;
-      break;
-    }
-  }
-
-  snippet = this.buffer.slice(start, end);
-
-  return common.repeat(' ', indent) + head + snippet + tail + '\n' +
-         common.repeat(' ', indent + this.position - start + head.length) + '^';
-};
-
-
-Mark.prototype.toString = function toString(compact) {
-  var snippet, where = '';
-
-  if (this.name) {
-    where += 'in "' + this.name + '" ';
-  }
-
-  where += 'at line ' + (this.line + 1) + ', column ' + (this.column + 1);
-
-  if (!compact) {
-    snippet = this.getSnippet();
-
-    if (snippet) {
-      where += ':\n' + snippet;
-    }
-  }
-
-  return where;
-};
-
-
-module.exports = Mark;
-
-
-/***/ }),
-/* 284 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-var require;
-
-/*eslint-disable no-bitwise*/
-
-var NodeBuffer;
-
-try {
-  // A trick for browserified version, to not include `Buffer` shim
-  var _require = require;
-  NodeBuffer = __webpack_require__(64).Buffer;
-} catch (__) {}
-
-var Type       = __webpack_require__(10);
-
-
-// [ 64, 65, 66 ] -> [ padding, CR, LF ]
-var BASE64_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r';
-
-
-function resolveYamlBinary(data) {
-  if (data === null) return false;
-
-  var code, idx, bitlen = 0, max = data.length, map = BASE64_MAP;
-
-  // Convert one by one.
-  for (idx = 0; idx < max; idx++) {
-    code = map.indexOf(data.charAt(idx));
-
-    // Skip CR/LF
-    if (code > 64) continue;
-
-    // Fail on illegal characters
-    if (code < 0) return false;
-
-    bitlen += 6;
-  }
-
-  // If there are any bits left, source was corrupted
-  return (bitlen % 8) === 0;
-}
-
-function constructYamlBinary(data) {
-  var idx, tailbits,
-      input = data.replace(/[\r\n=]/g, ''), // remove CR/LF & padding to simplify scan
-      max = input.length,
-      map = BASE64_MAP,
-      bits = 0,
-      result = [];
-
-  // Collect by 6*4 bits (3 bytes)
-
-  for (idx = 0; idx < max; idx++) {
-    if ((idx % 4 === 0) && idx) {
-      result.push((bits >> 16) & 0xFF);
-      result.push((bits >> 8) & 0xFF);
-      result.push(bits & 0xFF);
-    }
-
-    bits = (bits << 6) | map.indexOf(input.charAt(idx));
-  }
-
-  // Dump tail
-
-  tailbits = (max % 4) * 6;
-
-  if (tailbits === 0) {
-    result.push((bits >> 16) & 0xFF);
-    result.push((bits >> 8) & 0xFF);
-    result.push(bits & 0xFF);
-  } else if (tailbits === 18) {
-    result.push((bits >> 10) & 0xFF);
-    result.push((bits >> 2) & 0xFF);
-  } else if (tailbits === 12) {
-    result.push((bits >> 4) & 0xFF);
-  }
-
-  // Wrap into Buffer for NodeJS and leave Array for browser
-  if (NodeBuffer) {
-    // Support node 6.+ Buffer API when available
-    return NodeBuffer.from ? NodeBuffer.from(result) : new NodeBuffer(result);
-  }
-
-  return result;
-}
-
-function representYamlBinary(object /*, style*/) {
-  var result = '', bits = 0, idx, tail,
-      max = object.length,
-      map = BASE64_MAP;
-
-  // Convert every three bytes to 4 ASCII characters.
-
-  for (idx = 0; idx < max; idx++) {
-    if ((idx % 3 === 0) && idx) {
-      result += map[(bits >> 18) & 0x3F];
-      result += map[(bits >> 12) & 0x3F];
-      result += map[(bits >> 6) & 0x3F];
-      result += map[bits & 0x3F];
-    }
-
-    bits = (bits << 8) + object[idx];
-  }
-
-  // Dump tail
-
-  tail = max % 3;
-
-  if (tail === 0) {
-    result += map[(bits >> 18) & 0x3F];
-    result += map[(bits >> 12) & 0x3F];
-    result += map[(bits >> 6) & 0x3F];
-    result += map[bits & 0x3F];
-  } else if (tail === 2) {
-    result += map[(bits >> 10) & 0x3F];
-    result += map[(bits >> 4) & 0x3F];
-    result += map[(bits << 2) & 0x3F];
-    result += map[64];
-  } else if (tail === 1) {
-    result += map[(bits >> 2) & 0x3F];
-    result += map[(bits << 4) & 0x3F];
-    result += map[64];
-    result += map[64];
-  }
-
-  return result;
-}
-
-function isBinary(object) {
-  return NodeBuffer && NodeBuffer.isBuffer(object);
-}
-
-module.exports = new Type('tag:yaml.org,2002:binary', {
-  kind: 'scalar',
-  resolve: resolveYamlBinary,
-  construct: constructYamlBinary,
-  predicate: isBinary,
-  represent: representYamlBinary
-});
-
-
-/***/ }),
-/* 285 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-function resolveYamlBoolean(data) {
-  if (data === null) return false;
-
-  var max = data.length;
-
-  return (max === 4 && (data === 'true' || data === 'True' || data === 'TRUE')) ||
-         (max === 5 && (data === 'false' || data === 'False' || data === 'FALSE'));
-}
-
-function constructYamlBoolean(data) {
-  return data === 'true' ||
-         data === 'True' ||
-         data === 'TRUE';
-}
-
-function isBoolean(object) {
-  return Object.prototype.toString.call(object) === '[object Boolean]';
-}
-
-module.exports = new Type('tag:yaml.org,2002:bool', {
-  kind: 'scalar',
-  resolve: resolveYamlBoolean,
-  construct: constructYamlBoolean,
-  predicate: isBoolean,
-  represent: {
-    lowercase: function (object) { return object ? 'true' : 'false'; },
-    uppercase: function (object) { return object ? 'TRUE' : 'FALSE'; },
-    camelcase: function (object) { return object ? 'True' : 'False'; }
-  },
-  defaultStyle: 'lowercase'
-});
-
-
-/***/ }),
-/* 286 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var common = __webpack_require__(43);
-var Type   = __webpack_require__(10);
-
-var YAML_FLOAT_PATTERN = new RegExp(
-  // 2.5e4, 2.5 and integers
-  '^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?' +
-  // .2e4, .2
-  // special case, seems not from spec
-  '|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?' +
-  // 20:59
-  '|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*' +
-  // .inf
-  '|[-+]?\\.(?:inf|Inf|INF)' +
-  // .nan
-  '|\\.(?:nan|NaN|NAN))$');
-
-function resolveYamlFloat(data) {
-  if (data === null) return false;
-
-  if (!YAML_FLOAT_PATTERN.test(data) ||
-      // Quick hack to not allow integers end with `_`
-      // Probably should update regexp & check speed
-      data[data.length - 1] === '_') {
-    return false;
-  }
-
-  return true;
-}
-
-function constructYamlFloat(data) {
-  var value, sign, base, digits;
-
-  value  = data.replace(/_/g, '').toLowerCase();
-  sign   = value[0] === '-' ? -1 : 1;
-  digits = [];
-
-  if ('+-'.indexOf(value[0]) >= 0) {
-    value = value.slice(1);
-  }
-
-  if (value === '.inf') {
-    return (sign === 1) ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
-
-  } else if (value === '.nan') {
-    return NaN;
-
-  } else if (value.indexOf(':') >= 0) {
-    value.split(':').forEach(function (v) {
-      digits.unshift(parseFloat(v, 10));
-    });
-
-    value = 0.0;
-    base = 1;
-
-    digits.forEach(function (d) {
-      value += d * base;
-      base *= 60;
-    });
-
-    return sign * value;
-
-  }
-  return sign * parseFloat(value, 10);
-}
-
-
-var SCIENTIFIC_WITHOUT_DOT = /^[-+]?[0-9]+e/;
-
-function representYamlFloat(object, style) {
-  var res;
-
-  if (isNaN(object)) {
-    switch (style) {
-      case 'lowercase': return '.nan';
-      case 'uppercase': return '.NAN';
-      case 'camelcase': return '.NaN';
-    }
-  } else if (Number.POSITIVE_INFINITY === object) {
-    switch (style) {
-      case 'lowercase': return '.inf';
-      case 'uppercase': return '.INF';
-      case 'camelcase': return '.Inf';
-    }
-  } else if (Number.NEGATIVE_INFINITY === object) {
-    switch (style) {
-      case 'lowercase': return '-.inf';
-      case 'uppercase': return '-.INF';
-      case 'camelcase': return '-.Inf';
-    }
-  } else if (common.isNegativeZero(object)) {
-    return '-0.0';
-  }
-
-  res = object.toString(10);
-
-  // JS stringifier can build scientific format without dots: 5e-100,
-  // while YAML requres dot: 5.e-100. Fix it with simple hack
-
-  return SCIENTIFIC_WITHOUT_DOT.test(res) ? res.replace('e', '.e') : res;
-}
-
-function isFloat(object) {
-  return (Object.prototype.toString.call(object) === '[object Number]') &&
-         (object % 1 !== 0 || common.isNegativeZero(object));
-}
-
-module.exports = new Type('tag:yaml.org,2002:float', {
-  kind: 'scalar',
-  resolve: resolveYamlFloat,
-  construct: constructYamlFloat,
-  predicate: isFloat,
-  represent: representYamlFloat,
-  defaultStyle: 'lowercase'
-});
-
-
-/***/ }),
-/* 287 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var common = __webpack_require__(43);
-var Type   = __webpack_require__(10);
-
-function isHexCode(c) {
-  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */)) ||
-         ((0x41/* A */ <= c) && (c <= 0x46/* F */)) ||
-         ((0x61/* a */ <= c) && (c <= 0x66/* f */));
-}
-
-function isOctCode(c) {
-  return ((0x30/* 0 */ <= c) && (c <= 0x37/* 7 */));
-}
-
-function isDecCode(c) {
-  return ((0x30/* 0 */ <= c) && (c <= 0x39/* 9 */));
-}
-
-function resolveYamlInteger(data) {
-  if (data === null) return false;
-
-  var max = data.length,
-      index = 0,
-      hasDigits = false,
-      ch;
-
-  if (!max) return false;
-
-  ch = data[index];
-
-  // sign
-  if (ch === '-' || ch === '+') {
-    ch = data[++index];
-  }
-
-  if (ch === '0') {
-    // 0
-    if (index + 1 === max) return true;
-    ch = data[++index];
-
-    // base 2, base 8, base 16
-
-    if (ch === 'b') {
-      // base 2
-      index++;
-
-      for (; index < max; index++) {
-        ch = data[index];
-        if (ch === '_') continue;
-        if (ch !== '0' && ch !== '1') return false;
-        hasDigits = true;
-      }
-      return hasDigits && ch !== '_';
-    }
-
-
-    if (ch === 'x') {
-      // base 16
-      index++;
-
-      for (; index < max; index++) {
-        ch = data[index];
-        if (ch === '_') continue;
-        if (!isHexCode(data.charCodeAt(index))) return false;
-        hasDigits = true;
-      }
-      return hasDigits && ch !== '_';
-    }
-
-    // base 8
-    for (; index < max; index++) {
-      ch = data[index];
-      if (ch === '_') continue;
-      if (!isOctCode(data.charCodeAt(index))) return false;
-      hasDigits = true;
-    }
-    return hasDigits && ch !== '_';
-  }
-
-  // base 10 (except 0) or base 60
-
-  // value should not start with `_`;
-  if (ch === '_') return false;
-
-  for (; index < max; index++) {
-    ch = data[index];
-    if (ch === '_') continue;
-    if (ch === ':') break;
-    if (!isDecCode(data.charCodeAt(index))) {
-      return false;
-    }
-    hasDigits = true;
-  }
-
-  // Should have digits and should not end with `_`
-  if (!hasDigits || ch === '_') return false;
-
-  // if !base60 - done;
-  if (ch !== ':') return true;
-
-  // base60 almost not used, no needs to optimize
-  return /^(:[0-5]?[0-9])+$/.test(data.slice(index));
-}
-
-function constructYamlInteger(data) {
-  var value = data, sign = 1, ch, base, digits = [];
-
-  if (value.indexOf('_') !== -1) {
-    value = value.replace(/_/g, '');
-  }
-
-  ch = value[0];
-
-  if (ch === '-' || ch === '+') {
-    if (ch === '-') sign = -1;
-    value = value.slice(1);
-    ch = value[0];
-  }
-
-  if (value === '0') return 0;
-
-  if (ch === '0') {
-    if (value[1] === 'b') return sign * parseInt(value.slice(2), 2);
-    if (value[1] === 'x') return sign * parseInt(value, 16);
-    return sign * parseInt(value, 8);
-  }
-
-  if (value.indexOf(':') !== -1) {
-    value.split(':').forEach(function (v) {
-      digits.unshift(parseInt(v, 10));
-    });
-
-    value = 0;
-    base = 1;
-
-    digits.forEach(function (d) {
-      value += (d * base);
-      base *= 60;
-    });
-
-    return sign * value;
-
-  }
-
-  return sign * parseInt(value, 10);
-}
-
-function isInteger(object) {
-  return (Object.prototype.toString.call(object)) === '[object Number]' &&
-         (object % 1 === 0 && !common.isNegativeZero(object));
-}
-
-module.exports = new Type('tag:yaml.org,2002:int', {
-  kind: 'scalar',
-  resolve: resolveYamlInteger,
-  construct: constructYamlInteger,
-  predicate: isInteger,
-  represent: {
-    binary:      function (obj) { return obj >= 0 ? '0b' + obj.toString(2) : '-0b' + obj.toString(2).slice(1); },
-    octal:       function (obj) { return obj >= 0 ? '0'  + obj.toString(8) : '-0'  + obj.toString(8).slice(1); },
-    decimal:     function (obj) { return obj.toString(10); },
-    /* eslint-disable max-len */
-    hexadecimal: function (obj) { return obj >= 0 ? '0x' + obj.toString(16).toUpperCase() :  '-0x' + obj.toString(16).toUpperCase().slice(1); }
-  },
-  defaultStyle: 'decimal',
-  styleAliases: {
-    binary:      [ 2,  'bin' ],
-    octal:       [ 8,  'oct' ],
-    decimal:     [ 10, 'dec' ],
-    hexadecimal: [ 16, 'hex' ]
-  }
-});
-
-
-/***/ }),
-/* 288 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-var require;
-
-var esprima;
-
-// Browserified version does not have esprima
-//
-// 1. For node.js just require module as deps
-// 2. For browser try to require mudule via external AMD system.
-//    If not found - try to fallback to window.esprima. If not
-//    found too - then fail to parse.
-//
-try {
-  // workaround to exclude package from browserify list.
-  var _require = require;
-  esprima = __webpack_require__(268);
-} catch (_) {
-  /*global window */
-  if (typeof window !== 'undefined') esprima = window.esprima;
-}
-
-var Type = __webpack_require__(10);
-
-function resolveJavascriptFunction(data) {
-  if (data === null) return false;
-
-  try {
-    var source = '(' + data + ')',
-        ast    = esprima.parse(source, { range: true });
-
-    if (ast.type                    !== 'Program'             ||
-        ast.body.length             !== 1                     ||
-        ast.body[0].type            !== 'ExpressionStatement' ||
-        (ast.body[0].expression.type !== 'ArrowFunctionExpression' &&
-          ast.body[0].expression.type !== 'FunctionExpression')) {
-      return false;
-    }
-
-    return true;
-  } catch (err) {
-    return false;
-  }
-}
-
-function constructJavascriptFunction(data) {
-  /*jslint evil:true*/
-
-  var source = '(' + data + ')',
-      ast    = esprima.parse(source, { range: true }),
-      params = [],
-      body;
-
-  if (ast.type                    !== 'Program'             ||
-      ast.body.length             !== 1                     ||
-      ast.body[0].type            !== 'ExpressionStatement' ||
-      (ast.body[0].expression.type !== 'ArrowFunctionExpression' &&
-        ast.body[0].expression.type !== 'FunctionExpression')) {
-    throw new Error('Failed to resolve function');
-  }
-
-  ast.body[0].expression.params.forEach(function (param) {
-    params.push(param.name);
-  });
-
-  body = ast.body[0].expression.body.range;
-
-  // Esprima's ranges include the first '{' and the last '}' characters on
-  // function expressions. So cut them out.
-  if (ast.body[0].expression.body.type === 'BlockStatement') {
-    /*eslint-disable no-new-func*/
-    return new Function(params, source.slice(body[0] + 1, body[1] - 1));
-  }
-  // ES6 arrow functions can omit the BlockStatement. In that case, just return
-  // the body.
-  /*eslint-disable no-new-func*/
-  return new Function(params, 'return ' + source.slice(body[0], body[1]));
-}
-
-function representJavascriptFunction(object /*, style*/) {
-  return object.toString();
-}
-
-function isFunction(object) {
-  return Object.prototype.toString.call(object) === '[object Function]';
-}
-
-module.exports = new Type('tag:yaml.org,2002:js/function', {
-  kind: 'scalar',
-  resolve: resolveJavascriptFunction,
-  construct: constructJavascriptFunction,
-  predicate: isFunction,
-  represent: representJavascriptFunction
-});
-
-
-/***/ }),
-/* 289 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-function resolveJavascriptRegExp(data) {
-  if (data === null) return false;
-  if (data.length === 0) return false;
-
-  var regexp = data,
-      tail   = /\/([gim]*)$/.exec(data),
-      modifiers = '';
-
-  // if regexp starts with '/' it can have modifiers and must be properly closed
-  // `/foo/gim` - modifiers tail can be maximum 3 chars
-  if (regexp[0] === '/') {
-    if (tail) modifiers = tail[1];
-
-    if (modifiers.length > 3) return false;
-    // if expression starts with /, is should be properly terminated
-    if (regexp[regexp.length - modifiers.length - 1] !== '/') return false;
-  }
-
-  return true;
-}
-
-function constructJavascriptRegExp(data) {
-  var regexp = data,
-      tail   = /\/([gim]*)$/.exec(data),
-      modifiers = '';
-
-  // `/foo/gim` - tail can be maximum 4 chars
-  if (regexp[0] === '/') {
-    if (tail) modifiers = tail[1];
-    regexp = regexp.slice(1, regexp.length - modifiers.length - 1);
-  }
-
-  return new RegExp(regexp, modifiers);
-}
-
-function representJavascriptRegExp(object /*, style*/) {
-  var result = '/' + object.source + '/';
-
-  if (object.global) result += 'g';
-  if (object.multiline) result += 'm';
-  if (object.ignoreCase) result += 'i';
-
-  return result;
-}
-
-function isRegExp(object) {
-  return Object.prototype.toString.call(object) === '[object RegExp]';
-}
-
-module.exports = new Type('tag:yaml.org,2002:js/regexp', {
-  kind: 'scalar',
-  resolve: resolveJavascriptRegExp,
-  construct: constructJavascriptRegExp,
-  predicate: isRegExp,
-  represent: representJavascriptRegExp
-});
-
-
-/***/ }),
-/* 290 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-function resolveJavascriptUndefined() {
-  return true;
-}
-
-function constructJavascriptUndefined() {
-  /*eslint-disable no-undefined*/
-  return undefined;
-}
-
-function representJavascriptUndefined() {
-  return '';
-}
-
-function isUndefined(object) {
-  return typeof object === 'undefined';
-}
-
-module.exports = new Type('tag:yaml.org,2002:js/undefined', {
-  kind: 'scalar',
-  resolve: resolveJavascriptUndefined,
-  construct: constructJavascriptUndefined,
-  predicate: isUndefined,
-  represent: representJavascriptUndefined
-});
-
-
-/***/ }),
-/* 291 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-module.exports = new Type('tag:yaml.org,2002:map', {
-  kind: 'mapping',
-  construct: function (data) { return data !== null ? data : {}; }
-});
-
-
-/***/ }),
-/* 292 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-function resolveYamlMerge(data) {
-  return data === '<<' || data === null;
-}
-
-module.exports = new Type('tag:yaml.org,2002:merge', {
-  kind: 'scalar',
-  resolve: resolveYamlMerge
-});
-
-
-/***/ }),
-/* 293 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-function resolveYamlNull(data) {
-  if (data === null) return true;
-
-  var max = data.length;
-
-  return (max === 1 && data === '~') ||
-         (max === 4 && (data === 'null' || data === 'Null' || data === 'NULL'));
-}
-
-function constructYamlNull() {
-  return null;
-}
-
-function isNull(object) {
-  return object === null;
-}
-
-module.exports = new Type('tag:yaml.org,2002:null', {
-  kind: 'scalar',
-  resolve: resolveYamlNull,
-  construct: constructYamlNull,
-  predicate: isNull,
-  represent: {
-    canonical: function () { return '~';    },
-    lowercase: function () { return 'null'; },
-    uppercase: function () { return 'NULL'; },
-    camelcase: function () { return 'Null'; }
-  },
-  defaultStyle: 'lowercase'
-});
-
-
-/***/ }),
-/* 294 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-var _toString       = Object.prototype.toString;
-
-function resolveYamlOmap(data) {
-  if (data === null) return true;
-
-  var objectKeys = [], index, length, pair, pairKey, pairHasKey,
-      object = data;
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    pair = object[index];
-    pairHasKey = false;
-
-    if (_toString.call(pair) !== '[object Object]') return false;
-
-    for (pairKey in pair) {
-      if (_hasOwnProperty.call(pair, pairKey)) {
-        if (!pairHasKey) pairHasKey = true;
-        else return false;
-      }
-    }
-
-    if (!pairHasKey) return false;
-
-    if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);
-    else return false;
-  }
-
-  return true;
-}
-
-function constructYamlOmap(data) {
-  return data !== null ? data : [];
-}
-
-module.exports = new Type('tag:yaml.org,2002:omap', {
-  kind: 'sequence',
-  resolve: resolveYamlOmap,
-  construct: constructYamlOmap
-});
-
-
-/***/ }),
-/* 295 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-var _toString = Object.prototype.toString;
-
-function resolveYamlPairs(data) {
-  if (data === null) return true;
-
-  var index, length, pair, keys, result,
-      object = data;
-
-  result = new Array(object.length);
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    pair = object[index];
-
-    if (_toString.call(pair) !== '[object Object]') return false;
-
-    keys = Object.keys(pair);
-
-    if (keys.length !== 1) return false;
-
-    result[index] = [ keys[0], pair[keys[0]] ];
-  }
-
-  return true;
-}
-
-function constructYamlPairs(data) {
-  if (data === null) return [];
-
-  var index, length, pair, keys, result,
-      object = data;
-
-  result = new Array(object.length);
-
-  for (index = 0, length = object.length; index < length; index += 1) {
-    pair = object[index];
-
-    keys = Object.keys(pair);
-
-    result[index] = [ keys[0], pair[keys[0]] ];
-  }
-
-  return result;
-}
-
-module.exports = new Type('tag:yaml.org,2002:pairs', {
-  kind: 'sequence',
-  resolve: resolveYamlPairs,
-  construct: constructYamlPairs
-});
-
-
-/***/ }),
-/* 296 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-module.exports = new Type('tag:yaml.org,2002:seq', {
-  kind: 'sequence',
-  construct: function (data) { return data !== null ? data : []; }
-});
-
-
-/***/ }),
-/* 297 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-
-function resolveYamlSet(data) {
-  if (data === null) return true;
-
-  var key, object = data;
-
-  for (key in object) {
-    if (_hasOwnProperty.call(object, key)) {
-      if (object[key] !== null) return false;
-    }
-  }
-
-  return true;
-}
-
-function constructYamlSet(data) {
-  return data !== null ? data : {};
-}
-
-module.exports = new Type('tag:yaml.org,2002:set', {
-  kind: 'mapping',
-  resolve: resolveYamlSet,
-  construct: constructYamlSet
-});
-
-
-/***/ }),
-/* 298 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-module.exports = new Type('tag:yaml.org,2002:str', {
-  kind: 'scalar',
-  construct: function (data) { return data !== null ? data : ''; }
-});
-
-
-/***/ }),
-/* 299 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Type = __webpack_require__(10);
-
-var YAML_DATE_REGEXP = new RegExp(
-  '^([0-9][0-9][0-9][0-9])'          + // [1] year
-  '-([0-9][0-9])'                    + // [2] month
-  '-([0-9][0-9])$');                   // [3] day
-
-var YAML_TIMESTAMP_REGEXP = new RegExp(
-  '^([0-9][0-9][0-9][0-9])'          + // [1] year
-  '-([0-9][0-9]?)'                   + // [2] month
-  '-([0-9][0-9]?)'                   + // [3] day
-  '(?:[Tt]|[ \\t]+)'                 + // ...
-  '([0-9][0-9]?)'                    + // [4] hour
-  ':([0-9][0-9])'                    + // [5] minute
-  ':([0-9][0-9])'                    + // [6] second
-  '(?:\\.([0-9]*))?'                 + // [7] fraction
-  '(?:[ \\t]*(Z|([-+])([0-9][0-9]?)' + // [8] tz [9] tz_sign [10] tz_hour
-  '(?::([0-9][0-9]))?))?$');           // [11] tz_minute
-
-function resolveYamlTimestamp(data) {
-  if (data === null) return false;
-  if (YAML_DATE_REGEXP.exec(data) !== null) return true;
-  if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;
-  return false;
-}
-
-function constructYamlTimestamp(data) {
-  var match, year, month, day, hour, minute, second, fraction = 0,
-      delta = null, tz_hour, tz_minute, date;
-
-  match = YAML_DATE_REGEXP.exec(data);
-  if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);
-
-  if (match === null) throw new Error('Date resolve error');
-
-  // match: [1] year [2] month [3] day
-
-  year = +(match[1]);
-  month = +(match[2]) - 1; // JS month starts with 0
-  day = +(match[3]);
-
-  if (!match[4]) { // no hour
-    return new Date(Date.UTC(year, month, day));
-  }
-
-  // match: [4] hour [5] minute [6] second [7] fraction
-
-  hour = +(match[4]);
-  minute = +(match[5]);
-  second = +(match[6]);
-
-  if (match[7]) {
-    fraction = match[7].slice(0, 3);
-    while (fraction.length < 3) { // milli-seconds
-      fraction += '0';
-    }
-    fraction = +fraction;
-  }
-
-  // match: [8] tz [9] tz_sign [10] tz_hour [11] tz_minute
-
-  if (match[9]) {
-    tz_hour = +(match[10]);
-    tz_minute = +(match[11] || 0);
-    delta = (tz_hour * 60 + tz_minute) * 60000; // delta in mili-seconds
-    if (match[9] === '-') delta = -delta;
-  }
-
-  date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
-
-  if (delta) date.setTime(date.getTime() - delta);
-
-  return date;
-}
-
-function representYamlTimestamp(object /*, style*/) {
-  return object.toISOString();
-}
-
-module.exports = new Type('tag:yaml.org,2002:timestamp', {
-  kind: 'scalar',
-  resolve: resolveYamlTimestamp,
-  construct: constructYamlTimestamp,
-  instanceOf: Date,
-  represent: representYamlTimestamp
-});
-
-
-/***/ }),
-/* 300 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var win32 = process && process.platform === 'win32';
-var path = __webpack_require__(0);
-var fileRe = __webpack_require__(646);
-var utils = module.exports;
-
-/**
- * Module dependencies
- */
-
-utils.diff = __webpack_require__(755);
-utils.unique = __webpack_require__(756);
-utils.braces = __webpack_require__(757);
-utils.brackets = __webpack_require__(639);
-utils.extglob = __webpack_require__(644);
-utils.isExtglob = __webpack_require__(177);
-utils.isGlob = __webpack_require__(178);
-utils.typeOf = __webpack_require__(179);
-utils.normalize = __webpack_require__(765);
-utils.omit = __webpack_require__(769);
-utils.parseGlob = __webpack_require__(773);
-utils.cache = __webpack_require__(795);
-
-/**
- * Get the filename of a filepath
- *
- * @param {String} `string`
- * @return {String}
- */
-
-utils.filename = function filename(fp) {
-  var seg = fp.match(fileRe());
-  return seg && seg[0];
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern is the same as a given `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.isPath = function isPath(pattern, opts) {
-  opts = opts || {};
-  return function(fp) {
-    var unixified = utils.unixify(fp, opts);
-    if(opts.nocase){
-      return pattern.toLowerCase() === unixified.toLowerCase();
-    }
-    return pattern === unixified;
-  };
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.hasPath = function hasPath(pattern, opts) {
-  return function(fp) {
-    return utils.unixify(pattern, opts).indexOf(fp) !== -1;
-  };
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern matches or contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.matchPath = function matchPath(pattern, opts) {
-  var fn = (opts && opts.contains)
-    ? utils.hasPath(pattern, opts)
-    : utils.isPath(pattern, opts);
-  return fn;
-};
-
-/**
- * Returns a function that returns true if the given
- * regex matches the `filename` of a file path.
- *
- * @param {RegExp} `re`
- * @return {Boolean}
- */
-
-utils.hasFilename = function hasFilename(re) {
-  return function(fp) {
-    var name = utils.filename(fp);
-    return name && re.test(name);
-  };
-};
-
-/**
- * Coerce `val` to an array
- *
- * @param  {*} val
- * @return {Array}
- */
-
-utils.arrayify = function arrayify(val) {
-  return !Array.isArray(val)
-    ? [val]
-    : val;
-};
-
-/**
- * Normalize all slashes in a file path or glob pattern to
- * forward slashes.
- */
-
-utils.unixify = function unixify(fp, opts) {
-  if (opts && opts.unixify === false) return fp;
-  if (opts && opts.unixify === true || win32 || path.sep === '\\') {
-    return utils.normalize(fp, false);
-  }
-  if (opts && opts.unescape === true) {
-    return fp ? fp.toString().replace(/\\(\w)/g, '$1') : '';
-  }
-  return fp;
-};
-
-/**
- * Escape/unescape utils
- */
-
-utils.escapePath = function escapePath(fp) {
-  return fp.replace(/[\\.]/g, '\\$&');
-};
-
-utils.unescapeGlob = function unescapeGlob(fp) {
-  return fp.replace(/[\\"']/g, '');
-};
-
-utils.escapeRe = function escapeRe(str) {
-  return str.replace(/[-[\\$*+?.#^\s{}(|)\]]/g, '\\$&');
-};
-
-/**
- * Expose `utils`
- */
-
-module.exports = utils;
-
-
-/***/ }),
-/* 301 */
-/***/ (function(module, exports) {
-
-/**
- * Helpers.
- */
-
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
-
-/**
- * Parse or format the given `val`.
- *
- * Options:
- *
- *  - `long` verbose formatting [false]
- *
- * @param {String|Number} val
- * @param {Object} [options]
- * @throws {Error} throw an error if val is not a non-empty string or a number
- * @return {String|Number}
- * @api public
- */
-
-module.exports = function(val, options) {
-  options = options || {};
-  var type = typeof val;
-  if (type === 'string' && val.length > 0) {
-    return parse(val);
-  } else if (type === 'number' && isNaN(val) === false) {
-    return options.long ? fmtLong(val) : fmtShort(val);
-  }
-  throw new Error(
-    'val is not a non-empty string or a valid number. val=' +
-      JSON.stringify(val)
-  );
-};
-
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
-
-function parse(str) {
-  str = String(str);
-  if (str.length > 100) {
-    return;
-  }
-  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
-    str
-  );
-  if (!match) {
-    return;
-  }
-  var n = parseFloat(match[1]);
-  var type = (match[2] || 'ms').toLowerCase();
-  switch (type) {
-    case 'years':
-    case 'year':
-    case 'yrs':
-    case 'yr':
-    case 'y':
-      return n * y;
-    case 'days':
-    case 'day':
-    case 'd':
-      return n * d;
-    case 'hours':
-    case 'hour':
-    case 'hrs':
-    case 'hr':
-    case 'h':
-      return n * h;
-    case 'minutes':
-    case 'minute':
-    case 'mins':
-    case 'min':
-    case 'm':
-      return n * m;
-    case 'seconds':
-    case 'second':
-    case 'secs':
-    case 'sec':
-    case 's':
-      return n * s;
-    case 'milliseconds':
-    case 'millisecond':
-    case 'msecs':
-    case 'msec':
-    case 'ms':
-      return n;
-    default:
-      return undefined;
-  }
-}
-
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtShort(ms) {
-  if (ms >= d) {
-    return Math.round(ms / d) + 'd';
-  }
-  if (ms >= h) {
-    return Math.round(ms / h) + 'h';
-  }
-  if (ms >= m) {
-    return Math.round(ms / m) + 'm';
-  }
-  if (ms >= s) {
-    return Math.round(ms / s) + 's';
-  }
-  return ms + 'ms';
-}
-
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtLong(ms) {
-  return plural(ms, d, 'day') ||
-    plural(ms, h, 'hour') ||
-    plural(ms, m, 'minute') ||
-    plural(ms, s, 'second') ||
-    ms + ' ms';
-}
-
-/**
- * Pluralization helper.
- */
-
-function plural(ms, n, name) {
-  if (ms < n) {
-    return;
-  }
-  if (ms < n * 1.5) {
-    return Math.floor(ms / n) + ' ' + name;
-  }
-  return Math.ceil(ms / n) + ' ' + name + 's';
-}
-
-
-/***/ }),
-/* 302 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(763);
-
-/***/ }),
-/* 303 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-
-/* eslint-disable no-unused-vars */
-var getOwnPropertySymbols = Object.getOwnPropertySymbols;
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-var propIsEnumerable = Object.prototype.propertyIsEnumerable;
-
-function toObject(val) {
-	if (val === null || val === undefined) {
-		throw new TypeError('Object.assign cannot be called with null or undefined');
-	}
-
-	return Object(val);
-}
-
-function shouldUseNative() {
-	try {
-		if (!Object.assign) {
-			return false;
-		}
-
-		// Detect buggy property enumeration order in older V8 versions.
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=4118
-		var test1 = new String('abc');  // eslint-disable-line no-new-wrappers
-		test1[5] = 'de';
-		if (Object.getOwnPropertyNames(test1)[0] === '5') {
-			return false;
-		}
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test2 = {};
-		for (var i = 0; i < 10; i++) {
-			test2['_' + String.fromCharCode(i)] = i;
-		}
-		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
-			return test2[n];
-		});
-		if (order2.join('') !== '0123456789') {
-			return false;
-		}
-
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test3 = {};
-		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
-			test3[letter] = letter;
-		});
-		if (Object.keys(Object.assign({}, test3)).join('') !==
-				'abcdefghijklmnopqrst') {
-			return false;
-		}
-
-		return true;
-	} catch (err) {
-		// We don't expect any of the above to throw, but better to be safe.
-		return false;
-	}
-}
-
-module.exports = shouldUseNative() ? Object.assign : function (target, source) {
-	var from;
-	var to = toObject(target);
-	var symbols;
-
-	for (var s = 1; s < arguments.length; s++) {
-		from = Object(arguments[s]);
-
-		for (var key in from) {
-			if (hasOwnProperty.call(from, key)) {
-				to[key] = from[key];
-			}
-		}
-
-		if (getOwnPropertySymbols) {
-			symbols = getOwnPropertySymbols(from);
-			for (var i = 0; i < symbols.length; i++) {
-				if (propIsEnumerable.call(from, symbols[i])) {
-					to[symbols[i]] = from[symbols[i]];
-				}
-			}
-		}
-	}
-
-	return to;
-};
-
-
-/***/ }),
-/* 304 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (root, factory){
-  'use strict';
-
-  /*istanbul ignore next:cant test*/
-  if (typeof module === 'object' && typeof module.exports === 'object') {
-    module.exports = factory();
-  } else if (true) {
-    // AMD. Register as an anonymous module.
-    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-  } else {
-    // Browser globals
-    root.objectPath = factory();
-  }
-})(this, function(){
-  'use strict';
-
-  var toStr = Object.prototype.toString;
-  function hasOwnProperty(obj, prop) {
-    if(obj == null) {
-      return false
-    }
-    //to handle objects with null prototypes (too edge case?)
-    return Object.prototype.hasOwnProperty.call(obj, prop)
-  }
-
-  function isEmpty(value){
-    if (!value) {
-      return true;
-    }
-    if (isArray(value) && value.length === 0) {
-        return true;
-    } else if (typeof value !== 'string') {
-        for (var i in value) {
-            if (hasOwnProperty(value, i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    return false;
-  }
-
-  function toString(type){
-    return toStr.call(type);
-  }
-
-  function isObject(obj){
-    return typeof obj === 'object' && toString(obj) === "[object Object]";
-  }
-
-  var isArray = Array.isArray || function(obj){
-    /*istanbul ignore next:cant test*/
-    return toStr.call(obj) === '[object Array]';
-  }
-
-  function isBoolean(obj){
-    return typeof obj === 'boolean' || toString(obj) === '[object Boolean]';
-  }
-
-  function getKey(key){
-    var intKey = parseInt(key);
-    if (intKey.toString() === key) {
-      return intKey;
-    }
-    return key;
-  }
-
-  function factory(options) {
-    options = options || {}
-
-    var objectPath = function(obj) {
-      return Object.keys(objectPath).reduce(function(proxy, prop) {
-        if(prop === 'create') {
-          return proxy;
-        }
-
-        /*istanbul ignore else*/
-        if (typeof objectPath[prop] === 'function') {
-          proxy[prop] = objectPath[prop].bind(objectPath, obj);
-        }
-
-        return proxy;
-      }, {});
-    };
-
-    function hasShallowProperty(obj, prop) {
-      return (options.includeInheritedProps || (typeof prop === 'number' && Array.isArray(obj)) || hasOwnProperty(obj, prop))
-    }
-
-    function getShallowProperty(obj, prop) {
-      if (hasShallowProperty(obj, prop)) {
-        return obj[prop];
-      }
-    }
-
-    function set(obj, path, value, doNotReplace){
-      if (typeof path === 'number') {
-        path = [path];
-      }
-      if (!path || path.length === 0) {
-        return obj;
-      }
-      if (typeof path === 'string') {
-        return set(obj, path.split('.').map(getKey), value, doNotReplace);
-      }
-      var currentPath = path[0];
-      var currentValue = getShallowProperty(obj, currentPath);
-      if (path.length === 1) {
-        if (currentValue === void 0 || !doNotReplace) {
-          obj[currentPath] = value;
-        }
-        return currentValue;
-      }
-
-      if (currentValue === void 0) {
-        //check if we assume an array
-        if(typeof path[1] === 'number') {
-          obj[currentPath] = [];
-        } else {
-          obj[currentPath] = {};
-        }
-      }
-
-      return set(obj[currentPath], path.slice(1), value, doNotReplace);
-    }
-
-    objectPath.has = function (obj, path) {
-      if (typeof path === 'number') {
-        path = [path];
-      } else if (typeof path === 'string') {
-        path = path.split('.');
-      }
-
-      if (!path || path.length === 0) {
-        return !!obj;
-      }
-
-      for (var i = 0; i < path.length; i++) {
-        var j = getKey(path[i]);
-
-        if((typeof j === 'number' && isArray(obj) && j < obj.length) ||
-          (options.includeInheritedProps ? (j in Object(obj)) : hasOwnProperty(obj, j))) {
-          obj = obj[j];
-        } else {
-          return false;
-        }
-      }
-
-      return true;
-    };
-
-    objectPath.ensureExists = function (obj, path, value){
-      return set(obj, path, value, true);
-    };
-
-    objectPath.set = function (obj, path, value, doNotReplace){
-      return set(obj, path, value, doNotReplace);
-    };
-
-    objectPath.insert = function (obj, path, value, at){
-      var arr = objectPath.get(obj, path);
-      at = ~~at;
-      if (!isArray(arr)) {
-        arr = [];
-        objectPath.set(obj, path, arr);
-      }
-      arr.splice(at, 0, value);
-    };
-
-    objectPath.empty = function(obj, path) {
-      if (isEmpty(path)) {
-        return void 0;
-      }
-      if (obj == null) {
-        return void 0;
-      }
-
-      var value, i;
-      if (!(value = objectPath.get(obj, path))) {
-        return void 0;
-      }
-
-      if (typeof value === 'string') {
-        return objectPath.set(obj, path, '');
-      } else if (isBoolean(value)) {
-        return objectPath.set(obj, path, false);
-      } else if (typeof value === 'number') {
-        return objectPath.set(obj, path, 0);
-      } else if (isArray(value)) {
-        value.length = 0;
-      } else if (isObject(value)) {
-        for (i in value) {
-          if (hasShallowProperty(value, i)) {
-            delete value[i];
-          }
-        }
-      } else {
-        return objectPath.set(obj, path, null);
-      }
-    };
-
-    objectPath.push = function (obj, path /*, values */){
-      var arr = objectPath.get(obj, path);
-      if (!isArray(arr)) {
-        arr = [];
-        objectPath.set(obj, path, arr);
-      }
-
-      arr.push.apply(arr, Array.prototype.slice.call(arguments, 2));
-    };
-
-    objectPath.coalesce = function (obj, paths, defaultValue) {
-      var value;
-
-      for (var i = 0, len = paths.length; i < len; i++) {
-        if ((value = objectPath.get(obj, paths[i])) !== void 0) {
-          return value;
-        }
-      }
-
-      return defaultValue;
-    };
-
-    objectPath.get = function (obj, path, defaultValue){
-      if (typeof path === 'number') {
-        path = [path];
-      }
-      if (!path || path.length === 0) {
-        return obj;
-      }
-      if (obj == null) {
-        return defaultValue;
-      }
-      if (typeof path === 'string') {
-        return objectPath.get(obj, path.split('.'), defaultValue);
-      }
-
-      var currentPath = getKey(path[0]);
-      var nextObj = getShallowProperty(obj, currentPath)
-      if (nextObj === void 0) {
-        return defaultValue;
-      }
-
-      if (path.length === 1) {
-        return nextObj;
-      }
-
-      return objectPath.get(obj[currentPath], path.slice(1), defaultValue);
-    };
-
-    objectPath.del = function del(obj, path) {
-      if (typeof path === 'number') {
-        path = [path];
-      }
-
-      if (obj == null) {
-        return obj;
-      }
-
-      if (isEmpty(path)) {
-        return obj;
-      }
-      if(typeof path === 'string') {
-        return objectPath.del(obj, path.split('.'));
-      }
-
-      var currentPath = getKey(path[0]);
-      if (!hasShallowProperty(obj, currentPath)) {
-        return obj;
-      }
-
-      if(path.length === 1) {
-        if (isArray(obj)) {
-          obj.splice(currentPath, 1);
-        } else {
-          delete obj[currentPath];
-        }
-      } else {
-        return objectPath.del(obj[currentPath], path.slice(1));
-      }
-
-      return obj;
-    }
-
-    return objectPath;
-  }
-
-  var mod = factory();
-  mod.create = factory;
-  mod.withInheritedProps = factory({includeInheritedProps: true})
-  return mod;
-});
-
-
-/***/ }),
-/* 305 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var jsonSafeStringify = __webpack_require__(745)
-var crypto = __webpack_require__(12)
-var Buffer = __webpack_require__(45).Buffer
-
-var defer = typeof setImmediate === 'undefined'
-  ? process.nextTick
-  : setImmediate
-
-function paramsHaveRequestBody (params) {
-  return (
-    params.body ||
-    params.requestBodyStream ||
-    (params.json && typeof params.json !== 'boolean') ||
-    params.multipart
-  )
-}
-
-function safeStringify (obj, replacer) {
-  var ret
-  try {
-    ret = JSON.stringify(obj, replacer)
-  } catch (e) {
-    ret = jsonSafeStringify(obj, replacer)
-  }
-  return ret
-}
-
-function md5 (str) {
-  return crypto.createHash('md5').update(str).digest('hex')
-}
-
-function isReadStream (rs) {
-  return rs.readable && rs.path && rs.mode
-}
-
-function toBase64 (str) {
-  return Buffer.from(str || '', 'utf8').toString('base64')
-}
-
-function copy (obj) {
-  var o = {}
-  Object.keys(obj).forEach(function (i) {
-    o[i] = obj[i]
-  })
-  return o
-}
-
-function version () {
-  var numbers = process.version.replace('v', '').split('.')
-  return {
-    major: parseInt(numbers[0], 10),
-    minor: parseInt(numbers[1], 10),
-    patch: parseInt(numbers[2], 10)
-  }
-}
-
-exports.paramsHaveRequestBody = paramsHaveRequestBody
-exports.safeStringify = safeStringify
-exports.md5 = md5
-exports.isReadStream = isReadStream
-exports.toBase64 = toBase64
-exports.copy = copy
-exports.version = version
-exports.defer = defer
-
-
-/***/ }),
-/* 306 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
-
-function specifierIncluded(specifier) {
-    var parts = specifier.split(' ');
-    var op = parts.length > 1 ? parts[0] : '=';
-    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
-
-    for (var i = 0; i < 3; ++i) {
-        var cur = Number(current[i] || 0);
-        var ver = Number(versionParts[i] || 0);
-        if (cur === ver) {
-            continue; // eslint-disable-line no-restricted-syntax, no-continue
-        }
-        if (op === '<') {
-            return cur < ver;
-        } else if (op === '>=') {
-            return cur >= ver;
-        } else {
-            return false;
-        }
-    }
-    return op === '>=';
-}
-
-function matchesRange(range) {
-    var specifiers = range.split(/ ?&& ?/);
-    if (specifiers.length === 0) { return false; }
-    for (var i = 0; i < specifiers.length; ++i) {
-        if (!specifierIncluded(specifiers[i])) { return false; }
-    }
-    return true;
-}
-
-function versionIncluded(specifierValue) {
-    if (typeof specifierValue === 'boolean') { return specifierValue; }
-    if (specifierValue && typeof specifierValue === 'object') {
-        for (var i = 0; i < specifierValue.length; ++i) {
-            if (matchesRange(specifierValue[i])) { return true; }
-        }
-        return false;
-    }
-    return matchesRange(specifierValue);
-}
-
-var data = __webpack_require__(816);
-
-var core = {};
-for (var mod in data) { // eslint-disable-line no-restricted-syntax
-    if (Object.prototype.hasOwnProperty.call(data, mod)) {
-        core[mod] = versionIncluded(data[mod]);
-    }
-}
-module.exports = core;
-
-
-/***/ }),
-/* 307 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = rimraf
-rimraf.sync = rimrafSync
-
-var assert = __webpack_require__(28)
-var path = __webpack_require__(0)
-var fs = __webpack_require__(5)
-var glob = __webpack_require__(99)
-var _0666 = parseInt('666', 8)
-
-var defaultGlobOpts = {
-  nosort: true,
-  silent: true
-}
-
-// for EMFILE handling
-var timeout = 0
-
-var isWindows = (process.platform === "win32")
-
-function defaults (options) {
-  var methods = [
-    'unlink',
-    'chmod',
-    'stat',
-    'lstat',
-    'rmdir',
-    'readdir'
-  ]
-  methods.forEach(function(m) {
-    options[m] = options[m] || fs[m]
-    m = m + 'Sync'
-    options[m] = options[m] || fs[m]
-  })
-
-  options.maxBusyTries = options.maxBusyTries || 3
-  options.emfileWait = options.emfileWait || 1000
-  if (options.glob === false) {
-    options.disableGlob = true
-  }
-  options.disableGlob = options.disableGlob || false
-  options.glob = options.glob || defaultGlobOpts
-}
-
-function rimraf (p, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
-
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
-  assert(options, 'rimraf: invalid options argument provided')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
-
-  defaults(options)
-
-  var busyTries = 0
-  var errState = null
-  var n = 0
-
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
-
-  options.lstat(p, function (er, stat) {
-    if (!er)
-      return afterGlob(null, [p])
-
-    glob(p, options.glob, afterGlob)
-  })
-
-  function next (er) {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
-
-  function afterGlob (er, results) {
-    if (er)
-      return cb(er)
-
-    n = results.length
-    if (n === 0)
-      return cb()
-
-    results.forEach(function (p) {
-      rimraf_(p, options, function CB (er) {
-        if (er) {
-          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
-              busyTries < options.maxBusyTries) {
-            busyTries ++
-            var time = busyTries * 100
-            // try again, with the same exact callback as this one.
-            return setTimeout(function () {
-              rimraf_(p, options, CB)
-            }, time)
-          }
-
-          // this one won't happen if graceful-fs is used.
-          if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(function () {
-              rimraf_(p, options, CB)
-            }, timeout ++)
-          }
-
-          // already gone
-          if (er.code === "ENOENT") er = null
-        }
-
-        timeout = 0
-        next(er)
-      })
-    })
-  }
-}
-
-// Two possible strategies.
-// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
-// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
-//
-// Both result in an extra syscall when you guess wrong.  However, there
-// are likely far more normal files in the world than directories.  This
-// is based on the assumption that a the average number of files per
-// directory is >= 1.
-//
-// If anyone ever complains about this, then I guess the strategy could
-// be made configurable somehow.  But until then, YAGNI.
-function rimraf_ (p, options, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-
-  // sunos lets the root user unlink directories, which is... weird.
-  // so we have to lstat here and make sure it's not a dir.
-  options.lstat(p, function (er, st) {
-    if (er && er.code === "ENOENT")
-      return cb(null)
-
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
-
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
-
-    options.unlink(p, function (er) {
-      if (er) {
-        if (er.code === "ENOENT")
-          return cb(null)
-        if (er.code === "EPERM")
-          return (isWindows)
-            ? fixWinEPERM(p, options, er, cb)
-            : rmdir(p, options, er, cb)
-        if (er.code === "EISDIR")
-          return rmdir(p, options, er, cb)
-      }
-      return cb(er)
-    })
-  })
-}
-
-function fixWinEPERM (p, options, er, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-  if (er)
-    assert(er instanceof Error)
-
-  options.chmod(p, _0666, function (er2) {
-    if (er2)
-      cb(er2.code === "ENOENT" ? null : er)
-    else
-      options.stat(p, function(er3, stats) {
-        if (er3)
-          cb(er3.code === "ENOENT" ? null : er)
-        else if (stats.isDirectory())
-          rmdir(p, options, er, cb)
-        else
-          options.unlink(p, cb)
-      })
-  })
-}
-
-function fixWinEPERMSync (p, options, er) {
-  assert(p)
-  assert(options)
-  if (er)
-    assert(er instanceof Error)
-
-  try {
-    options.chmodSync(p, _0666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
-
-  try {
-    var stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
-  }
-
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
-}
-
-function rmdir (p, options, originalEr, cb) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-  assert(typeof cb === 'function')
-
-  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
-  // if we guessed wrong, and it's not a directory, then
-  // raise the original error.
-  options.rmdir(p, function (er) {
-    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
-      rmkids(p, options, cb)
-    else if (er && er.code === "ENOTDIR")
-      cb(originalEr)
-    else
-      cb(er)
-  })
-}
-
-function rmkids(p, options, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-
-  options.readdir(p, function (er, files) {
-    if (er)
-      return cb(er)
-    var n = files.length
-    if (n === 0)
-      return options.rmdir(p, cb)
-    var errState
-    files.forEach(function (f) {
-      rimraf(path.join(p, f), options, function (er) {
-        if (errState)
-          return
-        if (er)
-          return cb(errState = er)
-        if (--n === 0)
-          options.rmdir(p, cb)
-      })
-    })
-  })
-}
-
-// this looks simpler, and is strictly *faster*, but will
-// tie up the JavaScript thread and fail on excessively
-// deep directory trees.
-function rimrafSync (p, options) {
-  options = options || {}
-  defaults(options)
-
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert(options, 'rimraf: missing options')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
-
-  var results
-
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
-  }
-
-  if (!results.length)
-    return
-
-  for (var i = 0; i < results.length; i++) {
-    var p = results[i]
-
-    try {
-      var st = options.lstatSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
-
-      // Windows can EPERM on stat.  Life is suffering.
-      if (er.code === "EPERM" && isWindows)
-        fixWinEPERMSync(p, options, er)
-    }
-
-    try {
-      // sunos lets the root user unlink directories, which is... weird.
-      if (st && st.isDirectory())
-        rmdirSync(p, options, null)
-      else
-        options.unlinkSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
-      if (er.code === "EPERM")
-        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
-      if (er.code !== "EISDIR")
-        throw er
-
-      rmdirSync(p, options, er)
-    }
-  }
-}
-
-function rmdirSync (p, options, originalEr) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-
-  try {
-    options.rmdirSync(p)
-  } catch (er) {
-    if (er.code === "ENOENT")
-      return
-    if (er.code === "ENOTDIR")
-      throw originalEr
-    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
-      rmkidsSync(p, options)
-  }
-}
-
-function rmkidsSync (p, options) {
-  assert(p)
-  assert(options)
-  options.readdirSync(p).forEach(function (f) {
-    rimrafSync(path.join(p, f), options)
-  })
-
-  // We only end up here once we got ENOTEMPTY at least once, and
-  // at this point, we are guaranteed to have removed all the kids.
-  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
-  // try really hard to delete stuff on windows, because it has a
-  // PROFOUNDLY annoying habit of not closing handles promptly when
-  // files are deleted, resulting in spurious ENOTEMPTY errors.
-  var retries = isWindows ? 100 : 1
-  var i = 0
-  do {
-    var threw = true
-    try {
-      var ret = options.rmdirSync(p, options)
-      threw = false
-      return ret
-    } finally {
-      if (++i < retries && threw)
-        continue
-    }
-  } while (true)
-}
-
-
-/***/ }),
-/* 308 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ReplaySubject; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__ = __webpack_require__(439);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__ = __webpack_require__(434);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__ = __webpack_require__(189);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__ = __webpack_require__(422);
-/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */
-
-
-
-
-
-
-
-var ReplaySubject = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ReplaySubject, _super);
-    function ReplaySubject(bufferSize, windowTime, scheduler) {
-        if (bufferSize === void 0) {
-            bufferSize = Number.POSITIVE_INFINITY;
-        }
-        if (windowTime === void 0) {
-            windowTime = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this) || this;
-        _this.scheduler = scheduler;
-        _this._events = [];
-        _this._infiniteTimeWindow = false;
-        _this._bufferSize = bufferSize < 1 ? 1 : bufferSize;
-        _this._windowTime = windowTime < 1 ? 1 : windowTime;
-        if (windowTime === Number.POSITIVE_INFINITY) {
-            _this._infiniteTimeWindow = true;
-            _this.next = _this.nextInfiniteTimeWindow;
-        }
-        else {
-            _this.next = _this.nextTimeWindow;
-        }
-        return _this;
-    }
-    ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) {
-        var _events = this._events;
-        _events.push(value);
-        if (_events.length > this._bufferSize) {
-            _events.shift();
-        }
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype.nextTimeWindow = function (value) {
-        this._events.push(new ReplayEvent(this._getNow(), value));
-        this._trimBufferThenGetEvents();
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype._subscribe = function (subscriber) {
-        var _infiniteTimeWindow = this._infiniteTimeWindow;
-        var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents();
-        var scheduler = this.scheduler;
-        var len = _events.length;
-        var subscription;
-        if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        else if (this.isStopped || this.hasError) {
-            subscription = __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY;
-        }
-        else {
-            this.observers.push(subscriber);
-            subscription = new __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber);
-        }
-        if (scheduler) {
-            subscriber.add(subscriber = new __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__["a" /* ObserveOnSubscriber */](subscriber, scheduler));
-        }
-        if (_infiniteTimeWindow) {
-            for (var i = 0; i < len && !subscriber.closed; i++) {
-                subscriber.next(_events[i]);
-            }
-        }
-        else {
-            for (var i = 0; i < len && !subscriber.closed; i++) {
-                subscriber.next(_events[i].value);
-            }
-        }
-        if (this.hasError) {
-            subscriber.error(this.thrownError);
-        }
-        else if (this.isStopped) {
-            subscriber.complete();
-        }
-        return subscription;
-    };
-    ReplaySubject.prototype._getNow = function () {
-        return (this.scheduler || __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__["a" /* queue */]).now();
-    };
-    ReplaySubject.prototype._trimBufferThenGetEvents = function () {
-        var now = this._getNow();
-        var _bufferSize = this._bufferSize;
-        var _windowTime = this._windowTime;
-        var _events = this._events;
-        var eventsCount = _events.length;
-        var spliceCount = 0;
-        while (spliceCount < eventsCount) {
-            if ((now - _events[spliceCount].time) < _windowTime) {
-                break;
-            }
-            spliceCount++;
-        }
-        if (eventsCount > _bufferSize) {
-            spliceCount = Math.max(spliceCount, eventsCount - _bufferSize);
-        }
-        if (spliceCount > 0) {
-            _events.splice(0, spliceCount);
-        }
-        return _events;
-    };
-    return ReplaySubject;
-}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
-
-var ReplayEvent = /*@__PURE__*/ (function () {
-    function ReplayEvent(time, value) {
-        this.time = time;
-        this.value = value;
-    }
-    return ReplayEvent;
-}());
-//# sourceMappingURL=ReplaySubject.js.map
-
-
-/***/ }),
-/* 309 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = combineLatest;
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return CombineLatestOperator; });
-/* unused harmony export CombineLatestSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(85);
-/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */
-
-
-
-
-
-
-var NONE = {};
-function combineLatest() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var resultSelector = null;
-    var scheduler = null;
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isScheduler__["a" /* isScheduler */])(observables[observables.length - 1])) {
-        scheduler = observables.pop();
-    }
-    if (typeof observables[observables.length - 1] === 'function') {
-        resultSelector = observables.pop();
-    }
-    if (observables.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(observables[0])) {
-        observables = observables[0];
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(observables, scheduler).lift(new CombineLatestOperator(resultSelector));
-}
-var CombineLatestOperator = /*@__PURE__*/ (function () {
-    function CombineLatestOperator(resultSelector) {
-        this.resultSelector = resultSelector;
-    }
-    CombineLatestOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector));
-    };
-    return CombineLatestOperator;
-}());
-
-var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CombineLatestSubscriber, _super);
-    function CombineLatestSubscriber(destination, resultSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.resultSelector = resultSelector;
-        _this.active = 0;
-        _this.values = [];
-        _this.observables = [];
-        return _this;
-    }
-    CombineLatestSubscriber.prototype._next = function (observable) {
-        this.values.push(NONE);
-        this.observables.push(observable);
-    };
-    CombineLatestSubscriber.prototype._complete = function () {
-        var observables = this.observables;
-        var len = observables.length;
-        if (len === 0) {
-            this.destination.complete();
-        }
-        else {
-            this.active = len;
-            this.toRespond = len;
-            for (var i = 0; i < len; i++) {
-                var observable = observables[i];
-                this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, observable, observable, i));
-            }
-        }
-    };
-    CombineLatestSubscriber.prototype.notifyComplete = function (unused) {
-        if ((this.active -= 1) === 0) {
-            this.destination.complete();
-        }
-    };
-    CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var values = this.values;
-        var oldVal = values[outerIndex];
-        var toRespond = !this.toRespond
-            ? 0
-            : oldVal === NONE ? --this.toRespond : this.toRespond;
-        values[outerIndex] = innerValue;
-        if (toRespond === 0) {
-            if (this.resultSelector) {
-                this._tryResultSelector(values);
-            }
-            else {
-                this.destination.next(values.slice());
-            }
-        }
-    };
-    CombineLatestSubscriber.prototype._tryResultSelector = function (values) {
-        var result;
-        try {
-            result = this.resultSelector.apply(this, values);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return CombineLatestSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-
-//# sourceMappingURL=combineLatest.js.map
-
-
-/***/ }),
-/* 310 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = defer;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(62);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
-
-
-
-function defer(observableFactory) {
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var input;
-        try {
-            input = observableFactory();
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var source = input ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(input) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__empty__["a" /* empty */])();
-        return source.subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=defer.js.map
-
-
-/***/ }),
-/* 311 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = of;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(48);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(85);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scalar__ = __webpack_require__(312);
-/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_empty,_scalar PURE_IMPORTS_END */
-
-
-
-
-function of() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var scheduler = args[args.length - 1];
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
-        args.pop();
-    }
-    else {
-        scheduler = undefined;
-    }
-    switch (args.length) {
-        case 0:
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__empty__["a" /* empty */])(scheduler);
-        case 1:
-            return scheduler ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__scalar__["a" /* scalar */])(args[0]);
-        default:
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler);
-    }
-}
-//# sourceMappingURL=of.js.map
-
-
-/***/ }),
-/* 312 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = scalar;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-function scalar(value) {
-    var result = new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        subscriber.next(value);
-        subscriber.complete();
-    });
-    result._isScalar = true;
-    result.value = value;
-    return result;
-}
-//# sourceMappingURL=scalar.js.map
-
-
-/***/ }),
-/* 313 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = throwError;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-function throwError(error, scheduler) {
-    if (!scheduler) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.error(error); });
-    }
-    else {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); });
-    }
-}
-function dispatch(_a) {
-    var error = _a.error, subscriber = _a.subscriber;
-    subscriber.error(error);
-}
-//# sourceMappingURL=throwError.js.map
-
-
-/***/ }),
-/* 314 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = zip;
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return ZipOperator; });
-/* unused harmony export ZipSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(85);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__ = __webpack_require__(151);
-/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */
-
-
-
-
-
-
-
-function zip() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var resultSelector = observables[observables.length - 1];
-    if (typeof resultSelector === 'function') {
-        observables.pop();
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(observables, undefined).lift(new ZipOperator(resultSelector));
-}
-var ZipOperator = /*@__PURE__*/ (function () {
-    function ZipOperator(resultSelector) {
-        this.resultSelector = resultSelector;
-    }
-    ZipOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector));
-    };
-    return ZipOperator;
-}());
-
-var ZipSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipSubscriber, _super);
-    function ZipSubscriber(destination, resultSelector, values) {
-        if (values === void 0) {
-            values = Object.create(null);
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.iterators = [];
-        _this.active = 0;
-        _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null;
-        _this.values = values;
-        return _this;
-    }
-    ZipSubscriber.prototype._next = function (value) {
-        var iterators = this.iterators;
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(value)) {
-            iterators.push(new StaticArrayIterator(value));
-        }
-        else if (typeof value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] === 'function') {
-            iterators.push(new StaticIterator(value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]]()));
-        }
-        else {
-            iterators.push(new ZipBufferIterator(this.destination, this, value));
-        }
-    };
-    ZipSubscriber.prototype._complete = function () {
-        var iterators = this.iterators;
-        var len = iterators.length;
-        this.unsubscribe();
-        if (len === 0) {
-            this.destination.complete();
-            return;
-        }
-        this.active = len;
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            if (iterator.stillUnsubscribed) {
-                var destination = this.destination;
-                destination.add(iterator.subscribe(iterator, i));
-            }
-            else {
-                this.active--;
-            }
-        }
-    };
-    ZipSubscriber.prototype.notifyInactive = function () {
-        this.active--;
-        if (this.active === 0) {
-            this.destination.complete();
-        }
-    };
-    ZipSubscriber.prototype.checkIterators = function () {
-        var iterators = this.iterators;
-        var len = iterators.length;
-        var destination = this.destination;
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) {
-                return;
-            }
-        }
-        var shouldComplete = false;
-        var args = [];
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            var result = iterator.next();
-            if (iterator.hasCompleted()) {
-                shouldComplete = true;
-            }
-            if (result.done) {
-                destination.complete();
-                return;
-            }
-            args.push(result.value);
-        }
-        if (this.resultSelector) {
-            this._tryresultSelector(args);
-        }
-        else {
-            destination.next(args);
-        }
-        if (shouldComplete) {
-            destination.complete();
-        }
-    };
-    ZipSubscriber.prototype._tryresultSelector = function (args) {
-        var result;
-        try {
-            result = this.resultSelector.apply(this, args);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return ZipSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
-
-var StaticIterator = /*@__PURE__*/ (function () {
-    function StaticIterator(iterator) {
-        this.iterator = iterator;
-        this.nextResult = iterator.next();
-    }
-    StaticIterator.prototype.hasValue = function () {
-        return true;
-    };
-    StaticIterator.prototype.next = function () {
-        var result = this.nextResult;
-        this.nextResult = this.iterator.next();
-        return result;
-    };
-    StaticIterator.prototype.hasCompleted = function () {
-        var nextResult = this.nextResult;
-        return nextResult && nextResult.done;
-    };
-    return StaticIterator;
-}());
-var StaticArrayIterator = /*@__PURE__*/ (function () {
-    function StaticArrayIterator(array) {
-        this.array = array;
-        this.index = 0;
-        this.length = 0;
-        this.length = array.length;
-    }
-    StaticArrayIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () {
-        return this;
-    };
-    StaticArrayIterator.prototype.next = function (value) {
-        var i = this.index++;
-        var array = this.array;
-        return i < this.length ? { value: array[i], done: false } : { value: null, done: true };
-    };
-    StaticArrayIterator.prototype.hasValue = function () {
-        return this.array.length > this.index;
-    };
-    StaticArrayIterator.prototype.hasCompleted = function () {
-        return this.array.length === this.index;
-    };
-    return StaticArrayIterator;
-}());
-var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipBufferIterator, _super);
-    function ZipBufferIterator(destination, parent, observable) {
-        var _this = _super.call(this, destination) || this;
-        _this.parent = parent;
-        _this.observable = observable;
-        _this.stillUnsubscribed = true;
-        _this.buffer = [];
-        _this.isComplete = false;
-        return _this;
-    }
-    ZipBufferIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () {
-        return this;
-    };
-    ZipBufferIterator.prototype.next = function () {
-        var buffer = this.buffer;
-        if (buffer.length === 0 && this.isComplete) {
-            return { value: null, done: true };
-        }
-        else {
-            return { value: buffer.shift(), done: false };
-        }
-    };
-    ZipBufferIterator.prototype.hasValue = function () {
-        return this.buffer.length > 0;
-    };
-    ZipBufferIterator.prototype.hasCompleted = function () {
-        return this.buffer.length === 0 && this.isComplete;
-    };
-    ZipBufferIterator.prototype.notifyComplete = function () {
-        if (this.buffer.length > 0) {
-            this.isComplete = true;
-            this.parent.notifyInactive();
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.buffer.push(innerValue);
-        this.parent.checkIterators();
-    };
-    ZipBufferIterator.prototype.subscribe = function (value, index) {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, this.observable, this, index);
-    };
-    return ZipBufferIterator;
-}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=zip.js.map
-
-
-/***/ }),
-/* 315 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = mergeAll;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
-/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
-
-
-function mergeAll(concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(__WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */], concurrent);
-}
-//# sourceMappingURL=mergeAll.js.map
-
-
-/***/ }),
-/* 316 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = refCount;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function refCount() {
-    return function refCountOperatorFunction(source) {
-        return source.lift(new RefCountOperator(source));
-    };
-}
-var RefCountOperator = /*@__PURE__*/ (function () {
-    function RefCountOperator(connectable) {
-        this.connectable = connectable;
-    }
-    RefCountOperator.prototype.call = function (subscriber, source) {
-        var connectable = this.connectable;
-        connectable._refCount++;
-        var refCounter = new RefCountSubscriber(subscriber, connectable);
-        var subscription = source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            refCounter.connection = connectable.connect();
-        }
-        return subscription;
-    };
-    return RefCountOperator;
-}());
-var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RefCountSubscriber, _super);
-    function RefCountSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    RefCountSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (!connectable) {
-            this.connection = null;
-            return;
-        }
-        this.connectable = null;
-        var refCount = connectable._refCount;
-        if (refCount <= 0) {
-            this.connection = null;
-            return;
-        }
-        connectable._refCount = refCount - 1;
-        if (refCount > 1) {
-            this.connection = null;
-            return;
-        }
-        var connection = this.connection;
-        var sharedConnection = connectable._connection;
-        this.connection = null;
-        if (sharedConnection && (!connection || sharedConnection === connection)) {
-            sharedConnection.unsubscribe();
-        }
-    };
-    return RefCountSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=refCount.js.map
-
-
-/***/ }),
-/* 317 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = scan;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function scan(accumulator, seed) {
-    var hasSeed = false;
-    if (arguments.length >= 2) {
-        hasSeed = true;
-    }
-    return function scanOperatorFunction(source) {
-        return source.lift(new ScanOperator(accumulator, seed, hasSeed));
-    };
-}
-var ScanOperator = /*@__PURE__*/ (function () {
-    function ScanOperator(accumulator, seed, hasSeed) {
-        if (hasSeed === void 0) {
-            hasSeed = false;
-        }
-        this.accumulator = accumulator;
-        this.seed = seed;
-        this.hasSeed = hasSeed;
-    }
-    ScanOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed));
-    };
-    return ScanOperator;
-}());
-var ScanSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ScanSubscriber, _super);
-    function ScanSubscriber(destination, accumulator, _seed, hasSeed) {
-        var _this = _super.call(this, destination) || this;
-        _this.accumulator = accumulator;
-        _this._seed = _seed;
-        _this.hasSeed = hasSeed;
-        _this.index = 0;
-        return _this;
-    }
-    Object.defineProperty(ScanSubscriber.prototype, "seed", {
-        get: function () {
-            return this._seed;
-        },
-        set: function (value) {
-            this.hasSeed = true;
-            this._seed = value;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    ScanSubscriber.prototype._next = function (value) {
-        if (!this.hasSeed) {
-            this.seed = value;
-            this.destination.next(value);
-        }
-        else {
-            return this._tryNext(value);
-        }
-    };
-    ScanSubscriber.prototype._tryNext = function (value) {
-        var index = this.index++;
-        var result;
-        try {
-            result = this.accumulator(this.seed, value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-        this.seed = result;
-        this.destination.next(result);
-    };
-    return ScanSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=scan.js.map
-
-
-/***/ }),
-/* 318 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = switchMap;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
-
-
-
-
-
-
-function switchMap(project, resultSelector) {
-    if (typeof resultSelector === 'function') {
-        return function (source) { return source.pipe(switchMap(function (a, i) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__observable_from__["a" /* from */])(project(a, i)).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
-    }
-    return function (source) { return source.lift(new SwitchMapOperator(project)); };
-}
-var SwitchMapOperator = /*@__PURE__*/ (function () {
-    function SwitchMapOperator(project) {
-        this.project = project;
-    }
-    SwitchMapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SwitchMapSubscriber(subscriber, this.project));
-    };
-    return SwitchMapOperator;
-}());
-var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SwitchMapSubscriber, _super);
-    function SwitchMapSubscriber(destination, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.index = 0;
-        return _this;
-    }
-    SwitchMapSubscriber.prototype._next = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (error) {
-            this.destination.error(error);
-            return;
-        }
-        this._innerSub(result, value, index);
-    };
-    SwitchMapSubscriber.prototype._innerSub = function (result, value, index) {
-        var innerSubscription = this.innerSubscription;
-        if (innerSubscription) {
-            innerSubscription.unsubscribe();
-        }
-        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        this.innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index, innerSubscriber);
-    };
-    SwitchMapSubscriber.prototype._complete = function () {
-        var innerSubscription = this.innerSubscription;
-        if (!innerSubscription || innerSubscription.closed) {
-            _super.prototype._complete.call(this);
-        }
-        this.unsubscribe();
-    };
-    SwitchMapSubscriber.prototype._unsubscribe = function () {
-        this.innerSubscription = null;
-    };
-    SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.innerSubscription = null;
-        if (this.isStopped) {
-            _super.prototype._complete.call(this);
-        }
-    };
-    SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    return SwitchMapSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=switchMap.js.map
-
-
-/***/ }),
-/* 319 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = take;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
-
-
-
-
-function take(count) {
-    return function (source) {
-        if (count === 0) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["a" /* empty */])();
-        }
-        else {
-            return source.lift(new TakeOperator(count));
-        }
-    };
-}
-var TakeOperator = /*@__PURE__*/ (function () {
-    function TakeOperator(total) {
-        this.total = total;
-        if (this.total < 0) {
-            throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */];
-        }
-    }
-    TakeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeSubscriber(subscriber, this.total));
-    };
-    return TakeOperator;
-}());
-var TakeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeSubscriber, _super);
-    function TakeSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.count = 0;
-        return _this;
-    }
-    TakeSubscriber.prototype._next = function (value) {
-        var total = this.total;
-        var count = ++this.count;
-        if (count <= total) {
-            this.destination.next(value);
-            if (count === total) {
-                this.destination.complete();
-                this.unsubscribe();
-            }
-        }
-    };
-    return TakeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=take.js.map
-
-
-/***/ }),
-/* 320 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = takeLast;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
-
-
-
-
-function takeLast(count) {
-    return function takeLastOperatorFunction(source) {
-        if (count === 0) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["a" /* empty */])();
-        }
-        else {
-            return source.lift(new TakeLastOperator(count));
-        }
-    };
-}
-var TakeLastOperator = /*@__PURE__*/ (function () {
-    function TakeLastOperator(total) {
-        this.total = total;
-        if (this.total < 0) {
-            throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */];
-        }
-    }
-    TakeLastOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeLastSubscriber(subscriber, this.total));
-    };
-    return TakeLastOperator;
-}());
-var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeLastSubscriber, _super);
-    function TakeLastSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.ring = new Array();
-        _this.count = 0;
-        return _this;
-    }
-    TakeLastSubscriber.prototype._next = function (value) {
-        var ring = this.ring;
-        var total = this.total;
-        var count = this.count++;
-        if (ring.length < total) {
-            ring.push(value);
-        }
-        else {
-            var index = count % total;
-            ring[index] = value;
-        }
-    };
-    TakeLastSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        var count = this.count;
-        if (count > 0) {
-            var total = this.count >= this.total ? this.total : this.count;
-            var ring = this.ring;
-            for (var i = 0; i < total; i++) {
-                var idx = (count++) % total;
-                destination.next(ring[idx]);
-            }
-        }
-        destination.complete();
-    };
-    return TakeLastSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=takeLast.js.map
-
-
-/***/ }),
-/* 321 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return rxSubscriber; });
-/* unused harmony export $$rxSubscriber */
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var rxSubscriber = typeof Symbol === 'function'
-    ? /*@__PURE__*/ Symbol('rxSubscriber')
-    : '@@rxSubscriber_' + /*@__PURE__*/ Math.random();
-var $$rxSubscriber = rxSubscriber;
-//# sourceMappingURL=rxSubscriber.js.map
-
-
-/***/ }),
-/* 322 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = canReportError;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */
-
-function canReportError(observer) {
-    while (observer) {
-        var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped;
-        if (closed_1 || isStopped) {
-            return false;
-        }
-        else if (destination && destination instanceof __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */]) {
-            observer = destination;
-        }
-        else {
-            observer = null;
-        }
-    }
-    return true;
-}
-//# sourceMappingURL=canReportError.js.map
-
-
-/***/ }),
-/* 323 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = hostReportError;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function hostReportError(err) {
-    setTimeout(function () { throw err; });
-}
-//# sourceMappingURL=hostReportError.js.map
-
-
-/***/ }),
-/* 324 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = pipe;
-/* harmony export (immutable) */ __webpack_exports__["b"] = pipeFromArray;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__noop__ = __webpack_require__(191);
-/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */
-
-function pipe() {
-    var fns = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        fns[_i] = arguments[_i];
-    }
-    return pipeFromArray(fns);
-}
-function pipeFromArray(fns) {
-    if (!fns) {
-        return __WEBPACK_IMPORTED_MODULE_0__noop__["a" /* noop */];
-    }
-    if (fns.length === 1) {
-        return fns[0];
-    }
-    return function piped(input) {
-        return fns.reduce(function (prev, fn) { return fn(prev); }, input);
-    };
-}
-//# sourceMappingURL=pipe.js.map
-
-
-/***/ }),
-/* 325 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = {
-	DiffieHellman: DiffieHellman,
-	generateECDSA: generateECDSA,
-	generateED25519: generateED25519
-};
-
-var assert = __webpack_require__(16);
-var crypto = __webpack_require__(12);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var nacl;
-
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-
-var CRYPTO_HAVE_ECDH = (crypto.createECDH !== undefined);
-
-var ecdh, ec, jsbn;
-
-function DiffieHellman(key) {
-	utils.assertCompatible(key, Key, [1, 4], 'key');
-	this._isPriv = PrivateKey.isPrivateKey(key, [1, 3]);
-	this._algo = key.type;
-	this._curve = key.curve;
-	this._key = key;
-	if (key.type === 'dsa') {
-		if (!CRYPTO_HAVE_ECDH) {
-			throw (new Error('Due to bugs in the node 0.10 ' +
-			    'crypto API, node 0.12.x or later is required ' +
-			    'to use DH'));
-		}
-		this._dh = crypto.createDiffieHellman(
-		    key.part.p.data, undefined,
-		    key.part.g.data, undefined);
-		this._p = key.part.p;
-		this._g = key.part.g;
-		if (this._isPriv)
-			this._dh.setPrivateKey(key.part.x.data);
-		this._dh.setPublicKey(key.part.y.data);
-
-	} else if (key.type === 'ecdsa') {
-		if (!CRYPTO_HAVE_ECDH) {
-			if (ecdh === undefined)
-				ecdh = __webpack_require__(387);
-			if (ec === undefined)
-				ec = __webpack_require__(139);
-			if (jsbn === undefined)
-				jsbn = __webpack_require__(81).BigInteger;
-
-			this._ecParams = new X9ECParameters(this._curve);
-
-			if (this._isPriv) {
-				this._priv = new ECPrivate(
-				    this._ecParams, key.part.d.data);
-			}
-			return;
-		}
-
-		var curve = {
-			'nistp256': 'prime256v1',
-			'nistp384': 'secp384r1',
-			'nistp521': 'secp521r1'
-		}[key.curve];
-		this._dh = crypto.createECDH(curve);
-		if (typeof (this._dh) !== 'object' ||
-		    typeof (this._dh.setPrivateKey) !== 'function') {
-			CRYPTO_HAVE_ECDH = false;
-			DiffieHellman.call(this, key);
-			return;
-		}
-		if (this._isPriv)
-			this._dh.setPrivateKey(key.part.d.data);
-		this._dh.setPublicKey(key.part.Q.data);
-
-	} else if (key.type === 'curve25519') {
-		if (nacl === undefined)
-			nacl = __webpack_require__(75);
-
-		if (this._isPriv) {
-			utils.assertCompatible(key, PrivateKey, [1, 5], 'key');
-			this._priv = key.part.k.data;
-		}
-
-	} else {
-		throw (new Error('DH not supported for ' + key.type + ' keys'));
-	}
-}
-
-DiffieHellman.prototype.getPublicKey = function () {
-	if (this._isPriv)
-		return (this._key.toPublic());
-	return (this._key);
-};
-
-DiffieHellman.prototype.getPrivateKey = function () {
-	if (this._isPriv)
-		return (this._key);
-	else
-		return (undefined);
-};
-DiffieHellman.prototype.getKey = DiffieHellman.prototype.getPrivateKey;
-
-DiffieHellman.prototype._keyCheck = function (pk, isPub) {
-	assert.object(pk, 'key');
-	if (!isPub)
-		utils.assertCompatible(pk, PrivateKey, [1, 3], 'key');
-	utils.assertCompatible(pk, Key, [1, 4], 'key');
-
-	if (pk.type !== this._algo) {
-		throw (new Error('A ' + pk.type + ' key cannot be used in ' +
-		    this._algo + ' Diffie-Hellman'));
-	}
-
-	if (pk.curve !== this._curve) {
-		throw (new Error('A key from the ' + pk.curve + ' curve ' +
-		    'cannot be used with a ' + this._curve +
-		    ' Diffie-Hellman'));
-	}
-
-	if (pk.type === 'dsa') {
-		assert.deepEqual(pk.part.p, this._p,
-		    'DSA key prime does not match');
-		assert.deepEqual(pk.part.g, this._g,
-		    'DSA key generator does not match');
-	}
-};
-
-DiffieHellman.prototype.setKey = function (pk) {
-	this._keyCheck(pk);
-
-	if (pk.type === 'dsa') {
-		this._dh.setPrivateKey(pk.part.x.data);
-		this._dh.setPublicKey(pk.part.y.data);
-
-	} else if (pk.type === 'ecdsa') {
-		if (CRYPTO_HAVE_ECDH) {
-			this._dh.setPrivateKey(pk.part.d.data);
-			this._dh.setPublicKey(pk.part.Q.data);
-		} else {
-			this._priv = new ECPrivate(
-			    this._ecParams, pk.part.d.data);
-		}
-
-	} else if (pk.type === 'curve25519') {
-		var k = pk.part.k;
-		if (!pk.part.k)
-			k = pk.part.r;
-		this._priv = k.data;
-		if (this._priv[0] === 0x00)
-			this._priv = this._priv.slice(1);
-		this._priv = this._priv.slice(0, 32);
-	}
-	this._key = pk;
-	this._isPriv = true;
-};
-DiffieHellman.prototype.setPrivateKey = DiffieHellman.prototype.setKey;
-
-DiffieHellman.prototype.computeSecret = function (otherpk) {
-	this._keyCheck(otherpk, true);
-	if (!this._isPriv)
-		throw (new Error('DH exchange has not been initialized with ' +
-		    'a private key yet'));
-
-	var pub;
-	if (this._algo === 'dsa') {
-		return (this._dh.computeSecret(
-		    otherpk.part.y.data));
-
-	} else if (this._algo === 'ecdsa') {
-		if (CRYPTO_HAVE_ECDH) {
-			return (this._dh.computeSecret(
-			    otherpk.part.Q.data));
-		} else {
-			pub = new ECPublic(
-			    this._ecParams, otherpk.part.Q.data);
-			return (this._priv.deriveSharedSecret(pub));
-		}
-
-	} else if (this._algo === 'curve25519') {
-		pub = otherpk.part.A.data;
-		while (pub[0] === 0x00 && pub.length > 32)
-			pub = pub.slice(1);
-		var priv = this._priv;
-		assert.strictEqual(pub.length, 32);
-		assert.strictEqual(priv.length, 32);
-
-		var secret = nacl.box.before(new Uint8Array(pub),
-		    new Uint8Array(priv));
-
-		return (Buffer.from(secret));
-	}
-
-	throw (new Error('Invalid algorithm: ' + this._algo));
-};
-
-DiffieHellman.prototype.generateKey = function () {
-	var parts = [];
-	var priv, pub;
-	if (this._algo === 'dsa') {
-		this._dh.generateKeys();
-
-		parts.push({name: 'p', data: this._p.data});
-		parts.push({name: 'q', data: this._key.part.q.data});
-		parts.push({name: 'g', data: this._g.data});
-		parts.push({name: 'y', data: this._dh.getPublicKey()});
-		parts.push({name: 'x', data: this._dh.getPrivateKey()});
-		this._key = new PrivateKey({
-			type: 'dsa',
-			parts: parts
-		});
-		this._isPriv = true;
-		return (this._key);
-
-	} else if (this._algo === 'ecdsa') {
-		if (CRYPTO_HAVE_ECDH) {
-			this._dh.generateKeys();
-
-			parts.push({name: 'curve',
-			    data: Buffer.from(this._curve)});
-			parts.push({name: 'Q', data: this._dh.getPublicKey()});
-			parts.push({name: 'd', data: this._dh.getPrivateKey()});
-			this._key = new PrivateKey({
-				type: 'ecdsa',
-				curve: this._curve,
-				parts: parts
-			});
-			this._isPriv = true;
-			return (this._key);
-
-		} else {
-			var n = this._ecParams.getN();
-			var r = new jsbn(crypto.randomBytes(n.bitLength()));
-			var n1 = n.subtract(jsbn.ONE);
-			priv = r.mod(n1).add(jsbn.ONE);
-			pub = this._ecParams.getG().multiply(priv);
-
-			priv = Buffer.from(priv.toByteArray());
-			pub = Buffer.from(this._ecParams.getCurve().
-			    encodePointHex(pub), 'hex');
-
-			this._priv = new ECPrivate(this._ecParams, priv);
-
-			parts.push({name: 'curve',
-			    data: Buffer.from(this._curve)});
-			parts.push({name: 'Q', data: pub});
-			parts.push({name: 'd', data: priv});
-
-			this._key = new PrivateKey({
-				type: 'ecdsa',
-				curve: this._curve,
-				parts: parts
-			});
-			this._isPriv = true;
-			return (this._key);
-		}
-
-	} else if (this._algo === 'curve25519') {
-		var pair = nacl.box.keyPair();
-		priv = Buffer.from(pair.secretKey);
-		pub = Buffer.from(pair.publicKey);
-		priv = Buffer.concat([priv, pub]);
-		assert.strictEqual(priv.length, 64);
-		assert.strictEqual(pub.length, 32);
-
-		parts.push({name: 'A', data: pub});
-		parts.push({name: 'k', data: priv});
-		this._key = new PrivateKey({
-			type: 'curve25519',
-			parts: parts
-		});
-		this._isPriv = true;
-		return (this._key);
-	}
-
-	throw (new Error('Invalid algorithm: ' + this._algo));
-};
-DiffieHellman.prototype.generateKeys = DiffieHellman.prototype.generateKey;
-
-/* These are helpers for using ecc-jsbn (for node 0.10 compatibility). */
-
-function X9ECParameters(name) {
-	var params = algs.curves[name];
-	assert.object(params);
-
-	var p = new jsbn(params.p);
-	var a = new jsbn(params.a);
-	var b = new jsbn(params.b);
-	var n = new jsbn(params.n);
-	var h = jsbn.ONE;
-	var curve = new ec.ECCurveFp(p, a, b);
-	var G = curve.decodePointHex(params.G.toString('hex'));
-
-	this.curve = curve;
-	this.g = G;
-	this.n = n;
-	this.h = h;
-}
-X9ECParameters.prototype.getCurve = function () { return (this.curve); };
-X9ECParameters.prototype.getG = function () { return (this.g); };
-X9ECParameters.prototype.getN = function () { return (this.n); };
-X9ECParameters.prototype.getH = function () { return (this.h); };
-
-function ECPublic(params, buffer) {
-	this._params = params;
-	if (buffer[0] === 0x00)
-		buffer = buffer.slice(1);
-	this._pub = params.getCurve().decodePointHex(buffer.toString('hex'));
-}
-
-function ECPrivate(params, buffer) {
-	this._params = params;
-	this._priv = new jsbn(utils.mpNormalize(buffer));
-}
-ECPrivate.prototype.deriveSharedSecret = function (pubKey) {
-	assert.ok(pubKey instanceof ECPublic);
-	var S = pubKey._pub.multiply(this._priv);
-	return (Buffer.from(S.getX().toBigInteger().toByteArray()));
-};
-
-function generateED25519() {
-	if (nacl === undefined)
-		nacl = __webpack_require__(75);
-
-	var pair = nacl.sign.keyPair();
-	var priv = Buffer.from(pair.secretKey);
-	var pub = Buffer.from(pair.publicKey);
-	assert.strictEqual(priv.length, 64);
-	assert.strictEqual(pub.length, 32);
-
-	var parts = [];
-	parts.push({name: 'A', data: pub});
-	parts.push({name: 'k', data: priv.slice(0, 32)});
-	var key = new PrivateKey({
-		type: 'ed25519',
-		parts: parts
-	});
-	return (key);
-}
-
-/* Generates a new ECDSA private key on a given curve. */
-function generateECDSA(curve) {
-	var parts = [];
-	var key;
-
-	if (CRYPTO_HAVE_ECDH) {
-		/*
-		 * Node crypto doesn't expose key generation directly, but the
-		 * ECDH instances can generate keys. It turns out this just
-		 * calls into the OpenSSL generic key generator, and we can
-		 * read its output happily without doing an actual DH. So we
-		 * use that here.
-		 */
-		var osCurve = {
-			'nistp256': 'prime256v1',
-			'nistp384': 'secp384r1',
-			'nistp521': 'secp521r1'
-		}[curve];
-
-		var dh = crypto.createECDH(osCurve);
-		dh.generateKeys();
-
-		parts.push({name: 'curve',
-		    data: Buffer.from(curve)});
-		parts.push({name: 'Q', data: dh.getPublicKey()});
-		parts.push({name: 'd', data: dh.getPrivateKey()});
-
-		key = new PrivateKey({
-			type: 'ecdsa',
-			curve: curve,
-			parts: parts
-		});
-		return (key);
-	} else {
-		if (ecdh === undefined)
-			ecdh = __webpack_require__(387);
-		if (ec === undefined)
-			ec = __webpack_require__(139);
-		if (jsbn === undefined)
-			jsbn = __webpack_require__(81).BigInteger;
-
-		var ecParams = new X9ECParameters(curve);
-
-		/* This algorithm taken from FIPS PUB 186-4 (section B.4.1) */
-		var n = ecParams.getN();
-		/*
-		 * The crypto.randomBytes() function can only give us whole
-		 * bytes, so taking a nod from X9.62, we round up.
-		 */
-		var cByteLen = Math.ceil((n.bitLength() + 64) / 8);
-		var c = new jsbn(crypto.randomBytes(cByteLen));
-
-		var n1 = n.subtract(jsbn.ONE);
-		var priv = c.mod(n1).add(jsbn.ONE);
-		var pub = ecParams.getG().multiply(priv);
-
-		priv = Buffer.from(priv.toByteArray());
-		pub = Buffer.from(ecParams.getCurve().
-		    encodePointHex(pub), 'hex');
-
-		parts.push({name: 'curve', data: Buffer.from(curve)});
-		parts.push({name: 'Q', data: pub});
-		parts.push({name: 'd', data: priv});
-
-		key = new PrivateKey({
-			type: 'ecdsa',
-			curve: curve,
-			parts: parts
-		});
-		return (key);
-	}
-}
-
-
-/***/ }),
-/* 326 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var utils = __webpack_require__(26);
-var SSHBuffer = __webpack_require__(159);
-var Dhe = __webpack_require__(325);
-
-var supportedAlgos = {
-	'rsa-sha1' : 5,
-	'rsa-sha256' : 8,
-	'rsa-sha512' : 10,
-	'ecdsa-p256-sha256' : 13,
-	'ecdsa-p384-sha384' : 14
-	/*
-	 * ed25519 is hypothetically supported with id 15
-	 * but the common tools available don't appear to be
-	 * capable of generating/using ed25519 keys
-	 */
-};
-
-var supportedAlgosById = {};
-Object.keys(supportedAlgos).forEach(function (k) {
-	supportedAlgosById[supportedAlgos[k]] = k.toUpperCase();
-});
-
-function read(buf, options) {
-	if (typeof (buf) !== 'string') {
-		assert.buffer(buf, 'buf');
-		buf = buf.toString('ascii');
-	}
-	var lines = buf.split('\n');
-	if (lines[0].match(/^Private-key-format\: v1/)) {
-		var algElems = lines[1].split(' ');
-		var algoNum = parseInt(algElems[1], 10);
-		var algoName = algElems[2];
-		if (!supportedAlgosById[algoNum])
-			throw (new Error('Unsupported algorithm: ' + algoName));
-		return (readDNSSECPrivateKey(algoNum, lines.slice(2)));
-	}
-
-	// skip any comment-lines
-	var line = 0;
-	/* JSSTYLED */
-	while (lines[line].match(/^\;/))
-		line++;
-	// we should now have *one single* line left with our KEY on it.
-	if ((lines[line].match(/\. IN KEY /) ||
-	    lines[line].match(/\. IN DNSKEY /)) && lines[line+1].length === 0) {
-		return (readRFC3110(lines[line]));
-	}
-	throw (new Error('Cannot parse dnssec key'));
-}
-
-function readRFC3110(keyString) {
-	var elems = keyString.split(' ');
-	//unused var flags = parseInt(elems[3], 10);
-	//unused var protocol = parseInt(elems[4], 10);
-	var algorithm = parseInt(elems[5], 10);
-	if (!supportedAlgosById[algorithm])
-		throw (new Error('Unsupported algorithm: ' + algorithm));
-	var base64key = elems.slice(6, elems.length).join();
-	var keyBuffer = Buffer.from(base64key, 'base64');
-	if (supportedAlgosById[algorithm].match(/^RSA-/)) {
-		// join the rest of the body into a single base64-blob
-		var publicExponentLen = keyBuffer.readUInt8(0);
-		if (publicExponentLen != 3 && publicExponentLen != 1)
-			throw (new Error('Cannot parse dnssec key: ' +
-			    'unsupported exponent length'));
-
-		var publicExponent = keyBuffer.slice(1, publicExponentLen+1);
-		publicExponent = utils.mpNormalize(publicExponent);
-		var modulus = keyBuffer.slice(1+publicExponentLen);
-		modulus = utils.mpNormalize(modulus);
-		// now, make the key
-		var rsaKey = {
-			type: 'rsa',
-			parts: []
-		};
-		rsaKey.parts.push({ name: 'e', data: publicExponent});
-		rsaKey.parts.push({ name: 'n', data: modulus});
-		return (new Key(rsaKey));
-	}
-	if (supportedAlgosById[algorithm] === 'ECDSA-P384-SHA384' ||
-	    supportedAlgosById[algorithm] === 'ECDSA-P256-SHA256') {
-		var curve = 'nistp384';
-		var size = 384;
-		if (supportedAlgosById[algorithm].match(/^ECDSA-P256-SHA256/)) {
-			curve = 'nistp256';
-			size = 256;
-		}
-
-		var ecdsaKey = {
-			type: 'ecdsa',
-			curve: curve,
-			size: size,
-			parts: [
-				{name: 'curve', data: Buffer.from(curve) },
-				{name: 'Q', data: utils.ecNormalize(keyBuffer) }
-			]
-		};
-		return (new Key(ecdsaKey));
-	}
-	throw (new Error('Unsupported algorithm: ' +
-	    supportedAlgosById[algorithm]));
-}
-
-function elementToBuf(e) {
-	return (Buffer.from(e.split(' ')[1], 'base64'));
-}
-
-function readDNSSECRSAPrivateKey(elements) {
-	var rsaParams = {};
-	elements.forEach(function (element) {
-		if (element.split(' ')[0] === 'Modulus:')
-			rsaParams['n'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'PublicExponent:')
-			rsaParams['e'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'PrivateExponent:')
-			rsaParams['d'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'Prime1:')
-			rsaParams['p'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'Prime2:')
-			rsaParams['q'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'Exponent1:')
-			rsaParams['dmodp'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'Exponent2:')
-			rsaParams['dmodq'] = elementToBuf(element);
-		else if (element.split(' ')[0] === 'Coefficient:')
-			rsaParams['iqmp'] = elementToBuf(element);
-	});
-	// now, make the key
-	var key = {
-		type: 'rsa',
-		parts: [
-			{ name: 'e', data: utils.mpNormalize(rsaParams['e'])},
-			{ name: 'n', data: utils.mpNormalize(rsaParams['n'])},
-			{ name: 'd', data: utils.mpNormalize(rsaParams['d'])},
-			{ name: 'p', data: utils.mpNormalize(rsaParams['p'])},
-			{ name: 'q', data: utils.mpNormalize(rsaParams['q'])},
-			{ name: 'dmodp',
-			    data: utils.mpNormalize(rsaParams['dmodp'])},
-			{ name: 'dmodq',
-			    data: utils.mpNormalize(rsaParams['dmodq'])},
-			{ name: 'iqmp',
-			    data: utils.mpNormalize(rsaParams['iqmp'])}
-		]
-	};
-	return (new PrivateKey(key));
-}
-
-function readDNSSECPrivateKey(alg, elements) {
-	if (supportedAlgosById[alg].match(/^RSA-/)) {
-		return (readDNSSECRSAPrivateKey(elements));
-	}
-	if (supportedAlgosById[alg] === 'ECDSA-P384-SHA384' ||
-	    supportedAlgosById[alg] === 'ECDSA-P256-SHA256') {
-		var d = Buffer.from(elements[0].split(' ')[1], 'base64');
-		var curve = 'nistp384';
-		var size = 384;
-		if (supportedAlgosById[alg] === 'ECDSA-P256-SHA256') {
-			curve = 'nistp256';
-			size = 256;
-		}
-		// DNSSEC generates the public-key on the fly (go calculate it)
-		var publicKey = utils.publicFromPrivateECDSA(curve, d);
-		var Q = publicKey.part['Q'].data;
-		var ecdsaKey = {
-			type: 'ecdsa',
-			curve: curve,
-			size: size,
-			parts: [
-				{name: 'curve', data: Buffer.from(curve) },
-				{name: 'd', data: d },
-				{name: 'Q', data: Q }
-			]
-		};
-		return (new PrivateKey(ecdsaKey));
-	}
-	throw (new Error('Unsupported algorithm: ' + supportedAlgosById[alg]));
-}
-
-function dnssecTimestamp(date) {
-	var year = date.getFullYear() + ''; //stringify
-	var month = (date.getMonth() + 1);
-	var timestampStr = year + month + date.getUTCDate();
-	timestampStr += '' + date.getUTCHours() + date.getUTCMinutes();
-	timestampStr += date.getUTCSeconds();
-	return (timestampStr);
-}
-
-function rsaAlgFromOptions(opts) {
-	if (!opts || !opts.hashAlgo || opts.hashAlgo === 'sha1')
-		return ('5 (RSASHA1)');
-	else if (opts.hashAlgo === 'sha256')
-		return ('8 (RSASHA256)');
-	else if (opts.hashAlgo === 'sha512')
-		return ('10 (RSASHA512)');
-	else
-		throw (new Error('Unknown or unsupported hash: ' +
-		    opts.hashAlgo));
-}
-
-function writeRSA(key, options) {
-	// if we're missing parts, add them.
-	if (!key.part.dmodp || !key.part.dmodq) {
-		utils.addRSAMissing(key);
-	}
-
-	var out = '';
-	out += 'Private-key-format: v1.3\n';
-	out += 'Algorithm: ' + rsaAlgFromOptions(options) + '\n';
-	var n = utils.mpDenormalize(key.part['n'].data);
-	out += 'Modulus: ' + n.toString('base64') + '\n';
-	var e = utils.mpDenormalize(key.part['e'].data);
-	out += 'PublicExponent: ' + e.toString('base64') + '\n';
-	var d = utils.mpDenormalize(key.part['d'].data);
-	out += 'PrivateExponent: ' + d.toString('base64') + '\n';
-	var p = utils.mpDenormalize(key.part['p'].data);
-	out += 'Prime1: ' + p.toString('base64') + '\n';
-	var q = utils.mpDenormalize(key.part['q'].data);
-	out += 'Prime2: ' + q.toString('base64') + '\n';
-	var dmodp = utils.mpDenormalize(key.part['dmodp'].data);
-	out += 'Exponent1: ' + dmodp.toString('base64') + '\n';
-	var dmodq = utils.mpDenormalize(key.part['dmodq'].data);
-	out += 'Exponent2: ' + dmodq.toString('base64') + '\n';
-	var iqmp = utils.mpDenormalize(key.part['iqmp'].data);
-	out += 'Coefficient: ' + iqmp.toString('base64') + '\n';
-	// Assume that we're valid as-of now
-	var timestamp = new Date();
-	out += 'Created: ' + dnssecTimestamp(timestamp) + '\n';
-	out += 'Publish: ' + dnssecTimestamp(timestamp) + '\n';
-	out += 'Activate: ' + dnssecTimestamp(timestamp) + '\n';
-	return (Buffer.from(out, 'ascii'));
-}
-
-function writeECDSA(key, options) {
-	var out = '';
-	out += 'Private-key-format: v1.3\n';
-
-	if (key.curve === 'nistp256') {
-		out += 'Algorithm: 13 (ECDSAP256SHA256)\n';
-	} else if (key.curve === 'nistp384') {
-		out += 'Algorithm: 14 (ECDSAP384SHA384)\n';
-	} else {
-		throw (new Error('Unsupported curve'));
-	}
-	var base64Key = key.part['d'].data.toString('base64');
-	out += 'PrivateKey: ' + base64Key + '\n';
-
-	// Assume that we're valid as-of now
-	var timestamp = new Date();
-	out += 'Created: ' + dnssecTimestamp(timestamp) + '\n';
-	out += 'Publish: ' + dnssecTimestamp(timestamp) + '\n';
-	out += 'Activate: ' + dnssecTimestamp(timestamp) + '\n';
-
-	return (Buffer.from(out, 'ascii'));
-}
-
-function write(key, options) {
-	if (PrivateKey.isPrivateKey(key)) {
-		if (key.type === 'rsa') {
-			return (writeRSA(key, options));
-		} else if (key.type === 'ecdsa') {
-			return (writeECDSA(key, options));
-		} else {
-			throw (new Error('Unsupported algorithm: ' + key.type));
-		}
-	} else if (Key.isKey(key)) {
-		/*
-		 * RFC3110 requires a keyname, and a keytype, which we
-		 * don't really have a mechanism for specifying such
-		 * additional metadata.
-		 */
-		throw (new Error('Format "dnssec" only supports ' +
-		    'writing private keys'));
-	} else {
-		throw (new Error('key is not a Key or PrivateKey'));
-	}
-}
-
-
-/***/ }),
-/* 327 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	readPkcs1: readPkcs1,
-	write: write,
-	writePkcs1: writePkcs1
-};
-
-var assert = __webpack_require__(16);
-var asn1 = __webpack_require__(65);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var pem = __webpack_require__(86);
-
-var pkcs8 = __webpack_require__(157);
-var readECDSACurve = pkcs8.readECDSACurve;
-
-function read(buf, options) {
-	return (pem.read(buf, options, 'pkcs1'));
-}
-
-function write(key, options) {
-	return (pem.write(key, options, 'pkcs1'));
-}
-
-/* Helper to read in a single mpint */
-function readMPInt(der, nm) {
-	assert.strictEqual(der.peek(), asn1.Ber.Integer,
-	    nm + ' is not an Integer');
-	return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
-}
-
-function readPkcs1(alg, type, der) {
-	switch (alg) {
-	case 'RSA':
-		if (type === 'public')
-			return (readPkcs1RSAPublic(der));
-		else if (type === 'private')
-			return (readPkcs1RSAPrivate(der));
-		throw (new Error('Unknown key type: ' + type));
-	case 'DSA':
-		if (type === 'public')
-			return (readPkcs1DSAPublic(der));
-		else if (type === 'private')
-			return (readPkcs1DSAPrivate(der));
-		throw (new Error('Unknown key type: ' + type));
-	case 'EC':
-	case 'ECDSA':
-		if (type === 'private')
-			return (readPkcs1ECDSAPrivate(der));
-		else if (type === 'public')
-			return (readPkcs1ECDSAPublic(der));
-		throw (new Error('Unknown key type: ' + type));
-	case 'EDDSA':
-	case 'EdDSA':
-		if (type === 'private')
-			return (readPkcs1EdDSAPrivate(der));
-		throw (new Error(type + ' keys not supported with EdDSA'));
-	default:
-		throw (new Error('Unknown key algo: ' + alg));
-	}
-}
-
-function readPkcs1RSAPublic(der) {
-	// modulus and exponent
-	var n = readMPInt(der, 'modulus');
-	var e = readMPInt(der, 'exponent');
-
-	// now, make the key
-	var key = {
-		type: 'rsa',
-		parts: [
-			{ name: 'e', data: e },
-			{ name: 'n', data: n }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs1RSAPrivate(der) {
-	var version = readMPInt(der, 'version');
-	assert.strictEqual(version[0], 0);
-
-	// modulus then public exponent
-	var n = readMPInt(der, 'modulus');
-	var e = readMPInt(der, 'public exponent');
-	var d = readMPInt(der, 'private exponent');
-	var p = readMPInt(der, 'prime1');
-	var q = readMPInt(der, 'prime2');
-	var dmodp = readMPInt(der, 'exponent1');
-	var dmodq = readMPInt(der, 'exponent2');
-	var iqmp = readMPInt(der, 'iqmp');
-
-	// now, make the key
-	var key = {
-		type: 'rsa',
-		parts: [
-			{ name: 'n', data: n },
-			{ name: 'e', data: e },
-			{ name: 'd', data: d },
-			{ name: 'iqmp', data: iqmp },
-			{ name: 'p', data: p },
-			{ name: 'q', data: q },
-			{ name: 'dmodp', data: dmodp },
-			{ name: 'dmodq', data: dmodq }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readPkcs1DSAPrivate(der) {
-	var version = readMPInt(der, 'version');
-	assert.strictEqual(version.readUInt8(0), 0);
-
-	var p = readMPInt(der, 'p');
-	var q = readMPInt(der, 'q');
-	var g = readMPInt(der, 'g');
-	var y = readMPInt(der, 'y');
-	var x = readMPInt(der, 'x');
-
-	// now, make the key
-	var key = {
-		type: 'dsa',
-		parts: [
-			{ name: 'p', data: p },
-			{ name: 'q', data: q },
-			{ name: 'g', data: g },
-			{ name: 'y', data: y },
-			{ name: 'x', data: x }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readPkcs1EdDSAPrivate(der) {
-	var version = readMPInt(der, 'version');
-	assert.strictEqual(version.readUInt8(0), 1);
-
-	// private key
-	var k = der.readString(asn1.Ber.OctetString, true);
-
-	der.readSequence(0xa0);
-	var oid = der.readOID();
-	assert.strictEqual(oid, '1.3.101.112', 'the ed25519 curve identifier');
-
-	der.readSequence(0xa1);
-	var A = utils.readBitString(der);
-
-	var key = {
-		type: 'ed25519',
-		parts: [
-			{ name: 'A', data: utils.zeroPadToLength(A, 32) },
-			{ name: 'k', data: k }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function readPkcs1DSAPublic(der) {
-	var y = readMPInt(der, 'y');
-	var p = readMPInt(der, 'p');
-	var q = readMPInt(der, 'q');
-	var g = readMPInt(der, 'g');
-
-	var key = {
-		type: 'dsa',
-		parts: [
-			{ name: 'y', data: y },
-			{ name: 'p', data: p },
-			{ name: 'q', data: q },
-			{ name: 'g', data: g }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs1ECDSAPublic(der) {
-	der.readSequence();
-
-	var oid = der.readOID();
-	assert.strictEqual(oid, '1.2.840.10045.2.1', 'must be ecPublicKey');
-
-	var curveOid = der.readOID();
-
-	var curve;
-	var curves = Object.keys(algs.curves);
-	for (var j = 0; j < curves.length; ++j) {
-		var c = curves[j];
-		var cd = algs.curves[c];
-		if (cd.pkcs8oid === curveOid) {
-			curve = c;
-			break;
-		}
-	}
-	assert.string(curve, 'a known ECDSA named curve');
-
-	var Q = der.readString(asn1.Ber.BitString, true);
-	Q = utils.ecNormalize(Q);
-
-	var key = {
-		type: 'ecdsa',
-		parts: [
-			{ name: 'curve', data: Buffer.from(curve) },
-			{ name: 'Q', data: Q }
-		]
-	};
-
-	return (new Key(key));
-}
-
-function readPkcs1ECDSAPrivate(der) {
-	var version = readMPInt(der, 'version');
-	assert.strictEqual(version.readUInt8(0), 1);
-
-	// private key
-	var d = der.readString(asn1.Ber.OctetString, true);
-
-	der.readSequence(0xa0);
-	var curve = readECDSACurve(der);
-	assert.string(curve, 'a known elliptic curve');
-
-	der.readSequence(0xa1);
-	var Q = der.readString(asn1.Ber.BitString, true);
-	Q = utils.ecNormalize(Q);
-
-	var key = {
-		type: 'ecdsa',
-		parts: [
-			{ name: 'curve', data: Buffer.from(curve) },
-			{ name: 'Q', data: Q },
-			{ name: 'd', data: d }
-		]
-	};
-
-	return (new PrivateKey(key));
-}
-
-function writePkcs1(der, key) {
-	der.startSequence();
-
-	switch (key.type) {
-	case 'rsa':
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs1RSAPrivate(der, key);
-		else
-			writePkcs1RSAPublic(der, key);
-		break;
-	case 'dsa':
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs1DSAPrivate(der, key);
-		else
-			writePkcs1DSAPublic(der, key);
-		break;
-	case 'ecdsa':
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs1ECDSAPrivate(der, key);
-		else
-			writePkcs1ECDSAPublic(der, key);
-		break;
-	case 'ed25519':
-		if (PrivateKey.isPrivateKey(key))
-			writePkcs1EdDSAPrivate(der, key);
-		else
-			writePkcs1EdDSAPublic(der, key);
-		break;
-	default:
-		throw (new Error('Unknown key algo: ' + key.type));
-	}
-
-	der.endSequence();
-}
-
-function writePkcs1RSAPublic(der, key) {
-	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
-}
-
-function writePkcs1RSAPrivate(der, key) {
-	var ver = Buffer.from([0]);
-	der.writeBuffer(ver, asn1.Ber.Integer);
-
-	der.writeBuffer(key.part.n.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.e.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.d.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
-	if (!key.part.dmodp || !key.part.dmodq)
-		utils.addRSAMissing(key);
-	der.writeBuffer(key.part.dmodp.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.dmodq.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.iqmp.data, asn1.Ber.Integer);
-}
-
-function writePkcs1DSAPrivate(der, key) {
-	var ver = Buffer.from([0]);
-	der.writeBuffer(ver, asn1.Ber.Integer);
-
-	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.y.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.x.data, asn1.Ber.Integer);
-}
-
-function writePkcs1DSAPublic(der, key) {
-	der.writeBuffer(key.part.y.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.p.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.q.data, asn1.Ber.Integer);
-	der.writeBuffer(key.part.g.data, asn1.Ber.Integer);
-}
-
-function writePkcs1ECDSAPublic(der, key) {
-	der.startSequence();
-
-	der.writeOID('1.2.840.10045.2.1'); /* ecPublicKey */
-	var curve = key.part.curve.data.toString();
-	var curveOid = algs.curves[curve].pkcs8oid;
-	assert.string(curveOid, 'a known ECDSA named curve');
-	der.writeOID(curveOid);
-
-	der.endSequence();
-
-	var Q = utils.ecNormalize(key.part.Q.data, true);
-	der.writeBuffer(Q, asn1.Ber.BitString);
-}
-
-function writePkcs1ECDSAPrivate(der, key) {
-	var ver = Buffer.from([1]);
-	der.writeBuffer(ver, asn1.Ber.Integer);
-
-	der.writeBuffer(key.part.d.data, asn1.Ber.OctetString);
-
-	der.startSequence(0xa0);
-	var curve = key.part.curve.data.toString();
-	var curveOid = algs.curves[curve].pkcs8oid;
-	assert.string(curveOid, 'a known ECDSA named curve');
-	der.writeOID(curveOid);
-	der.endSequence();
-
-	der.startSequence(0xa1);
-	var Q = utils.ecNormalize(key.part.Q.data, true);
-	der.writeBuffer(Q, asn1.Ber.BitString);
-	der.endSequence();
-}
-
-function writePkcs1EdDSAPrivate(der, key) {
-	var ver = Buffer.from([1]);
-	der.writeBuffer(ver, asn1.Ber.Integer);
-
-	der.writeBuffer(key.part.k.data, asn1.Ber.OctetString);
-
-	der.startSequence(0xa0);
-	der.writeOID('1.3.101.112');
-	der.endSequence();
-
-	der.startSequence(0xa1);
-	utils.writeBitString(der, key.part.A.data);
-	der.endSequence();
-}
-
-function writePkcs1EdDSAPublic(der, key) {
-	throw (new Error('Public keys are not supported for EdDSA PKCS#1'));
-}
-
-
-/***/ }),
-/* 328 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-var Key = __webpack_require__(27);
-var Fingerprint = __webpack_require__(156);
-var Signature = __webpack_require__(74);
-var PrivateKey = __webpack_require__(33);
-var Certificate = __webpack_require__(155);
-var Identity = __webpack_require__(158);
-var errs = __webpack_require__(73);
-
-module.exports = {
-	/* top-level classes */
-	Key: Key,
-	parseKey: Key.parse,
-	Fingerprint: Fingerprint,
-	parseFingerprint: Fingerprint.parse,
-	Signature: Signature,
-	parseSignature: Signature.parse,
-	PrivateKey: PrivateKey,
-	parsePrivateKey: PrivateKey.parse,
-	generatePrivateKey: PrivateKey.generate,
-	Certificate: Certificate,
-	parseCertificate: Certificate.parse,
-	createSelfSignedCertificate: Certificate.createSelfSigned,
-	createCertificate: Certificate.create,
-	Identity: Identity,
-	identityFromDN: Identity.parseDN,
-	identityForHost: Identity.forHost,
-	identityForUser: Identity.forUser,
-	identityForEmail: Identity.forEmail,
-
-	/* errors */
-	FingerprintFormatError: errs.FingerprintFormatError,
-	InvalidAlgorithmError: errs.InvalidAlgorithmError,
-	KeyParseError: errs.KeyParseError,
-	SignatureParseError: errs.SignatureParseError,
-	KeyEncryptedError: errs.KeyEncryptedError,
-	CertificateParseError: errs.CertificateParseError
-};
-
-
-/***/ }),
-/* 329 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const ansiRegex = __webpack_require__(948);
-
-module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
-
-
-/***/ }),
-/* 330 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var hasFlag = __webpack_require__(273);
-
-var support = function (level) {
-	if (level === 0) {
-		return false;
-	}
-
-	return {
-		level: level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-};
-
-var supportLevel = (function () {
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
-		return 0;
-	}
-
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
-
-	if (hasFlag('color=256')) {
-		return 2;
-	}
-
-	if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		return 1;
-	}
-
-	if (process.stdout && !process.stdout.isTTY) {
-		return 0;
-	}
-
-	if (process.platform === 'win32') {
-		return 1;
-	}
-
-	if ('CI' in process.env) {
-		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
-			return 1;
-		}
-
-		return 0;
-	}
-
-	if ('TEAMCITY_VERSION' in process.env) {
-		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
-	}
-
-	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
-		return 2;
-	}
-
-	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
-		return 1;
-	}
-
-	if ('COLORTERM' in process.env) {
-		return 1;
-	}
-
-	if (process.env.TERM === 'dumb') {
-		return 0;
-	}
-
-	return 0;
-})();
-
-if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
-	supportLevel = 1;
-}
-
-module.exports = process && support(supportLevel);
-
-
-/***/ }),
-/* 331 */
-/***/ (function(module, exports) {
-
-module.exports = require("child_process");
-
-/***/ }),
-/* 332 */
-/***/ (function(module, exports) {
-
-module.exports = require("punycode");
-
-/***/ }),
-/* 333 */
-/***/ (function(module, exports) {
-
-module.exports = require("string_decoder");
-
-/***/ }),
-/* 334 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _access;
-
-function _load_access() {
-  return _access = _interopRequireWildcard(__webpack_require__(525));
-}
-
-var _add;
-
-function _load_add() {
-  return _add = _interopRequireWildcard(__webpack_require__(165));
-}
-
-var _audit;
-
-function _load_audit() {
-  return _audit = _interopRequireWildcard(__webpack_require__(353));
-}
-
-var _autoclean;
-
-function _load_autoclean() {
-  return _autoclean = _interopRequireWildcard(__webpack_require__(354));
-}
-
-var _bin;
-
-function _load_bin() {
-  return _bin = _interopRequireWildcard(__webpack_require__(526));
-}
-
-var _cache;
-
-function _load_cache() {
-  return _cache = _interopRequireWildcard(__webpack_require__(355));
-}
-
-var _check;
-
-function _load_check() {
-  return _check = _interopRequireWildcard(__webpack_require__(356));
-}
-
-var _config;
-
-function _load_config() {
-  return _config = _interopRequireWildcard(__webpack_require__(527));
-}
-
-var _create;
-
-function _load_create() {
-  return _create = _interopRequireWildcard(__webpack_require__(528));
-}
-
-var _exec;
-
-function _load_exec() {
-  return _exec = _interopRequireWildcard(__webpack_require__(529));
-}
-
-var _generateLockEntry;
-
-function _load_generateLockEntry() {
-  return _generateLockEntry = _interopRequireWildcard(__webpack_require__(530));
-}
-
-var _global;
-
-function _load_global() {
-  return _global = _interopRequireWildcard(__webpack_require__(121));
-}
-
-var _help;
-
-function _load_help() {
-  return _help = _interopRequireWildcard(__webpack_require__(531));
-}
-
-var _import;
-
-function _load_import() {
-  return _import = _interopRequireWildcard(__webpack_require__(532));
-}
-
-var _info;
-
-function _load_info() {
-  return _info = _interopRequireWildcard(__webpack_require__(533));
-}
-
-var _init;
-
-function _load_init() {
-  return _init = _interopRequireWildcard(__webpack_require__(534));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = _interopRequireWildcard(__webpack_require__(34));
-}
-
-var _licenses;
-
-function _load_licenses() {
-  return _licenses = _interopRequireWildcard(__webpack_require__(535));
-}
-
-var _link;
-
-function _load_link() {
-  return _link = _interopRequireWildcard(__webpack_require__(357));
-}
-
-var _login;
-
-function _load_login() {
-  return _login = _interopRequireWildcard(__webpack_require__(107));
-}
-
-var _logout;
-
-function _load_logout() {
-  return _logout = _interopRequireWildcard(__webpack_require__(536));
-}
-
-var _list;
-
-function _load_list() {
-  return _list = _interopRequireWildcard(__webpack_require__(358));
-}
-
-var _node;
-
-function _load_node() {
-  return _node = _interopRequireWildcard(__webpack_require__(537));
-}
-
-var _outdated;
-
-function _load_outdated() {
-  return _outdated = _interopRequireWildcard(__webpack_require__(538));
-}
-
-var _owner;
-
-function _load_owner() {
-  return _owner = _interopRequireWildcard(__webpack_require__(539));
-}
-
-var _pack;
-
-function _load_pack() {
-  return _pack = _interopRequireWildcard(__webpack_require__(166));
-}
-
-var _policies;
-
-function _load_policies() {
-  return _policies = _interopRequireWildcard(__webpack_require__(540));
-}
-
-var _publish;
-
-function _load_publish() {
-  return _publish = _interopRequireWildcard(__webpack_require__(541));
-}
-
-var _remove;
-
-function _load_remove() {
-  return _remove = _interopRequireWildcard(__webpack_require__(359));
-}
-
-var _run;
-
-function _load_run() {
-  return _run = _interopRequireWildcard(__webpack_require__(360));
-}
-
-var _tag;
-
-function _load_tag() {
-  return _tag = _interopRequireWildcard(__webpack_require__(361));
-}
-
-var _team;
-
-function _load_team() {
-  return _team = _interopRequireWildcard(__webpack_require__(542));
-}
-
-var _unplug;
-
-function _load_unplug() {
-  return _unplug = _interopRequireWildcard(__webpack_require__(544));
-}
-
-var _unlink;
-
-function _load_unlink() {
-  return _unlink = _interopRequireWildcard(__webpack_require__(543));
-}
-
-var _upgrade;
-
-function _load_upgrade() {
-  return _upgrade = _interopRequireWildcard(__webpack_require__(207));
-}
-
-var _version;
-
-function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(363));
-}
-
-var _versions;
-
-function _load_versions() {
-  return _versions = _interopRequireWildcard(__webpack_require__(545));
-}
-
-var _why;
-
-function _load_why() {
-  return _why = _interopRequireWildcard(__webpack_require__(546));
-}
-
-var _workspaces;
-
-function _load_workspaces() {
-  return _workspaces = _interopRequireWildcard(__webpack_require__(548));
-}
-
-var _workspace;
-
-function _load_workspace() {
-  return _workspace = _interopRequireWildcard(__webpack_require__(547));
-}
-
-var _upgradeInteractive;
-
-function _load_upgradeInteractive() {
-  return _upgradeInteractive = _interopRequireWildcard(__webpack_require__(362));
-}
-
-var _useless;
-
-function _load_useless() {
-  return _useless = _interopRequireDefault(__webpack_require__(524));
-}
-
-var _aliases;
-
-function _load_aliases() {
-  return _aliases = _interopRequireDefault(__webpack_require__(352));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-const chalk = __webpack_require__(30);
-
-
-const getDocsLink = name => `${(_constants || _load_constants()).YARN_DOCS}${name || ''}`;
-const getDocsInfo = name => 'Visit ' + chalk.bold(getDocsLink(name)) + ' for documentation about this command.';
-
-const commands = {
-  access: _access || _load_access(),
-  add: _add || _load_add(),
-  audit: _audit || _load_audit(),
-  autoclean: _autoclean || _load_autoclean(),
-  bin: _bin || _load_bin(),
-  cache: _cache || _load_cache(),
-  check: _check || _load_check(),
-  config: _config || _load_config(),
-  create: _create || _load_create(),
-  dedupe: (0, (_useless || _load_useless()).default)("The dedupe command isn't necessary. `yarn install` will already dedupe."),
-  exec: _exec || _load_exec(),
-  generateLockEntry: _generateLockEntry || _load_generateLockEntry(),
-  global: _global || _load_global(),
-  help: _help || _load_help(),
-  import: _import || _load_import(),
-  info: _info || _load_info(),
-  init: _init || _load_init(),
-  install: _install || _load_install(),
-  licenses: _licenses || _load_licenses(),
-  link: _link || _load_link(),
-  lockfile: (0, (_useless || _load_useless()).default)("The lockfile command isn't necessary. `yarn install` will produce a lockfile."),
-  login: _login || _load_login(),
-  logout: _logout || _load_logout(),
-  list: _list || _load_list(),
-  node: _node || _load_node(),
-  outdated: _outdated || _load_outdated(),
-  owner: _owner || _load_owner(),
-  pack: _pack || _load_pack(),
-  policies: _policies || _load_policies(),
-  prune: (0, (_useless || _load_useless()).default)("The prune command isn't necessary. `yarn install` will prune extraneous packages."),
-  publish: _publish || _load_publish(),
-  remove: _remove || _load_remove(),
-  run: _run || _load_run(),
-  tag: _tag || _load_tag(),
-  team: _team || _load_team(),
-  unplug: _unplug || _load_unplug(),
-  unlink: _unlink || _load_unlink(),
-  upgrade: _upgrade || _load_upgrade(),
-  version: _version || _load_version(),
-  versions: _versions || _load_versions(),
-  why: _why || _load_why(),
-  workspaces: _workspaces || _load_workspaces(),
-  workspace: _workspace || _load_workspace(),
-  upgradeInteractive: _upgradeInteractive || _load_upgradeInteractive()
-};
-
-for (const key in commands) {
-  commands[key].getDocsInfo = getDocsInfo(key);
-}
-
-for (const key in (_aliases || _load_aliases()).default) {
-  commands[key] = commands[(_aliases || _load_aliases()).default[key]];
-  commands[key].getDocsInfo = getDocsInfo(key);
-}
-
-exports.default = commands;
-
-/***/ }),
-/* 335 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getRcConfigForCwd = getRcConfigForCwd;
-exports.getRcArgs = getRcArgs;
-
-var _fs;
-
-function _load_fs() {
-  return _fs = __webpack_require__(5);
-}
-
-var _path;
-
-function _load_path() {
-  return _path = __webpack_require__(0);
-}
-
-var _commander;
-
-function _load_commander() {
-  return _commander = _interopRequireDefault(__webpack_require__(338));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = __webpack_require__(19);
-}
-
-var _rc;
-
-function _load_rc() {
-  return _rc = _interopRequireWildcard(__webpack_require__(590));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// Keys that will get resolved relative to the path of the rc file they belong to
-const PATH_KEYS = new Set(['yarn-path', 'cache-folder', 'global-folder', 'modules-folder', 'cwd', 'offline-cache-folder']);
-
-// given a cwd, load all .yarnrc files relative to it
-
-
-function getRcConfigForCwd(cwd, args) {
-  const config = {};
-
-  if (args.indexOf('--no-default-rc') === -1) {
-    Object.assign(config, (_rc || _load_rc()).findRc('yarn', cwd, (fileText, filePath) => {
-      return loadRcFile(fileText, filePath);
-    }));
-  }
-
-  for (let index = args.indexOf('--use-yarnrc'); index !== -1; index = args.indexOf('--use-yarnrc', index + 1)) {
-    const value = args[index + 1];
-
-    if (value && value.charAt(0) !== '-') {
-      Object.assign(config, loadRcFile((0, (_fs || _load_fs()).readFileSync)(value).toString(), value));
-    }
-  }
-
-  return config;
-}
-
-function loadRcFile(fileText, filePath) {
-  var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc');
-
-  let values = _parse.object;
-
-
-  if (filePath.match(/\.yml$/)) {
-    values = { 'yarn-path': values.yarnPath };
-  }
-
-  // some keys reference directories so keep their relativity
-  for (const key in values) {
-    if (PATH_KEYS.has(key.replace(/^(--)?([^.]+\.)*/, ''))) {
-      values[key] = (0, (_path || _load_path()).resolve)((0, (_path || _load_path()).dirname)(filePath), values[key]);
-    }
-  }
-
-  return values;
-}
-
-// get the built of arguments of a .yarnrc chain of the passed cwd
-function buildRcArgs(cwd, args) {
-  const config = getRcConfigForCwd(cwd, args);
-
-  const argsForCommands = new Map();
-
-  for (const key in config) {
-    // args can be prefixed with the command name they're meant for, eg.
-    // `--install.check-files true`
-    const keyMatch = key.match(/^--(?:([^.]+)\.)?(.*)$/);
-    if (!keyMatch) {
-      continue;
-    }
-
-    const commandName = keyMatch[1] || '*';
-    const arg = keyMatch[2];
-    const value = config[key];
-
-    // create args for this command name if we didn't previously have them
-    const args = argsForCommands.get(commandName) || [];
-    argsForCommands.set(commandName, args);
-
-    // turn config value into appropriate cli flag
-    const option = (_commander || _load_commander()).default.optionFor(`--${arg}`);
-
-    // If commander doesn't recognize the option or it takes a value after it
-    if (!option || option.optional || option.required) {
-      args.push(`--${arg}`, value);
-    } else if (value === true) {
-      // we can't force remove an arg from cli
-      args.push(`--${arg}`);
-    }
-  }
-
-  return argsForCommands;
-}
-
-// extract the value of a --cwd arg if present
-function extractCwdArg(args) {
-  for (let i = 0, I = args.length; i < I; ++i) {
-    const arg = args[i];
-    if (arg === '--') {
-      return null;
-    } else if (arg === '--cwd') {
-      return args[i + 1];
-    }
-  }
-  return null;
-}
-
-// get a list of arguments from .yarnrc that apply to this commandName
-function getRcArgs(commandName, args, previousCwds = []) {
-  // for the cwd, use the --cwd arg if it was passed or else use process.cwd()
-  const origCwd = extractCwdArg(args) || process.cwd();
-
-  // get a map of command names and their arguments
-  const argMap = buildRcArgs(origCwd, args);
-
-  // concat wildcard arguments and arguments meant for this specific command
-  const newArgs = [...(argMap.get('*') || []), ...(argMap.get(commandName) || [])];
-
-  // check if the .yarnrc args specified a cwd
-  const newCwd = extractCwdArg(newArgs);
-  if (newCwd && newCwd !== origCwd) {
-    // ensure that we don't enter into a loop
-    if (previousCwds.indexOf(newCwd) !== -1) {
-      throw new Error(`Recursive .yarnrc files specifying --cwd flags. Bailing out.`);
-    }
-
-    //  if we have a new cwd then let's refetch the .yarnrc args relative to it
-    return getRcArgs(commandName, newArgs, previousCwds.concat(origCwd));
-  }
-
-  return newArgs;
-}
-
-/***/ }),
-/* 336 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.boolify = boolify;
-exports.boolifyWithDefault = boolifyWithDefault;
-const FALSY_STRINGS = new Set(['0', 'false']);
-
-function boolify(val) {
-  return !FALSY_STRINGS.has(val.toString().toLowerCase());
-}
-
-function boolifyWithDefault(val, defaultResult) {
-  return val === '' || val === null || val === undefined ? defaultResult : boolify(val);
-}
-
-/***/ }),
-/* 337 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isOffline = isOffline;
-const os = __webpack_require__(49);
-
-const IGNORE_INTERFACES = ['lo0', 'awdl0', 'bridge0'];
-const LOCAL_IPS = ['127.0.0.1', '::1'];
-
-function isOffline() {
-  let interfaces;
-
-  try {
-    interfaces = os.networkInterfaces();
-  } catch (e) {
-    // As of October 2016, Windows Subsystem for Linux (WSL) does not support
-    // the os.networkInterfaces() call and throws instead. For this platform,
-    // assume we are online.
-    if (e.syscall === 'uv_interface_addresses') {
-      return false;
-    } else {
-      throw e;
-    }
-  }
-
-  for (const name in interfaces) {
-    if (IGNORE_INTERFACES.indexOf(name) >= 0) {
-      continue;
-    }
-
-    const addrs = interfaces[name];
-    for (var _iterator = addrs, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const addr = _ref;
-
-      if (LOCAL_IPS.indexOf(addr.address) < 0) {
-        // found a possible remote ip
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-/***/ }),
-/* 338 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/**
- * Module dependencies.
- */
-
-var EventEmitter = __webpack_require__(76).EventEmitter;
-var spawn = __webpack_require__(331).spawn;
-var path = __webpack_require__(0);
-var dirname = path.dirname;
-var basename = path.basename;
-var fs = __webpack_require__(5);
-
-/**
- * Inherit `Command` from `EventEmitter.prototype`.
- */
-
-__webpack_require__(3).inherits(Command, EventEmitter);
-
-/**
- * Expose the root command.
- */
-
-exports = module.exports = new Command();
-
-/**
- * Expose `Command`.
- */
-
-exports.Command = Command;
-
-/**
- * Expose `Option`.
- */
-
-exports.Option = Option;
-
-/**
- * Initialize a new `Option` with the given `flags` and `description`.
- *
- * @param {String} flags
- * @param {String} description
- * @api public
- */
-
-function Option(flags, description) {
-  this.flags = flags;
-  this.required = flags.indexOf('<') >= 0;
-  this.optional = flags.indexOf('[') >= 0;
-  this.bool = flags.indexOf('-no-') === -1;
-  flags = flags.split(/[ ,|]+/);
-  if (flags.length > 1 && !/^[[<]/.test(flags[1])) this.short = flags.shift();
-  this.long = flags.shift();
-  this.description = description || '';
-}
-
-/**
- * Return option name.
- *
- * @return {String}
- * @api private
- */
-
-Option.prototype.name = function() {
-  return this.long
-    .replace('--', '')
-    .replace('no-', '');
-};
-
-/**
- * Return option name, in a camelcase format that can be used
- * as a object attribute key.
- *
- * @return {String}
- * @api private
- */
-
-Option.prototype.attributeName = function() {
-  return camelcase(this.name());
-};
-
-/**
- * Check if `arg` matches the short or long flag.
- *
- * @param {String} arg
- * @return {Boolean}
- * @api private
- */
-
-Option.prototype.is = function(arg) {
-  return this.short === arg || this.long === arg;
-};
-
-/**
- * Initialize a new `Command`.
- *
- * @param {String} name
- * @api public
- */
-
-function Command(name) {
-  this.commands = [];
-  this.options = [];
-  this._execs = {};
-  this._allowUnknownOption = false;
-  this._args = [];
-  this._name = name || '';
-}
-
-/**
- * Add command `name`.
- *
- * The `.action()` callback is invoked when the
- * command `name` is specified via __ARGV__,
- * and the remaining arguments are applied to the
- * function for access.
- *
- * When the `name` is "*" an un-matched command
- * will be passed as the first arg, followed by
- * the rest of __ARGV__ remaining.
- *
- * Examples:
- *
- *      program
- *        .version('0.0.1')
- *        .option('-C, --chdir <path>', 'change the working directory')
- *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
- *        .option('-T, --no-tests', 'ignore test hook')
- *
- *      program
- *        .command('setup')
- *        .description('run remote setup commands')
- *        .action(function() {
- *          console.log('setup');
- *        });
- *
- *      program
- *        .command('exec <cmd>')
- *        .description('run the given remote command')
- *        .action(function(cmd) {
- *          console.log('exec "%s"', cmd);
- *        });
- *
- *      program
- *        .command('teardown <dir> [otherDirs...]')
- *        .description('run teardown commands')
- *        .action(function(dir, otherDirs) {
- *          console.log('dir "%s"', dir);
- *          if (otherDirs) {
- *            otherDirs.forEach(function (oDir) {
- *              console.log('dir "%s"', oDir);
- *            });
- *          }
- *        });
- *
- *      program
- *        .command('*')
- *        .description('deploy the given env')
- *        .action(function(env) {
- *          console.log('deploying "%s"', env);
- *        });
- *
- *      program.parse(process.argv);
-  *
- * @param {String} name
- * @param {String} [desc] for git-style sub-commands
- * @return {Command} the new command
- * @api public
- */
-
-Command.prototype.command = function(name, desc, opts) {
-  if (typeof desc === 'object' && desc !== null) {
-    opts = desc;
-    desc = null;
-  }
-  opts = opts || {};
-  var args = name.split(/ +/);
-  var cmd = new Command(args.shift());
-
-  if (desc) {
-    cmd.description(desc);
-    this.executables = true;
-    this._execs[cmd._name] = true;
-    if (opts.isDefault) this.defaultExecutable = cmd._name;
-  }
-  cmd._noHelp = !!opts.noHelp;
-  this.commands.push(cmd);
-  cmd.parseExpectedArgs(args);
-  cmd.parent = this;
-
-  if (desc) return this;
-  return cmd;
-};
-
-/**
- * Define argument syntax for the top-level command.
- *
- * @api public
- */
-
-Command.prototype.arguments = function(desc) {
-  return this.parseExpectedArgs(desc.split(/ +/));
-};
-
-/**
- * Add an implicit `help [cmd]` subcommand
- * which invokes `--help` for the given command.
- *
- * @api private
- */
-
-Command.prototype.addImplicitHelpCommand = function() {
-  this.command('help [cmd]', 'display help for [cmd]');
-};
-
-/**
- * Parse expected `args`.
- *
- * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
- *
- * @param {Array} args
- * @return {Command} for chaining
- * @api public
- */
-
-Command.prototype.parseExpectedArgs = function(args) {
-  if (!args.length) return;
-  var self = this;
-  args.forEach(function(arg) {
-    var argDetails = {
-      required: false,
-      name: '',
-      variadic: false
-    };
-
-    switch (arg[0]) {
-      case '<':
-        argDetails.required = true;
-        argDetails.name = arg.slice(1, -1);
-        break;
-      case '[':
-        argDetails.name = arg.slice(1, -1);
-        break;
-    }
-
-    if (argDetails.name.length > 3 && argDetails.name.slice(-3) === '...') {
-      argDetails.variadic = true;
-      argDetails.name = argDetails.name.slice(0, -3);
-    }
-    if (argDetails.name) {
-      self._args.push(argDetails);
-    }
-  });
-  return this;
-};
-
-/**
- * Register callback `fn` for the command.
- *
- * Examples:
- *
- *      program
- *        .command('help')
- *        .description('display verbose help')
- *        .action(function() {
- *           // output help here
- *        });
- *
- * @param {Function} fn
- * @return {Command} for chaining
- * @api public
- */
-
-Command.prototype.action = function(fn) {
-  var self = this;
-  var listener = function(args, unknown) {
-    // Parse any so-far unknown options
-    args = args || [];
-    unknown = unknown || [];
-
-    var parsed = self.parseOptions(unknown);
-
-    // Output help if necessary
-    outputHelpIfNecessary(self, parsed.unknown);
-
-    // If there are still any unknown options, then we simply
-    // die, unless someone asked for help, in which case we give it
-    // to them, and then we die.
-    if (parsed.unknown.length > 0) {
-      self.unknownOption(parsed.unknown[0]);
-    }
-
-    // Leftover arguments need to be pushed back. Fixes issue #56
-    if (parsed.args.length) args = parsed.args.concat(args);
-
-    self._args.forEach(function(arg, i) {
-      if (arg.required && args[i] == null) {
-        self.missingArgument(arg.name);
-      } else if (arg.variadic) {
-        if (i !== self._args.length - 1) {
-          self.variadicArgNotLast(arg.name);
-        }
-
-        args[i] = args.splice(i);
-      }
-    });
-
-    // Always append ourselves to the end of the arguments,
-    // to make sure we match the number of arguments the user
-    // expects
-    if (self._args.length) {
-      args[self._args.length] = self;
-    } else {
-      args.push(self);
-    }
-
-    fn.apply(self, args);
-  };
-  var parent = this.parent || this;
-  var name = parent === this ? '*' : this._name;
-  parent.on('command:' + name, listener);
-  if (this._alias) parent.on('command:' + this._alias, listener);
-  return this;
-};
-
-/**
- * Define option with `flags`, `description` and optional
- * coercion `fn`.
- *
- * The `flags` string should contain both the short and long flags,
- * separated by comma, a pipe or space. The following are all valid
- * all will output this way when `--help` is used.
- *
- *    "-p, --pepper"
- *    "-p|--pepper"
- *    "-p --pepper"
- *
- * Examples:
- *
- *     // simple boolean defaulting to false
- *     program.option('-p, --pepper', 'add pepper');
- *
- *     --pepper
- *     program.pepper
- *     // => Boolean
- *
- *     // simple boolean defaulting to true
- *     program.option('-C, --no-cheese', 'remove cheese');
- *
- *     program.cheese
- *     // => true
- *
- *     --no-cheese
- *     program.cheese
- *     // => false
- *
- *     // required argument
- *     program.option('-C, --chdir <path>', 'change the working directory');
- *
- *     --chdir /tmp
- *     program.chdir
- *     // => "/tmp"
- *
- *     // optional argument
- *     program.option('-c, --cheese [type]', 'add cheese [marble]');
- *
- * @param {String} flags
- * @param {String} description
- * @param {Function|*} [fn] or default
- * @param {*} [defaultValue]
- * @return {Command} for chaining
- * @api public
- */
-
-Command.prototype.option = function(flags, description, fn, defaultValue) {
-  var self = this,
-    option = new Option(flags, description),
-    oname = option.name(),
-    name = option.attributeName();
-
-  // default as 3rd arg
-  if (typeof fn !== 'function') {
-    if (fn instanceof RegExp) {
-      var regex = fn;
-      fn = function(val, def) {
-        var m = regex.exec(val);
-        return m ? m[0] : def;
-      };
-    } else {
-      defaultValue = fn;
-      fn = null;
-    }
-  }
-
-  // preassign default value only for --no-*, [optional], or <required>
-  if (!option.bool || option.optional || option.required) {
-    // when --no-* we make sure default is true
-    if (!option.bool) defaultValue = true;
-    // preassign only if we have a default
-    if (defaultValue !== undefined) {
-      self[name] = defaultValue;
-      option.defaultValue = defaultValue;
-    }
-  }
-
-  // register the option
-  this.options.push(option);
-
-  // when it's passed assign the value
-  // and conditionally invoke the callback
-  this.on('option:' + oname, function(val) {
-    // coercion
-    if (val !== null && fn) {
-      val = fn(val, self[name] === undefined ? defaultValue : self[name]);
-    }
-
-    // unassigned or bool
-    if (typeof self[name] === 'boolean' || typeof self[name] === 'undefined') {
-      // if no value, bool true, and we have a default, then use it!
-      if (val == null) {
-        self[name] = option.bool
-          ? defaultValue || true
-          : false;
-      } else {
-        self[name] = val;
-      }
-    } else if (val !== null) {
-      // reassign
-      self[name] = val;
-    }
-  });
-
-  return this;
-};
-
-/**
- * Allow unknown options on the command line.
- *
- * @param {Boolean} arg if `true` or omitted, no error will be thrown
- * for unknown options.
- * @api public
- */
-Command.prototype.allowUnknownOption = function(arg) {
-  this._allowUnknownOption = arguments.length === 0 || arg;
-  return this;
-};
-
-/**
- * Parse `argv`, settings options and invoking commands when defined.
- *
- * @param {Array} argv
- * @return {Command} for chaining
- * @api public
- */
-
-Command.prototype.parse = function(argv) {
-  // implicit help
-  if (this.executables) this.addImplicitHelpCommand();
-
-  // store raw args
-  this.rawArgs = argv;
-
-  // guess name
-  this._name = this._name || basename(argv[1], '.js');
-
-  // github-style sub-commands with no sub-command
-  if (this.executables && argv.length < 3 && !this.defaultExecutable) {
-    // this user needs help
-    argv.push('--help');
-  }
-
-  // process argv
-  var parsed = this.parseOptions(this.normalize(argv.slice(2)));
-  var args = this.args = parsed.args;
-
-  var result = this.parseArgs(this.args, parsed.unknown);
-
-  // executable sub-commands
-  var name = result.args[0];
-
-  var aliasCommand = null;
-  // check alias of sub commands
-  if (name) {
-    aliasCommand = this.commands.filter(function(command) {
-      return command.alias() === name;
-    })[0];
-  }
-
-  if (this._execs[name] && typeof this._execs[name] !== 'function') {
-    return this.executeSubCommand(argv, args, parsed.unknown);
-  } else if (aliasCommand) {
-    // is alias of a subCommand
-    args[0] = aliasCommand._name;
-    return this.executeSubCommand(argv, args, parsed.unknown);
-  } else if (this.defaultExecutable) {
-    // use the default subcommand
-    args.unshift(this.defaultExecutable);
-    return this.executeSubCommand(argv, args, parsed.unknown);
-  }
-
-  return result;
-};
-
-/**
- * Execute a sub-command executable.
- *
- * @param {Array} argv
- * @param {Array} args
- * @param {Array} unknown
- * @api private
- */
-
-Command.prototype.executeSubCommand = function(argv, args, unknown) {
-  args = args.concat(unknown);
-
-  if (!args.length) this.help();
-  if (args[0] === 'help' && args.length === 1) this.help();
-
-  // <cmd> --help
-  if (args[0] === 'help') {
-    args[0] = args[1];
-    args[1] = '--help';
-  }
-
-  // executable
-  var f = argv[1];
-  // name of the subcommand, link `pm-install`
-  var bin = basename(f, '.js') + '-' + args[0];
-
-  // In case of globally installed, get the base dir where executable
-  //  subcommand file should be located at
-  var baseDir,
-    link = fs.lstatSync(f).isSymbolicLink() ? fs.readlinkSync(f) : f;
-
-  // when symbolink is relative path
-  if (link !== f && link.charAt(0) !== '/') {
-    link = path.join(dirname(f), link);
-  }
-  baseDir = dirname(link);
-
-  // prefer local `./<bin>` to bin in the $PATH
-  var localBin = path.join(baseDir, bin);
-
-  // whether bin file is a js script with explicit `.js` extension
-  var isExplicitJS = false;
-  if (exists(localBin + '.js')) {
-    bin = localBin + '.js';
-    isExplicitJS = true;
-  } else if (exists(localBin)) {
-    bin = localBin;
-  }
-
-  args = args.slice(1);
-
-  var proc;
-  if (process.platform !== 'win32') {
-    if (isExplicitJS) {
-      args.unshift(bin);
-      // add executable arguments to spawn
-      args = (process.execArgv || []).concat(args);
-
-      proc = spawn(process.argv[0], args, { stdio: 'inherit', customFds: [0, 1, 2] });
-    } else {
-      proc = spawn(bin, args, { stdio: 'inherit', customFds: [0, 1, 2] });
-    }
-  } else {
-    args.unshift(bin);
-    proc = spawn(process.execPath, args, { stdio: 'inherit' });
-  }
-
-  var signals = ['SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGINT', 'SIGHUP'];
-  signals.forEach(function(signal) {
-    process.on(signal, function() {
-      if (proc.killed === false && proc.exitCode === null) {
-        proc.kill(signal);
-      }
-    });
-  });
-  proc.on('close', process.exit.bind(process));
-  proc.on('error', function(err) {
-    if (err.code === 'ENOENT') {
-      console.error('\n  %s(1) does not exist, try --help\n', bin);
-    } else if (err.code === 'EACCES') {
-      console.error('\n  %s(1) not executable. try chmod or run with root\n', bin);
-    }
-    process.exit(1);
-  });
-
-  // Store the reference to the child process
-  this.runningCommand = proc;
-};
-
-/**
- * Normalize `args`, splitting joined short flags. For example
- * the arg "-abc" is equivalent to "-a -b -c".
- * This also normalizes equal sign and splits "--abc=def" into "--abc def".
- *
- * @param {Array} args
- * @return {Array}
- * @api private
- */
-
-Command.prototype.normalize = function(args) {
-  var ret = [],
-    arg,
-    lastOpt,
-    index;
-
-  for (var i = 0, len = args.length; i < len; ++i) {
-    arg = args[i];
-    if (i > 0) {
-      lastOpt = this.optionFor(args[i - 1]);
-    }
-
-    if (arg === '--') {
-      // Honor option terminator
-      ret = ret.concat(args.slice(i));
-      break;
-    } else if (lastOpt && lastOpt.required) {
-      ret.push(arg);
-    } else if (arg.length > 1 && arg[0] === '-' && arg[1] !== '-') {
-      arg.slice(1).split('').forEach(function(c) {
-        ret.push('-' + c);
-      });
-    } else if (/^--/.test(arg) && ~(index = arg.indexOf('='))) {
-      ret.push(arg.slice(0, index), arg.slice(index + 1));
-    } else {
-      ret.push(arg);
-    }
-  }
-
-  return ret;
-};
-
-/**
- * Parse command `args`.
- *
- * When listener(s) are available those
- * callbacks are invoked, otherwise the "*"
- * event is emitted and those actions are invoked.
- *
- * @param {Array} args
- * @return {Command} for chaining
- * @api private
- */
-
-Command.prototype.parseArgs = function(args, unknown) {
-  var name;
-
-  if (args.length) {
-    name = args[0];
-    if (this.listeners('command:' + name).length) {
-      this.emit('command:' + args.shift(), args, unknown);
-    } else {
-      this.emit('command:*', args);
-    }
-  } else {
-    outputHelpIfNecessary(this, unknown);
-
-    // If there were no args and we have unknown options,
-    // then they are extraneous and we need to error.
-    if (unknown.length > 0) {
-      this.unknownOption(unknown[0]);
-    }
-  }
-
-  return this;
-};
-
-/**
- * Return an option matching `arg` if any.
- *
- * @param {String} arg
- * @return {Option}
- * @api private
- */
-
-Command.prototype.optionFor = function(arg) {
-  for (var i = 0, len = this.options.length; i < len; ++i) {
-    if (this.options[i].is(arg)) {
-      return this.options[i];
-    }
-  }
-};
-
-/**
- * Parse options from `argv` returning `argv`
- * void of these options.
- *
- * @param {Array} argv
- * @return {Array}
- * @api public
- */
-
-Command.prototype.parseOptions = function(argv) {
-  var args = [],
-    len = argv.length,
-    literal,
-    option,
-    arg;
-
-  var unknownOptions = [];
-
-  // parse options
-  for (var i = 0; i < len; ++i) {
-    arg = argv[i];
-
-    // literal args after --
-    if (literal) {
-      args.push(arg);
-      continue;
-    }
-
-    if (arg === '--') {
-      literal = true;
-      continue;
-    }
-
-    // find matching Option
-    option = this.optionFor(arg);
-
-    // option is defined
-    if (option) {
-      // requires arg
-      if (option.required) {
-        arg = argv[++i];
-        if (arg == null) return this.optionMissingArgument(option);
-        this.emit('option:' + option.name(), arg);
-      // optional arg
-      } else if (option.optional) {
-        arg = argv[i + 1];
-        if (arg == null || (arg[0] === '-' && arg !== '-')) {
-          arg = null;
-        } else {
-          ++i;
-        }
-        this.emit('option:' + option.name(), arg);
-      // bool
-      } else {
-        this.emit('option:' + option.name());
-      }
-      continue;
-    }
-
-    // looks like an option
-    if (arg.length > 1 && arg[0] === '-') {
-      unknownOptions.push(arg);
-
-      // If the next argument looks like it might be
-      // an argument for this option, we pass it on.
-      // If it isn't, then it'll simply be ignored
-      if ((i + 1) < argv.length && argv[i + 1][0] !== '-') {
-        unknownOptions.push(argv[++i]);
-      }
-      continue;
-    }
-
-    // arg
-    args.push(arg);
-  }
-
-  return { args: args, unknown: unknownOptions };
-};
-
-/**
- * Return an object containing options as key-value pairs
- *
- * @return {Object}
- * @api public
- */
-Command.prototype.opts = function() {
-  var result = {},
-    len = this.options.length;
-
-  for (var i = 0; i < len; i++) {
-    var key = this.options[i].attributeName();
-    result[key] = key === this._versionOptionName ? this._version : this[key];
-  }
-  return result;
-};
-
-/**
- * Argument `name` is missing.
- *
- * @param {String} name
- * @api private
- */
-
-Command.prototype.missingArgument = function(name) {
-  console.error();
-  console.error("  error: missing required argument `%s'", name);
-  console.error();
-  process.exit(1);
-};
-
-/**
- * `Option` is missing an argument, but received `flag` or nothing.
- *
- * @param {String} option
- * @param {String} flag
- * @api private
- */
-
-Command.prototype.optionMissingArgument = function(option, flag) {
-  console.error();
-  if (flag) {
-    console.error("  error: option `%s' argument missing, got `%s'", option.flags, flag);
-  } else {
-    console.error("  error: option `%s' argument missing", option.flags);
-  }
-  console.error();
-  process.exit(1);
-};
-
-/**
- * Unknown option `flag`.
- *
- * @param {String} flag
- * @api private
- */
-
-Command.prototype.unknownOption = function(flag) {
-  if (this._allowUnknownOption) return;
-  console.error();
-  console.error("  error: unknown option `%s'", flag);
-  console.error();
-  process.exit(1);
-};
-
-/**
- * Variadic argument with `name` is not the last argument as required.
- *
- * @param {String} name
- * @api private
- */
-
-Command.prototype.variadicArgNotLast = function(name) {
-  console.error();
-  console.error("  error: variadic arguments must be last `%s'", name);
-  console.error();
-  process.exit(1);
-};
-
-/**
- * Set the program version to `str`.
- *
- * This method auto-registers the "-V, --version" flag
- * which will print the version number when passed.
- *
- * @param {String} str
- * @param {String} [flags]
- * @return {Command} for chaining
- * @api public
- */
-
-Command.prototype.version = function(str, flags) {
-  if (arguments.length === 0) return this._version;
-  this._version = str;
-  flags = flags || '-V, --version';
-  var versionOption = new Option(flags, 'output the version number');
-  this._versionOptionName = versionOption.long.substr(2) || 'version';
-  this.options.push(versionOption);
-  this.on('option:' + this._versionOptionName, function() {
-    process.stdout.write(str + '\n');
-    process.exit(0);
-  });
-  return this;
-};
-
-/**
- * Set the description to `str`.
- *
- * @param {String} str
- * @param {Object} argsDescription
- * @return {String|Command}
- * @api public
- */
-
-Command.prototype.description = function(str, argsDescription) {
-  if (arguments.length === 0) return this._description;
-  this._description = str;
-  this._argsDescription = argsDescription;
-  return this;
-};
-
-/**
- * Set an alias for the command
- *
- * @param {String} alias
- * @return {String|Command}
- * @api public
- */
-
-Command.prototype.alias = function(alias) {
-  var command = this;
-  if (this.commands.length !== 0) {
-    command = this.commands[this.commands.length - 1];
-  }
-
-  if (arguments.length === 0) return command._alias;
-
-  if (alias === command._name) throw new Error('Command alias can\'t be the same as its name');
-
-  command._alias = alias;
-  return this;
-};
-
-/**
- * Set / get the command usage `str`.
- *
- * @param {String} str
- * @return {String|Command}
- * @api public
- */
-
-Command.prototype.usage = function(str) {
-  var args = this._args.map(function(arg) {
-    return humanReadableArgName(arg);
-  });
-
-  var usage = '[options]' +
-    (this.commands.length ? ' [command]' : '') +
-    (this._args.length ? ' ' + args.join(' ') : '');
-
-  if (arguments.length === 0) return this._usage || usage;
-  this._usage = str;
-
-  return this;
-};
-
-/**
- * Get or set the name of the command
- *
- * @param {String} str
- * @return {String|Command}
- * @api public
- */
-
-Command.prototype.name = function(str) {
-  if (arguments.length === 0) return this._name;
-  this._name = str;
-  return this;
-};
-
-/**
- * Return prepared commands.
- *
- * @return {Array}
- * @api private
- */
-
-Command.prototype.prepareCommands = function() {
-  return this.commands.filter(function(cmd) {
-    return !cmd._noHelp;
-  }).map(function(cmd) {
-    var args = cmd._args.map(function(arg) {
-      return humanReadableArgName(arg);
-    }).join(' ');
-
-    return [
-      cmd._name +
-        (cmd._alias ? '|' + cmd._alias : '') +
-        (cmd.options.length ? ' [options]' : '') +
-        (args ? ' ' + args : ''),
-      cmd._description
-    ];
-  });
-};
-
-/**
- * Return the largest command length.
- *
- * @return {Number}
- * @api private
- */
-
-Command.prototype.largestCommandLength = function() {
-  var commands = this.prepareCommands();
-  return commands.reduce(function(max, command) {
-    return Math.max(max, command[0].length);
-  }, 0);
-};
-
-/**
- * Return the largest option length.
- *
- * @return {Number}
- * @api private
- */
-
-Command.prototype.largestOptionLength = function() {
-  var options = [].slice.call(this.options);
-  options.push({
-    flags: '-h, --help'
-  });
-  return options.reduce(function(max, option) {
-    return Math.max(max, option.flags.length);
-  }, 0);
-};
-
-/**
- * Return the largest arg length.
- *
- * @return {Number}
- * @api private
- */
-
-Command.prototype.largestArgLength = function() {
-  return this._args.reduce(function(max, arg) {
-    return Math.max(max, arg.name.length);
-  }, 0);
-};
-
-/**
- * Return the pad width.
- *
- * @return {Number}
- * @api private
- */
-
-Command.prototype.padWidth = function() {
-  var width = this.largestOptionLength();
-  if (this._argsDescription && this._args.length) {
-    if (this.largestArgLength() > width) {
-      width = this.largestArgLength();
-    }
-  }
-
-  if (this.commands && this.commands.length) {
-    if (this.largestCommandLength() > width) {
-      width = this.largestCommandLength();
-    }
-  }
-
-  return width;
-};
-
-/**
- * Return help for options.
- *
- * @return {String}
- * @api private
- */
-
-Command.prototype.optionHelp = function() {
-  var width = this.padWidth();
-
-  // Append the help information
-  return this.options.map(function(option) {
-    return pad(option.flags, width) + '  ' + option.description +
-      ((option.bool && option.defaultValue !== undefined) ? ' (default: ' + option.defaultValue + ')' : '');
-  }).concat([pad('-h, --help', width) + '  ' + 'output usage information'])
-    .join('\n');
-};
-
-/**
- * Return command help documentation.
- *
- * @return {String}
- * @api private
- */
-
-Command.prototype.commandHelp = function() {
-  if (!this.commands.length) return '';
-
-  var commands = this.prepareCommands();
-  var width = this.padWidth();
-
-  return [
-    '  Commands:',
-    '',
-    commands.map(function(cmd) {
-      var desc = cmd[1] ? '  ' + cmd[1] : '';
-      return (desc ? pad(cmd[0], width) : cmd[0]) + desc;
-    }).join('\n').replace(/^/gm, '    '),
-    ''
-  ].join('\n');
-};
-
-/**
- * Return program help documentation.
- *
- * @return {String}
- * @api private
- */
-
-Command.prototype.helpInformation = function() {
-  var desc = [];
-  if (this._description) {
-    desc = [
-      '  ' + this._description,
-      ''
-    ];
-
-    var argsDescription = this._argsDescription;
-    if (argsDescription && this._args.length) {
-      var width = this.padWidth();
-      desc.push('  Arguments:');
-      desc.push('');
-      this._args.forEach(function(arg) {
-        desc.push('    ' + pad(arg.name, width) + '  ' + argsDescription[arg.name]);
-      });
-      desc.push('');
-    }
-  }
-
-  var cmdName = this._name;
-  if (this._alias) {
-    cmdName = cmdName + '|' + this._alias;
-  }
-  var usage = [
-    '',
-    '  Usage: ' + cmdName + ' ' + this.usage(),
-    ''
-  ];
-
-  var cmds = [];
-  var commandHelp = this.commandHelp();
-  if (commandHelp) cmds = [commandHelp];
-
-  var options = [
-    '  Options:',
-    '',
-    '' + this.optionHelp().replace(/^/gm, '    '),
-    ''
-  ];
-
-  return usage
-    .concat(desc)
-    .concat(options)
-    .concat(cmds)
-    .join('\n');
-};
-
-/**
- * Output help information for this command
- *
- * @api public
- */
-
-Command.prototype.outputHelp = function(cb) {
-  if (!cb) {
-    cb = function(passthru) {
-      return passthru;
-    };
-  }
-  process.stdout.write(cb(this.helpInformation()));
-  this.emit('--help');
-};
-
-/**
- * Output help information and exit.
- *
- * @api public
- */
-
-Command.prototype.help = function(cb) {
-  this.outputHelp(cb);
-  process.exit();
-};
-
-/**
- * Camel-case the given `flag`
- *
- * @param {String} flag
- * @return {String}
- * @api private
- */
-
-function camelcase(flag) {
-  return flag.split('-').reduce(function(str, word) {
-    return str + word[0].toUpperCase() + word.slice(1);
-  });
-}
-
-/**
- * Pad `str` to `width`.
- *
- * @param {String} str
- * @param {Number} width
- * @return {String}
- * @api private
- */
-
-function pad(str, width) {
-  var len = Math.max(0, width - str.length);
-  return str + Array(len + 1).join(' ');
-}
-
-/**
- * Output help information if necessary
- *
- * @param {Command} command to output help for
- * @param {Array} array of options to search for -h or --help
- * @api private
- */
-
-function outputHelpIfNecessary(cmd, options) {
-  options = options || [];
-  for (var i = 0; i < options.length; i++) {
-    if (options[i] === '--help' || options[i] === '-h') {
-      cmd.outputHelp();
-      process.exit(0);
-    }
-  }
-}
-
-/**
- * Takes an argument an returns its human readable equivalent for help usage.
- *
- * @param {Object} arg
- * @return {String}
- * @api private
- */
-
-function humanReadableArgName(arg) {
-  var nameOutput = arg.name + (arg.variadic === true ? '...' : '');
-
-  return arg.required
-    ? '<' + nameOutput + '>'
-    : '[' + nameOutput + ']';
-}
-
-// for versions before node v0.8 when there weren't `fs.existsSync`
-function exists(file) {
-  try {
-    if (fs.statSync(file).isFile()) {
-      return true;
-    }
-  } catch (e) {
-    return false;
-  }
-}
-
-
-/***/ }),
-/* 339 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var util = __webpack_require__(106);
-
-module.exports = SchemaObject;
-
-function SchemaObject(obj) {
-  util.copy(obj, this);
-}
-
-
-/***/ }),
-/* 340 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limit(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $isMax = $keyword == 'maximum',
-    $exclusiveKeyword = $isMax ? 'exclusiveMaximum' : 'exclusiveMinimum',
-    $schemaExcl = it.schema[$exclusiveKeyword],
-    $isDataExcl = it.opts.$data && $schemaExcl && $schemaExcl.$data,
-    $op = $isMax ? '<' : '>',
-    $notOp = $isMax ? '>' : '<',
-    $errorKeyword = undefined;
-  if ($isDataExcl) {
-    var $schemaValueExcl = it.util.getData($schemaExcl.$data, $dataLvl, it.dataPathArr),
-      $exclusive = 'exclusive' + $lvl,
-      $exclType = 'exclType' + $lvl,
-      $exclIsNumber = 'exclIsNumber' + $lvl,
-      $opExpr = 'op' + $lvl,
-      $opStr = '\' + ' + $opExpr + ' + \'';
-    out += ' var schemaExcl' + ($lvl) + ' = ' + ($schemaValueExcl) + '; ';
-    $schemaValueExcl = 'schemaExcl' + $lvl;
-    out += ' var ' + ($exclusive) + '; var ' + ($exclType) + ' = typeof ' + ($schemaValueExcl) + '; if (' + ($exclType) + ' != \'boolean\' && ' + ($exclType) + ' != \'undefined\' && ' + ($exclType) + ' != \'number\') { ';
-    var $errorKeyword = $exclusiveKeyword;
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ($errorKeyword || '_exclusiveLimit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'' + ($exclusiveKeyword) + ' should be boolean\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    out += ' } else if ( ';
-    if ($isData) {
-      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-    }
-    out += ' ' + ($exclType) + ' == \'number\' ? ( (' + ($exclusive) + ' = ' + ($schemaValue) + ' === undefined || ' + ($schemaValueExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ') ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValueExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) : ( (' + ($exclusive) + ' = ' + ($schemaValueExcl) + ' === true) ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValue) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { var op' + ($lvl) + ' = ' + ($exclusive) + ' ? \'' + ($op) + '\' : \'' + ($op) + '=\';';
-  } else {
-    var $exclIsNumber = typeof $schemaExcl == 'number',
-      $opStr = $op;
-    if ($exclIsNumber && $isData) {
-      var $opExpr = '\'' + $opStr + '\'';
-      out += ' if ( ';
-      if ($isData) {
-        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-      }
-      out += ' ( ' + ($schemaValue) + ' === undefined || ' + ($schemaExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ' ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { ';
-    } else {
-      if ($exclIsNumber && $schema === undefined) {
-        $exclusive = true;
-        $errorKeyword = $exclusiveKeyword;
-        $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
-        $schemaValue = $schemaExcl;
-        $notOp += '=';
-      } else {
-        if ($exclIsNumber) $schemaValue = Math[$isMax ? 'min' : 'max']($schemaExcl, $schema);
-        if ($schemaExcl === ($exclIsNumber ? $schemaValue : true)) {
-          $exclusive = true;
-          $errorKeyword = $exclusiveKeyword;
-          $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
-          $notOp += '=';
-        } else {
-          $exclusive = false;
-          $opStr += '=';
-        }
-      }
-      var $opExpr = '\'' + $opStr + '\'';
-      out += ' if ( ';
-      if ($isData) {
-        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-      }
-      out += ' ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' || ' + ($data) + ' !== ' + ($data) + ') { ';
-    }
-  }
-  $errorKeyword = $errorKeyword || $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { comparison: ' + ($opExpr) + ', limit: ' + ($schemaValue) + ', exclusive: ' + ($exclusive) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be ' + ($opStr) + ' ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue);
-      } else {
-        out += '' + ($schemaValue) + '\'';
-      }
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' } ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 341 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limitItems(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $op = $keyword == 'maxItems' ? '>' : '<';
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-  }
-  out += ' ' + ($data) + '.length ' + ($op) + ' ' + ($schemaValue) + ') { ';
-  var $errorKeyword = $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limitItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should NOT have ';
-      if ($keyword == 'maxItems') {
-        out += 'more';
-      } else {
-        out += 'less';
-      }
-      out += ' than ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + ($schema);
-      }
-      out += ' items\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 342 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limitLength(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $op = $keyword == 'maxLength' ? '>' : '<';
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-  }
-  if (it.opts.unicode === false) {
-    out += ' ' + ($data) + '.length ';
-  } else {
-    out += ' ucs2length(' + ($data) + ') ';
-  }
-  out += ' ' + ($op) + ' ' + ($schemaValue) + ') { ';
-  var $errorKeyword = $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limitLength') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should NOT be ';
-      if ($keyword == 'maxLength') {
-        out += 'longer';
-      } else {
-        out += 'shorter';
-      }
-      out += ' than ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + ($schema);
-      }
-      out += ' characters\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 343 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limitProperties(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $op = $keyword == 'maxProperties' ? '>' : '<';
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-  }
-  out += ' Object.keys(' + ($data) + ').length ' + ($op) + ' ' + ($schemaValue) + ') { ';
-  var $errorKeyword = $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limitProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should NOT have ';
-      if ($keyword == 'maxProperties') {
-        out += 'more';
-      } else {
-        out += 'less';
-      }
-      out += ' than ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + ($schema);
-      }
-      out += ' properties\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 344 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_validate(it, $keyword, $ruleType) {
-  var out = '';
-  var $async = it.schema.$async === true,
-    $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
-    $id = it.self._getId(it.schema);
-  if (it.isTop) {
-    if ($async) {
-      it.async = true;
-      var $es7 = it.opts.async == 'es7';
-      it.yieldAwait = $es7 ? 'await' : 'yield';
-    }
-    out += ' var validate = ';
-    if ($async) {
-      if ($es7) {
-        out += ' (async function ';
-      } else {
-        if (it.opts.async != '*') {
-          out += 'co.wrap';
-        }
-        out += '(function* ';
-      }
-    } else {
-      out += ' (function ';
-    }
-    out += ' (data, dataPath, parentData, parentDataProperty, rootData) { \'use strict\'; ';
-    if ($id && (it.opts.sourceCode || it.opts.processCode)) {
-      out += ' ' + ('/\*# sourceURL=' + $id + ' */') + ' ';
-    }
-  }
-  if (typeof it.schema == 'boolean' || !($refKeywords || it.schema.$ref)) {
-    var $keyword = 'false schema';
-    var $lvl = it.level;
-    var $dataLvl = it.dataLevel;
-    var $schema = it.schema[$keyword];
-    var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-    var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-    var $breakOnError = !it.opts.allErrors;
-    var $errorKeyword;
-    var $data = 'data' + ($dataLvl || '');
-    var $valid = 'valid' + $lvl;
-    if (it.schema === false) {
-      if (it.isTop) {
-        $breakOnError = true;
-      } else {
-        out += ' var ' + ($valid) + ' = false; ';
-      }
-      var $$outStack = $$outStack || [];
-      $$outStack.push(out);
-      out = ''; /* istanbul ignore else */
-      if (it.createErrors !== false) {
-        out += ' { keyword: \'' + ($errorKeyword || 'false schema') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-        if (it.opts.messages !== false) {
-          out += ' , message: \'boolean schema is false\' ';
-        }
-        if (it.opts.verbose) {
-          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-        }
-        out += ' } ';
-      } else {
-        out += ' {} ';
-      }
-      var __err = out;
-      out = $$outStack.pop();
-      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-        if (it.async) {
-          out += ' throw new ValidationError([' + (__err) + ']); ';
-        } else {
-          out += ' validate.errors = [' + (__err) + ']; return false; ';
-        }
-      } else {
-        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-      }
-    } else {
-      if (it.isTop) {
-        if ($async) {
-          out += ' return data; ';
-        } else {
-          out += ' validate.errors = null; return true; ';
-        }
-      } else {
-        out += ' var ' + ($valid) + ' = true; ';
-      }
-    }
-    if (it.isTop) {
-      out += ' }); return validate; ';
-    }
-    return out;
-  }
-  if (it.isTop) {
-    var $top = it.isTop,
-      $lvl = it.level = 0,
-      $dataLvl = it.dataLevel = 0,
-      $data = 'data';
-    it.rootId = it.resolve.fullPath(it.self._getId(it.root.schema));
-    it.baseId = it.baseId || it.rootId;
-    delete it.isTop;
-    it.dataPathArr = [undefined];
-    out += ' var vErrors = null; ';
-    out += ' var errors = 0;     ';
-    out += ' if (rootData === undefined) rootData = data; ';
-  } else {
-    var $lvl = it.level,
-      $dataLvl = it.dataLevel,
-      $data = 'data' + ($dataLvl || '');
-    if ($id) it.baseId = it.resolve.url(it.baseId, $id);
-    if ($async && !it.async) throw new Error('async schema in sync schema');
-    out += ' var errs_' + ($lvl) + ' = errors;';
-  }
-  var $valid = 'valid' + $lvl,
-    $breakOnError = !it.opts.allErrors,
-    $closingBraces1 = '',
-    $closingBraces2 = '';
-  var $errorKeyword;
-  var $typeSchema = it.schema.type,
-    $typeIsArray = Array.isArray($typeSchema);
-  if ($typeIsArray && $typeSchema.length == 1) {
-    $typeSchema = $typeSchema[0];
-    $typeIsArray = false;
-  }
-  if (it.schema.$ref && $refKeywords) {
-    if (it.opts.extendRefs == 'fail') {
-      throw new Error('$ref: validation keywords used in schema at path "' + it.errSchemaPath + '" (see option extendRefs)');
-    } else if (it.opts.extendRefs !== true) {
-      $refKeywords = false;
-      it.logger.warn('$ref: keywords ignored in schema at path "' + it.errSchemaPath + '"');
-    }
-  }
-  if ($typeSchema) {
-    if (it.opts.coerceTypes) {
-      var $coerceToTypes = it.util.coerceToTypes(it.opts.coerceTypes, $typeSchema);
-    }
-    var $rulesGroup = it.RULES.types[$typeSchema];
-    if ($coerceToTypes || $typeIsArray || $rulesGroup === true || ($rulesGroup && !$shouldUseGroup($rulesGroup))) {
-      var $schemaPath = it.schemaPath + '.type',
-        $errSchemaPath = it.errSchemaPath + '/type';
-      var $schemaPath = it.schemaPath + '.type',
-        $errSchemaPath = it.errSchemaPath + '/type',
-        $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
-      out += ' if (' + (it.util[$method]($typeSchema, $data, true)) + ') { ';
-      if ($coerceToTypes) {
-        var $dataType = 'dataType' + $lvl,
-          $coerced = 'coerced' + $lvl;
-        out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; ';
-        if (it.opts.coerceTypes == 'array') {
-          out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ')) ' + ($dataType) + ' = \'array\'; ';
-        }
-        out += ' var ' + ($coerced) + ' = undefined; ';
-        var $bracesCoercion = '';
-        var arr1 = $coerceToTypes;
-        if (arr1) {
-          var $type, $i = -1,
-            l1 = arr1.length - 1;
-          while ($i < l1) {
-            $type = arr1[$i += 1];
-            if ($i) {
-              out += ' if (' + ($coerced) + ' === undefined) { ';
-              $bracesCoercion += '}';
-            }
-            if (it.opts.coerceTypes == 'array' && $type != 'array') {
-              out += ' if (' + ($dataType) + ' == \'array\' && ' + ($data) + '.length == 1) { ' + ($coerced) + ' = ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + ';  } ';
-            }
-            if ($type == 'string') {
-              out += ' if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
-            } else if ($type == 'number' || $type == 'integer') {
-              out += ' if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
-              if ($type == 'integer') {
-                out += ' && !(' + ($data) + ' % 1)';
-              }
-              out += ')) ' + ($coerced) + ' = +' + ($data) + '; ';
-            } else if ($type == 'boolean') {
-              out += ' if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
-            } else if ($type == 'null') {
-              out += ' if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
-            } else if (it.opts.coerceTypes == 'array' && $type == 'array') {
-              out += ' if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
-            }
-          }
-        }
-        out += ' ' + ($bracesCoercion) + ' if (' + ($coerced) + ' === undefined) {   ';
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
-          if ($typeIsArray) {
-            out += '' + ($typeSchema.join(","));
-          } else {
-            out += '' + ($typeSchema);
-          }
-          out += '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'should be ';
-            if ($typeIsArray) {
-              out += '' + ($typeSchema.join(","));
-            } else {
-              out += '' + ($typeSchema);
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        out += ' } else {  ';
-        var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
-          $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
-        out += ' ' + ($data) + ' = ' + ($coerced) + '; ';
-        if (!$dataLvl) {
-          out += 'if (' + ($parentData) + ' !== undefined)';
-        }
-        out += ' ' + ($parentData) + '[' + ($parentDataProperty) + '] = ' + ($coerced) + '; } ';
-      } else {
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
-          if ($typeIsArray) {
-            out += '' + ($typeSchema.join(","));
-          } else {
-            out += '' + ($typeSchema);
-          }
-          out += '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'should be ';
-            if ($typeIsArray) {
-              out += '' + ($typeSchema.join(","));
-            } else {
-              out += '' + ($typeSchema);
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-      }
-      out += ' } ';
-    }
-  }
-  if (it.schema.$ref && !$refKeywords) {
-    out += ' ' + (it.RULES.all.$ref.code(it, '$ref')) + ' ';
-    if ($breakOnError) {
-      out += ' } if (errors === ';
-      if ($top) {
-        out += '0';
-      } else {
-        out += 'errs_' + ($lvl);
-      }
-      out += ') { ';
-      $closingBraces2 += '}';
-    }
-  } else {
-    if (it.opts.v5 && it.schema.patternGroups) {
-      it.logger.warn('keyword "patternGroups" is deprecated and disabled. Use option patternGroups: true to enable.');
-    }
-    var arr2 = it.RULES;
-    if (arr2) {
-      var $rulesGroup, i2 = -1,
-        l2 = arr2.length - 1;
-      while (i2 < l2) {
-        $rulesGroup = arr2[i2 += 1];
-        if ($shouldUseGroup($rulesGroup)) {
-          if ($rulesGroup.type) {
-            out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data)) + ') { ';
-          }
-          if (it.opts.useDefaults && !it.compositeRule) {
-            if ($rulesGroup.type == 'object' && it.schema.properties) {
-              var $schema = it.schema.properties,
-                $schemaKeys = Object.keys($schema);
-              var arr3 = $schemaKeys;
-              if (arr3) {
-                var $propertyKey, i3 = -1,
-                  l3 = arr3.length - 1;
-                while (i3 < l3) {
-                  $propertyKey = arr3[i3 += 1];
-                  var $sch = $schema[$propertyKey];
-                  if ($sch.default !== undefined) {
-                    var $passData = $data + it.util.getProperty($propertyKey);
-                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
-                    if (it.opts.useDefaults == 'shared') {
-                      out += ' ' + (it.useDefault($sch.default)) + ' ';
-                    } else {
-                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
-                    }
-                    out += '; ';
-                  }
-                }
-              }
-            } else if ($rulesGroup.type == 'array' && Array.isArray(it.schema.items)) {
-              var arr4 = it.schema.items;
-              if (arr4) {
-                var $sch, $i = -1,
-                  l4 = arr4.length - 1;
-                while ($i < l4) {
-                  $sch = arr4[$i += 1];
-                  if ($sch.default !== undefined) {
-                    var $passData = $data + '[' + $i + ']';
-                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
-                    if (it.opts.useDefaults == 'shared') {
-                      out += ' ' + (it.useDefault($sch.default)) + ' ';
-                    } else {
-                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
-                    }
-                    out += '; ';
-                  }
-                }
-              }
-            }
-          }
-          var arr5 = $rulesGroup.rules;
-          if (arr5) {
-            var $rule, i5 = -1,
-              l5 = arr5.length - 1;
-            while (i5 < l5) {
-              $rule = arr5[i5 += 1];
-              if ($shouldUseRule($rule)) {
-                var $code = $rule.code(it, $rule.keyword, $rulesGroup.type);
-                if ($code) {
-                  out += ' ' + ($code) + ' ';
-                  if ($breakOnError) {
-                    $closingBraces1 += '}';
-                  }
-                }
-              }
-            }
-          }
-          if ($breakOnError) {
-            out += ' ' + ($closingBraces1) + ' ';
-            $closingBraces1 = '';
-          }
-          if ($rulesGroup.type) {
-            out += ' } ';
-            if ($typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes) {
-              out += ' else { ';
-              var $schemaPath = it.schemaPath + '.type',
-                $errSchemaPath = it.errSchemaPath + '/type';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
-                if ($typeIsArray) {
-                  out += '' + ($typeSchema.join(","));
-                } else {
-                  out += '' + ($typeSchema);
-                }
-                out += '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'should be ';
-                  if ($typeIsArray) {
-                    out += '' + ($typeSchema.join(","));
-                  } else {
-                    out += '' + ($typeSchema);
-                  }
-                  out += '\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              out += ' } ';
-            }
-          }
-          if ($breakOnError) {
-            out += ' if (errors === ';
-            if ($top) {
-              out += '0';
-            } else {
-              out += 'errs_' + ($lvl);
-            }
-            out += ') { ';
-            $closingBraces2 += '}';
-          }
-        }
-      }
-    }
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces2) + ' ';
-  }
-  if ($top) {
-    if ($async) {
-      out += ' if (errors === 0) return data;           ';
-      out += ' else throw new ValidationError(vErrors); ';
-    } else {
-      out += ' validate.errors = vErrors; ';
-      out += ' return errors === 0;       ';
-    }
-    out += ' }); return validate;';
-  } else {
-    out += ' var ' + ($valid) + ' = errors === errs_' + ($lvl) + ';';
-  }
-  out = it.util.cleanUpCode(out);
-  if ($top) {
-    out = it.util.finalCleanUpCode(out, $async);
-  }
-
-  function $shouldUseGroup($rulesGroup) {
-    var rules = $rulesGroup.rules;
-    for (var i = 0; i < rules.length; i++)
-      if ($shouldUseRule(rules[i])) return true;
-  }
-
-  function $shouldUseRule($rule) {
-    return it.schema[$rule.keyword] !== undefined || ($rule.implements && $ruleImplementsSomeKeyword($rule));
-  }
-
-  function $ruleImplementsSomeKeyword($rule) {
-    var impl = $rule.implements;
-    for (var i = 0; i < impl.length; i++)
-      if (it.schema[impl[i]] !== undefined) return true;
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 345 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(509)().Promise
-
-
-/***/ }),
-/* 346 */
-/***/ (function(module, exports) {
-
-// API
-module.exports = abort;
-
-/**
- * Aborts leftover active jobs
- *
- * @param {object} state - current state object
- */
-function abort(state)
-{
-  Object.keys(state.jobs).forEach(clean.bind(state));
-
-  // reset leftover jobs
-  state.jobs = {};
-}
-
-/**
- * Cleans up leftover job by invoking abort function for the provided job id
- *
- * @this  state
- * @param {string|number} key - job id to abort
- */
-function clean(key)
-{
-  if (typeof this.jobs[key] == 'function')
-  {
-    this.jobs[key]();
-  }
-}
-
-
-/***/ }),
-/* 347 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var defer = __webpack_require__(518);
-
-// API
-module.exports = async;
-
-/**
- * Runs provided callback asynchronously
- * even if callback itself is not
- *
- * @param   {function} callback - callback to invoke
- * @returns {function} - augmented callback
- */
-function async(callback)
-{
-  var isAsync = false;
-
-  // check if async happened
-  defer(function() { isAsync = true; });
-
-  return function async_callback(err, result)
-  {
-    if (isAsync)
-    {
-      callback(err, result);
-    }
-    else
-    {
-      defer(function nextTick_callback()
-      {
-        callback(err, result);
-      });
-    }
-  };
-}
-
-
-/***/ }),
-/* 348 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var async = __webpack_require__(347)
-  , abort = __webpack_require__(346)
-  ;
-
-// API
-module.exports = iterate;
-
-/**
- * Iterates over each job object
- *
- * @param {array|object} list - array or object (named list) to iterate over
- * @param {function} iterator - iterator to run
- * @param {object} state - current job status
- * @param {function} callback - invoked when all elements processed
- */
-function iterate(list, iterator, state, callback)
-{
-  // store current index
-  var key = state['keyedList'] ? state['keyedList'][state.index] : state.index;
-
-  state.jobs[key] = runJob(iterator, key, list[key], function(error, output)
-  {
-    // don't repeat yourself
-    // skip secondary callbacks
-    if (!(key in state.jobs))
-    {
-      return;
-    }
-
-    // clean up jobs
-    delete state.jobs[key];
-
-    if (error)
-    {
-      // don't process rest of the results
-      // stop still active jobs
-      // and reset the list
-      abort(state);
-    }
-    else
-    {
-      state.results[key] = output;
-    }
-
-    // return salvaged results
-    callback(error, state.results);
-  });
-}
-
-/**
- * Runs iterator over provided job element
- *
- * @param   {function} iterator - iterator to invoke
- * @param   {string|number} key - key/index of the element in the list of jobs
- * @param   {mixed} item - job description
- * @param   {function} callback - invoked after iterator is done with the job
- * @returns {function|mixed} - job abort function or something else
- */
-function runJob(iterator, key, item, callback)
-{
-  var aborter;
-
-  // allow shortcut if iterator expects only two arguments
-  if (iterator.length == 2)
-  {
-    aborter = iterator(item, async(callback));
-  }
-  // otherwise go with full three arguments
-  else
-  {
-    aborter = iterator(item, key, async(callback));
-  }
-
-  return aborter;
-}
-
-
-/***/ }),
-/* 349 */
-/***/ (function(module, exports) {
-
-// API
-module.exports = state;
-
-/**
- * Creates initial state object
- * for iteration over list
- *
- * @param   {array|object} list - list to iterate over
- * @param   {function|null} sortMethod - function to use for keys sort,
- *                                     or `null` to keep them as is
- * @returns {object} - initial state object
- */
-function state(list, sortMethod)
-{
-  var isNamedList = !Array.isArray(list)
-    , initState =
-    {
-      index    : 0,
-      keyedList: isNamedList || sortMethod ? Object.keys(list) : null,
-      jobs     : {},
-      results  : isNamedList ? {} : [],
-      size     : isNamedList ? Object.keys(list).length : list.length
-    }
-    ;
-
-  if (sortMethod)
-  {
-    // sort array keys based on it's values
-    // sort object's keys just on own merit
-    initState.keyedList.sort(isNamedList ? sortMethod : function(a, b)
-    {
-      return sortMethod(list[a], list[b]);
-    });
-  }
-
-  return initState;
-}
-
-
-/***/ }),
-/* 350 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var abort = __webpack_require__(346)
-  , async = __webpack_require__(347)
-  ;
-
-// API
-module.exports = terminator;
-
-/**
- * Terminates jobs in the attached state context
- *
- * @this  AsyncKitState#
- * @param {function} callback - final callback to invoke after termination
- */
-function terminator(callback)
-{
-  if (!Object.keys(this.jobs).length)
-  {
-    return;
-  }
-
-  // fast forward iteration index
-  this.index = this.size;
-
-  // abort jobs
-  abort(this);
-
-  // send back results we have so far
-  async(callback)(null, this.results);
-}
-
-
-/***/ }),
-/* 351 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var iterate    = __webpack_require__(348)
-  , initState  = __webpack_require__(349)
-  , terminator = __webpack_require__(350)
-  ;
-
-// Public API
-module.exports = serialOrdered;
-// sorting helpers
-module.exports.ascending  = ascending;
-module.exports.descending = descending;
-
-/**
- * Runs iterator over provided sorted array elements in series
- *
- * @param   {array|object} list - array or object (named list) to iterate over
- * @param   {function} iterator - iterator to run
- * @param   {function} sortMethod - custom sort function
- * @param   {function} callback - invoked when all elements processed
- * @returns {function} - jobs terminator
- */
-function serialOrdered(list, iterator, sortMethod, callback)
-{
-  var state = initState(list, sortMethod);
-
-  iterate(list, iterator, state, function iteratorHandler(error, result)
-  {
-    if (error)
-    {
-      callback(error, result);
-      return;
-    }
-
-    state.index++;
-
-    // are we there yet?
-    if (state.index < (state['keyedList'] || list).length)
-    {
-      iterate(list, iterator, state, iteratorHandler);
-      return;
-    }
-
-    // done here
-    callback(null, state.results);
-  });
-
-  return terminator.bind(state, callback);
-}
-
-/*
- * -- Sort methods
- */
-
-/**
- * sort helper to sort array elements in ascending order
- *
- * @param   {mixed} a - an item to compare
- * @param   {mixed} b - an item to compare
- * @returns {number} - comparison result
- */
-function ascending(a, b)
-{
-  return a < b ? -1 : a > b ? 1 : 0;
-}
-
-/**
- * sort helper to sort array elements in descending order
- *
- * @param   {mixed} a - an item to compare
- * @param   {mixed} b - an item to compare
- * @returns {number} - comparison result
- */
-function descending(a, b)
-{
-  return -1 * ascending(a, b);
-}
-
-
-/***/ }),
-/* 352 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = {
-  'upgrade-interactive': 'upgradeInteractive',
-  'generate-lock-entry': 'generateLockEntry'
-};
-
-/***/ }),
-/* 353 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const DEFAULT_LOG_LEVEL = 'info';
-    const audit = new Audit(config, reporter, {
-      groups: flags.groups || (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES,
-      level: flags.level || DEFAULT_LOG_LEVEL
-    });
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-    const install = new (_install || _load_install()).Install({}, config, reporter, lockfile);
-
-    var _ref2 = yield install.fetchRequestFromCwd();
-
-    const manifest = _ref2.manifest,
-          requests = _ref2.requests,
-          patterns = _ref2.patterns,
-          workspaceLayout = _ref2.workspaceLayout;
-
-    yield install.resolver.init(requests, {
-      workspaceLayout
-    });
-
-    const vulnerabilities = yield audit.performAudit(manifest, lockfile, install.resolver, install.linker, patterns);
-
-    const EXIT_INFO = 1;
-    const EXIT_LOW = 2;
-    const EXIT_MODERATE = 4;
-    const EXIT_HIGH = 8;
-    const EXIT_CRITICAL = 16;
-
-    const exitCode = (vulnerabilities.info ? EXIT_INFO : 0) + (vulnerabilities.low ? EXIT_LOW : 0) + (vulnerabilities.moderate ? EXIT_MODERATE : 0) + (vulnerabilities.high ? EXIT_HIGH : 0) + (vulnerabilities.critical ? EXIT_CRITICAL : 0);
-
-    if (flags.summary) {
-      audit.summary();
-    } else {
-      audit.report();
-    }
-
-    return exitCode;
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _promise;
-
-function _load_promise() {
-  return _promise = __webpack_require__(50);
-}
-
-var _hoistedTreeBuilder;
-
-function _load_hoistedTreeBuilder() {
-  return _hoistedTreeBuilder = __webpack_require__(554);
-}
-
-var _getTransitiveDevDependencies;
-
-function _load_getTransitiveDevDependencies() {
-  return _getTransitiveDevDependencies = __webpack_require__(580);
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const zlib = __webpack_require__(198);
-
-const gzip = (0, (_promise || _load_promise()).promisify)(zlib.gzip);
-
-function setFlags(commander) {
-  commander.description('Checks for known security issues with the installed packages.');
-  commander.option('--summary', 'Only print the summary.');
-  commander.option('--groups <group_name> [<group_name> ...]', `Only audit dependencies from listed groups. Default: ${(_constants || _load_constants()).OWNED_DEPENDENCY_TYPES.join(', ')}`, groups => groups.split(' '), (_constants || _load_constants()).OWNED_DEPENDENCY_TYPES);
-  commander.option('--level <severity>', `Only print advisories with severity greater than or equal to one of the following: \
-    info|low|moderate|high|critical. Default: info`, 'info');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-class Audit {
-
-  constructor(config, reporter, options) {
-    this.severityLevels = ['info', 'low', 'moderate', 'high', 'critical'];
-
-    this.config = config;
-    this.reporter = reporter;
-    this.options = options;
-  }
-
-  _mapHoistedNodes(auditNode, hoistedNodes, transitiveDevDeps) {
-    for (var _iterator = hoistedNodes, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref3 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref3 = _i.value;
-      }
-
-      const node = _ref3;
-
-      const pkg = node.manifest.pkg;
-      const requires = Object.assign({}, pkg.dependencies || {}, pkg.optionalDependencies || {});
-      for (var _iterator2 = Object.keys(requires), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref4 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref4 = _i2.value;
-        }
-
-        const name = _ref4;
-
-        if (!requires[name]) {
-          requires[name] = '*';
-        }
-      }
-      auditNode.dependencies[node.name] = {
-        version: node.version,
-        integrity: pkg._remote ? pkg._remote.integrity || '' : '',
-        requires,
-        dependencies: {},
-        dev: transitiveDevDeps.has(`${node.name}@${node.version}`)
-      };
-      if (node.children) {
-        this._mapHoistedNodes(auditNode.dependencies[node.name], node.children, transitiveDevDeps);
-      }
-    }
-  }
-
-  _mapHoistedTreesToAuditTree(manifest, hoistedTrees, transitiveDevDeps) {
-    const requiresGroups = this.options.groups.map(function (group) {
-      return manifest[group] || {};
-    });
-
-    const auditTree = {
-      name: manifest.name || undefined,
-      version: manifest.version || undefined,
-      install: [],
-      remove: [],
-      metadata: {
-        //TODO: What do we send here? npm sends npm version, node version, etc.
-      },
-      requires: Object.assign({}, ...requiresGroups),
-      integrity: undefined,
-      dependencies: {},
-      dev: false
-    };
-
-    this._mapHoistedNodes(auditTree, hoistedTrees, transitiveDevDeps);
-    return auditTree;
-  }
-
-  _fetchAudit(auditTree) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let responseJson;
-      const registry = (_constants || _load_constants()).YARN_REGISTRY;
-      _this.reporter.verbose(`Audit Request: ${JSON.stringify(auditTree, null, 2)}`);
-      const requestBody = yield gzip(JSON.stringify(auditTree));
-      const response = yield _this.config.requestManager.request({
-        url: `${registry}/-/npm/v1/security/audits`,
-        method: 'POST',
-        body: requestBody,
-        headers: {
-          'Content-Encoding': 'gzip',
-          'Content-Type': 'application/json',
-          Accept: 'application/json'
-        }
-      });
-
-      try {
-        responseJson = JSON.parse(response);
-      } catch (ex) {
-        throw new Error(`Unexpected audit response (Invalid JSON): ${response}`);
-      }
-      if (!responseJson.metadata) {
-        throw new Error(`Unexpected audit response (Missing Metadata): ${JSON.stringify(responseJson, null, 2)}`);
-      }
-      _this.reporter.verbose(`Audit Response: ${JSON.stringify(responseJson, null, 2)}`);
-      return responseJson;
-    })();
-  }
-
-  _insertWorkspacePackagesIntoManifest(manifest, resolver) {
-    if (resolver.workspaceLayout) {
-      const workspaceAggregatorName = resolver.workspaceLayout.virtualManifestName;
-      const workspaceManifest = resolver.workspaceLayout.workspaces[workspaceAggregatorName].manifest;
-
-      manifest.dependencies = Object.assign(manifest.dependencies || {}, workspaceManifest.dependencies);
-      manifest.devDependencies = Object.assign(manifest.devDependencies || {}, workspaceManifest.devDependencies);
-      manifest.optionalDependencies = Object.assign(manifest.optionalDependencies || {}, workspaceManifest.optionalDependencies);
-    }
-  }
-
-  performAudit(manifest, lockfile, resolver, linker, patterns) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this2._insertWorkspacePackagesIntoManifest(manifest, resolver);
-      const transitiveDevDeps = (0, (_getTransitiveDevDependencies || _load_getTransitiveDevDependencies()).getTransitiveDevDependencies)(manifest, resolver.workspaceLayout, lockfile);
-      const hoistedTrees = yield (0, (_hoistedTreeBuilder || _load_hoistedTreeBuilder()).buildTree)(resolver, linker, patterns);
-      const auditTree = _this2._mapHoistedTreesToAuditTree(manifest, hoistedTrees, transitiveDevDeps);
-      _this2.auditData = yield _this2._fetchAudit(auditTree);
-      return _this2.auditData.metadata.vulnerabilities;
-    })();
-  }
-
-  summary() {
-    if (!this.auditData) {
-      return;
-    }
-    this.reporter.auditSummary(this.auditData.metadata);
-  }
-
-  report() {
-    if (!this.auditData) {
-      return;
-    }
-
-    const startLoggingAt = Math.max(0, this.severityLevels.indexOf(this.options.level));
-
-    const reportAdvisory = resolution => {
-      const advisory = this.auditData.advisories[resolution.id.toString()];
-
-      if (this.severityLevels.indexOf(advisory.severity) >= startLoggingAt) {
-        this.reporter.auditAdvisory(resolution, advisory);
-      }
-    };
-
-    if (Object.keys(this.auditData.advisories).length !== 0) {
-      // let printedManualReviewHeader = false;
-
-      this.auditData.actions.forEach(action => {
-        action.resolves.forEach(reportAdvisory);
-
-        /* The following block has been temporarily removed
-         * because the actions returned by npm are not valid for yarn.
-         * Removing this action reporting until we can come up with a way
-         * to correctly resolve issues.
-         */
-        // if (action.action === 'update' || action.action === 'install') {
-        //   // these advisories can be resolved automatically by running a yarn command
-        //   const recommendation: AuditActionRecommendation = {
-        //     cmd: `yarn upgrade ${action.module}@${action.target}`,
-        //     isBreaking: action.isMajor,
-        //     action,
-        //   };
-        //   this.reporter.auditAction(recommendation);
-        //   action.resolves.forEach(reportAdvisory);
-        // }
-
-        // if (action.action === 'review') {
-        //   // these advisories cannot be resolved automatically and require manual review
-        //   if (!printedManualReviewHeader) {
-        //     this.reporter.auditManualReview();
-        //   }
-        //   printedManualReviewHeader = true;
-        //   action.resolves.forEach(reportAdvisory);
-        // }
-      });
-    }
-
-    this.summary();
-  }
-}
-exports.default = Audit;
-
-/***/ }),
-/* 354 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.clean = exports.noArguments = exports.requireLockfile = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let clean = exports.clean = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter) {
-    const loc = path.join(config.lockfileFolder, (_constants || _load_constants()).CLEAN_FILENAME);
-    const file = yield (_fs || _load_fs()).readFile(loc);
-    const lines = file.split('\n');
-    const filters = (0, (_filter || _load_filter()).ignoreLinesToRegex)(lines);
-
-    let removedFiles = 0;
-    let removedSize = 0;
-
-    // build list of possible module folders
-    const locs = new Set();
-    for (var _iterator = config.registryFolders, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const registryFolder = _ref2;
-
-      locs.add(path.resolve(config.lockfileFolder, registryFolder));
-    }
-
-    const workspaceRootFolder = config.workspaceRootFolder;
-    if (workspaceRootFolder) {
-      const manifest = yield config.findManifest(workspaceRootFolder, false);
-      invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
-
-      const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
-
-      for (var _iterator2 = Object.keys(workspaces), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const workspaceName = _ref3;
-
-        for (var _iterator3 = (_index || _load_index()).registryNames, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-          var _ref4;
-
-          if (_isArray3) {
-            if (_i3 >= _iterator3.length) break;
-            _ref4 = _iterator3[_i3++];
-          } else {
-            _i3 = _iterator3.next();
-            if (_i3.done) break;
-            _ref4 = _i3.value;
-          }
-
-          const name = _ref4;
-
-          const registry = config.registries[name];
-          locs.add(path.join(workspaces[workspaceName].loc, registry.folder));
-        }
-      }
-    }
-
-    for (var _iterator4 = locs, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref5;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref5 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref5 = _i4.value;
-      }
-
-      const folder = _ref5;
-
-      if (!(yield (_fs || _load_fs()).exists(folder))) {
-        continue;
-      }
-
-      const spinner = reporter.activity();
-      const files = yield (_fs || _load_fs()).walk(folder);
-
-      var _sortFilter = (0, (_filter || _load_filter()).sortFilter)(files, filters);
-
-      const ignoreFiles = _sortFilter.ignoreFiles;
-
-      spinner.end();
-
-      const tick = reporter.progress(ignoreFiles.size);
-      // TODO make sure `main` field of all modules isn't ignored
-
-      for (var _iterator5 = ignoreFiles, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref6 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref6 = _i5.value;
-        }
-
-        const file = _ref6;
-
-        const loc = path.join(folder, file);
-        const stat = yield (_fs || _load_fs()).lstat(loc);
-        removedSize += stat.size;
-        removedFiles++;
-      }
-
-      for (var _iterator6 = ignoreFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray6) {
-          if (_i6 >= _iterator6.length) break;
-          _ref7 = _iterator6[_i6++];
-        } else {
-          _i6 = _iterator6.next();
-          if (_i6.done) break;
-          _ref7 = _i6.value;
-        }
-
-        const file = _ref7;
-
-        const loc = path.join(folder, file);
-        yield (_fs || _load_fs()).unlink(loc);
-        tick();
-      }
-    }
-
-    return { removedFiles, removedSize };
-  });
-
-  return function clean(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let runInit = (() => {
-  var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (cwd, reporter) {
-    reporter.step(1, 1, reporter.lang('cleanCreatingFile', (_constants || _load_constants()).CLEAN_FILENAME));
-    const cleanLoc = path.join(cwd, (_constants || _load_constants()).CLEAN_FILENAME);
-    yield (_fs || _load_fs()).writeFile(cleanLoc, `${DEFAULT_FILTER}\n`, { flag: 'wx' });
-    reporter.info(reporter.lang('cleanCreatedFile', (_constants || _load_constants()).CLEAN_FILENAME));
-  });
-
-  return function runInit(_x3, _x4) {
-    return _ref8.apply(this, arguments);
-  };
-})();
-
-let runAutoClean = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter) {
-    reporter.step(1, 1, reporter.lang('cleaning'));
-
-    var _ref10 = yield clean(config, reporter);
-
-    const removedFiles = _ref10.removedFiles,
-          removedSize = _ref10.removedSize;
-
-    reporter.info(reporter.lang('cleanRemovedFiles', removedFiles));
-    reporter.info(reporter.lang('cleanSavedSize', Number((removedSize / 1024 / 1024).toFixed(2))));
-  });
-
-  return function runAutoClean(_x5, _x6) {
-    return _ref9.apply(this, arguments);
-  };
-})();
-
-let checkForCleanFile = (() => {
-  var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (cwd) {
-    const cleanLoc = path.join(cwd, (_constants || _load_constants()).CLEAN_FILENAME);
-    const exists = yield (_fs || _load_fs()).exists(cleanLoc);
-    return exists;
-  });
-
-  return function checkForCleanFile(_x7) {
-    return _ref11.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref12 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const cleanFileExists = yield checkForCleanFile(config.cwd);
-
-    if (flags.init && cleanFileExists) {
-      reporter.info(reporter.lang('cleanAlreadyExists', (_constants || _load_constants()).CLEAN_FILENAME));
-    } else if (flags.init) {
-      yield runInit(config.cwd, reporter);
-    } else if (flags.force && cleanFileExists) {
-      yield runAutoClean(config, reporter);
-    } else if (cleanFileExists) {
-      reporter.info(reporter.lang('cleanRequiresForce', (_constants || _load_constants()).CLEAN_FILENAME));
-    } else {
-      reporter.info(reporter.lang('cleanDoesNotExist', (_constants || _load_constants()).CLEAN_FILENAME));
-    }
-  });
-
-  return function run(_x8, _x9, _x10, _x11) {
-    return _ref12.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(57);
-}
-
-var _filter;
-
-function _load_filter() {
-  return _filter = __webpack_require__(372);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-
-const requireLockfile = exports.requireLockfile = true;
-const noArguments = exports.noArguments = true;
-
-const DEFAULT_FILTER = `
-# test directories
-__tests__
-test
-tests
-powered-test
-
-# asset directories
-docs
-doc
-website
-images
-assets
-
-# examples
-example
-examples
-
-# code coverage directories
-coverage
-.nyc_output
-
-# build scripts
-Makefile
-Gulpfile.js
-Gruntfile.js
-
-# configs
-appveyor.yml
-circle.yml
-codeship-services.yml
-codeship-steps.yml
-wercker.yml
-.tern-project
-.gitattributes
-.editorconfig
-.*ignore
-.eslintrc
-.jshintrc
-.flowconfig
-.documentup.json
-.yarn-metadata.json
-.travis.yml
-
-# misc
-*.md
-`.trim();
-
-function setFlags(commander) {
-  commander.description('Cleans and removes unnecessary files from package dependencies.');
-  commander.usage('autoclean [flags]');
-  commander.option('-I, --init', `Create "${(_constants || _load_constants()).CLEAN_FILENAME}" file with the default entries.`);
-  commander.option('-F, --force', `Run autoclean using the existing "${(_constants || _load_constants()).CLEAN_FILENAME}" file.`);
-}
-
-function hasWrapper(commander) {
-  return true;
-}
-
-/***/ }),
-/* 355 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.run = exports.getCachedPackagesDirs = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getCachedPackagesDirs = exports.getCachedPackagesDirs = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, currentPath) {
-    const results = [];
-    const stat = yield (_fs || _load_fs()).lstat(currentPath);
-
-    if (!stat.isDirectory()) {
-      return results;
-    }
-
-    const folders = yield (_fs || _load_fs()).readdir(currentPath);
-    for (var _iterator = folders, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const folder = _ref2;
-
-      if (folder[0] === '.') {
-        continue;
-      }
-      const packageParentPath = path.join(currentPath, folder, 'node_modules');
-
-      const candidates = yield (_fs || _load_fs()).readdir(packageParentPath);
-      invariant(candidates.length === 1, `There should only be one folder in a package cache (got ${candidates.join(',')} in ${packageParentPath})`);
-
-      for (var _iterator2 = candidates, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const candidate = _ref3;
-
-        const candidatePath = path.join(packageParentPath, candidate);
-        if (candidate.charAt(0) === '@') {
-          const subCandidates = yield (_fs || _load_fs()).readdir(candidatePath);
-          invariant(subCandidates.length === 1, `There should only be one folder in a package cache (got ${subCandidates.join(',')} in ${candidatePath})`);
-
-          for (var _iterator3 = subCandidates, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-            var _ref4;
-
-            if (_isArray3) {
-              if (_i3 >= _iterator3.length) break;
-              _ref4 = _iterator3[_i3++];
-            } else {
-              _i3 = _iterator3.next();
-              if (_i3.done) break;
-              _ref4 = _i3.value;
-            }
-
-            const subCandidate = _ref4;
-
-            const subCandidatePath = path.join(candidatePath, subCandidate);
-            results.push(subCandidatePath);
-          }
-        } else {
-          results.push(candidatePath);
-        }
-      }
-    }
-
-    return results;
-  });
-
-  return function getCachedPackagesDirs(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let getCachedPackages = (() => {
-  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    const paths = yield getCachedPackagesDirs(config, config.cacheFolder);
-    return _getMetadataWithPath(config.readPackageMetadata.bind(config), paths).then(function (packages) {
-      return packages.filter(function (p) {
-        return !!p;
-      });
-    });
-  });
-
-  return function getCachedPackages(_x3) {
-    return _ref5.apply(this, arguments);
-  };
-})();
-
-let list = (() => {
-  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const filterOut = function filterOut({ registry, package: manifest, remote } = {}) {
-      if (flags.pattern && !micromatch.contains(manifest.name, flags.pattern)) {
-        return false;
-      }
-      return true;
-    };
-
-    const forReport = function forReport({ registry, package: manifest, remote } = {}) {
-      return [manifest.name, manifest.version, registry, remote && remote.resolved || ''];
-    };
-
-    const packages = yield getCachedPackages(config);
-    const body = packages.filter(filterOut).map(forReport);
-    reporter.table(['Name', 'Version', 'Registry', 'Resolved'], body);
-  });
-
-  return function list(_x4, _x5, _x6, _x7) {
-    return _ref6.apply(this, arguments);
-  };
-})();
-
-let clean = (() => {
-  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (config.cacheFolder) {
-      const activity = reporter.activity();
-
-      if (args.length > 0) {
-        // Clear named packages from cache
-        const packages = yield getCachedPackages(config);
-        const shouldDelete = function shouldDelete({ registry, package: manifest, remote } = {}) {
-          return args.indexOf(manifest.name) !== -1;
-        };
-        const packagesToDelete = packages.filter(shouldDelete);
-
-        for (var _iterator4 = packagesToDelete, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref8;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref8 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref8 = _i4.value;
-          }
-
-          const manifest = _ref8;
-
-          let relativePath = path.relative(config.cacheFolder, manifest._path);
-          while (relativePath && relativePath !== '.') {
-            yield (_fs || _load_fs()).unlink(path.resolve(config.cacheFolder, relativePath));
-            relativePath = path.dirname(relativePath);
-          }
-        }
-
-        activity.end();
-        reporter.success(reporter.lang('clearedPackageFromCache', args[0]));
-      } else {
-        // Clear all cache
-        yield (_fs || _load_fs()).unlink(config._cacheRootFolder);
-        yield (_fs || _load_fs()).mkdirp(config.cacheFolder);
-        activity.end();
-        reporter.success(reporter.lang('clearedCache'));
-      }
-    }
-  });
-
-  return function clean(_x8, _x9, _x10, _x11) {
-    return _ref7.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-const micromatch = __webpack_require__(114);
-
-function hasWrapper(flags, args) {
-  return args[0] !== 'dir';
-}
-
-function _getMetadataWithPath(getMetadataFn, paths) {
-  return Promise.all(paths.map(path => getMetadataFn(path).then(r => {
-    r._path = path;
-    return r;
-  }).catch(error => undefined)));
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('cache', {
-  ls(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      reporter.warn(`\`yarn cache ls\` is deprecated. Please use \`yarn cache list\`.`);
-      yield list(config, reporter, flags, args);
-    })();
-  },
-  list,
-  clean,
-  dir(config, reporter) {
-    reporter.log(config.cacheFolder, { force: true });
-  }
-});
-
-const run = _buildSubCommands.run,
-      _setFlags = _buildSubCommands.setFlags,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.examples = examples;
-function setFlags(commander) {
-  _setFlags(commander);
-  commander.description('Yarn cache list will print out every cached package.');
-  commander.option('--pattern [pattern]', 'filter cached packages by pattern');
-}
-
-/***/ }),
-/* 356 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.verifyTreeCheck = exports.noArguments = exports.requireLockfile = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let verifyTreeCheck = exports.verifyTreeCheck = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    let errCount = 0;
-    function reportError(msg, ...vars) {
-      reporter.error(reporter.lang(msg, ...vars));
-      errCount++;
-    }
-    // check all dependencies recursively without relying on internal resolver
-    const registryName = 'yarn';
-    const registryFolder = config.registryFolders[0];
-    const cwd = config.workspaceRootFolder ? config.lockfileFolder : config.cwd;
-    const rootManifest = yield config.readManifest(cwd, registryName);
-
-    const dependenciesToCheckVersion = [];
-    if (rootManifest.dependencies) {
-      for (const name in rootManifest.dependencies) {
-        const version = rootManifest.dependencies[name];
-        // skip linked dependencies
-        const isLinkedDependency = /^link:/i.test(version) || /^file:/i.test(version) && config.linkFileDependencies;
-        if (isLinkedDependency) {
-          continue;
-        }
-        dependenciesToCheckVersion.push({
-          name,
-          originalKey: name,
-          parentCwd: cwd,
-          version
-        });
-      }
-    }
-    if (rootManifest.devDependencies && !config.production) {
-      for (const name in rootManifest.devDependencies) {
-        const version = rootManifest.devDependencies[name];
-        // skip linked dependencies
-        const isLinkedDependency = /^link:/i.test(version) || /^file:/i.test(version) && config.linkFileDependencies;
-        if (isLinkedDependency) {
-          continue;
-        }
-        dependenciesToCheckVersion.push({
-          name,
-          originalKey: name,
-          parentCwd: cwd,
-          version
-        });
-      }
-    }
-
-    const locationsVisited = new Set();
-    while (dependenciesToCheckVersion.length) {
-      const dep = dependenciesToCheckVersion.shift();
-      const manifestLoc = path.resolve(dep.parentCwd, registryFolder, dep.name);
-      if (locationsVisited.has(manifestLoc + `@${dep.version}`)) {
-        continue;
-      }
-      locationsVisited.add(manifestLoc + `@${dep.version}`);
-      // When plugnplay is enabled, packages aren't copied to the node_modules folder, so this check doesn't make sense
-      // TODO: We ideally should check that the packages are located inside the cache instead
-      if (config.plugnplayEnabled) {
-        continue;
-      }
-      if (!(yield (_fs || _load_fs()).exists(manifestLoc))) {
-        reportError('packageNotInstalled', `${dep.originalKey}`);
-        continue;
-      }
-      if (!(yield (_fs || _load_fs()).exists(path.join(manifestLoc, 'package.json')))) {
-        continue;
-      }
-      const pkg = yield config.readManifest(manifestLoc, registryName);
-      if (semver.validRange(dep.version, config.looseSemver) && !semver.satisfies(pkg.version, dep.version, config.looseSemver)) {
-        reportError('packageWrongVersion', dep.originalKey, dep.version, pkg.version);
-        continue;
-      }
-      const dependencies = pkg.dependencies;
-      if (dependencies) {
-        for (const subdep in dependencies) {
-          const subDepPath = path.resolve(manifestLoc, registryFolder, subdep);
-          let found = false;
-          const relative = path.relative(cwd, subDepPath);
-          const locations = path.normalize(relative).split(registryFolder + path.sep).filter(function (dir) {
-            return !!dir;
-          });
-          locations.pop();
-          while (locations.length >= 0) {
-            let possiblePath;
-            if (locations.length > 0) {
-              possiblePath = path.join(cwd, registryFolder, locations.join(path.sep + registryFolder + path.sep));
-            } else {
-              possiblePath = cwd;
-            }
-            if (yield (_fs || _load_fs()).exists(path.resolve(possiblePath, registryFolder, subdep))) {
-              dependenciesToCheckVersion.push({
-                name: subdep,
-                originalKey: `${dep.originalKey}#${subdep}`,
-                parentCwd: possiblePath,
-                version: dependencies[subdep]
-              });
-              found = true;
-              break;
-            }
-            if (!locations.length) {
-              break;
-            }
-            locations.pop();
-          }
-          if (!found) {
-            reportError('packageNotInstalled', `${dep.originalKey}#${subdep}`);
-          }
-        }
-      }
-    }
-
-    if (errCount > 0) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('foundErrors', errCount));
-    } else {
-      reporter.success(reporter.lang('folderInSync'));
-    }
-  });
-
-  return function verifyTreeCheck(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let integrityHashCheck = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    let errCount = 0;
-    function reportError(msg, ...vars) {
-      reporter.error(reporter.lang(msg, ...vars));
-      errCount++;
-    }
-    const integrityChecker = new (_integrityChecker || _load_integrityChecker()).default(config);
-
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-
-    // get patterns that are installed when running `yarn install`
-
-    var _ref3 = yield install.fetchRequestFromCwd();
-
-    const patterns = _ref3.patterns,
-          workspaceLayout = _ref3.workspaceLayout;
-
-
-    const match = yield integrityChecker.check(patterns, lockfile.cache, flags, workspaceLayout);
-    for (var _iterator = match.missingPatterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref4 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref4 = _i.value;
-      }
-
-      const pattern = _ref4;
-
-      reportError('lockfileNotContainPattern', pattern);
-    }
-    if (match.integrityFileMissing) {
-      reportError('noIntegrityFile');
-    }
-    if (match.integrityMatches === false) {
-      reporter.warn(reporter.lang((_integrityChecker2 || _load_integrityChecker2()).integrityErrors[match.integrityError]));
-      reportError('integrityCheckFailed');
-    }
-
-    if (errCount > 0) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('foundErrors', errCount));
-    } else {
-      reporter.success(reporter.lang('folderInSync'));
-    }
-  });
-
-  return function integrityHashCheck(_x5, _x6, _x7, _x8) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (flags.verifyTree) {
-      yield verifyTreeCheck(config, reporter, flags, args);
-      return;
-    } else if (flags.integrity) {
-      yield integrityHashCheck(config, reporter, flags, args);
-      return;
-    }
-
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-
-    function humaniseLocation(loc) {
-      const relative = path.relative(path.join(config.cwd, 'node_modules'), loc);
-      const normalized = path.normalize(relative).split(path.sep);
-      return normalized.filter(p => p !== 'node_modules').reduce((result, part) => {
-        const length = result.length;
-        if (length && result[length - 1].startsWith('@') && result[length - 1].indexOf(path.sep) === -1) {
-          result[length - 1] += path.sep + part;
-        } else {
-          result.push(part);
-        }
-        return result;
-      }, []);
-    }
-
-    let warningCount = 0;
-    let errCount = 0;
-    function reportError(msg, ...vars) {
-      reporter.error(reporter.lang(msg, ...vars));
-      errCount++;
-    }
-
-    // get patterns that are installed when running `yarn install`
-
-    var _ref6 = yield install.hydrate();
-
-    const rawPatterns = _ref6.patterns,
-          workspaceLayout = _ref6.workspaceLayout;
-
-    const patterns = yield install.flatten(rawPatterns);
-
-    // check if patterns exist in lockfile
-    for (var _iterator2 = patterns, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref7 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref7 = _i2.value;
-      }
-
-      const pattern = _ref7;
-
-      if (!lockfile.getLocked(pattern) && (!workspaceLayout || !workspaceLayout.getManifestByPattern(pattern))) {
-        reportError('lockfileNotContainPattern', pattern);
-      }
-    }
-
-    const bundledDeps = {};
-    // check if any of the node_modules are out of sync
-    const res = yield install.linker.getFlatHoistedTree(patterns, workspaceLayout);
-    for (var _iterator3 = res, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref9;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref9 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref9 = _i3.value;
-      }
-
-      const _ref8 = _ref9;
-      const loc = _ref8[0];
-      var _ref8$ = _ref8[1];
-      const originalKey = _ref8$.originalKey;
-      const pkg = _ref8$.pkg;
-      const ignore = _ref8$.ignore;
-
-      if (ignore) {
-        continue;
-      }
-
-      const parts = humaniseLocation(loc);
-
-      // grey out hoisted portions of key
-      let human = originalKey;
-      const hoistedParts = parts.slice();
-      const hoistedKey = parts.join('#');
-      if (human !== hoistedKey) {
-        const humanParts = human.split('#');
-
-        for (let i = 0; i < humanParts.length; i++) {
-          const humanPart = humanParts[i];
-
-          if (hoistedParts[0] === humanPart) {
-            hoistedParts.shift();
-
-            if (i < humanParts.length - 1) {
-              humanParts[i] += '#';
-            }
-          } else {
-            humanParts[i] = reporter.format.dim(`${humanPart}#`);
-          }
-        }
-
-        human = humanParts.join('');
-      }
-
-      // skip unnecessary checks for linked dependencies
-      const remoteType = pkg._reference.remote.type;
-      const isLinkedDependency = remoteType === 'link' || remoteType === 'workspace' || remoteType === 'file' && config.linkFileDependencies;
-      const isResolution = pkg._reference.hint === 'resolution';
-      if (isLinkedDependency || isResolution) {
-        continue;
-      }
-
-      if (!(yield (_fs || _load_fs()).exists(loc))) {
-        if (pkg._reference.optional) {
-          reporter.warn(reporter.lang('optionalDepNotInstalled', human));
-        } else {
-          reportError('packageNotInstalled', human);
-        }
-        continue;
-      }
-
-      const pkgLoc = path.join(loc, 'package.json');
-
-      if (yield (_fs || _load_fs()).exists(pkgLoc)) {
-        const packageJson = yield config.readJson(pkgLoc);
-        packageJson.version = semver.clean(packageJson.version);
-
-        if (pkg.version !== packageJson.version) {
-          // node_modules contains wrong version
-          reportError('packageWrongVersion', human, pkg.version, packageJson.version);
-        }
-
-        const deps = Object.assign({}, packageJson.dependencies, packageJson.peerDependencies);
-        bundledDeps[packageJson.name] = packageJson.bundledDependencies || [];
-
-        for (const name in deps) {
-          const range = deps[name];
-          if (!semver.validRange(range, config.looseSemver)) {
-            continue; // exotic
-          }
-
-          const subHuman = `${human}#${name}@${range}`;
-
-          // find the package that this will resolve to, factoring in hoisting
-          const possibles = [];
-          let depLoc;
-          for (let i = parts.length; i >= 0; i--) {
-            const myParts = parts.slice(0, i).concat(name);
-
-            // build package.json location for this position
-            const myDepPkgLoc = path.join(config.cwd, 'node_modules', myParts.join(`${path.sep}node_modules${path.sep}`));
-
-            possibles.push(myDepPkgLoc);
-          }
-          while (possibles.length) {
-            const myDepPkgLoc = possibles.shift();
-            if (yield (_fs || _load_fs()).exists(myDepPkgLoc)) {
-              depLoc = myDepPkgLoc;
-              break;
-            }
-          }
-          if (!depLoc) {
-            // we'll hit the module not install error above when this module is hit
-            continue;
-          }
-
-          const depPkgLoc = path.join(depLoc, 'package.json');
-
-          if (yield (_fs || _load_fs()).exists(depPkgLoc)) {
-            const depPkg = yield config.readJson(depPkgLoc);
-            const foundHuman = `${humaniseLocation(path.dirname(depPkgLoc)).join('#')}@${depPkg.version}`;
-            if (!semver.satisfies(depPkg.version, range, config.looseSemver)) {
-              // module isn't correct semver
-              const resPattern = install.resolutionMap.find(name, originalKey.split('#'));
-              if (resPattern) {
-                const resHuman = `${human}#${resPattern}`;
-
-                var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(resPattern);
-
-                const resRange = _normalizePattern.range;
-
-
-                if (semver.satisfies(depPkg.version, resRange, config.looseSemver)) {
-                  reporter.warn(reporter.lang('incompatibleResolutionVersion', foundHuman, subHuman));
-                  warningCount++;
-                } else {
-                  reportError('packageDontSatisfy', resHuman, foundHuman);
-                }
-              } else {
-                reportError('packageDontSatisfy', subHuman, foundHuman);
-              }
-
-              continue;
-            }
-
-            // check for modules above us that this could be deduped to
-            for (var _iterator4 = possibles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-              var _ref10;
-
-              if (_isArray4) {
-                if (_i4 >= _iterator4.length) break;
-                _ref10 = _iterator4[_i4++];
-              } else {
-                _i4 = _iterator4.next();
-                if (_i4.done) break;
-                _ref10 = _i4.value;
-              }
-
-              const loc = _ref10;
-
-              const locPkg = path.join(loc, 'package.json');
-
-              if (!(yield (_fs || _load_fs()).exists(locPkg))) {
-                continue;
-              }
-
-              const packageJson = yield config.readJson(locPkg);
-              const packagePath = originalKey.split('#');
-              const rootDep = packagePath[0];
-              const packageName = packagePath[1] || packageJson.name;
-
-              const bundledDep = bundledDeps[rootDep] && bundledDeps[rootDep].indexOf(packageName) !== -1;
-              if (!bundledDep && (packageJson.version === depPkg.version || semver.satisfies(packageJson.version, range, config.looseSemver) && semver.gt(packageJson.version, depPkg.version, config.looseSemver))) {
-                reporter.warn(reporter.lang('couldBeDeduped', subHuman, packageJson.version, `${humaniseLocation(path.dirname(locPkg)).join('#')}@${packageJson.version}`));
-                warningCount++;
-              }
-              break;
-            }
-          }
-        }
-      }
-    }
-
-    if (warningCount > 1) {
-      reporter.info(reporter.lang('foundWarnings', warningCount));
-    }
-
-    if (errCount > 0) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('foundErrors', errCount));
-    } else {
-      reporter.success(reporter.lang('folderInSync'));
-    }
-  });
-
-  return function run(_x9, _x10, _x11, _x12) {
-    return _ref5.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _integrityChecker;
-
-function _load_integrityChecker() {
-  return _integrityChecker = _interopRequireDefault(__webpack_require__(208));
-}
-
-var _integrityChecker2;
-
-function _load_integrityChecker2() {
-  return _integrityChecker2 = __webpack_require__(208);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const semver = __webpack_require__(21);
-const path = __webpack_require__(0);
-
-const requireLockfile = exports.requireLockfile = false;
-const noArguments = exports.noArguments = true;
-
-function hasWrapper(commander) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Verifies if versions in the current project’s package.json match that of yarn’s lock file.');
-  commander.option('--integrity');
-  commander.option('--verify-tree');
-}
-
-/***/ }),
-/* 357 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.getRegistryFolder = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getRegistryFolder = exports.getRegistryFolder = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, name) {
-    if (config.modulesFolder) {
-      return config.modulesFolder;
-    }
-
-    const src = path.join(config.linkFolder, name);
-
-    var _ref2 = yield config.readManifest(src);
-
-    const _registry = _ref2._registry;
-
-    invariant(_registry, 'expected registry');
-
-    const registryFolder = config.registries[_registry].folder;
-    return path.join(config.cwd, registryFolder);
-  });
-
-  return function getRegistryFolder(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (args.length) {
-      for (var _iterator = args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref4 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref4 = _i.value;
-        }
-
-        const name = _ref4;
-
-        const src = path.join(config.linkFolder, name);
-
-        if (yield (_fs || _load_fs()).exists(src)) {
-          const folder = yield getRegistryFolder(config, name);
-          const dest = path.join(folder, name);
-
-          yield (_fs || _load_fs()).unlink(dest);
-          yield (_fs || _load_fs()).mkdirp(path.dirname(dest));
-          yield (_fs || _load_fs()).symlink(src, dest);
-          reporter.success(reporter.lang('linkUsing', name));
-        } else {
-          throw new (_errors || _load_errors()).MessageError(reporter.lang('linkMissing', name));
-        }
-      }
-    } else {
-      // add cwd module to the global registry
-      const manifest = yield config.readRootManifest();
-      const name = manifest.name;
-      if (!name) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownPackageName'));
-      }
-
-      const linkLoc = path.join(config.linkFolder, name);
-      if (yield (_fs || _load_fs()).exists(linkLoc)) {
-        reporter.warn(reporter.lang('linkCollision', name));
-      } else {
-        yield (_fs || _load_fs()).mkdirp(path.dirname(linkLoc));
-        yield (_fs || _load_fs()).symlink(config.cwd, linkLoc);
-
-        // If there is a `bin` defined in the package.json,
-        // link each bin to the global bin
-        if (manifest.bin) {
-          const globalBinFolder = yield (0, (_global || _load_global()).getBinFolder)(config, flags);
-          for (const binName in manifest.bin) {
-            const binSrc = manifest.bin[binName];
-            const binSrcLoc = path.join(linkLoc, binSrc);
-            const binDestLoc = path.join(globalBinFolder, binName);
-            if (yield (_fs || _load_fs()).exists(binDestLoc)) {
-              reporter.warn(reporter.lang('binLinkCollision', binName));
-            } else {
-              if (process.platform === 'win32') {
-                yield cmdShim(binSrcLoc, binDestLoc, { createPwshFile: false });
-              } else {
-                yield (_fs || _load_fs()).symlink(binSrcLoc, binDestLoc);
-              }
-            }
-          }
-        }
-
-        reporter.success(reporter.lang('linkRegistered', name));
-        reporter.info(reporter.lang('linkRegisteredMessage', name));
-      }
-    }
-  });
-
-  return function run(_x3, _x4, _x5, _x6) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _global;
-
-function _load_global() {
-  return _global = __webpack_require__(121);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const cmdShim = __webpack_require__(201);
-const path = __webpack_require__(0);
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Symlink a package folder during development.');
-}
-
-/***/ }),
-/* 358 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.buildTree = exports.requireLockfile = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let buildTree = exports.buildTree = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (resolver, linker, patterns, opts, onlyFresh, ignoreHoisted) {
-    const treesByKey = {};
-    const trees = [];
-    const flatTree = yield linker.getFlatHoistedTree(patterns);
-
-    // If using workspaces, filter out the virtual manifest
-    const workspaceLayout = resolver.workspaceLayout;
-
-    const hoisted = workspaceLayout && workspaceLayout.virtualManifestName ? flatTree.filter(function ([key]) {
-      return key.indexOf(workspaceLayout.virtualManifestName) === -1;
-    }) : flatTree;
-
-    const hoistedByKey = {};
-    for (var _iterator2 = hoisted, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref4 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref4 = _i2.value;
-      }
-
-      const _ref3 = _ref4;
-      const key = _ref3[0];
-      const info = _ref3[1];
-
-      hoistedByKey[key] = info;
-    }
-
-    // build initial trees
-    for (var _iterator3 = hoisted, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref6;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref6 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref6 = _i3.value;
-      }
-
-      const _ref5 = _ref6;
-      const info = _ref5[1];
-
-      const ref = info.pkg._reference;
-      const hint = null;
-      const parent = getParent(info.key, treesByKey);
-      const children = [];
-      let depth = 0;
-      let color = 'bold';
-      invariant(ref, 'expected reference');
-
-      if (onlyFresh) {
-        let isFresh = false;
-        for (var _iterator5 = ref.patterns, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-          var _ref9;
-
-          if (_isArray5) {
-            if (_i5 >= _iterator5.length) break;
-            _ref9 = _iterator5[_i5++];
-          } else {
-            _i5 = _iterator5.next();
-            if (_i5.done) break;
-            _ref9 = _i5.value;
-          }
-
-          const pattern = _ref9;
-
-          if (resolver.isNewPattern(pattern)) {
-            isFresh = true;
-            break;
-          }
-        }
-        if (!isFresh) {
-          continue;
-        }
-      }
-
-      if (info.originalKey !== info.key || opts.reqDepth === 0) {
-        // was hoisted
-        color = null;
-      }
-      // check parent to obtain next depth
-      if (parent && parent.depth > 0) {
-        depth = parent.depth + 1;
-      } else {
-        depth = 0;
-      }
-
-      const topLevel = opts.reqDepth === 0 && !parent;
-      const showAll = opts.reqDepth === -1;
-      const nextDepthIsValid = depth + 1 <= Number(opts.reqDepth);
-
-      if (topLevel || nextDepthIsValid || showAll) {
-        treesByKey[info.key] = {
-          name: `${info.pkg.name}@${info.pkg.version}`,
-          children,
-          hint,
-          color,
-          depth
-        };
-      }
-
-      // add in dummy children for hoisted dependencies
-      const nextChildDepthIsValid = depth + 1 < Number(opts.reqDepth);
-      invariant(ref, 'expected reference');
-      if (!ignoreHoisted && nextDepthIsValid || showAll) {
-        for (var _iterator6 = resolver.dedupePatterns(ref.dependencies), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-          var _ref10;
-
-          if (_isArray6) {
-            if (_i6 >= _iterator6.length) break;
-            _ref10 = _iterator6[_i6++];
-          } else {
-            _i6 = _iterator6.next();
-            if (_i6.done) break;
-            _ref10 = _i6.value;
-          }
-
-          const pattern = _ref10;
-
-          const pkg = resolver.getStrictResolvedPattern(pattern);
-
-          if (!hoistedByKey[`${info.key}#${pkg.name}`] && (nextChildDepthIsValid || showAll)) {
-            children.push({
-              name: pattern,
-              color: 'dim',
-              shadow: true
-            });
-          }
-        }
-      }
-    }
-
-    // add children
-    for (var _iterator4 = hoisted, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref8;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref8 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref8 = _i4.value;
-      }
-
-      const _ref7 = _ref8;
-      const info = _ref7[1];
-
-      const tree = treesByKey[info.key];
-      const parent = getParent(info.key, treesByKey);
-      if (!tree) {
-        continue;
-      }
-
-      if (info.key.split('#').length === 1) {
-        trees.push(tree);
-        continue;
-      }
-
-      if (parent) {
-        parent.children.push(tree);
-      }
-    }
-
-    return { trees, count: buildCount(trees) };
-  });
-
-  return function buildTree(_x, _x2, _x3, _x4, _x5, _x6) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref11 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-
-    var _ref12 = yield install.fetchRequestFromCwd();
-
-    const depRequests = _ref12.requests,
-          patterns = _ref12.patterns,
-          manifest = _ref12.manifest,
-          workspaceLayout = _ref12.workspaceLayout;
-
-    yield install.resolver.init(depRequests, {
-      isFlat: install.flags.flat,
-      isFrozen: install.flags.frozenLockfile,
-      workspaceLayout
-    });
-
-    let activePatterns = [];
-    if (config.production) {
-      const devDeps = getDevDeps(manifest);
-      activePatterns = patterns.filter(function (pattern) {
-        return !devDeps.has(pattern);
-      });
-    } else {
-      activePatterns = patterns;
-    }
-
-    const opts = {
-      reqDepth: getReqDepth(flags.depth)
-    };
-
-    var _ref13 = yield buildTree(install.resolver, install.linker, activePatterns, opts);
-
-    let trees = _ref13.trees;
-
-
-    if (args.length) {
-      reporter.warn(reporter.lang('deprecatedListArgs'));
-    }
-    if (args.length || flags.pattern) {
-      trees = trees.filter(function (tree) {
-        return filterTree(tree, args, flags.pattern);
-      });
-    }
-
-    reporter.tree('list', trees, { force: true });
-  });
-
-  return function run(_x7, _x8, _x9, _x10) {
-    return _ref11.apply(this, arguments);
-  };
-})();
-
-exports.getParent = getParent;
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-exports.getReqDepth = getReqDepth;
-exports.filterTree = filterTree;
-exports.getDevDeps = getDevDeps;
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const micromatch = __webpack_require__(114);
-
-const requireLockfile = exports.requireLockfile = true;
-
-function buildCount(trees) {
-  if (!trees || !trees.length) {
-    return 0;
-  }
-
-  let count = 0;
-
-  for (var _iterator = trees, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const tree = _ref;
-
-    if (tree.shadow) {
-      continue;
-    }
-
-    count++;
-    count += buildCount(tree.children);
-  }
-
-  return count;
-}
-
-function getParent(key, treesByKey) {
-  const parentKey = key.slice(0, key.lastIndexOf('#'));
-  return treesByKey[parentKey];
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Lists installed packages.');
-  commander.option('--depth [depth]', 'Limit the depth of the shown dependencies');
-  commander.option('--pattern [pattern]', 'Filter dependencies by pattern');
-}
-
-function getReqDepth(inputDepth) {
-  return inputDepth && /^\d+$/.test(inputDepth) ? Number(inputDepth) : -1;
-}
-
-function filterTree(tree, filters, pattern = '') {
-  if (tree.children) {
-    tree.children = tree.children.filter(child => filterTree(child, filters, pattern));
-  }
-
-  const notDim = tree.color !== 'dim';
-  const hasChildren = tree.children == null ? false : tree.children.length > 0;
-  const name = tree.name.slice(0, tree.name.lastIndexOf('@'));
-  const found = micromatch.any(name, filters) || micromatch.contains(name, pattern);
-
-  return notDim && (found || hasChildren);
-}
-
-function getDevDeps(manifest) {
-  if (manifest.devDependencies) {
-    return new Set(Object.keys(manifest.devDependencies).map(key => `${key}@${manifest.devDependencies[key]}`));
-  } else {
-    return new Set();
-  }
-}
-
-/***/ }),
-/* 359 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.requireLockfile = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const isWorkspaceRoot = config.workspaceRootFolder && config.cwd === config.workspaceRootFolder;
-
-    if (!args.length) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooFewArguments', 1));
-    }
-
-    // running "yarn remove something" in a workspace root is often a mistake
-    if (isWorkspaceRoot && !flags.ignoreWorkspaceRootCheck) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspacesRemoveRootCheck'));
-    }
-
-    const totalSteps = args.length + 1;
-    let step = 0;
-
-    // load manifests
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder);
-    const rootManifests = yield config.getRootManifests();
-    const manifests = [];
-
-    for (var _iterator = args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const name = _ref2;
-
-      reporter.step(++step, totalSteps, `Removing module ${name}`, emoji.get('wastebasket'));
-
-      let found = false;
-
-      for (var _iterator2 = Object.keys((_index || _load_index()).registries), _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i3 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i3++];
-        } else {
-          _i3 = _iterator2.next();
-          if (_i3.done) break;
-          _ref3 = _i3.value;
-        }
-
-        const registryName = _ref3;
-
-        const registry = config.registries[registryName];
-        const object = rootManifests[registryName].object;
-
-        for (var _iterator3 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray3 = Array.isArray(_iterator3), _i4 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-          var _ref4;
-
-          if (_isArray3) {
-            if (_i4 >= _iterator3.length) break;
-            _ref4 = _iterator3[_i4++];
-          } else {
-            _i4 = _iterator3.next();
-            if (_i4.done) break;
-            _ref4 = _i4.value;
-          }
-
-          const type = _ref4;
-
-          const deps = object[type];
-          if (deps && deps[name]) {
-            found = true;
-            delete deps[name];
-          }
-        }
-
-        const possibleManifestLoc = path.join(config.cwd, registry.folder, name);
-        if (yield (_fs || _load_fs()).exists(possibleManifestLoc)) {
-          const manifest = yield config.maybeReadManifest(possibleManifestLoc, registryName);
-          if (manifest) {
-            manifests.push([possibleManifestLoc, manifest]);
-          }
-        }
-      }
-
-      if (!found) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('moduleNotInManifest'));
-      }
-    }
-
-    // save manifests
-    yield config.saveRootManifests(rootManifests);
-
-    // run hooks - npm runs these one after another
-    var _arr = ['preuninstall', 'uninstall', 'postuninstall'];
-    for (var _i2 = 0; _i2 < _arr.length; _i2++) {
-      const action = _arr[_i2];
-      for (var _iterator4 = manifests, _isArray4 = Array.isArray(_iterator4), _i5 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray4) {
-          if (_i5 >= _iterator4.length) break;
-          _ref6 = _iterator4[_i5++];
-        } else {
-          _i5 = _iterator4.next();
-          if (_i5.done) break;
-          _ref6 = _i5.value;
-        }
-
-        const _ref5 = _ref6;
-        const loc = _ref5[0];
-
-        yield config.executeLifecycleScript(action, loc);
-      }
-    }
-
-    // reinstall so we can get the updated lockfile
-    reporter.step(++step, totalSteps, reporter.lang('uninstallRegenerate'), emoji.get('hammer'));
-    const installFlags = (0, (_extends2 || _load_extends()).default)({ force: true, workspaceRootIsCwd: true }, flags);
-    const reinstall = new (_install || _load_install()).Install(installFlags, config, new (_index2 || _load_index2()).NoopReporter(), lockfile);
-    yield reinstall.init();
-
-    //
-    reporter.success(reporter.lang('uninstalledPackages'));
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(57);
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _index2;
-
-function _load_index2() {
-  return _index2 = __webpack_require__(200);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-const emoji = __webpack_require__(302);
-
-const requireLockfile = exports.requireLockfile = true;
-
-function setFlags(commander) {
-  commander.description('Removes a package from your direct dependencies updating your package.json and yarn.lock.');
-  commander.usage('remove [packages ...] [flags]');
-  commander.option('-W, --ignore-workspace-root-check', 'required to run yarn remove inside a workspace root');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 360 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.getBinEntries = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getBinEntries = exports.getBinEntries = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    const binFolders = new Set();
-    const binEntries = new Map();
-
-    // Setup the node_modules/.bin folders for analysis
-    for (var _iterator2 = config.registryFolders, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref4 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref4 = _i2.value;
-      }
-
-      const registryFolder = _ref4;
-
-      binFolders.add(path.resolve(config.lockfileFolder, registryFolder, '.bin'));
-    }
-
-    // Same thing, but for the pnp dependencies, located inside the cache
-    if (yield (_fs || _load_fs()).exists(`${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`)) {
-      const pnpApi = (0, (_dynamicRequire || _load_dynamicRequire()).dynamicRequire)(`${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`);
-
-      const packageLocator = pnpApi.findPackageLocator(`${config.cwd}/`);
-      const packageInformation = pnpApi.getPackageInformation(packageLocator);
-
-      for (var _iterator3 = packageInformation.packageDependencies.entries(), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref6 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref6 = _i3.value;
-        }
-
-        const _ref5 = _ref6;
-        const name = _ref5[0];
-        const reference = _ref5[1];
-
-        const dependencyInformation = pnpApi.getPackageInformation({ name, reference });
-
-        if (dependencyInformation.packageLocation) {
-          binFolders.add(`${dependencyInformation.packageLocation}/.bin`);
-        }
-      }
-    }
-
-    // Build up a list of possible scripts by exploring the folders marked for analysis
-    for (var _iterator4 = binFolders, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref7 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref7 = _i4.value;
-      }
-
-      const binFolder = _ref7;
-
-      if (yield (_fs || _load_fs()).exists(binFolder)) {
-        for (var _iterator5 = yield (_fs || _load_fs()).readdir(binFolder), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-          var _ref8;
-
-          if (_isArray5) {
-            if (_i5 >= _iterator5.length) break;
-            _ref8 = _iterator5[_i5++];
-          } else {
-            _i5 = _iterator5.next();
-            if (_i5.done) break;
-            _ref8 = _i5.value;
-          }
-
-          const name = _ref8;
-
-          binEntries.set(name, path.join(binFolder, name));
-        }
-      }
-    }
-
-    return binEntries;
-  });
-
-  return function getBinEntries(_x) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    let realRunCommand = (() => {
-      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (action, args) {
-        // build up list of commands
-        const cmds = [];
-
-        if (pkgScripts && action in pkgScripts) {
-          const preAction = `pre${action}`;
-          if (preAction in pkgScripts) {
-            cmds.push([preAction, pkgScripts[preAction]]);
-          }
-
-          const script = scripts.get(action);
-          invariant(script, 'Script must exist');
-          cmds.push([action, script]);
-
-          const postAction = `post${action}`;
-          if (postAction in pkgScripts) {
-            cmds.push([postAction, pkgScripts[postAction]]);
-          }
-        } else if (scripts.has(action)) {
-          const script = scripts.get(action);
-          invariant(script, 'Script must exist');
-          cmds.push([action, script]);
-        }
-
-        if (cmds.length) {
-          const ignoreEngines = !!(flags.ignoreEngines || config.getOption('ignore-engines'));
-          try {
-            yield (0, (_packageCompatibility || _load_packageCompatibility()).checkOne)(pkg, config, ignoreEngines);
-          } catch (err) {
-            throw err instanceof (_errors || _load_errors()).MessageError ? new (_errors || _load_errors()).MessageError(reporter.lang('cannotRunWithIncompatibleEnv')) : err;
-          }
-
-          // Disable wrapper in executed commands
-          process.env.YARN_WRAP_OUTPUT = 'false';
-          for (var _iterator8 = cmds, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-            var _ref15;
-
-            if (_isArray8) {
-              if (_i8 >= _iterator8.length) break;
-              _ref15 = _iterator8[_i8++];
-            } else {
-              _i8 = _iterator8.next();
-              if (_i8.done) break;
-              _ref15 = _i8.value;
-            }
-
-            const _ref14 = _ref15;
-            const stage = _ref14[0];
-            const cmd = _ref14[1];
-
-            // only tack on trailing arguments for default script, ignore for pre and post - #1595
-            const cmdWithArgs = stage === action ? sh`${unquoted(cmd)} ${args}` : cmd;
-            const customShell = config.getOption('script-shell');
-            yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)({
-              stage,
-              config,
-              cmd: cmdWithArgs,
-              cwd: flags.into || config.cwd,
-              isInteractive: true,
-              customShell: customShell ? String(customShell) : undefined
-            });
-          }
-        } else if (action === 'env') {
-          reporter.log(JSON.stringify((yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)('env', config.cwd, config)), null, 2), { force: true });
-        } else {
-          let suggestion;
-
-          for (const commandName in scripts) {
-            const steps = leven(commandName, action);
-            if (steps < 2) {
-              suggestion = commandName;
-            }
-          }
-
-          let msg = `Command ${JSON.stringify(action)} not found.`;
-          if (suggestion) {
-            msg += ` Did you mean ${JSON.stringify(suggestion)}?`;
-          }
-          throw new (_errors || _load_errors()).MessageError(msg);
-        }
-      });
-
-      return function realRunCommand(_x6, _x7) {
-        return _ref13.apply(this, arguments);
-      };
-    })();
-
-    // list possible scripts if none specified
-
-
-    const pkg = yield config.readManifest(config.cwd);
-
-    const binCommands = new Set();
-    const pkgCommands = new Set();
-
-    const scripts = new Map();
-
-    for (var _iterator6 = yield getBinEntries(config), _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray6) {
-        if (_i6 >= _iterator6.length) break;
-        _ref11 = _iterator6[_i6++];
-      } else {
-        _i6 = _iterator6.next();
-        if (_i6.done) break;
-        _ref11 = _i6.value;
-      }
-
-      const _ref10 = _ref11;
-      const name = _ref10[0];
-      const loc = _ref10[1];
-
-      scripts.set(name, quoteForShell(loc));
-      binCommands.add(name);
-    }
-
-    const pkgScripts = pkg.scripts;
-
-    if (pkgScripts) {
-      for (var _iterator7 = Object.keys(pkgScripts).sort(), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-        var _ref12;
-
-        if (_isArray7) {
-          if (_i7 >= _iterator7.length) break;
-          _ref12 = _iterator7[_i7++];
-        } else {
-          _i7 = _iterator7.next();
-          if (_i7.done) break;
-          _ref12 = _i7.value;
-        }
-
-        const name = _ref12;
-
-        scripts.set(name, pkgScripts[name] || '');
-        pkgCommands.add(name);
-      }
-    }
-
-    function runCommand([action, ...args]) {
-      return (0, (_hooks || _load_hooks()).callThroughHook)('runScript', () => realRunCommand(action, args), { action, args });
-    }
-
-    if (args.length === 0) {
-      if (binCommands.size > 0) {
-        reporter.info(`${reporter.lang('binCommands') + Array.from(binCommands).join(', ')}`);
-      } else {
-        reporter.error(reporter.lang('noBinAvailable'));
-      }
-
-      const printedCommands = new Map();
-
-      for (var _iterator9 = pkgCommands, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-        var _ref16;
-
-        if (_isArray9) {
-          if (_i9 >= _iterator9.length) break;
-          _ref16 = _iterator9[_i9++];
-        } else {
-          _i9 = _iterator9.next();
-          if (_i9.done) break;
-          _ref16 = _i9.value;
-        }
-
-        const pkgCommand = _ref16;
-
-        const action = scripts.get(pkgCommand);
-        invariant(action, 'Action must exists');
-        printedCommands.set(pkgCommand, action);
-      }
-
-      if (pkgCommands.size > 0) {
-        reporter.info(`${reporter.lang('possibleCommands')}`);
-        reporter.list('possibleCommands', Array.from(pkgCommands), toObject(printedCommands));
-        if (!flags.nonInteractive) {
-          yield reporter.question(reporter.lang('commandQuestion')).then(function (answer) {
-            return runCommand(answer.trim().split(' '));
-          }, function () {
-            return reporter.error(reporter.lang('commandNotSpecified'));
-          });
-        }
-      } else {
-        reporter.error(reporter.lang('noScriptsAvailable'));
-      }
-      return Promise.resolve();
-    } else {
-      return runCommand(args);
-    }
-  });
-
-  return function run(_x2, _x3, _x4, _x5) {
-    return _ref9.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _executeLifecycleScript;
-
-function _load_executeLifecycleScript() {
-  return _executeLifecycleScript = __webpack_require__(111);
-}
-
-var _dynamicRequire;
-
-function _load_dynamicRequire() {
-  return _dynamicRequire = __webpack_require__(371);
-}
-
-var _hooks;
-
-function _load_hooks() {
-  return _hooks = __webpack_require__(374);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _packageCompatibility;
-
-function _load_packageCompatibility() {
-  return _packageCompatibility = __webpack_require__(209);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const leven = __webpack_require__(747);
-const path = __webpack_require__(0);
-
-var _require = __webpack_require__(780);
-
-const quoteForShell = _require.quoteForShell,
-      sh = _require.sh,
-      unquoted = _require.unquoted;
-
-
-function toObject(input) {
-  const output = Object.create(null);
-
-  for (var _iterator = input.entries(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref2;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref2 = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref2 = _i.value;
-    }
-
-    const _ref = _ref2;
-    const key = _ref[0];
-    const val = _ref[1];
-
-    output[key] = val;
-  }
-
-  return output;
-}
-
-function setFlags(commander) {
-  commander.description('Runs a defined package script.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 361 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.hasWrapper = exports.run = exports.getName = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getName = exports.getName = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (args, config) {
-    let name = args.shift();
-
-    if (!name) {
-      const pkg = yield config.readRootManifest();
-      name = pkg.name;
-    }
-
-    if (name) {
-      if (!(0, (_validate || _load_validate()).isValidPackageName)(name)) {
-        throw new (_errors || _load_errors()).MessageError(config.reporter.lang('invalidPackageName'));
-      }
-
-      return (_npmRegistry || _load_npmRegistry()).default.escapeName(name);
-    } else {
-      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('unknownPackageName'));
-    }
-  });
-
-  return function getName(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let list = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const name = yield getName(args, config);
-
-    reporter.step(1, 1, reporter.lang('gettingTags'));
-    const tags = yield config.registries.npm.request(`-/package/${name}/dist-tags`);
-
-    if (tags) {
-      reporter.info(`Package ${name}`);
-      for (const name in tags) {
-        reporter.info(`${name}: ${tags[name]}`);
-      }
-    }
-
-    if (!tags) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('packageNotFoundRegistry', name, 'npm'));
-    }
-  });
-
-  return function list(_x3, _x4, _x5, _x6) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let remove = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (args.length !== 2) {
-      return false;
-    }
-
-    const name = yield getName(args, config);
-    const tag = args.shift();
-
-    reporter.step(1, 3, reporter.lang('loggingIn'));
-    const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name);
-
-    reporter.step(2, 3, reporter.lang('deletingTags'));
-    const result = yield config.registries.npm.request(`-/package/${name}/dist-tags/${encodeURI(tag)}`, {
-      method: 'DELETE'
-    });
-
-    if (result === false) {
-      reporter.error(reporter.lang('deletedTagFail'));
-    } else {
-      reporter.success(reporter.lang('deletedTag'));
-    }
-
-    reporter.step(3, 3, reporter.lang('revokingToken'));
-    yield revoke();
-
-    if (result === false) {
-      throw new Error();
-    } else {
-      return true;
-    }
-  });
-
-  return function remove(_x7, _x8, _x9, _x10) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _login;
-
-function _load_login() {
-  return _login = __webpack_require__(107);
-}
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-var _validate;
-
-function _load_validate() {
-  return _validate = __webpack_require__(125);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function setFlags(commander) {
-  commander.description('Add, remove, or list tags on a package.');
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('tag', {
-  add(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (args.length !== 2) {
-        return false;
-      }
-
-      var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(args.shift());
-
-      const name = _normalizePattern.name,
-            range = _normalizePattern.range,
-            hasVersion = _normalizePattern.hasVersion;
-
-      if (!hasVersion) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('requiredVersionInRange'));
-      }
-      if (!(0, (_validate || _load_validate()).isValidPackageName)(name)) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidPackageName'));
-      }
-
-      const tag = args.shift();
-
-      reporter.step(1, 3, reporter.lang('loggingIn'));
-      const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name);
-
-      reporter.step(2, 3, reporter.lang('creatingTag', tag, range));
-      const result = yield config.registries.npm.request(`-/package/${(_npmRegistry || _load_npmRegistry()).default.escapeName(name)}/dist-tags/${encodeURI(tag)}`, {
-        method: 'PUT',
-        body: range
-      });
-
-      if (result != null && result.ok) {
-        reporter.success(reporter.lang('createdTag'));
-      } else {
-        reporter.error(reporter.lang('createdTagFail'));
-      }
-
-      reporter.step(3, 3, reporter.lang('revokingToken'));
-      yield revoke();
-
-      if (result != null && result.ok) {
-        return true;
-      } else {
-        throw new Error();
-      }
-    })();
-  },
-
-  rm(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      reporter.warn(`\`yarn tag rm\` is deprecated. Please use \`yarn tag remove\`.`);
-      yield remove(config, reporter, flags, args);
-    })();
-  },
-
-  remove(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield remove(config, reporter, flags, args);
-    })();
-  },
-
-  ls(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      reporter.warn(`\`yarn tag ls\` is deprecated. Please use \`yarn tag list\`.`);
-      yield list(config, reporter, flags, args);
-    })();
-  },
-
-  list(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield list(config, reporter, flags, args);
-    })();
-  }
-}, ['add <pkg>@<version> [<tag>]', 'remove <pkg> <tag>', 'list [<pkg>]']);
-
-const run = _buildSubCommands.run,
-      hasWrapper = _buildSubCommands.hasWrapper,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.hasWrapper = hasWrapper;
-exports.examples = examples;
-
-/***/ }),
-/* 362 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.requireLockfile = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const outdatedFieldName = flags.latest ? 'latest' : 'wanted';
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder);
-
-    const deps = yield (0, (_upgrade || _load_upgrade()).getOutdated)(config, reporter, (0, (_extends2 || _load_extends()).default)({}, flags, { includeWorkspaceDeps: true }), lockfile, args);
-
-    if (deps.length === 0) {
-      reporter.success(reporter.lang('allDependenciesUpToDate'));
-      return;
-    }
-
-    // Fail early with runtime compatibility checks so that it doesn't fail after you've made your selections
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-    yield install.checkCompatibility();
-
-    const usesWorkspaces = !!config.workspaceRootFolder;
-
-    const maxLengthArr = {
-      name: 'name'.length,
-      current: 'from'.length,
-      range: 'latest'.length,
-      [outdatedFieldName]: 'to'.length,
-      workspaceName: 'workspace'.length
-    };
-
-    const keysWithDynamicLength = ['name', 'current', outdatedFieldName];
-
-    if (!flags.latest) {
-      maxLengthArr.range = 'range'.length;
-      keysWithDynamicLength.push('range');
-    }
-
-    if (usesWorkspaces) {
-      keysWithDynamicLength.push('workspaceName');
-    }
-
-    deps.forEach(function (dep) {
-      return keysWithDynamicLength.forEach(function (key) {
-        maxLengthArr[key] = Math.max(maxLengthArr[key], dep[key].length);
-      });
-    });
-
-    // Depends on maxLengthArr
-    const addPadding = function addPadding(dep) {
-      return function (key) {
-        return `${dep[key]}${' '.repeat(maxLengthArr[key] - dep[key].length)}`;
-      };
-    };
-    const headerPadding = function headerPadding(header, key) {
-      return `${reporter.format.bold.underline(header)}${' '.repeat(maxLengthArr[key] - header.length)}`;
-    };
-
-    const colorizeName = function colorizeName(from, to) {
-      return reporter.format[(0, (_colorForVersions || _load_colorForVersions()).default)(from, to)];
-    };
-
-    const getNameFromHint = function getNameFromHint(hint) {
-      return hint ? `${hint}Dependencies` : 'dependencies';
-    };
-
-    const makeRow = function makeRow(dep) {
-      const padding = addPadding(dep);
-      const name = colorizeName(dep.current, dep[outdatedFieldName])(padding('name'));
-      const current = reporter.format.blue(padding('current'));
-      const latest = (0, (_colorizeDiff || _load_colorizeDiff()).default)(dep.current, padding(outdatedFieldName), reporter);
-      const url = reporter.format.cyan(dep.url);
-      const range = reporter.format.blue(flags.latest ? 'latest' : padding('range'));
-      if (usesWorkspaces) {
-        const workspace = padding('workspaceName');
-        return `${name}  ${range}  ${current}  ❯  ${latest}  ${workspace}  ${url}`;
-      } else {
-        return `${name}  ${range}  ${current}  ❯  ${latest}  ${url}`;
-      }
-    };
-
-    const makeHeaderRow = function makeHeaderRow() {
-      const name = headerPadding('name', 'name');
-      const range = headerPadding('range', 'range');
-      const from = headerPadding('from', 'current');
-      const to = headerPadding('to', outdatedFieldName);
-      const url = reporter.format.bold.underline('url');
-      if (usesWorkspaces) {
-        const workspace = headerPadding('workspace', 'workspaceName');
-        return `  ${name}  ${range}  ${from}     ${to}  ${workspace}  ${url}`;
-      } else {
-        return `  ${name}  ${range}  ${from}     ${to}  ${url}`;
-      }
-    };
-
-    const groupedDeps = deps.reduce(function (acc, dep) {
-      const hint = dep.hint,
-            name = dep.name,
-            upgradeTo = dep.upgradeTo;
-
-      const version = dep[outdatedFieldName];
-      const key = getNameFromHint(hint);
-      const xs = acc[key] || [];
-      acc[key] = xs.concat({
-        name: makeRow(dep),
-        value: dep,
-        short: `${name}@${version}`,
-        upgradeTo
-      });
-      return acc;
-    }, {});
-
-    const flatten = function flatten(xs) {
-      return xs.reduce(function (ys, y) {
-        return ys.concat(Array.isArray(y) ? flatten(y) : y);
-      }, []);
-    };
-
-    const choices = flatten(Object.keys(groupedDeps).map(function (key) {
-      return [new (_inquirer || _load_inquirer()).default.Separator(reporter.format.bold.underline.green(key)), new (_inquirer || _load_inquirer()).default.Separator(makeHeaderRow()), groupedDeps[key], new (_inquirer || _load_inquirer()).default.Separator(' ')];
-    }));
-
-    try {
-      const red = reporter.format.red('<red>');
-      const yellow = reporter.format.yellow('<yellow>');
-      const green = reporter.format.green('<green>');
-      reporter.info(reporter.lang('legendColorsForVersionUpdates', red, yellow, green));
-
-      const answers = yield reporter.prompt('Choose which packages to update.', choices, {
-        name: 'packages',
-        type: 'checkbox',
-        validate: function validate(answer) {
-          return !!answer.length || 'You must choose at least one package.';
-        }
-      });
-
-      const getPattern = function getPattern({ upgradeTo }) {
-        return upgradeTo;
-      };
-      const isHint = function isHint(x) {
-        return function ({ hint }) {
-          return hint === x;
-        };
-      };
-
-      var _arr = [null, 'dev', 'optional', 'peer'];
-      for (var _i = 0; _i < _arr.length; _i++) {
-        const hint = _arr[_i];
-        // Reset dependency flags
-        flags.dev = hint === 'dev';
-        flags.peer = hint === 'peer';
-        flags.optional = hint === 'optional';
-        flags.ignoreWorkspaceRootCheck = true;
-        flags.includeWorkspaceDeps = false;
-        flags.workspaceRootIsCwd = false;
-        const deps = answers.filter(isHint(hint));
-        if (deps.length) {
-          const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-
-          var _ref2 = yield install.fetchRequestFromCwd();
-
-          const packagePatterns = _ref2.requests;
-
-          const depsByWorkspace = deps.reduce(function (acc, dep) {
-            const workspaceLoc = dep.workspaceLoc;
-
-            const xs = acc[workspaceLoc] || [];
-            acc[workspaceLoc] = xs.concat(dep);
-            return acc;
-          }, {});
-          const cwd = config.cwd;
-          for (var _iterator = Object.keys(depsByWorkspace), _isArray = Array.isArray(_iterator), _i2 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-            var _ref3;
-
-            if (_isArray) {
-              if (_i2 >= _iterator.length) break;
-              _ref3 = _iterator[_i2++];
-            } else {
-              _i2 = _iterator.next();
-              if (_i2.done) break;
-              _ref3 = _i2.value;
-            }
-
-            const loc = _ref3;
-
-            const patterns = depsByWorkspace[loc].map(getPattern);
-            (0, (_upgrade || _load_upgrade()).cleanLockfile)(lockfile, deps, packagePatterns, reporter);
-            reporter.info(reporter.lang('updateInstalling', getNameFromHint(hint)));
-            if (loc !== '') {
-              config.cwd = path.resolve(path.dirname(loc));
-            }
-            const add = new (_add || _load_add()).Add(patterns, flags, config, reporter, lockfile);
-            yield add.init();
-            config.cwd = cwd;
-          }
-        }
-      }
-    } catch (e) {
-      Promise.reject(e);
-    }
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _inquirer;
-
-function _load_inquirer() {
-  return _inquirer = _interopRequireDefault(__webpack_require__(276));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _add;
-
-function _load_add() {
-  return _add = __webpack_require__(165);
-}
-
-var _upgrade;
-
-function _load_upgrade() {
-  return _upgrade = __webpack_require__(207);
-}
-
-var _colorForVersions;
-
-function _load_colorForVersions() {
-  return _colorForVersions = _interopRequireDefault(__webpack_require__(369));
-}
-
-var _colorizeDiff;
-
-function _load_colorizeDiff() {
-  return _colorizeDiff = _interopRequireDefault(__webpack_require__(370));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-const requireLockfile = exports.requireLockfile = true;
-
-function setFlags(commander) {
-  commander.description('Provides an easy way to update outdated packages.');
-  commander.usage('upgrade-interactive [flags]');
-  commander.option('-S, --scope <scope>', 'upgrade packages under the specified scope');
-  commander.option('--latest', 'list the latest version of packages, ignoring version ranges in package.json');
-  commander.option('-E, --exact', 'install exact version. Only used when --latest is specified.');
-  commander.option('-T, --tilde', 'install most recent release with the same minor version. Only used when --latest is specified.');
-  commander.option('-C, --caret', 'install most recent release with the same major version. Only used when --latest is specified.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 363 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.setVersion = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let setVersion = exports.setVersion = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args, required) {
-    const pkg = yield config.readRootManifest();
-    const pkgLoc = pkg._loc;
-    const scripts = (0, (_map || _load_map()).default)();
-    let newVersion = flags.newVersion;
-    let identifier = undefined;
-    if (flags.preid) {
-      identifier = flags.preid;
-    }
-    invariant(pkgLoc, 'expected package location');
-
-    if (args.length && !newVersion) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidVersionArgument', NEW_VERSION_FLAG));
-    }
-
-    function runLifecycle(lifecycle) {
-      if (scripts[lifecycle]) {
-        return (0, (_executeLifecycleScript || _load_executeLifecycleScript()).execCommand)({ stage: lifecycle, config, cmd: scripts[lifecycle], cwd: config.cwd, isInteractive: true });
-      }
-
-      return Promise.resolve();
-    }
-
-    function isCommitHooksDisabled() {
-      return flags.commitHooks === false || config.getOption('version-commit-hooks') === false;
-    }
-
-    if (pkg.scripts) {
-      // inherit `scripts` from manifest
-      Object.assign(scripts, pkg.scripts);
-    }
-
-    // get old version
-    let oldVersion = pkg.version;
-    if (oldVersion) {
-      reporter.info(`${reporter.lang('currentVersion')}: ${oldVersion}`);
-    } else {
-      oldVersion = '0.0.0';
-    }
-
-    // get new version
-    if (newVersion && !isValidNewVersion(oldVersion, newVersion, config.looseSemver, identifier)) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidVersion'));
-    }
-
-    // get new version by bumping old version, if requested
-    if (!newVersion) {
-      if (flags.major) {
-        newVersion = semver.inc(oldVersion, 'major');
-      } else if (flags.minor) {
-        newVersion = semver.inc(oldVersion, 'minor');
-      } else if (flags.patch) {
-        newVersion = semver.inc(oldVersion, 'patch');
-      } else if (flags.premajor) {
-        newVersion = semver.inc(oldVersion, 'premajor', identifier);
-      } else if (flags.preminor) {
-        newVersion = semver.inc(oldVersion, 'preminor', identifier);
-      } else if (flags.prepatch) {
-        newVersion = semver.inc(oldVersion, 'prepatch', identifier);
-      } else if (flags.prerelease) {
-        newVersion = semver.inc(oldVersion, 'prerelease', identifier);
-      }
-    }
-
-    // wasn't passed a version arg so ask interactively
-    while (!newVersion) {
-      // make sure we're not running in non-interactive mode before asking for new version
-      if (flags.nonInteractive || config.nonInteractive) {
-        // if no version is specified, use current version in package.json
-        newVersion = oldVersion;
-        break;
-      }
-
-      // Make sure we dont exit with an error message when pressing Ctrl-C or enter to abort
-      try {
-        newVersion = yield reporter.question(reporter.lang('newVersion'));
-        if (!newVersion) {
-          newVersion = oldVersion;
-        }
-      } catch (err) {
-        newVersion = oldVersion;
-      }
-
-      if (!required && !newVersion) {
-        reporter.info(`${reporter.lang('noVersionOnPublish')}: ${oldVersion}`);
-        return function () {
-          return Promise.resolve();
-        };
-      }
-
-      if (isValidNewVersion(oldVersion, newVersion, config.looseSemver, identifier)) {
-        break;
-      } else {
-        newVersion = null;
-        reporter.error(reporter.lang('invalidSemver'));
-      }
-    }
-    if (newVersion) {
-      newVersion = semver.inc(oldVersion, newVersion, config.looseSemver, identifier) || newVersion;
-    }
-    invariant(newVersion, 'expected new version');
-
-    if (newVersion === pkg.version) {
-      return function () {
-        return Promise.resolve();
-      };
-    }
-
-    yield runLifecycle('preversion');
-
-    // update version
-    reporter.info(`${reporter.lang('newVersion')}: ${newVersion}`);
-    pkg.version = newVersion;
-
-    // update versions in manifests
-    const manifests = yield config.getRootManifests();
-    for (var _iterator = (_index || _load_index()).registryNames, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const registryName = _ref2;
-
-      const manifest = manifests[registryName];
-      if (manifest.exists) {
-        manifest.object.version = newVersion;
-      }
-    }
-    yield config.saveRootManifests(manifests);
-
-    yield runLifecycle('version');
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      invariant(newVersion, 'expected version');
-
-      // check if a new git tag should be created
-      if (flags.gitTagVersion && config.getOption('version-git-tag')) {
-        // add git commit and tag
-        let isGit = false;
-        const parts = config.cwd.split(path.sep);
-        while (parts.length) {
-          isGit = yield (_fs || _load_fs()).exists(path.join(parts.join(path.sep), '.git'));
-          if (isGit) {
-            break;
-          } else {
-            parts.pop();
-          }
-        }
-
-        if (isGit) {
-          const message = (flags.message || String(config.getOption('version-git-message'))).replace(/%s/g, newVersion);
-          const sign = Boolean(config.getOption('version-sign-git-tag'));
-          const flag = sign ? '-sm' : '-am';
-          const prefix = String(config.getOption('version-tag-prefix'));
-          const args = ['commit', '-m', message, ...(isCommitHooksDisabled() ? ['-n'] : [])];
-
-          const gitRoot = (yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['rev-parse', '--show-toplevel'], { cwd: config.cwd })).trim();
-
-          // add manifest
-          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['add', path.relative(gitRoot, pkgLoc)], { cwd: gitRoot });
-
-          // create git commit
-          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(args, { cwd: gitRoot });
-
-          // create git tag
-          yield (0, (_gitSpawn || _load_gitSpawn()).spawn)(['tag', `${prefix}${newVersion}`, flag, message], { cwd: gitRoot });
-        }
-      }
-
-      yield runLifecycle('postversion');
-    });
-  });
-
-  return function setVersion(_x, _x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const commit = yield setVersion(config, reporter, flags, args, true);
-    yield commit();
-  });
-
-  return function run(_x6, _x7, _x8, _x9) {
-    return _ref4.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(57);
-}
-
-var _executeLifecycleScript;
-
-function _load_executeLifecycleScript() {
-  return _executeLifecycleScript = __webpack_require__(111);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _gitSpawn;
-
-function _load_gitSpawn() {
-  return _gitSpawn = __webpack_require__(373);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-const semver = __webpack_require__(21);
-const path = __webpack_require__(0);
-
-const NEW_VERSION_FLAG = '--new-version [version]';
-function isValidNewVersion(oldVersion, newVersion, looseSemver, identifier) {
-  return !!(semver.valid(newVersion, looseSemver) || semver.inc(oldVersion, newVersion, looseSemver, identifier));
-}
-
-function setFlags(commander) {
-  commander.description('Update the version of your package via the command line.');
-  commander.option(NEW_VERSION_FLAG, 'new version');
-  commander.option('--major', 'auto-increment major version number');
-  commander.option('--minor', 'auto-increment minor version number');
-  commander.option('--patch', 'auto-increment patch version number');
-  commander.option('--premajor', 'auto-increment premajor version number');
-  commander.option('--preminor', 'auto-increment preminor version number');
-  commander.option('--prepatch', 'auto-increment prepatch version number');
-  commander.option('--prerelease', 'auto-increment prerelease version number');
-  commander.option('--preid [preid]', 'add a custom identifier to the prerelease');
-  commander.option('--message [message]', 'message');
-  commander.option('--no-git-tag-version', 'no git tag version');
-  commander.option('--no-commit-hooks', 'bypass git hooks when committing new version');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 364 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LocalTarballFetcher = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _baseFetcher;
-
-function _load_baseFetcher() {
-  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _normalizeUrl;
-
-function _load_normalizeUrl() {
-  return _normalizeUrl = _interopRequireDefault(__webpack_require__(402));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const crypto = __webpack_require__(12);
-const path = __webpack_require__(0);
-const tarFs = __webpack_require__(193);
-const url = __webpack_require__(24);
-const fs = __webpack_require__(5);
-const stream = __webpack_require__(23);
-const gunzip = __webpack_require__(656);
-const invariant = __webpack_require__(9);
-const ssri = __webpack_require__(77);
-
-const RE_URL_NAME_MATCH = /\/(?:(@[^/]+)(?:\/|%2f))?[^/]+\/(?:-|_attachments)\/(?:@[^/]+\/)?([^/]+)$/;
-
-const isHashAlgorithmSupported = name => {
-  const cachedResult = isHashAlgorithmSupported.__cache[name];
-  if (cachedResult != null) {
-    return cachedResult;
-  }
-  let supported = true;
-  try {
-    crypto.createHash(name);
-  } catch (error) {
-    if (error.message !== 'Digest method not supported') {
-      throw error;
-    }
-    supported = false;
-  }
-
-  isHashAlgorithmSupported.__cache[name] = supported;
-  return supported;
-};
-isHashAlgorithmSupported.__cache = {};
-
-class TarballFetcher extends (_baseFetcher || _load_baseFetcher()).default {
-  constructor(...args) {
-    var _temp;
-
-    return _temp = super(...args), this.validateError = null, this.validateIntegrity = null, _temp;
-  }
-
-  setupMirrorFromCache() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const tarballMirrorPath = _this.getTarballMirrorPath();
-      const tarballCachePath = _this.getTarballCachePath();
-
-      if (tarballMirrorPath == null) {
-        return;
-      }
-
-      if (!(yield (_fs || _load_fs()).exists(tarballMirrorPath)) && (yield (_fs || _load_fs()).exists(tarballCachePath))) {
-        // The tarball doesn't exists in the offline cache but does in the cache; we import it to the mirror
-        yield (_fs || _load_fs()).mkdirp(path.dirname(tarballMirrorPath));
-        yield (_fs || _load_fs()).copy(tarballCachePath, tarballMirrorPath, _this.reporter);
-      }
-    })();
-  }
-
-  getTarballCachePath() {
-    return path.join(this.dest, (_constants || _load_constants()).TARBALL_FILENAME);
-  }
-
-  getTarballMirrorPath() {
-    var _url$parse = url.parse(this.reference);
-
-    const pathname = _url$parse.pathname;
-
-
-    if (pathname == null) {
-      return null;
-    }
-
-    const match = pathname.match(RE_URL_NAME_MATCH);
-
-    let packageFilename;
-    if (match) {
-      const scope = match[1],
-            tarballBasename = match[2];
-
-      packageFilename = scope ? `${scope}-${tarballBasename}` : tarballBasename;
-    } else {
-      // fallback to base name
-      packageFilename = path.basename(pathname);
-    }
-
-    return this.config.getOfflineMirrorPath(packageFilename);
-  }
-
-  createExtractor(resolve, reject, tarballPath) {
-    const integrityInfo = this._supportedIntegrity();
-
-    const now = new Date();
-
-    const fs = __webpack_require__(5);
-    const patchedFs = Object.assign({}, fs, {
-      utimes: (path, atime, mtime, cb) => {
-        fs.stat(path, (err, stat) => {
-          if (err) {
-            cb(err);
-            return;
-          }
-          if (stat.isDirectory()) {
-            fs.utimes(path, atime, mtime, cb);
-            return;
-          }
-          fs.open(path, 'a', (err, fd) => {
-            if (err) {
-              cb(err);
-              return;
-            }
-            fs.futimes(fd, atime, mtime, err => {
-              if (err) {
-                fs.close(fd, () => cb(err));
-              } else {
-                fs.close(fd, err => cb(err));
-              }
-            });
-          });
-        });
-      }
-    });
-
-    const validateStream = new ssri.integrityStream(integrityInfo);
-    const untarStream = tarFs.extract(this.dest, {
-      strip: 1,
-      dmode: 0o755, // all dirs should be readable
-      fmode: 0o644, // all files should be readable
-      chown: false, // don't chown. just leave as it is
-      map: header => {
-        header.mtime = now;
-        return header;
-      },
-      fs: patchedFs
-    });
-    const extractorStream = gunzip();
-
-    validateStream.once('error', err => {
-      this.validateError = err;
-    });
-    validateStream.once('integrity', sri => {
-      this.validateIntegrity = sri;
-    });
-
-    untarStream.on('error', err => {
-      reject(new (_errors || _load_errors()).MessageError(this.config.reporter.lang('errorExtractingTarball', err.message, tarballPath)));
-    });
-
-    extractorStream.pipe(untarStream).on('finish', () => {
-      const error = this.validateError;
-      const hexDigest = this.validateIntegrity ? this.validateIntegrity.hexDigest() : '';
-      if (this.config.updateChecksums && this.remote.integrity && this.validateIntegrity && this.remote.integrity !== this.validateIntegrity.toString()) {
-        this.remote.integrity = this.validateIntegrity.toString();
-      }
-
-      if (integrityInfo.algorithms.length === 0) {
-        return reject(new (_errors || _load_errors()).SecurityError(this.config.reporter.lang('fetchBadIntegrityAlgorithm', this.packageName, this.remote.reference)));
-      }
-
-      if (error) {
-        if (this.config.updateChecksums) {
-          this.remote.integrity = error.found.toString();
-        } else {
-          return reject(new (_errors || _load_errors()).SecurityError(this.config.reporter.lang('fetchBadHashWithPath', this.packageName, this.remote.reference, error.found.toString(), error.expected.toString())));
-        }
-      }
-
-      return resolve({
-        hash: this.hash || hexDigest
-      });
-    });
-
-    return { validateStream, extractorStream };
-  }
-
-  getLocalPaths(override) {
-    const paths = [override ? path.resolve(this.config.cwd, override) : null, this.getTarballMirrorPath(), this.getTarballCachePath()];
-    // $FlowFixMe: https://github.com/facebook/flow/issues/1414
-    return paths.filter(path => path != null);
-  }
-
-  fetchFromLocal(override) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const tarPaths = _this2.getLocalPaths(override);
-      const stream = yield (_fs || _load_fs()).readFirstAvailableStream(tarPaths);
-
-      return new Promise(function (resolve, reject) {
-        if (!stream) {
-          reject(new (_errors || _load_errors()).MessageError(_this2.reporter.lang('tarballNotInNetworkOrCache', _this2.reference, tarPaths)));
-          return;
-        }
-        invariant(stream, 'stream should be available at this point');
-        // $FlowFixMe - This is available https://nodejs.org/api/fs.html#fs_readstream_path
-        const tarballPath = stream.path;
-
-        var _createExtractor = _this2.createExtractor(resolve, reject, tarballPath);
-
-        const validateStream = _createExtractor.validateStream,
-              extractorStream = _createExtractor.extractorStream;
-
-
-        stream.pipe(validateStream).pipe(extractorStream).on('error', function (err) {
-          reject(new (_errors || _load_errors()).MessageError(_this2.config.reporter.lang('fetchErrorCorrupt', err.message, tarballPath)));
-        });
-      });
-    })();
-  }
-
-  fetchFromExternal() {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const registry = _this3.config.registries[_this3.registry];
-
-      try {
-        const headers = _this3.requestHeaders();
-        return yield registry.request(_this3.reference, {
-          headers: (0, (_extends2 || _load_extends()).default)({
-            'Accept-Encoding': 'gzip'
-          }, headers),
-          buffer: true,
-          process: function process(req, resolve, reject) {
-            // should we save this to the offline cache?
-            const tarballMirrorPath = _this3.getTarballMirrorPath();
-            const tarballCachePath = _this3.getTarballCachePath();
-
-            var _createExtractor2 = _this3.createExtractor(resolve, reject);
-
-            const validateStream = _createExtractor2.validateStream,
-                  extractorStream = _createExtractor2.extractorStream;
-
-
-            req.pipe(validateStream);
-
-            if (tarballMirrorPath) {
-              validateStream.pipe(fs.createWriteStream(tarballMirrorPath)).on('error', reject);
-            }
-
-            if (tarballCachePath) {
-              validateStream.pipe(fs.createWriteStream(tarballCachePath)).on('error', reject);
-            }
-
-            validateStream.pipe(extractorStream).on('error', reject);
-          }
-        }, _this3.packageName);
-      } catch (err) {
-        const tarballMirrorPath = _this3.getTarballMirrorPath();
-        const tarballCachePath = _this3.getTarballCachePath();
-
-        if (tarballMirrorPath && (yield (_fs || _load_fs()).exists(tarballMirrorPath))) {
-          yield (_fs || _load_fs()).unlink(tarballMirrorPath);
-        }
-
-        if (tarballCachePath && (yield (_fs || _load_fs()).exists(tarballCachePath))) {
-          yield (_fs || _load_fs()).unlink(tarballCachePath);
-        }
-
-        throw err;
-      }
-    })();
-  }
-
-  requestHeaders() {
-    const registry = this.config.registries.yarn;
-    const config = registry.config;
-    const requestParts = urlParts(this.reference);
-    return Object.keys(config).reduce((headers, option) => {
-      const parts = option.split(':');
-      if (parts.length === 3 && parts[1] === '_header') {
-        const registryParts = urlParts(parts[0]);
-        if (requestParts.host === registryParts.host && requestParts.path.startsWith(registryParts.path)) {
-          const headerName = parts[2];
-          const headerValue = config[option];
-          headers[headerName] = headerValue;
-        }
-      }
-      return headers;
-    }, {});
-  }
-
-  _fetch() {
-    const isFilePath = this.reference.startsWith('file:');
-    this.reference = (0, (_misc || _load_misc()).removePrefix)(this.reference, 'file:');
-    const urlParse = url.parse(this.reference);
-
-    // legacy support for local paths in yarn.lock entries
-    const isRelativePath = urlParse.protocol ? urlParse.protocol.match(/^[a-z]:$/i) : urlParse.pathname ? urlParse.pathname.match(/^(?:\.{1,2})?[\\\/]/) : false;
-
-    if (isFilePath || isRelativePath) {
-      return this.fetchFromLocal(this.reference);
-    }
-
-    return this.fetchFromLocal().catch(err => this.fetchFromExternal());
-  }
-
-  _findIntegrity() {
-    if (this.remote.integrity) {
-      return ssri.parse(this.remote.integrity);
-    }
-    if (this.hash) {
-      return ssri.fromHex(this.hash, 'sha1');
-    }
-    return null;
-  }
-
-  _supportedIntegrity() {
-    const expectedIntegrity = this._findIntegrity() || {};
-    const expectedIntegrityAlgorithms = Object.keys(expectedIntegrity);
-    const shouldValidateIntegrity = (this.hash || this.remote.integrity) && !this.config.updateChecksums;
-
-    if (expectedIntegrityAlgorithms.length === 0 && !shouldValidateIntegrity) {
-      const algorithms = this.config.updateChecksums ? ['sha512'] : ['sha1'];
-      // for consistency, return sha1 for packages without a remote integrity (eg. github)
-      return { integrity: null, algorithms };
-    }
-
-    const algorithms = new Set();
-    const integrity = {};
-    for (var _iterator = expectedIntegrityAlgorithms, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const algorithm = _ref;
-
-      if (isHashAlgorithmSupported(algorithm)) {
-        algorithms.add(algorithm);
-        integrity[algorithm] = expectedIntegrity[algorithm];
-      }
-    }
-
-    return { integrity, algorithms: Array.from(algorithms) };
-  }
-}
-
-exports.default = TarballFetcher;
-class LocalTarballFetcher extends TarballFetcher {
-  _fetch() {
-    return this.fetchFromLocal(this.reference);
-  }
-}
-
-exports.LocalTarballFetcher = LocalTarballFetcher;
-
-
-function urlParts(requestUrl) {
-  const normalizedUrl = (0, (_normalizeUrl || _load_normalizeUrl()).default)(requestUrl);
-  const parsed = url.parse(normalizedUrl);
-  const host = parsed.host || '';
-  const path = parsed.path || '';
-  return { host, path };
-}
-
-/***/ }),
-/* 365 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-class PackageReference {
-  constructor(request, info, remote) {
-    this.resolver = request.resolver;
-    this.lockfile = request.lockfile;
-    this.requests = [];
-    this.config = request.config;
-    this.hint = request.hint;
-
-    this.isPlugnplay = false;
-
-    this.registry = remote.registry;
-    this.version = info.version;
-    this.name = info.name;
-    this.uid = info._uid;
-
-    this.remote = remote;
-
-    this.dependencies = [];
-
-    this.permissions = {};
-    this.patterns = [];
-    this.optional = null;
-    this.level = Infinity;
-    this.ignore = false;
-    this.incompatible = false;
-    this.fresh = false;
-    this.locations = [];
-    this.addRequest(request);
-  }
-
-  setFresh(fresh) {
-    this.fresh = fresh;
-  }
-
-  addLocation(loc) {
-    if (this.locations.indexOf(loc) === -1) {
-      this.locations.push(loc);
-    }
-  }
-
-  addRequest(request) {
-    this.requests.push(request);
-
-    this.level = Math.min(this.level, request.parentNames.length);
-  }
-
-  prune() {
-    for (var _iterator = this.patterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const selfPattern = _ref;
-
-      // remove ourselves from the resolver
-      this.resolver.removePattern(selfPattern);
-    }
-  }
-
-  addDependencies(deps) {
-    this.dependencies = this.dependencies.concat(deps);
-  }
-
-  setPermission(key, val) {
-    this.permissions[key] = val;
-  }
-
-  hasPermission(key) {
-    if (key in this.permissions) {
-      return this.permissions[key];
-    } else {
-      return false;
-    }
-  }
-
-  addPattern(pattern, manifest) {
-    this.resolver.addPattern(pattern, manifest);
-
-    this.patterns.push(pattern);
-
-    const shrunk = this.lockfile.getLocked(pattern);
-    if (shrunk && shrunk.permissions) {
-      for (var _iterator2 = (0, (_misc || _load_misc()).entries)(shrunk.permissions), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const _ref2 = _ref3;
-        const key = _ref2[0];
-        const perm = _ref2[1];
-
-        this.setPermission(key, perm);
-      }
-    }
-  }
-
-  addOptional(optional) {
-    if (this.optional == null) {
-      // optional is uninitialised
-      this.optional = optional;
-    } else if (!optional) {
-      // otherwise, ignore all subsequent optional assignments and only accept ones making
-      // this not optional
-      this.optional = false;
-    }
-  }
-}
-exports.default = PackageReference;
-
-/***/ }),
-/* 366 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(78);
-}
-
-var _packageRequest;
-
-function _load_packageRequest() {
-  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
-}
-
-var _normalizePattern2;
-
-function _load_normalizePattern() {
-  return _normalizePattern2 = __webpack_require__(37);
-}
-
-var _requestManager;
-
-function _load_requestManager() {
-  return _requestManager = _interopRequireDefault(__webpack_require__(378));
-}
-
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-var _workspaceLayout;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
-}
-
-var _resolutionMap;
-
-function _load_resolutionMap() {
-  return _resolutionMap = _interopRequireDefault(__webpack_require__(214));
-}
-
-var _resolutionMap2;
-
-function _load_resolutionMap2() {
-  return _resolutionMap2 = __webpack_require__(214);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const semver = __webpack_require__(21);
-
-class PackageResolver {
-  constructor(config, lockfile, resolutionMap = new (_resolutionMap || _load_resolutionMap()).default(config)) {
-    this.patternsByPackage = (0, (_map || _load_map()).default)();
-    this.fetchingPatterns = new Set();
-    this.fetchingQueue = new (_blockingQueue || _load_blockingQueue()).default('resolver fetching');
-    this.patterns = (0, (_map || _load_map()).default)();
-    this.resolutionMap = resolutionMap;
-    this.usedRegistries = new Set();
-    this.flat = false;
-
-    this.reporter = config.reporter;
-    this.lockfile = lockfile;
-    this.config = config;
-    this.delayedResolveQueue = [];
-  }
-
-  // whether the dependency graph will be flattened
-
-
-  // list of registries that have been used in this resolution
-
-
-  // activity monitor
-
-
-  // patterns we've already resolved or are in the process of resolving
-
-
-  // TODO
-
-
-  // manages and throttles json api http requests
-
-
-  // list of patterns associated with a package
-
-
-  // lockfile instance which we can use to retrieve version info
-
-
-  // a map of dependency patterns to packages
-
-
-  // reporter instance, abstracts out display logic
-
-
-  // environment specific config methods and options
-
-
-  // list of packages need to be resolved later (they found a matching version in the
-  // resolver, but better matches can still arrive later in the resolve process)
-
-
-  /**
-   * TODO description
-   */
-
-  isNewPattern(pattern) {
-    return !!this.patterns[pattern].fresh;
-  }
-
-  updateManifest(ref, newPkg) {
-    // inherit fields
-    const oldPkg = this.patterns[ref.patterns[0]];
-    newPkg._reference = ref;
-    newPkg._remote = ref.remote;
-    newPkg.name = oldPkg.name;
-    newPkg.fresh = oldPkg.fresh;
-    newPkg.prebuiltVariants = oldPkg.prebuiltVariants;
-
-    // update patterns
-    for (var _iterator = ref.patterns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const pattern = _ref;
-
-      this.patterns[pattern] = newPkg;
-    }
-
-    return Promise.resolve();
-  }
-
-  updateManifests(newPkgs) {
-    for (var _iterator2 = newPkgs, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref2 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref2 = _i2.value;
-      }
-
-      const newPkg = _ref2;
-
-      if (newPkg._reference) {
-        for (var _iterator3 = newPkg._reference.patterns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-          var _ref3;
-
-          if (_isArray3) {
-            if (_i3 >= _iterator3.length) break;
-            _ref3 = _iterator3[_i3++];
-          } else {
-            _i3 = _iterator3.next();
-            if (_i3.done) break;
-            _ref3 = _i3.value;
-          }
-
-          const pattern = _ref3;
-
-          const oldPkg = this.patterns[pattern];
-          newPkg.prebuiltVariants = oldPkg.prebuiltVariants;
-
-          this.patterns[pattern] = newPkg;
-        }
-      }
-    }
-
-    return Promise.resolve();
-  }
-
-  /**
-   * Given a list of patterns, dedupe them to a list of unique patterns.
-   */
-
-  dedupePatterns(patterns) {
-    const deduped = [];
-    const seen = new Set();
-
-    for (var _iterator4 = patterns, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref4 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref4 = _i4.value;
-      }
-
-      const pattern = _ref4;
-
-      const info = this.getResolvedPattern(pattern);
-      if (seen.has(info)) {
-        continue;
-      }
-
-      seen.add(info);
-      deduped.push(pattern);
-    }
-
-    return deduped;
-  }
-
-  /**
-   * Get a list of all manifests by topological order.
-   */
-
-  getTopologicalManifests(seedPatterns) {
-    const pkgs = new Set();
-    const skip = new Set();
-
-    const add = seedPatterns => {
-      for (var _iterator5 = seedPatterns, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref5;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref5 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref5 = _i5.value;
-        }
-
-        const pattern = _ref5;
-
-        const pkg = this.getStrictResolvedPattern(pattern);
-        if (skip.has(pkg)) {
-          continue;
-        }
-
-        const ref = pkg._reference;
-        invariant(ref, 'expected reference');
-        skip.add(pkg);
-        add(ref.dependencies);
-        pkgs.add(pkg);
-      }
-    };
-
-    add(seedPatterns);
-
-    return pkgs;
-  }
-
-  /**
-   * Get a list of all manifests by level sort order.
-   */
-
-  getLevelOrderManifests(seedPatterns) {
-    const pkgs = new Set();
-    const skip = new Set();
-
-    const add = seedPatterns => {
-      const refs = [];
-
-      for (var _iterator6 = seedPatterns, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray6) {
-          if (_i6 >= _iterator6.length) break;
-          _ref6 = _iterator6[_i6++];
-        } else {
-          _i6 = _iterator6.next();
-          if (_i6.done) break;
-          _ref6 = _i6.value;
-        }
-
-        const pattern = _ref6;
-
-        const pkg = this.getStrictResolvedPattern(pattern);
-        if (skip.has(pkg)) {
-          continue;
-        }
-
-        const ref = pkg._reference;
-        invariant(ref, 'expected reference');
-
-        refs.push(ref);
-        skip.add(pkg);
-        pkgs.add(pkg);
-      }
-
-      for (var _iterator7 = refs, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray7) {
-          if (_i7 >= _iterator7.length) break;
-          _ref7 = _iterator7[_i7++];
-        } else {
-          _i7 = _iterator7.next();
-          if (_i7.done) break;
-          _ref7 = _i7.value;
-        }
-
-        const ref = _ref7;
-
-        add(ref.dependencies);
-      }
-    };
-
-    add(seedPatterns);
-
-    return pkgs;
-  }
-
-  /**
-   * Get a list of all package names in the dependency graph.
-   */
-
-  getAllDependencyNamesByLevelOrder(seedPatterns) {
-    const names = new Set();
-    for (var _iterator8 = this.getLevelOrderManifests(seedPatterns), _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-      var _ref9;
-
-      if (_isArray8) {
-        if (_i8 >= _iterator8.length) break;
-        _ref9 = _iterator8[_i8++];
-      } else {
-        _i8 = _iterator8.next();
-        if (_i8.done) break;
-        _ref9 = _i8.value;
-      }
-
-      const _ref8 = _ref9;
-      const name = _ref8.name;
-
-      names.add(name);
-    }
-    return names;
-  }
-
-  /**
-   * Retrieve all the package info stored for this package name.
-   */
-
-  getAllInfoForPackageName(name) {
-    const patterns = this.patternsByPackage[name] || [];
-    return this.getAllInfoForPatterns(patterns);
-  }
-
-  /**
-   * Retrieve all the package info stored for a list of patterns.
-   */
-
-  getAllInfoForPatterns(patterns) {
-    const infos = [];
-    const seen = new Set();
-
-    for (var _iterator9 = patterns, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref10;
-
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref10 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref10 = _i9.value;
-      }
-
-      const pattern = _ref10;
-
-      const info = this.patterns[pattern];
-      if (seen.has(info)) {
-        continue;
-      }
-
-      seen.add(info);
-      infos.push(info);
-    }
-
-    return infos;
-  }
-
-  /**
-   * Get a flat list of all package info.
-   */
-
-  getManifests() {
-    const infos = [];
-    const seen = new Set();
-
-    for (const pattern in this.patterns) {
-      const info = this.patterns[pattern];
-      if (seen.has(info)) {
-        continue;
-      }
-
-      infos.push(info);
-      seen.add(info);
-    }
-
-    return infos;
-  }
-
-  /**
-   * replace pattern in resolver, e.g. `name` is replaced with `name@^1.0.1`
-   */
-  replacePattern(pattern, newPattern) {
-    const pkg = this.getResolvedPattern(pattern);
-    invariant(pkg, `missing package ${pattern}`);
-    const ref = pkg._reference;
-    invariant(ref, 'expected package reference');
-    ref.patterns = [newPattern];
-    this.addPattern(newPattern, pkg);
-    this.removePattern(pattern);
-  }
-
-  /**
-   * Make all versions of this package resolve to it.
-   */
-
-  collapseAllVersionsOfPackage(name, version) {
-    const patterns = this.dedupePatterns(this.patternsByPackage[name]);
-    return this.collapsePackageVersions(name, version, patterns);
-  }
-
-  /**
-   * Make all given patterns resolve to version.
-   */
-  collapsePackageVersions(name, version, patterns) {
-    const human = `${name}@${version}`;
-
-    // get manifest that matches the version we're collapsing too
-    let collapseToReference;
-    let collapseToManifest;
-    let collapseToPattern;
-    for (var _iterator10 = patterns, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray10) {
-        if (_i10 >= _iterator10.length) break;
-        _ref11 = _iterator10[_i10++];
-      } else {
-        _i10 = _iterator10.next();
-        if (_i10.done) break;
-        _ref11 = _i10.value;
-      }
-
-      const pattern = _ref11;
-
-      const _manifest = this.patterns[pattern];
-      if (_manifest.version === version) {
-        collapseToReference = _manifest._reference;
-        collapseToManifest = _manifest;
-        collapseToPattern = pattern;
-        break;
-      }
-    }
-
-    invariant(collapseToReference && collapseToManifest && collapseToPattern, `Couldn't find package manifest for ${human}`);
-
-    for (var _iterator11 = patterns, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-      var _ref12;
-
-      if (_isArray11) {
-        if (_i11 >= _iterator11.length) break;
-        _ref12 = _iterator11[_i11++];
-      } else {
-        _i11 = _iterator11.next();
-        if (_i11.done) break;
-        _ref12 = _i11.value;
-      }
-
-      const pattern = _ref12;
-
-      // don't touch the pattern we're collapsing to
-      if (pattern === collapseToPattern) {
-        continue;
-      }
-
-      // remove this pattern
-      const ref = this.getStrictResolvedPattern(pattern)._reference;
-      invariant(ref, 'expected package reference');
-      const refPatterns = ref.patterns.slice();
-      ref.prune();
-
-      // add pattern to the manifest we're collapsing to
-      for (var _iterator12 = refPatterns, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-        var _ref13;
-
-        if (_isArray12) {
-          if (_i12 >= _iterator12.length) break;
-          _ref13 = _iterator12[_i12++];
-        } else {
-          _i12 = _iterator12.next();
-          if (_i12.done) break;
-          _ref13 = _i12.value;
-        }
-
-        const pattern = _ref13;
-
-        collapseToReference.addPattern(pattern, collapseToManifest);
-      }
-    }
-
-    return collapseToPattern;
-  }
-
-  /**
-   * TODO description
-   */
-
-  addPattern(pattern, info) {
-    this.patterns[pattern] = info;
-
-    const byName = this.patternsByPackage[info.name] = this.patternsByPackage[info.name] || [];
-    if (byName.indexOf(pattern) === -1) {
-      byName.push(pattern);
-    }
-  }
-
-  /**
-   * TODO description
-   */
-
-  removePattern(pattern) {
-    const pkg = this.patterns[pattern];
-    if (!pkg) {
-      return;
-    }
-
-    const byName = this.patternsByPackage[pkg.name];
-    if (!byName) {
-      return;
-    }
-
-    byName.splice(byName.indexOf(pattern), 1);
-    delete this.patterns[pattern];
-  }
-
-  /**
-   * TODO description
-   */
-
-  getResolvedPattern(pattern) {
-    return this.patterns[pattern];
-  }
-
-  /**
-   * TODO description
-   */
-
-  getStrictResolvedPattern(pattern) {
-    const manifest = this.getResolvedPattern(pattern);
-    invariant(manifest, 'expected manifest');
-    return manifest;
-  }
-
-  /**
-   * TODO description
-   */
-
-  getExactVersionMatch(name, version, manifest) {
-    const patterns = this.patternsByPackage[name];
-    if (!patterns) {
-      return null;
-    }
-
-    for (var _iterator13 = patterns, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
-      var _ref14;
-
-      if (_isArray13) {
-        if (_i13 >= _iterator13.length) break;
-        _ref14 = _iterator13[_i13++];
-      } else {
-        _i13 = _iterator13.next();
-        if (_i13.done) break;
-        _ref14 = _i13.value;
-      }
-
-      const pattern = _ref14;
-
-      const info = this.getStrictResolvedPattern(pattern);
-      if (info.version === version) {
-        return info;
-      }
-    }
-
-    if (manifest && (0, (_index || _load_index()).getExoticResolver)(version)) {
-      return this.exoticRangeMatch(patterns.map(this.getStrictResolvedPattern.bind(this)), manifest);
-    }
-
-    return null;
-  }
-
-  /**
-   * Get the manifest of the highest known version that satisfies a package range
-   */
-
-  getHighestRangeVersionMatch(name, range, manifest) {
-    const patterns = this.patternsByPackage[name];
-
-    if (!patterns) {
-      return null;
-    }
-
-    const versionNumbers = [];
-    const resolvedPatterns = patterns.map(pattern => {
-      const info = this.getStrictResolvedPattern(pattern);
-      versionNumbers.push(info.version);
-
-      return info;
-    });
-
-    const maxValidRange = semver.maxSatisfying(versionNumbers, range);
-
-    if (!maxValidRange) {
-      return manifest && (0, (_index || _load_index()).getExoticResolver)(range) ? this.exoticRangeMatch(resolvedPatterns, manifest) : null;
-    }
-
-    const indexOfmaxValidRange = versionNumbers.indexOf(maxValidRange);
-    const maxValidRangeManifest = resolvedPatterns[indexOfmaxValidRange];
-
-    return maxValidRangeManifest;
-  }
-
-  /**
-   * Get the manifest of the package that matches an exotic range
-   */
-
-  exoticRangeMatch(resolvedPkgs, manifest) {
-    const remote = manifest._remote;
-    if (!(remote && remote.reference && remote.type === 'copy')) {
-      return null;
-    }
-
-    const matchedPkg = resolvedPkgs.find(({ _remote: pkgRemote }) => pkgRemote && pkgRemote.reference === remote.reference && pkgRemote.type === 'copy');
-
-    if (matchedPkg) {
-      manifest._remote = matchedPkg._remote;
-    }
-
-    return matchedPkg;
-  }
-
-  /**
-   * Determine if LockfileEntry is incorrect, remove it from lockfile cache and consider the pattern as new
-   */
-  isLockfileEntryOutdated(version, range, hasVersion) {
-    return !!(semver.validRange(range) && semver.valid(version) && !(0, (_index || _load_index()).getExoticResolver)(range) && hasVersion && !semver.satisfies(version, range));
-  }
-
-  /**
-   * TODO description
-   */
-
-  find(initialReq) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const req = _this.resolveToResolution(initialReq);
-
-      // we've already resolved it with a resolution
-      if (!req) {
-        return;
-      }
-
-      const request = new (_packageRequest || _load_packageRequest()).default(req, _this);
-      const fetchKey = `${req.registry}:${req.pattern}:${String(req.optional)}`;
-      const initialFetch = !_this.fetchingPatterns.has(fetchKey);
-      let fresh = false;
-
-      if (_this.activity) {
-        _this.activity.tick(req.pattern);
-      }
-
-      if (initialFetch) {
-        _this.fetchingPatterns.add(fetchKey);
-
-        const lockfileEntry = _this.lockfile.getLocked(req.pattern);
-
-        if (lockfileEntry) {
-          var _normalizePattern = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(req.pattern);
-
-          const range = _normalizePattern.range,
-                hasVersion = _normalizePattern.hasVersion;
-
-
-          if (_this.isLockfileEntryOutdated(lockfileEntry.version, range, hasVersion)) {
-            _this.reporter.warn(_this.reporter.lang('incorrectLockfileEntry', req.pattern));
-            _this.removePattern(req.pattern);
-            _this.lockfile.removePattern(req.pattern);
-            fresh = true;
-          }
-        } else {
-          fresh = true;
-        }
-
-        request.init();
-      }
-
-      yield request.find({ fresh, frozen: _this.frozen });
-    })();
-  }
-
-  /**
-   * TODO description
-   */
-
-  init(deps, { isFlat, isFrozen, workspaceLayout } = {
-    isFlat: false,
-    isFrozen: false,
-    workspaceLayout: undefined
-  }) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this2.flat = Boolean(isFlat);
-      _this2.frozen = Boolean(isFrozen);
-      _this2.workspaceLayout = workspaceLayout;
-      const activity = _this2.activity = _this2.reporter.activity();
-
-      for (var _iterator14 = deps, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-        var _ref15;
-
-        if (_isArray14) {
-          if (_i14 >= _iterator14.length) break;
-          _ref15 = _iterator14[_i14++];
-        } else {
-          _i14 = _iterator14.next();
-          if (_i14.done) break;
-          _ref15 = _i14.value;
-        }
-
-        const req = _ref15;
-
-        yield _this2.find(req);
-      }
-
-      // all required package versions have been discovered, so now packages that
-      // resolved to existing versions can be resolved to their best available version
-      _this2.resolvePackagesWithExistingVersions();
-
-      for (var _iterator15 = _this2.resolutionMap.delayQueue, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
-        var _ref16;
-
-        if (_isArray15) {
-          if (_i15 >= _iterator15.length) break;
-          _ref16 = _iterator15[_i15++];
-        } else {
-          _i15 = _iterator15.next();
-          if (_i15.done) break;
-          _ref16 = _i15.value;
-        }
-
-        const req = _ref16;
-
-        _this2.resolveToResolution(req);
-      }
-
-      if (isFlat) {
-        for (var _iterator16 = deps, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
-          var _ref17;
-
-          if (_isArray16) {
-            if (_i16 >= _iterator16.length) break;
-            _ref17 = _iterator16[_i16++];
-          } else {
-            _i16 = _iterator16.next();
-            if (_i16.done) break;
-            _ref17 = _i16.value;
-          }
-
-          const dep = _ref17;
-
-          const name = (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(dep.pattern).name;
-          _this2.optimizeResolutions(name);
-        }
-      }
-
-      activity.end();
-      _this2.activity = null;
-    })();
-  }
-
-  // for a given package, see if a single manifest can satisfy all ranges
-  optimizeResolutions(name) {
-    const patterns = this.dedupePatterns(this.patternsByPackage[name] || []);
-
-    // don't optimize things that already have a lockfile entry:
-    // https://github.com/yarnpkg/yarn/issues/79
-    const collapsablePatterns = patterns.filter(pattern => {
-      const remote = this.patterns[pattern]._remote;
-      return !this.lockfile.getLocked(pattern) && (!remote || remote.type !== 'workspace');
-    });
-    if (collapsablePatterns.length < 2) {
-      return;
-    }
-
-    // reverse sort, so we'll find the maximum satisfying version first
-    const availableVersions = this.getAllInfoForPatterns(collapsablePatterns).map(manifest => manifest.version);
-    availableVersions.sort(semver.rcompare);
-
-    const ranges = collapsablePatterns.map(pattern => (0, (_normalizePattern2 || _load_normalizePattern()).normalizePattern)(pattern).range);
-
-    // find the most recent version that satisfies all patterns (if one exists), and
-    // collapse to that version.
-    for (var _iterator17 = availableVersions, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : _iterator17[Symbol.iterator]();;) {
-      var _ref18;
-
-      if (_isArray17) {
-        if (_i17 >= _iterator17.length) break;
-        _ref18 = _iterator17[_i17++];
-      } else {
-        _i17 = _iterator17.next();
-        if (_i17.done) break;
-        _ref18 = _i17.value;
-      }
-
-      const version = _ref18;
-
-      if (ranges.every(range => semver.satisfies(version, range))) {
-        this.collapsePackageVersions(name, version, collapsablePatterns);
-        return;
-      }
-    }
-  }
-
-  /**
-    * Called by the package requester for packages that this resolver already had
-    * a matching version for. Delay the resolve, because better matches can still be
-    * discovered.
-    */
-
-  reportPackageWithExistingVersion(req, info) {
-    this.delayedResolveQueue.push({ req, info });
-  }
-
-  /**
-    * Executes the resolve to existing versions for packages after the find process,
-    * when all versions that are going to be used have been discovered.
-    */
-
-  resolvePackagesWithExistingVersions() {
-    for (var _iterator18 = this.delayedResolveQueue, _isArray18 = Array.isArray(_iterator18), _i18 = 0, _iterator18 = _isArray18 ? _iterator18 : _iterator18[Symbol.iterator]();;) {
-      var _ref20;
-
-      if (_isArray18) {
-        if (_i18 >= _iterator18.length) break;
-        _ref20 = _iterator18[_i18++];
-      } else {
-        _i18 = _iterator18.next();
-        if (_i18.done) break;
-        _ref20 = _i18.value;
-      }
-
-      const _ref19 = _ref20;
-      const req = _ref19.req,
-            info = _ref19.info;
-
-      req.resolveToExistingVersion(info);
-    }
-  }
-
-  resolveToResolution(req) {
-    const parentNames = req.parentNames,
-          pattern = req.pattern;
-
-
-    if (!parentNames || this.flat) {
-      return req;
-    }
-
-    const resolution = this.resolutionMap.find(pattern, parentNames);
-
-    if (resolution) {
-      const resolutionManifest = this.getResolvedPattern(resolution);
-
-      if (resolutionManifest) {
-        invariant(resolutionManifest._reference, 'resolutions should have a resolved reference');
-        resolutionManifest._reference.patterns.push(pattern);
-        this.addPattern(pattern, resolutionManifest);
-        const lockManifest = this.lockfile.getLocked(pattern);
-        if ((0, (_resolutionMap2 || _load_resolutionMap2()).shouldUpdateLockfile)(lockManifest, resolutionManifest._reference)) {
-          this.lockfile.removePattern(pattern);
-        }
-      } else {
-        this.resolutionMap.addToDelayQueue(req);
-      }
-      return null;
-    }
-
-    return req;
-  }
-}
-exports.default = PackageResolver;
-
-/***/ }),
-/* 367 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _hostedGitResolver;
-
-function _load_hostedGitResolver() {
-  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class GitHubResolver extends (_hostedGitResolver || _load_hostedGitResolver()).default {
-
-  static isVersion(pattern) {
-    // github proto
-    if (pattern.startsWith('github:')) {
-      return true;
-    }
-
-    // github shorthand
-    if (/^[^:@%/\s.-][^:@%/\s]*[/][^:@\s/%]+(?:#.*)?$/.test(pattern)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  static getTarballUrl(parts, hash) {
-    return `https://codeload.${this.hostname}/${parts.user}/${parts.repo}/tar.gz/${hash}`;
-  }
-
-  static getGitSSHUrl(parts) {
-    return `git+ssh://git@${this.hostname}/${parts.user}/${parts.repo}.git` + `${parts.hash ? '#' + decodeURIComponent(parts.hash) : ''}`;
-  }
-
-  static getGitHTTPBaseUrl(parts) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}`;
-  }
-
-  static getGitHTTPUrl(parts) {
-    return `${GitHubResolver.getGitHTTPBaseUrl(parts)}.git`;
-  }
-
-  static getHTTPFileUrl(parts, filename, commit) {
-    return `https://raw.githubusercontent.com/${parts.user}/${parts.repo}/${commit}/${filename}`;
-  }
-}
-exports.default = GitHubResolver;
-GitHubResolver.protocol = 'github';
-GitHubResolver.hostname = 'github.com';
-
-/***/ }),
-/* 368 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LINK_PROTOCOL_PREFIX = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = _interopRequireWildcard(__webpack_require__(18));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-const LINK_PROTOCOL_PREFIX = exports.LINK_PROTOCOL_PREFIX = 'link:';
-
-class LinkResolver extends (_exoticResolver || _load_exoticResolver()).default {
-  constructor(request, fragment) {
-    super(request, fragment);
-    this.loc = (_misc || _load_misc()).removePrefix(fragment, LINK_PROTOCOL_PREFIX);
-  }
-
-  resolve() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let loc = _this.loc;
-      if (!path.isAbsolute(loc)) {
-        loc = path.resolve(_this.config.lockfileFolder, loc);
-      }
-
-      const name = path.basename(loc);
-      const registry = 'npm';
-
-      const manifest = !(yield (_fs || _load_fs()).exists(`${loc}/package.json`)) || loc === _this.config.lockfileFolder ? { _uid: '', name, version: '0.0.0', _registry: registry } : yield _this.config.readManifest(loc, _this.registry);
-
-      manifest._remote = {
-        type: 'link',
-        registry,
-        hash: null,
-        reference: loc
-      };
-
-      manifest._uid = manifest.version;
-
-      return manifest;
-    })();
-  }
-}
-exports.default = LinkResolver;
-LinkResolver.protocol = 'link';
-
-/***/ }),
-/* 369 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-exports.default = function (from, to) {
-  const validFrom = (_semver || _load_semver()).default.valid(from);
-  const validTo = (_semver || _load_semver()).default.valid(to);
-  let versionBump = 'unknown';
-  if (validFrom && validTo) {
-    versionBump = (0, (_semver2 || _load_semver2()).diffWithUnstable)(validFrom, validTo) || 'unchanged';
-  }
-  return (_constants || _load_constants()).VERSION_COLOR_SCHEME[versionBump];
-};
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-var _semver2;
-
-function _load_semver2() {
-  return _semver2 = __webpack_require__(224);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/***/ }),
-/* 370 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-exports.default = function (from, to, reporter) {
-  const parts = to.split('.');
-  const fromParts = from.split('.');
-
-  const splitIndex = parts.findIndex((part, i) => part !== fromParts[i]);
-  if (splitIndex === -1) {
-    return from;
-  }
-
-  const colorized = reporter.format.green(parts.slice(splitIndex).join('.'));
-  return parts.slice(0, splitIndex).concat(colorized).join('.');
-};
-
-/***/ }),
-/* 371 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// $FlowFixMe We want this require to be dynamic
-exports.dynamicRequire =  true ? require : require; // eslint-disable-line
-
-/***/ }),
-/* 372 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortFilter = sortFilter;
-exports.matchesFilter = matchesFilter;
-exports.ignoreLinesToRegex = ignoreLinesToRegex;
-exports.filterOverridenGitignores = filterOverridenGitignores;
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-const mm = __webpack_require__(114);
-const path = __webpack_require__(0);
-
-const WHITESPACE_RE = /^\s+$/;
-
-function sortFilter(files, filters, keepFiles = new Set(), possibleKeepFiles = new Set(), ignoreFiles = new Set()) {
-  for (var _iterator = files, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const file = _ref;
-
-    let keep = false;
-
-    // always keep a file if a ! pattern matches it
-    for (var _iterator5 = filters, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-      var _ref5;
-
-      if (_isArray5) {
-        if (_i5 >= _iterator5.length) break;
-        _ref5 = _iterator5[_i5++];
-      } else {
-        _i5 = _iterator5.next();
-        if (_i5.done) break;
-        _ref5 = _i5.value;
-      }
-
-      const filter = _ref5;
-
-      if (filter.isNegation && matchesFilter(filter, file.basename, file.relative)) {
-        keep = true;
-        break;
-      }
-    }
-
-    //
-    if (keep) {
-      keepFiles.add(file.relative);
-      continue;
-    }
-
-    // otherwise don't keep it if a pattern matches it
-    keep = true;
-    for (var _iterator6 = filters, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-      var _ref6;
-
-      if (_isArray6) {
-        if (_i6 >= _iterator6.length) break;
-        _ref6 = _iterator6[_i6++];
-      } else {
-        _i6 = _iterator6.next();
-        if (_i6.done) break;
-        _ref6 = _i6.value;
-      }
-
-      const filter = _ref6;
-
-      if (!filter.isNegation && matchesFilter(filter, file.basename, file.relative)) {
-        keep = false;
-        break;
-      }
-    }
-
-    if (keep) {
-      possibleKeepFiles.add(file.relative);
-    } else {
-      ignoreFiles.add(file.relative);
-    }
-  }
-
-  // exclude file
-  for (var _iterator2 = possibleKeepFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-    var _ref2;
-
-    if (_isArray2) {
-      if (_i2 >= _iterator2.length) break;
-      _ref2 = _iterator2[_i2++];
-    } else {
-      _i2 = _iterator2.next();
-      if (_i2.done) break;
-      _ref2 = _i2.value;
-    }
-
-    const file = _ref2;
-
-    const parts = path.dirname(file).split(path.sep);
-
-    while (parts.length) {
-      const folder = parts.join(path.sep);
-      if (ignoreFiles.has(folder)) {
-        ignoreFiles.add(file);
-        break;
-      }
-      parts.pop();
-    }
-  }
-
-  //
-  for (var _iterator3 = possibleKeepFiles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-    var _ref3;
-
-    if (_isArray3) {
-      if (_i3 >= _iterator3.length) break;
-      _ref3 = _iterator3[_i3++];
-    } else {
-      _i3 = _iterator3.next();
-      if (_i3.done) break;
-      _ref3 = _i3.value;
-    }
-
-    const file = _ref3;
-
-    if (!ignoreFiles.has(file)) {
-      keepFiles.add(file);
-    }
-  }
-
-  //
-  for (var _iterator4 = keepFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-    var _ref4;
-
-    if (_isArray4) {
-      if (_i4 >= _iterator4.length) break;
-      _ref4 = _iterator4[_i4++];
-    } else {
-      _i4 = _iterator4.next();
-      if (_i4.done) break;
-      _ref4 = _i4.value;
-    }
-
-    const file = _ref4;
-
-    const parts = path.dirname(file).split(path.sep);
-
-    while (parts.length) {
-      // deregister this folder from being ignored, any files inside
-      // will still be marked as ignored
-      ignoreFiles.delete(parts.join(path.sep));
-      parts.pop();
-    }
-  }
-
-  return { ignoreFiles, keepFiles };
-}
-
-function matchesFilter(filter, basename, loc) {
-  let filterByBasename = true;
-  if (filter.base && filter.base !== '.') {
-    loc = path.relative(filter.base, loc);
-    filterByBasename = false;
-  }
-  // the micromatch regex expects unix path separators
-  loc = loc.replace(/\\/g, '/');
-
-  return filter.regex.test(loc) || filter.regex.test(`/${loc}`) || filterByBasename && filter.regex.test(basename) || mm.isMatch(loc, filter.pattern);
-}
-
-function ignoreLinesToRegex(lines, base = '.') {
-  return lines
-  // create regex
-  .map(line => {
-    // remove empty lines, comments, etc
-    if (line === '' || line === '!' || line[0] === '#' || WHITESPACE_RE.test(line)) {
-      return null;
-    }
-
-    let pattern = line;
-    let isNegation = false;
-
-    // hide the fact that it's a negation from minimatch since we'll handle this specifically
-    // ourselves
-    if (pattern[0] === '!') {
-      isNegation = true;
-      pattern = pattern.slice(1);
-    }
-
-    // remove trailing slash
-    pattern = (0, (_misc || _load_misc()).removeSuffix)(pattern, '/');
-
-    const regex = mm.makeRe(pattern.trim(), { dot: true, nocase: true });
-
-    if (regex) {
-      return {
-        base,
-        isNegation,
-        pattern,
-        regex
-      };
-    } else {
-      return null;
-    }
-  }).filter(Boolean);
-}
-
-function filterOverridenGitignores(files) {
-  const IGNORE_FILENAMES = ['.yarnignore', '.npmignore', '.gitignore'];
-  const GITIGNORE_NAME = IGNORE_FILENAMES[2];
-  return files.filter(file => IGNORE_FILENAMES.indexOf(file.basename) > -1).reduce((acc, file) => {
-    if (file.basename !== GITIGNORE_NAME) {
-      return [...acc, file];
-    } else {
-      //don't include .gitignore if .npmignore or .yarnignore are present
-      const dir = path.dirname(file.absolute);
-      const higherPriorityIgnoreFilePaths = [path.join(dir, IGNORE_FILENAMES[0]), path.join(dir, IGNORE_FILENAMES[1])];
-      const hasHigherPriorityFiles = files.find(file => higherPriorityIgnoreFilePaths.indexOf(path.normalize(file.absolute)) > -1);
-      if (!hasHigherPriorityFiles) {
-        return [...acc, file];
-      }
-    }
-    return acc;
-  }, []);
-}
-
-/***/ }),
-/* 373 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.spawn = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const BATCH_MODE_ARGS = new Map([['ssh', '-oBatchMode=yes'], ['plink', '-batch']]);
-
-// Suppress any password prompts since we run these in the background
-const env = (0, (_extends2 || _load_extends()).default)({
-  GIT_ASKPASS: '',
-  GIT_TERMINAL_PROMPT: 0
-}, process.env);
-
-const sshCommand = env.GIT_SSH || 'ssh';
-const sshExecutable = (_path || _load_path()).default.basename(sshCommand.toLowerCase(), '.exe');
-const sshBatchArgs = BATCH_MODE_ARGS.get(sshExecutable);
-
-if (!env.GIT_SSH_COMMAND && sshBatchArgs) {
-  // We have to manually specify `GIT_SSH_VARIANT`,
-  // because it's not automatically set when using `GIT_SSH_COMMAND` instead of `GIT_SSH`
-  // See: https://github.com/yarnpkg/yarn/issues/4729
-  env.GIT_SSH_VARIANT = sshExecutable;
-  env.GIT_SSH_COMMAND = `"${sshCommand}" ${sshBatchArgs}`;
-}
-
-const spawn = exports.spawn = (args, opts = {}) => {
-  return (_child || _load_child()).spawn('git', args, (0, (_extends2 || _load_extends()).default)({}, opts, { env }));
-};
-
-/***/ }),
-/* 374 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.callThroughHook = callThroughHook;
-
-
-const YARN_HOOKS_KEY = 'experimentalYarnHooks';
-
-function callThroughHook(type, fn, context) {
-  if (typeof global === 'undefined') {
-    return fn();
-  }
-
-  if (typeof global[YARN_HOOKS_KEY] !== 'object' || !global[YARN_HOOKS_KEY]) {
-    return fn();
-  }
-
-  const hook = global[YARN_HOOKS_KEY][type];
-
-  if (!hook) {
-    return fn();
-  }
-
-  return hook(fn, context);
-}
-
-/***/ }),
-/* 375 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const lockPromises = new Map();
-
-/**
- * Acquires a mutex lock over the given key. If the lock can't be acquired, it waits until it's available.
- * @param key Key to get the lock for.
- * @return {Promise.<Function>} A Promise that resolves when the lock is acquired, with the function that
- * must be called to release the lock.
- */
-
-exports.default = key => {
-  let unlockNext;
-  const willLock = new Promise(resolve => unlockNext = resolve);
-  const lockPromise = lockPromises.get(key) || Promise.resolve();
-  const willUnlock = lockPromise.then(() => unlockNext);
-  lockPromises.set(key, lockPromise.then(() => willLock));
-  return willUnlock;
-};
-
-/***/ }),
-/* 376 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = parsePackagePath;
-exports.isValidPackagePath = isValidPackagePath;
-
-
-/**
- * Parse input strings like `package-1/package-2` to an array of packages
- */
-function parsePackagePath(input) {
-  return input.match(/(@[^\/]+\/)?([^/]+)/g) || [];
-}
-
-const WRONG_PATTERNS = /\/$|\/{2,}|\*+$/;
-
-function isValidPackagePath(input) {
-  return !WRONG_PATTERNS.test(input);
-}
-
-/***/ }),
-/* 377 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getPosixPath = getPosixPath;
-exports.resolveWithHome = resolveWithHome;
-
-var _path;
-
-function _load_path() {
-  return _path = __webpack_require__(0);
-}
-
-const userHome = __webpack_require__(66).default;
-
-function getPosixPath(path) {
-  return path.replace(/\\/g, '/');
-}
-
-function resolveWithHome(path) {
-  const homePattern = process.platform === 'win32' ? /^~(\/|\\)/ : /^~\//;
-  if (homePattern.test(path)) {
-    return (0, (_path || _load_path()).resolve)(userHome, path.substr(2));
-  }
-
-  return (0, (_path || _load_path()).resolve)(path);
-}
-
-/***/ }),
-/* 378 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
-}
-
-var _http;
-
-function _load_http() {
-  return _http = _interopRequireDefault(__webpack_require__(87));
-}
-
-var _url;
-
-function _load_url() {
-  return _url = _interopRequireDefault(__webpack_require__(24));
-}
-
-var _dnscache;
-
-function _load_dnscache() {
-  return _dnscache = _interopRequireDefault(__webpack_require__(637));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _requestCaptureHar;
-
-function _load_requestCaptureHar() {
-  return _requestCaptureHar = _interopRequireDefault(__webpack_require__(799));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _network;
-
-function _load_network() {
-  return _network = _interopRequireWildcard(__webpack_require__(337));
-}
-
-var _map;
-
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(29));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// Initialize DNS cache so we don't look up the same
-// domains like registry.yarnpkg.com over and over again
-// for each request.
-(0, (_dnscache || _load_dnscache()).default)({
-  enable: true,
-  ttl: 300,
-  cachesize: 10
-});
-
-const successHosts = (0, (_map || _load_map()).default)();
-const controlOffline = (_network || _load_network()).isOffline();
-
-class RequestManager {
-  constructor(reporter) {
-    this.offlineNoRequests = false;
-    this._requestCaptureHar = null;
-    this._requestModule = null;
-    this.offlineQueue = [];
-    this.captureHar = false;
-    this.httpsProxy = '';
-    this.ca = null;
-    this.httpProxy = '';
-    this.strictSSL = true;
-    this.userAgent = '';
-    this.reporter = reporter;
-    this.running = 0;
-    this.queue = [];
-    this.cache = {};
-    this.max = (_constants || _load_constants()).NETWORK_CONCURRENCY;
-    this.maxRetryAttempts = 5;
-  }
-
-  setOptions(opts) {
-    if (opts.userAgent != null) {
-      this.userAgent = opts.userAgent;
-    }
-
-    if (opts.offline != null) {
-      this.offlineNoRequests = opts.offline;
-    }
-
-    if (opts.captureHar != null) {
-      this.captureHar = opts.captureHar;
-    }
-
-    if (opts.httpProxy != null) {
-      this.httpProxy = opts.httpProxy || '';
-    }
-
-    if (opts.httpsProxy === '') {
-      this.httpsProxy = opts.httpProxy || '';
-    } else if (opts.httpsProxy === false) {
-      this.httpsProxy = false;
-    } else {
-      this.httpsProxy = opts.httpsProxy || '';
-    }
-
-    if (opts.strictSSL !== null && typeof opts.strictSSL !== 'undefined') {
-      this.strictSSL = opts.strictSSL;
-    }
-
-    if (opts.ca != null && opts.ca.length > 0) {
-      this.ca = opts.ca;
-    }
-
-    if (opts.networkConcurrency != null) {
-      this.max = opts.networkConcurrency;
-    }
-
-    if (opts.networkTimeout != null) {
-      this.timeout = opts.networkTimeout;
-    }
-
-    if (opts.maxRetryAttempts != null) {
-      this.maxRetryAttempts = opts.maxRetryAttempts;
-    }
-
-    if (opts.cafile != null && opts.cafile != '') {
-      // The CA bundle file can contain one or more certificates with comments/text between each PEM block.
-      // tls.connect wants an array of certificates without any comments/text, so we need to split the string
-      // and strip out any text in between the certificates
-      try {
-        const bundle = (_fs || _load_fs()).default.readFileSync(opts.cafile).toString();
-        const hasPemPrefix = block => block.startsWith('-----BEGIN ');
-        // opts.cafile overrides opts.ca, this matches with npm behavior
-        this.ca = bundle.split(/(-----BEGIN .*\r?\n[^-]+\r?\n--.*)/).filter(hasPemPrefix);
-      } catch (err) {
-        this.reporter.error(`Could not open cafile: ${err.message}`);
-      }
-    }
-
-    if (opts.cert != null) {
-      this.cert = opts.cert;
-    }
-
-    if (opts.key != null) {
-      this.key = opts.key;
-    }
-  }
-
-  /**
-   * Lazy load `request` since it is exceptionally expensive to load and is
-   * often not needed at all.
-   */
-
-  _getRequestModule() {
-    if (!this._requestModule) {
-      const request = __webpack_require__(800);
-      if (this.captureHar) {
-        this._requestCaptureHar = new (_requestCaptureHar || _load_requestCaptureHar()).default(request);
-        this._requestModule = this._requestCaptureHar.request.bind(this._requestCaptureHar);
-      } else {
-        this._requestModule = request;
-      }
-    }
-    return this._requestModule;
-  }
-
-  /**
-   * Queue up a request.
-   */
-
-  request(params) {
-    if (this.offlineNoRequests) {
-      return Promise.reject(new (_errors || _load_errors()).MessageError(this.reporter.lang('cantRequestOffline', params.url)));
-    }
-
-    const cached = this.cache[params.url];
-    if (cached) {
-      return cached;
-    }
-
-    params.method = params.method || 'GET';
-    params.forever = true;
-    params.retryAttempts = 0;
-    params.strictSSL = this.strictSSL;
-    params.headers = Object.assign({
-      'User-Agent': this.userAgent
-    }, params.headers);
-
-    const promise = new Promise((resolve, reject) => {
-      this.queue.push({ params, reject, resolve });
-      this.shiftQueue();
-    });
-
-    // we can't cache a request with a processor
-    if (!params.process) {
-      this.cache[params.url] = promise;
-    }
-
-    return promise;
-  }
-
-  /**
-   * Clear the request cache. This is important as we cache all HTTP requests so you'll
-   * want to do this as soon as you can.
-   */
-
-  clearCache() {
-    this.cache = {};
-    if (this._requestCaptureHar != null) {
-      this._requestCaptureHar.clear();
-    }
-  }
-
-  /**
-   * Check if an error is possibly due to lost or poor network connectivity.
-   */
-
-  isPossibleOfflineError(err) {
-    const code = err.code,
-          hostname = err.hostname;
-
-    if (!code) {
-      return false;
-    }
-
-    // network was previously online but now we're offline
-    const possibleOfflineChange = !controlOffline && !(_network || _load_network()).isOffline();
-    if (code === 'ENOTFOUND' && possibleOfflineChange) {
-      // can't resolve a domain
-      return true;
-    }
-
-    // used to be able to resolve this domain! something is wrong
-    if (code === 'ENOTFOUND' && hostname && successHosts[hostname]) {
-      // can't resolve this domain but we've successfully resolved it before
-      return true;
-    }
-
-    // network was previously offline and we can't resolve the domain
-    if (code === 'ENOTFOUND' && controlOffline) {
-      return true;
-    }
-
-    // connection was reset or dropped
-    if (code === 'ECONNRESET') {
-      return true;
-    }
-
-    // TCP timeout
-    if (code === 'ESOCKETTIMEDOUT' || code === 'ETIMEDOUT') {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Queue up request arguments to be retried. Start a network connectivity timer if there
-   * isn't already one.
-   */
-
-  queueForRetry(opts) {
-    if (opts.retryReason) {
-      let containsReason = false;
-
-      for (var _iterator = this.offlineQueue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const queuedOpts = _ref;
-
-        if (queuedOpts.retryReason === opts.retryReason) {
-          containsReason = true;
-          break;
-        }
-      }
-
-      if (!containsReason) {
-        this.reporter.info(opts.retryReason);
-      }
-    }
-
-    if (!this.offlineQueue.length) {
-      this.initOfflineRetry();
-    }
-
-    this.offlineQueue.push(opts);
-  }
-
-  /**
-   * Begin timers to retry failed requests when we possibly establish network connectivity
-   * again.
-   */
-
-  initOfflineRetry() {
-    setTimeout(() => {
-      const queue = this.offlineQueue;
-      this.offlineQueue = [];
-      for (var _iterator2 = queue, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref2 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref2 = _i2.value;
-        }
-
-        const opts = _ref2;
-
-        this.execute(opts);
-      }
-    }, 3000);
-  }
-
-  /**
-   * Execute a request.
-   */
-
-  execute(opts) {
-    const params = opts.params;
-    const reporter = this.reporter;
-
-
-    const buildNext = fn => data => {
-      fn(data);
-      this.running--;
-      this.shiftQueue();
-    };
-
-    const resolve = buildNext(opts.resolve);
-
-    const rejectNext = buildNext(opts.reject);
-    const reject = function reject(err) {
-      err.message = `${params.url}: ${err.message}`;
-      rejectNext(err);
-    };
-
-    const queueForRetry = reason => {
-      const attempts = params.retryAttempts || 0;
-      if (attempts >= this.maxRetryAttempts - 1) {
-        return false;
-      }
-      if (opts.params.method && opts.params.method.toUpperCase() !== 'GET') {
-        return false;
-      }
-      params.retryAttempts = attempts + 1;
-      if (typeof params.cleanup === 'function') {
-        params.cleanup();
-      }
-      opts.retryReason = reason;
-      this.queueForRetry(opts);
-      return true;
-    };
-
-    let calledOnError = false;
-    const onError = err => {
-      if (calledOnError) {
-        return;
-      }
-      calledOnError = true;
-
-      if (this.isPossibleOfflineError(err)) {
-        if (!queueForRetry(this.reporter.lang('offlineRetrying'))) {
-          reject(err);
-        }
-      } else {
-        reject(err);
-      }
-    };
-
-    if (!params.process) {
-      const parts = (_url || _load_url()).default.parse(params.url);
-
-      params.callback = (err, res, body) => {
-        if (err) {
-          onError(err);
-          return;
-        }
-
-        successHosts[parts.hostname] = true;
-
-        this.reporter.verbose(this.reporter.lang('verboseRequestFinish', params.url, res.statusCode));
-
-        if (res.statusCode === 408 || res.statusCode >= 500) {
-          const description = `${res.statusCode} ${(_http || _load_http()).default.STATUS_CODES[res.statusCode]}`;
-          if (!queueForRetry(this.reporter.lang('internalServerErrorRetrying', description))) {
-            throw new (_errors || _load_errors()).ResponseError(this.reporter.lang('requestFailed', description), res.statusCode);
-          } else {
-            return;
-          }
-        }
-
-        if (res.statusCode === 401 && res.headers['www-authenticate']) {
-          const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
-
-          if (authMethods.indexOf('otp') !== -1) {
-            reject(new (_errors || _load_errors()).OneTimePasswordError());
-            return;
-          }
-        }
-
-        if (body && typeof body.error === 'string') {
-          reject(new Error(body.error));
-          return;
-        }
-
-        if ([400, 401, 404].concat(params.rejectStatusCode || []).indexOf(res.statusCode) !== -1) {
-          // So this is actually a rejection ... the hosted git resolver uses this to know whether http is supported
-          resolve(false);
-        } else if (res.statusCode >= 400) {
-          const errMsg = body && body.message || reporter.lang('requestError', params.url, res.statusCode);
-          reject(new Error(errMsg));
-        } else {
-          resolve(body);
-        }
-      };
-    }
-
-    if (params.buffer) {
-      params.encoding = null;
-    }
-
-    let proxy = this.httpProxy;
-    if (params.url.startsWith('https:')) {
-      proxy = this.httpsProxy;
-    }
-
-    if (proxy) {
-      // if no proxy is set, do not pass a proxy down to request.
-      // the request library will internally check the HTTP_PROXY and HTTPS_PROXY env vars.
-      params.proxy = String(proxy);
-    } else if (proxy === false) {
-      // passing empty string prevents the underlying library from falling back to the env vars.
-      // an explicit false in the yarn config should override the env var. See #4546.
-      params.proxy = '';
-    }
-
-    if (this.ca != null) {
-      params.ca = this.ca;
-    }
-
-    if (this.cert != null) {
-      params.cert = this.cert;
-    }
-
-    if (this.key != null) {
-      params.key = this.key;
-    }
-
-    if (this.timeout != null) {
-      params.timeout = this.timeout;
-    }
-
-    const request = this._getRequestModule();
-    const req = request(params);
-    this.reporter.verbose(this.reporter.lang('verboseRequestStart', params.method, params.url));
-
-    req.on('error', onError);
-
-    const queue = params.queue;
-    if (queue) {
-      req.on('data', queue.stillActive.bind(queue));
-    }
-
-    const process = params.process;
-    if (process) {
-      req.on('response', res => {
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          return;
-        }
-
-        const description = `${res.statusCode} ${(_http || _load_http()).default.STATUS_CODES[res.statusCode]}`;
-        reject(new (_errors || _load_errors()).ResponseError(this.reporter.lang('requestFailed', description), res.statusCode));
-
-        req.abort();
-      });
-      process(req, resolve, reject);
-    }
-  }
-
-  /**
-   * Remove an item from the queue. Create it's request options and execute it.
-   */
-
-  shiftQueue() {
-    if (this.running >= this.max || !this.queue.length) {
-      return;
-    }
-
-    const opts = this.queue.shift();
-
-    this.running++;
-    this.execute(opts);
-  }
-
-  saveHar(filename) {
-    if (!this.captureHar) {
-      throw new Error(this.reporter.lang('requestManagerNotSetupHAR'));
-    }
-    // No request may have occurred at all.
-    this._getRequestModule();
-    (0, (_invariant || _load_invariant()).default)(this._requestCaptureHar != null, 'request-capture-har not setup');
-    this._requestCaptureHar.saveHar(filename);
-  }
-}
-exports.default = RequestManager;
-
-/***/ }),
-/* 379 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var crypto_hash_sha512 = __webpack_require__(75).lowlevel.crypto_hash;
-
-/*
- * This file is a 1:1 port from the OpenBSD blowfish.c and bcrypt_pbkdf.c. As a
- * result, it retains the original copyright and license. The two files are
- * under slightly different (but compatible) licenses, and are here combined in
- * one file.
- *
- * Credit for the actual porting work goes to:
- *  Devi Mandiri <me@devi.web.id>
- */
-
-/*
- * The Blowfish portions are under the following license:
- *
- * Blowfish block cipher for OpenBSD
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * The bcrypt_pbkdf portions are under the following license:
- *
- * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Performance improvements (Javascript-specific):
- *
- * Copyright 2016, Joyent Inc
- * Author: Alex Wilson <alex.wilson@joyent.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-// Ported from OpenBSD bcrypt_pbkdf.c v1.9
-
-var BLF_J = 0;
-
-var Blowfish = function() {
-  this.S = [
-    new Uint32Array([
-      0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-      0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-      0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-      0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-      0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-      0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-      0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-      0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-      0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-      0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-      0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-      0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-      0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-      0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-      0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-      0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-      0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-      0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-      0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-      0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-      0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-      0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-      0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-      0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-      0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-      0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-      0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-      0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-      0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-      0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-      0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-      0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-      0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-      0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-      0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-      0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-      0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-      0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-      0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-      0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-      0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-      0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-      0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-      0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-      0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-      0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-      0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-      0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-      0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-      0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-      0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-      0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-      0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-      0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-      0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-      0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-      0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-      0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-      0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-      0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-      0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-      0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-      0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-      0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a]),
-    new Uint32Array([
-      0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-      0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-      0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-      0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-      0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-      0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-      0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-      0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-      0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-      0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-      0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-      0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-      0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-      0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-      0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-      0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-      0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-      0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-      0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-      0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-      0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-      0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-      0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-      0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-      0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-      0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-      0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-      0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-      0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-      0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-      0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-      0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-      0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-      0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-      0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-      0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-      0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-      0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-      0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-      0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-      0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-      0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-      0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-      0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-      0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-      0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-      0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-      0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-      0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-      0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-      0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-      0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-      0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-      0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-      0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-      0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-      0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-      0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-      0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-      0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-      0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-      0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-      0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-      0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7]),
-    new Uint32Array([
-      0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-      0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-      0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-      0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-      0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-      0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-      0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-      0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-      0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-      0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-      0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-      0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-      0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-      0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-      0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-      0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-      0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-      0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-      0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-      0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-      0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-      0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-      0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-      0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-      0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-      0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-      0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-      0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-      0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-      0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-      0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-      0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-      0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-      0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-      0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-      0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-      0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-      0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-      0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-      0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-      0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-      0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-      0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-      0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-      0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-      0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-      0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-      0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-      0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-      0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-      0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-      0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-      0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-      0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-      0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-      0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-      0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-      0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-      0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-      0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-      0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-      0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-      0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-      0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0]),
-    new Uint32Array([
-      0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-      0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-      0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-      0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-      0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-      0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-      0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-      0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-      0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-      0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-      0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-      0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-      0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-      0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-      0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-      0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-      0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-      0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-      0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-      0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-      0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-      0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-      0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-      0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-      0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-      0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-      0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-      0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-      0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-      0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-      0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-      0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-      0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-      0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-      0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-      0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-      0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-      0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-      0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-      0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-      0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-      0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-      0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-      0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-      0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-      0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-      0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-      0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-      0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-      0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-      0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-      0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-      0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-      0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-      0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-      0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-      0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-      0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-      0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-      0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-      0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-      0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-      0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-      0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6])
-    ];
-  this.P = new Uint32Array([
-    0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-    0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-    0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-    0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-    0x9216d5d9, 0x8979fb1b]);
-};
-
-function F(S, x8, i) {
-  return (((S[0][x8[i+3]] +
-            S[1][x8[i+2]]) ^
-            S[2][x8[i+1]]) +
-            S[3][x8[i]]);
-};
-
-Blowfish.prototype.encipher = function(x, x8) {
-  if (x8 === undefined) {
-    x8 = new Uint8Array(x.buffer);
-    if (x.byteOffset !== 0)
-      x8 = x8.subarray(x.byteOffset);
-  }
-  x[0] ^= this.P[0];
-  for (var i = 1; i < 16; i += 2) {
-    x[1] ^= F(this.S, x8, 0) ^ this.P[i];
-    x[0] ^= F(this.S, x8, 4) ^ this.P[i+1];
-  }
-  var t = x[0];
-  x[0] = x[1] ^ this.P[17];
-  x[1] = t;
-};
-
-Blowfish.prototype.decipher = function(x) {
-  var x8 = new Uint8Array(x.buffer);
-  if (x.byteOffset !== 0)
-    x8 = x8.subarray(x.byteOffset);
-  x[0] ^= this.P[17];
-  for (var i = 16; i > 0; i -= 2) {
-    x[1] ^= F(this.S, x8, 0) ^ this.P[i];
-    x[0] ^= F(this.S, x8, 4) ^ this.P[i-1];
-  }
-  var t = x[0];
-  x[0] = x[1] ^ this.P[0];
-  x[1] = t;
-};
-
-function stream2word(data, databytes){
-  var i, temp = 0;
-  for (i = 0; i < 4; i++, BLF_J++) {
-    if (BLF_J >= databytes) BLF_J = 0;
-    temp = (temp << 8) | data[BLF_J];
-  }
-  return temp;
-};
-
-Blowfish.prototype.expand0state = function(key, keybytes) {
-  var d = new Uint32Array(2), i, k;
-  var d8 = new Uint8Array(d.buffer);
-
-  for (i = 0, BLF_J = 0; i < 18; i++) {
-    this.P[i] ^= stream2word(key, keybytes);
-  }
-  BLF_J = 0;
-
-  for (i = 0; i < 18; i += 2) {
-    this.encipher(d, d8);
-    this.P[i]   = d[0];
-    this.P[i+1] = d[1];
-  }
-
-  for (i = 0; i < 4; i++) {
-    for (k = 0; k < 256; k += 2) {
-      this.encipher(d, d8);
-      this.S[i][k]   = d[0];
-      this.S[i][k+1] = d[1];
-    }
-  }
-};
-
-Blowfish.prototype.expandstate = function(data, databytes, key, keybytes) {
-  var d = new Uint32Array(2), i, k;
-
-  for (i = 0, BLF_J = 0; i < 18; i++) {
-    this.P[i] ^= stream2word(key, keybytes);
-  }
-
-  for (i = 0, BLF_J = 0; i < 18; i += 2) {
-    d[0] ^= stream2word(data, databytes);
-    d[1] ^= stream2word(data, databytes);
-    this.encipher(d);
-    this.P[i]   = d[0];
-    this.P[i+1] = d[1];
-  }
-
-  for (i = 0; i < 4; i++) {
-    for (k = 0; k < 256; k += 2) {
-      d[0] ^= stream2word(data, databytes);
-      d[1] ^= stream2word(data, databytes);
-      this.encipher(d);
-      this.S[i][k]   = d[0];
-      this.S[i][k+1] = d[1];
-    }
-  }
-  BLF_J = 0;
-};
-
-Blowfish.prototype.enc = function(data, blocks) {
-  for (var i = 0; i < blocks; i++) {
-    this.encipher(data.subarray(i*2));
-  }
-};
-
-Blowfish.prototype.dec = function(data, blocks) {
-  for (var i = 0; i < blocks; i++) {
-    this.decipher(data.subarray(i*2));
-  }
-};
-
-var BCRYPT_BLOCKS = 8,
-    BCRYPT_HASHSIZE = 32;
-
-function bcrypt_hash(sha2pass, sha2salt, out) {
-  var state = new Blowfish(),
-      cdata = new Uint32Array(BCRYPT_BLOCKS), i,
-      ciphertext = new Uint8Array([79,120,121,99,104,114,111,109,97,116,105,
-            99,66,108,111,119,102,105,115,104,83,119,97,116,68,121,110,97,109,
-            105,116,101]); //"OxychromaticBlowfishSwatDynamite"
-
-  state.expandstate(sha2salt, 64, sha2pass, 64);
-  for (i = 0; i < 64; i++) {
-    state.expand0state(sha2salt, 64);
-    state.expand0state(sha2pass, 64);
-  }
-
-  for (i = 0; i < BCRYPT_BLOCKS; i++)
-    cdata[i] = stream2word(ciphertext, ciphertext.byteLength);
-  for (i = 0; i < 64; i++)
-    state.enc(cdata, cdata.byteLength / 8);
-
-  for (i = 0; i < BCRYPT_BLOCKS; i++) {
-    out[4*i+3] = cdata[i] >>> 24;
-    out[4*i+2] = cdata[i] >>> 16;
-    out[4*i+1] = cdata[i] >>> 8;
-    out[4*i+0] = cdata[i];
-  }
-};
-
-function bcrypt_pbkdf(pass, passlen, salt, saltlen, key, keylen, rounds) {
-  var sha2pass = new Uint8Array(64),
-      sha2salt = new Uint8Array(64),
-      out = new Uint8Array(BCRYPT_HASHSIZE),
-      tmpout = new Uint8Array(BCRYPT_HASHSIZE),
-      countsalt = new Uint8Array(saltlen+4),
-      i, j, amt, stride, dest, count,
-      origkeylen = keylen;
-
-  if (rounds < 1)
-    return -1;
-  if (passlen === 0 || saltlen === 0 || keylen === 0 ||
-      keylen > (out.byteLength * out.byteLength) || saltlen > (1<<20))
-    return -1;
-
-  stride = Math.floor((keylen + out.byteLength - 1) / out.byteLength);
-  amt = Math.floor((keylen + stride - 1) / stride);
-
-  for (i = 0; i < saltlen; i++)
-    countsalt[i] = salt[i];
-
-  crypto_hash_sha512(sha2pass, pass, passlen);
-
-  for (count = 1; keylen > 0; count++) {
-    countsalt[saltlen+0] = count >>> 24;
-    countsalt[saltlen+1] = count >>> 16;
-    countsalt[saltlen+2] = count >>>  8;
-    countsalt[saltlen+3] = count;
-
-    crypto_hash_sha512(sha2salt, countsalt, saltlen + 4);
-    bcrypt_hash(sha2pass, sha2salt, tmpout);
-    for (i = out.byteLength; i--;)
-      out[i] = tmpout[i];
-
-    for (i = 1; i < rounds; i++) {
-      crypto_hash_sha512(sha2salt, tmpout, tmpout.byteLength);
-      bcrypt_hash(sha2pass, sha2salt, tmpout);
-      for (j = 0; j < out.byteLength; j++)
-        out[j] ^= tmpout[j];
-    }
-
-    amt = Math.min(amt, keylen);
-    for (i = 0; i < amt; i++) {
-      dest = i * stride + (count - 1);
-      if (dest >= origkeylen)
-        break;
-      key[dest] = out[i];
-    }
-    keylen -= i;
-  }
-
-  return 0;
-};
-
-module.exports = {
-      BLOCKS: BCRYPT_BLOCKS,
-      HASHSIZE: BCRYPT_HASHSIZE,
-      hash: bcrypt_hash,
-      pbkdf: bcrypt_pbkdf
-};
-
-
-/***/ }),
-/* 380 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var bufferFill = __webpack_require__(594)
-var allocUnsafe = __webpack_require__(593)
-
-module.exports = function alloc (size, fill, encoding) {
-  if (typeof size !== 'number') {
-    throw new TypeError('"size" argument must be a number')
-  }
-
-  if (size < 0) {
-    throw new RangeError('"size" argument must not be negative')
-  }
-
-  if (Buffer.alloc) {
-    return Buffer.alloc(size, fill, encoding)
-  }
-
-  var buffer = allocUnsafe(size)
-
-  if (size === 0) {
-    return buffer
-  }
-
-  if (fill === undefined) {
-    return bufferFill(buffer, 0)
-  }
-
-  if (typeof encoding !== 'string') {
-    encoding = undefined
-  }
-
-  return bufferFill(buffer, fill, encoding)
-}
-
-
-/***/ }),
-/* 381 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const restoreCursor = __webpack_require__(818);
-
-let hidden = false;
-
-exports.show = stream => {
-	const s = stream || process.stderr;
-
-	if (!s.isTTY) {
-		return;
-	}
-
-	hidden = false;
-	s.write('\u001b[?25h');
-};
-
-exports.hide = stream => {
-	const s = stream || process.stderr;
-
-	if (!s.isTTY) {
-		return;
-	}
-
-	restoreCursor();
-	hidden = true;
-	s.write('\u001b[?25l');
-};
-
-exports.toggle = (force, stream) => {
-	if (force !== undefined) {
-		hidden = force;
-	}
-
-	if (hidden) {
-		exports.show(stream);
-	} else {
-		exports.hide(stream);
-	}
-};
-
-
-/***/ }),
-/* 382 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var objectAssign = __webpack_require__(303);
-var stringWidth = __webpack_require__(945);
-
-function codeRegex(capture){
-  return capture ? /\u001b\[((?:\d*;){0,5}\d*)m/g : /\u001b\[(?:\d*;){0,5}\d*m/g
-}
-
-function strlen(str){
-  var code = codeRegex();
-  var stripped = ("" + str).replace(code,'');
-  var split = stripped.split("\n");
-  return split.reduce(function (memo, s) { return (stringWidth(s) > memo) ? stringWidth(s) : memo }, 0);
-}
-
-function repeat(str,times){
-  return Array(times + 1).join(str);
-}
-
-function pad(str, len, pad, dir) {
-  var length = strlen(str);
-  if (len + 1 >= length) {
-    var padlen = len - length;
-    switch (dir) {
-      case 'right':
-        str = repeat(pad, padlen) + str;
-        break;
-
-      case 'center':
-        var right = Math.ceil((padlen) / 2);
-        var left = padlen - right;
-        str = repeat(pad, left) + str + repeat(pad, right);
-        break;
-
-      default :
-        str = str + repeat(pad,padlen);
-        break;
-    }
-  }
-  return str;
-}
-
-var codeCache = {};
-
-function addToCodeCache(name,on,off){
-  on = '\u001b[' + on + 'm';
-  off = '\u001b[' + off + 'm';
-  codeCache[on] = {set:name,to:true};
-  codeCache[off] = {set:name,to:false};
-  codeCache[name] = {on:on,off:off};
-}
-
-//https://github.com/Marak/colors.js/blob/master/lib/styles.js
-addToCodeCache('bold', 1, 22);
-addToCodeCache('italics', 3, 23);
-addToCodeCache('underline', 4, 24);
-addToCodeCache('inverse', 7, 27);
-addToCodeCache('strikethrough', 9, 29);
-
-
-function updateState(state, controlChars){
-  var controlCode = controlChars[1] ? parseInt(controlChars[1].split(';')[0]) : 0;
-  if ( (controlCode >= 30 && controlCode <= 39)
-     || (controlCode >= 90 && controlCode <= 97)
-  ) {
-    state.lastForegroundAdded = controlChars[0];
-    return;
-  }
-  if ( (controlCode >= 40 && controlCode <= 49)
-     || (controlCode >= 100 && controlCode <= 107)
-  ) {
-    state.lastBackgroundAdded = controlChars[0];
-    return;
-  }
-  if (controlCode === 0) {
-    for (var i in state) {
-      /* istanbul ignore else */
-      if (state.hasOwnProperty(i)) {
-        delete state[i];
-      }
-    }
-    return;
-  }
-  var info = codeCache[controlChars[0]];
-  if (info) {
-    state[info.set] = info.to;
-  }
-}
-
-function readState(line){
-  var code = codeRegex(true);
-  var controlChars = code.exec(line);
-  var state = {};
-  while(controlChars !== null){
-    updateState(state, controlChars);
-    controlChars = code.exec(line);
-  }
-  return state;
-}
-
-function unwindState(state,ret){
-  var lastBackgroundAdded = state.lastBackgroundAdded;
-  var lastForegroundAdded = state.lastForegroundAdded;
-
-  delete state.lastBackgroundAdded;
-  delete state.lastForegroundAdded;
-
-  Object.keys(state).forEach(function(key){
-    if(state[key]){
-      ret += codeCache[key].off;
-    }
-  });
-
-  if(lastBackgroundAdded && (lastBackgroundAdded != '\u001b[49m')){
-    ret += '\u001b[49m';
-  }
-  if(lastForegroundAdded && (lastForegroundAdded != '\u001b[39m')){
-    ret += '\u001b[39m';
-  }
-
-  return ret;
-}
-
-function rewindState(state,ret){
-  var lastBackgroundAdded = state.lastBackgroundAdded;
-  var lastForegroundAdded = state.lastForegroundAdded;
-
-  delete state.lastBackgroundAdded;
-  delete state.lastForegroundAdded;
-
-  Object.keys(state).forEach(function(key){
-    if(state[key]){
-      ret = codeCache[key].on + ret;
-    }
-  });
-
-  if(lastBackgroundAdded && (lastBackgroundAdded != '\u001b[49m')){
-    ret = lastBackgroundAdded + ret;
-  }
-  if(lastForegroundAdded && (lastForegroundAdded != '\u001b[39m')){
-    ret = lastForegroundAdded + ret;
-  }
-
-  return ret;
-}
-
-function truncateWidth(str, desiredLength){
-  if (str.length === strlen(str)) {
-    return str.substr(0, desiredLength);
-  }
-
-  while (strlen(str) > desiredLength){
-    str = str.slice(0, -1);
-  }
-
-  return str;
-}
-
-function truncateWidthWithAnsi(str, desiredLength){
-  var code = codeRegex(true);
-  var split = str.split(codeRegex());
-  var splitIndex = 0;
-  var retLen = 0;
-  var ret = '';
-  var myArray;
-  var state = {};
-
-  while(retLen < desiredLength){
-    myArray = code.exec(str);
-    var toAdd = split[splitIndex];
-    splitIndex++;
-    if (retLen + strlen(toAdd) > desiredLength){
-      toAdd = truncateWidth(toAdd, desiredLength - retLen);
-    }
-    ret += toAdd;
-    retLen += strlen(toAdd);
-
-    if(retLen < desiredLength){
-      if (!myArray) { break; }  // full-width chars may cause a whitespace which cannot be filled
-      ret += myArray[0];
-      updateState(state,myArray);
-    }
-  }
-
-  return unwindState(state,ret);
-}
-
-function truncate(str, desiredLength, truncateChar){
-  truncateChar = truncateChar || '…';
-  var lengthOfStr = strlen(str);
-  if(lengthOfStr <= desiredLength){
-    return str;
-  }
-  desiredLength -= strlen(truncateChar);
-
-  var ret = truncateWidthWithAnsi(str, desiredLength);
-
-  return ret + truncateChar;
-}
-
-
-function defaultOptions(){
-  return{
-    chars: {
-      'top': '─'
-      , 'top-mid': '┬'
-      , 'top-left': '┌'
-      , 'top-right': '┐'
-      , 'bottom': '─'
-      , 'bottom-mid': '┴'
-      , 'bottom-left': '└'
-      , 'bottom-right': '┘'
-      , 'left': '│'
-      , 'left-mid': '├'
-      , 'mid': '─'
-      , 'mid-mid': '┼'
-      , 'right': '│'
-      , 'right-mid': '┤'
-      , 'middle': '│'
-    }
-    , truncate: '…'
-    , colWidths: []
-    , rowHeights: []
-    , colAligns: []
-    , rowAligns: []
-    , style: {
-      'padding-left': 1
-      , 'padding-right': 1
-      , head: ['red']
-      , border: ['grey']
-      , compact : false
-    }
-    , head: []
-  };
-}
-
-function mergeOptions(options,defaults){
-  options = options || {};
-  defaults = defaults || defaultOptions();
-  var ret = objectAssign({}, defaults, options);
-  ret.chars = objectAssign({}, defaults.chars, options.chars);
-  ret.style = objectAssign({}, defaults.style, options.style);
-  return ret;
-}
-
-function wordWrap(maxLength,input){
-  var lines = [];
-  var split = input.split(/(\s+)/g);
-  var line = [];
-  var lineLength = 0;
-  var whitespace;
-  for (var i = 0; i < split.length; i += 2) {
-    var word = split[i];
-    var newLength = lineLength + strlen(word);
-    if (lineLength > 0 && whitespace) {
-      newLength += whitespace.length;
-    }
-    if(newLength > maxLength){
-      if(lineLength !== 0){
-        lines.push(line.join(''));
-      }
-      line = [word];
-      lineLength = strlen(word);
-    } else {
-      line.push(whitespace || '', word);
-      lineLength = newLength;
-    }
-    whitespace = split[i+1];
-  }
-  if(lineLength){
-    lines.push(line.join(''));
-  }
-  return lines;
-}
-
-function multiLineWordWrap(maxLength, input){
-  var output = [];
-  input = input.split('\n');
-  for(var i = 0; i < input.length; i++){
-    output.push.apply(output,wordWrap(maxLength,input[i]));
-  }
-  return output;
-}
-
-function colorizeLines(input){
-  var state = {};
-  var output = [];
-  for(var i = 0; i < input.length; i++){
-    var line = rewindState(state,input[i]) ;
-    state = readState(line);
-    var temp = objectAssign({},state);
-    output.push(unwindState(temp,line));
-  }
-  return output;
-}
-
-module.exports = {
-  strlen:strlen,
-  repeat:repeat,
-  pad:pad,
-  truncate:truncate,
-  mergeOptions:mergeOptions,
-  wordWrap:multiLineWordWrap,
-  colorizeLines:colorizeLines
-};
-
-
-/***/ }),
-/* 383 */
-/***/ (function(module, exports) {
-
-
-/**
- * slice() reference.
- */
-
-var slice = Array.prototype.slice;
-
-/**
- * Expose `co`.
- */
-
-module.exports = co['default'] = co.co = co;
-
-/**
- * Wrap the given generator `fn` into a
- * function that returns a promise.
- * This is a separate function so that
- * every `co()` call doesn't create a new,
- * unnecessary closure.
- *
- * @param {GeneratorFunction} fn
- * @return {Function}
- * @api public
- */
-
-co.wrap = function (fn) {
-  createPromise.__generatorFunction__ = fn;
-  return createPromise;
-  function createPromise() {
-    return co.call(this, fn.apply(this, arguments));
-  }
-};
-
-/**
- * Execute the generator function or a generator
- * and return a promise.
- *
- * @param {Function} fn
- * @return {Promise}
- * @api public
- */
-
-function co(gen) {
-  var ctx = this;
-  var args = slice.call(arguments, 1)
-
-  // we wrap everything in a promise to avoid promise chaining,
-  // which leads to memory leak errors.
-  // see https://github.com/tj/co/issues/180
-  return new Promise(function(resolve, reject) {
-    if (typeof gen === 'function') gen = gen.apply(ctx, args);
-    if (!gen || typeof gen.next !== 'function') return resolve(gen);
-
-    onFulfilled();
-
-    /**
-     * @param {Mixed} res
-     * @return {Promise}
-     * @api private
-     */
-
-    function onFulfilled(res) {
-      var ret;
-      try {
-        ret = gen.next(res);
-      } catch (e) {
-        return reject(e);
-      }
-      next(ret);
-    }
-
-    /**
-     * @param {Error} err
-     * @return {Promise}
-     * @api private
-     */
-
-    function onRejected(err) {
-      var ret;
-      try {
-        ret = gen.throw(err);
-      } catch (e) {
-        return reject(e);
-      }
-      next(ret);
-    }
-
-    /**
-     * Get the next value in the generator,
-     * return a promise.
-     *
-     * @param {Object} ret
-     * @return {Promise}
-     * @api private
-     */
-
-    function next(ret) {
-      if (ret.done) return resolve(ret.value);
-      var value = toPromise.call(ctx, ret.value);
-      if (value && isPromise(value)) return value.then(onFulfilled, onRejected);
-      return onRejected(new TypeError('You may only yield a function, promise, generator, array, or object, '
-        + 'but the following object was passed: "' + String(ret.value) + '"'));
-    }
-  });
-}
-
-/**
- * Convert a `yield`ed value into a promise.
- *
- * @param {Mixed} obj
- * @return {Promise}
- * @api private
- */
-
-function toPromise(obj) {
-  if (!obj) return obj;
-  if (isPromise(obj)) return obj;
-  if (isGeneratorFunction(obj) || isGenerator(obj)) return co.call(this, obj);
-  if ('function' == typeof obj) return thunkToPromise.call(this, obj);
-  if (Array.isArray(obj)) return arrayToPromise.call(this, obj);
-  if (isObject(obj)) return objectToPromise.call(this, obj);
-  return obj;
-}
-
-/**
- * Convert a thunk to a promise.
- *
- * @param {Function}
- * @return {Promise}
- * @api private
- */
-
-function thunkToPromise(fn) {
-  var ctx = this;
-  return new Promise(function (resolve, reject) {
-    fn.call(ctx, function (err, res) {
-      if (err) return reject(err);
-      if (arguments.length > 2) res = slice.call(arguments, 1);
-      resolve(res);
-    });
-  });
-}
-
-/**
- * Convert an array of "yieldables" to a promise.
- * Uses `Promise.all()` internally.
- *
- * @param {Array} obj
- * @return {Promise}
- * @api private
- */
-
-function arrayToPromise(obj) {
-  return Promise.all(obj.map(toPromise, this));
-}
-
-/**
- * Convert an object of "yieldables" to a promise.
- * Uses `Promise.all()` internally.
- *
- * @param {Object} obj
- * @return {Promise}
- * @api private
- */
-
-function objectToPromise(obj){
-  var results = new obj.constructor();
-  var keys = Object.keys(obj);
-  var promises = [];
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    var promise = toPromise.call(this, obj[key]);
-    if (promise && isPromise(promise)) defer(promise, key);
-    else results[key] = obj[key];
-  }
-  return Promise.all(promises).then(function () {
-    return results;
-  });
-
-  function defer(promise, key) {
-    // predefine the key in the result
-    results[key] = undefined;
-    promises.push(promise.then(function (res) {
-      results[key] = res;
-    }));
-  }
-}
-
-/**
- * Check if `obj` is a promise.
- *
- * @param {Object} obj
- * @return {Boolean}
- * @api private
- */
-
-function isPromise(obj) {
-  return 'function' == typeof obj.then;
-}
-
-/**
- * Check if `obj` is a generator.
- *
- * @param {Mixed} obj
- * @return {Boolean}
- * @api private
- */
-
-function isGenerator(obj) {
-  return 'function' == typeof obj.next && 'function' == typeof obj.throw;
-}
-
-/**
- * Check if `obj` is a generator function.
- *
- * @param {Mixed} obj
- * @return {Boolean}
- * @api private
- */
-function isGeneratorFunction(obj) {
-  var constructor = obj.constructor;
-  if (!constructor) return false;
-  if ('GeneratorFunction' === constructor.name || 'GeneratorFunction' === constructor.displayName) return true;
-  return isGenerator(constructor.prototype);
-}
-
-/**
- * Check for plain object.
- *
- * @param {Mixed} val
- * @return {Boolean}
- * @api private
- */
-
-function isObject(val) {
-  return Object == val.constructor;
-}
-
-
-/***/ }),
-/* 384 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* MIT license */
-var cssKeywords = __webpack_require__(610);
-
-// NOTE: conversions should only return primitive values (i.e. arrays, or
-//       values that give correct `typeof` results).
-//       do not use box values types (i.e. Number(), String(), etc.)
-
-var reverseKeywords = {};
-for (var key in cssKeywords) {
-	if (cssKeywords.hasOwnProperty(key)) {
-		reverseKeywords[cssKeywords[key]] = key;
-	}
-}
-
-var convert = module.exports = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
-};
-
-// hide .channels and .labels properties
-for (var model in convert) {
-	if (convert.hasOwnProperty(model)) {
-		if (!('channels' in convert[model])) {
-			throw new Error('missing channels property: ' + model);
-		}
-
-		if (!('labels' in convert[model])) {
-			throw new Error('missing channel labels property: ' + model);
-		}
-
-		if (convert[model].labels.length !== convert[model].channels) {
-			throw new Error('channel and label counts mismatch: ' + model);
-		}
-
-		var channels = convert[model].channels;
-		var labels = convert[model].labels;
-		delete convert[model].channels;
-		delete convert[model].labels;
-		Object.defineProperty(convert[model], 'channels', {value: channels});
-		Object.defineProperty(convert[model], 'labels', {value: labels});
-	}
-}
-
-convert.rgb.hsl = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var min = Math.min(r, g, b);
-	var max = Math.max(r, g, b);
-	var delta = max - min;
-	var h;
-	var s;
-	var l;
-
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
-
-	h = Math.min(h * 60, 360);
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	l = (min + max) / 2;
-
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
-
-	return [h, s * 100, l * 100];
-};
-
-convert.rgb.hsv = function (rgb) {
-	var rdif;
-	var gdif;
-	var bdif;
-	var h;
-	var s;
-
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var v = Math.max(r, g, b);
-	var diff = v - Math.min(r, g, b);
-	var diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
-
-	if (diff === 0) {
-		h = s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
-
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
-
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
-};
-
-convert.rgb.hwb = function (rgb) {
-	var r = rgb[0];
-	var g = rgb[1];
-	var b = rgb[2];
-	var h = convert.rgb.hsl(rgb)[0];
-	var w = 1 / 255 * Math.min(r, Math.min(g, b));
-
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
-
-	return [h, w * 100, b * 100];
-};
-
-convert.rgb.cmyk = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var c;
-	var m;
-	var y;
-	var k;
-
-	k = Math.min(1 - r, 1 - g, 1 - b);
-	c = (1 - r - k) / (1 - k) || 0;
-	m = (1 - g - k) / (1 - k) || 0;
-	y = (1 - b - k) / (1 - k) || 0;
-
-	return [c * 100, m * 100, y * 100, k * 100];
-};
-
-/**
- * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
- * */
-function comparativeDistance(x, y) {
-	return (
-		Math.pow(x[0] - y[0], 2) +
-		Math.pow(x[1] - y[1], 2) +
-		Math.pow(x[2] - y[2], 2)
-	);
-}
-
-convert.rgb.keyword = function (rgb) {
-	var reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
-
-	var currentClosestDistance = Infinity;
-	var currentClosestKeyword;
-
-	for (var keyword in cssKeywords) {
-		if (cssKeywords.hasOwnProperty(keyword)) {
-			var value = cssKeywords[keyword];
-
-			// Compute comparative distance
-			var distance = comparativeDistance(rgb, value);
-
-			// Check if its less, if so set as closest
-			if (distance < currentClosestDistance) {
-				currentClosestDistance = distance;
-				currentClosestKeyword = keyword;
-			}
-		}
-	}
-
-	return currentClosestKeyword;
-};
-
-convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
-};
-
-convert.rgb.xyz = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-
-	// assume sRGB
-	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
-	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
-	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
-
-	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
-
-	return [x * 100, y * 100, z * 100];
-};
-
-convert.rgb.lab = function (rgb) {
-	var xyz = convert.rgb.xyz(rgb);
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
-
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
-
-	return [l, a, b];
-};
-
-convert.hsl.rgb = function (hsl) {
-	var h = hsl[0] / 360;
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var t1;
-	var t2;
-	var t3;
-	var rgb;
-	var val;
-
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
-
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
-
-	t1 = 2 * l - t2;
-
-	rgb = [0, 0, 0];
-	for (var i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
-		if (t3 > 1) {
-			t3--;
-		}
-
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-		} else {
-			val = t1;
-		}
-
-		rgb[i] = val * 255;
-	}
-
-	return rgb;
-};
-
-convert.hsl.hsv = function (hsl) {
-	var h = hsl[0];
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var smin = s;
-	var lmin = Math.max(l, 0.01);
-	var sv;
-	var v;
-
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	v = (l + s) / 2;
-	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
-
-	return [h, sv * 100, v * 100];
-};
-
-convert.hsv.rgb = function (hsv) {
-	var h = hsv[0] / 60;
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var hi = Math.floor(h) % 6;
-
-	var f = h - Math.floor(h);
-	var p = 255 * v * (1 - s);
-	var q = 255 * v * (1 - (s * f));
-	var t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
-
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
-	}
-};
-
-convert.hsv.hsl = function (hsv) {
-	var h = hsv[0];
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var vmin = Math.max(v, 0.01);
-	var lmin;
-	var sl;
-	var l;
-
-	l = (2 - s) * v;
-	lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
-
-	return [h, sl * 100, l * 100];
-};
-
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-convert.hwb.rgb = function (hwb) {
-	var h = hwb[0] / 360;
-	var wh = hwb[1] / 100;
-	var bl = hwb[2] / 100;
-	var ratio = wh + bl;
-	var i;
-	var v;
-	var f;
-	var n;
-
-	// wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
-
-	i = Math.floor(6 * h);
-	v = 1 - bl;
-	f = 6 * h - i;
-
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
-
-	n = wh + f * (v - wh); // linear interpolation
-
-	var r;
-	var g;
-	var b;
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v; g = n; b = wh; break;
-		case 1: r = n; g = v; b = wh; break;
-		case 2: r = wh; g = v; b = n; break;
-		case 3: r = wh; g = n; b = v; break;
-		case 4: r = n; g = wh; b = v; break;
-		case 5: r = v; g = wh; b = n; break;
-	}
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.cmyk.rgb = function (cmyk) {
-	var c = cmyk[0] / 100;
-	var m = cmyk[1] / 100;
-	var y = cmyk[2] / 100;
-	var k = cmyk[3] / 100;
-	var r;
-	var g;
-	var b;
-
-	r = 1 - Math.min(1, c * (1 - k) + k);
-	g = 1 - Math.min(1, m * (1 - k) + k);
-	b = 1 - Math.min(1, y * (1 - k) + k);
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.xyz.rgb = function (xyz) {
-	var x = xyz[0] / 100;
-	var y = xyz[1] / 100;
-	var z = xyz[2] / 100;
-	var r;
-	var g;
-	var b;
-
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
-
-	// assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
-		: r * 12.92;
-
-	g = g > 0.0031308
-		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
-		: g * 12.92;
-
-	b = b > 0.0031308
-		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
-		: b * 12.92;
-
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.xyz.lab = function (xyz) {
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
-
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
-
-	return [l, a, b];
-};
-
-convert.lab.xyz = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var x;
-	var y;
-	var z;
-
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
-
-	var y2 = Math.pow(y, 3);
-	var x2 = Math.pow(x, 3);
-	var z2 = Math.pow(z, 3);
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
-
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
-
-	return [x, y, z];
-};
-
-convert.lab.lch = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var hr;
-	var h;
-	var c;
-
-	hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	c = Math.sqrt(a * a + b * b);
-
-	return [l, c, h];
-};
-
-convert.lch.lab = function (lch) {
-	var l = lch[0];
-	var c = lch[1];
-	var h = lch[2];
-	var a;
-	var b;
-	var hr;
-
-	hr = h / 360 * 2 * Math.PI;
-	a = c * Math.cos(hr);
-	b = c * Math.sin(hr);
-
-	return [l, a, b];
-};
-
-convert.rgb.ansi16 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
-
-	value = Math.round(value / 50);
-
-	if (value === 0) {
-		return 30;
-	}
-
-	var ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
-
-	if (value === 2) {
-		ansi += 60;
-	}
-
-	return ansi;
-};
-
-convert.hsv.ansi16 = function (args) {
-	// optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
-};
-
-convert.rgb.ansi256 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-
-	// we use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
-
-		if (r > 248) {
-			return 231;
-		}
-
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
-
-	var ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
-
-	return ansi;
-};
-
-convert.ansi16.rgb = function (args) {
-	var color = args % 10;
-
-	// handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
-
-		color = color / 10.5 * 255;
-
-		return [color, color, color];
-	}
-
-	var mult = (~~(args > 50) + 1) * 0.5;
-	var r = ((color & 1) * mult) * 255;
-	var g = (((color >> 1) & 1) * mult) * 255;
-	var b = (((color >> 2) & 1) * mult) * 255;
-
-	return [r, g, b];
-};
-
-convert.ansi256.rgb = function (args) {
-	// handle greyscale
-	if (args >= 232) {
-		var c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
-
-	args -= 16;
-
-	var rem;
-	var r = Math.floor(args / 36) / 5 * 255;
-	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	var b = (rem % 6) / 5 * 255;
-
-	return [r, g, b];
-};
-
-convert.rgb.hex = function (args) {
-	var integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
-
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.hex.rgb = function (args) {
-	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
-
-	var colorString = match[0];
-
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(function (char) {
-			return char + char;
-		}).join('');
-	}
-
-	var integer = parseInt(colorString, 16);
-	var r = (integer >> 16) & 0xFF;
-	var g = (integer >> 8) & 0xFF;
-	var b = integer & 0xFF;
-
-	return [r, g, b];
-};
-
-convert.rgb.hcg = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var max = Math.max(Math.max(r, g), b);
-	var min = Math.min(Math.min(r, g), b);
-	var chroma = (max - min);
-	var grayscale;
-	var hue;
-
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
-
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma + 4;
-	}
-
-	hue /= 6;
-	hue %= 1;
-
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
-
-convert.hsl.hcg = function (hsl) {
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var c = 1;
-	var f = 0;
-
-	if (l < 0.5) {
-		c = 2.0 * s * l;
-	} else {
-		c = 2.0 * s * (1.0 - l);
-	}
-
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
-
-	return [hsl[0], c * 100, f * 100];
-};
-
-convert.hsv.hcg = function (hsv) {
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-
-	var c = s * v;
-	var f = 0;
-
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
-
-	return [hsv[0], c * 100, f * 100];
-};
-
-convert.hcg.rgb = function (hcg) {
-	var h = hcg[0] / 360;
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
-
-	var pure = [0, 0, 0];
-	var hi = (h % 1) * 6;
-	var v = hi % 1;
-	var w = 1 - v;
-	var mg = 0;
-
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
-	}
-
-	mg = (1.0 - c) * g;
-
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
-};
-
-convert.hcg.hsv = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var v = c + g * (1.0 - c);
-	var f = 0;
-
-	if (v > 0.0) {
-		f = c / v;
-	}
-
-	return [hcg[0], f * 100, v * 100];
-};
-
-convert.hcg.hsl = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var l = g * (1.0 - c) + 0.5 * c;
-	var s = 0;
-
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
-
-	return [hcg[0], s * 100, l * 100];
-};
-
-convert.hcg.hwb = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-	var v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
-};
-
-convert.hwb.hcg = function (hwb) {
-	var w = hwb[1] / 100;
-	var b = hwb[2] / 100;
-	var v = 1 - b;
-	var c = v - w;
-	var g = 0;
-
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
-
-	return [hwb[0], c * 100, g * 100];
-};
-
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
-
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
-
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
-
-convert.gray.hsl = convert.gray.hsv = function (args) {
-	return [0, 0, args[0]];
-};
-
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
-
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
-
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
-
-convert.gray.hex = function (gray) {
-	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	var integer = (val << 16) + (val << 8) + val;
-
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.rgb.gray = function (rgb) {
-	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
-};
-
-
-/***/ }),
-/* 385 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var util = __webpack_require__(3);
-var Stream = __webpack_require__(23).Stream;
-var DelayedStream = __webpack_require__(634);
-var defer = __webpack_require__(622);
-
-module.exports = CombinedStream;
-function CombinedStream() {
-  this.writable = false;
-  this.readable = true;
-  this.dataSize = 0;
-  this.maxDataSize = 2 * 1024 * 1024;
-  this.pauseStreams = true;
-
-  this._released = false;
-  this._streams = [];
-  this._currentStream = null;
-}
-util.inherits(CombinedStream, Stream);
-
-CombinedStream.create = function(options) {
-  var combinedStream = new this();
-
-  options = options || {};
-  for (var option in options) {
-    combinedStream[option] = options[option];
-  }
-
-  return combinedStream;
-};
-
-CombinedStream.isStreamLike = function(stream) {
-  return (typeof stream !== 'function')
-    && (typeof stream !== 'string')
-    && (typeof stream !== 'boolean')
-    && (typeof stream !== 'number')
-    && (!Buffer.isBuffer(stream));
-};
-
-CombinedStream.prototype.append = function(stream) {
-  var isStreamLike = CombinedStream.isStreamLike(stream);
-
-  if (isStreamLike) {
-    if (!(stream instanceof DelayedStream)) {
-      var newStream = DelayedStream.create(stream, {
-        maxDataSize: Infinity,
-        pauseStream: this.pauseStreams,
-      });
-      stream.on('data', this._checkDataSize.bind(this));
-      stream = newStream;
-    }
-
-    this._handleErrors(stream);
-
-    if (this.pauseStreams) {
-      stream.pause();
-    }
-  }
-
-  this._streams.push(stream);
-  return this;
-};
-
-CombinedStream.prototype.pipe = function(dest, options) {
-  Stream.prototype.pipe.call(this, dest, options);
-  this.resume();
-  return dest;
-};
-
-CombinedStream.prototype._getNext = function() {
-  this._currentStream = null;
-  var stream = this._streams.shift();
-
-
-  if (typeof stream == 'undefined') {
-    this.end();
-    return;
-  }
-
-  if (typeof stream !== 'function') {
-    this._pipeNext(stream);
-    return;
-  }
-
-  var getStream = stream;
-  getStream(function(stream) {
-    var isStreamLike = CombinedStream.isStreamLike(stream);
-    if (isStreamLike) {
-      stream.on('data', this._checkDataSize.bind(this));
-      this._handleErrors(stream);
-    }
-
-    defer(this._pipeNext.bind(this, stream));
-  }.bind(this));
-};
-
-CombinedStream.prototype._pipeNext = function(stream) {
-  this._currentStream = stream;
-
-  var isStreamLike = CombinedStream.isStreamLike(stream);
-  if (isStreamLike) {
-    stream.on('end', this._getNext.bind(this));
-    stream.pipe(this, {end: false});
-    return;
-  }
-
-  var value = stream;
-  this.write(value);
-  this._getNext();
-};
-
-CombinedStream.prototype._handleErrors = function(stream) {
-  var self = this;
-  stream.on('error', function(err) {
-    self._emitError(err);
-  });
-};
-
-CombinedStream.prototype.write = function(data) {
-  this.emit('data', data);
-};
-
-CombinedStream.prototype.pause = function() {
-  if (!this.pauseStreams) {
-    return;
-  }
-
-  if(this.pauseStreams && this._currentStream && typeof(this._currentStream.pause) == 'function') this._currentStream.pause();
-  this.emit('pause');
-};
-
-CombinedStream.prototype.resume = function() {
-  if (!this._released) {
-    this._released = true;
-    this.writable = true;
-    this._getNext();
-  }
-
-  if(this.pauseStreams && this._currentStream && typeof(this._currentStream.resume) == 'function') this._currentStream.resume();
-  this.emit('resume');
-};
-
-CombinedStream.prototype.end = function() {
-  this._reset();
-  this.emit('end');
-};
-
-CombinedStream.prototype.destroy = function() {
-  this._reset();
-  this.emit('close');
-};
-
-CombinedStream.prototype._reset = function() {
-  this.writable = false;
-  this._streams = [];
-  this._currentStream = null;
-};
-
-CombinedStream.prototype._checkDataSize = function() {
-  this._updateDataSize();
-  if (this.dataSize <= this.maxDataSize) {
-    return;
-  }
-
-  var message =
-    'DelayedStream#maxDataSize of ' + this.maxDataSize + ' bytes exceeded.';
-  this._emitError(new Error(message));
-};
-
-CombinedStream.prototype._updateDataSize = function() {
-  this.dataSize = 0;
-
-  var self = this;
-  this._streams.forEach(function(stream) {
-    if (!stream.dataSize) {
-      return;
-    }
-
-    self.dataSize += stream.dataSize;
-  });
-
-  if (this._currentStream && this._currentStream.dataSize) {
-    this.dataSize += this._currentStream.dataSize;
-  }
-};
-
-CombinedStream.prototype._emitError = function(err) {
-  this._reset();
-  this.emit('error', err);
-};
-
-
-/***/ }),
-/* 386 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var stream = __webpack_require__(102)
-var eos = __webpack_require__(173)
-var inherits = __webpack_require__(61)
-var shift = __webpack_require__(942)
-
-var SIGNAL_FLUSH = (Buffer.from && Buffer.from !== Uint8Array.from)
-  ? Buffer.from([0])
-  : new Buffer([0])
-
-var onuncork = function(self, fn) {
-  if (self._corked) self.once('uncork', fn)
-  else fn()
-}
-
-var autoDestroy = function (self, err) {
-  if (self._autoDestroy) self.destroy(err)
-}
-
-var destroyer = function(self, end) {
-  return function(err) {
-    if (err) autoDestroy(self, err.message === 'premature close' ? null : err)
-    else if (end && !self._ended) self.end()
-  }
-}
-
-var end = function(ws, fn) {
-  if (!ws) return fn()
-  if (ws._writableState && ws._writableState.finished) return fn()
-  if (ws._writableState) return ws.end(fn)
-  ws.end()
-  fn()
-}
-
-var toStreams2 = function(rs) {
-  return new (stream.Readable)({objectMode:true, highWaterMark:16}).wrap(rs)
-}
-
-var Duplexify = function(writable, readable, opts) {
-  if (!(this instanceof Duplexify)) return new Duplexify(writable, readable, opts)
-  stream.Duplex.call(this, opts)
-
-  this._writable = null
-  this._readable = null
-  this._readable2 = null
-
-  this._autoDestroy = !opts || opts.autoDestroy !== false
-  this._forwardDestroy = !opts || opts.destroy !== false
-  this._forwardEnd = !opts || opts.end !== false
-  this._corked = 1 // start corked
-  this._ondrain = null
-  this._drained = false
-  this._forwarding = false
-  this._unwrite = null
-  this._unread = null
-  this._ended = false
-
-  this.destroyed = false
-
-  if (writable) this.setWritable(writable)
-  if (readable) this.setReadable(readable)
-}
-
-inherits(Duplexify, stream.Duplex)
-
-Duplexify.obj = function(writable, readable, opts) {
-  if (!opts) opts = {}
-  opts.objectMode = true
-  opts.highWaterMark = 16
-  return new Duplexify(writable, readable, opts)
-}
-
-Duplexify.prototype.cork = function() {
-  if (++this._corked === 1) this.emit('cork')
-}
-
-Duplexify.prototype.uncork = function() {
-  if (this._corked && --this._corked === 0) this.emit('uncork')
-}
-
-Duplexify.prototype.setWritable = function(writable) {
-  if (this._unwrite) this._unwrite()
-
-  if (this.destroyed) {
-    if (writable && writable.destroy) writable.destroy()
-    return
-  }
-
-  if (writable === null || writable === false) {
-    this.end()
-    return
-  }
-
-  var self = this
-  var unend = eos(writable, {writable:true, readable:false}, destroyer(this, this._forwardEnd))
-
-  var ondrain = function() {
-    var ondrain = self._ondrain
-    self._ondrain = null
-    if (ondrain) ondrain()
-  }
-
-  var clear = function() {
-    self._writable.removeListener('drain', ondrain)
-    unend()
-  }
-
-  if (this._unwrite) process.nextTick(ondrain) // force a drain on stream reset to avoid livelocks
-
-  this._writable = writable
-  this._writable.on('drain', ondrain)
-  this._unwrite = clear
-
-  this.uncork() // always uncork setWritable
-}
-
-Duplexify.prototype.setReadable = function(readable) {
-  if (this._unread) this._unread()
-
-  if (this.destroyed) {
-    if (readable && readable.destroy) readable.destroy()
-    return
-  }
-
-  if (readable === null || readable === false) {
-    this.push(null)
-    this.resume()
-    return
-  }
-
-  var self = this
-  var unend = eos(readable, {writable:false, readable:true}, destroyer(this))
-
-  var onreadable = function() {
-    self._forward()
-  }
-
-  var onend = function() {
-    self.push(null)
-  }
-
-  var clear = function() {
-    self._readable2.removeListener('readable', onreadable)
-    self._readable2.removeListener('end', onend)
-    unend()
-  }
-
-  this._drained = true
-  this._readable = readable
-  this._readable2 = readable._readableState ? readable : toStreams2(readable)
-  this._readable2.on('readable', onreadable)
-  this._readable2.on('end', onend)
-  this._unread = clear
-
-  this._forward()
-}
-
-Duplexify.prototype._read = function() {
-  this._drained = true
-  this._forward()
-}
-
-Duplexify.prototype._forward = function() {
-  if (this._forwarding || !this._readable2 || !this._drained) return
-  this._forwarding = true
-
-  var data
-
-  while (this._drained && (data = shift(this._readable2)) !== null) {
-    if (this.destroyed) continue
-    this._drained = this.push(data)
-  }
-
-  this._forwarding = false
-}
-
-Duplexify.prototype.destroy = function(err) {
-  if (this.destroyed) return
-  this.destroyed = true
-
-  var self = this
-  process.nextTick(function() {
-    self._destroy(err)
-  })
-}
-
-Duplexify.prototype._destroy = function(err) {
-  if (err) {
-    var ondrain = this._ondrain
-    this._ondrain = null
-    if (ondrain) ondrain(err)
-    else this.emit('error', err)
-  }
-
-  if (this._forwardDestroy) {
-    if (this._readable && this._readable.destroy) this._readable.destroy()
-    if (this._writable && this._writable.destroy) this._writable.destroy()
-  }
-
-  this.emit('close')
-}
-
-Duplexify.prototype._write = function(data, enc, cb) {
-  if (this.destroyed) return cb()
-  if (this._corked) return onuncork(this, this._write.bind(this, data, enc, cb))
-  if (data === SIGNAL_FLUSH) return this._finish(cb)
-  if (!this._writable) return cb()
-
-  if (this._writable.write(data) === false) this._ondrain = cb
-  else cb()
-}
-
-
-Duplexify.prototype._finish = function(cb) {
-  var self = this
-  this.emit('preend')
-  onuncork(this, function() {
-    end(self._forwardEnd && self._writable, function() {
-      // haxx to not emit prefinish twice
-      if (self._writableState.prefinished === false) self._writableState.prefinished = true
-      self.emit('prefinish')
-      onuncork(self, cb)
-    })
-  })
-}
-
-Duplexify.prototype.end = function(data, enc, cb) {
-  if (typeof data === 'function') return this.end(null, null, data)
-  if (typeof enc === 'function') return this.end(data, null, enc)
-  this._ended = true
-  if (data) this.write(data)
-  if (!this._writableState.ending) this.write(SIGNAL_FLUSH)
-  return stream.Writable.prototype.end.call(this, cb)
-}
-
-module.exports = Duplexify
-
-
-/***/ }),
-/* 387 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var crypto = __webpack_require__(12);
-var BigInteger = __webpack_require__(81).BigInteger;
-var ECPointFp = __webpack_require__(139).ECPointFp;
-var Buffer = __webpack_require__(15).Buffer;
-exports.ECCurves = __webpack_require__(638);
-
-// zero prepad
-function unstupid(hex,len)
-{
-	return (hex.length >= len) ? hex : unstupid("0"+hex,len);
-}
-
-exports.ECKey = function(curve, key, isPublic)
-{
-  var priv;
-	var c = curve();
-	var n = c.getN();
-  var bytes = Math.floor(n.bitLength()/8);
-
-  if(key)
-  {
-    if(isPublic)
-    {
-      var curve = c.getCurve();
-//      var x = key.slice(1,bytes+1); // skip the 04 for uncompressed format
-//      var y = key.slice(bytes+1);
-//      this.P = new ECPointFp(curve,
-//        curve.fromBigInteger(new BigInteger(x.toString("hex"), 16)),
-//        curve.fromBigInteger(new BigInteger(y.toString("hex"), 16)));      
-      this.P = curve.decodePointHex(key.toString("hex"));
-    }else{
-      if(key.length != bytes) return false;
-      priv = new BigInteger(key.toString("hex"), 16);      
-    }
-  }else{
-    var n1 = n.subtract(BigInteger.ONE);
-    var r = new BigInteger(crypto.randomBytes(n.bitLength()));
-    priv = r.mod(n1).add(BigInteger.ONE);
-    this.P = c.getG().multiply(priv);
-  }
-  if(this.P)
-  {
-//  var pubhex = unstupid(this.P.getX().toBigInteger().toString(16),bytes*2)+unstupid(this.P.getY().toBigInteger().toString(16),bytes*2);
-//  this.PublicKey = Buffer.from("04"+pubhex,"hex");
-    this.PublicKey = Buffer.from(c.getCurve().encodeCompressedPointHex(this.P),"hex");
-  }
-  if(priv)
-  {
-    this.PrivateKey = Buffer.from(unstupid(priv.toString(16),bytes*2),"hex");
-    this.deriveSharedSecret = function(key)
-    {
-      if(!key || !key.P) return false;
-      var S = key.P.multiply(priv);
-      return Buffer.from(unstupid(S.getX().toBigInteger().toString(16),bytes*2),"hex");
-   }     
-  }
-}
-
-
-
-/***/ }),
-/* 388 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-
-module.exports = function (str) {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	return str.replace(matchOperatorsRe, '\\$&');
-};
-
-
-/***/ }),
-/* 389 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = function (data, opts) {
-    if (!opts) opts = {};
-    if (typeof opts === 'function') opts = { cmp: opts };
-    var cycles = (typeof opts.cycles === 'boolean') ? opts.cycles : false;
-
-    var cmp = opts.cmp && (function (f) {
-        return function (node) {
-            return function (a, b) {
-                var aobj = { key: a, value: node[a] };
-                var bobj = { key: b, value: node[b] };
-                return f(aobj, bobj);
-            };
-        };
-    })(opts.cmp);
-
-    var seen = [];
-    return (function stringify (node) {
-        if (node && node.toJSON && typeof node.toJSON === 'function') {
-            node = node.toJSON();
-        }
-
-        if (node === undefined) return;
-        if (typeof node == 'number') return isFinite(node) ? '' + node : 'null';
-        if (typeof node !== 'object') return JSON.stringify(node);
-
-        var i, out;
-        if (Array.isArray(node)) {
-            out = '[';
-            for (i = 0; i < node.length; i++) {
-                if (i) out += ',';
-                out += stringify(node[i]) || 'null';
-            }
-            return out + ']';
-        }
-
-        if (node === null) return 'null';
-
-        if (seen.indexOf(node) !== -1) {
-            if (cycles) return JSON.stringify('__cycle__');
-            throw new TypeError('Converting circular structure to JSON');
-        }
-
-        var seenIndex = seen.push(node) - 1;
-        var keys = Object.keys(node).sort(cmp && cmp(node));
-        out = '';
-        for (i = 0; i < keys.length; i++) {
-            var key = keys[i];
-            var value = stringify(node[key]);
-
-            if (!value) continue;
-            if (out) out += ',';
-            out += JSON.stringify(key) + ':' + value;
-        }
-        seen.splice(seenIndex, 1);
-        return '{' + out + '}';
-    })(data);
-};
-
-
-/***/ }),
-/* 390 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var fs = __webpack_require__(5)
-
-module.exports = clone(fs)
-
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
-
-  if (obj instanceof Object)
-    var copy = { __proto__: obj.__proto__ }
-  else
-    var copy = Object.create(null)
-
-  Object.getOwnPropertyNames(obj).forEach(function (key) {
-    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
-  })
-
-  return copy
-}
-
-
-/***/ }),
-/* 391 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var fs = __webpack_require__(5)
-var polyfills = __webpack_require__(655)
-var legacy = __webpack_require__(654)
-var queue = []
-
-var util = __webpack_require__(3)
-
-function noop () {}
-
-var debug = noop
-if (util.debuglog)
-  debug = util.debuglog('gfs4')
-else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
-  debug = function() {
-    var m = util.format.apply(util, arguments)
-    m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ')
-    console.error(m)
-  }
-
-if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug(queue)
-    __webpack_require__(28).equal(queue.length, 0)
-  })
-}
-
-module.exports = patch(__webpack_require__(390))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
-  module.exports = patch(fs)
-}
-
-// Always patch fs.close/closeSync, because we want to
-// retry() whenever a close happens *anywhere* in the program.
-// This is essential when multiple graceful-fs instances are
-// in play at the same time.
-module.exports.close =
-fs.close = (function (fs$close) { return function (fd, cb) {
-  return fs$close.call(fs, fd, function (err) {
-    if (!err)
-      retry()
-
-    if (typeof cb === 'function')
-      cb.apply(this, arguments)
-  })
-}})(fs.close)
-
-module.exports.closeSync =
-fs.closeSync = (function (fs$closeSync) { return function (fd) {
-  // Note that graceful-fs also retries when fs.closeSync() fails.
-  // Looks like a bug to me, although it's probably a harmless one.
-  var rval = fs$closeSync.apply(fs, arguments)
-  retry()
-  return rval
-}})(fs.closeSync)
-
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
-  fs.FileReadStream = ReadStream;  // Legacy name.
-  fs.FileWriteStream = WriteStream;  // Legacy name.
-  fs.createReadStream = createReadStream
-  fs.createWriteStream = createWriteStream
-  var fs$readFile = fs.readFile
-  fs.readFile = readFile
-  function readFile (path, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
-
-    return go$readFile(path, options, cb)
-
-    function go$readFile (path, options, cb) {
-      return fs$readFile(path, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$readFile, [path, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
-
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
-
-    return go$writeFile(path, data, options, cb)
-
-    function go$writeFile (path, data, options, cb) {
-      return fs$writeFile(path, data, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$writeFile, [path, data, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
-
-  var fs$appendFile = fs.appendFile
-  if (fs$appendFile)
-    fs.appendFile = appendFile
-  function appendFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
-
-    return go$appendFile(path, data, options, cb)
-
-    function go$appendFile (path, data, options, cb) {
-      return fs$appendFile(path, data, options, function (err) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$appendFile, [path, data, options, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
-
-  var fs$readdir = fs.readdir
-  fs.readdir = readdir
-  function readdir (path, options, cb) {
-    var args = [path]
-    if (typeof options !== 'function') {
-      args.push(options)
-    } else {
-      cb = options
-    }
-    args.push(go$readdir$cb)
-
-    return go$readdir(args)
-
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
-
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
-      }
-    }
-  }
-
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
-  }
-
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
-  }
-
-  var fs$ReadStream = fs.ReadStream
-  ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-  ReadStream.prototype.open = ReadStream$open
-
-  var fs$WriteStream = fs.WriteStream
-  WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-  WriteStream.prototype.open = WriteStream$open
-
-  fs.ReadStream = ReadStream
-  fs.WriteStream = WriteStream
-
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
-  }
-
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
-
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
-
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
-
-  function WriteStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        that.destroy()
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-      }
-    })
-  }
-
-  function createReadStream (path, options) {
-    return new ReadStream(path, options)
-  }
-
-  function createWriteStream (path, options) {
-    return new WriteStream(path, options)
-  }
-
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
-
-    return go$open(path, flags, mode, cb)
-
-    function go$open (path, flags, mode, cb) {
-      return fs$open(path, flags, mode, function (err, fd) {
-        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-          enqueue([go$open, [path, flags, mode, cb]])
-        else {
-          if (typeof cb === 'function')
-            cb.apply(this, arguments)
-          retry()
-        }
-      })
-    }
-  }
-
-  return fs
-}
-
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  queue.push(elem)
-}
-
-function retry () {
-  var elem = queue.shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
-  }
-}
-
-
-/***/ }),
-/* 392 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `input` type prompt
- */
-
-var chalk = __webpack_require__(30);
-var { map, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var observe = __webpack_require__(80);
-
-class InputPrompt extends Base {
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    // Once user confirm (enter key)
-    var events = observe(this.rl);
-    var submit = events.line.pipe(map(this.filterInput.bind(this)));
-
-    var validation = this.handleSubmitEvents(submit);
-    validation.success.forEach(this.onEnd.bind(this));
-    validation.error.forEach(this.onError.bind(this));
-
-    events.keypress
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onKeypress.bind(this));
-
-    // Init
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {InputPrompt} self
-   */
-
-  render(error) {
-    var bottomContent = '';
-    var appendContent = '';
-    var message = this.getQuestion();
-    var transformer = this.opt.transformer;
-    var isFinal = this.status === 'answered';
-
-    if (isFinal) {
-      appendContent = this.answer;
-    } else {
-      appendContent = this.rl.line;
-    }
-
-    if (transformer) {
-      message += transformer(appendContent, this.answers, { isFinal });
-    } else {
-      message += isFinal ? chalk.cyan(appendContent) : appendContent;
-    }
-
-    if (error) {
-      bottomContent = chalk.red('>> ') + error;
-    }
-
-    this.screen.render(message, bottomContent);
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  filterInput(input) {
-    if (!input) {
-      return this.opt.default == null ? '' : this.opt.default;
-    }
-    return input;
-  }
-
-  onEnd(state) {
-    this.answer = state.value;
-    this.status = 'answered';
-
-    // Re-render prompt
-    this.render();
-
-    this.screen.done();
-    this.done(state.value);
-  }
-
-  onError(state) {
-    this.render(state.isValid);
-  }
-
-  /**
-   * When user press a key
-   */
-
-  onKeypress() {
-    // If user press a key, just clear the default value
-    if (this.opt.default) {
-      this.opt.default = undefined;
-    }
-
-    this.render();
-  }
-}
-
-module.exports = InputPrompt;
-
-
-/***/ }),
-/* 393 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var _ = __webpack_require__(38);
-var MuteStream = __webpack_require__(401);
-var readline = __webpack_require__(197);
-
-/**
- * Base interface class other can inherits from
- */
-
-class UI {
-  constructor(opt) {
-    // Instantiate the Readline interface
-    // @Note: Don't reassign if already present (allow test to override the Stream)
-    if (!this.rl) {
-      this.rl = readline.createInterface(setupReadlineOptions(opt));
-    }
-    this.rl.resume();
-
-    this.onForceClose = this.onForceClose.bind(this);
-
-    // Make sure new prompt start on a newline when closing
-    process.on('exit', this.onForceClose);
-
-    // Terminate process on SIGINT (which will call process.on('exit') in return)
-    this.rl.on('SIGINT', this.onForceClose);
-  }
-
-  /**
-   * Handle the ^C exit
-   * @return {null}
-   */
-
-  onForceClose() {
-    this.close();
-    process.kill(process.pid, 'SIGINT');
-    console.log('');
-  }
-
-  /**
-   * Close the interface and cleanup listeners
-   */
-
-  close() {
-    // Remove events listeners
-    this.rl.removeListener('SIGINT', this.onForceClose);
-    process.removeListener('exit', this.onForceClose);
-
-    this.rl.output.unmute();
-
-    if (this.activePrompt && typeof this.activePrompt.close === 'function') {
-      this.activePrompt.close();
-    }
-
-    // Close the readline
-    this.rl.output.end();
-    this.rl.pause();
-    this.rl.close();
-  }
-}
-
-function setupReadlineOptions(opt) {
-  opt = opt || {};
-
-  // Default `input` to stdin
-  var input = opt.input || process.stdin;
-
-  // Add mute capabilities to the output
-  var ms = new MuteStream();
-  ms.pipe(opt.output || process.stdout);
-  var output = ms;
-
-  return _.extend(
-    {
-      terminal: true,
-      input: input,
-      output: output
-    },
-    _.omit(opt, ['input', 'output'])
-  );
-}
-
-module.exports = UI;
-
-
-/***/ }),
-/* 394 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var ansiEscapes = __webpack_require__(504);
-
-/**
- * Move cursor left by `x`
- * @param  {Readline} rl - Readline instance
- * @param  {Number}   x  - How far to go left (default to 1)
- */
-
-exports.left = function(rl, x) {
-  rl.output.write(ansiEscapes.cursorBackward(x));
-};
-
-/**
- * Move cursor right by `x`
- * @param  {Readline} rl - Readline instance
- * @param  {Number}   x  - How far to go left (default to 1)
- */
-
-exports.right = function(rl, x) {
-  rl.output.write(ansiEscapes.cursorForward(x));
-};
-
-/**
- * Move cursor up by `x`
- * @param  {Readline} rl - Readline instance
- * @param  {Number}   x  - How far to go up (default to 1)
- */
-
-exports.up = function(rl, x) {
-  rl.output.write(ansiEscapes.cursorUp(x));
-};
-
-/**
- * Move cursor down by `x`
- * @param  {Readline} rl - Readline instance
- * @param  {Number}   x  - How far to go down (default to 1)
- */
-
-exports.down = function(rl, x) {
-  rl.output.write(ansiEscapes.cursorDown(x));
-};
-
-/**
- * Clear current line
- * @param  {Readline} rl  - Readline instance
- * @param  {Number}   len - number of line to delete
- */
-exports.clearLine = function(rl, len) {
-  rl.output.write(ansiEscapes.eraseLines(len));
-};
-
-
-/***/ }),
-/* 395 */
-/***/ (function(module, exports) {
-
-module.exports = [["0","\u0000",127],["a140","　，、。．‧；：？！︰…‥﹐﹑﹒·﹔﹕﹖﹗｜–︱—︳╴︴﹏（）︵︶｛｝︷︸〔〕︹︺【】︻︼《》︽︾〈〉︿﹀「」﹁﹂『』﹃﹄﹙﹚"],["a1a1","﹛﹜﹝﹞‘’“”〝〞‵′＃＆＊※§〃○●△▲◎☆★◇◆□■▽▼㊣℅¯￣＿ˍ﹉﹊﹍﹎﹋﹌﹟﹠﹡＋－×÷±√＜＞＝≦≧≠∞≒≡﹢",4,"～∩∪⊥∠∟⊿㏒㏑∫∮∵∴♀♂⊕⊙↑↓←→↖↗↙↘∥∣／"],["a240","＼∕﹨＄￥〒￠￡％＠℃℉﹩﹪﹫㏕㎜㎝㎞㏎㎡㎎㎏㏄°兙兛兞兝兡兣嗧瓩糎▁",7,"▏▎▍▌▋▊▉┼┴┬┤├▔─│▕┌┐└┘╭"],["a2a1","╮╰╯═╞╪╡◢◣◥◤╱╲╳０",9,"Ⅰ",9,"〡",8,"十卄卅Ａ",25,"ａ",21],["a340","ｗｘｙｚΑ",16,"Σ",6,"α",16,"σ",6,"ㄅ",10],["a3a1","ㄐ",25,"˙ˉˊˇˋ"],["a3e1","€"],["a440","一乙丁七乃九了二人儿入八几刀刁力匕十卜又三下丈上丫丸凡久么也乞于亡兀刃勺千叉口土士夕大女子孑孓寸小尢尸山川工己已巳巾干廾弋弓才"],["a4a1","丑丐不中丰丹之尹予云井互五亢仁什仃仆仇仍今介仄元允內六兮公冗凶分切刈勻勾勿化匹午升卅卞厄友及反壬天夫太夭孔少尤尺屯巴幻廿弔引心戈戶手扎支文斗斤方日曰月木欠止歹毋比毛氏水火爪父爻片牙牛犬王丙"],["a540","世丕且丘主乍乏乎以付仔仕他仗代令仙仞充兄冉冊冬凹出凸刊加功包匆北匝仟半卉卡占卯卮去可古右召叮叩叨叼司叵叫另只史叱台句叭叻四囚外"],["a5a1","央失奴奶孕它尼巨巧左市布平幼弁弘弗必戊打扔扒扑斥旦朮本未末札正母民氐永汁汀氾犯玄玉瓜瓦甘生用甩田由甲申疋白皮皿目矛矢石示禾穴立丞丟乒乓乩亙交亦亥仿伉伙伊伕伍伐休伏仲件任仰仳份企伋光兇兆先全"],["a640","共再冰列刑划刎刖劣匈匡匠印危吉吏同吊吐吁吋各向名合吃后吆吒因回囝圳地在圭圬圯圩夙多夷夸妄奸妃好她如妁字存宇守宅安寺尖屹州帆并年"],["a6a1","式弛忙忖戎戌戍成扣扛托收早旨旬旭曲曳有朽朴朱朵次此死氖汝汗汙江池汐汕污汛汍汎灰牟牝百竹米糸缶羊羽老考而耒耳聿肉肋肌臣自至臼舌舛舟艮色艾虫血行衣西阡串亨位住佇佗佞伴佛何估佐佑伽伺伸佃佔似但佣"],["a740","作你伯低伶余佝佈佚兌克免兵冶冷別判利刪刨劫助努劬匣即卵吝吭吞吾否呎吧呆呃吳呈呂君吩告吹吻吸吮吵吶吠吼呀吱含吟听囪困囤囫坊坑址坍"],["a7a1","均坎圾坐坏圻壯夾妝妒妨妞妣妙妖妍妤妓妊妥孝孜孚孛完宋宏尬局屁尿尾岐岑岔岌巫希序庇床廷弄弟彤形彷役忘忌志忍忱快忸忪戒我抄抗抖技扶抉扭把扼找批扳抒扯折扮投抓抑抆改攻攸旱更束李杏材村杜杖杞杉杆杠"],["a840","杓杗步每求汞沙沁沈沉沅沛汪決沐汰沌汨沖沒汽沃汲汾汴沆汶沍沔沘沂灶灼災灸牢牡牠狄狂玖甬甫男甸皂盯矣私秀禿究系罕肖肓肝肘肛肚育良芒"],["a8a1","芋芍見角言谷豆豕貝赤走足身車辛辰迂迆迅迄巡邑邢邪邦那酉釆里防阮阱阪阬並乖乳事些亞享京佯依侍佳使佬供例來侃佰併侈佩佻侖佾侏侑佺兔兒兕兩具其典冽函刻券刷刺到刮制剁劾劻卒協卓卑卦卷卸卹取叔受味呵"],["a940","咖呸咕咀呻呷咄咒咆呼咐呱呶和咚呢周咋命咎固垃坷坪坩坡坦坤坼夜奉奇奈奄奔妾妻委妹妮姑姆姐姍始姓姊妯妳姒姅孟孤季宗定官宜宙宛尚屈居"],["a9a1","屆岷岡岸岩岫岱岳帘帚帖帕帛帑幸庚店府底庖延弦弧弩往征彿彼忝忠忽念忿怏怔怯怵怖怪怕怡性怩怫怛或戕房戾所承拉拌拄抿拂抹拒招披拓拔拋拈抨抽押拐拙拇拍抵拚抱拘拖拗拆抬拎放斧於旺昔易昌昆昂明昀昏昕昊"],["aa40","昇服朋杭枋枕東果杳杷枇枝林杯杰板枉松析杵枚枓杼杪杲欣武歧歿氓氛泣注泳沱泌泥河沽沾沼波沫法泓沸泄油況沮泗泅泱沿治泡泛泊沬泯泜泖泠"],["aaa1","炕炎炒炊炙爬爭爸版牧物狀狎狙狗狐玩玨玟玫玥甽疝疙疚的盂盲直知矽社祀祁秉秈空穹竺糾罔羌羋者肺肥肢肱股肫肩肴肪肯臥臾舍芳芝芙芭芽芟芹花芬芥芯芸芣芰芾芷虎虱初表軋迎返近邵邸邱邶采金長門阜陀阿阻附"],["ab40","陂隹雨青非亟亭亮信侵侯便俠俑俏保促侶俘俟俊俗侮俐俄係俚俎俞侷兗冒冑冠剎剃削前剌剋則勇勉勃勁匍南卻厚叛咬哀咨哎哉咸咦咳哇哂咽咪品"],["aba1","哄哈咯咫咱咻咩咧咿囿垂型垠垣垢城垮垓奕契奏奎奐姜姘姿姣姨娃姥姪姚姦威姻孩宣宦室客宥封屎屏屍屋峙峒巷帝帥帟幽庠度建弈弭彥很待徊律徇後徉怒思怠急怎怨恍恰恨恢恆恃恬恫恪恤扁拜挖按拼拭持拮拽指拱拷"],["ac40","拯括拾拴挑挂政故斫施既春昭映昧是星昨昱昤曷柿染柱柔某柬架枯柵柩柯柄柑枴柚查枸柏柞柳枰柙柢柝柒歪殃殆段毒毗氟泉洋洲洪流津洌洱洞洗"],["aca1","活洽派洶洛泵洹洧洸洩洮洵洎洫炫為炳炬炯炭炸炮炤爰牲牯牴狩狠狡玷珊玻玲珍珀玳甚甭畏界畎畋疫疤疥疢疣癸皆皇皈盈盆盃盅省盹相眉看盾盼眇矜砂研砌砍祆祉祈祇禹禺科秒秋穿突竿竽籽紂紅紀紉紇約紆缸美羿耄"],["ad40","耐耍耑耶胖胥胚胃胄背胡胛胎胞胤胝致舢苧范茅苣苛苦茄若茂茉苒苗英茁苜苔苑苞苓苟苯茆虐虹虻虺衍衫要觔計訂訃貞負赴赳趴軍軌述迦迢迪迥"],["ada1","迭迫迤迨郊郎郁郃酋酊重閂限陋陌降面革韋韭音頁風飛食首香乘亳倌倍倣俯倦倥俸倩倖倆值借倚倒們俺倀倔倨俱倡個候倘俳修倭倪俾倫倉兼冤冥冢凍凌准凋剖剜剔剛剝匪卿原厝叟哨唐唁唷哼哥哲唆哺唔哩哭員唉哮哪"],["ae40","哦唧唇哽唏圃圄埂埔埋埃堉夏套奘奚娑娘娜娟娛娓姬娠娣娩娥娌娉孫屘宰害家宴宮宵容宸射屑展屐峭峽峻峪峨峰島崁峴差席師庫庭座弱徒徑徐恙"],["aea1","恣恥恐恕恭恩息悄悟悚悍悔悌悅悖扇拳挈拿捎挾振捕捂捆捏捉挺捐挽挪挫挨捍捌效敉料旁旅時晉晏晃晒晌晅晁書朔朕朗校核案框桓根桂桔栩梳栗桌桑栽柴桐桀格桃株桅栓栘桁殊殉殷氣氧氨氦氤泰浪涕消涇浦浸海浙涓"],["af40","浬涉浮浚浴浩涌涊浹涅浥涔烊烘烤烙烈烏爹特狼狹狽狸狷玆班琉珮珠珪珞畔畝畜畚留疾病症疲疳疽疼疹痂疸皋皰益盍盎眩真眠眨矩砰砧砸砝破砷"],["afa1","砥砭砠砟砲祕祐祠祟祖神祝祗祚秤秣秧租秦秩秘窄窈站笆笑粉紡紗紋紊素索純紐紕級紜納紙紛缺罟羔翅翁耆耘耕耙耗耽耿胱脂胰脅胭胴脆胸胳脈能脊胼胯臭臬舀舐航舫舨般芻茫荒荔荊茸荐草茵茴荏茲茹茶茗荀茱茨荃"],["b040","虔蚊蚪蚓蚤蚩蚌蚣蚜衰衷袁袂衽衹記訐討訌訕訊託訓訖訏訑豈豺豹財貢起躬軒軔軏辱送逆迷退迺迴逃追逅迸邕郡郝郢酒配酌釘針釗釜釙閃院陣陡"],["b0a1","陛陝除陘陞隻飢馬骨高鬥鬲鬼乾偺偽停假偃偌做偉健偶偎偕偵側偷偏倏偯偭兜冕凰剪副勒務勘動匐匏匙匿區匾參曼商啪啦啄啞啡啃啊唱啖問啕唯啤唸售啜唬啣唳啁啗圈國圉域堅堊堆埠埤基堂堵執培夠奢娶婁婉婦婪婀"],["b140","娼婢婚婆婊孰寇寅寄寂宿密尉專將屠屜屝崇崆崎崛崖崢崑崩崔崙崤崧崗巢常帶帳帷康庸庶庵庾張強彗彬彩彫得徙從徘御徠徜恿患悉悠您惋悴惦悽"],["b1a1","情悻悵惜悼惘惕惆惟悸惚惇戚戛扈掠控捲掖探接捷捧掘措捱掩掉掃掛捫推掄授掙採掬排掏掀捻捩捨捺敝敖救教敗啟敏敘敕敔斜斛斬族旋旌旎晝晚晤晨晦晞曹勗望梁梯梢梓梵桿桶梱梧梗械梃棄梭梆梅梔條梨梟梡梂欲殺"],["b240","毫毬氫涎涼淳淙液淡淌淤添淺清淇淋涯淑涮淞淹涸混淵淅淒渚涵淚淫淘淪深淮淨淆淄涪淬涿淦烹焉焊烽烯爽牽犁猜猛猖猓猙率琅琊球理現琍瓠瓶"],["b2a1","瓷甜產略畦畢異疏痔痕疵痊痍皎盔盒盛眷眾眼眶眸眺硫硃硎祥票祭移窒窕笠笨笛第符笙笞笮粒粗粕絆絃統紮紹紼絀細紳組累終紲紱缽羞羚翌翎習耜聊聆脯脖脣脫脩脰脤舂舵舷舶船莎莞莘荸莢莖莽莫莒莊莓莉莠荷荻荼"],["b340","莆莧處彪蛇蛀蚶蛄蚵蛆蛋蚱蚯蛉術袞袈被袒袖袍袋覓規訪訝訣訥許設訟訛訢豉豚販責貫貨貪貧赧赦趾趺軛軟這逍通逗連速逝逐逕逞造透逢逖逛途"],["b3a1","部郭都酗野釵釦釣釧釭釩閉陪陵陳陸陰陴陶陷陬雀雪雩章竟頂頃魚鳥鹵鹿麥麻傢傍傅備傑傀傖傘傚最凱割剴創剩勞勝勛博厥啻喀喧啼喊喝喘喂喜喪喔喇喋喃喳單喟唾喲喚喻喬喱啾喉喫喙圍堯堪場堤堰報堡堝堠壹壺奠"],["b440","婷媚婿媒媛媧孳孱寒富寓寐尊尋就嵌嵐崴嵇巽幅帽幀幃幾廊廁廂廄弼彭復循徨惑惡悲悶惠愜愣惺愕惰惻惴慨惱愎惶愉愀愒戟扉掣掌描揀揩揉揆揍"],["b4a1","插揣提握揖揭揮捶援揪換摒揚揹敞敦敢散斑斐斯普晰晴晶景暑智晾晷曾替期朝棺棕棠棘棗椅棟棵森棧棹棒棲棣棋棍植椒椎棉棚楮棻款欺欽殘殖殼毯氮氯氬港游湔渡渲湧湊渠渥渣減湛湘渤湖湮渭渦湯渴湍渺測湃渝渾滋"],["b540","溉渙湎湣湄湲湩湟焙焚焦焰無然煮焜牌犄犀猶猥猴猩琺琪琳琢琥琵琶琴琯琛琦琨甥甦畫番痢痛痣痙痘痞痠登發皖皓皴盜睏短硝硬硯稍稈程稅稀窘"],["b5a1","窗窖童竣等策筆筐筒答筍筋筏筑粟粥絞結絨絕紫絮絲絡給絢絰絳善翔翕耋聒肅腕腔腋腑腎脹腆脾腌腓腴舒舜菩萃菸萍菠菅萋菁華菱菴著萊菰萌菌菽菲菊萸萎萄菜萇菔菟虛蛟蛙蛭蛔蛛蛤蛐蛞街裁裂袱覃視註詠評詞証詁"],["b640","詔詛詐詆訴診訶詖象貂貯貼貳貽賁費賀貴買貶貿貸越超趁跎距跋跚跑跌跛跆軻軸軼辜逮逵週逸進逶鄂郵鄉郾酣酥量鈔鈕鈣鈉鈞鈍鈐鈇鈑閔閏開閑"],["b6a1","間閒閎隊階隋陽隅隆隍陲隄雁雅雄集雇雯雲韌項順須飧飪飯飩飲飭馮馭黃黍黑亂傭債傲傳僅傾催傷傻傯僇剿剷剽募勦勤勢勣匯嗟嗨嗓嗦嗎嗜嗇嗑嗣嗤嗯嗚嗡嗅嗆嗥嗉園圓塞塑塘塗塚塔填塌塭塊塢塒塋奧嫁嫉嫌媾媽媼"],["b740","媳嫂媲嵩嵯幌幹廉廈弒彙徬微愚意慈感想愛惹愁愈慎慌慄慍愾愴愧愍愆愷戡戢搓搾搞搪搭搽搬搏搜搔損搶搖搗搆敬斟新暗暉暇暈暖暄暘暍會榔業"],["b7a1","楚楷楠楔極椰概楊楨楫楞楓楹榆楝楣楛歇歲毀殿毓毽溢溯滓溶滂源溝滇滅溥溘溼溺溫滑準溜滄滔溪溧溴煎煙煩煤煉照煜煬煦煌煥煞煆煨煖爺牒猷獅猿猾瑯瑚瑕瑟瑞瑁琿瑙瑛瑜當畸瘀痰瘁痲痱痺痿痴痳盞盟睛睫睦睞督"],["b840","睹睪睬睜睥睨睢矮碎碰碗碘碌碉硼碑碓硿祺祿禁萬禽稜稚稠稔稟稞窟窠筷節筠筮筧粱粳粵經絹綑綁綏絛置罩罪署義羨群聖聘肆肄腱腰腸腥腮腳腫"],["b8a1","腹腺腦舅艇蒂葷落萱葵葦葫葉葬葛萼萵葡董葩葭葆虞虜號蛹蜓蜈蜇蜀蛾蛻蜂蜃蜆蜊衙裟裔裙補裘裝裡裊裕裒覜解詫該詳試詩詰誇詼詣誠話誅詭詢詮詬詹詻訾詨豢貊貉賊資賈賄貲賃賂賅跡跟跨路跳跺跪跤跦躲較載軾輊"],["b940","辟農運遊道遂達逼違遐遇遏過遍遑逾遁鄒鄗酬酪酩釉鈷鉗鈸鈽鉀鈾鉛鉋鉤鉑鈴鉉鉍鉅鈹鈿鉚閘隘隔隕雍雋雉雊雷電雹零靖靴靶預頑頓頊頒頌飼飴"],["b9a1","飽飾馳馱馴髡鳩麂鼎鼓鼠僧僮僥僖僭僚僕像僑僱僎僩兢凳劃劂匱厭嗾嘀嘛嘗嗽嘔嘆嘉嘍嘎嗷嘖嘟嘈嘐嗶團圖塵塾境墓墊塹墅塽壽夥夢夤奪奩嫡嫦嫩嫗嫖嫘嫣孵寞寧寡寥實寨寢寤察對屢嶄嶇幛幣幕幗幔廓廖弊彆彰徹慇"],["ba40","愿態慷慢慣慟慚慘慵截撇摘摔撤摸摟摺摑摧搴摭摻敲斡旗旖暢暨暝榜榨榕槁榮槓構榛榷榻榫榴槐槍榭槌榦槃榣歉歌氳漳演滾漓滴漩漾漠漬漏漂漢"],["baa1","滿滯漆漱漸漲漣漕漫漯澈漪滬漁滲滌滷熔熙煽熊熄熒爾犒犖獄獐瑤瑣瑪瑰瑭甄疑瘧瘍瘋瘉瘓盡監瞄睽睿睡磁碟碧碳碩碣禎福禍種稱窪窩竭端管箕箋筵算箝箔箏箸箇箄粹粽精綻綰綜綽綾綠緊綴網綱綺綢綿綵綸維緒緇綬"],["bb40","罰翠翡翟聞聚肇腐膀膏膈膊腿膂臧臺與舔舞艋蓉蒿蓆蓄蒙蒞蒲蒜蓋蒸蓀蓓蒐蒼蓑蓊蜿蜜蜻蜢蜥蜴蜘蝕蜷蜩裳褂裴裹裸製裨褚裯誦誌語誣認誡誓誤"],["bba1","說誥誨誘誑誚誧豪貍貌賓賑賒赫趙趕跼輔輒輕輓辣遠遘遜遣遙遞遢遝遛鄙鄘鄞酵酸酷酴鉸銀銅銘銖鉻銓銜銨鉼銑閡閨閩閣閥閤隙障際雌雒需靼鞅韶頗領颯颱餃餅餌餉駁骯骰髦魁魂鳴鳶鳳麼鼻齊億儀僻僵價儂儈儉儅凜"],["bc40","劇劈劉劍劊勰厲嘮嘻嘹嘲嘿嘴嘩噓噎噗噴嘶嘯嘰墀墟增墳墜墮墩墦奭嬉嫻嬋嫵嬌嬈寮寬審寫層履嶝嶔幢幟幡廢廚廟廝廣廠彈影德徵慶慧慮慝慕憂"],["bca1","慼慰慫慾憧憐憫憎憬憚憤憔憮戮摩摯摹撞撲撈撐撰撥撓撕撩撒撮播撫撚撬撙撢撳敵敷數暮暫暴暱樣樟槨樁樞標槽模樓樊槳樂樅槭樑歐歎殤毅毆漿潼澄潑潦潔澆潭潛潸潮澎潺潰潤澗潘滕潯潠潟熟熬熱熨牖犛獎獗瑩璋璃"],["bd40","瑾璀畿瘠瘩瘟瘤瘦瘡瘢皚皺盤瞎瞇瞌瞑瞋磋磅確磊碾磕碼磐稿稼穀稽稷稻窯窮箭箱範箴篆篇篁箠篌糊締練緯緻緘緬緝編緣線緞緩綞緙緲緹罵罷羯"],["bda1","翩耦膛膜膝膠膚膘蔗蔽蔚蓮蔬蔭蔓蔑蔣蔡蔔蓬蔥蓿蔆螂蝴蝶蝠蝦蝸蝨蝙蝗蝌蝓衛衝褐複褒褓褕褊誼諒談諄誕請諸課諉諂調誰論諍誶誹諛豌豎豬賠賞賦賤賬賭賢賣賜質賡赭趟趣踫踐踝踢踏踩踟踡踞躺輝輛輟輩輦輪輜輞"],["be40","輥適遮遨遭遷鄰鄭鄧鄱醇醉醋醃鋅銻銷鋪銬鋤鋁銳銼鋒鋇鋰銲閭閱霄霆震霉靠鞍鞋鞏頡頫頜颳養餓餒餘駝駐駟駛駑駕駒駙骷髮髯鬧魅魄魷魯鴆鴉"],["bea1","鴃麩麾黎墨齒儒儘儔儐儕冀冪凝劑劓勳噙噫噹噩噤噸噪器噥噱噯噬噢噶壁墾壇壅奮嬝嬴學寰導彊憲憑憩憊懍憶憾懊懈戰擅擁擋撻撼據擄擇擂操撿擒擔撾整曆曉暹曄曇暸樽樸樺橙橫橘樹橄橢橡橋橇樵機橈歙歷氅濂澱澡"],["bf40","濃澤濁澧澳激澹澶澦澠澴熾燉燐燒燈燕熹燎燙燜燃燄獨璜璣璘璟璞瓢甌甍瘴瘸瘺盧盥瞠瞞瞟瞥磨磚磬磧禦積穎穆穌穋窺篙簑築篤篛篡篩篦糕糖縊"],["bfa1","縑縈縛縣縞縝縉縐罹羲翰翱翮耨膳膩膨臻興艘艙蕊蕙蕈蕨蕩蕃蕉蕭蕪蕞螃螟螞螢融衡褪褲褥褫褡親覦諦諺諫諱謀諜諧諮諾謁謂諷諭諳諶諼豫豭貓賴蹄踱踴蹂踹踵輻輯輸輳辨辦遵遴選遲遼遺鄴醒錠錶鋸錳錯錢鋼錫錄錚"],["c040","錐錦錡錕錮錙閻隧隨險雕霎霑霖霍霓霏靛靜靦鞘頰頸頻頷頭頹頤餐館餞餛餡餚駭駢駱骸骼髻髭鬨鮑鴕鴣鴦鴨鴒鴛默黔龍龜優償儡儲勵嚎嚀嚐嚅嚇"],["c0a1","嚏壕壓壑壎嬰嬪嬤孺尷屨嶼嶺嶽嶸幫彌徽應懂懇懦懋戲戴擎擊擘擠擰擦擬擱擢擭斂斃曙曖檀檔檄檢檜櫛檣橾檗檐檠歜殮毚氈濘濱濟濠濛濤濫濯澀濬濡濩濕濮濰燧營燮燦燥燭燬燴燠爵牆獰獲璩環璦璨癆療癌盪瞳瞪瞰瞬"],["c140","瞧瞭矯磷磺磴磯礁禧禪穗窿簇簍篾篷簌篠糠糜糞糢糟糙糝縮績繆縷縲繃縫總縱繅繁縴縹繈縵縿縯罄翳翼聱聲聰聯聳臆臃膺臂臀膿膽臉膾臨舉艱薪"],["c1a1","薄蕾薜薑薔薯薛薇薨薊虧蟀蟑螳蟒蟆螫螻螺蟈蟋褻褶襄褸褽覬謎謗謙講謊謠謝謄謐豁谿豳賺賽購賸賻趨蹉蹋蹈蹊轄輾轂轅輿避遽還邁邂邀鄹醣醞醜鍍鎂錨鍵鍊鍥鍋錘鍾鍬鍛鍰鍚鍔闊闋闌闈闆隱隸雖霜霞鞠韓顆颶餵騁"],["c240","駿鮮鮫鮪鮭鴻鴿麋黏點黜黝黛鼾齋叢嚕嚮壙壘嬸彝懣戳擴擲擾攆擺擻擷斷曜朦檳檬櫃檻檸櫂檮檯歟歸殯瀉瀋濾瀆濺瀑瀏燻燼燾燸獷獵璧璿甕癖癘"],["c2a1","癒瞽瞿瞻瞼礎禮穡穢穠竄竅簫簧簪簞簣簡糧織繕繞繚繡繒繙罈翹翻職聶臍臏舊藏薩藍藐藉薰薺薹薦蟯蟬蟲蟠覆覲觴謨謹謬謫豐贅蹙蹣蹦蹤蹟蹕軀轉轍邇邃邈醫醬釐鎔鎊鎖鎢鎳鎮鎬鎰鎘鎚鎗闔闖闐闕離雜雙雛雞霤鞣鞦"],["c340","鞭韹額顏題顎顓颺餾餿餽餮馥騎髁鬃鬆魏魎魍鯊鯉鯽鯈鯀鵑鵝鵠黠鼕鼬儳嚥壞壟壢寵龐廬懲懷懶懵攀攏曠曝櫥櫝櫚櫓瀛瀟瀨瀚瀝瀕瀘爆爍牘犢獸"],["c3a1","獺璽瓊瓣疇疆癟癡矇礙禱穫穩簾簿簸簽簷籀繫繭繹繩繪羅繳羶羹羸臘藩藝藪藕藤藥藷蟻蠅蠍蟹蟾襠襟襖襞譁譜識證譚譎譏譆譙贈贊蹼蹲躇蹶蹬蹺蹴轔轎辭邊邋醱醮鏡鏑鏟鏃鏈鏜鏝鏖鏢鏍鏘鏤鏗鏨關隴難霪霧靡韜韻類"],["c440","願顛颼饅饉騖騙鬍鯨鯧鯖鯛鶉鵡鵲鵪鵬麒麗麓麴勸嚨嚷嚶嚴嚼壤孀孃孽寶巉懸懺攘攔攙曦朧櫬瀾瀰瀲爐獻瓏癢癥礦礪礬礫竇競籌籃籍糯糰辮繽繼"],["c4a1","纂罌耀臚艦藻藹蘑藺蘆蘋蘇蘊蠔蠕襤覺觸議譬警譯譟譫贏贍躉躁躅躂醴釋鐘鐃鏽闡霰飄饒饑馨騫騰騷騵鰓鰍鹹麵黨鼯齟齣齡儷儸囁囀囂夔屬巍懼懾攝攜斕曩櫻欄櫺殲灌爛犧瓖瓔癩矓籐纏續羼蘗蘭蘚蠣蠢蠡蠟襪襬覽譴"],["c540","護譽贓躊躍躋轟辯醺鐮鐳鐵鐺鐸鐲鐫闢霸霹露響顧顥饗驅驃驀騾髏魔魑鰭鰥鶯鶴鷂鶸麝黯鼙齜齦齧儼儻囈囊囉孿巔巒彎懿攤權歡灑灘玀瓤疊癮癬"],["c5a1","禳籠籟聾聽臟襲襯觼讀贖贗躑躓轡酈鑄鑑鑒霽霾韃韁顫饕驕驍髒鬚鱉鰱鰾鰻鷓鷗鼴齬齪龔囌巖戀攣攫攪曬欐瓚竊籤籣籥纓纖纔臢蘸蘿蠱變邐邏鑣鑠鑤靨顯饜驚驛驗髓體髑鱔鱗鱖鷥麟黴囑壩攬灞癱癲矗罐羈蠶蠹衢讓讒"],["c640","讖艷贛釀鑪靂靈靄韆顰驟鬢魘鱟鷹鷺鹼鹽鼇齷齲廳欖灣籬籮蠻觀躡釁鑲鑰顱饞髖鬣黌灤矚讚鑷韉驢驥纜讜躪釅鑽鑾鑼鱷鱸黷豔鑿鸚爨驪鬱鸛鸞籲"],["c940","乂乜凵匚厂万丌乇亍囗兀屮彳丏冇与丮亓仂仉仈冘勼卬厹圠夃夬尐巿旡殳毌气爿丱丼仨仜仩仡仝仚刌匜卌圢圣夗夯宁宄尒尻屴屳帄庀庂忉戉扐氕"],["c9a1","氶汃氿氻犮犰玊禸肊阞伎优伬仵伔仱伀价伈伝伂伅伢伓伄仴伒冱刓刉刐劦匢匟卍厊吇囡囟圮圪圴夼妀奼妅奻奾奷奿孖尕尥屼屺屻屾巟幵庄异弚彴忕忔忏扜扞扤扡扦扢扙扠扚扥旯旮朾朹朸朻机朿朼朳氘汆汒汜汏汊汔汋"],["ca40","汌灱牞犴犵玎甪癿穵网艸艼芀艽艿虍襾邙邗邘邛邔阢阤阠阣佖伻佢佉体佤伾佧佒佟佁佘伭伳伿佡冏冹刜刞刡劭劮匉卣卲厎厏吰吷吪呔呅吙吜吥吘"],["caa1","吽呏呁吨吤呇囮囧囥坁坅坌坉坋坒夆奀妦妘妠妗妎妢妐妏妧妡宎宒尨尪岍岏岈岋岉岒岊岆岓岕巠帊帎庋庉庌庈庍弅弝彸彶忒忑忐忭忨忮忳忡忤忣忺忯忷忻怀忴戺抃抌抎抏抔抇扱扻扺扰抁抈扷扽扲扴攷旰旴旳旲旵杅杇"],["cb40","杙杕杌杈杝杍杚杋毐氙氚汸汧汫沄沋沏汱汯汩沚汭沇沕沜汦汳汥汻沎灴灺牣犿犽狃狆狁犺狅玕玗玓玔玒町甹疔疕皁礽耴肕肙肐肒肜芐芏芅芎芑芓"],["cba1","芊芃芄豸迉辿邟邡邥邞邧邠阰阨阯阭丳侘佼侅佽侀侇佶佴侉侄佷佌侗佪侚佹侁佸侐侜侔侞侒侂侕佫佮冞冼冾刵刲刳剆刱劼匊匋匼厒厔咇呿咁咑咂咈呫呺呾呥呬呴呦咍呯呡呠咘呣呧呤囷囹坯坲坭坫坱坰坶垀坵坻坳坴坢"],["cc40","坨坽夌奅妵妺姏姎妲姌姁妶妼姃姖妱妽姀姈妴姇孢孥宓宕屄屇岮岤岠岵岯岨岬岟岣岭岢岪岧岝岥岶岰岦帗帔帙弨弢弣弤彔徂彾彽忞忥怭怦怙怲怋"],["cca1","怴怊怗怳怚怞怬怢怍怐怮怓怑怌怉怜戔戽抭抴拑抾抪抶拊抮抳抯抻抩抰抸攽斨斻昉旼昄昒昈旻昃昋昍昅旽昑昐曶朊枅杬枎枒杶杻枘枆构杴枍枌杺枟枑枙枃杽极杸杹枔欥殀歾毞氝沓泬泫泮泙沶泔沭泧沷泐泂沺泃泆泭泲"],["cd40","泒泝沴沊沝沀泞泀洰泍泇沰泹泏泩泑炔炘炅炓炆炄炑炖炂炚炃牪狖狋狘狉狜狒狔狚狌狑玤玡玭玦玢玠玬玝瓝瓨甿畀甾疌疘皯盳盱盰盵矸矼矹矻矺"],["cda1","矷祂礿秅穸穻竻籵糽耵肏肮肣肸肵肭舠芠苀芫芚芘芛芵芧芮芼芞芺芴芨芡芩苂芤苃芶芢虰虯虭虮豖迒迋迓迍迖迕迗邲邴邯邳邰阹阽阼阺陃俍俅俓侲俉俋俁俔俜俙侻侳俛俇俖侺俀侹俬剄剉勀勂匽卼厗厖厙厘咺咡咭咥哏"],["ce40","哃茍咷咮哖咶哅哆咠呰咼咢咾呲哞咰垵垞垟垤垌垗垝垛垔垘垏垙垥垚垕壴复奓姡姞姮娀姱姝姺姽姼姶姤姲姷姛姩姳姵姠姾姴姭宨屌峐峘峌峗峋峛"],["cea1","峞峚峉峇峊峖峓峔峏峈峆峎峟峸巹帡帢帣帠帤庰庤庢庛庣庥弇弮彖徆怷怹恔恲恞恅恓恇恉恛恌恀恂恟怤恄恘恦恮扂扃拏挍挋拵挎挃拫拹挏挌拸拶挀挓挔拺挕拻拰敁敃斪斿昶昡昲昵昜昦昢昳昫昺昝昴昹昮朏朐柁柲柈枺"],["cf40","柜枻柸柘柀枷柅柫柤柟枵柍枳柷柶柮柣柂枹柎柧柰枲柼柆柭柌枮柦柛柺柉柊柃柪柋欨殂殄殶毖毘毠氠氡洨洴洭洟洼洿洒洊泚洳洄洙洺洚洑洀洝浂"],["cfa1","洁洘洷洃洏浀洇洠洬洈洢洉洐炷炟炾炱炰炡炴炵炩牁牉牊牬牰牳牮狊狤狨狫狟狪狦狣玅珌珂珈珅玹玶玵玴珫玿珇玾珃珆玸珋瓬瓮甮畇畈疧疪癹盄眈眃眄眅眊盷盻盺矧矨砆砑砒砅砐砏砎砉砃砓祊祌祋祅祄秕种秏秖秎窀"],["d040","穾竑笀笁籺籸籹籿粀粁紃紈紁罘羑羍羾耇耎耏耔耷胘胇胠胑胈胂胐胅胣胙胜胊胕胉胏胗胦胍臿舡芔苙苾苹茇苨茀苕茺苫苖苴苬苡苲苵茌苻苶苰苪"],["d0a1","苤苠苺苳苭虷虴虼虳衁衎衧衪衩觓訄訇赲迣迡迮迠郱邽邿郕郅邾郇郋郈釔釓陔陏陑陓陊陎倞倅倇倓倢倰倛俵俴倳倷倬俶俷倗倜倠倧倵倯倱倎党冔冓凊凄凅凈凎剡剚剒剞剟剕剢勍匎厞唦哢唗唒哧哳哤唚哿唄唈哫唑唅哱"],["d140","唊哻哷哸哠唎唃唋圁圂埌堲埕埒垺埆垽垼垸垶垿埇埐垹埁夎奊娙娖娭娮娕娏娗娊娞娳孬宧宭宬尃屖屔峬峿峮峱峷崀峹帩帨庨庮庪庬弳弰彧恝恚恧"],["d1a1","恁悢悈悀悒悁悝悃悕悛悗悇悜悎戙扆拲挐捖挬捄捅挶捃揤挹捋捊挼挩捁挴捘捔捙挭捇挳捚捑挸捗捀捈敊敆旆旃旄旂晊晟晇晑朒朓栟栚桉栲栳栻桋桏栖栱栜栵栫栭栯桎桄栴栝栒栔栦栨栮桍栺栥栠欬欯欭欱欴歭肂殈毦毤"],["d240","毨毣毢毧氥浺浣浤浶洍浡涒浘浢浭浯涑涍淯浿涆浞浧浠涗浰浼浟涂涘洯浨涋浾涀涄洖涃浻浽浵涐烜烓烑烝烋缹烢烗烒烞烠烔烍烅烆烇烚烎烡牂牸"],["d2a1","牷牶猀狺狴狾狶狳狻猁珓珙珥珖玼珧珣珩珜珒珛珔珝珚珗珘珨瓞瓟瓴瓵甡畛畟疰痁疻痄痀疿疶疺皊盉眝眛眐眓眒眣眑眕眙眚眢眧砣砬砢砵砯砨砮砫砡砩砳砪砱祔祛祏祜祓祒祑秫秬秠秮秭秪秜秞秝窆窉窅窋窌窊窇竘笐"],["d340","笄笓笅笏笈笊笎笉笒粄粑粊粌粈粍粅紞紝紑紎紘紖紓紟紒紏紌罜罡罞罠罝罛羖羒翃翂翀耖耾耹胺胲胹胵脁胻脀舁舯舥茳茭荄茙荑茥荖茿荁茦茜茢"],["d3a1","荂荎茛茪茈茼荍茖茤茠茷茯茩荇荅荌荓茞茬荋茧荈虓虒蚢蚨蚖蚍蚑蚞蚇蚗蚆蚋蚚蚅蚥蚙蚡蚧蚕蚘蚎蚝蚐蚔衃衄衭衵衶衲袀衱衿衯袃衾衴衼訒豇豗豻貤貣赶赸趵趷趶軑軓迾迵适迿迻逄迼迶郖郠郙郚郣郟郥郘郛郗郜郤酐"],["d440","酎酏釕釢釚陜陟隼飣髟鬯乿偰偪偡偞偠偓偋偝偲偈偍偁偛偊偢倕偅偟偩偫偣偤偆偀偮偳偗偑凐剫剭剬剮勖勓匭厜啵啶唼啍啐唴唪啑啢唶唵唰啒啅"],["d4a1","唌唲啥啎唹啈唭唻啀啋圊圇埻堔埢埶埜埴堀埭埽堈埸堋埳埏堇埮埣埲埥埬埡堎埼堐埧堁堌埱埩埰堍堄奜婠婘婕婧婞娸娵婭婐婟婥婬婓婤婗婃婝婒婄婛婈媎娾婍娹婌婰婩婇婑婖婂婜孲孮寁寀屙崞崋崝崚崠崌崨崍崦崥崏"],["d540","崰崒崣崟崮帾帴庱庴庹庲庳弶弸徛徖徟悊悐悆悾悰悺惓惔惏惤惙惝惈悱惛悷惊悿惃惍惀挲捥掊掂捽掽掞掭掝掗掫掎捯掇掐据掯捵掜捭掮捼掤挻掟"],["d5a1","捸掅掁掑掍捰敓旍晥晡晛晙晜晢朘桹梇梐梜桭桮梮梫楖桯梣梬梩桵桴梲梏桷梒桼桫桲梪梀桱桾梛梖梋梠梉梤桸桻梑梌梊桽欶欳欷欸殑殏殍殎殌氪淀涫涴涳湴涬淩淢涷淶淔渀淈淠淟淖涾淥淜淝淛淴淊涽淭淰涺淕淂淏淉"],["d640","淐淲淓淽淗淍淣涻烺焍烷焗烴焌烰焄烳焐烼烿焆焓焀烸烶焋焂焎牾牻牼牿猝猗猇猑猘猊猈狿猏猞玈珶珸珵琄琁珽琇琀珺珼珿琌琋珴琈畤畣痎痒痏"],["d6a1","痋痌痑痐皏皉盓眹眯眭眱眲眴眳眽眥眻眵硈硒硉硍硊硌砦硅硐祤祧祩祪祣祫祡离秺秸秶秷窏窔窐笵筇笴笥笰笢笤笳笘笪笝笱笫笭笯笲笸笚笣粔粘粖粣紵紽紸紶紺絅紬紩絁絇紾紿絊紻紨罣羕羜羝羛翊翋翍翐翑翇翏翉耟"],["d740","耞耛聇聃聈脘脥脙脛脭脟脬脞脡脕脧脝脢舑舸舳舺舴舲艴莐莣莨莍荺荳莤荴莏莁莕莙荵莔莩荽莃莌莝莛莪莋荾莥莯莈莗莰荿莦莇莮荶莚虙虖蚿蚷"],["d7a1","蛂蛁蛅蚺蚰蛈蚹蚳蚸蛌蚴蚻蚼蛃蚽蚾衒袉袕袨袢袪袚袑袡袟袘袧袙袛袗袤袬袌袓袎覂觖觙觕訰訧訬訞谹谻豜豝豽貥赽赻赹趼跂趹趿跁軘軞軝軜軗軠軡逤逋逑逜逌逡郯郪郰郴郲郳郔郫郬郩酖酘酚酓酕釬釴釱釳釸釤釹釪"],["d840","釫釷釨釮镺閆閈陼陭陫陱陯隿靪頄飥馗傛傕傔傞傋傣傃傌傎傝偨傜傒傂傇兟凔匒匑厤厧喑喨喥喭啷噅喢喓喈喏喵喁喣喒喤啽喌喦啿喕喡喎圌堩堷"],["d8a1","堙堞堧堣堨埵塈堥堜堛堳堿堶堮堹堸堭堬堻奡媯媔媟婺媢媞婸媦婼媥媬媕媮娷媄媊媗媃媋媩婻婽媌媜媏媓媝寪寍寋寔寑寊寎尌尰崷嵃嵫嵁嵋崿崵嵑嵎嵕崳崺嵒崽崱嵙嵂崹嵉崸崼崲崶嵀嵅幄幁彘徦徥徫惉悹惌惢惎惄愔"],["d940","惲愊愖愅惵愓惸惼惾惁愃愘愝愐惿愄愋扊掔掱掰揎揥揨揯揃撝揳揊揠揶揕揲揵摡揟掾揝揜揄揘揓揂揇揌揋揈揰揗揙攲敧敪敤敜敨敥斌斝斞斮旐旒"],["d9a1","晼晬晻暀晱晹晪晲朁椌棓椄棜椪棬棪棱椏棖棷棫棤棶椓椐棳棡椇棌椈楰梴椑棯棆椔棸棐棽棼棨椋椊椗棎棈棝棞棦棴棑椆棔棩椕椥棇欹欻欿欼殔殗殙殕殽毰毲毳氰淼湆湇渟湉溈渼渽湅湢渫渿湁湝湳渜渳湋湀湑渻渃渮湞"],["da40","湨湜湡渱渨湠湱湫渹渢渰湓湥渧湸湤湷湕湹湒湦渵渶湚焠焞焯烻焮焱焣焥焢焲焟焨焺焛牋牚犈犉犆犅犋猒猋猰猢猱猳猧猲猭猦猣猵猌琮琬琰琫琖"],["daa1","琚琡琭琱琤琣琝琩琠琲瓻甯畯畬痧痚痡痦痝痟痤痗皕皒盚睆睇睄睍睅睊睎睋睌矞矬硠硤硥硜硭硱硪确硰硩硨硞硢祴祳祲祰稂稊稃稌稄窙竦竤筊笻筄筈筌筎筀筘筅粢粞粨粡絘絯絣絓絖絧絪絏絭絜絫絒絔絩絑絟絎缾缿罥"],["db40","罦羢羠羡翗聑聏聐胾胔腃腊腒腏腇脽腍脺臦臮臷臸臹舄舼舽舿艵茻菏菹萣菀菨萒菧菤菼菶萐菆菈菫菣莿萁菝菥菘菿菡菋菎菖菵菉萉萏菞萑萆菂菳"],["dba1","菕菺菇菑菪萓菃菬菮菄菻菗菢萛菛菾蛘蛢蛦蛓蛣蛚蛪蛝蛫蛜蛬蛩蛗蛨蛑衈衖衕袺裗袹袸裀袾袶袼袷袽袲褁裉覕覘覗觝觚觛詎詍訹詙詀詗詘詄詅詒詈詑詊詌詏豟貁貀貺貾貰貹貵趄趀趉跘跓跍跇跖跜跏跕跙跈跗跅軯軷軺"],["dc40","軹軦軮軥軵軧軨軶軫軱軬軴軩逭逴逯鄆鄬鄄郿郼鄈郹郻鄁鄀鄇鄅鄃酡酤酟酢酠鈁鈊鈥鈃鈚鈦鈏鈌鈀鈒釿釽鈆鈄鈧鈂鈜鈤鈙鈗鈅鈖镻閍閌閐隇陾隈"],["dca1","隉隃隀雂雈雃雱雰靬靰靮頇颩飫鳦黹亃亄亶傽傿僆傮僄僊傴僈僂傰僁傺傱僋僉傶傸凗剺剸剻剼嗃嗛嗌嗐嗋嗊嗝嗀嗔嗄嗩喿嗒喍嗏嗕嗢嗖嗈嗲嗍嗙嗂圔塓塨塤塏塍塉塯塕塎塝塙塥塛堽塣塱壼嫇嫄嫋媺媸媱媵媰媿嫈媻嫆"],["dd40","媷嫀嫊媴媶嫍媹媐寖寘寙尟尳嵱嵣嵊嵥嵲嵬嵞嵨嵧嵢巰幏幎幊幍幋廅廌廆廋廇彀徯徭惷慉慊愫慅愶愲愮慆愯慏愩慀戠酨戣戥戤揅揱揫搐搒搉搠搤"],["dda1","搳摃搟搕搘搹搷搢搣搌搦搰搨摁搵搯搊搚摀搥搧搋揧搛搮搡搎敯斒旓暆暌暕暐暋暊暙暔晸朠楦楟椸楎楢楱椿楅楪椹楂楗楙楺楈楉椵楬椳椽楥棰楸椴楩楀楯楄楶楘楁楴楌椻楋椷楜楏楑椲楒椯楻椼歆歅歃歂歈歁殛嗀毻毼"],["de40","毹毷毸溛滖滈溏滀溟溓溔溠溱溹滆滒溽滁溞滉溷溰滍溦滏溲溾滃滜滘溙溒溎溍溤溡溿溳滐滊溗溮溣煇煔煒煣煠煁煝煢煲煸煪煡煂煘煃煋煰煟煐煓"],["dea1","煄煍煚牏犍犌犑犐犎猼獂猻猺獀獊獉瑄瑊瑋瑒瑑瑗瑀瑏瑐瑎瑂瑆瑍瑔瓡瓿瓾瓽甝畹畷榃痯瘏瘃痷痾痼痹痸瘐痻痶痭痵痽皙皵盝睕睟睠睒睖睚睩睧睔睙睭矠碇碚碔碏碄碕碅碆碡碃硹碙碀碖硻祼禂祽祹稑稘稙稒稗稕稢稓"],["df40","稛稐窣窢窞竫筦筤筭筴筩筲筥筳筱筰筡筸筶筣粲粴粯綈綆綀綍絿綅絺綎絻綃絼綌綔綄絽綒罭罫罧罨罬羦羥羧翛翜耡腤腠腷腜腩腛腢腲朡腞腶腧腯"],["dfa1","腄腡舝艉艄艀艂艅蓱萿葖葶葹蒏蒍葥葑葀蒆葧萰葍葽葚葙葴葳葝蔇葞萷萺萴葺葃葸萲葅萩菙葋萯葂萭葟葰萹葎葌葒葯蓅蒎萻葇萶萳葨葾葄萫葠葔葮葐蜋蜄蛷蜌蛺蛖蛵蝍蛸蜎蜉蜁蛶蜍蜅裖裋裍裎裞裛裚裌裐覅覛觟觥觤"],["e040","觡觠觢觜触詶誆詿詡訿詷誂誄詵誃誁詴詺谼豋豊豥豤豦貆貄貅賌赨赩趑趌趎趏趍趓趔趐趒跰跠跬跱跮跐跩跣跢跧跲跫跴輆軿輁輀輅輇輈輂輋遒逿"],["e0a1","遄遉逽鄐鄍鄏鄑鄖鄔鄋鄎酮酯鉈鉒鈰鈺鉦鈳鉥鉞銃鈮鉊鉆鉭鉬鉏鉠鉧鉯鈶鉡鉰鈱鉔鉣鉐鉲鉎鉓鉌鉖鈲閟閜閞閛隒隓隑隗雎雺雽雸雵靳靷靸靲頏頍頎颬飶飹馯馲馰馵骭骫魛鳪鳭鳧麀黽僦僔僗僨僳僛僪僝僤僓僬僰僯僣僠"],["e140","凘劀劁勩勫匰厬嘧嘕嘌嘒嗼嘏嘜嘁嘓嘂嗺嘝嘄嗿嗹墉塼墐墘墆墁塿塴墋塺墇墑墎塶墂墈塻墔墏壾奫嫜嫮嫥嫕嫪嫚嫭嫫嫳嫢嫠嫛嫬嫞嫝嫙嫨嫟孷寠"],["e1a1","寣屣嶂嶀嵽嶆嵺嶁嵷嶊嶉嶈嵾嵼嶍嵹嵿幘幙幓廘廑廗廎廜廕廙廒廔彄彃彯徶愬愨慁慞慱慳慒慓慲慬憀慴慔慺慛慥愻慪慡慖戩戧戫搫摍摛摝摴摶摲摳摽摵摦撦摎撂摞摜摋摓摠摐摿搿摬摫摙摥摷敳斠暡暠暟朅朄朢榱榶槉"],["e240","榠槎榖榰榬榼榑榙榎榧榍榩榾榯榿槄榽榤槔榹槊榚槏榳榓榪榡榞槙榗榐槂榵榥槆歊歍歋殞殟殠毃毄毾滎滵滱漃漥滸漷滻漮漉潎漙漚漧漘漻漒滭漊"],["e2a1","漶潳滹滮漭潀漰漼漵滫漇漎潃漅滽滶漹漜滼漺漟漍漞漈漡熇熐熉熀熅熂熏煻熆熁熗牄牓犗犕犓獃獍獑獌瑢瑳瑱瑵瑲瑧瑮甀甂甃畽疐瘖瘈瘌瘕瘑瘊瘔皸瞁睼瞅瞂睮瞀睯睾瞃碲碪碴碭碨硾碫碞碥碠碬碢碤禘禊禋禖禕禔禓"],["e340","禗禈禒禐稫穊稰稯稨稦窨窫窬竮箈箜箊箑箐箖箍箌箛箎箅箘劄箙箤箂粻粿粼粺綧綷緂綣綪緁緀緅綝緎緄緆緋緌綯綹綖綼綟綦綮綩綡緉罳翢翣翥翞"],["e3a1","耤聝聜膉膆膃膇膍膌膋舕蒗蒤蒡蒟蒺蓎蓂蒬蒮蒫蒹蒴蓁蓍蒪蒚蒱蓐蒝蒧蒻蒢蒔蓇蓌蒛蒩蒯蒨蓖蒘蒶蓏蒠蓗蓔蓒蓛蒰蒑虡蜳蜣蜨蝫蝀蜮蜞蜡蜙蜛蝃蜬蝁蜾蝆蜠蜲蜪蜭蜼蜒蜺蜱蜵蝂蜦蜧蜸蜤蜚蜰蜑裷裧裱裲裺裾裮裼裶裻"],["e440","裰裬裫覝覡覟覞觩觫觨誫誙誋誒誏誖谽豨豩賕賏賗趖踉踂跿踍跽踊踃踇踆踅跾踀踄輐輑輎輍鄣鄜鄠鄢鄟鄝鄚鄤鄡鄛酺酲酹酳銥銤鉶銛鉺銠銔銪銍"],["e4a1","銦銚銫鉹銗鉿銣鋮銎銂銕銢鉽銈銡銊銆銌銙銧鉾銇銩銝銋鈭隞隡雿靘靽靺靾鞃鞀鞂靻鞄鞁靿韎韍頖颭颮餂餀餇馝馜駃馹馻馺駂馽駇骱髣髧鬾鬿魠魡魟鳱鳲鳵麧僿儃儰僸儆儇僶僾儋儌僽儊劋劌勱勯噈噂噌嘵噁噊噉噆噘"],["e540","噚噀嘳嘽嘬嘾嘸嘪嘺圚墫墝墱墠墣墯墬墥墡壿嫿嫴嫽嫷嫶嬃嫸嬂嫹嬁嬇嬅嬏屧嶙嶗嶟嶒嶢嶓嶕嶠嶜嶡嶚嶞幩幝幠幜緳廛廞廡彉徲憋憃慹憱憰憢憉"],["e5a1","憛憓憯憭憟憒憪憡憍慦憳戭摮摰撖撠撅撗撜撏撋撊撌撣撟摨撱撘敶敺敹敻斲斳暵暰暩暲暷暪暯樀樆樗槥槸樕槱槤樠槿槬槢樛樝槾樧槲槮樔槷槧橀樈槦槻樍槼槫樉樄樘樥樏槶樦樇槴樖歑殥殣殢殦氁氀毿氂潁漦潾澇濆澒"],["e640","澍澉澌潢潏澅潚澖潶潬澂潕潲潒潐潗澔澓潝漀潡潫潽潧澐潓澋潩潿澕潣潷潪潻熲熯熛熰熠熚熩熵熝熥熞熤熡熪熜熧熳犘犚獘獒獞獟獠獝獛獡獚獙"],["e6a1","獢璇璉璊璆璁瑽璅璈瑼瑹甈甇畾瘥瘞瘙瘝瘜瘣瘚瘨瘛皜皝皞皛瞍瞏瞉瞈磍碻磏磌磑磎磔磈磃磄磉禚禡禠禜禢禛歶稹窲窴窳箷篋箾箬篎箯箹篊箵糅糈糌糋緷緛緪緧緗緡縃緺緦緶緱緰緮緟罶羬羰羭翭翫翪翬翦翨聤聧膣膟"],["e740","膞膕膢膙膗舖艏艓艒艐艎艑蔤蔻蔏蔀蔩蔎蔉蔍蔟蔊蔧蔜蓻蔫蓺蔈蔌蓴蔪蓲蔕蓷蓫蓳蓼蔒蓪蓩蔖蓾蔨蔝蔮蔂蓽蔞蓶蔱蔦蓧蓨蓰蓯蓹蔘蔠蔰蔋蔙蔯虢"],["e7a1","蝖蝣蝤蝷蟡蝳蝘蝔蝛蝒蝡蝚蝑蝞蝭蝪蝐蝎蝟蝝蝯蝬蝺蝮蝜蝥蝏蝻蝵蝢蝧蝩衚褅褌褔褋褗褘褙褆褖褑褎褉覢覤覣觭觰觬諏諆誸諓諑諔諕誻諗誾諀諅諘諃誺誽諙谾豍貏賥賟賙賨賚賝賧趠趜趡趛踠踣踥踤踮踕踛踖踑踙踦踧"],["e840","踔踒踘踓踜踗踚輬輤輘輚輠輣輖輗遳遰遯遧遫鄯鄫鄩鄪鄲鄦鄮醅醆醊醁醂醄醀鋐鋃鋄鋀鋙銶鋏鋱鋟鋘鋩鋗鋝鋌鋯鋂鋨鋊鋈鋎鋦鋍鋕鋉鋠鋞鋧鋑鋓"],["e8a1","銵鋡鋆銴镼閬閫閮閰隤隢雓霅霈霂靚鞊鞎鞈韐韏頞頝頦頩頨頠頛頧颲餈飺餑餔餖餗餕駜駍駏駓駔駎駉駖駘駋駗駌骳髬髫髳髲髱魆魃魧魴魱魦魶魵魰魨魤魬鳼鳺鳽鳿鳷鴇鴀鳹鳻鴈鴅鴄麃黓鼏鼐儜儓儗儚儑凞匴叡噰噠噮"],["e940","噳噦噣噭噲噞噷圜圛壈墽壉墿墺壂墼壆嬗嬙嬛嬡嬔嬓嬐嬖嬨嬚嬠嬞寯嶬嶱嶩嶧嶵嶰嶮嶪嶨嶲嶭嶯嶴幧幨幦幯廩廧廦廨廥彋徼憝憨憖懅憴懆懁懌憺"],["e9a1","憿憸憌擗擖擐擏擉撽撉擃擛擳擙攳敿敼斢曈暾曀曊曋曏暽暻暺曌朣樴橦橉橧樲橨樾橝橭橶橛橑樨橚樻樿橁橪橤橐橏橔橯橩橠樼橞橖橕橍橎橆歕歔歖殧殪殫毈毇氄氃氆澭濋澣濇澼濎濈潞濄澽澞濊澨瀄澥澮澺澬澪濏澿澸"],["ea40","澢濉澫濍澯澲澰燅燂熿熸燖燀燁燋燔燊燇燏熽燘熼燆燚燛犝犞獩獦獧獬獥獫獪瑿璚璠璔璒璕璡甋疀瘯瘭瘱瘽瘳瘼瘵瘲瘰皻盦瞚瞝瞡瞜瞛瞢瞣瞕瞙"],["eaa1","瞗磝磩磥磪磞磣磛磡磢磭磟磠禤穄穈穇窶窸窵窱窷篞篣篧篝篕篥篚篨篹篔篪篢篜篫篘篟糒糔糗糐糑縒縡縗縌縟縠縓縎縜縕縚縢縋縏縖縍縔縥縤罃罻罼罺羱翯耪耩聬膱膦膮膹膵膫膰膬膴膲膷膧臲艕艖艗蕖蕅蕫蕍蕓蕡蕘"],["eb40","蕀蕆蕤蕁蕢蕄蕑蕇蕣蔾蕛蕱蕎蕮蕵蕕蕧蕠薌蕦蕝蕔蕥蕬虣虥虤螛螏螗螓螒螈螁螖螘蝹螇螣螅螐螑螝螄螔螜螚螉褞褦褰褭褮褧褱褢褩褣褯褬褟觱諠"],["eba1","諢諲諴諵諝謔諤諟諰諈諞諡諨諿諯諻貑貒貐賵賮賱賰賳赬赮趥趧踳踾踸蹀蹅踶踼踽蹁踰踿躽輶輮輵輲輹輷輴遶遹遻邆郺鄳鄵鄶醓醐醑醍醏錧錞錈錟錆錏鍺錸錼錛錣錒錁鍆錭錎錍鋋錝鋺錥錓鋹鋷錴錂錤鋿錩錹錵錪錔錌"],["ec40","錋鋾錉錀鋻錖閼闍閾閹閺閶閿閵閽隩雔霋霒霐鞙鞗鞔韰韸頵頯頲餤餟餧餩馞駮駬駥駤駰駣駪駩駧骹骿骴骻髶髺髹髷鬳鮀鮅鮇魼魾魻鮂鮓鮒鮐魺鮕"],["eca1","魽鮈鴥鴗鴠鴞鴔鴩鴝鴘鴢鴐鴙鴟麈麆麇麮麭黕黖黺鼒鼽儦儥儢儤儠儩勴嚓嚌嚍嚆嚄嚃噾嚂噿嚁壖壔壏壒嬭嬥嬲嬣嬬嬧嬦嬯嬮孻寱寲嶷幬幪徾徻懃憵憼懧懠懥懤懨懞擯擩擣擫擤擨斁斀斶旚曒檍檖檁檥檉檟檛檡檞檇檓檎"],["ed40","檕檃檨檤檑橿檦檚檅檌檒歛殭氉濌澩濴濔濣濜濭濧濦濞濲濝濢濨燡燱燨燲燤燰燢獳獮獯璗璲璫璐璪璭璱璥璯甐甑甒甏疄癃癈癉癇皤盩瞵瞫瞲瞷瞶"],["eda1","瞴瞱瞨矰磳磽礂磻磼磲礅磹磾礄禫禨穜穛穖穘穔穚窾竀竁簅簏篲簀篿篻簎篴簋篳簂簉簃簁篸篽簆篰篱簐簊糨縭縼繂縳顈縸縪繉繀繇縩繌縰縻縶繄縺罅罿罾罽翴翲耬膻臄臌臊臅臇膼臩艛艚艜薃薀薏薧薕薠薋薣蕻薤薚薞"],["ee40","蕷蕼薉薡蕺蕸蕗薎薖薆薍薙薝薁薢薂薈薅蕹蕶薘薐薟虨螾螪螭蟅螰螬螹螵螼螮蟉蟃蟂蟌螷螯蟄蟊螴螶螿螸螽蟞螲褵褳褼褾襁襒褷襂覭覯覮觲觳謞"],["eea1","謘謖謑謅謋謢謏謒謕謇謍謈謆謜謓謚豏豰豲豱豯貕貔賹赯蹎蹍蹓蹐蹌蹇轃轀邅遾鄸醚醢醛醙醟醡醝醠鎡鎃鎯鍤鍖鍇鍼鍘鍜鍶鍉鍐鍑鍠鍭鎏鍌鍪鍹鍗鍕鍒鍏鍱鍷鍻鍡鍞鍣鍧鎀鍎鍙闇闀闉闃闅閷隮隰隬霠霟霘霝霙鞚鞡鞜"],["ef40","鞞鞝韕韔韱顁顄顊顉顅顃餥餫餬餪餳餲餯餭餱餰馘馣馡騂駺駴駷駹駸駶駻駽駾駼騃骾髾髽鬁髼魈鮚鮨鮞鮛鮦鮡鮥鮤鮆鮢鮠鮯鴳鵁鵧鴶鴮鴯鴱鴸鴰"],["efa1","鵅鵂鵃鴾鴷鵀鴽翵鴭麊麉麍麰黈黚黻黿鼤鼣鼢齔龠儱儭儮嚘嚜嚗嚚嚝嚙奰嬼屩屪巀幭幮懘懟懭懮懱懪懰懫懖懩擿攄擽擸攁攃擼斔旛曚曛曘櫅檹檽櫡櫆檺檶檷櫇檴檭歞毉氋瀇瀌瀍瀁瀅瀔瀎濿瀀濻瀦濼濷瀊爁燿燹爃燽獶"],["f040","璸瓀璵瓁璾璶璻瓂甔甓癜癤癙癐癓癗癚皦皽盬矂瞺磿礌礓礔礉礐礒礑禭禬穟簜簩簙簠簟簭簝簦簨簢簥簰繜繐繖繣繘繢繟繑繠繗繓羵羳翷翸聵臑臒"],["f0a1","臐艟艞薴藆藀藃藂薳薵薽藇藄薿藋藎藈藅薱薶藒蘤薸薷薾虩蟧蟦蟢蟛蟫蟪蟥蟟蟳蟤蟔蟜蟓蟭蟘蟣螤蟗蟙蠁蟴蟨蟝襓襋襏襌襆襐襑襉謪謧謣謳謰謵譇謯謼謾謱謥謷謦謶謮謤謻謽謺豂豵貙貘貗賾贄贂贀蹜蹢蹠蹗蹖蹞蹥蹧"],["f140","蹛蹚蹡蹝蹩蹔轆轇轈轋鄨鄺鄻鄾醨醥醧醯醪鎵鎌鎒鎷鎛鎝鎉鎧鎎鎪鎞鎦鎕鎈鎙鎟鎍鎱鎑鎲鎤鎨鎴鎣鎥闒闓闑隳雗雚巂雟雘雝霣霢霥鞬鞮鞨鞫鞤鞪"],["f1a1","鞢鞥韗韙韖韘韺顐顑顒颸饁餼餺騏騋騉騍騄騑騊騅騇騆髀髜鬈鬄鬅鬩鬵魊魌魋鯇鯆鯃鮿鯁鮵鮸鯓鮶鯄鮹鮽鵜鵓鵏鵊鵛鵋鵙鵖鵌鵗鵒鵔鵟鵘鵚麎麌黟鼁鼀鼖鼥鼫鼪鼩鼨齌齕儴儵劖勷厴嚫嚭嚦嚧嚪嚬壚壝壛夒嬽嬾嬿巃幰"],["f240","徿懻攇攐攍攉攌攎斄旞旝曞櫧櫠櫌櫑櫙櫋櫟櫜櫐櫫櫏櫍櫞歠殰氌瀙瀧瀠瀖瀫瀡瀢瀣瀩瀗瀤瀜瀪爌爊爇爂爅犥犦犤犣犡瓋瓅璷瓃甖癠矉矊矄矱礝礛"],["f2a1","礡礜礗礞禰穧穨簳簼簹簬簻糬糪繶繵繸繰繷繯繺繲繴繨罋罊羃羆羷翽翾聸臗臕艤艡艣藫藱藭藙藡藨藚藗藬藲藸藘藟藣藜藑藰藦藯藞藢蠀蟺蠃蟶蟷蠉蠌蠋蠆蟼蠈蟿蠊蠂襢襚襛襗襡襜襘襝襙覈覷覶觶譐譈譊譀譓譖譔譋譕"],["f340","譑譂譒譗豃豷豶貚贆贇贉趬趪趭趫蹭蹸蹳蹪蹯蹻軂轒轑轏轐轓辴酀鄿醰醭鏞鏇鏏鏂鏚鏐鏹鏬鏌鏙鎩鏦鏊鏔鏮鏣鏕鏄鏎鏀鏒鏧镽闚闛雡霩霫霬霨霦"],["f3a1","鞳鞷鞶韝韞韟顜顙顝顗颿颽颻颾饈饇饃馦馧騚騕騥騝騤騛騢騠騧騣騞騜騔髂鬋鬊鬎鬌鬷鯪鯫鯠鯞鯤鯦鯢鯰鯔鯗鯬鯜鯙鯥鯕鯡鯚鵷鶁鶊鶄鶈鵱鶀鵸鶆鶋鶌鵽鵫鵴鵵鵰鵩鶅鵳鵻鶂鵯鵹鵿鶇鵨麔麑黀黼鼭齀齁齍齖齗齘匷嚲"],["f440","嚵嚳壣孅巆巇廮廯忀忁懹攗攖攕攓旟曨曣曤櫳櫰櫪櫨櫹櫱櫮櫯瀼瀵瀯瀷瀴瀱灂瀸瀿瀺瀹灀瀻瀳灁爓爔犨獽獼璺皫皪皾盭矌矎矏矍矲礥礣礧礨礤礩"],["f4a1","禲穮穬穭竷籉籈籊籇籅糮繻繾纁纀羺翿聹臛臙舋艨艩蘢藿蘁藾蘛蘀藶蘄蘉蘅蘌藽蠙蠐蠑蠗蠓蠖襣襦覹觷譠譪譝譨譣譥譧譭趮躆躈躄轙轖轗轕轘轚邍酃酁醷醵醲醳鐋鐓鏻鐠鐏鐔鏾鐕鐐鐨鐙鐍鏵鐀鏷鐇鐎鐖鐒鏺鐉鏸鐊鏿"],["f540","鏼鐌鏶鐑鐆闞闠闟霮霯鞹鞻韽韾顠顢顣顟飁飂饐饎饙饌饋饓騲騴騱騬騪騶騩騮騸騭髇髊髆鬐鬒鬑鰋鰈鯷鰅鰒鯸鱀鰇鰎鰆鰗鰔鰉鶟鶙鶤鶝鶒鶘鶐鶛"],["f5a1","鶠鶔鶜鶪鶗鶡鶚鶢鶨鶞鶣鶿鶩鶖鶦鶧麙麛麚黥黤黧黦鼰鼮齛齠齞齝齙龑儺儹劘劗囃嚽嚾孈孇巋巏廱懽攛欂櫼欃櫸欀灃灄灊灈灉灅灆爝爚爙獾甗癪矐礭礱礯籔籓糲纊纇纈纋纆纍罍羻耰臝蘘蘪蘦蘟蘣蘜蘙蘧蘮蘡蘠蘩蘞蘥"],["f640","蠩蠝蠛蠠蠤蠜蠫衊襭襩襮襫觺譹譸譅譺譻贐贔趯躎躌轞轛轝酆酄酅醹鐿鐻鐶鐩鐽鐼鐰鐹鐪鐷鐬鑀鐱闥闤闣霵霺鞿韡顤飉飆飀饘饖騹騽驆驄驂驁騺"],["f6a1","騿髍鬕鬗鬘鬖鬺魒鰫鰝鰜鰬鰣鰨鰩鰤鰡鶷鶶鶼鷁鷇鷊鷏鶾鷅鷃鶻鶵鷎鶹鶺鶬鷈鶱鶭鷌鶳鷍鶲鹺麜黫黮黭鼛鼘鼚鼱齎齥齤龒亹囆囅囋奱孋孌巕巑廲攡攠攦攢欋欈欉氍灕灖灗灒爞爟犩獿瓘瓕瓙瓗癭皭礵禴穰穱籗籜籙籛籚"],["f740","糴糱纑罏羇臞艫蘴蘵蘳蘬蘲蘶蠬蠨蠦蠪蠥襱覿覾觻譾讄讂讆讅譿贕躕躔躚躒躐躖躗轠轢酇鑌鑐鑊鑋鑏鑇鑅鑈鑉鑆霿韣顪顩飋饔饛驎驓驔驌驏驈驊"],["f7a1","驉驒驐髐鬙鬫鬻魖魕鱆鱈鰿鱄鰹鰳鱁鰼鰷鰴鰲鰽鰶鷛鷒鷞鷚鷋鷐鷜鷑鷟鷩鷙鷘鷖鷵鷕鷝麶黰鼵鼳鼲齂齫龕龢儽劙壨壧奲孍巘蠯彏戁戃戄攩攥斖曫欑欒欏毊灛灚爢玂玁玃癰矔籧籦纕艬蘺虀蘹蘼蘱蘻蘾蠰蠲蠮蠳襶襴襳觾"],["f840","讌讎讋讈豅贙躘轤轣醼鑢鑕鑝鑗鑞韄韅頀驖驙鬞鬟鬠鱒鱘鱐鱊鱍鱋鱕鱙鱌鱎鷻鷷鷯鷣鷫鷸鷤鷶鷡鷮鷦鷲鷰鷢鷬鷴鷳鷨鷭黂黐黲黳鼆鼜鼸鼷鼶齃齏"],["f8a1","齱齰齮齯囓囍孎屭攭曭曮欓灟灡灝灠爣瓛瓥矕礸禷禶籪纗羉艭虃蠸蠷蠵衋讔讕躞躟躠躝醾醽釂鑫鑨鑩雥靆靃靇韇韥驞髕魙鱣鱧鱦鱢鱞鱠鸂鷾鸇鸃鸆鸅鸀鸁鸉鷿鷽鸄麠鼞齆齴齵齶囔攮斸欘欙欗欚灢爦犪矘矙礹籩籫糶纚"],["f940","纘纛纙臠臡虆虇虈襹襺襼襻觿讘讙躥躤躣鑮鑭鑯鑱鑳靉顲饟鱨鱮鱭鸋鸍鸐鸏鸒鸑麡黵鼉齇齸齻齺齹圞灦籯蠼趲躦釃鑴鑸鑶鑵驠鱴鱳鱱鱵鸔鸓黶鼊"],["f9a1","龤灨灥糷虪蠾蠽蠿讞貜躩軉靋顳顴飌饡馫驤驦驧鬤鸕鸗齈戇欞爧虌躨钂钀钁驩驨鬮鸙爩虋讟钃鱹麷癵驫鱺鸝灩灪麤齾齉龘碁銹裏墻恒粧嫺╔╦╗╠╬╣╚╩╝╒╤╕╞╪╡╘╧╛╓╥╖╟╫╢╙╨╜║═╭╮╰╯▓"]]
-
-/***/ }),
-/* 396 */
-/***/ (function(module, exports) {
-
-module.exports = [["a140","",62],["a180","",32],["a240","",62],["a280","",32],["a2ab","",5],["a2e3","€"],["a2ef",""],["a2fd",""],["a340","",62],["a380","",31,"　"],["a440","",62],["a480","",32],["a4f4","",10],["a540","",62],["a580","",32],["a5f7","",7],["a640","",62],["a680","",32],["a6b9","",7],["a6d9","",6],["a6ec",""],["a6f3",""],["a6f6","",8],["a740","",62],["a780","",32],["a7c2","",14],["a7f2","",12],["a896","",10],["a8bc",""],["a8bf","ǹ"],["a8c1",""],["a8ea","",20],["a958",""],["a95b",""],["a95d",""],["a989","〾⿰",11],["a997","",12],["a9f0","",14],["aaa1","",93],["aba1","",93],["aca1","",93],["ada1","",93],["aea1","",93],["afa1","",93],["d7fa","",4],["f8a1","",93],["f9a1","",93],["faa1","",93],["fba1","",93],["fca1","",93],["fda1","",93],["fe50","⺁⺄㑳㑇⺈⺋㖞㘚㘎⺌⺗㥮㤘㧏㧟㩳㧐㭎㱮㳠⺧⺪䁖䅟⺮䌷⺳⺶⺷䎱䎬⺻䏝䓖䙡䙌"],["fe80","䜣䜩䝼䞍⻊䥇䥺䥽䦂䦃䦅䦆䦟䦛䦷䦶䲣䲟䲠䲡䱷䲢䴓",6,"䶮",93]]
-
-/***/ }),
-/* 397 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = __webpack_require__(601).isCI
-
-
-/***/ }),
-/* 398 */
-/***/ (function(module, exports) {
-
-var toString = {}.toString;
-
-module.exports = Array.isArray || function (arr) {
-  return toString.call(arr) == '[object Array]';
-};
-
-
-/***/ }),
-/* 399 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var stream = __webpack_require__(23)
-
-
-function isStream (obj) {
-  return obj instanceof stream.Stream
-}
-
-
-function isReadable (obj) {
-  return isStream(obj) && typeof obj._read == 'function' && typeof obj._readableState == 'object'
-}
-
-
-function isWritable (obj) {
-  return isStream(obj) && typeof obj._write == 'function' && typeof obj._writableState == 'object'
-}
-
-
-function isDuplex (obj) {
-  return isReadable(obj) && isWritable(obj)
-}
-
-
-module.exports            = isStream
-module.exports.isReadable = isReadable
-module.exports.isWritable = isWritable
-module.exports.isDuplex   = isDuplex
-
-
-/***/ }),
-/* 400 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * mime-types
- * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-
-
-/**
- * Module dependencies.
- * @private
- */
-
-var db = __webpack_require__(759)
-var extname = __webpack_require__(0).extname
-
-/**
- * Module variables.
- * @private
- */
-
-var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/
-var TEXT_TYPE_REGEXP = /^text\//i
-
-/**
- * Module exports.
- * @public
- */
-
-exports.charset = charset
-exports.charsets = { lookup: charset }
-exports.contentType = contentType
-exports.extension = extension
-exports.extensions = Object.create(null)
-exports.lookup = lookup
-exports.types = Object.create(null)
-
-// Populate the extensions/types maps
-populateMaps(exports.extensions, exports.types)
-
-/**
- * Get the default charset for a MIME type.
- *
- * @param {string} type
- * @return {boolean|string}
- */
-
-function charset (type) {
-  if (!type || typeof type !== 'string') {
-    return false
-  }
-
-  // TODO: use media-typer
-  var match = EXTRACT_TYPE_REGEXP.exec(type)
-  var mime = match && db[match[1].toLowerCase()]
-
-  if (mime && mime.charset) {
-    return mime.charset
-  }
-
-  // default text/* to utf-8
-  if (match && TEXT_TYPE_REGEXP.test(match[1])) {
-    return 'UTF-8'
-  }
-
-  return false
-}
-
-/**
- * Create a full Content-Type header given a MIME type or extension.
- *
- * @param {string} str
- * @return {boolean|string}
- */
-
-function contentType (str) {
-  // TODO: should this even be in this module?
-  if (!str || typeof str !== 'string') {
-    return false
-  }
-
-  var mime = str.indexOf('/') === -1
-    ? exports.lookup(str)
-    : str
-
-  if (!mime) {
-    return false
-  }
-
-  // TODO: use content-type or other module
-  if (mime.indexOf('charset') === -1) {
-    var charset = exports.charset(mime)
-    if (charset) mime += '; charset=' + charset.toLowerCase()
-  }
-
-  return mime
-}
-
-/**
- * Get the default extension for a MIME type.
- *
- * @param {string} type
- * @return {boolean|string}
- */
-
-function extension (type) {
-  if (!type || typeof type !== 'string') {
-    return false
-  }
-
-  // TODO: use media-typer
-  var match = EXTRACT_TYPE_REGEXP.exec(type)
-
-  // get extensions
-  var exts = match && exports.extensions[match[1].toLowerCase()]
-
-  if (!exts || !exts.length) {
-    return false
-  }
-
-  return exts[0]
-}
-
-/**
- * Lookup the MIME type for a file path/extension.
- *
- * @param {string} path
- * @return {boolean|string}
- */
-
-function lookup (path) {
-  if (!path || typeof path !== 'string') {
-    return false
-  }
-
-  // get the extension ("ext" or ".ext" or full path)
-  var extension = extname('x.' + path)
-    .toLowerCase()
-    .substr(1)
-
-  if (!extension) {
-    return false
-  }
-
-  return exports.types[extension] || false
-}
-
-/**
- * Populate the extensions and types maps.
- * @private
- */
-
-function populateMaps (extensions, types) {
-  // source preference (least -> most)
-  var preference = ['nginx', 'apache', undefined, 'iana']
-
-  Object.keys(db).forEach(function forEachMimeType (type) {
-    var mime = db[type]
-    var exts = mime.extensions
-
-    if (!exts || !exts.length) {
-      return
-    }
-
-    // mime -> extensions
-    extensions[type] = exts
-
-    // extension -> mime
-    for (var i = 0; i < exts.length; i++) {
-      var extension = exts[i]
-
-      if (types[extension]) {
-        var from = preference.indexOf(db[types[extension]].source)
-        var to = preference.indexOf(mime.source)
-
-        if (types[extension] !== 'application/octet-stream' &&
-          (from > to || (from === to && types[extension].substr(0, 12) === 'application/'))) {
-          // skip the remapping
-          continue
-        }
-      }
-
-      // set the extension -> mime
-      types[extension] = type
-    }
-  })
-}
-
-
-/***/ }),
-/* 401 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(23)
-
-module.exports = MuteStream
-
-// var out = new MuteStream(process.stdout)
-// argument auto-pipes
-function MuteStream (opts) {
-  Stream.apply(this)
-  opts = opts || {}
-  this.writable = this.readable = true
-  this.muted = false
-  this.on('pipe', this._onpipe)
-  this.replace = opts.replace
-
-  // For readline-type situations
-  // This much at the start of a line being redrawn after a ctrl char
-  // is seen (such as backspace) won't be redrawn as the replacement
-  this._prompt = opts.prompt || null
-  this._hadControl = false
-}
-
-MuteStream.prototype = Object.create(Stream.prototype)
-
-Object.defineProperty(MuteStream.prototype, 'constructor', {
-  value: MuteStream,
-  enumerable: false
-})
-
-MuteStream.prototype.mute = function () {
-  this.muted = true
-}
-
-MuteStream.prototype.unmute = function () {
-  this.muted = false
-}
-
-Object.defineProperty(MuteStream.prototype, '_onpipe', {
-  value: onPipe,
-  enumerable: false,
-  writable: true,
-  configurable: true
-})
-
-function onPipe (src) {
-  this._src = src
-}
-
-Object.defineProperty(MuteStream.prototype, 'isTTY', {
-  get: getIsTTY,
-  set: setIsTTY,
-  enumerable: true,
-  configurable: true
-})
-
-function getIsTTY () {
-  return( (this._dest) ? this._dest.isTTY
-        : (this._src) ? this._src.isTTY
-        : false
-        )
-}
-
-// basically just get replace the getter/setter with a regular value
-function setIsTTY (isTTY) {
-  Object.defineProperty(this, 'isTTY', {
-    value: isTTY,
-    enumerable: true,
-    writable: true,
-    configurable: true
-  })
-}
-
-Object.defineProperty(MuteStream.prototype, 'rows', {
-  get: function () {
-    return( this._dest ? this._dest.rows
-          : this._src ? this._src.rows
-          : undefined )
-  }, enumerable: true, configurable: true })
-
-Object.defineProperty(MuteStream.prototype, 'columns', {
-  get: function () {
-    return( this._dest ? this._dest.columns
-          : this._src ? this._src.columns
-          : undefined )
-  }, enumerable: true, configurable: true })
-
-
-MuteStream.prototype.pipe = function (dest, options) {
-  this._dest = dest
-  return Stream.prototype.pipe.call(this, dest, options)
-}
-
-MuteStream.prototype.pause = function () {
-  if (this._src) return this._src.pause()
-}
-
-MuteStream.prototype.resume = function () {
-  if (this._src) return this._src.resume()
-}
-
-MuteStream.prototype.write = function (c) {
-  if (this.muted) {
-    if (!this.replace) return true
-    if (c.match(/^\u001b/)) {
-      if(c.indexOf(this._prompt) === 0) {
-        c = c.substr(this._prompt.length);
-        c = c.replace(/./g, this.replace);
-        c = this._prompt + c;
-      }
-      this._hadControl = true
-      return this.emit('data', c)
-    } else {
-      if (this._prompt && this._hadControl &&
-          c.indexOf(this._prompt) === 0) {
-        this._hadControl = false
-        this.emit('data', this._prompt)
-        c = c.substr(this._prompt.length)
-      }
-      c = c.toString().replace(/./g, this.replace)
-    }
-  }
-  this.emit('data', c)
-}
-
-MuteStream.prototype.end = function (c) {
-  if (this.muted) {
-    if (c && this.replace) {
-      c = c.toString().replace(/./g, this.replace)
-    } else {
-      c = null
-    }
-  }
-  if (c) this.emit('data', c)
-  this.emit('end')
-}
-
-function proxy (fn) { return function () {
-  var d = this._dest
-  var s = this._src
-  if (d && d[fn]) d[fn].apply(d, arguments)
-  if (s && s[fn]) s[fn].apply(s, arguments)
-}}
-
-MuteStream.prototype.destroy = proxy('destroy')
-MuteStream.prototype.destroySoon = proxy('destroySoon')
-MuteStream.prototype.close = proxy('close')
-
-
-/***/ }),
-/* 402 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const url = __webpack_require__(24);
-const punycode = __webpack_require__(332);
-const queryString = __webpack_require__(786);
-const prependHttp = __webpack_require__(777);
-const sortKeys = __webpack_require__(934);
-
-const DEFAULT_PORTS = {
-	'http:': 80,
-	'https:': 443,
-	'ftp:': 21
-};
-
-// Protocols that always contain a `//`` bit
-const slashedProtocol = {
-	http: true,
-	https: true,
-	ftp: true,
-	gopher: true,
-	file: true,
-	'http:': true,
-	'https:': true,
-	'ftp:': true,
-	'gopher:': true,
-	'file:': true
-};
-
-function testParameter(name, filters) {
-	return filters.some(filter => filter instanceof RegExp ? filter.test(name) : filter === name);
-}
-
-module.exports = (str, opts) => {
-	opts = Object.assign({
-		normalizeProtocol: true,
-		normalizeHttps: false,
-		stripFragment: true,
-		stripWWW: true,
-		removeQueryParameters: [/^utm_\w+/i],
-		removeTrailingSlash: true,
-		removeDirectoryIndex: false,
-		sortQueryParameters: true
-	}, opts);
-
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	const hasRelativeProtocol = str.startsWith('//');
-
-	// Prepend protocol
-	str = prependHttp(str.trim()).replace(/^\/\//, 'http://');
-
-	const urlObj = url.parse(str);
-
-	if (opts.normalizeHttps && urlObj.protocol === 'https:') {
-		urlObj.protocol = 'http:';
-	}
-
-	if (!urlObj.hostname && !urlObj.pathname) {
-		throw new Error('Invalid URL');
-	}
-
-	// Prevent these from being used by `url.format`
-	delete urlObj.host;
-	delete urlObj.query;
-
-	// Remove fragment
-	if (opts.stripFragment) {
-		delete urlObj.hash;
-	}
-
-	// Remove default port
-	const port = DEFAULT_PORTS[urlObj.protocol];
-	if (Number(urlObj.port) === port) {
-		delete urlObj.port;
-	}
-
-	// Remove duplicate slashes
-	if (urlObj.pathname) {
-		urlObj.pathname = urlObj.pathname.replace(/\/{2,}/g, '/');
-	}
-
-	// Decode URI octets
-	if (urlObj.pathname) {
-		urlObj.pathname = decodeURI(urlObj.pathname);
-	}
-
-	// Remove directory index
-	if (opts.removeDirectoryIndex === true) {
-		opts.removeDirectoryIndex = [/^index\.[a-z]+$/];
-	}
-
-	if (Array.isArray(opts.removeDirectoryIndex) && opts.removeDirectoryIndex.length > 0) {
-		let pathComponents = urlObj.pathname.split('/');
-		const lastComponent = pathComponents[pathComponents.length - 1];
-
-		if (testParameter(lastComponent, opts.removeDirectoryIndex)) {
-			pathComponents = pathComponents.slice(0, pathComponents.length - 1);
-			urlObj.pathname = pathComponents.slice(1).join('/') + '/';
-		}
-	}
-
-	// Resolve relative paths, but only for slashed protocols
-	if (slashedProtocol[urlObj.protocol]) {
-		const domain = urlObj.protocol + '//' + urlObj.hostname;
-		const relative = url.resolve(domain, urlObj.pathname);
-		urlObj.pathname = relative.replace(domain, '');
-	}
-
-	if (urlObj.hostname) {
-		// IDN to Unicode
-		urlObj.hostname = punycode.toUnicode(urlObj.hostname).toLowerCase();
-
-		// Remove trailing dot
-		urlObj.hostname = urlObj.hostname.replace(/\.$/, '');
-
-		// Remove `www.`
-		if (opts.stripWWW) {
-			urlObj.hostname = urlObj.hostname.replace(/^www\./, '');
-		}
-	}
-
-	// Remove URL with empty query string
-	if (urlObj.search === '?') {
-		delete urlObj.search;
-	}
-
-	const queryParameters = queryString.parse(urlObj.search);
-
-	// Remove query unwanted parameters
-	if (Array.isArray(opts.removeQueryParameters)) {
-		for (const key in queryParameters) {
-			if (testParameter(key, opts.removeQueryParameters)) {
-				delete queryParameters[key];
-			}
-		}
-	}
-
-	// Sort query parameters
-	if (opts.sortQueryParameters) {
-		urlObj.search = queryString.stringify(sortKeys(queryParameters));
-	}
-
-	// Decode query parameters
-	if (urlObj.search !== null) {
-		urlObj.search = decodeURIComponent(urlObj.search);
-	}
-
-	// Take advantage of many of the Node `url` normalizations
-	str = url.format(urlObj);
-
-	// Remove ending `/`
-	if (opts.removeTrailingSlash || urlObj.pathname === '/') {
-		str = str.replace(/\/$/, '');
-	}
-
-	// Restore relative protocol, if applicable
-	if (hasRelativeProtocol && !opts.normalizeProtocol) {
-		str = str.replace(/^http:\/\//, '//');
-	}
-
-	return str;
-};
-
-
-/***/ }),
-/* 403 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var replace = String.prototype.replace;
-var percentTwenties = /%20/g;
-
-module.exports = {
-    'default': 'RFC3986',
-    formatters: {
-        RFC1738: function (value) {
-            return replace.call(value, percentTwenties, '+');
-        },
-        RFC3986: function (value) {
-            return value;
-        }
-    },
-    RFC1738: 'RFC1738',
-    RFC3986: 'RFC3986'
-};
-
-
-/***/ }),
-/* 404 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var stringify = __webpack_require__(785);
-var parse = __webpack_require__(784);
-var formats = __webpack_require__(403);
-
-module.exports = {
-    formats: formats,
-    parse: parse,
-    stringify: stringify
-};
-
-
-/***/ }),
-/* 405 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var has = Object.prototype.hasOwnProperty;
-
-var hexTable = (function () {
-    var array = [];
-    for (var i = 0; i < 256; ++i) {
-        array.push('%' + ((i < 16 ? '0' : '') + i.toString(16)).toUpperCase());
-    }
-
-    return array;
-}());
-
-var compactQueue = function compactQueue(queue) {
-    var obj;
-
-    while (queue.length) {
-        var item = queue.pop();
-        obj = item.obj[item.prop];
-
-        if (Array.isArray(obj)) {
-            var compacted = [];
-
-            for (var j = 0; j < obj.length; ++j) {
-                if (typeof obj[j] !== 'undefined') {
-                    compacted.push(obj[j]);
-                }
-            }
-
-            item.obj[item.prop] = compacted;
-        }
-    }
-
-    return obj;
-};
-
-var arrayToObject = function arrayToObject(source, options) {
-    var obj = options && options.plainObjects ? Object.create(null) : {};
-    for (var i = 0; i < source.length; ++i) {
-        if (typeof source[i] !== 'undefined') {
-            obj[i] = source[i];
-        }
-    }
-
-    return obj;
-};
-
-var merge = function merge(target, source, options) {
-    if (!source) {
-        return target;
-    }
-
-    if (typeof source !== 'object') {
-        if (Array.isArray(target)) {
-            target.push(source);
-        } else if (typeof target === 'object') {
-            if (options.plainObjects || options.allowPrototypes || !has.call(Object.prototype, source)) {
-                target[source] = true;
-            }
-        } else {
-            return [target, source];
-        }
-
-        return target;
-    }
-
-    if (typeof target !== 'object') {
-        return [target].concat(source);
-    }
-
-    var mergeTarget = target;
-    if (Array.isArray(target) && !Array.isArray(source)) {
-        mergeTarget = arrayToObject(target, options);
-    }
-
-    if (Array.isArray(target) && Array.isArray(source)) {
-        source.forEach(function (item, i) {
-            if (has.call(target, i)) {
-                if (target[i] && typeof target[i] === 'object') {
-                    target[i] = merge(target[i], item, options);
-                } else {
-                    target.push(item);
-                }
-            } else {
-                target[i] = item;
-            }
-        });
-        return target;
-    }
-
-    return Object.keys(source).reduce(function (acc, key) {
-        var value = source[key];
-
-        if (has.call(acc, key)) {
-            acc[key] = merge(acc[key], value, options);
-        } else {
-            acc[key] = value;
-        }
-        return acc;
-    }, mergeTarget);
-};
-
-var assign = function assignSingleSource(target, source) {
-    return Object.keys(source).reduce(function (acc, key) {
-        acc[key] = source[key];
-        return acc;
-    }, target);
-};
-
-var decode = function (str) {
-    try {
-        return decodeURIComponent(str.replace(/\+/g, ' '));
-    } catch (e) {
-        return str;
-    }
-};
-
-var encode = function encode(str) {
-    // This code was originally written by Brian White (mscdex) for the io.js core querystring library.
-    // It has been adapted here for stricter adherence to RFC 3986
-    if (str.length === 0) {
-        return str;
-    }
-
-    var string = typeof str === 'string' ? str : String(str);
-
-    var out = '';
-    for (var i = 0; i < string.length; ++i) {
-        var c = string.charCodeAt(i);
-
-        if (
-            c === 0x2D // -
-            || c === 0x2E // .
-            || c === 0x5F // _
-            || c === 0x7E // ~
-            || (c >= 0x30 && c <= 0x39) // 0-9
-            || (c >= 0x41 && c <= 0x5A) // a-z
-            || (c >= 0x61 && c <= 0x7A) // A-Z
-        ) {
-            out += string.charAt(i);
-            continue;
-        }
-
-        if (c < 0x80) {
-            out = out + hexTable[c];
-            continue;
-        }
-
-        if (c < 0x800) {
-            out = out + (hexTable[0xC0 | (c >> 6)] + hexTable[0x80 | (c & 0x3F)]);
-            continue;
-        }
-
-        if (c < 0xD800 || c >= 0xE000) {
-            out = out + (hexTable[0xE0 | (c >> 12)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]);
-            continue;
-        }
-
-        i += 1;
-        c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
-        out += hexTable[0xF0 | (c >> 18)]
-            + hexTable[0x80 | ((c >> 12) & 0x3F)]
-            + hexTable[0x80 | ((c >> 6) & 0x3F)]
-            + hexTable[0x80 | (c & 0x3F)];
-    }
-
-    return out;
-};
-
-var compact = function compact(value) {
-    var queue = [{ obj: { o: value }, prop: 'o' }];
-    var refs = [];
-
-    for (var i = 0; i < queue.length; ++i) {
-        var item = queue[i];
-        var obj = item.obj[item.prop];
-
-        var keys = Object.keys(obj);
-        for (var j = 0; j < keys.length; ++j) {
-            var key = keys[j];
-            var val = obj[key];
-            if (typeof val === 'object' && val !== null && refs.indexOf(val) === -1) {
-                queue.push({ obj: obj, prop: key });
-                refs.push(val);
-            }
-        }
-    }
-
-    return compactQueue(queue);
-};
-
-var isRegExp = function isRegExp(obj) {
-    return Object.prototype.toString.call(obj) === '[object RegExp]';
-};
-
-var isBuffer = function isBuffer(obj) {
-    if (obj === null || typeof obj === 'undefined') {
-        return false;
-    }
-
-    return !!(obj.constructor && obj.constructor.isBuffer && obj.constructor.isBuffer(obj));
-};
-
-module.exports = {
-    arrayToObject: arrayToObject,
-    assign: assign,
-    compact: compact,
-    decode: decode,
-    encode: encode,
-    isBuffer: isBuffer,
-    isRegExp: isRegExp,
-    merge: merge
-};
-
-
-/***/ }),
-/* 406 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-/*<replacement>*/
-
-var pna = __webpack_require__(180);
-/*</replacement>*/
-
-module.exports = Readable;
-
-/*<replacement>*/
-var isArray = __webpack_require__(398);
-/*</replacement>*/
-
-/*<replacement>*/
-var Duplex;
-/*</replacement>*/
-
-Readable.ReadableState = ReadableState;
-
-/*<replacement>*/
-var EE = __webpack_require__(76).EventEmitter;
-
-var EElistenerCount = function (emitter, type) {
-  return emitter.listeners(type).length;
-};
-/*</replacement>*/
-
-/*<replacement>*/
-var Stream = __webpack_require__(410);
-/*</replacement>*/
-
-/*<replacement>*/
-
-var Buffer = __webpack_require__(45).Buffer;
-var OurUint8Array = global.Uint8Array || function () {};
-function _uint8ArrayToBuffer(chunk) {
-  return Buffer.from(chunk);
-}
-function _isUint8Array(obj) {
-  return Buffer.isBuffer(obj) || obj instanceof OurUint8Array;
-}
-
-/*</replacement>*/
-
-/*<replacement>*/
-var util = __webpack_require__(113);
-util.inherits = __webpack_require__(61);
-/*</replacement>*/
-
-/*<replacement>*/
-var debugUtil = __webpack_require__(3);
-var debug = void 0;
-if (debugUtil && debugUtil.debuglog) {
-  debug = debugUtil.debuglog('stream');
-} else {
-  debug = function () {};
-}
-/*</replacement>*/
-
-var BufferList = __webpack_require__(793);
-var destroyImpl = __webpack_require__(409);
-var StringDecoder;
-
-util.inherits(Readable, Stream);
-
-var kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume'];
-
-function prependListener(emitter, event, fn) {
-  // Sadly this is not cacheable as some libraries bundle their own
-  // event emitter implementation with them.
-  if (typeof emitter.prependListener === 'function') return emitter.prependListener(event, fn);
-
-  // This is a hack to make sure that our error handler is attached before any
-  // userland ones.  NEVER DO THIS. This is here only because this code needs
-  // to continue to work with older versions of Node.js that do not include
-  // the prependListener() method. The goal is to eventually remove this hack.
-  if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);else if (isArray(emitter._events[event])) emitter._events[event].unshift(fn);else emitter._events[event] = [fn, emitter._events[event]];
-}
-
-function ReadableState(options, stream) {
-  Duplex = Duplex || __webpack_require__(115);
-
-  options = options || {};
-
-  // Duplex streams are both readable and writable, but share
-  // the same options object.
-  // However, some cases require setting options to different
-  // values for the readable and the writable sides of the duplex stream.
-  // These options can be provided separately as readableXXX and writableXXX.
-  var isDuplex = stream instanceof Duplex;
-
-  // object stream flag. Used to make read(n) ignore n and to
-  // make all the buffer merging and length checks go away
-  this.objectMode = !!options.objectMode;
-
-  if (isDuplex) this.objectMode = this.objectMode || !!options.readableObjectMode;
-
-  // the point at which it stops calling _read() to fill the buffer
-  // Note: 0 is a valid value, means "don't call _read preemptively ever"
-  var hwm = options.highWaterMark;
-  var readableHwm = options.readableHighWaterMark;
-  var defaultHwm = this.objectMode ? 16 : 16 * 1024;
-
-  if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (readableHwm || readableHwm === 0)) this.highWaterMark = readableHwm;else this.highWaterMark = defaultHwm;
-
-  // cast to ints.
-  this.highWaterMark = Math.floor(this.highWaterMark);
-
-  // A linked list is used to store data chunks instead of an array because the
-  // linked list can remove elements from the beginning faster than
-  // array.shift()
-  this.buffer = new BufferList();
-  this.length = 0;
-  this.pipes = null;
-  this.pipesCount = 0;
-  this.flowing = null;
-  this.ended = false;
-  this.endEmitted = false;
-  this.reading = false;
-
-  // a flag to be able to tell if the event 'readable'/'data' is emitted
-  // immediately, or on a later tick.  We set this to true at first, because
-  // any actions that shouldn't happen until "later" should generally also
-  // not happen before the first read call.
-  this.sync = true;
-
-  // whenever we return null, then we set a flag to say
-  // that we're awaiting a 'readable' event emission.
-  this.needReadable = false;
-  this.emittedReadable = false;
-  this.readableListening = false;
-  this.resumeScheduled = false;
-
-  // has it been destroyed
-  this.destroyed = false;
-
-  // Crypto is kind of old and crusty.  Historically, its default string
-  // encoding is 'binary' so we have to make this configurable.
-  // Everything else in the universe uses 'utf8', though.
-  this.defaultEncoding = options.defaultEncoding || 'utf8';
-
-  // the number of writers that are awaiting a drain event in .pipe()s
-  this.awaitDrain = 0;
-
-  // if true, a maybeReadMore has been scheduled
-  this.readingMore = false;
-
-  this.decoder = null;
-  this.encoding = null;
-  if (options.encoding) {
-    if (!StringDecoder) StringDecoder = __webpack_require__(458).StringDecoder;
-    this.decoder = new StringDecoder(options.encoding);
-    this.encoding = options.encoding;
-  }
-}
-
-function Readable(options) {
-  Duplex = Duplex || __webpack_require__(115);
-
-  if (!(this instanceof Readable)) return new Readable(options);
-
-  this._readableState = new ReadableState(options, this);
-
-  // legacy
-  this.readable = true;
-
-  if (options) {
-    if (typeof options.read === 'function') this._read = options.read;
-
-    if (typeof options.destroy === 'function') this._destroy = options.destroy;
-  }
-
-  Stream.call(this);
-}
-
-Object.defineProperty(Readable.prototype, 'destroyed', {
-  get: function () {
-    if (this._readableState === undefined) {
-      return false;
-    }
-    return this._readableState.destroyed;
-  },
-  set: function (value) {
-    // we ignore the value if the stream
-    // has not been initialized yet
-    if (!this._readableState) {
-      return;
-    }
-
-    // backward compatibility, the user is explicitly
-    // managing destroyed
-    this._readableState.destroyed = value;
-  }
-});
-
-Readable.prototype.destroy = destroyImpl.destroy;
-Readable.prototype._undestroy = destroyImpl.undestroy;
-Readable.prototype._destroy = function (err, cb) {
-  this.push(null);
-  cb(err);
-};
-
-// Manually shove something into the read() buffer.
-// This returns true if the highWaterMark has not been hit yet,
-// similar to how Writable.write() returns true if you should
-// write() some more.
-Readable.prototype.push = function (chunk, encoding) {
-  var state = this._readableState;
-  var skipChunkCheck;
-
-  if (!state.objectMode) {
-    if (typeof chunk === 'string') {
-      encoding = encoding || state.defaultEncoding;
-      if (encoding !== state.encoding) {
-        chunk = Buffer.from(chunk, encoding);
-        encoding = '';
-      }
-      skipChunkCheck = true;
-    }
-  } else {
-    skipChunkCheck = true;
-  }
-
-  return readableAddChunk(this, chunk, encoding, false, skipChunkCheck);
-};
-
-// Unshift should *always* be something directly out of read()
-Readable.prototype.unshift = function (chunk) {
-  return readableAddChunk(this, chunk, null, true, false);
-};
-
-function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) {
-  var state = stream._readableState;
-  if (chunk === null) {
-    state.reading = false;
-    onEofChunk(stream, state);
-  } else {
-    var er;
-    if (!skipChunkCheck) er = chunkInvalid(state, chunk);
-    if (er) {
-      stream.emit('error', er);
-    } else if (state.objectMode || chunk && chunk.length > 0) {
-      if (typeof chunk !== 'string' && !state.objectMode && Object.getPrototypeOf(chunk) !== Buffer.prototype) {
-        chunk = _uint8ArrayToBuffer(chunk);
-      }
-
-      if (addToFront) {
-        if (state.endEmitted) stream.emit('error', new Error('stream.unshift() after end event'));else addChunk(stream, state, chunk, true);
-      } else if (state.ended) {
-        stream.emit('error', new Error('stream.push() after EOF'));
-      } else {
-        state.reading = false;
-        if (state.decoder && !encoding) {
-          chunk = state.decoder.write(chunk);
-          if (state.objectMode || chunk.length !== 0) addChunk(stream, state, chunk, false);else maybeReadMore(stream, state);
-        } else {
-          addChunk(stream, state, chunk, false);
-        }
-      }
-    } else if (!addToFront) {
-      state.reading = false;
-    }
-  }
-
-  return needMoreData(state);
-}
-
-function addChunk(stream, state, chunk, addToFront) {
-  if (state.flowing && state.length === 0 && !state.sync) {
-    stream.emit('data', chunk);
-    stream.read(0);
-  } else {
-    // update the buffer info.
-    state.length += state.objectMode ? 1 : chunk.length;
-    if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk);
-
-    if (state.needReadable) emitReadable(stream);
-  }
-  maybeReadMore(stream, state);
-}
-
-function chunkInvalid(state, chunk) {
-  var er;
-  if (!_isUint8Array(chunk) && typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) {
-    er = new TypeError('Invalid non-string/buffer chunk');
-  }
-  return er;
-}
-
-// if it's past the high water mark, we can push in some more.
-// Also, if we have no data yet, we can stand some
-// more bytes.  This is to work around cases where hwm=0,
-// such as the repl.  Also, if the push() triggered a
-// readable event, and the user called read(largeNumber) such that
-// needReadable was set, then we ought to push more, so that another
-// 'readable' event will be triggered.
-function needMoreData(state) {
-  return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0);
-}
-
-Readable.prototype.isPaused = function () {
-  return this._readableState.flowing === false;
-};
-
-// backwards compatibility.
-Readable.prototype.setEncoding = function (enc) {
-  if (!StringDecoder) StringDecoder = __webpack_require__(458).StringDecoder;
-  this._readableState.decoder = new StringDecoder(enc);
-  this._readableState.encoding = enc;
-  return this;
-};
-
-// Don't raise the hwm > 8MB
-var MAX_HWM = 0x800000;
-function computeNewHighWaterMark(n) {
-  if (n >= MAX_HWM) {
-    n = MAX_HWM;
-  } else {
-    // Get the next highest power of 2 to prevent increasing hwm excessively in
-    // tiny amounts
-    n--;
-    n |= n >>> 1;
-    n |= n >>> 2;
-    n |= n >>> 4;
-    n |= n >>> 8;
-    n |= n >>> 16;
-    n++;
-  }
-  return n;
-}
-
-// This function is designed to be inlinable, so please take care when making
-// changes to the function body.
-function howMuchToRead(n, state) {
-  if (n <= 0 || state.length === 0 && state.ended) return 0;
-  if (state.objectMode) return 1;
-  if (n !== n) {
-    // Only flow one buffer at a time
-    if (state.flowing && state.length) return state.buffer.head.data.length;else return state.length;
-  }
-  // If we're asking for more than the current hwm, then raise the hwm.
-  if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n);
-  if (n <= state.length) return n;
-  // Don't have enough
-  if (!state.ended) {
-    state.needReadable = true;
-    return 0;
-  }
-  return state.length;
-}
-
-// you can override either this method, or the async _read(n) below.
-Readable.prototype.read = function (n) {
-  debug('read', n);
-  n = parseInt(n, 10);
-  var state = this._readableState;
-  var nOrig = n;
-
-  if (n !== 0) state.emittedReadable = false;
-
-  // if we're doing read(0) to trigger a readable event, but we
-  // already have a bunch of data in the buffer, then just trigger
-  // the 'readable' event and move on.
-  if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) {
-    debug('read: emitReadable', state.length, state.ended);
-    if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this);
-    return null;
-  }
-
-  n = howMuchToRead(n, state);
-
-  // if we've ended, and we're now clear, then finish it up.
-  if (n === 0 && state.ended) {
-    if (state.length === 0) endReadable(this);
-    return null;
-  }
-
-  // All the actual chunk generation logic needs to be
-  // *below* the call to _read.  The reason is that in certain
-  // synthetic stream cases, such as passthrough streams, _read
-  // may be a completely synchronous operation which may change
-  // the state of the read buffer, providing enough data when
-  // before there was *not* enough.
-  //
-  // So, the steps are:
-  // 1. Figure out what the state of things will be after we do
-  // a read from the buffer.
-  //
-  // 2. If that resulting state will trigger a _read, then call _read.
-  // Note that this may be asynchronous, or synchronous.  Yes, it is
-  // deeply ugly to write APIs this way, but that still doesn't mean
-  // that the Readable class should behave improperly, as streams are
-  // designed to be sync/async agnostic.
-  // Take note if the _read call is sync or async (ie, if the read call
-  // has returned yet), so that we know whether or not it's safe to emit
-  // 'readable' etc.
-  //
-  // 3. Actually pull the requested chunks out of the buffer and return.
-
-  // if we need a readable event, then we need to do some reading.
-  var doRead = state.needReadable;
-  debug('need readable', doRead);
-
-  // if we currently have less than the highWaterMark, then also read some
-  if (state.length === 0 || state.length - n < state.highWaterMark) {
-    doRead = true;
-    debug('length less than watermark', doRead);
-  }
-
-  // however, if we've ended, then there's no point, and if we're already
-  // reading, then it's unnecessary.
-  if (state.ended || state.reading) {
-    doRead = false;
-    debug('reading or ended', doRead);
-  } else if (doRead) {
-    debug('do read');
-    state.reading = true;
-    state.sync = true;
-    // if the length is currently zero, then we *need* a readable event.
-    if (state.length === 0) state.needReadable = true;
-    // call internal read method
-    this._read(state.highWaterMark);
-    state.sync = false;
-    // If _read pushed data synchronously, then `reading` will be false,
-    // and we need to re-evaluate how much data we can return to the user.
-    if (!state.reading) n = howMuchToRead(nOrig, state);
-  }
-
-  var ret;
-  if (n > 0) ret = fromList(n, state);else ret = null;
-
-  if (ret === null) {
-    state.needReadable = true;
-    n = 0;
-  } else {
-    state.length -= n;
-  }
-
-  if (state.length === 0) {
-    // If we have nothing in the buffer, then we want to know
-    // as soon as we *do* get something into the buffer.
-    if (!state.ended) state.needReadable = true;
-
-    // If we tried to read() past the EOF, then emit end on the next tick.
-    if (nOrig !== n && state.ended) endReadable(this);
-  }
-
-  if (ret !== null) this.emit('data', ret);
-
-  return ret;
-};
-
-function onEofChunk(stream, state) {
-  if (state.ended) return;
-  if (state.decoder) {
-    var chunk = state.decoder.end();
-    if (chunk && chunk.length) {
-      state.buffer.push(chunk);
-      state.length += state.objectMode ? 1 : chunk.length;
-    }
-  }
-  state.ended = true;
-
-  // emit 'readable' now to make sure it gets picked up.
-  emitReadable(stream);
-}
-
-// Don't emit readable right away in sync mode, because this can trigger
-// another read() call => stack overflow.  This way, it might trigger
-// a nextTick recursion warning, but that's not so bad.
-function emitReadable(stream) {
-  var state = stream._readableState;
-  state.needReadable = false;
-  if (!state.emittedReadable) {
-    debug('emitReadable', state.flowing);
-    state.emittedReadable = true;
-    if (state.sync) pna.nextTick(emitReadable_, stream);else emitReadable_(stream);
-  }
-}
-
-function emitReadable_(stream) {
-  debug('emit readable');
-  stream.emit('readable');
-  flow(stream);
-}
-
-// at this point, the user has presumably seen the 'readable' event,
-// and called read() to consume some data.  that may have triggered
-// in turn another _read(n) call, in which case reading = true if
-// it's in progress.
-// However, if we're not ended, or reading, and the length < hwm,
-// then go ahead and try to read some more preemptively.
-function maybeReadMore(stream, state) {
-  if (!state.readingMore) {
-    state.readingMore = true;
-    pna.nextTick(maybeReadMore_, stream, state);
-  }
-}
-
-function maybeReadMore_(stream, state) {
-  var len = state.length;
-  while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) {
-    debug('maybeReadMore read 0');
-    stream.read(0);
-    if (len === state.length)
-      // didn't get any data, stop spinning.
-      break;else len = state.length;
-  }
-  state.readingMore = false;
-}
-
-// abstract method.  to be overridden in specific implementation classes.
-// call cb(er, data) where data is <= n in length.
-// for virtual (non-string, non-buffer) streams, "length" is somewhat
-// arbitrary, and perhaps not very meaningful.
-Readable.prototype._read = function (n) {
-  this.emit('error', new Error('_read() is not implemented'));
-};
-
-Readable.prototype.pipe = function (dest, pipeOpts) {
-  var src = this;
-  var state = this._readableState;
-
-  switch (state.pipesCount) {
-    case 0:
-      state.pipes = dest;
-      break;
-    case 1:
-      state.pipes = [state.pipes, dest];
-      break;
-    default:
-      state.pipes.push(dest);
-      break;
-  }
-  state.pipesCount += 1;
-  debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts);
-
-  var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr;
-
-  var endFn = doEnd ? onend : unpipe;
-  if (state.endEmitted) pna.nextTick(endFn);else src.once('end', endFn);
-
-  dest.on('unpipe', onunpipe);
-  function onunpipe(readable, unpipeInfo) {
-    debug('onunpipe');
-    if (readable === src) {
-      if (unpipeInfo && unpipeInfo.hasUnpiped === false) {
-        unpipeInfo.hasUnpiped = true;
-        cleanup();
-      }
-    }
-  }
-
-  function onend() {
-    debug('onend');
-    dest.end();
-  }
-
-  // when the dest drains, it reduces the awaitDrain counter
-  // on the source.  This would be more elegant with a .once()
-  // handler in flow(), but adding and removing repeatedly is
-  // too slow.
-  var ondrain = pipeOnDrain(src);
-  dest.on('drain', ondrain);
-
-  var cleanedUp = false;
-  function cleanup() {
-    debug('cleanup');
-    // cleanup event handlers once the pipe is broken
-    dest.removeListener('close', onclose);
-    dest.removeListener('finish', onfinish);
-    dest.removeListener('drain', ondrain);
-    dest.removeListener('error', onerror);
-    dest.removeListener('unpipe', onunpipe);
-    src.removeListener('end', onend);
-    src.removeListener('end', unpipe);
-    src.removeListener('data', ondata);
-
-    cleanedUp = true;
-
-    // if the reader is waiting for a drain event from this
-    // specific writer, then it would cause it to never start
-    // flowing again.
-    // So, if this is awaiting a drain, then we just call it now.
-    // If we don't know, then assume that we are waiting for one.
-    if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain();
-  }
-
-  // If the user pushes more data while we're writing to dest then we'll end up
-  // in ondata again. However, we only want to increase awaitDrain once because
-  // dest will only emit one 'drain' event for the multiple writes.
-  // => Introduce a guard on increasing awaitDrain.
-  var increasedAwaitDrain = false;
-  src.on('data', ondata);
-  function ondata(chunk) {
-    debug('ondata');
-    increasedAwaitDrain = false;
-    var ret = dest.write(chunk);
-    if (false === ret && !increasedAwaitDrain) {
-      // If the user unpiped during `dest.write()`, it is possible
-      // to get stuck in a permanently paused state if that write
-      // also returned false.
-      // => Check whether `dest` is still a piping destination.
-      if ((state.pipesCount === 1 && state.pipes === dest || state.pipesCount > 1 && indexOf(state.pipes, dest) !== -1) && !cleanedUp) {
-        debug('false write response, pause', src._readableState.awaitDrain);
-        src._readableState.awaitDrain++;
-        increasedAwaitDrain = true;
-      }
-      src.pause();
-    }
-  }
-
-  // if the dest has an error, then stop piping into it.
-  // however, don't suppress the throwing behavior for this.
-  function onerror(er) {
-    debug('onerror', er);
-    unpipe();
-    dest.removeListener('error', onerror);
-    if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er);
-  }
-
-  // Make sure our error handler is attached before userland ones.
-  prependListener(dest, 'error', onerror);
-
-  // Both close and finish should trigger unpipe, but only once.
-  function onclose() {
-    dest.removeListener('finish', onfinish);
-    unpipe();
-  }
-  dest.once('close', onclose);
-  function onfinish() {
-    debug('onfinish');
-    dest.removeListener('close', onclose);
-    unpipe();
-  }
-  dest.once('finish', onfinish);
-
-  function unpipe() {
-    debug('unpipe');
-    src.unpipe(dest);
-  }
-
-  // tell the dest that it's being piped to
-  dest.emit('pipe', src);
-
-  // start the flow if it hasn't been started already.
-  if (!state.flowing) {
-    debug('pipe resume');
-    src.resume();
-  }
-
-  return dest;
-};
-
-function pipeOnDrain(src) {
-  return function () {
-    var state = src._readableState;
-    debug('pipeOnDrain', state.awaitDrain);
-    if (state.awaitDrain) state.awaitDrain--;
-    if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) {
-      state.flowing = true;
-      flow(src);
-    }
-  };
-}
-
-Readable.prototype.unpipe = function (dest) {
-  var state = this._readableState;
-  var unpipeInfo = { hasUnpiped: false };
-
-  // if we're not piping anywhere, then do nothing.
-  if (state.pipesCount === 0) return this;
-
-  // just one destination.  most common case.
-  if (state.pipesCount === 1) {
-    // passed in one, but it's not the right one.
-    if (dest && dest !== state.pipes) return this;
-
-    if (!dest) dest = state.pipes;
-
-    // got a match.
-    state.pipes = null;
-    state.pipesCount = 0;
-    state.flowing = false;
-    if (dest) dest.emit('unpipe', this, unpipeInfo);
-    return this;
-  }
-
-  // slow case. multiple pipe destinations.
-
-  if (!dest) {
-    // remove all.
-    var dests = state.pipes;
-    var len = state.pipesCount;
-    state.pipes = null;
-    state.pipesCount = 0;
-    state.flowing = false;
-
-    for (var i = 0; i < len; i++) {
-      dests[i].emit('unpipe', this, unpipeInfo);
-    }return this;
-  }
-
-  // try to find the right one.
-  var index = indexOf(state.pipes, dest);
-  if (index === -1) return this;
-
-  state.pipes.splice(index, 1);
-  state.pipesCount -= 1;
-  if (state.pipesCount === 1) state.pipes = state.pipes[0];
-
-  dest.emit('unpipe', this, unpipeInfo);
-
-  return this;
-};
-
-// set up data events if they are asked for
-// Ensure readable listeners eventually get something
-Readable.prototype.on = function (ev, fn) {
-  var res = Stream.prototype.on.call(this, ev, fn);
-
-  if (ev === 'data') {
-    // Start flowing on next tick if stream isn't explicitly paused
-    if (this._readableState.flowing !== false) this.resume();
-  } else if (ev === 'readable') {
-    var state = this._readableState;
-    if (!state.endEmitted && !state.readableListening) {
-      state.readableListening = state.needReadable = true;
-      state.emittedReadable = false;
-      if (!state.reading) {
-        pna.nextTick(nReadingNextTick, this);
-      } else if (state.length) {
-        emitReadable(this);
-      }
-    }
-  }
-
-  return res;
-};
-Readable.prototype.addListener = Readable.prototype.on;
-
-function nReadingNextTick(self) {
-  debug('readable nexttick read 0');
-  self.read(0);
-}
-
-// pause() and resume() are remnants of the legacy readable stream API
-// If the user uses them, then switch into old mode.
-Readable.prototype.resume = function () {
-  var state = this._readableState;
-  if (!state.flowing) {
-    debug('resume');
-    state.flowing = true;
-    resume(this, state);
-  }
-  return this;
-};
-
-function resume(stream, state) {
-  if (!state.resumeScheduled) {
-    state.resumeScheduled = true;
-    pna.nextTick(resume_, stream, state);
-  }
-}
-
-function resume_(stream, state) {
-  if (!state.reading) {
-    debug('resume read 0');
-    stream.read(0);
-  }
-
-  state.resumeScheduled = false;
-  state.awaitDrain = 0;
-  stream.emit('resume');
-  flow(stream);
-  if (state.flowing && !state.reading) stream.read(0);
-}
-
-Readable.prototype.pause = function () {
-  debug('call pause flowing=%j', this._readableState.flowing);
-  if (false !== this._readableState.flowing) {
-    debug('pause');
-    this._readableState.flowing = false;
-    this.emit('pause');
-  }
-  return this;
-};
-
-function flow(stream) {
-  var state = stream._readableState;
-  debug('flow', state.flowing);
-  while (state.flowing && stream.read() !== null) {}
-}
-
-// wrap an old-style stream as the async data source.
-// This is *not* part of the readable stream interface.
-// It is an ugly unfortunate mess of history.
-Readable.prototype.wrap = function (stream) {
-  var _this = this;
-
-  var state = this._readableState;
-  var paused = false;
-
-  stream.on('end', function () {
-    debug('wrapped end');
-    if (state.decoder && !state.ended) {
-      var chunk = state.decoder.end();
-      if (chunk && chunk.length) _this.push(chunk);
-    }
-
-    _this.push(null);
-  });
-
-  stream.on('data', function (chunk) {
-    debug('wrapped data');
-    if (state.decoder) chunk = state.decoder.write(chunk);
-
-    // don't skip over falsy values in objectMode
-    if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return;
-
-    var ret = _this.push(chunk);
-    if (!ret) {
-      paused = true;
-      stream.pause();
-    }
-  });
-
-  // proxy all the other methods.
-  // important when wrapping filters and duplexes.
-  for (var i in stream) {
-    if (this[i] === undefined && typeof stream[i] === 'function') {
-      this[i] = function (method) {
-        return function () {
-          return stream[method].apply(stream, arguments);
-        };
-      }(i);
-    }
-  }
-
-  // proxy certain important events.
-  for (var n = 0; n < kProxyEvents.length; n++) {
-    stream.on(kProxyEvents[n], this.emit.bind(this, kProxyEvents[n]));
-  }
-
-  // when we try to consume some more bytes, simply unpause the
-  // underlying stream.
-  this._read = function (n) {
-    debug('wrapped _read', n);
-    if (paused) {
-      paused = false;
-      stream.resume();
-    }
-  };
-
-  return this;
-};
-
-Object.defineProperty(Readable.prototype, 'readableHighWaterMark', {
-  // making it explicit this property is not enumerable
-  // because otherwise some prototype manipulation in
-  // userland will fail
-  enumerable: false,
-  get: function () {
-    return this._readableState.highWaterMark;
-  }
-});
-
-// exposed for testing purposes only.
-Readable._fromList = fromList;
-
-// Pluck off n bytes from an array of buffers.
-// Length is the combined lengths of all the buffers in the list.
-// This function is designed to be inlinable, so please take care when making
-// changes to the function body.
-function fromList(n, state) {
-  // nothing buffered
-  if (state.length === 0) return null;
-
-  var ret;
-  if (state.objectMode) ret = state.buffer.shift();else if (!n || n >= state.length) {
-    // read it all, truncate the list
-    if (state.decoder) ret = state.buffer.join('');else if (state.buffer.length === 1) ret = state.buffer.head.data;else ret = state.buffer.concat(state.length);
-    state.buffer.clear();
-  } else {
-    // read part of list
-    ret = fromListPartial(n, state.buffer, state.decoder);
-  }
-
-  return ret;
-}
-
-// Extracts only enough buffered data to satisfy the amount requested.
-// This function is designed to be inlinable, so please take care when making
-// changes to the function body.
-function fromListPartial(n, list, hasStrings) {
-  var ret;
-  if (n < list.head.data.length) {
-    // slice is the same for buffers and strings
-    ret = list.head.data.slice(0, n);
-    list.head.data = list.head.data.slice(n);
-  } else if (n === list.head.data.length) {
-    // first chunk is a perfect match
-    ret = list.shift();
-  } else {
-    // result spans more than one buffer
-    ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list);
-  }
-  return ret;
-}
-
-// Copies a specified amount of characters from the list of buffered data
-// chunks.
-// This function is designed to be inlinable, so please take care when making
-// changes to the function body.
-function copyFromBufferString(n, list) {
-  var p = list.head;
-  var c = 1;
-  var ret = p.data;
-  n -= ret.length;
-  while (p = p.next) {
-    var str = p.data;
-    var nb = n > str.length ? str.length : n;
-    if (nb === str.length) ret += str;else ret += str.slice(0, n);
-    n -= nb;
-    if (n === 0) {
-      if (nb === str.length) {
-        ++c;
-        if (p.next) list.head = p.next;else list.head = list.tail = null;
-      } else {
-        list.head = p;
-        p.data = str.slice(nb);
-      }
-      break;
-    }
-    ++c;
-  }
-  list.length -= c;
-  return ret;
-}
-
-// Copies a specified amount of bytes from the list of buffered data chunks.
-// This function is designed to be inlinable, so please take care when making
-// changes to the function body.
-function copyFromBuffer(n, list) {
-  var ret = Buffer.allocUnsafe(n);
-  var p = list.head;
-  var c = 1;
-  p.data.copy(ret);
-  n -= p.data.length;
-  while (p = p.next) {
-    var buf = p.data;
-    var nb = n > buf.length ? buf.length : n;
-    buf.copy(ret, ret.length - n, 0, nb);
-    n -= nb;
-    if (n === 0) {
-      if (nb === buf.length) {
-        ++c;
-        if (p.next) list.head = p.next;else list.head = list.tail = null;
-      } else {
-        list.head = p;
-        p.data = buf.slice(nb);
-      }
-      break;
-    }
-    ++c;
-  }
-  list.length -= c;
-  return ret;
-}
-
-function endReadable(stream) {
-  var state = stream._readableState;
-
-  // If we get here before consuming all the bytes, then that is a
-  // bug in node.  Should never happen.
-  if (state.length > 0) throw new Error('"endReadable()" called on non-empty stream');
-
-  if (!state.endEmitted) {
-    state.ended = true;
-    pna.nextTick(endReadableNT, state, stream);
-  }
-}
-
-function endReadableNT(state, stream) {
-  // Check that we didn't get one last unshift.
-  if (!state.endEmitted && state.length === 0) {
-    state.endEmitted = true;
-    stream.readable = false;
-    stream.emit('end');
-  }
-}
-
-function indexOf(xs, x) {
-  for (var i = 0, l = xs.length; i < l; i++) {
-    if (xs[i] === x) return i;
-  }
-  return -1;
-}
-
-/***/ }),
-/* 407 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// a transform stream is a readable/writable stream where you do
-// something with the data.  Sometimes it's called a "filter",
-// but that's not a great name for it, since that implies a thing where
-// some bits pass through, and others are simply ignored.  (That would
-// be a valid example of a transform, of course.)
-//
-// While the output is causally related to the input, it's not a
-// necessarily symmetric or synchronous transformation.  For example,
-// a zlib stream might take multiple plain-text writes(), and then
-// emit a single compressed chunk some time in the future.
-//
-// Here's how this works:
-//
-// The Transform stream has all the aspects of the readable and writable
-// stream classes.  When you write(chunk), that calls _write(chunk,cb)
-// internally, and returns false if there's a lot of pending writes
-// buffered up.  When you call read(), that calls _read(n) until
-// there's enough pending readable data buffered up.
-//
-// In a transform stream, the written data is placed in a buffer.  When
-// _read(n) is called, it transforms the queued up data, calling the
-// buffered _write cb's as it consumes chunks.  If consuming a single
-// written chunk would result in multiple output chunks, then the first
-// outputted bit calls the readcb, and subsequent chunks just go into
-// the read buffer, and will cause it to emit 'readable' if necessary.
-//
-// This way, back-pressure is actually determined by the reading side,
-// since _read has to be called to start processing a new chunk.  However,
-// a pathological inflate type of transform can cause excessive buffering
-// here.  For example, imagine a stream where every byte of input is
-// interpreted as an integer from 0-255, and then results in that many
-// bytes of output.  Writing the 4 bytes {ff,ff,ff,ff} would result in
-// 1kb of data being output.  In this case, you could write a very small
-// amount of input, and end up with a very large amount of output.  In
-// such a pathological inflating mechanism, there'd be no way to tell
-// the system to stop doing the transform.  A single 4MB write could
-// cause the system to run out of memory.
-//
-// However, even in such a pathological case, only a single written chunk
-// would be consumed, and then the rest would wait (un-transformed) until
-// the results of the previous transformed chunk were consumed.
-
-
-
-module.exports = Transform;
-
-var Duplex = __webpack_require__(115);
-
-/*<replacement>*/
-var util = __webpack_require__(113);
-util.inherits = __webpack_require__(61);
-/*</replacement>*/
-
-util.inherits(Transform, Duplex);
-
-function afterTransform(er, data) {
-  var ts = this._transformState;
-  ts.transforming = false;
-
-  var cb = ts.writecb;
-
-  if (!cb) {
-    return this.emit('error', new Error('write callback called multiple times'));
-  }
-
-  ts.writechunk = null;
-  ts.writecb = null;
-
-  if (data != null) // single equals check for both `null` and `undefined`
-    this.push(data);
-
-  cb(er);
-
-  var rs = this._readableState;
-  rs.reading = false;
-  if (rs.needReadable || rs.length < rs.highWaterMark) {
-    this._read(rs.highWaterMark);
-  }
-}
-
-function Transform(options) {
-  if (!(this instanceof Transform)) return new Transform(options);
-
-  Duplex.call(this, options);
-
-  this._transformState = {
-    afterTransform: afterTransform.bind(this),
-    needTransform: false,
-    transforming: false,
-    writecb: null,
-    writechunk: null,
-    writeencoding: null
-  };
-
-  // start out asking for a readable event once data is transformed.
-  this._readableState.needReadable = true;
-
-  // we have implemented the _read method, and done the other things
-  // that Readable wants before the first _read call, so unset the
-  // sync guard flag.
-  this._readableState.sync = false;
-
-  if (options) {
-    if (typeof options.transform === 'function') this._transform = options.transform;
-
-    if (typeof options.flush === 'function') this._flush = options.flush;
-  }
-
-  // When the writable side finishes, then flush out anything remaining.
-  this.on('prefinish', prefinish);
-}
-
-function prefinish() {
-  var _this = this;
-
-  if (typeof this._flush === 'function') {
-    this._flush(function (er, data) {
-      done(_this, er, data);
-    });
-  } else {
-    done(this, null, null);
-  }
-}
-
-Transform.prototype.push = function (chunk, encoding) {
-  this._transformState.needTransform = false;
-  return Duplex.prototype.push.call(this, chunk, encoding);
-};
-
-// This is the part where you do stuff!
-// override this function in implementation classes.
-// 'chunk' is an input chunk.
-//
-// Call `push(newChunk)` to pass along transformed output
-// to the readable side.  You may call 'push' zero or more times.
-//
-// Call `cb(err)` when you are done with this chunk.  If you pass
-// an error, then that'll put the hurt on the whole operation.  If you
-// never call cb(), then you'll never get another chunk.
-Transform.prototype._transform = function (chunk, encoding, cb) {
-  throw new Error('_transform() is not implemented');
-};
-
-Transform.prototype._write = function (chunk, encoding, cb) {
-  var ts = this._transformState;
-  ts.writecb = cb;
-  ts.writechunk = chunk;
-  ts.writeencoding = encoding;
-  if (!ts.transforming) {
-    var rs = this._readableState;
-    if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark);
-  }
-};
-
-// Doesn't matter what the args are here.
-// _transform does all the work.
-// That we got here means that the readable side wants more data.
-Transform.prototype._read = function (n) {
-  var ts = this._transformState;
-
-  if (ts.writechunk !== null && ts.writecb && !ts.transforming) {
-    ts.transforming = true;
-    this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform);
-  } else {
-    // mark that we need a transform, so that any data that comes in
-    // will get processed, now that we've asked for it.
-    ts.needTransform = true;
-  }
-};
-
-Transform.prototype._destroy = function (err, cb) {
-  var _this2 = this;
-
-  Duplex.prototype._destroy.call(this, err, function (err2) {
-    cb(err2);
-    _this2.emit('close');
-  });
-};
-
-function done(stream, er, data) {
-  if (er) return stream.emit('error', er);
-
-  if (data != null) // single equals check for both `null` and `undefined`
-    stream.push(data);
-
-  // if there's nothing in the write buffer, then that means
-  // that nothing more will ever be provided
-  if (stream._writableState.length) throw new Error('Calling transform done when ws.length != 0');
-
-  if (stream._transformState.transforming) throw new Error('Calling transform done when still transforming');
-
-  return stream.push(null);
-}
-
-/***/ }),
-/* 408 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// A bit simpler than readable streams.
-// Implement an async ._write(chunk, encoding, cb), and it'll handle all
-// the drain event emission and buffering.
-
-
-
-/*<replacement>*/
-
-var pna = __webpack_require__(180);
-/*</replacement>*/
-
-module.exports = Writable;
-
-/* <replacement> */
-function WriteReq(chunk, encoding, cb) {
-  this.chunk = chunk;
-  this.encoding = encoding;
-  this.callback = cb;
-  this.next = null;
-}
-
-// It seems a linked list but it is not
-// there will be only 2 of these for each stream
-function CorkedRequest(state) {
-  var _this = this;
-
-  this.next = null;
-  this.entry = null;
-  this.finish = function () {
-    onCorkedFinish(_this, state);
-  };
-}
-/* </replacement> */
-
-/*<replacement>*/
-var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
-/*</replacement>*/
-
-/*<replacement>*/
-var Duplex;
-/*</replacement>*/
-
-Writable.WritableState = WritableState;
-
-/*<replacement>*/
-var util = __webpack_require__(113);
-util.inherits = __webpack_require__(61);
-/*</replacement>*/
-
-/*<replacement>*/
-var internalUtil = {
-  deprecate: __webpack_require__(956)
-};
-/*</replacement>*/
-
-/*<replacement>*/
-var Stream = __webpack_require__(410);
-/*</replacement>*/
-
-/*<replacement>*/
-
-var Buffer = __webpack_require__(45).Buffer;
-var OurUint8Array = global.Uint8Array || function () {};
-function _uint8ArrayToBuffer(chunk) {
-  return Buffer.from(chunk);
-}
-function _isUint8Array(obj) {
-  return Buffer.isBuffer(obj) || obj instanceof OurUint8Array;
-}
-
-/*</replacement>*/
-
-var destroyImpl = __webpack_require__(409);
-
-util.inherits(Writable, Stream);
-
-function nop() {}
-
-function WritableState(options, stream) {
-  Duplex = Duplex || __webpack_require__(115);
-
-  options = options || {};
-
-  // Duplex streams are both readable and writable, but share
-  // the same options object.
-  // However, some cases require setting options to different
-  // values for the readable and the writable sides of the duplex stream.
-  // These options can be provided separately as readableXXX and writableXXX.
-  var isDuplex = stream instanceof Duplex;
-
-  // object stream flag to indicate whether or not this stream
-  // contains buffers or objects.
-  this.objectMode = !!options.objectMode;
-
-  if (isDuplex) this.objectMode = this.objectMode || !!options.writableObjectMode;
-
-  // the point at which write() starts returning false
-  // Note: 0 is a valid value, means that we always return false if
-  // the entire buffer is not flushed immediately on write()
-  var hwm = options.highWaterMark;
-  var writableHwm = options.writableHighWaterMark;
-  var defaultHwm = this.objectMode ? 16 : 16 * 1024;
-
-  if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (writableHwm || writableHwm === 0)) this.highWaterMark = writableHwm;else this.highWaterMark = defaultHwm;
-
-  // cast to ints.
-  this.highWaterMark = Math.floor(this.highWaterMark);
-
-  // if _final has been called
-  this.finalCalled = false;
-
-  // drain event flag.
-  this.needDrain = false;
-  // at the start of calling end()
-  this.ending = false;
-  // when end() has been called, and returned
-  this.ended = false;
-  // when 'finish' is emitted
-  this.finished = false;
-
-  // has it been destroyed
-  this.destroyed = false;
-
-  // should we decode strings into buffers before passing to _write?
-  // this is here so that some node-core streams can optimize string
-  // handling at a lower level.
-  var noDecode = options.decodeStrings === false;
-  this.decodeStrings = !noDecode;
-
-  // Crypto is kind of old and crusty.  Historically, its default string
-  // encoding is 'binary' so we have to make this configurable.
-  // Everything else in the universe uses 'utf8', though.
-  this.defaultEncoding = options.defaultEncoding || 'utf8';
-
-  // not an actual buffer we keep track of, but a measurement
-  // of how much we're waiting to get pushed to some underlying
-  // socket or file.
-  this.length = 0;
-
-  // a flag to see when we're in the middle of a write.
-  this.writing = false;
-
-  // when true all writes will be buffered until .uncork() call
-  this.corked = 0;
-
-  // a flag to be able to tell if the onwrite cb is called immediately,
-  // or on a later tick.  We set this to true at first, because any
-  // actions that shouldn't happen until "later" should generally also
-  // not happen before the first write call.
-  this.sync = true;
-
-  // a flag to know if we're processing previously buffered items, which
-  // may call the _write() callback in the same tick, so that we don't
-  // end up in an overlapped onwrite situation.
-  this.bufferProcessing = false;
-
-  // the callback that's passed to _write(chunk,cb)
-  this.onwrite = function (er) {
-    onwrite(stream, er);
-  };
-
-  // the callback that the user supplies to write(chunk,encoding,cb)
-  this.writecb = null;
-
-  // the amount that is being written when _write is called.
-  this.writelen = 0;
-
-  this.bufferedRequest = null;
-  this.lastBufferedRequest = null;
-
-  // number of pending user-supplied write callbacks
-  // this must be 0 before 'finish' can be emitted
-  this.pendingcb = 0;
-
-  // emit prefinish if the only thing we're waiting for is _write cbs
-  // This is relevant for synchronous Transform streams
-  this.prefinished = false;
-
-  // True if the error was already emitted and should not be thrown again
-  this.errorEmitted = false;
-
-  // count buffered requests
-  this.bufferedRequestCount = 0;
-
-  // allocate the first CorkedRequest, there is always
-  // one allocated and free to use, and we maintain at most two
-  this.corkedRequestsFree = new CorkedRequest(this);
-}
-
-WritableState.prototype.getBuffer = function getBuffer() {
-  var current = this.bufferedRequest;
-  var out = [];
-  while (current) {
-    out.push(current);
-    current = current.next;
-  }
-  return out;
-};
-
-(function () {
-  try {
-    Object.defineProperty(WritableState.prototype, 'buffer', {
-      get: internalUtil.deprecate(function () {
-        return this.getBuffer();
-      }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.', 'DEP0003')
-    });
-  } catch (_) {}
-})();
-
-// Test _writableState for inheritance to account for Duplex streams,
-// whose prototype chain only points to Readable.
-var realHasInstance;
-if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === 'function') {
-  realHasInstance = Function.prototype[Symbol.hasInstance];
-  Object.defineProperty(Writable, Symbol.hasInstance, {
-    value: function (object) {
-      if (realHasInstance.call(this, object)) return true;
-      if (this !== Writable) return false;
-
-      return object && object._writableState instanceof WritableState;
-    }
-  });
-} else {
-  realHasInstance = function (object) {
-    return object instanceof this;
-  };
-}
-
-function Writable(options) {
-  Duplex = Duplex || __webpack_require__(115);
-
-  // Writable ctor is applied to Duplexes, too.
-  // `realHasInstance` is necessary because using plain `instanceof`
-  // would return false, as no `_writableState` property is attached.
-
-  // Trying to use the custom `instanceof` for Writable here will also break the
-  // Node.js LazyTransform implementation, which has a non-trivial getter for
-  // `_writableState` that would lead to infinite recursion.
-  if (!realHasInstance.call(Writable, this) && !(this instanceof Duplex)) {
-    return new Writable(options);
-  }
-
-  this._writableState = new WritableState(options, this);
-
-  // legacy.
-  this.writable = true;
-
-  if (options) {
-    if (typeof options.write === 'function') this._write = options.write;
-
-    if (typeof options.writev === 'function') this._writev = options.writev;
-
-    if (typeof options.destroy === 'function') this._destroy = options.destroy;
-
-    if (typeof options.final === 'function') this._final = options.final;
-  }
-
-  Stream.call(this);
-}
-
-// Otherwise people can pipe Writable streams, which is just wrong.
-Writable.prototype.pipe = function () {
-  this.emit('error', new Error('Cannot pipe, not readable'));
-};
-
-function writeAfterEnd(stream, cb) {
-  var er = new Error('write after end');
-  // TODO: defer error events consistently everywhere, not just the cb
-  stream.emit('error', er);
-  pna.nextTick(cb, er);
-}
-
-// Checks that a user-supplied chunk is valid, especially for the particular
-// mode the stream is in. Currently this means that `null` is never accepted
-// and undefined/non-string values are only allowed in object mode.
-function validChunk(stream, state, chunk, cb) {
-  var valid = true;
-  var er = false;
-
-  if (chunk === null) {
-    er = new TypeError('May not write null values to stream');
-  } else if (typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) {
-    er = new TypeError('Invalid non-string/buffer chunk');
-  }
-  if (er) {
-    stream.emit('error', er);
-    pna.nextTick(cb, er);
-    valid = false;
-  }
-  return valid;
-}
-
-Writable.prototype.write = function (chunk, encoding, cb) {
-  var state = this._writableState;
-  var ret = false;
-  var isBuf = !state.objectMode && _isUint8Array(chunk);
-
-  if (isBuf && !Buffer.isBuffer(chunk)) {
-    chunk = _uint8ArrayToBuffer(chunk);
-  }
-
-  if (typeof encoding === 'function') {
-    cb = encoding;
-    encoding = null;
-  }
-
-  if (isBuf) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding;
-
-  if (typeof cb !== 'function') cb = nop;
-
-  if (state.ended) writeAfterEnd(this, cb);else if (isBuf || validChunk(this, state, chunk, cb)) {
-    state.pendingcb++;
-    ret = writeOrBuffer(this, state, isBuf, chunk, encoding, cb);
-  }
-
-  return ret;
-};
-
-Writable.prototype.cork = function () {
-  var state = this._writableState;
-
-  state.corked++;
-};
-
-Writable.prototype.uncork = function () {
-  var state = this._writableState;
-
-  if (state.corked) {
-    state.corked--;
-
-    if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state);
-  }
-};
-
-Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
-  // node::ParseEncoding() requires lower case.
-  if (typeof encoding === 'string') encoding = encoding.toLowerCase();
-  if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding);
-  this._writableState.defaultEncoding = encoding;
-  return this;
-};
-
-function decodeChunk(state, chunk, encoding) {
-  if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') {
-    chunk = Buffer.from(chunk, encoding);
-  }
-  return chunk;
-}
-
-Object.defineProperty(Writable.prototype, 'writableHighWaterMark', {
-  // making it explicit this property is not enumerable
-  // because otherwise some prototype manipulation in
-  // userland will fail
-  enumerable: false,
-  get: function () {
-    return this._writableState.highWaterMark;
-  }
-});
-
-// if we're already writing something, then just put this
-// in the queue, and wait our turn.  Otherwise, call _write
-// If we return false, then we need a drain event, so set that flag.
-function writeOrBuffer(stream, state, isBuf, chunk, encoding, cb) {
-  if (!isBuf) {
-    var newChunk = decodeChunk(state, chunk, encoding);
-    if (chunk !== newChunk) {
-      isBuf = true;
-      encoding = 'buffer';
-      chunk = newChunk;
-    }
-  }
-  var len = state.objectMode ? 1 : chunk.length;
-
-  state.length += len;
-
-  var ret = state.length < state.highWaterMark;
-  // we must ensure that previous needDrain will not be reset to false.
-  if (!ret) state.needDrain = true;
-
-  if (state.writing || state.corked) {
-    var last = state.lastBufferedRequest;
-    state.lastBufferedRequest = {
-      chunk: chunk,
-      encoding: encoding,
-      isBuf: isBuf,
-      callback: cb,
-      next: null
-    };
-    if (last) {
-      last.next = state.lastBufferedRequest;
-    } else {
-      state.bufferedRequest = state.lastBufferedRequest;
-    }
-    state.bufferedRequestCount += 1;
-  } else {
-    doWrite(stream, state, false, len, chunk, encoding, cb);
-  }
-
-  return ret;
-}
-
-function doWrite(stream, state, writev, len, chunk, encoding, cb) {
-  state.writelen = len;
-  state.writecb = cb;
-  state.writing = true;
-  state.sync = true;
-  if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite);
-  state.sync = false;
-}
-
-function onwriteError(stream, state, sync, er, cb) {
-  --state.pendingcb;
-
-  if (sync) {
-    // defer the callback if we are being called synchronously
-    // to avoid piling up things on the stack
-    pna.nextTick(cb, er);
-    // this can emit finish, and it will always happen
-    // after error
-    pna.nextTick(finishMaybe, stream, state);
-    stream._writableState.errorEmitted = true;
-    stream.emit('error', er);
-  } else {
-    // the caller expect this to happen before if
-    // it is async
-    cb(er);
-    stream._writableState.errorEmitted = true;
-    stream.emit('error', er);
-    // this can emit finish, but finish must
-    // always follow error
-    finishMaybe(stream, state);
-  }
-}
-
-function onwriteStateUpdate(state) {
-  state.writing = false;
-  state.writecb = null;
-  state.length -= state.writelen;
-  state.writelen = 0;
-}
-
-function onwrite(stream, er) {
-  var state = stream._writableState;
-  var sync = state.sync;
-  var cb = state.writecb;
-
-  onwriteStateUpdate(state);
-
-  if (er) onwriteError(stream, state, sync, er, cb);else {
-    // Check if we're actually ready to finish, but don't emit yet
-    var finished = needFinish(state);
-
-    if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) {
-      clearBuffer(stream, state);
-    }
-
-    if (sync) {
-      /*<replacement>*/
-      asyncWrite(afterWrite, stream, state, finished, cb);
-      /*</replacement>*/
-    } else {
-      afterWrite(stream, state, finished, cb);
-    }
-  }
-}
-
-function afterWrite(stream, state, finished, cb) {
-  if (!finished) onwriteDrain(stream, state);
-  state.pendingcb--;
-  cb();
-  finishMaybe(stream, state);
-}
-
-// Must force callback to be called on nextTick, so that we don't
-// emit 'drain' before the write() consumer gets the 'false' return
-// value, and has a chance to attach a 'drain' listener.
-function onwriteDrain(stream, state) {
-  if (state.length === 0 && state.needDrain) {
-    state.needDrain = false;
-    stream.emit('drain');
-  }
-}
-
-// if there's something in the buffer waiting, then process it
-function clearBuffer(stream, state) {
-  state.bufferProcessing = true;
-  var entry = state.bufferedRequest;
-
-  if (stream._writev && entry && entry.next) {
-    // Fast case, write everything using _writev()
-    var l = state.bufferedRequestCount;
-    var buffer = new Array(l);
-    var holder = state.corkedRequestsFree;
-    holder.entry = entry;
-
-    var count = 0;
-    var allBuffers = true;
-    while (entry) {
-      buffer[count] = entry;
-      if (!entry.isBuf) allBuffers = false;
-      entry = entry.next;
-      count += 1;
-    }
-    buffer.allBuffers = allBuffers;
-
-    doWrite(stream, state, true, state.length, buffer, '', holder.finish);
-
-    // doWrite is almost always async, defer these to save a bit of time
-    // as the hot path ends with doWrite
-    state.pendingcb++;
-    state.lastBufferedRequest = null;
-    if (holder.next) {
-      state.corkedRequestsFree = holder.next;
-      holder.next = null;
-    } else {
-      state.corkedRequestsFree = new CorkedRequest(state);
-    }
-    state.bufferedRequestCount = 0;
-  } else {
-    // Slow case, write chunks one-by-one
-    while (entry) {
-      var chunk = entry.chunk;
-      var encoding = entry.encoding;
-      var cb = entry.callback;
-      var len = state.objectMode ? 1 : chunk.length;
-
-      doWrite(stream, state, false, len, chunk, encoding, cb);
-      entry = entry.next;
-      state.bufferedRequestCount--;
-      // if we didn't call the onwrite immediately, then
-      // it means that we need to wait until it does.
-      // also, that means that the chunk and cb are currently
-      // being processed, so move the buffer counter past them.
-      if (state.writing) {
-        break;
-      }
-    }
-
-    if (entry === null) state.lastBufferedRequest = null;
-  }
-
-  state.bufferedRequest = entry;
-  state.bufferProcessing = false;
-}
-
-Writable.prototype._write = function (chunk, encoding, cb) {
-  cb(new Error('_write() is not implemented'));
-};
-
-Writable.prototype._writev = null;
-
-Writable.prototype.end = function (chunk, encoding, cb) {
-  var state = this._writableState;
-
-  if (typeof chunk === 'function') {
-    cb = chunk;
-    chunk = null;
-    encoding = null;
-  } else if (typeof encoding === 'function') {
-    cb = encoding;
-    encoding = null;
-  }
-
-  if (chunk !== null && chunk !== undefined) this.write(chunk, encoding);
-
-  // .end() fully uncorks
-  if (state.corked) {
-    state.corked = 1;
-    this.uncork();
-  }
-
-  // ignore unnecessary end() calls.
-  if (!state.ending && !state.finished) endWritable(this, state, cb);
-};
-
-function needFinish(state) {
-  return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing;
-}
-function callFinal(stream, state) {
-  stream._final(function (err) {
-    state.pendingcb--;
-    if (err) {
-      stream.emit('error', err);
-    }
-    state.prefinished = true;
-    stream.emit('prefinish');
-    finishMaybe(stream, state);
-  });
-}
-function prefinish(stream, state) {
-  if (!state.prefinished && !state.finalCalled) {
-    if (typeof stream._final === 'function') {
-      state.pendingcb++;
-      state.finalCalled = true;
-      pna.nextTick(callFinal, stream, state);
-    } else {
-      state.prefinished = true;
-      stream.emit('prefinish');
-    }
-  }
-}
-
-function finishMaybe(stream, state) {
-  var need = needFinish(state);
-  if (need) {
-    prefinish(stream, state);
-    if (state.pendingcb === 0) {
-      state.finished = true;
-      stream.emit('finish');
-    }
-  }
-  return need;
-}
-
-function endWritable(stream, state, cb) {
-  state.ending = true;
-  finishMaybe(stream, state);
-  if (cb) {
-    if (state.finished) pna.nextTick(cb);else stream.once('finish', cb);
-  }
-  state.ended = true;
-  stream.writable = false;
-}
-
-function onCorkedFinish(corkReq, state, err) {
-  var entry = corkReq.entry;
-  corkReq.entry = null;
-  while (entry) {
-    var cb = entry.callback;
-    state.pendingcb--;
-    cb(err);
-    entry = entry.next;
-  }
-  if (state.corkedRequestsFree) {
-    state.corkedRequestsFree.next = corkReq;
-  } else {
-    state.corkedRequestsFree = corkReq;
-  }
-}
-
-Object.defineProperty(Writable.prototype, 'destroyed', {
-  get: function () {
-    if (this._writableState === undefined) {
-      return false;
-    }
-    return this._writableState.destroyed;
-  },
-  set: function (value) {
-    // we ignore the value if the stream
-    // has not been initialized yet
-    if (!this._writableState) {
-      return;
-    }
-
-    // backward compatibility, the user is explicitly
-    // managing destroyed
-    this._writableState.destroyed = value;
-  }
-});
-
-Writable.prototype.destroy = destroyImpl.destroy;
-Writable.prototype._undestroy = destroyImpl.undestroy;
-Writable.prototype._destroy = function (err, cb) {
-  this.end();
-  cb(err);
-};
-
-/***/ }),
-/* 409 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/*<replacement>*/
-
-var pna = __webpack_require__(180);
-/*</replacement>*/
-
-// undocumented cb() API, needed for core, not for public API
-function destroy(err, cb) {
-  var _this = this;
-
-  var readableDestroyed = this._readableState && this._readableState.destroyed;
-  var writableDestroyed = this._writableState && this._writableState.destroyed;
-
-  if (readableDestroyed || writableDestroyed) {
-    if (cb) {
-      cb(err);
-    } else if (err && (!this._writableState || !this._writableState.errorEmitted)) {
-      pna.nextTick(emitErrorNT, this, err);
-    }
-    return this;
-  }
-
-  // we set destroyed to true before firing error callbacks in order
-  // to make it re-entrance safe in case destroy() is called within callbacks
-
-  if (this._readableState) {
-    this._readableState.destroyed = true;
-  }
-
-  // if this is a duplex stream mark the writable part as destroyed as well
-  if (this._writableState) {
-    this._writableState.destroyed = true;
-  }
-
-  this._destroy(err || null, function (err) {
-    if (!cb && err) {
-      pna.nextTick(emitErrorNT, _this, err);
-      if (_this._writableState) {
-        _this._writableState.errorEmitted = true;
-      }
-    } else if (cb) {
-      cb(err);
-    }
-  });
-
-  return this;
-}
-
-function undestroy() {
-  if (this._readableState) {
-    this._readableState.destroyed = false;
-    this._readableState.reading = false;
-    this._readableState.ended = false;
-    this._readableState.endEmitted = false;
-  }
-
-  if (this._writableState) {
-    this._writableState.destroyed = false;
-    this._writableState.ended = false;
-    this._writableState.ending = false;
-    this._writableState.finished = false;
-    this._writableState.errorEmitted = false;
-  }
-}
-
-function emitErrorNT(self, err) {
-  self.emit('error', err);
-}
-
-module.exports = {
-  destroy: destroy,
-  undestroy: undestroy
-};
-
-/***/ }),
-/* 410 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(23);
-
-
-/***/ }),
-/* 411 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * repeat-element <https://github.com/jonschlinkert/repeat-element>
- *
- * Copyright (c) 2015 Jon Schlinkert.
- * Licensed under the MIT license.
- */
-
-
-
-module.exports = function repeat(ele, num) {
-  var arr = new Array(num);
-
-  for (var i = 0; i < num; i++) {
-    arr[i] = ele;
-  }
-
-  return arr;
-};
-
-
-/***/ }),
-/* 412 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var tough = __webpack_require__(810)
-
-var Cookie = tough.Cookie
-var CookieJar = tough.CookieJar
-
-exports.parse = function (str) {
-  if (str && str.uri) {
-    str = str.uri
-  }
-  if (typeof str !== 'string') {
-    throw new Error('The cookie function only accepts STRING as param')
-  }
-  return Cookie.parse(str, {loose: true})
-}
-
-// Adapt the sometimes-Async api of tough.CookieJar to our requirements
-function RequestJar (store) {
-  var self = this
-  self._jar = new CookieJar(store, {looseMode: true})
-}
-RequestJar.prototype.setCookie = function (cookieOrStr, uri, options) {
-  var self = this
-  return self._jar.setCookieSync(cookieOrStr, uri, options || {})
-}
-RequestJar.prototype.getCookieString = function (uri) {
-  var self = this
-  return self._jar.getCookieStringSync(uri)
-}
-RequestJar.prototype.getCookies = function (uri) {
-  var self = this
-  return self._jar.getCookiesSync(uri)
-}
-
-exports.jar = function (store) {
-  return new RequestJar(store)
-}
-
-
-/***/ }),
-/* 413 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * "A request-path path-matches a given cookie-path if at least one of the
- * following conditions holds:"
- */
-function pathMatch (reqPath, cookiePath) {
-  // "o  The cookie-path and the request-path are identical."
-  if (cookiePath === reqPath) {
-    return true;
-  }
-
-  var idx = reqPath.indexOf(cookiePath);
-  if (idx === 0) {
-    // "o  The cookie-path is a prefix of the request-path, and the last
-    // character of the cookie-path is %x2F ("/")."
-    if (cookiePath.substr(-1) === "/") {
-      return true;
-    }
-
-    // " o  The cookie-path is a prefix of the request-path, and the first
-    // character of the request-path that is not included in the cookie- path
-    // is a %x2F ("/") character."
-    if (reqPath.substr(cookiePath.length, 1) === "/") {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-exports.pathMatch = pathMatch;
-
-
-/***/ }),
-/* 414 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-var pubsuffix = __webpack_require__(415);
-
-// Gives the permutation of all possible domainMatch()es of a given domain. The
-// array is in shortest-to-longest order.  Handy for indexing.
-function permuteDomain (domain) {
-  var pubSuf = pubsuffix.getPublicSuffix(domain);
-  if (!pubSuf) {
-    return null;
-  }
-  if (pubSuf == domain) {
-    return [domain];
-  }
-
-  var prefix = domain.slice(0, -(pubSuf.length + 1)); // ".example.com"
-  var parts = prefix.split('.').reverse();
-  var cur = pubSuf;
-  var permutations = [cur];
-  while (parts.length) {
-    cur = parts.shift() + '.' + cur;
-    permutations.push(cur);
-  }
-  return permutations;
-}
-
-exports.permuteDomain = permuteDomain;
-
-
-/***/ }),
-/* 415 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/****************************************************
- * AUTOMATICALLY GENERATED by generate-pubsuffix.js *
- *                  DO NOT EDIT!                    *
- ****************************************************/
-
-
-
-var punycode = __webpack_require__(332);
-
-module.exports.getPublicSuffix = function getPublicSuffix(domain) {
-  /*!
-   * Copyright (c) 2015, Salesforce.com, Inc.
-   * All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions are met:
-   *
-   * 1. Redistributions of source code must retain the above copyright notice,
-   * this list of conditions and the following disclaimer.
-   *
-   * 2. Redistributions in binary form must reproduce the above copyright notice,
-   * this list of conditions and the following disclaimer in the documentation
-   * and/or other materials provided with the distribution.
-   *
-   * 3. Neither the name of Salesforce.com nor the names of its contributors may
-   * be used to endorse or promote products derived from this software without
-   * specific prior written permission.
-   *
-   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   * POSSIBILITY OF SUCH DAMAGE.
-   */
-  if (!domain) {
-    return null;
-  }
-  if (domain.match(/^\./)) {
-    return null;
-  }
-  var asciiDomain = punycode.toASCII(domain);
-  var converted = false;
-  if (asciiDomain !== domain) {
-    domain = asciiDomain;
-    converted = true;
-  }
-  if (index[domain]) {
-    return null;
-  }
-
-  domain = domain.toLowerCase();
-  var parts = domain.split('.').reverse();
-
-  var suffix = '';
-  var suffixLen = 0;
-  for (var i=0; i<parts.length; i++) {
-    var part = parts[i];
-    var starstr = '*'+suffix;
-    var partstr = part+suffix;
-
-    if (index[starstr]) { // star rule matches
-      suffixLen = i+1;
-      if (index[partstr] === false) { // exception rule matches (NB: false, not undefined)
-        suffixLen--;
-      }
-    } else if (index[partstr]) { // exact match, not exception
-      suffixLen = i+1;
-    }
-
-    suffix = '.'+partstr;
-  }
-
-  if (index['*'+suffix]) { // *.domain exists (e.g. *.kyoto.jp for domain='kyoto.jp');
-    return null;
-  }
-
-  suffixLen = suffixLen || 1;
-  if (parts.length > suffixLen) {
-    var publicSuffix = parts.slice(0,suffixLen+1).reverse().join('.');
-    return converted ? punycode.toUnicode(publicSuffix) : publicSuffix;
-  }
-
-  return null;
-};
-
-// The following generated structure is used under the MPL version 2.0
-// See public-suffix.txt for more information
-
-var index = module.exports.index = Object.freeze(
-{"ac":true,"com.ac":true,"edu.ac":true,"gov.ac":true,"net.ac":true,"mil.ac":true,"org.ac":true,"ad":true,"nom.ad":true,"ae":true,"co.ae":true,"net.ae":true,"org.ae":true,"sch.ae":true,"ac.ae":true,"gov.ae":true,"mil.ae":true,"aero":true,"accident-investigation.aero":true,"accident-prevention.aero":true,"aerobatic.aero":true,"aeroclub.aero":true,"aerodrome.aero":true,"agents.aero":true,"aircraft.aero":true,"airline.aero":true,"airport.aero":true,"air-surveillance.aero":true,"airtraffic.aero":true,"air-traffic-control.aero":true,"ambulance.aero":true,"amusement.aero":true,"association.aero":true,"author.aero":true,"ballooning.aero":true,"broker.aero":true,"caa.aero":true,"cargo.aero":true,"catering.aero":true,"certification.aero":true,"championship.aero":true,"charter.aero":true,"civilaviation.aero":true,"club.aero":true,"conference.aero":true,"consultant.aero":true,"consulting.aero":true,"control.aero":true,"council.aero":true,"crew.aero":true,"design.aero":true,"dgca.aero":true,"educator.aero":true,"emergency.aero":true,"engine.aero":true,"engineer.aero":true,"entertainment.aero":true,"equipment.aero":true,"exchange.aero":true,"express.aero":true,"federation.aero":true,"flight.aero":true,"freight.aero":true,"fuel.aero":true,"gliding.aero":true,"government.aero":true,"groundhandling.aero":true,"group.aero":true,"hanggliding.aero":true,"homebuilt.aero":true,"insurance.aero":true,"journal.aero":true,"journalist.aero":true,"leasing.aero":true,"logistics.aero":true,"magazine.aero":true,"maintenance.aero":true,"media.aero":true,"microlight.aero":true,"modelling.aero":true,"navigation.aero":true,"parachuting.aero":true,"paragliding.aero":true,"passenger-association.aero":true,"pilot.aero":true,"press.aero":true,"production.aero":true,"recreation.aero":true,"repbody.aero":true,"res.aero":true,"research.aero":true,"rotorcraft.aero":true,"safety.aero":true,"scientist.aero":true,"services.aero":true,"show.aero":true,"skydiving.aero":true,"software.aero":true,"student.aero":true,"trader.aero":true,"trading.aero":true,"trainer.aero":true,"union.aero":true,"workinggroup.aero":true,"works.aero":true,"af":true,"gov.af":true,"com.af":true,"org.af":true,"net.af":true,"edu.af":true,"ag":true,"com.ag":true,"org.ag":true,"net.ag":true,"co.ag":true,"nom.ag":true,"ai":true,"off.ai":true,"com.ai":true,"net.ai":true,"org.ai":true,"al":true,"com.al":true,"edu.al":true,"gov.al":true,"mil.al":true,"net.al":true,"org.al":true,"am":true,"ao":true,"ed.ao":true,"gv.ao":true,"og.ao":true,"co.ao":true,"pb.ao":true,"it.ao":true,"aq":true,"ar":true,"com.ar":true,"edu.ar":true,"gob.ar":true,"gov.ar":true,"int.ar":true,"mil.ar":true,"musica.ar":true,"net.ar":true,"org.ar":true,"tur.ar":true,"arpa":true,"e164.arpa":true,"in-addr.arpa":true,"ip6.arpa":true,"iris.arpa":true,"uri.arpa":true,"urn.arpa":true,"as":true,"gov.as":true,"asia":true,"at":true,"ac.at":true,"co.at":true,"gv.at":true,"or.at":true,"au":true,"com.au":true,"net.au":true,"org.au":true,"edu.au":true,"gov.au":true,"asn.au":true,"id.au":true,"info.au":true,"conf.au":true,"oz.au":true,"act.au":true,"nsw.au":true,"nt.au":true,"qld.au":true,"sa.au":true,"tas.au":true,"vic.au":true,"wa.au":true,"act.edu.au":true,"nsw.edu.au":true,"nt.edu.au":true,"qld.edu.au":true,"sa.edu.au":true,"tas.edu.au":true,"vic.edu.au":true,"wa.edu.au":true,"qld.gov.au":true,"sa.gov.au":true,"tas.gov.au":true,"vic.gov.au":true,"wa.gov.au":true,"aw":true,"com.aw":true,"ax":true,"az":true,"com.az":true,"net.az":true,"int.az":true,"gov.az":true,"org.az":true,"edu.az":true,"info.az":true,"pp.az":true,"mil.az":true,"name.az":true,"pro.az":true,"biz.az":true,"ba":true,"com.ba":true,"edu.ba":true,"gov.ba":true,"mil.ba":true,"net.ba":true,"org.ba":true,"bb":true,"biz.bb":true,"co.bb":true,"com.bb":true,"edu.bb":true,"gov.bb":true,"info.bb":true,"net.bb":true,"org.bb":true,"store.bb":true,"tv.bb":true,"*.bd":true,"be":true,"ac.be":true,"bf":true,"gov.bf":true,"bg":true,"a.bg":true,"b.bg":true,"c.bg":true,"d.bg":true,"e.bg":true,"f.bg":true,"g.bg":true,"h.bg":true,"i.bg":true,"j.bg":true,"k.bg":true,"l.bg":true,"m.bg":true,"n.bg":true,"o.bg":true,"p.bg":true,"q.bg":true,"r.bg":true,"s.bg":true,"t.bg":true,"u.bg":true,"v.bg":true,"w.bg":true,"x.bg":true,"y.bg":true,"z.bg":true,"0.bg":true,"1.bg":true,"2.bg":true,"3.bg":true,"4.bg":true,"5.bg":true,"6.bg":true,"7.bg":true,"8.bg":true,"9.bg":true,"bh":true,"com.bh":true,"edu.bh":true,"net.bh":true,"org.bh":true,"gov.bh":true,"bi":true,"co.bi":true,"com.bi":true,"edu.bi":true,"or.bi":true,"org.bi":true,"biz":true,"bj":true,"asso.bj":true,"barreau.bj":true,"gouv.bj":true,"bm":true,"com.bm":true,"edu.bm":true,"gov.bm":true,"net.bm":true,"org.bm":true,"*.bn":true,"bo":true,"com.bo":true,"edu.bo":true,"gob.bo":true,"int.bo":true,"org.bo":true,"net.bo":true,"mil.bo":true,"tv.bo":true,"web.bo":true,"academia.bo":true,"agro.bo":true,"arte.bo":true,"blog.bo":true,"bolivia.bo":true,"ciencia.bo":true,"cooperativa.bo":true,"democracia.bo":true,"deporte.bo":true,"ecologia.bo":true,"economia.bo":true,"empresa.bo":true,"indigena.bo":true,"industria.bo":true,"info.bo":true,"medicina.bo":true,"movimiento.bo":true,"musica.bo":true,"natural.bo":true,"nombre.bo":true,"noticias.bo":true,"patria.bo":true,"politica.bo":true,"profesional.bo":true,"plurinacional.bo":true,"pueblo.bo":true,"revista.bo":true,"salud.bo":true,"tecnologia.bo":true,"tksat.bo":true,"transporte.bo":true,"wiki.bo":true,"br":true,"9guacu.br":true,"abc.br":true,"adm.br":true,"adv.br":true,"agr.br":true,"aju.br":true,"am.br":true,"anani.br":true,"aparecida.br":true,"arq.br":true,"art.br":true,"ato.br":true,"b.br":true,"belem.br":true,"bhz.br":true,"bio.br":true,"blog.br":true,"bmd.br":true,"boavista.br":true,"bsb.br":true,"campinagrande.br":true,"campinas.br":true,"caxias.br":true,"cim.br":true,"cng.br":true,"cnt.br":true,"com.br":true,"contagem.br":true,"coop.br":true,"cri.br":true,"cuiaba.br":true,"curitiba.br":true,"def.br":true,"ecn.br":true,"eco.br":true,"edu.br":true,"emp.br":true,"eng.br":true,"esp.br":true,"etc.br":true,"eti.br":true,"far.br":true,"feira.br":true,"flog.br":true,"floripa.br":true,"fm.br":true,"fnd.br":true,"fortal.br":true,"fot.br":true,"foz.br":true,"fst.br":true,"g12.br":true,"ggf.br":true,"goiania.br":true,"gov.br":true,"ac.gov.br":true,"al.gov.br":true,"am.gov.br":true,"ap.gov.br":true,"ba.gov.br":true,"ce.gov.br":true,"df.gov.br":true,"es.gov.br":true,"go.gov.br":true,"ma.gov.br":true,"mg.gov.br":true,"ms.gov.br":true,"mt.gov.br":true,"pa.gov.br":true,"pb.gov.br":true,"pe.gov.br":true,"pi.gov.br":true,"pr.gov.br":true,"rj.gov.br":true,"rn.gov.br":true,"ro.gov.br":true,"rr.gov.br":true,"rs.gov.br":true,"sc.gov.br":true,"se.gov.br":true,"sp.gov.br":true,"to.gov.br":true,"gru.br":true,"imb.br":true,"ind.br":true,"inf.br":true,"jab.br":true,"jampa.br":true,"jdf.br":true,"joinville.br":true,"jor.br":true,"jus.br":true,"leg.br":true,"lel.br":true,"londrina.br":true,"macapa.br":true,"maceio.br":true,"manaus.br":true,"maringa.br":true,"mat.br":true,"med.br":true,"mil.br":true,"morena.br":true,"mp.br":true,"mus.br":true,"natal.br":true,"net.br":true,"niteroi.br":true,"*.nom.br":true,"not.br":true,"ntr.br":true,"odo.br":true,"org.br":true,"osasco.br":true,"palmas.br":true,"poa.br":true,"ppg.br":true,"pro.br":true,"psc.br":true,"psi.br":true,"pvh.br":true,"qsl.br":true,"radio.br":true,"rec.br":true,"recife.br":true,"ribeirao.br":true,"rio.br":true,"riobranco.br":true,"riopreto.br":true,"salvador.br":true,"sampa.br":true,"santamaria.br":true,"santoandre.br":true,"saobernardo.br":true,"saogonca.br":true,"sjc.br":true,"slg.br":true,"slz.br":true,"sorocaba.br":true,"srv.br":true,"taxi.br":true,"teo.br":true,"the.br":true,"tmp.br":true,"trd.br":true,"tur.br":true,"tv.br":true,"udi.br":true,"vet.br":true,"vix.br":true,"vlog.br":true,"wiki.br":true,"zlg.br":true,"bs":true,"com.bs":true,"net.bs":true,"org.bs":true,"edu.bs":true,"gov.bs":true,"bt":true,"com.bt":true,"edu.bt":true,"gov.bt":true,"net.bt":true,"org.bt":true,"bv":true,"bw":true,"co.bw":true,"org.bw":true,"by":true,"gov.by":true,"mil.by":true,"com.by":true,"of.by":true,"bz":true,"com.bz":true,"net.bz":true,"org.bz":true,"edu.bz":true,"gov.bz":true,"ca":true,"ab.ca":true,"bc.ca":true,"mb.ca":true,"nb.ca":true,"nf.ca":true,"nl.ca":true,"ns.ca":true,"nt.ca":true,"nu.ca":true,"on.ca":true,"pe.ca":true,"qc.ca":true,"sk.ca":true,"yk.ca":true,"gc.ca":true,"cat":true,"cc":true,"cd":true,"gov.cd":true,"cf":true,"cg":true,"ch":true,"ci":true,"org.ci":true,"or.ci":true,"com.ci":true,"co.ci":true,"edu.ci":true,"ed.ci":true,"ac.ci":true,"net.ci":true,"go.ci":true,"asso.ci":true,"xn--aroport-bya.ci":true,"int.ci":true,"presse.ci":true,"md.ci":true,"gouv.ci":true,"*.ck":true,"www.ck":false,"cl":true,"gov.cl":true,"gob.cl":true,"co.cl":true,"mil.cl":true,"cm":true,"co.cm":true,"com.cm":true,"gov.cm":true,"net.cm":true,"cn":true,"ac.cn":true,"com.cn":true,"edu.cn":true,"gov.cn":true,"net.cn":true,"org.cn":true,"mil.cn":true,"xn--55qx5d.cn":true,"xn--io0a7i.cn":true,"xn--od0alg.cn":true,"ah.cn":true,"bj.cn":true,"cq.cn":true,"fj.cn":true,"gd.cn":true,"gs.cn":true,"gz.cn":true,"gx.cn":true,"ha.cn":true,"hb.cn":true,"he.cn":true,"hi.cn":true,"hl.cn":true,"hn.cn":true,"jl.cn":true,"js.cn":true,"jx.cn":true,"ln.cn":true,"nm.cn":true,"nx.cn":true,"qh.cn":true,"sc.cn":true,"sd.cn":true,"sh.cn":true,"sn.cn":true,"sx.cn":true,"tj.cn":true,"xj.cn":true,"xz.cn":true,"yn.cn":true,"zj.cn":true,"hk.cn":true,"mo.cn":true,"tw.cn":true,"co":true,"arts.co":true,"com.co":true,"edu.co":true,"firm.co":true,"gov.co":true,"info.co":true,"int.co":true,"mil.co":true,"net.co":true,"nom.co":true,"org.co":true,"rec.co":true,"web.co":true,"com":true,"coop":true,"cr":true,"ac.cr":true,"co.cr":true,"ed.cr":true,"fi.cr":true,"go.cr":true,"or.cr":true,"sa.cr":true,"cu":true,"com.cu":true,"edu.cu":true,"org.cu":true,"net.cu":true,"gov.cu":true,"inf.cu":true,"cv":true,"cw":true,"com.cw":true,"edu.cw":true,"net.cw":true,"org.cw":true,"cx":true,"gov.cx":true,"cy":true,"ac.cy":true,"biz.cy":true,"com.cy":true,"ekloges.cy":true,"gov.cy":true,"ltd.cy":true,"name.cy":true,"net.cy":true,"org.cy":true,"parliament.cy":true,"press.cy":true,"pro.cy":true,"tm.cy":true,"cz":true,"de":true,"dj":true,"dk":true,"dm":true,"com.dm":true,"net.dm":true,"org.dm":true,"edu.dm":true,"gov.dm":true,"do":true,"art.do":true,"com.do":true,"edu.do":true,"gob.do":true,"gov.do":true,"mil.do":true,"net.do":true,"org.do":true,"sld.do":true,"web.do":true,"dz":true,"com.dz":true,"org.dz":true,"net.dz":true,"gov.dz":true,"edu.dz":true,"asso.dz":true,"pol.dz":true,"art.dz":true,"ec":true,"com.ec":true,"info.ec":true,"net.ec":true,"fin.ec":true,"k12.ec":true,"med.ec":true,"pro.ec":true,"org.ec":true,"edu.ec":true,"gov.ec":true,"gob.ec":true,"mil.ec":true,"edu":true,"ee":true,"edu.ee":true,"gov.ee":true,"riik.ee":true,"lib.ee":true,"med.ee":true,"com.ee":true,"pri.ee":true,"aip.ee":true,"org.ee":true,"fie.ee":true,"eg":true,"com.eg":true,"edu.eg":true,"eun.eg":true,"gov.eg":true,"mil.eg":true,"name.eg":true,"net.eg":true,"org.eg":true,"sci.eg":true,"*.er":true,"es":true,"com.es":true,"nom.es":true,"org.es":true,"gob.es":true,"edu.es":true,"et":true,"com.et":true,"gov.et":true,"org.et":true,"edu.et":true,"biz.et":true,"name.et":true,"info.et":true,"net.et":true,"eu":true,"fi":true,"aland.fi":true,"*.fj":true,"*.fk":true,"fm":true,"fo":true,"fr":true,"com.fr":true,"asso.fr":true,"nom.fr":true,"prd.fr":true,"presse.fr":true,"tm.fr":true,"aeroport.fr":true,"assedic.fr":true,"avocat.fr":true,"avoues.fr":true,"cci.fr":true,"chambagri.fr":true,"chirurgiens-dentistes.fr":true,"experts-comptables.fr":true,"geometre-expert.fr":true,"gouv.fr":true,"greta.fr":true,"huissier-justice.fr":true,"medecin.fr":true,"notaires.fr":true,"pharmacien.fr":true,"port.fr":true,"veterinaire.fr":true,"ga":true,"gb":true,"gd":true,"ge":true,"com.ge":true,"edu.ge":true,"gov.ge":true,"org.ge":true,"mil.ge":true,"net.ge":true,"pvt.ge":true,"gf":true,"gg":true,"co.gg":true,"net.gg":true,"org.gg":true,"gh":true,"com.gh":true,"edu.gh":true,"gov.gh":true,"org.gh":true,"mil.gh":true,"gi":true,"com.gi":true,"ltd.gi":true,"gov.gi":true,"mod.gi":true,"edu.gi":true,"org.gi":true,"gl":true,"co.gl":true,"com.gl":true,"edu.gl":true,"net.gl":true,"org.gl":true,"gm":true,"gn":true,"ac.gn":true,"com.gn":true,"edu.gn":true,"gov.gn":true,"org.gn":true,"net.gn":true,"gov":true,"gp":true,"com.gp":true,"net.gp":true,"mobi.gp":true,"edu.gp":true,"org.gp":true,"asso.gp":true,"gq":true,"gr":true,"com.gr":true,"edu.gr":true,"net.gr":true,"org.gr":true,"gov.gr":true,"gs":true,"gt":true,"com.gt":true,"edu.gt":true,"gob.gt":true,"ind.gt":true,"mil.gt":true,"net.gt":true,"org.gt":true,"*.gu":true,"gw":true,"gy":true,"co.gy":true,"com.gy":true,"edu.gy":true,"gov.gy":true,"net.gy":true,"org.gy":true,"hk":true,"com.hk":true,"edu.hk":true,"gov.hk":true,"idv.hk":true,"net.hk":true,"org.hk":true,"xn--55qx5d.hk":true,"xn--wcvs22d.hk":true,"xn--lcvr32d.hk":true,"xn--mxtq1m.hk":true,"xn--gmqw5a.hk":true,"xn--ciqpn.hk":true,"xn--gmq050i.hk":true,"xn--zf0avx.hk":true,"xn--io0a7i.hk":true,"xn--mk0axi.hk":true,"xn--od0alg.hk":true,"xn--od0aq3b.hk":true,"xn--tn0ag.hk":true,"xn--uc0atv.hk":true,"xn--uc0ay4a.hk":true,"hm":true,"hn":true,"com.hn":true,"edu.hn":true,"org.hn":true,"net.hn":true,"mil.hn":true,"gob.hn":true,"hr":true,"iz.hr":true,"from.hr":true,"name.hr":true,"com.hr":true,"ht":true,"com.ht":true,"shop.ht":true,"firm.ht":true,"info.ht":true,"adult.ht":true,"net.ht":true,"pro.ht":true,"org.ht":true,"med.ht":true,"art.ht":true,"coop.ht":true,"pol.ht":true,"asso.ht":true,"edu.ht":true,"rel.ht":true,"gouv.ht":true,"perso.ht":true,"hu":true,"co.hu":true,"info.hu":true,"org.hu":true,"priv.hu":true,"sport.hu":true,"tm.hu":true,"2000.hu":true,"agrar.hu":true,"bolt.hu":true,"casino.hu":true,"city.hu":true,"erotica.hu":true,"erotika.hu":true,"film.hu":true,"forum.hu":true,"games.hu":true,"hotel.hu":true,"ingatlan.hu":true,"jogasz.hu":true,"konyvelo.hu":true,"lakas.hu":true,"media.hu":true,"news.hu":true,"reklam.hu":true,"sex.hu":true,"shop.hu":true,"suli.hu":true,"szex.hu":true,"tozsde.hu":true,"utazas.hu":true,"video.hu":true,"id":true,"ac.id":true,"biz.id":true,"co.id":true,"desa.id":true,"go.id":true,"mil.id":true,"my.id":true,"net.id":true,"or.id":true,"sch.id":true,"web.id":true,"ie":true,"gov.ie":true,"il":true,"ac.il":true,"co.il":true,"gov.il":true,"idf.il":true,"k12.il":true,"muni.il":true,"net.il":true,"org.il":true,"im":true,"ac.im":true,"co.im":true,"com.im":true,"ltd.co.im":true,"net.im":true,"org.im":true,"plc.co.im":true,"tt.im":true,"tv.im":true,"in":true,"co.in":true,"firm.in":true,"net.in":true,"org.in":true,"gen.in":true,"ind.in":true,"nic.in":true,"ac.in":true,"edu.in":true,"res.in":true,"gov.in":true,"mil.in":true,"info":true,"int":true,"eu.int":true,"io":true,"com.io":true,"iq":true,"gov.iq":true,"edu.iq":true,"mil.iq":true,"com.iq":true,"org.iq":true,"net.iq":true,"ir":true,"ac.ir":true,"co.ir":true,"gov.ir":true,"id.ir":true,"net.ir":true,"org.ir":true,"sch.ir":true,"xn--mgba3a4f16a.ir":true,"xn--mgba3a4fra.ir":true,"is":true,"net.is":true,"com.is":true,"edu.is":true,"gov.is":true,"org.is":true,"int.is":true,"it":true,"gov.it":true,"edu.it":true,"abr.it":true,"abruzzo.it":true,"aosta-valley.it":true,"aostavalley.it":true,"bas.it":true,"basilicata.it":true,"cal.it":true,"calabria.it":true,"cam.it":true,"campania.it":true,"emilia-romagna.it":true,"emiliaromagna.it":true,"emr.it":true,"friuli-v-giulia.it":true,"friuli-ve-giulia.it":true,"friuli-vegiulia.it":true,"friuli-venezia-giulia.it":true,"friuli-veneziagiulia.it":true,"friuli-vgiulia.it":true,"friuliv-giulia.it":true,"friulive-giulia.it":true,"friulivegiulia.it":true,"friulivenezia-giulia.it":true,"friuliveneziagiulia.it":true,"friulivgiulia.it":true,"fvg.it":true,"laz.it":true,"lazio.it":true,"lig.it":true,"liguria.it":true,"lom.it":true,"lombardia.it":true,"lombardy.it":true,"lucania.it":true,"mar.it":true,"marche.it":true,"mol.it":true,"molise.it":true,"piedmont.it":true,"piemonte.it":true,"pmn.it":true,"pug.it":true,"puglia.it":true,"sar.it":true,"sardegna.it":true,"sardinia.it":true,"sic.it":true,"sicilia.it":true,"sicily.it":true,"taa.it":true,"tos.it":true,"toscana.it":true,"trentino-a-adige.it":true,"trentino-aadige.it":true,"trentino-alto-adige.it":true,"trentino-altoadige.it":true,"trentino-s-tirol.it":true,"trentino-stirol.it":true,"trentino-sud-tirol.it":true,"trentino-sudtirol.it":true,"trentino-sued-tirol.it":true,"trentino-suedtirol.it":true,"trentinoa-adige.it":true,"trentinoaadige.it":true,"trentinoalto-adige.it":true,"trentinoaltoadige.it":true,"trentinos-tirol.it":true,"trentinostirol.it":true,"trentinosud-tirol.it":true,"trentinosudtirol.it":true,"trentinosued-tirol.it":true,"trentinosuedtirol.it":true,"tuscany.it":true,"umb.it":true,"umbria.it":true,"val-d-aosta.it":true,"val-daosta.it":true,"vald-aosta.it":true,"valdaosta.it":true,"valle-aosta.it":true,"valle-d-aosta.it":true,"valle-daosta.it":true,"valleaosta.it":true,"valled-aosta.it":true,"valledaosta.it":true,"vallee-aoste.it":true,"valleeaoste.it":true,"vao.it":true,"vda.it":true,"ven.it":true,"veneto.it":true,"ag.it":true,"agrigento.it":true,"al.it":true,"alessandria.it":true,"alto-adige.it":true,"altoadige.it":true,"an.it":true,"ancona.it":true,"andria-barletta-trani.it":true,"andria-trani-barletta.it":true,"andriabarlettatrani.it":true,"andriatranibarletta.it":true,"ao.it":true,"aosta.it":true,"aoste.it":true,"ap.it":true,"aq.it":true,"aquila.it":true,"ar.it":true,"arezzo.it":true,"ascoli-piceno.it":true,"ascolipiceno.it":true,"asti.it":true,"at.it":true,"av.it":true,"avellino.it":true,"ba.it":true,"balsan.it":true,"bari.it":true,"barletta-trani-andria.it":true,"barlettatraniandria.it":true,"belluno.it":true,"benevento.it":true,"bergamo.it":true,"bg.it":true,"bi.it":true,"biella.it":true,"bl.it":true,"bn.it":true,"bo.it":true,"bologna.it":true,"bolzano.it":true,"bozen.it":true,"br.it":true,"brescia.it":true,"brindisi.it":true,"bs.it":true,"bt.it":true,"bz.it":true,"ca.it":true,"cagliari.it":true,"caltanissetta.it":true,"campidano-medio.it":true,"campidanomedio.it":true,"campobasso.it":true,"carbonia-iglesias.it":true,"carboniaiglesias.it":true,"carrara-massa.it":true,"carraramassa.it":true,"caserta.it":true,"catania.it":true,"catanzaro.it":true,"cb.it":true,"ce.it":true,"cesena-forli.it":true,"cesenaforli.it":true,"ch.it":true,"chieti.it":true,"ci.it":true,"cl.it":true,"cn.it":true,"co.it":true,"como.it":true,"cosenza.it":true,"cr.it":true,"cremona.it":true,"crotone.it":true,"cs.it":true,"ct.it":true,"cuneo.it":true,"cz.it":true,"dell-ogliastra.it":true,"dellogliastra.it":true,"en.it":true,"enna.it":true,"fc.it":true,"fe.it":true,"fermo.it":true,"ferrara.it":true,"fg.it":true,"fi.it":true,"firenze.it":true,"florence.it":true,"fm.it":true,"foggia.it":true,"forli-cesena.it":true,"forlicesena.it":true,"fr.it":true,"frosinone.it":true,"ge.it":true,"genoa.it":true,"genova.it":true,"go.it":true,"gorizia.it":true,"gr.it":true,"grosseto.it":true,"iglesias-carbonia.it":true,"iglesiascarbonia.it":true,"im.it":true,"imperia.it":true,"is.it":true,"isernia.it":true,"kr.it":true,"la-spezia.it":true,"laquila.it":true,"laspezia.it":true,"latina.it":true,"lc.it":true,"le.it":true,"lecce.it":true,"lecco.it":true,"li.it":true,"livorno.it":true,"lo.it":true,"lodi.it":true,"lt.it":true,"lu.it":true,"lucca.it":true,"macerata.it":true,"mantova.it":true,"massa-carrara.it":true,"massacarrara.it":true,"matera.it":true,"mb.it":true,"mc.it":true,"me.it":true,"medio-campidano.it":true,"mediocampidano.it":true,"messina.it":true,"mi.it":true,"milan.it":true,"milano.it":true,"mn.it":true,"mo.it":true,"modena.it":true,"monza-brianza.it":true,"monza-e-della-brianza.it":true,"monza.it":true,"monzabrianza.it":true,"monzaebrianza.it":true,"monzaedellabrianza.it":true,"ms.it":true,"mt.it":true,"na.it":true,"naples.it":true,"napoli.it":true,"no.it":true,"novara.it":true,"nu.it":true,"nuoro.it":true,"og.it":true,"ogliastra.it":true,"olbia-tempio.it":true,"olbiatempio.it":true,"or.it":true,"oristano.it":true,"ot.it":true,"pa.it":true,"padova.it":true,"padua.it":true,"palermo.it":true,"parma.it":true,"pavia.it":true,"pc.it":true,"pd.it":true,"pe.it":true,"perugia.it":true,"pesaro-urbino.it":true,"pesarourbino.it":true,"pescara.it":true,"pg.it":true,"pi.it":true,"piacenza.it":true,"pisa.it":true,"pistoia.it":true,"pn.it":true,"po.it":true,"pordenone.it":true,"potenza.it":true,"pr.it":true,"prato.it":true,"pt.it":true,"pu.it":true,"pv.it":true,"pz.it":true,"ra.it":true,"ragusa.it":true,"ravenna.it":true,"rc.it":true,"re.it":true,"reggio-calabria.it":true,"reggio-emilia.it":true,"reggiocalabria.it":true,"reggioemilia.it":true,"rg.it":true,"ri.it":true,"rieti.it":true,"rimini.it":true,"rm.it":true,"rn.it":true,"ro.it":true,"roma.it":true,"rome.it":true,"rovigo.it":true,"sa.it":true,"salerno.it":true,"sassari.it":true,"savona.it":true,"si.it":true,"siena.it":true,"siracusa.it":true,"so.it":true,"sondrio.it":true,"sp.it":true,"sr.it":true,"ss.it":true,"suedtirol.it":true,"sv.it":true,"ta.it":true,"taranto.it":true,"te.it":true,"tempio-olbia.it":true,"tempioolbia.it":true,"teramo.it":true,"terni.it":true,"tn.it":true,"to.it":true,"torino.it":true,"tp.it":true,"tr.it":true,"trani-andria-barletta.it":true,"trani-barletta-andria.it":true,"traniandriabarletta.it":true,"tranibarlettaandria.it":true,"trapani.it":true,"trentino.it":true,"trento.it":true,"treviso.it":true,"trieste.it":true,"ts.it":true,"turin.it":true,"tv.it":true,"ud.it":true,"udine.it":true,"urbino-pesaro.it":true,"urbinopesaro.it":true,"va.it":true,"varese.it":true,"vb.it":true,"vc.it":true,"ve.it":true,"venezia.it":true,"venice.it":true,"verbania.it":true,"vercelli.it":true,"verona.it":true,"vi.it":true,"vibo-valentia.it":true,"vibovalentia.it":true,"vicenza.it":true,"viterbo.it":true,"vr.it":true,"vs.it":true,"vt.it":true,"vv.it":true,"je":true,"co.je":true,"net.je":true,"org.je":true,"*.jm":true,"jo":true,"com.jo":true,"org.jo":true,"net.jo":true,"edu.jo":true,"sch.jo":true,"gov.jo":true,"mil.jo":true,"name.jo":true,"jobs":true,"jp":true,"ac.jp":true,"ad.jp":true,"co.jp":true,"ed.jp":true,"go.jp":true,"gr.jp":true,"lg.jp":true,"ne.jp":true,"or.jp":true,"aichi.jp":true,"akita.jp":true,"aomori.jp":true,"chiba.jp":true,"ehime.jp":true,"fukui.jp":true,"fukuoka.jp":true,"fukushima.jp":true,"gifu.jp":true,"gunma.jp":true,"hiroshima.jp":true,"hokkaido.jp":true,"hyogo.jp":true,"ibaraki.jp":true,"ishikawa.jp":true,"iwate.jp":true,"kagawa.jp":true,"kagoshima.jp":true,"kanagawa.jp":true,"kochi.jp":true,"kumamoto.jp":true,"kyoto.jp":true,"mie.jp":true,"miyagi.jp":true,"miyazaki.jp":true,"nagano.jp":true,"nagasaki.jp":true,"nara.jp":true,"niigata.jp":true,"oita.jp":true,"okayama.jp":true,"okinawa.jp":true,"osaka.jp":true,"saga.jp":true,"saitama.jp":true,"shiga.jp":true,"shimane.jp":true,"shizuoka.jp":true,"tochigi.jp":true,"tokushima.jp":true,"tokyo.jp":true,"tottori.jp":true,"toyama.jp":true,"wakayama.jp":true,"yamagata.jp":true,"yamaguchi.jp":true,"yamanashi.jp":true,"xn--4pvxs.jp":true,"xn--vgu402c.jp":true,"xn--c3s14m.jp":true,"xn--f6qx53a.jp":true,"xn--8pvr4u.jp":true,"xn--uist22h.jp":true,"xn--djrs72d6uy.jp":true,"xn--mkru45i.jp":true,"xn--0trq7p7nn.jp":true,"xn--8ltr62k.jp":true,"xn--2m4a15e.jp":true,"xn--efvn9s.jp":true,"xn--32vp30h.jp":true,"xn--4it797k.jp":true,"xn--1lqs71d.jp":true,"xn--5rtp49c.jp":true,"xn--5js045d.jp":true,"xn--ehqz56n.jp":true,"xn--1lqs03n.jp":true,"xn--qqqt11m.jp":true,"xn--kbrq7o.jp":true,"xn--pssu33l.jp":true,"xn--ntsq17g.jp":true,"xn--uisz3g.jp":true,"xn--6btw5a.jp":true,"xn--1ctwo.jp":true,"xn--6orx2r.jp":true,"xn--rht61e.jp":true,"xn--rht27z.jp":true,"xn--djty4k.jp":true,"xn--nit225k.jp":true,"xn--rht3d.jp":true,"xn--klty5x.jp":true,"xn--kltx9a.jp":true,"xn--kltp7d.jp":true,"xn--uuwu58a.jp":true,"xn--zbx025d.jp":true,"xn--ntso0iqx3a.jp":true,"xn--elqq16h.jp":true,"xn--4it168d.jp":true,"xn--klt787d.jp":true,"xn--rny31h.jp":true,"xn--7t0a264c.jp":true,"xn--5rtq34k.jp":true,"xn--k7yn95e.jp":true,"xn--tor131o.jp":true,"xn--d5qv7z876c.jp":true,"*.kawasaki.jp":true,"*.kitakyushu.jp":true,"*.kobe.jp":true,"*.nagoya.jp":true,"*.sapporo.jp":true,"*.sendai.jp":true,"*.yokohama.jp":true,"city.kawasaki.jp":false,"city.kitakyushu.jp":false,"city.kobe.jp":false,"city.nagoya.jp":false,"city.sapporo.jp":false,"city.sendai.jp":false,"city.yokohama.jp":false,"aisai.aichi.jp":true,"ama.aichi.jp":true,"anjo.aichi.jp":true,"asuke.aichi.jp":true,"chiryu.aichi.jp":true,"chita.aichi.jp":true,"fuso.aichi.jp":true,"gamagori.aichi.jp":true,"handa.aichi.jp":true,"hazu.aichi.jp":true,"hekinan.aichi.jp":true,"higashiura.aichi.jp":true,"ichinomiya.aichi.jp":true,"inazawa.aichi.jp":true,"inuyama.aichi.jp":true,"isshiki.aichi.jp":true,"iwakura.aichi.jp":true,"kanie.aichi.jp":true,"kariya.aichi.jp":true,"kasugai.aichi.jp":true,"kira.aichi.jp":true,"kiyosu.aichi.jp":true,"komaki.aichi.jp":true,"konan.aichi.jp":true,"kota.aichi.jp":true,"mihama.aichi.jp":true,"miyoshi.aichi.jp":true,"nishio.aichi.jp":true,"nisshin.aichi.jp":true,"obu.aichi.jp":true,"oguchi.aichi.jp":true,"oharu.aichi.jp":true,"okazaki.aichi.jp":true,"owariasahi.aichi.jp":true,"seto.aichi.jp":true,"shikatsu.aichi.jp":true,"shinshiro.aichi.jp":true,"shitara.aichi.jp":true,"tahara.aichi.jp":true,"takahama.aichi.jp":true,"tobishima.aichi.jp":true,"toei.aichi.jp":true,"togo.aichi.jp":true,"tokai.aichi.jp":true,"tokoname.aichi.jp":true,"toyoake.aichi.jp":true,"toyohashi.aichi.jp":true,"toyokawa.aichi.jp":true,"toyone.aichi.jp":true,"toyota.aichi.jp":true,"tsushima.aichi.jp":true,"yatomi.aichi.jp":true,"akita.akita.jp":true,"daisen.akita.jp":true,"fujisato.akita.jp":true,"gojome.akita.jp":true,"hachirogata.akita.jp":true,"happou.akita.jp":true,"higashinaruse.akita.jp":true,"honjo.akita.jp":true,"honjyo.akita.jp":true,"ikawa.akita.jp":true,"kamikoani.akita.jp":true,"kamioka.akita.jp":true,"katagami.akita.jp":true,"kazuno.akita.jp":true,"kitaakita.akita.jp":true,"kosaka.akita.jp":true,"kyowa.akita.jp":true,"misato.akita.jp":true,"mitane.akita.jp":true,"moriyoshi.akita.jp":true,"nikaho.akita.jp":true,"noshiro.akita.jp":true,"odate.akita.jp":true,"oga.akita.jp":true,"ogata.akita.jp":true,"semboku.akita.jp":true,"yokote.akita.jp":true,"yurihonjo.akita.jp":true,"aomori.aomori.jp":true,"gonohe.aomori.jp":true,"hachinohe.aomori.jp":true,"hashikami.aomori.jp":true,"hiranai.aomori.jp":true,"hirosaki.aomori.jp":true,"itayanagi.aomori.jp":true,"kuroishi.aomori.jp":true,"misawa.aomori.jp":true,"mutsu.aomori.jp":true,"nakadomari.aomori.jp":true,"noheji.aomori.jp":true,"oirase.aomori.jp":true,"owani.aomori.jp":true,"rokunohe.aomori.jp":true,"sannohe.aomori.jp":true,"shichinohe.aomori.jp":true,"shingo.aomori.jp":true,"takko.aomori.jp":true,"towada.aomori.jp":true,"tsugaru.aomori.jp":true,"tsuruta.aomori.jp":true,"abiko.chiba.jp":true,"asahi.chiba.jp":true,"chonan.chiba.jp":true,"chosei.chiba.jp":true,"choshi.chiba.jp":true,"chuo.chiba.jp":true,"funabashi.chiba.jp":true,"futtsu.chiba.jp":true,"hanamigawa.chiba.jp":true,"ichihara.chiba.jp":true,"ichikawa.chiba.jp":true,"ichinomiya.chiba.jp":true,"inzai.chiba.jp":true,"isumi.chiba.jp":true,"kamagaya.chiba.jp":true,"kamogawa.chiba.jp":true,"kashiwa.chiba.jp":true,"katori.chiba.jp":true,"katsuura.chiba.jp":true,"kimitsu.chiba.jp":true,"kisarazu.chiba.jp":true,"kozaki.chiba.jp":true,"kujukuri.chiba.jp":true,"kyonan.chiba.jp":true,"matsudo.chiba.jp":true,"midori.chiba.jp":true,"mihama.chiba.jp":true,"minamiboso.chiba.jp":true,"mobara.chiba.jp":true,"mutsuzawa.chiba.jp":true,"nagara.chiba.jp":true,"nagareyama.chiba.jp":true,"narashino.chiba.jp":true,"narita.chiba.jp":true,"noda.chiba.jp":true,"oamishirasato.chiba.jp":true,"omigawa.chiba.jp":true,"onjuku.chiba.jp":true,"otaki.chiba.jp":true,"sakae.chiba.jp":true,"sakura.chiba.jp":true,"shimofusa.chiba.jp":true,"shirako.chiba.jp":true,"shiroi.chiba.jp":true,"shisui.chiba.jp":true,"sodegaura.chiba.jp":true,"sosa.chiba.jp":true,"tako.chiba.jp":true,"tateyama.chiba.jp":true,"togane.chiba.jp":true,"tohnosho.chiba.jp":true,"tomisato.chiba.jp":true,"urayasu.chiba.jp":true,"yachimata.chiba.jp":true,"yachiyo.chiba.jp":true,"yokaichiba.chiba.jp":true,"yokoshibahikari.chiba.jp":true,"yotsukaido.chiba.jp":true,"ainan.ehime.jp":true,"honai.ehime.jp":true,"ikata.ehime.jp":true,"imabari.ehime.jp":true,"iyo.ehime.jp":true,"kamijima.ehime.jp":true,"kihoku.ehime.jp":true,"kumakogen.ehime.jp":true,"masaki.ehime.jp":true,"matsuno.ehime.jp":true,"matsuyama.ehime.jp":true,"namikata.ehime.jp":true,"niihama.ehime.jp":true,"ozu.ehime.jp":true,"saijo.ehime.jp":true,"seiyo.ehime.jp":true,"shikokuchuo.ehime.jp":true,"tobe.ehime.jp":true,"toon.ehime.jp":true,"uchiko.ehime.jp":true,"uwajima.ehime.jp":true,"yawatahama.ehime.jp":true,"echizen.fukui.jp":true,"eiheiji.fukui.jp":true,"fukui.fukui.jp":true,"ikeda.fukui.jp":true,"katsuyama.fukui.jp":true,"mihama.fukui.jp":true,"minamiechizen.fukui.jp":true,"obama.fukui.jp":true,"ohi.fukui.jp":true,"ono.fukui.jp":true,"sabae.fukui.jp":true,"sakai.fukui.jp":true,"takahama.fukui.jp":true,"tsuruga.fukui.jp":true,"wakasa.fukui.jp":true,"ashiya.fukuoka.jp":true,"buzen.fukuoka.jp":true,"chikugo.fukuoka.jp":true,"chikuho.fukuoka.jp":true,"chikujo.fukuoka.jp":true,"chikushino.fukuoka.jp":true,"chikuzen.fukuoka.jp":true,"chuo.fukuoka.jp":true,"dazaifu.fukuoka.jp":true,"fukuchi.fukuoka.jp":true,"hakata.fukuoka.jp":true,"higashi.fukuoka.jp":true,"hirokawa.fukuoka.jp":true,"hisayama.fukuoka.jp":true,"iizuka.fukuoka.jp":true,"inatsuki.fukuoka.jp":true,"kaho.fukuoka.jp":true,"kasuga.fukuoka.jp":true,"kasuya.fukuoka.jp":true,"kawara.fukuoka.jp":true,"keisen.fukuoka.jp":true,"koga.fukuoka.jp":true,"kurate.fukuoka.jp":true,"kurogi.fukuoka.jp":true,"kurume.fukuoka.jp":true,"minami.fukuoka.jp":true,"miyako.fukuoka.jp":true,"miyama.fukuoka.jp":true,"miyawaka.fukuoka.jp":true,"mizumaki.fukuoka.jp":true,"munakata.fukuoka.jp":true,"nakagawa.fukuoka.jp":true,"nakama.fukuoka.jp":true,"nishi.fukuoka.jp":true,"nogata.fukuoka.jp":true,"ogori.fukuoka.jp":true,"okagaki.fukuoka.jp":true,"okawa.fukuoka.jp":true,"oki.fukuoka.jp":true,"omuta.fukuoka.jp":true,"onga.fukuoka.jp":true,"onojo.fukuoka.jp":true,"oto.fukuoka.jp":true,"saigawa.fukuoka.jp":true,"sasaguri.fukuoka.jp":true,"shingu.fukuoka.jp":true,"shinyoshitomi.fukuoka.jp":true,"shonai.fukuoka.jp":true,"soeda.fukuoka.jp":true,"sue.fukuoka.jp":true,"tachiarai.fukuoka.jp":true,"tagawa.fukuoka.jp":true,"takata.fukuoka.jp":true,"toho.fukuoka.jp":true,"toyotsu.fukuoka.jp":true,"tsuiki.fukuoka.jp":true,"ukiha.fukuoka.jp":true,"umi.fukuoka.jp":true,"usui.fukuoka.jp":true,"yamada.fukuoka.jp":true,"yame.fukuoka.jp":true,"yanagawa.fukuoka.jp":true,"yukuhashi.fukuoka.jp":true,"aizubange.fukushima.jp":true,"aizumisato.fukushima.jp":true,"aizuwakamatsu.fukushima.jp":true,"asakawa.fukushima.jp":true,"bandai.fukushima.jp":true,"date.fukushima.jp":true,"fukushima.fukushima.jp":true,"furudono.fukushima.jp":true,"futaba.fukushima.jp":true,"hanawa.fukushima.jp":true,"higashi.fukushima.jp":true,"hirata.fukushima.jp":true,"hirono.fukushima.jp":true,"iitate.fukushima.jp":true,"inawashiro.fukushima.jp":true,"ishikawa.fukushima.jp":true,"iwaki.fukushima.jp":true,"izumizaki.fukushima.jp":true,"kagamiishi.fukushima.jp":true,"kaneyama.fukushima.jp":true,"kawamata.fukushima.jp":true,"kitakata.fukushima.jp":true,"kitashiobara.fukushima.jp":true,"koori.fukushima.jp":true,"koriyama.fukushima.jp":true,"kunimi.fukushima.jp":true,"miharu.fukushima.jp":true,"mishima.fukushima.jp":true,"namie.fukushima.jp":true,"nango.fukushima.jp":true,"nishiaizu.fukushima.jp":true,"nishigo.fukushima.jp":true,"okuma.fukushima.jp":true,"omotego.fukushima.jp":true,"ono.fukushima.jp":true,"otama.fukushima.jp":true,"samegawa.fukushima.jp":true,"shimogo.fukushima.jp":true,"shirakawa.fukushima.jp":true,"showa.fukushima.jp":true,"soma.fukushima.jp":true,"sukagawa.fukushima.jp":true,"taishin.fukushima.jp":true,"tamakawa.fukushima.jp":true,"tanagura.fukushima.jp":true,"tenei.fukushima.jp":true,"yabuki.fukushima.jp":true,"yamato.fukushima.jp":true,"yamatsuri.fukushima.jp":true,"yanaizu.fukushima.jp":true,"yugawa.fukushima.jp":true,"anpachi.gifu.jp":true,"ena.gifu.jp":true,"gifu.gifu.jp":true,"ginan.gifu.jp":true,"godo.gifu.jp":true,"gujo.gifu.jp":true,"hashima.gifu.jp":true,"hichiso.gifu.jp":true,"hida.gifu.jp":true,"higashishirakawa.gifu.jp":true,"ibigawa.gifu.jp":true,"ikeda.gifu.jp":true,"kakamigahara.gifu.jp":true,"kani.gifu.jp":true,"kasahara.gifu.jp":true,"kasamatsu.gifu.jp":true,"kawaue.gifu.jp":true,"kitagata.gifu.jp":true,"mino.gifu.jp":true,"minokamo.gifu.jp":true,"mitake.gifu.jp":true,"mizunami.gifu.jp":true,"motosu.gifu.jp":true,"nakatsugawa.gifu.jp":true,"ogaki.gifu.jp":true,"sakahogi.gifu.jp":true,"seki.gifu.jp":true,"sekigahara.gifu.jp":true,"shirakawa.gifu.jp":true,"tajimi.gifu.jp":true,"takayama.gifu.jp":true,"tarui.gifu.jp":true,"toki.gifu.jp":true,"tomika.gifu.jp":true,"wanouchi.gifu.jp":true,"yamagata.gifu.jp":true,"yaotsu.gifu.jp":true,"yoro.gifu.jp":true,"annaka.gunma.jp":true,"chiyoda.gunma.jp":true,"fujioka.gunma.jp":true,"higashiagatsuma.gunma.jp":true,"isesaki.gunma.jp":true,"itakura.gunma.jp":true,"kanna.gunma.jp":true,"kanra.gunma.jp":true,"katashina.gunma.jp":true,"kawaba.gunma.jp":true,"kiryu.gunma.jp":true,"kusatsu.gunma.jp":true,"maebashi.gunma.jp":true,"meiwa.gunma.jp":true,"midori.gunma.jp":true,"minakami.gunma.jp":true,"naganohara.gunma.jp":true,"nakanojo.gunma.jp":true,"nanmoku.gunma.jp":true,"numata.gunma.jp":true,"oizumi.gunma.jp":true,"ora.gunma.jp":true,"ota.gunma.jp":true,"shibukawa.gunma.jp":true,"shimonita.gunma.jp":true,"shinto.gunma.jp":true,"showa.gunma.jp":true,"takasaki.gunma.jp":true,"takayama.gunma.jp":true,"tamamura.gunma.jp":true,"tatebayashi.gunma.jp":true,"tomioka.gunma.jp":true,"tsukiyono.gunma.jp":true,"tsumagoi.gunma.jp":true,"ueno.gunma.jp":true,"yoshioka.gunma.jp":true,"asaminami.hiroshima.jp":true,"daiwa.hiroshima.jp":true,"etajima.hiroshima.jp":true,"fuchu.hiroshima.jp":true,"fukuyama.hiroshima.jp":true,"hatsukaichi.hiroshima.jp":true,"higashihiroshima.hiroshima.jp":true,"hongo.hiroshima.jp":true,"jinsekikogen.hiroshima.jp":true,"kaita.hiroshima.jp":true,"kui.hiroshima.jp":true,"kumano.hiroshima.jp":true,"kure.hiroshima.jp":true,"mihara.hiroshima.jp":true,"miyoshi.hiroshima.jp":true,"naka.hiroshima.jp":true,"onomichi.hiroshima.jp":true,"osakikamijima.hiroshima.jp":true,"otake.hiroshima.jp":true,"saka.hiroshima.jp":true,"sera.hiroshima.jp":true,"seranishi.hiroshima.jp":true,"shinichi.hiroshima.jp":true,"shobara.hiroshima.jp":true,"takehara.hiroshima.jp":true,"abashiri.hokkaido.jp":true,"abira.hokkaido.jp":true,"aibetsu.hokkaido.jp":true,"akabira.hokkaido.jp":true,"akkeshi.hokkaido.jp":true,"asahikawa.hokkaido.jp":true,"ashibetsu.hokkaido.jp":true,"ashoro.hokkaido.jp":true,"assabu.hokkaido.jp":true,"atsuma.hokkaido.jp":true,"bibai.hokkaido.jp":true,"biei.hokkaido.jp":true,"bifuka.hokkaido.jp":true,"bihoro.hokkaido.jp":true,"biratori.hokkaido.jp":true,"chippubetsu.hokkaido.jp":true,"chitose.hokkaido.jp":true,"date.hokkaido.jp":true,"ebetsu.hokkaido.jp":true,"embetsu.hokkaido.jp":true,"eniwa.hokkaido.jp":true,"erimo.hokkaido.jp":true,"esan.hokkaido.jp":true,"esashi.hokkaido.jp":true,"fukagawa.hokkaido.jp":true,"fukushima.hokkaido.jp":true,"furano.hokkaido.jp":true,"furubira.hokkaido.jp":true,"haboro.hokkaido.jp":true,"hakodate.hokkaido.jp":true,"hamatonbetsu.hokkaido.jp":true,"hidaka.hokkaido.jp":true,"higashikagura.hokkaido.jp":true,"higashikawa.hokkaido.jp":true,"hiroo.hokkaido.jp":true,"hokuryu.hokkaido.jp":true,"hokuto.hokkaido.jp":true,"honbetsu.hokkaido.jp":true,"horokanai.hokkaido.jp":true,"horonobe.hokkaido.jp":true,"ikeda.hokkaido.jp":true,"imakane.hokkaido.jp":true,"ishikari.hokkaido.jp":true,"iwamizawa.hokkaido.jp":true,"iwanai.hokkaido.jp":true,"kamifurano.hokkaido.jp":true,"kamikawa.hokkaido.jp":true,"kamishihoro.hokkaido.jp":true,"kamisunagawa.hokkaido.jp":true,"kamoenai.hokkaido.jp":true,"kayabe.hokkaido.jp":true,"kembuchi.hokkaido.jp":true,"kikonai.hokkaido.jp":true,"kimobetsu.hokkaido.jp":true,"kitahiroshima.hokkaido.jp":true,"kitami.hokkaido.jp":true,"kiyosato.hokkaido.jp":true,"koshimizu.hokkaido.jp":true,"kunneppu.hokkaido.jp":true,"kuriyama.hokkaido.jp":true,"kuromatsunai.hokkaido.jp":true,"kushiro.hokkaido.jp":true,"kutchan.hokkaido.jp":true,"kyowa.hokkaido.jp":true,"mashike.hokkaido.jp":true,"matsumae.hokkaido.jp":true,"mikasa.hokkaido.jp":true,"minamifurano.hokkaido.jp":true,"mombetsu.hokkaido.jp":true,"moseushi.hokkaido.jp":true,"mukawa.hokkaido.jp":true,"muroran.hokkaido.jp":true,"naie.hokkaido.jp":true,"nakagawa.hokkaido.jp":true,"nakasatsunai.hokkaido.jp":true,"nakatombetsu.hokkaido.jp":true,"nanae.hokkaido.jp":true,"nanporo.hokkaido.jp":true,"nayoro.hokkaido.jp":true,"nemuro.hokkaido.jp":true,"niikappu.hokkaido.jp":true,"niki.hokkaido.jp":true,"nishiokoppe.hokkaido.jp":true,"noboribetsu.hokkaido.jp":true,"numata.hokkaido.jp":true,"obihiro.hokkaido.jp":true,"obira.hokkaido.jp":true,"oketo.hokkaido.jp":true,"okoppe.hokkaido.jp":true,"otaru.hokkaido.jp":true,"otobe.hokkaido.jp":true,"otofuke.hokkaido.jp":true,"otoineppu.hokkaido.jp":true,"oumu.hokkaido.jp":true,"ozora.hokkaido.jp":true,"pippu.hokkaido.jp":true,"rankoshi.hokkaido.jp":true,"rebun.hokkaido.jp":true,"rikubetsu.hokkaido.jp":true,"rishiri.hokkaido.jp":true,"rishirifuji.hokkaido.jp":true,"saroma.hokkaido.jp":true,"sarufutsu.hokkaido.jp":true,"shakotan.hokkaido.jp":true,"shari.hokkaido.jp":true,"shibecha.hokkaido.jp":true,"shibetsu.hokkaido.jp":true,"shikabe.hokkaido.jp":true,"shikaoi.hokkaido.jp":true,"shimamaki.hokkaido.jp":true,"shimizu.hokkaido.jp":true,"shimokawa.hokkaido.jp":true,"shinshinotsu.hokkaido.jp":true,"shintoku.hokkaido.jp":true,"shiranuka.hokkaido.jp":true,"shiraoi.hokkaido.jp":true,"shiriuchi.hokkaido.jp":true,"sobetsu.hokkaido.jp":true,"sunagawa.hokkaido.jp":true,"taiki.hokkaido.jp":true,"takasu.hokkaido.jp":true,"takikawa.hokkaido.jp":true,"takinoue.hokkaido.jp":true,"teshikaga.hokkaido.jp":true,"tobetsu.hokkaido.jp":true,"tohma.hokkaido.jp":true,"tomakomai.hokkaido.jp":true,"tomari.hokkaido.jp":true,"toya.hokkaido.jp":true,"toyako.hokkaido.jp":true,"toyotomi.hokkaido.jp":true,"toyoura.hokkaido.jp":true,"tsubetsu.hokkaido.jp":true,"tsukigata.hokkaido.jp":true,"urakawa.hokkaido.jp":true,"urausu.hokkaido.jp":true,"uryu.hokkaido.jp":true,"utashinai.hokkaido.jp":true,"wakkanai.hokkaido.jp":true,"wassamu.hokkaido.jp":true,"yakumo.hokkaido.jp":true,"yoichi.hokkaido.jp":true,"aioi.hyogo.jp":true,"akashi.hyogo.jp":true,"ako.hyogo.jp":true,"amagasaki.hyogo.jp":true,"aogaki.hyogo.jp":true,"asago.hyogo.jp":true,"ashiya.hyogo.jp":true,"awaji.hyogo.jp":true,"fukusaki.hyogo.jp":true,"goshiki.hyogo.jp":true,"harima.hyogo.jp":true,"himeji.hyogo.jp":true,"ichikawa.hyogo.jp":true,"inagawa.hyogo.jp":true,"itami.hyogo.jp":true,"kakogawa.hyogo.jp":true,"kamigori.hyogo.jp":true,"kamikawa.hyogo.jp":true,"kasai.hyogo.jp":true,"kasuga.hyogo.jp":true,"kawanishi.hyogo.jp":true,"miki.hyogo.jp":true,"minamiawaji.hyogo.jp":true,"nishinomiya.hyogo.jp":true,"nishiwaki.hyogo.jp":true,"ono.hyogo.jp":true,"sanda.hyogo.jp":true,"sannan.hyogo.jp":true,"sasayama.hyogo.jp":true,"sayo.hyogo.jp":true,"shingu.hyogo.jp":true,"shinonsen.hyogo.jp":true,"shiso.hyogo.jp":true,"sumoto.hyogo.jp":true,"taishi.hyogo.jp":true,"taka.hyogo.jp":true,"takarazuka.hyogo.jp":true,"takasago.hyogo.jp":true,"takino.hyogo.jp":true,"tamba.hyogo.jp":true,"tatsuno.hyogo.jp":true,"toyooka.hyogo.jp":true,"yabu.hyogo.jp":true,"yashiro.hyogo.jp":true,"yoka.hyogo.jp":true,"yokawa.hyogo.jp":true,"ami.ibaraki.jp":true,"asahi.ibaraki.jp":true,"bando.ibaraki.jp":true,"chikusei.ibaraki.jp":true,"daigo.ibaraki.jp":true,"fujishiro.ibaraki.jp":true,"hitachi.ibaraki.jp":true,"hitachinaka.ibaraki.jp":true,"hitachiomiya.ibaraki.jp":true,"hitachiota.ibaraki.jp":true,"ibaraki.ibaraki.jp":true,"ina.ibaraki.jp":true,"inashiki.ibaraki.jp":true,"itako.ibaraki.jp":true,"iwama.ibaraki.jp":true,"joso.ibaraki.jp":true,"kamisu.ibaraki.jp":true,"kasama.ibaraki.jp":true,"kashima.ibaraki.jp":true,"kasumigaura.ibaraki.jp":true,"koga.ibaraki.jp":true,"miho.ibaraki.jp":true,"mito.ibaraki.jp":true,"moriya.ibaraki.jp":true,"naka.ibaraki.jp":true,"namegata.ibaraki.jp":true,"oarai.ibaraki.jp":true,"ogawa.ibaraki.jp":true,"omitama.ibaraki.jp":true,"ryugasaki.ibaraki.jp":true,"sakai.ibaraki.jp":true,"sakuragawa.ibaraki.jp":true,"shimodate.ibaraki.jp":true,"shimotsuma.ibaraki.jp":true,"shirosato.ibaraki.jp":true,"sowa.ibaraki.jp":true,"suifu.ibaraki.jp":true,"takahagi.ibaraki.jp":true,"tamatsukuri.ibaraki.jp":true,"tokai.ibaraki.jp":true,"tomobe.ibaraki.jp":true,"tone.ibaraki.jp":true,"toride.ibaraki.jp":true,"tsuchiura.ibaraki.jp":true,"tsukuba.ibaraki.jp":true,"uchihara.ibaraki.jp":true,"ushiku.ibaraki.jp":true,"yachiyo.ibaraki.jp":true,"yamagata.ibaraki.jp":true,"yawara.ibaraki.jp":true,"yuki.ibaraki.jp":true,"anamizu.ishikawa.jp":true,"hakui.ishikawa.jp":true,"hakusan.ishikawa.jp":true,"kaga.ishikawa.jp":true,"kahoku.ishikawa.jp":true,"kanazawa.ishikawa.jp":true,"kawakita.ishikawa.jp":true,"komatsu.ishikawa.jp":true,"nakanoto.ishikawa.jp":true,"nanao.ishikawa.jp":true,"nomi.ishikawa.jp":true,"nonoichi.ishikawa.jp":true,"noto.ishikawa.jp":true,"shika.ishikawa.jp":true,"suzu.ishikawa.jp":true,"tsubata.ishikawa.jp":true,"tsurugi.ishikawa.jp":true,"uchinada.ishikawa.jp":true,"wajima.ishikawa.jp":true,"fudai.iwate.jp":true,"fujisawa.iwate.jp":true,"hanamaki.iwate.jp":true,"hiraizumi.iwate.jp":true,"hirono.iwate.jp":true,"ichinohe.iwate.jp":true,"ichinoseki.iwate.jp":true,"iwaizumi.iwate.jp":true,"iwate.iwate.jp":true,"joboji.iwate.jp":true,"kamaishi.iwate.jp":true,"kanegasaki.iwate.jp":true,"karumai.iwate.jp":true,"kawai.iwate.jp":true,"kitakami.iwate.jp":true,"kuji.iwate.jp":true,"kunohe.iwate.jp":true,"kuzumaki.iwate.jp":true,"miyako.iwate.jp":true,"mizusawa.iwate.jp":true,"morioka.iwate.jp":true,"ninohe.iwate.jp":true,"noda.iwate.jp":true,"ofunato.iwate.jp":true,"oshu.iwate.jp":true,"otsuchi.iwate.jp":true,"rikuzentakata.iwate.jp":true,"shiwa.iwate.jp":true,"shizukuishi.iwate.jp":true,"sumita.iwate.jp":true,"tanohata.iwate.jp":true,"tono.iwate.jp":true,"yahaba.iwate.jp":true,"yamada.iwate.jp":true,"ayagawa.kagawa.jp":true,"higashikagawa.kagawa.jp":true,"kanonji.kagawa.jp":true,"kotohira.kagawa.jp":true,"manno.kagawa.jp":true,"marugame.kagawa.jp":true,"mitoyo.kagawa.jp":true,"naoshima.kagawa.jp":true,"sanuki.kagawa.jp":true,"tadotsu.kagawa.jp":true,"takamatsu.kagawa.jp":true,"tonosho.kagawa.jp":true,"uchinomi.kagawa.jp":true,"utazu.kagawa.jp":true,"zentsuji.kagawa.jp":true,"akune.kagoshima.jp":true,"amami.kagoshima.jp":true,"hioki.kagoshima.jp":true,"isa.kagoshima.jp":true,"isen.kagoshima.jp":true,"izumi.kagoshima.jp":true,"kagoshima.kagoshima.jp":true,"kanoya.kagoshima.jp":true,"kawanabe.kagoshima.jp":true,"kinko.kagoshima.jp":true,"kouyama.kagoshima.jp":true,"makurazaki.kagoshima.jp":true,"matsumoto.kagoshima.jp":true,"minamitane.kagoshima.jp":true,"nakatane.kagoshima.jp":true,"nishinoomote.kagoshima.jp":true,"satsumasendai.kagoshima.jp":true,"soo.kagoshima.jp":true,"tarumizu.kagoshima.jp":true,"yusui.kagoshima.jp":true,"aikawa.kanagawa.jp":true,"atsugi.kanagawa.jp":true,"ayase.kanagawa.jp":true,"chigasaki.kanagawa.jp":true,"ebina.kanagawa.jp":true,"fujisawa.kanagawa.jp":true,"hadano.kanagawa.jp":true,"hakone.kanagawa.jp":true,"hiratsuka.kanagawa.jp":true,"isehara.kanagawa.jp":true,"kaisei.kanagawa.jp":true,"kamakura.kanagawa.jp":true,"kiyokawa.kanagawa.jp":true,"matsuda.kanagawa.jp":true,"minamiashigara.kanagawa.jp":true,"miura.kanagawa.jp":true,"nakai.kanagawa.jp":true,"ninomiya.kanagawa.jp":true,"odawara.kanagawa.jp":true,"oi.kanagawa.jp":true,"oiso.kanagawa.jp":true,"sagamihara.kanagawa.jp":true,"samukawa.kanagawa.jp":true,"tsukui.kanagawa.jp":true,"yamakita.kanagawa.jp":true,"yamato.kanagawa.jp":true,"yokosuka.kanagawa.jp":true,"yugawara.kanagawa.jp":true,"zama.kanagawa.jp":true,"zushi.kanagawa.jp":true,"aki.kochi.jp":true,"geisei.kochi.jp":true,"hidaka.kochi.jp":true,"higashitsuno.kochi.jp":true,"ino.kochi.jp":true,"kagami.kochi.jp":true,"kami.kochi.jp":true,"kitagawa.kochi.jp":true,"kochi.kochi.jp":true,"mihara.kochi.jp":true,"motoyama.kochi.jp":true,"muroto.kochi.jp":true,"nahari.kochi.jp":true,"nakamura.kochi.jp":true,"nankoku.kochi.jp":true,"nishitosa.kochi.jp":true,"niyodogawa.kochi.jp":true,"ochi.kochi.jp":true,"okawa.kochi.jp":true,"otoyo.kochi.jp":true,"otsuki.kochi.jp":true,"sakawa.kochi.jp":true,"sukumo.kochi.jp":true,"susaki.kochi.jp":true,"tosa.kochi.jp":true,"tosashimizu.kochi.jp":true,"toyo.kochi.jp":true,"tsuno.kochi.jp":true,"umaji.kochi.jp":true,"yasuda.kochi.jp":true,"yusuhara.kochi.jp":true,"amakusa.kumamoto.jp":true,"arao.kumamoto.jp":true,"aso.kumamoto.jp":true,"choyo.kumamoto.jp":true,"gyokuto.kumamoto.jp":true,"kamiamakusa.kumamoto.jp":true,"kikuchi.kumamoto.jp":true,"kumamoto.kumamoto.jp":true,"mashiki.kumamoto.jp":true,"mifune.kumamoto.jp":true,"minamata.kumamoto.jp":true,"minamioguni.kumamoto.jp":true,"nagasu.kumamoto.jp":true,"nishihara.kumamoto.jp":true,"oguni.kumamoto.jp":true,"ozu.kumamoto.jp":true,"sumoto.kumamoto.jp":true,"takamori.kumamoto.jp":true,"uki.kumamoto.jp":true,"uto.kumamoto.jp":true,"yamaga.kumamoto.jp":true,"yamato.kumamoto.jp":true,"yatsushiro.kumamoto.jp":true,"ayabe.kyoto.jp":true,"fukuchiyama.kyoto.jp":true,"higashiyama.kyoto.jp":true,"ide.kyoto.jp":true,"ine.kyoto.jp":true,"joyo.kyoto.jp":true,"kameoka.kyoto.jp":true,"kamo.kyoto.jp":true,"kita.kyoto.jp":true,"kizu.kyoto.jp":true,"kumiyama.kyoto.jp":true,"kyotamba.kyoto.jp":true,"kyotanabe.kyoto.jp":true,"kyotango.kyoto.jp":true,"maizuru.kyoto.jp":true,"minami.kyoto.jp":true,"minamiyamashiro.kyoto.jp":true,"miyazu.kyoto.jp":true,"muko.kyoto.jp":true,"nagaokakyo.kyoto.jp":true,"nakagyo.kyoto.jp":true,"nantan.kyoto.jp":true,"oyamazaki.kyoto.jp":true,"sakyo.kyoto.jp":true,"seika.kyoto.jp":true,"tanabe.kyoto.jp":true,"uji.kyoto.jp":true,"ujitawara.kyoto.jp":true,"wazuka.kyoto.jp":true,"yamashina.kyoto.jp":true,"yawata.kyoto.jp":true,"asahi.mie.jp":true,"inabe.mie.jp":true,"ise.mie.jp":true,"kameyama.mie.jp":true,"kawagoe.mie.jp":true,"kiho.mie.jp":true,"kisosaki.mie.jp":true,"kiwa.mie.jp":true,"komono.mie.jp":true,"kumano.mie.jp":true,"kuwana.mie.jp":true,"matsusaka.mie.jp":true,"meiwa.mie.jp":true,"mihama.mie.jp":true,"minamiise.mie.jp":true,"misugi.mie.jp":true,"miyama.mie.jp":true,"nabari.mie.jp":true,"shima.mie.jp":true,"suzuka.mie.jp":true,"tado.mie.jp":true,"taiki.mie.jp":true,"taki.mie.jp":true,"tamaki.mie.jp":true,"toba.mie.jp":true,"tsu.mie.jp":true,"udono.mie.jp":true,"ureshino.mie.jp":true,"watarai.mie.jp":true,"yokkaichi.mie.jp":true,"furukawa.miyagi.jp":true,"higashimatsushima.miyagi.jp":true,"ishinomaki.miyagi.jp":true,"iwanuma.miyagi.jp":true,"kakuda.miyagi.jp":true,"kami.miyagi.jp":true,"kawasaki.miyagi.jp":true,"marumori.miyagi.jp":true,"matsushima.miyagi.jp":true,"minamisanriku.miyagi.jp":true,"misato.miyagi.jp":true,"murata.miyagi.jp":true,"natori.miyagi.jp":true,"ogawara.miyagi.jp":true,"ohira.miyagi.jp":true,"onagawa.miyagi.jp":true,"osaki.miyagi.jp":true,"rifu.miyagi.jp":true,"semine.miyagi.jp":true,"shibata.miyagi.jp":true,"shichikashuku.miyagi.jp":true,"shikama.miyagi.jp":true,"shiogama.miyagi.jp":true,"shiroishi.miyagi.jp":true,"tagajo.miyagi.jp":true,"taiwa.miyagi.jp":true,"tome.miyagi.jp":true,"tomiya.miyagi.jp":true,"wakuya.miyagi.jp":true,"watari.miyagi.jp":true,"yamamoto.miyagi.jp":true,"zao.miyagi.jp":true,"aya.miyazaki.jp":true,"ebino.miyazaki.jp":true,"gokase.miyazaki.jp":true,"hyuga.miyazaki.jp":true,"kadogawa.miyazaki.jp":true,"kawaminami.miyazaki.jp":true,"kijo.miyazaki.jp":true,"kitagawa.miyazaki.jp":true,"kitakata.miyazaki.jp":true,"kitaura.miyazaki.jp":true,"kobayashi.miyazaki.jp":true,"kunitomi.miyazaki.jp":true,"kushima.miyazaki.jp":true,"mimata.miyazaki.jp":true,"miyakonojo.miyazaki.jp":true,"miyazaki.miyazaki.jp":true,"morotsuka.miyazaki.jp":true,"nichinan.miyazaki.jp":true,"nishimera.miyazaki.jp":true,"nobeoka.miyazaki.jp":true,"saito.miyazaki.jp":true,"shiiba.miyazaki.jp":true,"shintomi.miyazaki.jp":true,"takaharu.miyazaki.jp":true,"takanabe.miyazaki.jp":true,"takazaki.miyazaki.jp":true,"tsuno.miyazaki.jp":true,"achi.nagano.jp":true,"agematsu.nagano.jp":true,"anan.nagano.jp":true,"aoki.nagano.jp":true,"asahi.nagano.jp":true,"azumino.nagano.jp":true,"chikuhoku.nagano.jp":true,"chikuma.nagano.jp":true,"chino.nagano.jp":true,"fujimi.nagano.jp":true,"hakuba.nagano.jp":true,"hara.nagano.jp":true,"hiraya.nagano.jp":true,"iida.nagano.jp":true,"iijima.nagano.jp":true,"iiyama.nagano.jp":true,"iizuna.nagano.jp":true,"ikeda.nagano.jp":true,"ikusaka.nagano.jp":true,"ina.nagano.jp":true,"karuizawa.nagano.jp":true,"kawakami.nagano.jp":true,"kiso.nagano.jp":true,"kisofukushima.nagano.jp":true,"kitaaiki.nagano.jp":true,"komagane.nagano.jp":true,"komoro.nagano.jp":true,"matsukawa.nagano.jp":true,"matsumoto.nagano.jp":true,"miasa.nagano.jp":true,"minamiaiki.nagano.jp":true,"minamimaki.nagano.jp":true,"minamiminowa.nagano.jp":true,"minowa.nagano.jp":true,"miyada.nagano.jp":true,"miyota.nagano.jp":true,"mochizuki.nagano.jp":true,"nagano.nagano.jp":true,"nagawa.nagano.jp":true,"nagiso.nagano.jp":true,"nakagawa.nagano.jp":true,"nakano.nagano.jp":true,"nozawaonsen.nagano.jp":true,"obuse.nagano.jp":true,"ogawa.nagano.jp":true,"okaya.nagano.jp":true,"omachi.nagano.jp":true,"omi.nagano.jp":true,"ookuwa.nagano.jp":true,"ooshika.nagano.jp":true,"otaki.nagano.jp":true,"otari.nagano.jp":true,"sakae.nagano.jp":true,"sakaki.nagano.jp":true,"saku.nagano.jp":true,"sakuho.nagano.jp":true,"shimosuwa.nagano.jp":true,"shinanomachi.nagano.jp":true,"shiojiri.nagano.jp":true,"suwa.nagano.jp":true,"suzaka.nagano.jp":true,"takagi.nagano.jp":true,"takamori.nagano.jp":true,"takayama.nagano.jp":true,"tateshina.nagano.jp":true,"tatsuno.nagano.jp":true,"togakushi.nagano.jp":true,"togura.nagano.jp":true,"tomi.nagano.jp":true,"ueda.nagano.jp":true,"wada.nagano.jp":true,"yamagata.nagano.jp":true,"yamanouchi.nagano.jp":true,"yasaka.nagano.jp":true,"yasuoka.nagano.jp":true,"chijiwa.nagasaki.jp":true,"futsu.nagasaki.jp":true,"goto.nagasaki.jp":true,"hasami.nagasaki.jp":true,"hirado.nagasaki.jp":true,"iki.nagasaki.jp":true,"isahaya.nagasaki.jp":true,"kawatana.nagasaki.jp":true,"kuchinotsu.nagasaki.jp":true,"matsuura.nagasaki.jp":true,"nagasaki.nagasaki.jp":true,"obama.nagasaki.jp":true,"omura.nagasaki.jp":true,"oseto.nagasaki.jp":true,"saikai.nagasaki.jp":true,"sasebo.nagasaki.jp":true,"seihi.nagasaki.jp":true,"shimabara.nagasaki.jp":true,"shinkamigoto.nagasaki.jp":true,"togitsu.nagasaki.jp":true,"tsushima.nagasaki.jp":true,"unzen.nagasaki.jp":true,"ando.nara.jp":true,"gose.nara.jp":true,"heguri.nara.jp":true,"higashiyoshino.nara.jp":true,"ikaruga.nara.jp":true,"ikoma.nara.jp":true,"kamikitayama.nara.jp":true,"kanmaki.nara.jp":true,"kashiba.nara.jp":true,"kashihara.nara.jp":true,"katsuragi.nara.jp":true,"kawai.nara.jp":true,"kawakami.nara.jp":true,"kawanishi.nara.jp":true,"koryo.nara.jp":true,"kurotaki.nara.jp":true,"mitsue.nara.jp":true,"miyake.nara.jp":true,"nara.nara.jp":true,"nosegawa.nara.jp":true,"oji.nara.jp":true,"ouda.nara.jp":true,"oyodo.nara.jp":true,"sakurai.nara.jp":true,"sango.nara.jp":true,"shimoichi.nara.jp":true,"shimokitayama.nara.jp":true,"shinjo.nara.jp":true,"soni.nara.jp":true,"takatori.nara.jp":true,"tawaramoto.nara.jp":true,"tenkawa.nara.jp":true,"tenri.nara.jp":true,"uda.nara.jp":true,"yamatokoriyama.nara.jp":true,"yamatotakada.nara.jp":true,"yamazoe.nara.jp":true,"yoshino.nara.jp":true,"aga.niigata.jp":true,"agano.niigata.jp":true,"gosen.niigata.jp":true,"itoigawa.niigata.jp":true,"izumozaki.niigata.jp":true,"joetsu.niigata.jp":true,"kamo.niigata.jp":true,"kariwa.niigata.jp":true,"kashiwazaki.niigata.jp":true,"minamiuonuma.niigata.jp":true,"mitsuke.niigata.jp":true,"muika.niigata.jp":true,"murakami.niigata.jp":true,"myoko.niigata.jp":true,"nagaoka.niigata.jp":true,"niigata.niigata.jp":true,"ojiya.niigata.jp":true,"omi.niigata.jp":true,"sado.niigata.jp":true,"sanjo.niigata.jp":true,"seiro.niigata.jp":true,"seirou.niigata.jp":true,"sekikawa.niigata.jp":true,"shibata.niigata.jp":true,"tagami.niigata.jp":true,"tainai.niigata.jp":true,"tochio.niigata.jp":true,"tokamachi.niigata.jp":true,"tsubame.niigata.jp":true,"tsunan.niigata.jp":true,"uonuma.niigata.jp":true,"yahiko.niigata.jp":true,"yoita.niigata.jp":true,"yuzawa.niigata.jp":true,"beppu.oita.jp":true,"bungoono.oita.jp":true,"bungotakada.oita.jp":true,"hasama.oita.jp":true,"hiji.oita.jp":true,"himeshima.oita.jp":true,"hita.oita.jp":true,"kamitsue.oita.jp":true,"kokonoe.oita.jp":true,"kuju.oita.jp":true,"kunisaki.oita.jp":true,"kusu.oita.jp":true,"oita.oita.jp":true,"saiki.oita.jp":true,"taketa.oita.jp":true,"tsukumi.oita.jp":true,"usa.oita.jp":true,"usuki.oita.jp":true,"yufu.oita.jp":true,"akaiwa.okayama.jp":true,"asakuchi.okayama.jp":true,"bizen.okayama.jp":true,"hayashima.okayama.jp":true,"ibara.okayama.jp":true,"kagamino.okayama.jp":true,"kasaoka.okayama.jp":true,"kibichuo.okayama.jp":true,"kumenan.okayama.jp":true,"kurashiki.okayama.jp":true,"maniwa.okayama.jp":true,"misaki.okayama.jp":true,"nagi.okayama.jp":true,"niimi.okayama.jp":true,"nishiawakura.okayama.jp":true,"okayama.okayama.jp":true,"satosho.okayama.jp":true,"setouchi.okayama.jp":true,"shinjo.okayama.jp":true,"shoo.okayama.jp":true,"soja.okayama.jp":true,"takahashi.okayama.jp":true,"tamano.okayama.jp":true,"tsuyama.okayama.jp":true,"wake.okayama.jp":true,"yakage.okayama.jp":true,"aguni.okinawa.jp":true,"ginowan.okinawa.jp":true,"ginoza.okinawa.jp":true,"gushikami.okinawa.jp":true,"haebaru.okinawa.jp":true,"higashi.okinawa.jp":true,"hirara.okinawa.jp":true,"iheya.okinawa.jp":true,"ishigaki.okinawa.jp":true,"ishikawa.okinawa.jp":true,"itoman.okinawa.jp":true,"izena.okinawa.jp":true,"kadena.okinawa.jp":true,"kin.okinawa.jp":true,"kitadaito.okinawa.jp":true,"kitanakagusuku.okinawa.jp":true,"kumejima.okinawa.jp":true,"kunigami.okinawa.jp":true,"minamidaito.okinawa.jp":true,"motobu.okinawa.jp":true,"nago.okinawa.jp":true,"naha.okinawa.jp":true,"nakagusuku.okinawa.jp":true,"nakijin.okinawa.jp":true,"nanjo.okinawa.jp":true,"nishihara.okinawa.jp":true,"ogimi.okinawa.jp":true,"okinawa.okinawa.jp":true,"onna.okinawa.jp":true,"shimoji.okinawa.jp":true,"taketomi.okinawa.jp":true,"tarama.okinawa.jp":true,"tokashiki.okinawa.jp":true,"tomigusuku.okinawa.jp":true,"tonaki.okinawa.jp":true,"urasoe.okinawa.jp":true,"uruma.okinawa.jp":true,"yaese.okinawa.jp":true,"yomitan.okinawa.jp":true,"yonabaru.okinawa.jp":true,"yonaguni.okinawa.jp":true,"zamami.okinawa.jp":true,"abeno.osaka.jp":true,"chihayaakasaka.osaka.jp":true,"chuo.osaka.jp":true,"daito.osaka.jp":true,"fujiidera.osaka.jp":true,"habikino.osaka.jp":true,"hannan.osaka.jp":true,"higashiosaka.osaka.jp":true,"higashisumiyoshi.osaka.jp":true,"higashiyodogawa.osaka.jp":true,"hirakata.osaka.jp":true,"ibaraki.osaka.jp":true,"ikeda.osaka.jp":true,"izumi.osaka.jp":true,"izumiotsu.osaka.jp":true,"izumisano.osaka.jp":true,"kadoma.osaka.jp":true,"kaizuka.osaka.jp":true,"kanan.osaka.jp":true,"kashiwara.osaka.jp":true,"katano.osaka.jp":true,"kawachinagano.osaka.jp":true,"kishiwada.osaka.jp":true,"kita.osaka.jp":true,"kumatori.osaka.jp":true,"matsubara.osaka.jp":true,"minato.osaka.jp":true,"minoh.osaka.jp":true,"misaki.osaka.jp":true,"moriguchi.osaka.jp":true,"neyagawa.osaka.jp":true,"nishi.osaka.jp":true,"nose.osaka.jp":true,"osakasayama.osaka.jp":true,"sakai.osaka.jp":true,"sayama.osaka.jp":true,"sennan.osaka.jp":true,"settsu.osaka.jp":true,"shijonawate.osaka.jp":true,"shimamoto.osaka.jp":true,"suita.osaka.jp":true,"tadaoka.osaka.jp":true,"taishi.osaka.jp":true,"tajiri.osaka.jp":true,"takaishi.osaka.jp":true,"takatsuki.osaka.jp":true,"tondabayashi.osaka.jp":true,"toyonaka.osaka.jp":true,"toyono.osaka.jp":true,"yao.osaka.jp":true,"ariake.saga.jp":true,"arita.saga.jp":true,"fukudomi.saga.jp":true,"genkai.saga.jp":true,"hamatama.saga.jp":true,"hizen.saga.jp":true,"imari.saga.jp":true,"kamimine.saga.jp":true,"kanzaki.saga.jp":true,"karatsu.saga.jp":true,"kashima.saga.jp":true,"kitagata.saga.jp":true,"kitahata.saga.jp":true,"kiyama.saga.jp":true,"kouhoku.saga.jp":true,"kyuragi.saga.jp":true,"nishiarita.saga.jp":true,"ogi.saga.jp":true,"omachi.saga.jp":true,"ouchi.saga.jp":true,"saga.saga.jp":true,"shiroishi.saga.jp":true,"taku.saga.jp":true,"tara.saga.jp":true,"tosu.saga.jp":true,"yoshinogari.saga.jp":true,"arakawa.saitama.jp":true,"asaka.saitama.jp":true,"chichibu.saitama.jp":true,"fujimi.saitama.jp":true,"fujimino.saitama.jp":true,"fukaya.saitama.jp":true,"hanno.saitama.jp":true,"hanyu.saitama.jp":true,"hasuda.saitama.jp":true,"hatogaya.saitama.jp":true,"hatoyama.saitama.jp":true,"hidaka.saitama.jp":true,"higashichichibu.saitama.jp":true,"higashimatsuyama.saitama.jp":true,"honjo.saitama.jp":true,"ina.saitama.jp":true,"iruma.saitama.jp":true,"iwatsuki.saitama.jp":true,"kamiizumi.saitama.jp":true,"kamikawa.saitama.jp":true,"kamisato.saitama.jp":true,"kasukabe.saitama.jp":true,"kawagoe.saitama.jp":true,"kawaguchi.saitama.jp":true,"kawajima.saitama.jp":true,"kazo.saitama.jp":true,"kitamoto.saitama.jp":true,"koshigaya.saitama.jp":true,"kounosu.saitama.jp":true,"kuki.saitama.jp":true,"kumagaya.saitama.jp":true,"matsubushi.saitama.jp":true,"minano.saitama.jp":true,"misato.saitama.jp":true,"miyashiro.saitama.jp":true,"miyoshi.saitama.jp":true,"moroyama.saitama.jp":true,"nagatoro.saitama.jp":true,"namegawa.saitama.jp":true,"niiza.saitama.jp":true,"ogano.saitama.jp":true,"ogawa.saitama.jp":true,"ogose.saitama.jp":true,"okegawa.saitama.jp":true,"omiya.saitama.jp":true,"otaki.saitama.jp":true,"ranzan.saitama.jp":true,"ryokami.saitama.jp":true,"saitama.saitama.jp":true,"sakado.saitama.jp":true,"satte.saitama.jp":true,"sayama.saitama.jp":true,"shiki.saitama.jp":true,"shiraoka.saitama.jp":true,"soka.saitama.jp":true,"sugito.saitama.jp":true,"toda.saitama.jp":true,"tokigawa.saitama.jp":true,"tokorozawa.saitama.jp":true,"tsurugashima.saitama.jp":true,"urawa.saitama.jp":true,"warabi.saitama.jp":true,"yashio.saitama.jp":true,"yokoze.saitama.jp":true,"yono.saitama.jp":true,"yorii.saitama.jp":true,"yoshida.saitama.jp":true,"yoshikawa.saitama.jp":true,"yoshimi.saitama.jp":true,"aisho.shiga.jp":true,"gamo.shiga.jp":true,"higashiomi.shiga.jp":true,"hikone.shiga.jp":true,"koka.shiga.jp":true,"konan.shiga.jp":true,"kosei.shiga.jp":true,"koto.shiga.jp":true,"kusatsu.shiga.jp":true,"maibara.shiga.jp":true,"moriyama.shiga.jp":true,"nagahama.shiga.jp":true,"nishiazai.shiga.jp":true,"notogawa.shiga.jp":true,"omihachiman.shiga.jp":true,"otsu.shiga.jp":true,"ritto.shiga.jp":true,"ryuoh.shiga.jp":true,"takashima.shiga.jp":true,"takatsuki.shiga.jp":true,"torahime.shiga.jp":true,"toyosato.shiga.jp":true,"yasu.shiga.jp":true,"akagi.shimane.jp":true,"ama.shimane.jp":true,"gotsu.shimane.jp":true,"hamada.shimane.jp":true,"higashiizumo.shimane.jp":true,"hikawa.shimane.jp":true,"hikimi.shimane.jp":true,"izumo.shimane.jp":true,"kakinoki.shimane.jp":true,"masuda.shimane.jp":true,"matsue.shimane.jp":true,"misato.shimane.jp":true,"nishinoshima.shimane.jp":true,"ohda.shimane.jp":true,"okinoshima.shimane.jp":true,"okuizumo.shimane.jp":true,"shimane.shimane.jp":true,"tamayu.shimane.jp":true,"tsuwano.shimane.jp":true,"unnan.shimane.jp":true,"yakumo.shimane.jp":true,"yasugi.shimane.jp":true,"yatsuka.shimane.jp":true,"arai.shizuoka.jp":true,"atami.shizuoka.jp":true,"fuji.shizuoka.jp":true,"fujieda.shizuoka.jp":true,"fujikawa.shizuoka.jp":true,"fujinomiya.shizuoka.jp":true,"fukuroi.shizuoka.jp":true,"gotemba.shizuoka.jp":true,"haibara.shizuoka.jp":true,"hamamatsu.shizuoka.jp":true,"higashiizu.shizuoka.jp":true,"ito.shizuoka.jp":true,"iwata.shizuoka.jp":true,"izu.shizuoka.jp":true,"izunokuni.shizuoka.jp":true,"kakegawa.shizuoka.jp":true,"kannami.shizuoka.jp":true,"kawanehon.shizuoka.jp":true,"kawazu.shizuoka.jp":true,"kikugawa.shizuoka.jp":true,"kosai.shizuoka.jp":true,"makinohara.shizuoka.jp":true,"matsuzaki.shizuoka.jp":true,"minamiizu.shizuoka.jp":true,"mishima.shizuoka.jp":true,"morimachi.shizuoka.jp":true,"nishiizu.shizuoka.jp":true,"numazu.shizuoka.jp":true,"omaezaki.shizuoka.jp":true,"shimada.shizuoka.jp":true,"shimizu.shizuoka.jp":true,"shimoda.shizuoka.jp":true,"shizuoka.shizuoka.jp":true,"susono.shizuoka.jp":true,"yaizu.shizuoka.jp":true,"yoshida.shizuoka.jp":true,"ashikaga.tochigi.jp":true,"bato.tochigi.jp":true,"haga.tochigi.jp":true,"ichikai.tochigi.jp":true,"iwafune.tochigi.jp":true,"kaminokawa.tochigi.jp":true,"kanuma.tochigi.jp":true,"karasuyama.tochigi.jp":true,"kuroiso.tochigi.jp":true,"mashiko.tochigi.jp":true,"mibu.tochigi.jp":true,"moka.tochigi.jp":true,"motegi.tochigi.jp":true,"nasu.tochigi.jp":true,"nasushiobara.tochigi.jp":true,"nikko.tochigi.jp":true,"nishikata.tochigi.jp":true,"nogi.tochigi.jp":true,"ohira.tochigi.jp":true,"ohtawara.tochigi.jp":true,"oyama.tochigi.jp":true,"sakura.tochigi.jp":true,"sano.tochigi.jp":true,"shimotsuke.tochigi.jp":true,"shioya.tochigi.jp":true,"takanezawa.tochigi.jp":true,"tochigi.tochigi.jp":true,"tsuga.tochigi.jp":true,"ujiie.tochigi.jp":true,"utsunomiya.tochigi.jp":true,"yaita.tochigi.jp":true,"aizumi.tokushima.jp":true,"anan.tokushima.jp":true,"ichiba.tokushima.jp":true,"itano.tokushima.jp":true,"kainan.tokushima.jp":true,"komatsushima.tokushima.jp":true,"matsushige.tokushima.jp":true,"mima.tokushima.jp":true,"minami.tokushima.jp":true,"miyoshi.tokushima.jp":true,"mugi.tokushima.jp":true,"nakagawa.tokushima.jp":true,"naruto.tokushima.jp":true,"sanagochi.tokushima.jp":true,"shishikui.tokushima.jp":true,"tokushima.tokushima.jp":true,"wajiki.tokushima.jp":true,"adachi.tokyo.jp":true,"akiruno.tokyo.jp":true,"akishima.tokyo.jp":true,"aogashima.tokyo.jp":true,"arakawa.tokyo.jp":true,"bunkyo.tokyo.jp":true,"chiyoda.tokyo.jp":true,"chofu.tokyo.jp":true,"chuo.tokyo.jp":true,"edogawa.tokyo.jp":true,"fuchu.tokyo.jp":true,"fussa.tokyo.jp":true,"hachijo.tokyo.jp":true,"hachioji.tokyo.jp":true,"hamura.tokyo.jp":true,"higashikurume.tokyo.jp":true,"higashimurayama.tokyo.jp":true,"higashiyamato.tokyo.jp":true,"hino.tokyo.jp":true,"hinode.tokyo.jp":true,"hinohara.tokyo.jp":true,"inagi.tokyo.jp":true,"itabashi.tokyo.jp":true,"katsushika.tokyo.jp":true,"kita.tokyo.jp":true,"kiyose.tokyo.jp":true,"kodaira.tokyo.jp":true,"koganei.tokyo.jp":true,"kokubunji.tokyo.jp":true,"komae.tokyo.jp":true,"koto.tokyo.jp":true,"kouzushima.tokyo.jp":true,"kunitachi.tokyo.jp":true,"machida.tokyo.jp":true,"meguro.tokyo.jp":true,"minato.tokyo.jp":true,"mitaka.tokyo.jp":true,"mizuho.tokyo.jp":true,"musashimurayama.tokyo.jp":true,"musashino.tokyo.jp":true,"nakano.tokyo.jp":true,"nerima.tokyo.jp":true,"ogasawara.tokyo.jp":true,"okutama.tokyo.jp":true,"ome.tokyo.jp":true,"oshima.tokyo.jp":true,"ota.tokyo.jp":true,"setagaya.tokyo.jp":true,"shibuya.tokyo.jp":true,"shinagawa.tokyo.jp":true,"shinjuku.tokyo.jp":true,"suginami.tokyo.jp":true,"sumida.tokyo.jp":true,"tachikawa.tokyo.jp":true,"taito.tokyo.jp":true,"tama.tokyo.jp":true,"toshima.tokyo.jp":true,"chizu.tottori.jp":true,"hino.tottori.jp":true,"kawahara.tottori.jp":true,"koge.tottori.jp":true,"kotoura.tottori.jp":true,"misasa.tottori.jp":true,"nanbu.tottori.jp":true,"nichinan.tottori.jp":true,"sakaiminato.tottori.jp":true,"tottori.tottori.jp":true,"wakasa.tottori.jp":true,"yazu.tottori.jp":true,"yonago.tottori.jp":true,"asahi.toyama.jp":true,"fuchu.toyama.jp":true,"fukumitsu.toyama.jp":true,"funahashi.toyama.jp":true,"himi.toyama.jp":true,"imizu.toyama.jp":true,"inami.toyama.jp":true,"johana.toyama.jp":true,"kamiichi.toyama.jp":true,"kurobe.toyama.jp":true,"nakaniikawa.toyama.jp":true,"namerikawa.toyama.jp":true,"nanto.toyama.jp":true,"nyuzen.toyama.jp":true,"oyabe.toyama.jp":true,"taira.toyama.jp":true,"takaoka.toyama.jp":true,"tateyama.toyama.jp":true,"toga.toyama.jp":true,"tonami.toyama.jp":true,"toyama.toyama.jp":true,"unazuki.toyama.jp":true,"uozu.toyama.jp":true,"yamada.toyama.jp":true,"arida.wakayama.jp":true,"aridagawa.wakayama.jp":true,"gobo.wakayama.jp":true,"hashimoto.wakayama.jp":true,"hidaka.wakayama.jp":true,"hirogawa.wakayama.jp":true,"inami.wakayama.jp":true,"iwade.wakayama.jp":true,"kainan.wakayama.jp":true,"kamitonda.wakayama.jp":true,"katsuragi.wakayama.jp":true,"kimino.wakayama.jp":true,"kinokawa.wakayama.jp":true,"kitayama.wakayama.jp":true,"koya.wakayama.jp":true,"koza.wakayama.jp":true,"kozagawa.wakayama.jp":true,"kudoyama.wakayama.jp":true,"kushimoto.wakayama.jp":true,"mihama.wakayama.jp":true,"misato.wakayama.jp":true,"nachikatsuura.wakayama.jp":true,"shingu.wakayama.jp":true,"shirahama.wakayama.jp":true,"taiji.wakayama.jp":true,"tanabe.wakayama.jp":true,"wakayama.wakayama.jp":true,"yuasa.wakayama.jp":true,"yura.wakayama.jp":true,"asahi.yamagata.jp":true,"funagata.yamagata.jp":true,"higashine.yamagata.jp":true,"iide.yamagata.jp":true,"kahoku.yamagata.jp":true,"kaminoyama.yamagata.jp":true,"kaneyama.yamagata.jp":true,"kawanishi.yamagata.jp":true,"mamurogawa.yamagata.jp":true,"mikawa.yamagata.jp":true,"murayama.yamagata.jp":true,"nagai.yamagata.jp":true,"nakayama.yamagata.jp":true,"nanyo.yamagata.jp":true,"nishikawa.yamagata.jp":true,"obanazawa.yamagata.jp":true,"oe.yamagata.jp":true,"oguni.yamagata.jp":true,"ohkura.yamagata.jp":true,"oishida.yamagata.jp":true,"sagae.yamagata.jp":true,"sakata.yamagata.jp":true,"sakegawa.yamagata.jp":true,"shinjo.yamagata.jp":true,"shirataka.yamagata.jp":true,"shonai.yamagata.jp":true,"takahata.yamagata.jp":true,"tendo.yamagata.jp":true,"tozawa.yamagata.jp":true,"tsuruoka.yamagata.jp":true,"yamagata.yamagata.jp":true,"yamanobe.yamagata.jp":true,"yonezawa.yamagata.jp":true,"yuza.yamagata.jp":true,"abu.yamaguchi.jp":true,"hagi.yamaguchi.jp":true,"hikari.yamaguchi.jp":true,"hofu.yamaguchi.jp":true,"iwakuni.yamaguchi.jp":true,"kudamatsu.yamaguchi.jp":true,"mitou.yamaguchi.jp":true,"nagato.yamaguchi.jp":true,"oshima.yamaguchi.jp":true,"shimonoseki.yamaguchi.jp":true,"shunan.yamaguchi.jp":true,"tabuse.yamaguchi.jp":true,"tokuyama.yamaguchi.jp":true,"toyota.yamaguchi.jp":true,"ube.yamaguchi.jp":true,"yuu.yamaguchi.jp":true,"chuo.yamanashi.jp":true,"doshi.yamanashi.jp":true,"fuefuki.yamanashi.jp":true,"fujikawa.yamanashi.jp":true,"fujikawaguchiko.yamanashi.jp":true,"fujiyoshida.yamanashi.jp":true,"hayakawa.yamanashi.jp":true,"hokuto.yamanashi.jp":true,"ichikawamisato.yamanashi.jp":true,"kai.yamanashi.jp":true,"kofu.yamanashi.jp":true,"koshu.yamanashi.jp":true,"kosuge.yamanashi.jp":true,"minami-alps.yamanashi.jp":true,"minobu.yamanashi.jp":true,"nakamichi.yamanashi.jp":true,"nanbu.yamanashi.jp":true,"narusawa.yamanashi.jp":true,"nirasaki.yamanashi.jp":true,"nishikatsura.yamanashi.jp":true,"oshino.yamanashi.jp":true,"otsuki.yamanashi.jp":true,"showa.yamanashi.jp":true,"tabayama.yamanashi.jp":true,"tsuru.yamanashi.jp":true,"uenohara.yamanashi.jp":true,"yamanakako.yamanashi.jp":true,"yamanashi.yamanashi.jp":true,"ke":true,"ac.ke":true,"co.ke":true,"go.ke":true,"info.ke":true,"me.ke":true,"mobi.ke":true,"ne.ke":true,"or.ke":true,"sc.ke":true,"kg":true,"org.kg":true,"net.kg":true,"com.kg":true,"edu.kg":true,"gov.kg":true,"mil.kg":true,"*.kh":true,"ki":true,"edu.ki":true,"biz.ki":true,"net.ki":true,"org.ki":true,"gov.ki":true,"info.ki":true,"com.ki":true,"km":true,"org.km":true,"nom.km":true,"gov.km":true,"prd.km":true,"tm.km":true,"edu.km":true,"mil.km":true,"ass.km":true,"com.km":true,"coop.km":true,"asso.km":true,"presse.km":true,"medecin.km":true,"notaires.km":true,"pharmaciens.km":true,"veterinaire.km":true,"gouv.km":true,"kn":true,"net.kn":true,"org.kn":true,"edu.kn":true,"gov.kn":true,"kp":true,"com.kp":true,"edu.kp":true,"gov.kp":true,"org.kp":true,"rep.kp":true,"tra.kp":true,"kr":true,"ac.kr":true,"co.kr":true,"es.kr":true,"go.kr":true,"hs.kr":true,"kg.kr":true,"mil.kr":true,"ms.kr":true,"ne.kr":true,"or.kr":true,"pe.kr":true,"re.kr":true,"sc.kr":true,"busan.kr":true,"chungbuk.kr":true,"chungnam.kr":true,"daegu.kr":true,"daejeon.kr":true,"gangwon.kr":true,"gwangju.kr":true,"gyeongbuk.kr":true,"gyeonggi.kr":true,"gyeongnam.kr":true,"incheon.kr":true,"jeju.kr":true,"jeonbuk.kr":true,"jeonnam.kr":true,"seoul.kr":true,"ulsan.kr":true,"*.kw":true,"ky":true,"edu.ky":true,"gov.ky":true,"com.ky":true,"org.ky":true,"net.ky":true,"kz":true,"org.kz":true,"edu.kz":true,"net.kz":true,"gov.kz":true,"mil.kz":true,"com.kz":true,"la":true,"int.la":true,"net.la":true,"info.la":true,"edu.la":true,"gov.la":true,"per.la":true,"com.la":true,"org.la":true,"lb":true,"com.lb":true,"edu.lb":true,"gov.lb":true,"net.lb":true,"org.lb":true,"lc":true,"com.lc":true,"net.lc":true,"co.lc":true,"org.lc":true,"edu.lc":true,"gov.lc":true,"li":true,"lk":true,"gov.lk":true,"sch.lk":true,"net.lk":true,"int.lk":true,"com.lk":true,"org.lk":true,"edu.lk":true,"ngo.lk":true,"soc.lk":true,"web.lk":true,"ltd.lk":true,"assn.lk":true,"grp.lk":true,"hotel.lk":true,"ac.lk":true,"lr":true,"com.lr":true,"edu.lr":true,"gov.lr":true,"org.lr":true,"net.lr":true,"ls":true,"co.ls":true,"org.ls":true,"lt":true,"gov.lt":true,"lu":true,"lv":true,"com.lv":true,"edu.lv":true,"gov.lv":true,"org.lv":true,"mil.lv":true,"id.lv":true,"net.lv":true,"asn.lv":true,"conf.lv":true,"ly":true,"com.ly":true,"net.ly":true,"gov.ly":true,"plc.ly":true,"edu.ly":true,"sch.ly":true,"med.ly":true,"org.ly":true,"id.ly":true,"ma":true,"co.ma":true,"net.ma":true,"gov.ma":true,"org.ma":true,"ac.ma":true,"press.ma":true,"mc":true,"tm.mc":true,"asso.mc":true,"md":true,"me":true,"co.me":true,"net.me":true,"org.me":true,"edu.me":true,"ac.me":true,"gov.me":true,"its.me":true,"priv.me":true,"mg":true,"org.mg":true,"nom.mg":true,"gov.mg":true,"prd.mg":true,"tm.mg":true,"edu.mg":true,"mil.mg":true,"com.mg":true,"co.mg":true,"mh":true,"mil":true,"mk":true,"com.mk":true,"org.mk":true,"net.mk":true,"edu.mk":true,"gov.mk":true,"inf.mk":true,"name.mk":true,"ml":true,"com.ml":true,"edu.ml":true,"gouv.ml":true,"gov.ml":true,"net.ml":true,"org.ml":true,"presse.ml":true,"*.mm":true,"mn":true,"gov.mn":true,"edu.mn":true,"org.mn":true,"mo":true,"com.mo":true,"net.mo":true,"org.mo":true,"edu.mo":true,"gov.mo":true,"mobi":true,"mp":true,"mq":true,"mr":true,"gov.mr":true,"ms":true,"com.ms":true,"edu.ms":true,"gov.ms":true,"net.ms":true,"org.ms":true,"mt":true,"com.mt":true,"edu.mt":true,"net.mt":true,"org.mt":true,"mu":true,"com.mu":true,"net.mu":true,"org.mu":true,"gov.mu":true,"ac.mu":true,"co.mu":true,"or.mu":true,"museum":true,"academy.museum":true,"agriculture.museum":true,"air.museum":true,"airguard.museum":true,"alabama.museum":true,"alaska.museum":true,"amber.museum":true,"ambulance.museum":true,"american.museum":true,"americana.museum":true,"americanantiques.museum":true,"americanart.museum":true,"amsterdam.museum":true,"and.museum":true,"annefrank.museum":true,"anthro.museum":true,"anthropology.museum":true,"antiques.museum":true,"aquarium.museum":true,"arboretum.museum":true,"archaeological.museum":true,"archaeology.museum":true,"architecture.museum":true,"art.museum":true,"artanddesign.museum":true,"artcenter.museum":true,"artdeco.museum":true,"arteducation.museum":true,"artgallery.museum":true,"arts.museum":true,"artsandcrafts.museum":true,"asmatart.museum":true,"assassination.museum":true,"assisi.museum":true,"association.museum":true,"astronomy.museum":true,"atlanta.museum":true,"austin.museum":true,"australia.museum":true,"automotive.museum":true,"aviation.museum":true,"axis.museum":true,"badajoz.museum":true,"baghdad.museum":true,"bahn.museum":true,"bale.museum":true,"baltimore.museum":true,"barcelona.museum":true,"baseball.museum":true,"basel.museum":true,"baths.museum":true,"bauern.museum":true,"beauxarts.museum":true,"beeldengeluid.museum":true,"bellevue.museum":true,"bergbau.museum":true,"berkeley.museum":true,"berlin.museum":true,"bern.museum":true,"bible.museum":true,"bilbao.museum":true,"bill.museum":true,"birdart.museum":true,"birthplace.museum":true,"bonn.museum":true,"boston.museum":true,"botanical.museum":true,"botanicalgarden.museum":true,"botanicgarden.museum":true,"botany.museum":true,"brandywinevalley.museum":true,"brasil.museum":true,"bristol.museum":true,"british.museum":true,"britishcolumbia.museum":true,"broadcast.museum":true,"brunel.museum":true,"brussel.museum":true,"brussels.museum":true,"bruxelles.museum":true,"building.museum":true,"burghof.museum":true,"bus.museum":true,"bushey.museum":true,"cadaques.museum":true,"california.museum":true,"cambridge.museum":true,"can.museum":true,"canada.museum":true,"capebreton.museum":true,"carrier.museum":true,"cartoonart.museum":true,"casadelamoneda.museum":true,"castle.museum":true,"castres.museum":true,"celtic.museum":true,"center.museum":true,"chattanooga.museum":true,"cheltenham.museum":true,"chesapeakebay.museum":true,"chicago.museum":true,"children.museum":true,"childrens.museum":true,"childrensgarden.museum":true,"chiropractic.museum":true,"chocolate.museum":true,"christiansburg.museum":true,"cincinnati.museum":true,"cinema.museum":true,"circus.museum":true,"civilisation.museum":true,"civilization.museum":true,"civilwar.museum":true,"clinton.museum":true,"clock.museum":true,"coal.museum":true,"coastaldefence.museum":true,"cody.museum":true,"coldwar.museum":true,"collection.museum":true,"colonialwilliamsburg.museum":true,"coloradoplateau.museum":true,"columbia.museum":true,"columbus.museum":true,"communication.museum":true,"communications.museum":true,"community.museum":true,"computer.museum":true,"computerhistory.museum":true,"xn--comunicaes-v6a2o.museum":true,"contemporary.museum":true,"contemporaryart.museum":true,"convent.museum":true,"copenhagen.museum":true,"corporation.museum":true,"xn--correios-e-telecomunicaes-ghc29a.museum":true,"corvette.museum":true,"costume.museum":true,"countryestate.museum":true,"county.museum":true,"crafts.museum":true,"cranbrook.museum":true,"creation.museum":true,"cultural.museum":true,"culturalcenter.museum":true,"culture.museum":true,"cyber.museum":true,"cymru.museum":true,"dali.museum":true,"dallas.museum":true,"database.museum":true,"ddr.museum":true,"decorativearts.museum":true,"delaware.museum":true,"delmenhorst.museum":true,"denmark.museum":true,"depot.museum":true,"design.museum":true,"detroit.museum":true,"dinosaur.museum":true,"discovery.museum":true,"dolls.museum":true,"donostia.museum":true,"durham.museum":true,"eastafrica.museum":true,"eastcoast.museum":true,"education.museum":true,"educational.museum":true,"egyptian.museum":true,"eisenbahn.museum":true,"elburg.museum":true,"elvendrell.museum":true,"embroidery.museum":true,"encyclopedic.museum":true,"england.museum":true,"entomology.museum":true,"environment.museum":true,"environmentalconservation.museum":true,"epilepsy.museum":true,"essex.museum":true,"estate.museum":true,"ethnology.museum":true,"exeter.museum":true,"exhibition.museum":true,"family.museum":true,"farm.museum":true,"farmequipment.museum":true,"farmers.museum":true,"farmstead.museum":true,"field.museum":true,"figueres.museum":true,"filatelia.museum":true,"film.museum":true,"fineart.museum":true,"finearts.museum":true,"finland.museum":true,"flanders.museum":true,"florida.museum":true,"force.museum":true,"fortmissoula.museum":true,"fortworth.museum":true,"foundation.museum":true,"francaise.museum":true,"frankfurt.museum":true,"franziskaner.museum":true,"freemasonry.museum":true,"freiburg.museum":true,"fribourg.museum":true,"frog.museum":true,"fundacio.museum":true,"furniture.museum":true,"gallery.museum":true,"garden.museum":true,"gateway.museum":true,"geelvinck.museum":true,"gemological.museum":true,"geology.museum":true,"georgia.museum":true,"giessen.museum":true,"glas.museum":true,"glass.museum":true,"gorge.museum":true,"grandrapids.museum":true,"graz.museum":true,"guernsey.museum":true,"halloffame.museum":true,"hamburg.museum":true,"handson.museum":true,"harvestcelebration.museum":true,"hawaii.museum":true,"health.museum":true,"heimatunduhren.museum":true,"hellas.museum":true,"helsinki.museum":true,"hembygdsforbund.museum":true,"heritage.museum":true,"histoire.museum":true,"historical.museum":true,"historicalsociety.museum":true,"historichouses.museum":true,"historisch.museum":true,"historisches.museum":true,"history.museum":true,"historyofscience.museum":true,"horology.museum":true,"house.museum":true,"humanities.museum":true,"illustration.museum":true,"imageandsound.museum":true,"indian.museum":true,"indiana.museum":true,"indianapolis.museum":true,"indianmarket.museum":true,"intelligence.museum":true,"interactive.museum":true,"iraq.museum":true,"iron.museum":true,"isleofman.museum":true,"jamison.museum":true,"jefferson.museum":true,"jerusalem.museum":true,"jewelry.museum":true,"jewish.museum":true,"jewishart.museum":true,"jfk.museum":true,"journalism.museum":true,"judaica.museum":true,"judygarland.museum":true,"juedisches.museum":true,"juif.museum":true,"karate.museum":true,"karikatur.museum":true,"kids.museum":true,"koebenhavn.museum":true,"koeln.museum":true,"kunst.museum":true,"kunstsammlung.museum":true,"kunstunddesign.museum":true,"labor.museum":true,"labour.museum":true,"lajolla.museum":true,"lancashire.museum":true,"landes.museum":true,"lans.museum":true,"xn--lns-qla.museum":true,"larsson.museum":true,"lewismiller.museum":true,"lincoln.museum":true,"linz.museum":true,"living.museum":true,"livinghistory.museum":true,"localhistory.museum":true,"london.museum":true,"losangeles.museum":true,"louvre.museum":true,"loyalist.museum":true,"lucerne.museum":true,"luxembourg.museum":true,"luzern.museum":true,"mad.museum":true,"madrid.museum":true,"mallorca.museum":true,"manchester.museum":true,"mansion.museum":true,"mansions.museum":true,"manx.museum":true,"marburg.museum":true,"maritime.museum":true,"maritimo.museum":true,"maryland.museum":true,"marylhurst.museum":true,"media.museum":true,"medical.museum":true,"medizinhistorisches.museum":true,"meeres.museum":true,"memorial.museum":true,"mesaverde.museum":true,"michigan.museum":true,"midatlantic.museum":true,"military.museum":true,"mill.museum":true,"miners.museum":true,"mining.museum":true,"minnesota.museum":true,"missile.museum":true,"missoula.museum":true,"modern.museum":true,"moma.museum":true,"money.museum":true,"monmouth.museum":true,"monticello.museum":true,"montreal.museum":true,"moscow.museum":true,"motorcycle.museum":true,"muenchen.museum":true,"muenster.museum":true,"mulhouse.museum":true,"muncie.museum":true,"museet.museum":true,"museumcenter.museum":true,"museumvereniging.museum":true,"music.museum":true,"national.museum":true,"nationalfirearms.museum":true,"nationalheritage.museum":true,"nativeamerican.museum":true,"naturalhistory.museum":true,"naturalhistorymuseum.museum":true,"naturalsciences.museum":true,"nature.museum":true,"naturhistorisches.museum":true,"natuurwetenschappen.museum":true,"naumburg.museum":true,"naval.museum":true,"nebraska.museum":true,"neues.museum":true,"newhampshire.museum":true,"newjersey.museum":true,"newmexico.museum":true,"newport.museum":true,"newspaper.museum":true,"newyork.museum":true,"niepce.museum":true,"norfolk.museum":true,"north.museum":true,"nrw.museum":true,"nuernberg.museum":true,"nuremberg.museum":true,"nyc.museum":true,"nyny.museum":true,"oceanographic.museum":true,"oceanographique.museum":true,"omaha.museum":true,"online.museum":true,"ontario.museum":true,"openair.museum":true,"oregon.museum":true,"oregontrail.museum":true,"otago.museum":true,"oxford.museum":true,"pacific.museum":true,"paderborn.museum":true,"palace.museum":true,"paleo.museum":true,"palmsprings.museum":true,"panama.museum":true,"paris.museum":true,"pasadena.museum":true,"pharmacy.museum":true,"philadelphia.museum":true,"philadelphiaarea.museum":true,"philately.museum":true,"phoenix.museum":true,"photography.museum":true,"pilots.museum":true,"pittsburgh.museum":true,"planetarium.museum":true,"plantation.museum":true,"plants.museum":true,"plaza.museum":true,"portal.museum":true,"portland.museum":true,"portlligat.museum":true,"posts-and-telecommunications.museum":true,"preservation.museum":true,"presidio.museum":true,"press.museum":true,"project.museum":true,"public.museum":true,"pubol.museum":true,"quebec.museum":true,"railroad.museum":true,"railway.museum":true,"research.museum":true,"resistance.museum":true,"riodejaneiro.museum":true,"rochester.museum":true,"rockart.museum":true,"roma.museum":true,"russia.museum":true,"saintlouis.museum":true,"salem.museum":true,"salvadordali.museum":true,"salzburg.museum":true,"sandiego.museum":true,"sanfrancisco.museum":true,"santabarbara.museum":true,"santacruz.museum":true,"santafe.museum":true,"saskatchewan.museum":true,"satx.museum":true,"savannahga.museum":true,"schlesisches.museum":true,"schoenbrunn.museum":true,"schokoladen.museum":true,"school.museum":true,"schweiz.museum":true,"science.museum":true,"scienceandhistory.museum":true,"scienceandindustry.museum":true,"sciencecenter.museum":true,"sciencecenters.museum":true,"science-fiction.museum":true,"sciencehistory.museum":true,"sciences.museum":true,"sciencesnaturelles.museum":true,"scotland.museum":true,"seaport.museum":true,"settlement.museum":true,"settlers.museum":true,"shell.museum":true,"sherbrooke.museum":true,"sibenik.museum":true,"silk.museum":true,"ski.museum":true,"skole.museum":true,"society.museum":true,"sologne.museum":true,"soundandvision.museum":true,"southcarolina.museum":true,"southwest.museum":true,"space.museum":true,"spy.museum":true,"square.museum":true,"stadt.museum":true,"stalbans.museum":true,"starnberg.museum":true,"state.museum":true,"stateofdelaware.museum":true,"station.museum":true,"steam.museum":true,"steiermark.museum":true,"stjohn.museum":true,"stockholm.museum":true,"stpetersburg.museum":true,"stuttgart.museum":true,"suisse.museum":true,"surgeonshall.museum":true,"surrey.museum":true,"svizzera.museum":true,"sweden.museum":true,"sydney.museum":true,"tank.museum":true,"tcm.museum":true,"technology.museum":true,"telekommunikation.museum":true,"television.museum":true,"texas.museum":true,"textile.museum":true,"theater.museum":true,"time.museum":true,"timekeeping.museum":true,"topology.museum":true,"torino.museum":true,"touch.museum":true,"town.museum":true,"transport.museum":true,"tree.museum":true,"trolley.museum":true,"trust.museum":true,"trustee.museum":true,"uhren.museum":true,"ulm.museum":true,"undersea.museum":true,"university.museum":true,"usa.museum":true,"usantiques.museum":true,"usarts.museum":true,"uscountryestate.museum":true,"usculture.museum":true,"usdecorativearts.museum":true,"usgarden.museum":true,"ushistory.museum":true,"ushuaia.museum":true,"uslivinghistory.museum":true,"utah.museum":true,"uvic.museum":true,"valley.museum":true,"vantaa.museum":true,"versailles.museum":true,"viking.museum":true,"village.museum":true,"virginia.museum":true,"virtual.museum":true,"virtuel.museum":true,"vlaanderen.museum":true,"volkenkunde.museum":true,"wales.museum":true,"wallonie.museum":true,"war.museum":true,"washingtondc.museum":true,"watchandclock.museum":true,"watch-and-clock.museum":true,"western.museum":true,"westfalen.museum":true,"whaling.museum":true,"wildlife.museum":true,"williamsburg.museum":true,"windmill.museum":true,"workshop.museum":true,"york.museum":true,"yorkshire.museum":true,"yosemite.museum":true,"youth.museum":true,"zoological.museum":true,"zoology.museum":true,"xn--9dbhblg6di.museum":true,"xn--h1aegh.museum":true,"mv":true,"aero.mv":true,"biz.mv":true,"com.mv":true,"coop.mv":true,"edu.mv":true,"gov.mv":true,"info.mv":true,"int.mv":true,"mil.mv":true,"museum.mv":true,"name.mv":true,"net.mv":true,"org.mv":true,"pro.mv":true,"mw":true,"ac.mw":true,"biz.mw":true,"co.mw":true,"com.mw":true,"coop.mw":true,"edu.mw":true,"gov.mw":true,"int.mw":true,"museum.mw":true,"net.mw":true,"org.mw":true,"mx":true,"com.mx":true,"org.mx":true,"gob.mx":true,"edu.mx":true,"net.mx":true,"my":true,"com.my":true,"net.my":true,"org.my":true,"gov.my":true,"edu.my":true,"mil.my":true,"name.my":true,"mz":true,"ac.mz":true,"adv.mz":true,"co.mz":true,"edu.mz":true,"gov.mz":true,"mil.mz":true,"net.mz":true,"org.mz":true,"na":true,"info.na":true,"pro.na":true,"name.na":true,"school.na":true,"or.na":true,"dr.na":true,"us.na":true,"mx.na":true,"ca.na":true,"in.na":true,"cc.na":true,"tv.na":true,"ws.na":true,"mobi.na":true,"co.na":true,"com.na":true,"org.na":true,"name":true,"nc":true,"asso.nc":true,"nom.nc":true,"ne":true,"net":true,"nf":true,"com.nf":true,"net.nf":true,"per.nf":true,"rec.nf":true,"web.nf":true,"arts.nf":true,"firm.nf":true,"info.nf":true,"other.nf":true,"store.nf":true,"ng":true,"com.ng":true,"edu.ng":true,"gov.ng":true,"i.ng":true,"mil.ng":true,"mobi.ng":true,"name.ng":true,"net.ng":true,"org.ng":true,"sch.ng":true,"ni":true,"ac.ni":true,"biz.ni":true,"co.ni":true,"com.ni":true,"edu.ni":true,"gob.ni":true,"in.ni":true,"info.ni":true,"int.ni":true,"mil.ni":true,"net.ni":true,"nom.ni":true,"org.ni":true,"web.ni":true,"nl":true,"bv.nl":true,"no":true,"fhs.no":true,"vgs.no":true,"fylkesbibl.no":true,"folkebibl.no":true,"museum.no":true,"idrett.no":true,"priv.no":true,"mil.no":true,"stat.no":true,"dep.no":true,"kommune.no":true,"herad.no":true,"aa.no":true,"ah.no":true,"bu.no":true,"fm.no":true,"hl.no":true,"hm.no":true,"jan-mayen.no":true,"mr.no":true,"nl.no":true,"nt.no":true,"of.no":true,"ol.no":true,"oslo.no":true,"rl.no":true,"sf.no":true,"st.no":true,"svalbard.no":true,"tm.no":true,"tr.no":true,"va.no":true,"vf.no":true,"gs.aa.no":true,"gs.ah.no":true,"gs.bu.no":true,"gs.fm.no":true,"gs.hl.no":true,"gs.hm.no":true,"gs.jan-mayen.no":true,"gs.mr.no":true,"gs.nl.no":true,"gs.nt.no":true,"gs.of.no":true,"gs.ol.no":true,"gs.oslo.no":true,"gs.rl.no":true,"gs.sf.no":true,"gs.st.no":true,"gs.svalbard.no":true,"gs.tm.no":true,"gs.tr.no":true,"gs.va.no":true,"gs.vf.no":true,"akrehamn.no":true,"xn--krehamn-dxa.no":true,"algard.no":true,"xn--lgrd-poac.no":true,"arna.no":true,"brumunddal.no":true,"bryne.no":true,"bronnoysund.no":true,"xn--brnnysund-m8ac.no":true,"drobak.no":true,"xn--drbak-wua.no":true,"egersund.no":true,"fetsund.no":true,"floro.no":true,"xn--flor-jra.no":true,"fredrikstad.no":true,"hokksund.no":true,"honefoss.no":true,"xn--hnefoss-q1a.no":true,"jessheim.no":true,"jorpeland.no":true,"xn--jrpeland-54a.no":true,"kirkenes.no":true,"kopervik.no":true,"krokstadelva.no":true,"langevag.no":true,"xn--langevg-jxa.no":true,"leirvik.no":true,"mjondalen.no":true,"xn--mjndalen-64a.no":true,"mo-i-rana.no":true,"mosjoen.no":true,"xn--mosjen-eya.no":true,"nesoddtangen.no":true,"orkanger.no":true,"osoyro.no":true,"xn--osyro-wua.no":true,"raholt.no":true,"xn--rholt-mra.no":true,"sandnessjoen.no":true,"xn--sandnessjen-ogb.no":true,"skedsmokorset.no":true,"slattum.no":true,"spjelkavik.no":true,"stathelle.no":true,"stavern.no":true,"stjordalshalsen.no":true,"xn--stjrdalshalsen-sqb.no":true,"tananger.no":true,"tranby.no":true,"vossevangen.no":true,"afjord.no":true,"xn--fjord-lra.no":true,"agdenes.no":true,"al.no":true,"xn--l-1fa.no":true,"alesund.no":true,"xn--lesund-hua.no":true,"alstahaug.no":true,"alta.no":true,"xn--lt-liac.no":true,"alaheadju.no":true,"xn--laheadju-7ya.no":true,"alvdal.no":true,"amli.no":true,"xn--mli-tla.no":true,"amot.no":true,"xn--mot-tla.no":true,"andebu.no":true,"andoy.no":true,"xn--andy-ira.no":true,"andasuolo.no":true,"ardal.no":true,"xn--rdal-poa.no":true,"aremark.no":true,"arendal.no":true,"xn--s-1fa.no":true,"aseral.no":true,"xn--seral-lra.no":true,"asker.no":true,"askim.no":true,"askvoll.no":true,"askoy.no":true,"xn--asky-ira.no":true,"asnes.no":true,"xn--snes-poa.no":true,"audnedaln.no":true,"aukra.no":true,"aure.no":true,"aurland.no":true,"aurskog-holand.no":true,"xn--aurskog-hland-jnb.no":true,"austevoll.no":true,"austrheim.no":true,"averoy.no":true,"xn--avery-yua.no":true,"balestrand.no":true,"ballangen.no":true,"balat.no":true,"xn--blt-elab.no":true,"balsfjord.no":true,"bahccavuotna.no":true,"xn--bhccavuotna-k7a.no":true,"bamble.no":true,"bardu.no":true,"beardu.no":true,"beiarn.no":true,"bajddar.no":true,"xn--bjddar-pta.no":true,"baidar.no":true,"xn--bidr-5nac.no":true,"berg.no":true,"bergen.no":true,"berlevag.no":true,"xn--berlevg-jxa.no":true,"bearalvahki.no":true,"xn--bearalvhki-y4a.no":true,"bindal.no":true,"birkenes.no":true,"bjarkoy.no":true,"xn--bjarky-fya.no":true,"bjerkreim.no":true,"bjugn.no":true,"bodo.no":true,"xn--bod-2na.no":true,"badaddja.no":true,"xn--bdddj-mrabd.no":true,"budejju.no":true,"bokn.no":true,"bremanger.no":true,"bronnoy.no":true,"xn--brnny-wuac.no":true,"bygland.no":true,"bykle.no":true,"barum.no":true,"xn--brum-voa.no":true,"bo.telemark.no":true,"xn--b-5ga.telemark.no":true,"bo.nordland.no":true,"xn--b-5ga.nordland.no":true,"bievat.no":true,"xn--bievt-0qa.no":true,"bomlo.no":true,"xn--bmlo-gra.no":true,"batsfjord.no":true,"xn--btsfjord-9za.no":true,"bahcavuotna.no":true,"xn--bhcavuotna-s4a.no":true,"dovre.no":true,"drammen.no":true,"drangedal.no":true,"dyroy.no":true,"xn--dyry-ira.no":true,"donna.no":true,"xn--dnna-gra.no":true,"eid.no":true,"eidfjord.no":true,"eidsberg.no":true,"eidskog.no":true,"eidsvoll.no":true,"eigersund.no":true,"elverum.no":true,"enebakk.no":true,"engerdal.no":true,"etne.no":true,"etnedal.no":true,"evenes.no":true,"evenassi.no":true,"xn--eveni-0qa01ga.no":true,"evje-og-hornnes.no":true,"farsund.no":true,"fauske.no":true,"fuossko.no":true,"fuoisku.no":true,"fedje.no":true,"fet.no":true,"finnoy.no":true,"xn--finny-yua.no":true,"fitjar.no":true,"fjaler.no":true,"fjell.no":true,"flakstad.no":true,"flatanger.no":true,"flekkefjord.no":true,"flesberg.no":true,"flora.no":true,"fla.no":true,"xn--fl-zia.no":true,"folldal.no":true,"forsand.no":true,"fosnes.no":true,"frei.no":true,"frogn.no":true,"froland.no":true,"frosta.no":true,"frana.no":true,"xn--frna-woa.no":true,"froya.no":true,"xn--frya-hra.no":true,"fusa.no":true,"fyresdal.no":true,"forde.no":true,"xn--frde-gra.no":true,"gamvik.no":true,"gangaviika.no":true,"xn--ggaviika-8ya47h.no":true,"gaular.no":true,"gausdal.no":true,"gildeskal.no":true,"xn--gildeskl-g0a.no":true,"giske.no":true,"gjemnes.no":true,"gjerdrum.no":true,"gjerstad.no":true,"gjesdal.no":true,"gjovik.no":true,"xn--gjvik-wua.no":true,"gloppen.no":true,"gol.no":true,"gran.no":true,"grane.no":true,"granvin.no":true,"gratangen.no":true,"grimstad.no":true,"grong.no":true,"kraanghke.no":true,"xn--kranghke-b0a.no":true,"grue.no":true,"gulen.no":true,"hadsel.no":true,"halden.no":true,"halsa.no":true,"hamar.no":true,"hamaroy.no":true,"habmer.no":true,"xn--hbmer-xqa.no":true,"hapmir.no":true,"xn--hpmir-xqa.no":true,"hammerfest.no":true,"hammarfeasta.no":true,"xn--hmmrfeasta-s4ac.no":true,"haram.no":true,"hareid.no":true,"harstad.no":true,"hasvik.no":true,"aknoluokta.no":true,"xn--koluokta-7ya57h.no":true,"hattfjelldal.no":true,"aarborte.no":true,"haugesund.no":true,"hemne.no":true,"hemnes.no":true,"hemsedal.no":true,"heroy.more-og-romsdal.no":true,"xn--hery-ira.xn--mre-og-romsdal-qqb.no":true,"heroy.nordland.no":true,"xn--hery-ira.nordland.no":true,"hitra.no":true,"hjartdal.no":true,"hjelmeland.no":true,"hobol.no":true,"xn--hobl-ira.no":true,"hof.no":true,"hol.no":true,"hole.no":true,"holmestrand.no":true,"holtalen.no":true,"xn--holtlen-hxa.no":true,"hornindal.no":true,"horten.no":true,"hurdal.no":true,"hurum.no":true,"hvaler.no":true,"hyllestad.no":true,"hagebostad.no":true,"xn--hgebostad-g3a.no":true,"hoyanger.no":true,"xn--hyanger-q1a.no":true,"hoylandet.no":true,"xn--hylandet-54a.no":true,"ha.no":true,"xn--h-2fa.no":true,"ibestad.no":true,"inderoy.no":true,"xn--indery-fya.no":true,"iveland.no":true,"jevnaker.no":true,"jondal.no":true,"jolster.no":true,"xn--jlster-bya.no":true,"karasjok.no":true,"karasjohka.no":true,"xn--krjohka-hwab49j.no":true,"karlsoy.no":true,"galsa.no":true,"xn--gls-elac.no":true,"karmoy.no":true,"xn--karmy-yua.no":true,"kautokeino.no":true,"guovdageaidnu.no":true,"klepp.no":true,"klabu.no":true,"xn--klbu-woa.no":true,"kongsberg.no":true,"kongsvinger.no":true,"kragero.no":true,"xn--krager-gya.no":true,"kristiansand.no":true,"kristiansund.no":true,"krodsherad.no":true,"xn--krdsherad-m8a.no":true,"kvalsund.no":true,"rahkkeravju.no":true,"xn--rhkkervju-01af.no":true,"kvam.no":true,"kvinesdal.no":true,"kvinnherad.no":true,"kviteseid.no":true,"kvitsoy.no":true,"xn--kvitsy-fya.no":true,"kvafjord.no":true,"xn--kvfjord-nxa.no":true,"giehtavuoatna.no":true,"kvanangen.no":true,"xn--kvnangen-k0a.no":true,"navuotna.no":true,"xn--nvuotna-hwa.no":true,"kafjord.no":true,"xn--kfjord-iua.no":true,"gaivuotna.no":true,"xn--givuotna-8ya.no":true,"larvik.no":true,"lavangen.no":true,"lavagis.no":true,"loabat.no":true,"xn--loabt-0qa.no":true,"lebesby.no":true,"davvesiida.no":true,"leikanger.no":true,"leirfjord.no":true,"leka.no":true,"leksvik.no":true,"lenvik.no":true,"leangaviika.no":true,"xn--leagaviika-52b.no":true,"lesja.no":true,"levanger.no":true,"lier.no":true,"lierne.no":true,"lillehammer.no":true,"lillesand.no":true,"lindesnes.no":true,"lindas.no":true,"xn--linds-pra.no":true,"lom.no":true,"loppa.no":true,"lahppi.no":true,"xn--lhppi-xqa.no":true,"lund.no":true,"lunner.no":true,"luroy.no":true,"xn--lury-ira.no":true,"luster.no":true,"lyngdal.no":true,"lyngen.no":true,"ivgu.no":true,"lardal.no":true,"lerdal.no":true,"xn--lrdal-sra.no":true,"lodingen.no":true,"xn--ldingen-q1a.no":true,"lorenskog.no":true,"xn--lrenskog-54a.no":true,"loten.no":true,"xn--lten-gra.no":true,"malvik.no":true,"masoy.no":true,"xn--msy-ula0h.no":true,"muosat.no":true,"xn--muost-0qa.no":true,"mandal.no":true,"marker.no":true,"marnardal.no":true,"masfjorden.no":true,"meland.no":true,"meldal.no":true,"melhus.no":true,"meloy.no":true,"xn--mely-ira.no":true,"meraker.no":true,"xn--merker-kua.no":true,"moareke.no":true,"xn--moreke-jua.no":true,"midsund.no":true,"midtre-gauldal.no":true,"modalen.no":true,"modum.no":true,"molde.no":true,"moskenes.no":true,"moss.no":true,"mosvik.no":true,"malselv.no":true,"xn--mlselv-iua.no":true,"malatvuopmi.no":true,"xn--mlatvuopmi-s4a.no":true,"namdalseid.no":true,"aejrie.no":true,"namsos.no":true,"namsskogan.no":true,"naamesjevuemie.no":true,"xn--nmesjevuemie-tcba.no":true,"laakesvuemie.no":true,"nannestad.no":true,"narvik.no":true,"narviika.no":true,"naustdal.no":true,"nedre-eiker.no":true,"nes.akershus.no":true,"nes.buskerud.no":true,"nesna.no":true,"nesodden.no":true,"nesseby.no":true,"unjarga.no":true,"xn--unjrga-rta.no":true,"nesset.no":true,"nissedal.no":true,"nittedal.no":true,"nord-aurdal.no":true,"nord-fron.no":true,"nord-odal.no":true,"norddal.no":true,"nordkapp.no":true,"davvenjarga.no":true,"xn--davvenjrga-y4a.no":true,"nordre-land.no":true,"nordreisa.no":true,"raisa.no":true,"xn--risa-5na.no":true,"nore-og-uvdal.no":true,"notodden.no":true,"naroy.no":true,"xn--nry-yla5g.no":true,"notteroy.no":true,"xn--nttery-byae.no":true,"odda.no":true,"oksnes.no":true,"xn--ksnes-uua.no":true,"oppdal.no":true,"oppegard.no":true,"xn--oppegrd-ixa.no":true,"orkdal.no":true,"orland.no":true,"xn--rland-uua.no":true,"orskog.no":true,"xn--rskog-uua.no":true,"orsta.no":true,"xn--rsta-fra.no":true,"os.hedmark.no":true,"os.hordaland.no":true,"osen.no":true,"osteroy.no":true,"xn--ostery-fya.no":true,"ostre-toten.no":true,"xn--stre-toten-zcb.no":true,"overhalla.no":true,"ovre-eiker.no":true,"xn--vre-eiker-k8a.no":true,"oyer.no":true,"xn--yer-zna.no":true,"oygarden.no":true,"xn--ygarden-p1a.no":true,"oystre-slidre.no":true,"xn--ystre-slidre-ujb.no":true,"porsanger.no":true,"porsangu.no":true,"xn--porsgu-sta26f.no":true,"porsgrunn.no":true,"radoy.no":true,"xn--rady-ira.no":true,"rakkestad.no":true,"rana.no":true,"ruovat.no":true,"randaberg.no":true,"rauma.no":true,"rendalen.no":true,"rennebu.no":true,"rennesoy.no":true,"xn--rennesy-v1a.no":true,"rindal.no":true,"ringebu.no":true,"ringerike.no":true,"ringsaker.no":true,"rissa.no":true,"risor.no":true,"xn--risr-ira.no":true,"roan.no":true,"rollag.no":true,"rygge.no":true,"ralingen.no":true,"xn--rlingen-mxa.no":true,"rodoy.no":true,"xn--rdy-0nab.no":true,"romskog.no":true,"xn--rmskog-bya.no":true,"roros.no":true,"xn--rros-gra.no":true,"rost.no":true,"xn--rst-0na.no":true,"royken.no":true,"xn--ryken-vua.no":true,"royrvik.no":true,"xn--ryrvik-bya.no":true,"rade.no":true,"xn--rde-ula.no":true,"salangen.no":true,"siellak.no":true,"saltdal.no":true,"salat.no":true,"xn--slt-elab.no":true,"xn--slat-5na.no":true,"samnanger.no":true,"sande.more-og-romsdal.no":true,"sande.xn--mre-og-romsdal-qqb.no":true,"sande.vestfold.no":true,"sandefjord.no":true,"sandnes.no":true,"sandoy.no":true,"xn--sandy-yua.no":true,"sarpsborg.no":true,"sauda.no":true,"sauherad.no":true,"sel.no":true,"selbu.no":true,"selje.no":true,"seljord.no":true,"sigdal.no":true,"siljan.no":true,"sirdal.no":true,"skaun.no":true,"skedsmo.no":true,"ski.no":true,"skien.no":true,"skiptvet.no":true,"skjervoy.no":true,"xn--skjervy-v1a.no":true,"skierva.no":true,"xn--skierv-uta.no":true,"skjak.no":true,"xn--skjk-soa.no":true,"skodje.no":true,"skanland.no":true,"xn--sknland-fxa.no":true,"skanit.no":true,"xn--sknit-yqa.no":true,"smola.no":true,"xn--smla-hra.no":true,"snillfjord.no":true,"snasa.no":true,"xn--snsa-roa.no":true,"snoasa.no":true,"snaase.no":true,"xn--snase-nra.no":true,"sogndal.no":true,"sokndal.no":true,"sola.no":true,"solund.no":true,"songdalen.no":true,"sortland.no":true,"spydeberg.no":true,"stange.no":true,"stavanger.no":true,"steigen.no":true,"steinkjer.no":true,"stjordal.no":true,"xn--stjrdal-s1a.no":true,"stokke.no":true,"stor-elvdal.no":true,"stord.no":true,"stordal.no":true,"storfjord.no":true,"omasvuotna.no":true,"strand.no":true,"stranda.no":true,"stryn.no":true,"sula.no":true,"suldal.no":true,"sund.no":true,"sunndal.no":true,"surnadal.no":true,"sveio.no":true,"svelvik.no":true,"sykkylven.no":true,"sogne.no":true,"xn--sgne-gra.no":true,"somna.no":true,"xn--smna-gra.no":true,"sondre-land.no":true,"xn--sndre-land-0cb.no":true,"sor-aurdal.no":true,"xn--sr-aurdal-l8a.no":true,"sor-fron.no":true,"xn--sr-fron-q1a.no":true,"sor-odal.no":true,"xn--sr-odal-q1a.no":true,"sor-varanger.no":true,"xn--sr-varanger-ggb.no":true,"matta-varjjat.no":true,"xn--mtta-vrjjat-k7af.no":true,"sorfold.no":true,"xn--srfold-bya.no":true,"sorreisa.no":true,"xn--srreisa-q1a.no":true,"sorum.no":true,"xn--srum-gra.no":true,"tana.no":true,"deatnu.no":true,"time.no":true,"tingvoll.no":true,"tinn.no":true,"tjeldsund.no":true,"dielddanuorri.no":true,"tjome.no":true,"xn--tjme-hra.no":true,"tokke.no":true,"tolga.no":true,"torsken.no":true,"tranoy.no":true,"xn--trany-yua.no":true,"tromso.no":true,"xn--troms-zua.no":true,"tromsa.no":true,"romsa.no":true,"trondheim.no":true,"troandin.no":true,"trysil.no":true,"trana.no":true,"xn--trna-woa.no":true,"trogstad.no":true,"xn--trgstad-r1a.no":true,"tvedestrand.no":true,"tydal.no":true,"tynset.no":true,"tysfjord.no":true,"divtasvuodna.no":true,"divttasvuotna.no":true,"tysnes.no":true,"tysvar.no":true,"xn--tysvr-vra.no":true,"tonsberg.no":true,"xn--tnsberg-q1a.no":true,"ullensaker.no":true,"ullensvang.no":true,"ulvik.no":true,"utsira.no":true,"vadso.no":true,"xn--vads-jra.no":true,"cahcesuolo.no":true,"xn--hcesuolo-7ya35b.no":true,"vaksdal.no":true,"valle.no":true,"vang.no":true,"vanylven.no":true,"vardo.no":true,"xn--vard-jra.no":true,"varggat.no":true,"xn--vrggt-xqad.no":true,"vefsn.no":true,"vaapste.no":true,"vega.no":true,"vegarshei.no":true,"xn--vegrshei-c0a.no":true,"vennesla.no":true,"verdal.no":true,"verran.no":true,"vestby.no":true,"vestnes.no":true,"vestre-slidre.no":true,"vestre-toten.no":true,"vestvagoy.no":true,"xn--vestvgy-ixa6o.no":true,"vevelstad.no":true,"vik.no":true,"vikna.no":true,"vindafjord.no":true,"volda.no":true,"voss.no":true,"varoy.no":true,"xn--vry-yla5g.no":true,"vagan.no":true,"xn--vgan-qoa.no":true,"voagat.no":true,"vagsoy.no":true,"xn--vgsy-qoa0j.no":true,"vaga.no":true,"xn--vg-yiab.no":true,"valer.ostfold.no":true,"xn--vler-qoa.xn--stfold-9xa.no":true,"valer.hedmark.no":true,"xn--vler-qoa.hedmark.no":true,"*.np":true,"nr":true,"biz.nr":true,"info.nr":true,"gov.nr":true,"edu.nr":true,"org.nr":true,"net.nr":true,"com.nr":true,"nu":true,"nz":true,"ac.nz":true,"co.nz":true,"cri.nz":true,"geek.nz":true,"gen.nz":true,"govt.nz":true,"health.nz":true,"iwi.nz":true,"kiwi.nz":true,"maori.nz":true,"mil.nz":true,"xn--mori-qsa.nz":true,"net.nz":true,"org.nz":true,"parliament.nz":true,"school.nz":true,"om":true,"co.om":true,"com.om":true,"edu.om":true,"gov.om":true,"med.om":true,"museum.om":true,"net.om":true,"org.om":true,"pro.om":true,"onion":true,"org":true,"pa":true,"ac.pa":true,"gob.pa":true,"com.pa":true,"org.pa":true,"sld.pa":true,"edu.pa":true,"net.pa":true,"ing.pa":true,"abo.pa":true,"med.pa":true,"nom.pa":true,"pe":true,"edu.pe":true,"gob.pe":true,"nom.pe":true,"mil.pe":true,"org.pe":true,"com.pe":true,"net.pe":true,"pf":true,"com.pf":true,"org.pf":true,"edu.pf":true,"*.pg":true,"ph":true,"com.ph":true,"net.ph":true,"org.ph":true,"gov.ph":true,"edu.ph":true,"ngo.ph":true,"mil.ph":true,"i.ph":true,"pk":true,"com.pk":true,"net.pk":true,"edu.pk":true,"org.pk":true,"fam.pk":true,"biz.pk":true,"web.pk":true,"gov.pk":true,"gob.pk":true,"gok.pk":true,"gon.pk":true,"gop.pk":true,"gos.pk":true,"info.pk":true,"pl":true,"com.pl":true,"net.pl":true,"org.pl":true,"aid.pl":true,"agro.pl":true,"atm.pl":true,"auto.pl":true,"biz.pl":true,"edu.pl":true,"gmina.pl":true,"gsm.pl":true,"info.pl":true,"mail.pl":true,"miasta.pl":true,"media.pl":true,"mil.pl":true,"nieruchomosci.pl":true,"nom.pl":true,"pc.pl":true,"powiat.pl":true,"priv.pl":true,"realestate.pl":true,"rel.pl":true,"sex.pl":true,"shop.pl":true,"sklep.pl":true,"sos.pl":true,"szkola.pl":true,"targi.pl":true,"tm.pl":true,"tourism.pl":true,"travel.pl":true,"turystyka.pl":true,"gov.pl":true,"ap.gov.pl":true,"ic.gov.pl":true,"is.gov.pl":true,"us.gov.pl":true,"kmpsp.gov.pl":true,"kppsp.gov.pl":true,"kwpsp.gov.pl":true,"psp.gov.pl":true,"wskr.gov.pl":true,"kwp.gov.pl":true,"mw.gov.pl":true,"ug.gov.pl":true,"um.gov.pl":true,"umig.gov.pl":true,"ugim.gov.pl":true,"upow.gov.pl":true,"uw.gov.pl":true,"starostwo.gov.pl":true,"pa.gov.pl":true,"po.gov.pl":true,"psse.gov.pl":true,"pup.gov.pl":true,"rzgw.gov.pl":true,"sa.gov.pl":true,"so.gov.pl":true,"sr.gov.pl":true,"wsa.gov.pl":true,"sko.gov.pl":true,"uzs.gov.pl":true,"wiih.gov.pl":true,"winb.gov.pl":true,"pinb.gov.pl":true,"wios.gov.pl":true,"witd.gov.pl":true,"wzmiuw.gov.pl":true,"piw.gov.pl":true,"wiw.gov.pl":true,"griw.gov.pl":true,"wif.gov.pl":true,"oum.gov.pl":true,"sdn.gov.pl":true,"zp.gov.pl":true,"uppo.gov.pl":true,"mup.gov.pl":true,"wuoz.gov.pl":true,"konsulat.gov.pl":true,"oirm.gov.pl":true,"augustow.pl":true,"babia-gora.pl":true,"bedzin.pl":true,"beskidy.pl":true,"bialowieza.pl":true,"bialystok.pl":true,"bielawa.pl":true,"bieszczady.pl":true,"boleslawiec.pl":true,"bydgoszcz.pl":true,"bytom.pl":true,"cieszyn.pl":true,"czeladz.pl":true,"czest.pl":true,"dlugoleka.pl":true,"elblag.pl":true,"elk.pl":true,"glogow.pl":true,"gniezno.pl":true,"gorlice.pl":true,"grajewo.pl":true,"ilawa.pl":true,"jaworzno.pl":true,"jelenia-gora.pl":true,"jgora.pl":true,"kalisz.pl":true,"kazimierz-dolny.pl":true,"karpacz.pl":true,"kartuzy.pl":true,"kaszuby.pl":true,"katowice.pl":true,"kepno.pl":true,"ketrzyn.pl":true,"klodzko.pl":true,"kobierzyce.pl":true,"kolobrzeg.pl":true,"konin.pl":true,"konskowola.pl":true,"kutno.pl":true,"lapy.pl":true,"lebork.pl":true,"legnica.pl":true,"lezajsk.pl":true,"limanowa.pl":true,"lomza.pl":true,"lowicz.pl":true,"lubin.pl":true,"lukow.pl":true,"malbork.pl":true,"malopolska.pl":true,"mazowsze.pl":true,"mazury.pl":true,"mielec.pl":true,"mielno.pl":true,"mragowo.pl":true,"naklo.pl":true,"nowaruda.pl":true,"nysa.pl":true,"olawa.pl":true,"olecko.pl":true,"olkusz.pl":true,"olsztyn.pl":true,"opoczno.pl":true,"opole.pl":true,"ostroda.pl":true,"ostroleka.pl":true,"ostrowiec.pl":true,"ostrowwlkp.pl":true,"pila.pl":true,"pisz.pl":true,"podhale.pl":true,"podlasie.pl":true,"polkowice.pl":true,"pomorze.pl":true,"pomorskie.pl":true,"prochowice.pl":true,"pruszkow.pl":true,"przeworsk.pl":true,"pulawy.pl":true,"radom.pl":true,"rawa-maz.pl":true,"rybnik.pl":true,"rzeszow.pl":true,"sanok.pl":true,"sejny.pl":true,"slask.pl":true,"slupsk.pl":true,"sosnowiec.pl":true,"stalowa-wola.pl":true,"skoczow.pl":true,"starachowice.pl":true,"stargard.pl":true,"suwalki.pl":true,"swidnica.pl":true,"swiebodzin.pl":true,"swinoujscie.pl":true,"szczecin.pl":true,"szczytno.pl":true,"tarnobrzeg.pl":true,"tgory.pl":true,"turek.pl":true,"tychy.pl":true,"ustka.pl":true,"walbrzych.pl":true,"warmia.pl":true,"warszawa.pl":true,"waw.pl":true,"wegrow.pl":true,"wielun.pl":true,"wlocl.pl":true,"wloclawek.pl":true,"wodzislaw.pl":true,"wolomin.pl":true,"wroclaw.pl":true,"zachpomor.pl":true,"zagan.pl":true,"zarow.pl":true,"zgora.pl":true,"zgorzelec.pl":true,"pm":true,"pn":true,"gov.pn":true,"co.pn":true,"org.pn":true,"edu.pn":true,"net.pn":true,"post":true,"pr":true,"com.pr":true,"net.pr":true,"org.pr":true,"gov.pr":true,"edu.pr":true,"isla.pr":true,"pro.pr":true,"biz.pr":true,"info.pr":true,"name.pr":true,"est.pr":true,"prof.pr":true,"ac.pr":true,"pro":true,"aaa.pro":true,"aca.pro":true,"acct.pro":true,"avocat.pro":true,"bar.pro":true,"cpa.pro":true,"eng.pro":true,"jur.pro":true,"law.pro":true,"med.pro":true,"recht.pro":true,"ps":true,"edu.ps":true,"gov.ps":true,"sec.ps":true,"plo.ps":true,"com.ps":true,"org.ps":true,"net.ps":true,"pt":true,"net.pt":true,"gov.pt":true,"org.pt":true,"edu.pt":true,"int.pt":true,"publ.pt":true,"com.pt":true,"nome.pt":true,"pw":true,"co.pw":true,"ne.pw":true,"or.pw":true,"ed.pw":true,"go.pw":true,"belau.pw":true,"py":true,"com.py":true,"coop.py":true,"edu.py":true,"gov.py":true,"mil.py":true,"net.py":true,"org.py":true,"qa":true,"com.qa":true,"edu.qa":true,"gov.qa":true,"mil.qa":true,"name.qa":true,"net.qa":true,"org.qa":true,"sch.qa":true,"re":true,"asso.re":true,"com.re":true,"nom.re":true,"ro":true,"arts.ro":true,"com.ro":true,"firm.ro":true,"info.ro":true,"nom.ro":true,"nt.ro":true,"org.ro":true,"rec.ro":true,"store.ro":true,"tm.ro":true,"www.ro":true,"rs":true,"ac.rs":true,"co.rs":true,"edu.rs":true,"gov.rs":true,"in.rs":true,"org.rs":true,"ru":true,"ac.ru":true,"edu.ru":true,"gov.ru":true,"int.ru":true,"mil.ru":true,"test.ru":true,"rw":true,"gov.rw":true,"net.rw":true,"edu.rw":true,"ac.rw":true,"com.rw":true,"co.rw":true,"int.rw":true,"mil.rw":true,"gouv.rw":true,"sa":true,"com.sa":true,"net.sa":true,"org.sa":true,"gov.sa":true,"med.sa":true,"pub.sa":true,"edu.sa":true,"sch.sa":true,"sb":true,"com.sb":true,"edu.sb":true,"gov.sb":true,"net.sb":true,"org.sb":true,"sc":true,"com.sc":true,"gov.sc":true,"net.sc":true,"org.sc":true,"edu.sc":true,"sd":true,"com.sd":true,"net.sd":true,"org.sd":true,"edu.sd":true,"med.sd":true,"tv.sd":true,"gov.sd":true,"info.sd":true,"se":true,"a.se":true,"ac.se":true,"b.se":true,"bd.se":true,"brand.se":true,"c.se":true,"d.se":true,"e.se":true,"f.se":true,"fh.se":true,"fhsk.se":true,"fhv.se":true,"g.se":true,"h.se":true,"i.se":true,"k.se":true,"komforb.se":true,"kommunalforbund.se":true,"komvux.se":true,"l.se":true,"lanbib.se":true,"m.se":true,"n.se":true,"naturbruksgymn.se":true,"o.se":true,"org.se":true,"p.se":true,"parti.se":true,"pp.se":true,"press.se":true,"r.se":true,"s.se":true,"t.se":true,"tm.se":true,"u.se":true,"w.se":true,"x.se":true,"y.se":true,"z.se":true,"sg":true,"com.sg":true,"net.sg":true,"org.sg":true,"gov.sg":true,"edu.sg":true,"per.sg":true,"sh":true,"com.sh":true,"net.sh":true,"gov.sh":true,"org.sh":true,"mil.sh":true,"si":true,"sj":true,"sk":true,"sl":true,"com.sl":true,"net.sl":true,"edu.sl":true,"gov.sl":true,"org.sl":true,"sm":true,"sn":true,"art.sn":true,"com.sn":true,"edu.sn":true,"gouv.sn":true,"org.sn":true,"perso.sn":true,"univ.sn":true,"so":true,"com.so":true,"net.so":true,"org.so":true,"sr":true,"st":true,"co.st":true,"com.st":true,"consulado.st":true,"edu.st":true,"embaixada.st":true,"gov.st":true,"mil.st":true,"net.st":true,"org.st":true,"principe.st":true,"saotome.st":true,"store.st":true,"su":true,"sv":true,"com.sv":true,"edu.sv":true,"gob.sv":true,"org.sv":true,"red.sv":true,"sx":true,"gov.sx":true,"sy":true,"edu.sy":true,"gov.sy":true,"net.sy":true,"mil.sy":true,"com.sy":true,"org.sy":true,"sz":true,"co.sz":true,"ac.sz":true,"org.sz":true,"tc":true,"td":true,"tel":true,"tf":true,"tg":true,"th":true,"ac.th":true,"co.th":true,"go.th":true,"in.th":true,"mi.th":true,"net.th":true,"or.th":true,"tj":true,"ac.tj":true,"biz.tj":true,"co.tj":true,"com.tj":true,"edu.tj":true,"go.tj":true,"gov.tj":true,"int.tj":true,"mil.tj":true,"name.tj":true,"net.tj":true,"nic.tj":true,"org.tj":true,"test.tj":true,"web.tj":true,"tk":true,"tl":true,"gov.tl":true,"tm":true,"com.tm":true,"co.tm":true,"org.tm":true,"net.tm":true,"nom.tm":true,"gov.tm":true,"mil.tm":true,"edu.tm":true,"tn":true,"com.tn":true,"ens.tn":true,"fin.tn":true,"gov.tn":true,"ind.tn":true,"intl.tn":true,"nat.tn":true,"net.tn":true,"org.tn":true,"info.tn":true,"perso.tn":true,"tourism.tn":true,"edunet.tn":true,"rnrt.tn":true,"rns.tn":true,"rnu.tn":true,"mincom.tn":true,"agrinet.tn":true,"defense.tn":true,"turen.tn":true,"to":true,"com.to":true,"gov.to":true,"net.to":true,"org.to":true,"edu.to":true,"mil.to":true,"tr":true,"com.tr":true,"info.tr":true,"biz.tr":true,"net.tr":true,"org.tr":true,"web.tr":true,"gen.tr":true,"tv.tr":true,"av.tr":true,"dr.tr":true,"bbs.tr":true,"name.tr":true,"tel.tr":true,"gov.tr":true,"bel.tr":true,"pol.tr":true,"mil.tr":true,"k12.tr":true,"edu.tr":true,"kep.tr":true,"nc.tr":true,"gov.nc.tr":true,"travel":true,"tt":true,"co.tt":true,"com.tt":true,"org.tt":true,"net.tt":true,"biz.tt":true,"info.tt":true,"pro.tt":true,"int.tt":true,"coop.tt":true,"jobs.tt":true,"mobi.tt":true,"travel.tt":true,"museum.tt":true,"aero.tt":true,"name.tt":true,"gov.tt":true,"edu.tt":true,"tv":true,"tw":true,"edu.tw":true,"gov.tw":true,"mil.tw":true,"com.tw":true,"net.tw":true,"org.tw":true,"idv.tw":true,"game.tw":true,"ebiz.tw":true,"club.tw":true,"xn--zf0ao64a.tw":true,"xn--uc0atv.tw":true,"xn--czrw28b.tw":true,"tz":true,"ac.tz":true,"co.tz":true,"go.tz":true,"hotel.tz":true,"info.tz":true,"me.tz":true,"mil.tz":true,"mobi.tz":true,"ne.tz":true,"or.tz":true,"sc.tz":true,"tv.tz":true,"ua":true,"com.ua":true,"edu.ua":true,"gov.ua":true,"in.ua":true,"net.ua":true,"org.ua":true,"cherkassy.ua":true,"cherkasy.ua":true,"chernigov.ua":true,"chernihiv.ua":true,"chernivtsi.ua":true,"chernovtsy.ua":true,"ck.ua":true,"cn.ua":true,"cr.ua":true,"crimea.ua":true,"cv.ua":true,"dn.ua":true,"dnepropetrovsk.ua":true,"dnipropetrovsk.ua":true,"dominic.ua":true,"donetsk.ua":true,"dp.ua":true,"if.ua":true,"ivano-frankivsk.ua":true,"kh.ua":true,"kharkiv.ua":true,"kharkov.ua":true,"kherson.ua":true,"khmelnitskiy.ua":true,"khmelnytskyi.ua":true,"kiev.ua":true,"kirovograd.ua":true,"km.ua":true,"kr.ua":true,"krym.ua":true,"ks.ua":true,"kv.ua":true,"kyiv.ua":true,"lg.ua":true,"lt.ua":true,"lugansk.ua":true,"lutsk.ua":true,"lv.ua":true,"lviv.ua":true,"mk.ua":true,"mykolaiv.ua":true,"nikolaev.ua":true,"od.ua":true,"odesa.ua":true,"odessa.ua":true,"pl.ua":true,"poltava.ua":true,"rivne.ua":true,"rovno.ua":true,"rv.ua":true,"sb.ua":true,"sebastopol.ua":true,"sevastopol.ua":true,"sm.ua":true,"sumy.ua":true,"te.ua":true,"ternopil.ua":true,"uz.ua":true,"uzhgorod.ua":true,"vinnica.ua":true,"vinnytsia.ua":true,"vn.ua":true,"volyn.ua":true,"yalta.ua":true,"zaporizhzhe.ua":true,"zaporizhzhia.ua":true,"zhitomir.ua":true,"zhytomyr.ua":true,"zp.ua":true,"zt.ua":true,"ug":true,"co.ug":true,"or.ug":true,"ac.ug":true,"sc.ug":true,"go.ug":true,"ne.ug":true,"com.ug":true,"org.ug":true,"uk":true,"ac.uk":true,"co.uk":true,"gov.uk":true,"ltd.uk":true,"me.uk":true,"net.uk":true,"nhs.uk":true,"org.uk":true,"plc.uk":true,"police.uk":true,"*.sch.uk":true,"us":true,"dni.us":true,"fed.us":true,"isa.us":true,"kids.us":true,"nsn.us":true,"ak.us":true,"al.us":true,"ar.us":true,"as.us":true,"az.us":true,"ca.us":true,"co.us":true,"ct.us":true,"dc.us":true,"de.us":true,"fl.us":true,"ga.us":true,"gu.us":true,"hi.us":true,"ia.us":true,"id.us":true,"il.us":true,"in.us":true,"ks.us":true,"ky.us":true,"la.us":true,"ma.us":true,"md.us":true,"me.us":true,"mi.us":true,"mn.us":true,"mo.us":true,"ms.us":true,"mt.us":true,"nc.us":true,"nd.us":true,"ne.us":true,"nh.us":true,"nj.us":true,"nm.us":true,"nv.us":true,"ny.us":true,"oh.us":true,"ok.us":true,"or.us":true,"pa.us":true,"pr.us":true,"ri.us":true,"sc.us":true,"sd.us":true,"tn.us":true,"tx.us":true,"ut.us":true,"vi.us":true,"vt.us":true,"va.us":true,"wa.us":true,"wi.us":true,"wv.us":true,"wy.us":true,"k12.ak.us":true,"k12.al.us":true,"k12.ar.us":true,"k12.as.us":true,"k12.az.us":true,"k12.ca.us":true,"k12.co.us":true,"k12.ct.us":true,"k12.dc.us":true,"k12.de.us":true,"k12.fl.us":true,"k12.ga.us":true,"k12.gu.us":true,"k12.ia.us":true,"k12.id.us":true,"k12.il.us":true,"k12.in.us":true,"k12.ks.us":true,"k12.ky.us":true,"k12.la.us":true,"k12.ma.us":true,"k12.md.us":true,"k12.me.us":true,"k12.mi.us":true,"k12.mn.us":true,"k12.mo.us":true,"k12.ms.us":true,"k12.mt.us":true,"k12.nc.us":true,"k12.ne.us":true,"k12.nh.us":true,"k12.nj.us":true,"k12.nm.us":true,"k12.nv.us":true,"k12.ny.us":true,"k12.oh.us":true,"k12.ok.us":true,"k12.or.us":true,"k12.pa.us":true,"k12.pr.us":true,"k12.ri.us":true,"k12.sc.us":true,"k12.tn.us":true,"k12.tx.us":true,"k12.ut.us":true,"k12.vi.us":true,"k12.vt.us":true,"k12.va.us":true,"k12.wa.us":true,"k12.wi.us":true,"k12.wy.us":true,"cc.ak.us":true,"cc.al.us":true,"cc.ar.us":true,"cc.as.us":true,"cc.az.us":true,"cc.ca.us":true,"cc.co.us":true,"cc.ct.us":true,"cc.dc.us":true,"cc.de.us":true,"cc.fl.us":true,"cc.ga.us":true,"cc.gu.us":true,"cc.hi.us":true,"cc.ia.us":true,"cc.id.us":true,"cc.il.us":true,"cc.in.us":true,"cc.ks.us":true,"cc.ky.us":true,"cc.la.us":true,"cc.ma.us":true,"cc.md.us":true,"cc.me.us":true,"cc.mi.us":true,"cc.mn.us":true,"cc.mo.us":true,"cc.ms.us":true,"cc.mt.us":true,"cc.nc.us":true,"cc.nd.us":true,"cc.ne.us":true,"cc.nh.us":true,"cc.nj.us":true,"cc.nm.us":true,"cc.nv.us":true,"cc.ny.us":true,"cc.oh.us":true,"cc.ok.us":true,"cc.or.us":true,"cc.pa.us":true,"cc.pr.us":true,"cc.ri.us":true,"cc.sc.us":true,"cc.sd.us":true,"cc.tn.us":true,"cc.tx.us":true,"cc.ut.us":true,"cc.vi.us":true,"cc.vt.us":true,"cc.va.us":true,"cc.wa.us":true,"cc.wi.us":true,"cc.wv.us":true,"cc.wy.us":true,"lib.ak.us":true,"lib.al.us":true,"lib.ar.us":true,"lib.as.us":true,"lib.az.us":true,"lib.ca.us":true,"lib.co.us":true,"lib.ct.us":true,"lib.dc.us":true,"lib.fl.us":true,"lib.ga.us":true,"lib.gu.us":true,"lib.hi.us":true,"lib.ia.us":true,"lib.id.us":true,"lib.il.us":true,"lib.in.us":true,"lib.ks.us":true,"lib.ky.us":true,"lib.la.us":true,"lib.ma.us":true,"lib.md.us":true,"lib.me.us":true,"lib.mi.us":true,"lib.mn.us":true,"lib.mo.us":true,"lib.ms.us":true,"lib.mt.us":true,"lib.nc.us":true,"lib.nd.us":true,"lib.ne.us":true,"lib.nh.us":true,"lib.nj.us":true,"lib.nm.us":true,"lib.nv.us":true,"lib.ny.us":true,"lib.oh.us":true,"lib.ok.us":true,"lib.or.us":true,"lib.pa.us":true,"lib.pr.us":true,"lib.ri.us":true,"lib.sc.us":true,"lib.sd.us":true,"lib.tn.us":true,"lib.tx.us":true,"lib.ut.us":true,"lib.vi.us":true,"lib.vt.us":true,"lib.va.us":true,"lib.wa.us":true,"lib.wi.us":true,"lib.wy.us":true,"pvt.k12.ma.us":true,"chtr.k12.ma.us":true,"paroch.k12.ma.us":true,"ann-arbor.mi.us":true,"cog.mi.us":true,"dst.mi.us":true,"eaton.mi.us":true,"gen.mi.us":true,"mus.mi.us":true,"tec.mi.us":true,"washtenaw.mi.us":true,"uy":true,"com.uy":true,"edu.uy":true,"gub.uy":true,"mil.uy":true,"net.uy":true,"org.uy":true,"uz":true,"co.uz":true,"com.uz":true,"net.uz":true,"org.uz":true,"va":true,"vc":true,"com.vc":true,"net.vc":true,"org.vc":true,"gov.vc":true,"mil.vc":true,"edu.vc":true,"ve":true,"arts.ve":true,"co.ve":true,"com.ve":true,"e12.ve":true,"edu.ve":true,"firm.ve":true,"gob.ve":true,"gov.ve":true,"info.ve":true,"int.ve":true,"mil.ve":true,"net.ve":true,"org.ve":true,"rec.ve":true,"store.ve":true,"tec.ve":true,"web.ve":true,"vg":true,"vi":true,"co.vi":true,"com.vi":true,"k12.vi":true,"net.vi":true,"org.vi":true,"vn":true,"com.vn":true,"net.vn":true,"org.vn":true,"edu.vn":true,"gov.vn":true,"int.vn":true,"ac.vn":true,"biz.vn":true,"info.vn":true,"name.vn":true,"pro.vn":true,"health.vn":true,"vu":true,"com.vu":true,"edu.vu":true,"net.vu":true,"org.vu":true,"wf":true,"ws":true,"com.ws":true,"net.ws":true,"org.ws":true,"gov.ws":true,"edu.ws":true,"yt":true,"xn--mgbaam7a8h":true,"xn--y9a3aq":true,"xn--54b7fta0cc":true,"xn--90ae":true,"xn--90ais":true,"xn--fiqs8s":true,"xn--fiqz9s":true,"xn--lgbbat1ad8j":true,"xn--wgbh1c":true,"xn--e1a4c":true,"xn--node":true,"xn--qxam":true,"xn--j6w193g":true,"xn--2scrj9c":true,"xn--3hcrj9c":true,"xn--45br5cyl":true,"xn--h2breg3eve":true,"xn--h2brj9c8c":true,"xn--mgbgu82a":true,"xn--rvc1e0am3e":true,"xn--h2brj9c":true,"xn--mgbbh1a71e":true,"xn--fpcrj9c3d":true,"xn--gecrj9c":true,"xn--s9brj9c":true,"xn--45brj9c":true,"xn--xkc2dl3a5ee0h":true,"xn--mgba3a4f16a":true,"xn--mgba3a4fra":true,"xn--mgbtx2b":true,"xn--mgbayh7gpa":true,"xn--3e0b707e":true,"xn--80ao21a":true,"xn--fzc2c9e2c":true,"xn--xkc2al3hye2a":true,"xn--mgbc0a9azcg":true,"xn--d1alf":true,"xn--l1acc":true,"xn--mix891f":true,"xn--mix082f":true,"xn--mgbx4cd0ab":true,"xn--mgb9awbf":true,"xn--mgbai9azgqp6j":true,"xn--mgbai9a5eva00b":true,"xn--ygbi2ammx":true,"xn--90a3ac":true,"xn--o1ac.xn--90a3ac":true,"xn--c1avg.xn--90a3ac":true,"xn--90azh.xn--90a3ac":true,"xn--d1at.xn--90a3ac":true,"xn--o1ach.xn--90a3ac":true,"xn--80au.xn--90a3ac":true,"xn--p1ai":true,"xn--wgbl6a":true,"xn--mgberp4a5d4ar":true,"xn--mgberp4a5d4a87g":true,"xn--mgbqly7c0a67fbc":true,"xn--mgbqly7cvafr":true,"xn--mgbpl2fh":true,"xn--yfro4i67o":true,"xn--clchc0ea0b2g2a9gcd":true,"xn--ogbpf8fl":true,"xn--mgbtf8fl":true,"xn--o3cw4h":true,"xn--12c1fe0br.xn--o3cw4h":true,"xn--12co0c3b4eva.xn--o3cw4h":true,"xn--h3cuzk1di.xn--o3cw4h":true,"xn--o3cyx2a.xn--o3cw4h":true,"xn--m3ch0j3a.xn--o3cw4h":true,"xn--12cfi8ixb8l.xn--o3cw4h":true,"xn--pgbs0dh":true,"xn--kpry57d":true,"xn--kprw13d":true,"xn--nnx388a":true,"xn--j1amh":true,"xn--mgb2ddes":true,"xxx":true,"*.ye":true,"ac.za":true,"agric.za":true,"alt.za":true,"co.za":true,"edu.za":true,"gov.za":true,"grondar.za":true,"law.za":true,"mil.za":true,"net.za":true,"ngo.za":true,"nis.za":true,"nom.za":true,"org.za":true,"school.za":true,"tm.za":true,"web.za":true,"zm":true,"ac.zm":true,"biz.zm":true,"co.zm":true,"com.zm":true,"edu.zm":true,"gov.zm":true,"info.zm":true,"mil.zm":true,"net.zm":true,"org.zm":true,"sch.zm":true,"zw":true,"ac.zw":true,"co.zw":true,"gov.zw":true,"mil.zw":true,"org.zw":true,"aaa":true,"aarp":true,"abarth":true,"abb":true,"abbott":true,"abbvie":true,"abc":true,"able":true,"abogado":true,"abudhabi":true,"academy":true,"accenture":true,"accountant":true,"accountants":true,"aco":true,"active":true,"actor":true,"adac":true,"ads":true,"adult":true,"aeg":true,"aetna":true,"afamilycompany":true,"afl":true,"africa":true,"agakhan":true,"agency":true,"aig":true,"aigo":true,"airbus":true,"airforce":true,"airtel":true,"akdn":true,"alfaromeo":true,"alibaba":true,"alipay":true,"allfinanz":true,"allstate":true,"ally":true,"alsace":true,"alstom":true,"americanexpress":true,"americanfamily":true,"amex":true,"amfam":true,"amica":true,"amsterdam":true,"analytics":true,"android":true,"anquan":true,"anz":true,"aol":true,"apartments":true,"app":true,"apple":true,"aquarelle":true,"arab":true,"aramco":true,"archi":true,"army":true,"art":true,"arte":true,"asda":true,"associates":true,"athleta":true,"attorney":true,"auction":true,"audi":true,"audible":true,"audio":true,"auspost":true,"author":true,"auto":true,"autos":true,"avianca":true,"aws":true,"axa":true,"azure":true,"baby":true,"baidu":true,"banamex":true,"bananarepublic":true,"band":true,"bank":true,"bar":true,"barcelona":true,"barclaycard":true,"barclays":true,"barefoot":true,"bargains":true,"baseball":true,"basketball":true,"bauhaus":true,"bayern":true,"bbc":true,"bbt":true,"bbva":true,"bcg":true,"bcn":true,"beats":true,"beauty":true,"beer":true,"bentley":true,"berlin":true,"best":true,"bestbuy":true,"bet":true,"bharti":true,"bible":true,"bid":true,"bike":true,"bing":true,"bingo":true,"bio":true,"black":true,"blackfriday":true,"blanco":true,"blockbuster":true,"blog":true,"bloomberg":true,"blue":true,"bms":true,"bmw":true,"bnl":true,"bnpparibas":true,"boats":true,"boehringer":true,"bofa":true,"bom":true,"bond":true,"boo":true,"book":true,"booking":true,"boots":true,"bosch":true,"bostik":true,"boston":true,"bot":true,"boutique":true,"box":true,"bradesco":true,"bridgestone":true,"broadway":true,"broker":true,"brother":true,"brussels":true,"budapest":true,"bugatti":true,"build":true,"builders":true,"business":true,"buy":true,"buzz":true,"bzh":true,"cab":true,"cafe":true,"cal":true,"call":true,"calvinklein":true,"cam":true,"camera":true,"camp":true,"cancerresearch":true,"canon":true,"capetown":true,"capital":true,"capitalone":true,"car":true,"caravan":true,"cards":true,"care":true,"career":true,"careers":true,"cars":true,"cartier":true,"casa":true,"case":true,"caseih":true,"cash":true,"casino":true,"catering":true,"catholic":true,"cba":true,"cbn":true,"cbre":true,"cbs":true,"ceb":true,"center":true,"ceo":true,"cern":true,"cfa":true,"cfd":true,"chanel":true,"channel":true,"chase":true,"chat":true,"cheap":true,"chintai":true,"christmas":true,"chrome":true,"chrysler":true,"church":true,"cipriani":true,"circle":true,"cisco":true,"citadel":true,"citi":true,"citic":true,"city":true,"cityeats":true,"claims":true,"cleaning":true,"click":true,"clinic":true,"clinique":true,"clothing":true,"cloud":true,"club":true,"clubmed":true,"coach":true,"codes":true,"coffee":true,"college":true,"cologne":true,"comcast":true,"commbank":true,"community":true,"company":true,"compare":true,"computer":true,"comsec":true,"condos":true,"construction":true,"consulting":true,"contact":true,"contractors":true,"cooking":true,"cookingchannel":true,"cool":true,"corsica":true,"country":true,"coupon":true,"coupons":true,"courses":true,"credit":true,"creditcard":true,"creditunion":true,"cricket":true,"crown":true,"crs":true,"cruise":true,"cruises":true,"csc":true,"cuisinella":true,"cymru":true,"cyou":true,"dabur":true,"dad":true,"dance":true,"data":true,"date":true,"dating":true,"datsun":true,"day":true,"dclk":true,"dds":true,"deal":true,"dealer":true,"deals":true,"degree":true,"delivery":true,"dell":true,"deloitte":true,"delta":true,"democrat":true,"dental":true,"dentist":true,"desi":true,"design":true,"dev":true,"dhl":true,"diamonds":true,"diet":true,"digital":true,"direct":true,"directory":true,"discount":true,"discover":true,"dish":true,"diy":true,"dnp":true,"docs":true,"doctor":true,"dodge":true,"dog":true,"doha":true,"domains":true,"dot":true,"download":true,"drive":true,"dtv":true,"dubai":true,"duck":true,"dunlop":true,"duns":true,"dupont":true,"durban":true,"dvag":true,"dvr":true,"earth":true,"eat":true,"eco":true,"edeka":true,"education":true,"email":true,"emerck":true,"energy":true,"engineer":true,"engineering":true,"enterprises":true,"epost":true,"epson":true,"equipment":true,"ericsson":true,"erni":true,"esq":true,"estate":true,"esurance":true,"etisalat":true,"eurovision":true,"eus":true,"events":true,"everbank":true,"exchange":true,"expert":true,"exposed":true,"express":true,"extraspace":true,"fage":true,"fail":true,"fairwinds":true,"faith":true,"family":true,"fan":true,"fans":true,"farm":true,"farmers":true,"fashion":true,"fast":true,"fedex":true,"feedback":true,"ferrari":true,"ferrero":true,"fiat":true,"fidelity":true,"fido":true,"film":true,"final":true,"finance":true,"financial":true,"fire":true,"firestone":true,"firmdale":true,"fish":true,"fishing":true,"fit":true,"fitness":true,"flickr":true,"flights":true,"flir":true,"florist":true,"flowers":true,"fly":true,"foo":true,"food":true,"foodnetwork":true,"football":true,"ford":true,"forex":true,"forsale":true,"forum":true,"foundation":true,"fox":true,"free":true,"fresenius":true,"frl":true,"frogans":true,"frontdoor":true,"frontier":true,"ftr":true,"fujitsu":true,"fujixerox":true,"fun":true,"fund":true,"furniture":true,"futbol":true,"fyi":true,"gal":true,"gallery":true,"gallo":true,"gallup":true,"game":true,"games":true,"gap":true,"garden":true,"gbiz":true,"gdn":true,"gea":true,"gent":true,"genting":true,"george":true,"ggee":true,"gift":true,"gifts":true,"gives":true,"giving":true,"glade":true,"glass":true,"gle":true,"global":true,"globo":true,"gmail":true,"gmbh":true,"gmo":true,"gmx":true,"godaddy":true,"gold":true,"goldpoint":true,"golf":true,"goo":true,"goodhands":true,"goodyear":true,"goog":true,"google":true,"gop":true,"got":true,"grainger":true,"graphics":true,"gratis":true,"green":true,"gripe":true,"grocery":true,"group":true,"guardian":true,"gucci":true,"guge":true,"guide":true,"guitars":true,"guru":true,"hair":true,"hamburg":true,"hangout":true,"haus":true,"hbo":true,"hdfc":true,"hdfcbank":true,"health":true,"healthcare":true,"help":true,"helsinki":true,"here":true,"hermes":true,"hgtv":true,"hiphop":true,"hisamitsu":true,"hitachi":true,"hiv":true,"hkt":true,"hockey":true,"holdings":true,"holiday":true,"homedepot":true,"homegoods":true,"homes":true,"homesense":true,"honda":true,"honeywell":true,"horse":true,"hospital":true,"host":true,"hosting":true,"hot":true,"hoteles":true,"hotels":true,"hotmail":true,"house":true,"how":true,"hsbc":true,"hughes":true,"hyatt":true,"hyundai":true,"ibm":true,"icbc":true,"ice":true,"icu":true,"ieee":true,"ifm":true,"ikano":true,"imamat":true,"imdb":true,"immo":true,"immobilien":true,"industries":true,"infiniti":true,"ing":true,"ink":true,"institute":true,"insurance":true,"insure":true,"intel":true,"international":true,"intuit":true,"investments":true,"ipiranga":true,"irish":true,"iselect":true,"ismaili":true,"ist":true,"istanbul":true,"itau":true,"itv":true,"iveco":true,"iwc":true,"jaguar":true,"java":true,"jcb":true,"jcp":true,"jeep":true,"jetzt":true,"jewelry":true,"jio":true,"jlc":true,"jll":true,"jmp":true,"jnj":true,"joburg":true,"jot":true,"joy":true,"jpmorgan":true,"jprs":true,"juegos":true,"juniper":true,"kaufen":true,"kddi":true,"kerryhotels":true,"kerrylogistics":true,"kerryproperties":true,"kfh":true,"kia":true,"kim":true,"kinder":true,"kindle":true,"kitchen":true,"kiwi":true,"koeln":true,"komatsu":true,"kosher":true,"kpmg":true,"kpn":true,"krd":true,"kred":true,"kuokgroup":true,"kyoto":true,"lacaixa":true,"ladbrokes":true,"lamborghini":true,"lamer":true,"lancaster":true,"lancia":true,"lancome":true,"land":true,"landrover":true,"lanxess":true,"lasalle":true,"lat":true,"latino":true,"latrobe":true,"law":true,"lawyer":true,"lds":true,"lease":true,"leclerc":true,"lefrak":true,"legal":true,"lego":true,"lexus":true,"lgbt":true,"liaison":true,"lidl":true,"life":true,"lifeinsurance":true,"lifestyle":true,"lighting":true,"like":true,"lilly":true,"limited":true,"limo":true,"lincoln":true,"linde":true,"link":true,"lipsy":true,"live":true,"living":true,"lixil":true,"loan":true,"loans":true,"locker":true,"locus":true,"loft":true,"lol":true,"london":true,"lotte":true,"lotto":true,"love":true,"lpl":true,"lplfinancial":true,"ltd":true,"ltda":true,"lundbeck":true,"lupin":true,"luxe":true,"luxury":true,"macys":true,"madrid":true,"maif":true,"maison":true,"makeup":true,"man":true,"management":true,"mango":true,"map":true,"market":true,"marketing":true,"markets":true,"marriott":true,"marshalls":true,"maserati":true,"mattel":true,"mba":true,"mckinsey":true,"med":true,"media":true,"meet":true,"melbourne":true,"meme":true,"memorial":true,"men":true,"menu":true,"meo":true,"merckmsd":true,"metlife":true,"miami":true,"microsoft":true,"mini":true,"mint":true,"mit":true,"mitsubishi":true,"mlb":true,"mls":true,"mma":true,"mobile":true,"mobily":true,"moda":true,"moe":true,"moi":true,"mom":true,"monash":true,"money":true,"monster":true,"mopar":true,"mormon":true,"mortgage":true,"moscow":true,"moto":true,"motorcycles":true,"mov":true,"movie":true,"movistar":true,"msd":true,"mtn":true,"mtpc":true,"mtr":true,"mutual":true,"nab":true,"nadex":true,"nagoya":true,"nationwide":true,"natura":true,"navy":true,"nba":true,"nec":true,"netbank":true,"netflix":true,"network":true,"neustar":true,"new":true,"newholland":true,"news":true,"next":true,"nextdirect":true,"nexus":true,"nfl":true,"ngo":true,"nhk":true,"nico":true,"nike":true,"nikon":true,"ninja":true,"nissan":true,"nissay":true,"nokia":true,"northwesternmutual":true,"norton":true,"now":true,"nowruz":true,"nowtv":true,"nra":true,"nrw":true,"ntt":true,"nyc":true,"obi":true,"observer":true,"off":true,"office":true,"okinawa":true,"olayan":true,"olayangroup":true,"oldnavy":true,"ollo":true,"omega":true,"one":true,"ong":true,"onl":true,"online":true,"onyourside":true,"ooo":true,"open":true,"oracle":true,"orange":true,"organic":true,"origins":true,"osaka":true,"otsuka":true,"ott":true,"ovh":true,"page":true,"panasonic":true,"panerai":true,"paris":true,"pars":true,"partners":true,"parts":true,"party":true,"passagens":true,"pay":true,"pccw":true,"pet":true,"pfizer":true,"pharmacy":true,"phd":true,"philips":true,"phone":true,"photo":true,"photography":true,"photos":true,"physio":true,"piaget":true,"pics":true,"pictet":true,"pictures":true,"pid":true,"pin":true,"ping":true,"pink":true,"pioneer":true,"pizza":true,"place":true,"play":true,"playstation":true,"plumbing":true,"plus":true,"pnc":true,"pohl":true,"poker":true,"politie":true,"porn":true,"pramerica":true,"praxi":true,"press":true,"prime":true,"prod":true,"productions":true,"prof":true,"progressive":true,"promo":true,"properties":true,"property":true,"protection":true,"pru":true,"prudential":true,"pub":true,"pwc":true,"qpon":true,"quebec":true,"quest":true,"qvc":true,"racing":true,"radio":true,"raid":true,"read":true,"realestate":true,"realtor":true,"realty":true,"recipes":true,"red":true,"redstone":true,"redumbrella":true,"rehab":true,"reise":true,"reisen":true,"reit":true,"reliance":true,"ren":true,"rent":true,"rentals":true,"repair":true,"report":true,"republican":true,"rest":true,"restaurant":true,"review":true,"reviews":true,"rexroth":true,"rich":true,"richardli":true,"ricoh":true,"rightathome":true,"ril":true,"rio":true,"rip":true,"rmit":true,"rocher":true,"rocks":true,"rodeo":true,"rogers":true,"room":true,"rsvp":true,"rugby":true,"ruhr":true,"run":true,"rwe":true,"ryukyu":true,"saarland":true,"safe":true,"safety":true,"sakura":true,"sale":true,"salon":true,"samsclub":true,"samsung":true,"sandvik":true,"sandvikcoromant":true,"sanofi":true,"sap":true,"sapo":true,"sarl":true,"sas":true,"save":true,"saxo":true,"sbi":true,"sbs":true,"sca":true,"scb":true,"schaeffler":true,"schmidt":true,"scholarships":true,"school":true,"schule":true,"schwarz":true,"science":true,"scjohnson":true,"scor":true,"scot":true,"search":true,"seat":true,"secure":true,"security":true,"seek":true,"select":true,"sener":true,"services":true,"ses":true,"seven":true,"sew":true,"sex":true,"sexy":true,"sfr":true,"shangrila":true,"sharp":true,"shaw":true,"shell":true,"shia":true,"shiksha":true,"shoes":true,"shop":true,"shopping":true,"shouji":true,"show":true,"showtime":true,"shriram":true,"silk":true,"sina":true,"singles":true,"site":true,"ski":true,"skin":true,"sky":true,"skype":true,"sling":true,"smart":true,"smile":true,"sncf":true,"soccer":true,"social":true,"softbank":true,"software":true,"sohu":true,"solar":true,"solutions":true,"song":true,"sony":true,"soy":true,"space":true,"spiegel":true,"spot":true,"spreadbetting":true,"srl":true,"srt":true,"stada":true,"staples":true,"star":true,"starhub":true,"statebank":true,"statefarm":true,"statoil":true,"stc":true,"stcgroup":true,"stockholm":true,"storage":true,"store":true,"stream":true,"studio":true,"study":true,"style":true,"sucks":true,"supplies":true,"supply":true,"support":true,"surf":true,"surgery":true,"suzuki":true,"swatch":true,"swiftcover":true,"swiss":true,"sydney":true,"symantec":true,"systems":true,"tab":true,"taipei":true,"talk":true,"taobao":true,"target":true,"tatamotors":true,"tatar":true,"tattoo":true,"tax":true,"taxi":true,"tci":true,"tdk":true,"team":true,"tech":true,"technology":true,"telecity":true,"telefonica":true,"temasek":true,"tennis":true,"teva":true,"thd":true,"theater":true,"theatre":true,"tiaa":true,"tickets":true,"tienda":true,"tiffany":true,"tips":true,"tires":true,"tirol":true,"tjmaxx":true,"tjx":true,"tkmaxx":true,"tmall":true,"today":true,"tokyo":true,"tools":true,"top":true,"toray":true,"toshiba":true,"total":true,"tours":true,"town":true,"toyota":true,"toys":true,"trade":true,"trading":true,"training":true,"travelchannel":true,"travelers":true,"travelersinsurance":true,"trust":true,"trv":true,"tube":true,"tui":true,"tunes":true,"tushu":true,"tvs":true,"ubank":true,"ubs":true,"uconnect":true,"unicom":true,"university":true,"uno":true,"uol":true,"ups":true,"vacations":true,"vana":true,"vanguard":true,"vegas":true,"ventures":true,"verisign":true,"versicherung":true,"vet":true,"viajes":true,"video":true,"vig":true,"viking":true,"villas":true,"vin":true,"vip":true,"virgin":true,"visa":true,"vision":true,"vista":true,"vistaprint":true,"viva":true,"vivo":true,"vlaanderen":true,"vodka":true,"volkswagen":true,"volvo":true,"vote":true,"voting":true,"voto":true,"voyage":true,"vuelos":true,"wales":true,"walmart":true,"walter":true,"wang":true,"wanggou":true,"warman":true,"watch":true,"watches":true,"weather":true,"weatherchannel":true,"webcam":true,"weber":true,"website":true,"wed":true,"wedding":true,"weibo":true,"weir":true,"whoswho":true,"wien":true,"wiki":true,"williamhill":true,"win":true,"windows":true,"wine":true,"winners":true,"wme":true,"wolterskluwer":true,"woodside":true,"work":true,"works":true,"world":true,"wow":true,"wtc":true,"wtf":true,"xbox":true,"xerox":true,"xfinity":true,"xihuan":true,"xin":true,"xn--11b4c3d":true,"xn--1ck2e1b":true,"xn--1qqw23a":true,"xn--30rr7y":true,"xn--3bst00m":true,"xn--3ds443g":true,"xn--3oq18vl8pn36a":true,"xn--3pxu8k":true,"xn--42c2d9a":true,"xn--45q11c":true,"xn--4gbrim":true,"xn--55qw42g":true,"xn--55qx5d":true,"xn--5su34j936bgsg":true,"xn--5tzm5g":true,"xn--6frz82g":true,"xn--6qq986b3xl":true,"xn--80adxhks":true,"xn--80aqecdr1a":true,"xn--80asehdb":true,"xn--80aswg":true,"xn--8y0a063a":true,"xn--9dbq2a":true,"xn--9et52u":true,"xn--9krt00a":true,"xn--b4w605ferd":true,"xn--bck1b9a5dre4c":true,"xn--c1avg":true,"xn--c2br7g":true,"xn--cck2b3b":true,"xn--cg4bki":true,"xn--czr694b":true,"xn--czrs0t":true,"xn--czru2d":true,"xn--d1acj3b":true,"xn--eckvdtc9d":true,"xn--efvy88h":true,"xn--estv75g":true,"xn--fct429k":true,"xn--fhbei":true,"xn--fiq228c5hs":true,"xn--fiq64b":true,"xn--fjq720a":true,"xn--flw351e":true,"xn--fzys8d69uvgm":true,"xn--g2xx48c":true,"xn--gckr3f0f":true,"xn--gk3at1e":true,"xn--hxt814e":true,"xn--i1b6b1a6a2e":true,"xn--imr513n":true,"xn--io0a7i":true,"xn--j1aef":true,"xn--jlq61u9w7b":true,"xn--jvr189m":true,"xn--kcrx77d1x4a":true,"xn--kpu716f":true,"xn--kput3i":true,"xn--mgba3a3ejt":true,"xn--mgba7c0bbn0a":true,"xn--mgbaakc7dvf":true,"xn--mgbab2bd":true,"xn--mgbb9fbpob":true,"xn--mgbca7dzdo":true,"xn--mgbi4ecexp":true,"xn--mgbt3dhd":true,"xn--mk1bu44c":true,"xn--mxtq1m":true,"xn--ngbc5azd":true,"xn--ngbe9e0a":true,"xn--ngbrx":true,"xn--nqv7f":true,"xn--nqv7fs00ema":true,"xn--nyqy26a":true,"xn--p1acf":true,"xn--pbt977c":true,"xn--pssy2u":true,"xn--q9jyb4c":true,"xn--qcka1pmc":true,"xn--rhqv96g":true,"xn--rovu88b":true,"xn--ses554g":true,"xn--t60b56a":true,"xn--tckwe":true,"xn--tiq49xqyj":true,"xn--unup4y":true,"xn--vermgensberater-ctb":true,"xn--vermgensberatung-pwb":true,"xn--vhquv":true,"xn--vuq861b":true,"xn--w4r85el8fhu5dnra":true,"xn--w4rs40l":true,"xn--xhq521b":true,"xn--zfr164b":true,"xperia":true,"xyz":true,"yachts":true,"yahoo":true,"yamaxun":true,"yandex":true,"yodobashi":true,"yoga":true,"yokohama":true,"you":true,"youtube":true,"yun":true,"zappos":true,"zara":true,"zero":true,"zip":true,"zippo":true,"zone":true,"zuerich":true,"cc.ua":true,"inf.ua":true,"ltd.ua":true,"1password.ca":true,"1password.com":true,"1password.eu":true,"beep.pl":true,"*.compute.estate":true,"*.alces.network":true,"alwaysdata.net":true,"cloudfront.net":true,"*.compute.amazonaws.com":true,"*.compute-1.amazonaws.com":true,"*.compute.amazonaws.com.cn":true,"us-east-1.amazonaws.com":true,"cn-north-1.eb.amazonaws.com.cn":true,"elasticbeanstalk.com":true,"ap-northeast-1.elasticbeanstalk.com":true,"ap-northeast-2.elasticbeanstalk.com":true,"ap-south-1.elasticbeanstalk.com":true,"ap-southeast-1.elasticbeanstalk.com":true,"ap-southeast-2.elasticbeanstalk.com":true,"ca-central-1.elasticbeanstalk.com":true,"eu-central-1.elasticbeanstalk.com":true,"eu-west-1.elasticbeanstalk.com":true,"eu-west-2.elasticbeanstalk.com":true,"eu-west-3.elasticbeanstalk.com":true,"sa-east-1.elasticbeanstalk.com":true,"us-east-1.elasticbeanstalk.com":true,"us-east-2.elasticbeanstalk.com":true,"us-gov-west-1.elasticbeanstalk.com":true,"us-west-1.elasticbeanstalk.com":true,"us-west-2.elasticbeanstalk.com":true,"*.elb.amazonaws.com":true,"*.elb.amazonaws.com.cn":true,"s3.amazonaws.com":true,"s3-ap-northeast-1.amazonaws.com":true,"s3-ap-northeast-2.amazonaws.com":true,"s3-ap-south-1.amazonaws.com":true,"s3-ap-southeast-1.amazonaws.com":true,"s3-ap-southeast-2.amazonaws.com":true,"s3-ca-central-1.amazonaws.com":true,"s3-eu-central-1.amazonaws.com":true,"s3-eu-west-1.amazonaws.com":true,"s3-eu-west-2.amazonaws.com":true,"s3-eu-west-3.amazonaws.com":true,"s3-external-1.amazonaws.com":true,"s3-fips-us-gov-west-1.amazonaws.com":true,"s3-sa-east-1.amazonaws.com":true,"s3-us-gov-west-1.amazonaws.com":true,"s3-us-east-2.amazonaws.com":true,"s3-us-west-1.amazonaws.com":true,"s3-us-west-2.amazonaws.com":true,"s3.ap-northeast-2.amazonaws.com":true,"s3.ap-south-1.amazonaws.com":true,"s3.cn-north-1.amazonaws.com.cn":true,"s3.ca-central-1.amazonaws.com":true,"s3.eu-central-1.amazonaws.com":true,"s3.eu-west-2.amazonaws.com":true,"s3.eu-west-3.amazonaws.com":true,"s3.us-east-2.amazonaws.com":true,"s3.dualstack.ap-northeast-1.amazonaws.com":true,"s3.dualstack.ap-northeast-2.amazonaws.com":true,"s3.dualstack.ap-south-1.amazonaws.com":true,"s3.dualstack.ap-southeast-1.amazonaws.com":true,"s3.dualstack.ap-southeast-2.amazonaws.com":true,"s3.dualstack.ca-central-1.amazonaws.com":true,"s3.dualstack.eu-central-1.amazonaws.com":true,"s3.dualstack.eu-west-1.amazonaws.com":true,"s3.dualstack.eu-west-2.amazonaws.com":true,"s3.dualstack.eu-west-3.amazonaws.com":true,"s3.dualstack.sa-east-1.amazonaws.com":true,"s3.dualstack.us-east-1.amazonaws.com":true,"s3.dualstack.us-east-2.amazonaws.com":true,"s3-website-us-east-1.amazonaws.com":true,"s3-website-us-west-1.amazonaws.com":true,"s3-website-us-west-2.amazonaws.com":true,"s3-website-ap-northeast-1.amazonaws.com":true,"s3-website-ap-southeast-1.amazonaws.com":true,"s3-website-ap-southeast-2.amazonaws.com":true,"s3-website-eu-west-1.amazonaws.com":true,"s3-website-sa-east-1.amazonaws.com":true,"s3-website.ap-northeast-2.amazonaws.com":true,"s3-website.ap-south-1.amazonaws.com":true,"s3-website.ca-central-1.amazonaws.com":true,"s3-website.eu-central-1.amazonaws.com":true,"s3-website.eu-west-2.amazonaws.com":true,"s3-website.eu-west-3.amazonaws.com":true,"s3-website.us-east-2.amazonaws.com":true,"t3l3p0rt.net":true,"tele.amune.org":true,"on-aptible.com":true,"user.party.eus":true,"pimienta.org":true,"poivron.org":true,"potager.org":true,"sweetpepper.org":true,"myasustor.com":true,"myfritz.net":true,"*.awdev.ca":true,"*.advisor.ws":true,"backplaneapp.io":true,"betainabox.com":true,"bnr.la":true,"boomla.net":true,"boxfuse.io":true,"square7.ch":true,"bplaced.com":true,"bplaced.de":true,"square7.de":true,"bplaced.net":true,"square7.net":true,"browsersafetymark.io":true,"mycd.eu":true,"ae.org":true,"ar.com":true,"br.com":true,"cn.com":true,"com.de":true,"com.se":true,"de.com":true,"eu.com":true,"gb.com":true,"gb.net":true,"hu.com":true,"hu.net":true,"jp.net":true,"jpn.com":true,"kr.com":true,"mex.com":true,"no.com":true,"qc.com":true,"ru.com":true,"sa.com":true,"se.com":true,"se.net":true,"uk.com":true,"uk.net":true,"us.com":true,"uy.com":true,"za.bz":true,"za.com":true,"africa.com":true,"gr.com":true,"in.net":true,"us.org":true,"co.com":true,"c.la":true,"certmgr.org":true,"xenapponazure.com":true,"virtueeldomein.nl":true,"c66.me":true,"cloud66.ws":true,"jdevcloud.com":true,"wpdevcloud.com":true,"cloudaccess.host":true,"freesite.host":true,"cloudaccess.net":true,"cloudcontrolled.com":true,"cloudcontrolapp.com":true,"co.ca":true,"co.cz":true,"c.cdn77.org":true,"cdn77-ssl.net":true,"r.cdn77.net":true,"rsc.cdn77.org":true,"ssl.origin.cdn77-secure.org":true,"cloudns.asia":true,"cloudns.biz":true,"cloudns.club":true,"cloudns.cc":true,"cloudns.eu":true,"cloudns.in":true,"cloudns.info":true,"cloudns.org":true,"cloudns.pro":true,"cloudns.pw":true,"cloudns.us":true,"co.nl":true,"co.no":true,"webhosting.be":true,"hosting-cluster.nl":true,"dyn.cosidns.de":true,"dynamisches-dns.de":true,"dnsupdater.de":true,"internet-dns.de":true,"l-o-g-i-n.de":true,"dynamic-dns.info":true,"feste-ip.net":true,"knx-server.net":true,"static-access.net":true,"realm.cz":true,"*.cryptonomic.net":true,"cupcake.is":true,"cyon.link":true,"cyon.site":true,"daplie.me":true,"localhost.daplie.me":true,"biz.dk":true,"co.dk":true,"firm.dk":true,"reg.dk":true,"store.dk":true,"debian.net":true,"dedyn.io":true,"dnshome.de":true,"drayddns.com":true,"dreamhosters.com":true,"mydrobo.com":true,"drud.io":true,"drud.us":true,"duckdns.org":true,"dy.fi":true,"tunk.org":true,"dyndns-at-home.com":true,"dyndns-at-work.com":true,"dyndns-blog.com":true,"dyndns-free.com":true,"dyndns-home.com":true,"dyndns-ip.com":true,"dyndns-mail.com":true,"dyndns-office.com":true,"dyndns-pics.com":true,"dyndns-remote.com":true,"dyndns-server.com":true,"dyndns-web.com":true,"dyndns-wiki.com":true,"dyndns-work.com":true,"dyndns.biz":true,"dyndns.info":true,"dyndns.org":true,"dyndns.tv":true,"at-band-camp.net":true,"ath.cx":true,"barrel-of-knowledge.info":true,"barrell-of-knowledge.info":true,"better-than.tv":true,"blogdns.com":true,"blogdns.net":true,"blogdns.org":true,"blogsite.org":true,"boldlygoingnowhere.org":true,"broke-it.net":true,"buyshouses.net":true,"cechire.com":true,"dnsalias.com":true,"dnsalias.net":true,"dnsalias.org":true,"dnsdojo.com":true,"dnsdojo.net":true,"dnsdojo.org":true,"does-it.net":true,"doesntexist.com":true,"doesntexist.org":true,"dontexist.com":true,"dontexist.net":true,"dontexist.org":true,"doomdns.com":true,"doomdns.org":true,"dvrdns.org":true,"dyn-o-saur.com":true,"dynalias.com":true,"dynalias.net":true,"dynalias.org":true,"dynathome.net":true,"dyndns.ws":true,"endofinternet.net":true,"endofinternet.org":true,"endoftheinternet.org":true,"est-a-la-maison.com":true,"est-a-la-masion.com":true,"est-le-patron.com":true,"est-mon-blogueur.com":true,"for-better.biz":true,"for-more.biz":true,"for-our.info":true,"for-some.biz":true,"for-the.biz":true,"forgot.her.name":true,"forgot.his.name":true,"from-ak.com":true,"from-al.com":true,"from-ar.com":true,"from-az.net":true,"from-ca.com":true,"from-co.net":true,"from-ct.com":true,"from-dc.com":true,"from-de.com":true,"from-fl.com":true,"from-ga.com":true,"from-hi.com":true,"from-ia.com":true,"from-id.com":true,"from-il.com":true,"from-in.com":true,"from-ks.com":true,"from-ky.com":true,"from-la.net":true,"from-ma.com":true,"from-md.com":true,"from-me.org":true,"from-mi.com":true,"from-mn.com":true,"from-mo.com":true,"from-ms.com":true,"from-mt.com":true,"from-nc.com":true,"from-nd.com":true,"from-ne.com":true,"from-nh.com":true,"from-nj.com":true,"from-nm.com":true,"from-nv.com":true,"from-ny.net":true,"from-oh.com":true,"from-ok.com":true,"from-or.com":true,"from-pa.com":true,"from-pr.com":true,"from-ri.com":true,"from-sc.com":true,"from-sd.com":true,"from-tn.com":true,"from-tx.com":true,"from-ut.com":true,"from-va.com":true,"from-vt.com":true,"from-wa.com":true,"from-wi.com":true,"from-wv.com":true,"from-wy.com":true,"ftpaccess.cc":true,"fuettertdasnetz.de":true,"game-host.org":true,"game-server.cc":true,"getmyip.com":true,"gets-it.net":true,"go.dyndns.org":true,"gotdns.com":true,"gotdns.org":true,"groks-the.info":true,"groks-this.info":true,"ham-radio-op.net":true,"here-for-more.info":true,"hobby-site.com":true,"hobby-site.org":true,"home.dyndns.org":true,"homedns.org":true,"homeftp.net":true,"homeftp.org":true,"homeip.net":true,"homelinux.com":true,"homelinux.net":true,"homelinux.org":true,"homeunix.com":true,"homeunix.net":true,"homeunix.org":true,"iamallama.com":true,"in-the-band.net":true,"is-a-anarchist.com":true,"is-a-blogger.com":true,"is-a-bookkeeper.com":true,"is-a-bruinsfan.org":true,"is-a-bulls-fan.com":true,"is-a-candidate.org":true,"is-a-caterer.com":true,"is-a-celticsfan.org":true,"is-a-chef.com":true,"is-a-chef.net":true,"is-a-chef.org":true,"is-a-conservative.com":true,"is-a-cpa.com":true,"is-a-cubicle-slave.com":true,"is-a-democrat.com":true,"is-a-designer.com":true,"is-a-doctor.com":true,"is-a-financialadvisor.com":true,"is-a-geek.com":true,"is-a-geek.net":true,"is-a-geek.org":true,"is-a-green.com":true,"is-a-guru.com":true,"is-a-hard-worker.com":true,"is-a-hunter.com":true,"is-a-knight.org":true,"is-a-landscaper.com":true,"is-a-lawyer.com":true,"is-a-liberal.com":true,"is-a-libertarian.com":true,"is-a-linux-user.org":true,"is-a-llama.com":true,"is-a-musician.com":true,"is-a-nascarfan.com":true,"is-a-nurse.com":true,"is-a-painter.com":true,"is-a-patsfan.org":true,"is-a-personaltrainer.com":true,"is-a-photographer.com":true,"is-a-player.com":true,"is-a-republican.com":true,"is-a-rockstar.com":true,"is-a-socialist.com":true,"is-a-soxfan.org":true,"is-a-student.com":true,"is-a-teacher.com":true,"is-a-techie.com":true,"is-a-therapist.com":true,"is-an-accountant.com":true,"is-an-actor.com":true,"is-an-actress.com":true,"is-an-anarchist.com":true,"is-an-artist.com":true,"is-an-engineer.com":true,"is-an-entertainer.com":true,"is-by.us":true,"is-certified.com":true,"is-found.org":true,"is-gone.com":true,"is-into-anime.com":true,"is-into-cars.com":true,"is-into-cartoons.com":true,"is-into-games.com":true,"is-leet.com":true,"is-lost.org":true,"is-not-certified.com":true,"is-saved.org":true,"is-slick.com":true,"is-uberleet.com":true,"is-very-bad.org":true,"is-very-evil.org":true,"is-very-good.org":true,"is-very-nice.org":true,"is-very-sweet.org":true,"is-with-theband.com":true,"isa-geek.com":true,"isa-geek.net":true,"isa-geek.org":true,"isa-hockeynut.com":true,"issmarterthanyou.com":true,"isteingeek.de":true,"istmein.de":true,"kicks-ass.net":true,"kicks-ass.org":true,"knowsitall.info":true,"land-4-sale.us":true,"lebtimnetz.de":true,"leitungsen.de":true,"likes-pie.com":true,"likescandy.com":true,"merseine.nu":true,"mine.nu":true,"misconfused.org":true,"mypets.ws":true,"myphotos.cc":true,"neat-url.com":true,"office-on-the.net":true,"on-the-web.tv":true,"podzone.net":true,"podzone.org":true,"readmyblog.org":true,"saves-the-whales.com":true,"scrapper-site.net":true,"scrapping.cc":true,"selfip.biz":true,"selfip.com":true,"selfip.info":true,"selfip.net":true,"selfip.org":true,"sells-for-less.com":true,"sells-for-u.com":true,"sells-it.net":true,"sellsyourhome.org":true,"servebbs.com":true,"servebbs.net":true,"servebbs.org":true,"serveftp.net":true,"serveftp.org":true,"servegame.org":true,"shacknet.nu":true,"simple-url.com":true,"space-to-rent.com":true,"stuff-4-sale.org":true,"stuff-4-sale.us":true,"teaches-yoga.com":true,"thruhere.net":true,"traeumtgerade.de":true,"webhop.biz":true,"webhop.info":true,"webhop.net":true,"webhop.org":true,"worse-than.tv":true,"writesthisblog.com":true,"ddnss.de":true,"dyn.ddnss.de":true,"dyndns.ddnss.de":true,"dyndns1.de":true,"dyn-ip24.de":true,"home-webserver.de":true,"dyn.home-webserver.de":true,"myhome-server.de":true,"ddnss.org":true,"definima.net":true,"definima.io":true,"ddnsfree.com":true,"ddnsgeek.com":true,"giize.com":true,"gleeze.com":true,"kozow.com":true,"loseyourip.com":true,"ooguy.com":true,"theworkpc.com":true,"casacam.net":true,"dynu.net":true,"accesscam.org":true,"camdvr.org":true,"freeddns.org":true,"mywire.org":true,"webredirect.org":true,"myddns.rocks":true,"blogsite.xyz":true,"dynv6.net":true,"e4.cz":true,"mytuleap.com":true,"enonic.io":true,"customer.enonic.io":true,"eu.org":true,"al.eu.org":true,"asso.eu.org":true,"at.eu.org":true,"au.eu.org":true,"be.eu.org":true,"bg.eu.org":true,"ca.eu.org":true,"cd.eu.org":true,"ch.eu.org":true,"cn.eu.org":true,"cy.eu.org":true,"cz.eu.org":true,"de.eu.org":true,"dk.eu.org":true,"edu.eu.org":true,"ee.eu.org":true,"es.eu.org":true,"fi.eu.org":true,"fr.eu.org":true,"gr.eu.org":true,"hr.eu.org":true,"hu.eu.org":true,"ie.eu.org":true,"il.eu.org":true,"in.eu.org":true,"int.eu.org":true,"is.eu.org":true,"it.eu.org":true,"jp.eu.org":true,"kr.eu.org":true,"lt.eu.org":true,"lu.eu.org":true,"lv.eu.org":true,"mc.eu.org":true,"me.eu.org":true,"mk.eu.org":true,"mt.eu.org":true,"my.eu.org":true,"net.eu.org":true,"ng.eu.org":true,"nl.eu.org":true,"no.eu.org":true,"nz.eu.org":true,"paris.eu.org":true,"pl.eu.org":true,"pt.eu.org":true,"q-a.eu.org":true,"ro.eu.org":true,"ru.eu.org":true,"se.eu.org":true,"si.eu.org":true,"sk.eu.org":true,"tr.eu.org":true,"uk.eu.org":true,"us.eu.org":true,"eu-1.evennode.com":true,"eu-2.evennode.com":true,"eu-3.evennode.com":true,"eu-4.evennode.com":true,"us-1.evennode.com":true,"us-2.evennode.com":true,"us-3.evennode.com":true,"us-4.evennode.com":true,"twmail.cc":true,"twmail.net":true,"twmail.org":true,"mymailer.com.tw":true,"url.tw":true,"apps.fbsbx.com":true,"ru.net":true,"adygeya.ru":true,"bashkiria.ru":true,"bir.ru":true,"cbg.ru":true,"com.ru":true,"dagestan.ru":true,"grozny.ru":true,"kalmykia.ru":true,"kustanai.ru":true,"marine.ru":true,"mordovia.ru":true,"msk.ru":true,"mytis.ru":true,"nalchik.ru":true,"nov.ru":true,"pyatigorsk.ru":true,"spb.ru":true,"vladikavkaz.ru":true,"vladimir.ru":true,"abkhazia.su":true,"adygeya.su":true,"aktyubinsk.su":true,"arkhangelsk.su":true,"armenia.su":true,"ashgabad.su":true,"azerbaijan.su":true,"balashov.su":true,"bashkiria.su":true,"bryansk.su":true,"bukhara.su":true,"chimkent.su":true,"dagestan.su":true,"east-kazakhstan.su":true,"exnet.su":true,"georgia.su":true,"grozny.su":true,"ivanovo.su":true,"jambyl.su":true,"kalmykia.su":true,"kaluga.su":true,"karacol.su":true,"karaganda.su":true,"karelia.su":true,"khakassia.su":true,"krasnodar.su":true,"kurgan.su":true,"kustanai.su":true,"lenug.su":true,"mangyshlak.su":true,"mordovia.su":true,"msk.su":true,"murmansk.su":true,"nalchik.su":true,"navoi.su":true,"north-kazakhstan.su":true,"nov.su":true,"obninsk.su":true,"penza.su":true,"pokrovsk.su":true,"sochi.su":true,"spb.su":true,"tashkent.su":true,"termez.su":true,"togliatti.su":true,"troitsk.su":true,"tselinograd.su":true,"tula.su":true,"tuva.su":true,"vladikavkaz.su":true,"vladimir.su":true,"vologda.su":true,"channelsdvr.net":true,"fastlylb.net":true,"map.fastlylb.net":true,"freetls.fastly.net":true,"map.fastly.net":true,"a.prod.fastly.net":true,"global.prod.fastly.net":true,"a.ssl.fastly.net":true,"b.ssl.fastly.net":true,"global.ssl.fastly.net":true,"fhapp.xyz":true,"fedorainfracloud.org":true,"fedorapeople.org":true,"cloud.fedoraproject.org":true,"app.os.fedoraproject.org":true,"app.os.stg.fedoraproject.org":true,"filegear.me":true,"firebaseapp.com":true,"flynnhub.com":true,"flynnhosting.net":true,"freebox-os.com":true,"freeboxos.com":true,"fbx-os.fr":true,"fbxos.fr":true,"freebox-os.fr":true,"freeboxos.fr":true,"*.futurecms.at":true,"futurehosting.at":true,"futuremailing.at":true,"*.ex.ortsinfo.at":true,"*.kunden.ortsinfo.at":true,"*.statics.cloud":true,"service.gov.uk":true,"github.io":true,"githubusercontent.com":true,"gitlab.io":true,"homeoffice.gov.uk":true,"ro.im":true,"shop.ro":true,"goip.de":true,"*.0emm.com":true,"appspot.com":true,"blogspot.ae":true,"blogspot.al":true,"blogspot.am":true,"blogspot.ba":true,"blogspot.be":true,"blogspot.bg":true,"blogspot.bj":true,"blogspot.ca":true,"blogspot.cf":true,"blogspot.ch":true,"blogspot.cl":true,"blogspot.co.at":true,"blogspot.co.id":true,"blogspot.co.il":true,"blogspot.co.ke":true,"blogspot.co.nz":true,"blogspot.co.uk":true,"blogspot.co.za":true,"blogspot.com":true,"blogspot.com.ar":true,"blogspot.com.au":true,"blogspot.com.br":true,"blogspot.com.by":true,"blogspot.com.co":true,"blogspot.com.cy":true,"blogspot.com.ee":true,"blogspot.com.eg":true,"blogspot.com.es":true,"blogspot.com.mt":true,"blogspot.com.ng":true,"blogspot.com.tr":true,"blogspot.com.uy":true,"blogspot.cv":true,"blogspot.cz":true,"blogspot.de":true,"blogspot.dk":true,"blogspot.fi":true,"blogspot.fr":true,"blogspot.gr":true,"blogspot.hk":true,"blogspot.hr":true,"blogspot.hu":true,"blogspot.ie":true,"blogspot.in":true,"blogspot.is":true,"blogspot.it":true,"blogspot.jp":true,"blogspot.kr":true,"blogspot.li":true,"blogspot.lt":true,"blogspot.lu":true,"blogspot.md":true,"blogspot.mk":true,"blogspot.mr":true,"blogspot.mx":true,"blogspot.my":true,"blogspot.nl":true,"blogspot.no":true,"blogspot.pe":true,"blogspot.pt":true,"blogspot.qa":true,"blogspot.re":true,"blogspot.ro":true,"blogspot.rs":true,"blogspot.ru":true,"blogspot.se":true,"blogspot.sg":true,"blogspot.si":true,"blogspot.sk":true,"blogspot.sn":true,"blogspot.td":true,"blogspot.tw":true,"blogspot.ug":true,"blogspot.vn":true,"cloudfunctions.net":true,"cloud.goog":true,"codespot.com":true,"googleapis.com":true,"googlecode.com":true,"pagespeedmobilizer.com":true,"publishproxy.com":true,"withgoogle.com":true,"withyoutube.com":true,"hashbang.sh":true,"hasura-app.io":true,"hepforge.org":true,"herokuapp.com":true,"herokussl.com":true,"moonscale.net":true,"iki.fi":true,"biz.at":true,"info.at":true,"info.cx":true,"ac.leg.br":true,"al.leg.br":true,"am.leg.br":true,"ap.leg.br":true,"ba.leg.br":true,"ce.leg.br":true,"df.leg.br":true,"es.leg.br":true,"go.leg.br":true,"ma.leg.br":true,"mg.leg.br":true,"ms.leg.br":true,"mt.leg.br":true,"pa.leg.br":true,"pb.leg.br":true,"pe.leg.br":true,"pi.leg.br":true,"pr.leg.br":true,"rj.leg.br":true,"rn.leg.br":true,"ro.leg.br":true,"rr.leg.br":true,"rs.leg.br":true,"sc.leg.br":true,"se.leg.br":true,"sp.leg.br":true,"to.leg.br":true,"pixolino.com":true,"ipifony.net":true,"*.triton.zone":true,"*.cns.joyent.com":true,"js.org":true,"keymachine.de":true,"knightpoint.systems":true,"co.krd":true,"edu.krd":true,"git-repos.de":true,"lcube-server.de":true,"svn-repos.de":true,"linkyard.cloud":true,"linkyard-cloud.ch":true,"we.bs":true,"barsy.bg":true,"barsyonline.com":true,"barsy.de":true,"barsy.eu":true,"barsy.in":true,"barsy.net":true,"barsy.online":true,"barsy.support":true,"*.magentosite.cloud":true,"hb.cldmail.ru":true,"cloud.metacentrum.cz":true,"custom.metacentrum.cz":true,"meteorapp.com":true,"eu.meteorapp.com":true,"co.pl":true,"azurewebsites.net":true,"azure-mobile.net":true,"cloudapp.net":true,"mozilla-iot.org":true,"bmoattachments.org":true,"net.ru":true,"org.ru":true,"pp.ru":true,"bitballoon.com":true,"netlify.com":true,"4u.com":true,"ngrok.io":true,"nh-serv.co.uk":true,"nfshost.com":true,"nsupdate.info":true,"nerdpol.ovh":true,"blogsyte.com":true,"brasilia.me":true,"cable-modem.org":true,"ciscofreak.com":true,"collegefan.org":true,"couchpotatofries.org":true,"damnserver.com":true,"ddns.me":true,"ditchyourip.com":true,"dnsfor.me":true,"dnsiskinky.com":true,"dvrcam.info":true,"dynns.com":true,"eating-organic.net":true,"fantasyleague.cc":true,"geekgalaxy.com":true,"golffan.us":true,"health-carereform.com":true,"homesecuritymac.com":true,"homesecuritypc.com":true,"hopto.me":true,"ilovecollege.info":true,"loginto.me":true,"mlbfan.org":true,"mmafan.biz":true,"myactivedirectory.com":true,"mydissent.net":true,"myeffect.net":true,"mymediapc.net":true,"mypsx.net":true,"mysecuritycamera.com":true,"mysecuritycamera.net":true,"mysecuritycamera.org":true,"net-freaks.com":true,"nflfan.org":true,"nhlfan.net":true,"no-ip.ca":true,"no-ip.co.uk":true,"no-ip.net":true,"noip.us":true,"onthewifi.com":true,"pgafan.net":true,"point2this.com":true,"pointto.us":true,"privatizehealthinsurance.net":true,"quicksytes.com":true,"read-books.org":true,"securitytactics.com":true,"serveexchange.com":true,"servehumour.com":true,"servep2p.com":true,"servesarcasm.com":true,"stufftoread.com":true,"ufcfan.org":true,"unusualperson.com":true,"workisboring.com":true,"3utilities.com":true,"bounceme.net":true,"ddns.net":true,"ddnsking.com":true,"gotdns.ch":true,"hopto.org":true,"myftp.biz":true,"myftp.org":true,"myvnc.com":true,"no-ip.biz":true,"no-ip.info":true,"no-ip.org":true,"noip.me":true,"redirectme.net":true,"servebeer.com":true,"serveblog.net":true,"servecounterstrike.com":true,"serveftp.com":true,"servegame.com":true,"servehalflife.com":true,"servehttp.com":true,"serveirc.com":true,"serveminecraft.net":true,"servemp3.com":true,"servepics.com":true,"servequake.com":true,"sytes.net":true,"webhop.me":true,"zapto.org":true,"stage.nodeart.io":true,"nodum.co":true,"nodum.io":true,"nyc.mn":true,"nom.ae":true,"nom.ai":true,"nom.al":true,"nym.by":true,"nym.bz":true,"nom.cl":true,"nom.gd":true,"nom.gl":true,"nym.gr":true,"nom.gt":true,"nom.hn":true,"nom.im":true,"nym.kz":true,"nym.la":true,"nom.li":true,"nym.li":true,"nym.lt":true,"nym.lu":true,"nym.me":true,"nom.mk":true,"nym.mx":true,"nom.nu":true,"nym.nz":true,"nym.pe":true,"nym.pt":true,"nom.pw":true,"nom.qa":true,"nom.rs":true,"nom.si":true,"nym.sk":true,"nym.su":true,"nym.sx":true,"nym.tw":true,"nom.ug":true,"nom.uy":true,"nom.vc":true,"nom.vg":true,"cya.gg":true,"nid.io":true,"opencraft.hosting":true,"operaunite.com":true,"outsystemscloud.com":true,"ownprovider.com":true,"oy.lc":true,"pgfog.com":true,"pagefrontapp.com":true,"art.pl":true,"gliwice.pl":true,"krakow.pl":true,"poznan.pl":true,"wroc.pl":true,"zakopane.pl":true,"pantheonsite.io":true,"gotpantheon.com":true,"mypep.link":true,"on-web.fr":true,"*.platform.sh":true,"*.platformsh.site":true,"xen.prgmr.com":true,"priv.at":true,"protonet.io":true,"chirurgiens-dentistes-en-france.fr":true,"byen.site":true,"qa2.com":true,"dev-myqnapcloud.com":true,"alpha-myqnapcloud.com":true,"myqnapcloud.com":true,"*.quipelements.com":true,"vapor.cloud":true,"vaporcloud.io":true,"rackmaze.com":true,"rackmaze.net":true,"rhcloud.com":true,"resindevice.io":true,"devices.resinstaging.io":true,"hzc.io":true,"wellbeingzone.eu":true,"ptplus.fit":true,"wellbeingzone.co.uk":true,"sandcats.io":true,"logoip.de":true,"logoip.com":true,"schokokeks.net":true,"scrysec.com":true,"firewall-gateway.com":true,"firewall-gateway.de":true,"my-gateway.de":true,"my-router.de":true,"spdns.de":true,"spdns.eu":true,"firewall-gateway.net":true,"my-firewall.org":true,"myfirewall.org":true,"spdns.org":true,"*.s5y.io":true,"*.sensiosite.cloud":true,"biz.ua":true,"co.ua":true,"pp.ua":true,"shiftedit.io":true,"myshopblocks.com":true,"1kapp.com":true,"appchizi.com":true,"applinzi.com":true,"sinaapp.com":true,"vipsinaapp.com":true,"bounty-full.com":true,"alpha.bounty-full.com":true,"beta.bounty-full.com":true,"static.land":true,"dev.static.land":true,"sites.static.land":true,"apps.lair.io":true,"*.stolos.io":true,"spacekit.io":true,"stackspace.space":true,"storj.farm":true,"temp-dns.com":true,"diskstation.me":true,"dscloud.biz":true,"dscloud.me":true,"dscloud.mobi":true,"dsmynas.com":true,"dsmynas.net":true,"dsmynas.org":true,"familyds.com":true,"familyds.net":true,"familyds.org":true,"i234.me":true,"myds.me":true,"synology.me":true,"vpnplus.to":true,"taifun-dns.de":true,"gda.pl":true,"gdansk.pl":true,"gdynia.pl":true,"med.pl":true,"sopot.pl":true,"cust.dev.thingdust.io":true,"cust.disrec.thingdust.io":true,"cust.prod.thingdust.io":true,"cust.testing.thingdust.io":true,"bloxcms.com":true,"townnews-staging.com":true,"12hp.at":true,"2ix.at":true,"4lima.at":true,"lima-city.at":true,"12hp.ch":true,"2ix.ch":true,"4lima.ch":true,"lima-city.ch":true,"trafficplex.cloud":true,"de.cool":true,"12hp.de":true,"2ix.de":true,"4lima.de":true,"lima-city.de":true,"1337.pictures":true,"clan.rip":true,"lima-city.rocks":true,"webspace.rocks":true,"lima.zone":true,"*.transurl.be":true,"*.transurl.eu":true,"*.transurl.nl":true,"tuxfamily.org":true,"dd-dns.de":true,"diskstation.eu":true,"diskstation.org":true,"dray-dns.de":true,"draydns.de":true,"dyn-vpn.de":true,"dynvpn.de":true,"mein-vigor.de":true,"my-vigor.de":true,"my-wan.de":true,"syno-ds.de":true,"synology-diskstation.de":true,"synology-ds.de":true,"uber.space":true,"hk.com":true,"hk.org":true,"ltd.hk":true,"inc.hk":true,"lib.de.us":true,"2038.io":true,"router.management":true,"v-info.info":true,"wedeploy.io":true,"wedeploy.me":true,"wedeploy.sh":true,"remotewd.com":true,"wmflabs.org":true,"cistron.nl":true,"demon.nl":true,"xs4all.space":true,"official.academy":true,"yolasite.com":true,"ybo.faith":true,"yombo.me":true,"homelink.one":true,"ybo.party":true,"ybo.review":true,"ybo.science":true,"ybo.trade":true,"za.net":true,"za.org":true,"now.sh":true});
-
-// END of automatically generated file
-
-
-/***/ }),
-/* 416 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*jshint unused:false */
-
-function Store() {
-}
-exports.Store = Store;
-
-// Stores may be synchronous, but are still required to use a
-// Continuation-Passing Style API.  The CookieJar itself will expose a "*Sync"
-// API that converts from synchronous-callbacks to imperative style.
-Store.prototype.synchronous = false;
-
-Store.prototype.findCookie = function(domain, path, key, cb) {
-  throw new Error('findCookie is not implemented');
-};
-
-Store.prototype.findCookies = function(domain, path, cb) {
-  throw new Error('findCookies is not implemented');
-};
-
-Store.prototype.putCookie = function(cookie, cb) {
-  throw new Error('putCookie is not implemented');
-};
-
-Store.prototype.updateCookie = function(oldCookie, newCookie, cb) {
-  // recommended default implementation:
-  // return this.putCookie(newCookie, cb);
-  throw new Error('updateCookie is not implemented');
-};
-
-Store.prototype.removeCookie = function(domain, path, key, cb) {
-  throw new Error('removeCookie is not implemented');
-};
-
-Store.prototype.removeCookies = function(domain, path, cb) {
-  throw new Error('removeCookies is not implemented');
-};
-
-Store.prototype.getAllCookies = function(cb) {
-  throw new Error('getAllCookies is not implemented (therefore jar cannot be serialized)');
-};
-
-
-/***/ }),
-/* 417 */
-/***/ (function(module, exports) {
-
-module.exports = function () {
-    // see https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-    var origPrepareStackTrace = Error.prepareStackTrace;
-    Error.prepareStackTrace = function (_, stack) { return stack; };
-    var stack = (new Error()).stack;
-    Error.prepareStackTrace = origPrepareStackTrace;
-    return stack[2].getFileName();
-};
-
-
-/***/ }),
-/* 418 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var path = __webpack_require__(0);
-var fs = __webpack_require__(5);
-var parse = path.parse || __webpack_require__(774);
-
-module.exports = function nodeModulesPaths(start, opts) {
-    var modules = opts && opts.moduleDirectory
-        ? [].concat(opts.moduleDirectory)
-        : ['node_modules'];
-
-    // ensure that `start` is an absolute path at this point,
-    // resolving against the process' current working directory
-    var absoluteStart = path.resolve(start);
-
-    if (opts && opts.preserveSymlinks === false) {
-        try {
-            absoluteStart = fs.realpathSync(absoluteStart);
-        } catch (err) {
-            if (err.code !== 'ENOENT') {
-                throw err;
-            }
-        }
-    }
-
-    var prefix = '/';
-    if (/^([A-Za-z]:)/.test(absoluteStart)) {
-        prefix = '';
-    } else if (/^\\\\/.test(absoluteStart)) {
-        prefix = '\\\\';
-    }
-
-    var paths = [absoluteStart];
-    var parsed = parse(absoluteStart);
-    while (parsed.dir !== paths[paths.length - 1]) {
-        paths.push(parsed.dir);
-        parsed = parse(parsed.dir);
-    }
-
-    var dirs = paths.reduce(function (dirs, aPath) {
-        return dirs.concat(modules.map(function (moduleDir) {
-            return path.join(prefix, aPath, moduleDir);
-        }));
-    }, []);
-
-    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
-};
-
-
-/***/ }),
-/* 419 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BehaviorSubject; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__ = __webpack_require__(189);
-/** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */
-
-
-
-var BehaviorSubject = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BehaviorSubject, _super);
-    function BehaviorSubject(_value) {
-        var _this = _super.call(this) || this;
-        _this._value = _value;
-        return _this;
-    }
-    Object.defineProperty(BehaviorSubject.prototype, "value", {
-        get: function () {
-            return this.getValue();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    BehaviorSubject.prototype._subscribe = function (subscriber) {
-        var subscription = _super.prototype._subscribe.call(this, subscriber);
-        if (subscription && !subscription.closed) {
-            subscriber.next(this._value);
-        }
-        return subscription;
-    };
-    BehaviorSubject.prototype.getValue = function () {
-        if (this.hasError) {
-            throw this.thrownError;
-        }
-        else if (this.closed) {
-            throw new __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */]();
-        }
-        else {
-            return this._value;
-        }
-    };
-    BehaviorSubject.prototype.next = function (value) {
-        _super.prototype.next.call(this, this._value = value);
-    };
-    return BehaviorSubject;
-}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
-
-//# sourceMappingURL=BehaviorSubject.js.map
-
-
-/***/ }),
-/* 420 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return empty; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__config__ = __webpack_require__(185);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_hostReportError__ = __webpack_require__(323);
-/** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
-
-
-var empty = {
-    closed: true,
-    next: function (value) { },
-    error: function (err) {
-        if (__WEBPACK_IMPORTED_MODULE_0__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) {
-            throw err;
-        }
-        else {
-            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_hostReportError__["a" /* hostReportError */])(err);
-        }
-    },
-    complete: function () { }
-};
-//# sourceMappingURL=Observer.js.map
-
-
-/***/ }),
-/* 421 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Scheduler; });
-var Scheduler = /*@__PURE__*/ (function () {
-    function Scheduler(SchedulerAction, now) {
-        if (now === void 0) {
-            now = Scheduler.now;
-        }
-        this.SchedulerAction = SchedulerAction;
-        this.now = now;
-    }
-    Scheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return new this.SchedulerAction(this, work).schedule(state, delay);
-    };
-    Scheduler.now = function () { return Date.now(); };
-    return Scheduler;
-}());
-
-//# sourceMappingURL=Scheduler.js.map
-
-
-/***/ }),
-/* 422 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SubjectSubscription; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
-
-
-var SubjectSubscription = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubjectSubscription, _super);
-    function SubjectSubscription(subject, subscriber) {
-        var _this = _super.call(this) || this;
-        _this.subject = subject;
-        _this.subscriber = subscriber;
-        _this.closed = false;
-        return _this;
-    }
-    SubjectSubscription.prototype.unsubscribe = function () {
-        if (this.closed) {
-            return;
-        }
-        this.closed = true;
-        var subject = this.subject;
-        var observers = subject.observers;
-        this.subject = null;
-        if (!observers || observers.length === 0 || subject.isStopped || subject.closed) {
-            return;
-        }
-        var subscriberIndex = observers.indexOf(this.subscriber);
-        if (subscriberIndex !== -1) {
-            observers.splice(subscriberIndex, 1);
-        }
-    };
-    return SubjectSubscription;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]));
-
-//# sourceMappingURL=SubjectSubscription.js.map
-
-
-/***/ }),
-/* 423 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ConnectableObservable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return connectableObservableDescriptor; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__operators_refCount__ = __webpack_require__(316);
-/** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */
-
-
-
-
-
-
-var ConnectableObservable = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ConnectableObservable, _super);
-    function ConnectableObservable(source, subjectFactory) {
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.subjectFactory = subjectFactory;
-        _this._refCount = 0;
-        _this._isComplete = false;
-        return _this;
-    }
-    ConnectableObservable.prototype._subscribe = function (subscriber) {
-        return this.getSubject().subscribe(subscriber);
-    };
-    ConnectableObservable.prototype.getSubject = function () {
-        var subject = this._subject;
-        if (!subject || subject.isStopped) {
-            this._subject = this.subjectFactory();
-        }
-        return this._subject;
-    };
-    ConnectableObservable.prototype.connect = function () {
-        var connection = this._connection;
-        if (!connection) {
-            this._isComplete = false;
-            connection = this._connection = new __WEBPACK_IMPORTED_MODULE_4__Subscription__["a" /* Subscription */]();
-            connection.add(this.source
-                .subscribe(new ConnectableSubscriber(this.getSubject(), this)));
-            if (connection.closed) {
-                this._connection = null;
-                connection = __WEBPACK_IMPORTED_MODULE_4__Subscription__["a" /* Subscription */].EMPTY;
-            }
-            else {
-                this._connection = connection;
-            }
-        }
-        return connection;
-    };
-    ConnectableObservable.prototype.refCount = function () {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__operators_refCount__["a" /* refCount */])()(this);
-    };
-    return ConnectableObservable;
-}(__WEBPACK_IMPORTED_MODULE_2__Observable__["a" /* Observable */]));
-
-var connectableProto = ConnectableObservable.prototype;
-var connectableObservableDescriptor = {
-    operator: { value: null },
-    _refCount: { value: 0, writable: true },
-    _subject: { value: null, writable: true },
-    _connection: { value: null, writable: true },
-    _subscribe: { value: connectableProto._subscribe },
-    _isComplete: { value: connectableProto._isComplete, writable: true },
-    getSubject: { value: connectableProto.getSubject },
-    connect: { value: connectableProto.connect },
-    refCount: { value: connectableProto.refCount }
-};
-var ConnectableSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ConnectableSubscriber, _super);
-    function ConnectableSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    ConnectableSubscriber.prototype._error = function (err) {
-        this._unsubscribe();
-        _super.prototype._error.call(this, err);
-    };
-    ConnectableSubscriber.prototype._complete = function () {
-        this.connectable._isComplete = true;
-        this._unsubscribe();
-        _super.prototype._complete.call(this);
-    };
-    ConnectableSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (connectable) {
-            this.connectable = null;
-            var connection = connectable._connection;
-            connectable._refCount = 0;
-            connectable._subject = null;
-            connectable._connection = null;
-            if (connection) {
-                connection.unsubscribe();
-            }
-        }
-    };
-    return ConnectableSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subject__["b" /* SubjectSubscriber */]));
-var RefCountOperator = /*@__PURE__*/ (function () {
-    function RefCountOperator(connectable) {
-        this.connectable = connectable;
-    }
-    RefCountOperator.prototype.call = function (subscriber, source) {
-        var connectable = this.connectable;
-        connectable._refCount++;
-        var refCounter = new RefCountSubscriber(subscriber, connectable);
-        var subscription = source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            refCounter.connection = connectable.connect();
-        }
-        return subscription;
-    };
-    return RefCountOperator;
-}());
-var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RefCountSubscriber, _super);
-    function RefCountSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    RefCountSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (!connectable) {
-            this.connection = null;
-            return;
-        }
-        this.connectable = null;
-        var refCount = connectable._refCount;
-        if (refCount <= 0) {
-            this.connection = null;
-            return;
-        }
-        connectable._refCount = refCount - 1;
-        if (refCount > 1) {
-            this.connection = null;
-            return;
-        }
-        var connection = this.connection;
-        var sharedConnection = connectable._connection;
-        this.connection = null;
-        if (sharedConnection && (!connection || sharedConnection === connection)) {
-            sharedConnection.unsubscribe();
-        }
-    };
-    return RefCountSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=ConnectableObservable.js.map
-
-
-/***/ }),
-/* 424 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = merge;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(48);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__ = __webpack_require__(315);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fromArray__ = __webpack_require__(85);
-/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
-
-
-
-
-function merge() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var concurrent = Number.POSITIVE_INFINITY;
-    var scheduler = null;
-    var last = observables[observables.length - 1];
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isScheduler__["a" /* isScheduler */])(last)) {
-        scheduler = observables.pop();
-        if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') {
-            concurrent = observables.pop();
-        }
-    }
-    else if (typeof last === 'number') {
-        concurrent = observables.pop();
-    }
-    if (scheduler === null && observables.length === 1 && observables[0] instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) {
-        return observables[0];
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__["a" /* mergeAll */])(concurrent)(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__fromArray__["a" /* fromArray */])(observables, scheduler));
-}
-//# sourceMappingURL=merge.js.map
-
-
-/***/ }),
-/* 425 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return NEVER; });
-/* harmony export (immutable) */ __webpack_exports__["a"] = never;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_noop__ = __webpack_require__(191);
-/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
-
-
-var NEVER = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__WEBPACK_IMPORTED_MODULE_1__util_noop__["a" /* noop */]);
-function never() {
-    return NEVER;
-}
-//# sourceMappingURL=never.js.map
-
-
-/***/ }),
-/* 426 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = race;
-/* unused harmony export RaceOperator */
-/* unused harmony export RaceSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__fromArray__ = __webpack_require__(85);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-function race() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    if (observables.length === 1) {
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isArray__["a" /* isArray */])(observables[0])) {
-            observables = observables[0];
-        }
-        else {
-            return observables[0];
-        }
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__fromArray__["a" /* fromArray */])(observables, undefined).lift(new RaceOperator());
-}
-var RaceOperator = /*@__PURE__*/ (function () {
-    function RaceOperator() {
-    }
-    RaceOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RaceSubscriber(subscriber));
-    };
-    return RaceOperator;
-}());
-
-var RaceSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RaceSubscriber, _super);
-    function RaceSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasFirst = false;
-        _this.observables = [];
-        _this.subscriptions = [];
-        return _this;
-    }
-    RaceSubscriber.prototype._next = function (observable) {
-        this.observables.push(observable);
-    };
-    RaceSubscriber.prototype._complete = function () {
-        var observables = this.observables;
-        var len = observables.length;
-        if (len === 0) {
-            this.destination.complete();
-        }
-        else {
-            for (var i = 0; i < len && !this.hasFirst; i++) {
-                var observable = observables[i];
-                var subscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, observable, observable, i);
-                if (this.subscriptions) {
-                    this.subscriptions.push(subscription);
-                }
-                this.add(subscription);
-            }
-            this.observables = null;
-        }
-    };
-    RaceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        if (!this.hasFirst) {
-            this.hasFirst = true;
-            for (var i = 0; i < this.subscriptions.length; i++) {
-                if (i !== outerIndex) {
-                    var subscription = this.subscriptions[i];
-                    subscription.unsubscribe();
-                    this.remove(subscription);
-                }
-            }
-            this.subscriptions = null;
-        }
-        this.destination.next(innerValue);
-    };
-    return RaceSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-
-//# sourceMappingURL=race.js.map
-
-
-/***/ }),
-/* 427 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = timer;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-function timer(dueTime, periodOrScheduler, scheduler) {
-    if (dueTime === void 0) {
-        dueTime = 0;
-    }
-    var period = -1;
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isNumeric__["a" /* isNumeric */])(periodOrScheduler)) {
-        period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler);
-    }
-    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isScheduler__["a" /* isScheduler */])(periodOrScheduler)) {
-        scheduler = periodOrScheduler;
-    }
-    if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var due = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isNumeric__["a" /* isNumeric */])(dueTime)
-            ? dueTime
-            : (+dueTime - scheduler.now());
-        return scheduler.schedule(dispatch, due, {
-            index: 0, period: period, subscriber: subscriber
-        });
-    });
-}
-function dispatch(state) {
-    var index = state.index, period = state.period, subscriber = state.subscriber;
-    subscriber.next(index);
-    if (subscriber.closed) {
-        return;
-    }
-    else if (period === -1) {
-        return subscriber.complete();
-    }
-    state.index = index + 1;
-    this.schedule(state, period);
-}
-//# sourceMappingURL=timer.js.map
-
-
-/***/ }),
-/* 428 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = audit;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-function audit(durationSelector) {
-    return function auditOperatorFunction(source) {
-        return source.lift(new AuditOperator(durationSelector));
-    };
-}
-var AuditOperator = /*@__PURE__*/ (function () {
-    function AuditOperator(durationSelector) {
-        this.durationSelector = durationSelector;
-    }
-    AuditOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector));
-    };
-    return AuditOperator;
-}());
-var AuditSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AuditSubscriber, _super);
-    function AuditSubscriber(destination, durationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.durationSelector = durationSelector;
-        _this.hasValue = false;
-        return _this;
-    }
-    AuditSubscriber.prototype._next = function (value) {
-        this.value = value;
-        this.hasValue = true;
-        if (!this.throttled) {
-            var duration = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_tryCatch__["a" /* tryCatch */])(this.durationSelector)(value);
-            if (duration === __WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */]) {
-                this.destination.error(__WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */].e);
-            }
-            else {
-                var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, duration);
-                if (!innerSubscription || innerSubscription.closed) {
-                    this.clearThrottle();
-                }
-                else {
-                    this.add(this.throttled = innerSubscription);
-                }
-            }
-        }
-    };
-    AuditSubscriber.prototype.clearThrottle = function () {
-        var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled;
-        if (throttled) {
-            this.remove(throttled);
-            this.throttled = null;
-            throttled.unsubscribe();
-        }
-        if (hasValue) {
-            this.value = null;
-            this.hasValue = false;
-            this.destination.next(value);
-        }
-    };
-    AuditSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex) {
-        this.clearThrottle();
-    };
-    AuditSubscriber.prototype.notifyComplete = function () {
-        this.clearThrottle();
-    };
-    return AuditSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=audit.js.map
-
-
-/***/ }),
-/* 429 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = concatAll;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeAll__ = __webpack_require__(315);
-/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */
-
-function concatAll() {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeAll__["a" /* mergeAll */])(1);
-}
-//# sourceMappingURL=concatAll.js.map
-
-
-/***/ }),
-/* 430 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = concatMap;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
-/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
-
-function concatMap(project, resultSelector) {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(project, resultSelector, 1);
-}
-//# sourceMappingURL=concatMap.js.map
-
-
-/***/ }),
-/* 431 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilChanged;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
-
-
-
-
-function distinctUntilChanged(compare, keySelector) {
-    return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); };
-}
-var DistinctUntilChangedOperator = /*@__PURE__*/ (function () {
-    function DistinctUntilChangedOperator(compare, keySelector) {
-        this.compare = compare;
-        this.keySelector = keySelector;
-    }
-    DistinctUntilChangedOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector));
-    };
-    return DistinctUntilChangedOperator;
-}());
-var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DistinctUntilChangedSubscriber, _super);
-    function DistinctUntilChangedSubscriber(destination, compare, keySelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.hasKey = false;
-        if (typeof compare === 'function') {
-            _this.compare = compare;
-        }
-        return _this;
-    }
-    DistinctUntilChangedSubscriber.prototype.compare = function (x, y) {
-        return x === y;
-    };
-    DistinctUntilChangedSubscriber.prototype._next = function (value) {
-        var keySelector = this.keySelector;
-        var key = value;
-        if (keySelector) {
-            key = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.keySelector)(value);
-            if (key === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-                return this.destination.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
-            }
-        }
-        var result = false;
-        if (this.hasKey) {
-            result = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.compare)(this.key, key);
-            if (result === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-                return this.destination.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
-            }
-        }
-        else {
-            this.hasKey = true;
-        }
-        if (Boolean(result) === false) {
-            this.key = key;
-            this.destination.next(value);
-        }
-    };
-    return DistinctUntilChangedSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=distinctUntilChanged.js.map
-
-
-/***/ }),
-/* 432 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = find;
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return FindValueOperator; });
-/* unused harmony export FindValueSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function find(predicate, thisArg) {
-    if (typeof predicate !== 'function') {
-        throw new TypeError('predicate is not a function');
-    }
-    return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); };
-}
-var FindValueOperator = /*@__PURE__*/ (function () {
-    function FindValueOperator(predicate, source, yieldIndex, thisArg) {
-        this.predicate = predicate;
-        this.source = source;
-        this.yieldIndex = yieldIndex;
-        this.thisArg = thisArg;
-    }
-    FindValueOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg));
-    };
-    return FindValueOperator;
-}());
-
-var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FindValueSubscriber, _super);
-    function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.yieldIndex = yieldIndex;
-        _this.thisArg = thisArg;
-        _this.index = 0;
-        return _this;
-    }
-    FindValueSubscriber.prototype.notifyComplete = function (value) {
-        var destination = this.destination;
-        destination.next(value);
-        destination.complete();
-        this.unsubscribe();
-    };
-    FindValueSubscriber.prototype._next = function (value) {
-        var _a = this, predicate = _a.predicate, thisArg = _a.thisArg;
-        var index = this.index++;
-        try {
-            var result = predicate.call(thisArg || this, value, index, this.source);
-            if (result) {
-                this.notifyComplete(this.yieldIndex ? index : value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    FindValueSubscriber.prototype._complete = function () {
-        this.notifyComplete(this.yieldIndex ? -1 : undefined);
-    };
-    return FindValueSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-
-//# sourceMappingURL=find.js.map
-
-
-/***/ }),
-/* 433 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["b"] = groupBy;
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GroupedObservable; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subject__ = __webpack_require__(36);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */
-
-
-
-
-
-function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) {
-    return function (source) {
-        return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector));
-    };
-}
-var GroupByOperator = /*@__PURE__*/ (function () {
-    function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) {
-        this.keySelector = keySelector;
-        this.elementSelector = elementSelector;
-        this.durationSelector = durationSelector;
-        this.subjectSelector = subjectSelector;
-    }
-    GroupByOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector));
-    };
-    return GroupByOperator;
-}());
-var GroupBySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](GroupBySubscriber, _super);
-    function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.elementSelector = elementSelector;
-        _this.durationSelector = durationSelector;
-        _this.subjectSelector = subjectSelector;
-        _this.groups = null;
-        _this.attemptedToUnsubscribe = false;
-        _this.count = 0;
-        return _this;
-    }
-    GroupBySubscriber.prototype._next = function (value) {
-        var key;
-        try {
-            key = this.keySelector(value);
-        }
-        catch (err) {
-            this.error(err);
-            return;
-        }
-        this._group(value, key);
-    };
-    GroupBySubscriber.prototype._group = function (value, key) {
-        var groups = this.groups;
-        if (!groups) {
-            groups = this.groups = new Map();
-        }
-        var group = groups.get(key);
-        var element;
-        if (this.elementSelector) {
-            try {
-                element = this.elementSelector(value);
-            }
-            catch (err) {
-                this.error(err);
-            }
-        }
-        else {
-            element = value;
-        }
-        if (!group) {
-            group = (this.subjectSelector ? this.subjectSelector() : new __WEBPACK_IMPORTED_MODULE_4__Subject__["a" /* Subject */]());
-            groups.set(key, group);
-            var groupedObservable = new GroupedObservable(key, group, this);
-            this.destination.next(groupedObservable);
-            if (this.durationSelector) {
-                var duration = void 0;
-                try {
-                    duration = this.durationSelector(new GroupedObservable(key, group));
-                }
-                catch (err) {
-                    this.error(err);
-                    return;
-                }
-                this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this)));
-            }
-        }
-        if (!group.closed) {
-            group.next(element);
-        }
-    };
-    GroupBySubscriber.prototype._error = function (err) {
-        var groups = this.groups;
-        if (groups) {
-            groups.forEach(function (group, key) {
-                group.error(err);
-            });
-            groups.clear();
-        }
-        this.destination.error(err);
-    };
-    GroupBySubscriber.prototype._complete = function () {
-        var groups = this.groups;
-        if (groups) {
-            groups.forEach(function (group, key) {
-                group.complete();
-            });
-            groups.clear();
-        }
-        this.destination.complete();
-    };
-    GroupBySubscriber.prototype.removeGroup = function (key) {
-        this.groups.delete(key);
-    };
-    GroupBySubscriber.prototype.unsubscribe = function () {
-        if (!this.closed) {
-            this.attemptedToUnsubscribe = true;
-            if (this.count === 0) {
-                _super.prototype.unsubscribe.call(this);
-            }
-        }
-    };
-    return GroupBySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](GroupDurationSubscriber, _super);
-    function GroupDurationSubscriber(key, group, parent) {
-        var _this = _super.call(this, group) || this;
-        _this.key = key;
-        _this.group = group;
-        _this.parent = parent;
-        return _this;
-    }
-    GroupDurationSubscriber.prototype._next = function (value) {
-        this.complete();
-    };
-    GroupDurationSubscriber.prototype._unsubscribe = function () {
-        var _a = this, parent = _a.parent, key = _a.key;
-        this.key = this.parent = null;
-        if (parent) {
-            parent.removeGroup(key);
-        }
-    };
-    return GroupDurationSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-var GroupedObservable = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](GroupedObservable, _super);
-    function GroupedObservable(key, groupSubject, refCountSubscription) {
-        var _this = _super.call(this) || this;
-        _this.key = key;
-        _this.groupSubject = groupSubject;
-        _this.refCountSubscription = refCountSubscription;
-        return _this;
-    }
-    GroupedObservable.prototype._subscribe = function (subscriber) {
-        var subscription = new __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */]();
-        var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject;
-        if (refCountSubscription && !refCountSubscription.closed) {
-            subscription.add(new InnerRefCountSubscription(refCountSubscription));
-        }
-        subscription.add(groupSubject.subscribe(subscriber));
-        return subscription;
-    };
-    return GroupedObservable;
-}(__WEBPACK_IMPORTED_MODULE_3__Observable__["a" /* Observable */]));
-
-var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](InnerRefCountSubscription, _super);
-    function InnerRefCountSubscription(parent) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        parent.count++;
-        return _this;
-    }
-    InnerRefCountSubscription.prototype.unsubscribe = function () {
-        var parent = this.parent;
-        if (!parent.closed && !this.closed) {
-            _super.prototype.unsubscribe.call(this);
-            parent.count -= 1;
-            if (parent.count === 0 && parent.attemptedToUnsubscribe) {
-                parent.unsubscribe();
-            }
-        }
-    };
-    return InnerRefCountSubscription;
-}(__WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */]));
-//# sourceMappingURL=groupBy.js.map
-
-
-/***/ }),
-/* 434 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["b"] = observeOn;
-/* unused harmony export ObserveOnOperator */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObserveOnSubscriber; });
-/* unused harmony export ObserveOnMessage */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(184);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
-
-
-
-function observeOn(scheduler, delay) {
-    if (delay === void 0) {
-        delay = 0;
-    }
-    return function observeOnOperatorFunction(source) {
-        return source.lift(new ObserveOnOperator(scheduler, delay));
-    };
-}
-var ObserveOnOperator = /*@__PURE__*/ (function () {
-    function ObserveOnOperator(scheduler, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        this.scheduler = scheduler;
-        this.delay = delay;
-    }
-    ObserveOnOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay));
-    };
-    return ObserveOnOperator;
-}());
-
-var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ObserveOnSubscriber, _super);
-    function ObserveOnSubscriber(destination, scheduler, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.scheduler = scheduler;
-        _this.delay = delay;
-        return _this;
-    }
-    ObserveOnSubscriber.dispatch = function (arg) {
-        var notification = arg.notification, destination = arg.destination;
-        notification.observe(destination);
-        this.unsubscribe();
-    };
-    ObserveOnSubscriber.prototype.scheduleMessage = function (notification) {
-        var destination = this.destination;
-        destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination)));
-    };
-    ObserveOnSubscriber.prototype._next = function (value) {
-        this.scheduleMessage(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createNext(value));
-    };
-    ObserveOnSubscriber.prototype._error = function (err) {
-        this.scheduleMessage(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createError(err));
-        this.unsubscribe();
-    };
-    ObserveOnSubscriber.prototype._complete = function () {
-        this.scheduleMessage(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createComplete());
-        this.unsubscribe();
-    };
-    return ObserveOnSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-
-var ObserveOnMessage = /*@__PURE__*/ (function () {
-    function ObserveOnMessage(notification, destination) {
-        this.notification = notification;
-        this.destination = destination;
-    }
-    return ObserveOnMessage;
-}());
-
-//# sourceMappingURL=observeOn.js.map
-
-
-/***/ }),
-/* 435 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = tap;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_noop__ = __webpack_require__(191);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isFunction__ = __webpack_require__(154);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */
-
-
-
-
-function tap(nextOrObserver, error, complete) {
-    return function tapOperatorFunction(source) {
-        return source.lift(new DoOperator(nextOrObserver, error, complete));
-    };
-}
-var DoOperator = /*@__PURE__*/ (function () {
-    function DoOperator(nextOrObserver, error, complete) {
-        this.nextOrObserver = nextOrObserver;
-        this.error = error;
-        this.complete = complete;
-    }
-    DoOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete));
-    };
-    return DoOperator;
-}());
-var TapSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TapSubscriber, _super);
-    function TapSubscriber(destination, observerOrNext, error, complete) {
-        var _this = _super.call(this, destination) || this;
-        _this._tapNext = __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-        _this._tapError = __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-        _this._tapComplete = __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-        _this._tapError = error || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-        _this._tapComplete = complete || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isFunction__["a" /* isFunction */])(observerOrNext)) {
-            _this._context = _this;
-            _this._tapNext = observerOrNext;
-        }
-        else if (observerOrNext) {
-            _this._context = observerOrNext;
-            _this._tapNext = observerOrNext.next || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-            _this._tapError = observerOrNext.error || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-            _this._tapComplete = observerOrNext.complete || __WEBPACK_IMPORTED_MODULE_2__util_noop__["a" /* noop */];
-        }
-        return _this;
-    }
-    TapSubscriber.prototype._next = function (value) {
-        try {
-            this._tapNext.call(this._context, value);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(value);
-    };
-    TapSubscriber.prototype._error = function (err) {
-        try {
-            this._tapError.call(this._context, err);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.error(err);
-    };
-    TapSubscriber.prototype._complete = function () {
-        try {
-            this._tapComplete.call(this._context);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        return this.destination.complete();
-    };
-    return TapSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=tap.js.map
-
-
-/***/ }),
-/* 436 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return defaultThrottleConfig; });
-/* harmony export (immutable) */ __webpack_exports__["a"] = throttle;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-var defaultThrottleConfig = {
-    leading: true,
-    trailing: false
-};
-function throttle(durationSelector, config) {
-    if (config === void 0) {
-        config = defaultThrottleConfig;
-    }
-    return function (source) { return source.lift(new ThrottleOperator(durationSelector, config.leading, config.trailing)); };
-}
-var ThrottleOperator = /*@__PURE__*/ (function () {
-    function ThrottleOperator(durationSelector, leading, trailing) {
-        this.durationSelector = durationSelector;
-        this.leading = leading;
-        this.trailing = trailing;
-    }
-    ThrottleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing));
-    };
-    return ThrottleOperator;
-}());
-var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ThrottleSubscriber, _super);
-    function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.durationSelector = durationSelector;
-        _this._leading = _leading;
-        _this._trailing = _trailing;
-        _this._hasValue = false;
-        return _this;
-    }
-    ThrottleSubscriber.prototype._next = function (value) {
-        this._hasValue = true;
-        this._sendValue = value;
-        if (!this._throttled) {
-            if (this._leading) {
-                this.send();
-            }
-            else {
-                this.throttle(value);
-            }
-        }
-    };
-    ThrottleSubscriber.prototype.send = function () {
-        var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue;
-        if (_hasValue) {
-            this.destination.next(_sendValue);
-            this.throttle(_sendValue);
-        }
-        this._hasValue = false;
-        this._sendValue = null;
-    };
-    ThrottleSubscriber.prototype.throttle = function (value) {
-        var duration = this.tryDurationSelector(value);
-        if (duration) {
-            this.add(this._throttled = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, duration));
-        }
-    };
-    ThrottleSubscriber.prototype.tryDurationSelector = function (value) {
-        try {
-            return this.durationSelector(value);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return null;
-        }
-    };
-    ThrottleSubscriber.prototype.throttlingDone = function () {
-        var _a = this, _throttled = _a._throttled, _trailing = _a._trailing;
-        if (_throttled) {
-            _throttled.unsubscribe();
-        }
-        this._throttled = null;
-        if (_trailing) {
-            this.send();
-        }
-    };
-    ThrottleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.throttlingDone();
-    };
-    ThrottleSubscriber.prototype.notifyComplete = function () {
-        this.throttlingDone();
-    };
-    return ThrottleSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=throttle.js.map
-
-
-/***/ }),
-/* 437 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = timeoutWith;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(443);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-function timeoutWith(due, withObservable, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
-    }
-    return function (source) {
-        var absoluteTimeout = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isDate__["a" /* isDate */])(due);
-        var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due);
-        return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler));
-    };
-}
-var TimeoutWithOperator = /*@__PURE__*/ (function () {
-    function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) {
-        this.waitFor = waitFor;
-        this.absoluteTimeout = absoluteTimeout;
-        this.withObservable = withObservable;
-        this.scheduler = scheduler;
-    }
-    TimeoutWithOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler));
-    };
-    return TimeoutWithOperator;
-}());
-var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TimeoutWithSubscriber, _super);
-    function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.absoluteTimeout = absoluteTimeout;
-        _this.waitFor = waitFor;
-        _this.withObservable = withObservable;
-        _this.scheduler = scheduler;
-        _this.action = null;
-        _this.scheduleTimeout();
-        return _this;
-    }
-    TimeoutWithSubscriber.dispatchTimeout = function (subscriber) {
-        var withObservable = subscriber.withObservable;
-        subscriber._unsubscribeAndRecycle();
-        subscriber.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(subscriber, withObservable));
-    };
-    TimeoutWithSubscriber.prototype.scheduleTimeout = function () {
-        var action = this.action;
-        if (action) {
-            this.action = action.schedule(this, this.waitFor);
-        }
-        else {
-            this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this));
-        }
-    };
-    TimeoutWithSubscriber.prototype._next = function (value) {
-        if (!this.absoluteTimeout) {
-            this.scheduleTimeout();
-        }
-        _super.prototype._next.call(this, value);
-    };
-    TimeoutWithSubscriber.prototype._unsubscribe = function () {
-        this.action = null;
-        this.scheduler = null;
-        this.withObservable = null;
-    };
-    return TimeoutWithSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=timeoutWith.js.map
-
-
-/***/ }),
-/* 438 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return asap; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsapAction__ = __webpack_require__(921);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__ = __webpack_require__(922);
-/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */
-
-
-var asap = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__["a" /* AsapScheduler */](__WEBPACK_IMPORTED_MODULE_0__AsapAction__["a" /* AsapAction */]);
-//# sourceMappingURL=asap.js.map
-
-
-/***/ }),
-/* 439 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return queue; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__QueueAction__ = __webpack_require__(923);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__ = __webpack_require__(924);
-/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */
-
-
-var queue = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__["a" /* QueueScheduler */](__WEBPACK_IMPORTED_MODULE_0__QueueAction__["a" /* QueueAction */]);
-//# sourceMappingURL=queue.js.map
-
-
-/***/ }),
-/* 440 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TimeoutError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function TimeoutErrorImpl() {
-    Error.call(this);
-    this.message = 'Timeout has occurred';
-    this.name = 'TimeoutError';
-    return this;
-}
-TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-var TimeoutError = TimeoutErrorImpl;
-//# sourceMappingURL=TimeoutError.js.map
-
-
-/***/ }),
-/* 441 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return UnsubscriptionError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function UnsubscriptionErrorImpl(errors) {
-    Error.call(this);
-    this.message = errors ?
-        errors.length + " errors occurred during unsubscription:\n" + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n  ') : '';
-    this.name = 'UnsubscriptionError';
-    this.errors = errors;
-    return this;
-}
-UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-var UnsubscriptionError = UnsubscriptionErrorImpl;
-//# sourceMappingURL=UnsubscriptionError.js.map
-
-
-/***/ }),
-/* 442 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArrayLike; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
-//# sourceMappingURL=isArrayLike.js.map
-
-
-/***/ }),
-/* 443 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isDate;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isDate(value) {
-    return value instanceof Date && !isNaN(+value);
-}
-//# sourceMappingURL=isDate.js.map
-
-
-/***/ }),
-/* 444 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isObject;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isObject(x) {
-    return x != null && typeof x === 'object';
-}
-//# sourceMappingURL=isObject.js.map
-
-
-/***/ }),
-/* 445 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isPromise;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isPromise(value) {
-    return value && typeof value.subscribe !== 'function' && typeof value.then === 'function';
-}
-//# sourceMappingURL=isPromise.js.map
-
-
-/***/ }),
-/* 446 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeTo; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeToArray__ = __webpack_require__(447);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__subscribeToPromise__ = __webpack_require__(450);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__subscribeToIterable__ = __webpack_require__(448);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__subscribeToObservable__ = __webpack_require__(449);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__isArrayLike__ = __webpack_require__(442);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__isPromise__ = __webpack_require__(445);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__isObject__ = __webpack_require__(444);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__symbol_iterator__ = __webpack_require__(151);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__symbol_observable__ = __webpack_require__(117);
-/** PURE_IMPORTS_START _Observable,_subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
-
-
-
-
-
-
-
-
-
-
-var subscribeTo = function (result) {
-    if (result instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) {
-        return function (subscriber) {
-            if (result._isScalar) {
-                subscriber.next(result.value);
-                subscriber.complete();
-                return undefined;
-            }
-            else {
-                return result.subscribe(subscriber);
-            }
-        };
-    }
-    else if (result && typeof result[__WEBPACK_IMPORTED_MODULE_9__symbol_observable__["a" /* observable */]] === 'function') {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__subscribeToObservable__["a" /* subscribeToObservable */])(result);
-    }
-    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__isArrayLike__["a" /* isArrayLike */])(result)) {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__subscribeToArray__["a" /* subscribeToArray */])(result);
-    }
-    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__isPromise__["a" /* isPromise */])(result)) {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__subscribeToPromise__["a" /* subscribeToPromise */])(result);
-    }
-    else if (result && typeof result[__WEBPACK_IMPORTED_MODULE_8__symbol_iterator__["a" /* iterator */]] === 'function') {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__subscribeToIterable__["a" /* subscribeToIterable */])(result);
-    }
-    else {
-        var value = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_7__isObject__["a" /* isObject */])(result) ? 'an invalid object' : "'" + result + "'";
-        var msg = "You provided " + value + " where a stream was expected."
-            + ' You can provide an Observable, Promise, Array, or Iterable.';
-        throw new TypeError(msg);
-    }
-};
-//# sourceMappingURL=subscribeTo.js.map
-
-
-/***/ }),
-/* 447 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToArray; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var subscribeToArray = function (array) {
-    return function (subscriber) {
-        for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) {
-            subscriber.next(array[i]);
-        }
-        if (!subscriber.closed) {
-            subscriber.complete();
-        }
-    };
-};
-//# sourceMappingURL=subscribeToArray.js.map
-
-
-/***/ }),
-/* 448 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToIterable; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(151);
-/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
-
-var subscribeToIterable = function (iterable) {
-    return function (subscriber) {
-        var iterator = iterable[__WEBPACK_IMPORTED_MODULE_0__symbol_iterator__["a" /* iterator */]]();
-        do {
-            var item = iterator.next();
-            if (item.done) {
-                subscriber.complete();
-                break;
-            }
-            subscriber.next(item.value);
-            if (subscriber.closed) {
-                break;
-            }
-        } while (true);
-        if (typeof iterator.return === 'function') {
-            subscriber.add(function () {
-                if (iterator.return) {
-                    iterator.return();
-                }
-            });
-        }
-        return subscriber;
-    };
-};
-//# sourceMappingURL=subscribeToIterable.js.map
-
-
-/***/ }),
-/* 449 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToObservable; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(117);
-/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
-
-var subscribeToObservable = function (obj) {
-    return function (subscriber) {
-        var obs = obj[__WEBPACK_IMPORTED_MODULE_0__symbol_observable__["a" /* observable */]]();
-        if (typeof obs.subscribe !== 'function') {
-            throw new TypeError('Provided object does not correctly implement Symbol.observable');
-        }
-        else {
-            return obs.subscribe(subscriber);
-        }
-    };
-};
-//# sourceMappingURL=subscribeToObservable.js.map
-
-
-/***/ }),
-/* 450 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToPromise; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__hostReportError__ = __webpack_require__(323);
-/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */
-
-var subscribeToPromise = function (promise) {
-    return function (subscriber) {
-        promise.then(function (value) {
-            if (!subscriber.closed) {
-                subscriber.next(value);
-                subscriber.complete();
-            }
-        }, function (err) { return subscriber.error(err); })
-            .then(null, __WEBPACK_IMPORTED_MODULE_0__hostReportError__["a" /* hostReportError */]);
-        return subscriber;
-    };
-};
-//# sourceMappingURL=subscribeToPromise.js.map
-
-
-/***/ }),
-/* 451 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Note: since nyc uses this module to output coverage, any lines
-// that are in the direct sync flow of nyc's outputCoverage are
-// ignored, since we can never get coverage for them.
-var assert = __webpack_require__(28)
-var signals = __webpack_require__(933)
-
-var EE = __webpack_require__(76)
-/* istanbul ignore if */
-if (typeof EE !== 'function') {
-  EE = EE.EventEmitter
-}
-
-var emitter
-if (process.__signal_exit_emitter__) {
-  emitter = process.__signal_exit_emitter__
-} else {
-  emitter = process.__signal_exit_emitter__ = new EE()
-  emitter.count = 0
-  emitter.emitted = {}
-}
-
-// Because this emitter is a global, we have to check to see if a
-// previous version of this library failed to enable infinite listeners.
-// I know what you're about to say.  But literally everything about
-// signal-exit is a compromise with evil.  Get used to it.
-if (!emitter.infinite) {
-  emitter.setMaxListeners(Infinity)
-  emitter.infinite = true
-}
-
-module.exports = function (cb, opts) {
-  assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
-
-  if (loaded === false) {
-    load()
-  }
-
-  var ev = 'exit'
-  if (opts && opts.alwaysLast) {
-    ev = 'afterexit'
-  }
-
-  var remove = function () {
-    emitter.removeListener(ev, cb)
-    if (emitter.listeners('exit').length === 0 &&
-        emitter.listeners('afterexit').length === 0) {
-      unload()
-    }
-  }
-  emitter.on(ev, cb)
-
-  return remove
-}
-
-module.exports.unload = unload
-function unload () {
-  if (!loaded) {
-    return
-  }
-  loaded = false
-
-  signals.forEach(function (sig) {
-    try {
-      process.removeListener(sig, sigListeners[sig])
-    } catch (er) {}
-  })
-  process.emit = originalProcessEmit
-  process.reallyExit = originalProcessReallyExit
-  emitter.count -= 1
-}
-
-function emit (event, code, signal) {
-  if (emitter.emitted[event]) {
-    return
-  }
-  emitter.emitted[event] = true
-  emitter.emit(event, code, signal)
-}
-
-// { <signal>: <listener fn>, ... }
-var sigListeners = {}
-signals.forEach(function (sig) {
-  sigListeners[sig] = function listener () {
-    // If there are no other listeners, an exit is coming!
-    // Simplest way: remove us and then re-send the signal.
-    // We know that this will kill the process, so we can
-    // safely emit now.
-    var listeners = process.listeners(sig)
-    if (listeners.length === emitter.count) {
-      unload()
-      emit('exit', null, sig)
-      /* istanbul ignore next */
-      emit('afterexit', null, sig)
-      /* istanbul ignore next */
-      process.kill(process.pid, sig)
-    }
-  }
-})
-
-module.exports.signals = function () {
-  return signals
-}
-
-module.exports.load = load
-
-var loaded = false
-
-function load () {
-  if (loaded) {
-    return
-  }
-  loaded = true
-
-  // This is the number of onSignalExit's that are in play.
-  // It's important so that we can count the correct number of
-  // listeners on signals, and don't wait for the other one to
-  // handle it instead of us.
-  emitter.count += 1
-
-  signals = signals.filter(function (sig) {
-    try {
-      process.on(sig, sigListeners[sig])
-      return true
-    } catch (er) {
-      return false
-    }
-  })
-
-  process.emit = processEmit
-  process.reallyExit = processReallyExit
-}
-
-var originalProcessReallyExit = process.reallyExit
-function processReallyExit (code) {
-  process.exitCode = code || 0
-  emit('exit', process.exitCode, null)
-  /* istanbul ignore next */
-  emit('afterexit', process.exitCode, null)
-  /* istanbul ignore next */
-  originalProcessReallyExit.call(process, process.exitCode)
-}
-
-var originalProcessEmit = process.emit
-function processEmit (ev, arg) {
-  if (ev === 'exit') {
-    if (arg !== undefined) {
-      process.exitCode = arg
-    }
-    var ret = originalProcessEmit.apply(this, arguments)
-    emit('exit', process.exitCode, null)
-    /* istanbul ignore next */
-    emit('afterexit', process.exitCode, null)
-    return ret
-  } else {
-    return originalProcessEmit.apply(this, arguments)
-  }
-}
-
-
-/***/ }),
-/* 452 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var scan = __webpack_require__(938)
-var parse = __webpack_require__(937)
-
-module.exports = function (source) {
-  return parse(scan(source))
-}
-
-
-/***/ }),
-/* 453 */
-/***/ (function(module, exports) {
-
-module.exports = ["0BSD","AAL","Abstyles","Adobe-2006","Adobe-Glyph","ADSL","AFL-1.1","AFL-1.2","AFL-2.0","AFL-2.1","AFL-3.0","Afmparse","AGPL-1.0","AGPL-3.0-only","AGPL-3.0-or-later","Aladdin","AMDPLPA","AML","AMPAS","ANTLR-PD","Apache-1.0","Apache-1.1","Apache-2.0","APAFML","APL-1.0","APSL-1.0","APSL-1.1","APSL-1.2","APSL-2.0","Artistic-1.0-cl8","Artistic-1.0-Perl","Artistic-1.0","Artistic-2.0","Bahyph","Barr","Beerware","BitTorrent-1.0","BitTorrent-1.1","Borceux","BSD-1-Clause","BSD-2-Clause-FreeBSD","BSD-2-Clause-NetBSD","BSD-2-Clause-Patent","BSD-2-Clause","BSD-3-Clause-Attribution","BSD-3-Clause-Clear","BSD-3-Clause-LBNL","BSD-3-Clause-No-Nuclear-License-2014","BSD-3-Clause-No-Nuclear-License","BSD-3-Clause-No-Nuclear-Warranty","BSD-3-Clause","BSD-4-Clause-UC","BSD-4-Clause","BSD-Protection","BSD-Source-Code","BSL-1.0","bzip2-1.0.5","bzip2-1.0.6","Caldera","CATOSL-1.1","CC-BY-1.0","CC-BY-2.0","CC-BY-2.5","CC-BY-3.0","CC-BY-4.0","CC-BY-NC-1.0","CC-BY-NC-2.0","CC-BY-NC-2.5","CC-BY-NC-3.0","CC-BY-NC-4.0","CC-BY-NC-ND-1.0","CC-BY-NC-ND-2.0","CC-BY-NC-ND-2.5","CC-BY-NC-ND-3.0","CC-BY-NC-ND-4.0","CC-BY-NC-SA-1.0","CC-BY-NC-SA-2.0","CC-BY-NC-SA-2.5","CC-BY-NC-SA-3.0","CC-BY-NC-SA-4.0","CC-BY-ND-1.0","CC-BY-ND-2.0","CC-BY-ND-2.5","CC-BY-ND-3.0","CC-BY-ND-4.0","CC-BY-SA-1.0","CC-BY-SA-2.0","CC-BY-SA-2.5","CC-BY-SA-3.0","CC-BY-SA-4.0","CC0-1.0","CDDL-1.0","CDDL-1.1","CDLA-Permissive-1.0","CDLA-Sharing-1.0","CECILL-1.0","CECILL-1.1","CECILL-2.0","CECILL-2.1","CECILL-B","CECILL-C","ClArtistic","CNRI-Jython","CNRI-Python-GPL-Compatible","CNRI-Python","Condor-1.1","CPAL-1.0","CPL-1.0","CPOL-1.02","Crossword","CrystalStacker","CUA-OPL-1.0","Cube","curl","D-FSL-1.0","diffmark","DOC","Dotseqn","DSDP","dvipdfm","ECL-1.0","ECL-2.0","EFL-1.0","EFL-2.0","eGenix","Entessa","EPL-1.0","EPL-2.0","ErlPL-1.1","EUDatagrid","EUPL-1.0","EUPL-1.1","EUPL-1.2","Eurosym","Fair","Frameworx-1.0","FreeImage","FSFAP","FSFUL","FSFULLR","FTL","GFDL-1.1-only","GFDL-1.1-or-later","GFDL-1.2-only","GFDL-1.2-or-later","GFDL-1.3-only","GFDL-1.3-or-later","Giftware","GL2PS","Glide","Glulxe","gnuplot","GPL-1.0-only","GPL-1.0-or-later","GPL-2.0-only","GPL-2.0-or-later","GPL-3.0-only","GPL-3.0-or-later","gSOAP-1.3b","HaskellReport","HPND","IBM-pibs","ICU","IJG","ImageMagick","iMatix","Imlib2","Info-ZIP","Intel-ACPI","Intel","Interbase-1.0","IPA","IPL-1.0","ISC","JasPer-2.0","JSON","LAL-1.2","LAL-1.3","Latex2e","Leptonica","LGPL-2.0-only","LGPL-2.0-or-later","LGPL-2.1-only","LGPL-2.1-or-later","LGPL-3.0-only","LGPL-3.0-or-later","LGPLLR","Libpng","libtiff","LiLiQ-P-1.1","LiLiQ-R-1.1","LiLiQ-Rplus-1.1","LPL-1.0","LPL-1.02","LPPL-1.0","LPPL-1.1","LPPL-1.2","LPPL-1.3a","LPPL-1.3c","MakeIndex","MirOS","MIT-advertising","MIT-CMU","MIT-enna","MIT-feh","MIT","MITNFA","Motosoto","mpich2","MPL-1.0","MPL-1.1","MPL-2.0-no-copyleft-exception","MPL-2.0","MS-PL","MS-RL","MTLL","Multics","Mup","NASA-1.3","Naumen","NBPL-1.0","NCSA","Net-SNMP","NetCDF","Newsletr","NGPL","NLOD-1.0","NLPL","Nokia","NOSL","Noweb","NPL-1.0","NPL-1.1","NPOSL-3.0","NRL","NTP","OCCT-PL","OCLC-2.0","ODbL-1.0","OFL-1.0","OFL-1.1","OGTSL","OLDAP-1.1","OLDAP-1.2","OLDAP-1.3","OLDAP-1.4","OLDAP-2.0.1","OLDAP-2.0","OLDAP-2.1","OLDAP-2.2.1","OLDAP-2.2.2","OLDAP-2.2","OLDAP-2.3","OLDAP-2.4","OLDAP-2.5","OLDAP-2.6","OLDAP-2.7","OLDAP-2.8","OML","OpenSSL","OPL-1.0","OSET-PL-2.1","OSL-1.0","OSL-1.1","OSL-2.0","OSL-2.1","OSL-3.0","PDDL-1.0","PHP-3.0","PHP-3.01","Plexus","PostgreSQL","psfrag","psutils","Python-2.0","Qhull","QPL-1.0","Rdisc","RHeCos-1.1","RPL-1.1","RPL-1.5","RPSL-1.0","RSA-MD","RSCPL","Ruby","SAX-PD","Saxpath","SCEA","Sendmail","SGI-B-1.0","SGI-B-1.1","SGI-B-2.0","SimPL-2.0","SISSL-1.2","SISSL","Sleepycat","SMLNJ","SMPPL","SNIA","Spencer-86","Spencer-94","Spencer-99","SPL-1.0","SugarCRM-1.1.3","SWL","TCL","TCP-wrappers","TMate","TORQUE-1.1","TOSL","Unicode-DFS-2015","Unicode-DFS-2016","Unicode-TOU","Unlicense","UPL-1.0","Vim","VOSTROM","VSL-1.0","W3C-19980720","W3C-20150513","W3C","Watcom-1.0","Wsuipa","WTFPL","X11","Xerox","XFree86-1.1","xinetd","Xnet","xpp","XSkat","YPL-1.0","YPL-1.1","Zed","Zend-2.0","Zimbra-1.3","Zimbra-1.4","zlib-acknowledgement","Zlib","ZPL-1.1","ZPL-2.0","ZPL-2.1"]
-
-/***/ }),
-/* 454 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	Verifier: Verifier,
-	Signer: Signer
-};
-
-var nacl;
-var stream = __webpack_require__(23);
-var util = __webpack_require__(3);
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var Signature = __webpack_require__(74);
-
-function Verifier(key, hashAlgo) {
-	if (nacl === undefined)
-		nacl = __webpack_require__(75);
-
-	if (hashAlgo.toLowerCase() !== 'sha512')
-		throw (new Error('ED25519 only supports the use of ' +
-		    'SHA-512 hashes'));
-
-	this.key = key;
-	this.chunks = [];
-
-	stream.Writable.call(this, {});
-}
-util.inherits(Verifier, stream.Writable);
-
-Verifier.prototype._write = function (chunk, enc, cb) {
-	this.chunks.push(chunk);
-	cb();
-};
-
-Verifier.prototype.update = function (chunk) {
-	if (typeof (chunk) === 'string')
-		chunk = Buffer.from(chunk, 'binary');
-	this.chunks.push(chunk);
-};
-
-Verifier.prototype.verify = function (signature, fmt) {
-	var sig;
-	if (Signature.isSignature(signature, [2, 0])) {
-		if (signature.type !== 'ed25519')
-			return (false);
-		sig = signature.toBuffer('raw');
-
-	} else if (typeof (signature) === 'string') {
-		sig = Buffer.from(signature, 'base64');
-
-	} else if (Signature.isSignature(signature, [1, 0])) {
-		throw (new Error('signature was created by too old ' +
-		    'a version of sshpk and cannot be verified'));
-	}
-
-	assert.buffer(sig);
-	return (nacl.sign.detached.verify(
-	    new Uint8Array(Buffer.concat(this.chunks)),
-	    new Uint8Array(sig),
-	    new Uint8Array(this.key.part.A.data)));
-};
-
-function Signer(key, hashAlgo) {
-	if (nacl === undefined)
-		nacl = __webpack_require__(75);
-
-	if (hashAlgo.toLowerCase() !== 'sha512')
-		throw (new Error('ED25519 only supports the use of ' +
-		    'SHA-512 hashes'));
-
-	this.key = key;
-	this.chunks = [];
-
-	stream.Writable.call(this, {});
-}
-util.inherits(Signer, stream.Writable);
-
-Signer.prototype._write = function (chunk, enc, cb) {
-	this.chunks.push(chunk);
-	cb();
-};
-
-Signer.prototype.update = function (chunk) {
-	if (typeof (chunk) === 'string')
-		chunk = Buffer.from(chunk, 'binary');
-	this.chunks.push(chunk);
-};
-
-Signer.prototype.sign = function () {
-	var sig = nacl.sign.detached(
-	    new Uint8Array(Buffer.concat(this.chunks)),
-	    new Uint8Array(Buffer.concat([
-		this.key.part.k.data, this.key.part.A.data])));
-	var sigBuf = Buffer.from(sig);
-	var sigObj = Signature.parse(sigBuf, 'ed25519', 'raw');
-	sigObj.hashAlgorithm = 'sha512';
-	return (sigObj);
-};
-
-
-/***/ }),
-/* 455 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-
-var pem = __webpack_require__(86);
-var ssh = __webpack_require__(456);
-var rfc4253 = __webpack_require__(103);
-var dnssec = __webpack_require__(326);
-
-var DNSSEC_PRIVKEY_HEADER_PREFIX = 'Private-key-format: v1';
-
-function read(buf, options) {
-	if (typeof (buf) === 'string') {
-		if (buf.trim().match(/^[-]+[ ]*BEGIN/))
-			return (pem.read(buf, options));
-		if (buf.match(/^\s*ssh-[a-z]/))
-			return (ssh.read(buf, options));
-		if (buf.match(/^\s*ecdsa-/))
-			return (ssh.read(buf, options));
-		if (findDNSSECHeader(buf))
-			return (dnssec.read(buf, options));
-		buf = Buffer.from(buf, 'binary');
-	} else {
-		assert.buffer(buf);
-		if (findPEMHeader(buf))
-			return (pem.read(buf, options));
-		if (findSSHHeader(buf))
-			return (ssh.read(buf, options));
-		if (findDNSSECHeader(buf))
-			return (dnssec.read(buf, options));
-	}
-	if (buf.readUInt32BE(0) < buf.length)
-		return (rfc4253.read(buf, options));
-	throw (new Error('Failed to auto-detect format of key'));
-}
-
-function findSSHHeader(buf) {
-	var offset = 0;
-	while (offset < buf.length &&
-	    (buf[offset] === 32 || buf[offset] === 10 || buf[offset] === 9))
-		++offset;
-	if (offset + 4 <= buf.length &&
-	    buf.slice(offset, offset + 4).toString('ascii') === 'ssh-')
-		return (true);
-	if (offset + 6 <= buf.length &&
-	    buf.slice(offset, offset + 6).toString('ascii') === 'ecdsa-')
-		return (true);
-	return (false);
-}
-
-function findPEMHeader(buf) {
-	var offset = 0;
-	while (offset < buf.length &&
-	    (buf[offset] === 32 || buf[offset] === 10))
-		++offset;
-	if (buf[offset] !== 45)
-		return (false);
-	while (offset < buf.length &&
-	    (buf[offset] === 45))
-		++offset;
-	while (offset < buf.length &&
-	    (buf[offset] === 32))
-		++offset;
-	if (offset + 5 > buf.length ||
-	    buf.slice(offset, offset + 5).toString('ascii') !== 'BEGIN')
-		return (false);
-	return (true);
-}
-
-function findDNSSECHeader(buf) {
-	// private case first
-	if (buf.length <= DNSSEC_PRIVKEY_HEADER_PREFIX.length)
-		return (false);
-	var headerCheck = buf.slice(0, DNSSEC_PRIVKEY_HEADER_PREFIX.length);
-	if (headerCheck.toString('ascii') === DNSSEC_PRIVKEY_HEADER_PREFIX)
-		return (true);
-
-	// public-key RFC3110 ?
-	// 'domain.com. IN KEY ...' or 'domain.com. IN DNSKEY ...'
-	// skip any comment-lines
-	if (typeof (buf) !== 'string') {
-		buf = buf.toString('ascii');
-	}
-	var lines = buf.split('\n');
-	var line = 0;
-	/* JSSTYLED */
-	while (lines[line].match(/^\;/))
-		line++;
-	if (lines[line].toString('ascii').match(/\. IN KEY /))
-		return (true);
-	if (lines[line].toString('ascii').match(/\. IN DNSKEY /))
-		return (true);
-	return (false);
-}
-
-function write(key, options) {
-	throw (new Error('"auto" format cannot be used for writing'));
-}
-
-
-/***/ }),
-/* 456 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var Buffer = __webpack_require__(15).Buffer;
-var rfc4253 = __webpack_require__(103);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-
-var sshpriv = __webpack_require__(192);
-
-/*JSSTYLED*/
-var SSHKEY_RE = /^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([ \t]+([^ \t][^\n]*[\n]*)?)?$/;
-/*JSSTYLED*/
-var SSHKEY_RE2 = /^([a-z0-9-]+)[ \t\n]+([a-zA-Z0-9+\/][a-zA-Z0-9+\/ \t\n=]*)([^a-zA-Z0-9+\/ \t\n=].*)?$/;
-
-function read(buf, options) {
-	if (typeof (buf) !== 'string') {
-		assert.buffer(buf, 'buf');
-		buf = buf.toString('ascii');
-	}
-
-	var trimmed = buf.trim().replace(/[\\\r]/g, '');
-	var m = trimmed.match(SSHKEY_RE);
-	if (!m)
-		m = trimmed.match(SSHKEY_RE2);
-	assert.ok(m, 'key must match regex');
-
-	var type = rfc4253.algToKeyType(m[1]);
-	var kbuf = Buffer.from(m[2], 'base64');
-
-	/*
-	 * This is a bit tricky. If we managed to parse the key and locate the
-	 * key comment with the regex, then do a non-partial read and assert
-	 * that we have consumed all bytes. If we couldn't locate the key
-	 * comment, though, there may be whitespace shenanigans going on that
-	 * have conjoined the comment to the rest of the key. We do a partial
-	 * read in this case to try to make the best out of a sorry situation.
-	 */
-	var key;
-	var ret = {};
-	if (m[4]) {
-		try {
-			key = rfc4253.read(kbuf);
-
-		} catch (e) {
-			m = trimmed.match(SSHKEY_RE2);
-			assert.ok(m, 'key must match regex');
-			kbuf = Buffer.from(m[2], 'base64');
-			key = rfc4253.readInternal(ret, 'public', kbuf);
-		}
-	} else {
-		key = rfc4253.readInternal(ret, 'public', kbuf);
-	}
-
-	assert.strictEqual(type, key.type);
-
-	if (m[4] && m[4].length > 0) {
-		key.comment = m[4];
-
-	} else if (ret.consumed) {
-		/*
-		 * Now the magic: trying to recover the key comment when it's
-		 * gotten conjoined to the key or otherwise shenanigan'd.
-		 *
-		 * Work out how much base64 we used, then drop all non-base64
-		 * chars from the beginning up to this point in the the string.
-		 * Then offset in this and try to make up for missing = chars.
-		 */
-		var data = m[2] + (m[3] ? m[3] : '');
-		var realOffset = Math.ceil(ret.consumed / 3) * 4;
-		data = data.slice(0, realOffset - 2). /*JSSTYLED*/
-		    replace(/[^a-zA-Z0-9+\/=]/g, '') +
-		    data.slice(realOffset - 2);
-
-		var padding = ret.consumed % 3;
-		if (padding > 0 &&
-		    data.slice(realOffset - 1, realOffset) !== '=')
-			realOffset--;
-		while (data.slice(realOffset, realOffset + 1) === '=')
-			realOffset++;
-
-		/* Finally, grab what we think is the comment & clean it up. */
-		var trailer = data.slice(realOffset);
-		trailer = trailer.replace(/[\r\n]/g, ' ').
-		    replace(/^\s+/, '');
-		if (trailer.match(/^[a-zA-Z0-9]/))
-			key.comment = trailer;
-	}
-
-	return (key);
-}
-
-function write(key, options) {
-	assert.object(key);
-	if (!Key.isKey(key))
-		throw (new Error('Must be a public key'));
-
-	var parts = [];
-	var alg = rfc4253.keyTypeToAlg(key);
-	parts.push(alg);
-
-	var buf = rfc4253.write(key);
-	parts.push(buf.toString('base64'));
-
-	if (key.comment)
-		parts.push(key.comment);
-
-	return (Buffer.from(parts.join(' ')));
-}
-
-
-/***/ }),
-/* 457 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	verify: verify,
-	sign: sign,
-	signAsync: signAsync,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var asn1 = __webpack_require__(65);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var pem = __webpack_require__(86);
-var Identity = __webpack_require__(158);
-var Signature = __webpack_require__(74);
-var Certificate = __webpack_require__(155);
-var pkcs8 = __webpack_require__(157);
-
-/*
- * This file is based on RFC5280 (X.509).
- */
-
-/* Helper to read in a single mpint */
-function readMPInt(der, nm) {
-	assert.strictEqual(der.peek(), asn1.Ber.Integer,
-	    nm + ' is not an Integer');
-	return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
-}
-
-function verify(cert, key) {
-	var sig = cert.signatures.x509;
-	assert.object(sig, 'x509 signature');
-
-	var algParts = sig.algo.split('-');
-	if (algParts[0] !== key.type)
-		return (false);
-
-	var blob = sig.cache;
-	if (blob === undefined) {
-		var der = new asn1.BerWriter();
-		writeTBSCert(cert, der);
-		blob = der.buffer;
-	}
-
-	var verifier = key.createVerify(algParts[1]);
-	verifier.write(blob);
-	return (verifier.verify(sig.signature));
-}
-
-function Local(i) {
-	return (asn1.Ber.Context | asn1.Ber.Constructor | i);
-}
-
-function Context(i) {
-	return (asn1.Ber.Context | i);
-}
-
-var SIGN_ALGS = {
-	'rsa-md5': '1.2.840.113549.1.1.4',
-	'rsa-sha1': '1.2.840.113549.1.1.5',
-	'rsa-sha256': '1.2.840.113549.1.1.11',
-	'rsa-sha384': '1.2.840.113549.1.1.12',
-	'rsa-sha512': '1.2.840.113549.1.1.13',
-	'dsa-sha1': '1.2.840.10040.4.3',
-	'dsa-sha256': '2.16.840.1.101.3.4.3.2',
-	'ecdsa-sha1': '1.2.840.10045.4.1',
-	'ecdsa-sha256': '1.2.840.10045.4.3.2',
-	'ecdsa-sha384': '1.2.840.10045.4.3.3',
-	'ecdsa-sha512': '1.2.840.10045.4.3.4',
-	'ed25519-sha512': '1.3.101.112'
-};
-Object.keys(SIGN_ALGS).forEach(function (k) {
-	SIGN_ALGS[SIGN_ALGS[k]] = k;
-});
-SIGN_ALGS['1.3.14.3.2.3'] = 'rsa-md5';
-SIGN_ALGS['1.3.14.3.2.29'] = 'rsa-sha1';
-
-var EXTS = {
-	'issuerKeyId': '2.5.29.35',
-	'altName': '2.5.29.17',
-	'basicConstraints': '2.5.29.19',
-	'keyUsage': '2.5.29.15',
-	'extKeyUsage': '2.5.29.37'
-};
-
-function read(buf, options) {
-	if (typeof (buf) === 'string') {
-		buf = Buffer.from(buf, 'binary');
-	}
-	assert.buffer(buf, 'buf');
-
-	var der = new asn1.BerReader(buf);
-
-	der.readSequence();
-	if (Math.abs(der.length - der.remain) > 1) {
-		throw (new Error('DER sequence does not contain whole byte ' +
-		    'stream'));
-	}
-
-	var tbsStart = der.offset;
-	der.readSequence();
-	var sigOffset = der.offset + der.length;
-	var tbsEnd = sigOffset;
-
-	if (der.peek() === Local(0)) {
-		der.readSequence(Local(0));
-		var version = der.readInt();
-		assert.ok(version <= 3,
-		    'only x.509 versions up to v3 supported');
-	}
-
-	var cert = {};
-	cert.signatures = {};
-	var sig = (cert.signatures.x509 = {});
-	sig.extras = {};
-
-	cert.serial = readMPInt(der, 'serial');
-
-	der.readSequence();
-	var after = der.offset + der.length;
-	var certAlgOid = der.readOID();
-	var certAlg = SIGN_ALGS[certAlgOid];
-	if (certAlg === undefined)
-		throw (new Error('unknown signature algorithm ' + certAlgOid));
-
-	der._offset = after;
-	cert.issuer = Identity.parseAsn1(der);
-
-	der.readSequence();
-	cert.validFrom = readDate(der);
-	cert.validUntil = readDate(der);
-
-	cert.subjects = [Identity.parseAsn1(der)];
-
-	der.readSequence();
-	after = der.offset + der.length;
-	cert.subjectKey = pkcs8.readPkcs8(undefined, 'public', der);
-	der._offset = after;
-
-	/* issuerUniqueID */
-	if (der.peek() === Local(1)) {
-		der.readSequence(Local(1));
-		sig.extras.issuerUniqueID =
-		    buf.slice(der.offset, der.offset + der.length);
-		der._offset += der.length;
-	}
-
-	/* subjectUniqueID */
-	if (der.peek() === Local(2)) {
-		der.readSequence(Local(2));
-		sig.extras.subjectUniqueID =
-		    buf.slice(der.offset, der.offset + der.length);
-		der._offset += der.length;
-	}
-
-	/* extensions */
-	if (der.peek() === Local(3)) {
-		der.readSequence(Local(3));
-		var extEnd = der.offset + der.length;
-		der.readSequence();
-
-		while (der.offset < extEnd)
-			readExtension(cert, buf, der);
-
-		assert.strictEqual(der.offset, extEnd);
-	}
-
-	assert.strictEqual(der.offset, sigOffset);
-
-	der.readSequence();
-	after = der.offset + der.length;
-	var sigAlgOid = der.readOID();
-	var sigAlg = SIGN_ALGS[sigAlgOid];
-	if (sigAlg === undefined)
-		throw (new Error('unknown signature algorithm ' + sigAlgOid));
-	der._offset = after;
-
-	var sigData = der.readString(asn1.Ber.BitString, true);
-	if (sigData[0] === 0)
-		sigData = sigData.slice(1);
-	var algParts = sigAlg.split('-');
-
-	sig.signature = Signature.parse(sigData, algParts[0], 'asn1');
-	sig.signature.hashAlgorithm = algParts[1];
-	sig.algo = sigAlg;
-	sig.cache = buf.slice(tbsStart, tbsEnd);
-
-	return (new Certificate(cert));
-}
-
-function readDate(der) {
-	if (der.peek() === asn1.Ber.UTCTime) {
-		return (utcTimeToDate(der.readString(asn1.Ber.UTCTime)));
-	} else if (der.peek() === asn1.Ber.GeneralizedTime) {
-		return (gTimeToDate(der.readString(asn1.Ber.GeneralizedTime)));
-	} else {
-		throw (new Error('Unsupported date format'));
-	}
-}
-
-/* RFC5280, section 4.2.1.6 (GeneralName type) */
-var ALTNAME = {
-	OtherName: Local(0),
-	RFC822Name: Context(1),
-	DNSName: Context(2),
-	X400Address: Local(3),
-	DirectoryName: Local(4),
-	EDIPartyName: Local(5),
-	URI: Context(6),
-	IPAddress: Context(7),
-	OID: Context(8)
-};
-
-/* RFC5280, section 4.2.1.12 (KeyPurposeId) */
-var EXTPURPOSE = {
-	'serverAuth': '1.3.6.1.5.5.7.3.1',
-	'clientAuth': '1.3.6.1.5.5.7.3.2',
-	'codeSigning': '1.3.6.1.5.5.7.3.3',
-
-	/* See https://github.com/joyent/oid-docs/blob/master/root.md */
-	'joyentDocker': '1.3.6.1.4.1.38678.1.4.1',
-	'joyentCmon': '1.3.6.1.4.1.38678.1.4.2'
-};
-var EXTPURPOSE_REV = {};
-Object.keys(EXTPURPOSE).forEach(function (k) {
-	EXTPURPOSE_REV[EXTPURPOSE[k]] = k;
-});
-
-var KEYUSEBITS = [
-	'signature', 'identity', 'keyEncryption',
-	'encryption', 'keyAgreement', 'ca', 'crl'
-];
-
-function readExtension(cert, buf, der) {
-	der.readSequence();
-	var after = der.offset + der.length;
-	var extId = der.readOID();
-	var id;
-	var sig = cert.signatures.x509;
-	sig.extras.exts = [];
-
-	var critical;
-	if (der.peek() === asn1.Ber.Boolean)
-		critical = der.readBoolean();
-
-	switch (extId) {
-	case (EXTS.basicConstraints):
-		der.readSequence(asn1.Ber.OctetString);
-		der.readSequence();
-		var bcEnd = der.offset + der.length;
-		var ca = false;
-		if (der.peek() === asn1.Ber.Boolean)
-			ca = der.readBoolean();
-		if (cert.purposes === undefined)
-			cert.purposes = [];
-		if (ca === true)
-			cert.purposes.push('ca');
-		var bc = { oid: extId, critical: critical };
-		if (der.offset < bcEnd && der.peek() === asn1.Ber.Integer)
-			bc.pathLen = der.readInt();
-		sig.extras.exts.push(bc);
-		break;
-	case (EXTS.extKeyUsage):
-		der.readSequence(asn1.Ber.OctetString);
-		der.readSequence();
-		if (cert.purposes === undefined)
-			cert.purposes = [];
-		var ekEnd = der.offset + der.length;
-		while (der.offset < ekEnd) {
-			var oid = der.readOID();
-			cert.purposes.push(EXTPURPOSE_REV[oid] || oid);
-		}
-		/*
-		 * This is a bit of a hack: in the case where we have a cert
-		 * that's only allowed to do serverAuth or clientAuth (and not
-		 * the other), we want to make sure all our Subjects are of
-		 * the right type. But we already parsed our Subjects and
-		 * decided if they were hosts or users earlier (since it appears
-		 * first in the cert).
-		 *
-		 * So we go through and mutate them into the right kind here if
-		 * it doesn't match. This might not be hugely beneficial, as it
-		 * seems that single-purpose certs are not often seen in the
-		 * wild.
-		 */
-		if (cert.purposes.indexOf('serverAuth') !== -1 &&
-		    cert.purposes.indexOf('clientAuth') === -1) {
-			cert.subjects.forEach(function (ide) {
-				if (ide.type !== 'host') {
-					ide.type = 'host';
-					ide.hostname = ide.uid ||
-					    ide.email ||
-					    ide.components[0].value;
-				}
-			});
-		} else if (cert.purposes.indexOf('clientAuth') !== -1 &&
-		    cert.purposes.indexOf('serverAuth') === -1) {
-			cert.subjects.forEach(function (ide) {
-				if (ide.type !== 'user') {
-					ide.type = 'user';
-					ide.uid = ide.hostname ||
-					    ide.email ||
-					    ide.components[0].value;
-				}
-			});
-		}
-		sig.extras.exts.push({ oid: extId, critical: critical });
-		break;
-	case (EXTS.keyUsage):
-		der.readSequence(asn1.Ber.OctetString);
-		var bits = der.readString(asn1.Ber.BitString, true);
-		var setBits = readBitField(bits, KEYUSEBITS);
-		setBits.forEach(function (bit) {
-			if (cert.purposes === undefined)
-				cert.purposes = [];
-			if (cert.purposes.indexOf(bit) === -1)
-				cert.purposes.push(bit);
-		});
-		sig.extras.exts.push({ oid: extId, critical: critical,
-		    bits: bits });
-		break;
-	case (EXTS.altName):
-		der.readSequence(asn1.Ber.OctetString);
-		der.readSequence();
-		var aeEnd = der.offset + der.length;
-		while (der.offset < aeEnd) {
-			switch (der.peek()) {
-			case ALTNAME.OtherName:
-			case ALTNAME.EDIPartyName:
-				der.readSequence();
-				der._offset += der.length;
-				break;
-			case ALTNAME.OID:
-				der.readOID(ALTNAME.OID);
-				break;
-			case ALTNAME.RFC822Name:
-				/* RFC822 specifies email addresses */
-				var email = der.readString(ALTNAME.RFC822Name);
-				id = Identity.forEmail(email);
-				if (!cert.subjects[0].equals(id))
-					cert.subjects.push(id);
-				break;
-			case ALTNAME.DirectoryName:
-				der.readSequence(ALTNAME.DirectoryName);
-				id = Identity.parseAsn1(der);
-				if (!cert.subjects[0].equals(id))
-					cert.subjects.push(id);
-				break;
-			case ALTNAME.DNSName:
-				var host = der.readString(
-				    ALTNAME.DNSName);
-				id = Identity.forHost(host);
-				if (!cert.subjects[0].equals(id))
-					cert.subjects.push(id);
-				break;
-			default:
-				der.readString(der.peek());
-				break;
-			}
-		}
-		sig.extras.exts.push({ oid: extId, critical: critical });
-		break;
-	default:
-		sig.extras.exts.push({
-			oid: extId,
-			critical: critical,
-			data: der.readString(asn1.Ber.OctetString, true)
-		});
-		break;
-	}
-
-	der._offset = after;
-}
-
-var UTCTIME_RE =
-    /^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})?Z$/;
-function utcTimeToDate(t) {
-	var m = t.match(UTCTIME_RE);
-	assert.ok(m, 'timestamps must be in UTC');
-	var d = new Date();
-
-	var thisYear = d.getUTCFullYear();
-	var century = Math.floor(thisYear / 100) * 100;
-
-	var year = parseInt(m[1], 10);
-	if (thisYear % 100 < 50 && year >= 60)
-		year += (century - 1);
-	else
-		year += century;
-	d.setUTCFullYear(year, parseInt(m[2], 10) - 1, parseInt(m[3], 10));
-	d.setUTCHours(parseInt(m[4], 10), parseInt(m[5], 10));
-	if (m[6] && m[6].length > 0)
-		d.setUTCSeconds(parseInt(m[6], 10));
-	return (d);
-}
-
-var GTIME_RE =
-    /^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})?Z$/;
-function gTimeToDate(t) {
-	var m = t.match(GTIME_RE);
-	assert.ok(m);
-	var d = new Date();
-
-	d.setUTCFullYear(parseInt(m[1], 10), parseInt(m[2], 10) - 1,
-	    parseInt(m[3], 10));
-	d.setUTCHours(parseInt(m[4], 10), parseInt(m[5], 10));
-	if (m[6] && m[6].length > 0)
-		d.setUTCSeconds(parseInt(m[6], 10));
-	return (d);
-}
-
-function zeroPad(n) {
-	var s = '' + n;
-	while (s.length < 2)
-		s = '0' + s;
-	return (s);
-}
-
-function dateToUTCTime(d) {
-	var s = '';
-	s += zeroPad(d.getUTCFullYear() % 100);
-	s += zeroPad(d.getUTCMonth() + 1);
-	s += zeroPad(d.getUTCDate());
-	s += zeroPad(d.getUTCHours());
-	s += zeroPad(d.getUTCMinutes());
-	s += zeroPad(d.getUTCSeconds());
-	s += 'Z';
-	return (s);
-}
-
-function sign(cert, key) {
-	if (cert.signatures.x509 === undefined)
-		cert.signatures.x509 = {};
-	var sig = cert.signatures.x509;
-
-	sig.algo = key.type + '-' + key.defaultHashAlgorithm();
-	if (SIGN_ALGS[sig.algo] === undefined)
-		return (false);
-
-	var der = new asn1.BerWriter();
-	writeTBSCert(cert, der);
-	var blob = der.buffer;
-	sig.cache = blob;
-
-	var signer = key.createSign();
-	signer.write(blob);
-	cert.signatures.x509.signature = signer.sign();
-
-	return (true);
-}
-
-function signAsync(cert, signer, done) {
-	if (cert.signatures.x509 === undefined)
-		cert.signatures.x509 = {};
-	var sig = cert.signatures.x509;
-
-	var der = new asn1.BerWriter();
-	writeTBSCert(cert, der);
-	var blob = der.buffer;
-	sig.cache = blob;
-
-	signer(blob, function (err, signature) {
-		if (err) {
-			done(err);
-			return;
-		}
-		sig.algo = signature.type + '-' + signature.hashAlgorithm;
-		if (SIGN_ALGS[sig.algo] === undefined) {
-			done(new Error('Invalid signing algorithm "' +
-			    sig.algo + '"'));
-			return;
-		}
-		sig.signature = signature;
-		done();
-	});
-}
-
-function write(cert, options) {
-	var sig = cert.signatures.x509;
-	assert.object(sig, 'x509 signature');
-
-	var der = new asn1.BerWriter();
-	der.startSequence();
-	if (sig.cache) {
-		der._ensure(sig.cache.length);
-		sig.cache.copy(der._buf, der._offset);
-		der._offset += sig.cache.length;
-	} else {
-		writeTBSCert(cert, der);
-	}
-
-	der.startSequence();
-	der.writeOID(SIGN_ALGS[sig.algo]);
-	if (sig.algo.match(/^rsa-/))
-		der.writeNull();
-	der.endSequence();
-
-	var sigData = sig.signature.toBuffer('asn1');
-	var data = Buffer.alloc(sigData.length + 1);
-	data[0] = 0;
-	sigData.copy(data, 1);
-	der.writeBuffer(data, asn1.Ber.BitString);
-	der.endSequence();
-
-	return (der.buffer);
-}
-
-function writeTBSCert(cert, der) {
-	var sig = cert.signatures.x509;
-	assert.object(sig, 'x509 signature');
-
-	der.startSequence();
-
-	der.startSequence(Local(0));
-	der.writeInt(2);
-	der.endSequence();
-
-	der.writeBuffer(utils.mpNormalize(cert.serial), asn1.Ber.Integer);
-
-	der.startSequence();
-	der.writeOID(SIGN_ALGS[sig.algo]);
-	if (sig.algo.match(/^rsa-/))
-		der.writeNull();
-	der.endSequence();
-
-	cert.issuer.toAsn1(der);
-
-	der.startSequence();
-	der.writeString(dateToUTCTime(cert.validFrom), asn1.Ber.UTCTime);
-	der.writeString(dateToUTCTime(cert.validUntil), asn1.Ber.UTCTime);
-	der.endSequence();
-
-	var subject = cert.subjects[0];
-	var altNames = cert.subjects.slice(1);
-	subject.toAsn1(der);
-
-	pkcs8.writePkcs8(der, cert.subjectKey);
-
-	if (sig.extras && sig.extras.issuerUniqueID) {
-		der.writeBuffer(sig.extras.issuerUniqueID, Local(1));
-	}
-
-	if (sig.extras && sig.extras.subjectUniqueID) {
-		der.writeBuffer(sig.extras.subjectUniqueID, Local(2));
-	}
-
-	if (altNames.length > 0 || subject.type === 'host' ||
-	    (cert.purposes !== undefined && cert.purposes.length > 0) ||
-	    (sig.extras && sig.extras.exts)) {
-		der.startSequence(Local(3));
-		der.startSequence();
-
-		var exts = [];
-		if (cert.purposes !== undefined && cert.purposes.length > 0) {
-			exts.push({
-				oid: EXTS.basicConstraints,
-				critical: true
-			});
-			exts.push({
-				oid: EXTS.keyUsage,
-				critical: true
-			});
-			exts.push({
-				oid: EXTS.extKeyUsage,
-				critical: true
-			});
-		}
-		exts.push({ oid: EXTS.altName });
-		if (sig.extras && sig.extras.exts)
-			exts = sig.extras.exts;
-
-		for (var i = 0; i < exts.length; ++i) {
-			der.startSequence();
-			der.writeOID(exts[i].oid);
-
-			if (exts[i].critical !== undefined)
-				der.writeBoolean(exts[i].critical);
-
-			if (exts[i].oid === EXTS.altName) {
-				der.startSequence(asn1.Ber.OctetString);
-				der.startSequence();
-				if (subject.type === 'host') {
-					der.writeString(subject.hostname,
-					    Context(2));
-				}
-				for (var j = 0; j < altNames.length; ++j) {
-					if (altNames[j].type === 'host') {
-						der.writeString(
-						    altNames[j].hostname,
-						    ALTNAME.DNSName);
-					} else if (altNames[j].type ===
-					    'email') {
-						der.writeString(
-						    altNames[j].email,
-						    ALTNAME.RFC822Name);
-					} else {
-						/*
-						 * Encode anything else as a
-						 * DN style name for now.
-						 */
-						der.startSequence(
-						    ALTNAME.DirectoryName);
-						altNames[j].toAsn1(der);
-						der.endSequence();
-					}
-				}
-				der.endSequence();
-				der.endSequence();
-			} else if (exts[i].oid === EXTS.basicConstraints) {
-				der.startSequence(asn1.Ber.OctetString);
-				der.startSequence();
-				var ca = (cert.purposes.indexOf('ca') !== -1);
-				var pathLen = exts[i].pathLen;
-				der.writeBoolean(ca);
-				if (pathLen !== undefined)
-					der.writeInt(pathLen);
-				der.endSequence();
-				der.endSequence();
-			} else if (exts[i].oid === EXTS.extKeyUsage) {
-				der.startSequence(asn1.Ber.OctetString);
-				der.startSequence();
-				cert.purposes.forEach(function (purpose) {
-					if (purpose === 'ca')
-						return;
-					if (KEYUSEBITS.indexOf(purpose) !== -1)
-						return;
-					var oid = purpose;
-					if (EXTPURPOSE[purpose] !== undefined)
-						oid = EXTPURPOSE[purpose];
-					der.writeOID(oid);
-				});
-				der.endSequence();
-				der.endSequence();
-			} else if (exts[i].oid === EXTS.keyUsage) {
-				der.startSequence(asn1.Ber.OctetString);
-				/*
-				 * If we parsed this certificate from a byte
-				 * stream (i.e. we didn't generate it in sshpk)
-				 * then we'll have a ".bits" property on the
-				 * ext with the original raw byte contents.
-				 *
-				 * If we have this, use it here instead of
-				 * regenerating it. This guarantees we output
-				 * the same data we parsed, so signatures still
-				 * validate.
-				 */
-				if (exts[i].bits !== undefined) {
-					der.writeBuffer(exts[i].bits,
-					    asn1.Ber.BitString);
-				} else {
-					var bits = writeBitField(cert.purposes,
-					    KEYUSEBITS);
-					der.writeBuffer(bits,
-					    asn1.Ber.BitString);
-				}
-				der.endSequence();
-			} else {
-				der.writeBuffer(exts[i].data,
-				    asn1.Ber.OctetString);
-			}
-
-			der.endSequence();
-		}
-
-		der.endSequence();
-		der.endSequence();
-	}
-
-	der.endSequence();
-}
-
-/*
- * Reads an ASN.1 BER bitfield out of the Buffer produced by doing
- * `BerReader#readString(asn1.Ber.BitString)`. That function gives us the raw
- * contents of the BitString tag, which is a count of unused bits followed by
- * the bits as a right-padded byte string.
- *
- * `bits` is the Buffer, `bitIndex` should contain an array of string names
- * for the bits in the string, ordered starting with bit #0 in the ASN.1 spec.
- *
- * Returns an array of Strings, the names of the bits that were set to 1.
- */
-function readBitField(bits, bitIndex) {
-	var bitLen = 8 * (bits.length - 1) - bits[0];
-	var setBits = {};
-	for (var i = 0; i < bitLen; ++i) {
-		var byteN = 1 + Math.floor(i / 8);
-		var bit = 7 - (i % 8);
-		var mask = 1 << bit;
-		var bitVal = ((bits[byteN] & mask) !== 0);
-		var name = bitIndex[i];
-		if (bitVal && typeof (name) === 'string') {
-			setBits[name] = true;
-		}
-	}
-	return (Object.keys(setBits));
-}
-
-/*
- * `setBits` is an array of strings, containing the names for each bit that
- * sould be set to 1. `bitIndex` is same as in `readBitField()`.
- *
- * Returns a Buffer, ready to be written out with `BerWriter#writeString()`.
- */
-function writeBitField(setBits, bitIndex) {
-	var bitLen = bitIndex.length;
-	var blen = Math.ceil(bitLen / 8);
-	var unused = blen * 8 - bitLen;
-	var bits = Buffer.alloc(1 + blen); // zero-filled
-	bits[0] = unused;
-	for (var i = 0; i < bitLen; ++i) {
-		var byteN = 1 + Math.floor(i / 8);
-		var bit = 7 - (i % 8);
-		var mask = 1 << bit;
-		var name = bitIndex[i];
-		if (name === undefined)
-			continue;
-		var bitVal = (setBits.indexOf(name) !== -1);
-		if (bitVal) {
-			bits[byteN] |= mask;
-		}
-	}
-	return (bits);
-}
-
-
-/***/ }),
-/* 458 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-/*<replacement>*/
-
-var Buffer = __webpack_require__(45).Buffer;
-/*</replacement>*/
-
-var isEncoding = Buffer.isEncoding || function (encoding) {
-  encoding = '' + encoding;
-  switch (encoding && encoding.toLowerCase()) {
-    case 'hex':case 'utf8':case 'utf-8':case 'ascii':case 'binary':case 'base64':case 'ucs2':case 'ucs-2':case 'utf16le':case 'utf-16le':case 'raw':
-      return true;
-    default:
-      return false;
-  }
-};
-
-function _normalizeEncoding(enc) {
-  if (!enc) return 'utf8';
-  var retried;
-  while (true) {
-    switch (enc) {
-      case 'utf8':
-      case 'utf-8':
-        return 'utf8';
-      case 'ucs2':
-      case 'ucs-2':
-      case 'utf16le':
-      case 'utf-16le':
-        return 'utf16le';
-      case 'latin1':
-      case 'binary':
-        return 'latin1';
-      case 'base64':
-      case 'ascii':
-      case 'hex':
-        return enc;
-      default:
-        if (retried) return; // undefined
-        enc = ('' + enc).toLowerCase();
-        retried = true;
-    }
-  }
-};
-
-// Do not cache `Buffer.isEncoding` when checking encoding names as some
-// modules monkey-patch it to support additional encodings
-function normalizeEncoding(enc) {
-  var nenc = _normalizeEncoding(enc);
-  if (typeof nenc !== 'string' && (Buffer.isEncoding === isEncoding || !isEncoding(enc))) throw new Error('Unknown encoding: ' + enc);
-  return nenc || enc;
-}
-
-// StringDecoder provides an interface for efficiently splitting a series of
-// buffers into a series of JS strings without breaking apart multi-byte
-// characters.
-exports.StringDecoder = StringDecoder;
-function StringDecoder(encoding) {
-  this.encoding = normalizeEncoding(encoding);
-  var nb;
-  switch (this.encoding) {
-    case 'utf16le':
-      this.text = utf16Text;
-      this.end = utf16End;
-      nb = 4;
-      break;
-    case 'utf8':
-      this.fillLast = utf8FillLast;
-      nb = 4;
-      break;
-    case 'base64':
-      this.text = base64Text;
-      this.end = base64End;
-      nb = 3;
-      break;
-    default:
-      this.write = simpleWrite;
-      this.end = simpleEnd;
-      return;
-  }
-  this.lastNeed = 0;
-  this.lastTotal = 0;
-  this.lastChar = Buffer.allocUnsafe(nb);
-}
-
-StringDecoder.prototype.write = function (buf) {
-  if (buf.length === 0) return '';
-  var r;
-  var i;
-  if (this.lastNeed) {
-    r = this.fillLast(buf);
-    if (r === undefined) return '';
-    i = this.lastNeed;
-    this.lastNeed = 0;
-  } else {
-    i = 0;
-  }
-  if (i < buf.length) return r ? r + this.text(buf, i) : this.text(buf, i);
-  return r || '';
-};
-
-StringDecoder.prototype.end = utf8End;
-
-// Returns only complete characters in a Buffer
-StringDecoder.prototype.text = utf8Text;
-
-// Attempts to complete a partial non-UTF-8 character using bytes from a Buffer
-StringDecoder.prototype.fillLast = function (buf) {
-  if (this.lastNeed <= buf.length) {
-    buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, this.lastNeed);
-    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
-  }
-  buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, buf.length);
-  this.lastNeed -= buf.length;
-};
-
-// Checks the type of a UTF-8 byte, whether it's ASCII, a leading byte, or a
-// continuation byte. If an invalid byte is detected, -2 is returned.
-function utf8CheckByte(byte) {
-  if (byte <= 0x7F) return 0;else if (byte >> 5 === 0x06) return 2;else if (byte >> 4 === 0x0E) return 3;else if (byte >> 3 === 0x1E) return 4;
-  return byte >> 6 === 0x02 ? -1 : -2;
-}
-
-// Checks at most 3 bytes at the end of a Buffer in order to detect an
-// incomplete multi-byte UTF-8 character. The total number of bytes (2, 3, or 4)
-// needed to complete the UTF-8 character (if applicable) are returned.
-function utf8CheckIncomplete(self, buf, i) {
-  var j = buf.length - 1;
-  if (j < i) return 0;
-  var nb = utf8CheckByte(buf[j]);
-  if (nb >= 0) {
-    if (nb > 0) self.lastNeed = nb - 1;
-    return nb;
-  }
-  if (--j < i || nb === -2) return 0;
-  nb = utf8CheckByte(buf[j]);
-  if (nb >= 0) {
-    if (nb > 0) self.lastNeed = nb - 2;
-    return nb;
-  }
-  if (--j < i || nb === -2) return 0;
-  nb = utf8CheckByte(buf[j]);
-  if (nb >= 0) {
-    if (nb > 0) {
-      if (nb === 2) nb = 0;else self.lastNeed = nb - 3;
-    }
-    return nb;
-  }
-  return 0;
-}
-
-// Validates as many continuation bytes for a multi-byte UTF-8 character as
-// needed or are available. If we see a non-continuation byte where we expect
-// one, we "replace" the validated continuation bytes we've seen so far with
-// a single UTF-8 replacement character ('\ufffd'), to match v8's UTF-8 decoding
-// behavior. The continuation byte check is included three times in the case
-// where all of the continuation bytes for a character exist in the same buffer.
-// It is also done this way as a slight performance increase instead of using a
-// loop.
-function utf8CheckExtraBytes(self, buf, p) {
-  if ((buf[0] & 0xC0) !== 0x80) {
-    self.lastNeed = 0;
-    return '\ufffd';
-  }
-  if (self.lastNeed > 1 && buf.length > 1) {
-    if ((buf[1] & 0xC0) !== 0x80) {
-      self.lastNeed = 1;
-      return '\ufffd';
-    }
-    if (self.lastNeed > 2 && buf.length > 2) {
-      if ((buf[2] & 0xC0) !== 0x80) {
-        self.lastNeed = 2;
-        return '\ufffd';
-      }
-    }
-  }
-}
-
-// Attempts to complete a multi-byte UTF-8 character using bytes from a Buffer.
-function utf8FillLast(buf) {
-  var p = this.lastTotal - this.lastNeed;
-  var r = utf8CheckExtraBytes(this, buf, p);
-  if (r !== undefined) return r;
-  if (this.lastNeed <= buf.length) {
-    buf.copy(this.lastChar, p, 0, this.lastNeed);
-    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
-  }
-  buf.copy(this.lastChar, p, 0, buf.length);
-  this.lastNeed -= buf.length;
-}
-
-// Returns all complete UTF-8 characters in a Buffer. If the Buffer ended on a
-// partial character, the character's bytes are buffered until the required
-// number of bytes are available.
-function utf8Text(buf, i) {
-  var total = utf8CheckIncomplete(this, buf, i);
-  if (!this.lastNeed) return buf.toString('utf8', i);
-  this.lastTotal = total;
-  var end = buf.length - (total - this.lastNeed);
-  buf.copy(this.lastChar, 0, end);
-  return buf.toString('utf8', i, end);
-}
-
-// For UTF-8, a replacement character is added when ending on a partial
-// character.
-function utf8End(buf) {
-  var r = buf && buf.length ? this.write(buf) : '';
-  if (this.lastNeed) return r + '\ufffd';
-  return r;
-}
-
-// UTF-16LE typically needs two bytes per character, but even if we have an even
-// number of bytes available, we need to check if we end on a leading/high
-// surrogate. In that case, we need to wait for the next two bytes in order to
-// decode the last character properly.
-function utf16Text(buf, i) {
-  if ((buf.length - i) % 2 === 0) {
-    var r = buf.toString('utf16le', i);
-    if (r) {
-      var c = r.charCodeAt(r.length - 1);
-      if (c >= 0xD800 && c <= 0xDBFF) {
-        this.lastNeed = 2;
-        this.lastTotal = 4;
-        this.lastChar[0] = buf[buf.length - 2];
-        this.lastChar[1] = buf[buf.length - 1];
-        return r.slice(0, -1);
-      }
-    }
-    return r;
-  }
-  this.lastNeed = 1;
-  this.lastTotal = 2;
-  this.lastChar[0] = buf[buf.length - 1];
-  return buf.toString('utf16le', i, buf.length - 1);
-}
-
-// For UTF-16LE we do not explicitly append special replacement characters if we
-// end on a partial character, we simply let v8 handle that.
-function utf16End(buf) {
-  var r = buf && buf.length ? this.write(buf) : '';
-  if (this.lastNeed) {
-    var end = this.lastTotal - this.lastNeed;
-    return r + this.lastChar.toString('utf16le', 0, end);
-  }
-  return r;
-}
-
-function base64Text(buf, i) {
-  var n = (buf.length - i) % 3;
-  if (n === 0) return buf.toString('base64', i);
-  this.lastNeed = 3 - n;
-  this.lastTotal = 3;
-  if (n === 1) {
-    this.lastChar[0] = buf[buf.length - 1];
-  } else {
-    this.lastChar[0] = buf[buf.length - 2];
-    this.lastChar[1] = buf[buf.length - 1];
-  }
-  return buf.toString('base64', i, buf.length - n);
-}
-
-function base64End(buf) {
-  var r = buf && buf.length ? this.write(buf) : '';
-  if (this.lastNeed) return r + this.lastChar.toString('base64', 0, 3 - this.lastNeed);
-  return r;
-}
-
-// Pass bytes on through for single-byte encodings (e.g. ascii, latin1, hex)
-function simpleWrite(buf) {
-  return buf.toString(this.encoding);
-}
-
-function simpleEnd(buf) {
-  return buf && buf.length ? this.write(buf) : '';
-}
-
-/***/ }),
-/* 459 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var toBuffer = __webpack_require__(462)
-var alloc = __webpack_require__(380)
-
-var ZEROS = '0000000000000000000'
-var SEVENS = '7777777777777777777'
-var ZERO_OFFSET = '0'.charCodeAt(0)
-var USTAR = 'ustar\x0000'
-var MASK = parseInt('7777', 8)
-
-var clamp = function (index, len, defaultValue) {
-  if (typeof index !== 'number') return defaultValue
-  index = ~~index // Coerce to integer.
-  if (index >= len) return len
-  if (index >= 0) return index
-  index += len
-  if (index >= 0) return index
-  return 0
-}
-
-var toType = function (flag) {
-  switch (flag) {
-    case 0:
-      return 'file'
-    case 1:
-      return 'link'
-    case 2:
-      return 'symlink'
-    case 3:
-      return 'character-device'
-    case 4:
-      return 'block-device'
-    case 5:
-      return 'directory'
-    case 6:
-      return 'fifo'
-    case 7:
-      return 'contiguous-file'
-    case 72:
-      return 'pax-header'
-    case 55:
-      return 'pax-global-header'
-    case 27:
-      return 'gnu-long-link-path'
-    case 28:
-    case 30:
-      return 'gnu-long-path'
-  }
-
-  return null
-}
-
-var toTypeflag = function (flag) {
-  switch (flag) {
-    case 'file':
-      return 0
-    case 'link':
-      return 1
-    case 'symlink':
-      return 2
-    case 'character-device':
-      return 3
-    case 'block-device':
-      return 4
-    case 'directory':
-      return 5
-    case 'fifo':
-      return 6
-    case 'contiguous-file':
-      return 7
-    case 'pax-header':
-      return 72
-  }
-
-  return 0
-}
-
-var indexOf = function (block, num, offset, end) {
-  for (; offset < end; offset++) {
-    if (block[offset] === num) return offset
-  }
-  return end
-}
-
-var cksum = function (block) {
-  var sum = 8 * 32
-  for (var i = 0; i < 148; i++) sum += block[i]
-  for (var j = 156; j < 512; j++) sum += block[j]
-  return sum
-}
-
-var encodeOct = function (val, n) {
-  val = val.toString(8)
-  if (val.length > n) return SEVENS.slice(0, n) + ' '
-  else return ZEROS.slice(0, n - val.length) + val + ' '
-}
-
-/* Copied from the node-tar repo and modified to meet
- * tar-stream coding standard.
- *
- * Source: https://github.com/npm/node-tar/blob/51b6627a1f357d2eb433e7378e5f05e83b7aa6cd/lib/header.js#L349
- */
-function parse256 (buf) {
-  // first byte MUST be either 80 or FF
-  // 80 for positive, FF for 2's comp
-  var positive
-  if (buf[0] === 0x80) positive = true
-  else if (buf[0] === 0xFF) positive = false
-  else return null
-
-  // build up a base-256 tuple from the least sig to the highest
-  var zero = false
-  var tuple = []
-  for (var i = buf.length - 1; i > 0; i--) {
-    var byte = buf[i]
-    if (positive) tuple.push(byte)
-    else if (zero && byte === 0) tuple.push(0)
-    else if (zero) {
-      zero = false
-      tuple.push(0x100 - byte)
-    } else tuple.push(0xFF - byte)
-  }
-
-  var sum = 0
-  var l = tuple.length
-  for (i = 0; i < l; i++) {
-    sum += tuple[i] * Math.pow(256, i)
-  }
-
-  return positive ? sum : -1 * sum
-}
-
-var decodeOct = function (val, offset, length) {
-  val = val.slice(offset, offset + length)
-  offset = 0
-
-  // If prefixed with 0x80 then parse as a base-256 integer
-  if (val[offset] & 0x80) {
-    return parse256(val)
-  } else {
-    // Older versions of tar can prefix with spaces
-    while (offset < val.length && val[offset] === 32) offset++
-    var end = clamp(indexOf(val, 32, offset, val.length), val.length, val.length)
-    while (offset < end && val[offset] === 0) offset++
-    if (end === offset) return 0
-    return parseInt(val.slice(offset, end).toString(), 8)
-  }
-}
-
-var decodeStr = function (val, offset, length, encoding) {
-  return val.slice(offset, indexOf(val, 0, offset, offset + length)).toString(encoding)
-}
-
-var addLength = function (str) {
-  var len = Buffer.byteLength(str)
-  var digits = Math.floor(Math.log(len) / Math.log(10)) + 1
-  if (len + digits >= Math.pow(10, digits)) digits++
-
-  return (len + digits) + str
-}
-
-exports.decodeLongPath = function (buf, encoding) {
-  return decodeStr(buf, 0, buf.length, encoding)
-}
-
-exports.encodePax = function (opts) { // TODO: encode more stuff in pax
-  var result = ''
-  if (opts.name) result += addLength(' path=' + opts.name + '\n')
-  if (opts.linkname) result += addLength(' linkpath=' + opts.linkname + '\n')
-  var pax = opts.pax
-  if (pax) {
-    for (var key in pax) {
-      result += addLength(' ' + key + '=' + pax[key] + '\n')
-    }
-  }
-  return toBuffer(result)
-}
-
-exports.decodePax = function (buf) {
-  var result = {}
-
-  while (buf.length) {
-    var i = 0
-    while (i < buf.length && buf[i] !== 32) i++
-    var len = parseInt(buf.slice(0, i).toString(), 10)
-    if (!len) return result
-
-    var b = buf.slice(i + 1, len - 1).toString()
-    var keyIndex = b.indexOf('=')
-    if (keyIndex === -1) return result
-    result[b.slice(0, keyIndex)] = b.slice(keyIndex + 1)
-
-    buf = buf.slice(len)
-  }
-
-  return result
-}
-
-exports.encode = function (opts) {
-  var buf = alloc(512)
-  var name = opts.name
-  var prefix = ''
-
-  if (opts.typeflag === 5 && name[name.length - 1] !== '/') name += '/'
-  if (Buffer.byteLength(name) !== name.length) return null // utf-8
-
-  while (Buffer.byteLength(name) > 100) {
-    var i = name.indexOf('/')
-    if (i === -1) return null
-    prefix += prefix ? '/' + name.slice(0, i) : name.slice(0, i)
-    name = name.slice(i + 1)
-  }
-
-  if (Buffer.byteLength(name) > 100 || Buffer.byteLength(prefix) > 155) return null
-  if (opts.linkname && Buffer.byteLength(opts.linkname) > 100) return null
-
-  buf.write(name)
-  buf.write(encodeOct(opts.mode & MASK, 6), 100)
-  buf.write(encodeOct(opts.uid, 6), 108)
-  buf.write(encodeOct(opts.gid, 6), 116)
-  buf.write(encodeOct(opts.size, 11), 124)
-  buf.write(encodeOct((opts.mtime.getTime() / 1000) | 0, 11), 136)
-
-  buf[156] = ZERO_OFFSET + toTypeflag(opts.type)
-
-  if (opts.linkname) buf.write(opts.linkname, 157)
-
-  buf.write(USTAR, 257)
-  if (opts.uname) buf.write(opts.uname, 265)
-  if (opts.gname) buf.write(opts.gname, 297)
-  buf.write(encodeOct(opts.devmajor || 0, 6), 329)
-  buf.write(encodeOct(opts.devminor || 0, 6), 337)
-
-  if (prefix) buf.write(prefix, 345)
-
-  buf.write(encodeOct(cksum(buf), 6), 148)
-
-  return buf
-}
-
-exports.decode = function (buf, filenameEncoding) {
-  var typeflag = buf[156] === 0 ? 0 : buf[156] - ZERO_OFFSET
-
-  var name = decodeStr(buf, 0, 100, filenameEncoding)
-  var mode = decodeOct(buf, 100, 8)
-  var uid = decodeOct(buf, 108, 8)
-  var gid = decodeOct(buf, 116, 8)
-  var size = decodeOct(buf, 124, 12)
-  var mtime = decodeOct(buf, 136, 12)
-  var type = toType(typeflag)
-  var linkname = buf[157] === 0 ? null : decodeStr(buf, 157, 100, filenameEncoding)
-  var uname = decodeStr(buf, 265, 32)
-  var gname = decodeStr(buf, 297, 32)
-  var devmajor = decodeOct(buf, 329, 8)
-  var devminor = decodeOct(buf, 337, 8)
-
-  if (buf[345]) name = decodeStr(buf, 345, 155, filenameEncoding) + '/' + name
-
-  // to support old tar versions that use trailing / to indicate dirs
-  if (typeflag === 0 && name && name[name.length - 1] === '/') typeflag = 5
-
-  var c = cksum(buf)
-
-  // checksum is still initial value if header was null.
-  if (c === 8 * 32) return null
-
-  // valid checksum
-  if (c !== decodeOct(buf, 148, 8)) throw new Error('Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?')
-
-  return {
-    name: name,
-    mode: mode,
-    uid: uid,
-    gid: gid,
-    size: size,
-    mtime: new Date(1000 * mtime),
-    type: type,
-    linkname: linkname,
-    uname: uname,
-    gname: gname,
-    devmajor: devmajor,
-    devminor: devminor
-  }
-}
-
-
-/***/ }),
-/* 460 */
-/***/ (function(module, exports, __webpack_require__) {
-
-exports.extract = __webpack_require__(949)
-exports.pack = __webpack_require__(950)
-
-
-/***/ }),
-/* 461 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Transform = __webpack_require__(794)
-  , inherits  = __webpack_require__(3).inherits
-  , xtend     = __webpack_require__(465)
-
-function DestroyableTransform(opts) {
-  Transform.call(this, opts)
-  this._destroyed = false
-}
-
-inherits(DestroyableTransform, Transform)
-
-DestroyableTransform.prototype.destroy = function(err) {
-  if (this._destroyed) return
-  this._destroyed = true
-  
-  var self = this
-  process.nextTick(function() {
-    if (err)
-      self.emit('error', err)
-    self.emit('close')
-  })
-}
-
-// a noop _transform function
-function noop (chunk, enc, callback) {
-  callback(null, chunk)
-}
-
-
-// create a new export function, used by both the main export and
-// the .ctor export, contains common logic for dealing with arguments
-function through2 (construct) {
-  return function (options, transform, flush) {
-    if (typeof options == 'function') {
-      flush     = transform
-      transform = options
-      options   = {}
-    }
-
-    if (typeof transform != 'function')
-      transform = noop
-
-    if (typeof flush != 'function')
-      flush = null
-
-    return construct(options, transform, flush)
-  }
-}
-
-
-// main export, just make me a transform stream!
-module.exports = through2(function (options, transform, flush) {
-  var t2 = new DestroyableTransform(options)
-
-  t2._transform = transform
-
-  if (flush)
-    t2._flush = flush
-
-  return t2
-})
-
-
-// make me a reusable prototype that I can `new`, or implicitly `new`
-// with a constructor call
-module.exports.ctor = through2(function (options, transform, flush) {
-  function Through2 (override) {
-    if (!(this instanceof Through2))
-      return new Through2(override)
-
-    this.options = xtend(options, override)
-
-    DestroyableTransform.call(this, this.options)
-  }
-
-  inherits(Through2, DestroyableTransform)
-
-  Through2.prototype._transform = transform
-
-  if (flush)
-    Through2.prototype._flush = flush
-
-  return Through2
-})
-
-
-module.exports.obj = through2(function (options, transform, flush) {
-  var t2 = new DestroyableTransform(xtend({ objectMode: true, highWaterMark: 16 }, options))
-
-  t2._transform = transform
-
-  if (flush)
-    t2._flush = flush
-
-  return t2
-})
-
-
-/***/ }),
-/* 462 */
-/***/ (function(module, exports) {
-
-module.exports = toBuffer
-
-var makeBuffer = Buffer.from && Buffer.from !== Uint8Array.from ? Buffer.from : bufferFrom
-
-function bufferFrom (buf, enc) {
-  return new Buffer(buf, enc)
-}
-
-function toBuffer (buf, enc) {
-  if (Buffer.isBuffer(buf)) return buf
-  if (typeof buf === 'string') return makeBuffer(buf, enc)
-  if (Array.isArray(buf)) return makeBuffer(buf)
-  throw new Error('Input should be a buffer or a string')
-}
-
-
-/***/ }),
-/* 463 */
-/***/ (function(module, exports) {
-
-/**
- * Convert array of 16 byte values to UUID string format of the form:
- * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- */
-var byteToHex = [];
-for (var i = 0; i < 256; ++i) {
-  byteToHex[i] = (i + 0x100).toString(16).substr(1);
-}
-
-function bytesToUuid(buf, offset) {
-  var i = offset || 0;
-  var bth = byteToHex;
-  // join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
-  return ([bth[buf[i++]], bth[buf[i++]], 
-	bth[buf[i++]], bth[buf[i++]], '-',
-	bth[buf[i++]], bth[buf[i++]], '-',
-	bth[buf[i++]], bth[buf[i++]], '-',
-	bth[buf[i++]], bth[buf[i++]], '-',
-	bth[buf[i++]], bth[buf[i++]],
-	bth[buf[i++]], bth[buf[i++]],
-	bth[buf[i++]], bth[buf[i++]]]).join('');
-}
-
-module.exports = bytesToUuid;
-
-
-/***/ }),
-/* 464 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Unique ID creation requires a high quality random # generator.  In node.js
-// this is pretty straight-forward - we use the crypto API.
-
-var crypto = __webpack_require__(12);
-
-module.exports = function nodeRNG() {
-  return crypto.randomBytes(16);
-};
-
-
-/***/ }),
-/* 465 */
-/***/ (function(module, exports) {
-
-module.exports = extend
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-function extend() {
-    var target = {}
-
-    for (var i = 0; i < arguments.length; i++) {
-        var source = arguments[i]
-
-        for (var key in source) {
-            if (hasOwnProperty.call(source, key)) {
-                target[key] = source[key]
-            }
-        }
-    }
-
-    return target
-}
-
-
-/***/ }),
-/* 466 */
-/***/ (function(module, exports) {
-
-module.exports = require("constants");
-
-/***/ }),
-/* 467 */
-/***/ (function(module, exports) {
-
-module.exports = require("tls");
-
-/***/ }),
-/* 468 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = handleSignals;
-
-var _child;
-
-function _load_child() {
-  return _child = __webpack_require__(58);
-}
-
-function forwardSignalAndExit(signal) {
-  (0, (_child || _load_child()).forwardSignalToSpawnedProcesses)(signal);
-  // We want to exit immediately here since `SIGTERM` means that
-  // If we lose stdout messages due to abrupt exit, shoot the messenger?
-  process.exit(1); // eslint-disable-line no-process-exit
-}
-function handleSignals() {
-  process.on('SIGTERM', () => {
-    forwardSignalAndExit('SIGTERM');
-  });
-}
-
-/***/ }),
-/* 469 */
-/***/ (function(module, exports) {
-
-
-var defaultConfig = {
-  uncaughtException: false,
-  SIGINT: true,
-  SIGTERM: true,
-  SIGQUIT: true
-}
-
-var DEBUG = false
-
-function ON_DEATH (callback) {
-  var handlers = [];
-  Object.keys(defaultConfig).forEach(function(key) {
-    var val = defaultConfig[key]
-    var handler = null;
-    if (val) {
-      if (DEBUG) {
-        handler = function() {
-          var args = Array.prototype.slice.call(arguments, 0)
-          args.unshift(key)
-          console.log('Trapped ' + key)
-          callback.apply(null, args)
-        };
-        process.on(key, handler)
-      } else {
-        handler = function() {
-          var args = Array.prototype.slice.call(arguments, 0)
-          args.unshift(key)
-          callback.apply(null, args)
-        }
-        process.on(key, handler)
-      }
-      handlers.push([key, handler])
-    }
-  })
-  return function OFF_DEATH() {
-    handlers.forEach(function (args) {
-      var key = args[0];
-      var handler = args[1];
-      process.removeListener(key, handler);
-    })
-  }
-}
-
-module.exports = function (arg) {
-  if (typeof arg === 'object') {
-    if (arg['debug'])
-      DEBUG = arg.debug
-    if (arg['DEBUG'])
-      DEBUG = arg.DEBUG
-    delete arg.debug; delete arg.DEBUG;
-
-    Object.keys(arg).forEach(function(key) {
-      defaultConfig[key] = arg[key]
-    })
-
-    if (DEBUG)
-      console.log('ON_DEATH: debug mode enabled for pid [%d]', process.pid)
-
-    return ON_DEATH
-   } else if (typeof arg === 'function') {
-    return ON_DEATH(arg)
-  }
-}
-
-
-
-/***/ }),
-/* 470 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var util = __webpack_require__(3);
-var onExit = __webpack_require__(451);
-var currentlyUnhandled = __webpack_require__(629);
-
-var installed = false;
-
-module.exports = function (log) {
-	if (installed) {
-		return;
-	}
-
-	installed = true;
-
-	log = log || console.error;
-
-	var listUnhandled = currentlyUnhandled();
-
-	onExit(function () {
-		var unhandledRejections = listUnhandled();
-
-		if (unhandledRejections.length > 0) {
-			unhandledRejections.forEach(function (x) {
-				var err = x.reason;
-
-				if (!(err instanceof Error)) {
-					err = new Error('Promise rejected with value: ' + util.inspect(err));
-				}
-
-				log(err.stack);
-			});
-
-			process.exitCode = 1;
-		}
-	});
-};
-
-
-/***/ }),
-/* 471 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const fs = __webpack_require__(391);
-const path = __webpack_require__(0);
-const retry = __webpack_require__(819);
-const syncFs = __webpack_require__(779);
-
-const locks = {};
-
-function getLockFile(file) {
-    return `${file}.lock`;
-}
-
-function canonicalPath(file, options, callback) {
-    if (!options.realpath) {
-        return callback(null, path.resolve(file));
-    }
-
-    // Use realpath to resolve symlinks
-    // It also resolves relative paths
-    options.fs.realpath(file, callback);
-}
-
-function acquireLock(file, options, callback) {
-    // Use mkdir to create the lockfile (atomic operation)
-    options.fs.mkdir(getLockFile(file), (err) => {
-        // If successful, we are done
-        if (!err) {
-            return callback();
-        }
-
-        // If error is not EEXIST then some other error occurred while locking
-        if (err.code !== 'EEXIST') {
-            return callback(err);
-        }
-
-        // Otherwise, check if lock is stale by analyzing the file mtime
-        if (options.stale <= 0) {
-            return callback(Object.assign(new Error('Lock file is already being hold'), { code: 'ELOCKED', file }));
-        }
-
-        options.fs.stat(getLockFile(file), (err, stat) => {
-            if (err) {
-                // Retry if the lockfile has been removed (meanwhile)
-                // Skip stale check to avoid recursiveness
-                if (err.code === 'ENOENT') {
-                    return acquireLock(file, Object.assign({}, options, { stale: 0 }), callback);
-                }
-
-                return callback(err);
-            }
-
-            if (!isLockStale(stat, options)) {
-                return callback(Object.assign(new Error('Lock file is already being hold'), { code: 'ELOCKED', file }));
-            }
-
-            // If it's stale, remove it and try again!
-            // Skip stale check to avoid recursiveness
-            removeLock(file, options, (err) => {
-                if (err) {
-                    return callback(err);
-                }
-
-                acquireLock(file, Object.assign({}, options, { stale: 0 }), callback);
-            });
-        });
-    });
-}
-
-function isLockStale(stat, options) {
-    return stat.mtime.getTime() < Date.now() - options.stale;
-}
-
-function removeLock(file, options, callback) {
-    // Remove lockfile, ignoring ENOENT errors
-    options.fs.rmdir(getLockFile(file), (err) => {
-        if (err && err.code !== 'ENOENT') {
-            return callback(err);
-        }
-
-        callback();
-    });
-}
-
-function updateLock(file, options) {
-    const lock = locks[file];
-
-    /* istanbul ignore next */
-    if (lock.updateTimeout) {
-        return;
-    }
-
-    lock.updateDelay = lock.updateDelay || options.update;
-    lock.updateTimeout = setTimeout(() => {
-        const mtime = Date.now() / 1000;
-
-        lock.updateTimeout = null;
-
-        options.fs.utimes(getLockFile(file), mtime, mtime, (err) => {
-            // Ignore if the lock was released
-            if (lock.released) {
-                return;
-            }
-
-            // Verify if we are within the stale threshold
-            if (lock.lastUpdate <= Date.now() - options.stale &&
-                lock.lastUpdate > Date.now() - options.stale * 2) {
-                return compromisedLock(file, lock, Object.assign(new Error(lock.updateError || 'Unable to update lock within the stale \
-threshold'), { code: 'ECOMPROMISED' }));
-            }
-
-            // If the file is older than (stale * 2), we assume the clock is moved manually,
-            // which we consider a valid case
-
-            // If it failed to update the lockfile, keep trying unless
-            // the lockfile was deleted!
-            if (err) {
-                if (err.code === 'ENOENT') {
-                    return compromisedLock(file, lock, Object.assign(err, { code: 'ECOMPROMISED' }));
-                }
-
-                lock.updateError = err;
-                lock.updateDelay = 1000;
-                return updateLock(file, options);
-            }
-
-            // All ok, keep updating..
-            lock.lastUpdate = Date.now();
-            lock.updateError = null;
-            lock.updateDelay = null;
-            updateLock(file, options);
-        });
-    }, lock.updateDelay);
-
-    // Unref the timer so that the nodejs process can exit freely
-    // This is safe because all acquired locks will be automatically released
-    // on process exit
-
-    // We first check that `lock.updateTimeout.unref` exists because some users
-    // may be using this module outside of NodeJS (e.g., in an electron app), 
-    // and in those cases `setTimeout` return an integer.
-    if (lock.updateTimeout.unref) {
-        lock.updateTimeout.unref();
-    }
-}
-
-function compromisedLock(file, lock, err) {
-    lock.released = true;                                    // Signal the lock has been released
-    /* istanbul ignore next */
-    lock.updateTimeout && clearTimeout(lock.updateTimeout);  // Cancel lock mtime update
-
-    if (locks[file] === lock) {
-        delete locks[file];
-    }
-
-    lock.compromised(err);
-}
-
-// -----------------------------------------
-
-function lock(file, options, compromised, callback) {
-    if (typeof options === 'function') {
-        callback = compromised;
-        compromised = options;
-        options = null;
-    }
-
-    if (!callback) {
-        callback = compromised;
-        compromised = null;
-    }
-
-    options = Object.assign({
-        stale: 10000,
-        update: null,
-        realpath: true,
-        retries: 0,
-        fs,
-    }, options);
-
-    options.retries = options.retries || 0;
-    options.retries = typeof options.retries === 'number' ? { retries: options.retries } : options.retries;
-    options.stale = Math.max(options.stale || 0, 2000);
-    options.update = options.update == null ? options.stale / 2 : options.update || 0;
-    options.update = Math.max(Math.min(options.update, options.stale / 2), 1000);
-    compromised = compromised || function (err) { throw err; };
-
-    // Resolve to a canonical file path
-    canonicalPath(file, options, (err, file) => {
-        if (err) {
-            return callback(err);
-        }
-
-        // Attempt to acquire the lock
-        const operation = retry.operation(options.retries);
-
-        operation.attempt(() => {
-            acquireLock(file, options, (err) => {
-                if (operation.retry(err)) {
-                    return;
-                }
-
-                if (err) {
-                    return callback(operation.mainError());
-                }
-
-                // We now own the lock
-                const lock = locks[file] = {
-                    options,
-                    compromised,
-                    lastUpdate: Date.now(),
-                };
-
-                // We must keep the lock fresh to avoid staleness
-                updateLock(file, options);
-
-                callback(null, (releasedCallback) => {
-                    if (lock.released) {
-                        return releasedCallback &&
-                            releasedCallback(Object.assign(new Error('Lock is already released'), { code: 'ERELEASED' }));
-                    }
-
-                    // Not necessary to use realpath twice when unlocking
-                    unlock(file, Object.assign({}, options, { realpath: false }), releasedCallback);
-                });
-            });
-        });
-    });
-}
-
-function unlock(file, options, callback) {
-    if (typeof options === 'function') {
-        callback = options;
-        options = null;
-    }
-
-    options = Object.assign({
-        fs,
-        realpath: true,
-    }, options);
-
-    callback = callback || function () {};
-
-    // Resolve to a canonical file path
-    canonicalPath(file, options, (err, file) => {
-        if (err) {
-            return callback(err);
-        }
-
-        // Skip if the lock is not acquired
-        const lock = locks[file];
-
-        if (!lock) {
-            return callback(Object.assign(new Error('Lock is not acquired/owned by you'), { code: 'ENOTACQUIRED' }));
-        }
-
-        lock.updateTimeout && clearTimeout(lock.updateTimeout);  // Cancel lock mtime update
-        lock.released = true;                                    // Signal the lock has been released
-        delete locks[file];                                      // Delete from locks
-
-        removeLock(file, options, callback);
-    });
-}
-
-function lockSync(file, options, compromised) {
-    if (typeof options === 'function') {
-        compromised = options;
-        options = null;
-    }
-
-    options = options || {};
-    options.fs = syncFs(options.fs || fs);
-    options.retries = options.retries || 0;
-    options.retries = typeof options.retries === 'number' ? { retries: options.retries } : options.retries;
-
-    // Retries are not allowed because it requires the flow to be sync
-    if (options.retries.retries) {
-        throw Object.assign(new Error('Cannot use retries with the sync api'), { code: 'ESYNC' });
-    }
-
-    let err;
-    let release;
-
-    lock(file, options, compromised, (_err, _release) => {
-        err = _err;
-        release = _release;
-    });
-
-    if (err) {
-        throw err;
-    }
-
-    return release;
-}
-
-function unlockSync(file, options) {
-    options = options || {};
-    options.fs = syncFs(options.fs || fs);
-
-    let err;
-
-    unlock(file, options, (_err) => {
-        err = _err;
-    });
-
-    if (err) {
-        throw err;
-    }
-}
-
-function check(file, options, callback) {
-    if (typeof options === 'function') {
-        callback = options;
-        options = null;
-    }
-
-    options = Object.assign({
-        stale: 10000,
-        realpath: true,
-        fs,
-    }, options);
-
-    options.stale = Math.max(options.stale || 0, 2000);
-
-    // Resolve to a canonical file path
-    canonicalPath(file, options, (err, file) => {
-        if (err) {
-            return callback(err);
-        }
-
-        // Check if lockfile exists
-        options.fs.stat(getLockFile(file), (err, stat) => {
-            if (err) {
-                // if does not exist, file is not locked. Otherwise, callback with error
-                return (err.code === 'ENOENT') ? callback(null, false) : callback(err);
-            }
-
-            if (options.stale <= 0) { return callback(null, true); }
-
-            // Otherwise, check if lock is stale by analyzing the file mtime
-            return callback(null, !isLockStale(stat, options));
-        });
-    });
-}
-
-function checkSync(file, options) {
-    options = options || {};
-    options.fs = syncFs(options.fs || fs);
-
-    let err;
-    let locked;
-
-    check(file, options, (_err, _locked) => {
-        err = _err;
-        locked = _locked;
-    });
-
-    if (err) {
-        throw err;
-    }
-
-    return locked;
-}
-
-
-// Remove acquired locks on exit
-/* istanbul ignore next */
-process.on('exit', () => {
-    Object.keys(locks).forEach((file) => {
-        try { locks[file].options.fs.rmdirSync(getLockFile(file)); } catch (e) { /* empty */ }
-    });
-});
-
-module.exports = lock;
-module.exports.lock = lock;
-module.exports.unlock = unlock;
-module.exports.lockSync = lockSync;
-module.exports.unlockSync = unlockSync;
-module.exports.check = check;
-module.exports.checkSync = checkSync;
-
-
-/***/ }),
-/* 472 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var KEYWORDS = [
-  'multipleOf',
-  'maximum',
-  'exclusiveMaximum',
-  'minimum',
-  'exclusiveMinimum',
-  'maxLength',
-  'minLength',
-  'pattern',
-  'additionalItems',
-  'maxItems',
-  'minItems',
-  'uniqueItems',
-  'maxProperties',
-  'minProperties',
-  'required',
-  'additionalProperties',
-  'enum',
-  'format',
-  'const'
-];
-
-module.exports = function (metaSchema, keywordsJsonPointers) {
-  for (var i=0; i<keywordsJsonPointers.length; i++) {
-    metaSchema = JSON.parse(JSON.stringify(metaSchema));
-    var segments = keywordsJsonPointers[i].split('/');
-    var keywords = metaSchema;
-    var j;
-    for (j=1; j<segments.length; j++)
-      keywords = keywords[segments[j]];
-
-    for (j=0; j<KEYWORDS.length; j++) {
-      var key = KEYWORDS[j];
-      var schema = keywords[key];
-      if (schema) {
-        keywords[key] = {
-          anyOf: [
-            schema,
-            { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
-          ]
-        };
-      }
-    }
-  }
-
-  return metaSchema;
-};
-
-
-/***/ }),
-/* 473 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var compileSchema = __webpack_require__(478)
-  , resolve = __webpack_require__(203)
-  , Cache = __webpack_require__(474)
-  , SchemaObject = __webpack_require__(339)
-  , stableStringify = __webpack_require__(389)
-  , formats = __webpack_require__(477)
-  , rules = __webpack_require__(479)
-  , $dataMetaSchema = __webpack_require__(472)
-  , patternGroups = __webpack_require__(500)
-  , util = __webpack_require__(106)
-  , co = __webpack_require__(383);
-
-module.exports = Ajv;
-
-Ajv.prototype.validate = validate;
-Ajv.prototype.compile = compile;
-Ajv.prototype.addSchema = addSchema;
-Ajv.prototype.addMetaSchema = addMetaSchema;
-Ajv.prototype.validateSchema = validateSchema;
-Ajv.prototype.getSchema = getSchema;
-Ajv.prototype.removeSchema = removeSchema;
-Ajv.prototype.addFormat = addFormat;
-Ajv.prototype.errorsText = errorsText;
-
-Ajv.prototype._addSchema = _addSchema;
-Ajv.prototype._compile = _compile;
-
-Ajv.prototype.compileAsync = __webpack_require__(476);
-var customKeyword = __webpack_require__(499);
-Ajv.prototype.addKeyword = customKeyword.add;
-Ajv.prototype.getKeyword = customKeyword.get;
-Ajv.prototype.removeKeyword = customKeyword.remove;
-
-var errorClasses = __webpack_require__(202);
-Ajv.ValidationError = errorClasses.Validation;
-Ajv.MissingRefError = errorClasses.MissingRef;
-Ajv.$dataMetaSchema = $dataMetaSchema;
-
-var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
-
-var META_IGNORE_OPTIONS = [ 'removeAdditional', 'useDefaults', 'coerceTypes' ];
-var META_SUPPORT_DATA = ['/properties'];
-
-/**
- * Creates validator instance.
- * Usage: `Ajv(opts)`
- * @param {Object} opts optional options
- * @return {Object} ajv instance
- */
-function Ajv(opts) {
-  if (!(this instanceof Ajv)) return new Ajv(opts);
-  opts = this._opts = util.copy(opts) || {};
-  setLogger(this);
-  this._schemas = {};
-  this._refs = {};
-  this._fragments = {};
-  this._formats = formats(opts.format);
-  var schemaUriFormat = this._schemaUriFormat = this._formats['uri-reference'];
-  this._schemaUriFormatFunc = function (str) { return schemaUriFormat.test(str); };
-
-  this._cache = opts.cache || new Cache;
-  this._loadingSchemas = {};
-  this._compilations = [];
-  this.RULES = rules();
-  this._getId = chooseGetId(opts);
-
-  opts.loopRequired = opts.loopRequired || Infinity;
-  if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
-  if (opts.serialize === undefined) opts.serialize = stableStringify;
-  this._metaOpts = getMetaSchemaOptions(this);
-
-  if (opts.formats) addInitialFormats(this);
-  addDraft6MetaSchema(this);
-  if (typeof opts.meta == 'object') this.addMetaSchema(opts.meta);
-  addInitialSchemas(this);
-  if (opts.patternGroups) patternGroups(this);
-}
-
-
-
-/**
- * Validate data using schema
- * Schema will be compiled and cached (using serialized JSON as key. [fast-json-stable-stringify](https://github.com/epoberezkin/fast-json-stable-stringify) is used to serialize.
- * @this   Ajv
- * @param  {String|Object} schemaKeyRef key, ref or schema object
- * @param  {Any} data to be validated
- * @return {Boolean} validation result. Errors from the last validation will be available in `ajv.errors` (and also in compiled schema: `schema.errors`).
- */
-function validate(schemaKeyRef, data) {
-  var v;
-  if (typeof schemaKeyRef == 'string') {
-    v = this.getSchema(schemaKeyRef);
-    if (!v) throw new Error('no schema with key or ref "' + schemaKeyRef + '"');
-  } else {
-    var schemaObj = this._addSchema(schemaKeyRef);
-    v = schemaObj.validate || this._compile(schemaObj);
-  }
-
-  var valid = v(data);
-  if (v.$async === true)
-    return this._opts.async == '*' ? co(valid) : valid;
-  this.errors = v.errors;
-  return valid;
-}
-
-
-/**
- * Create validating function for passed schema.
- * @this   Ajv
- * @param  {Object} schema schema object
- * @param  {Boolean} _meta true if schema is a meta-schema. Used internally to compile meta schemas of custom keywords.
- * @return {Function} validating function
- */
-function compile(schema, _meta) {
-  var schemaObj = this._addSchema(schema, undefined, _meta);
-  return schemaObj.validate || this._compile(schemaObj);
-}
-
-
-/**
- * Adds schema to the instance.
- * @this   Ajv
- * @param {Object|Array} schema schema or array of schemas. If array is passed, `key` and other parameters will be ignored.
- * @param {String} key Optional schema key. Can be passed to `validate` method instead of schema object or id/ref. One schema per instance can have empty `id` and `key`.
- * @param {Boolean} _skipValidation true to skip schema validation. Used internally, option validateSchema should be used instead.
- * @param {Boolean} _meta true if schema is a meta-schema. Used internally, addMetaSchema should be used instead.
- * @return {Ajv} this for method chaining
- */
-function addSchema(schema, key, _skipValidation, _meta) {
-  if (Array.isArray(schema)){
-    for (var i=0; i<schema.length; i++) this.addSchema(schema[i], undefined, _skipValidation, _meta);
-    return this;
-  }
-  var id = this._getId(schema);
-  if (id !== undefined && typeof id != 'string')
-    throw new Error('schema id must be string');
-  key = resolve.normalizeId(key || id);
-  checkUnique(this, key);
-  this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
-  return this;
-}
-
-
-/**
- * Add schema that will be used to validate other schemas
- * options in META_IGNORE_OPTIONS are alway set to false
- * @this   Ajv
- * @param {Object} schema schema object
- * @param {String} key optional schema key
- * @param {Boolean} skipValidation true to skip schema validation, can be used to override validateSchema option for meta-schema
- * @return {Ajv} this for method chaining
- */
-function addMetaSchema(schema, key, skipValidation) {
-  this.addSchema(schema, key, skipValidation, true);
-  return this;
-}
-
-
-/**
- * Validate schema
- * @this   Ajv
- * @param {Object} schema schema to validate
- * @param {Boolean} throwOrLogError pass true to throw (or log) an error if invalid
- * @return {Boolean} true if schema is valid
- */
-function validateSchema(schema, throwOrLogError) {
-  var $schema = schema.$schema;
-  if ($schema !== undefined && typeof $schema != 'string')
-    throw new Error('$schema must be a string');
-  $schema = $schema || this._opts.defaultMeta || defaultMeta(this);
-  if (!$schema) {
-    this.logger.warn('meta-schema not available');
-    this.errors = null;
-    return true;
-  }
-  var currentUriFormat = this._formats.uri;
-  this._formats.uri = typeof currentUriFormat == 'function'
-                      ? this._schemaUriFormatFunc
-                      : this._schemaUriFormat;
-  var valid;
-  try { valid = this.validate($schema, schema); }
-  finally { this._formats.uri = currentUriFormat; }
-  if (!valid && throwOrLogError) {
-    var message = 'schema is invalid: ' + this.errorsText();
-    if (this._opts.validateSchema == 'log') this.logger.error(message);
-    else throw new Error(message);
-  }
-  return valid;
-}
-
-
-function defaultMeta(self) {
-  var meta = self._opts.meta;
-  self._opts.defaultMeta = typeof meta == 'object'
-                            ? self._getId(meta) || meta
-                            : self.getSchema(META_SCHEMA_ID)
-                              ? META_SCHEMA_ID
-                              : undefined;
-  return self._opts.defaultMeta;
-}
-
-
-/**
- * Get compiled schema from the instance by `key` or `ref`.
- * @this   Ajv
- * @param  {String} keyRef `key` that was passed to `addSchema` or full schema reference (`schema.id` or resolved id).
- * @return {Function} schema validating function (with property `schema`).
- */
-function getSchema(keyRef) {
-  var schemaObj = _getSchemaObj(this, keyRef);
-  switch (typeof schemaObj) {
-    case 'object': return schemaObj.validate || this._compile(schemaObj);
-    case 'string': return this.getSchema(schemaObj);
-    case 'undefined': return _getSchemaFragment(this, keyRef);
-  }
-}
-
-
-function _getSchemaFragment(self, ref) {
-  var res = resolve.schema.call(self, { schema: {} }, ref);
-  if (res) {
-    var schema = res.schema
-      , root = res.root
-      , baseId = res.baseId;
-    var v = compileSchema.call(self, schema, root, undefined, baseId);
-    self._fragments[ref] = new SchemaObject({
-      ref: ref,
-      fragment: true,
-      schema: schema,
-      root: root,
-      baseId: baseId,
-      validate: v
-    });
-    return v;
-  }
-}
-
-
-function _getSchemaObj(self, keyRef) {
-  keyRef = resolve.normalizeId(keyRef);
-  return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
-}
-
-
-/**
- * Remove cached schema(s).
- * If no parameter is passed all schemas but meta-schemas are removed.
- * If RegExp is passed all schemas with key/id matching pattern but meta-schemas are removed.
- * Even if schema is referenced by other schemas it still can be removed as other schemas have local references.
- * @this   Ajv
- * @param  {String|Object|RegExp} schemaKeyRef key, ref, pattern to match key/ref or schema object
- * @return {Ajv} this for method chaining
- */
-function removeSchema(schemaKeyRef) {
-  if (schemaKeyRef instanceof RegExp) {
-    _removeAllSchemas(this, this._schemas, schemaKeyRef);
-    _removeAllSchemas(this, this._refs, schemaKeyRef);
-    return this;
-  }
-  switch (typeof schemaKeyRef) {
-    case 'undefined':
-      _removeAllSchemas(this, this._schemas);
-      _removeAllSchemas(this, this._refs);
-      this._cache.clear();
-      return this;
-    case 'string':
-      var schemaObj = _getSchemaObj(this, schemaKeyRef);
-      if (schemaObj) this._cache.del(schemaObj.cacheKey);
-      delete this._schemas[schemaKeyRef];
-      delete this._refs[schemaKeyRef];
-      return this;
-    case 'object':
-      var serialize = this._opts.serialize;
-      var cacheKey = serialize ? serialize(schemaKeyRef) : schemaKeyRef;
-      this._cache.del(cacheKey);
-      var id = this._getId(schemaKeyRef);
-      if (id) {
-        id = resolve.normalizeId(id);
-        delete this._schemas[id];
-        delete this._refs[id];
-      }
-  }
-  return this;
-}
-
-
-function _removeAllSchemas(self, schemas, regex) {
-  for (var keyRef in schemas) {
-    var schemaObj = schemas[keyRef];
-    if (!schemaObj.meta && (!regex || regex.test(keyRef))) {
-      self._cache.del(schemaObj.cacheKey);
-      delete schemas[keyRef];
-    }
-  }
-}
-
-
-/* @this   Ajv */
-function _addSchema(schema, skipValidation, meta, shouldAddSchema) {
-  if (typeof schema != 'object' && typeof schema != 'boolean')
-    throw new Error('schema should be object or boolean');
-  var serialize = this._opts.serialize;
-  var cacheKey = serialize ? serialize(schema) : schema;
-  var cached = this._cache.get(cacheKey);
-  if (cached) return cached;
-
-  shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
-
-  var id = resolve.normalizeId(this._getId(schema));
-  if (id && shouldAddSchema) checkUnique(this, id);
-
-  var willValidate = this._opts.validateSchema !== false && !skipValidation;
-  var recursiveMeta;
-  if (willValidate && !(recursiveMeta = id && id == resolve.normalizeId(schema.$schema)))
-    this.validateSchema(schema, true);
-
-  var localRefs = resolve.ids.call(this, schema);
-
-  var schemaObj = new SchemaObject({
-    id: id,
-    schema: schema,
-    localRefs: localRefs,
-    cacheKey: cacheKey,
-    meta: meta
-  });
-
-  if (id[0] != '#' && shouldAddSchema) this._refs[id] = schemaObj;
-  this._cache.put(cacheKey, schemaObj);
-
-  if (willValidate && recursiveMeta) this.validateSchema(schema, true);
-
-  return schemaObj;
-}
-
-
-/* @this   Ajv */
-function _compile(schemaObj, root) {
-  if (schemaObj.compiling) {
-    schemaObj.validate = callValidate;
-    callValidate.schema = schemaObj.schema;
-    callValidate.errors = null;
-    callValidate.root = root ? root : callValidate;
-    if (schemaObj.schema.$async === true)
-      callValidate.$async = true;
-    return callValidate;
-  }
-  schemaObj.compiling = true;
-
-  var currentOpts;
-  if (schemaObj.meta) {
-    currentOpts = this._opts;
-    this._opts = this._metaOpts;
-  }
-
-  var v;
-  try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
-  finally {
-    schemaObj.compiling = false;
-    if (schemaObj.meta) this._opts = currentOpts;
-  }
-
-  schemaObj.validate = v;
-  schemaObj.refs = v.refs;
-  schemaObj.refVal = v.refVal;
-  schemaObj.root = v.root;
-  return v;
-
-
-  function callValidate() {
-    var _validate = schemaObj.validate;
-    var result = _validate.apply(null, arguments);
-    callValidate.errors = _validate.errors;
-    return result;
-  }
-}
-
-
-function chooseGetId(opts) {
-  switch (opts.schemaId) {
-    case '$id': return _get$Id;
-    case 'id': return _getId;
-    default: return _get$IdOrId;
-  }
-}
-
-/* @this   Ajv */
-function _getId(schema) {
-  if (schema.$id) this.logger.warn('schema $id ignored', schema.$id);
-  return schema.id;
-}
-
-/* @this   Ajv */
-function _get$Id(schema) {
-  if (schema.id) this.logger.warn('schema id ignored', schema.id);
-  return schema.$id;
-}
-
-
-function _get$IdOrId(schema) {
-  if (schema.$id && schema.id && schema.$id != schema.id)
-    throw new Error('schema $id is different from id');
-  return schema.$id || schema.id;
-}
-
-
-/**
- * Convert array of error message objects to string
- * @this   Ajv
- * @param  {Array<Object>} errors optional array of validation errors, if not passed errors from the instance are used.
- * @param  {Object} options optional options with properties `separator` and `dataVar`.
- * @return {String} human readable string with all errors descriptions
- */
-function errorsText(errors, options) {
-  errors = errors || this.errors;
-  if (!errors) return 'No errors';
-  options = options || {};
-  var separator = options.separator === undefined ? ', ' : options.separator;
-  var dataVar = options.dataVar === undefined ? 'data' : options.dataVar;
-
-  var text = '';
-  for (var i=0; i<errors.length; i++) {
-    var e = errors[i];
-    if (e) text += dataVar + e.dataPath + ' ' + e.message + separator;
-  }
-  return text.slice(0, -separator.length);
-}
-
-
-/**
- * Add custom format
- * @this   Ajv
- * @param {String} name format name
- * @param {String|RegExp|Function} format string is converted to RegExp; function should return boolean (true when valid)
- * @return {Ajv} this for method chaining
- */
-function addFormat(name, format) {
-  if (typeof format == 'string') format = new RegExp(format);
-  this._formats[name] = format;
-  return this;
-}
-
-
-function addDraft6MetaSchema(self) {
-  var $dataSchema;
-  if (self._opts.$data) {
-    $dataSchema = __webpack_require__(501);
-    self.addMetaSchema($dataSchema, $dataSchema.$id, true);
-  }
-  if (self._opts.meta === false) return;
-  var metaSchema = __webpack_require__(502);
-  if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
-  self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
-  self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
-}
-
-
-function addInitialSchemas(self) {
-  var optsSchemas = self._opts.schemas;
-  if (!optsSchemas) return;
-  if (Array.isArray(optsSchemas)) self.addSchema(optsSchemas);
-  else for (var key in optsSchemas) self.addSchema(optsSchemas[key], key);
-}
-
-
-function addInitialFormats(self) {
-  for (var name in self._opts.formats) {
-    var format = self._opts.formats[name];
-    self.addFormat(name, format);
-  }
-}
-
-
-function checkUnique(self, id) {
-  if (self._schemas[id] || self._refs[id])
-    throw new Error('schema with key or id "' + id + '" already exists');
-}
-
-
-function getMetaSchemaOptions(self) {
-  var metaOpts = util.copy(self._opts);
-  for (var i=0; i<META_IGNORE_OPTIONS.length; i++)
-    delete metaOpts[META_IGNORE_OPTIONS[i]];
-  return metaOpts;
-}
-
-
-function setLogger(self) {
-  var logger = self._opts.logger;
-  if (logger === false) {
-    self.logger = {log: noop, warn: noop, error: noop};
-  } else {
-    if (logger === undefined) logger = console;
-    if (!(typeof logger == 'object' && logger.log && logger.warn && logger.error))
-      throw new Error('logger must implement log, warn and error methods');
-    self.logger = logger;
-  }
-}
-
-
-function noop() {}
-
-
-/***/ }),
-/* 474 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-var Cache = module.exports = function Cache() {
-  this._cache = {};
-};
-
-
-Cache.prototype.put = function Cache_put(key, value) {
-  this._cache[key] = value;
-};
-
-
-Cache.prototype.get = function Cache_get(key) {
-  return this._cache[key];
-};
-
-
-Cache.prototype.del = function Cache_del(key) {
-  delete this._cache[key];
-};
-
-
-Cache.prototype.clear = function Cache_clear() {
-  this._cache = {};
-};
-
-
-/***/ }),
-/* 475 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-//all requires must be explicit because browserify won't work with dynamic requires
-module.exports = {
-  '$ref': __webpack_require__(496),
-  allOf: __webpack_require__(481),
-  anyOf: __webpack_require__(482),
-  const: __webpack_require__(483),
-  contains: __webpack_require__(484),
-  dependencies: __webpack_require__(486),
-  'enum': __webpack_require__(487),
-  format: __webpack_require__(488),
-  items: __webpack_require__(489),
-  maximum: __webpack_require__(340),
-  minimum: __webpack_require__(340),
-  maxItems: __webpack_require__(341),
-  minItems: __webpack_require__(341),
-  maxLength: __webpack_require__(342),
-  minLength: __webpack_require__(342),
-  maxProperties: __webpack_require__(343),
-  minProperties: __webpack_require__(343),
-  multipleOf: __webpack_require__(490),
-  not: __webpack_require__(491),
-  oneOf: __webpack_require__(492),
-  pattern: __webpack_require__(493),
-  properties: __webpack_require__(494),
-  propertyNames: __webpack_require__(495),
-  required: __webpack_require__(497),
-  uniqueItems: __webpack_require__(498),
-  validate: __webpack_require__(344)
-};
-
-
-/***/ }),
-/* 476 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var MissingRefError = __webpack_require__(202).MissingRef;
-
-module.exports = compileAsync;
-
-
-/**
- * Creates validating function for passed schema with asynchronous loading of missing schemas.
- * `loadSchema` option should be a function that accepts schema uri and returns promise that resolves with the schema.
- * @this  Ajv
- * @param {Object}   schema schema object
- * @param {Boolean}  meta optional true to compile meta-schema; this parameter can be skipped
- * @param {Function} callback an optional node-style callback, it is called with 2 parameters: error (or null) and validating function.
- * @return {Promise} promise that resolves with a validating function.
- */
-function compileAsync(schema, meta, callback) {
-  /* eslint no-shadow: 0 */
-  /* global Promise */
-  /* jshint validthis: true */
-  var self = this;
-  if (typeof this._opts.loadSchema != 'function')
-    throw new Error('options.loadSchema should be a function');
-
-  if (typeof meta == 'function') {
-    callback = meta;
-    meta = undefined;
-  }
-
-  var p = loadMetaSchemaOf(schema).then(function () {
-    var schemaObj = self._addSchema(schema, undefined, meta);
-    return schemaObj.validate || _compileAsync(schemaObj);
-  });
-
-  if (callback) {
-    p.then(
-      function(v) { callback(null, v); },
-      callback
-    );
-  }
-
-  return p;
-
-
-  function loadMetaSchemaOf(sch) {
-    var $schema = sch.$schema;
-    return $schema && !self.getSchema($schema)
-            ? compileAsync.call(self, { $ref: $schema }, true)
-            : Promise.resolve();
-  }
-
-
-  function _compileAsync(schemaObj) {
-    try { return self._compile(schemaObj); }
-    catch(e) {
-      if (e instanceof MissingRefError) return loadMissingSchema(e);
-      throw e;
-    }
-
-
-    function loadMissingSchema(e) {
-      var ref = e.missingSchema;
-      if (added(ref)) throw new Error('Schema ' + ref + ' is loaded but ' + e.missingRef + ' cannot be resolved');
-
-      var schemaPromise = self._loadingSchemas[ref];
-      if (!schemaPromise) {
-        schemaPromise = self._loadingSchemas[ref] = self._opts.loadSchema(ref);
-        schemaPromise.then(removePromise, removePromise);
-      }
-
-      return schemaPromise.then(function (sch) {
-        if (!added(ref)) {
-          return loadMetaSchemaOf(sch).then(function () {
-            if (!added(ref)) self.addSchema(sch, ref, undefined, meta);
-          });
-        }
-      }).then(function() {
-        return _compileAsync(schemaObj);
-      });
-
-      function removePromise() {
-        delete self._loadingSchemas[ref];
-      }
-
-      function added(ref) {
-        return self._refs[ref] || self._schemas[ref];
-      }
-    }
-  }
-}
-
-
-/***/ }),
-/* 477 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var util = __webpack_require__(106);
-
-var DATE = /^\d\d\d\d-(\d\d)-(\d\d)$/;
-var DAYS = [0,31,29,31,30,31,30,31,31,30,31,30,31];
-var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i;
-var HOSTNAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i;
-var URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
-var URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
-// uri-template: https://tools.ietf.org/html/rfc6570
-var URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i;
-// For the source: https://gist.github.com/dperini/729294
-// For test cases: https://mathiasbynens.be/demo/url-regex
-// @todo Delete current URL in favour of the commented out URL rule when this issue is fixed https://github.com/eslint/eslint/issues/7983.
-// var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
-var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
-var UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
-var JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$|^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
-var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
-
-
-module.exports = formats;
-
-function formats(mode) {
-  mode = mode == 'full' ? 'full' : 'fast';
-  return util.copy(formats[mode]);
-}
-
-
-formats.fast = {
-  // date: http://tools.ietf.org/html/rfc3339#section-5.6
-  date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
-  // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
-  time: /^[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
-  'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
-  // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
-  uri: /^(?:[a-z][a-z0-9+-.]*)(?::|\/)\/?[^\s]*$/i,
-  'uri-reference': /^(?:(?:[a-z][a-z0-9+-.]*:)?\/\/)?[^\s]*$/i,
-  'uri-template': URITEMPLATE,
-  url: URL,
-  // email (sources from jsen validator):
-  // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363
-  // http://www.w3.org/TR/html5/forms.html#valid-e-mail-address (search for 'willful violation')
-  email: /^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i,
-  hostname: HOSTNAME,
-  // optimized https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
-  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
-  // optimized http://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
-  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
-  regex: regex,
-  // uuid: http://tools.ietf.org/html/rfc4122
-  uuid: UUID,
-  // JSON-pointer: https://tools.ietf.org/html/rfc6901
-  // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
-  'json-pointer': JSON_POINTER,
-  // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00
-  'relative-json-pointer': RELATIVE_JSON_POINTER
-};
-
-
-formats.full = {
-  date: date,
-  time: time,
-  'date-time': date_time,
-  uri: uri,
-  'uri-reference': URIREF,
-  'uri-template': URITEMPLATE,
-  url: URL,
-  email: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&''*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,
-  hostname: hostname,
-  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
-  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
-  regex: regex,
-  uuid: UUID,
-  'json-pointer': JSON_POINTER,
-  'relative-json-pointer': RELATIVE_JSON_POINTER
-};
-
-
-function date(str) {
-  // full-date from http://tools.ietf.org/html/rfc3339#section-5.6
-  var matches = str.match(DATE);
-  if (!matches) return false;
-
-  var month = +matches[1];
-  var day = +matches[2];
-  return month >= 1 && month <= 12 && day >= 1 && day <= DAYS[month];
-}
-
-
-function time(str, full) {
-  var matches = str.match(TIME);
-  if (!matches) return false;
-
-  var hour = matches[1];
-  var minute = matches[2];
-  var second = matches[3];
-  var timeZone = matches[5];
-  return hour <= 23 && minute <= 59 && second <= 59 && (!full || timeZone);
-}
-
-
-var DATE_TIME_SEPARATOR = /t|\s/i;
-function date_time(str) {
-  // http://tools.ietf.org/html/rfc3339#section-5.6
-  var dateTime = str.split(DATE_TIME_SEPARATOR);
-  return dateTime.length == 2 && date(dateTime[0]) && time(dateTime[1], true);
-}
-
-
-function hostname(str) {
-  // https://tools.ietf.org/html/rfc1034#section-3.5
-  // https://tools.ietf.org/html/rfc1123#section-2
-  return str.length <= 255 && HOSTNAME.test(str);
-}
-
-
-var NOT_URI_FRAGMENT = /\/|:/;
-function uri(str) {
-  // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."
-  return NOT_URI_FRAGMENT.test(str) && URI.test(str);
-}
-
-
-var Z_ANCHOR = /[^\\]\\Z/;
-function regex(str) {
-  if (Z_ANCHOR.test(str)) return false;
-  try {
-    new RegExp(str);
-    return true;
-  } catch(e) {
-    return false;
-  }
-}
-
-
-/***/ }),
-/* 478 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var resolve = __webpack_require__(203)
-  , util = __webpack_require__(106)
-  , errorClasses = __webpack_require__(202)
-  , stableStringify = __webpack_require__(389);
-
-var validateGenerator = __webpack_require__(344);
-
-/**
- * Functions below are used inside compiled validations function
- */
-
-var co = __webpack_require__(383);
-var ucs2length = util.ucs2length;
-var equal = __webpack_require__(204);
-
-// this error is thrown by async schemas to return validation errors via exception
-var ValidationError = errorClasses.Validation;
-
-module.exports = compile;
-
-
-/**
- * Compiles schema to validation function
- * @this   Ajv
- * @param  {Object} schema schema object
- * @param  {Object} root object with information about the root schema for this schema
- * @param  {Object} localRefs the hash of local references inside the schema (created by resolve.id), used for inline resolution
- * @param  {String} baseId base ID for IDs in the schema
- * @return {Function} validation function
- */
-function compile(schema, root, localRefs, baseId) {
-  /* jshint validthis: true, evil: true */
-  /* eslint no-shadow: 0 */
-  var self = this
-    , opts = this._opts
-    , refVal = [ undefined ]
-    , refs = {}
-    , patterns = []
-    , patternsHash = {}
-    , defaults = []
-    , defaultsHash = {}
-    , customRules = [];
-
-  root = root || { schema: schema, refVal: refVal, refs: refs };
-
-  var c = checkCompiling.call(this, schema, root, baseId);
-  var compilation = this._compilations[c.index];
-  if (c.compiling) return (compilation.callValidate = callValidate);
-
-  var formats = this._formats;
-  var RULES = this.RULES;
-
-  try {
-    var v = localCompile(schema, root, localRefs, baseId);
-    compilation.validate = v;
-    var cv = compilation.callValidate;
-    if (cv) {
-      cv.schema = v.schema;
-      cv.errors = null;
-      cv.refs = v.refs;
-      cv.refVal = v.refVal;
-      cv.root = v.root;
-      cv.$async = v.$async;
-      if (opts.sourceCode) cv.source = v.source;
-    }
-    return v;
-  } finally {
-    endCompiling.call(this, schema, root, baseId);
-  }
-
-  function callValidate() {
-    var validate = compilation.validate;
-    var result = validate.apply(null, arguments);
-    callValidate.errors = validate.errors;
-    return result;
-  }
-
-  function localCompile(_schema, _root, localRefs, baseId) {
-    var isRoot = !_root || (_root && _root.schema == _schema);
-    if (_root.schema != root.schema)
-      return compile.call(self, _schema, _root, localRefs, baseId);
-
-    var $async = _schema.$async === true;
-
-    var sourceCode = validateGenerator({
-      isTop: true,
-      schema: _schema,
-      isRoot: isRoot,
-      baseId: baseId,
-      root: _root,
-      schemaPath: '',
-      errSchemaPath: '#',
-      errorPath: '""',
-      MissingRefError: errorClasses.MissingRef,
-      RULES: RULES,
-      validate: validateGenerator,
-      util: util,
-      resolve: resolve,
-      resolveRef: resolveRef,
-      usePattern: usePattern,
-      useDefault: useDefault,
-      useCustomRule: useCustomRule,
-      opts: opts,
-      formats: formats,
-      logger: self.logger,
-      self: self
-    });
-
-    sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
-                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
-                   + sourceCode;
-
-    if (opts.processCode) sourceCode = opts.processCode(sourceCode);
-    // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
-    var validate;
-    try {
-      var makeValidate = new Function(
-        'self',
-        'RULES',
-        'formats',
-        'root',
-        'refVal',
-        'defaults',
-        'customRules',
-        'co',
-        'equal',
-        'ucs2length',
-        'ValidationError',
-        sourceCode
-      );
-
-      validate = makeValidate(
-        self,
-        RULES,
-        formats,
-        root,
-        refVal,
-        defaults,
-        customRules,
-        co,
-        equal,
-        ucs2length,
-        ValidationError
-      );
-
-      refVal[0] = validate;
-    } catch(e) {
-      self.logger.error('Error compiling schema, function code:', sourceCode);
-      throw e;
-    }
-
-    validate.schema = _schema;
-    validate.errors = null;
-    validate.refs = refs;
-    validate.refVal = refVal;
-    validate.root = isRoot ? validate : _root;
-    if ($async) validate.$async = true;
-    if (opts.sourceCode === true) {
-      validate.source = {
-        code: sourceCode,
-        patterns: patterns,
-        defaults: defaults
-      };
-    }
-
-    return validate;
-  }
-
-  function resolveRef(baseId, ref, isRoot) {
-    ref = resolve.url(baseId, ref);
-    var refIndex = refs[ref];
-    var _refVal, refCode;
-    if (refIndex !== undefined) {
-      _refVal = refVal[refIndex];
-      refCode = 'refVal[' + refIndex + ']';
-      return resolvedRef(_refVal, refCode);
-    }
-    if (!isRoot && root.refs) {
-      var rootRefId = root.refs[ref];
-      if (rootRefId !== undefined) {
-        _refVal = root.refVal[rootRefId];
-        refCode = addLocalRef(ref, _refVal);
-        return resolvedRef(_refVal, refCode);
-      }
-    }
-
-    refCode = addLocalRef(ref);
-    var v = resolve.call(self, localCompile, root, ref);
-    if (v === undefined) {
-      var localSchema = localRefs && localRefs[ref];
-      if (localSchema) {
-        v = resolve.inlineRef(localSchema, opts.inlineRefs)
-            ? localSchema
-            : compile.call(self, localSchema, root, localRefs, baseId);
-      }
-    }
-
-    if (v === undefined) {
-      removeLocalRef(ref);
-    } else {
-      replaceLocalRef(ref, v);
-      return resolvedRef(v, refCode);
-    }
-  }
-
-  function addLocalRef(ref, v) {
-    var refId = refVal.length;
-    refVal[refId] = v;
-    refs[ref] = refId;
-    return 'refVal' + refId;
-  }
-
-  function removeLocalRef(ref) {
-    delete refs[ref];
-  }
-
-  function replaceLocalRef(ref, v) {
-    var refId = refs[ref];
-    refVal[refId] = v;
-  }
-
-  function resolvedRef(refVal, code) {
-    return typeof refVal == 'object' || typeof refVal == 'boolean'
-            ? { code: code, schema: refVal, inline: true }
-            : { code: code, $async: refVal && refVal.$async };
-  }
-
-  function usePattern(regexStr) {
-    var index = patternsHash[regexStr];
-    if (index === undefined) {
-      index = patternsHash[regexStr] = patterns.length;
-      patterns[index] = regexStr;
-    }
-    return 'pattern' + index;
-  }
-
-  function useDefault(value) {
-    switch (typeof value) {
-      case 'boolean':
-      case 'number':
-        return '' + value;
-      case 'string':
-        return util.toQuotedString(value);
-      case 'object':
-        if (value === null) return 'null';
-        var valueStr = stableStringify(value);
-        var index = defaultsHash[valueStr];
-        if (index === undefined) {
-          index = defaultsHash[valueStr] = defaults.length;
-          defaults[index] = value;
-        }
-        return 'default' + index;
-    }
-  }
-
-  function useCustomRule(rule, schema, parentSchema, it) {
-    var validateSchema = rule.definition.validateSchema;
-    if (validateSchema && self._opts.validateSchema !== false) {
-      var valid = validateSchema(schema);
-      if (!valid) {
-        var message = 'keyword schema is invalid: ' + self.errorsText(validateSchema.errors);
-        if (self._opts.validateSchema == 'log') self.logger.error(message);
-        else throw new Error(message);
-      }
-    }
-
-    var compile = rule.definition.compile
-      , inline = rule.definition.inline
-      , macro = rule.definition.macro;
-
-    var validate;
-    if (compile) {
-      validate = compile.call(self, schema, parentSchema, it);
-    } else if (macro) {
-      validate = macro.call(self, schema, parentSchema, it);
-      if (opts.validateSchema !== false) self.validateSchema(validate, true);
-    } else if (inline) {
-      validate = inline.call(self, it, rule.keyword, schema, parentSchema);
-    } else {
-      validate = rule.definition.validate;
-      if (!validate) return;
-    }
-
-    if (validate === undefined)
-      throw new Error('custom keyword "' + rule.keyword + '"failed to compile');
-
-    var index = customRules.length;
-    customRules[index] = validate;
-
-    return {
-      code: 'customRule' + index,
-      validate: validate
-    };
-  }
-}
-
-
-/**
- * Checks if the schema is currently compiled
- * @this   Ajv
- * @param  {Object} schema schema to compile
- * @param  {Object} root root object
- * @param  {String} baseId base schema ID
- * @return {Object} object with properties "index" (compilation index) and "compiling" (boolean)
- */
-function checkCompiling(schema, root, baseId) {
-  /* jshint validthis: true */
-  var index = compIndex.call(this, schema, root, baseId);
-  if (index >= 0) return { index: index, compiling: true };
-  index = this._compilations.length;
-  this._compilations[index] = {
-    schema: schema,
-    root: root,
-    baseId: baseId
-  };
-  return { index: index, compiling: false };
-}
-
-
-/**
- * Removes the schema from the currently compiled list
- * @this   Ajv
- * @param  {Object} schema schema to compile
- * @param  {Object} root root object
- * @param  {String} baseId base schema ID
- */
-function endCompiling(schema, root, baseId) {
-  /* jshint validthis: true */
-  var i = compIndex.call(this, schema, root, baseId);
-  if (i >= 0) this._compilations.splice(i, 1);
-}
-
-
-/**
- * Index of schema compilation in the currently compiled list
- * @this   Ajv
- * @param  {Object} schema schema to compile
- * @param  {Object} root root object
- * @param  {String} baseId base schema ID
- * @return {Integer} compilation index
- */
-function compIndex(schema, root, baseId) {
-  /* jshint validthis: true */
-  for (var i=0; i<this._compilations.length; i++) {
-    var c = this._compilations[i];
-    if (c.schema == schema && c.root == root && c.baseId == baseId) return i;
-  }
-  return -1;
-}
-
-
-function patternCode(i, patterns) {
-  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
-}
-
-
-function defaultCode(i) {
-  return 'var default' + i + ' = defaults[' + i + '];';
-}
-
-
-function refValCode(i, refVal) {
-  return refVal[i] === undefined ? '' : 'var refVal' + i + ' = refVal[' + i + '];';
-}
-
-
-function customRuleCode(i) {
-  return 'var customRule' + i + ' = customRules[' + i + '];';
-}
-
-
-function vars(arr, statement) {
-  if (!arr.length) return '';
-  var code = '';
-  for (var i=0; i<arr.length; i++)
-    code += statement(i, arr);
-  return code;
-}
-
-
-/***/ }),
-/* 479 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var ruleModules = __webpack_require__(475)
-  , toHash = __webpack_require__(106).toHash;
-
-module.exports = function rules() {
-  var RULES = [
-    { type: 'number',
-      rules: [ { 'maximum': ['exclusiveMaximum'] },
-               { 'minimum': ['exclusiveMinimum'] }, 'multipleOf', 'format'] },
-    { type: 'string',
-      rules: [ 'maxLength', 'minLength', 'pattern', 'format' ] },
-    { type: 'array',
-      rules: [ 'maxItems', 'minItems', 'uniqueItems', 'contains', 'items' ] },
-    { type: 'object',
-      rules: [ 'maxProperties', 'minProperties', 'required', 'dependencies', 'propertyNames',
-               { 'properties': ['additionalProperties', 'patternProperties'] } ] },
-    { rules: [ '$ref', 'const', 'enum', 'not', 'anyOf', 'oneOf', 'allOf' ] }
-  ];
-
-  var ALL = [ 'type' ];
-  var KEYWORDS = [
-    'additionalItems', '$schema', '$id', 'id', 'title',
-    'description', 'default', 'definitions'
-  ];
-  var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
-  RULES.all = toHash(ALL);
-  RULES.types = toHash(TYPES);
-
-  RULES.forEach(function (group) {
-    group.rules = group.rules.map(function (keyword) {
-      var implKeywords;
-      if (typeof keyword == 'object') {
-        var key = Object.keys(keyword)[0];
-        implKeywords = keyword[key];
-        keyword = key;
-        implKeywords.forEach(function (k) {
-          ALL.push(k);
-          RULES.all[k] = true;
-        });
-      }
-      ALL.push(keyword);
-      var rule = RULES.all[keyword] = {
-        keyword: keyword,
-        code: ruleModules[keyword],
-        implements: implKeywords
-      };
-      return rule;
-    });
-
-    if (group.type) RULES.types[group.type] = group;
-  });
-
-  RULES.keywords = toHash(ALL.concat(KEYWORDS));
-  RULES.custom = {};
-
-  return RULES;
-};
-
-
-/***/ }),
-/* 480 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// https://mathiasbynens.be/notes/javascript-encoding
-// https://github.com/bestiejs/punycode.js - punycode.ucs2.decode
-module.exports = function ucs2length(str) {
-  var length = 0
-    , len = str.length
-    , pos = 0
-    , value;
-  while (pos < len) {
-    length++;
-    value = str.charCodeAt(pos++);
-    if (value >= 0xD800 && value <= 0xDBFF && pos < len) {
-      // high surrogate, and there is a next character
-      value = str.charCodeAt(pos);
-      if ((value & 0xFC00) == 0xDC00) pos++; // low surrogate
-    }
-  }
-  return length;
-};
-
-
-/***/ }),
-/* 481 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_allOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $currentBaseId = $it.baseId,
-    $allSchemasEmpty = true;
-  var arr1 = $schema;
-  if (arr1) {
-    var $sch, $i = -1,
-      l1 = arr1.length - 1;
-    while ($i < l1) {
-      $sch = arr1[$i += 1];
-      if (it.util.schemaHasRules($sch, it.RULES.all)) {
-        $allSchemasEmpty = false;
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + '[' + $i + ']';
-        $it.errSchemaPath = $errSchemaPath + '/' + $i;
-        out += '  ' + (it.validate($it)) + ' ';
-        $it.baseId = $currentBaseId;
-        if ($breakOnError) {
-          out += ' if (' + ($nextValid) + ') { ';
-          $closingBraces += '}';
-        }
-      }
-    }
-  }
-  if ($breakOnError) {
-    if ($allSchemasEmpty) {
-      out += ' if (true) { ';
-    } else {
-      out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
-    }
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 482 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_anyOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $noEmptySchema = $schema.every(function($sch) {
-    return it.util.schemaHasRules($sch, it.RULES.all);
-  });
-  if ($noEmptySchema) {
-    var $currentBaseId = $it.baseId;
-    out += ' var ' + ($errs) + ' = errors; var ' + ($valid) + ' = false;  ';
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    var arr1 = $schema;
-    if (arr1) {
-      var $sch, $i = -1,
-        l1 = arr1.length - 1;
-      while ($i < l1) {
-        $sch = arr1[$i += 1];
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + '[' + $i + ']';
-        $it.errSchemaPath = $errSchemaPath + '/' + $i;
-        out += '  ' + (it.validate($it)) + ' ';
-        $it.baseId = $currentBaseId;
-        out += ' ' + ($valid) + ' = ' + ($valid) + ' || ' + ($nextValid) + '; if (!' + ($valid) + ') { ';
-        $closingBraces += '}';
-      }
-    }
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' ' + ($closingBraces) + ' if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('anyOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should match some schema in anyOf\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError(vErrors); ';
-      } else {
-        out += ' validate.errors = vErrors; return false; ';
-      }
-    }
-    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
-    if (it.opts.allErrors) {
-      out += ' } ';
-    }
-    out = it.util.cleanUpCode(out);
-  } else {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 483 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_const(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  if (!$isData) {
-    out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + ';';
-  }
-  out += 'var ' + ($valid) + ' = equal(' + ($data) + ', schema' + ($lvl) + '); if (!' + ($valid) + ') {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('const') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be equal to constant\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' }';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 484 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_contains(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $idx = 'i' + $lvl,
-    $dataNxt = $it.dataLevel = it.dataLevel + 1,
-    $nextData = 'data' + $dataNxt,
-    $currentBaseId = it.baseId,
-    $nonEmptySchema = it.util.schemaHasRules($schema, it.RULES.all);
-  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
-  if ($nonEmptySchema) {
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    out += ' var ' + ($nextValid) + ' = false; for (var ' + ($idx) + ' = 0; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
-    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
-    var $passData = $data + '[' + $idx + ']';
-    $it.dataPathArr[$dataNxt] = $idx;
-    var $code = it.validate($it);
-    $it.baseId = $currentBaseId;
-    if (it.util.varOccurences($code, $nextData) < 2) {
-      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-    } else {
-      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-    }
-    out += ' if (' + ($nextValid) + ') break; }  ';
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' ' + ($closingBraces) + ' if (!' + ($nextValid) + ') {';
-  } else {
-    out += ' if (' + ($data) + '.length == 0) {';
-  }
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('contains') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should contain a valid item\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' } else { ';
-  if ($nonEmptySchema) {
-    out += '  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
-  }
-  if (it.opts.allErrors) {
-    out += ' } ';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 485 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_custom(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $rule = this,
-    $definition = 'definition' + $lvl,
-    $rDef = $rule.definition,
-    $closingBraces = '';
-  var $compile, $inline, $macro, $ruleValidate, $validateCode;
-  if ($isData && $rDef.$data) {
-    $validateCode = 'keywordValidate' + $lvl;
-    var $validateSchema = $rDef.validateSchema;
-    out += ' var ' + ($definition) + ' = RULES.custom[\'' + ($keyword) + '\'].definition; var ' + ($validateCode) + ' = ' + ($definition) + '.validate;';
-  } else {
-    $ruleValidate = it.useCustomRule($rule, $schema, it.schema, it);
-    if (!$ruleValidate) return;
-    $schemaValue = 'validate.schema' + $schemaPath;
-    $validateCode = $ruleValidate.code;
-    $compile = $rDef.compile;
-    $inline = $rDef.inline;
-    $macro = $rDef.macro;
-  }
-  var $ruleErrs = $validateCode + '.errors',
-    $i = 'i' + $lvl,
-    $ruleErr = 'ruleErr' + $lvl,
-    $asyncKeyword = $rDef.async;
-  if ($asyncKeyword && !it.async) throw new Error('async keyword in sync schema');
-  if (!($inline || $macro)) {
-    out += '' + ($ruleErrs) + ' = null;';
-  }
-  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
-  if ($isData && $rDef.$data) {
-    $closingBraces += '}';
-    out += ' if (' + ($schemaValue) + ' === undefined) { ' + ($valid) + ' = true; } else { ';
-    if ($validateSchema) {
-      $closingBraces += '}';
-      out += ' ' + ($valid) + ' = ' + ($definition) + '.validateSchema(' + ($schemaValue) + '); if (' + ($valid) + ') { ';
-    }
-  }
-  if ($inline) {
-    if ($rDef.statements) {
-      out += ' ' + ($ruleValidate.validate) + ' ';
-    } else {
-      out += ' ' + ($valid) + ' = ' + ($ruleValidate.validate) + '; ';
-    }
-  } else if ($macro) {
-    var $it = it.util.copy(it);
-    var $closingBraces = '';
-    $it.level++;
-    var $nextValid = 'valid' + $it.level;
-    $it.schema = $ruleValidate.validate;
-    $it.schemaPath = '';
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    var $code = it.validate($it).replace(/validate\.schema/g, $validateCode);
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' ' + ($code);
-  } else {
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = '';
-    out += '  ' + ($validateCode) + '.call( ';
-    if (it.opts.passContext) {
-      out += 'this';
-    } else {
-      out += 'self';
-    }
-    if ($compile || $rDef.schema === false) {
-      out += ' , ' + ($data) + ' ';
-    } else {
-      out += ' , ' + ($schemaValue) + ' , ' + ($data) + ' , validate.schema' + (it.schemaPath) + ' ';
-    }
-    out += ' , (dataPath || \'\')';
-    if (it.errorPath != '""') {
-      out += ' + ' + (it.errorPath);
-    }
-    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
-      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
-    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ' , rootData )  ';
-    var def_callRuleValidate = out;
-    out = $$outStack.pop();
-    if ($rDef.errors === false) {
-      out += ' ' + ($valid) + ' = ';
-      if ($asyncKeyword) {
-        out += '' + (it.yieldAwait);
-      }
-      out += '' + (def_callRuleValidate) + '; ';
-    } else {
-      if ($asyncKeyword) {
-        $ruleErrs = 'customErrors' + $lvl;
-        out += ' var ' + ($ruleErrs) + ' = null; try { ' + ($valid) + ' = ' + (it.yieldAwait) + (def_callRuleValidate) + '; } catch (e) { ' + ($valid) + ' = false; if (e instanceof ValidationError) ' + ($ruleErrs) + ' = e.errors; else throw e; } ';
-      } else {
-        out += ' ' + ($ruleErrs) + ' = null; ' + ($valid) + ' = ' + (def_callRuleValidate) + '; ';
-      }
-    }
-  }
-  if ($rDef.modifying) {
-    out += ' if (' + ($parentData) + ') ' + ($data) + ' = ' + ($parentData) + '[' + ($parentDataProperty) + '];';
-  }
-  out += '' + ($closingBraces);
-  if ($rDef.valid) {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-  } else {
-    out += ' if ( ';
-    if ($rDef.valid === undefined) {
-      out += ' !';
-      if ($macro) {
-        out += '' + ($nextValid);
-      } else {
-        out += '' + ($valid);
-      }
-    } else {
-      out += ' ' + (!$rDef.valid) + ' ';
-    }
-    out += ') { ';
-    $errorKeyword = $rule.keyword;
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = '';
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    var def_customError = out;
-    out = $$outStack.pop();
-    if ($inline) {
-      if ($rDef.errors) {
-        if ($rDef.errors != 'full') {
-          out += '  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
-          if (it.opts.verbose) {
-            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
-          }
-          out += ' } ';
-        }
-      } else {
-        if ($rDef.errors === false) {
-          out += ' ' + (def_customError) + ' ';
-        } else {
-          out += ' if (' + ($errs) + ' == errors) { ' + (def_customError) + ' } else {  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
-          if (it.opts.verbose) {
-            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
-          }
-          out += ' } } ';
-        }
-      }
-    } else if ($macro) {
-      out += '   var err =   '; /* istanbul ignore else */
-      if (it.createErrors !== false) {
-        out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
-        if (it.opts.messages !== false) {
-          out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
-        }
-        if (it.opts.verbose) {
-          out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-        }
-        out += ' } ';
-      } else {
-        out += ' {} ';
-      }
-      out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-        if (it.async) {
-          out += ' throw new ValidationError(vErrors); ';
-        } else {
-          out += ' validate.errors = vErrors; return false; ';
-        }
-      }
-    } else {
-      if ($rDef.errors === false) {
-        out += ' ' + (def_customError) + ' ';
-      } else {
-        out += ' if (Array.isArray(' + ($ruleErrs) + ')) { if (vErrors === null) vErrors = ' + ($ruleErrs) + '; else vErrors = vErrors.concat(' + ($ruleErrs) + '); errors = vErrors.length;  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + ';  ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '";  ';
-        if (it.opts.verbose) {
-          out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
-        }
-        out += ' } } else { ' + (def_customError) + ' } ';
-      }
-    }
-    out += ' } ';
-    if ($breakOnError) {
-      out += ' else { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 486 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_dependencies(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $schemaDeps = {},
-    $propertyDeps = {},
-    $ownProperties = it.opts.ownProperties;
-  for ($property in $schema) {
-    var $sch = $schema[$property];
-    var $deps = Array.isArray($sch) ? $propertyDeps : $schemaDeps;
-    $deps[$property] = $sch;
-  }
-  out += 'var ' + ($errs) + ' = errors;';
-  var $currentErrorPath = it.errorPath;
-  out += 'var missing' + ($lvl) + ';';
-  for (var $property in $propertyDeps) {
-    $deps = $propertyDeps[$property];
-    if ($deps.length) {
-      out += ' if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
-      if ($ownProperties) {
-        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
-      }
-      if ($breakOnError) {
-        out += ' && ( ';
-        var arr1 = $deps;
-        if (arr1) {
-          var $propertyKey, $i = -1,
-            l1 = arr1.length - 1;
-          while ($i < l1) {
-            $propertyKey = arr1[$i += 1];
-            if ($i) {
-              out += ' || ';
-            }
-            var $prop = it.util.getProperty($propertyKey),
-              $useData = $data + $prop;
-            out += ' ( ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
-          }
-        }
-        out += ')) {  ';
-        var $propertyPath = 'missing' + $lvl,
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
-        }
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'should have ';
-            if ($deps.length == 1) {
-              out += 'property ' + (it.util.escapeQuotes($deps[0]));
-            } else {
-              out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
-            }
-            out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-      } else {
-        out += ' ) { ';
-        var arr2 = $deps;
-        if (arr2) {
-          var $propertyKey, i2 = -1,
-            l2 = arr2.length - 1;
-          while (i2 < l2) {
-            $propertyKey = arr2[i2 += 1];
-            var $prop = it.util.getProperty($propertyKey),
-              $missingProperty = it.util.escapeQuotes($propertyKey),
-              $useData = $data + $prop;
-            if (it.opts._errorDataPathProperty) {
-              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
-            }
-            out += ' if ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') {  var err =   '; /* istanbul ignore else */
-            if (it.createErrors !== false) {
-              out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
-              if (it.opts.messages !== false) {
-                out += ' , message: \'should have ';
-                if ($deps.length == 1) {
-                  out += 'property ' + (it.util.escapeQuotes($deps[0]));
-                } else {
-                  out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
-                }
-                out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
-              }
-              if (it.opts.verbose) {
-                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-              }
-              out += ' } ';
-            } else {
-              out += ' {} ';
-            }
-            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
-          }
-        }
-      }
-      out += ' }   ';
-      if ($breakOnError) {
-        $closingBraces += '}';
-        out += ' else { ';
-      }
-    }
-  }
-  it.errorPath = $currentErrorPath;
-  var $currentBaseId = $it.baseId;
-  for (var $property in $schemaDeps) {
-    var $sch = $schemaDeps[$property];
-    if (it.util.schemaHasRules($sch, it.RULES.all)) {
-      out += ' ' + ($nextValid) + ' = true; if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
-      if ($ownProperties) {
-        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
-      }
-      out += ') { ';
-      $it.schema = $sch;
-      $it.schemaPath = $schemaPath + it.util.getProperty($property);
-      $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($property);
-      out += '  ' + (it.validate($it)) + ' ';
-      $it.baseId = $currentBaseId;
-      out += ' }  ';
-      if ($breakOnError) {
-        out += ' if (' + ($nextValid) + ') { ';
-        $closingBraces += '}';
-      }
-    }
-  }
-  if ($breakOnError) {
-    out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 487 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_enum(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $i = 'i' + $lvl,
-    $vSchema = 'schema' + $lvl;
-  if (!$isData) {
-    out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + ';';
-  }
-  out += 'var ' + ($valid) + ';';
-  if ($isData) {
-    out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
-  }
-  out += '' + ($valid) + ' = false;for (var ' + ($i) + '=0; ' + ($i) + '<' + ($vSchema) + '.length; ' + ($i) + '++) if (equal(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + '])) { ' + ($valid) + ' = true; break; }';
-  if ($isData) {
-    out += '  }  ';
-  }
-  out += ' if (!' + ($valid) + ') {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('enum') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { allowedValues: schema' + ($lvl) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be equal to one of the allowed values\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' }';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 488 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_format(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  if (it.opts.format === false) {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-    return out;
-  }
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $unknownFormats = it.opts.unknownFormats,
-    $allowUnknown = Array.isArray($unknownFormats);
-  if ($isData) {
-    var $format = 'format' + $lvl,
-      $isObject = 'isObject' + $lvl,
-      $formatType = 'formatType' + $lvl;
-    out += ' var ' + ($format) + ' = formats[' + ($schemaValue) + ']; var ' + ($isObject) + ' = typeof ' + ($format) + ' == \'object\' && !(' + ($format) + ' instanceof RegExp) && ' + ($format) + '.validate; var ' + ($formatType) + ' = ' + ($isObject) + ' && ' + ($format) + '.type || \'string\'; if (' + ($isObject) + ') { ';
-    if (it.async) {
-      out += ' var async' + ($lvl) + ' = ' + ($format) + '.async; ';
-    }
-    out += ' ' + ($format) + ' = ' + ($format) + '.validate; } if (  ';
-    if ($isData) {
-      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
-    }
-    out += ' (';
-    if ($unknownFormats != 'ignore') {
-      out += ' (' + ($schemaValue) + ' && !' + ($format) + ' ';
-      if ($allowUnknown) {
-        out += ' && self._opts.unknownFormats.indexOf(' + ($schemaValue) + ') == -1 ';
-      }
-      out += ') || ';
-    }
-    out += ' (' + ($format) + ' && ' + ($formatType) + ' == \'' + ($ruleType) + '\' && !(typeof ' + ($format) + ' == \'function\' ? ';
-    if (it.async) {
-      out += ' (async' + ($lvl) + ' ? ' + (it.yieldAwait) + ' ' + ($format) + '(' + ($data) + ') : ' + ($format) + '(' + ($data) + ')) ';
-    } else {
-      out += ' ' + ($format) + '(' + ($data) + ') ';
-    }
-    out += ' : ' + ($format) + '.test(' + ($data) + '))))) {';
-  } else {
-    var $format = it.formats[$schema];
-    if (!$format) {
-      if ($unknownFormats == 'ignore') {
-        it.logger.warn('unknown format "' + $schema + '" ignored in schema at path "' + it.errSchemaPath + '"');
-        if ($breakOnError) {
-          out += ' if (true) { ';
-        }
-        return out;
-      } else if ($allowUnknown && $unknownFormats.indexOf($schema) >= 0) {
-        if ($breakOnError) {
-          out += ' if (true) { ';
-        }
-        return out;
-      } else {
-        throw new Error('unknown format "' + $schema + '" is used in schema at path "' + it.errSchemaPath + '"');
-      }
-    }
-    var $isObject = typeof $format == 'object' && !($format instanceof RegExp) && $format.validate;
-    var $formatType = $isObject && $format.type || 'string';
-    if ($isObject) {
-      var $async = $format.async === true;
-      $format = $format.validate;
-    }
-    if ($formatType != $ruleType) {
-      if ($breakOnError) {
-        out += ' if (true) { ';
-      }
-      return out;
-    }
-    if ($async) {
-      if (!it.async) throw new Error('async format in sync schema');
-      var $formatRef = 'formats' + it.util.getProperty($schema) + '.validate';
-      out += ' if (!(' + (it.yieldAwait) + ' ' + ($formatRef) + '(' + ($data) + '))) { ';
-    } else {
-      out += ' if (! ';
-      var $formatRef = 'formats' + it.util.getProperty($schema);
-      if ($isObject) $formatRef += '.validate';
-      if (typeof $format == 'function') {
-        out += ' ' + ($formatRef) + '(' + ($data) + ') ';
-      } else {
-        out += ' ' + ($formatRef) + '.test(' + ($data) + ') ';
-      }
-      out += ') { ';
-    }
-  }
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('format') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { format:  ';
-    if ($isData) {
-      out += '' + ($schemaValue);
-    } else {
-      out += '' + (it.util.toQuotedString($schema));
-    }
-    out += '  } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should match format "';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + (it.util.escapeQuotes($schema));
-      }
-      out += '"\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + (it.util.toQuotedString($schema));
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' } ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 489 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_items(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $idx = 'i' + $lvl,
-    $dataNxt = $it.dataLevel = it.dataLevel + 1,
-    $nextData = 'data' + $dataNxt,
-    $currentBaseId = it.baseId;
-  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
-  if (Array.isArray($schema)) {
-    var $additionalItems = it.schema.additionalItems;
-    if ($additionalItems === false) {
-      out += ' ' + ($valid) + ' = ' + ($data) + '.length <= ' + ($schema.length) + '; ';
-      var $currErrSchemaPath = $errSchemaPath;
-      $errSchemaPath = it.errSchemaPath + '/additionalItems';
-      out += '  if (!' + ($valid) + ') {   ';
-      var $$outStack = $$outStack || [];
-      $$outStack.push(out);
-      out = ''; /* istanbul ignore else */
-      if (it.createErrors !== false) {
-        out += ' { keyword: \'' + ('additionalItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schema.length) + ' } ';
-        if (it.opts.messages !== false) {
-          out += ' , message: \'should NOT have more than ' + ($schema.length) + ' items\' ';
-        }
-        if (it.opts.verbose) {
-          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-        }
-        out += ' } ';
-      } else {
-        out += ' {} ';
-      }
-      var __err = out;
-      out = $$outStack.pop();
-      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-        if (it.async) {
-          out += ' throw new ValidationError([' + (__err) + ']); ';
-        } else {
-          out += ' validate.errors = [' + (__err) + ']; return false; ';
-        }
-      } else {
-        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-      }
-      out += ' } ';
-      $errSchemaPath = $currErrSchemaPath;
-      if ($breakOnError) {
-        $closingBraces += '}';
-        out += ' else { ';
-      }
-    }
-    var arr1 = $schema;
-    if (arr1) {
-      var $sch, $i = -1,
-        l1 = arr1.length - 1;
-      while ($i < l1) {
-        $sch = arr1[$i += 1];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($i) + ') { ';
-          var $passData = $data + '[' + $i + ']';
-          $it.schema = $sch;
-          $it.schemaPath = $schemaPath + '[' + $i + ']';
-          $it.errSchemaPath = $errSchemaPath + '/' + $i;
-          $it.errorPath = it.util.getPathExpr(it.errorPath, $i, it.opts.jsonPointers, true);
-          $it.dataPathArr[$dataNxt] = $i;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          out += ' }  ';
-          if ($breakOnError) {
-            out += ' if (' + ($nextValid) + ') { ';
-            $closingBraces += '}';
-          }
-        }
-      }
-    }
-    if (typeof $additionalItems == 'object' && it.util.schemaHasRules($additionalItems, it.RULES.all)) {
-      $it.schema = $additionalItems;
-      $it.schemaPath = it.schemaPath + '.additionalItems';
-      $it.errSchemaPath = it.errSchemaPath + '/additionalItems';
-      out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($schema.length) + ') {  for (var ' + ($idx) + ' = ' + ($schema.length) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
-      $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
-      var $passData = $data + '[' + $idx + ']';
-      $it.dataPathArr[$dataNxt] = $idx;
-      var $code = it.validate($it);
-      $it.baseId = $currentBaseId;
-      if (it.util.varOccurences($code, $nextData) < 2) {
-        out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-      } else {
-        out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-      }
-      if ($breakOnError) {
-        out += ' if (!' + ($nextValid) + ') break; ';
-      }
-      out += ' } }  ';
-      if ($breakOnError) {
-        out += ' if (' + ($nextValid) + ') { ';
-        $closingBraces += '}';
-      }
-    }
-  } else if (it.util.schemaHasRules($schema, it.RULES.all)) {
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    out += '  for (var ' + ($idx) + ' = ' + (0) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
-    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
-    var $passData = $data + '[' + $idx + ']';
-    $it.dataPathArr[$dataNxt] = $idx;
-    var $code = it.validate($it);
-    $it.baseId = $currentBaseId;
-    if (it.util.varOccurences($code, $nextData) < 2) {
-      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-    } else {
-      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-    }
-    if ($breakOnError) {
-      out += ' if (!' + ($nextValid) + ') break; ';
-    }
-    out += ' }';
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 490 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_multipleOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  out += 'var division' + ($lvl) + ';if (';
-  if ($isData) {
-    out += ' ' + ($schemaValue) + ' !== undefined && ( typeof ' + ($schemaValue) + ' != \'number\' || ';
-  }
-  out += ' (division' + ($lvl) + ' = ' + ($data) + ' / ' + ($schemaValue) + ', ';
-  if (it.opts.multipleOfPrecision) {
-    out += ' Math.abs(Math.round(division' + ($lvl) + ') - division' + ($lvl) + ') > 1e-' + (it.opts.multipleOfPrecision) + ' ';
-  } else {
-    out += ' division' + ($lvl) + ' !== parseInt(division' + ($lvl) + ') ';
-  }
-  out += ' ) ';
-  if ($isData) {
-    out += '  )  ';
-  }
-  out += ' ) {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('multipleOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { multipleOf: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be multiple of ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue);
-      } else {
-        out += '' + ($schemaValue) + '\'';
-      }
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 491 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_not(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  if (it.util.schemaHasRules($schema, it.RULES.all)) {
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    out += ' var ' + ($errs) + ' = errors;  ';
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    $it.createErrors = false;
-    var $allErrorsOption;
-    if ($it.opts.allErrors) {
-      $allErrorsOption = $it.opts.allErrors;
-      $it.opts.allErrors = false;
-    }
-    out += ' ' + (it.validate($it)) + ' ';
-    $it.createErrors = true;
-    if ($allErrorsOption) $it.opts.allErrors = $allErrorsOption;
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' if (' + ($nextValid) + ') {   ';
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should NOT be valid\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
-    if (it.opts.allErrors) {
-      out += ' } ';
-    }
-  } else {
-    out += '  var err =   '; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should NOT be valid\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    if ($breakOnError) {
-      out += ' if (false) { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 492 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_oneOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  out += 'var ' + ($errs) + ' = errors;var prevValid' + ($lvl) + ' = false;var ' + ($valid) + ' = false;';
-  var $currentBaseId = $it.baseId;
-  var $wasComposite = it.compositeRule;
-  it.compositeRule = $it.compositeRule = true;
-  var arr1 = $schema;
-  if (arr1) {
-    var $sch, $i = -1,
-      l1 = arr1.length - 1;
-    while ($i < l1) {
-      $sch = arr1[$i += 1];
-      if (it.util.schemaHasRules($sch, it.RULES.all)) {
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + '[' + $i + ']';
-        $it.errSchemaPath = $errSchemaPath + '/' + $i;
-        out += '  ' + (it.validate($it)) + ' ';
-        $it.baseId = $currentBaseId;
-      } else {
-        out += ' var ' + ($nextValid) + ' = true; ';
-      }
-      if ($i) {
-        out += ' if (' + ($nextValid) + ' && prevValid' + ($lvl) + ') ' + ($valid) + ' = false; else { ';
-        $closingBraces += '}';
-      }
-      out += ' if (' + ($nextValid) + ') ' + ($valid) + ' = prevValid' + ($lvl) + ' = true;';
-    }
-  }
-  it.compositeRule = $it.compositeRule = $wasComposite;
-  out += '' + ($closingBraces) + 'if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('oneOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should match exactly one schema in oneOf\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError(vErrors); ';
-    } else {
-      out += ' validate.errors = vErrors; return false; ';
-    }
-  }
-  out += '} else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; }';
-  if (it.opts.allErrors) {
-    out += ' } ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 493 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_pattern(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $regexp = $isData ? '(new RegExp(' + $schemaValue + '))' : it.usePattern($schema);
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
-  }
-  out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('pattern') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { pattern:  ';
-    if ($isData) {
-      out += '' + ($schemaValue);
-    } else {
-      out += '' + (it.util.toQuotedString($schema));
-    }
-    out += '  } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should match pattern "';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + (it.util.escapeQuotes($schema));
-      }
-      out += '"\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + (it.util.toQuotedString($schema));
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 494 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_properties(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $key = 'key' + $lvl,
-    $idx = 'idx' + $lvl,
-    $dataNxt = $it.dataLevel = it.dataLevel + 1,
-    $nextData = 'data' + $dataNxt,
-    $dataProperties = 'dataProperties' + $lvl;
-  var $schemaKeys = Object.keys($schema || {}),
-    $pProperties = it.schema.patternProperties || {},
-    $pPropertyKeys = Object.keys($pProperties),
-    $aProperties = it.schema.additionalProperties,
-    $someProperties = $schemaKeys.length || $pPropertyKeys.length,
-    $noAdditional = $aProperties === false,
-    $additionalIsSchema = typeof $aProperties == 'object' && Object.keys($aProperties).length,
-    $removeAdditional = it.opts.removeAdditional,
-    $checkAdditional = $noAdditional || $additionalIsSchema || $removeAdditional,
-    $ownProperties = it.opts.ownProperties,
-    $currentBaseId = it.baseId;
-  var $required = it.schema.required;
-  if ($required && !(it.opts.v5 && $required.$data) && $required.length < it.opts.loopRequired) var $requiredHash = it.util.toHash($required);
-  if (it.opts.patternGroups) {
-    var $pgProperties = it.schema.patternGroups || {},
-      $pgPropertyKeys = Object.keys($pgProperties);
-  }
-  out += 'var ' + ($errs) + ' = errors;var ' + ($nextValid) + ' = true;';
-  if ($ownProperties) {
-    out += ' var ' + ($dataProperties) + ' = undefined;';
-  }
-  if ($checkAdditional) {
-    if ($ownProperties) {
-      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-    } else {
-      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-    }
-    if ($someProperties) {
-      out += ' var isAdditional' + ($lvl) + ' = !(false ';
-      if ($schemaKeys.length) {
-        if ($schemaKeys.length > 5) {
-          out += ' || validate.schema' + ($schemaPath) + '[' + ($key) + '] ';
-        } else {
-          var arr1 = $schemaKeys;
-          if (arr1) {
-            var $propertyKey, i1 = -1,
-              l1 = arr1.length - 1;
-            while (i1 < l1) {
-              $propertyKey = arr1[i1 += 1];
-              out += ' || ' + ($key) + ' == ' + (it.util.toQuotedString($propertyKey)) + ' ';
-            }
-          }
-        }
-      }
-      if ($pPropertyKeys.length) {
-        var arr2 = $pPropertyKeys;
-        if (arr2) {
-          var $pProperty, $i = -1,
-            l2 = arr2.length - 1;
-          while ($i < l2) {
-            $pProperty = arr2[$i += 1];
-            out += ' || ' + (it.usePattern($pProperty)) + '.test(' + ($key) + ') ';
-          }
-        }
-      }
-      if (it.opts.patternGroups && $pgPropertyKeys.length) {
-        var arr3 = $pgPropertyKeys;
-        if (arr3) {
-          var $pgProperty, $i = -1,
-            l3 = arr3.length - 1;
-          while ($i < l3) {
-            $pgProperty = arr3[$i += 1];
-            out += ' || ' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ') ';
-          }
-        }
-      }
-      out += ' ); if (isAdditional' + ($lvl) + ') { ';
-    }
-    if ($removeAdditional == 'all') {
-      out += ' delete ' + ($data) + '[' + ($key) + ']; ';
-    } else {
-      var $currentErrorPath = it.errorPath;
-      var $additionalProperty = '\' + ' + $key + ' + \'';
-      if (it.opts._errorDataPathProperty) {
-        it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-      }
-      if ($noAdditional) {
-        if ($removeAdditional) {
-          out += ' delete ' + ($data) + '[' + ($key) + ']; ';
-        } else {
-          out += ' ' + ($nextValid) + ' = false; ';
-          var $currErrSchemaPath = $errSchemaPath;
-          $errSchemaPath = it.errSchemaPath + '/additionalProperties';
-          var $$outStack = $$outStack || [];
-          $$outStack.push(out);
-          out = ''; /* istanbul ignore else */
-          if (it.createErrors !== false) {
-            out += ' { keyword: \'' + ('additionalProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { additionalProperty: \'' + ($additionalProperty) + '\' } ';
-            if (it.opts.messages !== false) {
-              out += ' , message: \'should NOT have additional properties\' ';
-            }
-            if (it.opts.verbose) {
-              out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-            }
-            out += ' } ';
-          } else {
-            out += ' {} ';
-          }
-          var __err = out;
-          out = $$outStack.pop();
-          if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-            if (it.async) {
-              out += ' throw new ValidationError([' + (__err) + ']); ';
-            } else {
-              out += ' validate.errors = [' + (__err) + ']; return false; ';
-            }
-          } else {
-            out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-          }
-          $errSchemaPath = $currErrSchemaPath;
-          if ($breakOnError) {
-            out += ' break; ';
-          }
-        }
-      } else if ($additionalIsSchema) {
-        if ($removeAdditional == 'failing') {
-          out += ' var ' + ($errs) + ' = errors;  ';
-          var $wasComposite = it.compositeRule;
-          it.compositeRule = $it.compositeRule = true;
-          $it.schema = $aProperties;
-          $it.schemaPath = it.schemaPath + '.additionalProperties';
-          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
-          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          out += ' if (!' + ($nextValid) + ') { errors = ' + ($errs) + '; if (validate.errors !== null) { if (errors) validate.errors.length = errors; else validate.errors = null; } delete ' + ($data) + '[' + ($key) + ']; }  ';
-          it.compositeRule = $it.compositeRule = $wasComposite;
-        } else {
-          $it.schema = $aProperties;
-          $it.schemaPath = it.schemaPath + '.additionalProperties';
-          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
-          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          if ($breakOnError) {
-            out += ' if (!' + ($nextValid) + ') break; ';
-          }
-        }
-      }
-      it.errorPath = $currentErrorPath;
-    }
-    if ($someProperties) {
-      out += ' } ';
-    }
-    out += ' }  ';
-    if ($breakOnError) {
-      out += ' if (' + ($nextValid) + ') { ';
-      $closingBraces += '}';
-    }
-  }
-  var $useDefaults = it.opts.useDefaults && !it.compositeRule;
-  if ($schemaKeys.length) {
-    var arr4 = $schemaKeys;
-    if (arr4) {
-      var $propertyKey, i4 = -1,
-        l4 = arr4.length - 1;
-      while (i4 < l4) {
-        $propertyKey = arr4[i4 += 1];
-        var $sch = $schema[$propertyKey];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          var $prop = it.util.getProperty($propertyKey),
-            $passData = $data + $prop,
-            $hasDefault = $useDefaults && $sch.default !== undefined;
-          $it.schema = $sch;
-          $it.schemaPath = $schemaPath + $prop;
-          $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($propertyKey);
-          $it.errorPath = it.util.getPath(it.errorPath, $propertyKey, it.opts.jsonPointers);
-          $it.dataPathArr[$dataNxt] = it.util.toQuotedString($propertyKey);
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            $code = it.util.varReplace($code, $nextData, $passData);
-            var $useData = $passData;
-          } else {
-            var $useData = $nextData;
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ';
-          }
-          if ($hasDefault) {
-            out += ' ' + ($code) + ' ';
-          } else {
-            if ($requiredHash && $requiredHash[$propertyKey]) {
-              out += ' if ( ' + ($useData) + ' === undefined ';
-              if ($ownProperties) {
-                out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-              }
-              out += ') { ' + ($nextValid) + ' = false; ';
-              var $currentErrorPath = it.errorPath,
-                $currErrSchemaPath = $errSchemaPath,
-                $missingProperty = it.util.escapeQuotes($propertyKey);
-              if (it.opts._errorDataPathProperty) {
-                it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
-              }
-              $errSchemaPath = it.errSchemaPath + '/required';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'';
-                  if (it.opts._errorDataPathProperty) {
-                    out += 'is a required property';
-                  } else {
-                    out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-                  }
-                  out += '\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              $errSchemaPath = $currErrSchemaPath;
-              it.errorPath = $currentErrorPath;
-              out += ' } else { ';
-            } else {
-              if ($breakOnError) {
-                out += ' if ( ' + ($useData) + ' === undefined ';
-                if ($ownProperties) {
-                  out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-                }
-                out += ') { ' + ($nextValid) + ' = true; } else { ';
-              } else {
-                out += ' if (' + ($useData) + ' !== undefined ';
-                if ($ownProperties) {
-                  out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-                }
-                out += ' ) { ';
-              }
-            }
-            out += ' ' + ($code) + ' } ';
-          }
-        }
-        if ($breakOnError) {
-          out += ' if (' + ($nextValid) + ') { ';
-          $closingBraces += '}';
-        }
-      }
-    }
-  }
-  if ($pPropertyKeys.length) {
-    var arr5 = $pPropertyKeys;
-    if (arr5) {
-      var $pProperty, i5 = -1,
-        l5 = arr5.length - 1;
-      while (i5 < l5) {
-        $pProperty = arr5[i5 += 1];
-        var $sch = $pProperties[$pProperty];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          $it.schema = $sch;
-          $it.schemaPath = it.schemaPath + '.patternProperties' + it.util.getProperty($pProperty);
-          $it.errSchemaPath = it.errSchemaPath + '/patternProperties/' + it.util.escapeFragment($pProperty);
-          if ($ownProperties) {
-            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-          } else {
-            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-          }
-          out += ' if (' + (it.usePattern($pProperty)) + '.test(' + ($key) + ')) { ';
-          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          if ($breakOnError) {
-            out += ' if (!' + ($nextValid) + ') break; ';
-          }
-          out += ' } ';
-          if ($breakOnError) {
-            out += ' else ' + ($nextValid) + ' = true; ';
-          }
-          out += ' }  ';
-          if ($breakOnError) {
-            out += ' if (' + ($nextValid) + ') { ';
-            $closingBraces += '}';
-          }
-        }
-      }
-    }
-  }
-  if (it.opts.patternGroups && $pgPropertyKeys.length) {
-    var arr6 = $pgPropertyKeys;
-    if (arr6) {
-      var $pgProperty, i6 = -1,
-        l6 = arr6.length - 1;
-      while (i6 < l6) {
-        $pgProperty = arr6[i6 += 1];
-        var $pgSchema = $pgProperties[$pgProperty],
-          $sch = $pgSchema.schema;
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          $it.schema = $sch;
-          $it.schemaPath = it.schemaPath + '.patternGroups' + it.util.getProperty($pgProperty) + '.schema';
-          $it.errSchemaPath = it.errSchemaPath + '/patternGroups/' + it.util.escapeFragment($pgProperty) + '/schema';
-          out += ' var pgPropCount' + ($lvl) + ' = 0;  ';
-          if ($ownProperties) {
-            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-          } else {
-            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-          }
-          out += ' if (' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ')) { pgPropCount' + ($lvl) + '++; ';
-          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          if ($breakOnError) {
-            out += ' if (!' + ($nextValid) + ') break; ';
-          }
-          out += ' } ';
-          if ($breakOnError) {
-            out += ' else ' + ($nextValid) + ' = true; ';
-          }
-          out += ' }  ';
-          if ($breakOnError) {
-            out += ' if (' + ($nextValid) + ') { ';
-            $closingBraces += '}';
-          }
-          var $pgMin = $pgSchema.minimum,
-            $pgMax = $pgSchema.maximum;
-          if ($pgMin !== undefined || $pgMax !== undefined) {
-            out += ' var ' + ($valid) + ' = true; ';
-            var $currErrSchemaPath = $errSchemaPath;
-            if ($pgMin !== undefined) {
-              var $limit = $pgMin,
-                $reason = 'minimum',
-                $moreOrLess = 'less';
-              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' >= ' + ($pgMin) + '; ';
-              $errSchemaPath = it.errSchemaPath + '/patternGroups/minimum';
-              out += '  if (!' + ($valid) + ') {   ';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              out += ' } ';
-              if ($pgMax !== undefined) {
-                out += ' else ';
-              }
-            }
-            if ($pgMax !== undefined) {
-              var $limit = $pgMax,
-                $reason = 'maximum',
-                $moreOrLess = 'more';
-              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' <= ' + ($pgMax) + '; ';
-              $errSchemaPath = it.errSchemaPath + '/patternGroups/maximum';
-              out += '  if (!' + ($valid) + ') {   ';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              out += ' } ';
-            }
-            $errSchemaPath = $currErrSchemaPath;
-            if ($breakOnError) {
-              out += ' if (' + ($valid) + ') { ';
-              $closingBraces += '}';
-            }
-          }
-        }
-      }
-    }
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 495 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_propertyNames(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  if (it.util.schemaHasRules($schema, it.RULES.all)) {
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    var $key = 'key' + $lvl,
-      $idx = 'idx' + $lvl,
-      $i = 'i' + $lvl,
-      $invalidName = '\' + ' + $key + ' + \'',
-      $dataNxt = $it.dataLevel = it.dataLevel + 1,
-      $nextData = 'data' + $dataNxt,
-      $dataProperties = 'dataProperties' + $lvl,
-      $ownProperties = it.opts.ownProperties,
-      $currentBaseId = it.baseId;
-    out += ' var ' + ($errs) + ' = errors; ';
-    if ($ownProperties) {
-      out += ' var ' + ($dataProperties) + ' = undefined; ';
-    }
-    if ($ownProperties) {
-      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-    } else {
-      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-    }
-    out += ' var startErrs' + ($lvl) + ' = errors; ';
-    var $passData = $key;
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    var $code = it.validate($it);
-    $it.baseId = $currentBaseId;
-    if (it.util.varOccurences($code, $nextData) < 2) {
-      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-    } else {
-      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-    }
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' if (!' + ($nextValid) + ') { for (var ' + ($i) + '=startErrs' + ($lvl) + '; ' + ($i) + '<errors; ' + ($i) + '++) { vErrors[' + ($i) + '].propertyName = ' + ($key) + '; }   var err =   '; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('propertyNames') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { propertyName: \'' + ($invalidName) + '\' } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'property name \\\'' + ($invalidName) + '\\\' is invalid\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError(vErrors); ';
-      } else {
-        out += ' validate.errors = vErrors; return false; ';
-      }
-    }
-    if ($breakOnError) {
-      out += ' break; ';
-    }
-    out += ' } }';
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 496 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_ref(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $async, $refCode;
-  if ($schema == '#' || $schema == '#/') {
-    if (it.isRoot) {
-      $async = it.async;
-      $refCode = 'validate';
-    } else {
-      $async = it.root.schema.$async === true;
-      $refCode = 'root.refVal[0]';
-    }
-  } else {
-    var $refVal = it.resolveRef(it.baseId, $schema, it.isRoot);
-    if ($refVal === undefined) {
-      var $message = it.MissingRefError.message(it.baseId, $schema);
-      if (it.opts.missingRefs == 'fail') {
-        it.logger.error($message);
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('$ref') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { ref: \'' + (it.util.escapeQuotes($schema)) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'can\\\'t resolve reference ' + (it.util.escapeQuotes($schema)) + '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: ' + (it.util.toQuotedString($schema)) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        if ($breakOnError) {
-          out += ' if (false) { ';
-        }
-      } else if (it.opts.missingRefs == 'ignore') {
-        it.logger.warn($message);
-        if ($breakOnError) {
-          out += ' if (true) { ';
-        }
-      } else {
-        throw new it.MissingRefError(it.baseId, $schema, $message);
-      }
-    } else if ($refVal.inline) {
-      var $it = it.util.copy(it);
-      $it.level++;
-      var $nextValid = 'valid' + $it.level;
-      $it.schema = $refVal.schema;
-      $it.schemaPath = '';
-      $it.errSchemaPath = $schema;
-      var $code = it.validate($it).replace(/validate\.schema/g, $refVal.code);
-      out += ' ' + ($code) + ' ';
-      if ($breakOnError) {
-        out += ' if (' + ($nextValid) + ') { ';
-      }
-    } else {
-      $async = $refVal.$async === true;
-      $refCode = $refVal.code;
-    }
-  }
-  if ($refCode) {
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = '';
-    if (it.opts.passContext) {
-      out += ' ' + ($refCode) + '.call(this, ';
-    } else {
-      out += ' ' + ($refCode) + '( ';
-    }
-    out += ' ' + ($data) + ', (dataPath || \'\')';
-    if (it.errorPath != '""') {
-      out += ' + ' + (it.errorPath);
-    }
-    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
-      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
-    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ', rootData)  ';
-    var __callValidate = out;
-    out = $$outStack.pop();
-    if ($async) {
-      if (!it.async) throw new Error('async schema referenced by sync schema');
-      if ($breakOnError) {
-        out += ' var ' + ($valid) + '; ';
-      }
-      out += ' try { ' + (it.yieldAwait) + ' ' + (__callValidate) + '; ';
-      if ($breakOnError) {
-        out += ' ' + ($valid) + ' = true; ';
-      }
-      out += ' } catch (e) { if (!(e instanceof ValidationError)) throw e; if (vErrors === null) vErrors = e.errors; else vErrors = vErrors.concat(e.errors); errors = vErrors.length; ';
-      if ($breakOnError) {
-        out += ' ' + ($valid) + ' = false; ';
-      }
-      out += ' } ';
-      if ($breakOnError) {
-        out += ' if (' + ($valid) + ') { ';
-      }
-    } else {
-      out += ' if (!' + (__callValidate) + ') { if (vErrors === null) vErrors = ' + ($refCode) + '.errors; else vErrors = vErrors.concat(' + ($refCode) + '.errors); errors = vErrors.length; } ';
-      if ($breakOnError) {
-        out += ' else { ';
-      }
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 497 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_required(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $vSchema = 'schema' + $lvl;
-  if (!$isData) {
-    if ($schema.length < it.opts.loopRequired && it.schema.properties && Object.keys(it.schema.properties).length) {
-      var $required = [];
-      var arr1 = $schema;
-      if (arr1) {
-        var $property, i1 = -1,
-          l1 = arr1.length - 1;
-        while (i1 < l1) {
-          $property = arr1[i1 += 1];
-          var $propertySch = it.schema.properties[$property];
-          if (!($propertySch && it.util.schemaHasRules($propertySch, it.RULES.all))) {
-            $required[$required.length] = $property;
-          }
-        }
-      }
-    } else {
-      var $required = $schema;
-    }
-  }
-  if ($isData || $required.length) {
-    var $currentErrorPath = it.errorPath,
-      $loopRequired = $isData || $required.length >= it.opts.loopRequired,
-      $ownProperties = it.opts.ownProperties;
-    if ($breakOnError) {
-      out += ' var missing' + ($lvl) + '; ';
-      if ($loopRequired) {
-        if (!$isData) {
-          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
-        }
-        var $i = 'i' + $lvl,
-          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
-        }
-        out += ' var ' + ($valid) + ' = true; ';
-        if ($isData) {
-          out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
-        }
-        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { ' + ($valid) + ' = ' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] !== undefined ';
-        if ($ownProperties) {
-          out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
-        }
-        out += '; if (!' + ($valid) + ') break; } ';
-        if ($isData) {
-          out += '  }  ';
-        }
-        out += '  if (!' + ($valid) + ') {   ';
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'';
-            if (it.opts._errorDataPathProperty) {
-              out += 'is a required property';
-            } else {
-              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        out += ' } else { ';
-      } else {
-        out += ' if ( ';
-        var arr2 = $required;
-        if (arr2) {
-          var $propertyKey, $i = -1,
-            l2 = arr2.length - 1;
-          while ($i < l2) {
-            $propertyKey = arr2[$i += 1];
-            if ($i) {
-              out += ' || ';
-            }
-            var $prop = it.util.getProperty($propertyKey),
-              $useData = $data + $prop;
-            out += ' ( ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
-          }
-        }
-        out += ') {  ';
-        var $propertyPath = 'missing' + $lvl,
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
-        }
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'';
-            if (it.opts._errorDataPathProperty) {
-              out += 'is a required property';
-            } else {
-              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        out += ' } else { ';
-      }
-    } else {
-      if ($loopRequired) {
-        if (!$isData) {
-          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
-        }
-        var $i = 'i' + $lvl,
-          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
-        }
-        if ($isData) {
-          out += ' if (' + ($vSchema) + ' && !Array.isArray(' + ($vSchema) + ')) {  var err =   '; /* istanbul ignore else */
-          if (it.createErrors !== false) {
-            out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-            if (it.opts.messages !== false) {
-              out += ' , message: \'';
-              if (it.opts._errorDataPathProperty) {
-                out += 'is a required property';
-              } else {
-                out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-              }
-              out += '\' ';
-            }
-            if (it.opts.verbose) {
-              out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-            }
-            out += ' } ';
-          } else {
-            out += ' {} ';
-          }
-          out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } else if (' + ($vSchema) + ' !== undefined) { ';
-        }
-        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { if (' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] === undefined ';
-        if ($ownProperties) {
-          out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
-        }
-        out += ') {  var err =   '; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'';
-            if (it.opts._errorDataPathProperty) {
-              out += 'is a required property';
-            } else {
-              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } } ';
-        if ($isData) {
-          out += '  }  ';
-        }
-      } else {
-        var arr3 = $required;
-        if (arr3) {
-          var $propertyKey, i3 = -1,
-            l3 = arr3.length - 1;
-          while (i3 < l3) {
-            $propertyKey = arr3[i3 += 1];
-            var $prop = it.util.getProperty($propertyKey),
-              $missingProperty = it.util.escapeQuotes($propertyKey),
-              $useData = $data + $prop;
-            if (it.opts._errorDataPathProperty) {
-              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
-            }
-            out += ' if ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') {  var err =   '; /* istanbul ignore else */
-            if (it.createErrors !== false) {
-              out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-              if (it.opts.messages !== false) {
-                out += ' , message: \'';
-                if (it.opts._errorDataPathProperty) {
-                  out += 'is a required property';
-                } else {
-                  out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-                }
-                out += '\' ';
-              }
-              if (it.opts.verbose) {
-                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-              }
-              out += ' } ';
-            } else {
-              out += ' {} ';
-            }
-            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
-          }
-        }
-      }
-    }
-    it.errorPath = $currentErrorPath;
-  } else if ($breakOnError) {
-    out += ' if (true) {';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 498 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_uniqueItems(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  if (($schema || $isData) && it.opts.uniqueItems !== false) {
-    if ($isData) {
-      out += ' var ' + ($valid) + '; if (' + ($schemaValue) + ' === false || ' + ($schemaValue) + ' === undefined) ' + ($valid) + ' = true; else if (typeof ' + ($schemaValue) + ' != \'boolean\') ' + ($valid) + ' = false; else { ';
-    }
-    out += ' var ' + ($valid) + ' = true; if (' + ($data) + '.length > 1) { var i = ' + ($data) + '.length, j; outer: for (;i--;) { for (j = i; j--;) { if (equal(' + ($data) + '[i], ' + ($data) + '[j])) { ' + ($valid) + ' = false; break outer; } } } } ';
-    if ($isData) {
-      out += '  }  ';
-    }
-    out += ' if (!' + ($valid) + ') {   ';
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('uniqueItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { i: i, j: j } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should NOT have duplicate items (items ## \' + j + \' and \' + i + \' are identical)\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema:  ';
-        if ($isData) {
-          out += 'validate.schema' + ($schemaPath);
-        } else {
-          out += '' + ($schema);
-        }
-        out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    out += ' } ';
-    if ($breakOnError) {
-      out += ' else { ';
-    }
-  } else {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 499 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
-var customRuleCode = __webpack_require__(485);
-
-module.exports = {
-  add: addKeyword,
-  get: getKeyword,
-  remove: removeKeyword
-};
-
-/**
- * Define custom keyword
- * @this  Ajv
- * @param {String} keyword custom keyword, should be unique (including different from all standard, custom and macro keywords).
- * @param {Object} definition keyword definition object with properties `type` (type(s) which the keyword applies to), `validate` or `compile`.
- * @return {Ajv} this for method chaining
- */
-function addKeyword(keyword, definition) {
-  /* jshint validthis: true */
-  /* eslint no-shadow: 0 */
-  var RULES = this.RULES;
-
-  if (RULES.keywords[keyword])
-    throw new Error('Keyword ' + keyword + ' is already defined');
-
-  if (!IDENTIFIER.test(keyword))
-    throw new Error('Keyword ' + keyword + ' is not a valid identifier');
-
-  if (definition) {
-    if (definition.macro && definition.valid !== undefined)
-      throw new Error('"valid" option cannot be used with macro keywords');
-
-    var dataType = definition.type;
-    if (Array.isArray(dataType)) {
-      var i, len = dataType.length;
-      for (i=0; i<len; i++) checkDataType(dataType[i]);
-      for (i=0; i<len; i++) _addRule(keyword, dataType[i], definition);
-    } else {
-      if (dataType) checkDataType(dataType);
-      _addRule(keyword, dataType, definition);
-    }
-
-    var $data = definition.$data === true && this._opts.$data;
-    if ($data && !definition.validate)
-      throw new Error('$data support: "validate" function is not defined');
-
-    var metaSchema = definition.metaSchema;
-    if (metaSchema) {
-      if ($data) {
-        metaSchema = {
-          anyOf: [
-            metaSchema,
-            { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
-          ]
-        };
-      }
-      definition.validateSchema = this.compile(metaSchema, true);
-    }
-  }
-
-  RULES.keywords[keyword] = RULES.all[keyword] = true;
-
-
-  function _addRule(keyword, dataType, definition) {
-    var ruleGroup;
-    for (var i=0; i<RULES.length; i++) {
-      var rg = RULES[i];
-      if (rg.type == dataType) {
-        ruleGroup = rg;
-        break;
-      }
-    }
-
-    if (!ruleGroup) {
-      ruleGroup = { type: dataType, rules: [] };
-      RULES.push(ruleGroup);
-    }
-
-    var rule = {
-      keyword: keyword,
-      definition: definition,
-      custom: true,
-      code: customRuleCode,
-      implements: definition.implements
-    };
-    ruleGroup.rules.push(rule);
-    RULES.custom[keyword] = rule;
-  }
-
-
-  function checkDataType(dataType) {
-    if (!RULES.types[dataType]) throw new Error('Unknown type ' + dataType);
-  }
-
-  return this;
-}
-
-
-/**
- * Get keyword
- * @this  Ajv
- * @param {String} keyword pre-defined or custom keyword.
- * @return {Object|Boolean} custom keyword definition, `true` if it is a predefined keyword, `false` otherwise.
- */
-function getKeyword(keyword) {
-  /* jshint validthis: true */
-  var rule = this.RULES.custom[keyword];
-  return rule ? rule.definition : this.RULES.keywords[keyword] || false;
-}
-
-
-/**
- * Remove keyword
- * @this  Ajv
- * @param {String} keyword pre-defined or custom keyword.
- * @return {Ajv} this for method chaining
- */
-function removeKeyword(keyword) {
-  /* jshint validthis: true */
-  var RULES = this.RULES;
-  delete RULES.keywords[keyword];
-  delete RULES.all[keyword];
-  delete RULES.custom[keyword];
-  for (var i=0; i<RULES.length; i++) {
-    var rules = RULES[i].rules;
-    for (var j=0; j<rules.length; j++) {
-      if (rules[j].keyword == keyword) {
-        rules.splice(j, 1);
-        break;
-      }
-    }
-  }
-  return this;
-}
-
-
-/***/ }),
-/* 500 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
-
-module.exports = function (ajv) {
-  var defaultMeta = ajv._opts.defaultMeta;
-  var metaSchemaRef = typeof defaultMeta == 'string'
-                      ? { $ref: defaultMeta }
-                      : ajv.getSchema(META_SCHEMA_ID)
-                        ? { $ref: META_SCHEMA_ID }
-                        : {};
-
-  ajv.addKeyword('patternGroups', {
-    // implemented in properties.jst
-    metaSchema: {
-      type: 'object',
-      additionalProperties: {
-        type: 'object',
-        required: [ 'schema' ],
-        properties: {
-          maximum: {
-            type: 'integer',
-            minimum: 0
-          },
-          minimum: {
-            type: 'integer',
-            minimum: 0
-          },
-          schema: metaSchemaRef
-        },
-        additionalProperties: false
-      }
-    }
-  });
-  ajv.RULES.all.properties.implements.push('patternGroups');
-};
-
-
-/***/ }),
-/* 501 */
-/***/ (function(module, exports) {
-
-module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false}
-
-/***/ }),
-/* 502 */
-/***/ (function(module, exports) {
-
-module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"http://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"examples":{"type":"array","items":{}},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}}
-
-/***/ }),
-/* 503 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var traverse = module.exports = function (schema, opts, cb) {
-  if (typeof opts == 'function') {
-    cb = opts;
-    opts = {};
-  }
-  _traverse(opts, cb, schema, '', schema);
-};
-
-
-traverse.keywords = {
-  additionalItems: true,
-  items: true,
-  contains: true,
-  additionalProperties: true,
-  propertyNames: true,
-  not: true
-};
-
-traverse.arrayKeywords = {
-  items: true,
-  allOf: true,
-  anyOf: true,
-  oneOf: true
-};
-
-traverse.propsKeywords = {
-  definitions: true,
-  properties: true,
-  patternProperties: true,
-  dependencies: true
-};
-
-traverse.skipKeywords = {
-  enum: true,
-  const: true,
-  required: true,
-  maximum: true,
-  minimum: true,
-  exclusiveMaximum: true,
-  exclusiveMinimum: true,
-  multipleOf: true,
-  maxLength: true,
-  minLength: true,
-  pattern: true,
-  format: true,
-  maxItems: true,
-  minItems: true,
-  uniqueItems: true,
-  maxProperties: true,
-  minProperties: true
-};
-
-
-function _traverse(opts, cb, schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
-  if (schema && typeof schema == 'object' && !Array.isArray(schema)) {
-    cb(schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex);
-    for (var key in schema) {
-      var sch = schema[key];
-      if (Array.isArray(sch)) {
-        if (key in traverse.arrayKeywords) {
-          for (var i=0; i<sch.length; i++)
-            _traverse(opts, cb, sch[i], jsonPtr + '/' + key + '/' + i, rootSchema, jsonPtr, key, schema, i);
-        }
-      } else if (key in traverse.propsKeywords) {
-        if (sch && typeof sch == 'object') {
-          for (var prop in sch)
-            _traverse(opts, cb, sch[prop], jsonPtr + '/' + key + '/' + escapeJsonPtr(prop), rootSchema, jsonPtr, key, schema, prop);
-        }
-      } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
-        _traverse(opts, cb, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
-      }
-    }
-  }
-}
-
-
-function escapeJsonPtr(str) {
-  return str.replace(/~/g, '~0').replace(/\//g, '~1');
-}
-
-
-/***/ }),
-/* 504 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const x = module.exports;
-const ESC = '\u001B[';
-const OSC = '\u001B]';
-const BEL = '\u0007';
-const SEP = ';';
-const isTerminalApp = process.env.TERM_PROGRAM === 'Apple_Terminal';
-
-x.cursorTo = (x, y) => {
-	if (typeof x !== 'number') {
-		throw new TypeError('The `x` argument is required');
-	}
-
-	if (typeof y !== 'number') {
-		return ESC + (x + 1) + 'G';
-	}
-
-	return ESC + (y + 1) + ';' + (x + 1) + 'H';
-};
-
-x.cursorMove = (x, y) => {
-	if (typeof x !== 'number') {
-		throw new TypeError('The `x` argument is required');
-	}
-
-	let ret = '';
-
-	if (x < 0) {
-		ret += ESC + (-x) + 'D';
-	} else if (x > 0) {
-		ret += ESC + x + 'C';
-	}
-
-	if (y < 0) {
-		ret += ESC + (-y) + 'A';
-	} else if (y > 0) {
-		ret += ESC + y + 'B';
-	}
-
-	return ret;
-};
-
-x.cursorUp = count => ESC + (typeof count === 'number' ? count : 1) + 'A';
-x.cursorDown = count => ESC + (typeof count === 'number' ? count : 1) + 'B';
-x.cursorForward = count => ESC + (typeof count === 'number' ? count : 1) + 'C';
-x.cursorBackward = count => ESC + (typeof count === 'number' ? count : 1) + 'D';
-
-x.cursorLeft = ESC + 'G';
-x.cursorSavePosition = ESC + (isTerminalApp ? '7' : 's');
-x.cursorRestorePosition = ESC + (isTerminalApp ? '8' : 'u');
-x.cursorGetPosition = ESC + '6n';
-x.cursorNextLine = ESC + 'E';
-x.cursorPrevLine = ESC + 'F';
-x.cursorHide = ESC + '?25l';
-x.cursorShow = ESC + '?25h';
-
-x.eraseLines = count => {
-	let clear = '';
-
-	for (let i = 0; i < count; i++) {
-		clear += x.eraseLine + (i < count - 1 ? x.cursorUp() : '');
-	}
-
-	if (count) {
-		clear += x.cursorLeft;
-	}
-
-	return clear;
-};
-
-x.eraseEndLine = ESC + 'K';
-x.eraseStartLine = ESC + '1K';
-x.eraseLine = ESC + '2K';
-x.eraseDown = ESC + 'J';
-x.eraseUp = ESC + '1J';
-x.eraseScreen = ESC + '2J';
-x.scrollUp = ESC + 'S';
-x.scrollDown = ESC + 'T';
-
-x.clearScreen = '\u001Bc';
-x.beep = BEL;
-
-x.link = (text, url) => {
-	return [
-		OSC,
-		'8',
-		SEP,
-		SEP,
-		url,
-		BEL,
-		text,
-		OSC,
-		'8',
-		SEP,
-		SEP,
-		BEL
-	].join('');
-};
-
-x.image = (buf, opts) => {
-	opts = opts || {};
-
-	let ret = OSC + '1337;File=inline=1';
-
-	if (opts.width) {
-		ret += `;width=${opts.width}`;
-	}
-
-	if (opts.height) {
-		ret += `;height=${opts.height}`;
-	}
-
-	if (opts.preserveAspectRatio === false) {
-		ret += ';preserveAspectRatio=0';
-	}
-
-	return ret + ':' + buf.toString('base64') + BEL;
-};
-
-x.iTerm = {};
-
-x.iTerm.setCwd = cwd => OSC + '50;CurrentDir=' + (cwd || process.cwd()) + BEL;
-
-
-/***/ }),
-/* 505 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function () {
-	return /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]/g;
-};
-
-
-/***/ }),
-/* 506 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(608);
-
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
-
-const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
-
-const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
-
-function assembleStyles() {
-	const codes = new Map();
-	const styles = {
-		modifier: {
-			reset: [0, 0],
-			// 21 isn't widely supported and 22 does the same thing
-			bold: [1, 22],
-			dim: [2, 22],
-			italic: [3, 23],
-			underline: [4, 24],
-			inverse: [7, 27],
-			hidden: [8, 28],
-			strikethrough: [9, 29]
-		},
-		color: {
-			black: [30, 39],
-			red: [31, 39],
-			green: [32, 39],
-			yellow: [33, 39],
-			blue: [34, 39],
-			magenta: [35, 39],
-			cyan: [36, 39],
-			white: [37, 39],
-			gray: [90, 39],
-
-			// Bright color
-			redBright: [91, 39],
-			greenBright: [92, 39],
-			yellowBright: [93, 39],
-			blueBright: [94, 39],
-			magentaBright: [95, 39],
-			cyanBright: [96, 39],
-			whiteBright: [97, 39]
-		},
-		bgColor: {
-			bgBlack: [40, 49],
-			bgRed: [41, 49],
-			bgGreen: [42, 49],
-			bgYellow: [43, 49],
-			bgBlue: [44, 49],
-			bgMagenta: [45, 49],
-			bgCyan: [46, 49],
-			bgWhite: [47, 49],
-
-			// Bright color
-			bgBlackBright: [100, 49],
-			bgRedBright: [101, 49],
-			bgGreenBright: [102, 49],
-			bgYellowBright: [103, 49],
-			bgBlueBright: [104, 49],
-			bgMagentaBright: [105, 49],
-			bgCyanBright: [106, 49],
-			bgWhiteBright: [107, 49]
-		}
-	};
-
-	// Fix humans
-	styles.color.grey = styles.color.gray;
-
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
-
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
-
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
-
-			group[styleName] = styles[styleName];
-
-			codes.set(style[0], style[1]);
-		}
-
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
-
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
-	}
-
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
-
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
-
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
-
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
-
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
-
-		const suite = colorConvert[key];
-
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
-
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
-
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
-
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
-
-	return styles;
-}
-
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
-
-/***/ }),
-/* 507 */
-/***/ (function(module, exports) {
-
-function webpackEmptyContext(req) {
-	throw new Error("Cannot find module '" + req + "'.");
-}
-webpackEmptyContext.keys = function() { return []; };
-webpackEmptyContext.resolve = webpackEmptyContext;
-module.exports = webpackEmptyContext;
-webpackEmptyContext.id = 507;
-
-/***/ }),
-/* 508 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-    // global key for user preferred registration
-var REGISTRATION_KEY = '@@any-promise/REGISTRATION',
-    // Prior registration (preferred or detected)
-    registered = null
-
-/**
- * Registers the given implementation.  An implementation must
- * be registered prior to any call to `require("any-promise")`,
- * typically on application load.
- *
- * If called with no arguments, will return registration in
- * following priority:
- *
- * For Node.js:
- *
- * 1. Previous registration
- * 2. global.Promise if node.js version >= 0.12
- * 3. Auto detected promise based on first sucessful require of
- *    known promise libraries. Note this is a last resort, as the
- *    loaded library is non-deterministic. node.js >= 0.12 will
- *    always use global.Promise over this priority list.
- * 4. Throws error.
- *
- * For Browser:
- *
- * 1. Previous registration
- * 2. window.Promise
- * 3. Throws error.
- *
- * Options:
- *
- * Promise: Desired Promise constructor
- * global: Boolean - Should the registration be cached in a global variable to
- * allow cross dependency/bundle registration?  (default true)
- */
-module.exports = function(root, loadImplementation){
-  return function register(implementation, opts){
-    implementation = implementation || null
-    opts = opts || {}
-    // global registration unless explicitly  {global: false} in options (default true)
-    var registerGlobal = opts.global !== false;
-
-    // load any previous global registration
-    if(registered === null && registerGlobal){
-      registered = root[REGISTRATION_KEY] || null
-    }
-
-    if(registered !== null
-        && implementation !== null
-        && registered.implementation !== implementation){
-      // Throw error if attempting to redefine implementation
-      throw new Error('any-promise already defined as "'+registered.implementation+
-        '".  You can only register an implementation before the first '+
-        ' call to require("any-promise") and an implementation cannot be changed')
-    }
-
-    if(registered === null){
-      // use provided implementation
-      if(implementation !== null && typeof opts.Promise !== 'undefined'){
-        registered = {
-          Promise: opts.Promise,
-          implementation: implementation
-        }
-      } else {
-        // require implementation if implementation is specified but not provided
-        registered = loadImplementation(implementation)
-      }
-
-      if(registerGlobal){
-        // register preference globally in case multiple installations
-        root[REGISTRATION_KEY] = registered
-      }
-    }
-
-    return registered
-  }
-}
-
-
-/***/ }),
-/* 509 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = __webpack_require__(508)(global, loadImplementation);
-
-/**
- * Node.js version of loadImplementation.
- *
- * Requires the given implementation and returns the registration
- * containing {Promise, implementation}
- *
- * If implementation is undefined or global.Promise, loads it
- * Otherwise uses require
- */
-function loadImplementation(implementation){
-  var impl = null
-
-  if(shouldPreferGlobalPromise(implementation)){
-    // if no implementation or env specified use global.Promise
-    impl = {
-      Promise: global.Promise,
-      implementation: 'global.Promise'
-    }
-  } else if(implementation){
-    // if implementation specified, require it
-    var lib = !(function webpackMissingModule() { var e = new Error("Cannot find module \".\""); e.code = 'MODULE_NOT_FOUND'; throw e; }())
-    impl = {
-      Promise: lib.Promise || lib,
-      implementation: implementation
-    }
-  } else {
-    // try to auto detect implementation. This is non-deterministic
-    // and should prefer other branches, but this is our last chance
-    // to load something without throwing error
-    impl = tryAutoDetect()
-  }
-
-  if(impl === null){
-    throw new Error('Cannot find any-promise implementation nor'+
-      ' global.Promise. You must install polyfill or call'+
-      ' require("any-promise/register") with your preferred'+
-      ' implementation, e.g. require("any-promise/register/bluebird")'+
-      ' on application load prior to any require("any-promise").')
-  }
-
-  return impl
-}
-
-/**
- * Determines if the global.Promise should be preferred if an implementation
- * has not been registered.
- */
-function shouldPreferGlobalPromise(implementation){
-  if(implementation){
-    return implementation === 'global.Promise'
-  } else if(typeof global.Promise !== 'undefined'){
-    // Load global promise if implementation not specified
-    // Versions < 0.11 did not have global Promise
-    // Do not use for version < 0.12 as version 0.11 contained buggy versions
-    var version = (/v(\d+)\.(\d+)\.(\d+)/).exec(process.version)
-    return !(version && +version[1] == 0 && +version[2] < 12)
-  }
-
-  // do not have global.Promise or another implementation was specified
-  return false
-}
-
-/**
- * Look for common libs as last resort there is no guarantee that
- * this will return a desired implementation or even be deterministic.
- * The priority is also nearly arbitrary. We are only doing this
- * for older versions of Node.js <0.12 that do not have a reasonable
- * global.Promise implementation and we the user has not registered
- * the preference. This preserves the behavior of any-promise <= 0.1
- * and may be deprecated or removed in the future
- */
-function tryAutoDetect(){
-  var libs = [
-      "es6-promise",
-      "promise",
-      "native-promise-only",
-      "bluebird",
-      "rsvp",
-      "when",
-      "q",
-      "pinkie",
-      "lie",
-      "vow"]
-  var i = 0, len = libs.length
-  for(; i < len; i++){
-    try {
-      return loadImplementation(libs[i])
-    } catch(e){}
-  }
-  return null
-}
-
-
-/***/ }),
-/* 510 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * arr-flatten <https://github.com/jonschlinkert/arr-flatten>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function (arr) {
-  return flat(arr, []);
-};
-
-function flat(arr, res) {
-  var i = 0, cur;
-  var len = arr.length;
-  for (; i < len; i++) {
-    cur = arr[i];
-    Array.isArray(cur) ? flat(cur, res) : res.push(cur);
-  }
-  return res;
-}
-
-
-/***/ }),
-/* 511 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function (arr, predicate, ctx) {
-	if (typeof Array.prototype.findIndex === 'function') {
-		return arr.findIndex(predicate, ctx);
-	}
-
-	if (typeof predicate !== 'function') {
-		throw new TypeError('predicate must be a function');
-	}
-
-	var list = Object(arr);
-	var len = list.length;
-
-	if (len === 0) {
-		return -1;
-	}
-
-	for (var i = 0; i < len; i++) {
-		if (predicate.call(ctx, list[i], i, list)) {
-			return i;
-		}
-	}
-
-	return -1;
-};
-
-
-/***/ }),
-/* 512 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var rawAsap = __webpack_require__(513);
-var freeTasks = [];
-
-/**
- * Calls a task as soon as possible after returning, in its own event, with
- * priority over IO events. An exception thrown in a task can be handled by
- * `process.on("uncaughtException") or `domain.on("error")`, but will otherwise
- * crash the process. If the error is handled, all subsequent tasks will
- * resume.
- *
- * @param {{call}} task A callable object, typically a function that takes no
- * arguments.
- */
-module.exports = asap;
-function asap(task) {
-    var rawTask;
-    if (freeTasks.length) {
-        rawTask = freeTasks.pop();
-    } else {
-        rawTask = new RawTask();
-    }
-    rawTask.task = task;
-    rawTask.domain = process.domain;
-    rawAsap(rawTask);
-}
-
-function RawTask() {
-    this.task = null;
-    this.domain = null;
-}
-
-RawTask.prototype.call = function () {
-    if (this.domain) {
-        this.domain.enter();
-    }
-    var threw = true;
-    try {
-        this.task.call();
-        threw = false;
-        // If the task throws an exception (presumably) Node.js restores the
-        // domain stack for the next event.
-        if (this.domain) {
-            this.domain.exit();
-        }
-    } finally {
-        // We use try/finally and a threw flag to avoid messing up stack traces
-        // when we catch and release errors.
-        if (threw) {
-            // In Node.js, uncaught exceptions are considered fatal errors.
-            // Re-throw them to interrupt flushing!
-            // Ensure that flushing continues if an uncaught exception is
-            // suppressed listening process.on("uncaughtException") or
-            // domain.on("error").
-            rawAsap.requestFlush();
-        }
-        // If the task threw an error, we do not want to exit the domain here.
-        // Exiting the domain would prevent the domain from catching the error.
-        this.task = null;
-        this.domain = null;
-        freeTasks.push(this);
-    }
-};
-
-
-
-/***/ }),
-/* 513 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var domain; // The domain module is executed on demand
-var hasSetImmediate = typeof setImmediate === "function";
-
-// Use the fastest means possible to execute a task in its own turn, with
-// priority over other events including network IO events in Node.js.
-//
-// An exception thrown by a task will permanently interrupt the processing of
-// subsequent tasks. The higher level `asap` function ensures that if an
-// exception is thrown by a task, that the task queue will continue flushing as
-// soon as possible, but if you use `rawAsap` directly, you are responsible to
-// either ensure that no exceptions are thrown from your task, or to manually
-// call `rawAsap.requestFlush` if an exception is thrown.
-module.exports = rawAsap;
-function rawAsap(task) {
-    if (!queue.length) {
-        requestFlush();
-        flushing = true;
-    }
-    // Avoids a function call
-    queue[queue.length] = task;
-}
-
-var queue = [];
-// Once a flush has been requested, no further calls to `requestFlush` are
-// necessary until the next `flush` completes.
-var flushing = false;
-// The position of the next task to execute in the task queue. This is
-// preserved between calls to `flush` so that it can be resumed if
-// a task throws an exception.
-var index = 0;
-// If a task schedules additional tasks recursively, the task queue can grow
-// unbounded. To prevent memory excaustion, the task queue will periodically
-// truncate already-completed tasks.
-var capacity = 1024;
-
-// The flush function processes all tasks that have been scheduled with
-// `rawAsap` unless and until one of those tasks throws an exception.
-// If a task throws an exception, `flush` ensures that its state will remain
-// consistent and will resume where it left off when called again.
-// However, `flush` does not make any arrangements to be called again if an
-// exception is thrown.
-function flush() {
-    while (index < queue.length) {
-        var currentIndex = index;
-        // Advance the index before calling the task. This ensures that we will
-        // begin flushing on the next task the task throws an error.
-        index = index + 1;
-        queue[currentIndex].call();
-        // Prevent leaking memory for long chains of recursive calls to `asap`.
-        // If we call `asap` within tasks scheduled by `asap`, the queue will
-        // grow, but to avoid an O(n) walk for every task we execute, we don't
-        // shift tasks off the queue after they have been executed.
-        // Instead, we periodically shift 1024 tasks off the queue.
-        if (index > capacity) {
-            // Manually shift all values starting at the index back to the
-            // beginning of the queue.
-            for (var scan = 0, newLength = queue.length - index; scan < newLength; scan++) {
-                queue[scan] = queue[scan + index];
-            }
-            queue.length -= index;
-            index = 0;
-        }
-    }
-    queue.length = 0;
-    index = 0;
-    flushing = false;
-}
-
-rawAsap.requestFlush = requestFlush;
-function requestFlush() {
-    // Ensure flushing is not bound to any domain.
-    // It is not sufficient to exit the domain, because domains exist on a stack.
-    // To execute code outside of any domain, the following dance is necessary.
-    var parentDomain = process.domain;
-    if (parentDomain) {
-        if (!domain) {
-            // Lazy execute the domain module.
-            // Only employed if the user elects to use domains.
-            domain = __webpack_require__(965);
-        }
-        domain.active = process.domain = null;
-    }
-
-    // `setImmediate` is slower that `process.nextTick`, but `process.nextTick`
-    // cannot handle recursion.
-    // `requestFlush` will only be called recursively from `asap.js`, to resume
-    // flushing after an error is thrown into a domain.
-    // Conveniently, `setImmediate` was introduced in the same version
-    // `process.nextTick` started throwing recursion errors.
-    if (flushing && hasSetImmediate) {
-        setImmediate(flush);
-    } else {
-        process.nextTick(flush);
-    }
-
-    if (parentDomain) {
-        domain.active = process.domain = parentDomain;
-    }
-}
-
-
-/***/ }),
-/* 514 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
-
-var errors = __webpack_require__(205);
-var types = __webpack_require__(206);
-
-var Reader = __webpack_require__(515);
-var Writer = __webpack_require__(516);
-
-
-// --- Exports
-
-module.exports = {
-
-  Reader: Reader,
-
-  Writer: Writer
-
-};
-
-for (var t in types) {
-  if (types.hasOwnProperty(t))
-    module.exports[t] = types[t];
-}
-for (var e in errors) {
-  if (errors.hasOwnProperty(e))
-    module.exports[e] = errors[e];
-}
-
-
-/***/ }),
-/* 515 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
-
-var assert = __webpack_require__(28);
-var Buffer = __webpack_require__(15).Buffer;
-
-var ASN1 = __webpack_require__(206);
-var errors = __webpack_require__(205);
-
-
-// --- Globals
-
-var newInvalidAsn1Error = errors.newInvalidAsn1Error;
-
-
-
-// --- API
-
-function Reader(data) {
-  if (!data || !Buffer.isBuffer(data))
-    throw new TypeError('data must be a node Buffer');
-
-  this._buf = data;
-  this._size = data.length;
-
-  // These hold the "current" state
-  this._len = 0;
-  this._offset = 0;
-}
-
-Object.defineProperty(Reader.prototype, 'length', {
-  enumerable: true,
-  get: function () { return (this._len); }
-});
-
-Object.defineProperty(Reader.prototype, 'offset', {
-  enumerable: true,
-  get: function () { return (this._offset); }
-});
-
-Object.defineProperty(Reader.prototype, 'remain', {
-  get: function () { return (this._size - this._offset); }
-});
-
-Object.defineProperty(Reader.prototype, 'buffer', {
-  get: function () { return (this._buf.slice(this._offset)); }
-});
-
-
-/**
- * Reads a single byte and advances offset; you can pass in `true` to make this
- * a "peek" operation (i.e., get the byte, but don't advance the offset).
- *
- * @param {Boolean} peek true means don't move offset.
- * @return {Number} the next byte, null if not enough data.
- */
-Reader.prototype.readByte = function (peek) {
-  if (this._size - this._offset < 1)
-    return null;
-
-  var b = this._buf[this._offset] & 0xff;
-
-  if (!peek)
-    this._offset += 1;
-
-  return b;
-};
-
-
-Reader.prototype.peek = function () {
-  return this.readByte(true);
-};
-
-
-/**
- * Reads a (potentially) variable length off the BER buffer.  This call is
- * not really meant to be called directly, as callers have to manipulate
- * the internal buffer afterwards.
- *
- * As a result of this call, you can call `Reader.length`, until the
- * next thing called that does a readLength.
- *
- * @return {Number} the amount of offset to advance the buffer.
- * @throws {InvalidAsn1Error} on bad ASN.1
- */
-Reader.prototype.readLength = function (offset) {
-  if (offset === undefined)
-    offset = this._offset;
-
-  if (offset >= this._size)
-    return null;
-
-  var lenB = this._buf[offset++] & 0xff;
-  if (lenB === null)
-    return null;
-
-  if ((lenB & 0x80) === 0x80) {
-    lenB &= 0x7f;
-
-    if (lenB === 0)
-      throw newInvalidAsn1Error('Indefinite length not supported');
-
-    if (lenB > 4)
-      throw newInvalidAsn1Error('encoding too long');
-
-    if (this._size - offset < lenB)
-      return null;
-
-    this._len = 0;
-    for (var i = 0; i < lenB; i++)
-      this._len = (this._len << 8) + (this._buf[offset++] & 0xff);
-
-  } else {
-    // Wasn't a variable length
-    this._len = lenB;
-  }
-
-  return offset;
-};
-
-
-/**
- * Parses the next sequence in this BER buffer.
- *
- * To get the length of the sequence, call `Reader.length`.
- *
- * @return {Number} the sequence's tag.
- */
-Reader.prototype.readSequence = function (tag) {
-  var seq = this.peek();
-  if (seq === null)
-    return null;
-  if (tag !== undefined && tag !== seq)
-    throw newInvalidAsn1Error('Expected 0x' + tag.toString(16) +
-                              ': got 0x' + seq.toString(16));
-
-  var o = this.readLength(this._offset + 1); // stored in `length`
-  if (o === null)
-    return null;
-
-  this._offset = o;
-  return seq;
-};
-
-
-Reader.prototype.readInt = function () {
-  return this._readTag(ASN1.Integer);
-};
-
-
-Reader.prototype.readBoolean = function () {
-  return (this._readTag(ASN1.Boolean) === 0 ? false : true);
-};
-
-
-Reader.prototype.readEnumeration = function () {
-  return this._readTag(ASN1.Enumeration);
-};
-
-
-Reader.prototype.readString = function (tag, retbuf) {
-  if (!tag)
-    tag = ASN1.OctetString;
-
-  var b = this.peek();
-  if (b === null)
-    return null;
-
-  if (b !== tag)
-    throw newInvalidAsn1Error('Expected 0x' + tag.toString(16) +
-                              ': got 0x' + b.toString(16));
-
-  var o = this.readLength(this._offset + 1); // stored in `length`
-
-  if (o === null)
-    return null;
-
-  if (this.length > this._size - o)
-    return null;
-
-  this._offset = o;
-
-  if (this.length === 0)
-    return retbuf ? Buffer.alloc(0) : '';
-
-  var str = this._buf.slice(this._offset, this._offset + this.length);
-  this._offset += this.length;
-
-  return retbuf ? str : str.toString('utf8');
-};
-
-Reader.prototype.readOID = function (tag) {
-  if (!tag)
-    tag = ASN1.OID;
-
-  var b = this.readString(tag, true);
-  if (b === null)
-    return null;
-
-  var values = [];
-  var value = 0;
-
-  for (var i = 0; i < b.length; i++) {
-    var byte = b[i] & 0xff;
-
-    value <<= 7;
-    value += byte & 0x7f;
-    if ((byte & 0x80) === 0) {
-      values.push(value);
-      value = 0;
-    }
-  }
-
-  value = values.shift();
-  values.unshift(value % 40);
-  values.unshift((value / 40) >> 0);
-
-  return values.join('.');
-};
-
-
-Reader.prototype._readTag = function (tag) {
-  assert.ok(tag !== undefined);
-
-  var b = this.peek();
-
-  if (b === null)
-    return null;
-
-  if (b !== tag)
-    throw newInvalidAsn1Error('Expected 0x' + tag.toString(16) +
-                              ': got 0x' + b.toString(16));
-
-  var o = this.readLength(this._offset + 1); // stored in `length`
-  if (o === null)
-    return null;
-
-  if (this.length > 4)
-    throw newInvalidAsn1Error('Integer too long: ' + this.length);
-
-  if (this.length > this._size - o)
-    return null;
-  this._offset = o;
-
-  var fb = this._buf[this._offset];
-  var value = 0;
-
-  for (var i = 0; i < this.length; i++) {
-    value <<= 8;
-    value |= (this._buf[this._offset++] & 0xff);
-  }
-
-  if ((fb & 0x80) === 0x80 && i !== 4)
-    value -= (1 << (i * 8));
-
-  return value >> 0;
-};
-
-
-
-// --- Exported API
-
-module.exports = Reader;
-
-
-/***/ }),
-/* 516 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
-
-var assert = __webpack_require__(28);
-var Buffer = __webpack_require__(15).Buffer;
-var ASN1 = __webpack_require__(206);
-var errors = __webpack_require__(205);
-
-
-// --- Globals
-
-var newInvalidAsn1Error = errors.newInvalidAsn1Error;
-
-var DEFAULT_OPTS = {
-  size: 1024,
-  growthFactor: 8
-};
-
-
-// --- Helpers
-
-function merge(from, to) {
-  assert.ok(from);
-  assert.equal(typeof (from), 'object');
-  assert.ok(to);
-  assert.equal(typeof (to), 'object');
-
-  var keys = Object.getOwnPropertyNames(from);
-  keys.forEach(function (key) {
-    if (to[key])
-      return;
-
-    var value = Object.getOwnPropertyDescriptor(from, key);
-    Object.defineProperty(to, key, value);
-  });
-
-  return to;
-}
-
-
-
-// --- API
-
-function Writer(options) {
-  options = merge(DEFAULT_OPTS, options || {});
-
-  this._buf = Buffer.alloc(options.size || 1024);
-  this._size = this._buf.length;
-  this._offset = 0;
-  this._options = options;
-
-  // A list of offsets in the buffer where we need to insert
-  // sequence tag/len pairs.
-  this._seq = [];
-}
-
-Object.defineProperty(Writer.prototype, 'buffer', {
-  get: function () {
-    if (this._seq.length)
-      throw newInvalidAsn1Error(this._seq.length + ' unended sequence(s)');
-
-    return (this._buf.slice(0, this._offset));
-  }
-});
-
-Writer.prototype.writeByte = function (b) {
-  if (typeof (b) !== 'number')
-    throw new TypeError('argument must be a Number');
-
-  this._ensure(1);
-  this._buf[this._offset++] = b;
-};
-
-
-Writer.prototype.writeInt = function (i, tag) {
-  if (typeof (i) !== 'number')
-    throw new TypeError('argument must be a Number');
-  if (typeof (tag) !== 'number')
-    tag = ASN1.Integer;
-
-  var sz = 4;
-
-  while ((((i & 0xff800000) === 0) || ((i & 0xff800000) === 0xff800000 >> 0)) &&
-        (sz > 1)) {
-    sz--;
-    i <<= 8;
-  }
-
-  if (sz > 4)
-    throw newInvalidAsn1Error('BER ints cannot be > 0xffffffff');
-
-  this._ensure(2 + sz);
-  this._buf[this._offset++] = tag;
-  this._buf[this._offset++] = sz;
-
-  while (sz-- > 0) {
-    this._buf[this._offset++] = ((i & 0xff000000) >>> 24);
-    i <<= 8;
-  }
-
-};
-
-
-Writer.prototype.writeNull = function () {
-  this.writeByte(ASN1.Null);
-  this.writeByte(0x00);
-};
-
-
-Writer.prototype.writeEnumeration = function (i, tag) {
-  if (typeof (i) !== 'number')
-    throw new TypeError('argument must be a Number');
-  if (typeof (tag) !== 'number')
-    tag = ASN1.Enumeration;
-
-  return this.writeInt(i, tag);
-};
-
-
-Writer.prototype.writeBoolean = function (b, tag) {
-  if (typeof (b) !== 'boolean')
-    throw new TypeError('argument must be a Boolean');
-  if (typeof (tag) !== 'number')
-    tag = ASN1.Boolean;
-
-  this._ensure(3);
-  this._buf[this._offset++] = tag;
-  this._buf[this._offset++] = 0x01;
-  this._buf[this._offset++] = b ? 0xff : 0x00;
-};
-
-
-Writer.prototype.writeString = function (s, tag) {
-  if (typeof (s) !== 'string')
-    throw new TypeError('argument must be a string (was: ' + typeof (s) + ')');
-  if (typeof (tag) !== 'number')
-    tag = ASN1.OctetString;
-
-  var len = Buffer.byteLength(s);
-  this.writeByte(tag);
-  this.writeLength(len);
-  if (len) {
-    this._ensure(len);
-    this._buf.write(s, this._offset);
-    this._offset += len;
-  }
-};
-
-
-Writer.prototype.writeBuffer = function (buf, tag) {
-  if (typeof (tag) !== 'number')
-    throw new TypeError('tag must be a number');
-  if (!Buffer.isBuffer(buf))
-    throw new TypeError('argument must be a buffer');
-
-  this.writeByte(tag);
-  this.writeLength(buf.length);
-  this._ensure(buf.length);
-  buf.copy(this._buf, this._offset, 0, buf.length);
-  this._offset += buf.length;
-};
-
-
-Writer.prototype.writeStringArray = function (strings) {
-  if ((!strings instanceof Array))
-    throw new TypeError('argument must be an Array[String]');
-
-  var self = this;
-  strings.forEach(function (s) {
-    self.writeString(s);
-  });
-};
-
-// This is really to solve DER cases, but whatever for now
-Writer.prototype.writeOID = function (s, tag) {
-  if (typeof (s) !== 'string')
-    throw new TypeError('argument must be a string');
-  if (typeof (tag) !== 'number')
-    tag = ASN1.OID;
-
-  if (!/^([0-9]+\.){3,}[0-9]+$/.test(s))
-    throw new Error('argument is not a valid OID string');
-
-  function encodeOctet(bytes, octet) {
-    if (octet < 128) {
-        bytes.push(octet);
-    } else if (octet < 16384) {
-        bytes.push((octet >>> 7) | 0x80);
-        bytes.push(octet & 0x7F);
-    } else if (octet < 2097152) {
-      bytes.push((octet >>> 14) | 0x80);
-      bytes.push(((octet >>> 7) | 0x80) & 0xFF);
-      bytes.push(octet & 0x7F);
-    } else if (octet < 268435456) {
-      bytes.push((octet >>> 21) | 0x80);
-      bytes.push(((octet >>> 14) | 0x80) & 0xFF);
-      bytes.push(((octet >>> 7) | 0x80) & 0xFF);
-      bytes.push(octet & 0x7F);
-    } else {
-      bytes.push(((octet >>> 28) | 0x80) & 0xFF);
-      bytes.push(((octet >>> 21) | 0x80) & 0xFF);
-      bytes.push(((octet >>> 14) | 0x80) & 0xFF);
-      bytes.push(((octet >>> 7) | 0x80) & 0xFF);
-      bytes.push(octet & 0x7F);
-    }
-  }
-
-  var tmp = s.split('.');
-  var bytes = [];
-  bytes.push(parseInt(tmp[0], 10) * 40 + parseInt(tmp[1], 10));
-  tmp.slice(2).forEach(function (b) {
-    encodeOctet(bytes, parseInt(b, 10));
-  });
-
-  var self = this;
-  this._ensure(2 + bytes.length);
-  this.writeByte(tag);
-  this.writeLength(bytes.length);
-  bytes.forEach(function (b) {
-    self.writeByte(b);
-  });
-};
-
-
-Writer.prototype.writeLength = function (len) {
-  if (typeof (len) !== 'number')
-    throw new TypeError('argument must be a Number');
-
-  this._ensure(4);
-
-  if (len <= 0x7f) {
-    this._buf[this._offset++] = len;
-  } else if (len <= 0xff) {
-    this._buf[this._offset++] = 0x81;
-    this._buf[this._offset++] = len;
-  } else if (len <= 0xffff) {
-    this._buf[this._offset++] = 0x82;
-    this._buf[this._offset++] = len >> 8;
-    this._buf[this._offset++] = len;
-  } else if (len <= 0xffffff) {
-    this._buf[this._offset++] = 0x83;
-    this._buf[this._offset++] = len >> 16;
-    this._buf[this._offset++] = len >> 8;
-    this._buf[this._offset++] = len;
-  } else {
-    throw newInvalidAsn1Error('Length too long (> 4 bytes)');
-  }
-};
-
-Writer.prototype.startSequence = function (tag) {
-  if (typeof (tag) !== 'number')
-    tag = ASN1.Sequence | ASN1.Constructor;
-
-  this.writeByte(tag);
-  this._seq.push(this._offset);
-  this._ensure(3);
-  this._offset += 3;
-};
-
-
-Writer.prototype.endSequence = function () {
-  var seq = this._seq.pop();
-  var start = seq + 3;
-  var len = this._offset - start;
-
-  if (len <= 0x7f) {
-    this._shift(start, len, -2);
-    this._buf[seq] = len;
-  } else if (len <= 0xff) {
-    this._shift(start, len, -1);
-    this._buf[seq] = 0x81;
-    this._buf[seq + 1] = len;
-  } else if (len <= 0xffff) {
-    this._buf[seq] = 0x82;
-    this._buf[seq + 1] = len >> 8;
-    this._buf[seq + 2] = len;
-  } else if (len <= 0xffffff) {
-    this._shift(start, len, 1);
-    this._buf[seq] = 0x83;
-    this._buf[seq + 1] = len >> 16;
-    this._buf[seq + 2] = len >> 8;
-    this._buf[seq + 3] = len;
-  } else {
-    throw newInvalidAsn1Error('Sequence too long');
-  }
-};
-
-
-Writer.prototype._shift = function (start, len, shift) {
-  assert.ok(start !== undefined);
-  assert.ok(len !== undefined);
-  assert.ok(shift);
-
-  this._buf.copy(this._buf, start + shift, start, start + len);
-  this._offset += shift;
-};
-
-Writer.prototype._ensure = function (len) {
-  assert.ok(len);
-
-  if (this._size - this._offset < len) {
-    var sz = this._size * this._options.growthFactor;
-    if (sz - this._offset < len)
-      sz += len;
-
-    var buf = Buffer.alloc(sz);
-
-    this._buf.copy(buf, 0, 0, this._offset);
-    this._buf = buf;
-    this._size = sz;
-  }
-};
-
-
-
-// --- Exported API
-
-module.exports = Writer;
-
-
-/***/ }),
-/* 517 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports =
-{
-  parallel      : __webpack_require__(519),
-  serial        : __webpack_require__(520),
-  serialOrdered : __webpack_require__(351)
-};
-
-
-/***/ }),
-/* 518 */
-/***/ (function(module, exports) {
-
-module.exports = defer;
-
-/**
- * Runs provided function on next iteration of the event loop
- *
- * @param {function} fn - function to run
- */
-function defer(fn)
-{
-  var nextTick = typeof setImmediate == 'function'
-    ? setImmediate
-    : (
-      typeof process == 'object' && typeof process.nextTick == 'function'
-      ? process.nextTick
-      : null
-    );
-
-  if (nextTick)
-  {
-    nextTick(fn);
-  }
-  else
-  {
-    setTimeout(fn, 0);
-  }
-}
-
-
-/***/ }),
-/* 519 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var iterate    = __webpack_require__(348)
-  , initState  = __webpack_require__(349)
-  , terminator = __webpack_require__(350)
-  ;
-
-// Public API
-module.exports = parallel;
-
-/**
- * Runs iterator over provided array elements in parallel
- *
- * @param   {array|object} list - array or object (named list) to iterate over
- * @param   {function} iterator - iterator to run
- * @param   {function} callback - invoked when all elements processed
- * @returns {function} - jobs terminator
- */
-function parallel(list, iterator, callback)
-{
-  var state = initState(list);
-
-  while (state.index < (state['keyedList'] || list).length)
-  {
-    iterate(list, iterator, state, function(error, result)
-    {
-      if (error)
-      {
-        callback(error, result);
-        return;
-      }
-
-      // looks like it's the last one
-      if (Object.keys(state.jobs).length === 0)
-      {
-        callback(null, state.results);
-        return;
-      }
-    });
-
-    state.index++;
-  }
-
-  return terminator.bind(state, callback);
-}
-
-
-/***/ }),
-/* 520 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var serialOrdered = __webpack_require__(351);
-
-// Public API
-module.exports = serial;
-
-/**
- * Runs iterator over provided array elements in series
- *
- * @param   {array|object} list - array or object (named list) to iterate over
- * @param   {function} iterator - iterator to run
- * @param   {function} callback - invoked when all elements processed
- * @returns {function} - jobs terminator
- */
-function serial(list, iterator, callback)
-{
-  return serialOrdered(list, iterator, null, callback);
-}
-
-
-/***/ }),
-/* 521 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-/*!
- *  Copyright 2010 LearnBoost <dev@learnboost.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Module dependencies.
- */
-
-var crypto = __webpack_require__(12)
-  , parse = __webpack_require__(24).parse
-  ;
-
-/**
- * Valid keys.
- */
-
-var keys = 
-  [ 'acl'
-  , 'location'
-  , 'logging'
-  , 'notification'
-  , 'partNumber'
-  , 'policy'
-  , 'requestPayment'
-  , 'torrent'
-  , 'uploadId'
-  , 'uploads'
-  , 'versionId'
-  , 'versioning'
-  , 'versions'
-  , 'website'
-  ]
-
-/**
- * Return an "Authorization" header value with the given `options`
- * in the form of "AWS <key>:<signature>"
- *
- * @param {Object} options
- * @return {String}
- * @api private
- */
-
-function authorization (options) {
-  return 'AWS ' + options.key + ':' + sign(options)
-}
-
-module.exports = authorization
-module.exports.authorization = authorization
-
-/**
- * Simple HMAC-SHA1 Wrapper
- *
- * @param {Object} options
- * @return {String}
- * @api private
- */ 
-
-function hmacSha1 (options) {
-  return crypto.createHmac('sha1', options.secret).update(options.message).digest('base64')
-}
-
-module.exports.hmacSha1 = hmacSha1
-
-/**
- * Create a base64 sha1 HMAC for `options`. 
- * 
- * @param {Object} options
- * @return {String}
- * @api private
- */
-
-function sign (options) {
-  options.message = stringToSign(options)
-  return hmacSha1(options)
-}
-module.exports.sign = sign
-
-/**
- * Create a base64 sha1 HMAC for `options`. 
- *
- * Specifically to be used with S3 presigned URLs
- * 
- * @param {Object} options
- * @return {String}
- * @api private
- */
-
-function signQuery (options) {
-  options.message = queryStringToSign(options)
-  return hmacSha1(options)
-}
-module.exports.signQuery= signQuery
-
-/**
- * Return a string for sign() with the given `options`.
- *
- * Spec:
- * 
- *    <verb>\n
- *    <md5>\n
- *    <content-type>\n
- *    <date>\n
- *    [headers\n]
- *    <resource>
- *
- * @param {Object} options
- * @return {String}
- * @api private
- */
-
-function stringToSign (options) {
-  var headers = options.amazonHeaders || ''
-  if (headers) headers += '\n'
-  var r = 
-    [ options.verb
-    , options.md5
-    , options.contentType
-    , options.date ? options.date.toUTCString() : ''
-    , headers + options.resource
-    ]
-  return r.join('\n')
-}
-module.exports.stringToSign = stringToSign
-
-/**
- * Return a string for sign() with the given `options`, but is meant exclusively
- * for S3 presigned URLs
- *
- * Spec:
- * 
- *    <date>\n
- *    <resource>
- *
- * @param {Object} options
- * @return {String}
- * @api private
- */
-
-function queryStringToSign (options){
-  return 'GET\n\n\n' + options.date + '\n' + options.resource
-}
-module.exports.queryStringToSign = queryStringToSign
-
-/**
- * Perform the following:
- *
- *  - ignore non-amazon headers
- *  - lowercase fields
- *  - sort lexicographically
- *  - trim whitespace between ":"
- *  - join with newline
- *
- * @param {Object} headers
- * @return {String}
- * @api private
- */
-
-function canonicalizeHeaders (headers) {
-  var buf = []
-    , fields = Object.keys(headers)
-    ;
-  for (var i = 0, len = fields.length; i < len; ++i) {
-    var field = fields[i]
-      , val = headers[field]
-      , field = field.toLowerCase()
-      ;
-    if (0 !== field.indexOf('x-amz')) continue
-    buf.push(field + ':' + val)
-  }
-  return buf.sort().join('\n')
-}
-module.exports.canonicalizeHeaders = canonicalizeHeaders
-
-/**
- * Perform the following:
- *
- *  - ignore non sub-resources
- *  - sort lexicographically
- *
- * @param {String} resource
- * @return {String}
- * @api private
- */
-
-function canonicalizeResource (resource) {
-  var url = parse(resource, true)
-    , path = url.pathname
-    , buf = []
-    ;
-
-  Object.keys(url.query).forEach(function(key){
-    if (!~keys.indexOf(key)) return
-    var val = '' == url.query[key] ? '' : '=' + encodeURIComponent(url.query[key])
-    buf.push(key + val)
-  })
-
-  return path + (buf.length ? '?' + buf.sort().join('&') : '')
-}
-module.exports.canonicalizeResource = canonicalizeResource
-
-
-/***/ }),
-/* 522 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var aws4 = exports,
-    url = __webpack_require__(24),
-    querystring = __webpack_require__(196),
-    crypto = __webpack_require__(12),
-    lru = __webpack_require__(523),
-    credentialsCache = lru(1000)
-
-// http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html
-
-function hmac(key, string, encoding) {
-  return crypto.createHmac('sha256', key).update(string, 'utf8').digest(encoding)
-}
-
-function hash(string, encoding) {
-  return crypto.createHash('sha256').update(string, 'utf8').digest(encoding)
-}
-
-// This function assumes the string has already been percent encoded
-function encodeRfc3986(urlEncodedString) {
-  return urlEncodedString.replace(/[!'()*]/g, function(c) {
-    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
-  })
-}
-
-// request: { path | body, [host], [method], [headers], [service], [region] }
-// credentials: { accessKeyId, secretAccessKey, [sessionToken] }
-function RequestSigner(request, credentials) {
-
-  if (typeof request === 'string') request = url.parse(request)
-
-  var headers = request.headers = (request.headers || {}),
-      hostParts = this.matchHost(request.hostname || request.host || headers.Host || headers.host)
-
-  this.request = request
-  this.credentials = credentials || this.defaultCredentials()
-
-  this.service = request.service || hostParts[0] || ''
-  this.region = request.region || hostParts[1] || 'us-east-1'
-
-  // SES uses a different domain from the service name
-  if (this.service === 'email') this.service = 'ses'
-
-  if (!request.method && request.body)
-    request.method = 'POST'
-
-  if (!headers.Host && !headers.host) {
-    headers.Host = request.hostname || request.host || this.createHost()
-
-    // If a port is specified explicitly, use it as is
-    if (request.port)
-      headers.Host += ':' + request.port
-  }
-  if (!request.hostname && !request.host)
-    request.hostname = headers.Host || headers.host
-
-  this.isCodeCommitGit = this.service === 'codecommit' && request.method === 'GIT'
-}
-
-RequestSigner.prototype.matchHost = function(host) {
-  var match = (host || '').match(/([^\.]+)\.(?:([^\.]*)\.)?amazonaws\.com$/)
-  var hostParts = (match || []).slice(1, 3)
-
-  // ES's hostParts are sometimes the other way round, if the value that is expected
-  // to be region equals ‘es’ switch them back
-  // e.g. search-cluster-name-aaaa00aaaa0aaa0aaaaaaa0aaa.us-east-1.es.amazonaws.com
-  if (hostParts[1] === 'es')
-    hostParts = hostParts.reverse()
-
-  return hostParts
-}
-
-// http://docs.aws.amazon.com/general/latest/gr/rande.html
-RequestSigner.prototype.isSingleRegion = function() {
-  // Special case for S3 and SimpleDB in us-east-1
-  if (['s3', 'sdb'].indexOf(this.service) >= 0 && this.region === 'us-east-1') return true
-
-  return ['cloudfront', 'ls', 'route53', 'iam', 'importexport', 'sts']
-    .indexOf(this.service) >= 0
-}
-
-RequestSigner.prototype.createHost = function() {
-  var region = this.isSingleRegion() ? '' :
-        (this.service === 's3' && this.region !== 'us-east-1' ? '-' : '.') + this.region,
-      service = this.service === 'ses' ? 'email' : this.service
-  return service + region + '.amazonaws.com'
-}
-
-RequestSigner.prototype.prepareRequest = function() {
-  this.parsePath()
-
-  var request = this.request, headers = request.headers, query
-
-  if (request.signQuery) {
-
-    this.parsedPath.query = query = this.parsedPath.query || {}
-
-    if (this.credentials.sessionToken)
-      query['X-Amz-Security-Token'] = this.credentials.sessionToken
-
-    if (this.service === 's3' && !query['X-Amz-Expires'])
-      query['X-Amz-Expires'] = 86400
-
-    if (query['X-Amz-Date'])
-      this.datetime = query['X-Amz-Date']
-    else
-      query['X-Amz-Date'] = this.getDateTime()
-
-    query['X-Amz-Algorithm'] = 'AWS4-HMAC-SHA256'
-    query['X-Amz-Credential'] = this.credentials.accessKeyId + '/' + this.credentialString()
-    query['X-Amz-SignedHeaders'] = this.signedHeaders()
-
-  } else {
-
-    if (!request.doNotModifyHeaders && !this.isCodeCommitGit) {
-      if (request.body && !headers['Content-Type'] && !headers['content-type'])
-        headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
-
-      if (request.body && !headers['Content-Length'] && !headers['content-length'])
-        headers['Content-Length'] = Buffer.byteLength(request.body)
-
-      if (this.credentials.sessionToken && !headers['X-Amz-Security-Token'] && !headers['x-amz-security-token'])
-        headers['X-Amz-Security-Token'] = this.credentials.sessionToken
-
-      if (this.service === 's3' && !headers['X-Amz-Content-Sha256'] && !headers['x-amz-content-sha256'])
-        headers['X-Amz-Content-Sha256'] = hash(this.request.body || '', 'hex')
-
-      if (headers['X-Amz-Date'] || headers['x-amz-date'])
-        this.datetime = headers['X-Amz-Date'] || headers['x-amz-date']
-      else
-        headers['X-Amz-Date'] = this.getDateTime()
-    }
-
-    delete headers.Authorization
-    delete headers.authorization
-  }
-}
-
-RequestSigner.prototype.sign = function() {
-  if (!this.parsedPath) this.prepareRequest()
-
-  if (this.request.signQuery) {
-    this.parsedPath.query['X-Amz-Signature'] = this.signature()
-  } else {
-    this.request.headers.Authorization = this.authHeader()
-  }
-
-  this.request.path = this.formatPath()
-
-  return this.request
-}
-
-RequestSigner.prototype.getDateTime = function() {
-  if (!this.datetime) {
-    var headers = this.request.headers,
-      date = new Date(headers.Date || headers.date || new Date)
-
-    this.datetime = date.toISOString().replace(/[:\-]|\.\d{3}/g, '')
-
-    // Remove the trailing 'Z' on the timestamp string for CodeCommit git access
-    if (this.isCodeCommitGit) this.datetime = this.datetime.slice(0, -1)
-  }
-  return this.datetime
-}
-
-RequestSigner.prototype.getDate = function() {
-  return this.getDateTime().substr(0, 8)
-}
-
-RequestSigner.prototype.authHeader = function() {
-  return [
-    'AWS4-HMAC-SHA256 Credential=' + this.credentials.accessKeyId + '/' + this.credentialString(),
-    'SignedHeaders=' + this.signedHeaders(),
-    'Signature=' + this.signature(),
-  ].join(', ')
-}
-
-RequestSigner.prototype.signature = function() {
-  var date = this.getDate(),
-      cacheKey = [this.credentials.secretAccessKey, date, this.region, this.service].join(),
-      kDate, kRegion, kService, kCredentials = credentialsCache.get(cacheKey)
-  if (!kCredentials) {
-    kDate = hmac('AWS4' + this.credentials.secretAccessKey, date)
-    kRegion = hmac(kDate, this.region)
-    kService = hmac(kRegion, this.service)
-    kCredentials = hmac(kService, 'aws4_request')
-    credentialsCache.set(cacheKey, kCredentials)
-  }
-  return hmac(kCredentials, this.stringToSign(), 'hex')
-}
-
-RequestSigner.prototype.stringToSign = function() {
-  return [
-    'AWS4-HMAC-SHA256',
-    this.getDateTime(),
-    this.credentialString(),
-    hash(this.canonicalString(), 'hex'),
-  ].join('\n')
-}
-
-RequestSigner.prototype.canonicalString = function() {
-  if (!this.parsedPath) this.prepareRequest()
-
-  var pathStr = this.parsedPath.path,
-      query = this.parsedPath.query,
-      headers = this.request.headers,
-      queryStr = '',
-      normalizePath = this.service !== 's3',
-      decodePath = this.service === 's3' || this.request.doNotEncodePath,
-      decodeSlashesInPath = this.service === 's3',
-      firstValOnly = this.service === 's3',
-      bodyHash
-
-  if (this.service === 's3' && this.request.signQuery) {
-    bodyHash = 'UNSIGNED-PAYLOAD'
-  } else if (this.isCodeCommitGit) {
-    bodyHash = ''
-  } else {
-    bodyHash = headers['X-Amz-Content-Sha256'] || headers['x-amz-content-sha256'] ||
-      hash(this.request.body || '', 'hex')
-  }
-
-  if (query) {
-    queryStr = encodeRfc3986(querystring.stringify(Object.keys(query).sort().reduce(function(obj, key) {
-      if (!key) return obj
-      obj[key] = !Array.isArray(query[key]) ? query[key] :
-        (firstValOnly ? query[key][0] : query[key].slice().sort())
-      return obj
-    }, {})))
-  }
-  if (pathStr !== '/') {
-    if (normalizePath) pathStr = pathStr.replace(/\/{2,}/g, '/')
-    pathStr = pathStr.split('/').reduce(function(path, piece) {
-      if (normalizePath && piece === '..') {
-        path.pop()
-      } else if (!normalizePath || piece !== '.') {
-        if (decodePath) piece = decodeURIComponent(piece)
-        path.push(encodeRfc3986(encodeURIComponent(piece)))
-      }
-      return path
-    }, []).join('/')
-    if (pathStr[0] !== '/') pathStr = '/' + pathStr
-    if (decodeSlashesInPath) pathStr = pathStr.replace(/%2F/g, '/')
-  }
-
-  return [
-    this.request.method || 'GET',
-    pathStr,
-    queryStr,
-    this.canonicalHeaders() + '\n',
-    this.signedHeaders(),
-    bodyHash,
-  ].join('\n')
-}
-
-RequestSigner.prototype.canonicalHeaders = function() {
-  var headers = this.request.headers
-  function trimAll(header) {
-    return header.toString().trim().replace(/\s+/g, ' ')
-  }
-  return Object.keys(headers)
-    .sort(function(a, b) { return a.toLowerCase() < b.toLowerCase() ? -1 : 1 })
-    .map(function(key) { return key.toLowerCase() + ':' + trimAll(headers[key]) })
-    .join('\n')
-}
-
-RequestSigner.prototype.signedHeaders = function() {
-  return Object.keys(this.request.headers)
-    .map(function(key) { return key.toLowerCase() })
-    .sort()
-    .join(';')
-}
-
-RequestSigner.prototype.credentialString = function() {
-  return [
-    this.getDate(),
-    this.region,
-    this.service,
-    'aws4_request',
-  ].join('/')
-}
-
-RequestSigner.prototype.defaultCredentials = function() {
-  var env = process.env
-  return {
-    accessKeyId: env.AWS_ACCESS_KEY_ID || env.AWS_ACCESS_KEY,
-    secretAccessKey: env.AWS_SECRET_ACCESS_KEY || env.AWS_SECRET_KEY,
-    sessionToken: env.AWS_SESSION_TOKEN,
-  }
-}
-
-RequestSigner.prototype.parsePath = function() {
-  var path = this.request.path || '/',
-      queryIx = path.indexOf('?'),
-      query = null
-
-  if (queryIx >= 0) {
-    query = querystring.parse(path.slice(queryIx + 1))
-    path = path.slice(0, queryIx)
-  }
-
-  // S3 doesn't always encode characters > 127 correctly and
-  // all services don't encode characters > 255 correctly
-  // So if there are non-reserved chars (and it's not already all % encoded), just encode them all
-  if (/[^0-9A-Za-z!'()*\-._~%/]/.test(path)) {
-    path = path.split('/').map(function(piece) {
-      return encodeURIComponent(decodeURIComponent(piece))
-    }).join('/')
-  }
-
-  this.parsedPath = {
-    path: path,
-    query: query,
-  }
-}
-
-RequestSigner.prototype.formatPath = function() {
-  var path = this.parsedPath.path,
-      query = this.parsedPath.query
-
-  if (!query) return path
-
-  // Services don't support empty query string keys
-  if (query[''] != null) delete query['']
-
-  return path + '?' + encodeRfc3986(querystring.stringify(query))
-}
-
-aws4.RequestSigner = RequestSigner
-
-aws4.sign = function(request, credentials) {
-  return new RequestSigner(request, credentials).sign()
-}
-
-
-/***/ }),
-/* 523 */
-/***/ (function(module, exports) {
-
-module.exports = function(size) {
-  return new LruCache(size)
-}
-
-function LruCache(size) {
-  this.capacity = size | 0
-  this.map = Object.create(null)
-  this.list = new DoublyLinkedList()
-}
-
-LruCache.prototype.get = function(key) {
-  var node = this.map[key]
-  if (node == null) return undefined
-  this.used(node)
-  return node.val
-}
-
-LruCache.prototype.set = function(key, val) {
-  var node = this.map[key]
-  if (node != null) {
-    node.val = val
-  } else {
-    if (!this.capacity) this.prune()
-    if (!this.capacity) return false
-    node = new DoublyLinkedNode(key, val)
-    this.map[key] = node
-    this.capacity--
-  }
-  this.used(node)
-  return true
-}
-
-LruCache.prototype.used = function(node) {
-  this.list.moveToFront(node)
-}
-
-LruCache.prototype.prune = function() {
-  var node = this.list.pop()
-  if (node != null) {
-    delete this.map[node.key]
-    this.capacity++
-  }
-}
-
-
-function DoublyLinkedList() {
-  this.firstNode = null
-  this.lastNode = null
-}
-
-DoublyLinkedList.prototype.moveToFront = function(node) {
-  if (this.firstNode == node) return
-
-  this.remove(node)
-
-  if (this.firstNode == null) {
-    this.firstNode = node
-    this.lastNode = node
-    node.prev = null
-    node.next = null
-  } else {
-    node.prev = null
-    node.next = this.firstNode
-    node.next.prev = node
-    this.firstNode = node
-  }
-}
-
-DoublyLinkedList.prototype.pop = function() {
-  var lastNode = this.lastNode
-  if (lastNode != null) {
-    this.remove(lastNode)
-  }
-  return lastNode
-}
-
-DoublyLinkedList.prototype.remove = function(node) {
-  if (this.firstNode == node) {
-    this.firstNode = node.next
-  } else if (node.prev != null) {
-    node.prev.next = node.next
-  }
-  if (this.lastNode == node) {
-    this.lastNode = node.prev
-  } else if (node.next != null) {
-    node.next.prev = node.prev
-  }
-}
-
-
-function DoublyLinkedNode(key, val) {
-  this.key = key
-  this.val = val
-  this.prev = null
-  this.next = null
-}
-
-
-/***/ }),
-/* 524 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-exports.default = function (message) {
-  return {
-    useless: true,
-    run() {
-      throw new (_errors || _load_errors()).MessageError(message);
-    },
-    setFlags: () => {},
-    hasWrapper: () => true
-  };
-};
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-/***/ }),
-/* 525 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.hasWrapper = exports.run = undefined;
-exports.setFlags = setFlags;
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const notYetImplemented = () => Promise.reject(new Error('This command is not implemented yet.'));
-
-function setFlags(commander) {
-  commander.description('Has not been implemented yet');
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('access', {
-  public: notYetImplemented,
-  restricted: notYetImplemented,
-  grant: notYetImplemented,
-  revoke: notYetImplemented,
-  lsPackages: notYetImplemented,
-  lsCollaborators: notYetImplemented,
-  edit: notYetImplemented
-}, ['WARNING: This command yet to be implemented.', 'public [<package>]', 'restricted [<package>]', 'grant <read-only|read-write> <scope:team> [<package>]', 'revoke <scope:team> [<package>]', 'ls-packages [<user>|<scope>|<scope:team>]', 'ls-collaborators [<package> [<user>]]', 'edit [<package>]']);
-
-const run = _buildSubCommands.run,
-      hasWrapper = _buildSubCommands.hasWrapper,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.hasWrapper = hasWrapper;
-exports.examples = examples;
-
-/***/ }),
-/* 526 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const binFolder = path.join(config.cwd, config.registryFolders[0], '.bin');
-    if (args.length === 0) {
-      reporter.log(binFolder, { force: true });
-    } else {
-      const binEntries = yield (0, (_run || _load_run()).getBinEntries)(config);
-
-      const binName = args[0];
-      const binPath = binEntries.get(binName);
-
-      if (binPath) {
-        reporter.log(binPath, { force: true });
-      } else {
-        reporter.error(reporter.lang('packageBinaryNotFound', binName));
-      }
-    }
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _run;
-
-function _load_run() {
-  return _run = __webpack_require__(360);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-function hasWrapper(commander) {
-  return false;
-}
-
-function setFlags(commander) {
-  commander.description('Displays the location of the yarn bin folder.');
-}
-
-/***/ }),
-/* 527 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const CONFIG_KEYS = [
-// 'reporter',
-'registryFolders', 'linkedModules',
-// 'registries',
-'cache', 'cwd', 'looseSemver', 'commandName', 'preferOffline', 'modulesFolder', 'globalFolder', 'linkFolder', 'offline', 'binLinks', 'ignorePlatform', 'ignoreScripts', 'disablePrepublish', 'nonInteractive', 'workspaceRootFolder', 'lockfileFolder', 'networkConcurrency', 'childConcurrency', 'networkTimeout', 'workspacesEnabled', 'workspacesNohoistEnabled', 'pruneOfflineMirror', 'enableMetaFolder', 'enableLockfileVersions', 'linkFileDependencies', 'cacheFolder', 'tempFolder', 'production'];
-/* eslint object-shorthand: 0 */
-
-function hasWrapper(flags, args) {
-  return args[0] !== 'get';
-}
-
-function setFlags(commander) {
-  commander.description('Manages the yarn configuration files.');
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('config', {
-  set(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (args.length === 0 || args.length > 2) {
-        return false;
-      }
-      const key = args[0];
-      var _args$ = args[1];
-      const val = _args$ === undefined ? true : _args$;
-
-      const yarnConfig = config.registries.yarn;
-      yield yarnConfig.saveHomeConfig({ [key]: val });
-      reporter.success(reporter.lang('configSet', key, val));
-      return true;
-    })();
-  },
-
-  get(config, reporter, flags, args) {
-    if (args.length !== 1) {
-      return false;
-    }
-
-    reporter.log(String(config.getOption(args[0])), { force: true });
-    return true;
-  },
-
-  delete: (() => {
-    var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-      if (args.length !== 1) {
-        return false;
-      }
-
-      const key = args[0];
-      const yarnConfig = config.registries.yarn;
-      yield yarnConfig.saveHomeConfig({ [key]: undefined });
-      reporter.success(reporter.lang('configDelete', key));
-      return true;
-    });
-
-    function _delete(_x, _x2, _x3, _x4) {
-      return _ref.apply(this, arguments);
-    }
-
-    return _delete;
-  })(),
-
-  list(config, reporter, flags, args) {
-    if (args.length) {
-      return false;
-    }
-
-    reporter.info(reporter.lang('configYarn'));
-    reporter.inspect(config.registries.yarn.config);
-
-    reporter.info(reporter.lang('configNpm'));
-    reporter.inspect(config.registries.npm.config);
-
-    return true;
-  },
-
-  current(config, reporter, flags, args) {
-    if (args.length) {
-      return false;
-    }
-
-    reporter.log(JSON.stringify(config, CONFIG_KEYS, 2), { force: true });
-
-    return true;
-  }
-});
-
-const run = _buildSubCommands.run,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.examples = examples;
-
-/***/ }),
-/* 528 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const builderName = args[0],
-          rest = args.slice(1);
-
-
-    if (!builderName) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidPackageName'));
-    }
-
-    var _coerceCreatePackageN = coerceCreatePackageName(builderName);
-
-    const packageName = _coerceCreatePackageN.fullName,
-          commandName = _coerceCreatePackageN.name;
-
-
-    const linkLoc = path.join(config.linkFolder, commandName);
-    if (yield (_fs || _load_fs()).exists(linkLoc)) {
-      reporter.info(reporter.lang('linkUsing', packageName));
-    } else {
-      yield (0, (_global || _load_global()).run)(config, reporter, {}, ['add', packageName]);
-    }
-
-    const binFolder = yield (0, (_global || _load_global()).getBinFolder)(config, {});
-    const command = path.resolve(binFolder, commandName);
-    const env = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)('create', config.cwd, config);
-
-    yield (_child || _load_child()).spawn(command, rest, { stdio: `inherit`, shell: true, env });
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-exports.parsePackageName = parsePackageName;
-exports.coerceCreatePackageName = coerceCreatePackageName;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _executeLifecycleScript;
-
-function _load_executeLifecycleScript() {
-  return _executeLifecycleScript = __webpack_require__(111);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _global;
-
-function _load_global() {
-  return _global = __webpack_require__(121);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-function setFlags(commander) {
-  commander.description('Creates new projects from any create-* starter kits.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-function parsePackageName(str) {
-  if (str.charAt(0) === '/') {
-    throw new Error(`Name should not start with "/", got "${str}"`);
-  }
-  if (str.charAt(0) === '.') {
-    throw new Error(`Name should not start with ".", got "${str}"`);
-  }
-  const parts = str.split('/');
-  const isScoped = str.charAt(0) === '@';
-  if (isScoped && parts[0] === '@') {
-    throw new Error(`Scope should not be empty, got "${str}"`);
-  }
-  const scope = isScoped ? parts[0] : '';
-  const name = parts[isScoped ? 1 : 0] || '';
-  const path = parts.slice(isScoped ? 2 : 1).join('/');
-  const fullName = [scope, name].filter(Boolean).join('/');
-  const full = [scope, name, path].filter(Boolean).join('/');
-
-  return { fullName, name, scope, path, full };
-}
-
-function coerceCreatePackageName(str) {
-  const pkgNameObj = parsePackageName(str);
-  const coercedName = pkgNameObj.name !== '' ? `create-${pkgNameObj.name}` : `create`;
-  const coercedPkgNameObj = (0, (_extends2 || _load_extends()).default)({}, pkgNameObj, {
-    name: coercedName,
-    fullName: [pkgNameObj.scope, coercedName].filter(Boolean).join('/'),
-    full: [pkgNameObj.scope, coercedName, pkgNameObj.path].filter(Boolean).join('/')
-  });
-  return coercedPkgNameObj;
-}
-
-/***/ }),
-/* 529 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const env = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).makeEnv)(`exec`, config.cwd, config);
-
-    if (args.length < 1) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('execMissingCommand'));
-    }
-
-    const execName = args[0],
-          rest = args.slice(1);
-
-    yield (_child || _load_child()).spawn(execName, rest, { stdio: 'inherit', env });
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _executeLifecycleScript;
-
-function _load_executeLifecycleScript() {
-  return _executeLifecycleScript = __webpack_require__(111);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function setFlags(commander) {}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 530 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    let manifest;
-    if (flags.useManifest) {
-      manifest = yield config.readJson(flags.useManifest);
-    } else {
-      manifest = yield config.readRootManifest();
-    }
-    if (!manifest.name) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('noName'));
-    }
-    if (!manifest.version) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('noVersion'));
-    }
-
-    const entry = {
-      name: manifest.name,
-      version: manifest.version,
-      resolved: flags.resolved,
-      registry: flags.registry || manifest._registry,
-      optionalDependencies: manifest.optionalDependencies,
-      dependencies: manifest.dependencies
-    };
-    const pattern = flags.pattern || `${entry.name}@${entry.version}`;
-    reporter.log((0, (_lockfile || _load_lockfile()).stringify)({
-      [pattern]: (0, (_lockfile || _load_lockfile()).implodeEntry)(pattern, entry)
-    }));
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = __webpack_require__(19);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function hasWrapper(commander, args) {
-  return false;
-}
-
-function setFlags(commander) {
-  commander.description('Generates a lock file entry.');
-  commander.option('--use-manifest <location>', 'description');
-  commander.option('--resolved <resolved>', 'description');
-  commander.option('--registry <registry>', 'description');
-}
-
-const examples = exports.examples = ['generate-lock-entry', 'generate-lock-entry --use-manifest ./package.json', 'generate-lock-entry --resolved local-file.tgz#hash'];
-
-/***/ }),
-/* 531 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-exports.run = run;
-
-var _index;
-
-function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(334));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _aliases;
-
-function _load_aliases() {
-  return _aliases = _interopRequireDefault(__webpack_require__(352));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const chalk = __webpack_require__(30);
-
-function hasWrapper(flags, args) {
-  return false;
-}
-
-function setFlags(commander) {
-  commander.description('Displays help information.');
-}
-
-function run(config, reporter, commander, args) {
-  if (args.length) {
-    const commandName = args.shift();
-    if (Object.prototype.hasOwnProperty.call((_index || _load_index()).default, commandName)) {
-      const command = (_index || _load_index()).default[commandName];
-      if (command) {
-        command.setFlags(commander);
-        const examples = (command.examples || []).map(example => `    $ yarn ${example}`);
-        if (examples.length) {
-          commander.on('--help', () => {
-            reporter.log(reporter.lang('helpExamples', reporter.rawText(examples.join('\n'))));
-          });
-        }
-        // eslint-disable-next-line yarn-internal/warn-language
-        commander.on('--help', () => reporter.log('  ' + command.getDocsInfo + '\n'));
-        commander.help();
-        return Promise.resolve();
-      }
-    }
-  }
-
-  commander.on('--help', () => {
-    const commandsText = [];
-    for (var _iterator = Object.keys((_index || _load_index()).default).sort((_misc || _load_misc()).sortAlpha), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const name = _ref;
-
-      if ((_index || _load_index()).default[name].useless || Object.keys((_aliases || _load_aliases()).default).map(key => (_aliases || _load_aliases()).default[key]).indexOf(name) > -1) {
-        continue;
-      }
-      if ((_aliases || _load_aliases()).default[name]) {
-        commandsText.push(`    - ${(0, (_misc || _load_misc()).hyphenate)(name)} / ${(_aliases || _load_aliases()).default[name]}`);
-      } else {
-        commandsText.push(`    - ${(0, (_misc || _load_misc()).hyphenate)(name)}`);
-      }
-    }
-    reporter.log(reporter.lang('helpCommands', reporter.rawText(commandsText.join('\n'))));
-    reporter.log(reporter.lang('helpCommandsMore', reporter.rawText(chalk.bold('yarn help COMMAND'))));
-    reporter.log(reporter.lang('helpLearnMore', reporter.rawText(chalk.bold((_constants || _load_constants()).YARN_DOCS))));
-  });
-
-  commander.options.sort((_misc || _load_misc()).sortOptionsByFlags);
-
-  commander.help();
-  return Promise.resolve();
-}
-
-/***/ }),
-/* 532 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.Import = exports.noArguments = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const imp = new Import(flags, config, reporter, new (_lockfile || _load_lockfile()).default({ cache: {} }));
-    yield imp.init();
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref5.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _check;
-
-function _load_check() {
-  return _check = __webpack_require__(356);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(78);
-}
-
-var _baseResolver;
-
-function _load_baseResolver() {
-  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
-}
-
-var _hostedGitResolver;
-
-function _load_hostedGitResolver() {
-  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
-}
-
-var _hostedGitResolver2;
-
-function _load_hostedGitResolver2() {
-  return _hostedGitResolver2 = __webpack_require__(109);
-}
-
-var _gistResolver;
-
-function _load_gistResolver() {
-  return _gistResolver = _interopRequireDefault(__webpack_require__(216));
-}
-
-var _gistResolver2;
-
-function _load_gistResolver2() {
-  return _gistResolver2 = __webpack_require__(216);
-}
-
-var _gitResolver;
-
-function _load_gitResolver() {
-  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
-}
-
-var _fileResolver;
-
-function _load_fileResolver() {
-  return _fileResolver = _interopRequireDefault(__webpack_require__(215));
-}
-
-var _packageResolver;
-
-function _load_packageResolver() {
-  return _packageResolver = _interopRequireDefault(__webpack_require__(366));
-}
-
-var _packageRequest;
-
-function _load_packageRequest() {
-  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
-}
-
-var _packageReference;
-
-function _load_packageReference() {
-  return _packageReference = _interopRequireDefault(__webpack_require__(365));
-}
-
-var _packageFetcher;
-
-function _load_packageFetcher() {
-  return _packageFetcher = _interopRequireWildcard(__webpack_require__(210));
-}
-
-var _packageLinker;
-
-function _load_packageLinker() {
-  return _packageLinker = _interopRequireDefault(__webpack_require__(211));
-}
-
-var _packageCompatibility;
-
-function _load_packageCompatibility() {
-  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(209));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _normalizePattern9;
-
-function _load_normalizePattern() {
-  return _normalizePattern9 = __webpack_require__(37);
-}
-
-var _logicalDependencyTree;
-
-function _load_logicalDependencyTree() {
-  return _logicalDependencyTree = __webpack_require__(582);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = _interopRequireWildcard(__webpack_require__(18));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-const uuid = __webpack_require__(119);
-const ssri = __webpack_require__(77);
-const nodeVersion = process.versions.node.split('-')[0];
-
-const noArguments = exports.noArguments = true;
-
-class ImportResolver extends (_baseResolver || _load_baseResolver()).default {
-  getCwd() {
-    if (this.request.parentRequest) {
-      const parent = this.resolver.getStrictResolvedPattern(this.request.parentRequest.pattern);
-      invariant(parent._loc, 'expected package location');
-      return path.dirname(parent._loc);
-    }
-    return this.config.cwd;
-  }
-
-  resolveHostedGit(info, Resolver) {
-    var _normalizePattern = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
-
-    const range = _normalizePattern.range;
-
-    const exploded = (0, (_hostedGitResolver2 || _load_hostedGitResolver2()).explodeHostedGitFragment)(range, this.reporter);
-    const hash = info.gitHead;
-    invariant(hash, 'expected package gitHead');
-    const url = Resolver.getTarballUrl(exploded, hash);
-    info._uid = hash;
-    info._remote = {
-      resolved: url,
-      type: 'tarball',
-      registry: this.registry,
-      reference: url,
-      hash: null
-    };
-    return info;
-  }
-
-  resolveGist(info, Resolver) {
-    var _normalizePattern2 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
-
-    const range = _normalizePattern2.range;
-
-    var _explodeGistFragment = (0, (_gistResolver2 || _load_gistResolver2()).explodeGistFragment)(range, this.reporter);
-
-    const id = _explodeGistFragment.id;
-
-    const hash = info.gitHead;
-    invariant(hash, 'expected package gitHead');
-    const url = `https://gist.github.com/${id}.git`;
-    info._uid = hash;
-    info._remote = {
-      resolved: `${url}#${hash}`,
-      type: 'git',
-      registry: this.registry,
-      reference: url,
-      hash
-    };
-    return info;
-  }
-
-  resolveGit(info, Resolver) {
-    const url = info._resolved;
-    const hash = info.gitHead;
-    invariant(url, 'expected package _resolved');
-    invariant(hash, 'expected package gitHead');
-    info._uid = hash;
-    info._remote = {
-      resolved: `${url}#${hash}`,
-      type: 'git',
-      registry: this.registry,
-      reference: url,
-      hash
-    };
-    return info;
-  }
-
-  resolveFile(info, Resolver) {
-    var _normalizePattern3 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
-
-    const range = _normalizePattern3.range;
-
-    let loc = (_misc || _load_misc()).removePrefix(range, 'file:');
-    if (!path.isAbsolute(loc)) {
-      loc = path.join(this.config.cwd, loc);
-    }
-    info._uid = info.version;
-    info._remote = {
-      type: 'copy',
-      registry: this.registry,
-      hash: `${uuid.v4()}-${new Date().getTime()}`,
-      reference: loc
-    };
-    return info;
-  }
-
-  resolveRegistry(info) {
-    let url = info._resolved;
-    const hash = info._shasum;
-    invariant(url, 'expected package _resolved');
-    invariant(hash, 'expected package _shasum');
-    if (this.config.getOption('registry') === (_constants || _load_constants()).YARN_REGISTRY) {
-      url = url.replace((_constants || _load_constants()).NPM_REGISTRY_RE, (_constants || _load_constants()).YARN_REGISTRY);
-    }
-    info._uid = info.version;
-    info._remote = {
-      resolved: `${url}#${hash}`,
-      type: 'tarball',
-      registry: this.registry,
-      reference: url,
-      integrity: info._integrity ? ssri.parse(info._integrity) : ssri.fromHex(hash, 'sha1'),
-      hash
-    };
-    return info;
-  }
-
-  resolveImport(info) {
-    var _normalizePattern4 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
-
-    const range = _normalizePattern4.range;
-
-    const Resolver = (0, (_index || _load_index()).getExoticResolver)(range);
-    if (Resolver && Resolver.prototype instanceof (_hostedGitResolver || _load_hostedGitResolver()).default) {
-      return this.resolveHostedGit(info, Resolver);
-    } else if (Resolver && Resolver === (_gistResolver || _load_gistResolver()).default) {
-      return this.resolveGist(info, Resolver);
-    } else if (Resolver && Resolver === (_gitResolver || _load_gitResolver()).default) {
-      return this.resolveGit(info, Resolver);
-    } else if (Resolver && Resolver === (_fileResolver || _load_fileResolver()).default) {
-      return this.resolveFile(info, Resolver);
-    }
-    return this.resolveRegistry(info);
-  }
-
-  resolveLocation(loc) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const info = yield _this.config.tryManifest(loc, 'npm', false);
-      if (!info) {
-        return null;
-      }
-      return _this.resolveImport(info);
-    })();
-  }
-
-  resolveFixedVersion(fixedVersionPattern) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _normalizePattern5 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(fixedVersionPattern);
-
-      const range = _normalizePattern5.range;
-
-      const exoticResolver = (0, (_index || _load_index()).getExoticResolver)(range);
-      const manifest = exoticResolver ? yield _this2.request.findExoticVersionInfo(exoticResolver, range) : yield _this2.request.findVersionOnRegistry(fixedVersionPattern);
-      return manifest;
-    })();
-  }
-
-  _resolveFromFixedVersions() {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      invariant(_this3.request instanceof ImportPackageRequest, 'request must be ImportPackageRequest');
-
-      var _normalizePattern6 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(_this3.pattern);
-
-      const name = _normalizePattern6.name;
-
-      invariant(_this3.request.dependencyTree instanceof (_logicalDependencyTree || _load_logicalDependencyTree()).LogicalDependencyTree, 'dependencyTree on request must be LogicalDependencyTree');
-      const fixedVersionPattern = _this3.request.dependencyTree.getFixedVersionPattern(name, _this3.request.parentNames);
-      const info = yield _this3.config.getCache(`import-resolver-${fixedVersionPattern}`, function () {
-        return _this3.resolveFixedVersion(fixedVersionPattern);
-      });
-      if (info) {
-        return info;
-      }
-      throw new (_errors || _load_errors()).MessageError(_this3.reporter.lang('importResolveFailed', name, _this3.getCwd()));
-    })();
-  }
-
-  _resolveFromNodeModules() {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      var _normalizePattern7 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(_this4.pattern);
-
-      const name = _normalizePattern7.name;
-
-      let cwd = _this4.getCwd();
-      while (!path.relative(_this4.config.cwd, cwd).startsWith('..')) {
-        const loc = path.join(cwd, 'node_modules', name);
-        const info = yield _this4.config.getCache(`import-resolver-${loc}`, function () {
-          return _this4.resolveLocation(loc);
-        });
-        if (info) {
-          return info;
-        }
-        cwd = path.resolve(cwd, '../..');
-      }
-      throw new (_errors || _load_errors()).MessageError(_this4.reporter.lang('importResolveFailed', name, _this4.getCwd()));
-    })();
-  }
-
-  resolve() {
-    if (this.request instanceof ImportPackageRequest && this.request.dependencyTree) {
-      return this._resolveFromFixedVersions();
-    } else {
-      return this._resolveFromNodeModules();
-    }
-  }
-}
-
-class ImportPackageRequest extends (_packageRequest || _load_packageRequest()).default {
-  constructor(req, dependencyTree, resolver) {
-    super(req, resolver);
-    this.import = this.parentRequest instanceof ImportPackageRequest ? this.parentRequest.import : true;
-    this.dependencyTree = dependencyTree;
-  }
-
-  getRootName() {
-    return this.resolver instanceof ImportPackageResolver && this.resolver.rootName || 'root';
-  }
-
-  getParentHumanName() {
-    return [this.getRootName()].concat(this.parentNames).join(' > ');
-  }
-
-  reportResolvedRangeMatch(info, resolved) {
-    if (info.version === resolved.version) {
-      return;
-    }
-    this.reporter.warn(this.reporter.lang('importResolvedRangeMatch', resolved.version, resolved.name, info.version, this.getParentHumanName()));
-  }
-
-  _findResolvedManifest(info) {
-    var _normalizePattern8 = (0, (_normalizePattern9 || _load_normalizePattern()).normalizePattern)(this.pattern);
-
-    const range = _normalizePattern8.range,
-          name = _normalizePattern8.name;
-
-    const solvedRange = (_semver || _load_semver()).default.validRange(range) ? info.version : range;
-    const resolved = this.resolver.getExactVersionMatch(name, solvedRange, info);
-    if (resolved) {
-      return resolved;
-    }
-    invariant(info._remote, 'expected package remote');
-    const ref = new (_packageReference || _load_packageReference()).default(this, info, info._remote);
-    info._reference = ref;
-    return info;
-  }
-
-  resolveToExistingVersion(info) {
-    const resolved = this._findResolvedManifest(info);
-    invariant(resolved, 'should have found a resolved reference');
-    const ref = resolved._reference;
-    invariant(ref, 'should have a package reference');
-    ref.addRequest(this);
-    ref.addPattern(this.pattern, resolved);
-    ref.addOptional(this.optional);
-  }
-
-  findVersionInfo() {
-    if (!this.import) {
-      this.reporter.verbose(this.reporter.lang('skippingImport', this.pattern, this.getParentHumanName()));
-      return super.findVersionInfo();
-    }
-    const resolver = new ImportResolver(this, this.pattern);
-    return resolver.resolve().catch(() => {
-      this.import = false;
-      this.reporter.warn(this.reporter.lang('importFailed', this.pattern, this.getParentHumanName()));
-      return super.findVersionInfo();
-    });
-  }
-}
-
-class ImportPackageResolver extends (_packageResolver || _load_packageResolver()).default {
-  constructor(config, lockfile) {
-    super(config, lockfile);
-    this.next = [];
-    this.rootName = 'root';
-  }
-
-  find(req) {
-    this.next.push(req);
-    return Promise.resolve();
-  }
-
-  findOne(req) {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (_this5.activity) {
-        _this5.activity.tick(req.pattern);
-      }
-      const request = new ImportPackageRequest(req, _this5.dependencyTree, _this5);
-      yield request.find({ fresh: false });
-    })();
-  }
-
-  findAll(deps) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield Promise.all(deps.map(function (dep) {
-        return _this6.findOne(dep);
-      }));
-      deps = _this6.next;
-      _this6.next = [];
-      if (!deps.length) {
-        // all required package versions have been discovered, so now packages that
-        // resolved to existing versions can be resolved to their best available version
-        _this6.resolvePackagesWithExistingVersions();
-        return;
-      }
-      yield _this6.findAll(deps);
-    })();
-  }
-
-  resetOptional() {
-    for (const pattern in this.patterns) {
-      const ref = this.patterns[pattern]._reference;
-      invariant(ref, 'expected reference');
-      ref.optional = null;
-      for (var _iterator = ref.requests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const req = _ref;
-
-        ref.addOptional(req.optional);
-      }
-    }
-  }
-
-  init(deps, { isFlat, isFrozen, workspaceLayout } = { isFlat: false, isFrozen: false, workspaceLayout: undefined }) {
-    var _this7 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this7.flat = Boolean(isFlat);
-      const activity = _this7.activity = _this7.reporter.activity();
-      yield _this7.findAll(deps);
-      _this7.resetOptional();
-      activity.end();
-      _this7.activity = null;
-    })();
-  }
-}
-
-class Import extends (_install || _load_install()).Install {
-  constructor(flags, config, reporter, lockfile) {
-    super(flags, config, reporter, lockfile);
-    this.resolver = new ImportPackageResolver(this.config, this.lockfile);
-    this.linker = new (_packageLinker || _load_packageLinker()).default(config, this.resolver);
-  }
-  createLogicalDependencyTree(packageJson, packageLock) {
-    invariant(packageJson, 'package.json should exist');
-    invariant(packageLock, 'package-lock.json should exist');
-    invariant(this.resolver instanceof ImportPackageResolver, 'resolver should be an ImportPackageResolver');
-    try {
-      this.resolver.dependencyTree = new (_logicalDependencyTree || _load_logicalDependencyTree()).LogicalDependencyTree(packageJson, packageLock);
-    } catch (e) {
-      throw new (_errors || _load_errors()).MessageError(this.reporter.lang('importSourceFilesCorrupted'));
-    }
-  }
-  getExternalLockfileContents() {
-    var _this8 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      try {
-        var _ref2 = yield Promise.all([(_fs || _load_fs()).readFile(path.join(_this8.config.cwd, (_constants || _load_constants()).NODE_PACKAGE_JSON)), (_fs || _load_fs()).readFile(path.join(_this8.config.cwd, (_constants || _load_constants()).NPM_LOCK_FILENAME))]);
-
-        const packageJson = _ref2[0],
-              packageLock = _ref2[1];
-
-        return { packageJson, packageLock };
-      } catch (e) {
-        return { packageJson: null, packageLock: null };
-      }
-    })();
-  }
-  init() {
-    var _this9 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (yield (_fs || _load_fs()).exists(path.join(_this9.config.cwd, (_constants || _load_constants()).LOCKFILE_FILENAME))) {
-        throw new (_errors || _load_errors()).MessageError(_this9.reporter.lang('lockfileExists'));
-      }
-
-      var _ref3 = yield _this9.getExternalLockfileContents();
-
-      const packageJson = _ref3.packageJson,
-            packageLock = _ref3.packageLock;
-
-      const importSource = packageJson && packageLock && (_semver || _load_semver()).default.satisfies(nodeVersion, '>=5.0.0') ? 'package-lock.json' : 'node_modules';
-      if (importSource === 'package-lock.json') {
-        _this9.reporter.info(_this9.reporter.lang('importPackageLock'));
-        _this9.createLogicalDependencyTree(packageJson, packageLock);
-      }
-      if (importSource === 'node_modules') {
-        _this9.reporter.info(_this9.reporter.lang('importNodeModules'));
-        yield (0, (_check || _load_check()).verifyTreeCheck)(_this9.config, _this9.reporter, {}, []);
-      }
-
-      var _ref4 = yield _this9.fetchRequestFromCwd();
-
-      const requests = _ref4.requests,
-            patterns = _ref4.patterns,
-            manifest = _ref4.manifest;
-
-      if (manifest.name && _this9.resolver instanceof ImportPackageResolver) {
-        _this9.resolver.rootName = manifest.name;
-      }
-      yield _this9.resolver.init(requests, { isFlat: _this9.flags.flat, isFrozen: _this9.flags.frozenLockfile });
-      const manifests = yield (_packageFetcher || _load_packageFetcher()).fetch(_this9.resolver.getManifests(), _this9.config);
-      _this9.resolver.updateManifests(manifests);
-      yield (_packageCompatibility || _load_packageCompatibility()).check(_this9.resolver.getManifests(), _this9.config, _this9.flags.ignoreEngines);
-      yield _this9.linker.resolvePeerModules();
-      yield _this9.saveLockfileAndIntegrity(patterns);
-      return patterns;
-    })();
-  }
-}
-
-exports.Import = Import;
-function setFlags(commander) {
-  commander.description('Generates yarn.lock from an npm package-lock.json file or an existing npm-installed node_modules folder.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 533 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (args.length > 2) {
-      reporter.error(reporter.lang('tooManyArguments', 2));
-      return;
-    }
-
-    let packageName = args.shift() || '.';
-
-    // Handle the case when we are referencing a local package.
-    if (packageName === '.') {
-      packageName = (yield config.readRootManifest()).name;
-    }
-
-    const packageInput = (_npmRegistry || _load_npmRegistry()).default.escapeName(packageName);
-
-    var _parsePackageName = (0, (_parsePackageName2 || _load_parsePackageName()).default)(packageInput);
-
-    const name = _parsePackageName.name,
-          version = _parsePackageName.version;
-
-
-    let result;
-    try {
-      result = yield config.registries.npm.request(name, { unfiltered: true });
-    } catch (e) {
-      reporter.error(reporter.lang('infoFail'));
-      return;
-    }
-    if (!result) {
-      reporter.error(reporter.lang('infoFail'));
-      return;
-    }
-
-    result = clean(result);
-
-    const versions = result.versions;
-    // $FlowFixMe
-    result.versions = Object.keys(versions).sort(semver.compareLoose);
-    result.version = version || result['dist-tags'].latest;
-    result = Object.assign(result, versions[result.version]);
-
-    const fieldPath = args.shift();
-    const fields = fieldPath ? fieldPath.split('.') : [];
-
-    // Readmes can be long so exclude them unless explicitly asked for.
-    if (fields[0] !== 'readme') {
-      delete result.readme;
-    }
-
-    result = fields.reduce(function (prev, cur) {
-      return prev && prev[cur];
-    }, result);
-    reporter.inspect(result);
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-var _parsePackageName2;
-
-function _load_parsePackageName() {
-  return _parsePackageName2 = _interopRequireDefault(__webpack_require__(588));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const semver = __webpack_require__(21);
-
-function clean(object) {
-  if (Array.isArray(object)) {
-    const result = [];
-    object.forEach(item => {
-      item = clean(item);
-      if (item) {
-        result.push(item);
-      }
-    });
-    return result;
-  } else if (typeof object === 'object') {
-    const result = {};
-    for (const key in object) {
-      if (key.startsWith('_')) {
-        continue;
-      }
-
-      const item = clean(object[key]);
-      if (item) {
-        result[key] = item;
-      }
-    }
-    return result;
-  } else if (object) {
-    return object;
-  } else {
-    return null;
-  }
-}
-
-function setFlags(commander) {
-  commander.description('Shows information about a package.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 534 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getGitConfigInfo = exports.run = exports.shouldRunInCurrentCwd = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const manifests = yield config.getRootManifests();
-
-    let repository = {};
-    const author = {
-      name: config.getOption('init-author-name'),
-      email: config.getOption('init-author-email'),
-      url: config.getOption('init-author-url')
-    };
-    if (yield (_fs || _load_fs()).exists(path.join(config.cwd, '.git'))) {
-      // get git origin of the cwd
-      try {
-        repository = {
-          type: 'git',
-          url: yield (_child || _load_child()).spawn('git', ['config', 'remote.origin.url'], {
-            cwd: config.cwd
-          })
-        };
-      } catch (ex) {
-        // Ignore - Git repo may not have an origin URL yet (eg. if it only exists locally)
-      }
-
-      if (author.name === undefined) {
-        author.name = yield getGitConfigInfo('user.name');
-      }
-
-      if (author.email === undefined) {
-        author.email = yield getGitConfigInfo('user.email');
-      }
-    }
-
-    const keys = [{
-      key: 'name',
-      question: 'name',
-      default: path.basename(config.cwd),
-      validation: (_validate || _load_validate()).isValidPackageName,
-      validationError: 'invalidPackageName'
-    }, {
-      key: 'version',
-      question: 'version',
-      default: String(config.getOption('init-version'))
-    }, {
-      key: 'description',
-      question: 'description',
-      default: ''
-    }, {
-      key: 'main',
-      question: 'entry point',
-      default: 'index.js'
-    }, {
-      key: 'repository',
-      question: 'repository url',
-      default: (0, (_util || _load_util()).extractRepositoryUrl)(repository)
-    }, {
-      key: 'author',
-      question: 'author',
-      default: (0, (_util || _load_util()).stringifyPerson)(author)
-    }, {
-      key: 'license',
-      question: 'license',
-      default: String(config.getOption('init-license'))
-    }, {
-      key: 'private',
-      question: 'private',
-      default: config.getOption('init-private') || '',
-      inputFormatter: yn
-    }];
-
-    // get answers
-    const pkg = {};
-    for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const entry = _ref2;
-      const yes = flags.yes,
-            privateFlag = flags.private;
-      const manifestKey = entry.key;
-      let question = entry.question,
-          def = entry.default;
-
-
-      for (var _iterator4 = (_index || _load_index()).registryNames, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref5;
-
-        if (_isArray4) {
-          if (_i4 >= _iterator4.length) break;
-          _ref5 = _iterator4[_i4++];
-        } else {
-          _i4 = _iterator4.next();
-          if (_i4.done) break;
-          _ref5 = _i4.value;
-        }
-
-        const registryName = _ref5;
-        const object = manifests[registryName].object;
-
-        let val = objectPath.get(object, manifestKey);
-        if (!val) {
-          break;
-        }
-        if (typeof val === 'object') {
-          if (manifestKey === 'author') {
-            val = (0, (_util || _load_util()).stringifyPerson)(val);
-          } else if (manifestKey === 'repository') {
-            val = (0, (_util || _load_util()).extractRepositoryUrl)(val);
-          }
-        }
-        def = val;
-      }
-
-      if (manifestKey === 'private' && privateFlag) {
-        def = true;
-      }
-
-      if (def) {
-        question += ` (${String(def)})`;
-      }
-
-      let answer;
-      let validAnswer = false;
-
-      if (yes) {
-        answer = def;
-      } else {
-        // loop until a valid answer is provided, if validation is on entry
-        if (entry.validation) {
-          while (!validAnswer) {
-            answer = (yield reporter.question(question)) || def;
-            // validate answer
-            if (entry.validation(String(answer))) {
-              validAnswer = true;
-            } else {
-              reporter.error(reporter.lang('invalidPackageName'));
-            }
-          }
-        } else {
-          answer = (yield reporter.question(question)) || def;
-        }
-      }
-
-      if (answer) {
-        if (entry.inputFormatter) {
-          answer = entry.inputFormatter(answer);
-        }
-        objectPath.set(pkg, manifestKey, answer);
-      }
-    }
-
-    if (pkg.repository && (_githubResolver || _load_githubResolver()).default.isVersion(pkg.repository)) {
-      pkg.repository = `https://github.com/${pkg.repository}`;
-    }
-
-    // save answers
-    const targetManifests = [];
-    for (var _iterator2 = (_index || _load_index()).registryNames, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref3 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref3 = _i2.value;
-      }
-
-      const registryName = _ref3;
-
-      const info = manifests[registryName];
-      if (info.exists) {
-        targetManifests.push(info);
-      }
-    }
-    if (!targetManifests.length) {
-      targetManifests.push(manifests.npm);
-    }
-    for (var _iterator3 = targetManifests, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
-
-      const targetManifest = _ref4;
-
-      Object.assign(targetManifest.object, pkg);
-      reporter.success(`Saved ${path.basename(targetManifest.loc)}`);
-    }
-
-    yield config.saveRootManifests(manifests);
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let getGitConfigInfo = exports.getGitConfigInfo = (() => {
-  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (credential, spawn = (_child || _load_child()).spawn) {
-    try {
-      // try to get author default based on git config
-      return yield spawn('git', ['config', credential]);
-    } catch (e) {
-      return '';
-    }
-  });
-
-  return function getGitConfigInfo(_x5) {
-    return _ref6.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _util;
-
-function _load_util() {
-  return _util = __webpack_require__(221);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(57);
-}
-
-var _githubResolver;
-
-function _load_githubResolver() {
-  return _githubResolver = _interopRequireDefault(__webpack_require__(367));
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _validate;
-
-function _load_validate() {
-  return _validate = _interopRequireWildcard(__webpack_require__(125));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const objectPath = __webpack_require__(304);
-const path = __webpack_require__(0);
-const yn = __webpack_require__(962);
-
-function setFlags(commander) {
-  commander.description('Interactively creates or updates a package.json file.');
-  commander.option('-y, --yes', 'use default options');
-  commander.option('-p, --private', 'use default options and private true');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-const shouldRunInCurrentCwd = exports.shouldRunInCurrentCwd = true;
-
-/***/ }),
-/* 535 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.run = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getManifests = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, flags) {
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.cwd);
-    const install = new (_install || _load_install()).Install((0, (_extends2 || _load_extends()).default)({ skipIntegrityCheck: true }, flags), config, new (_baseReporter || _load_baseReporter()).default(), lockfile);
-    yield install.hydrate(true);
-
-    let manifests = install.resolver.getManifests();
-
-    // sort by name
-    manifests = manifests.sort(function (a, b) {
-      if (!a.name && !b.name) {
-        return 0;
-      }
-
-      if (!a.name) {
-        return 1;
-      }
-
-      if (!b.name) {
-        return -1;
-      }
-
-      return a.name.localeCompare(b.name);
-    });
-
-    // filter ignored manifests
-    manifests = manifests.filter(function (manifest) {
-      const ref = manifest._reference;
-      return !!ref && !ref.ignore;
-    });
-
-    return manifests;
-  });
-
-  return function getManifests(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let list = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const manifests = yield getManifests(config, flags);
-    const manifestsByLicense = new Map();
-
-    for (var _iterator = manifests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref4 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref4 = _i.value;
-      }
-
-      const _ref3 = _ref4;
-      const name = _ref3.name,
-            version = _ref3.version,
-            license = _ref3.license,
-            repository = _ref3.repository,
-            homepage = _ref3.homepage,
-            author = _ref3.author;
-
-      const licenseKey = license || 'UNKNOWN';
-      const url = repository ? repository.url : homepage;
-      const vendorUrl = homepage || author && author.url;
-      const vendorName = author && author.name;
-
-      if (!manifestsByLicense.has(licenseKey)) {
-        manifestsByLicense.set(licenseKey, new Map());
-      }
-
-      const byLicense = manifestsByLicense.get(licenseKey);
-      invariant(byLicense, 'expected value');
-      byLicense.set(`${name}@${version}`, {
-        name,
-        version,
-        url,
-        vendorUrl,
-        vendorName
-      });
-    }
-
-    if (flags.json) {
-      const body = [];
-
-      manifestsByLicense.forEach(function (license, licenseKey) {
-        license.forEach(function ({ name, version, url, vendorUrl, vendorName }) {
-          body.push([name, version, licenseKey, url || 'Unknown', vendorUrl || 'Unknown', vendorName || 'Unknown']);
-        });
-      });
-
-      reporter.table(['Name', 'Version', 'License', 'URL', 'VendorUrl', 'VendorName'], body);
-    } else {
-      const trees = [];
-
-      manifestsByLicense.forEach(function (license, licenseKey) {
-        const licenseTree = [];
-
-        license.forEach(function ({ name, version, url, vendorUrl, vendorName }) {
-          const children = [];
-
-          if (url) {
-            children.push({ name: `${reporter.format.bold('URL:')} ${url}` });
-          }
-
-          if (vendorUrl) {
-            children.push({ name: `${reporter.format.bold('VendorUrl:')} ${vendorUrl}` });
-          }
-
-          if (vendorName) {
-            children.push({ name: `${reporter.format.bold('VendorName:')} ${vendorName}` });
-          }
-
-          licenseTree.push({
-            name: `${name}@${version}`,
-            children
-          });
-        });
-
-        trees.push({
-          name: licenseKey,
-          children: licenseTree
-        });
-      });
-
-      reporter.tree('licenses', trees, { force: true });
-    }
-  });
-
-  return function list(_x3, _x4, _x5, _x6) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _baseReporter;
-
-function _load_baseReporter() {
-  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-function hasWrapper(flags, args) {
-  return args[0] != 'generate-disclaimer';
-}
-
-function setFlags(commander) {
-  commander.description('Lists licenses for installed packages.');
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('licenses', {
-  ls(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      reporter.warn(`\`yarn licenses ls\` is deprecated. Please use \`yarn licenses list\`.`);
-      yield list(config, reporter, flags, args);
-    })();
-  },
-
-  list(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield list(config, reporter, flags, args);
-    })();
-  },
-
-  generateDisclaimer(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      /* eslint-disable no-console */
-
-      // `reporter.log` dumps a bunch of ANSI escapes to clear the current line and
-      // is for abstracting the console output so it can be consumed by other tools
-      // (JSON output being the primary one). This command is only for text consumption
-      // and you should just be dumping it to a TXT file. Using a reporter here has the
-      // potential to mess up the output since it might print ansi escapes.
-      const manifests = yield getManifests(config, flags);
-      const manifest = yield config.readRootManifest();
-
-      // Create a map of license text to manifest so that packages with exactly
-      // the same license text are grouped together.
-      const manifestsByLicense = new Map();
-      for (var _iterator2 = manifests, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref5;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref5 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref5 = _i2.value;
-        }
-
-        const manifest = _ref5;
-        const licenseText = manifest.licenseText,
-              noticeText = manifest.noticeText;
-
-        let licenseKey;
-        if (!licenseText) {
-          continue;
-        }
-
-        if (!noticeText) {
-          licenseKey = licenseText;
-        } else {
-          licenseKey = `${licenseText}\n\nNOTICE\n\n${noticeText}`;
-        }
-
-        if (!manifestsByLicense.has(licenseKey)) {
-          manifestsByLicense.set(licenseKey, new Map());
-        }
-
-        const byLicense = manifestsByLicense.get(licenseKey);
-        invariant(byLicense, 'expected value');
-        byLicense.set(manifest.name, manifest);
-      }
-
-      console.log('THE FOLLOWING SETS FORTH ATTRIBUTION NOTICES FOR THIRD PARTY SOFTWARE THAT MAY BE CONTAINED ' + `IN PORTIONS OF THE ${String(manifest.name).toUpperCase().replace(/-/g, ' ')} PRODUCT.`);
-      console.log();
-
-      for (var _iterator3 = manifestsByLicense, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref7 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref7 = _i3.value;
-        }
-
-        const _ref6 = _ref7;
-        const licenseKey = _ref6[0];
-        const manifests = _ref6[1];
-
-        console.log('-----');
-        console.log();
-
-        const names = [];
-        const urls = [];
-        for (var _iterator4 = manifests, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref9;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref9 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref9 = _i4.value;
-          }
-
-          const _ref8 = _ref9;
-          const name = _ref8[0];
-          const repository = _ref8[1].repository;
-
-          names.push(name);
-          if (repository && repository.url) {
-            urls.push(manifests.size === 1 ? repository.url : `${repository.url} (${name})`);
-          }
-        }
-
-        const heading = [];
-        heading.push(`The following software may be included in this product: ${names.join(', ')}.`);
-        if (urls.length > 0) {
-          heading.push(`A copy of the source code may be downloaded from ${urls.join(', ')}.`);
-        }
-        heading.push('This software contains the following license and notice below:');
-
-        console.log(heading.join(' '));
-        console.log();
-
-        if (licenseKey) {
-          console.log(licenseKey.trim());
-        } else {
-          // what do we do here? base it on `license`?
-        }
-
-        console.log();
-      }
-    })();
-  }
-});
-
-const run = _buildSubCommands.run,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.examples = examples;
-
-/***/ }),
-/* 536 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    yield config.registries.yarn.saveHomeConfig({
-      username: undefined,
-      email: undefined
-    });
-
-    reporter.success(reporter.lang('clearedCredentials'));
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function setFlags(commander) {
-  commander.description('Clears registry username and email.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 537 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const pnpPath = `${config.lockfileFolder}/${(_constants || _load_constants()).PNP_FILENAME}`;
-
-    let nodeOptions = process.env.NODE_OPTIONS || '';
-    if (yield (_fs || _load_fs()).exists(pnpPath)) {
-      nodeOptions = `--require ${pnpPath} ${nodeOptions}`;
-    }
-
-    try {
-      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, args, {
-        stdio: 'inherit',
-        cwd: flags.into || config.cwd,
-        env: (0, (_extends2 || _load_extends()).default)({}, process.env, { NODE_OPTIONS: nodeOptions })
-      });
-    } catch (err) {
-      throw err;
-    }
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function setFlags(commander) {
-  commander.description('Runs Node with the same version that the one used by Yarn itself, and by default from the project root');
-  commander.usage('node [--into PATH] [... args]');
-  commander.option('--into <path>', 'Sets the cwd to the specified location');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 538 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.requireLockfile = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder);
-    const install = new (_install || _load_install()).Install((0, (_extends2 || _load_extends()).default)({}, flags, { includeWorkspaceDeps: true }), config, reporter, lockfile);
-    let deps = yield (_packageRequest || _load_packageRequest()).default.getOutdatedPackages(lockfile, install, config, reporter);
-
-    if (args.length) {
-      const requested = new Set(args);
-
-      deps = deps.filter(function ({ name }) {
-        return requested.has(name);
-      });
-    }
-
-    const getNameFromHint = function getNameFromHint(hint) {
-      return hint ? `${hint}Dependencies` : 'dependencies';
-    };
-    const colorizeName = function colorizeName({ current, latest, name }) {
-      return reporter.format[(0, (_colorForVersions || _load_colorForVersions()).default)(current, latest)](name);
-    };
-
-    if (deps.length) {
-      const usesWorkspaces = !!config.workspaceRootFolder;
-      const body = deps.map(function (info) {
-        const row = [colorizeName(info), info.current, (0, (_colorizeDiff || _load_colorizeDiff()).default)(info.current, info.wanted, reporter), reporter.format.cyan(info.latest), info.workspaceName || '', getNameFromHint(info.hint), reporter.format.cyan(info.url)];
-        if (!usesWorkspaces) {
-          row.splice(4, 1);
-        }
-        return row;
-      });
-
-      const red = reporter.format.red('<red>');
-      const yellow = reporter.format.yellow('<yellow>');
-      const green = reporter.format.green('<green>');
-      reporter.info(reporter.lang('legendColorsForVersionUpdates', red, yellow, green));
-
-      const header = ['Package', 'Current', 'Wanted', 'Latest', 'Workspace', 'Package Type', 'URL'];
-      if (!usesWorkspaces) {
-        header.splice(4, 1);
-      }
-      reporter.table(header, body);
-
-      return 1;
-    }
-    return 0;
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _packageRequest;
-
-function _load_packageRequest() {
-  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _colorForVersions;
-
-function _load_colorForVersions() {
-  return _colorForVersions = _interopRequireDefault(__webpack_require__(369));
-}
-
-var _colorizeDiff;
-
-function _load_colorizeDiff() {
-  return _colorizeDiff = _interopRequireDefault(__webpack_require__(370));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const requireLockfile = exports.requireLockfile = true;
-
-function setFlags(commander) {
-  commander.description('Checks for outdated package dependencies.');
-  commander.usage('outdated [packages ...]');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 539 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.hasWrapper = exports.run = exports.mutate = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let mutate = exports.mutate = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (args, config, reporter, buildMessages, mutator) {
-    if (args.length !== 2 && args.length !== 1) {
-      return false;
-    }
-
-    const username = args.shift();
-    const name = yield (0, (_tag || _load_tag()).getName)(args, config);
-    if (!(0, (_validate || _load_validate()).isValidPackageName)(name)) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('invalidPackageName'));
-    }
-
-    const msgs = buildMessages(username, name);
-    reporter.step(1, 3, reporter.lang('loggingIn'));
-    const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, name);
-
-    reporter.step(2, 3, msgs.info);
-    const user = yield config.registries.npm.request(`-/user/org.couchdb.user:${username}`);
-    let error = false;
-    if (user) {
-      // get package
-      const pkg = yield config.registries.npm.request((_npmRegistry || _load_npmRegistry()).default.escapeName(name));
-      if (pkg) {
-        pkg.maintainers = pkg.maintainers || [];
-        error = mutator({ name: user.name, email: user.email }, pkg);
-      } else {
-        error = true;
-        reporter.error(reporter.lang('unknownPackage', name));
-      }
-
-      // update package
-      if (pkg && !error) {
-        const res = yield config.registries.npm.request(`${(_npmRegistry || _load_npmRegistry()).default.escapeName(name)}/-rev/${pkg._rev}`, {
-          method: 'PUT',
-          body: {
-            _id: pkg._id,
-            _rev: pkg._rev,
-            maintainers: pkg.maintainers
-          }
-        });
-
-        if (res != null && res.success) {
-          reporter.success(msgs.success);
-        } else {
-          error = true;
-          reporter.error(msgs.error);
-        }
-      }
-    } else {
-      error = true;
-      reporter.error(reporter.lang('unknownUser', username));
-    }
-
-    reporter.step(3, 3, reporter.lang('revokingToken'));
-    yield revoke();
-
-    if (error) {
-      throw new Error();
-    } else {
-      return true;
-    }
-  });
-
-  return function mutate(_x, _x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let list = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (args.length > 1) {
-      return false;
-    }
-    const name = yield (0, (_tag || _load_tag()).getName)(args, config);
-    reporter.step(1, 1, reporter.lang('ownerGetting', name));
-    const pkg = yield config.registries.npm.request(name, { unfiltered: true });
-    if (pkg) {
-      const owners = pkg.maintainers;
-      if (!owners || !owners.length) {
-        reporter.warn(reporter.lang('ownerNone'));
-      } else {
-        for (var _iterator = owners, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-          var _ref3;
-
-          if (_isArray) {
-            if (_i >= _iterator.length) break;
-            _ref3 = _iterator[_i++];
-          } else {
-            _i = _iterator.next();
-            if (_i.done) break;
-            _ref3 = _i.value;
-          }
-
-          const owner = _ref3;
-
-          reporter.info(`${owner.name} <${owner.email}>`);
-        }
-      }
-    } else {
-      reporter.error(reporter.lang('ownerGettingFailed'));
-    }
-
-    if (pkg) {
-      return true;
-    } else {
-      throw new Error();
-    }
-  });
-
-  return function list(_x6, _x7, _x8, _x9) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _validate;
-
-function _load_validate() {
-  return _validate = __webpack_require__(125);
-}
-
-var _tag;
-
-function _load_tag() {
-  return _tag = __webpack_require__(361);
-}
-
-var _login;
-
-function _load_login() {
-  return _login = __webpack_require__(107);
-}
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function remove(config, reporter, flags, args) {
-  return mutate(args, config, reporter, (username, name) => ({
-    info: reporter.lang('ownerRemoving', username, name),
-    success: reporter.lang('ownerRemoved'),
-    error: reporter.lang('ownerRemoveError')
-  }), (user, pkg) => {
-    let found = false;
-
-    pkg.maintainers = pkg.maintainers.filter(o => {
-      const match = o.name === user.name;
-      found = found || match;
-      return !match;
-    });
-
-    if (!found) {
-      reporter.error(reporter.lang('userNotAnOwner', user.name));
-    }
-
-    return found;
-  });
-}
-
-function setFlags(commander) {
-  commander.description('Manages package owners.');
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('owner', {
-  add(config, reporter, flags, args) {
-    return mutate(args, config, reporter, (username, name) => ({
-      info: reporter.lang('ownerAdding', username, name),
-      success: reporter.lang('ownerAdded'),
-      error: reporter.lang('ownerAddingFailed')
-    }), (user, pkg) => {
-      for (var _iterator2 = pkg.maintainers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref4 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref4 = _i2.value;
-        }
-
-        const owner = _ref4;
-
-        if (owner.name === user) {
-          reporter.error(reporter.lang('ownerAlready'));
-          return true;
-        }
-      }
-
-      pkg.maintainers.push(user);
-
-      return false;
-    });
-  },
-
-  rm(config, reporter, flags, args) {
-    reporter.warn(`\`yarn owner rm\` is deprecated. Please use \`yarn owner remove\`.`);
-    return remove(config, reporter, flags, args);
-  },
-
-  remove(config, reporter, flags, args) {
-    return remove(config, reporter, flags, args);
-  },
-
-  ls(config, reporter, flags, args) {
-    reporter.warn(`\`yarn owner ls\` is deprecated. Please use \`yarn owner list\`.`);
-    return list(config, reporter, flags, args);
-  },
-
-  list(config, reporter, flags, args) {
-    return list(config, reporter, flags, args);
-  }
-}, ['add <user> [[<@scope>/]<pkg>]', 'remove <user> [[<@scope>/]<pkg>]', 'list [<@scope>/]<pkg>']);
-
-const run = _buildSubCommands.run,
-      hasWrapper = _buildSubCommands.hasWrapper,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.hasWrapper = hasWrapper;
-exports.examples = examples;
-
-/***/ }),
-/* 540 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.setFlags = exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let fetchReleases = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, { includePrereleases = false } = {}) {
-    const token = process.env.GITHUB_TOKEN;
-    const tokenUrlParameter = token ? `?access_token=${token}` : '';
-    const request = yield config.requestManager.request({
-      url: `https://api.github.com/repos/yarnpkg/yarn/releases${tokenUrlParameter}`,
-      json: true
-    });
-
-    const releases = request.filter(function (release) {
-      if (release.draft) {
-        return false;
-      }
-
-      if (release.prerelease && !includePrereleases) {
-        return false;
-      }
-
-      // $FlowFixMe
-      release.version = semver.coerce(release.tag_name);
-
-      if (!release.version) {
-        return false;
-      }
-
-      if (!getBundleAsset(release)) {
-        return false;
-      }
-
-      return true;
-    });
-
-    releases.sort(function (a, b) {
-      // $FlowFixMe
-      return -semver.compare(a.version, b.version);
-    });
-
-    return releases;
-  });
-
-  return function fetchReleases(_x) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _rc;
-
-function _load_rc() {
-  return _rc = __webpack_require__(335);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = __webpack_require__(19);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const chalk = __webpack_require__(30);
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-const semver = __webpack_require__(21);
-
-function getBundleAsset(release) {
-  return release.assets.find(asset => {
-    return asset.name.match(/^yarn-[0-9]+\.[0-9]+\.[0-9]+\.js$/);
-  });
-}
-
-function fetchBundle(config, url) {
-  return config.requestManager.request({
-    url,
-    buffer: true
-  });
-}
-
-function hasWrapper(flags, args) {
-  return false;
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('policies', {
-  setVersion(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let range = args[0] || 'latest';
-      let allowRc = flags.rc;
-
-      reporter.log(`Resolving ${chalk.yellow(range)} to a url...`);
-
-      if (range === 'rc') {
-        range = 'latest';
-        allowRc = true;
-      }
-
-      if (range === 'latest') {
-        range = '*';
-      }
-
-      let bundleUrl;
-      let bundleVersion;
-
-      if (range === 'nightly' || range === 'nightlies') {
-        bundleUrl = 'https://nightly.yarnpkg.com/latest.js';
-        bundleVersion = 'nightly';
-      } else if (range === 'berry' || range === 'v2' || range === '2') {
-        bundleUrl = 'https://github.com/yarnpkg/berry/raw/master/packages/berry-cli/bin/berry.js';
-        bundleVersion = 'berry';
-      } else {
-        const releases = yield fetchReleases(config, {
-          includePrereleases: allowRc
-        });
-
-        const release = releases.find(function (release) {
-          // $FlowFixMe
-          return semver.satisfies(release.version, range);
-        });
-
-        if (!release) {
-          throw new Error(`Release not found: ${range}`);
-        }
-
-        const asset = getBundleAsset(release);
-        invariant(asset, 'The bundle asset should exist');
-
-        bundleUrl = asset.browser_download_url;
-        bundleVersion = release.version.version;
-      }
-
-      reporter.log(`Downloading ${chalk.green(bundleUrl)}...`);
-
-      const bundle = yield fetchBundle(config, bundleUrl);
-      const rc = (0, (_rc || _load_rc()).getRcConfigForCwd)(config.lockfileFolder, []);
-
-      const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
-      reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
-      yield (_fs || _load_fs()).mkdirp(path.dirname(yarnPath));
-      yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
-      yield (_fs || _load_fs()).chmod(yarnPath, 0o755);
-
-      const rcPath = `${config.lockfileFolder}/.yarnrc`;
-      reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
-      rc['yarn-path'] = path.relative(config.lockfileFolder, yarnPath);
-      yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `${(0, (_lockfile || _load_lockfile()).stringify)(rc)}\n`);
-
-      reporter.log(`Done!`);
-    })();
-  }
-});
-
-const run = _buildSubCommands.run,
-      setFlags = _buildSubCommands.setFlags,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.setFlags = setFlags;
-exports.examples = examples;
-
-/***/ }),
-/* 541 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let publish = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, pkg, flags, dir) {
-    let access = flags.access;
-
-    // if no access level is provided, check package.json for `publishConfig.access`
-    // see: https://docs.npmjs.com/files/package.json#publishconfig
-    if (!access && pkg && pkg.publishConfig && pkg.publishConfig.access) {
-      access = pkg.publishConfig.access;
-    }
-
-    // validate access argument
-    if (access && access !== 'public' && access !== 'restricted') {
-      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('invalidAccess'));
-    }
-
-    // TODO this might modify package.json, do we need to reload it?
-    yield config.executeLifecycleScript('prepublish');
-    yield config.executeLifecycleScript('prepare');
-    yield config.executeLifecycleScript('prepublishOnly');
-    yield config.executeLifecycleScript('prepack');
-
-    // get tarball stream
-    const stat = yield (_fs || _load_fs()).lstat(dir);
-    let stream;
-    if (stat.isDirectory()) {
-      stream = yield (0, (_pack || _load_pack()).pack)(config);
-    } else if (stat.isFile()) {
-      stream = fs2.createReadStream(dir);
-    } else {
-      throw new Error("Don't know how to handle this file type");
-    }
-    const buffer = yield new Promise(function (resolve, reject) {
-      const data = [];
-      invariant(stream, 'expected stream');
-      stream.on('data', data.push.bind(data)).on('end', function () {
-        return resolve(Buffer.concat(data));
-      }).on('error', reject);
-    });
-
-    yield config.executeLifecycleScript('postpack');
-
-    // copy normalized package and remove internal keys as they may be sensitive or yarn specific
-    pkg = Object.assign({}, pkg);
-    for (const key in pkg) {
-      if (key[0] === '_') {
-        delete pkg[key];
-      }
-    }
-
-    const tag = flags.tag || 'latest';
-    const tbName = `${pkg.name}-${pkg.version}.tgz`;
-    const tbURI = `${pkg.name}/-/${tbName}`;
-
-    // create body
-    const root = {
-      _id: pkg.name,
-      access,
-      name: pkg.name,
-      description: pkg.description,
-      'dist-tags': {
-        [tag]: pkg.version
-      },
-      versions: {
-        [pkg.version]: pkg
-      },
-      readme: pkg.readme || '',
-      _attachments: {
-        [tbName]: {
-          content_type: 'application/octet-stream',
-          data: buffer.toString('base64'),
-          length: buffer.length
-        }
-      }
-    };
-
-    pkg._id = `${pkg.name}@${pkg.version}`;
-    pkg.dist = pkg.dist || {};
-    pkg.dist.shasum = crypto.createHash('sha1').update(buffer).digest('hex');
-    pkg.dist.integrity = ssri.fromData(buffer).toString();
-
-    const registry = String(config.getOption('registry'));
-    pkg.dist.tarball = url.resolve(registry, tbURI).replace(/^https:\/\//, 'http://');
-
-    // publish package
-    try {
-      yield config.registries.npm.request((_npmRegistry || _load_npmRegistry()).default.escapeName(pkg.name), {
-        registry: pkg && pkg.publishConfig && pkg.publishConfig.registry,
-        method: 'PUT',
-        body: root
-      });
-    } catch (error) {
-      throw new (_errors || _load_errors()).MessageError(config.reporter.lang('publishFail', error.message));
-    }
-
-    yield config.executeLifecycleScript('publish');
-    yield config.executeLifecycleScript('postpublish');
-  });
-
-  return function publish(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    // validate arguments
-    const dir = args[0] ? (_path || _load_path()).default.resolve(config.cwd, args[0]) : config.cwd;
-    if (args.length > 1) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooManyArguments', 1));
-    }
-    if (!(yield (_fs || _load_fs()).exists(dir))) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownFolderOrTarball'));
-    }
-
-    const stat = yield (_fs || _load_fs()).lstat(dir);
-    let publishPath = dir;
-    if (stat.isDirectory()) {
-      config.cwd = (_path || _load_path()).default.resolve(dir);
-      publishPath = config.cwd;
-    }
-
-    // validate package fields that are required for publishing
-    // $FlowFixMe
-    const pkg = yield config.readRootManifest();
-    if (pkg.private) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('publishPrivate'));
-    }
-    if (!pkg.name) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('noName'));
-    }
-
-    let registry = '';
-
-    if (pkg && pkg.publishConfig && pkg.publishConfig.registry) {
-      registry = pkg.publishConfig.registry;
-    }
-
-    reporter.step(1, 4, reporter.lang('bumpingVersion'));
-    const commitVersion = yield (0, (_version || _load_version()).setVersion)(config, reporter, flags, [], false);
-
-    //
-    reporter.step(2, 4, reporter.lang('loggingIn'));
-    const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter, pkg.name, flags, registry);
-
-    //
-    reporter.step(3, 4, reporter.lang('publishing'));
-    yield publish(config, pkg, flags, publishPath);
-    yield commitVersion();
-    reporter.success(reporter.lang('published'));
-
-    //
-    reporter.step(4, 4, reporter.lang('revokingToken'));
-    yield revoke();
-  });
-
-  return function run(_x5, _x6, _x7, _x8) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _version;
-
-function _load_version() {
-  return _version = __webpack_require__(363);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _pack;
-
-function _load_pack() {
-  return _pack = __webpack_require__(166);
-}
-
-var _login;
-
-function _load_login() {
-  return _login = __webpack_require__(107);
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const crypto = __webpack_require__(12);
-const url = __webpack_require__(24);
-const fs2 = __webpack_require__(5);
-const ssri = __webpack_require__(77);
-
-function setFlags(commander) {
-  (0, (_version || _load_version()).setFlags)(commander);
-  commander.description('Publishes a package to the npm registry.');
-  commander.usage('publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>]');
-  commander.option('--access [access]', 'access');
-  commander.option('--tag [tag]', 'tag');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 542 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.hasWrapper = exports.run = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let removeTeamUser = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter) {
-    reporter.step(2, 3, reporter.lang('teamRemovingUser'));
-    reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}/user`, {
-      method: 'DELETE',
-      body: {
-        user: parts.user
-      }
-    })));
-    return true;
-  });
-
-  return function removeTeamUser(_x5, _x6, _x7) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let list = (() => {
-  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter) {
-    reporter.step(2, 3, reporter.lang('teamListing'));
-    const uriParams = '?format=cli';
-    if (parts.team) {
-      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}/user${uriParams}`)));
-    } else {
-      reporter.inspect((yield config.registries.npm.request(`org/${parts.scope}/team${uriParams}`)));
-    }
-    return true;
-  });
-
-  return function list(_x8, _x9, _x10) {
-    return _ref3.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _login;
-
-function _load_login() {
-  return _login = __webpack_require__(107);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function explodeScopeTeam(arg, requireTeam, reporter) {
-  var _arg$split = arg.split(':');
-
-  const scope = _arg$split[0],
-        team = _arg$split[1],
-        parts = _arg$split.slice(2);
-
-  if (parts.length) {
-    return false;
-  }
-
-  if (requireTeam && !team) {
-    return false;
-  }
-
-  return {
-    scope: scope || '',
-    team: team || '',
-    user: ''
-  };
-}
-
-function warnDeprecation(reporter, deprecationWarning) {
-  const command = 'yarn team';
-  reporter.warn(reporter.lang('deprecatedCommand', `${command} ${deprecationWarning.deprecatedCommand}`, `${command} ${deprecationWarning.currentCommand}`));
-}
-
-function wrapRequired(callback, requireTeam, deprecationInfo) {
-  return (() => {
-    var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-      if (deprecationInfo) {
-        warnDeprecation(reporter, deprecationInfo);
-      }
-
-      if (!args.length) {
-        return false;
-      }
-
-      const parts = explodeScopeTeam(args[0], requireTeam, reporter);
-      if (!parts) {
-        return false;
-      }
-
-      reporter.step(1, 3, reporter.lang('loggingIn'));
-      const revoke = yield (0, (_login || _load_login()).getToken)(config, reporter);
-
-      const res = yield callback(parts, config, reporter, flags, args);
-      if (!res) {
-        return res;
-      }
-
-      reporter.step(3, 3, reporter.lang('revokingToken'));
-      yield revoke();
-      return true;
-    });
-
-    return function (_x, _x2, _x3, _x4) {
-      return _ref.apply(this, arguments);
-    };
-  })();
-}
-
-function wrapRequiredTeam(callback, requireTeam = true, subCommandDeprecated) {
-  return wrapRequired(function (parts, config, reporter, flags, args) {
-    if (args.length === 1) {
-      return callback(parts, config, reporter, flags, args);
-    } else {
-      return false;
-    }
-  }, requireTeam, subCommandDeprecated);
-}
-
-function wrapRequiredUser(callback, subCommandDeprecated) {
-  return wrapRequired(function (parts, config, reporter, flags, args) {
-    if (args.length === 2) {
-      return callback((0, (_extends2 || _load_extends()).default)({
-        user: args[1]
-      }, parts), config, reporter, flags, args);
-    } else {
-      return false;
-    }
-  }, true, subCommandDeprecated);
-}
-
-function setFlags(commander) {
-  commander.description('Maintain team memberships');
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('team', {
-  create: wrapRequiredTeam((() => {
-    var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter, flags, args) {
-      reporter.step(2, 3, reporter.lang('teamCreating'));
-      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}`, {
-        method: 'PUT',
-        body: {
-          team: parts.team
-        }
-      })));
-      return true;
-    });
-
-    return function (_x11, _x12, _x13, _x14, _x15) {
-      return _ref4.apply(this, arguments);
-    };
-  })()),
-
-  destroy: wrapRequiredTeam((() => {
-    var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter, flags, args) {
-      reporter.step(2, 3, reporter.lang('teamRemoving'));
-      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}`, {
-        method: 'DELETE'
-      })));
-      return true;
-    });
-
-    return function (_x16, _x17, _x18, _x19, _x20) {
-      return _ref5.apply(this, arguments);
-    };
-  })()),
-
-  add: wrapRequiredUser((() => {
-    var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (parts, config, reporter, flags, args) {
-      reporter.step(2, 3, reporter.lang('teamAddingUser'));
-      reporter.inspect((yield config.registries.npm.request(`team/${parts.scope}/${parts.team}/user`, {
-        method: 'PUT',
-        body: {
-          user: parts.user
-        }
-      })));
-      return true;
-    });
-
-    return function (_x21, _x22, _x23, _x24, _x25) {
-      return _ref6.apply(this, arguments);
-    };
-  })()),
-
-  rm: wrapRequiredUser(function (parts, config, reporter, flags, args) {
-    removeTeamUser(parts, config, reporter);
-  }, {
-    deprecatedCommand: 'rm',
-    currentCommand: 'remove'
-  }),
-
-  remove: wrapRequiredUser(function (parts, config, reporter, flags, args) {
-    removeTeamUser(parts, config, reporter);
-  }),
-
-  ls: wrapRequiredTeam(function (parts, config, reporter, flags, args) {
-    list(parts, config, reporter);
-  }, false, {
-    deprecatedCommand: 'ls',
-    currentCommand: 'list'
-  }),
-
-  list: wrapRequiredTeam(function (parts, config, reporter, flags, args) {
-    list(parts, config, reporter);
-  }, false)
-}, ['create <scope:team>', 'destroy <scope:team>', 'add <scope:team> <user>', 'remove <scope:team> <user>', 'list <scope>|<scope:team>']);
-
-const run = _buildSubCommands.run,
-      hasWrapper = _buildSubCommands.hasWrapper,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.hasWrapper = hasWrapper;
-exports.examples = examples;
-
-/***/ }),
-/* 543 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (args.length) {
-      for (var _iterator = args, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref2 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref2 = _i.value;
-        }
-
-        const name = _ref2;
-
-        const linkLoc = path.join(config.linkFolder, name);
-        if (yield (_fs || _load_fs()).exists(linkLoc)) {
-          yield (_fs || _load_fs()).unlink(path.join((yield (0, (_link || _load_link()).getRegistryFolder)(config, name)), name));
-          reporter.success(reporter.lang('linkDisusing', name));
-          reporter.info(reporter.lang('linkDisusingMessage', name));
-        } else {
-          throw new (_errors || _load_errors()).MessageError(reporter.lang('linkMissing', name));
-        }
-      }
-    } else {
-      // remove from registry
-      const manifest = yield config.readRootManifest();
-      const name = manifest.name;
-      if (!name) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('unknownPackageName'));
-      }
-
-      const linkLoc = path.join(config.linkFolder, name);
-      if (yield (_fs || _load_fs()).exists(linkLoc)) {
-        // If there is a `bin` defined in the package.json,
-        // link each bin to the global bin
-        if (manifest.bin) {
-          const globalBinFolder = yield (0, (_global || _load_global()).getBinFolder)(config, flags);
-          for (const binName in manifest.bin) {
-            const binDestLoc = path.join(globalBinFolder, binName);
-            if (yield (_fs || _load_fs()).exists(binDestLoc)) {
-              yield (_fs || _load_fs()).unlink(binDestLoc);
-              if (process.platform === 'win32') {
-                yield (_fs || _load_fs()).unlink(binDestLoc + '.cmd');
-              }
-            }
-          }
-        }
-
-        yield (_fs || _load_fs()).unlink(linkLoc);
-
-        reporter.success(reporter.lang('linkUnregistered', name));
-        reporter.info(reporter.lang('linkUnregisteredMessage', name));
-      } else {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('linkMissing', name));
-      }
-    }
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _link;
-
-function _load_link() {
-  return _link = __webpack_require__(357);
-}
-
-var _global;
-
-function _load_global() {
-  return _global = __webpack_require__(121);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-function setFlags(commander) {
-  commander.description('Unlink a previously created symlink for a package.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 544 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.clearAll = exports.clearSome = exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (!config.plugnplayEnabled) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('unplugDisabled'));
-    }
-    if (!args.length && flags.clear) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooFewArguments', 1));
-    }
-    if (args.length && flags.clearAll) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('noArguments'));
-    }
-
-    if (flags.clearAll) {
-      yield clearAll(config);
-    } else if (flags.clear) {
-      yield clearSome(config, new Set(args));
-    } else if (args.length > 0) {
-      const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-      yield (0, (_install || _load_install()).wrapLifecycle)(config, flags, (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-        const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-        install.linker.unplugged = args;
-        yield install.init();
-      }));
-    }
-
-    const unpluggedPackageFolders = yield config.listUnpluggedPackageFolders();
-
-    for (var _iterator = unpluggedPackageFolders.values(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref3 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref3 = _i.value;
-      }
-
-      const target = _ref3;
-
-      reporter.log(target, { force: true });
-    }
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let clearSome = exports.clearSome = (() => {
-  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, filters) {
-    const unpluggedPackageFolders = yield config.listUnpluggedPackageFolders();
-    const removeList = [];
-
-    for (var _iterator2 = unpluggedPackageFolders.entries(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref6;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref6 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref6 = _i2.value;
-      }
-
-      const _ref5 = _ref6;
-      const unpluggedName = _ref5[0];
-      const target = _ref5[1];
-
-      var _ref8 = yield (_fs || _load_fs()).readJson(path.join(target, 'package.json'));
-
-      const name = _ref8.name;
-
-      const toBeRemoved = filters.has(name);
-
-      if (toBeRemoved) {
-        removeList.push(path.join(config.getUnpluggedPath(), unpluggedName));
-      }
-    }
-
-    if (removeList.length === unpluggedPackageFolders.size) {
-      yield (_fs || _load_fs()).unlink(config.getUnpluggedPath());
-    } else {
-      for (var _iterator3 = removeList, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref7 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref7 = _i3.value;
-        }
-
-        const unpluggedPackagePath = _ref7;
-
-        yield (_fs || _load_fs()).unlink(unpluggedPackagePath);
-      }
-    }
-  });
-
-  return function clearSome(_x5, _x6) {
-    return _ref4.apply(this, arguments);
-  };
-})();
-
-let clearAll = exports.clearAll = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config) {
-    yield (_fs || _load_fs()).unlink(config.getUnpluggedPath());
-  });
-
-  return function clearAll(_x7) {
-    return _ref9.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-exports.setFlags = setFlags;
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-function hasWrapper(commander) {
-  return true;
-}
-
-function setFlags(commander) {
-  commander.description('Temporarily copies a package (with an optional @range suffix) outside of the global cache for debugging purposes');
-  commander.usage('unplug [packages ...] [flags]');
-  commander.option('--clear', 'Delete the selected packages');
-  commander.option('--clear-all', 'Delete all unplugged packages');
-}
-
-/***/ }),
-/* 545 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const versions = { yarn: (_yarnVersion || _load_yarnVersion()).version };
-
-    const pkg = yield config.maybeReadManifest(config.cwd);
-    if (pkg && pkg.name && pkg.version) {
-      versions[pkg.name] = pkg.version;
-    }
-
-    Object.assign(versions, process.versions);
-
-    reporter.inspect(versions);
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _yarnVersion;
-
-function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function setFlags(commander) {
-  commander.description('Displays version information of currently installed Yarn, Node.js, and its dependencies.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 546 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = exports.requireLockfile = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let cleanQuery = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, query) {
-    // if a location was passed then turn it into a hash query
-    if (path.isAbsolute(query) && (yield (_fs || _load_fs()).exists(query))) {
-      // absolute path
-      query = path.relative(config.cwd, query);
-    }
-
-    // remove references to node_modules with hashes
-    query = query.replace(/([\\/]|^)node_modules[\\/]/g, '#');
-
-    // remove trailing hashes
-    query = query.replace(/^#+/g, '');
-
-    // remove trailing paths from each part of the query, skip second part of path for scoped packages
-    let queryParts = query.split('#');
-    queryParts = queryParts.map(function (part) {
-      let parts = part.split(/[\\/]/g);
-
-      if (part[0] === '@') {
-        parts = parts.slice(0, 2);
-      } else {
-        parts = parts.slice(0, 1);
-      }
-
-      return parts.join('/');
-    });
-    query = queryParts.join('#');
-
-    return query;
-  });
-
-  return function cleanQuery(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let getPackageSize = (() => {
-  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (tuple) {
-    const loc = tuple[0];
-
-
-    const files = yield (_fs || _load_fs()).walk(loc, null, new Set([(_constants || _load_constants()).METADATA_FILENAME, (_constants || _load_constants()).TARBALL_FILENAME]));
-
-    const sizes = yield Promise.all(files.map(function (walkFile) {
-      return (_fs || _load_fs()).getFileSizeOnDisk(walkFile.absolute);
-    }));
-
-    return sum(sizes);
-  });
-
-  return function getPackageSize(_x3) {
-    return _ref2.apply(this, arguments);
-  };
-})();
-
-let run = exports.run = (() => {
-  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    if (!args.length) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('missingWhyDependency'));
-    }
-    if (args.length > 1) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('tooManyArguments', 1));
-    }
-
-    const query = yield cleanQuery(config, args[0]);
-
-    reporter.step(1, 4, reporter.lang('whyStart', args[0]), emoji.get('thinking_face'));
-
-    // init
-    reporter.step(2, 4, reporter.lang('whyInitGraph'), emoji.get('truck'));
-    const lockfile = yield (_lockfile || _load_lockfile()).default.fromDirectory(config.lockfileFolder, reporter);
-    const install = new (_install || _load_install()).Install(flags, config, reporter, lockfile);
-
-    var _ref7 = yield install.fetchRequestFromCwd();
-
-    const depRequests = _ref7.requests,
-          patterns = _ref7.patterns,
-          workspaceLayout = _ref7.workspaceLayout;
-
-    yield install.resolver.init(depRequests, {
-      isFlat: install.flags.flat,
-      isFrozen: install.flags.frozenLockfile,
-      workspaceLayout
-    });
-    const hoisted = yield install.linker.getFlatHoistedTree(patterns);
-
-    // finding
-    reporter.step(3, 4, reporter.lang('whyFinding'), emoji.get('mag'));
-
-    const matches = queryWhy(query, hoisted);
-
-    if (matches.length <= 0) {
-      reporter.error(reporter.lang('whyUnknownMatch'));
-      return;
-    }
-
-    const processMatch = (() => {
-      var _ref8 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (match) {
-        const matchInfo = match[1];
-
-        const matchRef = matchInfo.pkg._reference;
-        invariant(matchRef, 'expected reference');
-
-        const distinctMatchPatterns = new Set(matchRef.patterns);
-        const reasons = [];
-
-        // reason: dependency of these modules
-        if (matchInfo.originalParentPath.length > 0) {
-          reasons.push({
-            type: 'whyDependedOn',
-            typeSimple: 'whyDependedOnSimple',
-            value: toStandardPathString(matchInfo.originalParentPath)
-          });
-        }
-
-        // reason: exists in manifest
-        let rootType;
-        for (var _iterator3 = distinctMatchPatterns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-          var _ref9;
-
-          if (_isArray3) {
-            if (_i3 >= _iterator3.length) break;
-            _ref9 = _iterator3[_i3++];
-          } else {
-            _i3 = _iterator3.next();
-            if (_i3.done) break;
-            _ref9 = _i3.value;
-          }
-
-          const pattern = _ref9;
-
-          rootType = install.rootPatternsToOrigin[pattern];
-          if (rootType) {
-            reasons.push({
-              type: 'whySpecified',
-              typeSimple: 'whySpecifiedSimple',
-              value: rootType
-            });
-          }
-        }
-
-        // reason: this is hoisted from these modules
-        for (var _iterator4 = matchInfo.previousPaths, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref10;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref10 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref10 = _i4.value;
-          }
-
-          const path = _ref10;
-
-          reasons.push({
-            type: 'whyHoistedFrom',
-            typeSimple: 'whyHoistedFromSimple',
-            value: toStandardPathString(path)
-          });
-        }
-
-        // package sizes
-        let packageSize = 0;
-        let directSizes = [];
-        let transitiveSizes = [];
-        try {
-          packageSize = yield getPackageSize(match);
-        } catch (e) {}
-
-        const dependencies = Array.from(collect(hoisted, new Set(), match));
-        const transitiveDependencies = Array.from(collect(hoisted, new Set(), match, { recursive: true }));
-
-        try {
-          directSizes = yield Promise.all(dependencies.map(getPackageSize));
-          transitiveSizes = yield Promise.all(transitiveDependencies.map(getPackageSize));
-        } catch (e) {}
-
-        const transitiveKeys = new Set(transitiveDependencies.map(function ([, info]) {
-          return info.key;
-        }));
-        const sharedDependencies = getSharedDependencies(hoisted, transitiveKeys);
-
-        // prepare output: populate reporter
-        reporter.info(reporter.lang('whyMatch', `${matchInfo.key}@${matchInfo.pkg.version}`));
-        //
-        // reason: hoisted/nohoist
-        if (matchInfo.isNohoist) {
-          reasons.push({
-            type: 'whyNotHoisted',
-            typeSimple: 'whyNotHoistedSimple',
-            value: matchInfo.nohoistList
-          });
-        } else if (query === matchInfo.originalKey) {
-          reporter.info(reporter.lang('whyHoistedTo', matchInfo.key));
-        }
-
-        if (reasons.length === 1) {
-          reporter.info(reporter.lang(reasons[0].typeSimple, reasons[0].value));
-        } else if (reasons.length > 1) {
-          reporter.info(reporter.lang('whyReasons'));
-          reporter.list('reasons', reasons.map(function (reason) {
-            return reporter.lang(reason.type, reason.value);
-          }));
-        } else {
-          reporter.error(reporter.lang('whyWhoKnows'));
-        }
-
-        if (packageSize) {
-          // stats: file size of this dependency without any dependencies
-          reporter.info(reporter.lang('whyDiskSizeWithout', bytes(packageSize)));
-
-          // stats: file size of this dependency including dependencies that aren't shared
-          reporter.info(reporter.lang('whyDiskSizeUnique', bytes(packageSize + sum(directSizes))));
-
-          // stats: file size of this dependency including dependencies
-          reporter.info(reporter.lang('whyDiskSizeTransitive', bytes(packageSize + sum(transitiveSizes))));
-
-          // stats: shared transitive dependencies
-          reporter.info(reporter.lang('whySharedDependencies', sharedDependencies.size));
-        }
-      });
-
-      return function processMatch(_x8) {
-        return _ref8.apply(this, arguments);
-      };
-    })();
-
-    reporter.step(4, 4, reporter.lang('whyCalculating'), emoji.get('aerial_tramway'));
-    for (var _iterator5 = matches, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray5) {
-        if (_i5 >= _iterator5.length) break;
-        _ref11 = _iterator5[_i5++];
-      } else {
-        _i5 = _iterator5.next();
-        if (_i5.done) break;
-        _ref11 = _i5.value;
-      }
-
-      const match = _ref11;
-
-      yield processMatch(match);
-    }
-  });
-
-  return function run(_x4, _x5, _x6, _x7) {
-    return _ref6.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-exports.queryWhy = queryWhy;
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const requireLockfile = exports.requireLockfile = true;
-
-const invariant = __webpack_require__(9);
-const bytes = __webpack_require__(596);
-const emoji = __webpack_require__(302);
-const path = __webpack_require__(0);
-
-function sum(array) {
-  return array.length ? array.reduce((a, b) => a + b, 0) : 0;
-}
-
-function collect(hoistManifests, allDependencies, dependency, { recursive } = { recursive: false }) {
-  const depInfo = dependency[1];
-
-  const deps = depInfo.pkg.dependencies;
-
-  if (!deps) {
-    return allDependencies;
-  }
-
-  const dependencyKeys = new Set(Object.keys(deps));
-  const directDependencies = [];
-
-  for (var _iterator = hoistManifests, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref3;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref3 = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref3 = _i.value;
-    }
-
-    const dep = _ref3;
-    const info = dep[1];
-
-
-    if (!allDependencies.has(dep) && dependencyKeys.has(info.key)) {
-      allDependencies.add(dep);
-      directDependencies.push(dep);
-    }
-  }
-
-  if (recursive) {
-    directDependencies.forEach(dependency => collect(hoistManifests, allDependencies, dependency, { recursive: true }));
-  }
-
-  return allDependencies;
-}
-
-function getSharedDependencies(hoistManifests, transitiveKeys) {
-  const sharedDependencies = new Set();
-  for (var _iterator2 = hoistManifests, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-    var _ref5;
-
-    if (_isArray2) {
-      if (_i2 >= _iterator2.length) break;
-      _ref5 = _iterator2[_i2++];
-    } else {
-      _i2 = _iterator2.next();
-      if (_i2.done) break;
-      _ref5 = _i2.value;
-    }
-
-    const _ref4 = _ref5;
-    const info = _ref4[1];
-
-    if (!transitiveKeys.has(info.key) && info.pkg.dependencies) {
-      Object.keys(info.pkg.dependencies).forEach(dependency => {
-        if (transitiveKeys.has(dependency) && !sharedDependencies.has(dependency)) {
-          sharedDependencies.add(dependency);
-        }
-      });
-    }
-  }
-  return sharedDependencies;
-}
-
-function setFlags(commander) {
-  commander.description('Identifies why a package has been installed, detailing which other packages depend on it.');
-}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-// to conform to the current standard '#' as package tree separator
-function toStandardPathString(pathString) {
-  const str = pathString.replace(/\//g, '#');
-  if (str[0] === '#') {
-    return str.slice(1);
-  }
-  return str;
-}
-
-function queryWhy(pattern, hoisted) {
-  const nohoistPattern = `#${pattern}`;
-  const found = [];
-  for (var _iterator6 = hoisted, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-    var _ref13;
-
-    if (_isArray6) {
-      if (_i6 >= _iterator6.length) break;
-      _ref13 = _iterator6[_i6++];
-    } else {
-      _i6 = _iterator6.next();
-      if (_i6.done) break;
-      _ref13 = _i6.value;
-    }
-
-    const _ref12 = _ref13;
-    const loc = _ref12[0];
-    const info = _ref12[1];
-
-    if (info.key === pattern || info.previousPaths.indexOf(pattern) >= 0 || info.key.endsWith(nohoistPattern)) {
-      found.push([loc, info]);
-    }
-  }
-  return found;
-}
-
-/***/ }),
-/* 547 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.run = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let run = exports.run = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const workspaceRootFolder = config.workspaceRootFolder;
-
-
-    if (!workspaceRootFolder) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
-    }
-
-    if (flags.originalArgs < 1) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingWorkspace'));
-    }
-
-    if (flags.originalArgs < 2) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceMissingCommand'));
-    }
-
-    const manifest = yield config.findManifest(workspaceRootFolder, false);
-    invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
-
-    const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
-
-    var _ref2 = flags.originalArgs || [];
-
-    const workspaceName = _ref2[0],
-          rest = _ref2.slice(1);
-
-    if (!Object.prototype.hasOwnProperty.call(workspaces, workspaceName)) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceUnknownWorkspace', workspaceName));
-    }
-
-    const workspace = workspaces[workspaceName];
-
-    try {
-      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [(_constants || _load_constants()).YARN_BIN_PATH, ...rest], {
-        stdio: 'inherit',
-        cwd: workspace.loc
-      });
-    } catch (err) {
-      throw err;
-    }
-  });
-
-  return function run(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.setFlags = setFlags;
-exports.hasWrapper = hasWrapper;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-function setFlags(commander) {}
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-/***/ }),
-/* 548 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.examples = exports.setFlags = exports.run = exports.runScript = exports.info = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let info = exports.info = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const workspaceRootFolder = config.workspaceRootFolder;
-
-
-    if (!workspaceRootFolder) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
-    }
-
-    const manifest = yield config.findManifest(workspaceRootFolder, false);
-    invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
-
-    const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
-
-    const publicData = {};
-
-    for (var _iterator = Object.keys(workspaces), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
-
-      const workspaceName = _ref2;
-      var _workspaces$workspace = workspaces[workspaceName];
-      const loc = _workspaces$workspace.loc,
-            manifest = _workspaces$workspace.manifest;
-
-
-      const workspaceDependencies = new Set();
-      const mismatchedWorkspaceDependencies = new Set();
-
-      for (var _iterator2 = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const dependencyType = _ref3;
-
-        if (dependencyType !== 'peerDependencies') {
-          for (var _iterator3 = Object.keys(manifest[dependencyType] || {}), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-            var _ref4;
-
-            if (_isArray3) {
-              if (_i3 >= _iterator3.length) break;
-              _ref4 = _iterator3[_i3++];
-            } else {
-              _i3 = _iterator3.next();
-              if (_i3.done) break;
-              _ref4 = _i3.value;
-            }
-
-            const dependencyName = _ref4;
-
-            if (Object.prototype.hasOwnProperty.call(workspaces, dependencyName)) {
-              invariant(manifest && manifest[dependencyType], 'The request should exist');
-              const requestedRange = manifest[dependencyType][dependencyName];
-              if (semver.satisfies(workspaces[dependencyName].manifest.version, requestedRange)) {
-                workspaceDependencies.add(dependencyName);
-              } else {
-                mismatchedWorkspaceDependencies.add(dependencyName);
-              }
-            }
-          }
-        }
-      }
-
-      publicData[workspaceName] = {
-        location: path.relative(config.lockfileFolder, loc).replace(/\\/g, '/'),
-        workspaceDependencies: Array.from(workspaceDependencies),
-        mismatchedWorkspaceDependencies: Array.from(mismatchedWorkspaceDependencies)
-      };
-    }
-
-    reporter.log(JSON.stringify(publicData, null, 2), { force: true });
-  });
-
-  return function info(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let runScript = exports.runScript = (() => {
-  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
-    const workspaceRootFolder = config.workspaceRootFolder;
-
-
-    if (!workspaceRootFolder) {
-      throw new (_errors || _load_errors()).MessageError(reporter.lang('workspaceRootNotFound', config.cwd));
-    }
-
-    const manifest = yield config.findManifest(workspaceRootFolder, false);
-    invariant(manifest && manifest.workspaces, 'We must find a manifest with a "workspaces" property');
-
-    const workspaces = yield config.resolveWorkspaces(workspaceRootFolder, manifest);
-
-    try {
-      var _ref6 = flags.originalArgs || [];
-
-      const _ = _ref6[0],
-            rest = _ref6.slice(1);
-
-      for (var _iterator4 = Object.keys(workspaces), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray4) {
-          if (_i4 >= _iterator4.length) break;
-          _ref7 = _iterator4[_i4++];
-        } else {
-          _i4 = _iterator4.next();
-          if (_i4.done) break;
-          _ref7 = _i4.value;
-        }
-
-        const workspaceName = _ref7;
-        const loc = workspaces[workspaceName].loc;
-
-
-        yield (_child || _load_child()).spawn((_constants2 || _load_constants2()).NODE_BIN_PATH, [(_constants2 || _load_constants2()).YARN_BIN_PATH, ...rest], {
-          stdio: 'inherit',
-          cwd: loc
-        });
-      }
-    } catch (err) {
-      throw err;
-    }
-  });
-
-  return function runScript(_x5, _x6, _x7, _x8) {
-    return _ref5.apply(this, arguments);
-  };
-})();
-
-exports.hasWrapper = hasWrapper;
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _buildSubCommands2;
-
-function _load_buildSubCommands() {
-  return _buildSubCommands2 = _interopRequireDefault(__webpack_require__(59));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _child;
-
-function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
-}
-
-var _constants2;
-
-function _load_constants2() {
-  return _constants2 = __webpack_require__(8);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-const semver = __webpack_require__(21);
-
-function hasWrapper(commander, args) {
-  return true;
-}
-
-var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('workspaces', {
-  info(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield info(config, reporter, flags, args);
-    })();
-  },
-  run(config, reporter, flags, args) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield runScript(config, reporter, flags, args);
-    })();
-  }
-});
-
-const run = _buildSubCommands.run,
-      setFlags = _buildSubCommands.setFlags,
-      examples = _buildSubCommands.examples;
-exports.run = run;
-exports.setFlags = setFlags;
-exports.examples = examples;
-
-/***/ }),
-/* 549 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.autoRun = exports.main = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let main = exports.main = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({
-    startArgs,
-    args,
-    endArgs
-  }) {
-    const collect = function collect(val, acc) {
-      acc.push(val);
-      return acc;
-    };
-
-    (0, (_loudRejection || _load_loudRejection()).default)();
-    (0, (_signalHandler || _load_signalHandler()).default)();
-
-    // set global options
-    (_commander || _load_commander()).default.version((_yarnVersion || _load_yarnVersion()).version, '-v, --version');
-    (_commander || _load_commander()).default.usage('[command] [flags]');
-    (_commander || _load_commander()).default.option('--no-default-rc', 'prevent Yarn from automatically detecting yarnrc and npmrc files');
-    (_commander || _load_commander()).default.option('--use-yarnrc <path>', 'specifies a yarnrc file that Yarn should use (.yarnrc only, not .npmrc)', collect, []);
-    (_commander || _load_commander()).default.option('--verbose', 'output verbose messages on internal operations');
-    (_commander || _load_commander()).default.option('--offline', 'trigger an error if any required dependencies are not available in local cache');
-    (_commander || _load_commander()).default.option('--prefer-offline', 'use network only if dependencies are not available in local cache');
-    (_commander || _load_commander()).default.option('--enable-pnp, --pnp', "enable the Plug'n'Play installation");
-    (_commander || _load_commander()).default.option('--disable-pnp', "disable the Plug'n'Play installation");
-    (_commander || _load_commander()).default.option('--strict-semver');
-    (_commander || _load_commander()).default.option('--json', 'format Yarn log messages as lines of JSON (see jsonlines.org)');
-    (_commander || _load_commander()).default.option('--ignore-scripts', "don't run lifecycle scripts");
-    (_commander || _load_commander()).default.option('--har', 'save HAR output of network traffic');
-    (_commander || _load_commander()).default.option('--ignore-platform', 'ignore platform checks');
-    (_commander || _load_commander()).default.option('--ignore-engines', 'ignore engines check');
-    (_commander || _load_commander()).default.option('--ignore-optional', 'ignore optional dependencies');
-    (_commander || _load_commander()).default.option('--force', 'install and build packages even if they were built before, overwrite lockfile');
-    (_commander || _load_commander()).default.option('--skip-integrity-check', 'run install without checking if node_modules is installed');
-    (_commander || _load_commander()).default.option('--check-files', 'install will verify file tree of packages for consistency');
-    (_commander || _load_commander()).default.option('--no-bin-links', "don't generate bin links when setting up packages");
-    (_commander || _load_commander()).default.option('--flat', 'only allow one version of a package');
-    (_commander || _load_commander()).default.option('--prod, --production [prod]', '', (_conversion || _load_conversion()).boolify);
-    (_commander || _load_commander()).default.option('--no-lockfile', "don't read or generate a lockfile");
-    (_commander || _load_commander()).default.option('--pure-lockfile', "don't generate a lockfile");
-    (_commander || _load_commander()).default.option('--frozen-lockfile', "don't generate a lockfile and fail if an update is needed");
-    (_commander || _load_commander()).default.option('--update-checksums', 'update package checksums from current repository');
-    (_commander || _load_commander()).default.option('--link-duplicates', 'create hardlinks to the repeated modules in node_modules');
-    (_commander || _load_commander()).default.option('--link-folder <path>', 'specify a custom folder to store global links');
-    (_commander || _load_commander()).default.option('--global-folder <path>', 'specify a custom folder to store global packages');
-    (_commander || _load_commander()).default.option('--modules-folder <path>', 'rather than installing modules into the node_modules folder relative to the cwd, output them here');
-    (_commander || _load_commander()).default.option('--preferred-cache-folder <path>', 'specify a custom folder to store the yarn cache if possible');
-    (_commander || _load_commander()).default.option('--cache-folder <path>', 'specify a custom folder that must be used to store the yarn cache');
-    (_commander || _load_commander()).default.option('--mutex <type>[:specifier]', 'use a mutex to ensure only one yarn instance is executing');
-    (_commander || _load_commander()).default.option('--emoji [bool]', 'enable emoji in output', (_conversion || _load_conversion()).boolify, process.platform === 'darwin' || process.env.TERM_PROGRAM === 'Hyper' || process.env.TERM_PROGRAM === 'HyperTerm' || process.env.TERM_PROGRAM === 'Terminus');
-    (_commander || _load_commander()).default.option('-s, --silent', 'skip Yarn console logs, other types of logs (script output) will be printed');
-    (_commander || _load_commander()).default.option('--cwd <cwd>', 'working directory to use', process.cwd());
-    (_commander || _load_commander()).default.option('--proxy <host>', '');
-    (_commander || _load_commander()).default.option('--https-proxy <host>', '');
-    (_commander || _load_commander()).default.option('--registry <url>', 'override configuration registry');
-    (_commander || _load_commander()).default.option('--no-progress', 'disable progress bar');
-    (_commander || _load_commander()).default.option('--network-concurrency <number>', 'maximum number of concurrent network requests', parseInt);
-    (_commander || _load_commander()).default.option('--network-timeout <milliseconds>', 'TCP timeout for network requests', parseInt);
-    (_commander || _load_commander()).default.option('--non-interactive', 'do not show interactive prompts');
-    (_commander || _load_commander()).default.option('--scripts-prepend-node-path [bool]', 'prepend the node executable dir to the PATH in scripts', (_conversion || _load_conversion()).boolify);
-    (_commander || _load_commander()).default.option('--no-node-version-check', 'do not warn when using a potentially unsupported Node version');
-    (_commander || _load_commander()).default.option('--focus', 'Focus on a single workspace by installing remote copies of its sibling workspaces.');
-    (_commander || _load_commander()).default.option('--otp <otpcode>', 'one-time password for two factor authentication');
-
-    // if -v is the first command, then always exit after returning the version
-    if (args[0] === '-v') {
-      console.log((_yarnVersion || _load_yarnVersion()).version.trim());
-      process.exitCode = 0;
-      return;
-    }
-
-    // get command name
-    const firstNonFlagIndex = args.findIndex(function (arg, idx, arr) {
-      const isOption = arg.startsWith('-');
-      const prev = idx > 0 && arr[idx - 1];
-      const prevOption = prev && prev.startsWith('-') && (_commander || _load_commander()).default.optionFor(prev);
-      const boundToPrevOption = prevOption && (prevOption.optional || prevOption.required);
-
-      return !isOption && !boundToPrevOption;
-    });
-    let preCommandArgs;
-    let commandName = '';
-    if (firstNonFlagIndex > -1) {
-      preCommandArgs = args.slice(0, firstNonFlagIndex);
-      commandName = args[firstNonFlagIndex];
-      args = args.slice(firstNonFlagIndex + 1);
-    } else {
-      preCommandArgs = args;
-      args = [];
-    }
-
-    let isKnownCommand = Object.prototype.hasOwnProperty.call((_index3 || _load_index3()).default, commandName);
-    const isHelp = function isHelp(arg) {
-      return arg === '--help' || arg === '-h';
-    };
-    const helpInPre = preCommandArgs.findIndex(isHelp);
-    const helpInArgs = args.findIndex(isHelp);
-    const setHelpMode = function setHelpMode() {
-      if (isKnownCommand) {
-        args.unshift(commandName);
-      }
-      commandName = 'help';
-      isKnownCommand = true;
-    };
-
-    if (helpInPre > -1) {
-      preCommandArgs.splice(helpInPre);
-      setHelpMode();
-    } else if (isKnownCommand && helpInArgs === 0) {
-      args.splice(helpInArgs);
-      setHelpMode();
-    }
-
-    if (!commandName) {
-      commandName = 'install';
-      isKnownCommand = true;
-    }
-
-    if (!isKnownCommand) {
-      // if command is not recognized, then set default to `run`
-      args.unshift(commandName);
-      commandName = 'run';
-    }
-    const command = (_index3 || _load_index3()).default[commandName];
-
-    let warnAboutRunDashDash = false;
-    // we are using "yarn <script> -abc", "yarn run <script> -abc", or "yarn node -abc", we want -abc
-    // to be script options, not yarn options
-    const PROXY_COMMANDS = new Set([`run`, `create`, `node`]);
-    if (PROXY_COMMANDS.has(commandName)) {
-      if (endArgs.length === 0) {
-        let preservedArgs = 0;
-        // the "run" and "create" command take one argument that we want to parse as usual (the
-        // script/package name), hence the splice(1)
-        if (command === (_index3 || _load_index3()).default.run || command === (_index3 || _load_index3()).default.create) {
-          preservedArgs += 1;
-        }
-        // If the --into option immediately follows the command (or the script name in the "run/create"
-        // case), we parse them as regular options so that we can cd into them
-        if (args[preservedArgs] === `--into`) {
-          preservedArgs += 2;
-        }
-        endArgs = ['--', ...args.splice(preservedArgs)];
-      } else {
-        warnAboutRunDashDash = true;
-      }
-    }
-
-    (_commander || _load_commander()).default.originalArgs = args;
-    args = [...preCommandArgs, ...args];
-
-    command.setFlags((_commander || _load_commander()).default);
-    (_commander || _load_commander()).default.parse([...startArgs,
-    // we use this for https://github.com/tj/commander.js/issues/346, otherwise
-    // it will strip some args that match with any options
-    'this-arg-will-get-stripped-later', ...(0, (_rc || _load_rc()).getRcArgs)(commandName, args), ...args]);
-    (_commander || _load_commander()).default.args = (_commander || _load_commander()).default.args.concat(endArgs.slice(1));
-
-    // we strip cmd
-    console.assert((_commander || _load_commander()).default.args.length >= 1);
-    console.assert((_commander || _load_commander()).default.args[0] === 'this-arg-will-get-stripped-later');
-    (_commander || _load_commander()).default.args.shift();
-
-    //
-    const Reporter = (_commander || _load_commander()).default.json ? (_index || _load_index()).JSONReporter : (_index || _load_index()).ConsoleReporter;
-    const reporter = new Reporter({
-      emoji: process.stdout.isTTY && (_commander || _load_commander()).default.emoji,
-      verbose: (_commander || _load_commander()).default.verbose,
-      noProgress: !(_commander || _load_commander()).default.progress,
-      isSilent: (0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_SILENT, false) || (_commander || _load_commander()).default.silent,
-      nonInteractive: (_commander || _load_commander()).default.nonInteractive
-    });
-
-    const exit = function exit(exitCode) {
-      process.exitCode = exitCode || 0;
-      reporter.close();
-    };
-
-    reporter.initPeakMemoryCounter();
-
-    const config = new (_config || _load_config()).default(reporter);
-    const outputWrapperEnabled = (0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_WRAP_OUTPUT, true);
-    const shouldWrapOutput = outputWrapperEnabled && !(_commander || _load_commander()).default.json && command.hasWrapper((_commander || _load_commander()).default, (_commander || _load_commander()).default.args);
-
-    if (shouldWrapOutput) {
-      reporter.header(commandName, { name: 'yarn', version: (_yarnVersion || _load_yarnVersion()).version });
-    }
-
-    if ((_commander || _load_commander()).default.nodeVersionCheck && !(_semver || _load_semver()).default.satisfies(process.versions.node, (_constants || _load_constants()).SUPPORTED_NODE_VERSIONS)) {
-      reporter.warn(reporter.lang('unsupportedNodeVersion', process.versions.node, (_constants || _load_constants()).SUPPORTED_NODE_VERSIONS));
-    }
-
-    if (command.noArguments && (_commander || _load_commander()).default.args.length) {
-      reporter.error(reporter.lang('noArguments'));
-      reporter.info(command.getDocsInfo);
-      exit(1);
-      return;
-    }
-
-    //
-    if ((_commander || _load_commander()).default.yes) {
-      reporter.warn(reporter.lang('yesWarning'));
-    }
-
-    //
-    if (!(_commander || _load_commander()).default.offline && (_network || _load_network()).isOffline()) {
-      reporter.warn(reporter.lang('networkWarning'));
-    }
-
-    //
-    const run = function run() {
-      (0, (_invariant || _load_invariant()).default)(command, 'missing command');
-
-      if (warnAboutRunDashDash) {
-        reporter.warn(reporter.lang('dashDashDeprecation'));
-      }
-
-      return command.run(config, reporter, (_commander || _load_commander()).default, (_commander || _load_commander()).default.args).then(function (exitCode) {
-        if (shouldWrapOutput) {
-          reporter.footer(false);
-        }
-        return exitCode;
-      });
-    };
-
-    //
-    const runEventuallyWithFile = function runEventuallyWithFile(mutexFilename, isFirstTime) {
-      return new Promise(function (resolve) {
-        const lockFilename = mutexFilename || (_path || _load_path()).default.join(config.cwd, (_constants || _load_constants()).SINGLE_INSTANCE_FILENAME);
-        (_properLockfile || _load_properLockfile()).default.lock(lockFilename, { realpath: false }, function (err, release) {
-          if (err) {
-            if (isFirstTime) {
-              reporter.warn(reporter.lang('waitingInstance'));
-            }
-            setTimeout(function () {
-              resolve(runEventuallyWithFile(mutexFilename, false));
-            }, 200); // do not starve the CPU
-          } else {
-            (0, (_death || _load_death()).default)(function () {
-              process.exitCode = 1;
-            });
-            resolve(run().then(function () {
-              return new Promise(function (resolve) {
-                return release(resolve);
-              });
-            }));
-          }
-        });
-      });
-    };
-
-    const runEventuallyWithNetwork = function runEventuallyWithNetwork(mutexPort) {
-      return new Promise(function (resolve, reject) {
-        const connectionOptions = {
-          port: +mutexPort || (_constants || _load_constants()).SINGLE_INSTANCE_PORT,
-          host: 'localhost'
-        };
-
-        function startServer() {
-          const clients = new Set();
-          const server = (_http || _load_http()).default.createServer(manager);
-
-          // The server must not prevent us from exiting
-          server.unref();
-
-          // No socket must timeout, so that they aren't closed before we exit
-          server.timeout = 0;
-
-          // If we fail to setup the server, we ask the existing one for its name
-          server.on('error', () => {
-            reportServerName();
-          });
-
-          // If we succeed, keep track of all the connected sockets to close them later
-          server.on('connection', socket => {
-            clients.add(socket);
-            socket.on('close', () => {
-              clients.delete(socket);
-            });
-          });
-
-          server.listen(connectionOptions, () => {
-            // Don't forget to kill the sockets if we're being killed via signals
-            (0, (_death || _load_death()).default)(killSockets);
-
-            // Also kill the sockets if we finish, whether it's a success or a failure
-            run().then(res => {
-              killSockets();
-              resolve(res);
-            }, err => {
-              killSockets();
-              reject(err);
-            });
-          });
-
-          function manager(request, response) {
-            response.writeHead(200);
-            response.end(JSON.stringify({ cwd: config.cwd, pid: process.pid }));
-          }
-
-          function killSockets() {
-            try {
-              server.close();
-            } catch (err) {
-              // best effort
-            }
-
-            for (var _iterator = clients, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-              var _ref2;
-
-              if (_isArray) {
-                if (_i >= _iterator.length) break;
-                _ref2 = _iterator[_i++];
-              } else {
-                _i = _iterator.next();
-                if (_i.done) break;
-                _ref2 = _i.value;
-              }
-
-              const socket = _ref2;
-
-              try {
-                socket.destroy();
-              } catch (err) {
-                // best effort
-              }
-            }
-
-            // If the process hasn't exited in the next 5s, it has stalled and we abort
-            const timeout = setTimeout(() => {
-              console.error('Process stalled');
-              if (process._getActiveHandles) {
-                console.error('Active handles:');
-                // $FlowFixMe: getActiveHandles is undocumented, but it exists
-                for (var _iterator2 = process._getActiveHandles(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-                  var _ref3;
-
-                  if (_isArray2) {
-                    if (_i2 >= _iterator2.length) break;
-                    _ref3 = _iterator2[_i2++];
-                  } else {
-                    _i2 = _iterator2.next();
-                    if (_i2.done) break;
-                    _ref3 = _i2.value;
-                  }
-
-                  const handle = _ref3;
-
-                  console.error(`  - ${handle.constructor.name}`);
-                }
-              }
-              // eslint-disable-next-line no-process-exit
-              process.exit(1);
-            }, 5000);
-
-            // This timeout must not prevent us from exiting
-            // $FlowFixMe: Node's setTimeout returns a Timeout, not a Number
-            timeout.unref();
-          }
-        }
-
-        function reportServerName() {
-          const request = (_http || _load_http()).default.get(connectionOptions, response => {
-            const buffers = [];
-
-            response.on('data', buffer => {
-              buffers.push(buffer);
-            });
-
-            response.on('end', () => {
-              try {
-                var _JSON$parse = JSON.parse(Buffer.concat(buffers).toString());
-
-                const cwd = _JSON$parse.cwd,
-                      pid = _JSON$parse.pid;
-
-                reporter.warn(reporter.lang('waitingNamedInstance', pid, cwd));
-              } catch (error) {
-                reporter.verbose(error);
-                reject(new Error(reporter.lang('mutexPortBusy', connectionOptions.port)));
-                return;
-              }
-              waitForTheNetwork();
-            });
-
-            response.on('error', () => {
-              startServer();
-            });
-          });
-
-          request.on('error', () => {
-            startServer();
-          });
-        }
-
-        function waitForTheNetwork() {
-          const socket = (_net || _load_net()).default.createConnection(connectionOptions);
-
-          socket.on('error', () => {
-            // catch & ignore, the retry is handled in 'close'
-          });
-
-          socket.on('close', () => {
-            startServer();
-          });
-        }
-
-        startServer();
-      });
-    };
-
-    function onUnexpectedError(err) {
-      function indent(str) {
-        return '\n  ' + str.trim().split('\n').join('\n  ');
-      }
-
-      const log = [];
-      log.push(`Arguments: ${indent(process.argv.join(' '))}`);
-      log.push(`PATH: ${indent(process.env.PATH || 'undefined')}`);
-      log.push(`Yarn version: ${indent((_yarnVersion || _load_yarnVersion()).version)}`);
-      log.push(`Node version: ${indent(process.versions.node)}`);
-      log.push(`Platform: ${indent(process.platform + ' ' + process.arch)}`);
-
-      log.push(`Trace: ${indent(err.stack)}`);
-
-      // add manifests
-      for (var _iterator3 = (_index2 || _load_index2()).registryNames, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref4 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref4 = _i3.value;
-        }
-
-        const registryName = _ref4;
-
-        const possibleLoc = (_path || _load_path()).default.join(config.cwd, (_index2 || _load_index2()).registries[registryName].filename);
-        const manifest = (_fs || _load_fs()).default.existsSync(possibleLoc) ? (_fs || _load_fs()).default.readFileSync(possibleLoc, 'utf8') : 'No manifest';
-        log.push(`${registryName} manifest: ${indent(manifest)}`);
-      }
-
-      // lockfile
-      const lockLoc = (_path || _load_path()).default.join(config.lockfileFolder || config.cwd, // lockfileFolder might not be set at this point
-      (_constants || _load_constants()).LOCKFILE_FILENAME);
-      const lockfile = (_fs || _load_fs()).default.existsSync(lockLoc) ? (_fs || _load_fs()).default.readFileSync(lockLoc, 'utf8') : 'No lockfile';
-      log.push(`Lockfile: ${indent(lockfile)}`);
-
-      const errorReportLoc = writeErrorReport(log);
-
-      reporter.error(reporter.lang('unexpectedError', err.message));
-
-      if (errorReportLoc) {
-        reporter.info(reporter.lang('bugReport', errorReportLoc));
-      }
-    }
-
-    function writeErrorReport(log) {
-      const errorReportLoc = config.enableMetaFolder ? (_path || _load_path()).default.join(config.cwd, (_constants || _load_constants()).META_FOLDER, 'yarn-error.log') : (_path || _load_path()).default.join(config.cwd, 'yarn-error.log');
-
-      try {
-        (_fs || _load_fs()).default.writeFileSync(errorReportLoc, log.join('\n\n') + '\n');
-      } catch (err) {
-        reporter.error(reporter.lang('fileWriteError', errorReportLoc, err.message));
-        return undefined;
-      }
-
-      return errorReportLoc;
-    }
-
-    const cwd = command.shouldRunInCurrentCwd ? (_commander || _load_commander()).default.cwd : findProjectRoot((_commander || _load_commander()).default.cwd);
-
-    yield config.init({
-      cwd,
-      commandName,
-
-      enablePnp: (_commander || _load_commander()).default.pnp,
-      disablePnp: (_commander || _load_commander()).default.disablePnp,
-      enableDefaultRc: (_commander || _load_commander()).default.defaultRc,
-      extraneousYarnrcFiles: (_commander || _load_commander()).default.useYarnrc,
-      binLinks: (_commander || _load_commander()).default.binLinks,
-      modulesFolder: (_commander || _load_commander()).default.modulesFolder,
-      linkFolder: (_commander || _load_commander()).default.linkFolder,
-      globalFolder: (_commander || _load_commander()).default.globalFolder,
-      preferredCacheFolder: (_commander || _load_commander()).default.preferredCacheFolder,
-      cacheFolder: (_commander || _load_commander()).default.cacheFolder,
-      preferOffline: (_commander || _load_commander()).default.preferOffline,
-      captureHar: (_commander || _load_commander()).default.har,
-      ignorePlatform: (_commander || _load_commander()).default.ignorePlatform,
-      ignoreEngines: (_commander || _load_commander()).default.ignoreEngines,
-      ignoreScripts: (_commander || _load_commander()).default.ignoreScripts,
-      offline: (_commander || _load_commander()).default.preferOffline || (_commander || _load_commander()).default.offline,
-      looseSemver: !(_commander || _load_commander()).default.strictSemver,
-      production: (_commander || _load_commander()).default.production,
-      httpProxy: (_commander || _load_commander()).default.proxy,
-      httpsProxy: (_commander || _load_commander()).default.httpsProxy,
-      registry: (_commander || _load_commander()).default.registry,
-      networkConcurrency: (_commander || _load_commander()).default.networkConcurrency,
-      networkTimeout: (_commander || _load_commander()).default.networkTimeout,
-      nonInteractive: (_commander || _load_commander()).default.nonInteractive,
-      updateChecksums: (_commander || _load_commander()).default.updateChecksums,
-      focus: (_commander || _load_commander()).default.focus,
-      otp: (_commander || _load_commander()).default.otp
-    }).then(function () {
-      // lockfile check must happen after config.init sets lockfileFolder
-      if (command.requireLockfile && !(_fs || _load_fs()).default.existsSync((_path || _load_path()).default.join(config.lockfileFolder, (_constants || _load_constants()).LOCKFILE_FILENAME))) {
-        throw new (_errors || _load_errors()).MessageError(reporter.lang('noRequiredLockfile'));
-      }
-
-      // option "no-progress" stored in yarn config
-      const noProgressConfig = config.registries.yarn.getOption('no-progress');
-
-      if (noProgressConfig) {
-        reporter.disableProgress();
-      }
-
-      // verbose logs outputs process.uptime() with this line we can sync uptime to absolute time on the computer
-      reporter.verbose(`current time: ${new Date().toISOString()}`);
-
-      const mutex = (_commander || _load_commander()).default.mutex;
-      if (mutex && typeof mutex === 'string') {
-        const separatorLoc = mutex.indexOf(':');
-        let mutexType;
-        let mutexSpecifier;
-        if (separatorLoc === -1) {
-          mutexType = mutex;
-          mutexSpecifier = undefined;
-        } else {
-          mutexType = mutex.substring(0, separatorLoc);
-          mutexSpecifier = mutex.substring(separatorLoc + 1);
-        }
-
-        if (mutexType === 'file') {
-          return runEventuallyWithFile(mutexSpecifier, true).then(exit);
-        } else if (mutexType === 'network') {
-          return runEventuallyWithNetwork(mutexSpecifier).then(exit);
-        } else {
-          throw new (_errors || _load_errors()).MessageError(`Unknown single instance type ${mutexType}`);
-        }
-      } else {
-        return run().then(exit);
-      }
-    }).catch(function (err) {
-      reporter.verbose(err.stack);
-
-      if (err instanceof (_errors2 || _load_errors2()).ProcessTermError && reporter.isSilent) {
-        return exit(err.EXIT_CODE || 1);
-      }
-
-      if (err instanceof (_errors || _load_errors()).MessageError) {
-        reporter.error(err.message);
-      } else {
-        onUnexpectedError(err);
-      }
-
-      if (command.getDocsInfo) {
-        reporter.info(command.getDocsInfo);
-      }
-
-      if (err instanceof (_errors2 || _load_errors2()).ProcessTermError) {
-        return exit(err.EXIT_CODE || 1);
-      }
-
-      return exit(1);
-    });
-  });
-
-  return function main(_x) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-let start = (() => {
-  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-    const rc = (0, (_rc || _load_rc()).getRcConfigForCwd)(process.cwd(), process.argv.slice(2));
-    const yarnPath = rc['yarn-path'] || rc['yarnPath'];
-
-    if (yarnPath && !(0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_IGNORE_PATH, false)) {
-      const argv = process.argv.slice(2);
-      const opts = { stdio: 'inherit', env: Object.assign({}, process.env, { YARN_IGNORE_PATH: 1 }) };
-      let exitCode = 0;
-
-      try {
-        exitCode = yield (0, (_child || _load_child()).spawnp)(yarnPath, argv, opts);
-      } catch (firstError) {
-        try {
-          exitCode = yield (0, (_child || _load_child()).forkp)(yarnPath, argv, opts);
-        } catch (error) {
-          throw firstError;
-        }
-      }
-
-      process.exitCode = exitCode;
-    } else {
-      // ignore all arguments after a --
-      const doubleDashIndex = process.argv.findIndex(function (element) {
-        return element === '--';
-      });
-      const startArgs = process.argv.slice(0, 2);
-      const args = process.argv.slice(2, doubleDashIndex === -1 ? process.argv.length : doubleDashIndex);
-      const endArgs = doubleDashIndex === -1 ? [] : process.argv.slice(doubleDashIndex);
-
-      yield main({ startArgs, args, endArgs });
-    }
-  });
-
-  return function start() {
-    return _ref5.apply(this, arguments);
-  };
-})();
-
-// When this module is compiled via Webpack, its child
-// count will be 0 since it is a single-file bundle.
-
-
-var _http;
-
-function _load_http() {
-  return _http = _interopRequireDefault(__webpack_require__(87));
-}
-
-var _net;
-
-function _load_net() {
-  return _net = _interopRequireDefault(__webpack_require__(164));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-var _commander;
-
-function _load_commander() {
-  return _commander = _interopRequireDefault(__webpack_require__(338));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-var _properLockfile;
-
-function _load_properLockfile() {
-  return _properLockfile = _interopRequireDefault(__webpack_require__(471));
-}
-
-var _loudRejection;
-
-function _load_loudRejection() {
-  return _loudRejection = _interopRequireDefault(__webpack_require__(470));
-}
-
-var _death;
-
-function _load_death() {
-  return _death = _interopRequireDefault(__webpack_require__(469));
-}
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(21));
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(200);
-}
-
-var _index2;
-
-function _load_index2() {
-  return _index2 = __webpack_require__(57);
-}
-
-var _index3;
-
-function _load_index3() {
-  return _index3 = _interopRequireDefault(__webpack_require__(334));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _network;
-
-function _load_network() {
-  return _network = _interopRequireWildcard(__webpack_require__(337));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _config;
-
-function _load_config() {
-  return _config = _interopRequireDefault(__webpack_require__(162));
-}
-
-var _rc;
-
-function _load_rc() {
-  return _rc = __webpack_require__(335);
-}
-
-var _child;
-
-function _load_child() {
-  return _child = __webpack_require__(58);
-}
-
-var _yarnVersion;
-
-function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
-}
-
-var _signalHandler;
-
-function _load_signalHandler() {
-  return _signalHandler = _interopRequireDefault(__webpack_require__(468));
-}
-
-var _conversion;
-
-function _load_conversion() {
-  return _conversion = __webpack_require__(336);
-}
-
-var _errors2;
-
-function _load_errors2() {
-  return _errors2 = __webpack_require__(6);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-process.stdout.prependListener('error', err => {
-  // swallow err only if downstream consumer process closed pipe early
-  if (err.code === 'EPIPE' || err.code === 'ERR_STREAM_DESTROYED') {
-    return;
-  }
-  throw err;
-});
-
-function findProjectRoot(base) {
-  let prev = null;
-  let dir = base;
-
-  do {
-    if ((_fs || _load_fs()).default.existsSync((_path || _load_path()).default.join(dir, (_constants || _load_constants()).NODE_PACKAGE_JSON))) {
-      return dir;
-    }
-
-    prev = dir;
-    dir = (_path || _load_path()).default.dirname(dir);
-  } while (dir !== prev);
-
-  return base;
-}
-
-const autoRun = exports.autoRun = module.children.length === 0;
-
-if (__webpack_require__.c[__webpack_require__.s] === module) {
-  start().catch(error => {
-    console.error(error.stack || error.message || error);
-    process.exitCode = 1;
-  });
-}
-
-exports.default = start;
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
-
-/***/ }),
-/* 550 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _baseFetcher;
-
-function _load_baseFetcher() {
-  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class CopyFetcher extends (_baseFetcher || _load_baseFetcher()).default {
-  _fetch() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield (_fs || _load_fs()).copy(_this.reference, _this.dest, _this.reporter);
-      return {
-        hash: _this.hash || '',
-        resolved: null
-      };
-    })();
-  }
-}
-exports.default = CopyFetcher;
-
-/***/ }),
-/* 551 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _baseFetcher;
-
-function _load_baseFetcher() {
-  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
-}
-
-var _git;
-
-function _load_git() {
-  return _git = _interopRequireDefault(__webpack_require__(219));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _crypto;
-
-function _load_crypto() {
-  return _crypto = _interopRequireWildcard(__webpack_require__(168));
-}
-
-var _install;
-
-function _load_install() {
-  return _install = __webpack_require__(34);
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = _interopRequireDefault(__webpack_require__(19));
-}
-
-var _config;
-
-function _load_config() {
-  return _config = _interopRequireDefault(__webpack_require__(162));
-}
-
-var _pack;
-
-function _load_pack() {
-  return _pack = __webpack_require__(166);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const tarFs = __webpack_require__(193);
-const url = __webpack_require__(24);
-const path = __webpack_require__(0);
-const fs = __webpack_require__(5);
-
-const invariant = __webpack_require__(9);
-
-const PACKED_FLAG = '1';
-
-class GitFetcher extends (_baseFetcher || _load_baseFetcher()).default {
-  setupMirrorFromCache() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const tarballMirrorPath = _this.getTarballMirrorPath();
-      const tarballCachePath = _this.getTarballCachePath();
-
-      if (tarballMirrorPath == null) {
-        return;
-      }
-
-      if (!(yield (_fs || _load_fs()).exists(tarballMirrorPath)) && (yield (_fs || _load_fs()).exists(tarballCachePath))) {
-        // The tarball doesn't exists in the offline cache but does in the cache; we import it to the mirror
-        yield (_fs || _load_fs()).mkdirp(path.dirname(tarballMirrorPath));
-        yield (_fs || _load_fs()).copy(tarballCachePath, tarballMirrorPath, _this.reporter);
-      }
-    })();
-  }
-
-  getTarballMirrorPath({ withCommit = true } = {}) {
-    var _url$parse = url.parse(this.reference);
-
-    const pathname = _url$parse.pathname;
-
-
-    if (pathname == null) {
-      return null;
-    }
-
-    const hash = this.hash;
-
-    let packageFilename = withCommit && hash ? `${path.basename(pathname)}-${hash}` : `${path.basename(pathname)}`;
-
-    if (packageFilename.startsWith(':')) {
-      packageFilename = packageFilename.substr(1);
-    }
-
-    return this.config.getOfflineMirrorPath(packageFilename);
-  }
-
-  getTarballCachePath() {
-    return path.join(this.dest, (_constants || _load_constants()).TARBALL_FILENAME);
-  }
-
-  getLocalPaths(override) {
-    const paths = [override ? path.resolve(this.config.cwd, override) : null, this.getTarballMirrorPath(), this.getTarballMirrorPath({ withCommit: false }), this.getTarballCachePath()];
-    // $FlowFixMe: https://github.com/facebook/flow/issues/1414
-    return paths.filter(path => path != null);
-  }
-
-  fetchFromLocal(override) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const tarPaths = _this2.getLocalPaths(override);
-      const stream = yield (_fs || _load_fs()).readFirstAvailableStream(tarPaths);
-
-      return new Promise(function (resolve, reject) {
-        if (!stream) {
-          reject(new (_errors || _load_errors()).MessageError(_this2.reporter.lang('tarballNotInNetworkOrCache', _this2.reference, tarPaths)));
-          return;
-        }
-        invariant(stream, 'cachedStream should be available at this point');
-        // $FlowFixMe - This is available https://nodejs.org/api/fs.html#fs_readstream_path
-        const tarballPath = stream.path;
-
-        const untarStream = _this2._createUntarStream(_this2.dest);
-
-        const hashStream = new (_crypto || _load_crypto()).HashStream();
-        stream.pipe(hashStream).pipe(untarStream).on('finish', function () {
-          const expectHash = _this2.hash;
-          invariant(expectHash, 'Commit hash required');
-
-          const actualHash = hashStream.getHash();
-
-          // This condition is disabled because "expectHash" actually is the commit hash
-          // This is a design issue that we'll need to fix (https://github.com/yarnpkg/yarn/pull/3449)
-          if (true) {
-            resolve({
-              hash: expectHash
-            });
-          } else {
-            reject(new (_errors || _load_errors()).SecurityError(_this2.config.reporter.lang('fetchBadHashWithPath', _this2.packageName, _this2.remote.reference, expectHash, actualHash)));
-          }
-        }).on('error', function (err) {
-          reject(new (_errors || _load_errors()).MessageError(this.reporter.lang('fetchErrorCorrupt', err.message, tarballPath)));
-        });
-      });
-    })();
-  }
-
-  hasPrepareScript(git) {
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const manifestFile = yield git.getFile('package.json');
-
-      if (manifestFile) {
-        const scripts = JSON.parse(manifestFile).scripts;
-        const hasPrepareScript = Boolean(scripts && scripts.prepare);
-        return hasPrepareScript;
-      }
-
-      return false;
-    })();
-  }
-
-  fetchFromExternal() {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const hash = _this3.hash;
-      invariant(hash, 'Commit hash required');
-
-      const gitUrl = (_git || _load_git()).default.npmUrlToGitUrl(_this3.reference);
-      const git = new (_git || _load_git()).default(_this3.config, gitUrl, hash);
-      yield git.init();
-
-      if (yield _this3.hasPrepareScript(git)) {
-        yield _this3.fetchFromInstallAndPack(git);
-      } else {
-        yield _this3.fetchFromGitArchive(git);
-      }
-
-      return {
-        hash
-      };
-    })();
-  }
-
-  fetchFromInstallAndPack(git) {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const prepareDirectory = _this4.config.getTemp(`${(_crypto || _load_crypto()).hash(git.gitUrl.repository)}.${git.hash}.prepare`);
-      yield (_fs || _load_fs()).unlink(prepareDirectory);
-
-      yield git.clone(prepareDirectory);
-
-      var _ref = yield Promise.all([(_config || _load_config()).default.create({
-        binLinks: true,
-        cwd: prepareDirectory,
-        disablePrepublish: true,
-        production: false
-      }, _this4.reporter), (_lockfile || _load_lockfile()).default.fromDirectory(prepareDirectory, _this4.reporter)]);
-
-      const prepareConfig = _ref[0],
-            prepareLockFile = _ref[1];
-
-      yield (0, (_install || _load_install()).install)(prepareConfig, _this4.reporter, {}, prepareLockFile);
-
-      const tarballMirrorPath = _this4.getTarballMirrorPath();
-      const tarballCachePath = _this4.getTarballCachePath();
-
-      if (tarballMirrorPath) {
-        yield _this4._packToTarball(prepareConfig, tarballMirrorPath);
-      }
-      if (tarballCachePath) {
-        yield _this4._packToTarball(prepareConfig, tarballCachePath);
-      }
-
-      yield _this4._packToDirectory(prepareConfig, _this4.dest);
-
-      yield (_fs || _load_fs()).unlink(prepareDirectory);
-    })();
-  }
-
-  _packToTarball(config, path) {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const tarballStream = yield _this5._createTarballStream(config);
-      yield new Promise(function (resolve, reject) {
-        const writeStream = fs.createWriteStream(path);
-        tarballStream.on('error', reject);
-        writeStream.on('error', reject);
-        writeStream.on('end', resolve);
-        writeStream.on('open', function () {
-          tarballStream.pipe(writeStream);
-        });
-        writeStream.once('finish', resolve);
-      });
-    })();
-  }
-
-  _packToDirectory(config, dest) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const tarballStream = yield _this6._createTarballStream(config);
-      yield new Promise(function (resolve, reject) {
-        const untarStream = _this6._createUntarStream(dest);
-        tarballStream.on('error', reject);
-        untarStream.on('error', reject);
-        untarStream.on('end', resolve);
-        untarStream.once('finish', resolve);
-        tarballStream.pipe(untarStream);
-      });
-    })();
-  }
-
-  _createTarballStream(config) {
-    let savedPackedHeader = false;
-    return (0, (_pack || _load_pack()).packTarball)(config, {
-      mapHeader(header) {
-        if (!savedPackedHeader) {
-          savedPackedHeader = true;
-          header.pax = header.pax || {};
-          // add a custom data on the first header
-          // in order to distinguish a tar from "git archive" and a tar from "pack" command
-          header.pax.packed = PACKED_FLAG;
-        }
-        return header;
-      }
-    });
-  }
-
-  _createUntarStream(dest) {
-    const PREFIX = 'package/';
-    let isPackedTarball = undefined;
-    return tarFs.extract(dest, {
-      dmode: 0o555, // all dirs should be readable
-      fmode: 0o444, // all files should be readable
-      chown: false, // don't chown. just leave as it is
-      map: header => {
-        if (isPackedTarball === undefined) {
-          isPackedTarball = header.pax && header.pax.packed === PACKED_FLAG;
-        }
-        if (isPackedTarball) {
-          header.name = header.name.substr(PREFIX.length);
-        }
-      }
-    });
-  }
-
-  fetchFromGitArchive(git) {
-    var _this7 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield git.clone(_this7.dest);
-      const tarballMirrorPath = _this7.getTarballMirrorPath();
-      const tarballCachePath = _this7.getTarballCachePath();
-
-      if (tarballMirrorPath) {
-        yield git.archive(tarballMirrorPath);
-      }
-
-      if (tarballCachePath) {
-        yield git.archive(tarballCachePath);
-      }
-    })();
-  }
-
-  _fetch() {
-    return this.fetchFromLocal().catch(err => this.fetchFromExternal());
-  }
-}
-exports.default = GitFetcher;
-
-/***/ }),
-/* 552 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.workspace = exports.tarball = exports.git = exports.copy = exports.base = undefined;
-
-var _baseFetcher;
-
-function _load_baseFetcher() {
-  return _baseFetcher = _interopRequireDefault(__webpack_require__(167));
-}
-
-var _copyFetcher;
-
-function _load_copyFetcher() {
-  return _copyFetcher = _interopRequireDefault(__webpack_require__(550));
-}
-
-var _gitFetcher;
-
-function _load_gitFetcher() {
-  return _gitFetcher = _interopRequireDefault(__webpack_require__(551));
-}
-
-var _tarballFetcher;
-
-function _load_tarballFetcher() {
-  return _tarballFetcher = _interopRequireDefault(__webpack_require__(364));
-}
-
-var _workspaceFetcher;
-
-function _load_workspaceFetcher() {
-  return _workspaceFetcher = _interopRequireDefault(__webpack_require__(553));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.base = (_baseFetcher || _load_baseFetcher()).default;
-exports.copy = (_copyFetcher || _load_copyFetcher()).default;
-exports.git = (_gitFetcher || _load_gitFetcher()).default;
-exports.tarball = (_tarballFetcher || _load_tarballFetcher()).default;
-exports.workspace = (_workspaceFetcher || _load_workspaceFetcher()).default;
-
-/***/ }),
-/* 553 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _packageFetcher;
-
-function _load_packageFetcher() {
-  return _packageFetcher = __webpack_require__(210);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class WorkspaceFetcher {
-  constructor(dest, remote, config) {
-    this.config = config;
-    this.dest = dest;
-    this.registry = remote.registry;
-    this.workspaceDir = remote.reference;
-    this.registryRemote = remote.registryRemote;
-  }
-
-  setupMirrorFromCache() {
-    return Promise.resolve();
-  }
-
-  fetch() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const pkg = yield _this.config.readManifest(_this.workspaceDir, _this.registry);
-
-      if (_this.registryRemote) {
-        yield _this.fetchRemoteWorkspace(_this.registryRemote, pkg);
-      }
-
-      return {
-        resolved: null,
-        hash: '',
-        cached: false,
-        dest: _this.dest,
-        package: (0, (_extends2 || _load_extends()).default)({}, pkg, {
-          _uid: pkg.version
-        })
-      };
-    })();
-  }
-
-  fetchRemoteWorkspace(remote, manifest) {
-    return (0, (_packageFetcher || _load_packageFetcher()).fetchOneRemote)(remote, manifest.name, manifest.version, this.dest, this.config);
-  }
-}
-exports.default = WorkspaceFetcher;
-
-/***/ }),
-/* 554 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.buildTree = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let buildTree = exports.buildTree = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (resolver, linker, patterns, ignoreHoisted) {
-    const treesByKey = {};
-    const trees = [];
-    const flatTree = yield linker.getFlatHoistedTree(patterns);
-
-    // If using workspaces, filter out the virtual manifest
-    const workspaceLayout = resolver.workspaceLayout;
-
-    const hoisted = workspaceLayout && workspaceLayout.virtualManifestName ? flatTree.filter(function ([key]) {
-      return key.indexOf(workspaceLayout.virtualManifestName) === -1;
-    }) : flatTree;
-
-    const hoistedByKey = {};
-    for (var _iterator = hoisted, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref3;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref3 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref3 = _i.value;
-      }
-
-      const _ref2 = _ref3;
-      const key = _ref2[0];
-      const info = _ref2[1];
-
-      hoistedByKey[key] = info;
-    }
-
-    // build initial trees
-    for (var _iterator2 = hoisted, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref5;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref5 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref5 = _i2.value;
-      }
-
-      const _ref4 = _ref5;
-      const info = _ref4[1];
-
-      const ref = info.pkg._reference;
-      // const parent = getParent(info.key, treesByKey);
-      const children = [];
-      // let depth = 0;
-      invariant(ref, 'expected reference');
-
-      // check parent to obtain next depth
-      // if (parent && parent.depth > 0) {
-      //   depth = parent.depth + 1;
-      // } else {
-      //   depth = 0;
-      // }
-
-      treesByKey[info.key] = {
-        name: info.pkg.name,
-        version: info.pkg.version,
-        children,
-        manifest: info
-      };
-    }
-
-    // add children
-    for (var _iterator3 = hoisted, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref7 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref7 = _i3.value;
-      }
-
-      const _ref6 = _ref7;
-      const info = _ref6[1];
-
-      const tree = treesByKey[info.key];
-      const parent = getParent(info.key, treesByKey);
-      if (!tree) {
-        continue;
-      }
-
-      if (info.key.split('#').length === 1) {
-        trees.push(tree);
-        continue;
-      }
-
-      if (parent) {
-        parent.children.push(tree);
-      }
-    }
-
-    return trees;
-  });
-
-  return function buildTree(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.getParent = getParent;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-function getParent(key, treesByKey) {
-  const parentKey = key.slice(0, key.lastIndexOf('#'));
-  return treesByKey[parentKey];
-}
-
-/***/ }),
-/* 555 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const semver = __webpack_require__(21);
-
-// This isn't really a "proper" constraint resolver. We just return the highest semver
-// version in the versions passed that satisfies the input range. This vastly reduces
-// the complexity and is very efficient for package resolution.
-
-class PackageConstraintResolver {
-  constructor(config, reporter) {
-    this.reporter = reporter;
-    this.config = config;
-  }
-
-  reduce(versions, range) {
-    if (range === 'latest') {
-      // Usually versions are already ordered and the last one is the latest
-      return Promise.resolve(versions[versions.length - 1]);
-    } else {
-      return Promise.resolve(semver.maxSatisfying(versions, range, this.config.looseSemver));
-    }
-  }
-}
-exports.default = PackageConstraintResolver;
-
-/***/ }),
-/* 556 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.NohoistResolver = exports.HoistManifest = undefined;
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _config;
-
-function _load_config() {
-  return _config = _interopRequireDefault(__webpack_require__(162));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _micromatch;
-
-function _load_micromatch() {
-  return _micromatch = _interopRequireDefault(__webpack_require__(114));
-}
-
-var _workspaceLayout2;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout2 = _interopRequireDefault(__webpack_require__(90));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-const path = __webpack_require__(0);
-
-let historyCounter = 0;
-
-const LINK_TYPES = new Set(['workspace', 'link']);
-class HoistManifest {
-  constructor(key, parts, pkg, loc, isDirectRequire, isRequired, isIncompatible) {
-    this.isDirectRequire = isDirectRequire;
-    this.isRequired = isRequired;
-    this.isIncompatible = isIncompatible;
-
-    this.loc = loc;
-    this.pkg = pkg;
-    this.key = key;
-    this.parts = parts;
-    this.originalKey = key;
-    this.previousPaths = [];
-
-    this.history = [];
-    this.addHistory(`Start position = ${key}`);
-
-    this.isNohoist = false;
-    this.originalParentPath = '';
-
-    this.shallowPaths = [];
-    this.isShallow = false;
-  }
-
-  //focus
-
-
-  // nohoist info
-
-
-  addHistory(msg) {
-    this.history.push(`${++historyCounter}: ${msg}`);
-  }
-}
-
-exports.HoistManifest = HoistManifest;
-class PackageHoister {
-  constructor(config, resolver, { ignoreOptional, workspaceLayout } = {}) {
-    this.resolver = resolver;
-    this.config = config;
-
-    this.ignoreOptional = ignoreOptional;
-
-    this.taintedKeys = new Map();
-    this.levelQueue = [];
-    this.tree = new Map();
-
-    this.workspaceLayout = workspaceLayout;
-
-    this.nohoistResolver = new NohoistResolver(config, resolver);
-  }
-
-  /**
-   * Taint this key and prevent any modules from being hoisted to it.
-   */
-
-  taintKey(key, info) {
-    const existingTaint = this.taintedKeys.get(key);
-    if (existingTaint && existingTaint.loc !== info.loc) {
-      return false;
-    } else {
-      this.taintedKeys.set(key, info);
-      return true;
-    }
-  }
-
-  /**
-   * Implode an array of ancestry parts into a key.
-   */
-
-  implodeKey(parts) {
-    return parts.join('#');
-  }
-
-  /**
-   * Seed the hoister with patterns taken from the included resolver.
-   */
-
-  seed(patterns) {
-    this.prepass(patterns);
-
-    for (var _iterator = this.resolver.dedupePatterns(patterns), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const pattern = _ref;
-
-      this._seed(pattern, { isDirectRequire: true });
-    }
-
-    while (true) {
-      let queue = this.levelQueue;
-      if (!queue.length) {
-        this._propagateRequired();
-        return;
-      }
-
-      this.levelQueue = [];
-
-      // sort queue to get determinism between runs
-      queue = queue.sort(([aPattern], [bPattern]) => {
-        return (0, (_misc || _load_misc()).sortAlpha)(aPattern, bPattern);
-      });
-
-      // sort the queue again to hoist packages without peer dependencies first
-      let sortedQueue = [];
-      const availableSet = new Set();
-
-      let hasChanged = true;
-      while (queue.length > 0 && hasChanged) {
-        hasChanged = false;
-
-        const queueCopy = queue;
-        queue = [];
-        for (let t = 0; t < queueCopy.length; ++t) {
-          const queueItem = queueCopy[t];
-          const pattern = queueItem[0];
-          const pkg = this.resolver.getStrictResolvedPattern(pattern);
-
-          const peerDependencies = Object.keys(pkg.peerDependencies || {});
-          const areDependenciesFulfilled = peerDependencies.every(peerDependency => availableSet.has(peerDependency));
-
-          if (areDependenciesFulfilled) {
-            // Move the package inside our sorted queue
-            sortedQueue.push(queueItem);
-
-            // Add it to our set, so that we know it is available
-            availableSet.add(pattern);
-
-            // Schedule a next pass, in case other packages had peer dependencies on this one
-            hasChanged = true;
-          } else {
-            queue.push(queueItem);
-          }
-        }
-      }
-
-      // We might end up with some packages left in the queue, that have not been sorted. We reach this codepath if two
-      // packages have a cyclic dependency, or if the peer dependency is provided by a parent package. In these case,
-      // nothing we can do, so we just add all of these packages to the end of the sorted queue.
-      sortedQueue = sortedQueue.concat(queue);
-
-      for (var _iterator2 = sortedQueue, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const _ref2 = _ref3;
-        const pattern = _ref2[0];
-        const parent = _ref2[1];
-
-        const info = this._seed(pattern, { isDirectRequire: false, parent });
-        if (info) {
-          this.hoist(info);
-        }
-      }
-    }
-  }
-
-  /**
-   * Seed the hoister with a specific pattern.
-   */
-
-  _seed(pattern, { isDirectRequire, parent }) {
-    //
-    const pkg = this.resolver.getStrictResolvedPattern(pattern);
-    const ref = pkg._reference;
-    invariant(ref, 'expected reference');
-
-    //
-    let parentParts = [];
-
-    const isIncompatible = ref.incompatible;
-    const isMarkedAsOptional = ref.optional && this.ignoreOptional;
-
-    let isRequired = isDirectRequire && !ref.ignore && !isIncompatible && !isMarkedAsOptional;
-
-    if (parent) {
-      if (!this.tree.get(parent.key)) {
-        return null;
-      }
-      // non ignored dependencies inherit parent's ignored status
-      // parent may transition from ignored to non ignored when hoisted if it is used in another non ignored branch
-      if (!isDirectRequire && !isIncompatible && parent.isRequired && !isMarkedAsOptional) {
-        isRequired = true;
-      }
-      parentParts = parent.parts;
-    }
-
-    //
-    const loc = this.config.generateModuleCachePath(ref);
-    const parts = parentParts.concat(pkg.name);
-    const key = this.implodeKey(parts);
-    const info = new HoistManifest(key, parts, pkg, loc, isDirectRequire, isRequired, isIncompatible);
-
-    this.nohoistResolver.initNohoist(info, parent);
-
-    this.tree.set(key, info);
-    this.taintKey(key, info);
-
-    //
-    const pushed = new Set();
-    for (var _iterator3 = ref.dependencies, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
-
-      const depPattern = _ref4;
-
-      if (!pushed.has(depPattern)) {
-        this.levelQueue.push([depPattern, info]);
-        pushed.add(depPattern);
-      }
-    }
-
-    return info;
-  }
-
-  /**
-   * Propagate inherited ignore statuses from non-ignored to ignored packages
-   */
-
-  _propagateRequired() {
-    //
-    const toVisit = [];
-
-    // enumerate all non-ignored packages
-    for (var _iterator4 = this.tree.entries(), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref5;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref5 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref5 = _i4.value;
-      }
-
-      const entry = _ref5;
-
-      if (entry[1].isRequired) {
-        toVisit.push(entry[1]);
-      }
-    }
-
-    // visit them
-    while (toVisit.length) {
-      const info = toVisit.shift();
-      const ref = info.pkg._reference;
-      invariant(ref, 'expected reference');
-
-      for (var _iterator5 = ref.dependencies, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref6 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref6 = _i5.value;
-        }
-
-        const depPattern = _ref6;
-
-        const depinfo = this._lookupDependency(info, depPattern);
-
-        if (!depinfo) {
-          continue;
-        }
-
-        const depRef = depinfo.pkg._reference;
-
-        // If it's marked as optional, but the parent is required and the
-        // dependency was not listed in `optionalDependencies`, then we mark the
-        // dependency as required.
-        const isMarkedAsOptional = depRef && depRef.optional && this.ignoreOptional && !(info.isRequired && depRef.hint !== 'optional');
-
-        if (!depinfo.isRequired && !depinfo.isIncompatible && !isMarkedAsOptional) {
-          depinfo.isRequired = true;
-          depinfo.addHistory(`Mark as non-ignored because of usage by ${info.key}`);
-          toVisit.push(depinfo);
-        }
-      }
-    }
-  }
-
-  /**
-   * Looks up the package a dependency resolves to
-   */
-
-  _lookupDependency(info, depPattern) {
-    //
-    const pkg = this.resolver.getStrictResolvedPattern(depPattern);
-    const ref = pkg._reference;
-    invariant(ref, 'expected reference');
-
-    //
-    for (let i = info.parts.length; i >= 0; i--) {
-      const checkParts = info.parts.slice(0, i).concat(pkg.name);
-      const checkKey = this.implodeKey(checkParts);
-      const existing = this.tree.get(checkKey);
-      if (existing) {
-        return existing;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Find the highest position we can hoist this module to.
-   */
-
-  getNewParts(key, info, parts) {
-    let stepUp = false;
-
-    const highestHoistingPoint = this.nohoistResolver.highestHoistingPoint(info) || 0;
-    const fullKey = this.implodeKey(parts);
-    const stack = []; // stack of removed parts
-    const name = parts.pop();
-
-    if (info.isNohoist) {
-      info.addHistory(`Marked as nohoist, will not be hoisted above '${parts[highestHoistingPoint]}'`);
-    }
-
-    for (let i = parts.length - 1; i >= highestHoistingPoint; i--) {
-      const checkParts = parts.slice(0, i).concat(name);
-      const checkKey = this.implodeKey(checkParts);
-      info.addHistory(`Looked at ${checkKey} for a match`);
-
-      const existing = this.tree.get(checkKey);
-
-      if (existing) {
-        if (existing.loc === info.loc) {
-          // switch to non ignored if earlier deduped version was ignored (must be compatible)
-          if (!existing.isRequired && info.isRequired) {
-            existing.addHistory(`Deduped ${fullKey} to this item, marking as required`);
-            existing.isRequired = true;
-          } else {
-            existing.addHistory(`Deduped ${fullKey} to this item`);
-          }
-
-          return { parts: checkParts, duplicate: true };
-        } else {
-          // everything above will be shadowed and this is a conflict
-          info.addHistory(`Found a collision at ${checkKey}`);
-          break;
-        }
-      }
-
-      const existingTaint = this.taintedKeys.get(checkKey);
-      if (existingTaint && existingTaint.loc !== info.loc) {
-        info.addHistory(`Broken by ${checkKey}`);
-        break;
-      }
-    }
-
-    const peerDependencies = Object.keys(info.pkg.peerDependencies || {});
-
-    // remove redundant parts that wont collide
-    hoistLoop: while (parts.length > highestHoistingPoint) {
-      // we must not hoist a package higher than its peer dependencies
-      for (var _iterator6 = peerDependencies, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-        var _ref7;
-
-        if (_isArray6) {
-          if (_i6 >= _iterator6.length) break;
-          _ref7 = _iterator6[_i6++];
-        } else {
-          _i6 = _iterator6.next();
-          if (_i6.done) break;
-          _ref7 = _i6.value;
-        }
-
-        const peerDependency = _ref7;
-
-        const checkParts = parts.concat(peerDependency);
-        const checkKey = this.implodeKey(checkParts);
-        info.addHistory(`Looked at ${checkKey} for a peer dependency match`);
-
-        const existing = this.tree.get(checkKey);
-
-        if (existing) {
-          info.addHistory(`Found a peer dependency requirement at ${checkKey}`);
-          break hoistLoop;
-        }
-      }
-
-      const checkParts = parts.concat(name);
-      const checkKey = this.implodeKey(checkParts);
-
-      //
-      const existing = this.tree.get(checkKey);
-      if (existing) {
-        stepUp = true;
-        break;
-      }
-
-      // check if we're trying to hoist ourselves to a previously unflattened module key,
-      // this will result in a conflict and we'll need to move ourselves up
-      if (key !== checkKey && this.taintedKeys.has(checkKey)) {
-        stepUp = true;
-        break;
-      }
-
-      //
-      stack.push(parts.pop());
-    }
-
-    //
-    parts.push(name);
-
-    //
-    const isValidPosition = parts => {
-      // nohoist package can't be hoisted to the "root"
-      if (parts.length <= highestHoistingPoint) {
-        return false;
-      }
-      const key = this.implodeKey(parts);
-      const existing = this.tree.get(key);
-      if (existing && existing.loc === info.loc) {
-        return true;
-      }
-
-      // ensure there's no taint or the taint is us
-      const existingTaint = this.taintedKeys.get(key);
-      if (existingTaint && existingTaint.loc !== info.loc) {
-        return false;
-      }
-
-      return true;
-    };
-
-    // we need to special case when we attempt to hoist to the top level as the `existing` logic
-    // wont be hit in the above `while` loop and we could conflict
-    if (!isValidPosition(parts)) {
-      stepUp = true;
-    }
-
-    // sometimes we need to step up to a parent module to install ourselves
-    while (stepUp && stack.length) {
-      info.addHistory(`Stepping up from ${this.implodeKey(parts)}`);
-
-      parts.pop(); // remove `name`
-      parts.push(stack.pop(), name);
-
-      if (isValidPosition(parts)) {
-        info.addHistory(`Found valid position ${this.implodeKey(parts)}`);
-        stepUp = false;
-      }
-    }
-
-    return { parts, duplicate: false };
-  }
-
-  /**
-   * Hoist all seeded patterns to their highest positions.
-   */
-
-  hoist(info) {
-    const oldKey = info.key,
-          rawParts = info.parts;
-
-    // remove this item from the `tree` map so we can ignore it
-
-    this.tree.delete(oldKey);
-
-    var _getNewParts = this.getNewParts(oldKey, info, rawParts.slice());
-
-    const parts = _getNewParts.parts,
-          duplicate = _getNewParts.duplicate;
-
-
-    const newKey = this.implodeKey(parts);
-    if (duplicate) {
-      info.addHistory(`Satisfied from above by ${newKey}`);
-      this.declareRename(info, rawParts, parts);
-      this.updateHoistHistory(this.nohoistResolver._originalPath(info), this.implodeKey(parts));
-      return;
-    }
-
-    // update to the new key
-    if (oldKey === newKey) {
-      info.addHistory(`Didn't hoist - see reason above`);
-      this.setKey(info, oldKey, rawParts);
-      return;
-    }
-
-    //
-    this.declareRename(info, rawParts, parts);
-    this.setKey(info, newKey, parts);
-  }
-
-  /**
-   * Declare that a module has been hoisted and update our internal references.
-   */
-
-  declareRename(info, oldParts, newParts) {
-    // go down the tree from our new position reserving our name
-    this.taintParents(info, oldParts.slice(0, -1), newParts.length - 1);
-  }
-
-  /**
-   * Crawl upwards through a list of ancestry parts and taint a package name.
-   */
-
-  taintParents(info, processParts, start) {
-    for (let i = start; i < processParts.length; i++) {
-      const parts = processParts.slice(0, i).concat(info.pkg.name);
-      const key = this.implodeKey(parts);
-
-      if (this.taintKey(key, info)) {
-        info.addHistory(`Tainted ${key} to prevent collisions`);
-      }
-    }
-  }
-
-  updateHoistHistory(fromPath, toKey) {
-    const info = this.tree.get(toKey);
-    invariant(info, `expect to find hoist-to ${toKey}`);
-    info.previousPaths.push(fromPath);
-  }
-
-  /**
-   * Update the key of a module and update our references.
-   */
-
-  setKey(info, newKey, parts) {
-    const oldKey = info.key;
-
-    info.key = newKey;
-    info.parts = parts;
-    this.tree.set(newKey, info);
-
-    if (oldKey === newKey) {
-      return;
-    }
-
-    const fromInfo = this.tree.get(newKey);
-    invariant(fromInfo, `expect to find hoist-from ${newKey}`);
-    info.previousPaths.push(this.nohoistResolver._originalPath(fromInfo));
-    info.addHistory(`New position = ${newKey}`);
-  }
-
-  /**
-   * Perform a prepass and if there's multiple versions of the same package, hoist the one with
-   * the most dependents to the top.
-   */
-
-  prepass(patterns) {
-    patterns = this.resolver.dedupePatterns(patterns).sort();
-
-    const visited = new Map();
-
-    const occurences = {};
-
-    // visitor to be used inside add() to mark occurences of packages
-    const visitAdd = (pkg, ancestry, pattern) => {
-      const versions = occurences[pkg.name] = occurences[pkg.name] || {};
-      const version = versions[pkg.version] = versions[pkg.version] || {
-        occurences: new Set(),
-        pattern
-      };
-
-      if (ancestry.length) {
-        version.occurences.add(ancestry[ancestry.length - 1]);
-      }
-    };
-
-    // add an occurring package to the above data structure
-    const add = (pattern, ancestry, ancestryPatterns) => {
-      const pkg = this.resolver.getStrictResolvedPattern(pattern);
-      if (ancestry.indexOf(pkg) >= 0) {
-        // prevent recursive dependencies
-        return;
-      }
-
-      let visitedPattern = visited.get(pattern);
-
-      if (visitedPattern) {
-        // if a package has been visited before, simply increment occurrences of packages
-        // like last time this package was visited
-        visitedPattern.forEach(visitPkg => {
-          visitAdd(visitPkg.pkg, visitPkg.ancestry, visitPkg.pattern);
-        });
-
-        visitAdd(pkg, ancestry, pattern);
-
-        return;
-      }
-
-      const ref = pkg._reference;
-      invariant(ref, 'expected reference');
-
-      visitAdd(pkg, ancestry, pattern);
-
-      for (var _iterator7 = ref.dependencies, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-        var _ref8;
-
-        if (_isArray7) {
-          if (_i7 >= _iterator7.length) break;
-          _ref8 = _iterator7[_i7++];
-        } else {
-          _i7 = _iterator7.next();
-          if (_i7.done) break;
-          _ref8 = _i7.value;
-        }
-
-        const depPattern = _ref8;
-
-        const depAncestry = ancestry.concat(pkg);
-        const depAncestryPatterns = ancestryPatterns.concat(depPattern);
-        add(depPattern, depAncestry, depAncestryPatterns);
-      }
-
-      visitedPattern = visited.get(pattern) || [];
-      visited.set(pattern, visitedPattern);
-      visitedPattern.push({ pkg, ancestry, pattern });
-
-      ancestryPatterns.forEach(ancestryPattern => {
-        const visitedAncestryPattern = visited.get(ancestryPattern);
-        if (visitedAncestryPattern) {
-          visitedAncestryPattern.push({ pkg, ancestry, pattern });
-        }
-      });
-    };
-
-    // get a list of root package names since we can't hoist other dependencies to these spots!
-    const rootPackageNames = new Set();
-    for (var _iterator8 = patterns, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-      var _ref9;
-
-      if (_isArray8) {
-        if (_i8 >= _iterator8.length) break;
-        _ref9 = _iterator8[_i8++];
-      } else {
-        _i8 = _iterator8.next();
-        if (_i8.done) break;
-        _ref9 = _i8.value;
-      }
-
-      const pattern = _ref9;
-
-      const pkg = this.resolver.getStrictResolvedPattern(pattern);
-      rootPackageNames.add(pkg.name);
-      add(pattern, [], []);
-    }
-
-    for (var _iterator9 = Object.keys(occurences).sort(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref10;
-
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref10 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref10 = _i9.value;
-      }
-
-      const packageName = _ref10;
-
-      const versionOccurences = occurences[packageName];
-      const versions = Object.keys(versionOccurences);
-
-      if (versions.length === 1) {
-        // only one package type so we'll hoist this to the top anyway
-        continue;
-      }
-
-      if (this.tree.get(packageName)) {
-        // a transitive dependency of a previously hoisted dependency exists
-        continue;
-      }
-
-      if (rootPackageNames.has(packageName)) {
-        // can't replace top level packages
-        continue;
-      }
-
-      let mostOccurenceCount;
-      let mostOccurencePattern;
-      for (var _iterator10 = Object.keys(versionOccurences).sort(), _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-        var _ref11;
-
-        if (_isArray10) {
-          if (_i10 >= _iterator10.length) break;
-          _ref11 = _iterator10[_i10++];
-        } else {
-          _i10 = _iterator10.next();
-          if (_i10.done) break;
-          _ref11 = _i10.value;
-        }
-
-        const version = _ref11;
-        var _versionOccurences$ve = versionOccurences[version];
-        const occurences = _versionOccurences$ve.occurences,
-              pattern = _versionOccurences$ve.pattern;
-
-        const occurenceCount = occurences.size;
-
-        if (!mostOccurenceCount || occurenceCount > mostOccurenceCount) {
-          mostOccurenceCount = occurenceCount;
-          mostOccurencePattern = pattern;
-        }
-      }
-      invariant(mostOccurencePattern, 'expected most occurring pattern');
-      invariant(mostOccurenceCount, 'expected most occurring count');
-
-      // only hoist this module if it occured more than once
-      if (mostOccurenceCount > 1) {
-        this._seed(mostOccurencePattern, { isDirectRequire: false });
-      }
-    }
-  }
-
-  markShallowWorkspaceEntries() {
-    const targetWorkspace = this.config.focusedWorkspaceName;
-    const targetHoistManifest = this.tree.get(targetWorkspace);
-    invariant(targetHoistManifest, `targetHoistManifest from ${targetWorkspace} missing`);
-
-    //dedupe with a set
-    const dependentWorkspaces = Array.from(new Set(this._getDependentWorkspaces(targetHoistManifest)));
-
-    const entries = Array.from(this.tree);
-    entries.forEach(([key, info]) => {
-      const splitPath = key.split('#');
-
-      //mark the workspace and any un-hoisted dependencies it has for shallow installation
-      const isShallowDependency = dependentWorkspaces.some(w => {
-        if (splitPath[0] !== w) {
-          //entry is not related to the workspace
-          return false;
-        }
-        if (!splitPath[1]) {
-          //entry is the workspace
-          return true;
-        }
-        //don't bother marking dev dependencies or nohoist packages for shallow installation
-        const treeEntry = this.tree.get(w);
-        invariant(treeEntry, 'treeEntry is not defined for ' + w);
-        const pkg = treeEntry.pkg;
-        return !info.isNohoist && (!pkg.devDependencies || !(splitPath[1] in pkg.devDependencies));
-      });
-
-      if (isShallowDependency) {
-        info.shallowPaths = [null];
-        return;
-      }
-
-      //if package foo is at TARGET_WORKSPACE/node_modules/foo, the hoisted version of foo
-      //should be installed under each shallow workspace that uses it
-      //(unless that workspace has its own version of foo, in which case that should be installed)
-      if (splitPath.length !== 2 || splitPath[0] !== targetWorkspace) {
-        return;
-      }
-      const unhoistedDependency = splitPath[1];
-      const unhoistedInfo = this.tree.get(unhoistedDependency);
-      if (!unhoistedInfo) {
-        return;
-      }
-      dependentWorkspaces.forEach(w => {
-        if (this._packageDependsOnHoistedPackage(w, unhoistedDependency, false)) {
-          unhoistedInfo.shallowPaths.push(w);
-        }
-      });
-    });
-  }
-
-  _getDependentWorkspaces(parent, allowDevDeps = true, alreadySeen = new Set()) {
-    const parentName = parent.pkg.name;
-    if (alreadySeen.has(parentName)) {
-      return [];
-    }
-
-    alreadySeen.add(parentName);
-    invariant(this.workspaceLayout, 'missing workspaceLayout');
-    var _workspaceLayout = this.workspaceLayout;
-    const virtualManifestName = _workspaceLayout.virtualManifestName,
-          workspaces = _workspaceLayout.workspaces;
-
-
-    const directDependencies = [];
-    const ignored = [];
-    Object.keys(workspaces).forEach(workspace => {
-      if (alreadySeen.has(workspace) || workspace === virtualManifestName) {
-        return;
-      }
-
-      //skip a workspace if a different version of it is already being installed under the parent workspace
-      let info = this.tree.get(`${parentName}#${workspace}`);
-      if (info) {
-        const workspaceVersion = workspaces[workspace].manifest.version;
-        if (info.isNohoist && info.originalParentPath.startsWith(`/${WS_ROOT_ALIAS}/${parentName}`) && info.pkg.version === workspaceVersion) {
-          //nohoist installations are exceptions
-          directDependencies.push(info.key);
-        } else {
-          ignored.push(workspace);
-        }
-        return;
-      }
-
-      const searchPath = `/${WS_ROOT_ALIAS}/${parentName}`;
-      info = this.tree.get(workspace);
-      invariant(info, 'missing workspace tree entry ' + workspace);
-      if (!info.previousPaths.some(p => p.startsWith(searchPath))) {
-        return;
-      }
-      if (allowDevDeps || !parent.pkg.devDependencies || !(workspace in parent.pkg.devDependencies)) {
-        directDependencies.push(workspace);
-      }
-    });
-
-    let nested = directDependencies.map(d => {
-      const dependencyEntry = this.tree.get(d);
-      invariant(dependencyEntry, 'missing dependencyEntry ' + d);
-      return this._getDependentWorkspaces(dependencyEntry, false, alreadySeen);
-    });
-    nested = [].concat.apply([], nested); //flatten
-
-    const directDependencyNames = directDependencies.map(d => d.split('#').slice(-1)[0]);
-
-    return directDependencyNames.concat(nested).filter(w => ignored.indexOf(w) === -1);
-  }
-
-  _packageDependsOnHoistedPackage(p, hoisted, checkDevDeps = true, checked = new Set()) {
-    //don't check the same package more than once, and ignore any package that has its own version of hoisted
-    if (checked.has(p) || this.tree.has(`${p}#${hoisted}`)) {
-      return false;
-    }
-    checked.add(p);
-    const info = this.tree.get(p);
-    if (!info) {
-      return false;
-    }
-
-    const pkg = info.pkg;
-    if (!pkg) {
-      return false;
-    }
-
-    let deps = [];
-    if (pkg.dependencies) {
-      deps = deps.concat(Object.keys(pkg.dependencies));
-    }
-    if (checkDevDeps && pkg.devDependencies) {
-      deps = deps.concat(Object.keys(pkg.devDependencies));
-    }
-
-    if (deps.indexOf(hoisted) !== -1) {
-      return true;
-    }
-    return deps.some(dep => this._packageDependsOnHoistedPackage(dep, hoisted, false, checked));
-  }
-
-  /**
-   * Produce a flattened list of module locations and manifests.
-   */
-
-  init() {
-    const flatTree = [];
-
-    //
-    for (var _iterator11 = this.tree.entries(), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-      var _ref13;
-
-      if (_isArray11) {
-        if (_i11 >= _iterator11.length) break;
-        _ref13 = _iterator11[_i11++];
-      } else {
-        _i11 = _iterator11.next();
-        if (_i11.done) break;
-        _ref13 = _i11.value;
-      }
-
-      const _ref12 = _ref13;
-      const key = _ref12[0];
-      const info = _ref12[1];
-
-      // decompress the location and push it to the flat tree. this path could be made
-      const parts = [];
-      const keyParts = key.split('#');
-      for (let i = 0; i < keyParts.length; i++) {
-        const key = keyParts.slice(0, i + 1).join('#');
-        const hoisted = this.tree.get(key);
-        invariant(hoisted, `expected hoisted manifest for "${key}"`);
-        parts.push(this.config.getFolder(hoisted.pkg));
-        parts.push(keyParts[i]);
-      }
-
-      const shallowLocs = [];
-      if (this.config.modulesFolder) {
-        // remove the first part which will be the folder name and replace it with a
-        // hardcoded modules folder
-        parts.splice(0, 1, this.config.modulesFolder);
-      } else {
-        // first part will be the registry-specific module folder
-        parts.splice(0, 0, this.config.lockfileFolder);
-      }
-
-      info.shallowPaths.forEach(shallowPath => {
-        const shallowCopyParts = parts.slice();
-        shallowCopyParts[0] = this.config.cwd;
-        if (this.config.modulesFolder) {
-          //add back the module folder name for the shallow installation
-          const treeEntry = this.tree.get(keyParts[0]);
-          invariant(treeEntry, 'expected treeEntry for ' + keyParts[0]);
-          const moduleFolderName = this.config.getFolder(treeEntry.pkg);
-          shallowCopyParts.splice(1, 0, moduleFolderName);
-        }
-
-        if (shallowPath) {
-          const targetWorkspace = this.config.focusedWorkspaceName;
-          const treeEntry = this.tree.get(`${targetWorkspace}#${shallowPath}`) || this.tree.get(shallowPath);
-          invariant(treeEntry, 'expected treeEntry for ' + shallowPath);
-          const moduleFolderName = this.config.getFolder(treeEntry.pkg);
-          shallowCopyParts.splice(1, 0, moduleFolderName, shallowPath);
-        }
-        shallowLocs.push(path.join(...shallowCopyParts));
-      });
-
-      const loc = path.join(...parts);
-      flatTree.push([loc, info]);
-      shallowLocs.forEach(shallowLoc => {
-        const newManifest = (0, (_extends2 || _load_extends()).default)({}, info, { isShallow: true });
-        flatTree.push([shallowLoc, newManifest]);
-      });
-    }
-
-    // remove ignored modules from the tree
-    const visibleFlatTree = [];
-    for (var _iterator12 = flatTree, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-      var _ref15;
-
-      if (_isArray12) {
-        if (_i12 >= _iterator12.length) break;
-        _ref15 = _iterator12[_i12++];
-      } else {
-        _i12 = _iterator12.next();
-        if (_i12.done) break;
-        _ref15 = _i12.value;
-      }
-
-      const _ref14 = _ref15;
-      const loc = _ref14[0];
-      const info = _ref14[1];
-
-      const ref = info.pkg._reference;
-      invariant(ref, 'expected reference');
-      if (!info.isRequired) {
-        info.addHistory('Deleted as this module was ignored');
-      } else {
-        visibleFlatTree.push([loc, info]);
-      }
-    }
-    return visibleFlatTree;
-  }
-}
-
-exports.default = PackageHoister;
-const WS_ROOT_ALIAS = '_project_';
-class NohoistResolver {
-  constructor(config, resolver) {
-    this.initNohoist = (info, parent) => {
-      let parentNohoistList;
-      let originalParentPath = info.originalParentPath;
-
-      if (parent) {
-        parentNohoistList = parent.nohoistList;
-        originalParentPath = this._originalPath(parent);
-      } else {
-        invariant(this._isTopPackage(info), `${info.key} doesn't have parent nor a top package`);
-        if (info.pkg.name !== this._wsRootPackageName) {
-          parentNohoistList = this._wsRootNohoistList;
-          originalParentPath = this._wsRootPackageName || '';
-        }
-      }
-
-      info.originalParentPath = originalParentPath;
-      let nohoistList = this._extractNohoistList(info.pkg, this._originalPath(info)) || [];
-      if (parentNohoistList) {
-        nohoistList = nohoistList.concat(parentNohoistList);
-      }
-      info.nohoistList = nohoistList.length > 0 ? nohoistList : null;
-      info.isNohoist = this._isNohoist(info);
-    };
-
-    this.highestHoistingPoint = info => {
-      return info.isNohoist && info.parts.length > 1 ? 1 : null;
-    };
-
-    this._isNohoist = info => {
-      if (this._isTopPackage(info)) {
-        return false;
-      }
-      if (info.nohoistList && info.nohoistList.length > 0 && (_micromatch || _load_micromatch()).default.any(this._originalPath(info), info.nohoistList)) {
-        return true;
-      }
-      if (this._config.plugnplayEnabled) {
-        return true;
-      }
-      return false;
-    };
-
-    this._isRootPackage = pkg => {
-      return pkg.name === this._wsRootPackageName;
-    };
-
-    this._originalPath = info => {
-      return this._makePath(info.originalParentPath, info.pkg.name);
-    };
-
-    this._isTopPackage = info => {
-      const parentParts = info.parts.slice(0, -1);
-      const result = !parentParts || parentParts.length <= 0 || parentParts.length === 1 && parentParts[0] === this._wsRootPackageName;
-      return result;
-    };
-
-    this._isLink = info => {
-      return info.pkg._remote != null && LINK_TYPES.has(info.pkg._remote.type);
-    };
-
-    this._extractNohoistList = (pkg, pathPrefix) => {
-      let nohoistList;
-      const ws = this._config.getWorkspaces(pkg);
-
-      if (ws && ws.nohoist) {
-        nohoistList = ws.nohoist.map(p => this._makePath(pathPrefix, p));
-      }
-      return nohoistList;
-    };
-
-    this._resolver = resolver;
-    this._config = config;
-    if (resolver.workspaceLayout) {
-      this._wsRootPackageName = resolver.workspaceLayout.virtualManifestName;
-
-      var _resolver$workspaceLa = resolver.workspaceLayout.getWorkspaceManifest(this._wsRootPackageName);
-
-      const manifest = _resolver$workspaceLa.manifest;
-
-      this._wsRootNohoistList = this._extractNohoistList(manifest, manifest.name);
-    }
-  }
-
-  /**
-   * examine the top level packages to find the root package
-   */
-
-
-  /**
-   * find the highest hoisting point for the given HoistManifest.
-   * algorithm: a nohoist package should never be hoisted beyond the top of its branch, i.e.
-   * the first element of its parts. Therefore the highest possible hoisting index is 1,
-   * unless the package has only 1 part (itself), in such case returns null just like any hoisted package
-   *
-   */
-
-  // private functions
-
-  _makePath(...args) {
-    const parts = args.map(s => s === this._wsRootPackageName ? WS_ROOT_ALIAS : s);
-    const result = parts.join('/');
-    return result[0] === '/' ? result : '/' + result;
-  }
-
-  // extract nohoist from package.json then prefix them with branch path
-  // so we can matched against the branch tree ("originalPath") later
-}
-
-exports.NohoistResolver = NohoistResolver;
-
-/***/ }),
-/* 557 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _config;
-
-function _load_config() {
-  return _config = _interopRequireDefault(__webpack_require__(162));
-}
-
-var _executeLifecycleScript;
-
-function _load_executeLifecycleScript() {
-  return _executeLifecycleScript = _interopRequireDefault(__webpack_require__(111));
-}
-
-var _crypto;
-
-function _load_crypto() {
-  return _crypto = _interopRequireWildcard(__webpack_require__(168));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _packageNameUtils;
-
-function _load_packageNameUtils() {
-  return _packageNameUtils = __webpack_require__(222);
-}
-
-var _pack;
-
-function _load_pack() {
-  return _pack = __webpack_require__(166);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const fs = __webpack_require__(5);
-
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-
-const INSTALL_STAGES = ['preinstall', 'install', 'postinstall'];
-
-class PackageInstallScripts {
-  constructor(config, resolver, force) {
-    this.installed = 0;
-    this.resolver = resolver;
-    this.reporter = config.reporter;
-    this.config = config;
-    this.force = force;
-    this.artifacts = {};
-  }
-
-  setForce(force) {
-    this.force = force;
-  }
-
-  setArtifacts(artifacts) {
-    this.artifacts = artifacts;
-  }
-
-  getArtifacts() {
-    return this.artifacts;
-  }
-
-  getInstallCommands(pkg) {
-    const scripts = pkg.scripts;
-    if (scripts) {
-      const cmds = [];
-      for (var _iterator = INSTALL_STAGES, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const stage = _ref;
-
-        const cmd = scripts[stage];
-        if (cmd) {
-          cmds.push([stage, cmd]);
-        }
-      }
-      return cmds;
-    } else {
-      return [];
-    }
-  }
-
-  walk(loc) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const files = yield (_fs || _load_fs()).walk(loc, null, new Set(_this.config.registryFolders));
-      const mtimes = new Map();
-      for (var _iterator2 = files, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref2 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref2 = _i2.value;
-        }
-
-        const file = _ref2;
-
-        mtimes.set(file.relative, file.mtime);
-      }
-      return mtimes;
-    })();
-  }
-
-  saveBuildArtifacts(loc, pkg, beforeFiles, spinner) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const afterFiles = yield _this2.walk(loc);
-
-      // work out what files have been created/modified
-      const buildArtifacts = [];
-      for (var _iterator3 = afterFiles, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref4;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref4 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref4 = _i3.value;
-        }
-
-        const _ref3 = _ref4;
-        const file = _ref3[0];
-        const mtime = _ref3[1];
-
-        if (!beforeFiles.has(file) || beforeFiles.get(file) !== mtime) {
-          buildArtifacts.push(file);
-        }
-      }
-
-      if (!buildArtifacts.length) {
-        // nothing else to do here since we have no build artifacts
-        return;
-      }
-
-      // set build artifacts
-      const ref = pkg._reference;
-      invariant(ref, 'expected reference');
-      _this2.artifacts[`${pkg.name}@${pkg.version}`] = buildArtifacts;
-    })();
-  }
-
-  install(cmds, pkg, spinner) {
-    var _this3 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const ref = pkg._reference;
-      invariant(ref, 'expected reference');
-      const locs = ref.locations;
-
-      let updateProgress;
-
-      if (cmds.length > 0) {
-        updateProgress = function updateProgress(data) {
-          const dataStr = data.toString() // turn buffer into string
-          .trim(); // trim whitespace
-
-          invariant(spinner && spinner.tick, 'We should have spinner and its ticker here');
-          if (dataStr) {
-            spinner.tick(dataStr
-            // Only get the last line
-            .substr(dataStr.lastIndexOf('\n') + 1)
-            // change tabs to spaces as they can interfere with the console
-            .replace(/\t/g, ' '));
-          }
-        };
-      }
-
-      try {
-        for (var _iterator4 = cmds, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref6;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref6 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref6 = _i4.value;
-          }
-
-          const _ref5 = _ref6;
-          const stage = _ref5[0];
-          const cmd = _ref5[1];
-
-          yield Promise.all(locs.map((() => {
-            var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-              var _ref8 = yield (0, (_executeLifecycleScript || _load_executeLifecycleScript()).default)({
-                stage,
-                config: _this3.config,
-                cwd: loc,
-                cmd,
-                isInteractive: false,
-                updateProgress
-              });
-
-              const stdout = _ref8.stdout;
-
-              _this3.reporter.verbose(stdout);
-            });
-
-            return function (_x) {
-              return _ref7.apply(this, arguments);
-            };
-          })()));
-        }
-      } catch (err) {
-        err.message = `${locs.join(', ')}: ${err.message}`;
-
-        invariant(ref, 'expected reference');
-
-        if (ref.optional) {
-          ref.ignore = true;
-          ref.incompatible = true;
-          _this3.reporter.warn(_this3.reporter.lang('optionalModuleScriptFail', err.message));
-          _this3.reporter.info(_this3.reporter.lang('optionalModuleFail'));
-
-          // Cleanup node_modules
-          try {
-            yield Promise.all(locs.map((() => {
-              var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-                yield (_fs || _load_fs()).unlink(loc);
-              });
-
-              return function (_x2) {
-                return _ref9.apply(this, arguments);
-              };
-            })()));
-          } catch (e) {
-            _this3.reporter.error(_this3.reporter.lang('optionalModuleCleanupFail', e.message));
-          }
-        } else {
-          throw err;
-        }
-      }
-    })();
-  }
-
-  packageCanBeInstalled(pkg) {
-    const cmds = this.getInstallCommands(pkg);
-    if (!cmds.length) {
-      return false;
-    }
-    if (this.config.packBuiltPackages && pkg.prebuiltVariants) {
-      for (const variant in pkg.prebuiltVariants) {
-        if (pkg._remote && pkg._remote.reference && pkg._remote.reference.includes(variant)) {
-          return false;
-        }
-      }
-    }
-    const ref = pkg._reference;
-    invariant(ref, 'Missing package reference');
-    if (!ref.fresh && !this.force) {
-      // this package hasn't been touched
-      return false;
-    }
-
-    // Don't run lifecycle scripts for hoisted packages
-    if (!ref.locations.length) {
-      return false;
-    }
-
-    // we haven't actually written this module out
-    if (ref.ignore) {
-      return false;
-    }
-    return true;
-  }
-
-  runCommand(spinner, pkg) {
-    var _this4 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const cmds = _this4.getInstallCommands(pkg);
-      spinner.setPrefix(++_this4.installed, pkg.name);
-      yield _this4.install(cmds, pkg, spinner);
-    })();
-  }
-
-  // detect if there is a circularDependency in the dependency tree
-  detectCircularDependencies(root, seenManifests, pkg) {
-    const ref = pkg._reference;
-    invariant(ref, 'expected reference');
-
-    const deps = ref.dependencies;
-    for (var _iterator5 = deps, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-      var _ref10;
-
-      if (_isArray5) {
-        if (_i5 >= _iterator5.length) break;
-        _ref10 = _iterator5[_i5++];
-      } else {
-        _i5 = _iterator5.next();
-        if (_i5.done) break;
-        _ref10 = _i5.value;
-      }
-
-      const dep = _ref10;
-
-      const pkgDep = this.resolver.getStrictResolvedPattern(dep);
-      if (seenManifests.has(pkgDep)) {
-        // there is a cycle but not with the root
-        continue;
-      }
-      seenManifests.add(pkgDep);
-      // found a dependency pointing to root
-      if (pkgDep == root) {
-        return true;
-      }
-      if (this.detectCircularDependencies(root, seenManifests, pkgDep)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  // find the next package to be installed
-  findInstallablePackage(workQueue, installed) {
-    for (var _iterator6 = workQueue, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray6) {
-        if (_i6 >= _iterator6.length) break;
-        _ref11 = _iterator6[_i6++];
-      } else {
-        _i6 = _iterator6.next();
-        if (_i6.done) break;
-        _ref11 = _i6.value;
-      }
-
-      const pkg = _ref11;
-
-      const ref = pkg._reference;
-      invariant(ref, 'expected reference');
-      const deps = ref.dependencies;
-
-      let dependenciesFulfilled = true;
-      for (var _iterator7 = deps, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-        var _ref12;
-
-        if (_isArray7) {
-          if (_i7 >= _iterator7.length) break;
-          _ref12 = _iterator7[_i7++];
-        } else {
-          _i7 = _iterator7.next();
-          if (_i7.done) break;
-          _ref12 = _i7.value;
-        }
-
-        const dep = _ref12;
-
-        const pkgDep = this.resolver.getStrictResolvedPattern(dep);
-        if (!installed.has(pkgDep)) {
-          dependenciesFulfilled = false;
-          break;
-        }
-      }
-
-      // all dependencies are installed
-      if (dependenciesFulfilled) {
-        return pkg;
-      }
-
-      // detect circular dependency, mark this pkg as installable to break the circle
-      if (this.detectCircularDependencies(pkg, new Set(), pkg)) {
-        return pkg;
-      }
-    }
-    return null;
-  }
-
-  worker(spinner, workQueue, installed, waitQueue) {
-    var _this5 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      while (workQueue.size > 0) {
-        // find a installable package
-        const pkg = _this5.findInstallablePackage(workQueue, installed);
-
-        // can't find a package to install, register into waitQueue
-        if (pkg == null) {
-          spinner.clear();
-          yield new Promise(function (resolve) {
-            return waitQueue.add(resolve);
-          });
-          continue;
-        }
-
-        // found a package to install
-        workQueue.delete(pkg);
-        if (_this5.packageCanBeInstalled(pkg)) {
-          yield _this5.runCommand(spinner, pkg);
-        }
-        installed.add(pkg);
-        for (var _iterator8 = waitQueue, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-          var _ref13;
-
-          if (_isArray8) {
-            if (_i8 >= _iterator8.length) break;
-            _ref13 = _iterator8[_i8++];
-          } else {
-            _i8 = _iterator8.next();
-            if (_i8.done) break;
-            _ref13 = _i8.value;
-          }
-
-          const workerResolve = _ref13;
-
-          workerResolve();
-        }
-        waitQueue.clear();
-      }
-    })();
-  }
-
-  init(seedPatterns) {
-    var _this6 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const workQueue = new Set();
-      const installed = new Set();
-      const pkgs = _this6.resolver.getTopologicalManifests(seedPatterns);
-      let installablePkgs = 0;
-      // A map to keep track of what files exist before installation
-      const beforeFilesMap = new Map();
-      for (var _iterator9 = pkgs, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-        var _ref14;
-
-        if (_isArray9) {
-          if (_i9 >= _iterator9.length) break;
-          _ref14 = _iterator9[_i9++];
-        } else {
-          _i9 = _iterator9.next();
-          if (_i9.done) break;
-          _ref14 = _i9.value;
-        }
-
-        const pkg = _ref14;
-
-        if (_this6.packageCanBeInstalled(pkg)) {
-          const ref = pkg._reference;
-          invariant(ref, 'expected reference');
-          yield Promise.all(ref.locations.map((() => {
-            var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-              beforeFilesMap.set(loc, (yield _this6.walk(loc)));
-              installablePkgs += 1;
-            });
-
-            return function (_x6) {
-              return _ref19.apply(this, arguments);
-            };
-          })()));
-        }
-        workQueue.add(pkg);
-      }
-
-      const set = _this6.reporter.activitySet(installablePkgs, Math.min(installablePkgs, _this6.config.childConcurrency));
-
-      // waitQueue acts like a semaphore to allow workers to register to be notified
-      // when there are more work added to the work queue
-      const waitQueue = new Set();
-      yield Promise.all(set.spinners.map(function (spinner) {
-        return _this6.worker(spinner, workQueue, installed, waitQueue);
-      }));
-      // generate built package as prebuilt one for offline mirror
-      const offlineMirrorPath = _this6.config.getOfflineMirrorPath();
-      if (_this6.config.packBuiltPackages && offlineMirrorPath) {
-        for (var _iterator10 = pkgs, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-          var _ref15;
-
-          if (_isArray10) {
-            if (_i10 >= _iterator10.length) break;
-            _ref15 = _iterator10[_i10++];
-          } else {
-            _i10 = _iterator10.next();
-            if (_i10.done) break;
-            _ref15 = _i10.value;
-          }
-
-          const pkg = _ref15;
-
-          if (_this6.packageCanBeInstalled(pkg)) {
-            let prebuiltPath = path.join(offlineMirrorPath, 'prebuilt');
-            yield (_fs || _load_fs()).mkdirp(prebuiltPath);
-            const prebuiltFilename = (0, (_packageNameUtils || _load_packageNameUtils()).getPlatformSpecificPackageFilename)(pkg);
-            prebuiltPath = path.join(prebuiltPath, prebuiltFilename + '.tgz');
-            const ref = pkg._reference;
-            invariant(ref, 'expected reference');
-            const builtPackagePaths = ref.locations;
-
-            yield Promise.all(builtPackagePaths.map((() => {
-              var _ref16 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (builtPackagePath) {
-                // don't use pack command, we want to avoid the file filters logic
-                const stream = yield (0, (_pack || _load_pack()).packWithIgnoreAndHeaders)(builtPackagePath);
-
-                const hash = yield new Promise(function (resolve, reject) {
-                  const validateStream = new (_crypto || _load_crypto()).HashStream();
-                  stream.pipe(validateStream).pipe(fs.createWriteStream(prebuiltPath)).on('error', reject).on('close', function () {
-                    return resolve(validateStream.getHash());
-                  });
-                });
-                pkg.prebuiltVariants = pkg.prebuiltVariants || {};
-                pkg.prebuiltVariants[prebuiltFilename] = hash;
-              });
-
-              return function (_x3) {
-                return _ref16.apply(this, arguments);
-              };
-            })()));
-          }
-        }
-      } else {
-        // cache all build artifacts
-        for (var _iterator11 = pkgs, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-          var _ref17;
-
-          if (_isArray11) {
-            if (_i11 >= _iterator11.length) break;
-            _ref17 = _iterator11[_i11++];
-          } else {
-            _i11 = _iterator11.next();
-            if (_i11.done) break;
-            _ref17 = _i11.value;
-          }
-
-          const pkg = _ref17;
-
-          if (_this6.packageCanBeInstalled(pkg)) {
-            const ref = pkg._reference;
-            invariant(ref, 'expected reference');
-            const beforeFiles = ref.locations.map(function (loc) {
-              return beforeFilesMap.get(loc);
-            });
-            yield Promise.all(beforeFiles.map((() => {
-              var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (b, index) {
-                invariant(b, 'files before installation should always be recorded');
-                yield _this6.saveBuildArtifacts(ref.locations[index], pkg, b, set.spinners[0]);
-              });
-
-              return function (_x4, _x5) {
-                return _ref18.apply(this, arguments);
-              };
-            })()));
-          }
-        }
-      }
-
-      set.end();
-    })();
-  }
-}
-exports.default = PackageInstallScripts;
-
-/***/ }),
-/* 558 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const objectPath = __webpack_require__(304);
-
-const path = __webpack_require__(0);
-
-class BaseRegistry {
-  constructor(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles) {
-    this.reporter = reporter;
-    this.requestManager = requestManager;
-    this.registries = registries;
-    this.config = {};
-    this.folder = '';
-    this.token = '';
-    this.loc = '';
-    this.cwd = cwd;
-    this.enableDefaultRc = enableDefaultRc;
-    this.extraneousRcFiles = extraneousRcFiles;
-  }
-
-  // the filename to use for package metadata
-
-
-  //
-
-
-  //
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  //
-
-
-  // absolute folder name to insert modules
-
-
-  // relative folder name to put these modules
-
-
-  setToken(token) {
-    this.token = token;
-  }
-
-  setOtp(otp) {
-    this.otp = otp;
-  }
-
-  getOption(key) {
-    return this.config[key];
-  }
-
-  getAvailableRegistries() {
-    const config = this.config;
-    return Object.keys(config).reduce((registries, option) => {
-      if (option === 'registry' || option.split(':')[1] === 'registry') {
-        registries.push(config[option]);
-      }
-      return registries;
-    }, []);
-  }
-
-  loadConfig() {
-    return Promise.resolve();
-  }
-
-  checkOutdated(config, name, range) {
-    return Promise.reject(new Error('unimplemented'));
-  }
-
-  saveHomeConfig(config) {
-    return Promise.reject(new Error('unimplemented'));
-  }
-
-  request(pathname, opts = {}) {
-    return this.requestManager.request((0, (_extends2 || _load_extends()).default)({
-      url: pathname
-    }, opts));
-  }
-
-  init(overrides = {}) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      _this.mergeEnv('yarn_');
-      yield _this.loadConfig();
-
-      for (var _iterator = Object.keys(overrides), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref = _i.value;
-        }
-
-        const override = _ref;
-
-        const val = overrides[override];
-
-        if (val !== undefined) {
-          _this.config[override] = val;
-        }
-      }
-      _this.loc = path.join(_this.cwd, _this.folder);
-    })();
-  }
-
-  static normalizeConfig(config) {
-    for (const key in config) {
-      config[key] = BaseRegistry.normalizeConfigOption(config[key]);
-    }
-    return config;
-  }
-
-  static normalizeConfigOption(val) {
-    if (val === 'true') {
-      return true;
-    } else if (val === 'false') {
-      return false;
-    } else {
-      return val;
-    }
-  }
-
-  mergeEnv(prefix) {
-    // try environment variables
-    for (const envKey in process.env) {
-      let key = envKey.toLowerCase();
-
-      // only accept keys prefixed with the prefix
-      if (key.indexOf(prefix.toLowerCase()) !== 0) {
-        continue;
-      }
-
-      const val = BaseRegistry.normalizeConfigOption(process.env[envKey]);
-
-      // remove config prefix
-      key = (0, (_misc || _load_misc()).removePrefix)(key, prefix.toLowerCase());
-
-      // replace dunders with dots
-      key = key.replace(/__/g, '.');
-
-      // replace underscores with dashes ignoring keys that start with an underscore
-      key = key.replace(/([^_])_/g, '$1-');
-
-      // set it via a path
-      objectPath.set(this.config, key, val);
-    }
-  }
-}
-exports.default = BaseRegistry;
-
-/***/ }),
-/* 559 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DEFAULTS = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _npmRegistry;
-
-function _load_npmRegistry() {
-  return _npmRegistry = _interopRequireDefault(__webpack_require__(88));
-}
-
-var _lockfile;
-
-function _load_lockfile() {
-  return _lockfile = __webpack_require__(19);
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-var _yarnVersion;
-
-function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const userHome = __webpack_require__(66).default;
-const path = __webpack_require__(0);
-
-const DEFAULTS = exports.DEFAULTS = {
-  'version-tag-prefix': 'v',
-  'version-git-tag': true,
-  'version-commit-hooks': true,
-  'version-git-sign': false,
-  'version-git-message': 'v%s',
-
-  'init-version': '1.0.0',
-  'init-license': 'MIT',
-
-  'save-prefix': '^',
-  'bin-links': true,
-  'ignore-scripts': false,
-  'ignore-optional': false,
-  registry: (_constants || _load_constants()).YARN_REGISTRY,
-  'strict-ssl': true,
-  'user-agent': [`yarn/${(_yarnVersion || _load_yarnVersion()).version}`, 'npm/?', `node/${process.version}`, process.platform, process.arch].join(' ')
-};
-
-const RELATIVE_KEYS = ['yarn-offline-mirror', 'cache-folder', 'global-folder', 'offline-cache-folder', 'yarn-path'];
-const FOLDER_KEY = ['yarn-offline-mirror', 'cache-folder', 'global-folder', 'offline-cache-folder'];
-
-const npmMap = {
-  'version-git-sign': 'sign-git-tag',
-  'version-tag-prefix': 'tag-version-prefix',
-  'version-git-tag': 'git-tag-version',
-  'version-commit-hooks': 'commit-hooks',
-  'version-git-message': 'message'
-};
-
-class YarnRegistry extends (_npmRegistry || _load_npmRegistry()).default {
-  constructor(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles) {
-    super(cwd, registries, requestManager, reporter, enableDefaultRc, extraneousRcFiles);
-
-    this.homeConfigLoc = path.join(userHome, '.yarnrc');
-    this.homeConfig = {};
-  }
-
-  getOption(key) {
-    let val = this.config[key];
-
-    // if this isn't set in a yarn config, then use npm
-    if (typeof val === 'undefined') {
-      val = this.registries.npm.getOption(npmMap[key]);
-    }
-
-    if (typeof val === 'undefined') {
-      val = this.registries.npm.getOption(key);
-    }
-
-    // if this isn't set in a yarn config or npm config, then use the default (or undefined)
-    if (typeof val === 'undefined') {
-      val = DEFAULTS[key];
-    }
-
-    return val;
-  }
-
-  loadConfig() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const locations = yield _this.getPossibleConfigLocations('yarnrc', _this.reporter);
-
-      for (var _iterator = locations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref2 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref2 = _i.value;
-        }
-
-        const _ref = _ref2;
-        const isHome = _ref[0];
-        const loc = _ref[1];
-        const file = _ref[2];
-
-        var _parse = (0, (_lockfile || _load_lockfile()).parse)(file, loc);
-
-        const config = _parse.object;
-
-
-        if (isHome) {
-          _this.homeConfig = config;
-        }
-
-        for (var _iterator2 = RELATIVE_KEYS, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-          var _ref3;
-
-          if (_isArray2) {
-            if (_i2 >= _iterator2.length) break;
-            _ref3 = _iterator2[_i2++];
-          } else {
-            _i2 = _iterator2.next();
-            if (_i2.done) break;
-            _ref3 = _i2.value;
-          }
-
-          const key = _ref3;
-
-          const valueLoc = config[key];
-
-          if (!_this.config[key] && valueLoc) {
-            const resolvedLoc = config[key] = path.resolve(path.dirname(loc), valueLoc);
-
-            if (FOLDER_KEY.includes(key)) {
-              yield (_fs || _load_fs()).mkdirp(resolvedLoc);
-            }
-          }
-        }
-
-        // merge with any existing environment variables
-        const env = config.env;
-        if (env) {
-          const existingEnv = _this.config.env;
-          if (existingEnv) {
-            _this.config.env = Object.assign({}, env, existingEnv);
-          }
-        }
-
-        _this.config = Object.assign({}, config, _this.config);
-      }
-
-      // default yarn config
-      _this.config = Object.assign({}, DEFAULTS, _this.config);
-    })();
-  }
-
-  saveHomeConfig(config) {
-    var _this2 = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      YarnRegistry.normalizeConfig(config);
-
-      for (const key in config) {
-        const val = config[key];
-
-        // if the current config key was taken from home config then update
-        // the global config
-        if (_this2.homeConfig[key] === _this2.config[key]) {
-          _this2.config[key] = val;
-        }
-
-        // update just the home config
-        _this2.homeConfig[key] = config[key];
-      }
-
-      yield (_fs || _load_fs()).writeFilePreservingEol(_this2.homeConfigLoc, `${(0, (_lockfile || _load_lockfile()).stringify)(_this2.homeConfig)}\n`);
-    })();
-  }
-}
-exports.default = YarnRegistry;
-YarnRegistry.filename = 'yarn.json';
-
-/***/ }),
-/* 560 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _jsonReporter;
-
-function _load_jsonReporter() {
-  return _jsonReporter = _interopRequireDefault(__webpack_require__(213));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class BufferReporter extends (_jsonReporter || _load_jsonReporter()).default {
-  constructor(opts) {
-    super(opts);
-    this._buffer = [];
-  }
-
-  _dump(type, data, error) {
-    this._buffer.push({
-      type,
-      data,
-      error: !!error
-    });
-  }
-
-  getBuffer() {
-    return this._buffer;
-  }
-
-  getBufferText() {
-    return this._buffer.map(({ data }) => typeof data === 'string' ? data : JSON.stringify(data)).join('');
-  }
-
-  getBufferJson() {
-    return JSON.parse(this.getBufferText());
-  }
-}
-exports.default = BufferReporter;
-
-/***/ }),
-/* 561 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _baseReporter;
-
-function _load_baseReporter() {
-  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
-}
-
-var _progressBar;
-
-function _load_progressBar() {
-  return _progressBar = _interopRequireDefault(__webpack_require__(563));
-}
-
-var _spinnerProgress;
-
-function _load_spinnerProgress() {
-  return _spinnerProgress = _interopRequireDefault(__webpack_require__(564));
-}
-
-var _util;
-
-function _load_util() {
-  return _util = __webpack_require__(212);
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-var _treeHelper;
-
-function _load_treeHelper() {
-  return _treeHelper = __webpack_require__(562);
-}
-
-var _inquirer;
-
-function _load_inquirer() {
-  return _inquirer = _interopRequireDefault(__webpack_require__(276));
-}
-
-var _cliTable;
-
-function _load_cliTable() {
-  return _cliTable = _interopRequireDefault(__webpack_require__(602));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _require = __webpack_require__(3);
-
-const inspect = _require.inspect;
-
-const readline = __webpack_require__(197);
-const chalk = __webpack_require__(30);
-const stripAnsi = __webpack_require__(329);
-const read = __webpack_require__(790);
-const tty = __webpack_require__(104);
-
-const AUDIT_COL_WIDTHS = [15, 62];
-
-const auditSeverityColors = {
-  info: chalk.bold,
-  low: chalk.bold,
-  moderate: chalk.yellow,
-  high: chalk.red,
-  critical: chalk.bgRed
-};
-
-// fixes bold on windows
-if (process.platform === 'win32' && !(process.env.TERM && /^xterm/i.test(process.env.TERM))) {
-  chalk.bold._styles[0].close += '\u001b[m';
-}
-
-class ConsoleReporter extends (_baseReporter || _load_baseReporter()).default {
-  constructor(opts) {
-    super(opts);
-
-    this._lastCategorySize = 0;
-    this._spinners = new Set();
-    this.format = chalk;
-    this.format.stripColor = stripAnsi;
-    this.isSilent = !!opts.isSilent;
-  }
-
-  _prependEmoji(msg, emoji) {
-    if (this.emoji && emoji && this.isTTY) {
-      msg = `${emoji}  ${msg}`;
-    }
-    return msg;
-  }
-
-  _logCategory(category, color, msg) {
-    this._lastCategorySize = category.length;
-    this._log(`${this.format[color](category)} ${msg}`);
-  }
-
-  _verbose(msg) {
-    this._logCategory('verbose', 'grey', `${process.uptime()} ${msg}`);
-  }
-
-  _verboseInspect(obj) {
-    this.inspect(obj);
-  }
-
-  close() {
-    for (var _iterator = this._spinners, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const spinner = _ref;
-
-      spinner.stop();
-    }
-    this._spinners.clear();
-    this.stopProgress();
-    super.close();
-  }
-
-  table(head, body) {
-    //
-    head = head.map(field => this.format.underline(field));
-
-    //
-    const rows = [head].concat(body);
-
-    // get column widths
-    const cols = [];
-    for (let i = 0; i < head.length; i++) {
-      const widths = rows.map(row => this.format.stripColor(row[i]).length);
-      cols[i] = Math.max(...widths);
-    }
-
-    //
-    const builtRows = rows.map(row => {
-      for (let i = 0; i < row.length; i++) {
-        const field = row[i];
-        const padding = cols[i] - this.format.stripColor(field).length;
-
-        row[i] = field + ' '.repeat(padding);
-      }
-      return row.join(' ');
-    });
-
-    this.log(builtRows.join('\n'));
-  }
-
-  step(current, total, msg, emoji) {
-    msg = this._prependEmoji(msg, emoji);
-
-    if (msg.endsWith('?')) {
-      msg = `${(0, (_misc || _load_misc()).removeSuffix)(msg, '?')}...?`;
-    } else {
-      msg += '...';
-    }
-
-    this.log(`${this.format.dim(`[${current}/${total}]`)} ${msg}`);
-  }
-
-  inspect(value) {
-    if (typeof value !== 'number' && typeof value !== 'string') {
-      value = inspect(value, {
-        breakLength: 0,
-        colors: this.isTTY,
-        depth: null,
-        maxArrayLength: null
-      });
-    }
-
-    this.log(String(value), { force: true });
-  }
-
-  list(key, items, hints) {
-    const gutterWidth = (this._lastCategorySize || 2) - 1;
-
-    if (hints) {
-      for (var _iterator2 = items, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref2 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref2 = _i2.value;
-        }
-
-        const item = _ref2;
-
-        this._log(`${' '.repeat(gutterWidth)}- ${this.format.bold(item)}`);
-        this._log(`  ${' '.repeat(gutterWidth)} ${hints[item]}`);
-      }
-    } else {
-      for (var _iterator3 = items, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray3) {
-          if (_i3 >= _iterator3.length) break;
-          _ref3 = _iterator3[_i3++];
-        } else {
-          _i3 = _iterator3.next();
-          if (_i3.done) break;
-          _ref3 = _i3.value;
-        }
-
-        const item = _ref3;
-
-        this._log(`${' '.repeat(gutterWidth)}- ${item}`);
-      }
-    }
-  }
-
-  header(command, pkg) {
-    this.log(this.format.bold(`${pkg.name} ${command} v${pkg.version}`));
-  }
-
-  footer(showPeakMemory) {
-    this.stopProgress();
-
-    const totalTime = (this.getTotalTime() / 1000).toFixed(2);
-    let msg = `Done in ${totalTime}s.`;
-    if (showPeakMemory) {
-      const peakMemory = (this.peakMemory / 1024 / 1024).toFixed(2);
-      msg += ` Peak memory usage ${peakMemory}MB.`;
-    }
-    this.log(this._prependEmoji(msg, '✨'));
-  }
-
-  log(msg, { force = false } = {}) {
-    this._lastCategorySize = 0;
-    this._log(msg, { force });
-  }
-
-  _log(msg, { force = false } = {}) {
-    if (this.isSilent && !force) {
-      return;
-    }
-    (0, (_util || _load_util()).clearLine)(this.stdout);
-    this.stdout.write(`${msg}\n`);
-  }
-
-  success(msg) {
-    this._logCategory('success', 'green', msg);
-  }
-
-  error(msg) {
-    (0, (_util || _load_util()).clearLine)(this.stderr);
-    this.stderr.write(`${this.format.red('error')} ${msg}\n`);
-  }
-
-  info(msg) {
-    this._logCategory('info', 'blue', msg);
-  }
-
-  command(command) {
-    this.log(this.format.dim(`$ ${command}`));
-  }
-
-  warn(msg) {
-    (0, (_util || _load_util()).clearLine)(this.stderr);
-    this.stderr.write(`${this.format.yellow('warning')} ${msg}\n`);
-  }
-
-  question(question, options = {}) {
-    if (!process.stdout.isTTY) {
-      return Promise.reject(new Error("Can't answer a question unless a user TTY"));
-    }
-
-    return new Promise((resolve, reject) => {
-      read({
-        prompt: `${this.format.dim('question')} ${question}: `,
-        silent: !!options.password,
-        output: this.stdout,
-        input: this.stdin
-      }, (err, answer) => {
-        if (err) {
-          if (err.message === 'canceled') {
-            process.exitCode = 1;
-          }
-          reject(err);
-        } else {
-          if (!answer && options.required) {
-            this.error(this.lang('answerRequired'));
-            resolve(this.question(question, options));
-          } else {
-            resolve(answer);
-          }
-        }
-      });
-    });
-  }
-  // handles basic tree output to console
-  tree(key, trees, { force = false } = {}) {
-    this.stopProgress();
-    //
-    if (this.isSilent && !force) {
-      return;
-    }
-    const output = ({ name, children, hint, color }, titlePrefix, childrenPrefix) => {
-      const formatter = this.format;
-      const out = (0, (_treeHelper || _load_treeHelper()).getFormattedOutput)({
-        prefix: titlePrefix,
-        hint,
-        color,
-        name,
-        formatter
-      });
-      this.stdout.write(out);
-
-      if (children && children.length) {
-        (0, (_treeHelper || _load_treeHelper()).recurseTree)((0, (_treeHelper || _load_treeHelper()).sortTrees)(children), childrenPrefix, output);
-      }
-    };
-    (0, (_treeHelper || _load_treeHelper()).recurseTree)((0, (_treeHelper || _load_treeHelper()).sortTrees)(trees), '', output);
-  }
-
-  activitySet(total, workers) {
-    if (!this.isTTY || this.noProgress) {
-      return super.activitySet(total, workers);
-    }
-
-    const spinners = [];
-    const reporterSpinners = this._spinners;
-
-    for (let i = 1; i < workers; i++) {
-      this.log('');
-    }
-
-    for (let i = 0; i < workers; i++) {
-      const spinner = new (_spinnerProgress || _load_spinnerProgress()).default(this.stderr, i);
-      reporterSpinners.add(spinner);
-      spinner.start();
-
-      let prefix = null;
-      let current = 0;
-      const updatePrefix = () => {
-        spinner.setPrefix(`${this.format.dim(`[${current === 0 ? '-' : current}/${total}]`)} `);
-      };
-      const clear = () => {
-        prefix = null;
-        current = 0;
-        updatePrefix();
-        spinner.setText('waiting...');
-      };
-      clear();
-
-      spinners.unshift({
-        clear,
-
-        setPrefix(_current, _prefix) {
-          current = _current;
-          prefix = _prefix;
-          spinner.setText(prefix);
-          updatePrefix();
-        },
-
-        tick(msg) {
-          if (prefix) {
-            msg = `${prefix}: ${msg}`;
-          }
-          spinner.setText(msg);
-        },
-
-        end() {
-          spinner.stop();
-          reporterSpinners.delete(spinner);
-        }
-      });
-    }
-
-    return {
-      spinners,
-      end: () => {
-        for (var _iterator4 = spinners, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-          var _ref4;
-
-          if (_isArray4) {
-            if (_i4 >= _iterator4.length) break;
-            _ref4 = _iterator4[_i4++];
-          } else {
-            _i4 = _iterator4.next();
-            if (_i4.done) break;
-            _ref4 = _i4.value;
-          }
-
-          const spinner = _ref4;
-
-          spinner.end();
-        }
-        readline.moveCursor(this.stdout, 0, -workers + 1);
-      }
-    };
-  }
-
-  activity() {
-    if (!this.isTTY) {
-      return {
-        tick() {},
-        end() {}
-      };
-    }
-    const reporterSpinners = this._spinners;
-
-    const spinner = new (_spinnerProgress || _load_spinnerProgress()).default(this.stderr);
-    spinner.start();
-
-    reporterSpinners.add(spinner);
-
-    return {
-      tick(name) {
-        spinner.setText(name);
-      },
-
-      end() {
-        spinner.stop();
-        reporterSpinners.delete(spinner);
-      }
-    };
-  }
-
-  select(header, question, options) {
-    if (!this.isTTY) {
-      return Promise.reject(new Error("Can't answer a question unless a user TTY"));
-    }
-
-    const rl = readline.createInterface({
-      input: this.stdin,
-      output: this.stdout,
-      terminal: true
-    });
-
-    const questions = options.map(opt => opt.name);
-    const answers = options.map(opt => opt.value);
-
-    function toIndex(input) {
-      const index = answers.indexOf(input);
-
-      if (index >= 0) {
-        return index;
-      } else {
-        return +input;
-      }
-    }
-
-    return new Promise(resolve => {
-      this.info(header);
-
-      for (let i = 0; i < questions.length; i++) {
-        this.log(`  ${this.format.dim(`${i + 1})`)} ${questions[i]}`);
-      }
-
-      const ask = () => {
-        rl.question(`${question}: `, input => {
-          let index = toIndex(input);
-
-          if (isNaN(index)) {
-            this.log('Not a number');
-            ask();
-            return;
-          }
-
-          if (index <= 0 || index > options.length) {
-            this.log('Outside answer range');
-            ask();
-            return;
-          }
-
-          // get index
-          index--;
-          rl.close();
-          resolve(answers[index]);
-        });
-      };
-
-      ask();
-    });
-  }
-
-  progress(count) {
-    if (this.noProgress || count <= 0) {
-      return function () {
-        // noop
-      };
-    }
-
-    if (!this.isTTY) {
-      return function () {
-        // TODO what should the behaviour here be? we could buffer progress messages maybe
-      };
-    }
-
-    // Clear any potentially old progress bars
-    this.stopProgress();
-
-    const bar = this._progressBar = new (_progressBar || _load_progressBar()).default(count, this.stderr, progress => {
-      if (progress === this._progressBar) {
-        this._progressBar = null;
-      }
-    });
-
-    bar.render();
-
-    return function () {
-      bar.tick();
-    };
-  }
-
-  stopProgress() {
-    if (this._progressBar) {
-      this._progressBar.stop();
-    }
-  }
-
-  prompt(message, choices, options = {}) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      if (!process.stdout.isTTY) {
-        return Promise.reject(new Error("Can't answer a question unless a user TTY"));
-      }
-
-      let pageSize;
-      if (process.stdout instanceof tty.WriteStream) {
-        pageSize = process.stdout.rows - 2;
-      }
-
-      const rl = readline.createInterface({
-        input: _this.stdin,
-        output: _this.stdout,
-        terminal: true
-      });
-
-      // $FlowFixMe: Need to update the type of Inquirer
-      const prompt = (_inquirer || _load_inquirer()).default.createPromptModule({
-        input: _this.stdin,
-        output: _this.stdout
-      });
-
-      var _options$name = options.name;
-      const name = _options$name === undefined ? 'prompt' : _options$name;
-      var _options$type = options.type;
-      const type = _options$type === undefined ? 'input' : _options$type,
-            validate = options.validate;
-
-      const answers = yield prompt([{ name, type, message, choices, pageSize, validate }]);
-
-      rl.close();
-
-      return answers[name];
-    })();
-  }
-
-  auditSummary(auditMetadata) {
-    const totalDependencies = auditMetadata.totalDependencies,
-          vulnerabilities = auditMetadata.vulnerabilities;
-
-    const totalVulnerabilities = vulnerabilities.info + vulnerabilities.low + vulnerabilities.moderate + vulnerabilities.high + vulnerabilities.critical;
-    const summary = this.lang('auditSummary', totalVulnerabilities > 0 ? this.rawText(chalk.red(totalVulnerabilities.toString())) : totalVulnerabilities, totalDependencies);
-    this._log(summary);
-
-    if (totalVulnerabilities) {
-      const severities = [];
-      if (vulnerabilities.info) {
-        severities.push(this.lang('auditInfo', vulnerabilities.info));
-      }
-      if (vulnerabilities.low) {
-        severities.push(this.lang('auditLow', vulnerabilities.low));
-      }
-      if (vulnerabilities.moderate) {
-        severities.push(this.lang('auditModerate', vulnerabilities.moderate));
-      }
-      if (vulnerabilities.high) {
-        severities.push(this.lang('auditHigh', vulnerabilities.high));
-      }
-      if (vulnerabilities.critical) {
-        severities.push(this.lang('auditCritical', vulnerabilities.critical));
-      }
-      this._log(`${this.lang('auditSummarySeverity')} ${severities.join(' | ')}`);
-    }
-  }
-
-  auditAction(recommendation) {
-    const label = recommendation.action.resolves.length === 1 ? 'vulnerability' : 'vulnerabilities';
-    this._log(this.lang('auditResolveCommand', this.rawText(chalk.inverse(recommendation.cmd)), recommendation.action.resolves.length, this.rawText(label)));
-    if (recommendation.isBreaking) {
-      this._log(this.lang('auditSemverMajorChange'));
-    }
-  }
-
-  auditManualReview() {
-    const tableOptions = {
-      colWidths: [78]
-    };
-    const table = new (_cliTable || _load_cliTable()).default(tableOptions);
-    table.push([{
-      content: this.lang('auditManualReview'),
-      vAlign: 'center',
-      hAlign: 'center'
-    }]);
-
-    this._log(table.toString());
-  }
-
-  auditAdvisory(resolution, auditAdvisory) {
-    function colorSeverity(severity, message) {
-      return auditSeverityColors[severity](message || severity);
-    }
-
-    function makeAdvisoryTableRow(patchedIn) {
-      const patchRows = [];
-
-      if (patchedIn) {
-        patchRows.push({ 'Patched in': patchedIn });
-      }
-
-      return [{ [chalk.bold(colorSeverity(auditAdvisory.severity))]: chalk.bold(auditAdvisory.title) }, { Package: auditAdvisory.module_name }, ...patchRows, { 'Dependency of': `${resolution.path.split('>')[0]} ${resolution.dev ? '[dev]' : ''}` }, { Path: resolution.path.split('>').join(' > ') }, { 'More info': `https://www.npmjs.com/advisories/${auditAdvisory.id}` }];
-    }
-
-    const tableOptions = {
-      colWidths: AUDIT_COL_WIDTHS,
-      wordWrap: true
-    };
-    const table = new (_cliTable || _load_cliTable()).default(tableOptions);
-    const patchedIn = auditAdvisory.patched_versions.replace(' ', '') === '<0.0.0' ? 'No patch available' : auditAdvisory.patched_versions;
-    table.push(...makeAdvisoryTableRow(patchedIn));
-    this._log(table.toString());
-  }
-}
-exports.default = ConsoleReporter;
-
-/***/ }),
-/* 562 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortTrees = sortTrees;
-exports.recurseTree = recurseTree;
-exports.getFormattedOutput = getFormattedOutput;
-
-
-// public
-
-
-// types
-function sortTrees(trees) {
-  return trees.sort(function (tree1, tree2) {
-    return tree1.name.localeCompare(tree2.name);
-  });
-}
-
-function recurseTree(tree, prefix, recurseFunc) {
-  const treeLen = tree.length;
-  const treeEnd = treeLen - 1;
-  for (let i = 0; i < treeLen; i++) {
-    const atEnd = i === treeEnd;
-    recurseFunc(tree[i], prefix + getLastIndentChar(atEnd), prefix + getNextIndentChar(atEnd));
-  }
-}
-
-function getFormattedOutput(fmt) {
-  const item = formatColor(fmt.color, fmt.name, fmt.formatter);
-  const suffix = getSuffix(fmt.hint, fmt.formatter);
-  return `${fmt.prefix}─ ${item}${suffix}\n`;
-}
-
-function getNextIndentChar(end) {
-  return end ? '   ' : '│  ';
-}
-
-function getLastIndentChar(end) {
-  return end ? '└' : '├';
-}
-
-function getSuffix(hint, formatter) {
-  return hint ? ` (${formatter.grey(hint)})` : '';
-}
-
-function formatColor(color, strToFormat, formatter) {
-  return color ? formatter[color](strToFormat) : strToFormat;
-}
-
-/***/ }),
-/* 563 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _util;
-
-function _load_util() {
-  return _util = __webpack_require__(212);
-}
-
-class ProgressBar {
-  constructor(total, stdout = process.stderr, callback) {
-    this.stdout = stdout;
-    this.total = total;
-    this.chars = ProgressBar.bars[0];
-    this.delay = 60;
-    this.curr = 0;
-    this._callback = callback;
-    (0, (_util || _load_util()).clearLine)(stdout);
-  }
-
-  tick() {
-    if (this.curr >= this.total) {
-      return;
-    }
-
-    this.curr++;
-
-    // schedule render
-    if (!this.id) {
-      this.id = setTimeout(() => this.render(), this.delay);
-    }
-  }
-
-  cancelTick() {
-    if (this.id) {
-      clearTimeout(this.id);
-      this.id = null;
-    }
-  }
-
-  stop() {
-    // "stop" by setting current to end so `tick` becomes noop
-    this.curr = this.total;
-
-    this.cancelTick();
-    (0, (_util || _load_util()).clearLine)(this.stdout);
-    if (this._callback) {
-      this._callback(this);
-    }
-  }
-
-  render() {
-    // clear throttle
-    this.cancelTick();
-
-    let ratio = this.curr / this.total;
-    ratio = Math.min(Math.max(ratio, 0), 1);
-
-    // progress without bar
-    let bar = ` ${this.curr}/${this.total}`;
-
-    // calculate size of actual bar
-    // $FlowFixMe: investigate process.stderr.columns flow error
-    const availableSpace = Math.max(0, this.stdout.columns - bar.length - 3);
-    const width = Math.min(this.total, availableSpace);
-    const completeLength = Math.round(width * ratio);
-    const complete = this.chars[0].repeat(completeLength);
-    const incomplete = this.chars[1].repeat(width - completeLength);
-    bar = `[${complete}${incomplete}]${bar}`;
-
-    (0, (_util || _load_util()).toStartOfLine)(this.stdout);
-    this.stdout.write(bar);
-  }
-}
-exports.default = ProgressBar;
-ProgressBar.bars = [['#', '-']];
-
-/***/ }),
-/* 564 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _util;
-
-function _load_util() {
-  return _util = __webpack_require__(212);
-}
-
-class Spinner {
-  constructor(stdout = process.stderr, lineNumber = 0) {
-    this.current = 0;
-    this.prefix = '';
-    this.lineNumber = lineNumber;
-    this.stdout = stdout;
-    this.delay = 60;
-    this.chars = Spinner.spinners[28].split('');
-    this.text = '';
-    this.id = null;
-  }
-
-  setPrefix(prefix) {
-    this.prefix = prefix;
-  }
-  setText(text) {
-    this.text = text;
-  }
-  start() {
-    this.current = 0;
-    this.render();
-  }
-  render() {
-    if (this.id) {
-      clearTimeout(this.id);
-    }
-    // build line ensuring we don't wrap to the next line
-    let msg = `${this.prefix}${this.chars[this.current]} ${this.text}`;
-    const columns = typeof this.stdout.columns === 'number' ? this.stdout.columns : 100;
-    msg = msg.slice(0, columns);
-    (0, (_util || _load_util()).writeOnNthLine)(this.stdout, this.lineNumber, msg);
-    this.current = ++this.current % this.chars.length;
-    this.id = setTimeout(() => this.render(), this.delay);
-  }
-  stop() {
-    if (this.id) {
-      clearTimeout(this.id);
-      this.id = null;
-    }
-    (0, (_util || _load_util()).clearNthLine)(this.stdout, this.lineNumber);
-  }
-}
-exports.default = Spinner;
-Spinner.spinners = ['|/-\\', '⠂-–—–-', '◐◓◑◒', '◴◷◶◵', '◰◳◲◱', '▖▘▝▗', '■□▪▫', '▌▀▐▄', '▉▊▋▌▍▎▏▎▍▌▋▊▉', '▁▃▄▅▆▇█▇▆▅▄▃', '←↖↑↗→↘↓↙', '┤┘┴└├┌┬┐', '◢◣◤◥', '.oO°Oo.', '.oO@*', '🌍🌎🌏', '◡◡ ⊙⊙ ◠◠', '☱☲☴', '⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏', '⠋⠙⠚⠞⠖⠦⠴⠲⠳⠓', '⠄⠆⠇⠋⠙⠸⠰⠠⠰⠸⠙⠋⠇⠆', '⠋⠙⠚⠒⠂⠂⠒⠲⠴⠦⠖⠒⠐⠐⠒⠓⠋', '⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁', '⠈⠉⠋⠓⠒⠐⠐⠒⠖⠦⠤⠠⠠⠤⠦⠖⠒⠐⠐⠒⠓⠋⠉⠈', '⠁⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⠠⠠⠤⠦⠖⠒⠐⠐⠒⠓⠋⠉⠈⠈', '⢄⢂⢁⡁⡈⡐⡠', '⢹⢺⢼⣸⣇⡧⡗⡏', '⣾⣽⣻⢿⡿⣟⣯⣷', '⠁⠂⠄⡀⢀⠠⠐⠈'];
-
-/***/ }),
-/* 565 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _jsonReporter;
-
-function _load_jsonReporter() {
-  return _jsonReporter = _interopRequireDefault(__webpack_require__(213));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _require = __webpack_require__(76);
-
-const EventEmitter = _require.EventEmitter;
-class EventReporter extends (_jsonReporter || _load_jsonReporter()).default {
-
-  constructor(opts) {
-    super(opts);
-
-    // $FlowFixMe: looks like a flow bug
-    EventEmitter.call(this);
-  }
-
-  _dump(type, data) {
-    this.emit(type, data);
-  }
-}
-
-exports.default = EventReporter;
-Object.assign(EventReporter.prototype, EventEmitter.prototype);
-
-/***/ }),
-/* 566 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function formatFunction(...strs) {
-  return strs.join(' ');
-}
-
-const defaultFormatter = exports.defaultFormatter = {
-  bold: formatFunction,
-  dim: formatFunction,
-  italic: formatFunction,
-  underline: formatFunction,
-  inverse: formatFunction,
-  strikethrough: formatFunction,
-  black: formatFunction,
-  red: formatFunction,
-  green: formatFunction,
-  yellow: formatFunction,
-  blue: formatFunction,
-  magenta: formatFunction,
-  cyan: formatFunction,
-  white: formatFunction,
-  gray: formatFunction,
-  grey: formatFunction,
-  stripColor: formatFunction
-};
-
-/***/ }),
-/* 567 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-/* eslint max-len: 0 */
-
-const messages = {
-  upToDate: 'Already up-to-date.',
-  folderInSync: 'Folder in sync.',
-  nothingToInstall: 'Nothing to install.',
-  resolvingPackages: 'Resolving packages',
-  checkingManifest: 'Validating package.json',
-  fetchingPackages: 'Fetching packages',
-  linkingDependencies: 'Linking dependencies',
-  rebuildingPackages: 'Rebuilding all packages',
-  buildingFreshPackages: 'Building fresh packages',
-  cleaningModules: 'Cleaning modules',
-  bumpingVersion: 'Bumping version',
-  savingHar: 'Saving HAR file: $0',
-  answer: 'Answer?',
-  usage: 'Usage',
-  installCommandRenamed: '`install` has been replaced with `add` to add new dependencies. Run $0 instead.',
-  globalFlagRemoved: '`--global` has been deprecated. Please run $0 instead.',
-  waitingInstance: 'Waiting for the other yarn instance to finish (pid $0, inside $1)',
-  waitingNamedInstance: 'Waiting for the other yarn instance to finish ($0)',
-  offlineRetrying: 'There appears to be trouble with your network connection. Retrying...',
-  internalServerErrorRetrying: 'There appears to be trouble with the npm registry (returned $1). Retrying...',
-  clearedCache: 'Cleared cache.',
-  couldntClearPackageFromCache: "Couldn't clear package $0 from cache",
-  clearedPackageFromCache: 'Cleared package $0 from cache',
-  packWroteTarball: 'Wrote tarball to $0.',
-
-  helpExamples: '  Examples:\n$0\n',
-  helpCommands: '  Commands:\n$0\n',
-  helpCommandsMore: '  Run `$0` for more information on specific commands.',
-  helpLearnMore: '  Visit $0 to learn more about Yarn.\n',
-
-  manifestPotentialTypo: 'Potential typo $0, did you mean $1?',
-  manifestBuiltinModule: '$0 is also the name of a node core module',
-  manifestNameDot: "Name can't start with a dot",
-  manifestNameIllegalChars: 'Name contains illegal characters',
-  manifestNameBlacklisted: 'Name is blacklisted',
-  manifestLicenseInvalid: 'License should be a valid SPDX license expression',
-  manifestLicenseNone: 'No license field',
-  manifestStringExpected: '$0 is not a string',
-  manifestDependencyCollision: '$0 has dependency $1 with range $2 that collides with a dependency in $3 of the same name with version $4',
-  manifestDirectoryNotFound: 'Unable to read $0 directory of module $1',
-
-  verboseFileCopy: 'Copying $0 to $1.',
-  verboseFileLink: 'Creating hardlink at $0 to $1.',
-  verboseFileSymlink: 'Creating symlink at $0 to $1.',
-  verboseFileSkip: 'Skipping copying of file $0 as the file at $1 is the same size ($2) and mtime ($3).',
-  verboseFileSkipSymlink: 'Skipping copying of $0 as the file at $1 is the same symlink ($2).',
-  verboseFileSkipHardlink: 'Skipping copying of $0 as the file at $1 is the same hardlink ($2).',
-  verboseFileRemoveExtraneous: 'Removing extraneous file $0.',
-  verboseFilePhantomExtraneous: "File $0 would be marked as extraneous but has been removed as it's listed as a phantom file.",
-  verboseFileSkipArtifact: 'Skipping copying of $0 as the file is marked as a built artifact and subject to change.',
-  verboseFileFolder: 'Creating directory $0.',
-
-  verboseRequestStart: 'Performing $0 request to $1.',
-  verboseRequestFinish: 'Request $0 finished with status code $1.',
-
-  configSet: 'Set $0 to $1.',
-  configDelete: 'Deleted $0.',
-  configNpm: 'npm config',
-  configYarn: 'yarn config',
-
-  couldntFindPackagejson: "Couldn't find a package.json file in $0",
-  couldntFindMatch: "Couldn't find match for $0 in $1 for $2.",
-  couldntFindPackageInCache: "Couldn't find any versions for $0 that matches $1 in our cache (possible versions are $2). This is usually caused by a missing entry in the lockfile, running Yarn without the --offline flag may help fix this issue.",
-  couldntFindVersionThatMatchesRange: "Couldn't find any versions for $0 that matches $1",
-  chooseVersionFromList: 'Please choose a version of $0 from this list:',
-  moduleNotInManifest: "This module isn't specified in a package.json file.",
-  moduleAlreadyInManifest: '$0 is already in $1. Please remove existing entry first before adding it to $2.',
-  unknownFolderOrTarball: "Passed folder/tarball doesn't exist,",
-  unknownPackage: "Couldn't find package $0.",
-  unknownPackageName: "Couldn't find package name.",
-  unknownUser: "Couldn't find user $0.",
-  unknownRegistryResolver: 'Unknown registry resolver $0',
-  userNotAnOwner: "User $0 isn't an owner of this package.",
-  invalidVersionArgument: 'Use the $0 flag to create a new version.',
-  invalidVersion: 'Invalid version supplied.',
-  requiredVersionInRange: 'Required version in range.',
-  packageNotFoundRegistry: "Couldn't find package $0 on the $1 registry.",
-  requiredPackageNotFoundRegistry: "Couldn't find package $0 required by $1 on the $2 registry.",
-  doesntExist: "Package $1 refers to a non-existing file '$0'.",
-  missingRequiredPackageKey: `Package $0 doesn't have a $1.`,
-  invalidAccess: 'Invalid argument for access, expected public or restricted.',
-  invalidCommand: 'Invalid subcommand. Try $0',
-  invalidGistFragment: 'Invalid gist fragment $0.',
-  invalidHostedGitFragment: 'Invalid hosted git fragment $0.',
-  invalidFragment: 'Invalid fragment $0.',
-  invalidPackageName: 'Invalid package name.',
-  invalidPackageVersion: "Can't add $0: invalid package version $1.",
-  couldntFindManifestIn: "Couldn't find manifest in $0.",
-  shrinkwrapWarning: 'npm-shrinkwrap.json found. This will not be updated or respected. See https://yarnpkg.com/en/docs/migrating-from-npm for more information.',
-  npmLockfileWarning: 'package-lock.json found. Your project contains lock files generated by tools other than Yarn. It is advised not to mix package managers in order to avoid resolution inconsistencies caused by unsynchronized lock files. To clear this warning, remove package-lock.json.',
-  lockfileOutdated: 'Outdated lockfile. Please run `yarn install` and try again.',
-  lockfileMerged: 'Merge conflict detected in yarn.lock and successfully merged.',
-  lockfileConflict: 'A merge conflict was found in yarn.lock but it could not be successfully merged, regenerating yarn.lock from scratch.',
-  ignoredScripts: 'Ignored scripts due to flag.',
-  missingAddDependencies: 'Missing list of packages to add to your project.',
-  yesWarning: 'The yes flag has been set. This will automatically answer yes to all questions, which may have security implications.',
-  networkWarning: "You don't appear to have an internet connection. Try the --offline flag to use the cache for registry queries.",
-  flatGlobalError: 'The package $0 requires a flat dependency graph. Add `"flat": true` to your package.json and try again.',
-  noName: `Package doesn't have a name.`,
-  noVersion: `Package doesn't have a version.`,
-  answerRequired: 'An answer is required.',
-  missingWhyDependency: 'Missing package name, folder or path to file to identify why a package has been installed',
-  bugReport: 'If you think this is a bug, please open a bug report with the information provided in $0.',
-  unexpectedError: 'An unexpected error occurred: $0.',
-  jsonError: 'Error parsing JSON at $0, $1.',
-  noPermission: 'Cannot create $0 due to insufficient permissions.',
-  noGlobalFolder: 'Cannot find a suitable global folder. Tried these: $0',
-  allDependenciesUpToDate: 'All of your dependencies are up to date.',
-  legendColorsForVersionUpdates: 'Color legend : \n $0    : Major Update backward-incompatible updates \n $1 : Minor Update backward-compatible features \n $2  : Patch Update backward-compatible bug fixes',
-  frozenLockfileError: 'Your lockfile needs to be updated, but yarn was run with `--frozen-lockfile`.',
-  fileWriteError: 'Could not write file $0: $1',
-  multiplePackagesCantUnpackInSameDestination: 'Pattern $0 is trying to unpack in the same destination $1 as pattern $2. This could result in non-deterministic behavior, skipping.',
-  incorrectLockfileEntry: 'Lockfile has incorrect entry for $0. Ignoring it.',
-
-  invalidResolutionName: 'Resolution field $0 does not end with a valid package name and will be ignored',
-  invalidResolutionVersion: 'Resolution field $0 has an invalid version entry and may be ignored',
-  incompatibleResolutionVersion: 'Resolution field $0 is incompatible with requested version $1',
-
-  yarnOutdated: "Your current version of Yarn is out of date. The latest version is $0, while you're on $1.",
-  yarnOutdatedInstaller: 'To upgrade, download the latest installer at $0.',
-  yarnOutdatedCommand: 'To upgrade, run the following command:',
-
-  tooManyArguments: 'Too many arguments, maximum of $0.',
-  tooFewArguments: 'Not enough arguments, expected at least $0.',
-  noArguments: "This command doesn't require any arguments.",
-
-  ownerRemoving: 'Removing owner $0 from package $1.',
-  ownerRemoved: 'Owner removed.',
-  ownerRemoveError: "Couldn't remove owner.",
-  ownerGetting: 'Getting owners for package $0',
-  ownerGettingFailed: "Couldn't get list of owners.",
-  ownerAlready: 'This user is already an owner of this package.',
-  ownerAdded: 'Added owner.',
-  ownerAdding: 'Adding owner $0 to package $1',
-  ownerAddingFailed: "Couldn't add owner.",
-  ownerNone: 'No owners.',
-
-  teamCreating: 'Creating team',
-  teamRemoving: 'Removing team',
-  teamAddingUser: 'Adding user to team',
-  teamRemovingUser: 'Removing user from team',
-  teamListing: 'Listing teams',
-
-  cleaning: 'Cleaning modules',
-  cleanCreatingFile: 'Creating $0',
-  cleanCreatedFile: 'Created $0. Please review the contents of this file then run "yarn autoclean --force" to perform a clean.',
-  cleanAlreadyExists: '$0 already exists. To revert to the default file, delete $0 then rerun this command.',
-  cleanRequiresForce: 'This command required the "--force" flag to perform the clean. This is a destructive operation. Files specified in $0 will be deleted.',
-  cleanDoesNotExist: '$0 does not exist. Autoclean will delete files specified by $0. Run "autoclean --init" to create $0 with the default entries.',
-
-  binLinkCollision: "There's already a linked binary called $0 in your global Yarn bin. Could not link this package's $0 bin entry.",
-  linkCollision: "There's already a package called $0 registered. This command has had no effect. If this command was run in another folder with the same name, the other folder is still linked. Please run yarn unlink in the other folder if you want to register this folder.",
-  linkMissing: 'No registered package found called $0.',
-  linkRegistered: 'Registered $0.',
-  linkRegisteredMessage: 'You can now run `yarn link $0` in the projects where you want to use this package and it will be used instead.',
-  linkUnregistered: 'Unregistered $0.',
-  linkUnregisteredMessage: 'You can now run `yarn unlink $0` in the projects where you no longer want to use this package.',
-  linkUsing: 'Using linked package for $0.',
-  linkDisusing: 'Removed linked package $0.',
-  linkDisusingMessage: 'You will need to run `yarn install --force` to re-install the package that was linked.',
-  linkTargetMissing: 'The target of linked package $0 is missing. Removing link.',
-
-  createInvalidBin: 'Invalid bin entry found in package $0.',
-  createMissingPackage: 'Package not found - this is probably an internal error, and should be reported at https://github.com/yarnpkg/yarn/issues.',
-
-  workspacesAddRootCheck: 'Running this command will add the dependency to the workspace root rather than the workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).',
-  workspacesRemoveRootCheck: 'Running this command will remove the dependency from the workspace root rather than the workspace itself, which might not be what you want - if you really meant it, make it explicit by running this command again with the -W flag (or --ignore-workspace-root-check).',
-  workspacesFocusRootCheck: 'This command can only be run inside an individual workspace.',
-  workspacesRequirePrivateProjects: 'Workspaces can only be enabled in private projects.',
-  workspacesSettingMustBeArray: 'The workspaces field in package.json must be an array.',
-  workspacesDisabled: 'Your project root defines workspaces but the feature is disabled in your Yarn config. Please check "workspaces-experimental" in your .yarnrc file.',
-
-  workspacesNohoistRequirePrivatePackages: 'nohoist config is ignored in $0 because it is not a private package. If you think nohoist should be allowed in public packages, please submit an issue for your use case.',
-  workspacesNohoistDisabled: `$0 defines nohoist but the feature is disabled in your Yarn config ("workspaces-nohoist-experimental" in .yarnrc file)`,
-
-  workspaceRootNotFound: "Cannot find the root of your workspace - are you sure you're currently in a workspace?",
-  workspaceMissingWorkspace: 'Missing workspace name.',
-  workspaceMissingCommand: 'Missing command name.',
-  workspaceUnknownWorkspace: 'Unknown workspace $0.',
-  workspaceVersionMandatory: 'Missing version in workspace at $0, ignoring.',
-  workspaceNameMandatory: 'Missing name in workspace at $0, ignoring.',
-  workspaceNameDuplicate: 'There are more than one workspace with name $0',
-
-  cacheFolderSkipped: 'Skipping preferred cache folder $0 because it is not writable.',
-  cacheFolderMissing: "Yarn hasn't been able to find a cache folder it can use. Please use the explicit --cache-folder option to tell it what location to use, or make one of the preferred locations writable.",
-  cacheFolderSelected: 'Selected the next writable cache folder in the list, will be $0.',
-
-  execMissingCommand: 'Missing command name.',
-
-  noScriptsAvailable: 'There are no scripts specified inside package.json.',
-  noBinAvailable: 'There are no binary scripts available.',
-  dashDashDeprecation: `From Yarn 1.0 onwards, scripts don't require "--" for options to be forwarded. In a future version, any explicit "--" will be forwarded as-is to the scripts.`,
-  commandNotSpecified: 'No command specified.',
-  binCommands: 'Commands available from binary scripts: ',
-  possibleCommands: 'Project commands',
-  commandQuestion: 'Which command would you like to run?',
-  commandFailedWithCode: 'Command failed with exit code $0.',
-  commandFailedWithSignal: 'Command failed with signal $0.',
-  packageRequiresNodeGyp: 'This package requires node-gyp, which is not currently installed. Yarn will attempt to automatically install it. If this fails, you can run "yarn global add node-gyp" to manually install it.',
-  nodeGypAutoInstallFailed: 'Failed to auto-install node-gyp. Please run "yarn global add node-gyp" manually. Error: $0',
-
-  foundIncompatible: 'Found incompatible module.',
-  incompatibleEngine: 'The engine $0 is incompatible with this module. Expected version $1. Got $2',
-  incompatibleCPU: 'The CPU architecture $0 is incompatible with this module.',
-  incompatibleOS: 'The platform $0 is incompatible with this module.',
-  invalidEngine: 'The engine $0 appears to be invalid.',
-  cannotRunWithIncompatibleEnv: 'Commands cannot run with an incompatible environment.',
-
-  optionalCompatibilityExcluded: '$0 is an optional dependency and failed compatibility check. Excluding it from installation.',
-  optionalModuleFail: 'This module is OPTIONAL, you can safely ignore this error',
-  optionalModuleScriptFail: 'Error running install script for optional dependency: $0',
-  optionalModuleCleanupFail: 'Could not cleanup build artifacts from failed install: $0',
-
-  unmetPeer: '$0 has unmet peer dependency $1.',
-  incorrectPeer: '$0 has incorrect peer dependency $1.',
-  selectedPeer: 'Selecting $1 at level $2 as the peer dependency of $0.',
-  missingBundledDependency: '$0 is missing a bundled dependency $1. This should be reported to the package maintainer.',
-
-  savedNewDependency: 'Saved 1 new dependency.',
-  savedNewDependencies: 'Saved $0 new dependencies.',
-  directDependencies: 'Direct dependencies',
-  allDependencies: 'All dependencies',
-
-  foundWarnings: 'Found $0 warnings.',
-  foundErrors: 'Found $0 errors.',
-
-  savedLockfile: 'Saved lockfile.',
-  noRequiredLockfile: 'No lockfile in this directory. Run `yarn install` to generate one.',
-  noLockfileFound: 'No lockfile found.',
-
-  invalidSemver: 'Invalid semver version',
-  newVersion: 'New version',
-  currentVersion: 'Current version',
-  noVersionOnPublish: 'Proceeding with current version',
-
-  manualVersionResolution: 'Unable to find a suitable version for $0, please choose one by typing one of the numbers below:',
-  manualVersionResolutionOption: '$0 which resolved to $1',
-
-  createdTag: 'Created tag.',
-  createdTagFail: "Couldn't add tag.",
-  deletedTag: 'Deleted tag.',
-  deletedTagFail: "Couldn't delete tag.",
-  gettingTags: 'Getting tags',
-  deletingTags: 'Deleting tag',
-  creatingTag: 'Creating tag $0 = $1',
-
-  whyStart: 'Why do we have the module $0?',
-  whyFinding: 'Finding dependency',
-  whyCalculating: 'Calculating file sizes',
-  whyUnknownMatch: "We couldn't find a match!",
-  whyInitGraph: 'Initialising dependency graph',
-  whyWhoKnows: "We don't know why this module exists",
-  whyDiskSizeWithout: 'Disk size without dependencies: $0',
-  whyDiskSizeUnique: 'Disk size with unique dependencies: $0',
-  whyDiskSizeTransitive: 'Disk size with transitive dependencies: $0',
-  whySharedDependencies: 'Number of shared dependencies: $0',
-  whyHoistedTo: `Has been hoisted to $0`,
-
-  whyHoistedFromSimple: `This module exists because it's hoisted from $0.`,
-  whyNotHoistedSimple: `This module exists here because it's in the nohoist list $0.`,
-  whyDependedOnSimple: `This module exists because $0 depends on it.`,
-  whySpecifiedSimple: `This module exists because it's specified in $0.`,
-  whyReasons: 'Reasons this module exists',
-  whyHoistedFrom: 'Hoisted from $0',
-  whyNotHoisted: `in the nohoist list $0`,
-  whyDependedOn: '$0 depends on it',
-  whySpecified: `Specified in $0`,
-
-  whyMatch: `\r=> Found $0`,
-
-  uninstalledPackages: 'Uninstalled packages.',
-  uninstallRegenerate: 'Regenerating lockfile and installing missing dependencies',
-
-  cleanRemovedFiles: 'Removed $0 files',
-  cleanSavedSize: 'Saved $0 MB.',
-
-  configFileFound: 'Found configuration file $0.',
-  configPossibleFile: 'Checking for configuration file $0.',
-
-  npmUsername: 'npm username',
-  npmPassword: 'npm password',
-  npmEmail: 'npm email',
-  npmOneTimePassword: 'npm one-time password',
-
-  loggingIn: 'Logging in',
-  loggedIn: 'Logged in.',
-  notRevokingEnvToken: 'Not revoking login token, specified via environment variable.',
-  notRevokingConfigToken: 'Not revoking login token, specified via config file.',
-  noTokenToRevoke: 'No login token to revoke.',
-  revokingToken: 'Revoking token',
-  revokedToken: 'Revoked login token.',
-
-  loginAsPublic: 'Logging in as public',
-  incorrectCredentials: 'Incorrect username or password.',
-  incorrectOneTimePassword: 'Incorrect one-time password.',
-  twoFactorAuthenticationEnabled: 'Two factor authentication enabled.',
-  clearedCredentials: 'Cleared login credentials.',
-
-  publishFail: "Couldn't publish package: $0",
-  publishPrivate: 'Package marked as private, not publishing.',
-  published: 'Published.',
-  publishing: 'Publishing',
-
-  nonInteractiveNoVersionSpecified: 'You must specify a new version with --new-version when running with --non-interactive.',
-  nonInteractiveNoToken: "No token found and can't prompt for login when running with --non-interactive.",
-
-  infoFail: 'Received invalid response from npm.',
-  malformedRegistryResponse: 'Received malformed response from registry for $0. The registry may be down.',
-  registryNoVersions: 'No valid versions found for $0. The package may be unpublished.',
-
-  cantRequestOffline: "Can't make a request in offline mode ($0)",
-  requestManagerNotSetupHAR: 'RequestManager was not setup to capture HAR files',
-  requestError: 'Request $0 returned a $1',
-  requestFailed: 'Request failed $0',
-  tarballNotInNetworkOrCache: '$0: Tarball is not in network and can not be located in cache ($1)',
-  fetchBadHashWithPath: "Integrity check failed for $0 (computed integrity doesn't match our records, got $2)",
-  fetchBadIntegrityAlgorithm: 'Integrity checked failed for $0 (none of the specified algorithms are supported)',
-  fetchErrorCorrupt: '$0. Mirror tarball appears to be corrupt. You can resolve this by running:\n\n  rm -rf $1\n  yarn install',
-  errorExtractingTarball: 'Extracting tar content of $1 failed, the file appears to be corrupt: $0',
-  updateInstalling: 'Installing $0...',
-  hostedGitResolveError: 'Error connecting to repository. Please, check the url.',
-
-  unknownFetcherFor: 'Unknown fetcher for $0',
-
-  downloadGitWithoutCommit: 'Downloading the git repo $0 over plain git without a commit hash',
-  downloadHTTPWithoutCommit: 'Downloading the git repo $0 over HTTP without a commit hash',
-
-  unplugDisabled: "Packages can only be unplugged when Plug'n'Play is enabled.",
-
-  plugnplaySuggestV2L1: "Plug'n'Play support has been greatly improved on the Yarn v2 development branch.",
-  plugnplaySuggestV2L2: 'Please give it a try and tell us what you think! - https://next.yarnpkg.com/getting-started/install',
-  plugnplayWindowsSupport: "Plug'n'Play on Windows doesn't support the cache and project to be kept on separate drives",
-
-  packageInstalledWithBinaries: 'Installed $0 with binaries:',
-  packageHasBinaries: '$0 has binaries:',
-  packageHasNoBinaries: '$0 has no binaries',
-  packageBinaryNotFound: "Couldn't find a binary named $0",
-
-  couldBeDeduped: '$0 could be deduped from $1 to $2',
-  lockfileNotContainPattern: 'Lockfile does not contain pattern: $0',
-  integrityCheckFailed: 'Integrity check failed',
-  noIntegrityFile: "Couldn't find an integrity file",
-  integrityFailedExpectedIsNotAJSON: 'Integrity check: integrity file is not a json',
-  integrityCheckLinkedModulesDontMatch: "Integrity check: Linked modules don't match",
-  integrityFlagsDontMatch: "Integrity check: Flags don't match",
-  integrityLockfilesDontMatch: "Integrity check: Lock files don't match",
-  integrityFailedFilesMissing: 'Integrity check: Files are missing',
-  integrityPatternsDontMatch: "Integrity check: Top level patterns don't match",
-  integrityModulesFoldersMissing: 'Integrity check: Some module folders are missing',
-  integritySystemParamsDontMatch: "Integrity check: System parameters don't match",
-  packageNotInstalled: '$0 not installed',
-  optionalDepNotInstalled: 'Optional dependency $0 not installed',
-  packageWrongVersion: '$0 is wrong version: expected $1, got $2',
-  packageDontSatisfy: "$0 doesn't satisfy found match of $1",
-
-  lockfileExists: 'Lockfile already exists, not importing.',
-  skippingImport: 'Skipping import of $0 for $1',
-  importFailed: 'Import of $0 for $1 failed, resolving normally.',
-  importResolveFailed: 'Import of $0 failed starting in $1',
-  importResolvedRangeMatch: 'Using version $0 of $1 instead of $2 for $3',
-  importSourceFilesCorrupted: 'Failed to import from package-lock.json, source file(s) corrupted',
-  importPackageLock: 'found npm package-lock.json, converting to yarn.lock',
-  importNodeModules: 'creating yarn.lock from local node_modules folder',
-  packageContainsYarnAsGlobal: 'Installing Yarn via Yarn will result in you having two separate versions of Yarn installed at the same time, which is not recommended. To update Yarn please follow https://yarnpkg.com/en/docs/install .',
-
-  scopeNotValid: 'The specified scope is not valid.',
-
-  deprecatedCommand: '$0 is deprecated. Please use $1.',
-  deprecatedListArgs: 'Filtering by arguments is deprecated. Please use the pattern option instead.',
-  implicitFileDeprecated: 'Using the "file:" protocol implicitly is deprecated. Please either prepend the protocol or prepend the path $0 with "./".',
-  unsupportedNodeVersion: 'You are using Node $0 which is not supported and may encounter bugs or unexpected behavior. Yarn supports the following semver range: $1',
-
-  verboseUpgradeBecauseRequested: 'Considering upgrade of $0 to $1 because it was directly requested.',
-  verboseUpgradeBecauseOutdated: 'Considering upgrade of $0 to $1 because a newer version exists in the registry.',
-  verboseUpgradeNotUnlocking: 'Not unlocking $0 in the lockfile because it is a new or direct dependency.',
-  verboseUpgradeUnlocking: 'Unlocking $0 in the lockfile.',
-  folderMissing: "Directory $0 doesn't exist",
-  mutexPortBusy: 'Cannot use the network mutex on port $0. It is probably used by another app.',
-
-  auditRunning: 'Auditing packages',
-  auditSummary: '$0 vulnerabilities found - Packages audited: $1',
-  auditSummarySeverity: 'Severity:',
-  auditCritical: '$0 Critical',
-  auditHigh: '$0 High',
-  auditModerate: '$0 Moderate',
-  auditLow: '$0 Low',
-  auditInfo: '$0 Info',
-  auditResolveCommand: '# Run $0 to resolve $1 $2',
-  auditSemverMajorChange: 'SEMVER WARNING: Recommended action is a potentially breaking change',
-  auditManualReview: 'Manual Review\nSome vulnerabilities require your attention to resolve\n\nVisit https://go.npm.me/audit-guide for additional guidance',
-  auditRunAuditForDetails: 'Security audit found potential problems. Run "yarn audit" for additional details.',
-  auditOffline: 'Skipping audit. Security audit cannot be performed in offline mode.'
-};
-
-exports.default = messages;
-
-/***/ }),
-/* 568 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.en = undefined;
-
-var _en;
-
-function _load_en() {
-  return _en = _interopRequireDefault(__webpack_require__(567));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.en = (_en || _load_en()).default;
-
-/***/ }),
-/* 569 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _baseReporter;
-
-function _load_baseReporter() {
-  return _baseReporter = _interopRequireDefault(__webpack_require__(108));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint no-unused-vars: 0 */
-
-class NoopReporter extends (_baseReporter || _load_baseReporter()).default {
-  lang(key, ...args) {
-    return 'do nothing';
-  }
-  verbose(msg) {}
-  verboseInspect(val) {}
-  initPeakMemoryCounter() {}
-  checkPeakMemory() {}
-  close() {}
-  getTotalTime() {
-    return 0;
-  }
-  list(key, items, hints) {}
-  tree(key, obj) {}
-  step(current, total, message, emoji) {}
-  error(message) {}
-  info(message) {}
-  warn(message) {}
-  success(message) {}
-  log(message) {}
-  command(command) {}
-  inspect(value) {}
-  header(command, pkg) {}
-  footer(showPeakMemory) {}
-  table(head, body) {}
-
-  activity() {
-    return {
-      tick(name) {},
-      end() {}
-    };
-  }
-
-  activitySet(total, workers) {
-    return {
-      spinners: Array(workers).fill({
-        clear() {},
-        setPrefix() {},
-        tick() {},
-        end() {}
-      }),
-      end() {}
-    };
-  }
-
-  question(question, options = {}) {
-    return Promise.reject(new Error('Not implemented'));
-  }
-
-  questionAffirm(question) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      yield _this.question(question);
-      return false;
-    })();
-  }
-
-  select(header, question, options) {
-    return Promise.reject(new Error('Not implemented'));
-  }
-
-  progress(total) {
-    return function () {};
-  }
-
-  disableProgress() {
-    this.noProgress = true;
-  }
-
-  prompt(message, choices, options = {}) {
-    return Promise.reject(new Error('Not implemented'));
-  }
-}
-exports.default = NoopReporter;
-
-/***/ }),
-/* 570 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _extends2;
-
-function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(22));
-}
-
-var _packageRequest;
-
-function _load_packageRequest() {
-  return _packageRequest = _interopRequireDefault(__webpack_require__(122));
-}
-
-var _baseResolver;
-
-function _load_baseResolver() {
-  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
-}
-
-var _workspaceLayout;
-
-function _load_workspaceLayout() {
-  return _workspaceLayout = _interopRequireDefault(__webpack_require__(90));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-class WorkspaceResolver extends (_baseResolver || _load_baseResolver()).default {
-  static isWorkspace(pattern, workspaceLayout) {
-    return !!workspaceLayout && !!workspaceLayout.getManifestByPattern(pattern);
-  }
-
-  constructor(request, fragment, workspaceLayout) {
-    super(request, fragment);
-    this.workspaceLayout = workspaceLayout;
-  }
-
-  resolve(downloadedManifest) {
-    const workspace = this.workspaceLayout.getManifestByPattern(this.request.pattern);
-    invariant(workspace, 'expected workspace');
-    const manifest = workspace.manifest,
-          loc = workspace.loc;
-
-    if (manifest._remote && manifest._remote.registryRemote) {
-      return Promise.resolve(manifest); //already downloaded
-    }
-    const registry = manifest._registry;
-    invariant(registry, 'expected reference');
-    let hash = '';
-    let registryRemote;
-    if (downloadedManifest && manifest.version === downloadedManifest.version) {
-      registryRemote = downloadedManifest._remote;
-      invariant(registryRemote, 'missing remote info');
-      hash = registryRemote.hash;
-      //override any local changes to manifest
-      Object.keys(manifest).forEach(k => k.startsWith('_') || delete manifest[k]);
-      Object.assign(manifest, downloadedManifest);
-    } else if (manifest._remote && manifest._remote.hash) {
-      invariant(workspace.manifest._remote, 'missing remote info');
-      registryRemote = workspace.manifest._remote.registryRemote;
-      hash = manifest._remote.hash;
-    }
-    if (registryRemote) {
-      registryRemote = (0, (_extends2 || _load_extends()).default)({}, registryRemote);
-    }
-
-    manifest._remote = Object.assign(manifest._remote || {}, {
-      type: 'workspace',
-      registryRemote,
-      registry,
-      hash,
-      reference: loc
-    });
-
-    manifest._uid = manifest.version;
-
-    return Promise.resolve(manifest);
-  }
-}
-exports.default = WorkspaceResolver;
-
-/***/ }),
-/* 571 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _hostedGitResolver;
-
-function _load_hostedGitResolver() {
-  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class BitbucketResolver extends (_hostedGitResolver || _load_hostedGitResolver()).default {
-
-  static getTarballUrl(parts, hash) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}/get/${hash}.tar.gz`;
-  }
-
-  static getGitHTTPBaseUrl(parts) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}`;
-  }
-
-  static getGitHTTPUrl(parts) {
-    return `${BitbucketResolver.getGitHTTPBaseUrl(parts)}.git`;
-  }
-
-  static getGitSSHUrl(parts) {
-    return `git+ssh://git@${this.hostname}/${parts.user}/${parts.repo}.git` + `${parts.hash ? '#' + decodeURIComponent(parts.hash) : ''}`;
-  }
-
-  static getHTTPFileUrl(parts, filename, commit) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}/raw/${commit}/${filename}`;
-  }
-
-  hasHTTPCapability(url) {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      // We don't follow redirects and reject a 302 since this means BitBucket
-      // won't allow us to use the HTTP protocol for `git` access.
-      // Most probably a private repo and this 302 is to a login page.
-      const bitbucketHTTPSupport = yield _this.config.requestManager.request({
-        url,
-        method: 'HEAD',
-        queue: _this.resolver.fetchingQueue,
-        followRedirect: false,
-        rejectStatusCode: 302
-      });
-      return bitbucketHTTPSupport !== false;
-    })();
-  }
-}
-exports.default = BitbucketResolver;
-BitbucketResolver.hostname = 'bitbucket.org';
-BitbucketResolver.protocol = 'bitbucket';
-
-/***/ }),
-/* 572 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _hostedGitResolver;
-
-function _load_hostedGitResolver() {
-  return _hostedGitResolver = _interopRequireDefault(__webpack_require__(109));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class GitLabResolver extends (_hostedGitResolver || _load_hostedGitResolver()).default {
-
-  static getTarballUrl(parts, hash) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}/repository/archive.tar.gz?ref=${hash}`;
-  }
-
-  static getGitHTTPBaseUrl(parts) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}`;
-  }
-
-  static getGitHTTPUrl(parts) {
-    return `${GitLabResolver.getGitHTTPBaseUrl(parts)}.git`;
-  }
-
-  static getGitSSHUrl(parts) {
-    return `git+ssh://git@${this.hostname}/${parts.user}/${parts.repo}.git` + `${parts.hash ? '#' + decodeURIComponent(parts.hash) : ''}`;
-  }
-
-  static getHTTPFileUrl(parts, filename, commit) {
-    return `https://${this.hostname}/${parts.user}/${parts.repo}/raw/${commit}/${filename}`;
-  }
-}
-exports.default = GitLabResolver;
-GitLabResolver.hostname = 'gitlab.com';
-GitLabResolver.protocol = 'gitlab';
-
-/***/ }),
-/* 573 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class RegistryResolver extends (_exoticResolver || _load_exoticResolver()).default {
-  constructor(request, fragment) {
-    super(request, fragment);
-
-    const match = fragment.match(/^(\S+):(@?.*?)(@(.*?)|)$/);
-    if (match) {
-      this.range = match[4] || 'latest';
-      this.name = match[2];
-    } else {
-      throw new (_errors || _load_errors()).MessageError(this.reporter.lang('invalidFragment', fragment));
-    }
-
-    // $FlowFixMe
-    this.registry = this.constructor.protocol;
-  }
-
-  resolve() {
-    return this.fork(this.constructor.factory, false, this.name, this.range);
-  }
-}
-exports.default = RegistryResolver;
-
-/***/ }),
-/* 574 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _tarballFetcher;
-
-function _load_tarballFetcher() {
-  return _tarballFetcher = _interopRequireDefault(__webpack_require__(364));
-}
-
-var _exoticResolver;
-
-function _load_exoticResolver() {
-  return _exoticResolver = _interopRequireDefault(__webpack_require__(89));
-}
-
-var _gitResolver;
-
-function _load_gitResolver() {
-  return _gitResolver = _interopRequireDefault(__webpack_require__(124));
-}
-
-var _guessName;
-
-function _load_guessName() {
-  return _guessName = _interopRequireDefault(__webpack_require__(169));
-}
-
-var _version;
-
-function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(226));
-}
-
-var _crypto;
-
-function _load_crypto() {
-  return _crypto = _interopRequireWildcard(__webpack_require__(168));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const invariant = __webpack_require__(9);
-
-class TarballResolver extends (_exoticResolver || _load_exoticResolver()).default {
-  constructor(request, fragment) {
-    super(request, fragment);
-
-    var _versionUtil$explodeH = (_version || _load_version()).explodeHashedUrl(fragment);
-
-    const hash = _versionUtil$explodeH.hash,
-          url = _versionUtil$explodeH.url;
-
-    this.hash = hash;
-    this.url = url;
-  }
-
-  static isVersion(pattern) {
-    // we can sometimes match git urls which we don't want
-    if ((_gitResolver || _load_gitResolver()).default.isVersion(pattern)) {
-      return false;
-    }
-
-    // full http url
-    if (pattern.startsWith('http://') || pattern.startsWith('https://')) {
-      return true;
-    }
-
-    // local file reference - ignore patterns with names
-    if (pattern.indexOf('@') < 0) {
-      if (pattern.endsWith('.tgz') || pattern.endsWith('.tar.gz')) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  resolve() {
-    var _this = this;
-
-    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      const shrunk = _this.request.getLocked('tarball');
-      if (shrunk) {
-        return shrunk;
-      }
-
-      const url = _this.url;
-      let hash = _this.hash,
-          registry = _this.registry;
-
-      let pkgJson;
-
-      // generate temp directory
-      const dest = _this.config.getTemp((_crypto || _load_crypto()).hash(url));
-
-      if (yield _this.config.isValidModuleDest(dest)) {
-        var _ref = yield _this.config.readPackageMetadata(dest);
-        // load from local cache
-
-
-        pkgJson = _ref.package;
-        hash = _ref.hash;
-        registry = _ref.registry;
-      } else {
-        // delete if invalid
-        yield (_fs || _load_fs()).unlink(dest);
-
-        const fetcher = new (_tarballFetcher || _load_tarballFetcher()).default(dest, {
-          type: 'tarball',
-          reference: url,
-          registry,
-          hash
-        }, _this.config);
-
-        // fetch file and get it's hash
-        const fetched = yield fetcher.fetch({
-          name: (0, (_guessName || _load_guessName()).default)(url),
-          version: '0.0.0',
-          _registry: 'npm'
-        });
-        pkgJson = fetched.package;
-        hash = fetched.hash;
-
-        registry = pkgJson._registry;
-        invariant(registry, 'expected registry');
-      }
-
-      // use the commit/tarball hash as the uid as we can't rely on the version as it's not
-      // in the registry
-      pkgJson._uid = hash;
-
-      // set remote so it can be "fetched"
-      pkgJson._remote = {
-        type: 'copy',
-        resolved: `${url}#${hash}`,
-        hash,
-        registry,
-        reference: dest
-      };
-
-      return pkgJson;
-    })();
-  }
-}
-exports.default = TarballResolver;
-
-/***/ }),
-/* 575 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _baseResolver;
-
-function _load_baseResolver() {
-  return _baseResolver = _interopRequireDefault(__webpack_require__(123));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class RegistryResolver extends (_baseResolver || _load_baseResolver()).default {
-  constructor(request, name, range) {
-    super(request, `${name}@${range}`);
-    this.name = name;
-    this.range = range;
-
-    this.registryConfig = request.config.registries[this.constructor.registry].config;
-  }
-
-}
-exports.default = RegistryResolver;
-
-/***/ }),
-/* 576 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _npmResolver;
-
-function _load_npmResolver() {
-  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class YarnResolver extends (_npmResolver || _load_npmResolver()).default {}
-exports.default = YarnResolver;
-
-/***/ }),
-/* 577 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = envReplace;
-const ENV_EXPR = /(\\*)\$\{([^}]+)\}/g;
-
-function envReplace(value, env = process.env) {
-  if (typeof value !== 'string' || !value) {
-    return value;
-  }
-
-  return value.replace(ENV_EXPR, (match, esc, envVarName) => {
-    if (esc.length && esc.length % 2) {
-      return match;
-    }
-    if (undefined === env[envVarName]) {
-      throw new Error('Failed to replace env in config: ' + match);
-    }
-    return env[envVarName] || '';
-  });
-}
-
-/***/ }),
-/* 578 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fixCmdWinSlashes = fixCmdWinSlashes;
-function fixCmdWinSlashes(cmd) {
-  function findQuotes(quoteSymbol) {
-    const quotes = [];
-    const addQuote = (_, index) => {
-      quotes.push({ from: index, to: index + _.length });
-      return _;
-    };
-    const regEx = new RegExp(quoteSymbol + '.*' + quoteSymbol);
-    cmd.replace(regEx, addQuote);
-    return quotes;
-  }
-  const quotes = findQuotes('"').concat(findQuotes("'"));
-
-  function isInsideQuotes(index) {
-    return quotes.reduce((result, quote) => {
-      return result || quote.from <= index && index <= quote.to;
-    }, false);
-  }
-
-  const cmdPrePattern = '((?:^|&&|&|\\|\\||\\|)\\s*)';
-  const cmdPattern = '(".*?"|\'.*?\'|\\S*)';
-  const regExp = new RegExp(`${cmdPrePattern}${cmdPattern}`, 'g');
-  return cmd.replace(regExp, (whole, pre, cmd, index) => {
-    if ((pre[0] === '&' || pre[0] === '|') && isInsideQuotes(index)) {
-      return whole;
-    }
-    return pre + cmd.replace(/\//g, '\\');
-  });
-}
-
-/***/ }),
-/* 579 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.generatePnpMap = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getPackageInformationStores = (() => {
-  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, seedPatterns, { resolver, reporter, targetPath, workspaceLayout }) {
-    const targetDirectory = path.dirname(targetPath);
-    const offlineCacheFolder = config.offlineCacheFolder;
-
-    const packageInformationStores = new Map();
-    const blacklistedLocations = new Set();
-
-    const getCachePath = function getCachePath(fsPath) {
-      const cacheRelativePath = normalizePath(path.relative(config.cacheFolder, fsPath));
-
-      // if fsPath is not inside cacheRelativePath, we just skip it
-      if (cacheRelativePath.match(/^\.\.\//)) {
-        return null;
-      }
-
-      return cacheRelativePath;
-    };
-
-    const resolveOfflineCacheFolder = function resolveOfflineCacheFolder(fsPath) {
-      if (!offlineCacheFolder) {
-        return fsPath;
-      }
-
-      const cacheRelativePath = getCachePath(fsPath);
-
-      // if fsPath is not inside the cache, we shouldn't replace it (workspace)
-      if (!cacheRelativePath) {
-        return fsPath;
-      }
-
-      const components = cacheRelativePath.split(/\//g);
-      const cacheEntry = components[0],
-            internalPath = components.slice(1);
-
-
-      return path.resolve(offlineCacheFolder, `${cacheEntry}${OFFLINE_CACHE_EXTENSION}`, internalPath.join('/'));
-    };
-
-    const normalizePath = function normalizePath(fsPath) {
-      return process.platform === 'win32' ? fsPath.replace(backwardSlashRegExp, '/') : fsPath;
-    };
-
-    const normalizeDirectoryPath = function normalizeDirectoryPath(fsPath) {
-      let relativePath = normalizePath(path.relative(targetDirectory, resolveOfflineCacheFolder(fsPath)));
-
-      if (!relativePath.match(/^\.{0,2}\//) && !path.isAbsolute(relativePath)) {
-        relativePath = `./${relativePath}`;
-      }
-
-      return relativePath.replace(/\/?$/, '/');
-    };
-
-    const getHashFrom = function getHashFrom(data) {
-      const hashGenerator = crypto.createHash('sha1');
-
-      for (var _iterator10 = data, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-        var _ref18;
-
-        if (_isArray10) {
-          if (_i10 >= _iterator10.length) break;
-          _ref18 = _iterator10[_i10++];
-        } else {
-          _i10 = _iterator10.next();
-          if (_i10.done) break;
-          _ref18 = _i10.value;
-        }
-
-        const datum = _ref18;
-
-        hashGenerator.update(datum);
-      }
-
-      return hashGenerator.digest('hex');
-    };
-
-    const getResolverEntry = function getResolverEntry(pattern) {
-      const pkg = resolver.getStrictResolvedPattern(pattern);
-      const ref = pkg._reference;
-
-      if (!ref) {
-        return null;
-      }
-
-      invariant(ref.locations.length <= 1, 'Must have at most one location (usually in the cache)');
-      const loc = ref.locations[0];
-
-      if (!loc) {
-        return null;
-      }
-
-      return { pkg, ref, loc };
-    };
-
-    const visit = (() => {
-      var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (precomputedResolutions, seedPatterns, parentData = []) {
-        const resolutions = new Map(precomputedResolutions);
-        const locations = new Map();
-
-        // This first pass will compute the package reference of each of the given patterns
-        // They will usually be the package version, but not always. We need to do this in a pre-process pass, because the
-        // dependencies might depend on one another, so if we need to replace one of them, we need to compute it first
-        for (var _iterator11 = seedPatterns, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
-          var _ref20;
-
-          if (_isArray11) {
-            if (_i11 >= _iterator11.length) break;
-            _ref20 = _iterator11[_i11++];
-          } else {
-            _i11 = _iterator11.next();
-            if (_i11.done) break;
-            _ref20 = _i11.value;
-          }
-
-          const pattern = _ref20;
-
-          const entry = getResolverEntry(pattern);
-
-          if (!entry) {
-            continue;
-          }
-
-          const pkg = entry.pkg,
-                ref = entry.ref;
-          let loc = entry.loc;
-
-
-          const packageName = pkg.name;
-          let packageReference = pkg.version;
-
-          // If we have peer dependencies, then we generate a new virtual reference based on the parent one
-          // We cannot generate this reference based on what those peer references resolve to, because they might not have
-          // been computed yet (for example, consider the case where A has a peer dependency on B, and B a peer dependency
-          // on A; it's valid, but it prevents us from computing A and B - and it's even worse with 3+ packages involved)
-          const peerDependencies = new Set(Array.from(Object.keys(pkg.peerDependencies || {})));
-
-          // As an optimization, we only setup virtual packages if their underlying packages are referenced multiple times
-          // in the tree. This allow us to avoid having to create symlinks in the majority of cases
-          if (peerDependencies.size > 0 && ref.requests.length > 1) {
-            const hash = getHashFrom([...parentData, packageName, packageReference]);
-
-            let symlinkSource;
-            let symlinkFile;
-
-            switch (ref.remote.type) {
-              case 'workspace':
-                {
-                  symlinkSource = loc;
-                  symlinkFile = path.resolve(config.lockfileFolder, '.pnp', 'workspaces', `pnp-${hash}`, packageName);
-
-                  loc = symlinkFile;
-                }
-                break;
-
-              default:
-                {
-                  const isFromCache = getCachePath(loc);
-
-                  const hashName = isFromCache && offlineCacheFolder ? `pnp-${hash}${OFFLINE_CACHE_EXTENSION}` : `pnp-${hash}`;
-                  const newLoc = path.resolve(config.lockfileFolder, '.pnp', 'externals', hashName, 'node_modules', packageName);
-
-                  // The `node_modules/<pkgName>` part is already there when the package comes from the cache
-                  if (isFromCache) {
-                    const getBase = function getBase(source) {
-                      return path.resolve(source, '../'.repeat(1 + packageName.split('/').length));
-                    };
-                    symlinkSource = resolveOfflineCacheFolder(getBase(loc));
-                    symlinkFile = getBase(newLoc);
-                  } else {
-                    symlinkSource = loc;
-                    symlinkFile = newLoc;
-                  }
-
-                  loc = newLoc;
-                }
-                break;
-            }
-
-            yield (_fs || _load_fs()).mkdirp(path.dirname(symlinkFile));
-            yield (_fs || _load_fs()).symlink(symlinkSource, symlinkFile);
-
-            packageReference = `pnp:${hash}`;
-
-            // We blacklist this path so that we can print a nicer error message if someone tries to require it (it usually
-            // means that they're using realpath on the return value of require.resolve)
-            blacklistedLocations.add(normalizeDirectoryPath(loc));
-          }
-
-          // Now that we have the final reference, we need to store it
-          resolutions.set(packageName, packageReference);
-          locations.set(packageName, loc);
-        }
-
-        // Now that we have the final references, we can start the main loop, which will insert the packages into the store
-        // if they aren't already there, and recurse over their own children
-        for (var _iterator12 = seedPatterns, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-          var _ref21;
-
-          if (_isArray12) {
-            if (_i12 >= _iterator12.length) break;
-            _ref21 = _iterator12[_i12++];
-          } else {
-            _i12 = _iterator12.next();
-            if (_i12.done) break;
-            _ref21 = _i12.value;
-          }
-
-          const pattern = _ref21;
-
-          const entry = getResolverEntry(pattern);
-
-          if (!entry) {
-            continue;
-          }
-
-          const pkg = entry.pkg,
-                ref = entry.ref;
-
-
-          const packageName = pkg.name;
-
-          const packageReference = resolutions.get(packageName);
-          invariant(packageReference, `Package reference should have been computed during the pre-pass`);
-
-          const loc = locations.get(packageName);
-          invariant(loc, `Package location should have been computed during the pre-pass`);
-
-          // We can early exit if the package is already registered with the exact same name and reference, since even if
-          // we might get slightly different dependencies (depending on how things were optimized), both sets are valid
-          let packageInformationStore = packageInformationStores.get(packageName);
-
-          if (!packageInformationStore) {
-            packageInformationStore = new Map();
-            packageInformationStores.set(packageName, packageInformationStore);
-          }
-
-          let packageInformation = packageInformationStore.get(packageReference);
-
-          if (packageInformation) {
-            continue;
-          }
-
-          packageInformation = {
-            packageLocation: normalizeDirectoryPath(loc),
-            packageDependencies: new Map()
-          };
-
-          // Split the dependencies between direct/peer - we will only recurse on the former
-          const peerDependencies = new Set(Array.from(Object.keys(pkg.peerDependencies || {})));
-          const directDependencies = ref.dependencies.filter(function (pattern) {
-            const pkg = resolver.getStrictResolvedPattern(pattern);
-            return !pkg || !peerDependencies.has(pkg.name);
-          });
-
-          // We inject the partial information in the store right now so that we won't cycle indefinitely
-          packageInformationStore.set(packageReference, packageInformation);
-
-          // We must inject the peer dependencies before iterating; one of our dependencies might have a peer dependency
-          // on one of our peer dependencies, so it must be available from the start (we don't have to do that for direct
-          // dependencies, because the "visit" function that will iterate over them will automatically add the to the
-          // candidate resolutions as part of the first step, cf above)
-
-          for (var _iterator13 = peerDependencies, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
-            var _ref22;
-
-            if (_isArray13) {
-              if (_i13 >= _iterator13.length) break;
-              _ref22 = _iterator13[_i13++];
-            } else {
-              _i13 = _iterator13.next();
-              if (_i13.done) break;
-              _ref22 = _i13.value;
-            }
-
-            const dependencyName = _ref22;
-
-            const dependencyReference = resolutions.get(dependencyName);
-
-            if (dependencyReference) {
-              packageInformation.packageDependencies.set(dependencyName, dependencyReference);
-            }
-          }
-
-          const childResolutions = yield visit(packageInformation.packageDependencies, directDependencies, [packageName, packageReference]);
-
-          // We can now inject into our package the resolutions we got from the visit function
-          for (var _iterator14 = childResolutions.entries(), _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-            var _ref24;
-
-            if (_isArray14) {
-              if (_i14 >= _iterator14.length) break;
-              _ref24 = _iterator14[_i14++];
-            } else {
-              _i14 = _iterator14.next();
-              if (_i14.done) break;
-              _ref24 = _i14.value;
-            }
-
-            const _ref23 = _ref24;
-            const name = _ref23[0];
-            const reference = _ref23[1];
-
-            packageInformation.packageDependencies.set(name, reference);
-          }
-
-          // Finally, unless a package depends on a previous version of itself (that would be weird but correct...), we
-          // inject them an implicit dependency to themselves (so that they can require themselves)
-          if (!packageInformation.packageDependencies.has(packageName)) {
-            packageInformation.packageDependencies.set(packageName, packageReference);
-          }
-        }
-
-        return resolutions;
-      });
-
-      return function visit(_x4, _x5) {
-        return _ref19.apply(this, arguments);
-      };
-    })();
-
-    // If we have workspaces, we need to iterate over them all in order to add them to the map
-    // This is because they might not be declared as dependencies of the top-level project (and with reason, since the
-    // top-level package might depend on a different than the one provided in the workspaces - cf Babel, which depends
-    // on an old version of itself in order to compile itself)
-    if (workspaceLayout) {
-      for (var _iterator15 = Object.keys(workspaceLayout.workspaces), _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
-        var _ref25;
-
-        if (_isArray15) {
-          if (_i15 >= _iterator15.length) break;
-          _ref25 = _iterator15[_i15++];
-        } else {
-          _i15 = _iterator15.next();
-          if (_i15.done) break;
-          _ref25 = _i15.value;
-        }
-
-        const name = _ref25;
-
-        const pkg = workspaceLayout.workspaces[name].manifest;
-
-        // Skip the aggregator, since it's essentially a duplicate of the top-level package that we'll iterate later on
-        if (pkg.workspaces) {
-          continue;
-        }
-
-        const ref = pkg._reference;
-        invariant(ref, `Workspaces should have a reference`);
-
-        invariant(ref.locations.length === 1, `Workspaces should have exactly one location`);
-        const loc = ref.locations[0];
-        invariant(loc, `Workspaces should have a location`);
-
-        let packageInformationStore = packageInformationStores.get(name);
-
-        if (!packageInformationStore) {
-          packageInformationStore = new Map();
-          packageInformationStores.set(name, packageInformationStore);
-        }
-
-        packageInformationStore.set(pkg.version, {
-          packageLocation: normalizeDirectoryPath(loc),
-          packageDependencies: yield visit(new Map(), ref.dependencies, [name, pkg.version])
-        });
-      }
-    }
-
-    // Register the top-level package in our map
-    // This will recurse on each of its dependencies as well.
-    packageInformationStores.set(null, new Map([[null, {
-      packageLocation: normalizeDirectoryPath(config.lockfileFolder),
-      packageDependencies: yield visit(new Map(), seedPatterns)
-    }]]));
-
-    return [packageInformationStores, blacklistedLocations];
-  });
-
-  return function getPackageInformationStores(_x, _x2, _x3) {
-    return _ref17.apply(this, arguments);
-  };
-})();
-
-let generatePnpMap = exports.generatePnpMap = (() => {
-  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, seedPatterns, { resolver, reporter, workspaceLayout, targetPath }) {
-    var _ref27 = yield getPackageInformationStores(config, seedPatterns, {
-      resolver,
-      reporter,
-      targetPath,
-      workspaceLayout
-    });
-
-    const packageInformationStores = _ref27[0],
-          blacklistedLocations = _ref27[1];
-
-
-    const setupStaticTables = [generateMaps(packageInformationStores, blacklistedLocations), generateFindPackageLocator(packageInformationStores)].join(``);
-
-    return pnpApi.replace(/\$\$SHEBANG/g, config.plugnplayShebang).replace(/\$\$BLACKLIST/g, JSON.stringify(config.plugnplayBlacklist)).replace(/\$\$SETUP_STATIC_TABLES\(\);/g, setupStaticTables);
-  });
-
-  return function generatePnpMap(_x6, _x7, _x8) {
-    return _ref26.apply(this, arguments);
-  };
-})();
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* babel-plugin-inline-import './generate-pnp-map-api.tpl.js' */const pnpApi = '#!$$SHEBANG\n\n/* eslint-disable max-len, flowtype/require-valid-file-annotation, flowtype/require-return-type */\n/* global packageInformationStores, $$BLACKLIST, $$SETUP_STATIC_TABLES */\n\n// Used for the resolveUnqualified part of the resolution (ie resolving folder/index.js & file extensions)\n// Deconstructed so that they aren\'t affected by any fs monkeypatching occuring later during the execution\nconst {statSync, lstatSync, readlinkSync, readFileSync, existsSync, realpathSync} = require(\'fs\');\n\nconst Module = require(\'module\');\nconst path = require(\'path\');\nconst StringDecoder = require(\'string_decoder\');\n\nconst ignorePattern = $$BLACKLIST ? new RegExp($$BLACKLIST) : null;\n\nconst pnpFile = path.resolve(__dirname, __filename);\nconst builtinModules = new Set(Module.builtinModules || Object.keys(process.binding(\'natives\')));\n\nconst topLevelLocator = {name: null, reference: null};\nconst blacklistedLocator = {name: NaN, reference: NaN};\n\n// Used for compatibility purposes - cf setupCompatibilityLayer\nconst patchedModules = [];\nconst fallbackLocators = [topLevelLocator];\n\n// Matches backslashes of Windows paths\nconst backwardSlashRegExp = /\\\\/g;\n\n// Matches if the path must point to a directory (ie ends with /)\nconst isDirRegExp = /\\/$/;\n\n// Matches if the path starts with a valid path qualifier (./, ../, /)\n// eslint-disable-next-line no-unused-vars\nconst isStrictRegExp = /^\\.{0,2}\\//;\n\n// Splits a require request into its components, or return null if the request is a file path\nconst pathRegExp = /^(?![a-zA-Z]:[\\\\\\/]|\\\\\\\\|\\.{0,2}(?:\\/|$))((?:@[^\\/]+\\/)?[^\\/]+)\\/?(.*|)$/;\n\n// Keep a reference around ("module" is a common name in this context, so better rename it to something more significant)\nconst pnpModule = module;\n\n/**\n * Used to disable the resolution hooks (for when we want to fallback to the previous resolution - we then need\n * a way to "reset" the environment temporarily)\n */\n\nlet enableNativeHooks = true;\n\n/**\n * Simple helper function that assign an error code to an error, so that it can more easily be caught and used\n * by third-parties.\n */\n\nfunction makeError(code, message, data = {}) {\n  const error = new Error(message);\n  return Object.assign(error, {code, data});\n}\n\n/**\n * Ensures that the returned locator isn\'t a blacklisted one.\n *\n * Blacklisted packages are packages that cannot be used because their dependencies cannot be deduced. This only\n * happens with peer dependencies, which effectively have different sets of dependencies depending on their parents.\n *\n * In order to deambiguate those different sets of dependencies, the Yarn implementation of PnP will generate a\n * symlink for each combination of <package name>/<package version>/<dependent package> it will find, and will\n * blacklist the target of those symlinks. By doing this, we ensure that files loaded through a specific path\n * will always have the same set of dependencies, provided the symlinks are correctly preserved.\n *\n * Unfortunately, some tools do not preserve them, and when it happens PnP isn\'t able anymore to deduce the set of\n * dependencies based on the path of the file that makes the require calls. But since we\'ve blacklisted those paths,\n * we\'re able to print a more helpful error message that points out that a third-party package is doing something\n * incompatible!\n */\n\n// eslint-disable-next-line no-unused-vars\nfunction blacklistCheck(locator) {\n  if (locator === blacklistedLocator) {\n    throw makeError(\n      `BLACKLISTED`,\n      [\n        `A package has been resolved through a blacklisted path - this is usually caused by one of your tools calling`,\n        `"realpath" on the return value of "require.resolve". Since the returned values use symlinks to disambiguate`,\n        `peer dependencies, they must be passed untransformed to "require".`,\n      ].join(` `)\n    );\n  }\n\n  return locator;\n}\n\n$$SETUP_STATIC_TABLES();\n\n/**\n * Returns the module that should be used to resolve require calls. It\'s usually the direct parent, except if we\'re\n * inside an eval expression.\n */\n\nfunction getIssuerModule(parent) {\n  let issuer = parent;\n\n  while (issuer && (issuer.id === \'[eval]\' || issuer.id === \'<repl>\' || !issuer.filename)) {\n    issuer = issuer.parent;\n  }\n\n  return issuer;\n}\n\n/**\n * Returns information about a package in a safe way (will throw if they cannot be retrieved)\n */\n\nfunction getPackageInformationSafe(packageLocator) {\n  const packageInformation = exports.getPackageInformation(packageLocator);\n\n  if (!packageInformation) {\n    throw makeError(\n      `INTERNAL`,\n      `Couldn\'t find a matching entry in the dependency tree for the specified parent (this is probably an internal error)`\n    );\n  }\n\n  return packageInformation;\n}\n\n/**\n * Implements the node resolution for folder access and extension selection\n */\n\nfunction applyNodeExtensionResolution(unqualifiedPath, {extensions}) {\n  // We use this "infinite while" so that we can restart the process as long as we hit package folders\n  while (true) {\n    let stat;\n\n    try {\n      stat = statSync(unqualifiedPath);\n    } catch (error) {}\n\n    // If the file exists and is a file, we can stop right there\n\n    if (stat && !stat.isDirectory()) {\n      // If the very last component of the resolved path is a symlink to a file, we then resolve it to a file. We only\n      // do this first the last component, and not the rest of the path! This allows us to support the case of bin\n      // symlinks, where a symlink in "/xyz/pkg-name/.bin/bin-name" will point somewhere else (like "/xyz/pkg-name/index.js").\n      // In such a case, we want relative requires to be resolved relative to "/xyz/pkg-name/" rather than "/xyz/pkg-name/.bin/".\n      //\n      // Also note that the reason we must use readlink on the last component (instead of realpath on the whole path)\n      // is that we must preserve the other symlinks, in particular those used by pnp to deambiguate packages using\n      // peer dependencies. For example, "/xyz/.pnp/local/pnp-01234569/.bin/bin-name" should see its relative requires\n      // be resolved relative to "/xyz/.pnp/local/pnp-0123456789/" rather than "/xyz/pkg-with-peers/", because otherwise\n      // we would lose the information that would tell us what are the dependencies of pkg-with-peers relative to its\n      // ancestors.\n\n      if (lstatSync(unqualifiedPath).isSymbolicLink()) {\n        unqualifiedPath = path.normalize(path.resolve(path.dirname(unqualifiedPath), readlinkSync(unqualifiedPath)));\n      }\n\n      return unqualifiedPath;\n    }\n\n    // If the file is a directory, we must check if it contains a package.json with a "main" entry\n\n    if (stat && stat.isDirectory()) {\n      let pkgJson;\n\n      try {\n        pkgJson = JSON.parse(readFileSync(`${unqualifiedPath}/package.json`, \'utf-8\'));\n      } catch (error) {}\n\n      let nextUnqualifiedPath;\n\n      if (pkgJson && pkgJson.main) {\n        nextUnqualifiedPath = path.resolve(unqualifiedPath, pkgJson.main);\n      }\n\n      // If the "main" field changed the path, we start again from this new location\n\n      if (nextUnqualifiedPath && nextUnqualifiedPath !== unqualifiedPath) {\n        const resolution = applyNodeExtensionResolution(nextUnqualifiedPath, {extensions});\n\n        if (resolution !== null) {\n          return resolution;\n        }\n      }\n    }\n\n    // Otherwise we check if we find a file that match one of the supported extensions\n\n    const qualifiedPath = extensions\n      .map(extension => {\n        return `${unqualifiedPath}${extension}`;\n      })\n      .find(candidateFile => {\n        return existsSync(candidateFile);\n      });\n\n    if (qualifiedPath) {\n      return qualifiedPath;\n    }\n\n    // Otherwise, we check if the path is a folder - in such a case, we try to use its index\n\n    if (stat && stat.isDirectory()) {\n      const indexPath = extensions\n        .map(extension => {\n          return `${unqualifiedPath}/index${extension}`;\n        })\n        .find(candidateFile => {\n          return existsSync(candidateFile);\n        });\n\n      if (indexPath) {\n        return indexPath;\n      }\n    }\n\n    // Otherwise there\'s nothing else we can do :(\n\n    return null;\n  }\n}\n\n/**\n * This function creates fake modules that can be used with the _resolveFilename function.\n * Ideally it would be nice to be able to avoid this, since it causes useless allocations\n * and cannot be cached efficiently (we recompute the nodeModulePaths every time).\n *\n * Fortunately, this should only affect the fallback, and there hopefully shouldn\'t be a\n * lot of them.\n */\n\nfunction makeFakeModule(path) {\n  const fakeModule = new Module(path, false);\n  fakeModule.filename = path;\n  fakeModule.paths = Module._nodeModulePaths(path);\n  return fakeModule;\n}\n\n/**\n * Normalize path to posix format.\n */\n\nfunction normalizePath(fsPath) {\n  fsPath = path.normalize(fsPath);\n\n  if (process.platform === \'win32\') {\n    fsPath = fsPath.replace(backwardSlashRegExp, \'/\');\n  }\n\n  return fsPath;\n}\n\n/**\n * Forward the resolution to the next resolver (usually the native one)\n */\n\nfunction callNativeResolution(request, issuer) {\n  if (issuer.endsWith(\'/\')) {\n    issuer += \'internal.js\';\n  }\n\n  try {\n    enableNativeHooks = false;\n\n    // Since we would need to create a fake module anyway (to call _resolveLookupPath that\n    // would give us the paths to give to _resolveFilename), we can as well not use\n    // the {paths} option at all, since it internally makes _resolveFilename create another\n    // fake module anyway.\n    return Module._resolveFilename(request, makeFakeModule(issuer), false);\n  } finally {\n    enableNativeHooks = true;\n  }\n}\n\n/**\n * This key indicates which version of the standard is implemented by this resolver. The `std` key is the\n * Plug\'n\'Play standard, and any other key are third-party extensions. Third-party extensions are not allowed\n * to override the standard, and can only offer new methods.\n *\n * If an new version of the Plug\'n\'Play standard is released and some extensions conflict with newly added\n * functions, they\'ll just have to fix the conflicts and bump their own version number.\n */\n\nexports.VERSIONS = {std: 1};\n\n/**\n * Useful when used together with getPackageInformation to fetch information about the top-level package.\n */\n\nexports.topLevel = {name: null, reference: null};\n\n/**\n * Gets the package information for a given locator. Returns null if they cannot be retrieved.\n */\n\nexports.getPackageInformation = function getPackageInformation({name, reference}) {\n  const packageInformationStore = packageInformationStores.get(name);\n\n  if (!packageInformationStore) {\n    return null;\n  }\n\n  const packageInformation = packageInformationStore.get(reference);\n\n  if (!packageInformation) {\n    return null;\n  }\n\n  return packageInformation;\n};\n\n/**\n * Transforms a request (what\'s typically passed as argument to the require function) into an unqualified path.\n * This path is called "unqualified" because it only changes the package name to the package location on the disk,\n * which means that the end result still cannot be directly accessed (for example, it doesn\'t try to resolve the\n * file extension, or to resolve directories to their "index.js" content). Use the "resolveUnqualified" function\n * to convert them to fully-qualified paths, or just use "resolveRequest" that do both operations in one go.\n *\n * Note that it is extremely important that the `issuer` path ends with a forward slash if the issuer is to be\n * treated as a folder (ie. "/tmp/foo/" rather than "/tmp/foo" if "foo" is a directory). Otherwise relative\n * imports won\'t be computed correctly (they\'ll get resolved relative to "/tmp/" instead of "/tmp/foo/").\n */\n\nexports.resolveToUnqualified = function resolveToUnqualified(request, issuer, {considerBuiltins = true} = {}) {\n  // The \'pnpapi\' request is reserved and will always return the path to the PnP file, from everywhere\n\n  if (request === `pnpapi`) {\n    return pnpFile;\n  }\n\n  // Bailout if the request is a native module\n\n  if (considerBuiltins && builtinModules.has(request)) {\n    return null;\n  }\n\n  // We allow disabling the pnp resolution for some subpaths. This is because some projects, often legacy,\n  // contain multiple levels of dependencies (ie. a yarn.lock inside a subfolder of a yarn.lock). This is\n  // typically solved using workspaces, but not all of them have been converted already.\n\n  if (ignorePattern && ignorePattern.test(normalizePath(issuer))) {\n    const result = callNativeResolution(request, issuer);\n\n    if (result === false) {\n      throw makeError(\n        `BUILTIN_NODE_RESOLUTION_FAIL`,\n        `The builtin node resolution algorithm was unable to resolve the module referenced by "${request}" and requested from "${issuer}" (it didn\'t go through the pnp resolver because the issuer was explicitely ignored by the regexp "$$BLACKLIST")`,\n        {\n          request,\n          issuer,\n        }\n      );\n    }\n\n    return result;\n  }\n\n  let unqualifiedPath;\n\n  // If the request is a relative or absolute path, we just return it normalized\n\n  const dependencyNameMatch = request.match(pathRegExp);\n\n  if (!dependencyNameMatch) {\n    if (path.isAbsolute(request)) {\n      unqualifiedPath = path.normalize(request);\n    } else if (issuer.match(isDirRegExp)) {\n      unqualifiedPath = path.normalize(path.resolve(issuer, request));\n    } else {\n      unqualifiedPath = path.normalize(path.resolve(path.dirname(issuer), request));\n    }\n  }\n\n  // Things are more hairy if it\'s a package require - we then need to figure out which package is needed, and in\n  // particular the exact version for the given location on the dependency tree\n\n  if (dependencyNameMatch) {\n    const [, dependencyName, subPath] = dependencyNameMatch;\n\n    const issuerLocator = exports.findPackageLocator(issuer);\n\n    // If the issuer file doesn\'t seem to be owned by a package managed through pnp, then we resort to using the next\n    // resolution algorithm in the chain, usually the native Node resolution one\n\n    if (!issuerLocator) {\n      const result = callNativeResolution(request, issuer);\n\n      if (result === false) {\n        throw makeError(\n          `BUILTIN_NODE_RESOLUTION_FAIL`,\n          `The builtin node resolution algorithm was unable to resolve the module referenced by "${request}" and requested from "${issuer}" (it didn\'t go through the pnp resolver because the issuer doesn\'t seem to be part of the Yarn-managed dependency tree)`,\n          {\n            request,\n            issuer,\n          }\n        );\n      }\n\n      return result;\n    }\n\n    const issuerInformation = getPackageInformationSafe(issuerLocator);\n\n    // We obtain the dependency reference in regard to the package that request it\n\n    let dependencyReference = issuerInformation.packageDependencies.get(dependencyName);\n\n    // If we can\'t find it, we check if we can potentially load it from the packages that have been defined as potential fallbacks.\n    // It\'s a bit of a hack, but it improves compatibility with the existing Node ecosystem. Hopefully we should eventually be able\n    // to kill this logic and become stricter once pnp gets enough traction and the affected packages fix themselves.\n\n    if (issuerLocator !== topLevelLocator) {\n      for (let t = 0, T = fallbackLocators.length; dependencyReference === undefined && t < T; ++t) {\n        const fallbackInformation = getPackageInformationSafe(fallbackLocators[t]);\n        dependencyReference = fallbackInformation.packageDependencies.get(dependencyName);\n      }\n    }\n\n    // If we can\'t find the path, and if the package making the request is the top-level, we can offer nicer error messages\n\n    if (!dependencyReference) {\n      if (dependencyReference === null) {\n        if (issuerLocator === topLevelLocator) {\n          throw makeError(\n            `MISSING_PEER_DEPENDENCY`,\n            `You seem to be requiring a peer dependency ("${dependencyName}"), but it is not installed (which might be because you\'re the top-level package)`,\n            {request, issuer, dependencyName}\n          );\n        } else {\n          throw makeError(\n            `MISSING_PEER_DEPENDENCY`,\n            `Package "${issuerLocator.name}@${issuerLocator.reference}" is trying to access a peer dependency ("${dependencyName}") that should be provided by its direct ancestor but isn\'t`,\n            {request, issuer, issuerLocator: Object.assign({}, issuerLocator), dependencyName}\n          );\n        }\n      } else {\n        if (issuerLocator === topLevelLocator) {\n          throw makeError(\n            `UNDECLARED_DEPENDENCY`,\n            `You cannot require a package ("${dependencyName}") that is not declared in your dependencies (via "${issuer}")`,\n            {request, issuer, dependencyName}\n          );\n        } else {\n          const candidates = Array.from(issuerInformation.packageDependencies.keys());\n          throw makeError(\n            `UNDECLARED_DEPENDENCY`,\n            `Package "${issuerLocator.name}@${issuerLocator.reference}" (via "${issuer}") is trying to require the package "${dependencyName}" (via "${request}") without it being listed in its dependencies (${candidates.join(\n              `, `\n            )})`,\n            {request, issuer, issuerLocator: Object.assign({}, issuerLocator), dependencyName, candidates}\n          );\n        }\n      }\n    }\n\n    // We need to check that the package exists on the filesystem, because it might not have been installed\n\n    const dependencyLocator = {name: dependencyName, reference: dependencyReference};\n    const dependencyInformation = exports.getPackageInformation(dependencyLocator);\n    const dependencyLocation = path.resolve(__dirname, dependencyInformation.packageLocation);\n\n    if (!dependencyLocation) {\n      throw makeError(\n        `MISSING_DEPENDENCY`,\n        `Package "${dependencyLocator.name}@${dependencyLocator.reference}" is a valid dependency, but hasn\'t been installed and thus cannot be required (it might be caused if you install a partial tree, such as on production environments)`,\n        {request, issuer, dependencyLocator: Object.assign({}, dependencyLocator)}\n      );\n    }\n\n    // Now that we know which package we should resolve to, we only have to find out the file location\n\n    if (subPath) {\n      unqualifiedPath = path.resolve(dependencyLocation, subPath);\n    } else {\n      unqualifiedPath = dependencyLocation;\n    }\n  }\n\n  return path.normalize(unqualifiedPath);\n};\n\n/**\n * Transforms an unqualified path into a qualified path by using the Node resolution algorithm (which automatically\n * appends ".js" / ".json", and transforms directory accesses into "index.js").\n */\n\nexports.resolveUnqualified = function resolveUnqualified(\n  unqualifiedPath,\n  {extensions = Object.keys(Module._extensions)} = {}\n) {\n  const qualifiedPath = applyNodeExtensionResolution(unqualifiedPath, {extensions});\n\n  if (qualifiedPath) {\n    return path.normalize(qualifiedPath);\n  } else {\n    throw makeError(\n      `QUALIFIED_PATH_RESOLUTION_FAILED`,\n      `Couldn\'t find a suitable Node resolution for unqualified path "${unqualifiedPath}"`,\n      {unqualifiedPath}\n    );\n  }\n};\n\n/**\n * Transforms a request into a fully qualified path.\n *\n * Note that it is extremely important that the `issuer` path ends with a forward slash if the issuer is to be\n * treated as a folder (ie. "/tmp/foo/" rather than "/tmp/foo" if "foo" is a directory). Otherwise relative\n * imports won\'t be computed correctly (they\'ll get resolved relative to "/tmp/" instead of "/tmp/foo/").\n */\n\nexports.resolveRequest = function resolveRequest(request, issuer, {considerBuiltins, extensions} = {}) {\n  let unqualifiedPath;\n\n  try {\n    unqualifiedPath = exports.resolveToUnqualified(request, issuer, {considerBuiltins});\n  } catch (originalError) {\n    // If we get a BUILTIN_NODE_RESOLUTION_FAIL error there, it means that we\'ve had to use the builtin node\n    // resolution, which usually shouldn\'t happen. It might be because the user is trying to require something\n    // from a path loaded through a symlink (which is not possible, because we need something normalized to\n    // figure out which package is making the require call), so we try to make the same request using a fully\n    // resolved issuer and throws a better and more actionable error if it works.\n    if (originalError.code === `BUILTIN_NODE_RESOLUTION_FAIL`) {\n      let realIssuer;\n\n      try {\n        realIssuer = realpathSync(issuer);\n      } catch (error) {}\n\n      if (realIssuer) {\n        if (issuer.endsWith(`/`)) {\n          realIssuer = realIssuer.replace(/\\/?$/, `/`);\n        }\n\n        try {\n          exports.resolveToUnqualified(request, realIssuer, {considerBuiltins});\n        } catch (error) {\n          // If an error was thrown, the problem doesn\'t seem to come from a path not being normalized, so we\n          // can just throw the original error which was legit.\n          throw originalError;\n        }\n\n        // If we reach this stage, it means that resolveToUnqualified didn\'t fail when using the fully resolved\n        // file path, which is very likely caused by a module being invoked through Node with a path not being\n        // correctly normalized (ie you should use "node $(realpath script.js)" instead of "node script.js").\n        throw makeError(\n          `SYMLINKED_PATH_DETECTED`,\n          `A pnp module ("${request}") has been required from what seems to be a symlinked path ("${issuer}"). This is not possible, you must ensure that your modules are invoked through their fully resolved path on the filesystem (in this case "${realIssuer}").`,\n          {\n            request,\n            issuer,\n            realIssuer,\n          }\n        );\n      }\n    }\n    throw originalError;\n  }\n\n  if (unqualifiedPath === null) {\n    return null;\n  }\n\n  try {\n    return exports.resolveUnqualified(unqualifiedPath, {extensions});\n  } catch (resolutionError) {\n    if (resolutionError.code === \'QUALIFIED_PATH_RESOLUTION_FAILED\') {\n      Object.assign(resolutionError.data, {request, issuer});\n    }\n    throw resolutionError;\n  }\n};\n\n/**\n * Setups the hook into the Node environment.\n *\n * From this point on, any call to `require()` will go through the "resolveRequest" function, and the result will\n * be used as path of the file to load.\n */\n\nexports.setup = function setup() {\n  // A small note: we don\'t replace the cache here (and instead use the native one). This is an effort to not\n  // break code similar to "delete require.cache[require.resolve(FOO)]", where FOO is a package located outside\n  // of the Yarn dependency tree. In this case, we defer the load to the native loader. If we were to replace the\n  // cache by our own, the native loader would populate its own cache, which wouldn\'t be exposed anymore, so the\n  // delete call would be broken.\n\n  const originalModuleLoad = Module._load;\n\n  Module._load = function(request, parent, isMain) {\n    if (!enableNativeHooks) {\n      return originalModuleLoad.call(Module, request, parent, isMain);\n    }\n\n    // Builtins are managed by the regular Node loader\n\n    if (builtinModules.has(request)) {\n      try {\n        enableNativeHooks = false;\n        return originalModuleLoad.call(Module, request, parent, isMain);\n      } finally {\n        enableNativeHooks = true;\n      }\n    }\n\n    // The \'pnpapi\' name is reserved to return the PnP api currently in use by the program\n\n    if (request === `pnpapi`) {\n      return pnpModule.exports;\n    }\n\n    // Request `Module._resolveFilename` (ie. `resolveRequest`) to tell us which file we should load\n\n    const modulePath = Module._resolveFilename(request, parent, isMain);\n\n    // Check if the module has already been created for the given file\n\n    const cacheEntry = Module._cache[modulePath];\n\n    if (cacheEntry) {\n      return cacheEntry.exports;\n    }\n\n    // Create a new module and store it into the cache\n\n    const module = new Module(modulePath, parent);\n    Module._cache[modulePath] = module;\n\n    // The main module is exposed as global variable\n\n    if (isMain) {\n      process.mainModule = module;\n      module.id = \'.\';\n    }\n\n    // Try to load the module, and remove it from the cache if it fails\n\n    let hasThrown = true;\n\n    try {\n      module.load(modulePath);\n      hasThrown = false;\n    } finally {\n      if (hasThrown) {\n        delete Module._cache[modulePath];\n      }\n    }\n\n    // Some modules might have to be patched for compatibility purposes\n\n    for (const [filter, patchFn] of patchedModules) {\n      if (filter.test(request)) {\n        module.exports = patchFn(exports.findPackageLocator(parent.filename), module.exports);\n      }\n    }\n\n    return module.exports;\n  };\n\n  const originalModuleResolveFilename = Module._resolveFilename;\n\n  Module._resolveFilename = function(request, parent, isMain, options) {\n    if (!enableNativeHooks) {\n      return originalModuleResolveFilename.call(Module, request, parent, isMain, options);\n    }\n\n    let issuers;\n\n    if (options) {\n      const optionNames = new Set(Object.keys(options));\n      optionNames.delete(\'paths\');\n\n      if (optionNames.size > 0) {\n        throw makeError(\n          `UNSUPPORTED`,\n          `Some options passed to require() aren\'t supported by PnP yet (${Array.from(optionNames).join(\', \')})`\n        );\n      }\n\n      if (options.paths) {\n        issuers = options.paths.map(entry => `${path.normalize(entry)}/`);\n      }\n    }\n\n    if (!issuers) {\n      const issuerModule = getIssuerModule(parent);\n      const issuer = issuerModule ? issuerModule.filename : `${process.cwd()}/`;\n\n      issuers = [issuer];\n    }\n\n    let firstError;\n\n    for (const issuer of issuers) {\n      let resolution;\n\n      try {\n        resolution = exports.resolveRequest(request, issuer);\n      } catch (error) {\n        firstError = firstError || error;\n        continue;\n      }\n\n      return resolution !== null ? resolution : request;\n    }\n\n    throw firstError;\n  };\n\n  const originalFindPath = Module._findPath;\n\n  Module._findPath = function(request, paths, isMain) {\n    if (!enableNativeHooks) {\n      return originalFindPath.call(Module, request, paths, isMain);\n    }\n\n    for (const path of paths) {\n      let resolution;\n\n      try {\n        resolution = exports.resolveRequest(request, path);\n      } catch (error) {\n        continue;\n      }\n\n      if (resolution) {\n        return resolution;\n      }\n    }\n\n    return false;\n  };\n\n  process.versions.pnp = String(exports.VERSIONS.std);\n};\n\nexports.setupCompatibilityLayer = () => {\n  // ESLint currently doesn\'t have any portable way for shared configs to specify their own\n  // plugins that should be used (https://github.com/eslint/eslint/issues/10125). This will\n  // likely get fixed at some point, but it\'ll take time and in the meantime we\'ll just add\n  // additional fallback entries for common shared configs.\n\n  for (const name of [`react-scripts`]) {\n    const packageInformationStore = packageInformationStores.get(name);\n    if (packageInformationStore) {\n      for (const reference of packageInformationStore.keys()) {\n        fallbackLocators.push({name, reference});\n      }\n    }\n  }\n\n  // Modern versions of `resolve` support a specific entry point that custom resolvers can use\n  // to inject a specific resolution logic without having to patch the whole package.\n  //\n  // Cf: https://github.com/browserify/resolve/pull/174\n\n  patchedModules.push([\n    /^\\.\\/normalize-options\\.js$/,\n    (issuer, normalizeOptions) => {\n      if (!issuer || issuer.name !== \'resolve\') {\n        return normalizeOptions;\n      }\n\n      return (request, opts) => {\n        opts = opts || {};\n\n        if (opts.forceNodeResolution) {\n          return opts;\n        }\n\n        opts.preserveSymlinks = true;\n        opts.paths = function(request, basedir, getNodeModulesDir, opts) {\n          // Extract the name of the package being requested (1=full name, 2=scope name, 3=local name)\n          const parts = request.match(/^((?:(@[^\\/]+)\\/)?([^\\/]+))/);\n\n          // make sure that basedir ends with a slash\n          if (basedir.charAt(basedir.length - 1) !== \'/\') {\n            basedir = path.join(basedir, \'/\');\n          }\n          // This is guaranteed to return the path to the "package.json" file from the given package\n          const manifestPath = exports.resolveToUnqualified(`${parts[1]}/package.json`, basedir);\n\n          // The first dirname strips the package.json, the second strips the local named folder\n          let nodeModules = path.dirname(path.dirname(manifestPath));\n\n          // Strips the scope named folder if needed\n          if (parts[2]) {\n            nodeModules = path.dirname(nodeModules);\n          }\n\n          return [nodeModules];\n        };\n\n        return opts;\n      };\n    },\n  ]);\n};\n\nif (module.parent && module.parent.id === \'internal/preload\') {\n  exports.setupCompatibilityLayer();\n\n  exports.setup();\n}\n\nif (process.mainModule === module) {\n  exports.setupCompatibilityLayer();\n\n  const reportError = (code, message, data) => {\n    process.stdout.write(`${JSON.stringify([{code, message, data}, null])}\\n`);\n  };\n\n  const reportSuccess = resolution => {\n    process.stdout.write(`${JSON.stringify([null, resolution])}\\n`);\n  };\n\n  const processResolution = (request, issuer) => {\n    try {\n      reportSuccess(exports.resolveRequest(request, issuer));\n    } catch (error) {\n      reportError(error.code, error.message, error.data);\n    }\n  };\n\n  const processRequest = data => {\n    try {\n      const [request, issuer] = JSON.parse(data);\n      processResolution(request, issuer);\n    } catch (error) {\n      reportError(`INVALID_JSON`, error.message, error.data);\n    }\n  };\n\n  if (process.argv.length > 2) {\n    if (process.argv.length !== 4) {\n      process.stderr.write(`Usage: ${process.argv[0]} ${process.argv[1]} <request> <issuer>\\n`);\n      process.exitCode = 64; /* EX_USAGE */\n    } else {\n      processResolution(process.argv[2], process.argv[3]);\n    }\n  } else {\n    let buffer = \'\';\n    const decoder = new StringDecoder.StringDecoder();\n\n    process.stdin.on(\'data\', chunk => {\n      buffer += decoder.write(chunk);\n\n      do {\n        const index = buffer.indexOf(\'\\n\');\n        if (index === -1) {\n          break;\n        }\n\n        const line = buffer.slice(0, index);\n        buffer = buffer.slice(index + 1);\n\n        processRequest(line);\n      } while (true);\n    });\n  }\n}\n';
-
-
-const crypto = __webpack_require__(12);
-const invariant = __webpack_require__(9);
-const path = __webpack_require__(0);
-
-const backwardSlashRegExp = /\\/g;
-
-const OFFLINE_CACHE_EXTENSION = `.zip`;
-
-function generateMaps(packageInformationStores, blacklistedLocations) {
-  let code = ``;
-
-  // Bake the information stores into our generated code
-  code += `let packageInformationStores = new Map([\n`;
-  for (var _iterator = packageInformationStores, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref2;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref2 = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref2 = _i.value;
-    }
-
-    const _ref = _ref2;
-    const packageName = _ref[0];
-    const packageInformationStore = _ref[1];
-
-    code += `  [${JSON.stringify(packageName)}, new Map([\n`;
-    for (var _iterator4 = packageInformationStore, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray4) {
-        if (_i4 >= _iterator4.length) break;
-        _ref7 = _iterator4[_i4++];
-      } else {
-        _i4 = _iterator4.next();
-        if (_i4.done) break;
-        _ref7 = _i4.value;
-      }
-
-      const _ref6 = _ref7;
-      const packageReference = _ref6[0];
-      var _ref6$ = _ref6[1];
-      const packageLocation = _ref6$.packageLocation;
-      const packageDependencies = _ref6$.packageDependencies;
-
-      code += `    [${JSON.stringify(packageReference)}, {\n`;
-      code += `      packageLocation: path.resolve(__dirname, ${JSON.stringify(packageLocation)}),\n`;
-      code += `      packageDependencies: new Map([\n`;
-      for (var _iterator5 = packageDependencies.entries(), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref9;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref9 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref9 = _i5.value;
-        }
-
-        const _ref8 = _ref9;
-        const dependencyName = _ref8[0];
-        const dependencyReference = _ref8[1];
-
-        code += `        [${JSON.stringify(dependencyName)}, ${JSON.stringify(dependencyReference)}],\n`;
-      }
-      code += `      ]),\n`;
-      code += `    }],\n`;
-    }
-    code += `  ])],\n`;
-  }
-  code += `]);\n`;
-
-  code += `\n`;
-
-  // Also bake an inverse map that will allow us to find the package information based on the path
-  code += `let locatorsByLocations = new Map([\n`;
-  for (var _iterator2 = blacklistedLocations, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-    var _ref3;
-
-    if (_isArray2) {
-      if (_i2 >= _iterator2.length) break;
-      _ref3 = _iterator2[_i2++];
-    } else {
-      _i2 = _iterator2.next();
-      if (_i2.done) break;
-      _ref3 = _i2.value;
-    }
-
-    const blacklistedLocation = _ref3;
-
-    code += `  [${JSON.stringify(blacklistedLocation)}, blacklistedLocator],\n`;
-  }
-  for (var _iterator3 = packageInformationStores, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-    var _ref5;
-
-    if (_isArray3) {
-      if (_i3 >= _iterator3.length) break;
-      _ref5 = _iterator3[_i3++];
-    } else {
-      _i3 = _iterator3.next();
-      if (_i3.done) break;
-      _ref5 = _i3.value;
-    }
-
-    const _ref4 = _ref5;
-    const packageName = _ref4[0];
-    const packageInformationStore = _ref4[1];
-
-    for (var _iterator6 = packageInformationStore, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-      var _ref11;
-
-      if (_isArray6) {
-        if (_i6 >= _iterator6.length) break;
-        _ref11 = _iterator6[_i6++];
-      } else {
-        _i6 = _iterator6.next();
-        if (_i6.done) break;
-        _ref11 = _i6.value;
-      }
-
-      const _ref10 = _ref11;
-      const packageReference = _ref10[0];
-      const packageLocation = _ref10[1].packageLocation;
-
-      if (packageName !== null) {
-        code += `  [${JSON.stringify(packageLocation)}, ${JSON.stringify({
-          name: packageName,
-          reference: packageReference
-        })}],\n`;
-      } else {
-        code += `  [${JSON.stringify(packageLocation)}, topLevelLocator],\n`;
-      }
-    }
-  }
-  code += `]);\n`;
-
-  return code;
-}
-
-function generateFindPackageLocator(packageInformationStores) {
-  let code = ``;
-
-  // We get the list of each string length we'll need to check in order to find the current package context
-  const lengths = new Map();
-
-  for (var _iterator7 = packageInformationStores.values(), _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-    var _ref12;
-
-    if (_isArray7) {
-      if (_i7 >= _iterator7.length) break;
-      _ref12 = _iterator7[_i7++];
-    } else {
-      _i7 = _iterator7.next();
-      if (_i7.done) break;
-      _ref12 = _i7.value;
-    }
-
-    const packageInformationStore = _ref12;
-
-    for (var _iterator9 = packageInformationStore.values(), _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref16;
-
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref16 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref16 = _i9.value;
-      }
-
-      const _ref15 = _ref16;
-      const packageLocation = _ref15.packageLocation;
-
-      if (packageLocation === null) {
-        continue;
-      }
-
-      const length = packageLocation.length;
-      const count = (lengths.get(length) || 0) + 1;
-
-      lengths.set(length, count);
-    }
-  }
-
-  // We must try the larger lengths before the smaller ones, because smaller ones might also match the longest ones
-  // (for instance, /project/path will match /project/path/.pnp/global/node_modules/pnp-cf5f9c17b8f8db)
-  const sortedLengths = Array.from(lengths.entries()).sort((a, b) => {
-    return b[0] - a[0];
-  });
-
-  // Generate a function that, given a file path, returns the associated package name
-  code += `exports.findPackageLocator = function findPackageLocator(location) {\n`;
-  code += `  let relativeLocation = normalizePath(path.relative(__dirname, location));\n`;
-  code += `\n`;
-  code += `  if (!relativeLocation.match(isStrictRegExp))\n`;
-  code += `    relativeLocation = \`./\${relativeLocation}\`;\n`;
-  code += `\n`;
-  code += `  if (location.match(isDirRegExp) && relativeLocation.charAt(relativeLocation.length - 1) !== '/')\n`;
-  code += `    relativeLocation = \`\${relativeLocation}/\`;\n`;
-  code += `\n`;
-  code += `  let match;\n`;
-
-  for (var _iterator8 = sortedLengths, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
-    var _ref14;
-
-    if (_isArray8) {
-      if (_i8 >= _iterator8.length) break;
-      _ref14 = _iterator8[_i8++];
-    } else {
-      _i8 = _iterator8.next();
-      if (_i8.done) break;
-      _ref14 = _i8.value;
-    }
-
-    const _ref13 = _ref14;
-    const length = _ref13[0];
-
-    code += `\n`;
-    code += `  if (relativeLocation.length >= ${length} && relativeLocation[${length - 1}] === '/')\n`;
-    code += `    if (match = locatorsByLocations.get(relativeLocation.substr(0, ${length})))\n`;
-    code += `      return blacklistCheck(match);\n`;
-  }
-
-  code += `\n`;
-  code += `  return null;\n`;
-  code += `};\n`;
-
-  return code;
-}
-
-/***/ }),
-/* 580 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getTransitiveDevDependencies = getTransitiveDevDependencies;
-function dependenciesObjectToPatterns(dependencies) {
-  if (!dependencies) {
-    return [];
-  }
-  return Object.keys(dependencies).map(name => `${name}@${(dependencies || {})[name]}`);
-}
-
-// Enumerate all the transitive dependencies of a set of top-level packages
-function getTransitiveDependencies(lockfile, roots) {
-  // Queue of dependency patterns to visit; set of already-visited patterns
-  const queue = [];
-  const patterns = new Set();
-
-  const enqueue = pattern => {
-    if (patterns.has(pattern)) {
-      return;
-    }
-    patterns.add(pattern);
-    queue.push(pattern);
-  };
-
-  roots.forEach(enqueue);
-
-  // Final result set
-  const transitiveDependencies = new Set();
-
-  while (queue.length > 0) {
-    const pattern = queue.shift();
-    const lockManifest = lockfile.getLocked(pattern);
-
-    if (!lockManifest) {
-      continue;
-    }
-
-    // Add the dependency to the result set
-    transitiveDependencies.add(`${lockManifest.name}@${lockManifest.version}`);
-
-    // Enqueue any dependencies of the dependency for processing
-
-    const dependencyPatterns = dependenciesObjectToPatterns(lockManifest.dependencies);
-    dependencyPatterns.forEach(enqueue);
-
-    const optionalDependencyPatterns = dependenciesObjectToPatterns(lockManifest.optionalDependencies);
-    optionalDependencyPatterns.forEach(enqueue);
-  }
-
-  return transitiveDependencies;
-}
-
-function setDifference(x, y) {
-  return new Set([...x].filter(value => !y.has(value)));
-}
-
-// Given a manifest, an optional workspace layout, and a lockfile, enumerate
-// all package versions that:
-// i) are present in the lockfile
-// ii) are a transitive dependency of some top-level devDependency
-// iii) are not a transitive dependency of some top-level production dependency
-function getTransitiveDevDependencies(packageManifest, workspaceLayout, lockfile) {
-  // Enumerate the top-level package manifest as well as any workspace manifests
-  const manifests = [packageManifest];
-  if (workspaceLayout) {
-    for (var _iterator = Object.keys(workspaceLayout.workspaces), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const name = _ref;
-
-      manifests.push(workspaceLayout.workspaces[name].manifest);
-    }
-  }
-
-  // Collect all the top-level production and development dependencies across all manifests
-  let productionRoots = [];
-  let developmentRoots = [];
-  for (var _iterator2 = manifests, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-    var _ref2;
-
-    if (_isArray2) {
-      if (_i2 >= _iterator2.length) break;
-      _ref2 = _iterator2[_i2++];
-    } else {
-      _i2 = _iterator2.next();
-      if (_i2.done) break;
-      _ref2 = _i2.value;
-    }
-
-    const manifest = _ref2;
-
-    productionRoots = productionRoots.concat(dependenciesObjectToPatterns(manifest.dependencies));
-    productionRoots = productionRoots.concat(dependenciesObjectToPatterns(manifest.optionalDependencies));
-    developmentRoots = developmentRoots.concat(dependenciesObjectToPatterns(manifest.devDependencies));
-  }
-
-  // Enumerate all the transitive production and development dependencies
-  const productionDependencies = getTransitiveDependencies(lockfile, productionRoots);
-  const developmentDependencies = getTransitiveDependencies(lockfile, developmentRoots);
-
-  // Exclude any development dependencies that are also production dependencies
-  return setDifference(developmentDependencies, productionDependencies);
-}
-
-/***/ }),
-/* 581 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.parseRefs = exports.resolveVersion = exports.isCommitSha = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _misc;
-
-function _load_misc() {
-  return _misc = __webpack_require__(18);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const semver = __webpack_require__(21);
-
-const REF_PREFIX = 'refs/';
-const REF_TAG_PREFIX = 'refs/tags/';
-const REF_BRANCH_PREFIX = 'refs/heads/';
-const REF_PR_PREFIX = 'refs/pull/';
-
-// This regex is designed to match output from git of the style:
-//   ebeb6eafceb61dd08441ffe086c77eb472842494  refs/tags/v0.21.0
-// and extract the hash and ref name as capture groups
-const GIT_REF_LINE_REGEXP = /^([a-fA-F0-9]+)\s+(refs\/(?:tags|heads|pull|remotes)\/.*)$/;
-
-const COMMIT_SHA_REGEXP = /^[a-f0-9]{5,40}$/;
-const REF_NAME_REGEXP = /^refs\/(tags|heads)\/(.+)$/;
-
-const isCommitSha = exports.isCommitSha = target => COMMIT_SHA_REGEXP.test(target);
-
-const tryVersionAsGitCommit = ({ version, refs, git }) => {
-  const lowercaseVersion = version.toLowerCase();
-  if (!isCommitSha(lowercaseVersion)) {
-    return Promise.resolve(null);
-  }
-  for (var _iterator = refs.entries(), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref2;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref2 = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref2 = _i.value;
-    }
-
-    const _ref = _ref2;
-    const ref = _ref[0];
-    const sha = _ref[1];
-
-    if (sha.startsWith(lowercaseVersion)) {
-      return Promise.resolve({ sha, ref });
-    }
-  }
-  return git.resolveCommit(lowercaseVersion);
-};
-
-const tryEmptyVersionAsDefaultBranch = ({ version, git }) => version.trim() === '' ? git.resolveDefaultBranch() : Promise.resolve(null);
-
-const tryWildcardVersionAsDefaultBranch = ({ version, git }) => version === '*' ? git.resolveDefaultBranch() : Promise.resolve(null);
-
-const tryRef = (refs, ref) => {
-  const sha = refs.get(ref);
-  return sha ? { sha, ref } : null;
-};
-
-const tryVersionAsFullRef = ({ version, refs }) => version.startsWith('refs/') ? tryRef(refs, version) : null;
-
-const tryVersionAsTagName = ({ version, refs }) => tryRef(refs, `${REF_TAG_PREFIX}${version}`);
-
-const tryVersionAsPullRequestNo = ({ version, refs }) => tryRef(refs, `${REF_PR_PREFIX}${version}`);
-
-const tryVersionAsBranchName = ({ version, refs }) => tryRef(refs, `${REF_BRANCH_PREFIX}${version}`);
-
-const tryVersionAsDirectRef = ({ version, refs }) => tryRef(refs, `${REF_PREFIX}${version}`);
-
-const computeSemverNames = ({ config, refs }) => {
-  const names = {
-    tags: [],
-    heads: []
-  };
-  for (var _iterator2 = refs.keys(), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-    var _ref3;
-
-    if (_isArray2) {
-      if (_i2 >= _iterator2.length) break;
-      _ref3 = _iterator2[_i2++];
-    } else {
-      _i2 = _iterator2.next();
-      if (_i2.done) break;
-      _ref3 = _i2.value;
-    }
-
-    const ref = _ref3;
-
-    const match = REF_NAME_REGEXP.exec(ref);
-    if (!match) {
-      continue;
-    }
-    const type = match[1],
-          name = match[2];
-
-    if (semver.valid(name, config.looseSemver)) {
-      names[type].push(name);
-    }
-  }
-  return names;
-};
-
-const findSemver = (version, config, namesList) => config.resolveConstraints(namesList, version);
-
-const tryVersionAsTagSemver = (() => {
-  var _ref4 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({ version, config, refs }, names) {
-    const result = yield findSemver(version.replace(/^semver:/, ''), config, names.tags);
-    return result ? tryRef(refs, `${REF_TAG_PREFIX}${result}`) : null;
-  });
-
-  return function tryVersionAsTagSemver(_x, _x2) {
-    return _ref4.apply(this, arguments);
-  };
-})();
-
-const tryVersionAsBranchSemver = (() => {
-  var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* ({ version, config, refs }, names) {
-    const result = yield findSemver(version.replace(/^semver:/, ''), config, names.heads);
-    return result ? tryRef(refs, `${REF_BRANCH_PREFIX}${result}`) : null;
-  });
-
-  return function tryVersionAsBranchSemver(_x3, _x4) {
-    return _ref5.apply(this, arguments);
-  };
-})();
-
-const tryVersionAsSemverRange = (() => {
-  var _ref6 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) {
-    const names = computeSemverNames(options);
-    return (yield tryVersionAsTagSemver(options, names)) || tryVersionAsBranchSemver(options, names);
-  });
-
-  return function tryVersionAsSemverRange(_x5) {
-    return _ref6.apply(this, arguments);
-  };
-})();
-
-const VERSION_RESOLUTION_STEPS = [tryEmptyVersionAsDefaultBranch, tryVersionAsGitCommit, tryVersionAsFullRef, tryVersionAsTagName, tryVersionAsPullRequestNo, tryVersionAsBranchName, tryVersionAsSemverRange, tryWildcardVersionAsDefaultBranch, tryVersionAsDirectRef];
-
-/**
- * Resolve a git-url hash (version) to a git commit sha and branch/tag ref
- * Returns null if the version cannot be resolved to any commit
- */
-
-const resolveVersion = exports.resolveVersion = (() => {
-  var _ref7 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (options) {
-    for (var _iterator3 = VERSION_RESOLUTION_STEPS, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref8;
-
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref8 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref8 = _i3.value;
-      }
-
-      const testFunction = _ref8;
-
-      const result = yield testFunction(options);
-      if (result !== null) {
-        return result;
-      }
-    }
-    return null;
-  });
-
-  return function resolveVersion(_x6) {
-    return _ref7.apply(this, arguments);
-  };
-})();
-
-/**
- * Parse Git ref lines into hash of ref names to SHA hashes
- */
-
-const parseRefs = exports.parseRefs = stdout => {
-  // store references
-  const refs = new Map();
-
-  // line delimited
-  const refLines = stdout.split('\n');
-
-  for (var _iterator4 = refLines, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-    var _ref9;
-
-    if (_isArray4) {
-      if (_i4 >= _iterator4.length) break;
-      _ref9 = _iterator4[_i4++];
-    } else {
-      _i4 = _iterator4.next();
-      if (_i4.done) break;
-      _ref9 = _i4.value;
-    }
-
-    const line = _ref9;
-
-    const match = GIT_REF_LINE_REGEXP.exec(line);
-
-    if (match) {
-      const sha = match[1],
-            tagName = match[2];
-
-      // As documented in gitrevisions:
-      //   https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html#_specifying_revisions
-      // "A suffix ^ followed by an empty brace pair means the object could be a tag,
-      //   and dereference the tag recursively until a non-tag object is found."
-      // In other words, the hash without ^{} is the hash of the tag,
-      //   and the hash with ^{} is the hash of the commit at which the tag was made.
-
-      const name = (0, (_misc || _load_misc()).removeSuffix)(tagName, '^{}');
-
-      refs.set(name, sha);
-    }
-  }
-
-  return refs;
-};
-
-/***/ }),
-/* 582 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LogicalDependencyTree = undefined;
-
-var _npmLogicalTree;
-
-function _load_npmLogicalTree() {
-  return _npmLogicalTree = _interopRequireDefault(__webpack_require__(766));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class LogicalDependencyTree {
-  constructor(packageJson, packageLock) {
-    this.tree = (0, (_npmLogicalTree || _load_npmLogicalTree()).default)(JSON.parse(packageJson), JSON.parse(packageLock));
-  }
-
-  _findNode(name, parentNames) {
-    const parentTree = parentNames ? parentNames.reduce((node, ancestor) => {
-      const ancestorNode = node.dependencies.get(ancestor);
-      return ancestorNode;
-    }, this.tree) : this.tree;
-    const node = parentTree.dependencies.get(name);
-    return node;
-  }
-  getFixedVersionPattern(name, parentNames) {
-    const node = this._findNode(name, parentNames);
-    const version = node.version;
-    return `${node.name}@${version}`;
-  }
-}
-exports.LogicalDependencyTree = LogicalDependencyTree;
-
-/***/ }),
-/* 583 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _util;
-
-function _load_util() {
-  return _util = __webpack_require__(221);
-}
-
-var _index;
-
-function _load_index() {
-  return _index = __webpack_require__(78);
-}
-
-var _inferLicense;
-
-function _load_inferLicense() {
-  return _inferLicense = _interopRequireDefault(__webpack_require__(584));
-}
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const semver = __webpack_require__(21);
-const path = __webpack_require__(0);
-const url = __webpack_require__(24);
-
-const LICENSE_RENAMES = {
-  'MIT/X11': 'MIT',
-  X11: 'MIT'
-};
-
-exports.default = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (info, moduleLoc, reporter, warn, looseSemver) {
-    const files = yield (_fs || _load_fs()).readdir(moduleLoc);
-
-    // clean info.version
-    if (typeof info.version === 'string') {
-      info.version = semver.clean(info.version, looseSemver) || info.version;
-    }
-
-    // if name or version aren't set then set them to empty strings
-    info.name = info.name || '';
-    info.version = info.version || '';
-
-    // if the man field is a string then coerce it to an array
-    if (typeof info.man === 'string') {
-      info.man = [info.man];
-    }
-
-    // if the keywords field is a string then split it on any whitespace
-    if (typeof info.keywords === 'string') {
-      info.keywords = info.keywords.split(/\s+/g);
-    }
-
-    // if there's no contributors field but an authors field then expand it
-    if (!info.contributors && files.indexOf('AUTHORS') >= 0) {
-      const authorsFilepath = path.join(moduleLoc, 'AUTHORS');
-      const authorsFilestats = yield (_fs || _load_fs()).stat(authorsFilepath);
-      if (authorsFilestats.isFile()) {
-        let authors = yield (_fs || _load_fs()).readFile(authorsFilepath);
-        authors = authors.split(/\r?\n/g) // split on lines
-        .map(function (line) {
-          return line.replace(/^\s*#.*$/, '').trim();
-        }) // remove comments
-        .filter(function (line) {
-          return !!line;
-        }); // remove empty lines
-        info.contributors = authors;
-      }
-    }
-
-    // expand people fields to objects
-    if (typeof info.author === 'string' || typeof info.author === 'object') {
-      info.author = (0, (_util || _load_util()).normalizePerson)(info.author);
-    }
-    if (Array.isArray(info.contributors)) {
-      info.contributors = info.contributors.map((_util || _load_util()).normalizePerson);
-    }
-    if (Array.isArray(info.maintainers)) {
-      info.maintainers = info.maintainers.map((_util || _load_util()).normalizePerson);
-    }
-
-    // if there's no readme field then load the README file from the cwd
-    if (!info.readme) {
-      const readmeCandidates = files.filter(function (filename) {
-        const lower = filename.toLowerCase();
-        return lower === 'readme' || lower.indexOf('readme.') === 0;
-      }).sort(function (filename1, filename2) {
-        // favor files with extensions
-        return filename2.indexOf('.') - filename1.indexOf('.');
-      });
-
-      for (var _iterator = readmeCandidates, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref2;
-
-        if (_isArray) {
-          if (_i >= _iterator.length) break;
-          _ref2 = _iterator[_i++];
-        } else {
-          _i = _iterator.next();
-          if (_i.done) break;
-          _ref2 = _i.value;
-        }
-
-        const readmeFilename = _ref2;
-
-        const readmeFilepath = path.join(moduleLoc, readmeFilename);
-        const readmeFileStats = yield (_fs || _load_fs()).stat(readmeFilepath);
-        if (readmeFileStats.isFile()) {
-          info.readmeFilename = readmeFilename;
-          info.readme = yield (_fs || _load_fs()).readFile(readmeFilepath);
-          break;
-        }
-      }
-    }
-
-    // if there's no description then take the first paragraph from the readme
-    if (!info.description && info.readme) {
-      const desc = (0, (_util || _load_util()).extractDescription)(info.readme);
-      if (desc) {
-        info.description = desc;
-      }
-    }
-
-    // support array of engine keys
-    if (Array.isArray(info.engines)) {
-      const engines = {};
-      for (var _iterator2 = info.engines, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref3;
-
-        if (_isArray2) {
-          if (_i2 >= _iterator2.length) break;
-          _ref3 = _iterator2[_i2++];
-        } else {
-          _i2 = _iterator2.next();
-          if (_i2.done) break;
-          _ref3 = _i2.value;
-        }
-
-        const str = _ref3;
-
-        if (typeof str === 'string') {
-          var _str$trim$split = str.trim().split(/ +/g);
-
-          const name = _str$trim$split[0],
-                patternParts = _str$trim$split.slice(1);
-
-          engines[name] = patternParts.join(' ');
-        }
-      }
-      info.engines = engines;
-    }
-
-    // if the repository field is a string then assume it's a git repo and expand it
-    if (typeof info.repository === 'string') {
-      info.repository = {
-        type: 'git',
-        url: info.repository
-      };
-    }
-
-    const repo = info.repository;
-
-    // explode info.repository.url if it's a hosted git shorthand
-    if (repo && typeof repo === 'object' && typeof repo.url === 'string') {
-      repo.url = (0, (_index || _load_index()).hostedGitFragmentToGitUrl)(repo.url, reporter);
-    }
-
-    // allow bugs to be specified as a string, expand it to an object with a single url prop
-    if (typeof info.bugs === 'string') {
-      info.bugs = { url: info.bugs };
-    }
-
-    // normalize homepage url to http
-    if (typeof info.homepage === 'string') {
-      const parts = url.parse(info.homepage);
-      parts.protocol = parts.protocol || 'http:';
-      if (parts.pathname && !parts.hostname) {
-        parts.hostname = parts.pathname;
-        parts.pathname = '';
-      }
-      info.homepage = url.format(parts);
-    }
-
-    // if the `bin` field is as string then expand it to an object with a single property
-    // based on the original `bin` field and `name field`
-    // { name: "foo", bin: "cli.js" } -> { name: "foo", bin: { foo: "cli.js" } }
-    if (typeof info.name === 'string' && typeof info.bin === 'string' && info.bin.length > 0) {
-      // Remove scoped package name for consistency with NPM's bin field fixing behaviour
-      const name = info.name.replace(/^@[^\/]+\//, '');
-      info.bin = { [name]: info.bin };
-    }
-
-    // bundleDependencies is an alias for bundledDependencies
-    if (info.bundledDependencies) {
-      info.bundleDependencies = info.bundledDependencies;
-      delete info.bundledDependencies;
-    }
-
-    let scripts;
-
-    // dummy script object to shove file inferred scripts onto
-    if (info.scripts && typeof info.scripts === 'object') {
-      scripts = info.scripts;
-    } else {
-      scripts = {};
-    }
-
-    // if there's a server.js file and no start script then set it to `node server.js`
-    if (!scripts.start && files.indexOf('server.js') >= 0) {
-      scripts.start = 'node server.js';
-    }
-
-    // if there's a binding.gyp file and no install script then set it to `node-gyp rebuild`
-    if (!scripts.install && files.indexOf('binding.gyp') >= 0) {
-      scripts.install = 'node-gyp rebuild';
-    }
-
-    // set scripts if we've polluted the empty object
-    if (Object.keys(scripts).length) {
-      info.scripts = scripts;
-    }
-
-    const dirs = info.directories;
-
-    if (dirs && typeof dirs === 'object') {
-      const binDir = dirs.bin;
-
-      if (!info.bin && binDir && typeof binDir === 'string') {
-        const bin = info.bin = {};
-        const fullBinDir = path.join(moduleLoc, binDir);
-
-        if (yield (_fs || _load_fs()).exists(fullBinDir)) {
-          for (var _iterator3 = yield (_fs || _load_fs()).readdir(fullBinDir), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-            var _ref4;
-
-            if (_isArray3) {
-              if (_i3 >= _iterator3.length) break;
-              _ref4 = _iterator3[_i3++];
-            } else {
-              _i3 = _iterator3.next();
-              if (_i3.done) break;
-              _ref4 = _i3.value;
-            }
-
-            const scriptName = _ref4;
-
-            if (scriptName[0] === '.') {
-              continue;
-            }
-            bin[scriptName] = path.join('.', binDir, scriptName);
-          }
-        } else {
-          warn(reporter.lang('manifestDirectoryNotFound', binDir, info.name));
-        }
-      }
-
-      const manDir = dirs.man;
-
-      if (!info.man && typeof manDir === 'string') {
-        const man = info.man = [];
-        const fullManDir = path.join(moduleLoc, manDir);
-
-        if (yield (_fs || _load_fs()).exists(fullManDir)) {
-          for (var _iterator4 = yield (_fs || _load_fs()).readdir(fullManDir), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-            var _ref5;
-
-            if (_isArray4) {
-              if (_i4 >= _iterator4.length) break;
-              _ref5 = _iterator4[_i4++];
-            } else {
-              _i4 = _iterator4.next();
-              if (_i4.done) break;
-              _ref5 = _i4.value;
-            }
-
-            const filename = _ref5;
-
-            if (/^(.*?)\.[0-9]$/.test(filename)) {
-              man.push(path.join('.', manDir, filename));
-            }
-          }
-        } else {
-          warn(reporter.lang('manifestDirectoryNotFound', manDir, info.name));
-        }
-      }
-    }
-
-    delete info.directories;
-
-    // normalize licenses field
-    const licenses = info.licenses;
-    if (Array.isArray(licenses) && !info.license) {
-      let licenseTypes = [];
-
-      for (var _iterator5 = licenses, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
-        var _ref6;
-
-        if (_isArray5) {
-          if (_i5 >= _iterator5.length) break;
-          _ref6 = _iterator5[_i5++];
-        } else {
-          _i5 = _iterator5.next();
-          if (_i5.done) break;
-          _ref6 = _i5.value;
-        }
-
-        let license = _ref6;
-
-        if (license && typeof license === 'object') {
-          license = license.type;
-        }
-        if (typeof license === 'string') {
-          licenseTypes.push(license);
-        }
-      }
-
-      licenseTypes = licenseTypes.filter((_util || _load_util()).isValidLicense);
-
-      if (licenseTypes.length === 1) {
-        info.license = licenseTypes[0];
-      } else if (licenseTypes.length) {
-        info.license = `(${licenseTypes.join(' OR ')})`;
-      }
-    }
-
-    const license = info.license;
-
-    // normalize license
-    if (license && typeof license === 'object') {
-      info.license = license.type;
-    }
-
-    // get license file
-    const licenseFile = files.find(function (filename) {
-      const lower = filename.toLowerCase();
-      return lower === 'license' || lower.startsWith('license.') || lower === 'unlicense' || lower.startsWith('unlicense.');
-    });
-    if (licenseFile) {
-      const licenseFilepath = path.join(moduleLoc, licenseFile);
-      const licenseFileStats = yield (_fs || _load_fs()).stat(licenseFilepath);
-      if (licenseFileStats.isFile()) {
-        const licenseContent = yield (_fs || _load_fs()).readFile(licenseFilepath);
-        const inferredLicense = (0, (_inferLicense || _load_inferLicense()).default)(licenseContent);
-        info.licenseText = licenseContent;
-
-        const license = info.license;
-
-        if (typeof license === 'string') {
-          if (inferredLicense && (0, (_util || _load_util()).isValidLicense)(inferredLicense) && !(0, (_util || _load_util()).isValidLicense)(license)) {
-            // some packages don't specify their license version but we can infer it based on their license file
-            const basicLicense = license.toLowerCase().replace(/(-like|\*)$/g, '');
-            const expandedLicense = inferredLicense.toLowerCase();
-            if (expandedLicense.startsWith(basicLicense)) {
-              // TODO consider doing something to notify the user
-              info.license = inferredLicense;
-            }
-          }
-        } else if (inferredLicense) {
-          // if there's no license then infer it based on the license file
-          info.license = inferredLicense;
-        } else {
-          // valid expression to refer to a license in a file
-          info.license = `SEE LICENSE IN ${licenseFile}`;
-        }
-      }
-    }
-
-    if (typeof info.license === 'string') {
-      // sometimes licenses are known by different names, reduce them
-      info.license = LICENSE_RENAMES[info.license] || info.license;
-    } else if (typeof info.readme === 'string') {
-      // the license might be at the bottom of the README
-      const inferredLicense = (0, (_inferLicense || _load_inferLicense()).default)(info.readme);
-      if (inferredLicense) {
-        info.license = inferredLicense;
-      }
-    }
-
-    // get notice file
-    const noticeFile = files.find(function (filename) {
-      const lower = filename.toLowerCase();
-      return lower === 'notice' || lower.startsWith('notice.');
-    });
-    if (noticeFile) {
-      const noticeFilepath = path.join(moduleLoc, noticeFile);
-      const noticeFileStats = yield (_fs || _load_fs()).stat(noticeFilepath);
-      if (noticeFileStats.isFile()) {
-        info.noticeText = yield (_fs || _load_fs()).readFile(noticeFilepath);
-      }
-    }
-
-    for (var _iterator6 = (_constants || _load_constants()).MANIFEST_FIELDS, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
-      var _ref7;
-
-      if (_isArray6) {
-        if (_i6 >= _iterator6.length) break;
-        _ref7 = _iterator6[_i6++];
-      } else {
-        _i6 = _iterator6.next();
-        if (_i6.done) break;
-        _ref7 = _i6.value;
-      }
-
-      const dependencyType = _ref7;
-
-      const dependencyList = info[dependencyType];
-      if (dependencyList && typeof dependencyList === 'object') {
-        delete dependencyList['//'];
-        for (const name in dependencyList) {
-          dependencyList[name] = dependencyList[name] || '';
-        }
-      }
-    }
-  });
-
-  return function (_x, _x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-/***/ }),
-/* 584 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = inferLicense;
-
-var _licenses;
-
-function _load_licenses() {
-  return _licenses = _interopRequireDefault(__webpack_require__(585));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function clean(str) {
-  return str.replace(/[^A-Za-z\s]/g, ' ').replace(/[\s]+/g, ' ').trim().toLowerCase();
-}
-
-const REGEXES = {
-  Apache: [/Apache License\b/],
-  BSD: [/BSD\b/],
-  ISC: [/The ISC License/, /ISC\b/],
-  MIT: [/MIT\b/],
-  Unlicense: [/http:\/\/unlicense.org\//],
-  WTFPL: [/DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE/, /WTFPL\b/]
-};
-
-function inferLicense(license) {
-  // check if we have any explicit licenses
-  const cleanLicense = clean(license);
-  for (const licenseName in (_licenses || _load_licenses()).default) {
-    const testLicense = (_licenses || _load_licenses()).default[licenseName];
-    if (cleanLicense.search(testLicense) >= 0) {
-      return licenseName;
-    }
-  }
-
-  // infer based on some keywords
-  for (const licenseName in REGEXES) {
-    for (var _iterator = REGEXES[licenseName], _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
-
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
-
-      const regex = _ref;
-
-      if (license.search(regex) >= 0) {
-        return `${licenseName}*`;
-      }
-    }
-  }
-
-  return null;
-}
-
-/***/ }),
-/* 585 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-
-/* eslint-disable max-len */
-
-/**
- * DO NOT EDIT THIS FILE MANUALLY.
- * THIS FILE WAS GENERATED BY "generate-licenses-js.js".
- */
-
-exports.default = {
-  'Apache-2.0': new RegExp('(licensed under the apache license version the license you may not use this file except in compliance with the license you may obtain a copy of the license at http www apache org licenses license unless required by applicable law or agreed to in writing software distributed under the license is distributed on an as is basis without warranties or conditions of any kind either express or implied see the license for the specific language governing permissions and limitations under the license$|apache license version january http www apache org licenses terms and conditions for use reproduction and distribution definitions license shall mean the terms and conditions for use reproduction and distribution as defined by sections through of this document licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the license legal entity shall mean the union of the acting entity and all other entities that control are controlled by or are under common control with that entity for the purposes of this definition control means i the power direct or indirect to cause the direction or management of such entity whether by contract or otherwise or ii ownership of fifty percent or more of the outstanding shares or iii beneficial ownership of such entity you or your shall mean an individual or legal entity exercising permissions granted by this license source form shall mean the preferred form for making modifications including but not limited to software source code documentation source and configuration files object form shall mean any form resulting from mechanical transformation or translation of a source form including but not limited to compiled object code generated documentation and conversions to other media types work shall mean the work of authorship whether in source or object form made available under the license as indicated by a copyright notice that is included in or attached to the work an example is provided in the appendix below derivative works shall mean any work whether in source or object form that is based on or derived from the work and for which the editorial revisions annotations elaborations or other modifications represent as a whole an original work of authorship for the purposes of this license derivative works shall not include works that remain separable from or merely link or bind by name to the interfaces of the work and derivative works thereof contribution shall mean any work of authorship including the original version of the work and any modifications or additions to that work or derivative works thereof that is intentionally submitted to licensor for inclusion in the work by the copyright owner or by an individual or legal entity authorized to submit on behalf of the copyright owner for the purposes of this definition submitted means any form of electronic verbal or written communication sent to the licensor or its representatives including but not limited to communication on electronic mailing lists source code control systems and issue tracking systems that are managed by or on behalf of the licensor for the purpose of discussing and improving the work but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as not a contribution contributor shall mean licensor and any individual or legal entity on behalf of whom a contribution has been received by licensor and subsequently incorporated within the work grant of copyright license subject to the terms and conditions of this license each contributor hereby grants to you a perpetual worldwide non exclusive no charge royalty free irrevocable copyright license to reproduce prepare derivative works of publicly display publicly perform sublicense and distribute the work and such derivative works in source or object form grant of patent license subject to the terms and conditions of this license each contributor hereby grants to you a perpetual worldwide non exclusive no charge royalty free irrevocable except as stated in this section patent license to make have made use offer to sell sell import and otherwise transfer the work where such license applies only to those patent claims licensable by such contributor that are necessarily infringed by their contribution s alone or by combination of their contribution s with the work to which such contribution s was submitted if you institute patent litigation against any entity including a cross claim or counterclaim in a lawsuit alleging that the work or a contribution incorporated within the work constitutes direct or contributory patent infringement then any patent licenses granted to you under this license for that work shall terminate as of the date such litigation is filed redistribution you may reproduce and distribute copies of the work or derivative works thereof in any medium with or without modifications and in source or object form provided that you meet the following conditions a you must give any other recipients of the work or derivative works a copy of this license and b you must cause any modified files to carry prominent notices stating that you changed the files and c you must retain in the source form of any derivative works that you distribute all copyright patent trademark and attribution notices from the source form of the work excluding those notices that do not pertain to any part of the derivative works and d if the work includes a notice text file as part of its distribution then any derivative works that you distribute must include a readable copy of the attribution notices contained within such notice file excluding those notices that do not pertain to any part of the derivative works in at least one of the following places within a notice text file distributed as part of the derivative works within the source form or documentation if provided along with the derivative works or within a display generated by the derivative works if and wherever such third party notices normally appear the contents of the notice file are for informational purposes only and do not modify the license you may add your own attribution notices within derivative works that you distribute alongside or as an addendum to the notice text from the work provided that such additional attribution notices cannot be construed as modifying the license you may add your own copyright statement to your modifications and may provide additional or different license terms and conditions for use reproduction or distribution of your modifications or for any such derivative works as a whole provided your use reproduction and distribution of the work otherwise complies with the conditions stated in this license submission of contributions unless you explicitly state otherwise any contribution intentionally submitted for inclusion in the work by you to the licensor shall be under the terms and conditions of this license without any additional terms or conditions notwithstanding the above nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with licensor regarding such contributions trademarks this license does not grant permission to use the trade names trademarks service marks or product names of the licensor except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the notice file disclaimer of warranty unless required by applicable law or agreed to in writing licensor provides the work and each contributor provides its contributions on an as is basis without warranties or conditions of any kind either express or implied including without limitation any warranties or conditions of title non infringement merchantability or fitness for a particular purpose you are solely responsible for determining the appropriateness of using or redistributing the work and assume any risks associated with your exercise of permissions under this license limitation of liability in no event and under no legal theory whether in tort including negligence contract or otherwise unless required by applicable law such as deliberate and grossly negligent acts or agreed to in writing shall any contributor be liable to you for damages including any direct indirect special incidental or consequential damages of any character arising as a result of this license or out of the use or inability to use the work including but not limited to damages for loss of goodwill work stoppage computer failure or malfunction or any and all other commercial damages or losses even if such contributor has been advised of the possibility of such damages accepting warranty or additional liability while redistributing the work or derivative works thereof you may choose to offer and charge a fee for acceptance of support warranty indemnity or other liability obligations and or rights consistent with this license however in accepting such obligations you may act only on your own behalf and on your sole responsibility not on behalf of any other contributor and only if you agree to indemnify defend and hold each contributor harmless for any liability incurred by or claims asserted against such contributor by reason of your accepting any such warranty or additional liability end of terms and conditions$)', 'g'),
-  'BSD-2-Clause': new RegExp('(redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution this(.*?| )is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this(.*?| )even if advised of the possibility of such damage$|redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution this software is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$)', 'g'),
-  'BSD-3-Clause': new RegExp('(redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution neither the name of(.*?| )nor the names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission this software is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$|(redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution the names of any contributors may not be used to endorse or promote products derived from this software without specific prior written permission this software is provided by the copyright holders and contributors as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall the copyright holders and contributors be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$|redistribution and use in source and binary forms with or without modification are permitted provided that the following conditions are met redistributions of source code must retain the above copyright notice this list of conditions and the following disclaimer redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and or other materials provided with the distribution neither the name(.*?| )nor the names of(.*?| )contributors may be used to endorse or promote products derived from this software without specific prior written permission this software is provided by(.*?| )as is and any express or implied warranties including but not limited to the implied warranties of merchantability and fitness for a particular purpose are disclaimed in no event shall(.*?| )be liable for any direct indirect incidental special exemplary or consequential damages including but not limited to procurement of substitute goods or services loss of use data or profits or business interruption however caused and on any theory of liability whether in contract strict liability or tort including negligence or otherwise arising in any way out of the use of this software even if advised of the possibility of such damage$))', 'g'),
-  MIT: new RegExp('permission is hereby granted free of charge to any person obtaining a copy of this software and associated documentation files the software to deal in the software without restriction including without limitation the rights to use copy modify merge publish distribute sublicense and or sell copies of the software and to permit persons to whom the software is furnished to do so subject to the following conditions the above copyright notice and this permission notice shall be included in all copies or substantial portions of the software the software is provided as is without warranty of any kind express or implied including but not limited to the warranties of merchantability fitness for a particular purpose and noninfringement in no event shall the authors or copyright holders be liable for any claim damages or other liability whether in an action of contract tort or otherwise arising from out of or in connection with the software or the use or other dealings in the software$', 'g'),
-  Unlicense: new RegExp('this is free and unencumbered software released into the public domain anyone is free to copy modify publish use compile sell or distribute this software either in source code form or as a compiled binary for any purpose commercial or non commercial and by any means in jurisdictions that recognize copyright laws the author or authors of this software dedicate any and all copyright interest in the software to the public domain we make this dedication for the benefit of the public at large and to the detriment of our heirs and successors we intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law the software is provided as is without warranty of any kind express or implied including but not limited to the warranties of merchantability fitness for a particular purpose and noninfringement in no event shall the authors be liable for any claim damages or other liability whether in an action of contract tort or otherwise arising from out of or in connection with the software or the use or other dealings in the software for more information please refer to wildcard$', 'g')
-};
-
-/***/ }),
-/* 586 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-exports.default = function (info, moduleLoc, lockfileFolder) {
-  // It won't work if we don't yet know what's the folder we'll use as root. It's not a
-  // big deal tho, because it only happens when trying to figure out the root, and we
-  // don't need to know the dependencies / devDependencies at this time.
-  if (!lockfileFolder) {
-    return;
-  }
-
-  for (var _iterator = (_constants || _load_constants()).DEPENDENCY_TYPES, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const dependencyType = _ref;
-
-    const dependencies = info[dependencyType];
-    if (!dependencies) {
-      continue;
-    }
-
-    for (var _iterator2 = Object.keys(dependencies), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref2;
-
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref2 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref2 = _i2.value;
-      }
-
-      const name = _ref2;
-
-      let value = dependencies[name];
-
-      if (path.isAbsolute(value)) {
-        value = (_fileResolver || _load_fileResolver()).FILE_PROTOCOL_PREFIX + value;
-      }
-
-      let prefix;
-      if (value.startsWith((_fileResolver || _load_fileResolver()).FILE_PROTOCOL_PREFIX)) {
-        prefix = (_fileResolver || _load_fileResolver()).FILE_PROTOCOL_PREFIX;
-      } else if (value.startsWith((_linkResolver || _load_linkResolver()).LINK_PROTOCOL_PREFIX)) {
-        prefix = (_linkResolver || _load_linkResolver()).LINK_PROTOCOL_PREFIX;
-      } else {
-        continue;
-      }
-      (0, (_invariant || _load_invariant()).default)(prefix, 'prefix is definitely defined here');
-
-      const unprefixed = value.substr(prefix.length);
-      const hasPathPrefix = /^\.(\/|$)/.test(unprefixed);
-
-      const absoluteTarget = path.resolve(lockfileFolder, moduleLoc, unprefixed);
-      let relativeTarget = path.relative(lockfileFolder, absoluteTarget) || '.';
-
-      if (absoluteTarget === lockfileFolder) {
-        relativeTarget = '.';
-      } else if (hasPathPrefix) {
-        // TODO: This logic should be removed during the next major bump
-        // If the original value was using the "./" prefix, then we output a similar path.
-        // We need to do this because otherwise it would cause problems with already existing
-        // lockfile, which would see some of their entries being unrecognized.
-        relativeTarget = relativeTarget.replace(/^(?!\.{0,2}\/)/, `./`);
-      }
-
-      dependencies[name] = prefix + relativeTarget.replace(/\\/g, '/');
-    }
-  }
-};
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-var _fileResolver;
-
-function _load_fileResolver() {
-  return _fileResolver = __webpack_require__(215);
-}
-
-var _linkResolver;
-
-function _load_linkResolver() {
-  return _linkResolver = __webpack_require__(368);
-}
-
-var _invariant;
-
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(9));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-/***/ }),
-/* 587 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = {
-  autohr: 'author',
-  autor: 'author',
-  contributers: 'contributors',
-  depdenencies: 'dependencies',
-  dependancies: 'dependencies',
-  dependecies: 'dependencies',
-  depends: 'dependencies',
-  'dev-dependencies': 'devDependencies',
-  devDependences: 'devDependencies',
-  devDepenencies: 'devDependencies',
-  devEependencies: 'devDependencies',
-  devdependencies: 'devDependencies',
-  hampage: 'homepage',
-  hompage: 'homepage',
-  prefereGlobal: 'preferGlobal',
-  publicationConfig: 'publishConfig',
-  repo: 'repository',
-  repostitory: 'repository',
-  script: 'scripts'
-};
-
-/***/ }),
-/* 588 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = parsePackageName;
-
-
-const PKG_INPUT = /(^\S?[^\s@]+)(?:@(\S+))?$/;
-
-function parsePackageName(input) {
-  var _PKG_INPUT$exec = PKG_INPUT.exec(input);
-
-  const name = _PKG_INPUT$exec[1],
-        version = _PKG_INPUT$exec[2];
-
-  return { name, version };
-}
-
-/***/ }),
-/* 589 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let makePortableProxyScriptUnix = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (source, destination, options) {
-    const environment = options.extraEnvironment ? Array.from(options.extraEnvironment.entries()).map(function ([key, value]) {
-      return `${key}="${value}"`;
-    }).join(' ') + ' ' : '';
-
-    const prependedArguments = options.prependArguments ? ' ' + options.prependArguments.map(function (arg) {
-      return `"${arg}"`;
-    }).join(' ') : '';
-    const appendedArguments = options.appendArguments ? ' ' + options.appendArguments.map(function (arg) {
-      return `"${arg}"`;
-    }).join(' ') : '';
-
-    const filePath = `${destination}/${options.proxyBasename || path.basename(source)}`;
-
-    // Unless impossible we want to preserve any symlinks used to call us when forwarding the call to the binary (so we
-    // cannot use realpath or transform relative paths into absolute ones), but we also need to tell the sh interpreter
-    // that the symlink should be resolved relative to the script directory (hence dirname "$0" at runtime).
-    const sourcePath = path.isAbsolute(source) ? source : `$(dirname "$0")/../${source}`;
-
-    yield (_fs || _load_fs()).mkdirp(destination);
-
-    if (process.platform === 'win32') {
-      yield (_fs || _load_fs()).writeFile(filePath + '.cmd', `@${environment}"${sourcePath}" ${prependedArguments} ${appendedArguments} %*\r\n`);
-    } else {
-      yield (_fs || _load_fs()).writeFile(filePath, `#!/bin/sh\n\n${environment}exec "${sourcePath}"${prependedArguments} "$@"${appendedArguments}\n`);
-      yield (_fs || _load_fs()).chmod(filePath, 0o755);
-    }
-  });
-
-  return function makePortableProxyScriptUnix(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-exports.makePortableProxyScript = makePortableProxyScript;
-
-var _fs;
-
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const path = __webpack_require__(0);
-
-function makePortableProxyScript(source, destination,
-// $FlowFixMe Flow doesn't support exact types with empty default values
-options = {}) {
-  return makePortableProxyScriptUnix(source, destination, options);
-}
-
-/***/ }),
-/* 590 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findRc = findRc;
-
-var _fs;
-
-function _load_fs() {
-  return _fs = __webpack_require__(5);
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireWildcard(__webpack_require__(0));
-}
-
-var _constants;
-
-function _load_constants() {
-  return _constants = __webpack_require__(8);
-}
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-const etc = '/etc';
-
-const isWin = process.platform === 'win32';
-const home = isWin ? process.env.USERPROFILE : process.env.HOME;
-
-function getRcPaths(name, cwd) {
-  const configPaths = [];
-
-  function pushConfigPath(...segments) {
-    configPaths.push((_path || _load_path()).join(...segments));
-    if (segments[segments.length - 1] === `.${name}rc`) {
-      configPaths.push((_path || _load_path()).join(...segments.slice(0, -1), `.${name}rc.yml`));
-    }
-  }
-
-  function unshiftConfigPath(...segments) {
-    if (segments[segments.length - 1] === `.${name}rc`) {
-      configPaths.unshift((_path || _load_path()).join(...segments.slice(0, -1), `.${name}rc.yml`));
-    }
-    configPaths.unshift((_path || _load_path()).join(...segments));
-  }
-
-  if (!isWin) {
-    pushConfigPath(etc, name, 'config');
-    pushConfigPath(etc, `${name}rc`);
-  }
-
-  if (home) {
-    pushConfigPath((_constants || _load_constants()).CONFIG_DIRECTORY);
-    pushConfigPath(home, '.config', name, 'config');
-    pushConfigPath(home, '.config', name);
-    pushConfigPath(home, `.${name}`, 'config');
-    pushConfigPath(home, `.${name}rc`);
-  }
-
-  // add .yarnrc locations relative to the cwd
-  while (true) {
-    unshiftConfigPath(cwd, `.${name}rc`);
-
-    const upperCwd = (_path || _load_path()).dirname(cwd);
-    if (upperCwd === cwd) {
-      // we've reached the root
-      break;
-    } else {
-      // continue since there's still more directories to search
-      cwd = upperCwd;
-    }
-  }
-
-  const envVariable = `${name}_config`.toUpperCase();
-
-  if (process.env[envVariable]) {
-    pushConfigPath(process.env[envVariable]);
-  }
-
-  return configPaths;
-}
-
-function parseRcPaths(paths, parser) {
-  return Object.assign({}, ...paths.map(path => {
-    try {
-      return parser((0, (_fs || _load_fs()).readFileSync)(path).toString(), path);
-    } catch (error) {
-      return {};
-    }
-  }));
-}
-
-function findRc(name, cwd, parser) {
-  return parseRcPaths(getRcPaths(name, cwd), parser);
-}
-
-/***/ }),
-/* 591 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = { "default": __webpack_require__(623), __esModule: true };
-
-/***/ }),
-/* 592 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var DuplexStream = __webpack_require__(791)
-  , util         = __webpack_require__(3)
-  , Buffer       = __webpack_require__(45).Buffer
-
-
-function BufferList (callback) {
-  if (!(this instanceof BufferList))
-    return new BufferList(callback)
-
-  this._bufs  = []
-  this.length = 0
-
-  if (typeof callback == 'function') {
-    this._callback = callback
-
-    var piper = function piper (err) {
-      if (this._callback) {
-        this._callback(err)
-        this._callback = null
-      }
-    }.bind(this)
-
-    this.on('pipe', function onPipe (src) {
-      src.on('error', piper)
-    })
-    this.on('unpipe', function onUnpipe (src) {
-      src.removeListener('error', piper)
-    })
-  } else {
-    this.append(callback)
-  }
-
-  DuplexStream.call(this)
-}
-
-
-util.inherits(BufferList, DuplexStream)
-
-
-BufferList.prototype._offset = function _offset (offset) {
-  var tot = 0, i = 0, _t
-  if (offset === 0) return [ 0, 0 ]
-  for (; i < this._bufs.length; i++) {
-    _t = tot + this._bufs[i].length
-    if (offset < _t || i == this._bufs.length - 1)
-      return [ i, offset - tot ]
-    tot = _t
-  }
-}
-
-
-BufferList.prototype.append = function append (buf) {
-  var i = 0
-
-  if (Buffer.isBuffer(buf)) {
-    this._appendBuffer(buf);
-  } else if (Array.isArray(buf)) {
-    for (; i < buf.length; i++)
-      this.append(buf[i])
-  } else if (buf instanceof BufferList) {
-    // unwrap argument into individual BufferLists
-    for (; i < buf._bufs.length; i++)
-      this.append(buf._bufs[i])
-  } else if (buf != null) {
-    // coerce number arguments to strings, since Buffer(number) does
-    // uninitialized memory allocation
-    if (typeof buf == 'number')
-      buf = buf.toString()
-
-    this._appendBuffer(Buffer.from(buf));
-  }
-
-  return this
-}
-
-
-BufferList.prototype._appendBuffer = function appendBuffer (buf) {
-  this._bufs.push(buf)
-  this.length += buf.length
-}
-
-
-BufferList.prototype._write = function _write (buf, encoding, callback) {
-  this._appendBuffer(buf)
-
-  if (typeof callback == 'function')
-    callback()
-}
-
-
-BufferList.prototype._read = function _read (size) {
-  if (!this.length)
-    return this.push(null)
-
-  size = Math.min(size, this.length)
-  this.push(this.slice(0, size))
-  this.consume(size)
-}
-
-
-BufferList.prototype.end = function end (chunk) {
-  DuplexStream.prototype.end.call(this, chunk)
-
-  if (this._callback) {
-    this._callback(null, this.slice())
-    this._callback = null
-  }
-}
-
-
-BufferList.prototype.get = function get (index) {
-  return this.slice(index, index + 1)[0]
-}
-
-
-BufferList.prototype.slice = function slice (start, end) {
-  if (typeof start == 'number' && start < 0)
-    start += this.length
-  if (typeof end == 'number' && end < 0)
-    end += this.length
-  return this.copy(null, 0, start, end)
-}
-
-
-BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) {
-  if (typeof srcStart != 'number' || srcStart < 0)
-    srcStart = 0
-  if (typeof srcEnd != 'number' || srcEnd > this.length)
-    srcEnd = this.length
-  if (srcStart >= this.length)
-    return dst || Buffer.alloc(0)
-  if (srcEnd <= 0)
-    return dst || Buffer.alloc(0)
-
-  var copy   = !!dst
-    , off    = this._offset(srcStart)
-    , len    = srcEnd - srcStart
-    , bytes  = len
-    , bufoff = (copy && dstStart) || 0
-    , start  = off[1]
-    , l
-    , i
-
-  // copy/slice everything
-  if (srcStart === 0 && srcEnd == this.length) {
-    if (!copy) { // slice, but full concat if multiple buffers
-      return this._bufs.length === 1
-        ? this._bufs[0]
-        : Buffer.concat(this._bufs, this.length)
-    }
-
-    // copy, need to copy individual buffers
-    for (i = 0; i < this._bufs.length; i++) {
-      this._bufs[i].copy(dst, bufoff)
-      bufoff += this._bufs[i].length
-    }
-
-    return dst
-  }
-
-  // easy, cheap case where it's a subset of one of the buffers
-  if (bytes <= this._bufs[off[0]].length - start) {
-    return copy
-      ? this._bufs[off[0]].copy(dst, dstStart, start, start + bytes)
-      : this._bufs[off[0]].slice(start, start + bytes)
-  }
-
-  if (!copy) // a slice, we need something to copy in to
-    dst = Buffer.allocUnsafe(len)
-
-  for (i = off[0]; i < this._bufs.length; i++) {
-    l = this._bufs[i].length - start
-
-    if (bytes > l) {
-      this._bufs[i].copy(dst, bufoff, start)
-    } else {
-      this._bufs[i].copy(dst, bufoff, start, start + bytes)
-      break
-    }
-
-    bufoff += l
-    bytes -= l
-
-    if (start)
-      start = 0
-  }
-
-  return dst
-}
-
-BufferList.prototype.shallowSlice = function shallowSlice (start, end) {
-  start = start || 0
-  end = end || this.length
-
-  if (start < 0)
-    start += this.length
-  if (end < 0)
-    end += this.length
-
-  var startOffset = this._offset(start)
-    , endOffset = this._offset(end)
-    , buffers = this._bufs.slice(startOffset[0], endOffset[0] + 1)
-
-  if (endOffset[1] == 0)
-    buffers.pop()
-  else
-    buffers[buffers.length-1] = buffers[buffers.length-1].slice(0, endOffset[1])
-
-  if (startOffset[1] != 0)
-    buffers[0] = buffers[0].slice(startOffset[1])
-
-  return new BufferList(buffers)
-}
-
-BufferList.prototype.toString = function toString (encoding, start, end) {
-  return this.slice(start, end).toString(encoding)
-}
-
-BufferList.prototype.consume = function consume (bytes) {
-  while (this._bufs.length) {
-    if (bytes >= this._bufs[0].length) {
-      bytes -= this._bufs[0].length
-      this.length -= this._bufs[0].length
-      this._bufs.shift()
-    } else {
-      this._bufs[0] = this._bufs[0].slice(bytes)
-      this.length -= bytes
-      break
-    }
-  }
-  return this
-}
-
-
-BufferList.prototype.duplicate = function duplicate () {
-  var i = 0
-    , copy = new BufferList()
-
-  for (; i < this._bufs.length; i++)
-    copy.append(this._bufs[i])
-
-  return copy
-}
-
-
-BufferList.prototype.destroy = function destroy () {
-  this._bufs.length = 0
-  this.length = 0
-  this.push(null)
-}
-
-
-;(function () {
-  var methods = {
-      'readDoubleBE' : 8
-    , 'readDoubleLE' : 8
-    , 'readFloatBE'  : 4
-    , 'readFloatLE'  : 4
-    , 'readInt32BE'  : 4
-    , 'readInt32LE'  : 4
-    , 'readUInt32BE' : 4
-    , 'readUInt32LE' : 4
-    , 'readInt16BE'  : 2
-    , 'readInt16LE'  : 2
-    , 'readUInt16BE' : 2
-    , 'readUInt16LE' : 2
-    , 'readInt8'     : 1
-    , 'readUInt8'    : 1
-  }
-
-  for (var m in methods) {
-    (function (m) {
-      BufferList.prototype[m] = function (offset) {
-        return this.slice(offset, offset + methods[m])[m](0)
-      }
-    }(m))
-  }
-}())
-
-
-module.exports = BufferList
-
-
-/***/ }),
-/* 593 */
-/***/ (function(module, exports) {
-
-function allocUnsafe (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('"size" argument must be a number')
-  }
-
-  if (size < 0) {
-    throw new RangeError('"size" argument must not be negative')
-  }
-
-  if (Buffer.allocUnsafe) {
-    return Buffer.allocUnsafe(size)
-  } else {
-    return new Buffer(size)
-  }
-}
-
-module.exports = allocUnsafe
-
-
-/***/ }),
-/* 594 */
-/***/ (function(module, exports) {
-
-/* Node.js 6.4.0 and up has full support */
-var hasFullSupport = (function () {
-  try {
-    if (!Buffer.isEncoding('latin1')) {
-      return false
-    }
-
-    var buf = Buffer.alloc ? Buffer.alloc(4) : new Buffer(4)
-
-    buf.fill('ab', 'ucs2')
-
-    return (buf.toString('hex') === '61006200')
-  } catch (_) {
-    return false
-  }
-}())
-
-function isSingleByte (val) {
-  return (val.length === 1 && val.charCodeAt(0) < 256)
-}
-
-function fillWithNumber (buffer, val, start, end) {
-  if (start < 0 || end > buffer.length) {
-    throw new RangeError('Out of range index')
-  }
-
-  start = start >>> 0
-  end = end === undefined ? buffer.length : end >>> 0
-
-  if (end > start) {
-    buffer.fill(val, start, end)
-  }
-
-  return buffer
-}
-
-function fillWithBuffer (buffer, val, start, end) {
-  if (start < 0 || end > buffer.length) {
-    throw new RangeError('Out of range index')
-  }
-
-  if (end <= start) {
-    return buffer
-  }
-
-  start = start >>> 0
-  end = end === undefined ? buffer.length : end >>> 0
-
-  var pos = start
-  var len = val.length
-  while (pos <= (end - len)) {
-    val.copy(buffer, pos)
-    pos += len
-  }
-
-  if (pos !== end) {
-    val.copy(buffer, pos, 0, end - pos)
-  }
-
-  return buffer
-}
-
-function fill (buffer, val, start, end, encoding) {
-  if (hasFullSupport) {
-    return buffer.fill(val, start, end, encoding)
-  }
-
-  if (typeof val === 'number') {
-    return fillWithNumber(buffer, val, start, end)
-  }
-
-  if (typeof val === 'string') {
-    if (typeof start === 'string') {
-      encoding = start
-      start = 0
-      end = buffer.length
-    } else if (typeof end === 'string') {
-      encoding = end
-      end = buffer.length
-    }
-
-    if (encoding !== undefined && typeof encoding !== 'string') {
-      throw new TypeError('encoding must be a string')
-    }
-
-    if (encoding === 'latin1') {
-      encoding = 'binary'
-    }
-
-    if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) {
-      throw new TypeError('Unknown encoding: ' + encoding)
-    }
-
-    if (val === '') {
-      return fillWithNumber(buffer, 0, start, end)
-    }
-
-    if (isSingleByte(val)) {
-      return fillWithNumber(buffer, val.charCodeAt(0), start, end)
-    }
-
-    val = new Buffer(val, encoding)
-  }
-
-  if (Buffer.isBuffer(val)) {
-    return fillWithBuffer(buffer, val, start, end)
-  }
-
-  // Other values (e.g. undefined, boolean, object) results in zero-fill
-  return fillWithNumber(buffer, 0, start, end)
-}
-
-module.exports = fill
-
-
-/***/ }),
-/* 595 */
-/***/ (function(module, exports) {
-
-var toString = Object.prototype.toString
-
-var isModern = (
-  typeof Buffer.alloc === 'function' &&
-  typeof Buffer.allocUnsafe === 'function' &&
-  typeof Buffer.from === 'function'
-)
-
-function isArrayBuffer (input) {
-  return toString.call(input).slice(8, -1) === 'ArrayBuffer'
-}
-
-function fromArrayBuffer (obj, byteOffset, length) {
-  byteOffset >>>= 0
-
-  var maxLength = obj.byteLength - byteOffset
-
-  if (maxLength < 0) {
-    throw new RangeError("'offset' is out of bounds")
-  }
-
-  if (length === undefined) {
-    length = maxLength
-  } else {
-    length >>>= 0
-
-    if (length > maxLength) {
-      throw new RangeError("'length' is out of bounds")
-    }
-  }
-
-  return isModern
-    ? Buffer.from(obj.slice(byteOffset, byteOffset + length))
-    : new Buffer(new Uint8Array(obj.slice(byteOffset, byteOffset + length)))
-}
-
-function fromString (string, encoding) {
-  if (typeof encoding !== 'string' || encoding === '') {
-    encoding = 'utf8'
-  }
-
-  if (!Buffer.isEncoding(encoding)) {
-    throw new TypeError('"encoding" must be a valid string encoding')
-  }
-
-  return isModern
-    ? Buffer.from(string, encoding)
-    : new Buffer(string, encoding)
-}
-
-function bufferFrom (value, encodingOrOffset, length) {
-  if (typeof value === 'number') {
-    throw new TypeError('"value" argument must not be a number')
-  }
-
-  if (isArrayBuffer(value)) {
-    return fromArrayBuffer(value, encodingOrOffset, length)
-  }
-
-  if (typeof value === 'string') {
-    return fromString(value, encodingOrOffset)
-  }
-
-  return isModern
-    ? Buffer.from(value)
-    : new Buffer(value)
-}
-
-module.exports = bufferFrom
-
-
-/***/ }),
-/* 596 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * bytes
- * Copyright(c) 2012-2014 TJ Holowaychuk
- * Copyright(c) 2015 Jed Watson
- * MIT Licensed
- */
-
-
-
-/**
- * Module exports.
- * @public
- */
-
-module.exports = bytes;
-module.exports.format = format;
-module.exports.parse = parse;
-
-/**
- * Module variables.
- * @private
- */
-
-var formatThousandsRegExp = /\B(?=(\d{3})+(?!\d))/g;
-
-var formatDecimalsRegExp = /(?:\.0*|(\.[^0]+)0+)$/;
-
-var map = {
-  b:  1,
-  kb: 1 << 10,
-  mb: 1 << 20,
-  gb: 1 << 30,
-  tb: ((1 << 30) * 1024)
-};
-
-var parseRegExp = /^((-|\+)?(\d+(?:\.\d+)?)) *(kb|mb|gb|tb)$/i;
-
-/**
- * Convert the given value in bytes into a string or parse to string to an integer in bytes.
- *
- * @param {string|number} value
- * @param {{
- *  case: [string],
- *  decimalPlaces: [number]
- *  fixedDecimals: [boolean]
- *  thousandsSeparator: [string]
- *  unitSeparator: [string]
- *  }} [options] bytes options.
- *
- * @returns {string|number|null}
- */
-
-function bytes(value, options) {
-  if (typeof value === 'string') {
-    return parse(value);
-  }
-
-  if (typeof value === 'number') {
-    return format(value, options);
-  }
-
-  return null;
-}
-
-/**
- * Format the given value in bytes into a string.
- *
- * If the value is negative, it is kept as such. If it is a float,
- * it is rounded.
- *
- * @param {number} value
- * @param {object} [options]
- * @param {number} [options.decimalPlaces=2]
- * @param {number} [options.fixedDecimals=false]
- * @param {string} [options.thousandsSeparator=]
- * @param {string} [options.unit=]
- * @param {string} [options.unitSeparator=]
- *
- * @returns {string|null}
- * @public
- */
-
-function format(value, options) {
-  if (!Number.isFinite(value)) {
-    return null;
-  }
-
-  var mag = Math.abs(value);
-  var thousandsSeparator = (options && options.thousandsSeparator) || '';
-  var unitSeparator = (options && options.unitSeparator) || '';
-  var decimalPlaces = (options && options.decimalPlaces !== undefined) ? options.decimalPlaces : 2;
-  var fixedDecimals = Boolean(options && options.fixedDecimals);
-  var unit = (options && options.unit) || '';
-
-  if (!unit || !map[unit.toLowerCase()]) {
-    if (mag >= map.tb) {
-      unit = 'TB';
-    } else if (mag >= map.gb) {
-      unit = 'GB';
-    } else if (mag >= map.mb) {
-      unit = 'MB';
-    } else if (mag >= map.kb) {
-      unit = 'KB';
-    } else {
-      unit = 'B';
-    }
-  }
-
-  var val = value / map[unit.toLowerCase()];
-  var str = val.toFixed(decimalPlaces);
-
-  if (!fixedDecimals) {
-    str = str.replace(formatDecimalsRegExp, '$1');
-  }
-
-  if (thousandsSeparator) {
-    str = str.replace(formatThousandsRegExp, thousandsSeparator);
-  }
-
-  return str + unitSeparator + unit;
-}
-
-/**
- * Parse the string value into an integer in bytes.
- *
- * If no unit is given, it is assumed the value is in bytes.
- *
- * @param {number|string} val
- *
- * @returns {number|null}
- * @public
- */
-
-function parse(val) {
-  if (typeof val === 'number' && !isNaN(val)) {
-    return val;
-  }
-
-  if (typeof val !== 'string') {
-    return null;
-  }
-
-  // Test if the string passed is valid
-  var results = parseRegExp.exec(val);
-  var floatValue;
-  var unit = 'b';
-
-  if (!results) {
-    // Nothing could be extracted from the given string
-    floatValue = parseInt(val, 10);
-    unit = 'b'
-  } else {
-    // Retrieve the value and the unit
-    floatValue = parseFloat(results[1]);
-    unit = results[4].toLowerCase();
-  }
-
-  return Math.floor(map[unit] * floatValue);
-}
-
-
-/***/ }),
-/* 597 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = (flag, argv) => {
-	argv = argv || process.argv;
-	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-	const pos = argv.indexOf(prefix + flag);
-	const terminatorPos = argv.indexOf('--');
-	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-};
-
-
-/***/ }),
-/* 598 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const os = __webpack_require__(49);
-const hasFlag = __webpack_require__(597);
-
-const env = process.env;
-
-let forceColor;
-if (hasFlag('no-color') ||
-	hasFlag('no-colors') ||
-	hasFlag('color=false')) {
-	forceColor = false;
-} else if (hasFlag('color') ||
-	hasFlag('colors') ||
-	hasFlag('color=true') ||
-	hasFlag('color=always')) {
-	forceColor = true;
-}
-if ('FORCE_COLOR' in env) {
-	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
-}
-
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
-
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-}
-
-function supportsColor(stream) {
-	if (forceColor === false) {
-		return 0;
-	}
-
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
-
-	if (hasFlag('color=256')) {
-		return 2;
-	}
-
-	if (stream && !stream.isTTY && forceColor !== true) {
-		return 0;
-	}
-
-	const min = forceColor ? 1 : 0;
-
-	if (process.platform === 'win32') {
-		// Node.js 7.5.0 is the first version of Node.js to include a patch to
-		// libuv that enables 256 color output on Windows. Anything earlier and it
-		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
-		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-		// release that supports 256 colors. Windows 10 build 14931 is the first release
-		// that supports 16m/TrueColor.
-		const osRelease = os.release().split('.');
-		if (
-			Number(process.versions.node.split('.')[0]) >= 8 &&
-			Number(osRelease[0]) >= 10 &&
-			Number(osRelease[2]) >= 10586
-		) {
-			return Number(osRelease[2]) >= 14931 ? 3 : 2;
-		}
-
-		return 1;
-	}
-
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
-
-		return min;
-	}
-
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
-
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
-
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
-
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
-
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
-
-	if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
-
-	if ('COLORTERM' in env) {
-		return 1;
-	}
-
-	if (env.TERM === 'dumb') {
-		return min;
-	}
-
-	return min;
-}
-
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
-}
-
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
-};
-
-
-/***/ }),
-/* 599 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
-const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
-const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
-const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi;
-
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
-
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
-
-	return ESCAPES.get(c) || c;
-}
-
-function parseArguments(name, args) {
-	const results = [];
-	const chunks = args.trim().split(/\s*,\s*/g);
-	let matches;
-
-	for (const chunk of chunks) {
-		if (!isNaN(chunk)) {
-			results.push(Number(chunk));
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
-
-	return results;
-}
-
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
-
-	const results = [];
-	let matches;
-
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
-
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
-
-	return results;
-}
-
-function buildStyle(chalk, styles) {
-	const enabled = {};
-
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
-
-	let current = chalk;
-	for (const styleName of Object.keys(enabled)) {
-		if (Array.isArray(enabled[styleName])) {
-			if (!(styleName in current)) {
-				throw new Error(`Unknown Chalk style: ${styleName}`);
-			}
-
-			if (enabled[styleName].length > 0) {
-				current = current[styleName].apply(current, enabled[styleName]);
-			} else {
-				current = current[styleName];
-			}
-		}
-	}
-
-	return current;
-}
-
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
-
-	// eslint-disable-next-line max-params
-	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
-		if (escapeChar) {
-			chunk.push(unescape(escapeChar));
-		} else if (style) {
-			const str = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
-			}
-
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(chr);
-		}
-	});
-
-	chunks.push(chunk.join(''));
-
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
-	}
-
-	return chunks.join('');
-};
-
-
-/***/ }),
-/* 600 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = chownr
-chownr.sync = chownrSync
-
-var fs = __webpack_require__(5)
-, path = __webpack_require__(0)
-
-function chownr (p, uid, gid, cb) {
-  fs.readdir(p, function (er, children) {
-    // any error other than ENOTDIR means it's not readable, or
-    // doesn't exist.  give up.
-    if (er && er.code !== "ENOTDIR") return cb(er)
-    if (er || !children.length) return fs.chown(p, uid, gid, cb)
-
-    var len = children.length
-    , errState = null
-    children.forEach(function (child) {
-      var pathChild = path.resolve(p, child);
-      fs.lstat(pathChild, function(er, stats) {
-        if (er)
-          return cb(er)
-        if (!stats.isSymbolicLink())
-          chownr(pathChild, uid, gid, then)
-        else
-          then()
-        })
-    })
-    function then (er) {
-      if (errState) return
-      if (er) return cb(errState = er)
-      if (-- len === 0) return fs.chown(p, uid, gid, cb)
-    }
-  })
-}
-
-function chownrSync (p, uid, gid) {
-  var children
-  try {
-    children = fs.readdirSync(p)
-  } catch (er) {
-    if (er && er.code === "ENOTDIR") return fs.chownSync(p, uid, gid)
-    throw er
-  }
-  if (!children.length) return fs.chownSync(p, uid, gid)
-
-  children.forEach(function (child) {
-    var pathChild = path.resolve(p, child)
-    var stats = fs.lstatSync(pathChild)
-    if (!stats.isSymbolicLink())
-      chownrSync(pathChild, uid, gid)
-  })
-  return fs.chownSync(p, uid, gid)
-}
-
-
-/***/ }),
-/* 601 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var env = process.env
-
-var vendors = [
-  // Constant, Name, Envs
-  ['TRAVIS', 'Travis CI', 'TRAVIS'],
-  ['CIRCLE', 'CircleCI', 'CIRCLECI'],
-  ['GITLAB', 'GitLab CI', 'GITLAB_CI'],
-  ['APPVEYOR', 'AppVeyor', 'APPVEYOR'],
-  ['CODESHIP', 'Codeship', {CI_NAME: 'codeship'}],
-  ['DRONE', 'Drone', 'DRONE'],
-  ['MAGNUM', 'Magnum CI', 'MAGNUM'],
-  ['SEMAPHORE', 'Semaphore', 'SEMAPHORE'],
-  ['JENKINS', 'Jenkins', 'JENKINS_URL', 'BUILD_ID'],
-  ['BAMBOO', 'Bamboo', 'bamboo_planKey'],
-  ['TFS', 'Team Foundation Server', 'TF_BUILD'],
-  ['TEAMCITY', 'TeamCity', 'TEAMCITY_VERSION'],
-  ['BUILDKITE', 'Buildkite', 'BUILDKITE'],
-  ['HUDSON', 'Hudson', 'HUDSON_URL'],
-  ['TASKCLUSTER', 'TaskCluster', 'TASK_ID', 'RUN_ID'],
-  ['GOCD', 'GoCD', 'GO_PIPELINE_LABEL'],
-  ['BITBUCKET', 'Bitbucket Pipelines', 'BITBUCKET_COMMIT'],
-  ['CODEBUILD', 'AWS CodeBuild', 'CODEBUILD_BUILD_ARN']
-]
-
-exports.name = null
-
-vendors.forEach(function (vendor) {
-  var constant = vendor.shift()
-  var name = vendor.shift()
-  var isCI = vendor.every(function (obj) {
-    if (typeof obj === 'string') return !!env[obj]
-    return Object.keys(obj).every(function (k) {
-      return env[k] === obj[k]
-    })
-  })
-  exports[constant] = isCI
-  if (isCI) exports.name = name
-})
-
-exports.isCI = !!(
-  env.CI ||                      // Travis CI, CircleCI, Gitlab CI, Appveyor, CodeShip
-  env.CONTINUOUS_INTEGRATION ||  // Travis CI
-  env.BUILD_NUMBER ||            // Jenkins, TeamCity
-  exports.name ||
-  false
-)
-
-
-/***/ }),
-/* 602 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(605);
-
-/***/ }),
-/* 603 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var kindOf = __webpack_require__(179);
-var utils = __webpack_require__(382);
-
-/**
- * A representation of a cell within the table.
- * Implementations must have `init` and `draw` methods,
- * as well as `colSpan`, `rowSpan`, `desiredHeight` and `desiredWidth` properties.
- * @param options
- * @constructor
- */
-function Cell(options){
-  this.setOptions(options);
-}
-
-Cell.prototype.setOptions = function(options){
-  if(['boolean', 'number', 'string'].indexOf(kindOf(options)) !== -1){
-    options = {content:''+options};
-  }
-  options = options || {};
-  this.options = options;
-  var content = options.content;
-  if (['boolean', 'number', 'string'].indexOf(kindOf(content)) !== -1) {
-    this.content = String(content);
-  } else if (!content) {
-    this.content = '';
-  } else {
-    throw new Error('Content needs to be a primitive, got: ' + (typeof  content));
-  }
-  this.colSpan = options.colSpan || 1;
-  this.rowSpan = options.rowSpan || 1;
-};
-
-Cell.prototype.mergeTableOptions = function(tableOptions,cells){
-  this.cells = cells;
-
-  var optionsChars = this.options.chars || {};
-  var tableChars = tableOptions.chars;
-  var chars = this.chars = {};
-  CHAR_NAMES.forEach(function(name){
-     setOption(optionsChars,tableChars,name,chars);
-  });
-
-  this.truncate = this.options.truncate || tableOptions.truncate;
-
-  var style = this.options.style = this.options.style || {};
-  var tableStyle = tableOptions.style;
-  setOption(style, tableStyle, 'padding-left', this);
-  setOption(style, tableStyle, 'padding-right', this);
-  this.head = style.head || tableStyle.head;
-  this.border = style.border || tableStyle.border;
-
-  var fixedWidth = tableOptions.colWidths[this.x];
-  if(tableOptions.wordWrap && fixedWidth){
-    fixedWidth -= this.paddingLeft + this.paddingRight;
-    if(this.colSpan){
-      var i = 1;
-      while(i<this.colSpan){
-        fixedWidth += tableOptions.colWidths[this.x + i];
-        i++;
-      }
-    }
-    this.lines = utils.colorizeLines(utils.wordWrap(fixedWidth,this.content));
-  }
-  else {
-    this.lines = utils.colorizeLines(this.content.split('\n'));
-  }
-
-  this.desiredWidth = utils.strlen(this.content) + this.paddingLeft + this.paddingRight;
-  this.desiredHeight = this.lines.length;
-};
-
-/**
- * Each cell will have it's `x` and `y` values set by the `layout-manager` prior to
- * `init` being called;
- * @type {Number}
- */
-
-Cell.prototype.x = null;
-Cell.prototype.y = null;
-
-/**
- * Initializes the Cells data structure.
- *
- * @param tableOptions - A fully populated set of tableOptions.
- * In addition to the standard default values, tableOptions must have fully populated the
- * `colWidths` and `rowWidths` arrays. Those arrays must have lengths equal to the number
- * of columns or rows (respectively) in this table, and each array item must be a Number.
- *
- */
-Cell.prototype.init = function(tableOptions){
-  var x = this.x;
-  var y = this.y;
-  this.widths = tableOptions.colWidths.slice(x, x + this.colSpan);
-  this.heights = tableOptions.rowHeights.slice(y, y + this.rowSpan);
-  this.width = this.widths.reduce(sumPlusOne, -1);
-  this.height = this.heights.reduce(sumPlusOne, -1);
-
-  this.hAlign = this.options.hAlign || tableOptions.colAligns[x];
-  this.vAlign = this.options.vAlign || tableOptions.rowAligns[y];
-
-  this.drawRight = x + this.colSpan == tableOptions.colWidths.length;
-};
-
-/**
- * Draws the given line of the cell.
- * This default implementation defers to methods `drawTop`, `drawBottom`, `drawLine` and `drawEmpty`.
- * @param lineNum - can be `top`, `bottom` or a numerical line number.
- * @param spanningCell - will be a number if being called from a RowSpanCell, and will represent how
- * many rows below it's being called from. Otherwise it's undefined.
- * @returns {String} The representation of this line.
- */
-Cell.prototype.draw = function(lineNum,spanningCell){
-  if(lineNum == 'top') return this.drawTop(this.drawRight);
-  if(lineNum == 'bottom') return this.drawBottom(this.drawRight);
-  var padLen = Math.max(this.height - this.lines.length, 0);
-  var padTop;
-  switch (this.vAlign){
-    case 'center':
-      padTop = Math.ceil(padLen / 2);
-      break;
-    case 'bottom':
-      padTop = padLen;
-      break;
-    default :
-      padTop = 0;
-  }
-  if( (lineNum < padTop) || (lineNum >= (padTop + this.lines.length))){
-    return this.drawEmpty(this.drawRight,spanningCell);
-  }
-  var forceTruncation = (this.lines.length > this.height) && (lineNum + 1 >= this.height);
-  return this.drawLine(lineNum - padTop, this.drawRight, forceTruncation,spanningCell);
-};
-
-/**
- * Renders the top line of the cell.
- * @param drawRight - true if this method should render the right edge of the cell.
- * @returns {String}
- */
-Cell.prototype.drawTop = function(drawRight){
-  var content = [];
-  if(this.cells){  //TODO: cells should always exist - some tests don't fill it in though
-    this.widths.forEach(function(width,index){
-      content.push(this._topLeftChar(index));
-      content.push(
-        utils.repeat(this.chars[this.y == 0 ? 'top' : 'mid'],width)
-      );
-    },this);
-  }
-  else {
-    content.push(this._topLeftChar(0));
-    content.push(utils.repeat(this.chars[this.y == 0 ? 'top' : 'mid'],this.width));
-  }
-  if(drawRight){
-    content.push(this.chars[this.y == 0 ? 'topRight' : 'rightMid']);
-  }
-  return this.wrapWithStyleColors('border',content.join(''));
-};
-
-Cell.prototype._topLeftChar = function(offset){
-  var x = this.x+offset;
-  var leftChar;
-  if(this.y == 0){
-    leftChar = x == 0 ? 'topLeft' : (offset == 0 ? 'topMid' : 'top');
-  } else  {
-    if(x == 0){
-      leftChar = 'leftMid';
-    }
-    else {
-      leftChar = offset == 0 ? 'midMid' : 'bottomMid';
-      if(this.cells){  //TODO: cells should always exist - some tests don't fill it in though
-        var spanAbove = this.cells[this.y-1][x] instanceof Cell.ColSpanCell;
-        if(spanAbove){
-          leftChar = offset == 0 ? 'topMid' : 'mid';
-        }
-        if(offset == 0){
-          var i = 1;
-          while(this.cells[this.y][x-i] instanceof Cell.ColSpanCell){
-            i++;
-          }
-          if(this.cells[this.y][x-i] instanceof Cell.RowSpanCell){
-            leftChar = 'leftMid';
-          }
-        }
-      }
-    }
-  }
-  return this.chars[leftChar];
-};
-
-Cell.prototype.wrapWithStyleColors = function(styleProperty,content){
-  if(this[styleProperty] && this[styleProperty].length){
-    try {
-      var colors = __webpack_require__(621);
-      for(var i = this[styleProperty].length - 1; i >= 0; i--){
-        colors = colors[this[styleProperty][i]];
-      }
-      return colors(content);
-    } catch (e) {
-      return content;
-    }
-  }
-  else {
-    return content;
-  }
-};
-
-/**
- * Renders a line of text.
- * @param lineNum - Which line of text to render. This is not necessarily the line within the cell.
- * There may be top-padding above the first line of text.
- * @param drawRight - true if this method should render the right edge of the cell.
- * @param forceTruncationSymbol - `true` if the rendered text should end with the truncation symbol even
- * if the text fits. This is used when the cell is vertically truncated. If `false` the text should
- * only include the truncation symbol if the text will not fit horizontally within the cell width.
- * @param spanningCell - a number of if being called from a RowSpanCell. (how many rows below). otherwise undefined.
- * @returns {String}
- */
-Cell.prototype.drawLine = function(lineNum,drawRight,forceTruncationSymbol,spanningCell){
-  var left = this.chars[this.x == 0 ? 'left' : 'middle'];
-  if(this.x && spanningCell && this.cells){
-    var cellLeft = this.cells[this.y+spanningCell][this.x-1];
-    while(cellLeft instanceof ColSpanCell){
-      cellLeft = this.cells[cellLeft.y][cellLeft.x-1];
-    }
-    if(!(cellLeft instanceof RowSpanCell)){
-      left = this.chars['rightMid'];
-    }
-  }
-  var leftPadding = utils.repeat(' ', this.paddingLeft);
-  var right = (drawRight ? this.chars['right'] : '');
-  var rightPadding = utils.repeat(' ', this.paddingRight);
-  var line = this.lines[lineNum];
-  var len = this.width - (this.paddingLeft + this.paddingRight);
-  if(forceTruncationSymbol) line += this.truncate || '…';
-  var content = utils.truncate(line,len,this.truncate);
-  content = utils.pad(content, len, ' ', this.hAlign);
-  content = leftPadding + content + rightPadding;
-  return this.stylizeLine(left,content,right);
-};
-
-Cell.prototype.stylizeLine = function(left,content,right){
-  left = this.wrapWithStyleColors('border',left);
-  right = this.wrapWithStyleColors('border',right);
-  if(this.y === 0){
-    content = this.wrapWithStyleColors('head',content);
-  }
-  return left + content + right;
-};
-
-/**
- * Renders the bottom line of the cell.
- * @param drawRight - true if this method should render the right edge of the cell.
- * @returns {String}
- */
-Cell.prototype.drawBottom = function(drawRight){
-  var left = this.chars[this.x == 0 ? 'bottomLeft' : 'bottomMid'];
-  var content = utils.repeat(this.chars.bottom,this.width);
-  var right = drawRight ? this.chars['bottomRight'] : '';
-  return this.wrapWithStyleColors('border',left + content + right);
-};
-
-/**
- * Renders a blank line of text within the cell. Used for top and/or bottom padding.
- * @param drawRight - true if this method should render the right edge of the cell.
- * @param spanningCell - a number of if being called from a RowSpanCell. (how many rows below). otherwise undefined.
- * @returns {String}
- */
-Cell.prototype.drawEmpty = function(drawRight,spanningCell){
-  var left = this.chars[this.x == 0 ? 'left' : 'middle'];
-  if(this.x && spanningCell && this.cells){
-    var cellLeft = this.cells[this.y+spanningCell][this.x-1];
-    while(cellLeft instanceof ColSpanCell){
-      cellLeft = this.cells[cellLeft.y][cellLeft.x-1];
-    }
-    if(!(cellLeft instanceof RowSpanCell)){
-      left = this.chars['rightMid'];
-    }
-  }
-  var right = (drawRight ? this.chars['right'] : '');
-  var content = utils.repeat(' ',this.width);
-  return this.stylizeLine(left , content , right);
-};
-
-/**
- * A Cell that doesn't do anything. It just draws empty lines.
- * Used as a placeholder in column spanning.
- * @constructor
- */
-function ColSpanCell(){}
-
-ColSpanCell.prototype.draw = function(){
-  return '';
-};
-
-ColSpanCell.prototype.init = function(tableOptions){};
-
-
-/**
- * A placeholder Cell for a Cell that spans multiple rows.
- * It delegates rendering to the original cell, but adds the appropriate offset.
- * @param originalCell
- * @constructor
- */
-function RowSpanCell(originalCell){
-  this.originalCell = originalCell;
-}
-
-RowSpanCell.prototype.init = function(tableOptions){
-  var y = this.y;
-  var originalY = this.originalCell.y;
-  this.cellOffset = y - originalY;
-  this.offset = findDimension(tableOptions.rowHeights,originalY,this.cellOffset);
-};
-
-RowSpanCell.prototype.draw = function(lineNum){
-  if(lineNum == 'top'){
-    return this.originalCell.draw(this.offset,this.cellOffset);
-  }
-  if(lineNum == 'bottom'){
-    return this.originalCell.draw('bottom');
-  }
-  return this.originalCell.draw(this.offset + 1 + lineNum);
-};
-
-ColSpanCell.prototype.mergeTableOptions =
-RowSpanCell.prototype.mergeTableOptions = function(){};
-
-// HELPER FUNCTIONS
-function setOption(objA,objB,nameB,targetObj){
-  var nameA = nameB.split('-');
-  if(nameA.length > 1) {
-    nameA[1] = nameA[1].charAt(0).toUpperCase() + nameA[1].substr(1);
-    nameA = nameA.join('');
-    targetObj[nameA] = objA[nameA] || objA[nameB] || objB[nameA] || objB[nameB];
-  }
-  else {
-    targetObj[nameB] = objA[nameB] || objB[nameB];
-  }
-}
-
-function findDimension(dimensionTable, startingIndex, span){
-  var ret = dimensionTable[startingIndex];
-  for(var i = 1; i < span; i++){
-    ret += 1 + dimensionTable[startingIndex + i];
-  }
-  return ret;
-}
-
-function sumPlusOne(a,b){
-  return a+b+1;
-}
-
-var CHAR_NAMES = [  'top'
-  , 'top-mid'
-  , 'top-left'
-  , 'top-right'
-  , 'bottom'
-  , 'bottom-mid'
-  , 'bottom-left'
-  , 'bottom-right'
-  , 'left'
-  , 'left-mid'
-  , 'mid'
-  , 'mid-mid'
-  , 'right'
-  , 'right-mid'
-  , 'middle'
-];
-module.exports = Cell;
-module.exports.ColSpanCell = ColSpanCell;
-module.exports.RowSpanCell = RowSpanCell;
-
-
-/***/ }),
-/* 604 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var kindOf = __webpack_require__(179);
-var objectAssign = __webpack_require__(303);
-var Cell = __webpack_require__(603);
-var RowSpanCell = Cell.RowSpanCell;
-var ColSpanCell = Cell.ColSpanCell;
-
-(function(){
-  function layoutTable(table){
-    table.forEach(function(row,rowIndex){
-      row.forEach(function(cell,columnIndex){
-        cell.y = rowIndex;
-        cell.x = columnIndex;
-        for(var y = rowIndex; y >= 0; y--){
-          var row2 = table[y];
-          var xMax = (y === rowIndex) ? columnIndex : row2.length;
-          for(var x = 0; x < xMax; x++){
-            var cell2 = row2[x];
-            while(cellsConflict(cell,cell2)){
-              cell.x++;
-            }
-          }
-        }
-      });
-    });
-  }
-
-  function maxWidth(table) {
-    var mw = 0;
-    table.forEach(function (row) {
-      row.forEach(function (cell) {
-        mw = Math.max(mw,cell.x + (cell.colSpan || 1));
-      });
-    });
-    return mw;
-  }
-
-  function maxHeight(table){
-    return table.length;
-  }
-
-  function cellsConflict(cell1,cell2){
-    var yMin1 = cell1.y;
-    var yMax1 = cell1.y - 1 + (cell1.rowSpan || 1);
-    var yMin2 = cell2.y;
-    var yMax2 = cell2.y - 1 + (cell2.rowSpan || 1);
-    var yConflict = !(yMin1 > yMax2 || yMin2 > yMax1);
-
-    var xMin1= cell1.x;
-    var xMax1 = cell1.x - 1 + (cell1.colSpan || 1);
-    var xMin2= cell2.x;
-    var xMax2 = cell2.x - 1 + (cell2.colSpan || 1);
-    var xConflict = !(xMin1 > xMax2 || xMin2 > xMax1);
-
-    return yConflict && xConflict;
-  }
-
-  function conflictExists(rows,x,y){
-    var i_max = Math.min(rows.length-1,y);
-    var cell = {x:x,y:y};
-    for(var i = 0; i <= i_max; i++){
-      var row = rows[i];
-      for(var j = 0; j < row.length; j++){
-        if(cellsConflict(cell,row[j])){
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  function allBlank(rows,y,xMin,xMax){
-    for(var x = xMin; x < xMax; x++){
-      if(conflictExists(rows,x,y)){
-        return false;
-      }
-    }
-    return true;
-  }
-
-  function addRowSpanCells(table){
-    table.forEach(function(row,rowIndex){
-      row.forEach(function(cell){
-        for(var i = 1; i < cell.rowSpan; i++){
-          var rowSpanCell = new RowSpanCell(cell);
-          rowSpanCell.x = cell.x;
-          rowSpanCell.y = cell.y + i;
-          rowSpanCell.colSpan = cell.colSpan;
-          insertCell(rowSpanCell,table[rowIndex+i]);
-        }
-      });
-    });
-  }
-
-  function addColSpanCells(cellRows){
-    for(var rowIndex = cellRows.length-1; rowIndex >= 0; rowIndex--) {
-      var cellColumns = cellRows[rowIndex];
-      for (var columnIndex = 0; columnIndex < cellColumns.length; columnIndex++) {
-        var cell = cellColumns[columnIndex];
-        for (var k = 1; k < cell.colSpan; k++) {
-          var colSpanCell = new ColSpanCell();
-          colSpanCell.x = cell.x + k;
-          colSpanCell.y = cell.y;
-          cellColumns.splice(columnIndex + 1, 0, colSpanCell);
-        }
-      }
-    }
-  }
-
-  function insertCell(cell,row){
-    var x = 0;
-    while(x < row.length && (row[x].x < cell.x)) {
-      x++;
-    }
-    row.splice(x,0,cell);
-  }
-
-  function fillInTable(table){
-    var h_max = maxHeight(table);
-    var w_max = maxWidth(table);
-    for(var y = 0; y < h_max; y++){
-      for(var x = 0; x < w_max; x++){
-        if(!conflictExists(table,x,y)){
-          var opts = {x:x,y:y,colSpan:1,rowSpan:1};
-          x++;
-          while(x < w_max && !conflictExists(table,x,y)){
-            opts.colSpan++;
-            x++;
-          }
-          var y2 = y + 1;
-          while(y2 < h_max && allBlank(table,y2,opts.x,opts.x+opts.colSpan)){
-            opts.rowSpan++;
-            y2++;
-          }
-
-          var cell = new Cell(opts);
-          cell.x = opts.x;
-          cell.y = opts.y;
-          insertCell(cell,table[y]);
-        }
-      }
-    }
-  }
-
-  function generateCells(rows){
-    return rows.map(function(row){
-      if(kindOf(row) !== 'array'){
-        var key = Object.keys(row)[0];
-        row = row[key];
-        if(kindOf(row) === 'array'){
-          row = row.slice();
-          row.unshift(key);
-        }
-        else {
-          row = [key,row];
-        }
-      }
-      return row.map(function(cell){
-        return new Cell(cell);
-      });
-    });
-  }
-
-  function makeTableLayout(rows){
-    var cellRows = generateCells(rows);
-    layoutTable(cellRows);
-    fillInTable(cellRows);
-    addRowSpanCells(cellRows);
-    addColSpanCells(cellRows);
-    return cellRows;
-  }
-
-  module.exports = {
-    makeTableLayout: makeTableLayout,
-    layoutTable: layoutTable,
-    addRowSpanCells: addRowSpanCells,
-    maxWidth:maxWidth,
-    fillInTable:fillInTable,
-    computeWidths:makeComputeWidths('colSpan','desiredWidth','x',1),
-    computeHeights:makeComputeWidths('rowSpan','desiredHeight','y',1)
-  };
-})();
-
-function makeComputeWidths(colSpan,desiredWidth,x,forcedMin){
-  return function(vals,table){
-    var result = [];
-    var spanners = [];
-    table.forEach(function(row){
-      row.forEach(function(cell){
-        if((cell[colSpan] || 1) > 1){
-          spanners.push(cell);
-        }
-        else {
-          result[cell[x]] = Math.max(result[cell[x]] || 0, cell[desiredWidth] || 0, forcedMin);
-        }
-      });
-    });
-
-    vals.forEach(function(val,index){
-      if(kindOf(val) === 'number'){
-        result[index] = val;
-      }
-    });
-
-    //spanners.forEach(function(cell){
-    for(var k = spanners.length - 1; k >=0; k--){
-      var cell = spanners[k];
-      var span = cell[colSpan];
-      var col = cell[x];
-      var existingWidth = result[col];
-      var editableCols = kindOf(vals[col]) === 'number' ? 0 : 1;
-      for(var i = 1; i < span; i ++){
-        existingWidth += 1 + result[col + i];
-        if(kindOf(vals[col + i]) !== 'number'){
-          editableCols++;
-        }
-      }
-      if(cell[desiredWidth] > existingWidth){
-        i = 0;
-        while(editableCols > 0 && cell[desiredWidth] > existingWidth){
-          if(kindOf(vals[col+i]) !== 'number'){
-            var dif = Math.round( (cell[desiredWidth] - existingWidth) / editableCols );
-            existingWidth += dif;
-            result[col + i] += dif;
-            editableCols--;
-          }
-          i++;
-        }
-      }
-    }
-
-    objectAssign(vals,result);
-    for(var j = 0; j < vals.length; j++){
-      vals[j] = Math.max(forcedMin, vals[j] || 0);
-    }
-  };
-}
-
-
-/***/ }),
-/* 605 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var utils = __webpack_require__(382);
-var tableLayout = __webpack_require__(604);
-
-function Table(options){
-  this.options = utils.mergeOptions(options);
-}
-
-Table.prototype.__proto__ = Array.prototype;
-
-Table.prototype.toString = function(){
-  var array = this;
-  var headersPresent = this.options.head && this.options.head.length;
-  if(headersPresent){
-    array = [this.options.head];
-    if(this.length){
-      array.push.apply(array,this);
-    }
-  }
-  else {
-    this.options.style.head=[];
-  }
-
-  var cells = tableLayout.makeTableLayout(array);
-
-  cells.forEach(function(row){
-    row.forEach(function(cell){
-      cell.mergeTableOptions(this.options,cells);
-    },this);
-  },this);
-
-  tableLayout.computeWidths(this.options.colWidths,cells);
-  tableLayout.computeHeights(this.options.rowHeights,cells);
-
-  cells.forEach(function(row,rowIndex){
-    row.forEach(function(cell,cellIndex){
-      cell.init(this.options);
-    },this);
-  },this);
-
-  var result = [];
-
-  for(var rowIndex = 0; rowIndex < cells.length; rowIndex++){
-    var row = cells[rowIndex];
-    var heightOfRow = this.options.rowHeights[rowIndex];
-
-    if(rowIndex === 0 || !this.options.style.compact || (rowIndex == 1 && headersPresent)){
-      doDraw(row,'top',result);
-    }
-
-    for(var lineNum = 0; lineNum < heightOfRow; lineNum++){
-      doDraw(row,lineNum,result);
-    }
-
-    if(rowIndex + 1 == cells.length){
-      doDraw(row,'bottom',result);
-    }
-  }
-
-  return result.join('\n');
-};
-
-function doDraw(row,lineNum,result){
-  var line = [];
-  row.forEach(function(cell){
-    line.push(cell.draw(lineNum));
-  });
-  var str = line.join('');
-  if(str.length) result.push(str);
-}
-
-Table.prototype.__defineGetter__('width', function (){
-  var str = this.toString().split("\n");
-  return str[0].length;
-});
-
-module.exports = Table;
-
-
-/***/ }),
-/* 606 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-exports = module.exports = cliWidth;
-
-function normalizeOpts(options) {
-  var defaultOpts = {
-    defaultWidth: 0,
-    output: process.stdout,
-    tty: __webpack_require__(104)
-  };
-
-  if (!options) {
-    return defaultOpts;
-  } else {
-    Object.keys(defaultOpts).forEach(function (key) {
-      if (!options[key]) {
-        options[key] = defaultOpts[key];
-      }
-    });
-
-    return options;
-  }
-}
-
-function cliWidth(options) {
-  var opts = normalizeOpts(options);
-
-  if (opts.output.getWindowSize) {
-    return opts.output.getWindowSize()[0] || opts.defaultWidth;
-  } else {
-    if (opts.tty.getWindowSize) {
-      return opts.tty.getWindowSize()[1] || opts.defaultWidth;
-    } else {
-      if (opts.output.columns) {
-        return opts.output.columns;
-      } else {
-        if (process.env.CLI_WIDTH) {
-          var width = parseInt(process.env.CLI_WIDTH, 10);
-
-          if (!isNaN(width) && width !== 0) {
-            return width;
-          }
-        }
-      }
-
-      return opts.defaultWidth;
-    }
-  }
-};
-
-
-/***/ }),
-/* 607 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* eslint-disable babel/new-cap, xo/throw-new-error */
-
-module.exports = function (str, pos) {
-	if (str === null || str === undefined) {
-		throw TypeError();
-	}
-
-	str = String(str);
-
-	var size = str.length;
-	var i = pos ? Number(pos) : 0;
-
-	if (Number.isNaN(i)) {
-		i = 0;
-	}
-
-	if (i < 0 || i >= size) {
-		return undefined;
-	}
-
-	var first = str.charCodeAt(i);
-
-	if (first >= 0xD800 && first <= 0xDBFF && size > i + 1) {
-		var second = str.charCodeAt(i + 1);
-
-		if (second >= 0xDC00 && second <= 0xDFFF) {
-			return ((first - 0xD800) * 0x400) + second - 0xDC00 + 0x10000;
-		}
-	}
-
-	return first;
-};
-
-
-/***/ }),
-/* 608 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var conversions = __webpack_require__(384);
-var route = __webpack_require__(609);
-
-var convert = {};
-
-var models = Object.keys(conversions);
-
-function wrapRaw(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
-
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
-
-		return fn(args);
-	};
-
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
-
-	return wrappedFn;
-}
-
-function wrapRounded(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
-
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
-
-		var result = fn(args);
-
-		// we're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (var len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
-
-		return result;
-	};
-
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
-
-	return wrappedFn;
-}
-
-models.forEach(function (fromModel) {
-	convert[fromModel] = {};
-
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
-
-	var routes = route(fromModel);
-	var routeModels = Object.keys(routes);
-
-	routeModels.forEach(function (toModel) {
-		var fn = routes[toModel];
-
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
-
-module.exports = convert;
-
-
-/***/ }),
-/* 609 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var conversions = __webpack_require__(384);
-
-/*
-	this function routes a model to all other models.
-
-	all functions that are routed have a property `.conversion` attached
-	to the returned synthetic function. This property is an array
-	of strings, each with the steps in between the 'from' and 'to'
-	color models (inclusive).
-
-	conversions that are not possible simply are not included.
-*/
-
-function buildGraph() {
-	var graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	var models = Object.keys(conversions);
-
-	for (var len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
-
-	return graph;
-}
-
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	var graph = buildGraph();
-	var queue = [fromModel]; // unshift -> queue -> pop
-
-	graph[fromModel].distance = 0;
-
-	while (queue.length) {
-		var current = queue.pop();
-		var adjacents = Object.keys(conversions[current]);
-
-		for (var len = adjacents.length, i = 0; i < len; i++) {
-			var adjacent = adjacents[i];
-			var node = graph[adjacent];
-
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
-
-	return graph;
-}
-
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
-
-function wrapConversion(toModel, graph) {
-	var path = [graph[toModel].parent, toModel];
-	var fn = conversions[graph[toModel].parent][toModel];
-
-	var cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
-
-	fn.conversion = path;
-	return fn;
-}
-
-module.exports = function (fromModel) {
-	var graph = deriveBFS(fromModel);
-	var conversion = {};
-
-	var models = Object.keys(graph);
-	for (var len = models.length, i = 0; i < len; i++) {
-		var toModel = models[i];
-		var node = graph[toModel];
-
-		if (node.parent === null) {
-			// no possible conversion, or this node is the source model.
-			continue;
-		}
-
-		conversion[toModel] = wrapConversion(toModel, graph);
-	}
-
-	return conversion;
-};
-
-
-
-/***/ }),
-/* 610 */
-/***/ (function(module, exports) {
-
-module.exports = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
-
-/***/ }),
-/* 611 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-
-The MIT License (MIT)
-
-Original Library
-  - Copyright (c) Marak Squires
-
-Additional functionality
- - Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-var colors = {};
-module['exports'] = colors;
-
-colors.themes = {};
-
-var util = __webpack_require__(3);
-var ansiStyles = colors.styles = __webpack_require__(618);
-var defineProps = Object.defineProperties;
-var newLineRegex = new RegExp(/[\r\n]+/g);
-
-colors.supportsColor = __webpack_require__(620).supportsColor;
-
-if (typeof colors.enabled === 'undefined') {
-  colors.enabled = colors.supportsColor() !== false;
-}
-
-colors.enable = function() {
-  colors.enabled = true;
-};
-
-colors.disable = function() {
-  colors.enabled = false;
-};
-
-colors.stripColors = colors.strip = function(str) {
-  return ('' + str).replace(/\x1B\[\d+m/g, '');
-};
-
-// eslint-disable-next-line no-unused-vars
-var stylize = colors.stylize = function stylize(str, style) {
-  if (!colors.enabled) {
-    return str+'';
-  }
-
-  return ansiStyles[style].open + str + ansiStyles[style].close;
-};
-
-var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-var escapeStringRegexp = function(str) {
-  if (typeof str !== 'string') {
-    throw new TypeError('Expected a string');
-  }
-  return str.replace(matchOperatorsRe, '\\$&');
-};
-
-function build(_styles) {
-  var builder = function builder() {
-    return applyStyle.apply(builder, arguments);
-  };
-  builder._styles = _styles;
-  // __proto__ is used because we must return a function, but there is
-  // no way to create a function with a different prototype.
-  builder.__proto__ = proto;
-  return builder;
-}
-
-var styles = (function() {
-  var ret = {};
-  ansiStyles.grey = ansiStyles.gray;
-  Object.keys(ansiStyles).forEach(function(key) {
-    ansiStyles[key].closeRe =
-      new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
-    ret[key] = {
-      get: function() {
-        return build(this._styles.concat(key));
-      },
-    };
-  });
-  return ret;
-})();
-
-var proto = defineProps(function colors() {}, styles);
-
-function applyStyle() {
-  var args = Array.prototype.slice.call(arguments);
-
-  var str = args.map(function(arg) {
-    if (arg != undefined && arg.constructor === String) {
-      return arg;
-    } else {
-      return util.inspect(arg);
-    }
-  }).join(' ');
-
-  if (!colors.enabled || !str) {
-    return str;
-  }
-
-  var newLinesPresent = str.indexOf('\n') != -1;
-
-  var nestedStyles = this._styles;
-
-  var i = nestedStyles.length;
-  while (i--) {
-    var code = ansiStyles[nestedStyles[i]];
-    str = code.open + str.replace(code.closeRe, code.open) + code.close;
-    if (newLinesPresent) {
-      str = str.replace(newLineRegex, function(match) {
-        return code.close + match + code.open;
-      });
-    }
-  }
-
-  return str;
-}
-
-colors.setTheme = function(theme) {
-  if (typeof theme === 'string') {
-    console.log('colors.setTheme now only accepts an object, not a string.  ' +
-      'If you are trying to set a theme from a file, it is now your (the ' +
-      'caller\'s) responsibility to require the file.  The old syntax ' +
-      'looked like colors.setTheme(__dirname + ' +
-      '\'/../themes/generic-logging.js\'); The new syntax looks like '+
-      'colors.setTheme(require(__dirname + ' +
-      '\'/../themes/generic-logging.js\'));');
-    return;
-  }
-  for (var style in theme) {
-    (function(style) {
-      colors[style] = function(str) {
-        if (typeof theme[style] === 'object') {
-          var out = str;
-          for (var i in theme[style]) {
-            out = colors[theme[style][i]](out);
-          }
-          return out;
-        }
-        return colors[theme[style]](str);
-      };
-    })(style);
-  }
-};
-
-function init() {
-  var ret = {};
-  Object.keys(styles).forEach(function(name) {
-    ret[name] = {
-      get: function() {
-        return build([name]);
-      },
-    };
-  });
-  return ret;
-}
-
-var sequencer = function sequencer(map, str) {
-  var exploded = str.split('');
-  exploded = exploded.map(map);
-  return exploded.join('');
-};
-
-// custom formatter methods
-colors.trap = __webpack_require__(612);
-colors.zalgo = __webpack_require__(613);
-
-// maps
-colors.maps = {};
-colors.maps.america = __webpack_require__(614)(colors);
-colors.maps.zebra = __webpack_require__(617)(colors);
-colors.maps.rainbow = __webpack_require__(615)(colors);
-colors.maps.random = __webpack_require__(616)(colors);
-
-for (var map in colors.maps) {
-  (function(map) {
-    colors[map] = function(str) {
-      return sequencer(colors.maps[map], str);
-    };
-  })(map);
-}
-
-defineProps(colors, init());
-
-
-/***/ }),
-/* 612 */
-/***/ (function(module, exports) {
-
-module['exports'] = function runTheTrap(text, options) {
-  var result = '';
-  text = text || 'Run the trap, drop the bass';
-  text = text.split('');
-  var trap = {
-    a: ['\u0040', '\u0104', '\u023a', '\u0245', '\u0394', '\u039b', '\u0414'],
-    b: ['\u00df', '\u0181', '\u0243', '\u026e', '\u03b2', '\u0e3f'],
-    c: ['\u00a9', '\u023b', '\u03fe'],
-    d: ['\u00d0', '\u018a', '\u0500', '\u0501', '\u0502', '\u0503'],
-    e: ['\u00cb', '\u0115', '\u018e', '\u0258', '\u03a3', '\u03be', '\u04bc',
-         '\u0a6c'],
-    f: ['\u04fa'],
-    g: ['\u0262'],
-    h: ['\u0126', '\u0195', '\u04a2', '\u04ba', '\u04c7', '\u050a'],
-    i: ['\u0f0f'],
-    j: ['\u0134'],
-    k: ['\u0138', '\u04a0', '\u04c3', '\u051e'],
-    l: ['\u0139'],
-    m: ['\u028d', '\u04cd', '\u04ce', '\u0520', '\u0521', '\u0d69'],
-    n: ['\u00d1', '\u014b', '\u019d', '\u0376', '\u03a0', '\u048a'],
-    o: ['\u00d8', '\u00f5', '\u00f8', '\u01fe', '\u0298', '\u047a', '\u05dd',
-         '\u06dd', '\u0e4f'],
-    p: ['\u01f7', '\u048e'],
-    q: ['\u09cd'],
-    r: ['\u00ae', '\u01a6', '\u0210', '\u024c', '\u0280', '\u042f'],
-    s: ['\u00a7', '\u03de', '\u03df', '\u03e8'],
-    t: ['\u0141', '\u0166', '\u0373'],
-    u: ['\u01b1', '\u054d'],
-    v: ['\u05d8'],
-    w: ['\u0428', '\u0460', '\u047c', '\u0d70'],
-    x: ['\u04b2', '\u04fe', '\u04fc', '\u04fd'],
-    y: ['\u00a5', '\u04b0', '\u04cb'],
-    z: ['\u01b5', '\u0240'],
-  };
-  text.forEach(function(c) {
-    c = c.toLowerCase();
-    var chars = trap[c] || [' '];
-    var rand = Math.floor(Math.random() * chars.length);
-    if (typeof trap[c] !== 'undefined') {
-      result += trap[c][rand];
-    } else {
-      result += c;
-    }
-  });
-  return result;
-};
-
-
-/***/ }),
-/* 613 */
-/***/ (function(module, exports) {
-
-// please no
-module['exports'] = function zalgo(text, options) {
-  text = text || '   he is here   ';
-  var soul = {
-    'up': [
-      '̍', '̎', '̄', '̅',
-      '̿', '̑', '̆', '̐',
-      '͒', '͗', '͑', '̇',
-      '̈', '̊', '͂', '̓',
-      '̈', '͊', '͋', '͌',
-      '̃', '̂', '̌', '͐',
-      '̀', '́', '̋', '̏',
-      '̒', '̓', '̔', '̽',
-      '̉', 'ͣ', 'ͤ', 'ͥ',
-      'ͦ', 'ͧ', 'ͨ', 'ͩ',
-      'ͪ', 'ͫ', 'ͬ', 'ͭ',
-      'ͮ', 'ͯ', '̾', '͛',
-      '͆', '̚',
-    ],
-    'down': [
-      '̖', '̗', '̘', '̙',
-      '̜', '̝', '̞', '̟',
-      '̠', '̤', '̥', '̦',
-      '̩', '̪', '̫', '̬',
-      '̭', '̮', '̯', '̰',
-      '̱', '̲', '̳', '̹',
-      '̺', '̻', '̼', 'ͅ',
-      '͇', '͈', '͉', '͍',
-      '͎', '͓', '͔', '͕',
-      '͖', '͙', '͚', '̣',
-    ],
-    'mid': [
-      '̕', '̛', '̀', '́',
-      '͘', '̡', '̢', '̧',
-      '̨', '̴', '̵', '̶',
-      '͜', '͝', '͞',
-      '͟', '͠', '͢', '̸',
-      '̷', '͡', ' ҉',
-    ],
-  };
-  var all = [].concat(soul.up, soul.down, soul.mid);
-
-  function randomNumber(range) {
-    var r = Math.floor(Math.random() * range);
-    return r;
-  }
-
-  function isChar(character) {
-    var bool = false;
-    all.filter(function(i) {
-      bool = (i === character);
-    });
-    return bool;
-  }
-
-
-  function heComes(text, options) {
-    var result = '';
-    var counts;
-    var l;
-    options = options || {};
-    options['up'] =
-      typeof options['up'] !== 'undefined' ? options['up'] : true;
-    options['mid'] =
-      typeof options['mid'] !== 'undefined' ? options['mid'] : true;
-    options['down'] =
-      typeof options['down'] !== 'undefined' ? options['down'] : true;
-    options['size'] =
-      typeof options['size'] !== 'undefined' ? options['size'] : 'maxi';
-    text = text.split('');
-    for (l in text) {
-      if (isChar(l)) {
-        continue;
-      }
-      result = result + text[l];
-      counts = {'up': 0, 'down': 0, 'mid': 0};
-      switch (options.size) {
-      case 'mini':
-        counts.up = randomNumber(8);
-        counts.mid = randomNumber(2);
-        counts.down = randomNumber(8);
-        break;
-      case 'maxi':
-        counts.up = randomNumber(16) + 3;
-        counts.mid = randomNumber(4) + 1;
-        counts.down = randomNumber(64) + 3;
-        break;
-      default:
-        counts.up = randomNumber(8) + 1;
-        counts.mid = randomNumber(6) / 2;
-        counts.down = randomNumber(8) + 1;
-        break;
-      }
-
-      var arr = ['up', 'mid', 'down'];
-      for (var d in arr) {
-        var index = arr[d];
-        for (var i = 0; i <= counts[index]; i++) {
-          if (options[index]) {
-            result = result + soul[index][randomNumber(soul[index].length)];
-          }
-        }
-      }
-    }
-    return result;
-  }
-  // don't summon him
-  return heComes(text, options);
-};
-
-
-
-/***/ }),
-/* 614 */
-/***/ (function(module, exports) {
-
-module['exports'] = function(colors) {
-  return function(letter, i, exploded) {
-    if (letter === ' ') return letter;
-    switch (i%3) {
-      case 0: return colors.red(letter);
-      case 1: return colors.white(letter);
-      case 2: return colors.blue(letter);
-    }
-  };
-};
-
-
-/***/ }),
-/* 615 */
-/***/ (function(module, exports) {
-
-module['exports'] = function(colors) {
-  // RoY G BiV
-  var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta'];
-  return function(letter, i, exploded) {
-    if (letter === ' ') {
-      return letter;
-    } else {
-      return colors[rainbowColors[i++ % rainbowColors.length]](letter);
-    }
-  };
-};
-
-
-
-/***/ }),
-/* 616 */
-/***/ (function(module, exports) {
-
-module['exports'] = function(colors) {
-  var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green',
-    'blue', 'white', 'cyan', 'magenta'];
-  return function(letter, i, exploded) {
-    return letter === ' ' ? letter :
-      colors[
-        available[Math.round(Math.random() * (available.length - 2))]
-      ](letter);
-  };
-};
-
-
-/***/ }),
-/* 617 */
-/***/ (function(module, exports) {
-
-module['exports'] = function(colors) {
-  return function(letter, i, exploded) {
-    return i % 2 === 0 ? letter : colors.inverse(letter);
-  };
-};
-
-
-/***/ }),
-/* 618 */
-/***/ (function(module, exports) {
-
-/*
-The MIT License (MIT)
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-var styles = {};
-module['exports'] = styles;
-
-var codes = {
-  reset: [0, 0],
-
-  bold: [1, 22],
-  dim: [2, 22],
-  italic: [3, 23],
-  underline: [4, 24],
-  inverse: [7, 27],
-  hidden: [8, 28],
-  strikethrough: [9, 29],
-
-  black: [30, 39],
-  red: [31, 39],
-  green: [32, 39],
-  yellow: [33, 39],
-  blue: [34, 39],
-  magenta: [35, 39],
-  cyan: [36, 39],
-  white: [37, 39],
-  gray: [90, 39],
-  grey: [90, 39],
-
-  bgBlack: [40, 49],
-  bgRed: [41, 49],
-  bgGreen: [42, 49],
-  bgYellow: [43, 49],
-  bgBlue: [44, 49],
-  bgMagenta: [45, 49],
-  bgCyan: [46, 49],
-  bgWhite: [47, 49],
-
-  // legacy styles for colors pre v1.0.0
-  blackBG: [40, 49],
-  redBG: [41, 49],
-  greenBG: [42, 49],
-  yellowBG: [43, 49],
-  blueBG: [44, 49],
-  magentaBG: [45, 49],
-  cyanBG: [46, 49],
-  whiteBG: [47, 49],
-
-};
-
-Object.keys(codes).forEach(function(key) {
-  var val = codes[key];
-  var style = styles[key] = [];
-  style.open = '\u001b[' + val[0] + 'm';
-  style.close = '\u001b[' + val[1] + 'm';
-});
-
-
-/***/ }),
-/* 619 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-
-
-module.exports = function(flag, argv) {
-  argv = argv || process.argv;
-
-  var terminatorPos = argv.indexOf('--');
-  var prefix = /^-{1,2}/.test(flag) ? '' : '--';
-  var pos = argv.indexOf(prefix + flag);
-
-  return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-};
-
-
-/***/ }),
-/* 620 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*
-The MIT License (MIT)
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-
-
-var os = __webpack_require__(49);
-var hasFlag = __webpack_require__(619);
-
-var env = process.env;
-
-var forceColor = void 0;
-if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false')) {
-  forceColor = false;
-} else if (hasFlag('color') || hasFlag('colors') || hasFlag('color=true')
-           || hasFlag('color=always')) {
-  forceColor = true;
-}
-if ('FORCE_COLOR' in env) {
-  forceColor = env.FORCE_COLOR.length === 0
-    || parseInt(env.FORCE_COLOR, 10) !== 0;
-}
-
-function translateLevel(level) {
-  if (level === 0) {
-    return false;
-  }
-
-  return {
-    level: level,
-    hasBasic: true,
-    has256: level >= 2,
-    has16m: level >= 3,
-  };
-}
-
-function supportsColor(stream) {
-  if (forceColor === false) {
-    return 0;
-  }
-
-  if (hasFlag('color=16m') || hasFlag('color=full')
-      || hasFlag('color=truecolor')) {
-    return 3;
-  }
-
-  if (hasFlag('color=256')) {
-    return 2;
-  }
-
-  if (stream && !stream.isTTY && forceColor !== true) {
-    return 0;
-  }
-
-  var min = forceColor ? 1 : 0;
-
-  if (process.platform === 'win32') {
-    // Node.js 7.5.0 is the first version of Node.js to include a patch to
-    // libuv that enables 256 color output on Windows. Anything earlier and it
-    // won't work. However, here we target Node.js 8 at minimum as it is an LTS
-    // release, and Node.js 7 is not. Windows 10 build 10586 is the first
-    // Windows release that supports 256 colors. Windows 10 build 14931 is the
-    // first release that supports 16m/TrueColor.
-    var osRelease = os.release().split('.');
-    if (Number(process.versions.node.split('.')[0]) >= 8
-        && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
-      return Number(osRelease[2]) >= 14931 ? 3 : 2;
-    }
-
-    return 1;
-  }
-
-  if ('CI' in env) {
-    if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(function(sign) {
-      return sign in env;
-    }) || env.CI_NAME === 'codeship') {
-      return 1;
-    }
-
-    return min;
-  }
-
-  if ('TEAMCITY_VERSION' in env) {
-    return (/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0
-    );
-  }
-
-  if ('TERM_PROGRAM' in env) {
-    var version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
-
-    switch (env.TERM_PROGRAM) {
-      case 'iTerm.app':
-        return version >= 3 ? 3 : 2;
-      case 'Hyper':
-        return 3;
-      case 'Apple_Terminal':
-        return 2;
-      // No default
-    }
-  }
-
-  if (/-256(color)?$/i.test(env.TERM)) {
-    return 2;
-  }
-
-  if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-    return 1;
-  }
-
-  if ('COLORTERM' in env) {
-    return 1;
-  }
-
-  if (env.TERM === 'dumb') {
-    return min;
-  }
-
-  return min;
-}
-
-function getSupportLevel(stream) {
-  var level = supportsColor(stream);
-  return translateLevel(level);
-}
-
-module.exports = {
-  supportsColor: getSupportLevel,
-  stdout: getSupportLevel(process.stdout),
-  stderr: getSupportLevel(process.stderr),
-};
-
-
-/***/ }),
-/* 621 */
-/***/ (function(module, exports, __webpack_require__) {
-
-//
-// Remark: Requiring this file will use the "safe" colors API,
-// which will not touch String.prototype.
-//
-//   var colors = require('colors/safe');
-//   colors.red("foo")
-//
-//
-var colors = __webpack_require__(611);
-module['exports'] = colors;
-
-
-/***/ }),
-/* 622 */
-/***/ (function(module, exports) {
-
-module.exports = defer;
-
-/**
- * Runs provided function on next iteration of the event loop
- *
- * @param {function} fn - function to run
- */
-function defer(fn)
-{
-  var nextTick = typeof setImmediate == 'function'
-    ? setImmediate
-    : (
-      typeof process == 'object' && typeof process.nextTick == 'function'
-      ? process.nextTick
-      : null
-    );
-
-  if (nextTick)
-  {
-    nextTick(fn);
-  }
-  else
-  {
-    setTimeout(fn, 0);
-  }
-}
-
-
-/***/ }),
-/* 623 */
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__(627);
-module.exports = __webpack_require__(31).Object.assign;
-
-
-/***/ }),
-/* 624 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-// 19.1.2.1 Object.assign(target, source, ...)
-var getKeys = __webpack_require__(171);
-var gOPS = __webpack_require__(625);
-var pIE = __webpack_require__(626);
-var toObject = __webpack_require__(172);
-var IObject = __webpack_require__(170);
-var $assign = Object.assign;
-
-// should work with symbols and should have deterministic property order (V8 bug)
-module.exports = !$assign || __webpack_require__(112)(function () {
-  var A = {};
-  var B = {};
-  // eslint-disable-next-line no-undef
-  var S = Symbol();
-  var K = 'abcdefghijklmnopqrst';
-  A[S] = 7;
-  K.split('').forEach(function (k) { B[k] = k; });
-  return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K;
-}) ? function assign(target, source) { // eslint-disable-line no-unused-vars
-  var T = toObject(target);
-  var aLen = arguments.length;
-  var index = 1;
-  var getSymbols = gOPS.f;
-  var isEnum = pIE.f;
-  while (aLen > index) {
-    var S = IObject(arguments[index++]);
-    var keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S);
-    var length = keys.length;
-    var j = 0;
-    var key;
-    while (length > j) if (isEnum.call(S, key = keys[j++])) T[key] = S[key];
-  } return T;
-} : $assign;
-
-
-/***/ }),
-/* 625 */
-/***/ (function(module, exports) {
-
-exports.f = Object.getOwnPropertySymbols;
-
-
-/***/ }),
-/* 626 */
-/***/ (function(module, exports) {
-
-exports.f = {}.propertyIsEnumerable;
-
-
-/***/ }),
-/* 627 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// 19.1.3.1 Object.assign(target, source)
-var $export = __webpack_require__(60);
-
-$export($export.S + $export.F, 'Object', { assign: __webpack_require__(624) });
-
-
-/***/ }),
-/* 628 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var arrayFindIndex = __webpack_require__(511);
-
-module.exports = function () {
-	var unhandledRejections = [];
-
-	function onUnhandledRejection(reason, promise) {
-		unhandledRejections.push({reason: reason, promise: promise});
-	}
-
-	function onRejectionHandled(promise) {
-		var index = arrayFindIndex(unhandledRejections, function (x) {
-			return x.promise === promise;
-		});
-
-		unhandledRejections.splice(index, 1);
-	}
-
-	function currentlyUnhandled() {
-		return unhandledRejections.map(function (entry) {
-			return {
-				reason: entry.reason,
-				promise: entry.promise
-			};
-		});
-	}
-
-	return {
-		onUnhandledRejection: onUnhandledRejection,
-		onRejectionHandled: onRejectionHandled,
-		currentlyUnhandled: currentlyUnhandled
-	};
-};
-
-
-/***/ }),
-/* 629 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var core = __webpack_require__(628);
-
-module.exports = function (p) {
-	p = p || process;
-	var c = core();
-
-	p.on('unhandledRejection', c.onUnhandledRejection);
-	p.on('rejectionHandled', c.onRejectionHandled);
-
-	return c.currentlyUnhandled;
-};
-
-
-/***/ }),
-/* 630 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var token = '%[a-f0-9]{2}';
-var singleMatcher = new RegExp(token, 'gi');
-var multiMatcher = new RegExp('(' + token + ')+', 'gi');
-
-function decodeComponents(components, split) {
-	try {
-		// Try to decode the entire string first
-		return decodeURIComponent(components.join(''));
-	} catch (err) {
-		// Do nothing
-	}
-
-	if (components.length === 1) {
-		return components;
-	}
-
-	split = split || 1;
-
-	// Split the array in 2 parts
-	var left = components.slice(0, split);
-	var right = components.slice(split);
-
-	return Array.prototype.concat.call([], decodeComponents(left), decodeComponents(right));
-}
-
-function decode(input) {
-	try {
-		return decodeURIComponent(input);
-	} catch (err) {
-		var tokens = input.match(singleMatcher);
-
-		for (var i = 1; i < tokens.length; i++) {
-			input = decodeComponents(tokens, i).join('');
-
-			tokens = input.match(singleMatcher);
-		}
-
-		return input;
-	}
-}
-
-function customDecodeURIComponent(input) {
-	// Keep track of all the replacements and prefill the map with the `BOM`
-	var replaceMap = {
-		'%FE%FF': '\uFFFD\uFFFD',
-		'%FF%FE': '\uFFFD\uFFFD'
-	};
-
-	var match = multiMatcher.exec(input);
-	while (match) {
-		try {
-			// Decode as big chunks as possible
-			replaceMap[match[0]] = decodeURIComponent(match[0]);
-		} catch (err) {
-			var result = decode(match[0]);
-
-			if (result !== match[0]) {
-				replaceMap[match[0]] = result;
-			}
-		}
-
-		match = multiMatcher.exec(input);
-	}
-
-	// Add `%C2` at the end of the map to make sure it does not replace the combinator before everything else
-	replaceMap['%C2'] = '\uFFFD';
-
-	var entries = Object.keys(replaceMap);
-
-	for (var i = 0; i < entries.length; i++) {
-		// Replace all decoded components
-		var key = entries[i];
-		input = input.replace(new RegExp(key, 'g'), replaceMap[key]);
-	}
-
-	return input;
-}
-
-module.exports = function (encodedURI) {
-	if (typeof encodedURI !== 'string') {
-		throw new TypeError('Expected `encodedURI` to be of type `string`, got `' + typeof encodedURI + '`');
-	}
-
-	try {
-		encodedURI = encodedURI.replace(/\+/g, ' ');
-
-		// Try the built in decoder first
-		return decodeURIComponent(encodedURI);
-	} catch (err) {
-		// Fallback to a more advanced decoder
-		return customDecodeURIComponent(encodedURI);
-	}
-};
-
-
-/***/ }),
-/* 631 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var pSlice = Array.prototype.slice;
-var objectKeys = __webpack_require__(633);
-var isArguments = __webpack_require__(632);
-
-var deepEqual = module.exports = function (actual, expected, opts) {
-  if (!opts) opts = {};
-  // 7.1. All identical values are equivalent, as determined by ===.
-  if (actual === expected) {
-    return true;
-
-  } else if (actual instanceof Date && expected instanceof Date) {
-    return actual.getTime() === expected.getTime();
-
-  // 7.3. Other pairs that do not both pass typeof value == 'object',
-  // equivalence is determined by ==.
-  } else if (!actual || !expected || typeof actual != 'object' && typeof expected != 'object') {
-    return opts.strict ? actual === expected : actual == expected;
-
-  // 7.4. For all other Object pairs, including Array objects, equivalence is
-  // determined by having the same number of owned properties (as verified
-  // with Object.prototype.hasOwnProperty.call), the same set of keys
-  // (although not necessarily the same order), equivalent values for every
-  // corresponding key, and an identical 'prototype' property. Note: this
-  // accounts for both named and indexed properties on Arrays.
-  } else {
-    return objEquiv(actual, expected, opts);
-  }
-}
-
-function isUndefinedOrNull(value) {
-  return value === null || value === undefined;
-}
-
-function isBuffer (x) {
-  if (!x || typeof x !== 'object' || typeof x.length !== 'number') return false;
-  if (typeof x.copy !== 'function' || typeof x.slice !== 'function') {
-    return false;
-  }
-  if (x.length > 0 && typeof x[0] !== 'number') return false;
-  return true;
-}
-
-function objEquiv(a, b, opts) {
-  var i, key;
-  if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
-    return false;
-  // an identical 'prototype' property.
-  if (a.prototype !== b.prototype) return false;
-  //~~~I've managed to break Object.keys through screwy arguments passing.
-  //   Converting to array solves the problem.
-  if (isArguments(a)) {
-    if (!isArguments(b)) {
-      return false;
-    }
-    a = pSlice.call(a);
-    b = pSlice.call(b);
-    return deepEqual(a, b, opts);
-  }
-  if (isBuffer(a)) {
-    if (!isBuffer(b)) {
-      return false;
-    }
-    if (a.length !== b.length) return false;
-    for (i = 0; i < a.length; i++) {
-      if (a[i] !== b[i]) return false;
-    }
-    return true;
-  }
-  try {
-    var ka = objectKeys(a),
-        kb = objectKeys(b);
-  } catch (e) {//happens when one is a string literal and the other isn't
-    return false;
-  }
-  // having the same number of owned properties (keys incorporates
-  // hasOwnProperty)
-  if (ka.length != kb.length)
-    return false;
-  //the same set of keys (although not necessarily the same order),
-  ka.sort();
-  kb.sort();
-  //~~~cheap key test
-  for (i = ka.length - 1; i >= 0; i--) {
-    if (ka[i] != kb[i])
-      return false;
-  }
-  //equivalent values for every corresponding key, and
-  //~~~possibly expensive deep test
-  for (i = ka.length - 1; i >= 0; i--) {
-    key = ka[i];
-    if (!deepEqual(a[key], b[key], opts)) return false;
-  }
-  return typeof a === typeof b;
-}
-
-
-/***/ }),
-/* 632 */
-/***/ (function(module, exports) {
-
-var supportsArgumentsClass = (function(){
-  return Object.prototype.toString.call(arguments)
-})() == '[object Arguments]';
-
-exports = module.exports = supportsArgumentsClass ? supported : unsupported;
-
-exports.supported = supported;
-function supported(object) {
-  return Object.prototype.toString.call(object) == '[object Arguments]';
-};
-
-exports.unsupported = unsupported;
-function unsupported(object){
-  return object &&
-    typeof object == 'object' &&
-    typeof object.length == 'number' &&
-    Object.prototype.hasOwnProperty.call(object, 'callee') &&
-    !Object.prototype.propertyIsEnumerable.call(object, 'callee') ||
-    false;
-};
-
-
-/***/ }),
-/* 633 */
-/***/ (function(module, exports) {
-
-exports = module.exports = typeof Object.keys === 'function'
-  ? Object.keys : shim;
-
-exports.shim = shim;
-function shim (obj) {
-  var keys = [];
-  for (var key in obj) keys.push(key);
-  return keys;
-}
-
-
-/***/ }),
-/* 634 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(23).Stream;
-var util = __webpack_require__(3);
-
-module.exports = DelayedStream;
-function DelayedStream() {
-  this.source = null;
-  this.dataSize = 0;
-  this.maxDataSize = 1024 * 1024;
-  this.pauseStream = true;
-
-  this._maxDataSizeExceeded = false;
-  this._released = false;
-  this._bufferedEvents = [];
-}
-util.inherits(DelayedStream, Stream);
-
-DelayedStream.create = function(source, options) {
-  var delayedStream = new this();
-
-  options = options || {};
-  for (var option in options) {
-    delayedStream[option] = options[option];
-  }
-
-  delayedStream.source = source;
-
-  var realEmit = source.emit;
-  source.emit = function() {
-    delayedStream._handleEmit(arguments);
-    return realEmit.apply(source, arguments);
-  };
-
-  source.on('error', function() {});
-  if (delayedStream.pauseStream) {
-    source.pause();
-  }
-
-  return delayedStream;
-};
-
-Object.defineProperty(DelayedStream.prototype, 'readable', {
-  configurable: true,
-  enumerable: true,
-  get: function() {
-    return this.source.readable;
-  }
-});
-
-DelayedStream.prototype.setEncoding = function() {
-  return this.source.setEncoding.apply(this.source, arguments);
-};
-
-DelayedStream.prototype.resume = function() {
-  if (!this._released) {
-    this.release();
-  }
-
-  this.source.resume();
-};
-
-DelayedStream.prototype.pause = function() {
-  this.source.pause();
-};
-
-DelayedStream.prototype.release = function() {
-  this._released = true;
-
-  this._bufferedEvents.forEach(function(args) {
-    this.emit.apply(this, args);
-  }.bind(this));
-  this._bufferedEvents = [];
-};
-
-DelayedStream.prototype.pipe = function() {
-  var r = Stream.prototype.pipe.apply(this, arguments);
-  this.resume();
-  return r;
-};
-
-DelayedStream.prototype._handleEmit = function(args) {
-  if (this._released) {
-    this.emit.apply(this, args);
-    return;
-  }
-
-  if (args[0] === 'data') {
-    this.dataSize += args[1].length;
-    this._checkIfMaxDataSizeExceeded();
-  }
-
-  this._bufferedEvents.push(args);
-};
-
-DelayedStream.prototype._checkIfMaxDataSizeExceeded = function() {
-  if (this._maxDataSizeExceeded) {
-    return;
-  }
-
-  if (this.dataSize <= this.maxDataSize) {
-    return;
-  }
-
-  this._maxDataSizeExceeded = true;
-  var message =
-    'DelayedStream#maxDataSize of ' + this.maxDataSize + ' bytes exceeded.'
-  this.emit('error', new Error(message));
-};
-
-
-/***/ }),
-/* 635 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// detect either spaces or tabs but not both to properly handle tabs
-// for indentation and spaces for alignment
-const INDENT_RE = /^(?:( )+|\t+)/;
-
-function getMostUsed(indents) {
-	let result = 0;
-	let maxUsed = 0;
-	let maxWeight = 0;
-
-	for (const entry of indents) {
-		// TODO: use destructuring when targeting Node.js 6
-		const key = entry[0];
-		const val = entry[1];
-
-		const u = val[0];
-		const w = val[1];
-
-		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
-			maxUsed = u;
-			maxWeight = w;
-			result = Number(key);
-		}
-	}
-
-	return result;
-}
-
-module.exports = str => {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	// used to see if tabs or spaces are the most used
-	let tabs = 0;
-	let spaces = 0;
-
-	// remember the size of previous line's indentation
-	let prev = 0;
-
-	// remember how many indents/unindents as occurred for a given size
-	// and how much lines follow a given indentation
-	//
-	// indents = {
-	//    3: [1, 0],
-	//    4: [1, 5],
-	//    5: [1, 0],
-	//   12: [1, 0],
-	// }
-	const indents = new Map();
-
-	// pointer to the array of last used indent
-	let current;
-
-	// whether the last action was an indent (opposed to an unindent)
-	let isIndent;
-
-	for (const line of str.split(/\n/g)) {
-		if (!line) {
-			// ignore empty lines
-			continue;
-		}
-
-		let indent;
-		const matches = line.match(INDENT_RE);
-
-		if (matches) {
-			indent = matches[0].length;
-
-			if (matches[1]) {
-				spaces++;
-			} else {
-				tabs++;
-			}
-		} else {
-			indent = 0;
-		}
-
-		const diff = indent - prev;
-		prev = indent;
-
-		if (diff) {
-			// an indent or unindent has been detected
-
-			isIndent = diff > 0;
-
-			current = indents.get(isIndent ? diff : -diff);
-
-			if (current) {
-				current[0]++;
-			} else {
-				current = [1, 0];
-				indents.set(diff, current);
-			}
-		} else if (current) {
-			// if the last action was an indent, increment the weight
-			current[1] += Number(isIndent);
-		}
-	}
-
-	const amount = getMostUsed(indents);
-
-	let type;
-	let indent;
-	if (!amount) {
-		type = null;
-		indent = '';
-	} else if (spaces >= tabs) {
-		type = 'space';
-		indent = ' '.repeat(amount);
-	} else {
-		type = 'tab';
-		indent = '\t'.repeat(amount);
-	}
-
-	return {
-		amount,
-		type,
-		indent
-	};
-};
-
-
-/***/ }),
-/* 636 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-* Copyright (c) 2013, Yahoo! Inc. All rights reserved.
-* Copyrights licensed under the New BSD License.
-* See the accompanying LICENSE file for terms.
-*/
-
-var CacheObject = function (conf) {
-    conf = conf || {};
-    conf.ttl = parseInt(conf.ttl, 10) || 300; //0 is not permissible
-    conf.cachesize = parseInt(conf.cachesize, 10) || 1000; //0 is not permissible
-    
-    this.ttl = conf.ttl * 1000;
-    this.max = conf.cachesize;
-
-    this.count = 0;
-    this.data = {};
-    var next = __webpack_require__(512);
-
-    this.set = function (key, value, callback) {
-        var self = this;
-        next(function () {
-            if (self.data[key]) {
-                if (self.data[key].newer) {
-                    if (self.data[key].older) {
-                        self.data[key].newer.older = self.data[key].older;
-                        self.data[key].older.newer = self.data[key].newer;
-                    } else {
-                        self.tail = self.data[key].newer;
-                        delete self.tail.older;
-                    }
-
-                    self.data[key].older = self.head;
-                    self.head.newer = self.data[key];
-                    delete self.data[key].newer;
-                    self.head = self.data[key];
-                }
-
-                self.head.val = value;
-                self.head.hit = 0;
-                self.head.ts = Date.now();
-            } else {
-                // key is not exist
-                self.data[key] = {
-                    "key" : key,
-                    "val" : value,
-                    "hit" : 0,
-                    "ts" : Date.now()
-                };
-
-                if (!self.head) {
-                    // cache is empty
-                    self.head = self.data[key];
-                    self.tail = self.data[key];
-                } else {
-                    // insert the new entry to the front
-                    self.head.newer = self.data[key];
-                    self.data[key].older = self.head;
-                    self.head = self.data[key];
-                }
-
-                if (self.count >= self.max) {
-                    // remove the tail
-                    var temp = self.tail;
-                    self.tail = self.tail.newer;
-                    delete self.tail.next;
-                    delete self.data[temp.key];
-                } else {
-                    self.count = self.count + 1;
-                }
-            }
-            /* jshint -W030 */
-            callback && callback(null, value);
-        });
-    };
-
-    this.get = function (key, callback) {
-        var self = this;
-        if (!callback) {
-            throw('cache.get callback is required.');
-        }
-
-        next(function () {
-            if (!self.data[key]) {
-                return callback(null, undefined);
-            }
-            var value;
-            if (conf.ttl !== 0 && (Date.now() - self.data[key].ts) >= self.ttl) {
-                if (self.data[key].newer) {
-                    if (self.data[key].older) {
-                        // in the middle of the list
-                        self.data[key].newer.older = self.data[key].older;
-                        self.data[key].older.newer = self.data[key].newer;
-                    } else {
-                        // tail
-                        self.tail = self.data[key].newer;
-                        delete self.tail.older;
-                    }
-                } else {
-                    // the first item
-                    if (self.data[key].older) {
-                        self.head = self.data[key].older;
-                        delete self.head.newer;
-                    } else {
-                        // 1 items
-                        delete self.head;
-                        delete self.tail;
-                    }
-                }
-
-                delete self.data[key];
-                self.count = self.count - 1;
-            } else {
-                self.data[key].hit = self.data[key].hit + 1;
-                value = self.data[key].val;
-            }
-            callback(null, value);
-        });
-    };
-};
-
-module.exports = CacheObject;
-
-
-/***/ }),
-/* 637 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-* Copyright (c) 2013, Yahoo! Inc. All rights reserved.
-* Copyrights licensed under the New BSD License.
-* See the accompanying LICENSE file for terms.
-*/
-
-var CacheObject = __webpack_require__(636),
-    deepCopy = __webpack_require__(749),
-    dns = __webpack_require__(964);
-
-
-// original function storage
-var EnhanceDns = function (conf) {
-        conf = conf || {};
-        conf.ttl = parseInt(conf.ttl, 10) || 300; //0 is not allowed ie it ttl is set to 0, it will take the default
-        conf.cachesize = parseInt(conf.cachesize, 10); //0 is allowed but it will disable the caching
-
-        if (isNaN(conf.cachesize)) {
-            conf.cachesize = 1000; //set default cache size to 1000 records max
-        }
-        if (!conf.enable || conf.cachesize <= 0 || dns.internalCache) {
-            //cache already exists, means this code has already execute ie method are already overwritten
-            return dns;
-        }
-        
-        // original function storage
-        var backup_object = {
-                lookup : dns.lookup,
-                resolve : dns.resolve,
-                resolve4 : dns.resolve4,
-                resolve6 : dns.resolve6,
-                resolveMx : dns.resolveMx,
-                resolveTxt : dns.resolveTxt,
-                resolveSrv : dns.resolveSrv,
-                resolveNs : dns.resolveNs,
-                resolveCname : dns.resolveCname,
-                reverse : dns.reverse
-            },
-            // cache storage instance
-            cache = conf.cache ? /*istanbul ignore next*/ new conf.cache(conf) : new CacheObject(conf);
-        
-        // insert cache object to the instance
-        dns.internalCache = cache;
-
-        // override dns.lookup method
-        dns.lookup = function (domain, options, callback) {
-            var family = 0;
-            var hints = 0;
-            var all = false;
-            if (arguments.length === 2) {
-                callback = options;
-                options = family;
-            } else if (typeof options === 'object') {
-                if (options.family) {
-                    family = +options.family;
-                    if (family !== 4 && family !== 6) {
-                        callback(new Error('invalid argument: `family` must be 4 or 6'));
-                        return;
-                    }
-                }
-                /*istanbul ignore next - "hints" require node 0.12+*/
-                if (options.hints) {
-                    hints = +options.hints;
-                }
-                all = (options.all === true);
-            } else if (options) {
-                family = +options;
-                if (family !== 4 && family !== 6) {
-                    callback(new Error('invalid argument: `family` must be 4 or 6'));
-                    return;
-                }
-            }
-
-            cache.get('lookup_' + domain + '_' + family + '_' + hints + '_' + all, function (error, record) {
-                if (record) {
-                    /*istanbul ignore next - "all" option require node 4+*/
-                    if (Array.isArray(record)) {
-                        return callback(error, record);
-                    }
-                    return callback(error, record.address, record.family);
-                }
-
-                try{
-                    backup_object.lookup(domain, options, function (err, address, family_r) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        var value;
-                        /*istanbul ignore next - "all" option require node 4+*/
-                        if (Array.isArray(address)) {
-                            value = address;
-                        } else {
-                            value = {
-                                'address' : address,
-                                'family' : family_r
-                            };
-                        }
-                        cache.set('lookup_' + domain + '_' + family + '_' + hints + '_' +  all, value, function () {
-                            callback(err, address, family_r);
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolve method
-        dns.resolve = function (domain, type, callback) {
-            var type_new, callback_new;
-
-            if (typeof type === 'string') {
-                type_new = type;
-                callback_new = callback;
-            } else {
-                type_new = "A";
-                callback_new = type;
-            }
-
-            cache.get('resolve_' + domain + '_' + type_new, function (error, record) {
-                if (record) {
-                    return callback_new(error, deepCopy(record), true);
-                }
-                try {
-                    backup_object.resolve(domain, type_new, function (err, addresses) {
-                        if (err) {
-                            return callback_new(err);
-                        }
-                        cache.set('resolve_' + domain + '_' + type_new, addresses, function () {
-                            callback_new(err, deepCopy(addresses), false);
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback_new(err);
-                }
-            });
-        };
-
-        // override dns.resolve4 method
-        dns.resolve4 = function (domain, callback) {
-            cache.get('resolve4_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolve4(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolve4_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolve6 method
-        dns.resolve6 = function (domain, callback) {
-            cache.get('resolve6_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolve6(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolve6_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolveMx method
-        dns.resolveMx = function (domain, callback) {
-            cache.get('resolveMx_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolveMx(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolveMx_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolveTxt method
-        dns.resolveTxt = function (domain, callback) {
-            cache.get('resolveTxt_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolveTxt(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolveTxt_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolveSrv method
-        dns.resolveSrv = function (domain, callback) {
-            cache.get('resolveSrv_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolveSrv(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolveSrv_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolveNs method
-        dns.resolveNs = function (domain, callback) {
-            cache.get('resolveNs_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolveNs(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolveNs_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.resolveCname method
-        dns.resolveCname = function (domain, callback) {
-            cache.get('resolveCname_' + domain, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.resolveCname(domain, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('resolveCname_' + domain, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-
-        // override dns.reverse method
-        dns.reverse = function (ip, callback) {
-            cache.get('reverse_' + ip, function (error, record) {
-                if (record) {
-                    return callback(error, deepCopy(record));
-                }
-                try {
-                    backup_object.reverse(ip, function (err, addresses) {
-                        if (err) {
-                            return callback(err);
-                        }
-                        cache.set('reverse_' + ip, addresses, function () {
-                            callback(err, deepCopy(addresses));
-                        });
-                    });
-                } catch (err) {
-                    /*istanbul ignore next - doesn't throw in node 0.10*/
-                    callback(err);
-                }
-            });
-        };
-        return dns;
-};
-
-module.exports = function(conf) {
-    return new EnhanceDns(conf);
-};
-
-
-/***/ }),
-/* 638 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Named EC curves
-
-// Requires ec.js, jsbn.js, and jsbn2.js
-var BigInteger = __webpack_require__(81).BigInteger
-var ECCurveFp = __webpack_require__(139).ECCurveFp
-
-
-// ----------------
-// X9ECParameters
-
-// constructor
-function X9ECParameters(curve,g,n,h) {
-    this.curve = curve;
-    this.g = g;
-    this.n = n;
-    this.h = h;
-}
-
-function x9getCurve() {
-    return this.curve;
-}
-
-function x9getG() {
-    return this.g;
-}
-
-function x9getN() {
-    return this.n;
-}
-
-function x9getH() {
-    return this.h;
-}
-
-X9ECParameters.prototype.getCurve = x9getCurve;
-X9ECParameters.prototype.getG = x9getG;
-X9ECParameters.prototype.getN = x9getN;
-X9ECParameters.prototype.getH = x9getH;
-
-// ----------------
-// SECNamedCurves
-
-function fromHex(s) { return new BigInteger(s, 16); }
-
-function secp128r1() {
-    // p = 2^128 - 2^97 - 1
-    var p = fromHex("FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF");
-    var a = fromHex("FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC");
-    var b = fromHex("E87579C11079F43DD824993C2CEE5ED3");
-    //byte[] S = Hex.decode("000E0D4D696E6768756151750CC03A4473D03679");
-    var n = fromHex("FFFFFFFE0000000075A30D1B9038A115");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-                + "161FF7528B899B2D0C28607CA52C5B86"
-		+ "CF5AC8395BAFEB13C02DA292DDED7A83");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-function secp160k1() {
-    // p = 2^160 - 2^32 - 2^14 - 2^12 - 2^9 - 2^8 - 2^7 - 2^3 - 2^2 - 1
-    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73");
-    var a = BigInteger.ZERO;
-    var b = fromHex("7");
-    //byte[] S = null;
-    var n = fromHex("0100000000000000000001B8FA16DFAB9ACA16B6B3");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-                + "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
-                + "938CF935318FDCED6BC28286531733C3F03C4FEE");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-function secp160r1() {
-    // p = 2^160 - 2^31 - 1
-    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF");
-    var a = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC");
-    var b = fromHex("1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45");
-    //byte[] S = Hex.decode("1053CDE42C14D696E67687561517533BF3F83345");
-    var n = fromHex("0100000000000000000001F4C8F927AED3CA752257");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-		+ "4A96B5688EF573284664698968C38BB913CBFC82"
-		+ "23A628553168947D59DCC912042351377AC5FB32");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-function secp192k1() {
-    // p = 2^192 - 2^32 - 2^12 - 2^8 - 2^7 - 2^6 - 2^3 - 1
-    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37");
-    var a = BigInteger.ZERO;
-    var b = fromHex("3");
-    //byte[] S = null;
-    var n = fromHex("FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-                + "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
-                + "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-function secp192r1() {
-    // p = 2^192 - 2^64 - 1
-    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF");
-    var a = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC");
-    var b = fromHex("64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1");
-    //byte[] S = Hex.decode("3045AE6FC8422F64ED579528D38120EAE12196D5");
-    var n = fromHex("FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-                + "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
-                + "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-function secp224r1() {
-    // p = 2^224 - 2^96 + 1
-    var p = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001");
-    var a = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE");
-    var b = fromHex("B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4");
-    //byte[] S = Hex.decode("BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5");
-    var n = fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-                + "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
-                + "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-function secp256r1() {
-    // p = 2^224 (2^32 - 1) + 2^192 + 2^96 - 1
-    var p = fromHex("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF");
-    var a = fromHex("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC");
-    var b = fromHex("5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B");
-    //byte[] S = Hex.decode("C49D360886E704936A6678E1139D26B7819F7E90");
-    var n = fromHex("FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551");
-    var h = BigInteger.ONE;
-    var curve = new ECCurveFp(p, a, b);
-    var G = curve.decodePointHex("04"
-                + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
-		+ "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5");
-    return new X9ECParameters(curve, G, n, h);
-}
-
-// TODO: make this into a proper hashtable
-function getSECCurveByName(name) {
-    if(name == "secp128r1") return secp128r1();
-    if(name == "secp160k1") return secp160k1();
-    if(name == "secp160r1") return secp160r1();
-    if(name == "secp192k1") return secp192k1();
-    if(name == "secp192r1") return secp192r1();
-    if(name == "secp224r1") return secp224r1();
-    if(name == "secp256r1") return secp256r1();
-    return null;
-}
-
-module.exports = {
-  "secp128r1":secp128r1,
-  "secp160k1":secp160k1,
-  "secp160r1":secp160r1,
-  "secp192k1":secp192k1,
-  "secp192r1":secp192r1,
-  "secp224r1":secp224r1,
-  "secp256r1":secp256r1
-}
-
-
-/***/ }),
-/* 639 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * expand-brackets <https://github.com/jonschlinkert/expand-brackets>
- *
- * Copyright (c) 2015 Jon Schlinkert.
- * Licensed under the MIT license.
- */
-
-
-
-var isPosixBracket = __webpack_require__(739);
-
-/**
- * POSIX character classes
- */
-
-var POSIX = {
-  alnum: 'a-zA-Z0-9',
-  alpha: 'a-zA-Z',
-  blank: ' \\t',
-  cntrl: '\\x00-\\x1F\\x7F',
-  digit: '0-9',
-  graph: '\\x21-\\x7E',
-  lower: 'a-z',
-  print: '\\x20-\\x7E',
-  punct: '-!"#$%&\'()\\*+,./:;<=>?@[\\]^_`{|}~',
-  space: ' \\t\\r\\n\\v\\f',
-  upper: 'A-Z',
-  word:  'A-Za-z0-9_',
-  xdigit: 'A-Fa-f0-9',
-};
-
-/**
- * Expose `brackets`
- */
-
-module.exports = brackets;
-
-function brackets(str) {
-  if (!isPosixBracket(str)) {
-    return str;
-  }
-
-  var negated = false;
-  if (str.indexOf('[^') !== -1) {
-    negated = true;
-    str = str.split('[^').join('[');
-  }
-  if (str.indexOf('[!') !== -1) {
-    negated = true;
-    str = str.split('[!').join('[');
-  }
-
-  var a = str.split('[');
-  var b = str.split(']');
-  var imbalanced = a.length !== b.length;
-
-  var parts = str.split(/(?::\]\[:|\[?\[:|:\]\]?)/);
-  var len = parts.length, i = 0;
-  var end = '', beg = '';
-  var res = [];
-
-  // start at the end (innermost) first
-  while (len--) {
-    var inner = parts[i++];
-    if (inner === '^[!' || inner === '[!') {
-      inner = '';
-      negated = true;
-    }
-
-    var prefix = negated ? '^' : '';
-    var ch = POSIX[inner];
-
-    if (ch) {
-      res.push('[' + prefix + ch + ']');
-    } else if (inner) {
-      if (/^\[?\w-\w\]?$/.test(inner)) {
-        if (i === parts.length) {
-          res.push('[' + prefix + inner);
-        } else if (i === 1) {
-          res.push(prefix + inner + ']');
-        } else {
-          res.push(prefix + inner);
-        }
-      } else {
-        if (i === 1) {
-          beg += inner;
-        } else if (i === parts.length) {
-          end += inner;
-        } else {
-          res.push('[' + prefix + inner + ']');
-        }
-      }
-    }
-  }
-
-  var result = res.join('|');
-  var rlen = res.length || 1;
-  if (rlen > 1) {
-    result = '(?:' + result + ')';
-    rlen = 1;
-  }
-  if (beg) {
-    rlen++;
-    if (beg.charAt(0) === '[') {
-      if (imbalanced) {
-        beg = '\\[' + beg.slice(1);
-      } else {
-        beg += ']';
-      }
-    }
-    result = beg + result;
-  }
-  if (end) {
-    rlen++;
-    if (end.slice(-1) === ']') {
-      if (imbalanced) {
-        end = end.slice(0, end.length - 1) + '\\]';
-      } else {
-        end = '[' + end;
-      }
-    }
-    result += end;
-  }
-
-  if (rlen > 1) {
-    result = result.split('][').join(']|[');
-    if (result.indexOf('|') !== -1 && !/\(\?/.test(result)) {
-      result = '(?:' + result + ')';
-    }
-  }
-
-  result = result.replace(/\[+=|=\]+/g, '\\b');
-  return result;
-}
-
-brackets.makeRe = function(pattern) {
-  try {
-    return new RegExp(brackets(pattern));
-  } catch (err) {}
-};
-
-brackets.isMatch = function(str, pattern) {
-  try {
-    return brackets.makeRe(pattern).test(str);
-  } catch (err) {
-    return false;
-  }
-};
-
-brackets.match = function(arr, pattern) {
-  var len = arr.length, i = 0;
-  var res = arr.slice();
-
-  var re = brackets.makeRe(pattern);
-  while (i < len) {
-    var ele = arr[i++];
-    if (!re.test(ele)) {
-      continue;
-    }
-    res.splice(i, 1);
-  }
-  return res;
-};
-
-
-/***/ }),
-/* 640 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * expand-range <https://github.com/jonschlinkert/expand-range>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT license.
- */
-
-
-
-var fill = __webpack_require__(641);
-
-module.exports = function expandRange(str, options, fn) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expand-range expects a string.');
-  }
-
-  if (typeof options === 'function') {
-    fn = options;
-    options = {};
-  }
-
-  if (typeof options === 'boolean') {
-    options = {};
-    options.makeRe = true;
-  }
-
-  // create arguments to pass to fill-range
-  var opts = options || {};
-  var args = str.split('..');
-  var len = args.length;
-  if (len > 3) { return str; }
-
-  // if only one argument, it can't expand so return it
-  if (len === 1) { return args; }
-
-  // if `true`, tell fill-range to regexify the string
-  if (typeof fn === 'boolean' && fn === true) {
-    opts.makeRe = true;
-  }
-
-  args.push(opts);
-  return fill.apply(null, args.concat(fn));
-};
-
-
-/***/ }),
-/* 641 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(643);
-var isNumber = __webpack_require__(642);
-var randomize = __webpack_require__(787);
-var repeatStr = __webpack_require__(797);
-var repeat = __webpack_require__(411);
-
-/**
- * Expose `fillRange`
- */
-
-module.exports = fillRange;
-
-/**
- * Return a range of numbers or letters.
- *
- * @param  {String} `a` Start of the range
- * @param  {String} `b` End of the range
- * @param  {String} `step` Increment or decrement to use.
- * @param  {Function} `fn` Custom function to modify each element in the range.
- * @return {Array}
- */
-
-function fillRange(a, b, step, options, fn) {
-  if (a == null || b == null) {
-    throw new Error('fill-range expects the first and second args to be strings.');
-  }
-
-  if (typeof step === 'function') {
-    fn = step; options = {}; step = null;
-  }
-
-  if (typeof options === 'function') {
-    fn = options; options = {};
-  }
-
-  if (isObject(step)) {
-    options = step; step = '';
-  }
-
-  var expand, regex = false, sep = '';
-  var opts = options || {};
-
-  if (typeof opts.silent === 'undefined') {
-    opts.silent = true;
-  }
-
-  step = step || opts.step;
-
-  // store a ref to unmodified arg
-  var origA = a, origB = b;
-
-  b = (b.toString() === '-0') ? 0 : b;
-
-  if (opts.optimize || opts.makeRe) {
-    step = step ? (step += '~') : step;
-    expand = true;
-    regex = true;
-    sep = '~';
-  }
-
-  // handle special step characters
-  if (typeof step === 'string') {
-    var match = stepRe().exec(step);
-
-    if (match) {
-      var i = match.index;
-      var m = match[0];
-
-      // repeat string
-      if (m === '+') {
-        return repeat(a, b);
-
-      // randomize a, `b` times
-      } else if (m === '?') {
-        return [randomize(a, b)];
-
-      // expand right, no regex reduction
-      } else if (m === '>') {
-        step = step.substr(0, i) + step.substr(i + 1);
-        expand = true;
-
-      // expand to an array, or if valid create a reduced
-      // string for a regex logic `or`
-      } else if (m === '|') {
-        step = step.substr(0, i) + step.substr(i + 1);
-        expand = true;
-        regex = true;
-        sep = m;
-
-      // expand to an array, or if valid create a reduced
-      // string for a regex range
-      } else if (m === '~') {
-        step = step.substr(0, i) + step.substr(i + 1);
-        expand = true;
-        regex = true;
-        sep = m;
-      }
-    } else if (!isNumber(step)) {
-      if (!opts.silent) {
-        throw new TypeError('fill-range: invalid step.');
-      }
-      return null;
-    }
-  }
-
-  if (/[.&*()[\]^%$#@!]/.test(a) || /[.&*()[\]^%$#@!]/.test(b)) {
-    if (!opts.silent) {
-      throw new RangeError('fill-range: invalid range arguments.');
-    }
-    return null;
-  }
-
-  // has neither a letter nor number, or has both letters and numbers
-  // this needs to be after the step logic
-  if (!noAlphaNum(a) || !noAlphaNum(b) || hasBoth(a) || hasBoth(b)) {
-    if (!opts.silent) {
-      throw new RangeError('fill-range: invalid range arguments.');
-    }
-    return null;
-  }
-
-  // validate arguments
-  var isNumA = isNumber(zeros(a));
-  var isNumB = isNumber(zeros(b));
-
-  if ((!isNumA && isNumB) || (isNumA && !isNumB)) {
-    if (!opts.silent) {
-      throw new TypeError('fill-range: first range argument is incompatible with second.');
-    }
-    return null;
-  }
-
-  // by this point both are the same, so we
-  // can use A to check going forward.
-  var isNum = isNumA;
-  var num = formatStep(step);
-
-  // is the range alphabetical? or numeric?
-  if (isNum) {
-    // if numeric, coerce to an integer
-    a = +a; b = +b;
-  } else {
-    // otherwise, get the charCode to expand alpha ranges
-    a = a.charCodeAt(0);
-    b = b.charCodeAt(0);
-  }
-
-  // is the pattern descending?
-  var isDescending = a > b;
-
-  // don't create a character class if the args are < 0
-  if (a < 0 || b < 0) {
-    expand = false;
-    regex = false;
-  }
-
-  // detect padding
-  var padding = isPadded(origA, origB);
-  var res, pad, arr = [];
-  var ii = 0;
-
-  // character classes, ranges and logical `or`
-  if (regex) {
-    if (shouldExpand(a, b, num, isNum, padding, opts)) {
-      // make sure the correct separator is used
-      if (sep === '|' || sep === '~') {
-        sep = detectSeparator(a, b, num, isNum, isDescending);
-      }
-      return wrap([origA, origB], sep, opts);
-    }
-  }
-
-  while (isDescending ? (a >= b) : (a <= b)) {
-    if (padding && isNum) {
-      pad = padding(a);
-    }
-
-    // custom function
-    if (typeof fn === 'function') {
-      res = fn(a, isNum, pad, ii++);
-
-    // letters
-    } else if (!isNum) {
-      if (regex && isInvalidChar(a)) {
-        res = null;
-      } else {
-        res = String.fromCharCode(a);
-      }
-
-    // numbers
-    } else {
-      res = formatPadding(a, pad);
-    }
-
-    // add result to the array, filtering any nulled values
-    if (res !== null) arr.push(res);
-
-    // increment or decrement
-    if (isDescending) {
-      a -= num;
-    } else {
-      a += num;
-    }
-  }
-
-  // now that the array is expanded, we need to handle regex
-  // character classes, ranges or logical `or` that wasn't
-  // already handled before the loop
-  if ((regex || expand) && !opts.noexpand) {
-    // make sure the correct separator is used
-    if (sep === '|' || sep === '~') {
-      sep = detectSeparator(a, b, num, isNum, isDescending);
-    }
-    if (arr.length === 1 || a < 0 || b < 0) { return arr; }
-    return wrap(arr, sep, opts);
-  }
-
-  return arr;
-}
-
-/**
- * Wrap the string with the correct regex
- * syntax.
- */
-
-function wrap(arr, sep, opts) {
-  if (sep === '~') { sep = '-'; }
-  var str = arr.join(sep);
-  var pre = opts && opts.regexPrefix;
-
-  // regex logical `or`
-  if (sep === '|') {
-    str = pre ? pre + str : str;
-    str = '(' + str + ')';
-  }
-
-  // regex character class
-  if (sep === '-') {
-    str = (pre && pre === '^')
-      ? pre + str
-      : str;
-    str = '[' + str + ']';
-  }
-  return [str];
-}
-
-/**
- * Check for invalid characters
- */
-
-function isCharClass(a, b, step, isNum, isDescending) {
-  if (isDescending) { return false; }
-  if (isNum) { return a <= 9 && b <= 9; }
-  if (a < b) { return step === 1; }
-  return false;
-}
-
-/**
- * Detect the correct separator to use
- */
-
-function shouldExpand(a, b, num, isNum, padding, opts) {
-  if (isNum && (a > 9 || b > 9)) { return false; }
-  return !padding && num === 1 && a < b;
-}
-
-/**
- * Detect the correct separator to use
- */
-
-function detectSeparator(a, b, step, isNum, isDescending) {
-  var isChar = isCharClass(a, b, step, isNum, isDescending);
-  if (!isChar) {
-    return '|';
-  }
-  return '~';
-}
-
-/**
- * Correctly format the step based on type
- */
-
-function formatStep(step) {
-  return Math.abs(step >> 0) || 1;
-}
-
-/**
- * Format padding, taking leading `-` into account
- */
-
-function formatPadding(ch, pad) {
-  var res = pad ? pad + ch : ch;
-  if (pad && ch.toString().charAt(0) === '-') {
-    res = '-' + pad + ch.toString().substr(1);
-  }
-  return res.toString();
-}
-
-/**
- * Check for invalid characters
- */
-
-function isInvalidChar(str) {
-  var ch = toStr(str);
-  return ch === '\\'
-    || ch === '['
-    || ch === ']'
-    || ch === '^'
-    || ch === '('
-    || ch === ')'
-    || ch === '`';
-}
-
-/**
- * Convert to a string from a charCode
- */
-
-function toStr(ch) {
-  return String.fromCharCode(ch);
-}
-
-
-/**
- * Step regex
- */
-
-function stepRe() {
-  return /\?|>|\||\+|\~/g;
-}
-
-/**
- * Return true if `val` has either a letter
- * or a number
- */
-
-function noAlphaNum(val) {
-  return /[a-z0-9]/i.test(val);
-}
-
-/**
- * Return true if `val` has both a letter and
- * a number (invalid)
- */
-
-function hasBoth(val) {
-  return /[a-z][0-9]|[0-9][a-z]/i.test(val);
-}
-
-/**
- * Normalize zeros for checks
- */
-
-function zeros(val) {
-  if (/^-*0+$/.test(val.toString())) {
-    return '0';
-  }
-  return val;
-}
-
-/**
- * Return true if `val` has leading zeros,
- * or a similar valid pattern.
- */
-
-function hasZeros(val) {
-  return /[^.]\.|^-*0+[0-9]/.test(val);
-}
-
-/**
- * If the string is padded, returns a curried function with
- * the a cached padding string, or `false` if no padding.
- *
- * @param  {*} `origA` String or number.
- * @return {String|Boolean}
- */
-
-function isPadded(origA, origB) {
-  if (hasZeros(origA) || hasZeros(origB)) {
-    var alen = length(origA);
-    var blen = length(origB);
-
-    var len = alen >= blen
-      ? alen
-      : blen;
-
-    return function (a) {
-      return repeatStr('0', len - length(a));
-    };
-  }
-  return false;
-}
-
-/**
- * Get the string length of `val`
- */
-
-function length(val) {
-  return val.toString().length;
-}
-
-
-/***/ }),
-/* 642 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var typeOf = __webpack_require__(179);
-
-module.exports = function isNumber(num) {
-  var type = typeOf(num);
-  if (type !== 'number' && type !== 'string') {
-    return false;
-  }
-  var n = +num;
-  return (n - n + 1) >= 0 && num !== '';
-};
-
-
-/***/ }),
-/* 643 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * isobject <https://github.com/jonschlinkert/isobject>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isArray = __webpack_require__(398);
-
-module.exports = function isObject(val) {
-  return val != null && typeof val === 'object' && isArray(val) === false;
-};
-
-
-/***/ }),
-/* 644 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * extglob <https://github.com/jonschlinkert/extglob>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-/**
- * Module dependencies
- */
-
-var isExtglob = __webpack_require__(177);
-var re, cache = {};
-
-/**
- * Expose `extglob`
- */
-
-module.exports = extglob;
-
-/**
- * Convert the given extglob `string` to a regex-compatible
- * string.
- *
- * ```js
- * var extglob = require('extglob');
- * extglob('!(a?(b))');
- * //=> '(?!a(?:b)?)[^/]*?'
- * ```
- *
- * @param {String} `str` The string to convert.
- * @param {Object} `options`
- *   @option {Boolean} [options] `esc` If `false` special characters will not be escaped. Defaults to `true`.
- *   @option {Boolean} [options] `regex` If `true` a regular expression is returned instead of a string.
- * @return {String}
- * @api public
- */
-
-
-function extglob(str, opts) {
-  opts = opts || {};
-  var o = {}, i = 0;
-
-  // fix common character reversals
-  // '*!(.js)' => '*.!(js)'
-  str = str.replace(/!\(([^\w*()])/g, '$1!(');
-
-  // support file extension negation
-  str = str.replace(/([*\/])\.!\([*]\)/g, function (m, ch) {
-    if (ch === '/') {
-      return escape('\\/[^.]+');
-    }
-    return escape('[^.]+');
-  });
-
-  // create a unique key for caching by
-  // combining the string and options
-  var key = str
-    + String(!!opts.regex)
-    + String(!!opts.contains)
-    + String(!!opts.escape);
-
-  if (cache.hasOwnProperty(key)) {
-    return cache[key];
-  }
-
-  if (!(re instanceof RegExp)) {
-    re = regex();
-  }
-
-  opts.negate = false;
-  var m;
-
-  while (m = re.exec(str)) {
-    var prefix = m[1];
-    var inner = m[3];
-    if (prefix === '!') {
-      opts.negate = true;
-    }
-
-    var id = '__EXTGLOB_' + (i++) + '__';
-    // use the prefix of the _last_ (outtermost) pattern
-    o[id] = wrap(inner, prefix, opts.escape);
-    str = str.split(m[0]).join(id);
-  }
-
-  var keys = Object.keys(o);
-  var len = keys.length;
-
-  // we have to loop again to allow us to convert
-  // patterns in reverse order (starting with the
-  // innermost/last pattern first)
-  while (len--) {
-    var prop = keys[len];
-    str = str.split(prop).join(o[prop]);
-  }
-
-  var result = opts.regex
-    ? toRegex(str, opts.contains, opts.negate)
-    : str;
-
-  result = result.split('.').join('\\.');
-
-  // cache the result and return it
-  return (cache[key] = result);
-}
-
-/**
- * Convert `string` to a regex string.
- *
- * @param  {String} `str`
- * @param  {String} `prefix` Character that determines how to wrap the string.
- * @param  {Boolean} `esc` If `false` special characters will not be escaped. Defaults to `true`.
- * @return {String}
- */
-
-function wrap(inner, prefix, esc) {
-  if (esc) inner = escape(inner);
-
-  switch (prefix) {
-    case '!':
-      return '(?!' + inner + ')[^/]' + (esc ? '%%%~' : '*?');
-    case '@':
-      return '(?:' + inner + ')';
-    case '+':
-      return '(?:' + inner + ')+';
-    case '*':
-      return '(?:' + inner + ')' + (esc ? '%%' : '*')
-    case '?':
-      return '(?:' + inner + '|)';
-    default:
-      return inner;
-  }
-}
-
-function escape(str) {
-  str = str.split('*').join('[^/]%%%~');
-  str = str.split('.').join('\\.');
-  return str;
-}
-
-/**
- * extglob regex.
- */
-
-function regex() {
-  return /(\\?[@?!+*$]\\?)(\(([^()]*?)\))/;
-}
-
-/**
- * Negation regex
- */
-
-function negate(str) {
-  return '(?!^' + str + ').*$';
-}
-
-/**
- * Create the regex to do the matching. If
- * the leading character in the `pattern` is `!`
- * a negation regex is returned.
- *
- * @param {String} `pattern`
- * @param {Boolean} `contains` Allow loose matching.
- * @param {Boolean} `isNegated` True if the pattern is a negation pattern.
- */
-
-function toRegex(pattern, contains, isNegated) {
-  var prefix = contains ? '^' : '';
-  var after = contains ? '$' : '';
-  pattern = ('(?:' + pattern + ')' + after);
-  if (isNegated) {
-    pattern = prefix + negate(pattern);
-  }
-  return new RegExp(prefix + pattern);
-}
-
-
-/***/ }),
-/* 645 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- * extsprintf.js: extended POSIX-style sprintf
- */
-
-var mod_assert = __webpack_require__(28);
-var mod_util = __webpack_require__(3);
-
-/*
- * Public interface
- */
-exports.sprintf = jsSprintf;
-exports.printf = jsPrintf;
-exports.fprintf = jsFprintf;
-
-/*
- * Stripped down version of s[n]printf(3c).  We make a best effort to throw an
- * exception when given a format string we don't understand, rather than
- * ignoring it, so that we won't break existing programs if/when we go implement
- * the rest of this.
- *
- * This implementation currently supports specifying
- *	- field alignment ('-' flag),
- * 	- zero-pad ('0' flag)
- *	- always show numeric sign ('+' flag),
- *	- field width
- *	- conversions for strings, decimal integers, and floats (numbers).
- *	- argument size specifiers.  These are all accepted but ignored, since
- *	  Javascript has no notion of the physical size of an argument.
- *
- * Everything else is currently unsupported, most notably precision, unsigned
- * numbers, non-decimal numbers, and characters.
- */
-function jsSprintf(fmt)
-{
-	var regex = [
-	    '([^%]*)',				/* normal text */
-	    '%',				/* start of format */
-	    '([\'\\-+ #0]*?)',			/* flags (optional) */
-	    '([1-9]\\d*)?',			/* width (optional) */
-	    '(\\.([1-9]\\d*))?',		/* precision (optional) */
-	    '[lhjztL]*?',			/* length mods (ignored) */
-	    '([diouxXfFeEgGaAcCsSp%jr])'	/* conversion */
-	].join('');
-
-	var re = new RegExp(regex);
-	var args = Array.prototype.slice.call(arguments, 1);
-	var flags, width, precision, conversion;
-	var left, pad, sign, arg, match;
-	var ret = '';
-	var argn = 1;
-
-	mod_assert.equal('string', typeof (fmt));
-
-	while ((match = re.exec(fmt)) !== null) {
-		ret += match[1];
-		fmt = fmt.substring(match[0].length);
-
-		flags = match[2] || '';
-		width = match[3] || 0;
-		precision = match[4] || '';
-		conversion = match[6];
-		left = false;
-		sign = false;
-		pad = ' ';
-
-		if (conversion == '%') {
-			ret += '%';
-			continue;
-		}
-
-		if (args.length === 0)
-			throw (new Error('too few args to sprintf'));
-
-		arg = args.shift();
-		argn++;
-
-		if (flags.match(/[\' #]/))
-			throw (new Error(
-			    'unsupported flags: ' + flags));
-
-		if (precision.length > 0)
-			throw (new Error(
-			    'non-zero precision not supported'));
-
-		if (flags.match(/-/))
-			left = true;
-
-		if (flags.match(/0/))
-			pad = '0';
-
-		if (flags.match(/\+/))
-			sign = true;
-
-		switch (conversion) {
-		case 's':
-			if (arg === undefined || arg === null)
-				throw (new Error('argument ' + argn +
-				    ': attempted to print undefined or null ' +
-				    'as a string'));
-			ret += doPad(pad, width, left, arg.toString());
-			break;
-
-		case 'd':
-			arg = Math.floor(arg);
-			/*jsl:fallthru*/
-		case 'f':
-			sign = sign && arg > 0 ? '+' : '';
-			ret += sign + doPad(pad, width, left,
-			    arg.toString());
-			break;
-
-		case 'x':
-			ret += doPad(pad, width, left, arg.toString(16));
-			break;
-
-		case 'j': /* non-standard */
-			if (width === 0)
-				width = 10;
-			ret += mod_util.inspect(arg, false, width);
-			break;
-
-		case 'r': /* non-standard */
-			ret += dumpException(arg);
-			break;
-
-		default:
-			throw (new Error('unsupported conversion: ' +
-			    conversion));
-		}
-	}
-
-	ret += fmt;
-	return (ret);
-}
-
-function jsPrintf() {
-	var args = Array.prototype.slice.call(arguments);
-	args.unshift(process.stdout);
-	jsFprintf.apply(null, args);
-}
-
-function jsFprintf(stream) {
-	var args = Array.prototype.slice.call(arguments, 1);
-	return (stream.write(jsSprintf.apply(this, args)));
-}
-
-function doPad(chr, width, left, str)
-{
-	var ret = str;
-
-	while (ret.length < width) {
-		if (left)
-			ret += chr;
-		else
-			ret = chr + ret;
-	}
-
-	return (ret);
-}
-
-/*
- * This function dumps long stack traces for exceptions having a cause() method.
- * See node-verror for an example.
- */
-function dumpException(ex)
-{
-	var ret;
-
-	if (!(ex instanceof Error))
-		throw (new Error(jsSprintf('invalid type for %%r: %j', ex)));
-
-	/* Note that V8 prepends "ex.stack" with ex.toString(). */
-	ret = 'EXCEPTION: ' + ex.constructor.name + ': ' + ex.stack;
-
-	if (ex.cause && typeof (ex.cause) === 'function') {
-		var cex = ex.cause();
-		if (cex) {
-			ret += '\nCaused by: ' + dumpException(cex);
-		}
-	}
-
-	return (ret);
-}
-
-
-/***/ }),
-/* 646 */
-/***/ (function(module, exports) {
-
-/*!
- * filename-regex <https://github.com/regexps/filename-regex>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert
- * Licensed under the MIT license.
- */
-
-module.exports = function filenameRegex() {
-  return /([^\\\/]+)$/;
-};
-
-
-/***/ }),
-/* 647 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * for-in <https://github.com/jonschlinkert/for-in>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function forIn(obj, fn, thisArg) {
-  for (var key in obj) {
-    if (fn.call(thisArg, obj[key], key, obj) === false) {
-      break;
-    }
-  }
-};
-
-
-/***/ }),
-/* 648 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = ForeverAgent
-ForeverAgent.SSL = ForeverAgentSSL
-
-var util = __webpack_require__(3)
-  , Agent = __webpack_require__(87).Agent
-  , net = __webpack_require__(164)
-  , tls = __webpack_require__(467)
-  , AgentSSL = __webpack_require__(195).Agent
-  
-function getConnectionName(host, port) {  
-  var name = ''
-  if (typeof host === 'string') {
-    name = host + ':' + port
-  } else {
-    // For node.js v012.0 and iojs-v1.5.1, host is an object. And any existing localAddress is part of the connection name.
-    name = host.host + ':' + host.port + ':' + (host.localAddress ? (host.localAddress + ':') : ':')
-  }
-  return name
-}    
-
-function ForeverAgent(options) {
-  var self = this
-  self.options = options || {}
-  self.requests = {}
-  self.sockets = {}
-  self.freeSockets = {}
-  self.maxSockets = self.options.maxSockets || Agent.defaultMaxSockets
-  self.minSockets = self.options.minSockets || ForeverAgent.defaultMinSockets
-  self.on('free', function(socket, host, port) {
-    var name = getConnectionName(host, port)
-
-    if (self.requests[name] && self.requests[name].length) {
-      self.requests[name].shift().onSocket(socket)
-    } else if (self.sockets[name].length < self.minSockets) {
-      if (!self.freeSockets[name]) self.freeSockets[name] = []
-      self.freeSockets[name].push(socket)
-      
-      // if an error happens while we don't use the socket anyway, meh, throw the socket away
-      var onIdleError = function() {
-        socket.destroy()
-      }
-      socket._onIdleError = onIdleError
-      socket.on('error', onIdleError)
-    } else {
-      // If there are no pending requests just destroy the
-      // socket and it will get removed from the pool. This
-      // gets us out of timeout issues and allows us to
-      // default to Connection:keep-alive.
-      socket.destroy()
-    }
-  })
-
-}
-util.inherits(ForeverAgent, Agent)
-
-ForeverAgent.defaultMinSockets = 5
-
-
-ForeverAgent.prototype.createConnection = net.createConnection
-ForeverAgent.prototype.addRequestNoreuse = Agent.prototype.addRequest
-ForeverAgent.prototype.addRequest = function(req, host, port) {
-  var name = getConnectionName(host, port)
-  
-  if (typeof host !== 'string') {
-    var options = host
-    port = options.port
-    host = options.host
-  }
-
-  if (this.freeSockets[name] && this.freeSockets[name].length > 0 && !req.useChunkedEncodingByDefault) {
-    var idleSocket = this.freeSockets[name].pop()
-    idleSocket.removeListener('error', idleSocket._onIdleError)
-    delete idleSocket._onIdleError
-    req._reusedSocket = true
-    req.onSocket(idleSocket)
-  } else {
-    this.addRequestNoreuse(req, host, port)
-  }
-}
-
-ForeverAgent.prototype.removeSocket = function(s, name, host, port) {
-  if (this.sockets[name]) {
-    var index = this.sockets[name].indexOf(s)
-    if (index !== -1) {
-      this.sockets[name].splice(index, 1)
-    }
-  } else if (this.sockets[name] && this.sockets[name].length === 0) {
-    // don't leak
-    delete this.sockets[name]
-    delete this.requests[name]
-  }
-  
-  if (this.freeSockets[name]) {
-    var index = this.freeSockets[name].indexOf(s)
-    if (index !== -1) {
-      this.freeSockets[name].splice(index, 1)
-      if (this.freeSockets[name].length === 0) {
-        delete this.freeSockets[name]
-      }
-    }
-  }
-
-  if (this.requests[name] && this.requests[name].length) {
-    // If we have pending requests and a socket gets closed a new one
-    // needs to be created to take over in the pool for the one that closed.
-    this.createSocket(name, host, port).emit('free')
-  }
-}
-
-function ForeverAgentSSL (options) {
-  ForeverAgent.call(this, options)
-}
-util.inherits(ForeverAgentSSL, ForeverAgent)
-
-ForeverAgentSSL.prototype.createConnection = createConnectionSSL
-ForeverAgentSSL.prototype.addRequestNoreuse = AgentSSL.prototype.addRequest
-
-function createConnectionSSL (port, host, options) {
-  if (typeof port === 'object') {
-    options = port;
-  } else if (typeof host === 'object') {
-    options = host;
-  } else if (typeof options === 'object') {
-    options = options;
-  } else {
-    options = {};
-  }
-
-  if (typeof port === 'number') {
-    options.port = port;
-  }
-
-  if (typeof host === 'string') {
-    options.host = host;
-  }
-
-  return tls.connect(options);
-}
-
-
-/***/ }),
-/* 649 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var CombinedStream = __webpack_require__(385);
-var util = __webpack_require__(3);
-var path = __webpack_require__(0);
-var http = __webpack_require__(87);
-var https = __webpack_require__(195);
-var parseUrl = __webpack_require__(24).parse;
-var fs = __webpack_require__(5);
-var mime = __webpack_require__(400);
-var asynckit = __webpack_require__(517);
-var populate = __webpack_require__(650);
-
-// Public API
-module.exports = FormData;
-
-// make it a Stream
-util.inherits(FormData, CombinedStream);
-
-/**
- * Create readable "multipart/form-data" streams.
- * Can be used to submit forms
- * and file uploads to other web applications.
- *
- * @constructor
- * @param {Object} options - Properties to be added/overriden for FormData and CombinedStream
- */
-function FormData(options) {
-  if (!(this instanceof FormData)) {
-    return new FormData();
-  }
-
-  this._overheadLength = 0;
-  this._valueLength = 0;
-  this._valuesToMeasure = [];
-
-  CombinedStream.call(this);
-
-  options = options || {};
-  for (var option in options) {
-    this[option] = options[option];
-  }
-}
-
-FormData.LINE_BREAK = '\r\n';
-FormData.DEFAULT_CONTENT_TYPE = 'application/octet-stream';
-
-FormData.prototype.append = function(field, value, options) {
-
-  options = options || {};
-
-  // allow filename as single option
-  if (typeof options == 'string') {
-    options = {filename: options};
-  }
-
-  var append = CombinedStream.prototype.append.bind(this);
-
-  // all that streamy business can't handle numbers
-  if (typeof value == 'number') {
-    value = '' + value;
-  }
-
-  // https://github.com/felixge/node-form-data/issues/38
-  if (util.isArray(value)) {
-    // Please convert your array into string
-    // the way web server expects it
-    this._error(new Error('Arrays are not supported.'));
-    return;
-  }
-
-  var header = this._multiPartHeader(field, value, options);
-  var footer = this._multiPartFooter();
-
-  append(header);
-  append(value);
-  append(footer);
-
-  // pass along options.knownLength
-  this._trackLength(header, value, options);
-};
-
-FormData.prototype._trackLength = function(header, value, options) {
-  var valueLength = 0;
-
-  // used w/ getLengthSync(), when length is known.
-  // e.g. for streaming directly from a remote server,
-  // w/ a known file a size, and not wanting to wait for
-  // incoming file to finish to get its size.
-  if (options.knownLength != null) {
-    valueLength += +options.knownLength;
-  } else if (Buffer.isBuffer(value)) {
-    valueLength = value.length;
-  } else if (typeof value === 'string') {
-    valueLength = Buffer.byteLength(value);
-  }
-
-  this._valueLength += valueLength;
-
-  // @check why add CRLF? does this account for custom/multiple CRLFs?
-  this._overheadLength +=
-    Buffer.byteLength(header) +
-    FormData.LINE_BREAK.length;
-
-  // empty or either doesn't have path or not an http response
-  if (!value || ( !value.path && !(value.readable && value.hasOwnProperty('httpVersion')) )) {
-    return;
-  }
-
-  // no need to bother with the length
-  if (!options.knownLength) {
-    this._valuesToMeasure.push(value);
-  }
-};
-
-FormData.prototype._lengthRetriever = function(value, callback) {
-
-  if (value.hasOwnProperty('fd')) {
-
-    // take read range into a account
-    // `end` = Infinity –> read file till the end
-    //
-    // TODO: Looks like there is bug in Node fs.createReadStream
-    // it doesn't respect `end` options without `start` options
-    // Fix it when node fixes it.
-    // https://github.com/joyent/node/issues/7819
-    if (value.end != undefined && value.end != Infinity && value.start != undefined) {
-
-      // when end specified
-      // no need to calculate range
-      // inclusive, starts with 0
-      callback(null, value.end + 1 - (value.start ? value.start : 0));
-
-    // not that fast snoopy
-    } else {
-      // still need to fetch file size from fs
-      fs.stat(value.path, function(err, stat) {
-
-        var fileSize;
-
-        if (err) {
-          callback(err);
-          return;
-        }
-
-        // update final size based on the range options
-        fileSize = stat.size - (value.start ? value.start : 0);
-        callback(null, fileSize);
-      });
-    }
-
-  // or http response
-  } else if (value.hasOwnProperty('httpVersion')) {
-    callback(null, +value.headers['content-length']);
-
-  // or request stream http://github.com/mikeal/request
-  } else if (value.hasOwnProperty('httpModule')) {
-    // wait till response come back
-    value.on('response', function(response) {
-      value.pause();
-      callback(null, +response.headers['content-length']);
-    });
-    value.resume();
-
-  // something else
-  } else {
-    callback('Unknown stream');
-  }
-};
-
-FormData.prototype._multiPartHeader = function(field, value, options) {
-  // custom header specified (as string)?
-  // it becomes responsible for boundary
-  // (e.g. to handle extra CRLFs on .NET servers)
-  if (typeof options.header == 'string') {
-    return options.header;
-  }
-
-  var contentDisposition = this._getContentDisposition(value, options);
-  var contentType = this._getContentType(value, options);
-
-  var contents = '';
-  var headers  = {
-    // add custom disposition as third element or keep it two elements if not
-    'Content-Disposition': ['form-data', 'name="' + field + '"'].concat(contentDisposition || []),
-    // if no content type. allow it to be empty array
-    'Content-Type': [].concat(contentType || [])
-  };
-
-  // allow custom headers.
-  if (typeof options.header == 'object') {
-    populate(headers, options.header);
-  }
-
-  var header;
-  for (var prop in headers) {
-    if (!headers.hasOwnProperty(prop)) continue;
-    header = headers[prop];
-
-    // skip nullish headers.
-    if (header == null) {
-      continue;
-    }
-
-    // convert all headers to arrays.
-    if (!Array.isArray(header)) {
-      header = [header];
-    }
-
-    // add non-empty headers.
-    if (header.length) {
-      contents += prop + ': ' + header.join('; ') + FormData.LINE_BREAK;
-    }
-  }
-
-  return '--' + this.getBoundary() + FormData.LINE_BREAK + contents + FormData.LINE_BREAK;
-};
-
-FormData.prototype._getContentDisposition = function(value, options) {
-
-  var filename
-    , contentDisposition
-    ;
-
-  if (typeof options.filepath === 'string') {
-    // custom filepath for relative paths
-    filename = path.normalize(options.filepath).replace(/\\/g, '/');
-  } else if (options.filename || value.name || value.path) {
-    // custom filename take precedence
-    // formidable and the browser add a name property
-    // fs- and request- streams have path property
-    filename = path.basename(options.filename || value.name || value.path);
-  } else if (value.readable && value.hasOwnProperty('httpVersion')) {
-    // or try http response
-    filename = path.basename(value.client._httpMessage.path);
-  }
-
-  if (filename) {
-    contentDisposition = 'filename="' + filename + '"';
-  }
-
-  return contentDisposition;
-};
-
-FormData.prototype._getContentType = function(value, options) {
-
-  // use custom content-type above all
-  var contentType = options.contentType;
-
-  // or try `name` from formidable, browser
-  if (!contentType && value.name) {
-    contentType = mime.lookup(value.name);
-  }
-
-  // or try `path` from fs-, request- streams
-  if (!contentType && value.path) {
-    contentType = mime.lookup(value.path);
-  }
-
-  // or if it's http-reponse
-  if (!contentType && value.readable && value.hasOwnProperty('httpVersion')) {
-    contentType = value.headers['content-type'];
-  }
-
-  // or guess it from the filepath or filename
-  if (!contentType && (options.filepath || options.filename)) {
-    contentType = mime.lookup(options.filepath || options.filename);
-  }
-
-  // fallback to the default content type if `value` is not simple value
-  if (!contentType && typeof value == 'object') {
-    contentType = FormData.DEFAULT_CONTENT_TYPE;
-  }
-
-  return contentType;
-};
-
-FormData.prototype._multiPartFooter = function() {
-  return function(next) {
-    var footer = FormData.LINE_BREAK;
-
-    var lastPart = (this._streams.length === 0);
-    if (lastPart) {
-      footer += this._lastBoundary();
-    }
-
-    next(footer);
-  }.bind(this);
-};
-
-FormData.prototype._lastBoundary = function() {
-  return '--' + this.getBoundary() + '--' + FormData.LINE_BREAK;
-};
-
-FormData.prototype.getHeaders = function(userHeaders) {
-  var header;
-  var formHeaders = {
-    'content-type': 'multipart/form-data; boundary=' + this.getBoundary()
-  };
-
-  for (header in userHeaders) {
-    if (userHeaders.hasOwnProperty(header)) {
-      formHeaders[header.toLowerCase()] = userHeaders[header];
-    }
-  }
-
-  return formHeaders;
-};
-
-FormData.prototype.getBoundary = function() {
-  if (!this._boundary) {
-    this._generateBoundary();
-  }
-
-  return this._boundary;
-};
-
-FormData.prototype._generateBoundary = function() {
-  // This generates a 50 character boundary similar to those used by Firefox.
-  // They are optimized for boyer-moore parsing.
-  var boundary = '--------------------------';
-  for (var i = 0; i < 24; i++) {
-    boundary += Math.floor(Math.random() * 10).toString(16);
-  }
-
-  this._boundary = boundary;
-};
-
-// Note: getLengthSync DOESN'T calculate streams length
-// As workaround one can calculate file size manually
-// and add it as knownLength option
-FormData.prototype.getLengthSync = function() {
-  var knownLength = this._overheadLength + this._valueLength;
-
-  // Don't get confused, there are 3 "internal" streams for each keyval pair
-  // so it basically checks if there is any value added to the form
-  if (this._streams.length) {
-    knownLength += this._lastBoundary().length;
-  }
-
-  // https://github.com/form-data/form-data/issues/40
-  if (!this.hasKnownLength()) {
-    // Some async length retrievers are present
-    // therefore synchronous length calculation is false.
-    // Please use getLength(callback) to get proper length
-    this._error(new Error('Cannot calculate proper length in synchronous way.'));
-  }
-
-  return knownLength;
-};
-
-// Public API to check if length of added values is known
-// https://github.com/form-data/form-data/issues/196
-// https://github.com/form-data/form-data/issues/262
-FormData.prototype.hasKnownLength = function() {
-  var hasKnownLength = true;
-
-  if (this._valuesToMeasure.length) {
-    hasKnownLength = false;
-  }
-
-  return hasKnownLength;
-};
-
-FormData.prototype.getLength = function(cb) {
-  var knownLength = this._overheadLength + this._valueLength;
-
-  if (this._streams.length) {
-    knownLength += this._lastBoundary().length;
-  }
-
-  if (!this._valuesToMeasure.length) {
-    process.nextTick(cb.bind(this, null, knownLength));
-    return;
-  }
-
-  asynckit.parallel(this._valuesToMeasure, this._lengthRetriever, function(err, values) {
-    if (err) {
-      cb(err);
-      return;
-    }
-
-    values.forEach(function(length) {
-      knownLength += length;
-    });
-
-    cb(null, knownLength);
-  });
-};
-
-FormData.prototype.submit = function(params, cb) {
-  var request
-    , options
-    , defaults = {method: 'post'}
-    ;
-
-  // parse provided url if it's string
-  // or treat it as options object
-  if (typeof params == 'string') {
-
-    params = parseUrl(params);
-    options = populate({
-      port: params.port,
-      path: params.pathname,
-      host: params.hostname,
-      protocol: params.protocol
-    }, defaults);
-
-  // use custom params
-  } else {
-
-    options = populate(params, defaults);
-    // if no port provided use default one
-    if (!options.port) {
-      options.port = options.protocol == 'https:' ? 443 : 80;
-    }
-  }
-
-  // put that good code in getHeaders to some use
-  options.headers = this.getHeaders(params.headers);
-
-  // https if specified, fallback to http in any other case
-  if (options.protocol == 'https:') {
-    request = https.request(options);
-  } else {
-    request = http.request(options);
-  }
-
-  // get content length and fire away
-  this.getLength(function(err, length) {
-    if (err) {
-      this._error(err);
-      return;
-    }
-
-    // add content length
-    request.setHeader('Content-Length', length);
-
-    this.pipe(request);
-    if (cb) {
-      request.on('error', cb);
-      request.on('response', cb.bind(this, null));
-    }
-  }.bind(this));
-
-  return request;
-};
-
-FormData.prototype._error = function(err) {
-  if (!this.error) {
-    this.error = err;
-    this.pause();
-    this.emit('error', err);
-  }
-};
-
-FormData.prototype.toString = function () {
-  return '[object FormData]';
-};
-
-
-/***/ }),
-/* 650 */
-/***/ (function(module, exports) {
-
-// populates missing values
-module.exports = function(dst, src) {
-
-  Object.keys(src).forEach(function(prop)
-  {
-    dst[prop] = dst[prop] || src[prop];
-  });
-
-  return dst;
-};
-
-
-/***/ }),
-/* 651 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(5).constants || __webpack_require__(466)
-
-
-/***/ }),
-/* 652 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * glob-base <https://github.com/jonschlinkert/glob-base>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var path = __webpack_require__(0);
-var parent = __webpack_require__(653);
-var isGlob = __webpack_require__(178);
-
-module.exports = function globBase(pattern) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob-base expects a string.');
-  }
-
-  var res = {};
-  res.base = parent(pattern);
-  res.isGlob = isGlob(pattern);
-
-  if (res.base !== '.') {
-    res.glob = pattern.substr(res.base.length);
-    if (res.glob.charAt(0) === '/') {
-      res.glob = res.glob.substr(1);
-    }
-  } else {
-    res.glob = pattern;
-  }
-
-  if (!res.isGlob) {
-    res.base = dirname(pattern);
-    res.glob = res.base !== '.'
-      ? pattern.substr(res.base.length)
-      : pattern;
-  }
-
-  if (res.glob.substr(0, 2) === './') {
-    res.glob = res.glob.substr(2);
-  }
-  if (res.glob.charAt(0) === '/') {
-    res.glob = res.glob.substr(1);
-  }
-  return res;
-};
-
-function dirname(glob) {
-  if (glob.slice(-1) === '/') return glob;
-  return path.dirname(glob);
-}
-
-
-/***/ }),
-/* 653 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var path = __webpack_require__(0);
-var isglob = __webpack_require__(178);
-
-module.exports = function globParent(str) {
-	str += 'a'; // preserves full path in case of trailing path separator
-	do {str = path.dirname(str)} while (isglob(str));
-	return str;
-};
-
-
-/***/ }),
-/* 654 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(23).Stream
-
-module.exports = legacy
-
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
-
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
-
-    Stream.call(this);
-
-    var self = this;
-
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
-
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
-
-    options = options || {};
-
-    // Mixin options into this
-    var keys = Object.keys(options);
-    for (var index = 0, length = keys.length; index < length; index++) {
-      var key = keys[index];
-      this[key] = options[key];
-    }
-
-    if (this.encoding) this.setEncoding(this.encoding);
-
-    if (this.start !== undefined) {
-      if ('number' !== typeof this.start) {
-        throw TypeError('start must be a Number');
-      }
-      if (this.end === undefined) {
-        this.end = Infinity;
-      } else if ('number' !== typeof this.end) {
-        throw TypeError('end must be a Number');
-      }
-
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
-
-      this.pos = this.start;
-    }
-
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
-
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
-
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
-
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
-
-    Stream.call(this);
-
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
-
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
-
-    options = options || {};
-
-    // Mixin options into this
-    var keys = Object.keys(options);
-    for (var index = 0, length = keys.length; index < length; index++) {
-      var key = keys[index];
-      this[key] = options[key];
-    }
-
-    if (this.start !== undefined) {
-      if ('number' !== typeof this.start) {
-        throw TypeError('start must be a Number');
-      }
-      if (this.start < 0) {
-        throw new Error('start must be >= zero');
-      }
-
-      this.pos = this.start;
-    }
-
-    this.busy = false;
-    this._queue = [];
-
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
-  }
-}
-
-
-/***/ }),
-/* 655 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var fs = __webpack_require__(390)
-var constants = __webpack_require__(466)
-
-var origCwd = process.cwd
-var cwd = null
-
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
-
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-try {
-  process.cwd()
-} catch (er) {}
-
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
-}
-
-module.exports = patch
-
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
-
-  // lchmod, broken prior to 0.6.2
-  // back-port the fix here.
-  if (constants.hasOwnProperty('O_SYMLINK') &&
-      process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
-    patchLchmod(fs)
-  }
-
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
-
-  // https://github.com/isaacs/node-graceful-fs/issues/4
-  // Chown should not fail on einval or eperm if non-root.
-  // It should not fail on enosys ever, as this just indicates
-  // that a fs doesn't support the intended operation.
-
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
-
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
-
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
-
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
-
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
-
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
-
-  // if lchmod/lchown do not exist, then make them no-ops
-  if (!fs.lchmod) {
-    fs.lchmod = function (path, mode, cb) {
-      if (cb) process.nextTick(cb)
-    }
-    fs.lchmodSync = function () {}
-  }
-  if (!fs.lchown) {
-    fs.lchown = function (path, uid, gid, cb) {
-      if (cb) process.nextTick(cb)
-    }
-    fs.lchownSync = function () {}
-  }
-
-  // on Windows, A/V software can lock the directory, causing this
-  // to fail with an EACCES or EPERM if the directory contains newly
-  // created files.  Try again on failure, for up to 60 seconds.
-
-  // Set the timeout this long because some Windows Anti-Virus, such as Parity
-  // bit9, may lock files for up to a minute, causing npm package install
-  // failures. Also, take care to yield the scheduler. Windows scheduling gives
-  // CPU to a busy looping process, which can cause the program causing the lock
-  // contention to be starved of CPU by node, so the contention doesn't resolve.
-  if (platform === "win32") {
-    fs.rename = (function (fs$rename) { return function (from, to, cb) {
-      var start = Date.now()
-      var backoff = 0;
-      fs$rename(from, to, function CB (er) {
-        if (er
-            && (er.code === "EACCES" || er.code === "EPERM")
-            && Date.now() - start < 60000) {
-          setTimeout(function() {
-            fs.stat(to, function (stater, st) {
-              if (stater && stater.code === "ENOENT")
-                fs$rename(from, to, CB);
-              else
-                cb(er)
-            })
-          }, backoff)
-          if (backoff < 100)
-            backoff += 10;
-          return;
-        }
-        if (cb) cb(er)
-      })
-    }})(fs.rename)
-  }
-
-  // if read() returns EAGAIN, then just try it again.
-  fs.read = (function (fs$read) { return function (fd, buffer, offset, length, position, callback_) {
-    var callback
-    if (callback_ && typeof callback_ === 'function') {
-      var eagCounter = 0
-      callback = function (er, _, __) {
-        if (er && er.code === 'EAGAIN' && eagCounter < 10) {
-          eagCounter ++
-          return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-        }
-        callback_.apply(this, arguments)
-      }
-    }
-    return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-  }})(fs.read)
-
-  fs.readSync = (function (fs$readSync) { return function (fd, buffer, offset, length, position) {
-    var eagCounter = 0
-    while (true) {
-      try {
-        return fs$readSync.call(fs, fd, buffer, offset, length, position)
-      } catch (er) {
-        if (er.code === 'EAGAIN' && eagCounter < 10) {
-          eagCounter ++
-          continue
-        }
-        throw er
-      }
-    }
-  }})(fs.readSync)
-}
-
-function patchLchmod (fs) {
-  fs.lchmod = function (path, mode, callback) {
-    fs.open( path
-           , constants.O_WRONLY | constants.O_SYMLINK
-           , mode
-           , function (err, fd) {
-      if (err) {
-        if (callback) callback(err)
-        return
-      }
-      // prefer to return the chmod error, if one occurs,
-      // but still try to close, and report closing errors if they occur.
-      fs.fchmod(fd, mode, function (err) {
-        fs.close(fd, function(err2) {
-          if (callback) callback(err || err2)
-        })
-      })
-    })
-  }
-
-  fs.lchmodSync = function (path, mode) {
-    var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
-
-    // prefer to return the chmod error, if one occurs,
-    // but still try to close, and report closing errors if they occur.
-    var threw = true
-    var ret
-    try {
-      ret = fs.fchmodSync(fd, mode)
-      threw = false
-    } finally {
-      if (threw) {
-        try {
-          fs.closeSync(fd)
-        } catch (er) {}
-      } else {
-        fs.closeSync(fd)
-      }
-    }
-    return ret
-  }
-}
-
-function patchLutimes (fs) {
-  if (constants.hasOwnProperty("O_SYMLINK")) {
-    fs.lutimes = function (path, at, mt, cb) {
-      fs.open(path, constants.O_SYMLINK, function (er, fd) {
-        if (er) {
-          if (cb) cb(er)
-          return
-        }
-        fs.futimes(fd, at, mt, function (er) {
-          fs.close(fd, function (er2) {
-            if (cb) cb(er || er2)
-          })
-        })
-      })
-    }
-
-    fs.lutimesSync = function (path, at, mt) {
-      var fd = fs.openSync(path, constants.O_SYMLINK)
-      var ret
-      var threw = true
-      try {
-        ret = fs.futimesSync(fd, at, mt)
-        threw = false
-      } finally {
-        if (threw) {
-          try {
-            fs.closeSync(fd)
-          } catch (er) {}
-        } else {
-          fs.closeSync(fd)
-        }
-      }
-      return ret
-    }
-
-  } else {
-    fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-    fs.lutimesSync = function () {}
-  }
-}
-
-function chmodFix (orig) {
-  if (!orig) return orig
-  return function (target, mode, cb) {
-    return orig.call(fs, target, mode, function (er) {
-      if (chownErOk(er)) er = null
-      if (cb) cb.apply(this, arguments)
-    })
-  }
-}
-
-function chmodFixSync (orig) {
-  if (!orig) return orig
-  return function (target, mode) {
-    try {
-      return orig.call(fs, target, mode)
-    } catch (er) {
-      if (!chownErOk(er)) throw er
-    }
-  }
-}
-
-
-function chownFix (orig) {
-  if (!orig) return orig
-  return function (target, uid, gid, cb) {
-    return orig.call(fs, target, uid, gid, function (er) {
-      if (chownErOk(er)) er = null
-      if (cb) cb.apply(this, arguments)
-    })
-  }
-}
-
-function chownFixSync (orig) {
-  if (!orig) return orig
-  return function (target, uid, gid) {
-    try {
-      return orig.call(fs, target, uid, gid)
-    } catch (er) {
-      if (!chownErOk(er)) throw er
-    }
-  }
-}
-
-
-function statFix (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target, cb) {
-    return orig.call(fs, target, function (er, stats) {
-      if (!stats) return cb.apply(this, arguments)
-      if (stats.uid < 0) stats.uid += 0x100000000
-      if (stats.gid < 0) stats.gid += 0x100000000
-      if (cb) cb.apply(this, arguments)
-    })
-  }
-}
-
-function statFixSync (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target) {
-    var stats = orig.call(fs, target)
-    if (stats.uid < 0) stats.uid += 0x100000000
-    if (stats.gid < 0) stats.gid += 0x100000000
-    return stats;
-  }
-}
-
-// ENOSYS means that the fs doesn't support the op. Just ignore
-// that, because it doesn't matter.
-//
-// if there's no getuid, or if getuid() is something other
-// than 0, and the error is EINVAL or EPERM, then just ignore
-// it.
-//
-// This specific case is a silent failure in cp, install, tar,
-// and most other unix tools that manage permissions.
-//
-// When running as root, or if other types of errors are
-// encountered, then it's strict.
-function chownErOk (er) {
-  if (!er)
-    return true
-
-  if (er.code === "ENOSYS")
-    return true
-
-  var nonroot = !process.getuid || process.getuid() !== 0
-  if (nonroot) {
-    if (er.code === "EINVAL" || er.code === "EPERM")
-      return true
-  }
-
-  return false
-}
-
-
-/***/ }),
-/* 656 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var zlib = __webpack_require__(198)
-var peek = __webpack_require__(775)
-var through = __webpack_require__(461)
-var pumpify = __webpack_require__(782)
-var isGzip = __webpack_require__(737)
-var isDeflate = __webpack_require__(732)
-
-var isCompressed = function (data) {
-  if (isGzip(data)) return 1
-  if (isDeflate(data)) return 2
-  return 0
-}
-
-var gunzip = function (maxRecursion) {
-  if (!(maxRecursion >= 0)) maxRecursion = 3
-
-  return peek({newline: false, maxBuffer: 10}, function (data, swap) {
-    if (maxRecursion < 0) return swap(new Error('Maximum recursion reached'))
-    switch (isCompressed(data)) {
-      case 1:
-        swap(null, pumpify(zlib.createGunzip(), gunzip(maxRecursion - 1)))
-        break
-      case 2:
-        swap(null, pumpify(zlib.createInflate(), gunzip(maxRecursion - 1)))
-        break
-      default:
-        swap(null, through())
-    }
-  })
-}
-
-module.exports = gunzip
-
-
-/***/ }),
-/* 657 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"afterRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 658 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"beforeRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 659 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"browser.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 660 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"cache.json#","$schema":"http://json-schema.org/draft-06/schema#","properties":{"beforeRequest":{"oneOf":[{"type":"null"},{"$ref":"beforeRequest.json#"}]},"afterRequest":{"oneOf":[{"type":"null"},{"$ref":"afterRequest.json#"}]},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 661 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"content.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["size","mimeType"],"properties":{"size":{"type":"integer"},"compression":{"type":"integer"},"mimeType":{"type":"string"},"text":{"type":"string"},"encoding":{"type":"string"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 662 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"cookie.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"path":{"type":"string"},"domain":{"type":"string"},"expires":{"type":["string","null"],"format":"date-time"},"httpOnly":{"type":"boolean"},"secure":{"type":"boolean"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 663 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"creator.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 664 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"entry.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","time","request","response","cache","timings"],"properties":{"pageref":{"type":"string"},"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"time":{"type":"number","min":0},"request":{"$ref":"request.json#"},"response":{"$ref":"response.json#"},"cache":{"$ref":"cache.json#"},"timings":{"$ref":"timings.json#"},"serverIPAddress":{"type":"string","oneOf":[{"format":"ipv4"},{"format":"ipv6"}]},"connection":{"type":"string"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 665 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"har.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["log"],"properties":{"log":{"$ref":"log.json#"}}}
-
-/***/ }),
-/* 666 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"header.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 667 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = {
-  afterRequest: __webpack_require__(657),
-  beforeRequest: __webpack_require__(658),
-  browser: __webpack_require__(659),
-  cache: __webpack_require__(660),
-  content: __webpack_require__(661),
-  cookie: __webpack_require__(662),
-  creator: __webpack_require__(663),
-  entry: __webpack_require__(664),
-  har: __webpack_require__(665),
-  header: __webpack_require__(666),
-  log: __webpack_require__(668),
-  page: __webpack_require__(669),
-  pageTimings: __webpack_require__(670),
-  postData: __webpack_require__(671),
-  query: __webpack_require__(672),
-  request: __webpack_require__(673),
-  response: __webpack_require__(674),
-  timings: __webpack_require__(675)
-}
-
-
-/***/ }),
-/* 668 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"log.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["version","creator","entries"],"properties":{"version":{"type":"string"},"creator":{"$ref":"creator.json#"},"browser":{"$ref":"browser.json#"},"pages":{"type":"array","items":{"$ref":"page.json#"}},"entries":{"type":"array","items":{"$ref":"entry.json#"}},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 669 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"page.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","id","title","pageTimings"],"properties":{"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"id":{"type":"string","unique":true},"title":{"type":"string"},"pageTimings":{"$ref":"pageTimings.json#"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 670 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"pageTimings.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","properties":{"onContentLoad":{"type":"number","min":-1},"onLoad":{"type":"number","min":-1},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 671 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"postData.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["mimeType"],"properties":{"mimeType":{"type":"string"},"text":{"type":"string"},"params":{"type":"array","required":["name"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"fileName":{"type":"string"},"contentType":{"type":"string"},"comment":{"type":"string"}}},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 672 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"query.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 673 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"request.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["method","url","httpVersion","cookies","headers","queryString","headersSize","bodySize"],"properties":{"method":{"type":"string"},"url":{"type":"string","format":"uri"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"queryString":{"type":"array","items":{"$ref":"query.json#"}},"postData":{"$ref":"postData.json#"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 674 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"response.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["status","statusText","httpVersion","cookies","headers","content","redirectURL","headersSize","bodySize"],"properties":{"status":{"type":"integer"},"statusText":{"type":"string"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"content":{"$ref":"content.json#"},"redirectURL":{"type":"string"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 675 */
-/***/ (function(module, exports) {
-
-module.exports = {"$id":"timings.json#","$schema":"http://json-schema.org/draft-06/schema#","required":["send","wait","receive"],"properties":{"dns":{"type":"number","min":-1},"connect":{"type":"number","min":-1},"blocked":{"type":"number","min":-1},"send":{"type":"number","min":-1},"wait":{"type":"number","min":-1},"receive":{"type":"number","min":-1},"ssl":{"type":"number","min":-1},"comment":{"type":"string"}}}
-
-/***/ }),
-/* 676 */
-/***/ (function(module, exports) {
-
-function HARError (errors) {
-  var message = 'validation failed'
-
-  this.name = 'HARError'
-  this.message = message
-  this.errors = errors
-
-  if (typeof Error.captureStackTrace === 'function') {
-    Error.captureStackTrace(this, this.constructor)
-  } else {
-    this.stack = (new Error(message)).stack
-  }
-}
-
-HARError.prototype = Error.prototype
-
-module.exports = HARError
-
-
-/***/ }),
-/* 677 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Ajv = __webpack_require__(473)
-var HARError = __webpack_require__(676)
-var schemas = __webpack_require__(667)
-
-var ajv
-
-function validate (name, data) {
-  data = data || {}
-
-  // validator config
-  ajv = ajv || new Ajv({
-    allErrors: true,
-    schemas: schemas
-  })
-
-  var validate = ajv.getSchema(name + '.json')
-
-  return new Promise(function (resolve, reject) {
-    var valid = validate(data)
-
-    !valid ? reject(new HARError(validate.errors)) : resolve(data)
-  })
-}
-
-exports.afterRequest = function (data) {
-  return validate('afterRequest', data)
-}
-
-exports.beforeRequest = function (data) {
-  return validate('beforeRequest', data)
-}
-
-exports.browser = function (data) {
-  return validate('browser', data)
-}
-
-exports.cache = function (data) {
-  return validate('cache', data)
-}
-
-exports.content = function (data) {
-  return validate('content', data)
-}
-
-exports.cookie = function (data) {
-  return validate('cookie', data)
-}
-
-exports.creator = function (data) {
-  return validate('creator', data)
-}
-
-exports.entry = function (data) {
-  return validate('entry', data)
-}
-
-exports.har = function (data) {
-  return validate('har', data)
-}
-
-exports.header = function (data) {
-  return validate('header', data)
-}
-
-exports.log = function (data) {
-  return validate('log', data)
-}
-
-exports.page = function (data) {
-  return validate('page', data)
-}
-
-exports.pageTimings = function (data) {
-  return validate('pageTimings', data)
-}
-
-exports.postData = function (data) {
-  return validate('postData', data)
-}
-
-exports.query = function (data) {
-  return validate('query', data)
-}
-
-exports.request = function (data) {
-  return validate('request', data)
-}
-
-exports.response = function (data) {
-  return validate('response', data)
-}
-
-exports.timings = function (data) {
-  return validate('timings', data)
-}
-
-
-/***/ }),
-/* 678 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var pkg = __webpack_require__(944);
-
-/* @private
- *
- * constructs a set of all dependencies recursively
- *
- * @method depsFor
- * @param {String} name of package to assemble unique deps for
- * @param {String} dir (optional) path to begin resolving from
- * @return {Array} a unique set of all deps
- */
-module.exports = function depsFor(name, dir) {
-  var dependencies = [];
-  var visited = Object.create(null);
-
-  (function again(name, dir) {
-    var thePackage = pkg(name, dir);
-
-    if (thePackage === null) { return; }
-
-    var key = thePackage.name + thePackage.version + thePackage.baseDir;
-
-    if (visited[key]) { return; }
-    visited[key] = true;
-
-    dependencies.push(thePackage);
-
-    return Object.keys(thePackage.dependencies || {}).forEach(function(dep) {
-      again(dep, thePackage.baseDir);
-    });
-  }(name, dir));
-
-  return dependencies;
-};
-
-
-
-/***/ }),
-/* 679 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var resolve = __webpack_require__(814);
-var path = __webpack_require__(0);
-
-/* @private
- *
- * @method resolvePkg
- * @param {String} name
- * @param {String} dir
- * @return {String}
- */
-module.exports = function resolvePkg(name, dir) {
-  if (name === './') {
-    return path.resolve(name, 'package.json');
-  }
-
-  if (name[name.length - 1] !== '/') {
-    name += '/';
-  }
-
-  if (name.charAt(0) === '/') {
-    return name + 'package.json';
-  }
-
-  try {
-    return resolve.sync(name + 'package.json', {
-      basedir: dir || __dirname,
-      preserveSymlinks: false
-    });
-  } catch(err) {
-    if (err.code === 'MODULE_NOT_FOUND') {
-      return null;
-    }
-
-    throw err;
-  }
-};
-
-
-/***/ }),
-/* 680 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-var parser = __webpack_require__(681);
-var signer = __webpack_require__(682);
-var verify = __webpack_require__(683);
-var utils = __webpack_require__(174);
-
-
-
-///--- API
-
-module.exports = {
-
-  parse: parser.parseRequest,
-  parseRequest: parser.parseRequest,
-
-  sign: signer.signRequest,
-  signRequest: signer.signRequest,
-  createSigner: signer.createSigner,
-  isSigner: signer.isSigner,
-
-  sshKeyToPEM: utils.sshKeyToPEM,
-  sshKeyFingerprint: utils.fingerprint,
-  pemToRsaSSHKey: utils.pemToRsaSSHKey,
-
-  verify: verify.verifySignature,
-  verifySignature: verify.verifySignature,
-  verifyHMAC: verify.verifyHMAC
-};
-
-
-/***/ }),
-/* 681 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2012 Joyent, Inc.  All rights reserved.
-
-var assert = __webpack_require__(16);
-var util = __webpack_require__(3);
-var utils = __webpack_require__(174);
-
-
-
-///--- Globals
-
-var HASH_ALGOS = utils.HASH_ALGOS;
-var PK_ALGOS = utils.PK_ALGOS;
-var HttpSignatureError = utils.HttpSignatureError;
-var InvalidAlgorithmError = utils.InvalidAlgorithmError;
-var validateAlgorithm = utils.validateAlgorithm;
-
-var State = {
-  New: 0,
-  Params: 1
-};
-
-var ParamsState = {
-  Name: 0,
-  Quote: 1,
-  Value: 2,
-  Comma: 3
-};
-
-
-///--- Specific Errors
-
-
-function ExpiredRequestError(message) {
-  HttpSignatureError.call(this, message, ExpiredRequestError);
-}
-util.inherits(ExpiredRequestError, HttpSignatureError);
-
-
-function InvalidHeaderError(message) {
-  HttpSignatureError.call(this, message, InvalidHeaderError);
-}
-util.inherits(InvalidHeaderError, HttpSignatureError);
-
-
-function InvalidParamsError(message) {
-  HttpSignatureError.call(this, message, InvalidParamsError);
-}
-util.inherits(InvalidParamsError, HttpSignatureError);
-
-
-function MissingHeaderError(message) {
-  HttpSignatureError.call(this, message, MissingHeaderError);
-}
-util.inherits(MissingHeaderError, HttpSignatureError);
-
-function StrictParsingError(message) {
-  HttpSignatureError.call(this, message, StrictParsingError);
-}
-util.inherits(StrictParsingError, HttpSignatureError);
-
-///--- Exported API
-
-module.exports = {
-
-  /**
-   * Parses the 'Authorization' header out of an http.ServerRequest object.
-   *
-   * Note that this API will fully validate the Authorization header, and throw
-   * on any error.  It will not however check the signature, or the keyId format
-   * as those are specific to your environment.  You can use the options object
-   * to pass in extra constraints.
-   *
-   * As a response object you can expect this:
-   *
-   *     {
-   *       "scheme": "Signature",
-   *       "params": {
-   *         "keyId": "foo",
-   *         "algorithm": "rsa-sha256",
-   *         "headers": [
-   *           "date" or "x-date",
-   *           "digest"
-   *         ],
-   *         "signature": "base64"
-   *       },
-   *       "signingString": "ready to be passed to crypto.verify()"
-   *     }
-   *
-   * @param {Object} request an http.ServerRequest.
-   * @param {Object} options an optional options object with:
-   *                   - clockSkew: allowed clock skew in seconds (default 300).
-   *                   - headers: required header names (def: date or x-date)
-   *                   - algorithms: algorithms to support (default: all).
-   *                   - strict: should enforce latest spec parsing
-   *                             (default: false).
-   * @return {Object} parsed out object (see above).
-   * @throws {TypeError} on invalid input.
-   * @throws {InvalidHeaderError} on an invalid Authorization header error.
-   * @throws {InvalidParamsError} if the params in the scheme are invalid.
-   * @throws {MissingHeaderError} if the params indicate a header not present,
-   *                              either in the request headers from the params,
-   *                              or not in the params from a required header
-   *                              in options.
-   * @throws {StrictParsingError} if old attributes are used in strict parsing
-   *                              mode.
-   * @throws {ExpiredRequestError} if the value of date or x-date exceeds skew.
-   */
-  parseRequest: function parseRequest(request, options) {
-    assert.object(request, 'request');
-    assert.object(request.headers, 'request.headers');
-    if (options === undefined) {
-      options = {};
-    }
-    if (options.headers === undefined) {
-      options.headers = [request.headers['x-date'] ? 'x-date' : 'date'];
-    }
-    assert.object(options, 'options');
-    assert.arrayOfString(options.headers, 'options.headers');
-    assert.optionalFinite(options.clockSkew, 'options.clockSkew');
-
-    var authzHeaderName = options.authorizationHeaderName || 'authorization';
-
-    if (!request.headers[authzHeaderName]) {
-      throw new MissingHeaderError('no ' + authzHeaderName + ' header ' +
-                                   'present in the request');
-    }
-
-    options.clockSkew = options.clockSkew || 300;
-
-
-    var i = 0;
-    var state = State.New;
-    var substate = ParamsState.Name;
-    var tmpName = '';
-    var tmpValue = '';
-
-    var parsed = {
-      scheme: '',
-      params: {},
-      signingString: ''
-    };
-
-    var authz = request.headers[authzHeaderName];
-    for (i = 0; i < authz.length; i++) {
-      var c = authz.charAt(i);
-
-      switch (Number(state)) {
-
-      case State.New:
-        if (c !== ' ') parsed.scheme += c;
-        else state = State.Params;
-        break;
-
-      case State.Params:
-        switch (Number(substate)) {
-
-        case ParamsState.Name:
-          var code = c.charCodeAt(0);
-          // restricted name of A-Z / a-z
-          if ((code >= 0x41 && code <= 0x5a) || // A-Z
-              (code >= 0x61 && code <= 0x7a)) { // a-z
-            tmpName += c;
-          } else if (c === '=') {
-            if (tmpName.length === 0)
-              throw new InvalidHeaderError('bad param format');
-            substate = ParamsState.Quote;
-          } else {
-            throw new InvalidHeaderError('bad param format');
-          }
-          break;
-
-        case ParamsState.Quote:
-          if (c === '"') {
-            tmpValue = '';
-            substate = ParamsState.Value;
-          } else {
-            throw new InvalidHeaderError('bad param format');
-          }
-          break;
-
-        case ParamsState.Value:
-          if (c === '"') {
-            parsed.params[tmpName] = tmpValue;
-            substate = ParamsState.Comma;
-          } else {
-            tmpValue += c;
-          }
-          break;
-
-        case ParamsState.Comma:
-          if (c === ',') {
-            tmpName = '';
-            substate = ParamsState.Name;
-          } else {
-            throw new InvalidHeaderError('bad param format');
-          }
-          break;
-
-        default:
-          throw new Error('Invalid substate');
-        }
-        break;
-
-      default:
-        throw new Error('Invalid substate');
-      }
-
-    }
-
-    if (!parsed.params.headers || parsed.params.headers === '') {
-      if (request.headers['x-date']) {
-        parsed.params.headers = ['x-date'];
-      } else {
-        parsed.params.headers = ['date'];
-      }
-    } else {
-      parsed.params.headers = parsed.params.headers.split(' ');
-    }
-
-    // Minimally validate the parsed object
-    if (!parsed.scheme || parsed.scheme !== 'Signature')
-      throw new InvalidHeaderError('scheme was not "Signature"');
-
-    if (!parsed.params.keyId)
-      throw new InvalidHeaderError('keyId was not specified');
-
-    if (!parsed.params.algorithm)
-      throw new InvalidHeaderError('algorithm was not specified');
-
-    if (!parsed.params.signature)
-      throw new InvalidHeaderError('signature was not specified');
-
-    // Check the algorithm against the official list
-    parsed.params.algorithm = parsed.params.algorithm.toLowerCase();
-    try {
-      validateAlgorithm(parsed.params.algorithm);
-    } catch (e) {
-      if (e instanceof InvalidAlgorithmError)
-        throw (new InvalidParamsError(parsed.params.algorithm + ' is not ' +
-          'supported'));
-      else
-        throw (e);
-    }
-
-    // Build the signingString
-    for (i = 0; i < parsed.params.headers.length; i++) {
-      var h = parsed.params.headers[i].toLowerCase();
-      parsed.params.headers[i] = h;
-
-      if (h === 'request-line') {
-        if (!options.strict) {
-          /*
-           * We allow headers from the older spec drafts if strict parsing isn't
-           * specified in options.
-           */
-          parsed.signingString +=
-            request.method + ' ' + request.url + ' HTTP/' + request.httpVersion;
-        } else {
-          /* Strict parsing doesn't allow older draft headers. */
-          throw (new StrictParsingError('request-line is not a valid header ' +
-            'with strict parsing enabled.'));
-        }
-      } else if (h === '(request-target)') {
-        parsed.signingString +=
-          '(request-target): ' + request.method.toLowerCase() + ' ' +
-          request.url;
-      } else {
-        var value = request.headers[h];
-        if (value === undefined)
-          throw new MissingHeaderError(h + ' was not in the request');
-        parsed.signingString += h + ': ' + value;
-      }
-
-      if ((i + 1) < parsed.params.headers.length)
-        parsed.signingString += '\n';
-    }
-
-    // Check against the constraints
-    var date;
-    if (request.headers.date || request.headers['x-date']) {
-        if (request.headers['x-date']) {
-          date = new Date(request.headers['x-date']);
-        } else {
-          date = new Date(request.headers.date);
-        }
-      var now = new Date();
-      var skew = Math.abs(now.getTime() - date.getTime());
-
-      if (skew > options.clockSkew * 1000) {
-        throw new ExpiredRequestError('clock skew of ' +
-                                      (skew / 1000) +
-                                      's was greater than ' +
-                                      options.clockSkew + 's');
-      }
-    }
-
-    options.headers.forEach(function (hdr) {
-      // Remember that we already checked any headers in the params
-      // were in the request, so if this passes we're good.
-      if (parsed.params.headers.indexOf(hdr.toLowerCase()) < 0)
-        throw new MissingHeaderError(hdr + ' was not a signed header');
-    });
-
-    if (options.algorithms) {
-      if (options.algorithms.indexOf(parsed.params.algorithm) === -1)
-        throw new InvalidParamsError(parsed.params.algorithm +
-                                     ' is not a supported algorithm');
-    }
-
-    parsed.algorithm = parsed.params.algorithm.toUpperCase();
-    parsed.keyId = parsed.params.keyId;
-    return parsed;
-  }
-
-};
-
-
-/***/ }),
-/* 682 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2012 Joyent, Inc.  All rights reserved.
-
-var assert = __webpack_require__(16);
-var crypto = __webpack_require__(12);
-var http = __webpack_require__(87);
-var util = __webpack_require__(3);
-var sshpk = __webpack_require__(328);
-var jsprim = __webpack_require__(746);
-var utils = __webpack_require__(174);
-
-var sprintf = __webpack_require__(3).format;
-
-var HASH_ALGOS = utils.HASH_ALGOS;
-var PK_ALGOS = utils.PK_ALGOS;
-var InvalidAlgorithmError = utils.InvalidAlgorithmError;
-var HttpSignatureError = utils.HttpSignatureError;
-var validateAlgorithm = utils.validateAlgorithm;
-
-///--- Globals
-
-var AUTHZ_FMT =
-  'Signature keyId="%s",algorithm="%s",headers="%s",signature="%s"';
-
-///--- Specific Errors
-
-function MissingHeaderError(message) {
-  HttpSignatureError.call(this, message, MissingHeaderError);
-}
-util.inherits(MissingHeaderError, HttpSignatureError);
-
-function StrictParsingError(message) {
-  HttpSignatureError.call(this, message, StrictParsingError);
-}
-util.inherits(StrictParsingError, HttpSignatureError);
-
-/* See createSigner() */
-function RequestSigner(options) {
-  assert.object(options, 'options');
-
-  var alg = [];
-  if (options.algorithm !== undefined) {
-    assert.string(options.algorithm, 'options.algorithm');
-    alg = validateAlgorithm(options.algorithm);
-  }
-  this.rs_alg = alg;
-
-  /*
-   * RequestSigners come in two varieties: ones with an rs_signFunc, and ones
-   * with an rs_signer.
-   *
-   * rs_signFunc-based RequestSigners have to build up their entire signing
-   * string within the rs_lines array and give it to rs_signFunc as a single
-   * concat'd blob. rs_signer-based RequestSigners can add a line at a time to
-   * their signing state by using rs_signer.update(), thus only needing to
-   * buffer the hash function state and one line at a time.
-   */
-  if (options.sign !== undefined) {
-    assert.func(options.sign, 'options.sign');
-    this.rs_signFunc = options.sign;
-
-  } else if (alg[0] === 'hmac' && options.key !== undefined) {
-    assert.string(options.keyId, 'options.keyId');
-    this.rs_keyId = options.keyId;
-
-    if (typeof (options.key) !== 'string' && !Buffer.isBuffer(options.key))
-      throw (new TypeError('options.key for HMAC must be a string or Buffer'));
-
-    /*
-     * Make an rs_signer for HMACs, not a rs_signFunc -- HMACs digest their
-     * data in chunks rather than requiring it all to be given in one go
-     * at the end, so they are more similar to signers than signFuncs.
-     */
-    this.rs_signer = crypto.createHmac(alg[1].toUpperCase(), options.key);
-    this.rs_signer.sign = function () {
-      var digest = this.digest('base64');
-      return ({
-        hashAlgorithm: alg[1],
-        toString: function () { return (digest); }
-      });
-    };
-
-  } else if (options.key !== undefined) {
-    var key = options.key;
-    if (typeof (key) === 'string' || Buffer.isBuffer(key))
-      key = sshpk.parsePrivateKey(key);
-
-    assert.ok(sshpk.PrivateKey.isPrivateKey(key, [1, 2]),
-      'options.key must be a sshpk.PrivateKey');
-    this.rs_key = key;
-
-    assert.string(options.keyId, 'options.keyId');
-    this.rs_keyId = options.keyId;
-
-    if (!PK_ALGOS[key.type]) {
-      throw (new InvalidAlgorithmError(key.type.toUpperCase() + ' type ' +
-        'keys are not supported'));
-    }
-
-    if (alg[0] !== undefined && key.type !== alg[0]) {
-      throw (new InvalidAlgorithmError('options.key must be a ' +
-        alg[0].toUpperCase() + ' key, was given a ' +
-        key.type.toUpperCase() + ' key instead'));
-    }
-
-    this.rs_signer = key.createSign(alg[1]);
-
-  } else {
-    throw (new TypeError('options.sign (func) or options.key is required'));
-  }
-
-  this.rs_headers = [];
-  this.rs_lines = [];
-}
-
-/**
- * Adds a header to be signed, with its value, into this signer.
- *
- * @param {String} header
- * @param {String} value
- * @return {String} value written
- */
-RequestSigner.prototype.writeHeader = function (header, value) {
-  assert.string(header, 'header');
-  header = header.toLowerCase();
-  assert.string(value, 'value');
-
-  this.rs_headers.push(header);
-
-  if (this.rs_signFunc) {
-    this.rs_lines.push(header + ': ' + value);
-
-  } else {
-    var line = header + ': ' + value;
-    if (this.rs_headers.length > 0)
-      line = '\n' + line;
-    this.rs_signer.update(line);
-  }
-
-  return (value);
-};
-
-/**
- * Adds a default Date header, returning its value.
- *
- * @return {String}
- */
-RequestSigner.prototype.writeDateHeader = function () {
-  return (this.writeHeader('date', jsprim.rfc1123(new Date())));
-};
-
-/**
- * Adds the request target line to be signed.
- *
- * @param {String} method, HTTP method (e.g. 'get', 'post', 'put')
- * @param {String} path
- */
-RequestSigner.prototype.writeTarget = function (method, path) {
-  assert.string(method, 'method');
-  assert.string(path, 'path');
-  method = method.toLowerCase();
-  this.writeHeader('(request-target)', method + ' ' + path);
-};
-
-/**
- * Calculate the value for the Authorization header on this request
- * asynchronously.
- *
- * @param {Func} callback (err, authz)
- */
-RequestSigner.prototype.sign = function (cb) {
-  assert.func(cb, 'callback');
-
-  if (this.rs_headers.length < 1)
-    throw (new Error('At least one header must be signed'));
-
-  var alg, authz;
-  if (this.rs_signFunc) {
-    var data = this.rs_lines.join('\n');
-    var self = this;
-    this.rs_signFunc(data, function (err, sig) {
-      if (err) {
-        cb(err);
-        return;
-      }
-      try {
-        assert.object(sig, 'signature');
-        assert.string(sig.keyId, 'signature.keyId');
-        assert.string(sig.algorithm, 'signature.algorithm');
-        assert.string(sig.signature, 'signature.signature');
-        alg = validateAlgorithm(sig.algorithm);
-
-        authz = sprintf(AUTHZ_FMT,
-          sig.keyId,
-          sig.algorithm,
-          self.rs_headers.join(' '),
-          sig.signature);
-      } catch (e) {
-        cb(e);
-        return;
-      }
-      cb(null, authz);
-    });
-
-  } else {
-    try {
-      var sigObj = this.rs_signer.sign();
-    } catch (e) {
-      cb(e);
-      return;
-    }
-    alg = (this.rs_alg[0] || this.rs_key.type) + '-' + sigObj.hashAlgorithm;
-    var signature = sigObj.toString();
-    authz = sprintf(AUTHZ_FMT,
-      this.rs_keyId,
-      alg,
-      this.rs_headers.join(' '),
-      signature);
-    cb(null, authz);
-  }
-};
-
-///--- Exported API
-
-module.exports = {
-  /**
-   * Identifies whether a given object is a request signer or not.
-   *
-   * @param {Object} object, the object to identify
-   * @returns {Boolean}
-   */
-  isSigner: function (obj) {
-    if (typeof (obj) === 'object' && obj instanceof RequestSigner)
-      return (true);
-    return (false);
-  },
-
-  /**
-   * Creates a request signer, used to asynchronously build a signature
-   * for a request (does not have to be an http.ClientRequest).
-   *
-   * @param {Object} options, either:
-   *                   - {String} keyId
-   *                   - {String|Buffer} key
-   *                   - {String} algorithm (optional, required for HMAC)
-   *                 or:
-   *                   - {Func} sign (data, cb)
-   * @return {RequestSigner}
-   */
-  createSigner: function createSigner(options) {
-    return (new RequestSigner(options));
-  },
-
-  /**
-   * Adds an 'Authorization' header to an http.ClientRequest object.
-   *
-   * Note that this API will add a Date header if it's not already set. Any
-   * other headers in the options.headers array MUST be present, or this
-   * will throw.
-   *
-   * You shouldn't need to check the return type; it's just there if you want
-   * to be pedantic.
-   *
-   * The optional flag indicates whether parsing should use strict enforcement
-   * of the version draft-cavage-http-signatures-04 of the spec or beyond.
-   * The default is to be loose and support
-   * older versions for compatibility.
-   *
-   * @param {Object} request an instance of http.ClientRequest.
-   * @param {Object} options signing parameters object:
-   *                   - {String} keyId required.
-   *                   - {String} key required (either a PEM or HMAC key).
-   *                   - {Array} headers optional; defaults to ['date'].
-   *                   - {String} algorithm optional (unless key is HMAC);
-   *                              default is the same as the sshpk default
-   *                              signing algorithm for the type of key given
-   *                   - {String} httpVersion optional; defaults to '1.1'.
-   *                   - {Boolean} strict optional; defaults to 'false'.
-   * @return {Boolean} true if Authorization (and optionally Date) were added.
-   * @throws {TypeError} on bad parameter types (input).
-   * @throws {InvalidAlgorithmError} if algorithm was bad or incompatible with
-   *                                 the given key.
-   * @throws {sshpk.KeyParseError} if key was bad.
-   * @throws {MissingHeaderError} if a header to be signed was specified but
-   *                              was not present.
-   */
-  signRequest: function signRequest(request, options) {
-    assert.object(request, 'request');
-    assert.object(options, 'options');
-    assert.optionalString(options.algorithm, 'options.algorithm');
-    assert.string(options.keyId, 'options.keyId');
-    assert.optionalArrayOfString(options.headers, 'options.headers');
-    assert.optionalString(options.httpVersion, 'options.httpVersion');
-
-    if (!request.getHeader('Date'))
-      request.setHeader('Date', jsprim.rfc1123(new Date()));
-    if (!options.headers)
-      options.headers = ['date'];
-    if (!options.httpVersion)
-      options.httpVersion = '1.1';
-
-    var alg = [];
-    if (options.algorithm) {
-      options.algorithm = options.algorithm.toLowerCase();
-      alg = validateAlgorithm(options.algorithm);
-    }
-
-    var i;
-    var stringToSign = '';
-    for (i = 0; i < options.headers.length; i++) {
-      if (typeof (options.headers[i]) !== 'string')
-        throw new TypeError('options.headers must be an array of Strings');
-
-      var h = options.headers[i].toLowerCase();
-
-      if (h === 'request-line') {
-        if (!options.strict) {
-          /**
-           * We allow headers from the older spec drafts if strict parsing isn't
-           * specified in options.
-           */
-          stringToSign +=
-            request.method + ' ' + request.path + ' HTTP/' +
-            options.httpVersion;
-        } else {
-          /* Strict parsing doesn't allow older draft headers. */
-          throw (new StrictParsingError('request-line is not a valid header ' +
-            'with strict parsing enabled.'));
-        }
-      } else if (h === '(request-target)') {
-        stringToSign +=
-          '(request-target): ' + request.method.toLowerCase() + ' ' +
-          request.path;
-      } else {
-        var value = request.getHeader(h);
-        if (value === undefined || value === '') {
-          throw new MissingHeaderError(h + ' was not in the request');
-        }
-        stringToSign += h + ': ' + value;
-      }
-
-      if ((i + 1) < options.headers.length)
-        stringToSign += '\n';
-    }
-
-    /* This is just for unit tests. */
-    if (request.hasOwnProperty('_stringToSign')) {
-      request._stringToSign = stringToSign;
-    }
-
-    var signature;
-    if (alg[0] === 'hmac') {
-      if (typeof (options.key) !== 'string' && !Buffer.isBuffer(options.key))
-        throw (new TypeError('options.key must be a string or Buffer'));
-
-      var hmac = crypto.createHmac(alg[1].toUpperCase(), options.key);
-      hmac.update(stringToSign);
-      signature = hmac.digest('base64');
-
-    } else {
-      var key = options.key;
-      if (typeof (key) === 'string' || Buffer.isBuffer(key))
-        key = sshpk.parsePrivateKey(options.key);
-
-      assert.ok(sshpk.PrivateKey.isPrivateKey(key, [1, 2]),
-        'options.key must be a sshpk.PrivateKey');
-
-      if (!PK_ALGOS[key.type]) {
-        throw (new InvalidAlgorithmError(key.type.toUpperCase() + ' type ' +
-          'keys are not supported'));
-      }
-
-      if (alg[0] !== undefined && key.type !== alg[0]) {
-        throw (new InvalidAlgorithmError('options.key must be a ' +
-          alg[0].toUpperCase() + ' key, was given a ' +
-          key.type.toUpperCase() + ' key instead'));
-      }
-
-      var signer = key.createSign(alg[1]);
-      signer.update(stringToSign);
-      var sigObj = signer.sign();
-      if (!HASH_ALGOS[sigObj.hashAlgorithm]) {
-        throw (new InvalidAlgorithmError(sigObj.hashAlgorithm.toUpperCase() +
-          ' is not a supported hash algorithm'));
-      }
-      options.algorithm = key.type + '-' + sigObj.hashAlgorithm;
-      signature = sigObj.toString();
-      assert.notStrictEqual(signature, '', 'empty signature produced');
-    }
-
-    var authzHeaderName = options.authorizationHeaderName || 'Authorization';
-
-    request.setHeader(authzHeaderName, sprintf(AUTHZ_FMT,
-                                               options.keyId,
-                                               options.algorithm,
-                                               options.headers.join(' '),
-                                               signature));
-
-    return true;
-  }
-
-};
-
-
-/***/ }),
-/* 683 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2015 Joyent, Inc.
-
-var assert = __webpack_require__(16);
-var crypto = __webpack_require__(12);
-var sshpk = __webpack_require__(328);
-var utils = __webpack_require__(174);
-
-var HASH_ALGOS = utils.HASH_ALGOS;
-var PK_ALGOS = utils.PK_ALGOS;
-var InvalidAlgorithmError = utils.InvalidAlgorithmError;
-var HttpSignatureError = utils.HttpSignatureError;
-var validateAlgorithm = utils.validateAlgorithm;
-
-///--- Exported API
-
-module.exports = {
-  /**
-   * Verify RSA/DSA signature against public key.  You are expected to pass in
-   * an object that was returned from `parse()`.
-   *
-   * @param {Object} parsedSignature the object you got from `parse`.
-   * @param {String} pubkey RSA/DSA private key PEM.
-   * @return {Boolean} true if valid, false otherwise.
-   * @throws {TypeError} if you pass in bad arguments.
-   * @throws {InvalidAlgorithmError}
-   */
-  verifySignature: function verifySignature(parsedSignature, pubkey) {
-    assert.object(parsedSignature, 'parsedSignature');
-    if (typeof (pubkey) === 'string' || Buffer.isBuffer(pubkey))
-      pubkey = sshpk.parseKey(pubkey);
-    assert.ok(sshpk.Key.isKey(pubkey, [1, 1]), 'pubkey must be a sshpk.Key');
-
-    var alg = validateAlgorithm(parsedSignature.algorithm);
-    if (alg[0] === 'hmac' || alg[0] !== pubkey.type)
-      return (false);
-
-    var v = pubkey.createVerify(alg[1]);
-    v.update(parsedSignature.signingString);
-    return (v.verify(parsedSignature.params.signature, 'base64'));
-  },
-
-  /**
-   * Verify HMAC against shared secret.  You are expected to pass in an object
-   * that was returned from `parse()`.
-   *
-   * @param {Object} parsedSignature the object you got from `parse`.
-   * @param {String} secret HMAC shared secret.
-   * @return {Boolean} true if valid, false otherwise.
-   * @throws {TypeError} if you pass in bad arguments.
-   * @throws {InvalidAlgorithmError}
-   */
-  verifyHMAC: function verifyHMAC(parsedSignature, secret) {
-    assert.object(parsedSignature, 'parsedHMAC');
-    assert.string(secret, 'secret');
-
-    var alg = validateAlgorithm(parsedSignature.algorithm);
-    if (alg[0] !== 'hmac')
-      return (false);
-
-    var hashAlg = alg[1].toUpperCase();
-
-    var hmac = crypto.createHmac(hashAlg, secret);
-    hmac.update(parsedSignature.signingString);
-
-    /*
-     * Now double-hash to avoid leaking timing information - there's
-     * no easy constant-time compare in JS, so we use this approach
-     * instead. See for more info:
-     * https://www.isecpartners.com/blog/2011/february/double-hmac-
-     * verification.aspx
-     */
-    var h1 = crypto.createHmac(hashAlg, secret);
-    h1.update(hmac.digest());
-    h1 = h1.digest();
-    var h2 = crypto.createHmac(hashAlg, secret);
-    h2.update(new Buffer(parsedSignature.params.signature, 'base64'));
-    h2 = h2.digest();
-
-    /* Node 0.8 returns strings from .digest(). */
-    if (typeof (h1) === 'string')
-      return (h1 === h2);
-    /* And node 0.10 lacks the .equals() method on Buffers. */
-    if (Buffer.isBuffer(h1) && !h1.equals)
-      return (h1.toString('binary') === h2.toString('binary'));
-
-    return (h1.equals(h2));
-  }
-};
-
-
-/***/ }),
-/* 684 */
-/***/ (function(module, exports) {
-
-exports.parse = exports.decode = decode
-
-exports.stringify = exports.encode = encode
-
-exports.safe = safe
-exports.unsafe = unsafe
-
-var eol = typeof process !== 'undefined' &&
-  process.platform === 'win32' ? '\r\n' : '\n'
-
-function encode (obj, opt) {
-  var children = []
-  var out = ''
-
-  if (typeof opt === 'string') {
-    opt = {
-      section: opt,
-      whitespace: false
-    }
-  } else {
-    opt = opt || {}
-    opt.whitespace = opt.whitespace === true
-  }
-
-  var separator = opt.whitespace ? ' = ' : '='
-
-  Object.keys(obj).forEach(function (k, _, __) {
-    var val = obj[k]
-    if (val && Array.isArray(val)) {
-      val.forEach(function (item) {
-        out += safe(k + '[]') + separator + safe(item) + '\n'
-      })
-    } else if (val && typeof val === 'object') {
-      children.push(k)
-    } else {
-      out += safe(k) + separator + safe(val) + eol
-    }
-  })
-
-  if (opt.section && out.length) {
-    out = '[' + safe(opt.section) + ']' + eol + out
-  }
-
-  children.forEach(function (k, _, __) {
-    var nk = dotSplit(k).join('\\.')
-    var section = (opt.section ? opt.section + '.' : '') + nk
-    var child = encode(obj[k], {
-      section: section,
-      whitespace: opt.whitespace
-    })
-    if (out.length && child.length) {
-      out += eol
-    }
-    out += child
-  })
-
-  return out
-}
-
-function dotSplit (str) {
-  return str.replace(/\1/g, '\u0002LITERAL\\1LITERAL\u0002')
-    .replace(/\\\./g, '\u0001')
-    .split(/\./).map(function (part) {
-      return part.replace(/\1/g, '\\.')
-      .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
-    })
-}
-
-function decode (str) {
-  var out = {}
-  var p = out
-  var section = null
-  //          section     |key      = value
-  var re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i
-  var lines = str.split(/[\r\n]+/g)
-
-  lines.forEach(function (line, _, __) {
-    if (!line || line.match(/^\s*[;#]/)) return
-    var match = line.match(re)
-    if (!match) return
-    if (match[1] !== undefined) {
-      section = unsafe(match[1])
-      p = out[section] = out[section] || {}
-      return
-    }
-    var key = unsafe(match[2])
-    var value = match[3] ? unsafe(match[4]) : true
-    switch (value) {
-      case 'true':
-      case 'false':
-      case 'null': value = JSON.parse(value)
-    }
-
-    // Convert keys with '[]' suffix to an array
-    if (key.length > 2 && key.slice(-2) === '[]') {
-      key = key.substring(0, key.length - 2)
-      if (!p[key]) {
-        p[key] = []
-      } else if (!Array.isArray(p[key])) {
-        p[key] = [p[key]]
-      }
-    }
-
-    // safeguard against resetting a previously defined
-    // array by accidentally forgetting the brackets
-    if (Array.isArray(p[key])) {
-      p[key].push(value)
-    } else {
-      p[key] = value
-    }
-  })
-
-  // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
-  // use a filter to return the keys that have to be deleted.
-  Object.keys(out).filter(function (k, _, __) {
-    if (!out[k] ||
-      typeof out[k] !== 'object' ||
-      Array.isArray(out[k])) {
-      return false
-    }
-    // see if the parent section is also an object.
-    // if so, add it to that, and mark this one for deletion
-    var parts = dotSplit(k)
-    var p = out
-    var l = parts.pop()
-    var nl = l.replace(/\\\./g, '.')
-    parts.forEach(function (part, _, __) {
-      if (!p[part] || typeof p[part] !== 'object') p[part] = {}
-      p = p[part]
-    })
-    if (p === out && nl === l) {
-      return false
-    }
-    p[nl] = out[k]
-    return true
-  }).forEach(function (del, _, __) {
-    delete out[del]
-  })
-
-  return out
-}
-
-function isQuoted (val) {
-  return (val.charAt(0) === '"' && val.slice(-1) === '"') ||
-    (val.charAt(0) === "'" && val.slice(-1) === "'")
-}
-
-function safe (val) {
-  return (typeof val !== 'string' ||
-    val.match(/[=\r\n]/) ||
-    val.match(/^\[/) ||
-    (val.length > 1 &&
-     isQuoted(val)) ||
-    val !== val.trim())
-      ? JSON.stringify(val)
-      : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
-}
-
-function unsafe (val, doUnesc) {
-  val = (val || '').trim()
-  if (isQuoted(val)) {
-    // remove the single quotes before calling JSON.parse
-    if (val.charAt(0) === "'") {
-      val = val.substr(1, val.length - 2)
-    }
-    try { val = JSON.parse(val) } catch (_) {}
-  } else {
-    // walk the val to find the first not-escaped ; character
-    var esc = false
-    var unesc = ''
-    for (var i = 0, l = val.length; i < l; i++) {
-      var c = val.charAt(i)
-      if (esc) {
-        if ('\\;#'.indexOf(c) !== -1) {
-          unesc += c
-        } else {
-          unesc += '\\' + c
-        }
-        esc = false
-      } else if (';#'.indexOf(c) !== -1) {
-        break
-      } else if (c === '\\') {
-        esc = true
-      } else {
-        unesc += c
-      }
-    }
-    if (esc) {
-      unesc += '\\'
-    }
-    return unesc.trim()
-  }
-  return val
-}
-
-
-/***/ }),
-/* 685 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var _ = __webpack_require__(38);
-
-/**
- * Choice object
- * Normalize input as choice object
- * @constructor
- * @param {String|Object} val  Choice value. If an object is passed, it should contains
- *                             at least one of `value` or `name` property
- */
-
-module.exports = class Choice {
-  constructor(val, answers) {
-    // Don't process Choice and Separator object
-    if (val instanceof Choice || val.type === 'separator') {
-      return val;
-    }
-
-    if (_.isString(val)) {
-      this.name = val;
-      this.value = val;
-      this.short = val;
-    } else {
-      _.extend(this, val, {
-        name: val.name || val.value,
-        value: 'value' in val ? val.value : val.name,
-        short: val.short || val.name || val.value
-      });
-    }
-
-    if (_.isFunction(val.disabled)) {
-      this.disabled = val.disabled(answers);
-    } else {
-      this.disabled = val.disabled;
-    }
-  }
-};
-
-
-/***/ }),
-/* 686 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var assert = __webpack_require__(28);
-var _ = __webpack_require__(38);
-var Separator = __webpack_require__(175);
-var Choice = __webpack_require__(685);
-
-/**
- * Choices collection
- * Collection of multiple `choice` object
- * @constructor
- * @param {Array} choices  All `choice` to keep in the collection
- */
-
-module.exports = class Choices {
-  constructor(choices, answers) {
-    this.choices = choices.map(val => {
-      if (val.type === 'separator') {
-        if (!(val instanceof Separator)) {
-          val = new Separator(val.line);
-        }
-        return val;
-      }
-      return new Choice(val, answers);
-    });
-
-    this.realChoices = this.choices
-      .filter(Separator.exclude)
-      .filter(item => !item.disabled);
-
-    Object.defineProperty(this, 'length', {
-      get() {
-        return this.choices.length;
-      },
-      set(val) {
-        this.choices.length = val;
-      }
-    });
-
-    Object.defineProperty(this, 'realLength', {
-      get() {
-        return this.realChoices.length;
-      },
-      set() {
-        throw new Error('Cannot set `realLength` of a Choices collection');
-      }
-    });
-  }
-
-  /**
-   * Get a valid choice from the collection
-   * @param  {Number} selector  The selected choice index
-   * @return {Choice|Undefined} Return the matched choice or undefined
-   */
-
-  getChoice(selector) {
-    assert(_.isNumber(selector));
-    return this.realChoices[selector];
-  }
-
-  /**
-   * Get a raw element from the collection
-   * @param  {Number} selector  The selected index value
-   * @return {Choice|Undefined} Return the matched choice or undefined
-   */
-
-  get(selector) {
-    assert(_.isNumber(selector));
-    return this.choices[selector];
-  }
-
-  /**
-   * Match the valid choices against a where clause
-   * @param  {Object} whereClause Lodash `where` clause
-   * @return {Array}              Matching choices or empty array
-   */
-
-  where(whereClause) {
-    return _.filter(this.realChoices, whereClause);
-  }
-
-  /**
-   * Pluck a particular key from the choices
-   * @param  {String} propertyName Property name to select
-   * @return {Array}               Selected properties
-   */
-
-  pluck(propertyName) {
-    return _.map(this.realChoices, propertyName);
-  }
-
-  // Expose usual Array methods
-  indexOf() {
-    return this.choices.indexOf.apply(this.choices, arguments);
-  }
-
-  forEach() {
-    return this.choices.forEach.apply(this.choices, arguments);
-  }
-
-  filter() {
-    return this.choices.filter.apply(this.choices, arguments);
-  }
-
-  find(func) {
-    return _.find(this.choices, func);
-  }
-
-  push() {
-    var objs = _.map(arguments, val => new Choice(val));
-    this.choices.push.apply(this.choices, objs);
-    this.realChoices = this.choices.filter(Separator.exclude);
-    return this.choices;
-  }
-};
-
-
-/***/ }),
-/* 687 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `list` type prompt
- */
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-var cliCursor = __webpack_require__(381);
-var figures = __webpack_require__(270);
-var { map, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
-
-class CheckboxPrompt extends Base {
-  constructor(questions, rl, answers) {
-    super(questions, rl, answers);
-
-    if (!this.opt.choices) {
-      this.throwParamError('choices');
-    }
-
-    if (_.isArray(this.opt.default)) {
-      this.opt.choices.forEach(function(choice) {
-        if (this.opt.default.indexOf(choice.value) >= 0) {
-          choice.checked = true;
-        }
-      }, this);
-    }
-
-    this.pointer = 0;
-    this.firstRender = true;
-
-    // Make sure no default is set (so it won't be printed)
-    this.opt.default = null;
-
-    this.paginator = new Paginator(this.screen);
-  }
-
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    var events = observe(this.rl);
-
-    var validation = this.handleSubmitEvents(
-      events.line.pipe(map(this.getCurrentValue.bind(this)))
-    );
-    validation.success.forEach(this.onEnd.bind(this));
-    validation.error.forEach(this.onError.bind(this));
-
-    events.normalizedUpKey
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onUpKey.bind(this));
-    events.normalizedDownKey
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onDownKey.bind(this));
-    events.numberKey
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onNumberKey.bind(this));
-    events.spaceKey
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onSpaceKey.bind(this));
-    events.aKey.pipe(takeUntil(validation.success)).forEach(this.onAllKey.bind(this));
-    events.iKey.pipe(takeUntil(validation.success)).forEach(this.onInverseKey.bind(this));
-
-    // Init the prompt
-    cliCursor.hide();
-    this.render();
-    this.firstRender = false;
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {CheckboxPrompt} self
-   */
-
-  render(error) {
-    // Render question
-    var message = this.getQuestion();
-    var bottomContent = '';
-
-    if (this.firstRender) {
-      message +=
-        '(Press ' +
-        chalk.cyan.bold('<space>') +
-        ' to select, ' +
-        chalk.cyan.bold('<a>') +
-        ' to toggle all, ' +
-        chalk.cyan.bold('<i>') +
-        ' to invert selection)';
-    }
-
-    // Render choices or answer depending on the state
-    if (this.status === 'answered') {
-      message += chalk.cyan(this.selection.join(', '));
-    } else {
-      var choicesStr = renderChoices(this.opt.choices, this.pointer);
-      var indexPosition = this.opt.choices.indexOf(
-        this.opt.choices.getChoice(this.pointer)
-      );
-      message +=
-        '\n' + this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize);
-    }
-
-    if (error) {
-      bottomContent = chalk.red('>> ') + error;
-    }
-
-    this.screen.render(message, bottomContent);
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  onEnd(state) {
-    this.status = 'answered';
-
-    // Rerender prompt (and clean subline error)
-    this.render();
-
-    this.screen.done();
-    cliCursor.show();
-    this.done(state.value);
-  }
-
-  onError(state) {
-    this.render(state.isValid);
-  }
-
-  getCurrentValue() {
-    var choices = this.opt.choices.filter(function(choice) {
-      return Boolean(choice.checked) && !choice.disabled;
-    });
-
-    this.selection = _.map(choices, 'short');
-    return _.map(choices, 'value');
-  }
-
-  onUpKey() {
-    var len = this.opt.choices.realLength;
-    this.pointer = this.pointer > 0 ? this.pointer - 1 : len - 1;
-    this.render();
-  }
-
-  onDownKey() {
-    var len = this.opt.choices.realLength;
-    this.pointer = this.pointer < len - 1 ? this.pointer + 1 : 0;
-    this.render();
-  }
-
-  onNumberKey(input) {
-    if (input <= this.opt.choices.realLength) {
-      this.pointer = input - 1;
-      this.toggleChoice(this.pointer);
-    }
-    this.render();
-  }
-
-  onSpaceKey() {
-    this.toggleChoice(this.pointer);
-    this.render();
-  }
-
-  onAllKey() {
-    var shouldBeChecked = Boolean(
-      this.opt.choices.find(function(choice) {
-        return choice.type !== 'separator' && !choice.checked;
-      })
-    );
-
-    this.opt.choices.forEach(function(choice) {
-      if (choice.type !== 'separator') {
-        choice.checked = shouldBeChecked;
-      }
-    });
-
-    this.render();
-  }
-
-  onInverseKey() {
-    this.opt.choices.forEach(function(choice) {
-      if (choice.type !== 'separator') {
-        choice.checked = !choice.checked;
-      }
-    });
-
-    this.render();
-  }
-
-  toggleChoice(index) {
-    var item = this.opt.choices.getChoice(index);
-    if (item !== undefined) {
-      this.opt.choices.getChoice(index).checked = !item.checked;
-    }
-  }
-}
-
-/**
- * Function for rendering checkbox choices
- * @param  {Number} pointer Position of the pointer
- * @return {String}         Rendered content
- */
-
-function renderChoices(choices, pointer) {
-  var output = '';
-  var separatorOffset = 0;
-
-  choices.forEach(function(choice, i) {
-    if (choice.type === 'separator') {
-      separatorOffset++;
-      output += ' ' + choice + '\n';
-      return;
-    }
-
-    if (choice.disabled) {
-      separatorOffset++;
-      output += ' - ' + choice.name;
-      output += ' (' + (_.isString(choice.disabled) ? choice.disabled : 'Disabled') + ')';
-    } else {
-      var line = getCheckbox(choice.checked) + ' ' + choice.name;
-      if (i - separatorOffset === pointer) {
-        output += chalk.cyan(figures.pointer + line);
-      } else {
-        output += ' ' + line;
-      }
-    }
-
-    output += '\n';
-  });
-
-  return output.replace(/\n$/, '');
-}
-
-/**
- * Get the checkbox
- * @param  {Boolean} checked - add a X or not to the checkbox
- * @return {String} Composited checkbox string
- */
-
-function getCheckbox(checked) {
-  return checked ? chalk.green(figures.radioOn) : figures.radioOff;
-}
-
-module.exports = CheckboxPrompt;
-
-
-/***/ }),
-/* 688 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `confirm` type prompt
- */
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-var { take, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var observe = __webpack_require__(80);
-
-class ConfirmPrompt extends Base {
-  constructor(questions, rl, answers) {
-    super(questions, rl, answers);
-
-    var rawDefault = true;
-
-    _.extend(this.opt, {
-      filter: function(input) {
-        var value = rawDefault;
-        if (input != null && input !== '') {
-          value = /^y(es)?/i.test(input);
-        }
-        return value;
-      }
-    });
-
-    if (_.isBoolean(this.opt.default)) {
-      rawDefault = this.opt.default;
-    }
-
-    this.opt.default = rawDefault ? 'Y/n' : 'y/N';
-
-    return this;
-  }
-
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb   Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    // Once user confirm (enter key)
-    var events = observe(this.rl);
-    events.keypress.pipe(takeUntil(events.line)).forEach(this.onKeypress.bind(this));
-
-    events.line.pipe(take(1)).forEach(this.onEnd.bind(this));
-
-    // Init
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {ConfirmPrompt} self
-   */
-
-  render(answer) {
-    var message = this.getQuestion();
-
-    if (typeof answer === 'boolean') {
-      message += chalk.cyan(answer ? 'Yes' : 'No');
-    } else {
-      message += this.rl.line;
-    }
-
-    this.screen.render(message);
-
-    return this;
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  onEnd(input) {
-    this.status = 'answered';
-
-    var output = this.opt.filter(input);
-    this.render(output);
-
-    this.screen.done();
-    this.done(output);
-  }
-
-  /**
-   * When user press a key
-   */
-
-  onKeypress() {
-    this.render();
-  }
-}
-
-module.exports = ConfirmPrompt;
-
-
-/***/ }),
-/* 689 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `editor` type prompt
- */
-
-var chalk = __webpack_require__(30);
-var editAsync = __webpack_require__(709).editAsync;
-var Base = __webpack_require__(79);
-var observe = __webpack_require__(80);
-var { Subject } = __webpack_require__(182);
-
-class EditorPrompt extends Base {
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    this.editorResult = new Subject();
-
-    // Open Editor on "line" (Enter Key)
-    var events = observe(this.rl);
-    this.lineSubscription = events.line.subscribe(this.startExternalEditor.bind(this));
-
-    // Trigger Validation when editor closes
-    var validation = this.handleSubmitEvents(this.editorResult);
-    validation.success.forEach(this.onEnd.bind(this));
-    validation.error.forEach(this.onError.bind(this));
-
-    // Prevents default from being printed on screen (can look weird with multiple lines)
-    this.currentText = this.opt.default;
-    this.opt.default = null;
-
-    // Init
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {EditorPrompt} self
-   */
-
-  render(error) {
-    var bottomContent = '';
-    var message = this.getQuestion();
-
-    if (this.status === 'answered') {
-      message += chalk.dim('Received');
-    } else {
-      message += chalk.dim('Press <enter> to launch your preferred editor.');
-    }
-
-    if (error) {
-      bottomContent = chalk.red('>> ') + error;
-    }
-
-    this.screen.render(message, bottomContent);
-  }
-
-  /**
-   * Launch $EDITOR on user press enter
-   */
-
-  startExternalEditor() {
-    // Pause Readline to prevent stdin and stdout from being modified while the editor is showing
-    this.rl.pause();
-    editAsync(this.currentText, this.endExternalEditor.bind(this));
-  }
-
-  endExternalEditor(error, result) {
-    this.rl.resume();
-    if (error) {
-      this.editorResult.error(error);
-    } else {
-      this.editorResult.next(result);
-    }
-  }
-
-  onEnd(state) {
-    this.editorResult.unsubscribe();
-    this.lineSubscription.unsubscribe();
-    this.answer = state.value;
-    this.status = 'answered';
-    // Re-render prompt
-    this.render();
-    this.screen.done();
-    this.done(this.answer);
-  }
-
-  onError(state) {
-    this.render(state.isValid);
-  }
-}
-
-module.exports = EditorPrompt;
-
-
-/***/ }),
-/* 690 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `rawlist` type prompt
- */
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-var { map, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var Separator = __webpack_require__(175);
-var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
-
-class ExpandPrompt extends Base {
-  constructor(questions, rl, answers) {
-    super(questions, rl, answers);
-
-    if (!this.opt.choices) {
-      this.throwParamError('choices');
-    }
-
-    this.validateChoices(this.opt.choices);
-
-    // Add the default `help` (/expand) option
-    this.opt.choices.push({
-      key: 'h',
-      name: 'Help, list all options',
-      value: 'help'
-    });
-
-    this.opt.validate = choice => {
-      if (choice == null) {
-        return 'Please enter a valid command';
-      }
-
-      return choice !== 'help';
-    };
-
-    // Setup the default string (capitalize the default key)
-    this.opt.default = this.generateChoicesString(this.opt.choices, this.opt.default);
-
-    this.paginator = new Paginator(this.screen);
-  }
-
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    // Save user answer and update prompt to show selected option.
-    var events = observe(this.rl);
-    var validation = this.handleSubmitEvents(
-      events.line.pipe(map(this.getCurrentValue.bind(this)))
-    );
-    validation.success.forEach(this.onSubmit.bind(this));
-    validation.error.forEach(this.onError.bind(this));
-    this.keypressObs = events.keypress
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onKeypress.bind(this));
-
-    // Init the prompt
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {ExpandPrompt} self
-   */
-
-  render(error, hint) {
-    var message = this.getQuestion();
-    var bottomContent = '';
-
-    if (this.status === 'answered') {
-      message += chalk.cyan(this.answer);
-    } else if (this.status === 'expanded') {
-      var choicesStr = renderChoices(this.opt.choices, this.selectedKey);
-      message += this.paginator.paginate(choicesStr, this.selectedKey, this.opt.pageSize);
-      message += '\n  Answer: ';
-    }
-
-    message += this.rl.line;
-
-    if (error) {
-      bottomContent = chalk.red('>> ') + error;
-    }
-
-    if (hint) {
-      bottomContent = chalk.cyan('>> ') + hint;
-    }
-
-    this.screen.render(message, bottomContent);
-  }
-
-  getCurrentValue(input) {
-    if (!input) {
-      input = this.rawDefault;
-    }
-    var selected = this.opt.choices.where({ key: input.toLowerCase().trim() })[0];
-    if (!selected) {
-      return null;
-    }
-
-    return selected.value;
-  }
-
-  /**
-   * Generate the prompt choices string
-   * @return {String}  Choices string
-   */
-
-  getChoices() {
-    var output = '';
-
-    this.opt.choices.forEach(choice => {
-      output += '\n  ';
-
-      if (choice.type === 'separator') {
-        output += ' ' + choice;
-        return;
-      }
-
-      var choiceStr = choice.key + ') ' + choice.name;
-      if (this.selectedKey === choice.key) {
-        choiceStr = chalk.cyan(choiceStr);
-      }
-      output += choiceStr;
-    });
-
-    return output;
-  }
-
-  onError(state) {
-    if (state.value === 'help') {
-      this.selectedKey = '';
-      this.status = 'expanded';
-      this.render();
-      return;
-    }
-    this.render(state.isValid);
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  onSubmit(state) {
-    this.status = 'answered';
-    var choice = this.opt.choices.where({ value: state.value })[0];
-    this.answer = choice.short || choice.name;
-
-    // Re-render prompt
-    this.render();
-    this.screen.done();
-    this.done(state.value);
-  }
-
-  /**
-   * When user press a key
-   */
-
-  onKeypress() {
-    this.selectedKey = this.rl.line.toLowerCase();
-    var selected = this.opt.choices.where({ key: this.selectedKey })[0];
-    if (this.status === 'expanded') {
-      this.render();
-    } else {
-      this.render(null, selected ? selected.name : null);
-    }
-  }
-
-  /**
-   * Validate the choices
-   * @param {Array} choices
-   */
-
-  validateChoices(choices) {
-    var formatError;
-    var errors = [];
-    var keymap = {};
-    choices.filter(Separator.exclude).forEach(choice => {
-      if (!choice.key || choice.key.length !== 1) {
-        formatError = true;
-      }
-      if (keymap[choice.key]) {
-        errors.push(choice.key);
-      }
-      keymap[choice.key] = true;
-      choice.key = String(choice.key).toLowerCase();
-    });
-
-    if (formatError) {
-      throw new Error(
-        'Format error: `key` param must be a single letter and is required.'
-      );
-    }
-    if (keymap.h) {
-      throw new Error(
-        'Reserved key error: `key` param cannot be `h` - this value is reserved.'
-      );
-    }
-    if (errors.length) {
-      throw new Error(
-        'Duplicate key error: `key` param must be unique. Duplicates: ' +
-          _.uniq(errors).join(', ')
-      );
-    }
-  }
-
-  /**
-   * Generate a string out of the choices keys
-   * @param  {Array}  choices
-   * @param  {Number|String} default - the choice index or name to capitalize
-   * @return {String} The rendered choices key string
-   */
-  generateChoicesString(choices, defaultChoice) {
-    var defIndex = choices.realLength - 1;
-    if (_.isNumber(defaultChoice) && this.opt.choices.getChoice(defaultChoice)) {
-      defIndex = defaultChoice;
-    } else if (_.isString(defaultChoice)) {
-      let index = _.findIndex(
-        choices.realChoices,
-        ({ value }) => value === defaultChoice
-      );
-      defIndex = index === -1 ? defIndex : index;
-    }
-    var defStr = this.opt.choices.pluck('key');
-    this.rawDefault = defStr[defIndex];
-    defStr[defIndex] = String(defStr[defIndex]).toUpperCase();
-    return defStr.join('');
-  }
-}
-
-/**
- * Function for rendering checkbox choices
- * @param  {String} pointer Selected key
- * @return {String}         Rendered content
- */
-
-function renderChoices(choices, pointer) {
-  var output = '';
-
-  choices.forEach(choice => {
-    output += '\n  ';
-
-    if (choice.type === 'separator') {
-      output += ' ' + choice;
-      return;
-    }
-
-    var choiceStr = choice.key + ') ' + choice.name;
-    if (pointer === choice.key) {
-      choiceStr = chalk.cyan(choiceStr);
-    }
-    output += choiceStr;
-  });
-
-  return output;
-}
-
-module.exports = ExpandPrompt;
-
-
-/***/ }),
-/* 691 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `list` type prompt
- */
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-var figures = __webpack_require__(270);
-var cliCursor = __webpack_require__(381);
-var runAsync = __webpack_require__(181);
-var { flatMap, map, take, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
-
-class ListPrompt extends Base {
-  constructor(questions, rl, answers) {
-    super(questions, rl, answers);
-
-    if (!this.opt.choices) {
-      this.throwParamError('choices');
-    }
-
-    this.firstRender = true;
-    this.selected = 0;
-
-    var def = this.opt.default;
-
-    // If def is a Number, then use as index. Otherwise, check for value.
-    if (_.isNumber(def) && def >= 0 && def < this.opt.choices.realLength) {
-      this.selected = def;
-    } else if (!_.isNumber(def) && def != null) {
-      let index = _.findIndex(this.opt.choices.realChoices, ({ value }) => value === def);
-      this.selected = Math.max(index, 0);
-    }
-
-    // Make sure no default is set (so it won't be printed)
-    this.opt.default = null;
-
-    this.paginator = new Paginator(this.screen);
-  }
-
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    var self = this;
-
-    var events = observe(this.rl);
-    events.normalizedUpKey.pipe(takeUntil(events.line)).forEach(this.onUpKey.bind(this));
-    events.normalizedDownKey
-      .pipe(takeUntil(events.line))
-      .forEach(this.onDownKey.bind(this));
-    events.numberKey.pipe(takeUntil(events.line)).forEach(this.onNumberKey.bind(this));
-    events.line
-      .pipe(
-        take(1),
-        map(this.getCurrentValue.bind(this)),
-        flatMap(value => runAsync(self.opt.filter)(value).catch(err => err))
-      )
-      .forEach(this.onSubmit.bind(this));
-
-    // Init the prompt
-    cliCursor.hide();
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {ListPrompt} self
-   */
-
-  render() {
-    // Render question
-    var message = this.getQuestion();
-
-    if (this.firstRender) {
-      message += chalk.dim('(Use arrow keys)');
-    }
-
-    // Render choices or answer depending on the state
-    if (this.status === 'answered') {
-      message += chalk.cyan(this.opt.choices.getChoice(this.selected).short);
-    } else {
-      var choicesStr = listRender(this.opt.choices, this.selected);
-      var indexPosition = this.opt.choices.indexOf(
-        this.opt.choices.getChoice(this.selected)
-      );
-      message +=
-        '\n' + this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize);
-    }
-
-    this.firstRender = false;
-
-    this.screen.render(message);
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  onSubmit(value) {
-    this.status = 'answered';
-
-    // Rerender prompt
-    this.render();
-
-    this.screen.done();
-    cliCursor.show();
-    this.done(value);
-  }
-
-  getCurrentValue() {
-    return this.opt.choices.getChoice(this.selected).value;
-  }
-
-  /**
-   * When user press a key
-   */
-  onUpKey() {
-    var len = this.opt.choices.realLength;
-    this.selected = this.selected > 0 ? this.selected - 1 : len - 1;
-    this.render();
-  }
-
-  onDownKey() {
-    var len = this.opt.choices.realLength;
-    this.selected = this.selected < len - 1 ? this.selected + 1 : 0;
-    this.render();
-  }
-
-  onNumberKey(input) {
-    if (input <= this.opt.choices.realLength) {
-      this.selected = input - 1;
-    }
-    this.render();
-  }
-}
-
-/**
- * Function for rendering list choices
- * @param  {Number} pointer Position of the pointer
- * @return {String}         Rendered content
- */
-function listRender(choices, pointer) {
-  var output = '';
-  var separatorOffset = 0;
-
-  choices.forEach((choice, i) => {
-    if (choice.type === 'separator') {
-      separatorOffset++;
-      output += '  ' + choice + '\n';
-      return;
-    }
-
-    if (choice.disabled) {
-      separatorOffset++;
-      output += '  - ' + choice.name;
-      output += ' (' + (_.isString(choice.disabled) ? choice.disabled : 'Disabled') + ')';
-      output += '\n';
-      return;
-    }
-
-    var isSelected = i - separatorOffset === pointer;
-    var line = (isSelected ? figures.pointer + ' ' : '  ') + choice.name;
-    if (isSelected) {
-      line = chalk.cyan(line);
-    }
-    output += line + ' \n';
-  });
-
-  return output.replace(/\n$/, '');
-}
-
-module.exports = ListPrompt;
-
-
-/***/ }),
-/* 692 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `input` type prompt
- */
-
-var Input = __webpack_require__(392);
-
-/**
- * Extention of the Input prompt specifically for use with number inputs.
- */
-
-class NumberPrompt extends Input {
-  filterInput(input) {
-    if (input && typeof input === 'string') {
-      input = input.trim();
-      // Match a number in the input
-      let numberMatch = input.match(/(^-?\d+|^\d+\.\d*|^\d*\.\d+)(e\d+)?$/);
-      // If a number is found, return that input.
-      if (numberMatch) {
-        return Number(numberMatch[0]);
-      }
-    }
-    // If the input was invalid return the default value.
-    return this.opt.default == null ? NaN : this.opt.default;
-  }
-}
-
-module.exports = NumberPrompt;
-
-
-/***/ }),
-/* 693 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `password` type prompt
- */
-
-var chalk = __webpack_require__(30);
-var { map, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var observe = __webpack_require__(80);
-
-function mask(input, maskChar) {
-  input = String(input);
-  maskChar = typeof maskChar === 'string' ? maskChar : '*';
-  if (input.length === 0) {
-    return '';
-  }
-
-  return new Array(input.length + 1).join(maskChar);
-}
-
-class PasswordPrompt extends Base {
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    var events = observe(this.rl);
-
-    // Once user confirm (enter key)
-    var submit = events.line.pipe(map(this.filterInput.bind(this)));
-
-    var validation = this.handleSubmitEvents(submit);
-    validation.success.forEach(this.onEnd.bind(this));
-    validation.error.forEach(this.onError.bind(this));
-
-    if (this.opt.mask) {
-      events.keypress
-        .pipe(takeUntil(validation.success))
-        .forEach(this.onKeypress.bind(this));
-    }
-
-    // Init
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {PasswordPrompt} self
-   */
-
-  render(error) {
-    var message = this.getQuestion();
-    var bottomContent = '';
-
-    if (this.status === 'answered') {
-      message += this.opt.mask
-        ? chalk.cyan(mask(this.answer, this.opt.mask))
-        : chalk.italic.dim('[hidden]');
-    } else if (this.opt.mask) {
-      message += mask(this.rl.line || '', this.opt.mask);
-    } else {
-      message += chalk.italic.dim('[input is hidden] ');
-    }
-
-    if (error) {
-      bottomContent = '\n' + chalk.red('>> ') + error;
-    }
-
-    this.screen.render(message, bottomContent);
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  filterInput(input) {
-    if (!input) {
-      return this.opt.default == null ? '' : this.opt.default;
-    }
-    return input;
-  }
-
-  onEnd(state) {
-    this.status = 'answered';
-    this.answer = state.value;
-
-    // Re-render prompt
-    this.render();
-
-    this.screen.done();
-    this.done(state.value);
-  }
-
-  onError(state) {
-    this.render(state.isValid);
-  }
-
-  onKeypress() {
-    this.render();
-  }
-}
-
-module.exports = PasswordPrompt;
-
-
-/***/ }),
-/* 694 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * `rawlist` type prompt
- */
-
-var _ = __webpack_require__(38);
-var chalk = __webpack_require__(30);
-var { map, takeUntil } = __webpack_require__(63);
-var Base = __webpack_require__(79);
-var Separator = __webpack_require__(175);
-var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
-
-class RawListPrompt extends Base {
-  constructor(questions, rl, answers) {
-    super(questions, rl, answers);
-
-    if (!this.opt.choices) {
-      this.throwParamError('choices');
-    }
-
-    this.opt.validChoices = this.opt.choices.filter(Separator.exclude);
-
-    this.selected = 0;
-    this.rawDefault = 0;
-
-    _.extend(this.opt, {
-      validate: function(val) {
-        return val != null;
-      }
-    });
-
-    var def = this.opt.default;
-    if (_.isNumber(def) && def >= 0 && def < this.opt.choices.realLength) {
-      this.selected = def;
-      this.rawDefault = def;
-    } else if (!_.isNumber(def) && def != null) {
-      let index = _.findIndex(this.opt.choices.realChoices, ({ value }) => value === def);
-      let safeIndex = Math.max(index, 0);
-      this.selected = safeIndex;
-      this.rawDefault = safeIndex;
-    }
-
-    // Make sure no default is set (so it won't be printed)
-    this.opt.default = null;
-
-    this.paginator = new Paginator();
-  }
-
-  /**
-   * Start the Inquiry session
-   * @param  {Function} cb      Callback when prompt is done
-   * @return {this}
-   */
-
-  _run(cb) {
-    this.done = cb;
-
-    // Once user confirm (enter key)
-    var events = observe(this.rl);
-    var submit = events.line.pipe(map(this.getCurrentValue.bind(this)));
-
-    var validation = this.handleSubmitEvents(submit);
-    validation.success.forEach(this.onEnd.bind(this));
-    validation.error.forEach(this.onError.bind(this));
-
-    events.keypress
-      .pipe(takeUntil(validation.success))
-      .forEach(this.onKeypress.bind(this));
-
-    // Init the prompt
-    this.render();
-
-    return this;
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {RawListPrompt} self
-   */
-
-  render(error) {
-    // Render question
-    var message = this.getQuestion();
-    var bottomContent = '';
-
-    if (this.status === 'answered') {
-      message += chalk.cyan(this.answer);
-    } else {
-      var choicesStr = renderChoices(this.opt.choices, this.selected);
-      message += this.paginator.paginate(choicesStr, this.selected, this.opt.pageSize);
-      message += '\n  Answer: ';
-    }
-
-    message += this.rl.line;
-
-    if (error) {
-      bottomContent = '\n' + chalk.red('>> ') + error;
-    }
-
-    this.screen.render(message, bottomContent);
-  }
-
-  /**
-   * When user press `enter` key
-   */
-
-  getCurrentValue(index) {
-    if (index == null || index === '') {
-      index = this.rawDefault;
-    } else {
-      index -= 1;
-    }
-
-    var choice = this.opt.choices.getChoice(index);
-    return choice ? choice.value : null;
-  }
-
-  onEnd(state) {
-    this.status = 'answered';
-    this.answer = state.value;
-
-    // Re-render prompt
-    this.render();
-
-    this.screen.done();
-    this.done(state.value);
-  }
-
-  onError() {
-    this.render('Please enter a valid index');
-  }
-
-  /**
-   * When user press a key
-   */
-
-  onKeypress() {
-    var index = this.rl.line.length ? Number(this.rl.line) - 1 : 0;
-
-    if (this.opt.choices.getChoice(index)) {
-      this.selected = index;
-    } else {
-      this.selected = undefined;
-    }
-
-    this.render();
-  }
-}
-
-/**
- * Function for rendering list choices
- * @param  {Number} pointer Position of the pointer
- * @return {String}         Rendered content
- */
-
-function renderChoices(choices, pointer) {
-  var output = '';
-  var separatorOffset = 0;
-
-  choices.forEach(function(choice, i) {
-    output += '\n  ';
-
-    if (choice.type === 'separator') {
-      separatorOffset++;
-      output += ' ' + choice;
-      return;
-    }
-
-    var index = i - separatorOffset;
-    var display = index + 1 + ') ' + choice.name;
-    if (index === pointer) {
-      display = chalk.cyan(display);
-    }
-    output += display;
-  });
-
-  return output;
-}
-
-module.exports = RawListPrompt;
-
-
-/***/ }),
-/* 695 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/**
- * Sticky bottom bar user interface
- */
-
-var through = __webpack_require__(953);
-var Base = __webpack_require__(393);
-var rlUtils = __webpack_require__(394);
-var _ = __webpack_require__(38);
-
-class BottomBar extends Base {
-  constructor(opt) {
-    opt = opt || {};
-
-    super(opt);
-
-    this.log = through(this.writeLog.bind(this));
-    this.bottomBar = opt.bottomBar || '';
-    this.render();
-  }
-
-  /**
-   * Render the prompt to screen
-   * @return {BottomBar} self
-   */
-
-  render() {
-    this.write(this.bottomBar);
-    return this;
-  }
-
-  clean() {
-    rlUtils.clearLine(this.rl, this.bottomBar.split('\n').length);
-    return this;
-  }
-
-  /**
-   * Update the bottom bar content and rerender
-   * @param  {String} bottomBar Bottom bar content
-   * @return {BottomBar}           self
-   */
-
-  updateBottomBar(bottomBar) {
-    rlUtils.clearLine(this.rl, 1);
-    this.rl.output.unmute();
-    this.clean();
-    this.bottomBar = bottomBar;
-    this.render();
-    this.rl.output.mute();
-    return this;
-  }
-
-  /**
-   * Write out log data
-   * @param {String} data - The log data to be output
-   * @return {BottomBar} self
-   */
-
-  writeLog(data) {
-    this.rl.output.unmute();
-    this.clean();
-    this.rl.output.write(this.enforceLF(data.toString()));
-    this.render();
-    this.rl.output.mute();
-    return this;
-  }
-
-  /**
-   * Make sure line end on a line feed
-   * @param  {String} str Input string
-   * @return {String}     The input string with a final line feed
-   */
-
-  enforceLF(str) {
-    return str.match(/[\r\n]$/) ? str : str + '\n';
-  }
-
-  /**
-   * Helper for writing message in Prompt
-   * @param {BottomBar} prompt  - The Prompt object that extends tty
-   * @param {String} message - The message to be output
-   */
-  write(message) {
-    var msgLines = message.split(/\n/);
-    this.height = msgLines.length;
-
-    // Write message to screen and setPrompt to control backspace
-    this.rl.setPrompt(_.last(msgLines));
-
-    if (this.rl.output.rows === 0 && this.rl.output.columns === 0) {
-      /* When it's a tty through serial port there's no terminal info and the render will malfunction,
-         so we need enforce the cursor to locate to the leftmost position for rendering. */
-      rlUtils.left(this.rl, message.length + this.rl.line.length);
-    }
-    this.rl.output.write(message);
-  }
-}
-
-module.exports = BottomBar;
-
-
-/***/ }),
-/* 696 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var _ = __webpack_require__(38);
-var { defer, empty, from, of } = __webpack_require__(182);
-var { concatMap, filter, publish, reduce } = __webpack_require__(63);
-var runAsync = __webpack_require__(181);
-var utils = __webpack_require__(698);
-var Base = __webpack_require__(393);
-
-/**
- * Base interface class other can inherits from
- */
-
-class PromptUI extends Base {
-  constructor(prompts, opt) {
-    super(opt);
-    this.prompts = prompts;
-  }
-
-  run(questions) {
-    // Keep global reference to the answers
-    this.answers = {};
-
-    // Make sure questions is an array.
-    if (_.isPlainObject(questions)) {
-      questions = [questions];
-    }
-
-    // Create an observable, unless we received one as parameter.
-    // Note: As this is a public interface, we cannot do an instanceof check as we won't
-    // be using the exact same object in memory.
-    var obs = _.isArray(questions) ? from(questions) : questions;
-
-    this.process = obs.pipe(
-      concatMap(this.processQuestion.bind(this)),
-      publish() // Creates a hot Observable. It prevents duplicating prompts.
-    );
-
-    this.process.connect();
-
-    return this.process
-      .pipe(
-        reduce((answers, answer) => {
-          _.set(this.answers, answer.name, answer.answer);
-          return this.answers;
-        }, {})
-      )
-      .toPromise(Promise)
-      .then(this.onCompletion.bind(this));
-  }
-
-  /**
-   * Once all prompt are over
-   */
-
-  onCompletion() {
-    this.close();
-
-    return this.answers;
-  }
-
-  processQuestion(question) {
-    question = _.clone(question);
-    return defer(() => {
-      var obs = of(question);
-
-      return obs.pipe(
-        concatMap(this.setDefaultType.bind(this)),
-        concatMap(this.filterIfRunnable.bind(this)),
-        concatMap(() =>
-          utils.fetchAsyncQuestionProperty(question, 'message', this.answers)
-        ),
-        concatMap(() =>
-          utils.fetchAsyncQuestionProperty(question, 'default', this.answers)
-        ),
-        concatMap(() =>
-          utils.fetchAsyncQuestionProperty(question, 'choices', this.answers)
-        ),
-        concatMap(this.fetchAnswer.bind(this))
-      );
-    });
-  }
-
-  fetchAnswer(question) {
-    var Prompt = this.prompts[question.type];
-    this.activePrompt = new Prompt(question, this.rl, this.answers);
-    return defer(() =>
-      from(
-        this.activePrompt.run().then(answer => ({ name: question.name, answer: answer }))
-      )
-    );
-  }
-
-  setDefaultType(question) {
-    // Default type to input
-    if (!this.prompts[question.type]) {
-      question.type = 'input';
-    }
-    return defer(() => of(question));
-  }
-
-  filterIfRunnable(question) {
-    if (question.when === false) {
-      return empty();
-    }
-
-    if (!_.isFunction(question.when)) {
-      return of(question);
-    }
-
-    var answers = this.answers;
-    return defer(() =>
-      from(
-        runAsync(question.when)(answers).then(shouldRun => {
-          if (shouldRun) {
-            return question;
-          }
-        })
-      ).pipe(filter(val => val != null))
-    );
-  }
-}
-
-module.exports = PromptUI;
-
-
-/***/ }),
-/* 697 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var _ = __webpack_require__(38);
-var util = __webpack_require__(394);
-var cliWidth = __webpack_require__(606);
-var stripAnsi = __webpack_require__(329);
-var stringWidth = __webpack_require__(728);
-
-function height(content) {
-  return content.split('\n').length;
-}
-
-function lastLine(content) {
-  return _.last(content.split('\n'));
-}
-
-class ScreenManager {
-  constructor(rl) {
-    // These variables are keeping information to allow correct prompt re-rendering
-    this.height = 0;
-    this.extraLinesUnderPrompt = 0;
-
-    this.rl = rl;
-  }
-
-  render(content, bottomContent) {
-    this.rl.output.unmute();
-    this.clean(this.extraLinesUnderPrompt);
-
-    /**
-     * Write message to screen and setPrompt to control backspace
-     */
-
-    var promptLine = lastLine(content);
-    var rawPromptLine = stripAnsi(promptLine);
-
-    // Remove the rl.line from our prompt. We can't rely on the content of
-    // rl.line (mainly because of the password prompt), so just rely on it's
-    // length.
-    var prompt = rawPromptLine;
-    if (this.rl.line.length) {
-      prompt = prompt.slice(0, -this.rl.line.length);
-    }
-    this.rl.setPrompt(prompt);
-
-    // SetPrompt will change cursor position, now we can get correct value
-    var cursorPos = this.rl._getCursorPos();
-    var width = this.normalizedCliWidth();
-
-    content = this.forceLineReturn(content, width);
-    if (bottomContent) {
-      bottomContent = this.forceLineReturn(bottomContent, width);
-    }
-    // Manually insert an extra line if we're at the end of the line.
-    // This prevent the cursor from appearing at the beginning of the
-    // current line.
-    if (rawPromptLine.length % width === 0) {
-      content += '\n';
-    }
-    var fullContent = content + (bottomContent ? '\n' + bottomContent : '');
-    this.rl.output.write(fullContent);
-
-    /**
-     * Re-adjust the cursor at the correct position.
-     */
-
-    // We need to consider parts of the prompt under the cursor as part of the bottom
-    // content in order to correctly cleanup and re-render.
-    var promptLineUpDiff = Math.floor(rawPromptLine.length / width) - cursorPos.rows;
-    var bottomContentHeight =
-      promptLineUpDiff + (bottomContent ? height(bottomContent) : 0);
-    if (bottomContentHeight > 0) {
-      util.up(this.rl, bottomContentHeight);
-    }
-
-    // Reset cursor at the beginning of the line
-    util.left(this.rl, stringWidth(lastLine(fullContent)));
-
-    // Adjust cursor on the right
-    if (cursorPos.cols > 0) {
-      util.right(this.rl, cursorPos.cols);
-    }
-
-    /**
-     * Set up state for next re-rendering
-     */
-    this.extraLinesUnderPrompt = bottomContentHeight;
-    this.height = height(fullContent);
-
-    this.rl.output.mute();
-  }
-
-  clean(extraLines) {
-    if (extraLines > 0) {
-      util.down(this.rl, extraLines);
-    }
-    util.clearLine(this.rl, this.height);
-  }
-
-  done() {
-    this.rl.setPrompt('');
-    this.rl.output.unmute();
-    this.rl.output.write('\n');
-  }
-
-  releaseCursor() {
-    if (this.extraLinesUnderPrompt > 0) {
-      util.down(this.rl, this.extraLinesUnderPrompt);
-    }
-  }
-
-  normalizedCliWidth() {
-    var width = cliWidth({
-      defaultWidth: 80,
-      output: this.rl.output
-    });
-    return width;
-  }
-
-  breakLines(lines, width) {
-    // Break lines who're longer than the cli width so we can normalize the natural line
-    // returns behavior across terminals.
-    width = width || this.normalizedCliWidth();
-    var regex = new RegExp('(?:(?:\\033[[0-9;]*m)*.?){1,' + width + '}', 'g');
-    return lines.map(line => {
-      var chunk = line.match(regex);
-      // Last match is always empty
-      chunk.pop();
-      return chunk || '';
-    });
-  }
-
-  forceLineReturn(content, width) {
-    width = width || this.normalizedCliWidth();
-    return _.flatten(this.breakLines(content.split('\n'), width)).join('\n');
-  }
-}
-
-module.exports = ScreenManager;
-
-
-/***/ }),
-/* 698 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var _ = __webpack_require__(38);
-var { from, of } = __webpack_require__(182);
-var runAsync = __webpack_require__(181);
-
-/**
- * Resolve a question property value if it is passed as a function.
- * This method will overwrite the property on the question object with the received value.
- * @param  {Object} question - Question object
- * @param  {String} prop     - Property to fetch name
- * @param  {Object} answers  - Answers object
- * @return {Rx.Observable}   - Observable emitting once value is known
- */
-
-exports.fetchAsyncQuestionProperty = function(question, prop, answers) {
-  if (!_.isFunction(question[prop])) {
-    return of(question);
-  }
-
-  return from(
-    runAsync(question[prop])(answers).then(value => {
-      question[prop] = value;
-      return question;
-    })
-  );
-};
-
-
-/***/ }),
-/* 699 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var util = __webpack_require__(3),
-  Match = __webpack_require__ (142);
-
-
-/**
- * This is a superclass for the individual detectors for
- * each of the detectable members of the ISO 2022 family
- * of encodings.
- */
-
-function ISO_2022() {}
-
-ISO_2022.prototype.match = function(det) {
-
-  /**
-   * Matching function shared among the 2022 detectors JP, CN and KR
-   * Counts up the number of legal an unrecognized escape sequences in
-   * the sample of text, and computes a score based on the total number &
-   * the proportion that fit the encoding.
-   *
-   *
-   * @param text the byte buffer containing text to analyse
-   * @param textLen  the size of the text in the byte.
-   * @param escapeSequences the byte escape sequences to test for.
-   * @return match quality, in the range of 0-100.
-   */
-
-  var i, j;
-  var escN;
-  var hits   = 0;
-  var misses = 0;
-  var shifts = 0;
-  var quality;
-
-  // TODO: refactor me
-  var text = det.fInputBytes;
-  var textLen = det.fInputLen;
-
-  scanInput:
-    for (i = 0; i < textLen; i++) {
-      if (text[i] == 0x1b) {
-        checkEscapes:
-          for (escN = 0; escN < this.escapeSequences.length; escN++) {
-            var seq = this.escapeSequences[escN];
-
-            if ((textLen - i) < seq.length)
-              continue checkEscapes;
-
-            for (j = 1; j < seq.length; j++)
-              if (seq[j] != text[i + j])
-                continue checkEscapes;
-
-
-            hits++;
-            i += seq.length - 1;
-            continue scanInput;
-          }
-
-          misses++;
-      }
-
-      // Shift in/out
-      if (text[i] == 0x0e || text[i] == 0x0f)
-        shifts++;
-
-    }
-
-  if (hits == 0)
-    return null;
-
-  //
-  // Initial quality is based on relative proportion of recongized vs.
-  //   unrecognized escape sequences.
-  //   All good:  quality = 100;
-  //   half or less good: quality = 0;
-  //   linear inbetween.
-  quality = (100 * hits - 100 * misses) / (hits + misses);
-
-  // Back off quality if there were too few escape sequences seen.
-  //   Include shifts in this computation, so that KR does not get penalized
-  //   for having only a single Escape sequence, but many shifts.
-  if (hits + shifts < 5)
-    quality -= (5 - (hits + shifts)) * 10;
-
-  return quality <= 0 ? null : new Match(det, this, quality);
-};
-
-module.exports.ISO_2022_JP = function() {
-  this.name = function() {
-    return 'ISO-2022-JP';
-  };
-  this.escapeSequences = [
-    [ 0x1b, 0x24, 0x28, 0x43 ],   // KS X 1001:1992
-    [ 0x1b, 0x24, 0x28, 0x44 ],   // JIS X 212-1990
-    [ 0x1b, 0x24, 0x40 ],         // JIS C 6226-1978
-    [ 0x1b, 0x24, 0x41 ],         // GB 2312-80
-    [ 0x1b, 0x24, 0x42 ],         // JIS X 208-1983
-    [ 0x1b, 0x26, 0x40 ],         // JIS X 208 1990, 1997
-    [ 0x1b, 0x28, 0x42 ],         // ASCII
-    [ 0x1b, 0x28, 0x48 ],         // JIS-Roman
-    [ 0x1b, 0x28, 0x49 ],         // Half-width katakana
-    [ 0x1b, 0x28, 0x4a ],         // JIS-Roman
-    [ 0x1b, 0x2e, 0x41 ],         // ISO 8859-1
-    [ 0x1b, 0x2e, 0x46 ]          // ISO 8859-7
-  ];
-};
-util.inherits(module.exports.ISO_2022_JP, ISO_2022);
-
-
-
-module.exports.ISO_2022_KR = function() {
-  this.name = function() {
-    return 'ISO-2022-KR';
-  };
-  this.escapeSequences = [
-    [ 0x1b, 0x24, 0x29, 0x43 ]
-  ];
-};
-util.inherits(module.exports.ISO_2022_KR, ISO_2022);
-
-
-
-module.exports.ISO_2022_CN = function() {
-  this.name = function() {
-    return 'ISO-2022-CN';
-  };
-  this.escapeSequences = [
-    [ 0x1b, 0x24, 0x29, 0x41 ],   // GB 2312-80
-    [ 0x1b, 0x24, 0x29, 0x47 ],   // CNS 11643-1992 Plane 1
-    [ 0x1b, 0x24, 0x2A, 0x48 ],   // CNS 11643-1992 Plane 2
-    [ 0x1b, 0x24, 0x29, 0x45 ],   // ISO-IR-165
-    [ 0x1b, 0x24, 0x2B, 0x49 ],   // CNS 11643-1992 Plane 3
-    [ 0x1b, 0x24, 0x2B, 0x4A ],   // CNS 11643-1992 Plane 4
-    [ 0x1b, 0x24, 0x2B, 0x4B ],   // CNS 11643-1992 Plane 5
-    [ 0x1b, 0x24, 0x2B, 0x4C ],   // CNS 11643-1992 Plane 6
-    [ 0x1b, 0x24, 0x2B, 0x4D ],   // CNS 11643-1992 Plane 7
-    [ 0x1b, 0x4e ],               // SS2
-    [ 0x1b, 0x4f ]                // SS3
-  ];
-};
-util.inherits(module.exports.ISO_2022_CN, ISO_2022);
-
-
-/***/ }),
-/* 700 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var util = __webpack_require__(3),
-  Match = __webpack_require__ (142);
-
-/**
- * Binary search implementation (recursive)
- */
-function binarySearch(arr, searchValue) {
-  function find(arr, searchValue, left, right) {
-    if (right < left)
-      return -1;
-
-    /*
-    int mid = mid = (left + right) / 2;
-    There is a bug in the above line;
-    Joshua Bloch suggests the following replacement:
-    */
-    var mid = Math.floor((left + right) >>> 1);
-    if (searchValue > arr[mid])
-      return find(arr, searchValue, mid + 1, right);
-
-    if (searchValue < arr[mid])
-      return find(arr, searchValue, left, mid - 1);
-
-    return mid;
-  };
-
-  return find(arr, searchValue, 0, arr.length - 1);
-};
-
-// 'Character'  iterated character class.
-//    Recognizers for specific mbcs encodings make their 'characters' available
-//    by providing a nextChar() function that fills in an instance of iteratedChar
-//    with the next char from the input.
-//    The returned characters are not converted to Unicode, but remain as the raw
-//    bytes (concatenated into an int) from the codepage data.
-//
-//  For Asian charsets, use the raw input rather than the input that has been
-//   stripped of markup.  Detection only considers multi-byte chars, effectively
-//   stripping markup anyway, and double byte chars do occur in markup too.
-//
-function IteratedChar() {
-
-  this.charValue = 0; // 1-4 bytes from the raw input data
-  this.index     = 0;
-  this.nextIndex = 0;
-  this.error     = false;
-  this.done      = false;
-
-  this.reset = function() {
-    this.charValue = 0;
-    this.index     = -1;
-    this.nextIndex = 0;
-    this.error     = false;
-    this.done      = false;
-  };
-
-  this.nextByte = function(det) {
-    if (this.nextIndex >= det.fRawLength) {
-      this.done = true;
-      return -1;
-    }
-    var byteValue = det.fRawInput[this.nextIndex++] & 0x00ff;
-    return byteValue;
-  };
-};
-
-
-
-/**
- * Asian double or multi-byte - charsets.
- * Match is determined mostly by the input data adhering to the
- * encoding scheme for the charset, and, optionally,
- * frequency-of-occurence of characters.
- */
-
-function mbcs() {};
-
-/**
- * Test the match of this charset with the input text data
- *      which is obtained via the CharsetDetector object.
- *
- * @param det  The CharsetDetector, which contains the input text
- *             to be checked for being in this charset.
- * @return     Two values packed into one int  (Damn java, anyhow)
- *             bits 0-7:  the match confidence, ranging from 0-100
- *             bits 8-15: The match reason, an enum-like value.
- */
-mbcs.prototype.match = function(det) {
-
-  var singleByteCharCount = 0,  //TODO Do we really need this?
-    doubleByteCharCount = 0,
-    commonCharCount     = 0,
-    badCharCount        = 0,
-    totalCharCount      = 0,
-    confidence          = 0;
-
-  var iter = new IteratedChar();
-
-  detectBlock: {
-    for (iter.reset(); this.nextChar(iter, det);) {
-      totalCharCount++;
-      if (iter.error) {
-        badCharCount++;
-      } else {
-        var cv = iter.charValue & 0xFFFFFFFF;
-
-        if (cv <= 0xff) {
-          singleByteCharCount++;
-        } else {
-          doubleByteCharCount++;
-          if (this.commonChars != null) {
-            // NOTE: This assumes that there are no 4-byte common chars.
-            if (binarySearch(this.commonChars, cv) >= 0) {
-              commonCharCount++;
-            }
-          }
-        }
-      }
-      if (badCharCount >= 2 && badCharCount * 5 >= doubleByteCharCount) {
-        // console.log('its here!')
-        // Bail out early if the byte data is not matching the encoding scheme.
-        break detectBlock;
-      }
-    }
-
-    if (doubleByteCharCount <= 10 && badCharCount== 0) {
-      // Not many multi-byte chars.
-      if (doubleByteCharCount == 0 && totalCharCount < 10) {
-        // There weren't any multibyte sequences, and there was a low density of non-ASCII single bytes.
-        // We don't have enough data to have any confidence.
-        // Statistical analysis of single byte non-ASCII charcters would probably help here.
-        confidence = 0;
-      }
-      else {
-        //   ASCII or ISO file?  It's probably not our encoding,
-        //   but is not incompatible with our encoding, so don't give it a zero.
-        confidence = 10;
-      }
-      break detectBlock;
-    }
-
-    //
-    //  No match if there are too many characters that don't fit the encoding scheme.
-    //    (should we have zero tolerance for these?)
-    //
-    if (doubleByteCharCount < 20 * badCharCount) {
-      confidence = 0;
-      break detectBlock;
-    }
-
-    if (this.commonChars == null) {
-      // We have no statistics on frequently occuring characters.
-      //  Assess confidence purely on having a reasonable number of
-      //  multi-byte characters (the more the better
-      confidence = 30 + doubleByteCharCount - 20 * badCharCount;
-      if (confidence > 100) {
-        confidence = 100;
-      }
-    } else {
-      //
-      // Frequency of occurence statistics exist.
-      //
-      var maxVal = Math.log(parseFloat(doubleByteCharCount) / 4);
-      var scaleFactor = 90.0 / maxVal;
-      confidence = Math.floor(Math.log(commonCharCount + 1) * scaleFactor + 10);
-      confidence = Math.min(confidence, 100);
-    }
-  }   // end of detectBlock:
-
-  return confidence == 0 ? null : new Match(det, this, confidence);
-};
-
-/**
- * Get the next character (however many bytes it is) from the input data
- *    Subclasses for specific charset encodings must implement this function
- *    to get characters according to the rules of their encoding scheme.
- *
- *  This function is not a method of class iteratedChar only because
- *   that would require a lot of extra derived classes, which is awkward.
- * @param it  The iteratedChar 'struct' into which the returned char is placed.
- * @param det The charset detector, which is needed to get at the input byte data
- *            being iterated over.
- * @return    True if a character was returned, false at end of input.
- */
-
-mbcs.prototype.nextChar = function(iter, det) {};
-
-
-
-/**
- * Shift-JIS charset recognizer.
- */
-module.exports.sjis = function() {
-  this.name = function() {
-    return 'Shift-JIS';
-  };
-  this.language = function() {
-    return 'ja';
-  };
-
-  // TODO:  This set of data comes from the character frequency-
-  //        of-occurence analysis tool.  The data needs to be moved
-  //        into a resource and loaded from there.
-  this.commonChars = [
-    0x8140, 0x8141, 0x8142, 0x8145, 0x815b, 0x8169, 0x816a, 0x8175, 0x8176, 0x82a0,
-    0x82a2, 0x82a4, 0x82a9, 0x82aa, 0x82ab, 0x82ad, 0x82af, 0x82b1, 0x82b3, 0x82b5,
-    0x82b7, 0x82bd, 0x82be, 0x82c1, 0x82c4, 0x82c5, 0x82c6, 0x82c8, 0x82c9, 0x82cc,
-    0x82cd, 0x82dc, 0x82e0, 0x82e7, 0x82e8, 0x82e9, 0x82ea, 0x82f0, 0x82f1, 0x8341,
-    0x8343, 0x834e, 0x834f, 0x8358, 0x835e, 0x8362, 0x8367, 0x8375, 0x8376, 0x8389,
-    0x838a, 0x838b, 0x838d, 0x8393, 0x8e96, 0x93fa, 0x95aa
-  ];
-
-  this.nextChar = function(iter, det) {
-    iter.index = iter.nextIndex;
-    iter.error = false;
-
-    var firstByte;
-    firstByte = iter.charValue = iter.nextByte(det);
-    if (firstByte < 0)
-      return false;
-
-    if (firstByte <= 0x7f || (firstByte > 0xa0 && firstByte <= 0xdf))
-      return true;
-
-    var secondByte = iter.nextByte(det);
-    if (secondByte < 0)
-      return false;
-
-    iter.charValue = (firstByte << 8) | secondByte;
-    if (! ((secondByte >= 0x40 && secondByte <= 0x7f) || (secondByte >= 0x80 && secondByte <= 0xff))) {
-      // Illegal second byte value.
-      iter.error = true;
-    }
-    return true;
-  };
-};
-util.inherits(module.exports.sjis, mbcs);
-
-
-
-/**
- *   Big5 charset recognizer.
- */
-module.exports.big5 = function() {
-  this.name = function() {
-    return 'Big5';
-  };
-  this.language = function() {
-    return 'zh';
-  };
-  // TODO:  This set of data comes from the character frequency-
-  //        of-occurence analysis tool.  The data needs to be moved
-  //        into a resource and loaded from there.
-  this.commonChars = [
-    0xa140, 0xa141, 0xa142, 0xa143, 0xa147, 0xa149, 0xa175, 0xa176, 0xa440, 0xa446,
-    0xa447, 0xa448, 0xa451, 0xa454, 0xa457, 0xa464, 0xa46a, 0xa46c, 0xa477, 0xa4a3,
-    0xa4a4, 0xa4a7, 0xa4c1, 0xa4ce, 0xa4d1, 0xa4df, 0xa4e8, 0xa4fd, 0xa540, 0xa548,
-    0xa558, 0xa569, 0xa5cd, 0xa5e7, 0xa657, 0xa661, 0xa662, 0xa668, 0xa670, 0xa6a8,
-    0xa6b3, 0xa6b9, 0xa6d3, 0xa6db, 0xa6e6, 0xa6f2, 0xa740, 0xa751, 0xa759, 0xa7da,
-    0xa8a3, 0xa8a5, 0xa8ad, 0xa8d1, 0xa8d3, 0xa8e4, 0xa8fc, 0xa9c0, 0xa9d2, 0xa9f3,
-    0xaa6b, 0xaaba, 0xaabe, 0xaacc, 0xaafc, 0xac47, 0xac4f, 0xacb0, 0xacd2, 0xad59,
-    0xaec9, 0xafe0, 0xb0ea, 0xb16f, 0xb2b3, 0xb2c4, 0xb36f, 0xb44c, 0xb44e, 0xb54c,
-    0xb5a5, 0xb5bd, 0xb5d0, 0xb5d8, 0xb671, 0xb7ed, 0xb867, 0xb944, 0xbad8, 0xbb44,
-    0xbba1, 0xbdd1, 0xc2c4, 0xc3b9, 0xc440, 0xc45f
-  ];
-  this.nextChar = function(iter, det) {
-    iter.index = iter.nextIndex;
-    iter.error = false;
-
-    var firstByte = iter.charValue = iter.nextByte(det);
-
-    if (firstByte < 0)
-      return false;
-
-    // single byte character.
-    if (firstByte <= 0x7f || firstByte == 0xff)
-      return true;
-
-    var secondByte = iter.nextByte(det);
-
-    if (secondByte < 0)
-      return false;
-
-    iter.charValue = (iter.charValue << 8) | secondByte;
-
-    if (secondByte < 0x40 || secondByte == 0x7f || secondByte == 0xff)
-      iter.error = true;
-
-    return true;
-  };
-};
-util.inherits(module.exports.big5, mbcs);
-
-
-
-/**
- *  EUC charset recognizers.  One abstract class that provides the common function
- *  for getting the next character according to the EUC encoding scheme,
- *  and nested derived classes for EUC_KR, EUC_JP, EUC_CN.
- *
- *  Get the next character value for EUC based encodings.
- *  Character 'value' is simply the raw bytes that make up the character
- *     packed into an int.
- */
-function eucNextChar(iter, det) {
-  iter.index = iter.nextIndex;
-  iter.error = false;
-  var firstByte  = 0;
-  var secondByte = 0;
-  var thirdByte  = 0;
-  //int fourthByte = 0;
-  buildChar: {
-    firstByte = iter.charValue = iter.nextByte(det);
-    if (firstByte < 0) {
-      // Ran off the end of the input data
-      iter.done = true;
-      break buildChar;
-    }
-    if (firstByte <= 0x8d) {
-      // single byte char
-      break buildChar;
-    }
-    secondByte = iter.nextByte(det);
-    iter.charValue = (iter.charValue << 8) | secondByte;
-    if (firstByte >= 0xA1 && firstByte <= 0xfe) {
-      // Two byte Char
-      if (secondByte < 0xa1) {
-        iter.error = true;
-      }
-      break buildChar;
-    }
-    if (firstByte == 0x8e) {
-      // Code Set 2.
-      //   In EUC-JP, total char size is 2 bytes, only one byte of actual char value.
-      //   In EUC-TW, total char size is 4 bytes, three bytes contribute to char value.
-      // We don't know which we've got.
-      // Treat it like EUC-JP.  If the data really was EUC-TW, the following two
-      //   bytes will look like a well formed 2 byte char.
-      if (secondByte < 0xa1) {
-        iter.error = true;
-      }
-      break buildChar;
-    }
-    if (firstByte == 0x8f) {
-      // Code set 3.
-      // Three byte total char size, two bytes of actual char value.
-      thirdByte = iter.nextByte(det);
-      iter.charValue = (iter.charValue << 8) | thirdByte;
-      if (thirdByte < 0xa1) {
-        iter.error = true;
-      }
-    }
-  }
-  return iter.done == false;
-};
-
-
-
-/**
- * The charset recognize for EUC-JP.  A singleton instance of this class
- *    is created and kept by the public CharsetDetector class
- */
-module.exports.euc_jp = function() {
-  this.name = function() {
-    return 'EUC-JP';
-  };
-  this.language = function() {
-    return 'ja';
-  };
-
-  // TODO:  This set of data comes from the character frequency-
-  //        of-occurence analysis tool.  The data needs to be moved
-  //        into a resource and loaded from there.
-  this.commonChars = [
-    0xa1a1, 0xa1a2, 0xa1a3, 0xa1a6, 0xa1bc, 0xa1ca, 0xa1cb, 0xa1d6, 0xa1d7, 0xa4a2,
-    0xa4a4, 0xa4a6, 0xa4a8, 0xa4aa, 0xa4ab, 0xa4ac, 0xa4ad, 0xa4af, 0xa4b1, 0xa4b3,
-    0xa4b5, 0xa4b7, 0xa4b9, 0xa4bb, 0xa4bd, 0xa4bf, 0xa4c0, 0xa4c1, 0xa4c3, 0xa4c4,
-    0xa4c6, 0xa4c7, 0xa4c8, 0xa4c9, 0xa4ca, 0xa4cb, 0xa4ce, 0xa4cf, 0xa4d0, 0xa4de,
-    0xa4df, 0xa4e1, 0xa4e2, 0xa4e4, 0xa4e8, 0xa4e9, 0xa4ea, 0xa4eb, 0xa4ec, 0xa4ef,
-    0xa4f2, 0xa4f3, 0xa5a2, 0xa5a3, 0xa5a4, 0xa5a6, 0xa5a7, 0xa5aa, 0xa5ad, 0xa5af,
-    0xa5b0, 0xa5b3, 0xa5b5, 0xa5b7, 0xa5b8, 0xa5b9, 0xa5bf, 0xa5c3, 0xa5c6, 0xa5c7,
-    0xa5c8, 0xa5c9, 0xa5cb, 0xa5d0, 0xa5d5, 0xa5d6, 0xa5d7, 0xa5de, 0xa5e0, 0xa5e1,
-    0xa5e5, 0xa5e9, 0xa5ea, 0xa5eb, 0xa5ec, 0xa5ed, 0xa5f3, 0xb8a9, 0xb9d4, 0xbaee,
-    0xbbc8, 0xbef0, 0xbfb7, 0xc4ea, 0xc6fc, 0xc7bd, 0xcab8, 0xcaf3, 0xcbdc, 0xcdd1
-  ];
-
-  this.nextChar = eucNextChar;
-};
-util.inherits(module.exports.euc_jp, mbcs);
-
-
-
-/**
- * The charset recognize for EUC-KR.  A singleton instance of this class
- *    is created and kept by the public CharsetDetector class
- */
-module.exports.euc_kr = function() {
-  this.name = function() {
-    return 'EUC-KR';
-  };
-  this.language = function() {
-    return 'ko';
-  };
-
-  // TODO:  This set of data comes from the character frequency-
-  //        of-occurence analysis tool.  The data needs to be moved
-  //        into a resource and loaded from there.
-  this.commonChars = [
-    0xb0a1, 0xb0b3, 0xb0c5, 0xb0cd, 0xb0d4, 0xb0e6, 0xb0ed, 0xb0f8, 0xb0fa, 0xb0fc,
-    0xb1b8, 0xb1b9, 0xb1c7, 0xb1d7, 0xb1e2, 0xb3aa, 0xb3bb, 0xb4c2, 0xb4cf, 0xb4d9,
-    0xb4eb, 0xb5a5, 0xb5b5, 0xb5bf, 0xb5c7, 0xb5e9, 0xb6f3, 0xb7af, 0xb7c2, 0xb7ce,
-    0xb8a6, 0xb8ae, 0xb8b6, 0xb8b8, 0xb8bb, 0xb8e9, 0xb9ab, 0xb9ae, 0xb9cc, 0xb9ce,
-    0xb9fd, 0xbab8, 0xbace, 0xbad0, 0xbaf1, 0xbbe7, 0xbbf3, 0xbbfd, 0xbcad, 0xbcba,
-    0xbcd2, 0xbcf6, 0xbdba, 0xbdc0, 0xbdc3, 0xbdc5, 0xbec6, 0xbec8, 0xbedf, 0xbeee,
-    0xbef8, 0xbefa, 0xbfa1, 0xbfa9, 0xbfc0, 0xbfe4, 0xbfeb, 0xbfec, 0xbff8, 0xc0a7,
-    0xc0af, 0xc0b8, 0xc0ba, 0xc0bb, 0xc0bd, 0xc0c7, 0xc0cc, 0xc0ce, 0xc0cf, 0xc0d6,
-    0xc0da, 0xc0e5, 0xc0fb, 0xc0fc, 0xc1a4, 0xc1a6, 0xc1b6, 0xc1d6, 0xc1df, 0xc1f6,
-    0xc1f8, 0xc4a1, 0xc5cd, 0xc6ae, 0xc7cf, 0xc7d1, 0xc7d2, 0xc7d8, 0xc7e5, 0xc8ad
-  ];
-
-  this.nextChar = eucNextChar;
-};
-util.inherits(module.exports.euc_kr, mbcs);
-
-
-
-/**
- *   GB-18030 recognizer. Uses simplified Chinese statistics.
- */
-module.exports.gb_18030 = function() {
-  this.name = function() {
-    return 'GB18030';
-  };
-  this.language = function() {
-    return 'zh';
-  };
-
-  /*
-   *  Get the next character value for EUC based encodings.
-   *  Character 'value' is simply the raw bytes that make up the character
-   *     packed into an int.
-   */
-  this.nextChar = function(iter, det) {
-    iter.index = iter.nextIndex;
-    iter.error = false;
-    var firstByte  = 0;
-    var secondByte = 0;
-    var thirdByte  = 0;
-    var fourthByte = 0;
-    buildChar: {
-      firstByte = iter.charValue = iter.nextByte(det);
-      if (firstByte < 0) {
-        // Ran off the end of the input data
-        iter.done = true;
-        break buildChar;
-      }
-      if (firstByte <= 0x80) {
-        // single byte char
-        break buildChar;
-      }
-      secondByte = iter.nextByte(det);
-      iter.charValue = (iter.charValue << 8) | secondByte;
-      if (firstByte >= 0x81 && firstByte <= 0xFE) {
-        // Two byte Char
-        if ((secondByte >= 0x40 && secondByte <= 0x7E) || (secondByte >=80 && secondByte <= 0xFE)) {
-          break buildChar;
-        }
-        // Four byte char
-        if (secondByte >= 0x30 && secondByte <= 0x39) {
-          thirdByte = iter.nextByte(det);
-          if (thirdByte >= 0x81 && thirdByte <= 0xFE) {
-            fourthByte = iter.nextByte(det);
-            if (fourthByte >= 0x30 && fourthByte <= 0x39) {
-              iter.charValue = (iter.charValue << 16) | (thirdByte << 8) | fourthByte;
-              break buildChar;
-            }
-          }
-        }
-        iter.error = true;
-        break buildChar;
-      }
-    }
-    return iter.done == false;
-  };
-
-  // TODO:  This set of data comes from the character frequency-
-  //        of-occurence analysis tool.  The data needs to be moved
-  //        into a resource and loaded from there.
-  this.commonChars = [
-    0xa1a1, 0xa1a2, 0xa1a3, 0xa1a4, 0xa1b0, 0xa1b1, 0xa1f1, 0xa1f3, 0xa3a1, 0xa3ac,
-    0xa3ba, 0xb1a8, 0xb1b8, 0xb1be, 0xb2bb, 0xb3c9, 0xb3f6, 0xb4f3, 0xb5bd, 0xb5c4,
-    0xb5e3, 0xb6af, 0xb6d4, 0xb6e0, 0xb7a2, 0xb7a8, 0xb7bd, 0xb7d6, 0xb7dd, 0xb8b4,
-    0xb8df, 0xb8f6, 0xb9ab, 0xb9c9, 0xb9d8, 0xb9fa, 0xb9fd, 0xbacd, 0xbba7, 0xbbd6,
-    0xbbe1, 0xbbfa, 0xbcbc, 0xbcdb, 0xbcfe, 0xbdcc, 0xbecd, 0xbedd, 0xbfb4, 0xbfc6,
-    0xbfc9, 0xc0b4, 0xc0ed, 0xc1cb, 0xc2db, 0xc3c7, 0xc4dc, 0xc4ea, 0xc5cc, 0xc6f7,
-    0xc7f8, 0xc8ab, 0xc8cb, 0xc8d5, 0xc8e7, 0xc9cf, 0xc9fa, 0xcab1, 0xcab5, 0xcac7,
-    0xcad0, 0xcad6, 0xcaf5, 0xcafd, 0xccec, 0xcdf8, 0xceaa, 0xcec4, 0xced2, 0xcee5,
-    0xcfb5, 0xcfc2, 0xcfd6, 0xd0c2, 0xd0c5, 0xd0d0, 0xd0d4, 0xd1a7, 0xd2aa, 0xd2b2,
-    0xd2b5, 0xd2bb, 0xd2d4, 0xd3c3, 0xd3d0, 0xd3fd, 0xd4c2, 0xd4da, 0xd5e2, 0xd6d0
-  ];
-};
-util.inherits(module.exports.gb_18030, mbcs);
-
-
-/***/ }),
-/* 701 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var util = __webpack_require__(3),
-  Match = __webpack_require__ (142);
-
-/**
- * This class recognizes single-byte encodings. Because the encoding scheme is so
- * simple, language statistics are used to do the matching.
- */
-
-function NGramParser(theNgramList, theByteMap) {
-  var N_GRAM_MASK = 0xFFFFFF;
-
-  this.byteIndex = 0;
-  this.ngram = 0;
-
-  this.ngramList = theNgramList;
-  this.byteMap = theByteMap;
-
-  this.ngramCount = 0;
-  this.hitCount = 0;
-
-  this.spaceChar;
-
-  /*
-   * Binary search for value in table, which must have exactly 64 entries.
-   */
-  this.search = function(table, value) {
-    var index = 0;
-
-    if (table[index + 32] <= value) index += 32;
-    if (table[index + 16] <= value) index += 16;
-    if (table[index + 8]  <= value) index += 8;
-    if (table[index + 4]  <= value) index += 4;
-    if (table[index + 2]  <= value) index += 2;
-    if (table[index + 1]  <= value) index += 1;
-    if (table[index]      > value)  index -= 1;
-
-    if (index < 0 || table[index] != value)
-      return -1;
-
-    return index;
-  };
-
-  this.lookup = function(thisNgram) {
-    this.ngramCount += 1;
-    if (this.search(this.ngramList, thisNgram) >= 0) {
-      this.hitCount += 1;
-    }
-  };
-
-  this.addByte = function(b) {
-    this.ngram = ((this.ngram << 8) + (b & 0xFF)) & N_GRAM_MASK;
-    this.lookup(this.ngram);
-  }
-
-  this.nextByte = function(det) {
-    if (this.byteIndex >= det.fInputLen)
-      return -1;
-
-    return det.fInputBytes[this.byteIndex++] & 0xFF;
-  }
-
-  this.parse = function(det, spaceCh) {
-    var b, ignoreSpace = false;
-    this.spaceChar = spaceCh;
-
-    while ((b = this.nextByte(det)) >= 0) {
-      var mb = this.byteMap[b];
-
-      // TODO: 0x20 might not be a space in all character sets...
-      if (mb != 0) {
-        if (!(mb == this.spaceChar && ignoreSpace)) {
-          this.addByte(mb);
-        }
-
-        ignoreSpace = (mb == this.spaceChar);
-      }
-    }
-
-    // TODO: Is this OK? The buffer could have ended in the middle of a word...
-    this.addByte(this.spaceChar);
-
-    var rawPercent = this.hitCount / this.ngramCount;
-
-    // TODO - This is a bit of a hack to take care of a case
-    // were we were getting a confidence of 135...
-    if (rawPercent > 0.33)
-      return 98;
-
-    return Math.floor(rawPercent * 300.0);
-  };
-};
-
-function NGramsPlusLang(la, ng) {
-  this.fLang = la;
-  this.fNGrams = ng;
-};
-
-function sbcs() {};
-sbcs.prototype.spaceChar = 0x20;
-sbcs.prototype.ngrams = function() {};
-sbcs.prototype.byteMap = function() {};
-sbcs.prototype.match = function(det) {
-
-  var ngrams = this.ngrams();
-  var multiple = (Array.isArray(ngrams) && ngrams[0] instanceof NGramsPlusLang);
-
-  if (!multiple) {
-    var parser = new NGramParser(ngrams, this.byteMap());
-    var confidence = parser.parse(det, this.spaceChar);
-    return confidence <= 0 ? null : new Match(det, this, confidence);
-  }
-
-  var bestConfidenceSoFar = -1;
-  var lang = null;
-
-  for (var i = ngrams.length - 1; i >= 0; i--) {
-    var ngl = ngrams[i];
-
-    var parser = new NGramParser(ngl.fNGrams, this.byteMap());
-    var confidence = parser.parse(det, this.spaceChar);
-    if (confidence > bestConfidenceSoFar) {
-      bestConfidenceSoFar = confidence;
-      lang = ngl.fLang;
-    }
-  }
-
-  var name = this.name(det);
-  return bestConfidenceSoFar <= 0 ? null : new Match(det, this, bestConfidenceSoFar, name, lang);
-};
-
-
-module.exports.ISO_8859_1 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0xAA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
-      0x20, 0x20, 0xBA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      new NGramsPlusLang('da', [
-        0x206166, 0x206174, 0x206465, 0x20656E, 0x206572, 0x20666F, 0x206861, 0x206920,
-        0x206D65, 0x206F67, 0x2070E5, 0x207369, 0x207374, 0x207469, 0x207669, 0x616620,
-        0x616E20, 0x616E64, 0x617220, 0x617420, 0x646520, 0x64656E, 0x646572, 0x646574,
-        0x652073, 0x656420, 0x656465, 0x656E20, 0x656E64, 0x657220, 0x657265, 0x657320,
-        0x657420, 0x666F72, 0x676520, 0x67656E, 0x676572, 0x696765, 0x696C20, 0x696E67,
-        0x6B6520, 0x6B6B65, 0x6C6572, 0x6C6967, 0x6C6C65, 0x6D6564, 0x6E6465, 0x6E6520,
-        0x6E6720, 0x6E6765, 0x6F6720, 0x6F6D20, 0x6F7220, 0x70E520, 0x722064, 0x722065,
-        0x722073, 0x726520, 0x737465, 0x742073, 0x746520, 0x746572, 0x74696C, 0x766572
-      ]),
-      new NGramsPlusLang('de', [
-        0x20616E, 0x206175, 0x206265, 0x206461, 0x206465, 0x206469, 0x206569, 0x206765,
-        0x206861, 0x20696E, 0x206D69, 0x207363, 0x207365, 0x20756E, 0x207665, 0x20766F,
-        0x207765, 0x207A75, 0x626572, 0x636820, 0x636865, 0x636874, 0x646173, 0x64656E,
-        0x646572, 0x646965, 0x652064, 0x652073, 0x65696E, 0x656974, 0x656E20, 0x657220,
-        0x657320, 0x67656E, 0x68656E, 0x687420, 0x696368, 0x696520, 0x696E20, 0x696E65,
-        0x697420, 0x6C6963, 0x6C6C65, 0x6E2061, 0x6E2064, 0x6E2073, 0x6E6420, 0x6E6465,
-        0x6E6520, 0x6E6720, 0x6E6765, 0x6E7465, 0x722064, 0x726465, 0x726569, 0x736368,
-        0x737465, 0x742064, 0x746520, 0x74656E, 0x746572, 0x756E64, 0x756E67, 0x766572
-      ]),
-      new NGramsPlusLang('en', [
-        0x206120, 0x20616E, 0x206265, 0x20636F, 0x20666F, 0x206861, 0x206865, 0x20696E,
-        0x206D61, 0x206F66, 0x207072, 0x207265, 0x207361, 0x207374, 0x207468, 0x20746F,
-        0x207768, 0x616964, 0x616C20, 0x616E20, 0x616E64, 0x617320, 0x617420, 0x617465,
-        0x617469, 0x642061, 0x642074, 0x652061, 0x652073, 0x652074, 0x656420, 0x656E74,
-        0x657220, 0x657320, 0x666F72, 0x686174, 0x686520, 0x686572, 0x696420, 0x696E20,
-        0x696E67, 0x696F6E, 0x697320, 0x6E2061, 0x6E2074, 0x6E6420, 0x6E6720, 0x6E7420,
-        0x6F6620, 0x6F6E20, 0x6F7220, 0x726520, 0x727320, 0x732061, 0x732074, 0x736169,
-        0x737420, 0x742074, 0x746572, 0x746861, 0x746865, 0x74696F, 0x746F20, 0x747320
-      ]),
-      new NGramsPlusLang('es', [
-        0x206120, 0x206361, 0x20636F, 0x206465, 0x20656C, 0x20656E, 0x206573, 0x20696E,
-        0x206C61, 0x206C6F, 0x207061, 0x20706F, 0x207072, 0x207175, 0x207265, 0x207365,
-        0x20756E, 0x207920, 0x612063, 0x612064, 0x612065, 0x61206C, 0x612070, 0x616369,
-        0x61646F, 0x616C20, 0x617220, 0x617320, 0x6369F3, 0x636F6E, 0x646520, 0x64656C,
-        0x646F20, 0x652064, 0x652065, 0x65206C, 0x656C20, 0x656E20, 0x656E74, 0x657320,
-        0x657374, 0x69656E, 0x69F36E, 0x6C6120, 0x6C6F73, 0x6E2065, 0x6E7465, 0x6F2064,
-        0x6F2065, 0x6F6E20, 0x6F7220, 0x6F7320, 0x706172, 0x717565, 0x726120, 0x726573,
-        0x732064, 0x732065, 0x732070, 0x736520, 0x746520, 0x746F20, 0x756520, 0xF36E20
-      ]),
-      new NGramsPlusLang('fr', [
-        0x206175, 0x20636F, 0x206461, 0x206465, 0x206475, 0x20656E, 0x206574, 0x206C61,
-        0x206C65, 0x207061, 0x20706F, 0x207072, 0x207175, 0x207365, 0x20736F, 0x20756E,
-        0x20E020, 0x616E74, 0x617469, 0x636520, 0x636F6E, 0x646520, 0x646573, 0x647520,
-        0x652061, 0x652063, 0x652064, 0x652065, 0x65206C, 0x652070, 0x652073, 0x656E20,
-        0x656E74, 0x657220, 0x657320, 0x657420, 0x657572, 0x696F6E, 0x697320, 0x697420,
-        0x6C6120, 0x6C6520, 0x6C6573, 0x6D656E, 0x6E2064, 0x6E6520, 0x6E7320, 0x6E7420,
-        0x6F6E20, 0x6F6E74, 0x6F7572, 0x717565, 0x72206C, 0x726520, 0x732061, 0x732064,
-        0x732065, 0x73206C, 0x732070, 0x742064, 0x746520, 0x74696F, 0x756520, 0x757220
-      ]),
-      new NGramsPlusLang('it', [
-        0x20616C, 0x206368, 0x20636F, 0x206465, 0x206469, 0x206520, 0x20696C, 0x20696E,
-        0x206C61, 0x207065, 0x207072, 0x20756E, 0x612063, 0x612064, 0x612070, 0x612073,
-        0x61746F, 0x636865, 0x636F6E, 0x64656C, 0x646920, 0x652061, 0x652063, 0x652064,
-        0x652069, 0x65206C, 0x652070, 0x652073, 0x656C20, 0x656C6C, 0x656E74, 0x657220,
-        0x686520, 0x692061, 0x692063, 0x692064, 0x692073, 0x696120, 0x696C20, 0x696E20,
-        0x696F6E, 0x6C6120, 0x6C6520, 0x6C6920, 0x6C6C61, 0x6E6520, 0x6E6920, 0x6E6F20,
-        0x6E7465, 0x6F2061, 0x6F2064, 0x6F2069, 0x6F2073, 0x6F6E20, 0x6F6E65, 0x706572,
-        0x726120, 0x726520, 0x736920, 0x746120, 0x746520, 0x746920, 0x746F20, 0x7A696F
-      ]),
-      new NGramsPlusLang('nl', [
-        0x20616C, 0x206265, 0x206461, 0x206465, 0x206469, 0x206565, 0x20656E, 0x206765,
-        0x206865, 0x20696E, 0x206D61, 0x206D65, 0x206F70, 0x207465, 0x207661, 0x207665,
-        0x20766F, 0x207765, 0x207A69, 0x61616E, 0x616172, 0x616E20, 0x616E64, 0x617220,
-        0x617420, 0x636874, 0x646520, 0x64656E, 0x646572, 0x652062, 0x652076, 0x65656E,
-        0x656572, 0x656E20, 0x657220, 0x657273, 0x657420, 0x67656E, 0x686574, 0x696520,
-        0x696E20, 0x696E67, 0x697320, 0x6E2062, 0x6E2064, 0x6E2065, 0x6E2068, 0x6E206F,
-        0x6E2076, 0x6E6465, 0x6E6720, 0x6F6E64, 0x6F6F72, 0x6F7020, 0x6F7220, 0x736368,
-        0x737465, 0x742064, 0x746520, 0x74656E, 0x746572, 0x76616E, 0x766572, 0x766F6F
-      ]),
-      new NGramsPlusLang('no', [
-        0x206174, 0x206176, 0x206465, 0x20656E, 0x206572, 0x20666F, 0x206861, 0x206920,
-        0x206D65, 0x206F67, 0x2070E5, 0x207365, 0x20736B, 0x20736F, 0x207374, 0x207469,
-        0x207669, 0x20E520, 0x616E64, 0x617220, 0x617420, 0x646520, 0x64656E, 0x646574,
-        0x652073, 0x656420, 0x656E20, 0x656E65, 0x657220, 0x657265, 0x657420, 0x657474,
-        0x666F72, 0x67656E, 0x696B6B, 0x696C20, 0x696E67, 0x6B6520, 0x6B6B65, 0x6C6520,
-        0x6C6C65, 0x6D6564, 0x6D656E, 0x6E2073, 0x6E6520, 0x6E6720, 0x6E6765, 0x6E6E65,
-        0x6F6720, 0x6F6D20, 0x6F7220, 0x70E520, 0x722073, 0x726520, 0x736F6D, 0x737465,
-        0x742073, 0x746520, 0x74656E, 0x746572, 0x74696C, 0x747420, 0x747465, 0x766572
-      ]),
-      new NGramsPlusLang('pt', [
-        0x206120, 0x20636F, 0x206461, 0x206465, 0x20646F, 0x206520, 0x206573, 0x206D61,
-        0x206E6F, 0x206F20, 0x207061, 0x20706F, 0x207072, 0x207175, 0x207265, 0x207365,
-        0x20756D, 0x612061, 0x612063, 0x612064, 0x612070, 0x616465, 0x61646F, 0x616C20,
-        0x617220, 0x617261, 0x617320, 0x636F6D, 0x636F6E, 0x646120, 0x646520, 0x646F20,
-        0x646F73, 0x652061, 0x652064, 0x656D20, 0x656E74, 0x657320, 0x657374, 0x696120,
-        0x696361, 0x6D656E, 0x6E7465, 0x6E746F, 0x6F2061, 0x6F2063, 0x6F2064, 0x6F2065,
-        0x6F2070, 0x6F7320, 0x706172, 0x717565, 0x726120, 0x726573, 0x732061, 0x732064,
-        0x732065, 0x732070, 0x737461, 0x746520, 0x746F20, 0x756520, 0xE36F20, 0xE7E36F
-      ]),
-      new NGramsPlusLang('sv', [
-        0x206174, 0x206176, 0x206465, 0x20656E, 0x2066F6, 0x206861, 0x206920, 0x20696E,
-        0x206B6F, 0x206D65, 0x206F63, 0x2070E5, 0x20736B, 0x20736F, 0x207374, 0x207469,
-        0x207661, 0x207669, 0x20E472, 0x616465, 0x616E20, 0x616E64, 0x617220, 0x617474,
-        0x636820, 0x646520, 0x64656E, 0x646572, 0x646574, 0x656420, 0x656E20, 0x657220,
-        0x657420, 0x66F672, 0x67656E, 0x696C6C, 0x696E67, 0x6B6120, 0x6C6C20, 0x6D6564,
-        0x6E2073, 0x6E6120, 0x6E6465, 0x6E6720, 0x6E6765, 0x6E696E, 0x6F6368, 0x6F6D20,
-        0x6F6E20, 0x70E520, 0x722061, 0x722073, 0x726120, 0x736B61, 0x736F6D, 0x742073,
-        0x746120, 0x746520, 0x746572, 0x74696C, 0x747420, 0x766172, 0xE47220, 0xF67220,
-      ])
-    ];
-  };
-
-  this.name = function(det) {
-    return (det && det.fC1Bytes) ? 'windows-1252' : 'ISO-8859-1';
-  };
-};
-util.inherits(module.exports.ISO_8859_1, sbcs);
-
-
-module.exports.ISO_8859_2 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0xB1, 0x20, 0xB3, 0x20, 0xB5, 0xB6, 0x20,
-      0x20, 0xB9, 0xBA, 0xBB, 0xBC, 0x20, 0xBE, 0xBF,
-      0x20, 0xB1, 0x20, 0xB3, 0x20, 0xB5, 0xB6, 0xB7,
-      0x20, 0xB9, 0xBA, 0xBB, 0xBC, 0x20, 0xBE, 0xBF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x20
-    ];
-  }
-
-  this.ngrams = function() {
-    return [
-      new NGramsPlusLang('cs', [
-        0x206120, 0x206279, 0x20646F, 0x206A65, 0x206E61, 0x206E65, 0x206F20, 0x206F64,
-        0x20706F, 0x207072, 0x2070F8, 0x20726F, 0x207365, 0x20736F, 0x207374, 0x20746F,
-        0x207620, 0x207679, 0x207A61, 0x612070, 0x636520, 0x636820, 0x652070, 0x652073,
-        0x652076, 0x656D20, 0x656EED, 0x686F20, 0x686F64, 0x697374, 0x6A6520, 0x6B7465,
-        0x6C6520, 0x6C6920, 0x6E6120, 0x6EE920, 0x6EEC20, 0x6EED20, 0x6F2070, 0x6F646E,
-        0x6F6A69, 0x6F7374, 0x6F7520, 0x6F7661, 0x706F64, 0x706F6A, 0x70726F, 0x70F865,
-        0x736520, 0x736F75, 0x737461, 0x737469, 0x73746E, 0x746572, 0x746EED, 0x746F20,
-        0x752070, 0xBE6520, 0xE16EED, 0xE9686F, 0xED2070, 0xED2073, 0xED6D20, 0xF86564,
-      ]),
-      new NGramsPlusLang('hu', [
-        0x206120, 0x20617A, 0x206265, 0x206567, 0x20656C, 0x206665, 0x206861, 0x20686F,
-        0x206973, 0x206B65, 0x206B69, 0x206BF6, 0x206C65, 0x206D61, 0x206D65, 0x206D69,
-        0x206E65, 0x20737A, 0x207465, 0x20E973, 0x612061, 0x61206B, 0x61206D, 0x612073,
-        0x616B20, 0x616E20, 0x617A20, 0x62616E, 0x62656E, 0x656779, 0x656B20, 0x656C20,
-        0x656C65, 0x656D20, 0x656E20, 0x657265, 0x657420, 0x657465, 0x657474, 0x677920,
-        0x686F67, 0x696E74, 0x697320, 0x6B2061, 0x6BF67A, 0x6D6567, 0x6D696E, 0x6E2061,
-        0x6E616B, 0x6E656B, 0x6E656D, 0x6E7420, 0x6F6779, 0x732061, 0x737A65, 0x737A74,
-        0x737AE1, 0x73E967, 0x742061, 0x747420, 0x74E173, 0x7A6572, 0xE16E20, 0xE97320,
-      ]),
-      new NGramsPlusLang('pl', [
-        0x20637A, 0x20646F, 0x206920, 0x206A65, 0x206B6F, 0x206D61, 0x206D69, 0x206E61,
-        0x206E69, 0x206F64, 0x20706F, 0x207072, 0x207369, 0x207720, 0x207769, 0x207779,
-        0x207A20, 0x207A61, 0x612070, 0x612077, 0x616E69, 0x636820, 0x637A65, 0x637A79,
-        0x646F20, 0x647A69, 0x652070, 0x652073, 0x652077, 0x65207A, 0x65676F, 0x656A20,
-        0x656D20, 0x656E69, 0x676F20, 0x696120, 0x696520, 0x69656A, 0x6B6120, 0x6B6920,
-        0x6B6965, 0x6D6965, 0x6E6120, 0x6E6961, 0x6E6965, 0x6F2070, 0x6F7761, 0x6F7769,
-        0x706F6C, 0x707261, 0x70726F, 0x70727A, 0x727A65, 0x727A79, 0x7369EA, 0x736B69,
-        0x737461, 0x776965, 0x796368, 0x796D20, 0x7A6520, 0x7A6965, 0x7A7920, 0xF37720,
-      ]),
-      new NGramsPlusLang('ro', [
-        0x206120, 0x206163, 0x206361, 0x206365, 0x20636F, 0x206375, 0x206465, 0x206469,
-        0x206C61, 0x206D61, 0x207065, 0x207072, 0x207365, 0x2073E3, 0x20756E, 0x20BA69,
-        0x20EE6E, 0x612063, 0x612064, 0x617265, 0x617420, 0x617465, 0x617520, 0x636172,
-        0x636F6E, 0x637520, 0x63E320, 0x646520, 0x652061, 0x652063, 0x652064, 0x652070,
-        0x652073, 0x656120, 0x656920, 0x656C65, 0x656E74, 0x657374, 0x692061, 0x692063,
-        0x692064, 0x692070, 0x696520, 0x696920, 0x696E20, 0x6C6120, 0x6C6520, 0x6C6F72,
-        0x6C7569, 0x6E6520, 0x6E7472, 0x6F7220, 0x70656E, 0x726520, 0x726561, 0x727520,
-        0x73E320, 0x746520, 0x747275, 0x74E320, 0x756920, 0x756C20, 0xBA6920, 0xEE6E20,
-      ])
-    ];
-  };
-
-  this.name = function(det) {
-    return (det && det.fC1Bytes) ? 'windows-1250' : 'ISO-8859-2';
-  };
-};
-util.inherits(module.exports.ISO_8859_2, sbcs);
-
-
-module.exports.ISO_8859_5 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0x20, 0xFE, 0xFF,
-      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
-      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
-      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0x20, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0x20, 0xFE, 0xFF
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x20D220, 0x20D2DE, 0x20D4DE, 0x20D7D0, 0x20D820, 0x20DAD0, 0x20DADE, 0x20DDD0,
-      0x20DDD5, 0x20DED1, 0x20DFDE, 0x20DFE0, 0x20E0D0, 0x20E1DE, 0x20E1E2, 0x20E2DE,
-      0x20E7E2, 0x20EDE2, 0xD0DDD8, 0xD0E2EC, 0xD3DE20, 0xD5DBEC, 0xD5DDD8, 0xD5E1E2,
-      0xD5E220, 0xD820DF, 0xD8D520, 0xD8D820, 0xD8EF20, 0xDBD5DD, 0xDBD820, 0xDBECDD,
-      0xDDD020, 0xDDD520, 0xDDD8D5, 0xDDD8EF, 0xDDDE20, 0xDDDED2, 0xDE20D2, 0xDE20DF,
-      0xDE20E1, 0xDED220, 0xDED2D0, 0xDED3DE, 0xDED920, 0xDEDBEC, 0xDEDC20, 0xDEE1E2,
-      0xDFDEDB, 0xDFE0D5, 0xDFE0D8, 0xDFE0DE, 0xE0D0D2, 0xE0D5D4, 0xE1E2D0, 0xE1E2D2,
-      0xE1E2D8, 0xE1EF20, 0xE2D5DB, 0xE2DE20, 0xE2DEE0, 0xE2EC20, 0xE7E2DE, 0xEBE520
-    ];
-  };
-
-  this.name = function(det) {
-    return 'ISO-8859-5';
-  };
-
-  this.language = function() {
-    return 'ru';
-  };
-};
-util.inherits(module.exports.ISO_8859_5, sbcs);
-
-
-module.exports.ISO_8859_6 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
-      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
-      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
-      0xD8, 0xD9, 0xDA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x20C7E4, 0x20C7E6, 0x20C8C7, 0x20D9E4, 0x20E1EA, 0x20E4E4, 0x20E5E6, 0x20E8C7,
-      0xC720C7, 0xC7C120, 0xC7CA20, 0xC7D120, 0xC7E420, 0xC7E4C3, 0xC7E4C7, 0xC7E4C8,
-      0xC7E4CA, 0xC7E4CC, 0xC7E4CD, 0xC7E4CF, 0xC7E4D3, 0xC7E4D9, 0xC7E4E2, 0xC7E4E5,
-      0xC7E4E8, 0xC7E4EA, 0xC7E520, 0xC7E620, 0xC7E6CA, 0xC820C7, 0xC920C7, 0xC920E1,
-      0xC920E4, 0xC920E5, 0xC920E8, 0xCA20C7, 0xCF20C7, 0xCFC920, 0xD120C7, 0xD1C920,
-      0xD320C7, 0xD920C7, 0xD9E4E9, 0xE1EA20, 0xE420C7, 0xE4C920, 0xE4E920, 0xE4EA20,
-      0xE520C7, 0xE5C720, 0xE5C920, 0xE5E620, 0xE620C7, 0xE720C7, 0xE7C720, 0xE8C7E4,
-      0xE8E620, 0xE920C7, 0xEA20C7, 0xEA20E5, 0xEA20E8, 0xEAC920, 0xEAD120, 0xEAE620
-    ];
-  };
-
-  this.name = function(det) {
-    return 'ISO-8859-6';
-  };
-
-  this.language = function() {
-    return 'ar';
-  };
-};
-util.inherits(module.exports.ISO_8859_6, sbcs);
-
-
-module.exports.ISO_8859_7 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0xA1, 0xA2, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xDC, 0x20,
-      0xDD, 0xDE, 0xDF, 0x20, 0xFC, 0x20, 0xFD, 0xFE,
-      0xC0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0x20, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xDC, 0xDD, 0xDE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0x20
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x20E1ED, 0x20E1F0, 0x20E3E9, 0x20E4E9, 0x20E5F0, 0x20E720, 0x20EAE1, 0x20ECE5,
-      0x20EDE1, 0x20EF20, 0x20F0E1, 0x20F0EF, 0x20F0F1, 0x20F3F4, 0x20F3F5, 0x20F4E7,
-      0x20F4EF, 0xDFE120, 0xE120E1, 0xE120F4, 0xE1E920, 0xE1ED20, 0xE1F0FC, 0xE1F220,
-      0xE3E9E1, 0xE5E920, 0xE5F220, 0xE720F4, 0xE7ED20, 0xE7F220, 0xE920F4, 0xE9E120,
-      0xE9EADE, 0xE9F220, 0xEAE1E9, 0xEAE1F4, 0xECE520, 0xED20E1, 0xED20E5, 0xED20F0,
-      0xEDE120, 0xEFF220, 0xEFF520, 0xF0EFF5, 0xF0F1EF, 0xF0FC20, 0xF220E1, 0xF220E5,
-      0xF220EA, 0xF220F0, 0xF220F4, 0xF3E520, 0xF3E720, 0xF3F4EF, 0xF4E120, 0xF4E1E9,
-      0xF4E7ED, 0xF4E7F2, 0xF4E9EA, 0xF4EF20, 0xF4EFF5, 0xF4F9ED, 0xF9ED20, 0xFEED20
-    ];
-  };
-
-  this.name = function(det) {
-    return (det && det.fC1Bytes) ? 'windows-1253' : 'ISO-8859-7';
-  };
-
-  this.language = function() {
-    return 'el';
-  };
-};
-util.inherits(module.exports.ISO_8859_7, sbcs);
-
-module.exports.ISO_8859_8 = function() {
-
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0x20, 0x20, 0x20, 0x20, 0x20
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      new NGramsPlusLang('he', [
-        0x20E0E5, 0x20E0E7, 0x20E0E9, 0x20E0FA, 0x20E1E9, 0x20E1EE, 0x20E4E0, 0x20E4E5,
-        0x20E4E9, 0x20E4EE, 0x20E4F2, 0x20E4F9, 0x20E4FA, 0x20ECE0, 0x20ECE4, 0x20EEE0,
-        0x20F2EC, 0x20F9EC, 0xE0FA20, 0xE420E0, 0xE420E1, 0xE420E4, 0xE420EC, 0xE420EE,
-        0xE420F9, 0xE4E5E0, 0xE5E020, 0xE5ED20, 0xE5EF20, 0xE5F820, 0xE5FA20, 0xE920E4,
-        0xE9E420, 0xE9E5FA, 0xE9E9ED, 0xE9ED20, 0xE9EF20, 0xE9F820, 0xE9FA20, 0xEC20E0,
-        0xEC20E4, 0xECE020, 0xECE420, 0xED20E0, 0xED20E1, 0xED20E4, 0xED20EC, 0xED20EE,
-        0xED20F9, 0xEEE420, 0xEF20E4, 0xF0E420, 0xF0E920, 0xF0E9ED, 0xF2EC20, 0xF820E4,
-        0xF8E9ED, 0xF9EC20, 0xFA20E0, 0xFA20E1, 0xFA20E4, 0xFA20EC, 0xFA20EE, 0xFA20F9,
-      ]),
-      new NGramsPlusLang('he', [
-        0x20E0E5, 0x20E0EC, 0x20E4E9, 0x20E4EC, 0x20E4EE, 0x20E4F0, 0x20E9F0, 0x20ECF2,
-        0x20ECF9, 0x20EDE5, 0x20EDE9, 0x20EFE5, 0x20EFE9, 0x20F8E5, 0x20F8E9, 0x20FAE0,
-        0x20FAE5, 0x20FAE9, 0xE020E4, 0xE020EC, 0xE020ED, 0xE020FA, 0xE0E420, 0xE0E5E4,
-        0xE0EC20, 0xE0EE20, 0xE120E4, 0xE120ED, 0xE120FA, 0xE420E4, 0xE420E9, 0xE420EC,
-        0xE420ED, 0xE420EF, 0xE420F8, 0xE420FA, 0xE4EC20, 0xE5E020, 0xE5E420, 0xE7E020,
-        0xE9E020, 0xE9E120, 0xE9E420, 0xEC20E4, 0xEC20ED, 0xEC20FA, 0xECF220, 0xECF920,
-        0xEDE9E9, 0xEDE9F0, 0xEDE9F8, 0xEE20E4, 0xEE20ED, 0xEE20FA, 0xEEE120, 0xEEE420,
-        0xF2E420, 0xF920E4, 0xF920ED, 0xF920FA, 0xF9E420, 0xFAE020, 0xFAE420, 0xFAE5E9,
-      ])
-    ];
-  };
-
-  this.name = function(det) {
-    return (det && det.fC1Bytes) ? 'windows-1255' : 'ISO-8859-8';
-  };
-
-  this.language = function() {
-    return 'he';
-  };
-
-};
-util.inherits(module.exports.ISO_8859_8, sbcs);
-
-
-module.exports.ISO_8859_9 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0xAA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
-      0x20, 0x20, 0xBA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0x69, 0xFE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x20,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x206261, 0x206269, 0x206275, 0x206461, 0x206465, 0x206765, 0x206861, 0x20696C,
-      0x206B61, 0x206B6F, 0x206D61, 0x206F6C, 0x207361, 0x207461, 0x207665, 0x207961,
-      0x612062, 0x616B20, 0x616C61, 0x616D61, 0x616E20, 0x616EFD, 0x617220, 0x617261,
-      0x6172FD, 0x6173FD, 0x617961, 0x626972, 0x646120, 0x646520, 0x646920, 0x652062,
-      0x65206B, 0x656469, 0x656E20, 0x657220, 0x657269, 0x657369, 0x696C65, 0x696E20,
-      0x696E69, 0x697220, 0x6C616E, 0x6C6172, 0x6C6520, 0x6C6572, 0x6E2061, 0x6E2062,
-      0x6E206B, 0x6E6461, 0x6E6465, 0x6E6520, 0x6E6920, 0x6E696E, 0x6EFD20, 0x72696E,
-      0x72FD6E, 0x766520, 0x796120, 0x796F72, 0xFD6E20, 0xFD6E64, 0xFD6EFD, 0xFDF0FD
-    ];
-  };
-
-  this.name = function(det) {
-    return (det && det.fC1Bytes) ? 'windows-1254' : 'ISO-8859-9';
-  };
-
-  this.language = function() {
-    return 'tr';
-  };
-};
-util.inherits(module.exports.ISO_8859_9, sbcs);
-
-
-module.exports.windows_1251 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x90, 0x83, 0x20, 0x83, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x9A, 0x20, 0x9C, 0x9D, 0x9E, 0x9F,
-      0x90, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x9A, 0x20, 0x9C, 0x9D, 0x9E, 0x9F,
-      0x20, 0xA2, 0xA2, 0xBC, 0x20, 0xB4, 0x20, 0x20,
-      0xB8, 0x20, 0xBA, 0x20, 0x20, 0x20, 0x20, 0xBF,
-      0x20, 0x20, 0xB3, 0xB3, 0xB4, 0xB5, 0x20, 0x20,
-      0xB8, 0x20, 0xBA, 0x20, 0xBC, 0xBE, 0xBE, 0xBF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-      0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x20E220, 0x20E2EE, 0x20E4EE, 0x20E7E0, 0x20E820, 0x20EAE0, 0x20EAEE, 0x20EDE0,
-      0x20EDE5, 0x20EEE1, 0x20EFEE, 0x20EFF0, 0x20F0E0, 0x20F1EE, 0x20F1F2, 0x20F2EE,
-      0x20F7F2, 0x20FDF2, 0xE0EDE8, 0xE0F2FC, 0xE3EE20, 0xE5EBFC, 0xE5EDE8, 0xE5F1F2,
-      0xE5F220, 0xE820EF, 0xE8E520, 0xE8E820, 0xE8FF20, 0xEBE5ED, 0xEBE820, 0xEBFCED,
-      0xEDE020, 0xEDE520, 0xEDE8E5, 0xEDE8FF, 0xEDEE20, 0xEDEEE2, 0xEE20E2, 0xEE20EF,
-      0xEE20F1, 0xEEE220, 0xEEE2E0, 0xEEE3EE, 0xEEE920, 0xEEEBFC, 0xEEEC20, 0xEEF1F2,
-      0xEFEEEB, 0xEFF0E5, 0xEFF0E8, 0xEFF0EE, 0xF0E0E2, 0xF0E5E4, 0xF1F2E0, 0xF1F2E2,
-      0xF1F2E8, 0xF1FF20, 0xF2E5EB, 0xF2EE20, 0xF2EEF0, 0xF2FC20, 0xF7F2EE, 0xFBF520
-    ];
-  };
-
-  this.name = function(det) {
-    return 'windows-1251';
-  };
-
-  this.language = function() {
-    return 'ru';
-  };
-};
-util.inherits(module.exports.windows_1251, sbcs);
-
-
-module.exports.windows_1256 = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x81, 0x20, 0x83, 0x20, 0x20, 0x20, 0x20,
-      0x88, 0x20, 0x8A, 0x20, 0x9C, 0x8D, 0x8E, 0x8F,
-      0x90, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x98, 0x20, 0x9A, 0x20, 0x9C, 0x20, 0x20, 0x9F,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0xAA, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0xB5, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
-      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
-      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0x20,
-      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
-      0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-      0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-      0x20, 0x20, 0x20, 0x20, 0xF4, 0x20, 0x20, 0x20,
-      0x20, 0xF9, 0x20, 0xFB, 0xFC, 0x20, 0x20, 0xFF
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x20C7E1, 0x20C7E4, 0x20C8C7, 0x20DAE1, 0x20DDED, 0x20E1E1, 0x20E3E4, 0x20E6C7,
-      0xC720C7, 0xC7C120, 0xC7CA20, 0xC7D120, 0xC7E120, 0xC7E1C3, 0xC7E1C7, 0xC7E1C8,
-      0xC7E1CA, 0xC7E1CC, 0xC7E1CD, 0xC7E1CF, 0xC7E1D3, 0xC7E1DA, 0xC7E1DE, 0xC7E1E3,
-      0xC7E1E6, 0xC7E1ED, 0xC7E320, 0xC7E420, 0xC7E4CA, 0xC820C7, 0xC920C7, 0xC920DD,
-      0xC920E1, 0xC920E3, 0xC920E6, 0xCA20C7, 0xCF20C7, 0xCFC920, 0xD120C7, 0xD1C920,
-      0xD320C7, 0xDA20C7, 0xDAE1EC, 0xDDED20, 0xE120C7, 0xE1C920, 0xE1EC20, 0xE1ED20,
-      0xE320C7, 0xE3C720, 0xE3C920, 0xE3E420, 0xE420C7, 0xE520C7, 0xE5C720, 0xE6C7E1,
-      0xE6E420, 0xEC20C7, 0xED20C7, 0xED20E3, 0xED20E6, 0xEDC920, 0xEDD120, 0xEDE420
-    ];
-  };
-
-  this.name = function(det) {
-    return 'windows-1256';
-  };
-
-  this.language = function() {
-    return 'ar';
-  };
-};
-util.inherits(module.exports.windows_1256, sbcs);
-
-
-module.exports.KOI8_R = function() {
-  this.byteMap = function() {
-    return [
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-      0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
-      0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7A, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0xA3, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0xA3, 0x20, 0x20, 0x20, 0x20,
-      0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-      0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
-      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
-      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
-      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
-      0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
-      0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
-      0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
-      0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-      0x20C4CF, 0x20C920, 0x20CBC1, 0x20CBCF, 0x20CEC1, 0x20CEC5, 0x20CFC2, 0x20D0CF,
-      0x20D0D2, 0x20D2C1, 0x20D3CF, 0x20D3D4, 0x20D4CF, 0x20D720, 0x20D7CF, 0x20DAC1,
-      0x20DCD4, 0x20DED4, 0xC1CEC9, 0xC1D4D8, 0xC5CCD8, 0xC5CEC9, 0xC5D3D4, 0xC5D420,
-      0xC7CF20, 0xC920D0, 0xC9C520, 0xC9C920, 0xC9D120, 0xCCC5CE, 0xCCC920, 0xCCD8CE,
-      0xCEC120, 0xCEC520, 0xCEC9C5, 0xCEC9D1, 0xCECF20, 0xCECFD7, 0xCF20D0, 0xCF20D3,
-      0xCF20D7, 0xCFC7CF, 0xCFCA20, 0xCFCCD8, 0xCFCD20, 0xCFD3D4, 0xCFD720, 0xCFD7C1,
-      0xD0CFCC, 0xD0D2C5, 0xD0D2C9, 0xD0D2CF, 0xD2C1D7, 0xD2C5C4, 0xD3D120, 0xD3D4C1,
-      0xD3D4C9, 0xD3D4D7, 0xD4C5CC, 0xD4CF20, 0xD4CFD2, 0xD4D820, 0xD9C820, 0xDED4CF
-    ];
-  };
-
-  this.name = function(det) {
-    return 'KOI8-R';
-  };
-
-  this.language = function() {
-    return 'ru';
-  };
-};
-util.inherits(module.exports.KOI8_R, sbcs);
-
-
-/*
-module.exports.ISO_8859_7 = function() {
-  this.byteMap = function() {
-    return [
-
-    ];
-  };
-
-  this.ngrams = function() {
-    return [
-
-    ];
-  };
-
-  this.name = function(det) {
-    if (typeof det == 'undefined')
-      return 'ISO-8859-7';
-    return det.fC1Bytes ? 'windows-1253' : 'ISO-8859-7';
-  };
-
-  this.language = function() {
-    return 'el';
-  };
-};
-util.inherits(module.exports.ISO_8859_7, sbcs);
-*/
-
-
-
-/***/ }),
-/* 702 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var util = __webpack_require__(3),
-  Match = __webpack_require__ (142);
-
-/**
- * This class matches UTF-16 and UTF-32, both big- and little-endian. The
- * BOM will be used if it is present.
- */
-module.exports.UTF_16BE = function() {
-  this.name = function() {
-    return 'UTF-16BE';
-  };
-  this.match = function(det) {
-    var input = det.fRawInput;
-
-    if (input.length >= 2 && ((input[0] & 0xff) == 0xfe && (input[1] & 0xff) == 0xff)) {
-      return new Match(det, this, 100); // confidence = 100
-    }
-
-    // TODO: Do some statistics to check for unsigned UTF-16BE
-    return null;
-  };
-};
-
-module.exports.UTF_16LE = function() {
-  this.name = function() {
-    return 'UTF-16LE';
-  };
-  this.match = function(det) {
-    var input = det.fRawInput;
-
-    if (input.length >= 2 && ((input[0] & 0xff) == 0xff && (input[1] & 0xff) == 0xfe)) {
-      // LE BOM is present.
-      if (input.length >= 4 && input[2] == 0x00 && input[3] == 0x00) {
-        // It is probably UTF-32 LE, not UTF-16
-        return null;
-      }
-      return new Match(det, this, 100); // confidence = 100
-    }
-
-    // TODO: Do some statistics to check for unsigned UTF-16LE
-    return null;
-  }
-};
-
-function UTF_32() {};
-UTF_32.prototype.match = function(det) {
-  var input      = det.fRawInput,
-    limit      = (det.fRawLength / 4) * 4,
-    numValid   = 0,
-    numInvalid = 0,
-    hasBOM     = false,
-    confidence = 0;
-
-  if (limit == 0) {
-    return null;
-  }
-
-  if (this.getChar(input, 0) == 0x0000FEFF) {
-    hasBOM = true;
-  }
-
-  for (var i = 0; i < limit; i += 4) {
-    var ch = this.getChar(input, i);
-
-    if (ch < 0 || ch >= 0x10FFFF || (ch >= 0xD800 && ch <= 0xDFFF)) {
-      numInvalid += 1;
-    } else {
-      numValid += 1;
-    }
-  }
-
-  // Cook up some sort of confidence score, based on presence of a BOM
-  //    and the existence of valid and/or invalid multi-byte sequences.
-  if (hasBOM && numInvalid == 0) {
-    confidence = 100;
-  } else if (hasBOM && numValid > numInvalid * 10) {
-    confidence = 80;
-  } else if (numValid > 3 && numInvalid == 0) {
-    confidence = 100;
-  } else if (numValid > 0 && numInvalid == 0) {
-    confidence = 80;
-  } else if (numValid > numInvalid * 10) {
-    // Probably corrupt UTF-32BE data.  Valid sequences aren't likely by chance.
-    confidence = 25;
-  }
-
-  // return confidence == 0 ? null : new CharsetMatch(det, this, confidence);
-  return confidence == 0 ? null : new Match(det, this, confidence);
-};
-
-module.exports.UTF_32BE = function() {
-  this.name = function() {
-    return 'UTF-32BE';
-  };
-  this.getChar = function(input, index) {
-    return (input[index + 0] & 0xff) << 24 | (input[index + 1] & 0xff) << 16 |
-         (input[index + 2] & 0xff) <<  8 | (input[index + 3] & 0xff);
-  };
-};
-util.inherits(module.exports.UTF_32BE, UTF_32);
-
-module.exports.UTF_32LE = function() {
-  this.name = function() {
-    return 'UTF-32LE';
-  };
-  this.getChar = function(input, index) {
-    return (input[index + 3] & 0xff) << 24 | (input[index + 2] & 0xff) << 16 |
-         (input[index + 1] & 0xff) <<  8 | (input[index + 0] & 0xff);
-  };
-};
-util.inherits(module.exports.UTF_32LE, UTF_32);
-
-
-/***/ }),
-/* 703 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-var Match = __webpack_require__ (142);
-
-/**
- * Charset recognizer for UTF-8
- */
-module.exports = function() {
-  this.name = function() {
-    return 'UTF-8';
-  };
-  this.match = function(det) {
-
-    var hasBOM = false,
-      numValid = 0,
-      numInvalid = 0,
-      input = det.fRawInput,
-      trailBytes = 0,
-      confidence;
-
-    if (det.fRawLength >= 3 &&
-      (input[0] & 0xff) == 0xef && (input[1] & 0xff) == 0xbb && (input[2] & 0xff) == 0xbf) {
-      hasBOM = true;
-    }
-
-    // Scan for multi-byte sequences
-    for (var i = 0; i < det.fRawLength; i++) {
-      var b = input[i];
-      if ((b & 0x80) == 0)
-        continue; // ASCII
-
-      // Hi bit on char found.  Figure out how long the sequence should be
-      if ((b & 0x0e0) == 0x0c0) {
-        trailBytes = 1;
-      } else if ((b & 0x0f0) == 0x0e0) {
-        trailBytes = 2;
-      } else if ((b & 0x0f8) == 0xf0) {
-        trailBytes = 3;
-      } else {
-        numInvalid++;
-        if (numInvalid > 5)
-          break;
-        trailBytes = 0;
-      }
-
-      // Verify that we've got the right number of trail bytes in the sequence
-      for (;;) {
-        i++;
-        if (i >= det.fRawLength)
-          break;
-
-        if ((input[i] & 0xc0) != 0x080) {
-          numInvalid++;
-          break;
-        }
-        if (--trailBytes == 0) {
-          numValid++;
-          break;
-        }
-      }
-    }
-
-    // Cook up some sort of confidence score, based on presense of a BOM
-    //    and the existence of valid and/or invalid multi-byte sequences.
-    confidence = 0;
-    if (hasBOM && numInvalid == 0)
-      confidence = 100;
-    else if (hasBOM && numValid > numInvalid * 10)
-      confidence = 80;
-    else if (numValid > 3 && numInvalid == 0)
-      confidence = 100;
-    else if (numValid > 0 && numInvalid == 0)
-      confidence = 80;
-    else if (numValid == 0 && numInvalid == 0)
-      // Plain ASCII.
-      confidence = 10;
-    else if (numValid > numInvalid * 10)
-      // Probably corruput utf-8 data.  Valid sequences aren't likely by chance.
-      confidence = 25;
-    else
-      return null
-
-    return new Match(det, this, confidence);
-  };
-};
-
-
-/***/ }),
-/* 704 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-var fs = __webpack_require__(5);
-
-var utf8  = __webpack_require__(703),
-  unicode = __webpack_require__(702),
-  mbcs    = __webpack_require__(700),
-  sbcs    = __webpack_require__(701),
-  iso2022 = __webpack_require__(699);
-
-var self = this;
-
-var recognisers = [
-  new utf8,
-  new unicode.UTF_16BE,
-  new unicode.UTF_16LE,
-  new unicode.UTF_32BE,
-  new unicode.UTF_32LE,
-  new mbcs.sjis,
-  new mbcs.big5,
-  new mbcs.euc_jp,
-  new mbcs.euc_kr,
-  new mbcs.gb_18030,
-  new iso2022.ISO_2022_JP,
-  new iso2022.ISO_2022_KR,
-  new iso2022.ISO_2022_CN,
-  new sbcs.ISO_8859_1,
-  new sbcs.ISO_8859_2,
-  new sbcs.ISO_8859_5,
-  new sbcs.ISO_8859_6,
-  new sbcs.ISO_8859_7,
-  new sbcs.ISO_8859_8,
-  new sbcs.ISO_8859_9,
-  new sbcs.windows_1251,
-  new sbcs.windows_1256,
-  new sbcs.KOI8_R
-];
-
-module.exports.detect = function(buffer, opts) {
-
-  // Tally up the byte occurence statistics.
-  var fByteStats = [];
-  for (var i = 0; i < 256; i++)
-    fByteStats[i] = 0;
-
-  for (var i = buffer.length - 1; i >= 0; i--)
-    fByteStats[buffer[i] & 0x00ff]++;
-
-  var fC1Bytes = false;
-  for (var i = 0x80; i <= 0x9F; i += 1) {
-    if (fByteStats[i] != 0) {
-      fC1Bytes = true;
-      break;
-    }
-  }
-
-  var context = {
-    fByteStats:  fByteStats,
-    fC1Bytes:    fC1Bytes,
-    fRawInput:   buffer,
-    fRawLength:  buffer.length,
-    fInputBytes: buffer,
-    fInputLen:   buffer.length
-  };
-
-  var matches = recognisers.map(function(rec) {
-    return rec.match(context);
-  }).filter(function(match) {
-    return !!match;
-  }).sort(function(a, b) {
-    return b.confidence - a.confidence;
-  });
-
-  if (opts && opts.returnAllMatches === true) {
-    return matches;
-  }
-  else {
-    return matches.length > 0 ? matches[0].name : null;
-  }
-};
-
-module.exports.detectFile = function(filepath, opts, cb) {
-  if (typeof opts === 'function') {
-    cb = opts;
-    opts = undefined;
-  }
-
-  var fd;
-
-  var handler = function(err, buffer) {
-    if (fd) {
-      fs.closeSync(fd);
-    }
-
-    if (err) return cb(err, null);
-    cb(null, self.detect(buffer, opts));
-  };
-
-  if (opts && opts.sampleSize) {
-    fd = fs.openSync(filepath, 'r'),
-      sample = Buffer.allocUnsafe(opts.sampleSize);
-
-    fs.read(fd, sample, 0, opts.sampleSize, null, function(err) {
-      handler(err, sample);
-    });
-    return;
-  }
-
-  fs.readFile(filepath, handler);
-};
-
-module.exports.detectFileSync = function(filepath, opts) {
-  if (opts && opts.sampleSize) {
-    var fd = fs.openSync(filepath, 'r'),
-      sample = Buffer.allocUnsafe(opts.sampleSize);
-
-    fs.readSync(fd, sample, 0, opts.sampleSize);
-    fs.closeSync(fd);
-    return self.detect(sample, opts);
-  }
-
-  return self.detect(fs.readFileSync(filepath), opts);
-};
-
-// Wrappers for the previous functions to return all encodings
-module.exports.detectAll = function(buffer, opts) {
-  if (typeof opts !== 'object') {
-    opts = {};
-  }
-  opts.returnAllMatches = true;
-  return self.detect(buffer, opts);
-}
-
-module.exports.detectFileAll = function(filepath, opts, cb) {
-  if (typeof opts === 'function') {
-    cb = opts;
-    opts = undefined;
-  }
-  if (typeof opts !== 'object') {
-    opts = {};
-  }
-  opts.returnAllMatches = true;
-  self.detectFile(filepath, opts, cb);
-}
-
-module.exports.detectFileAllSync = function(filepath, opts) {
-  if (typeof opts !== 'object') {
-    opts = {};
-  }
-  opts.returnAllMatches = true;
-  return self.detectFileSync(filepath, opts);
-}
-
-
-/***/ }),
-/* 705 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/***
- * Node External Editor
- *
- * Kevin Gravier <kevin@mrkmg.com>
- * MIT 2018
- */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    }
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var CreateFileError = /** @class */ (function (_super) {
-    __extends(CreateFileError, _super);
-    function CreateFileError(originalError) {
-        var _newTarget = this.constructor;
-        var _this = _super.call(this, "Failed to create temporary file for editor") || this;
-        _this.originalError = originalError;
-        var proto = _newTarget.prototype;
-        if (Object.setPrototypeOf) {
-            Object.setPrototypeOf(_this, proto);
-        }
-        else {
-            _this.__proto__ = _newTarget.prototype;
-        }
-        return _this;
-    }
-    return CreateFileError;
-}(Error));
-exports.CreateFileError = CreateFileError;
-
-
-/***/ }),
-/* 706 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/***
- * Node External Editor
- *
- * Kevin Gravier <kevin@mrkmg.com>
- * MIT 2018
- */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    }
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var LaunchEditorError = /** @class */ (function (_super) {
-    __extends(LaunchEditorError, _super);
-    function LaunchEditorError(originalError) {
-        var _newTarget = this.constructor;
-        var _this = _super.call(this, "Failed launch editor") || this;
-        _this.originalError = originalError;
-        var proto = _newTarget.prototype;
-        if (Object.setPrototypeOf) {
-            Object.setPrototypeOf(_this, proto);
-        }
-        else {
-            _this.__proto__ = _newTarget.prototype;
-        }
-        return _this;
-    }
-    return LaunchEditorError;
-}(Error));
-exports.LaunchEditorError = LaunchEditorError;
-
-
-/***/ }),
-/* 707 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/***
- * Node External Editor
- *
- * Kevin Gravier <kevin@mrkmg.com>
- * MIT 2018
- */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    }
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var ReadFileError = /** @class */ (function (_super) {
-    __extends(ReadFileError, _super);
-    function ReadFileError(originalError) {
-        var _newTarget = this.constructor;
-        var _this = _super.call(this, "Failed to read temporary file") || this;
-        _this.originalError = originalError;
-        var proto = _newTarget.prototype;
-        if (Object.setPrototypeOf) {
-            Object.setPrototypeOf(_this, proto);
-        }
-        else {
-            _this.__proto__ = _newTarget.prototype;
-        }
-        return _this;
-    }
-    return ReadFileError;
-}(Error));
-exports.ReadFileError = ReadFileError;
-
-
-/***/ }),
-/* 708 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/***
- * Node External Editor
- *
- * Kevin Gravier <kevin@mrkmg.com>
- * MIT 2018
- */
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    }
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var RemoveFileError = /** @class */ (function (_super) {
-    __extends(RemoveFileError, _super);
-    function RemoveFileError(originalError) {
-        var _newTarget = this.constructor;
-        var _this = _super.call(this, "Failed to cleanup temporary file") || this;
-        _this.originalError = originalError;
-        var proto = _newTarget.prototype;
-        if (Object.setPrototypeOf) {
-            Object.setPrototypeOf(_this, proto);
-        }
-        else {
-            _this.__proto__ = _newTarget.prototype;
-        }
-        return _this;
-    }
-    return RemoveFileError;
-}(Error));
-exports.RemoveFileError = RemoveFileError;
-
-
-/***/ }),
-/* 709 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/***
- * Node External Editor
- *
- * Kevin Gravier <kevin@mrkmg.com>
- * MIT 2018
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-var chardet_1 = __webpack_require__(704);
-var child_process_1 = __webpack_require__(331);
-var fs_1 = __webpack_require__(5);
-var iconv_lite_1 = __webpack_require__(726);
-var tmp_1 = __webpack_require__(954);
-var CreateFileError_1 = __webpack_require__(705);
-exports.CreateFileError = CreateFileError_1.CreateFileError;
-var LaunchEditorError_1 = __webpack_require__(706);
-exports.LaunchEditorError = LaunchEditorError_1.LaunchEditorError;
-var ReadFileError_1 = __webpack_require__(707);
-exports.ReadFileError = ReadFileError_1.ReadFileError;
-var RemoveFileError_1 = __webpack_require__(708);
-exports.RemoveFileError = RemoveFileError_1.RemoveFileError;
-function edit(text) {
-    if (text === void 0) { text = ""; }
-    var editor = new ExternalEditor(text);
-    editor.run();
-    editor.cleanup();
-    return editor.text;
-}
-exports.edit = edit;
-function editAsync(text, callback) {
-    if (text === void 0) { text = ""; }
-    var editor = new ExternalEditor(text);
-    editor.runAsync(function (err, result) {
-        if (err) {
-            setImmediate(callback, err, null);
-        }
-        else {
-            try {
-                editor.cleanup();
-                setImmediate(callback, null, result);
-            }
-            catch (cleanupError) {
-                setImmediate(callback, cleanupError, null);
-            }
-        }
-    });
-}
-exports.editAsync = editAsync;
-var ExternalEditor = /** @class */ (function () {
-    function ExternalEditor(text) {
-        if (text === void 0) { text = ""; }
-        this.text = "";
-        this.text = text;
-        this.determineEditor();
-        this.createTemporaryFile();
-    }
-    ExternalEditor.splitStringBySpace = function (str) {
-        var pieces = [];
-        var currentString = "";
-        for (var strIndex = 0; strIndex < str.length; strIndex++) {
-            var currentLetter = str[strIndex];
-            if (strIndex > 0 && currentLetter === " " && str[strIndex - 1] !== "\\" && currentString.length > 0) {
-                pieces.push(currentString);
-                currentString = "";
-            }
-            else {
-                currentString += currentLetter;
-            }
-        }
-        if (currentString.length > 0) {
-            pieces.push(currentString);
-        }
-        return pieces;
-    };
-    Object.defineProperty(ExternalEditor.prototype, "temp_file", {
-        get: function () {
-            console.log("DEPRECATED: temp_file. Use tempFile moving forward.");
-            return this.tempFile;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(ExternalEditor.prototype, "last_exit_status", {
-        get: function () {
-            console.log("DEPRECATED: last_exit_status. Use lastExitStatus moving forward.");
-            return this.lastExitStatus;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    ExternalEditor.prototype.run = function () {
-        this.launchEditor();
-        this.readTemporaryFile();
-        return this.text;
-    };
-    ExternalEditor.prototype.runAsync = function (callback) {
-        var _this = this;
-        try {
-            this.launchEditorAsync(function () {
-                try {
-                    _this.readTemporaryFile();
-                    setImmediate(callback, null, _this.text);
-                }
-                catch (readError) {
-                    setImmediate(callback, readError, null);
-                }
-            });
-        }
-        catch (launchError) {
-            setImmediate(callback, launchError, null);
-        }
-    };
-    ExternalEditor.prototype.cleanup = function () {
-        this.removeTemporaryFile();
-    };
-    ExternalEditor.prototype.determineEditor = function () {
-        var editor = process.env.VISUAL ? process.env.VISUAL :
-            process.env.EDITOR ? process.env.EDITOR :
-                /^win/.test(process.platform) ? "notepad" :
-                    "vim";
-        var editorOpts = ExternalEditor.splitStringBySpace(editor).map(function (piece) { return piece.replace("\\ ", " "); });
-        var bin = editorOpts.shift();
-        this.editor = { args: editorOpts, bin: bin };
-    };
-    ExternalEditor.prototype.createTemporaryFile = function () {
-        try {
-            this.tempFile = tmp_1.tmpNameSync({});
-            fs_1.writeFileSync(this.tempFile, this.text, { encoding: "utf8" });
-        }
-        catch (createFileError) {
-            throw new CreateFileError_1.CreateFileError(createFileError);
-        }
-    };
-    ExternalEditor.prototype.readTemporaryFile = function () {
-        try {
-            var tempFileBuffer = fs_1.readFileSync(this.tempFile);
-            if (tempFileBuffer.length === 0) {
-                this.text = "";
-            }
-            else {
-                var encoding = chardet_1.detect(tempFileBuffer).toString();
-                if (!iconv_lite_1.encodingExists(encoding)) {
-                    // Probably a bad idea, but will at least prevent crashing
-                    encoding = "utf8";
-                }
-                this.text = iconv_lite_1.decode(tempFileBuffer, encoding);
-            }
-        }
-        catch (readFileError) {
-            throw new ReadFileError_1.ReadFileError(readFileError);
-        }
-    };
-    ExternalEditor.prototype.removeTemporaryFile = function () {
-        try {
-            fs_1.unlinkSync(this.tempFile);
-        }
-        catch (removeFileError) {
-            throw new RemoveFileError_1.RemoveFileError(removeFileError);
-        }
-    };
-    ExternalEditor.prototype.launchEditor = function () {
-        try {
-            var editorProcess = child_process_1.spawnSync(this.editor.bin, this.editor.args.concat([this.tempFile]), { stdio: "inherit" });
-            this.lastExitStatus = editorProcess.status;
-        }
-        catch (launchError) {
-            throw new LaunchEditorError_1.LaunchEditorError(launchError);
-        }
-    };
-    ExternalEditor.prototype.launchEditorAsync = function (callback) {
-        var _this = this;
-        try {
-            var editorProcess = child_process_1.spawn(this.editor.bin, this.editor.args.concat([this.tempFile]), { stdio: "inherit" });
-            editorProcess.on("exit", function (code) {
-                _this.lastExitStatus = code;
-                setImmediate(callback);
-            });
-        }
-        catch (launchError) {
-            throw new LaunchEditorError_1.LaunchEditorError(launchError);
-        }
-    };
-    return ExternalEditor;
-}());
-exports.ExternalEditor = ExternalEditor;
-
-
-/***/ }),
-/* 710 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var Buffer = __webpack_require__(15).Buffer;
-
-// Multibyte codec. In this scheme, a character is represented by 1 or more bytes.
-// Our codec supports UTF-16 surrogates, extensions for GB18030 and unicode sequences.
-// To save memory and loading time, we read table files only when requested.
-
-exports._dbcs = DBCSCodec;
-
-var UNASSIGNED = -1,
-    GB18030_CODE = -2,
-    SEQ_START  = -10,
-    NODE_START = -1000,
-    UNASSIGNED_NODE = new Array(0x100),
-    DEF_CHAR = -1;
-
-for (var i = 0; i < 0x100; i++)
-    UNASSIGNED_NODE[i] = UNASSIGNED;
-
-
-// Class DBCSCodec reads and initializes mapping tables.
-function DBCSCodec(codecOptions, iconv) {
-    this.encodingName = codecOptions.encodingName;
-    if (!codecOptions)
-        throw new Error("DBCS codec is called without the data.")
-    if (!codecOptions.table)
-        throw new Error("Encoding '" + this.encodingName + "' has no data.");
-
-    // Load tables.
-    var mappingTable = codecOptions.table();
-
-
-    // Decode tables: MBCS -> Unicode.
-
-    // decodeTables is a trie, encoded as an array of arrays of integers. Internal arrays are trie nodes and all have len = 256.
-    // Trie root is decodeTables[0].
-    // Values: >=  0 -> unicode character code. can be > 0xFFFF
-    //         == UNASSIGNED -> unknown/unassigned sequence.
-    //         == GB18030_CODE -> this is the end of a GB18030 4-byte sequence.
-    //         <= NODE_START -> index of the next node in our trie to process next byte.
-    //         <= SEQ_START  -> index of the start of a character code sequence, in decodeTableSeq.
-    this.decodeTables = [];
-    this.decodeTables[0] = UNASSIGNED_NODE.slice(0); // Create root node.
-
-    // Sometimes a MBCS char corresponds to a sequence of unicode chars. We store them as arrays of integers here. 
-    this.decodeTableSeq = [];
-
-    // Actual mapping tables consist of chunks. Use them to fill up decode tables.
-    for (var i = 0; i < mappingTable.length; i++)
-        this._addDecodeChunk(mappingTable[i]);
-
-    this.defaultCharUnicode = iconv.defaultCharUnicode;
-
-    
-    // Encode tables: Unicode -> DBCS.
-
-    // `encodeTable` is array mapping from unicode char to encoded char. All its values are integers for performance.
-    // Because it can be sparse, it is represented as array of buckets by 256 chars each. Bucket can be null.
-    // Values: >=  0 -> it is a normal char. Write the value (if <=256 then 1 byte, if <=65536 then 2 bytes, etc.).
-    //         == UNASSIGNED -> no conversion found. Output a default char.
-    //         <= SEQ_START  -> it's an index in encodeTableSeq, see below. The character starts a sequence.
-    this.encodeTable = [];
-    
-    // `encodeTableSeq` is used when a sequence of unicode characters is encoded as a single code. We use a tree of
-    // objects where keys correspond to characters in sequence and leafs are the encoded dbcs values. A special DEF_CHAR key
-    // means end of sequence (needed when one sequence is a strict subsequence of another).
-    // Objects are kept separately from encodeTable to increase performance.
-    this.encodeTableSeq = [];
-
-    // Some chars can be decoded, but need not be encoded.
-    var skipEncodeChars = {};
-    if (codecOptions.encodeSkipVals)
-        for (var i = 0; i < codecOptions.encodeSkipVals.length; i++) {
-            var val = codecOptions.encodeSkipVals[i];
-            if (typeof val === 'number')
-                skipEncodeChars[val] = true;
-            else
-                for (var j = val.from; j <= val.to; j++)
-                    skipEncodeChars[j] = true;
-        }
-        
-    // Use decode trie to recursively fill out encode tables.
-    this._fillEncodeTable(0, 0, skipEncodeChars);
-
-    // Add more encoding pairs when needed.
-    if (codecOptions.encodeAdd) {
-        for (var uChar in codecOptions.encodeAdd)
-            if (Object.prototype.hasOwnProperty.call(codecOptions.encodeAdd, uChar))
-                this._setEncodeChar(uChar.charCodeAt(0), codecOptions.encodeAdd[uChar]);
-    }
-
-    this.defCharSB  = this.encodeTable[0][iconv.defaultCharSingleByte.charCodeAt(0)];
-    if (this.defCharSB === UNASSIGNED) this.defCharSB = this.encodeTable[0]['?'];
-    if (this.defCharSB === UNASSIGNED) this.defCharSB = "?".charCodeAt(0);
-
-
-    // Load & create GB18030 tables when needed.
-    if (typeof codecOptions.gb18030 === 'function') {
-        this.gb18030 = codecOptions.gb18030(); // Load GB18030 ranges.
-
-        // Add GB18030 decode tables.
-        var thirdByteNodeIdx = this.decodeTables.length;
-        var thirdByteNode = this.decodeTables[thirdByteNodeIdx] = UNASSIGNED_NODE.slice(0);
-
-        var fourthByteNodeIdx = this.decodeTables.length;
-        var fourthByteNode = this.decodeTables[fourthByteNodeIdx] = UNASSIGNED_NODE.slice(0);
-
-        for (var i = 0x81; i <= 0xFE; i++) {
-            var secondByteNodeIdx = NODE_START - this.decodeTables[0][i];
-            var secondByteNode = this.decodeTables[secondByteNodeIdx];
-            for (var j = 0x30; j <= 0x39; j++)
-                secondByteNode[j] = NODE_START - thirdByteNodeIdx;
-        }
-        for (var i = 0x81; i <= 0xFE; i++)
-            thirdByteNode[i] = NODE_START - fourthByteNodeIdx;
-        for (var i = 0x30; i <= 0x39; i++)
-            fourthByteNode[i] = GB18030_CODE
-    }        
-}
-
-DBCSCodec.prototype.encoder = DBCSEncoder;
-DBCSCodec.prototype.decoder = DBCSDecoder;
-
-// Decoder helpers
-DBCSCodec.prototype._getDecodeTrieNode = function(addr) {
-    var bytes = [];
-    for (; addr > 0; addr >>= 8)
-        bytes.push(addr & 0xFF);
-    if (bytes.length == 0)
-        bytes.push(0);
-
-    var node = this.decodeTables[0];
-    for (var i = bytes.length-1; i > 0; i--) { // Traverse nodes deeper into the trie.
-        var val = node[bytes[i]];
-
-        if (val == UNASSIGNED) { // Create new node.
-            node[bytes[i]] = NODE_START - this.decodeTables.length;
-            this.decodeTables.push(node = UNASSIGNED_NODE.slice(0));
-        }
-        else if (val <= NODE_START) { // Existing node.
-            node = this.decodeTables[NODE_START - val];
-        }
-        else
-            throw new Error("Overwrite byte in " + this.encodingName + ", addr: " + addr.toString(16));
-    }
-    return node;
-}
-
-
-DBCSCodec.prototype._addDecodeChunk = function(chunk) {
-    // First element of chunk is the hex mbcs code where we start.
-    var curAddr = parseInt(chunk[0], 16);
-
-    // Choose the decoding node where we'll write our chars.
-    var writeTable = this._getDecodeTrieNode(curAddr);
-    curAddr = curAddr & 0xFF;
-
-    // Write all other elements of the chunk to the table.
-    for (var k = 1; k < chunk.length; k++) {
-        var part = chunk[k];
-        if (typeof part === "string") { // String, write as-is.
-            for (var l = 0; l < part.length;) {
-                var code = part.charCodeAt(l++);
-                if (0xD800 <= code && code < 0xDC00) { // Decode surrogate
-                    var codeTrail = part.charCodeAt(l++);
-                    if (0xDC00 <= codeTrail && codeTrail < 0xE000)
-                        writeTable[curAddr++] = 0x10000 + (code - 0xD800) * 0x400 + (codeTrail - 0xDC00);
-                    else
-                        throw new Error("Incorrect surrogate pair in "  + this.encodingName + " at chunk " + chunk[0]);
-                }
-                else if (0x0FF0 < code && code <= 0x0FFF) { // Character sequence (our own encoding used)
-                    var len = 0xFFF - code + 2;
-                    var seq = [];
-                    for (var m = 0; m < len; m++)
-                        seq.push(part.charCodeAt(l++)); // Simple variation: don't support surrogates or subsequences in seq.
-
-                    writeTable[curAddr++] = SEQ_START - this.decodeTableSeq.length;
-                    this.decodeTableSeq.push(seq);
-                }
-                else
-                    writeTable[curAddr++] = code; // Basic char
-            }
-        } 
-        else if (typeof part === "number") { // Integer, meaning increasing sequence starting with prev character.
-            var charCode = writeTable[curAddr - 1] + 1;
-            for (var l = 0; l < part; l++)
-                writeTable[curAddr++] = charCode++;
-        }
-        else
-            throw new Error("Incorrect type '" + typeof part + "' given in "  + this.encodingName + " at chunk " + chunk[0]);
-    }
-    if (curAddr > 0xFF)
-        throw new Error("Incorrect chunk in "  + this.encodingName + " at addr " + chunk[0] + ": too long" + curAddr);
-}
-
-// Encoder helpers
-DBCSCodec.prototype._getEncodeBucket = function(uCode) {
-    var high = uCode >> 8; // This could be > 0xFF because of astral characters.
-    if (this.encodeTable[high] === undefined)
-        this.encodeTable[high] = UNASSIGNED_NODE.slice(0); // Create bucket on demand.
-    return this.encodeTable[high];
-}
-
-DBCSCodec.prototype._setEncodeChar = function(uCode, dbcsCode) {
-    var bucket = this._getEncodeBucket(uCode);
-    var low = uCode & 0xFF;
-    if (bucket[low] <= SEQ_START)
-        this.encodeTableSeq[SEQ_START-bucket[low]][DEF_CHAR] = dbcsCode; // There's already a sequence, set a single-char subsequence of it.
-    else if (bucket[low] == UNASSIGNED)
-        bucket[low] = dbcsCode;
-}
-
-DBCSCodec.prototype._setEncodeSequence = function(seq, dbcsCode) {
-    
-    // Get the root of character tree according to first character of the sequence.
-    var uCode = seq[0];
-    var bucket = this._getEncodeBucket(uCode);
-    var low = uCode & 0xFF;
-
-    var node;
-    if (bucket[low] <= SEQ_START) {
-        // There's already a sequence with  - use it.
-        node = this.encodeTableSeq[SEQ_START-bucket[low]];
-    }
-    else {
-        // There was no sequence object - allocate a new one.
-        node = {};
-        if (bucket[low] !== UNASSIGNED) node[DEF_CHAR] = bucket[low]; // If a char was set before - make it a single-char subsequence.
-        bucket[low] = SEQ_START - this.encodeTableSeq.length;
-        this.encodeTableSeq.push(node);
-    }
-
-    // Traverse the character tree, allocating new nodes as needed.
-    for (var j = 1; j < seq.length-1; j++) {
-        var oldVal = node[uCode];
-        if (typeof oldVal === 'object')
-            node = oldVal;
-        else {
-            node = node[uCode] = {}
-            if (oldVal !== undefined)
-                node[DEF_CHAR] = oldVal
-        }
-    }
-
-    // Set the leaf to given dbcsCode.
-    uCode = seq[seq.length-1];
-    node[uCode] = dbcsCode;
-}
-
-DBCSCodec.prototype._fillEncodeTable = function(nodeIdx, prefix, skipEncodeChars) {
-    var node = this.decodeTables[nodeIdx];
-    for (var i = 0; i < 0x100; i++) {
-        var uCode = node[i];
-        var mbCode = prefix + i;
-        if (skipEncodeChars[mbCode])
-            continue;
-
-        if (uCode >= 0)
-            this._setEncodeChar(uCode, mbCode);
-        else if (uCode <= NODE_START)
-            this._fillEncodeTable(NODE_START - uCode, mbCode << 8, skipEncodeChars);
-        else if (uCode <= SEQ_START)
-            this._setEncodeSequence(this.decodeTableSeq[SEQ_START - uCode], mbCode);
-    }
-}
-
-
-
-// == Encoder ==================================================================
-
-function DBCSEncoder(options, codec) {
-    // Encoder state
-    this.leadSurrogate = -1;
-    this.seqObj = undefined;
-    
-    // Static data
-    this.encodeTable = codec.encodeTable;
-    this.encodeTableSeq = codec.encodeTableSeq;
-    this.defaultCharSingleByte = codec.defCharSB;
-    this.gb18030 = codec.gb18030;
-}
-
-DBCSEncoder.prototype.write = function(str) {
-    var newBuf = Buffer.alloc(str.length * (this.gb18030 ? 4 : 3)),
-        leadSurrogate = this.leadSurrogate,
-        seqObj = this.seqObj, nextChar = -1,
-        i = 0, j = 0;
-
-    while (true) {
-        // 0. Get next character.
-        if (nextChar === -1) {
-            if (i == str.length) break;
-            var uCode = str.charCodeAt(i++);
-        }
-        else {
-            var uCode = nextChar;
-            nextChar = -1;    
-        }
-
-        // 1. Handle surrogates.
-        if (0xD800 <= uCode && uCode < 0xE000) { // Char is one of surrogates.
-            if (uCode < 0xDC00) { // We've got lead surrogate.
-                if (leadSurrogate === -1) {
-                    leadSurrogate = uCode;
-                    continue;
-                } else {
-                    leadSurrogate = uCode;
-                    // Double lead surrogate found.
-                    uCode = UNASSIGNED;
-                }
-            } else { // We've got trail surrogate.
-                if (leadSurrogate !== -1) {
-                    uCode = 0x10000 + (leadSurrogate - 0xD800) * 0x400 + (uCode - 0xDC00);
-                    leadSurrogate = -1;
-                } else {
-                    // Incomplete surrogate pair - only trail surrogate found.
-                    uCode = UNASSIGNED;
-                }
-                
-            }
-        }
-        else if (leadSurrogate !== -1) {
-            // Incomplete surrogate pair - only lead surrogate found.
-            nextChar = uCode; uCode = UNASSIGNED; // Write an error, then current char.
-            leadSurrogate = -1;
-        }
-
-        // 2. Convert uCode character.
-        var dbcsCode = UNASSIGNED;
-        if (seqObj !== undefined && uCode != UNASSIGNED) { // We are in the middle of the sequence
-            var resCode = seqObj[uCode];
-            if (typeof resCode === 'object') { // Sequence continues.
-                seqObj = resCode;
-                continue;
-
-            } else if (typeof resCode == 'number') { // Sequence finished. Write it.
-                dbcsCode = resCode;
-
-            } else if (resCode == undefined) { // Current character is not part of the sequence.
-
-                // Try default character for this sequence
-                resCode = seqObj[DEF_CHAR];
-                if (resCode !== undefined) {
-                    dbcsCode = resCode; // Found. Write it.
-                    nextChar = uCode; // Current character will be written too in the next iteration.
-
-                } else {
-                    // TODO: What if we have no default? (resCode == undefined)
-                    // Then, we should write first char of the sequence as-is and try the rest recursively.
-                    // Didn't do it for now because no encoding has this situation yet.
-                    // Currently, just skip the sequence and write current char.
-                }
-            }
-            seqObj = undefined;
-        }
-        else if (uCode >= 0) {  // Regular character
-            var subtable = this.encodeTable[uCode >> 8];
-            if (subtable !== undefined)
-                dbcsCode = subtable[uCode & 0xFF];
-            
-            if (dbcsCode <= SEQ_START) { // Sequence start
-                seqObj = this.encodeTableSeq[SEQ_START-dbcsCode];
-                continue;
-            }
-
-            if (dbcsCode == UNASSIGNED && this.gb18030) {
-                // Use GB18030 algorithm to find character(s) to write.
-                var idx = findIdx(this.gb18030.uChars, uCode);
-                if (idx != -1) {
-                    var dbcsCode = this.gb18030.gbChars[idx] + (uCode - this.gb18030.uChars[idx]);
-                    newBuf[j++] = 0x81 + Math.floor(dbcsCode / 12600); dbcsCode = dbcsCode % 12600;
-                    newBuf[j++] = 0x30 + Math.floor(dbcsCode / 1260); dbcsCode = dbcsCode % 1260;
-                    newBuf[j++] = 0x81 + Math.floor(dbcsCode / 10); dbcsCode = dbcsCode % 10;
-                    newBuf[j++] = 0x30 + dbcsCode;
-                    continue;
-                }
-            }
-        }
-
-        // 3. Write dbcsCode character.
-        if (dbcsCode === UNASSIGNED)
-            dbcsCode = this.defaultCharSingleByte;
-        
-        if (dbcsCode < 0x100) {
-            newBuf[j++] = dbcsCode;
-        }
-        else if (dbcsCode < 0x10000) {
-            newBuf[j++] = dbcsCode >> 8;   // high byte
-            newBuf[j++] = dbcsCode & 0xFF; // low byte
-        }
-        else {
-            newBuf[j++] = dbcsCode >> 16;
-            newBuf[j++] = (dbcsCode >> 8) & 0xFF;
-            newBuf[j++] = dbcsCode & 0xFF;
-        }
-    }
-
-    this.seqObj = seqObj;
-    this.leadSurrogate = leadSurrogate;
-    return newBuf.slice(0, j);
-}
-
-DBCSEncoder.prototype.end = function() {
-    if (this.leadSurrogate === -1 && this.seqObj === undefined)
-        return; // All clean. Most often case.
-
-    var newBuf = Buffer.alloc(10), j = 0;
-
-    if (this.seqObj) { // We're in the sequence.
-        var dbcsCode = this.seqObj[DEF_CHAR];
-        if (dbcsCode !== undefined) { // Write beginning of the sequence.
-            if (dbcsCode < 0x100) {
-                newBuf[j++] = dbcsCode;
-            }
-            else {
-                newBuf[j++] = dbcsCode >> 8;   // high byte
-                newBuf[j++] = dbcsCode & 0xFF; // low byte
-            }
-        } else {
-            // See todo above.
-        }
-        this.seqObj = undefined;
-    }
-
-    if (this.leadSurrogate !== -1) {
-        // Incomplete surrogate pair - only lead surrogate found.
-        newBuf[j++] = this.defaultCharSingleByte;
-        this.leadSurrogate = -1;
-    }
-    
-    return newBuf.slice(0, j);
-}
-
-// Export for testing
-DBCSEncoder.prototype.findIdx = findIdx;
-
-
-// == Decoder ==================================================================
-
-function DBCSDecoder(options, codec) {
-    // Decoder state
-    this.nodeIdx = 0;
-    this.prevBuf = Buffer.alloc(0);
-
-    // Static data
-    this.decodeTables = codec.decodeTables;
-    this.decodeTableSeq = codec.decodeTableSeq;
-    this.defaultCharUnicode = codec.defaultCharUnicode;
-    this.gb18030 = codec.gb18030;
-}
-
-DBCSDecoder.prototype.write = function(buf) {
-    var newBuf = Buffer.alloc(buf.length*2),
-        nodeIdx = this.nodeIdx, 
-        prevBuf = this.prevBuf, prevBufOffset = this.prevBuf.length,
-        seqStart = -this.prevBuf.length, // idx of the start of current parsed sequence.
-        uCode;
-
-    if (prevBufOffset > 0) // Make prev buf overlap a little to make it easier to slice later.
-        prevBuf = Buffer.concat([prevBuf, buf.slice(0, 10)]);
-    
-    for (var i = 0, j = 0; i < buf.length; i++) {
-        var curByte = (i >= 0) ? buf[i] : prevBuf[i + prevBufOffset];
-
-        // Lookup in current trie node.
-        var uCode = this.decodeTables[nodeIdx][curByte];
-
-        if (uCode >= 0) { 
-            // Normal character, just use it.
-        }
-        else if (uCode === UNASSIGNED) { // Unknown char.
-            // TODO: Callback with seq.
-            //var curSeq = (seqStart >= 0) ? buf.slice(seqStart, i+1) : prevBuf.slice(seqStart + prevBufOffset, i+1 + prevBufOffset);
-            i = seqStart; // Try to parse again, after skipping first byte of the sequence ('i' will be incremented by 'for' cycle).
-            uCode = this.defaultCharUnicode.charCodeAt(0);
-        }
-        else if (uCode === GB18030_CODE) {
-            var curSeq = (seqStart >= 0) ? buf.slice(seqStart, i+1) : prevBuf.slice(seqStart + prevBufOffset, i+1 + prevBufOffset);
-            var ptr = (curSeq[0]-0x81)*12600 + (curSeq[1]-0x30)*1260 + (curSeq[2]-0x81)*10 + (curSeq[3]-0x30);
-            var idx = findIdx(this.gb18030.gbChars, ptr);
-            uCode = this.gb18030.uChars[idx] + ptr - this.gb18030.gbChars[idx];
-        }
-        else if (uCode <= NODE_START) { // Go to next trie node.
-            nodeIdx = NODE_START - uCode;
-            continue;
-        }
-        else if (uCode <= SEQ_START) { // Output a sequence of chars.
-            var seq = this.decodeTableSeq[SEQ_START - uCode];
-            for (var k = 0; k < seq.length - 1; k++) {
-                uCode = seq[k];
-                newBuf[j++] = uCode & 0xFF;
-                newBuf[j++] = uCode >> 8;
-            }
-            uCode = seq[seq.length-1];
-        }
-        else
-            throw new Error("iconv-lite internal error: invalid decoding table value " + uCode + " at " + nodeIdx + "/" + curByte);
-
-        // Write the character to buffer, handling higher planes using surrogate pair.
-        if (uCode > 0xFFFF) { 
-            uCode -= 0x10000;
-            var uCodeLead = 0xD800 + Math.floor(uCode / 0x400);
-            newBuf[j++] = uCodeLead & 0xFF;
-            newBuf[j++] = uCodeLead >> 8;
-
-            uCode = 0xDC00 + uCode % 0x400;
-        }
-        newBuf[j++] = uCode & 0xFF;
-        newBuf[j++] = uCode >> 8;
-
-        // Reset trie node.
-        nodeIdx = 0; seqStart = i+1;
-    }
-
-    this.nodeIdx = nodeIdx;
-    this.prevBuf = (seqStart >= 0) ? buf.slice(seqStart) : prevBuf.slice(seqStart + prevBufOffset);
-    return newBuf.slice(0, j).toString('ucs2');
-}
-
-DBCSDecoder.prototype.end = function() {
-    var ret = '';
-
-    // Try to parse all remaining chars.
-    while (this.prevBuf.length > 0) {
-        // Skip 1 character in the buffer.
-        ret += this.defaultCharUnicode;
-        var buf = this.prevBuf.slice(1);
-
-        // Parse remaining as usual.
-        this.prevBuf = Buffer.alloc(0);
-        this.nodeIdx = 0;
-        if (buf.length > 0)
-            ret += this.write(buf);
-    }
-
-    this.nodeIdx = 0;
-    return ret;
-}
-
-// Binary search for GB18030. Returns largest i such that table[i] <= val.
-function findIdx(table, val) {
-    if (table[0] > val)
-        return -1;
-
-    var l = 0, r = table.length;
-    while (l < r-1) { // always table[l] <= val < table[r]
-        var mid = l + Math.floor((r-l+1)/2);
-        if (table[mid] <= val)
-            l = mid;
-        else
-            r = mid;
-    }
-    return l;
-}
-
-
-
-/***/ }),
-/* 711 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// Description of supported double byte encodings and aliases.
-// Tables are not require()-d until they are needed to speed up library load.
-// require()-s are direct to support Browserify.
-
-module.exports = {
-    
-    // == Japanese/ShiftJIS ====================================================
-    // All japanese encodings are based on JIS X set of standards:
-    // JIS X 0201 - Single-byte encoding of ASCII + ¥ + Kana chars at 0xA1-0xDF.
-    // JIS X 0208 - Main set of 6879 characters, placed in 94x94 plane, to be encoded by 2 bytes. 
-    //              Has several variations in 1978, 1983, 1990 and 1997.
-    // JIS X 0212 - Supplementary plane of 6067 chars in 94x94 plane. 1990. Effectively dead.
-    // JIS X 0213 - Extension and modern replacement of 0208 and 0212. Total chars: 11233.
-    //              2 planes, first is superset of 0208, second - revised 0212.
-    //              Introduced in 2000, revised 2004. Some characters are in Unicode Plane 2 (0x2xxxx)
-
-    // Byte encodings are:
-    //  * Shift_JIS: Compatible with 0201, uses not defined chars in top half as lead bytes for double-byte
-    //               encoding of 0208. Lead byte ranges: 0x81-0x9F, 0xE0-0xEF; Trail byte ranges: 0x40-0x7E, 0x80-0x9E, 0x9F-0xFC.
-    //               Windows CP932 is a superset of Shift_JIS. Some companies added more chars, notably KDDI.
-    //  * EUC-JP:    Up to 3 bytes per character. Used mostly on *nixes.
-    //               0x00-0x7F       - lower part of 0201
-    //               0x8E, 0xA1-0xDF - upper part of 0201
-    //               (0xA1-0xFE)x2   - 0208 plane (94x94).
-    //               0x8F, (0xA1-0xFE)x2 - 0212 plane (94x94).
-    //  * JIS X 208: 7-bit, direct encoding of 0208. Byte ranges: 0x21-0x7E (94 values). Uncommon.
-    //               Used as-is in ISO2022 family.
-    //  * ISO2022-JP: Stateful encoding, with escape sequences to switch between ASCII, 
-    //                0201-1976 Roman, 0208-1978, 0208-1983.
-    //  * ISO2022-JP-1: Adds esc seq for 0212-1990.
-    //  * ISO2022-JP-2: Adds esc seq for GB2313-1980, KSX1001-1992, ISO8859-1, ISO8859-7.
-    //  * ISO2022-JP-3: Adds esc seq for 0201-1976 Kana set, 0213-2000 Planes 1, 2.
-    //  * ISO2022-JP-2004: Adds 0213-2004 Plane 1.
-    //
-    // After JIS X 0213 appeared, Shift_JIS-2004, EUC-JISX0213 and ISO2022-JP-2004 followed, with just changing the planes.
-    //
-    // Overall, it seems that it's a mess :( http://www8.plala.or.jp/tkubota1/unicode-symbols-map2.html
-
-    'shiftjis': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(721) },
-        encodeAdd: {'\u00a5': 0x5C, '\u203E': 0x7E},
-        encodeSkipVals: [{from: 0xED40, to: 0xF940}],
-    },
-    'csshiftjis': 'shiftjis',
-    'mskanji': 'shiftjis',
-    'sjis': 'shiftjis',
-    'windows31j': 'shiftjis',
-    'ms31j': 'shiftjis',
-    'xsjis': 'shiftjis',
-    'windows932': 'shiftjis',
-    'ms932': 'shiftjis',
-    '932': 'shiftjis',
-    'cp932': 'shiftjis',
-
-    'eucjp': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(719) },
-        encodeAdd: {'\u00a5': 0x5C, '\u203E': 0x7E},
-    },
-
-    // TODO: KDDI extension to Shift_JIS
-    // TODO: IBM CCSID 942 = CP932, but F0-F9 custom chars and other char changes.
-    // TODO: IBM CCSID 943 = Shift_JIS = CP932 with original Shift_JIS lower 128 chars.
-
-
-    // == Chinese/GBK ==========================================================
-    // http://en.wikipedia.org/wiki/GBK
-    // We mostly implement W3C recommendation: https://www.w3.org/TR/encoding/#gbk-encoder
-
-    // Oldest GB2312 (1981, ~7600 chars) is a subset of CP936
-    'gb2312': 'cp936',
-    'gb231280': 'cp936',
-    'gb23121980': 'cp936',
-    'csgb2312': 'cp936',
-    'csiso58gb231280': 'cp936',
-    'euccn': 'cp936',
-
-    // Microsoft's CP936 is a subset and approximation of GBK.
-    'windows936': 'cp936',
-    'ms936': 'cp936',
-    '936': 'cp936',
-    'cp936': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(277) },
-    },
-
-    // GBK (~22000 chars) is an extension of CP936 that added user-mapped chars and some other.
-    'gbk': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(277).concat(__webpack_require__(396)) },
-    },
-    'xgbk': 'gbk',
-    'isoir58': 'gbk',
-
-    // GB18030 is an algorithmic extension of GBK.
-    // Main source: https://www.w3.org/TR/encoding/#gbk-encoder
-    // http://icu-project.org/docs/papers/gb18030.html
-    // http://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/gb-18030-2000.xml
-    // http://www.khngai.com/chinese/charmap/tblgbk.php?page=0
-    'gb18030': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(277).concat(__webpack_require__(396)) },
-        gb18030: function() { return __webpack_require__(720) },
-        encodeSkipVals: [0x80],
-        encodeAdd: {'€': 0xA2E3},
-    },
-
-    'chinese': 'gb18030',
-
-
-    // == Korean ===============================================================
-    // EUC-KR, KS_C_5601 and KS X 1001 are exactly the same.
-    'windows949': 'cp949',
-    'ms949': 'cp949',
-    '949': 'cp949',
-    'cp949': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(718) },
-    },
-
-    'cseuckr': 'cp949',
-    'csksc56011987': 'cp949',
-    'euckr': 'cp949',
-    'isoir149': 'cp949',
-    'korean': 'cp949',
-    'ksc56011987': 'cp949',
-    'ksc56011989': 'cp949',
-    'ksc5601': 'cp949',
-
-
-    // == Big5/Taiwan/Hong Kong ================================================
-    // There are lots of tables for Big5 and cp950. Please see the following links for history:
-    // http://moztw.org/docs/big5/  http://www.haible.de/bruno/charsets/conversion-tables/Big5.html
-    // Variations, in roughly number of defined chars:
-    //  * Windows CP 950: Microsoft variant of Big5. Canonical: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT
-    //  * Windows CP 951: Microsoft variant of Big5-HKSCS-2001. Seems to be never public. http://me.abelcheung.org/articles/research/what-is-cp951/
-    //  * Big5-2003 (Taiwan standard) almost superset of cp950.
-    //  * Unicode-at-on (UAO) / Mozilla 1.8. Falling out of use on the Web. Not supported by other browsers.
-    //  * Big5-HKSCS (-2001, -2004, -2008). Hong Kong standard. 
-    //    many unicode code points moved from PUA to Supplementary plane (U+2XXXX) over the years.
-    //    Plus, it has 4 combining sequences.
-    //    Seems that Mozilla refused to support it for 10 yrs. https://bugzilla.mozilla.org/show_bug.cgi?id=162431 https://bugzilla.mozilla.org/show_bug.cgi?id=310299
-    //    because big5-hkscs is the only encoding to include astral characters in non-algorithmic way.
-    //    Implementations are not consistent within browsers; sometimes labeled as just big5.
-    //    MS Internet Explorer switches from big5 to big5-hkscs when a patch applied.
-    //    Great discussion & recap of what's going on https://bugzilla.mozilla.org/show_bug.cgi?id=912470#c31
-    //    In the encoder, it might make sense to support encoding old PUA mappings to Big5 bytes seq-s.
-    //    Official spec: http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/2003cmp_2008.txt
-    //                   http://www.ogcio.gov.hk/tc/business/tech_promotion/ccli/terms/doc/hkscs-2008-big5-iso.txt
-    // 
-    // Current understanding of how to deal with Big5(-HKSCS) is in the Encoding Standard, http://encoding.spec.whatwg.org/#big5-encoder
-    // Unicode mapping (http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT) is said to be wrong.
-
-    'windows950': 'cp950',
-    'ms950': 'cp950',
-    '950': 'cp950',
-    'cp950': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(395) },
-    },
-
-    // Big5 has many variations and is an extension of cp950. We use Encoding Standard's as a consensus.
-    'big5': 'big5hkscs',
-    'big5hkscs': {
-        type: '_dbcs',
-        table: function() { return __webpack_require__(395).concat(__webpack_require__(717)) },
-        encodeSkipVals: [0xa2cc],
-    },
-
-    'cnbig5': 'big5hkscs',
-    'csbig5': 'big5hkscs',
-    'xxbig5': 'big5hkscs',
-};
-
-
-/***/ }),
-/* 712 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// Update this array if you add/rename/remove files in this directory.
-// We support Browserify by skipping automatic module discovery and requiring modules directly.
-var modules = [
-    __webpack_require__(713),
-    __webpack_require__(722),
-    __webpack_require__(723),
-    __webpack_require__(714),
-    __webpack_require__(716),
-    __webpack_require__(715),
-    __webpack_require__(710),
-    __webpack_require__(711),
-];
-
-// Put all encoding/alias/codec definitions to single object and export it. 
-for (var i = 0; i < modules.length; i++) {
-    var module = modules[i];
-    for (var enc in module)
-        if (Object.prototype.hasOwnProperty.call(module, enc))
-            exports[enc] = module[enc];
-}
-
-
-/***/ }),
-/* 713 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var Buffer = __webpack_require__(15).Buffer;
-
-// Export Node.js internal encodings.
-
-module.exports = {
-    // Encodings
-    utf8:   { type: "_internal", bomAware: true},
-    cesu8:  { type: "_internal", bomAware: true},
-    unicode11utf8: "utf8",
-
-    ucs2:   { type: "_internal", bomAware: true},
-    utf16le: "ucs2",
-
-    binary: { type: "_internal" },
-    base64: { type: "_internal" },
-    hex:    { type: "_internal" },
-
-    // Codec.
-    _internal: InternalCodec,
-};
-
-//------------------------------------------------------------------------------
-
-function InternalCodec(codecOptions, iconv) {
-    this.enc = codecOptions.encodingName;
-    this.bomAware = codecOptions.bomAware;
-
-    if (this.enc === "base64")
-        this.encoder = InternalEncoderBase64;
-    else if (this.enc === "cesu8") {
-        this.enc = "utf8"; // Use utf8 for decoding.
-        this.encoder = InternalEncoderCesu8;
-
-        // Add decoder for versions of Node not supporting CESU-8
-        if (Buffer.from('eda0bdedb2a9', 'hex').toString() !== '💩') {
-            this.decoder = InternalDecoderCesu8;
-            this.defaultCharUnicode = iconv.defaultCharUnicode;
-        }
-    }
-}
-
-InternalCodec.prototype.encoder = InternalEncoder;
-InternalCodec.prototype.decoder = InternalDecoder;
-
-//------------------------------------------------------------------------------
-
-// We use node.js internal decoder. Its signature is the same as ours.
-var StringDecoder = __webpack_require__(333).StringDecoder;
-
-if (!StringDecoder.prototype.end) // Node v0.8 doesn't have this method.
-    StringDecoder.prototype.end = function() {};
-
-
-function InternalDecoder(options, codec) {
-    StringDecoder.call(this, codec.enc);
-}
-
-InternalDecoder.prototype = StringDecoder.prototype;
-
-
-//------------------------------------------------------------------------------
-// Encoder is mostly trivial
-
-function InternalEncoder(options, codec) {
-    this.enc = codec.enc;
-}
-
-InternalEncoder.prototype.write = function(str) {
-    return Buffer.from(str, this.enc);
-}
-
-InternalEncoder.prototype.end = function() {
-}
-
-
-//------------------------------------------------------------------------------
-// Except base64 encoder, which must keep its state.
-
-function InternalEncoderBase64(options, codec) {
-    this.prevStr = '';
-}
-
-InternalEncoderBase64.prototype.write = function(str) {
-    str = this.prevStr + str;
-    var completeQuads = str.length - (str.length % 4);
-    this.prevStr = str.slice(completeQuads);
-    str = str.slice(0, completeQuads);
-
-    return Buffer.from(str, "base64");
-}
-
-InternalEncoderBase64.prototype.end = function() {
-    return Buffer.from(this.prevStr, "base64");
-}
-
-
-//------------------------------------------------------------------------------
-// CESU-8 encoder is also special.
-
-function InternalEncoderCesu8(options, codec) {
-}
-
-InternalEncoderCesu8.prototype.write = function(str) {
-    var buf = Buffer.alloc(str.length * 3), bufIdx = 0;
-    for (var i = 0; i < str.length; i++) {
-        var charCode = str.charCodeAt(i);
-        // Naive implementation, but it works because CESU-8 is especially easy
-        // to convert from UTF-16 (which all JS strings are encoded in).
-        if (charCode < 0x80)
-            buf[bufIdx++] = charCode;
-        else if (charCode < 0x800) {
-            buf[bufIdx++] = 0xC0 + (charCode >>> 6);
-            buf[bufIdx++] = 0x80 + (charCode & 0x3f);
-        }
-        else { // charCode will always be < 0x10000 in javascript.
-            buf[bufIdx++] = 0xE0 + (charCode >>> 12);
-            buf[bufIdx++] = 0x80 + ((charCode >>> 6) & 0x3f);
-            buf[bufIdx++] = 0x80 + (charCode & 0x3f);
-        }
-    }
-    return buf.slice(0, bufIdx);
-}
-
-InternalEncoderCesu8.prototype.end = function() {
-}
-
-//------------------------------------------------------------------------------
-// CESU-8 decoder is not implemented in Node v4.0+
-
-function InternalDecoderCesu8(options, codec) {
-    this.acc = 0;
-    this.contBytes = 0;
-    this.accBytes = 0;
-    this.defaultCharUnicode = codec.defaultCharUnicode;
-}
-
-InternalDecoderCesu8.prototype.write = function(buf) {
-    var acc = this.acc, contBytes = this.contBytes, accBytes = this.accBytes, 
-        res = '';
-    for (var i = 0; i < buf.length; i++) {
-        var curByte = buf[i];
-        if ((curByte & 0xC0) !== 0x80) { // Leading byte
-            if (contBytes > 0) { // Previous code is invalid
-                res += this.defaultCharUnicode;
-                contBytes = 0;
-            }
-
-            if (curByte < 0x80) { // Single-byte code
-                res += String.fromCharCode(curByte);
-            } else if (curByte < 0xE0) { // Two-byte code
-                acc = curByte & 0x1F;
-                contBytes = 1; accBytes = 1;
-            } else if (curByte < 0xF0) { // Three-byte code
-                acc = curByte & 0x0F;
-                contBytes = 2; accBytes = 1;
-            } else { // Four or more are not supported for CESU-8.
-                res += this.defaultCharUnicode;
-            }
-        } else { // Continuation byte
-            if (contBytes > 0) { // We're waiting for it.
-                acc = (acc << 6) | (curByte & 0x3f);
-                contBytes--; accBytes++;
-                if (contBytes === 0) {
-                    // Check for overlong encoding, but support Modified UTF-8 (encoding NULL as C0 80)
-                    if (accBytes === 2 && acc < 0x80 && acc > 0)
-                        res += this.defaultCharUnicode;
-                    else if (accBytes === 3 && acc < 0x800)
-                        res += this.defaultCharUnicode;
-                    else
-                        // Actually add character.
-                        res += String.fromCharCode(acc);
-                }
-            } else { // Unexpected continuation byte
-                res += this.defaultCharUnicode;
-            }
-        }
-    }
-    this.acc = acc; this.contBytes = contBytes; this.accBytes = accBytes;
-    return res;
-}
-
-InternalDecoderCesu8.prototype.end = function() {
-    var res = 0;
-    if (this.contBytes > 0)
-        res += this.defaultCharUnicode;
-    return res;
-}
-
-
-/***/ }),
-/* 714 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var Buffer = __webpack_require__(15).Buffer;
-
-// Single-byte codec. Needs a 'chars' string parameter that contains 256 or 128 chars that
-// correspond to encoded bytes (if 128 - then lower half is ASCII). 
-
-exports._sbcs = SBCSCodec;
-function SBCSCodec(codecOptions, iconv) {
-    if (!codecOptions)
-        throw new Error("SBCS codec is called without the data.")
-    
-    // Prepare char buffer for decoding.
-    if (!codecOptions.chars || (codecOptions.chars.length !== 128 && codecOptions.chars.length !== 256))
-        throw new Error("Encoding '"+codecOptions.type+"' has incorrect 'chars' (must be of len 128 or 256)");
-    
-    if (codecOptions.chars.length === 128) {
-        var asciiString = "";
-        for (var i = 0; i < 128; i++)
-            asciiString += String.fromCharCode(i);
-        codecOptions.chars = asciiString + codecOptions.chars;
-    }
-
-    this.decodeBuf = Buffer.from(codecOptions.chars, 'ucs2');
-    
-    // Encoding buffer.
-    var encodeBuf = Buffer.alloc(65536, iconv.defaultCharSingleByte.charCodeAt(0));
-
-    for (var i = 0; i < codecOptions.chars.length; i++)
-        encodeBuf[codecOptions.chars.charCodeAt(i)] = i;
-
-    this.encodeBuf = encodeBuf;
-}
-
-SBCSCodec.prototype.encoder = SBCSEncoder;
-SBCSCodec.prototype.decoder = SBCSDecoder;
-
-
-function SBCSEncoder(options, codec) {
-    this.encodeBuf = codec.encodeBuf;
-}
-
-SBCSEncoder.prototype.write = function(str) {
-    var buf = Buffer.alloc(str.length);
-    for (var i = 0; i < str.length; i++)
-        buf[i] = this.encodeBuf[str.charCodeAt(i)];
-    
-    return buf;
-}
-
-SBCSEncoder.prototype.end = function() {
-}
-
-
-function SBCSDecoder(options, codec) {
-    this.decodeBuf = codec.decodeBuf;
-}
-
-SBCSDecoder.prototype.write = function(buf) {
-    // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
-    var decodeBuf = this.decodeBuf;
-    var newBuf = Buffer.alloc(buf.length*2);
-    var idx1 = 0, idx2 = 0;
-    for (var i = 0; i < buf.length; i++) {
-        idx1 = buf[i]*2; idx2 = i*2;
-        newBuf[idx2] = decodeBuf[idx1];
-        newBuf[idx2+1] = decodeBuf[idx1+1];
-    }
-    return newBuf.toString('ucs2');
-}
-
-SBCSDecoder.prototype.end = function() {
-}
-
-
-/***/ }),
-/* 715 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// Generated data for sbcs codec. Don't edit manually. Regenerate using generation/gen-sbcs.js script.
-module.exports = {
-  "437": "cp437",
-  "737": "cp737",
-  "775": "cp775",
-  "850": "cp850",
-  "852": "cp852",
-  "855": "cp855",
-  "856": "cp856",
-  "857": "cp857",
-  "858": "cp858",
-  "860": "cp860",
-  "861": "cp861",
-  "862": "cp862",
-  "863": "cp863",
-  "864": "cp864",
-  "865": "cp865",
-  "866": "cp866",
-  "869": "cp869",
-  "874": "windows874",
-  "922": "cp922",
-  "1046": "cp1046",
-  "1124": "cp1124",
-  "1125": "cp1125",
-  "1129": "cp1129",
-  "1133": "cp1133",
-  "1161": "cp1161",
-  "1162": "cp1162",
-  "1163": "cp1163",
-  "1250": "windows1250",
-  "1251": "windows1251",
-  "1252": "windows1252",
-  "1253": "windows1253",
-  "1254": "windows1254",
-  "1255": "windows1255",
-  "1256": "windows1256",
-  "1257": "windows1257",
-  "1258": "windows1258",
-  "28591": "iso88591",
-  "28592": "iso88592",
-  "28593": "iso88593",
-  "28594": "iso88594",
-  "28595": "iso88595",
-  "28596": "iso88596",
-  "28597": "iso88597",
-  "28598": "iso88598",
-  "28599": "iso88599",
-  "28600": "iso885910",
-  "28601": "iso885911",
-  "28603": "iso885913",
-  "28604": "iso885914",
-  "28605": "iso885915",
-  "28606": "iso885916",
-  "windows874": {
-    "type": "_sbcs",
-    "chars": "€����…�����������‘’“”•–—�������� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
-  },
-  "win874": "windows874",
-  "cp874": "windows874",
-  "windows1250": {
-    "type": "_sbcs",
-    "chars": "€�‚�„…†‡�‰Š‹ŚŤŽŹ�‘’“”•–—�™š›śťžź ˇ˘Ł¤Ą¦§¨©Ş«¬­®Ż°±˛ł´µ¶·¸ąş»Ľ˝ľżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙"
-  },
-  "win1250": "windows1250",
-  "cp1250": "windows1250",
-  "windows1251": {
-    "type": "_sbcs",
-    "chars": "ЂЃ‚ѓ„…†‡€‰Љ‹ЊЌЋЏђ‘’“”•–—�™љ›њќћџ ЎўЈ¤Ґ¦§Ё©Є«¬­®Ї°±Ііґµ¶·ё№є»јЅѕїАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"
-  },
-  "win1251": "windows1251",
-  "cp1251": "windows1251",
-  "windows1252": {
-    "type": "_sbcs",
-    "chars": "€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
-  },
-  "win1252": "windows1252",
-  "cp1252": "windows1252",
-  "windows1253": {
-    "type": "_sbcs",
-    "chars": "€�‚ƒ„…†‡�‰�‹�����‘’“”•–—�™�›���� ΅Ά£¤¥¦§¨©�«¬­®―°±²³΄µ¶·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�"
-  },
-  "win1253": "windows1253",
-  "cp1253": "windows1253",
-  "windows1254": {
-    "type": "_sbcs",
-    "chars": "€�‚ƒ„…†‡ˆ‰Š‹Œ����‘’“”•–—˜™š›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ"
-  },
-  "win1254": "windows1254",
-  "cp1254": "windows1254",
-  "windows1255": {
-    "type": "_sbcs",
-    "chars": "€�‚ƒ„…†‡ˆ‰�‹�����‘’“”•–—˜™�›���� ¡¢£₪¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾¿ְֱֲֳִֵֶַָֹֺֻּֽ־ֿ׀ׁׂ׃װױײ׳״�������אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�"
-  },
-  "win1255": "windows1255",
-  "cp1255": "windows1255",
-  "windows1256": {
-    "type": "_sbcs",
-    "chars": "€پ‚ƒ„…†‡ˆ‰ٹ‹Œچژڈگ‘’“”•–—ک™ڑ›œ‌‍ں ،¢£¤¥¦§¨©ھ«¬­®¯°±²³´µ¶·¸¹؛»¼½¾؟ہءآأؤإئابةتثجحخدذرزسشصض×طظعغـفقكàلâمنهوçèéêëىيîïًٌٍَôُِ÷ّùْûü‎‏ے"
-  },
-  "win1256": "windows1256",
-  "cp1256": "windows1256",
-  "windows1257": {
-    "type": "_sbcs",
-    "chars": "€�‚�„…†‡�‰�‹�¨ˇ¸�‘’“”•–—�™�›�¯˛� �¢£¤�¦§Ø©Ŗ«¬­®Æ°±²³´µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž˙"
-  },
-  "win1257": "windows1257",
-  "cp1257": "windows1257",
-  "windows1258": {
-    "type": "_sbcs",
-    "chars": "€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“”•–—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ"
-  },
-  "win1258": "windows1258",
-  "cp1258": "windows1258",
-  "iso88591": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
-  },
-  "cp28591": "iso88591",
-  "iso88592": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ą˘Ł¤ĽŚ§¨ŠŞŤŹ­ŽŻ°ą˛ł´ľśˇ¸šşťź˝žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙"
-  },
-  "cp28592": "iso88592",
-  "iso88593": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ħ˘£¤�Ĥ§¨İŞĞĴ­�Ż°ħ²³´µĥ·¸ışğĵ½�żÀÁÂ�ÄĊĈÇÈÉÊËÌÍÎÏ�ÑÒÓÔĠÖ×ĜÙÚÛÜŬŜßàáâ�äċĉçèéêëìíîï�ñòóôġö÷ĝùúûüŭŝ˙"
-  },
-  "cp28593": "iso88593",
-  "iso88594": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄĸŖ¤ĨĻ§¨ŠĒĢŦ­Ž¯°ą˛ŗ´ĩļˇ¸šēģŧŊžŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎĪĐŅŌĶÔÕÖ×ØŲÚÛÜŨŪßāáâãäåæįčéęëėíîīđņōķôõö÷øųúûüũū˙"
-  },
-  "cp28594": "iso88594",
-  "iso88595": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ЁЂЃЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђѓєѕіїјљњћќ§ўџ"
-  },
-  "cp28595": "iso88595",
-  "iso88596": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ���¤�������،­�������������؛���؟�ءآأؤإئابةتثجحخدذرزسشصضطظعغ�����ـفقكلمنهوىيًٌٍَُِّْ�������������"
-  },
-  "cp28596": "iso88596",
-  "iso88597": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ‘’£€₯¦§¨©ͺ«¬­�―°±²³΄΅Ά·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�"
-  },
-  "cp28597": "iso88597",
-  "iso88598": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ �¢£¤¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾��������������������������������‗אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�"
-  },
-  "cp28598": "iso88598",
-  "iso88599": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ"
-  },
-  "cp28599": "iso88599",
-  "iso885910": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄĒĢĪĨĶ§ĻĐŠŦŽ­ŪŊ°ąēģīĩķ·ļđšŧž―ūŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎÏÐŅŌÓÔÕÖŨØŲÚÛÜÝÞßāáâãäåæįčéęëėíîïðņōóôõöũøųúûüýþĸ"
-  },
-  "cp28600": "iso885910",
-  "iso885911": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
-  },
-  "cp28601": "iso885911",
-  "iso885913": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ”¢£¤„¦§Ø©Ŗ«¬­®Æ°±²³“µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž’"
-  },
-  "cp28603": "iso885913",
-  "iso885914": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ḃḃ£ĊċḊ§Ẁ©ẂḋỲ­®ŸḞḟĠġṀṁ¶ṖẁṗẃṠỳẄẅṡÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŴÑÒÓÔÕÖṪØÙÚÛÜÝŶßàáâãäåæçèéêëìíîïŵñòóôõöṫøùúûüýŷÿ"
-  },
-  "cp28604": "iso885914",
-  "iso885915": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
-  },
-  "cp28605": "iso885915",
-  "iso885916": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄąŁ€„Š§š©Ș«Ź­źŻ°±ČłŽ”¶·žčș»ŒœŸżÀÁÂĂÄĆÆÇÈÉÊËÌÍÎÏĐŃÒÓÔŐÖŚŰÙÚÛÜĘȚßàáâăäćæçèéêëìíîïđńòóôőöśűùúûüęțÿ"
-  },
-  "cp28606": "iso885916",
-  "cp437": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-  },
-  "ibm437": "cp437",
-  "csibm437": "cp437",
-  "cp737": {
-    "type": "_sbcs",
-    "chars": "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρσςτυφχψ░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀ωάέήϊίόύϋώΆΈΉΊΌΎΏ±≥≤ΪΫ÷≈°∙·√ⁿ²■ "
-  },
-  "ibm737": "cp737",
-  "csibm737": "cp737",
-  "cp775": {
-    "type": "_sbcs",
-    "chars": "ĆüéāäģåćłēŖŗīŹÄÅÉæÆōöĢ¢ŚśÖÜø£ØפĀĪóŻżź”¦©®¬½¼Ł«»░▒▓│┤ĄČĘĖ╣║╗╝ĮŠ┐└┴┬├─┼ŲŪ╚╔╩╦╠═╬Žąčęėįšųūž┘┌█▄▌▐▀ÓßŌŃõÕµńĶķĻļņĒŅ’­±“¾¶§÷„°∙·¹³²■ "
-  },
-  "ibm775": "cp775",
-  "csibm775": "cp775",
-  "cp850": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ðÐÊËÈıÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµþÞÚÛÙýݯ´­±‗¾¶§÷¸°¨·¹³²■ "
-  },
-  "ibm850": "cp850",
-  "csibm850": "cp850",
-  "cp852": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäůćçłëŐőîŹÄĆÉĹĺôöĽľŚśÖÜŤťŁ×čáíóúĄąŽžĘ꬟Ⱥ«»░▒▓│┤ÁÂĚŞ╣║╗╝Żż┐└┴┬├─┼Ăă╚╔╩╦╠═╬¤đĐĎËďŇÍÎě┘┌█▄ŢŮ▀ÓßÔŃńňŠšŔÚŕŰýÝţ´­˝˛ˇ˘§÷¸°¨˙űŘř■ "
-  },
-  "ibm852": "cp852",
-  "csibm852": "cp852",
-  "cp855": {
-    "type": "_sbcs",
-    "chars": "ђЂѓЃёЁєЄѕЅіІїЇјЈљЉњЊћЋќЌўЎџЏюЮъЪаАбБцЦдДеЕфФгГ«»░▒▓│┤хХиИ╣║╗╝йЙ┐└┴┬├─┼кК╚╔╩╦╠═╬¤лЛмМнНоОп┘┌█▄Пя▀ЯрРсСтТуУжЖвВьЬ№­ыЫзЗшШэЭщЩчЧ§■ "
-  },
-  "ibm855": "cp855",
-  "csibm855": "cp855",
-  "cp856": {
-    "type": "_sbcs",
-    "chars": "אבגדהוזחטיךכלםמןנסעףפץצקרשת�£�×����������®¬½¼�«»░▒▓│┤���©╣║╗╝¢¥┐└┴┬├─┼��╚╔╩╦╠═╬¤���������┘┌█▄¦�▀������µ�������¯´­±‗¾¶§÷¸°¨·¹³²■ "
-  },
-  "ibm856": "cp856",
-  "csibm856": "cp856",
-  "cp857": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäàåçêëèïîıÄÅÉæÆôöòûùİÖÜø£ØŞşáíóúñÑĞ𿮬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ºªÊËÈ�ÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµ�×ÚÛÙìÿ¯´­±�¾¶§÷¸°¨·¹³²■ "
-  },
-  "ibm857": "cp857",
-  "csibm857": "cp857",
-  "cp858": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ðÐÊËÈ€ÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµþÞÚÛÙýݯ´­±‗¾¶§÷¸°¨·¹³²■ "
-  },
-  "ibm858": "cp858",
-  "csibm858": "cp858",
-  "cp860": {
-    "type": "_sbcs",
-    "chars": "ÇüéâãàÁçêÊèÍÔìÃÂÉÀÈôõòÚùÌÕÜ¢£Ù₧ÓáíóúñѪº¿Ò¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-  },
-  "ibm860": "cp860",
-  "csibm860": "cp860",
-  "cp861": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäàåçêëèÐðÞÄÅÉæÆôöþûÝýÖÜø£Ø₧ƒáíóúÁÍÓÚ¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-  },
-  "ibm861": "cp861",
-  "csibm861": "cp861",
-  "cp862": {
-    "type": "_sbcs",
-    "chars": "אבגדהוזחטיךכלםמןנסעףפץצקרשת¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-  },
-  "ibm862": "cp862",
-  "csibm862": "cp862",
-  "cp863": {
-    "type": "_sbcs",
-    "chars": "ÇüéâÂà¶çêëèïî‗À§ÉÈÊôËÏûù¤ÔÜ¢£ÙÛƒ¦´óú¨¸³¯Î⌐¬½¼¾«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-  },
-  "ibm863": "cp863",
-  "csibm863": "cp863",
-  "cp864": {
-    "type": "_sbcs",
-    "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$٪&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~°·∙√▒─│┼┤┬├┴┐┌└┘β∞φ±½¼≈«»ﻷﻸ��ﻻﻼ� ­ﺂ£¤ﺄ��ﺎﺏﺕﺙ،ﺝﺡﺥ٠١٢٣٤٥٦٧٨٩ﻑ؛ﺱﺵﺹ؟¢ﺀﺁﺃﺅﻊﺋﺍﺑﺓﺗﺛﺟﺣﺧﺩﺫﺭﺯﺳﺷﺻﺿﻁﻅﻋﻏ¦¬÷×ﻉـﻓﻗﻛﻟﻣﻧﻫﻭﻯﻳﺽﻌﻎﻍﻡﹽّﻥﻩﻬﻰﻲﻐﻕﻵﻶﻝﻙﻱ■�"
-  },
-  "ibm864": "cp864",
-  "csibm864": "cp864",
-  "cp865": {
-    "type": "_sbcs",
-    "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø₧ƒáíóúñѪº¿⌐¬½¼¡«¤░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-  },
-  "ibm865": "cp865",
-  "csibm865": "cp865",
-  "cp866": {
-    "type": "_sbcs",
-    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№¤■ "
-  },
-  "ibm866": "cp866",
-  "csibm866": "cp866",
-  "cp869": {
-    "type": "_sbcs",
-    "chars": "������Ά�·¬¦‘’Έ―ΉΊΪΌ��ΎΫ©Ώ²³ά£έήίϊΐόύΑΒΓΔΕΖΗ½ΘΙ«»░▒▓│┤ΚΛΜΝ╣║╗╝ΞΟ┐└┴┬├─┼ΠΡ╚╔╩╦╠═╬ΣΤΥΦΧΨΩαβγ┘┌█▄δε▀ζηθικλμνξοπρσςτ΄­±υφχ§ψ΅°¨ωϋΰώ■ "
-  },
-  "ibm869": "cp869",
-  "csibm869": "cp869",
-  "cp922": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®‾°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŠÑÒÓÔÕÖ×ØÙÚÛÜÝŽßàáâãäåæçèéêëìíîïšñòóôõö÷øùúûüýžÿ"
-  },
-  "ibm922": "cp922",
-  "csibm922": "cp922",
-  "cp1046": {
-    "type": "_sbcs",
-    "chars": "ﺈ×÷ﹱˆ■│─┐┌└┘ﹹﹻﹽﹿﹷﺊﻰﻳﻲﻎﻏﻐﻶﻸﻺﻼ ¤ﺋﺑﺗﺛﺟﺣ،­ﺧﺳ٠١٢٣٤٥٦٧٨٩ﺷ؛ﺻﺿﻊ؟ﻋءآأؤإئابةتثجحخدذرزسشصضطﻇعغﻌﺂﺄﺎﻓـفقكلمنهوىيًٌٍَُِّْﻗﻛﻟﻵﻷﻹﻻﻣﻧﻬﻩ�"
-  },
-  "ibm1046": "cp1046",
-  "csibm1046": "cp1046",
-  "cp1124": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ЁЂҐЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђґєѕіїјљњћќ§ўџ"
-  },
-  "ibm1124": "cp1124",
-  "csibm1124": "cp1124",
-  "cp1125": {
-    "type": "_sbcs",
-    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёҐґЄєІіЇї·√№¤■ "
-  },
-  "ibm1125": "cp1125",
-  "csibm1125": "cp1125",
-  "cp1129": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§œ©ª«¬­®¯°±²³Ÿµ¶·Œ¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ"
-  },
-  "ibm1129": "cp1129",
-  "csibm1129": "cp1129",
-  "cp1133": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ກຂຄງຈສຊຍດຕຖທນບປຜຝພຟມຢຣລວຫອຮ���ຯະາຳິີຶືຸູຼັົຽ���ເແໂໃໄ່້໊໋໌ໍໆ�ໜໝ₭����������������໐໑໒໓໔໕໖໗໘໙��¢¬¦�"
-  },
-  "ibm1133": "cp1133",
-  "csibm1133": "cp1133",
-  "cp1161": {
-    "type": "_sbcs",
-    "chars": "��������������������������������่กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู้๊๋€฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛¢¬¦ "
-  },
-  "ibm1161": "cp1161",
-  "csibm1161": "cp1161",
-  "cp1162": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
-  },
-  "ibm1162": "cp1162",
-  "csibm1162": "cp1162",
-  "cp1163": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£€¥¦§œ©ª«¬­®¯°±²³Ÿµ¶·Œ¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ"
-  },
-  "ibm1163": "cp1163",
-  "csibm1163": "cp1163",
-  "maccroatian": {
-    "type": "_sbcs",
-    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®Š™´¨≠ŽØ∞±≤≥∆µ∂∑∏š∫ªºΩžø¿¡¬√ƒ≈Ć«Č… ÀÃÕŒœĐ—“”‘’÷◊�©⁄¤‹›Æ»–·‚„‰ÂćÁčÈÍÎÏÌÓÔđÒÚÛÙıˆ˜¯πË˚¸Êæˇ"
-  },
-  "maccyrillic": {
-    "type": "_sbcs",
-    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°¢£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµ∂ЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤"
-  },
-  "macgreek": {
-    "type": "_sbcs",
-    "chars": "Ĺ²É³ÖÜ΅àâä΄¨çéèê룙î‰ôö¦­ùûü†ΓΔΘΛΞΠß®©ΣΪ§≠°·Α±≤≥¥ΒΕΖΗΙΚΜΦΫΨΩάΝ¬ΟΡ≈Τ«»… ΥΧΆΈœ–―“”‘’÷ΉΊΌΎέήίόΏύαβψδεφγηιξκλμνοπώρστθωςχυζϊϋΐΰ�"
-  },
-  "maciceland": {
-    "type": "_sbcs",
-    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûüÝ°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤ÐðÞþý·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
-  },
-  "macroman": {
-    "type": "_sbcs",
-    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
-  },
-  "macromania": {
-    "type": "_sbcs",
-    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ĂŞ∞±≤≥¥µ∂∑∏π∫ªºΩăş¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›Ţţ‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
-  },
-  "macthai": {
-    "type": "_sbcs",
-    "chars": "«»…“”�•‘’� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู​–—฿เแโใไๅๆ็่้๊๋์ํ™๏๐๑๒๓๔๕๖๗๘๙®©����"
-  },
-  "macturkish": {
-    "type": "_sbcs",
-    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸĞğİıŞş‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙ�ˆ˜¯˘˙˚¸˝˛ˇ"
-  },
-  "macukraine": {
-    "type": "_sbcs",
-    "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ґ£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤"
-  },
-  "koi8r": {
-    "type": "_sbcs",
-    "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ё╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡Ё╢╣╤╥╦╧╨╩╪╫╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
-  },
-  "koi8u": {
-    "type": "_sbcs",
-    "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґ╝╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪Ґ╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
-  },
-  "koi8ru": {
-    "type": "_sbcs",
-    "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґў╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪ҐЎ©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
-  },
-  "koi8t": {
-    "type": "_sbcs",
-    "chars": "қғ‚Ғ„…†‡�‰ҳ‹ҲҷҶ�Қ‘’“”•–—�™�›�����ӯӮё¤ӣ¦§���«¬­®�°±²Ё�Ӣ¶·�№�»���©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ"
-  },
-  "armscii8": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ �և։)(»«—.՝,-֊…՜՛՞ԱաԲբԳգԴդԵեԶզԷէԸըԹթԺժԻիԼլԽխԾծԿկՀհՁձՂղՃճՄմՅյՆնՇշՈոՉչՊպՋջՌռՍսՎվՏտՐրՑցՒւՓփՔքՕօՖֆ՚�"
-  },
-  "rk1048": {
-    "type": "_sbcs",
-    "chars": "ЂЃ‚ѓ„…†‡€‰Љ‹ЊҚҺЏђ‘’“”•–—�™љ›њқһџ ҰұӘ¤Ө¦§Ё©Ғ«¬­®Ү°±Ііөµ¶·ё№ғ»әҢңүАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"
-  },
-  "tcvn": {
-    "type": "_sbcs",
-    "chars": "\u0000ÚỤ\u0003ỪỬỮ\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010ỨỰỲỶỸÝỴ\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÀẢÃÁẠẶẬÈẺẼÉẸỆÌỈĨÍỊÒỎÕÓỌỘỜỞỠỚỢÙỦŨ ĂÂÊÔƠƯĐăâêôơưđẶ̀̀̉̃́àảãáạẲằẳẵắẴẮẦẨẪẤỀặầẩẫấậèỂẻẽéẹềểễếệìỉỄẾỒĩíịòỔỏõóọồổỗốộờởỡớợùỖủũúụừửữứựỳỷỹýỵỐ"
-  },
-  "georgianacademy": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿აბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰჱჲჳჴჵჶçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
-  },
-  "georgianps": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿აბგდევზჱთიკლმნჲოპჟრსტჳუფქღყშჩცძწჭხჴჯჰჵæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
-  },
-  "pt154": {
-    "type": "_sbcs",
-    "chars": "ҖҒӮғ„…ҶҮҲүҠӢҢҚҺҸҗ‘’“”•–—ҳҷҡӣңқһҹ ЎўЈӨҘҰ§Ё©Ә«¬ӯ®Ҝ°ұІіҙө¶·ё№ә»јҪҫҝАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"
-  },
-  "viscii": {
-    "type": "_sbcs",
-    "chars": "\u0000\u0001Ẳ\u0003\u0004ẴẪ\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013Ỷ\u0015\u0016\u0017\u0018Ỹ\u001a\u001b\u001c\u001dỴ\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ẠẮẰẶẤẦẨẬẼẸẾỀỂỄỆỐỒỔỖỘỢỚỜỞỊỎỌỈỦŨỤỲÕắằặấầẩậẽẹếềểễệốồổỗỠƠộờởịỰỨỪỬơớƯÀÁÂÃẢĂẳẵÈÉÊẺÌÍĨỳĐứÒÓÔạỷừửÙÚỹỵÝỡưàáâãảăữẫèéêẻìíĩỉđựòóôõỏọụùúũủýợỮ"
-  },
-  "iso646cn": {
-    "type": "_sbcs",
-    "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#¥%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}‾��������������������������������������������������������������������������������������������������������������������������������"
-  },
-  "iso646jp": {
-    "type": "_sbcs",
-    "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[¥]^_`abcdefghijklmnopqrstuvwxyz{|}‾��������������������������������������������������������������������������������������������������������������������������������"
-  },
-  "hproman8": {
-    "type": "_sbcs",
-    "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ÀÂÈÊËÎÏ´ˋˆ¨˜ÙÛ₤¯Ýý°ÇçÑñ¡¿¤£¥§ƒ¢âêôûáéóúàèòùäëöüÅîØÆåíøæÄìÖÜÉïßÔÁÃãÐðÍÌÓÒÕõŠšÚŸÿÞþ·µ¶¾—¼½ªº«■»±�"
-  },
-  "macintosh": {
-    "type": "_sbcs",
-    "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ"
-  },
-  "ascii": {
-    "type": "_sbcs",
-    "chars": "��������������������������������������������������������������������������������������������������������������������������������"
-  },
-  "tis620": {
-    "type": "_sbcs",
-    "chars": "���������������������������������กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����"
-  }
-}
-
-/***/ }),
-/* 716 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// Manually added data to be used by sbcs codec in addition to generated one.
-
-module.exports = {
-    // Not supported by iconv, not sure why.
-    "10029": "maccenteuro",
-    "maccenteuro": {
-        "type": "_sbcs",
-        "chars": "ÄĀāÉĄÖÜáąČäčĆć鏟ĎíďĒēĖóėôöõúĚěü†°Ę£§•¶ß®©™ę¨≠ģĮįĪ≤≥īĶ∂∑łĻļĽľĹĺŅņѬ√ńŇ∆«»… ňŐÕőŌ–—“”‘’÷◊ōŔŕŘ‹›řŖŗŠ‚„šŚśÁŤťÍŽžŪÓÔūŮÚůŰűŲųÝýķŻŁżĢˇ"
-    },
-
-    "808": "cp808",
-    "ibm808": "cp808",
-    "cp808": {
-        "type": "_sbcs",
-        "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№€■ "
-    },
-
-    "mik": {
-        "type": "_sbcs",
-        "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя└┴┬├─┼╣║╚╔╩╦╠═╬┐░▒▓│┤№§╗╝┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ "
-    },
-
-    // Aliases of generated encodings.
-    "ascii8bit": "ascii",
-    "usascii": "ascii",
-    "ansix34": "ascii",
-    "ansix341968": "ascii",
-    "ansix341986": "ascii",
-    "csascii": "ascii",
-    "cp367": "ascii",
-    "ibm367": "ascii",
-    "isoir6": "ascii",
-    "iso646us": "ascii",
-    "iso646irv": "ascii",
-    "us": "ascii",
-
-    "latin1": "iso88591",
-    "latin2": "iso88592",
-    "latin3": "iso88593",
-    "latin4": "iso88594",
-    "latin5": "iso88599",
-    "latin6": "iso885910",
-    "latin7": "iso885913",
-    "latin8": "iso885914",
-    "latin9": "iso885915",
-    "latin10": "iso885916",
-
-    "csisolatin1": "iso88591",
-    "csisolatin2": "iso88592",
-    "csisolatin3": "iso88593",
-    "csisolatin4": "iso88594",
-    "csisolatincyrillic": "iso88595",
-    "csisolatinarabic": "iso88596",
-    "csisolatingreek" : "iso88597",
-    "csisolatinhebrew": "iso88598",
-    "csisolatin5": "iso88599",
-    "csisolatin6": "iso885910",
-
-    "l1": "iso88591",
-    "l2": "iso88592",
-    "l3": "iso88593",
-    "l4": "iso88594",
-    "l5": "iso88599",
-    "l6": "iso885910",
-    "l7": "iso885913",
-    "l8": "iso885914",
-    "l9": "iso885915",
-    "l10": "iso885916",
-
-    "isoir14": "iso646jp",
-    "isoir57": "iso646cn",
-    "isoir100": "iso88591",
-    "isoir101": "iso88592",
-    "isoir109": "iso88593",
-    "isoir110": "iso88594",
-    "isoir144": "iso88595",
-    "isoir127": "iso88596",
-    "isoir126": "iso88597",
-    "isoir138": "iso88598",
-    "isoir148": "iso88599",
-    "isoir157": "iso885910",
-    "isoir166": "tis620",
-    "isoir179": "iso885913",
-    "isoir199": "iso885914",
-    "isoir203": "iso885915",
-    "isoir226": "iso885916",
-
-    "cp819": "iso88591",
-    "ibm819": "iso88591",
-
-    "cyrillic": "iso88595",
-
-    "arabic": "iso88596",
-    "arabic8": "iso88596",
-    "ecma114": "iso88596",
-    "asmo708": "iso88596",
-
-    "greek" : "iso88597",
-    "greek8" : "iso88597",
-    "ecma118" : "iso88597",
-    "elot928" : "iso88597",
-
-    "hebrew": "iso88598",
-    "hebrew8": "iso88598",
-
-    "turkish": "iso88599",
-    "turkish8": "iso88599",
-
-    "thai": "iso885911",
-    "thai8": "iso885911",
-
-    "celtic": "iso885914",
-    "celtic8": "iso885914",
-    "isoceltic": "iso885914",
-
-    "tis6200": "tis620",
-    "tis62025291": "tis620",
-    "tis62025330": "tis620",
-
-    "10000": "macroman",
-    "10006": "macgreek",
-    "10007": "maccyrillic",
-    "10079": "maciceland",
-    "10081": "macturkish",
-
-    "cspc8codepage437": "cp437",
-    "cspc775baltic": "cp775",
-    "cspc850multilingual": "cp850",
-    "cspcp852": "cp852",
-    "cspc862latinhebrew": "cp862",
-    "cpgr": "cp869",
-
-    "msee": "cp1250",
-    "mscyrl": "cp1251",
-    "msansi": "cp1252",
-    "msgreek": "cp1253",
-    "msturk": "cp1254",
-    "mshebr": "cp1255",
-    "msarab": "cp1256",
-    "winbaltrim": "cp1257",
-
-    "cp20866": "koi8r",
-    "20866": "koi8r",
-    "ibm878": "koi8r",
-    "cskoi8r": "koi8r",
-
-    "cp21866": "koi8u",
-    "21866": "koi8u",
-    "ibm1168": "koi8u",
-
-    "strk10482002": "rk1048",
-
-    "tcvn5712": "tcvn",
-    "tcvn57121": "tcvn",
-
-    "gb198880": "iso646cn",
-    "cn": "iso646cn",
-
-    "csiso14jisc6220ro": "iso646jp",
-    "jisc62201969ro": "iso646jp",
-    "jp": "iso646jp",
-
-    "cshproman8": "hproman8",
-    "r8": "hproman8",
-    "roman8": "hproman8",
-    "xroman8": "hproman8",
-    "ibm1051": "hproman8",
-
-    "mac": "macintosh",
-    "csmacintosh": "macintosh",
-};
-
-
-
-/***/ }),
-/* 717 */
-/***/ (function(module, exports) {
-
-module.exports = [["8740","䏰䰲䘃䖦䕸𧉧䵷䖳𧲱䳢𧳅㮕䜶䝄䱇䱀𤊿𣘗𧍒𦺋𧃒䱗𪍑䝏䗚䲅𧱬䴇䪤䚡𦬣爥𥩔𡩣𣸆𣽡晍囻"],["8767","綕夝𨮹㷴霴𧯯寛𡵞媤㘥𩺰嫑宷峼杮薓𩥅瑡璝㡵𡵓𣚞𦀡㻬"],["87a1","𥣞㫵竼龗𤅡𨤍𣇪𠪊𣉞䌊蒄龖鐯䤰蘓墖靊鈘秐稲晠権袝瑌篅枂稬剏遆㓦珄𥶹瓆鿇垳䤯呌䄱𣚎堘穲𧭥讏䚮𦺈䆁𥶙箮𢒼鿈𢓁𢓉𢓌鿉蔄𣖻䂴鿊䓡𪷿拁灮鿋"],["8840","㇀",4,"𠄌㇅𠃑𠃍㇆㇇𠃋𡿨㇈𠃊㇉㇊㇋㇌𠄎㇍㇎ĀÁǍÀĒÉĚÈŌÓǑÒ࿿Ê̄Ế࿿Ê̌ỀÊāáǎàɑēéěèīíǐìōóǒòūúǔùǖǘǚ"],["88a1","ǜü࿿ê̄ế࿿ê̌ềêɡ⏚⏛"],["8940","𪎩𡅅"],["8943","攊"],["8946","丽滝鵎釟"],["894c","𧜵撑会伨侨兖兴农凤务动医华发变团声处备夲头学实実岚庆总斉柾栄桥济炼电纤纬纺织经统缆缷艺苏药视设询车轧轮"],["89a1","琑糼緍楆竉刧"],["89ab","醌碸酞肼"],["89b0","贋胶𠧧"],["89b5","肟黇䳍鷉鸌䰾𩷶𧀎鸊𪄳㗁"],["89c1","溚舾甙"],["89c5","䤑马骏龙禇𨑬𡷊𠗐𢫦两亁亀亇亿仫伷㑌侽㹈倃傈㑽㒓㒥円夅凛凼刅争剹劐匧㗇厩㕑厰㕓参吣㕭㕲㚁咓咣咴咹哐哯唘唣唨㖘唿㖥㖿嗗㗅"],["8a40","𧶄唥"],["8a43","𠱂𠴕𥄫喐𢳆㧬𠍁蹆𤶸𩓥䁓𨂾睺𢰸㨴䟕𨅝𦧲𤷪擝𠵼𠾴𠳕𡃴撍蹾𠺖𠰋𠽤𢲩𨉖𤓓"],["8a64","𠵆𩩍𨃩䟴𤺧𢳂骲㩧𩗴㿭㔆𥋇𩟔𧣈𢵄鵮頕"],["8a76","䏙𦂥撴哣𢵌𢯊𡁷㧻𡁯"],["8aa1","𦛚𦜖𧦠擪𥁒𠱃蹨𢆡𨭌𠜱"],["8aac","䠋𠆩㿺塳𢶍"],["8ab2","𤗈𠓼𦂗𠽌𠶖啹䂻䎺"],["8abb","䪴𢩦𡂝膪飵𠶜捹㧾𢝵跀嚡摼㹃"],["8ac9","𪘁𠸉𢫏𢳉"],["8ace","𡃈𣧂㦒㨆𨊛㕸𥹉𢃇噒𠼱𢲲𩜠㒼氽𤸻"],["8adf","𧕴𢺋𢈈𪙛𨳍𠹺𠰴𦠜羓𡃏𢠃𢤹㗻𥇣𠺌𠾍𠺪㾓𠼰𠵇𡅏𠹌"],["8af6","𠺫𠮩𠵈𡃀𡄽㿹𢚖搲𠾭"],["8b40","𣏴𧘹𢯎𠵾𠵿𢱑𢱕㨘𠺘𡃇𠼮𪘲𦭐𨳒𨶙𨳊閪哌苄喹"],["8b55","𩻃鰦骶𧝞𢷮煀腭胬尜𦕲脴㞗卟𨂽醶𠻺𠸏𠹷𠻻㗝𤷫㘉𠳖嚯𢞵𡃉𠸐𠹸𡁸𡅈𨈇𡑕𠹹𤹐𢶤婔𡀝𡀞𡃵𡃶垜𠸑"],["8ba1","𧚔𨋍𠾵𠹻𥅾㜃𠾶𡆀𥋘𪊽𤧚𡠺𤅷𨉼墙剨㘚𥜽箲孨䠀䬬鼧䧧鰟鮍𥭴𣄽嗻㗲嚉丨夂𡯁屮靑𠂆乛亻㔾尣彑忄㣺扌攵歺氵氺灬爫丬犭𤣩罒礻糹罓𦉪㓁"],["8bde","𦍋耂肀𦘒𦥑卝衤见𧢲讠贝钅镸长门𨸏韦页风飞饣𩠐鱼鸟黄歯龜丷𠂇阝户钢"],["8c40","倻淾𩱳龦㷉袏𤅎灷峵䬠𥇍㕙𥴰愢𨨲辧釶熑朙玺𣊁𪄇㲋𡦀䬐磤琂冮𨜏䀉橣𪊺䈣蘏𠩯稪𩥇𨫪靕灍匤𢁾鏴盙𨧣龧矝亣俰傼丯众龨吴綋墒壐𡶶庒庙忂𢜒斋"],["8ca1","𣏹椙橃𣱣泿"],["8ca7","爀𤔅玌㻛𤨓嬕璹讃𥲤𥚕窓篬糃繬苸薗龩袐龪躹龫迏蕟駠鈡龬𨶹𡐿䁱䊢娚"],["8cc9","顨杫䉶圽"],["8cce","藖𤥻芿𧄍䲁𦵴嵻𦬕𦾾龭龮宖龯曧繛湗秊㶈䓃𣉖𢞖䎚䔶"],["8ce6","峕𣬚諹屸㴒𣕑嵸龲煗䕘𤃬𡸣䱷㥸㑊𠆤𦱁諌侴𠈹妿腬顖𩣺弻"],["8d40","𠮟"],["8d42","𢇁𨥭䄂䚻𩁹㼇龳𪆵䃸㟖䛷𦱆䅼𨚲𧏿䕭㣔𥒚䕡䔛䶉䱻䵶䗪㿈𤬏㙡䓞䒽䇭崾嵈嵖㷼㠏嶤嶹㠠㠸幂庽弥徃㤈㤔㤿㥍惗愽峥㦉憷憹懏㦸戬抐拥挘㧸嚱"],["8da1","㨃揢揻搇摚㩋擀崕嘡龟㪗斆㪽旿晓㫲暒㬢朖㭂枤栀㭘桊梄㭲㭱㭻椉楃牜楤榟榅㮼槖㯝橥橴橱檂㯬檙㯲檫檵櫔櫶殁毁毪汵沪㳋洂洆洦涁㳯涤涱渕渘温溆𨧀溻滢滚齿滨滩漤漴㵆𣽁澁澾㵪㵵熷岙㶊瀬㶑灐灔灯灿炉𠌥䏁㗱𠻘"],["8e40","𣻗垾𦻓焾𥟠㙎榢𨯩孴穉𥣡𩓙穥穽𥦬窻窰竂竃燑𦒍䇊竚竝竪䇯咲𥰁笋筕笩𥌎𥳾箢筯莜𥮴𦱿篐萡箒箸𥴠㶭𥱥蒒篺簆簵𥳁籄粃𤢂粦晽𤕸糉糇糦籴糳糵糎"],["8ea1","繧䔝𦹄絝𦻖璍綉綫焵綳緒𤁗𦀩緤㴓緵𡟹緥𨍭縝𦄡𦅚繮纒䌫鑬縧罀罁罇礶𦋐駡羗𦍑羣𡙡𠁨䕜𣝦䔃𨌺翺𦒉者耈耝耨耯𪂇𦳃耻耼聡𢜔䦉𦘦𣷣𦛨朥肧𨩈脇脚墰𢛶汿𦒘𤾸擧𡒊舘𡡞橓𤩥𤪕䑺舩𠬍𦩒𣵾俹𡓽蓢荢𦬊𤦧𣔰𡝳𣷸芪椛芳䇛"],["8f40","蕋苐茚𠸖𡞴㛁𣅽𣕚艻苢茘𣺋𦶣𦬅𦮗𣗎㶿茝嗬莅䔋𦶥莬菁菓㑾𦻔橗蕚㒖𦹂𢻯葘𥯤葱㷓䓤檧葊𣲵祘蒨𦮖𦹷𦹃蓞萏莑䒠蒓蓤𥲑䉀𥳀䕃蔴嫲𦺙䔧蕳䔖枿蘖"],["8fa1","𨘥𨘻藁𧂈蘂𡖂𧃍䕫䕪蘨㙈𡢢号𧎚虾蝱𪃸蟮𢰧螱蟚蠏噡虬桖䘏衅衆𧗠𣶹𧗤衞袜䙛袴袵揁装睷𧜏覇覊覦覩覧覼𨨥觧𧤤𧪽誜瞓釾誐𧩙竩𧬺𣾏䜓𧬸煼謌謟𥐰𥕥謿譌譍誩𤩺讐讛誯𡛟䘕衏貛𧵔𧶏貫㜥𧵓賖𧶘𧶽贒贃𡤐賛灜贑𤳉㻐起"],["9040","趩𨀂𡀔𤦊㭼𨆼𧄌竧躭躶軃鋔輙輭𨍥𨐒辥錃𪊟𠩐辳䤪𨧞𨔽𣶻廸𣉢迹𪀔𨚼𨔁𢌥㦀𦻗逷𨔼𧪾遡𨕬𨘋邨𨜓郄𨛦邮都酧㫰醩釄粬𨤳𡺉鈎沟鉁鉢𥖹銹𨫆𣲛𨬌𥗛"],["90a1","𠴱錬鍫𨫡𨯫炏嫃𨫢𨫥䥥鉄𨯬𨰹𨯿鍳鑛躼閅閦鐦閠濶䊹𢙺𨛘𡉼𣸮䧟氜陻隖䅬隣𦻕懚隶磵𨫠隽双䦡𦲸𠉴𦐐𩂯𩃥𤫑𡤕𣌊霱虂霶䨏䔽䖅𤫩灵孁霛靜𩇕靗孊𩇫靟鐥僐𣂷𣂼鞉鞟鞱鞾韀韒韠𥑬韮琜𩐳響韵𩐝𧥺䫑頴頳顋顦㬎𧅵㵑𠘰𤅜"],["9140","𥜆飊颷飈飇䫿𦴧𡛓喰飡飦飬鍸餹𤨩䭲𩡗𩤅駵騌騻騐驘𥜥㛄𩂱𩯕髠髢𩬅髴䰎鬔鬭𨘀倴鬴𦦨㣃𣁽魐魀𩴾婅𡡣鮎𤉋鰂鯿鰌𩹨鷔𩾷𪆒𪆫𪃡𪄣𪇟鵾鶃𪄴鸎梈"],["91a1","鷄𢅛𪆓𪈠𡤻𪈳鴹𪂹𪊴麐麕麞麢䴴麪麯𤍤黁㭠㧥㴝伲㞾𨰫鼂鼈䮖鐤𦶢鼗鼖鼹嚟嚊齅馸𩂋韲葿齢齩竜龎爖䮾𤥵𤦻煷𤧸𤍈𤩑玞𨯚𡣺禟𨥾𨸶鍩鏳𨩄鋬鎁鏋𨥬𤒹爗㻫睲穃烐𤑳𤏸煾𡟯炣𡢾𣖙㻇𡢅𥐯𡟸㜢𡛻𡠹㛡𡝴𡣑𥽋㜣𡛀坛𤨥𡏾𡊨"],["9240","𡏆𡒶蔃𣚦蔃葕𤦔𧅥𣸱𥕜𣻻𧁒䓴𣛮𩦝𦼦柹㜳㰕㷧塬𡤢栐䁗𣜿𤃡𤂋𤄏𦰡哋嚞𦚱嚒𠿟𠮨𠸍鏆𨬓鎜仸儫㠙𤐶亼𠑥𠍿佋侊𥙑婨𠆫𠏋㦙𠌊𠐔㐵伩𠋀𨺳𠉵諚𠈌亘"],["92a1","働儍侢伃𤨎𣺊佂倮偬傁俌俥偘僼兙兛兝兞湶𣖕𣸹𣺿浲𡢄𣺉冨凃𠗠䓝𠒣𠒒𠒑赺𨪜𠜎剙劤𠡳勡鍮䙺熌𤎌𠰠𤦬𡃤槑𠸝瑹㻞璙琔瑖玘䮎𤪼𤂍叐㖄爏𤃉喴𠍅响𠯆圝鉝雴鍦埝垍坿㘾壋媙𨩆𡛺𡝯𡜐娬妸銏婾嫏娒𥥆𡧳𡡡𤊕㛵洅瑃娡𥺃"],["9340","媁𨯗𠐓鏠璌𡌃焅䥲鐈𨧻鎽㞠尞岞幞幈𡦖𡥼𣫮廍孏𡤃𡤄㜁𡢠㛝𡛾㛓脪𨩇𡶺𣑲𨦨弌弎𡤧𡞫婫𡜻孄蘔𧗽衠恾𢡠𢘫忛㺸𢖯𢖾𩂈𦽳懀𠀾𠁆𢘛憙憘恵𢲛𢴇𤛔𩅍"],["93a1","摱𤙥𢭪㨩𢬢𣑐𩣪𢹸挷𪑛撶挱揑𤧣𢵧护𢲡搻敫楲㯴𣂎𣊭𤦉𣊫唍𣋠𡣙𩐿曎𣊉𣆳㫠䆐𥖄𨬢𥖏𡛼𥕛𥐥磮𣄃𡠪𣈴㑤𣈏𣆂𤋉暎𦴤晫䮓昰𧡰𡷫晣𣋒𣋡昞𥡲㣑𣠺𣞼㮙𣞢𣏾瓐㮖枏𤘪梶栞㯄檾㡣𣟕𤒇樳橒櫉欅𡤒攑梘橌㯗橺歗𣿀𣲚鎠鋲𨯪𨫋"],["9440","銉𨀞𨧜鑧涥漋𤧬浧𣽿㶏渄𤀼娽渊塇洤硂焻𤌚𤉶烱牐犇犔𤞏𤜥兹𤪤𠗫瑺𣻸𣙟𤩊𤤗𥿡㼆㺱𤫟𨰣𣼵悧㻳瓌琼鎇琷䒟𦷪䕑疃㽣𤳙𤴆㽘畕癳𪗆㬙瑨𨫌𤦫𤦎㫻"],["94a1","㷍𤩎㻿𤧅𤣳釺圲鍂𨫣𡡤僟𥈡𥇧睸𣈲眎眏睻𤚗𣞁㩞𤣰琸璛㺿𤪺𤫇䃈𤪖𦆮錇𥖁砞碍碈磒珐祙𧝁𥛣䄎禛蒖禥樭𣻺稺秴䅮𡛦䄲鈵秱𠵌𤦌𠊙𣶺𡝮㖗啫㕰㚪𠇔𠰍竢婙𢛵𥪯𥪜娍𠉛磰娪𥯆竾䇹籝籭䈑𥮳𥺼𥺦糍𤧹𡞰粎籼粮檲緜縇緓罎𦉡"],["9540","𦅜𧭈綗𥺂䉪𦭵𠤖柖𠁎𣗏埄𦐒𦏸𤥢翝笧𠠬𥫩𥵃笌𥸎駦虅驣樜𣐿㧢𤧷𦖭騟𦖠蒀𧄧𦳑䓪脷䐂胆脉腂𦞴飃𦩂艢艥𦩑葓𦶧蘐𧈛媆䅿𡡀嬫𡢡嫤𡣘蚠蜨𣶏蠭𧐢娂"],["95a1","衮佅袇袿裦襥襍𥚃襔𧞅𧞄𨯵𨯙𨮜𨧹㺭蒣䛵䛏㟲訽訜𩑈彍鈫𤊄旔焩烄𡡅鵭貟賩𧷜妚矃姰䍮㛔踪躧𤰉輰轊䋴汘澻𢌡䢛潹溋𡟚鯩㚵𤤯邻邗啱䤆醻鐄𨩋䁢𨫼鐧𨰝𨰻蓥訫閙閧閗閖𨴴瑅㻂𤣿𤩂𤏪㻧𣈥随𨻧𨹦𨹥㻌𤧭𤩸𣿮琒瑫㻼靁𩂰"],["9640","桇䨝𩂓𥟟靝鍨𨦉𨰦𨬯𦎾銺嬑譩䤼珹𤈛鞛靱餸𠼦巁𨯅𤪲頟𩓚鋶𩗗釥䓀𨭐𤩧𨭤飜𨩅㼀鈪䤥萔餻饍𧬆㷽馛䭯馪驜𨭥𥣈檏騡嫾騯𩣱䮐𩥈馼䮽䮗鍽塲𡌂堢𤦸"],["96a1","𡓨硄𢜟𣶸棅㵽鑘㤧慐𢞁𢥫愇鱏鱓鱻鰵鰐魿鯏𩸭鮟𪇵𪃾鴡䲮𤄄鸘䲰鴌𪆴𪃭𪃳𩤯鶥蒽𦸒𦿟𦮂藼䔳𦶤𦺄𦷰萠藮𦸀𣟗𦁤秢𣖜𣙀䤭𤧞㵢鏛銾鍈𠊿碹鉷鑍俤㑀遤𥕝砽硔碶硋𡝗𣇉𤥁㚚佲濚濙瀞瀞吔𤆵垻壳垊鴖埗焴㒯𤆬燫𦱀𤾗嬨𡞵𨩉"],["9740","愌嫎娋䊼𤒈㜬䭻𨧼鎻鎸𡣖𠼝葲𦳀𡐓𤋺𢰦𤏁妔𣶷𦝁綨𦅛𦂤𤦹𤦋𨧺鋥珢㻩璴𨭣𡢟㻡𤪳櫘珳珻㻖𤨾𤪔𡟙𤩦𠎧𡐤𤧥瑈𤤖炥𤥶銄珦鍟𠓾錱𨫎𨨖鎆𨯧𥗕䤵𨪂煫"],["97a1","𤥃𠳿嚤𠘚𠯫𠲸唂秄𡟺緾𡛂𤩐𡡒䔮鐁㜊𨫀𤦭妰𡢿𡢃𧒄媡㛢𣵛㚰鉟婹𨪁𡡢鍴㳍𠪴䪖㦊僴㵩㵌𡎜煵䋻𨈘渏𩃤䓫浗𧹏灧沯㳖𣿭𣸭渂漌㵯𠏵畑㚼㓈䚀㻚䡱姄鉮䤾轁𨰜𦯀堒埈㛖𡑒烾𤍢𤩱𢿣𡊰𢎽梹楧𡎘𣓥𧯴𣛟𨪃𣟖𣏺𤲟樚𣚭𦲷萾䓟䓎"],["9840","𦴦𦵑𦲂𦿞漗𧄉茽𡜺菭𦲀𧁓𡟛妉媂𡞳婡婱𡤅𤇼㜭姯𡜼㛇熎鎐暚𤊥婮娫𤊓樫𣻹𧜶𤑛𤋊焝𤉙𨧡侰𦴨峂𤓎𧹍𤎽樌𤉖𡌄炦焳𤏩㶥泟勇𤩏繥姫崯㷳彜𤩝𡟟綤萦"],["98a1","咅𣫺𣌀𠈔坾𠣕𠘙㿥𡾞𪊶瀃𩅛嵰玏糓𨩙𩐠俈翧狍猐𧫴猸猹𥛶獁獈㺩𧬘遬燵𤣲珡臶㻊県㻑沢国琙琞琟㻢㻰㻴㻺瓓㼎㽓畂畭畲疍㽼痈痜㿀癍㿗癴㿜発𤽜熈嘣覀塩䀝睃䀹条䁅㗛瞘䁪䁯属瞾矋売砘点砜䂨砹硇硑硦葈𥔵礳栃礲䄃"],["9940","䄉禑禙辻稆込䅧窑䆲窼艹䇄竏竛䇏両筢筬筻簒簛䉠䉺类粜䊌粸䊔糭输烀𠳏総緔緐緽羮羴犟䎗耠耥笹耮耱联㷌垴炠肷胩䏭脌猪脎脒畠脔䐁㬹腖腙腚"],["99a1","䐓堺腼膄䐥膓䐭膥埯臁臤艔䒏芦艶苊苘苿䒰荗险榊萅烵葤惣蒈䔄蒾蓡蓸蔐蔸蕒䔻蕯蕰藠䕷虲蚒蚲蛯际螋䘆䘗袮裿褤襇覑𧥧訩訸誔誴豑賔賲贜䞘塟跃䟭仮踺嗘坔蹱嗵躰䠷軎転軤軭軲辷迁迊迌逳駄䢭飠鈓䤞鈨鉘鉫銱銮銿"],["9a40","鋣鋫鋳鋴鋽鍃鎄鎭䥅䥑麿鐗匁鐝鐭鐾䥪鑔鑹锭関䦧间阳䧥枠䨤靀䨵鞲韂噔䫤惨颹䬙飱塄餎餙冴餜餷饂饝饢䭰駅䮝騼鬏窃魩鮁鯝鯱鯴䱭鰠㝯𡯂鵉鰺"],["9aa1","黾噐鶓鶽鷀鷼银辶鹻麬麱麽黆铜黢黱黸竈齄𠂔𠊷𠎠椚铃妬𠓗塀铁㞹𠗕𠘕𠙶𡚺块煳𠫂𠫍𠮿呪吆𠯋咞𠯻𠰻𠱓𠱥𠱼惧𠲍噺𠲵𠳝𠳭𠵯𠶲𠷈楕鰯螥𠸄𠸎𠻗𠾐𠼭𠹳尠𠾼帋𡁜𡁏𡁶朞𡁻𡂈𡂖㙇𡂿𡃓𡄯𡄻卤蒭𡋣𡍵𡌶讁𡕷𡘙𡟃𡟇乸炻𡠭𡥪"],["9b40","𡨭𡩅𡰪𡱰𡲬𡻈拃𡻕𡼕熘桕𢁅槩㛈𢉼𢏗𢏺𢜪𢡱𢥏苽𢥧𢦓𢫕覥𢫨辠𢬎鞸𢬿顇骽𢱌"],["9b62","𢲈𢲷𥯨𢴈𢴒𢶷𢶕𢹂𢽴𢿌𣀳𣁦𣌟𣏞徱晈暿𧩹𣕧𣗳爁𤦺矗𣘚𣜖纇𠍆墵朎"],["9ba1","椘𣪧𧙗𥿢𣸑𣺹𧗾𢂚䣐䪸𤄙𨪚𤋮𤌍𤀻𤌴𤎖𤩅𠗊凒𠘑妟𡺨㮾𣳿𤐄𤓖垈𤙴㦛𤜯𨗨𩧉㝢𢇃譞𨭎駖𤠒𤣻𤨕爉𤫀𠱸奥𤺥𤾆𠝹軚𥀬劏圿煱𥊙𥐙𣽊𤪧喼𥑆𥑮𦭒釔㑳𥔿𧘲𥕞䜘𥕢𥕦𥟇𤤿𥡝偦㓻𣏌惞𥤃䝼𨥈𥪮𥮉𥰆𡶐垡煑澶𦄂𧰒遖𦆲𤾚譢𦐂𦑊"],["9c40","嵛𦯷輶𦒄𡤜諪𤧶𦒈𣿯𦔒䯀𦖿𦚵𢜛鑥𥟡憕娧晉侻嚹𤔡𦛼乪𤤴陖涏𦲽㘘襷𦞙𦡮𦐑𦡞營𦣇筂𩃀𠨑𦤦鄄𦤹穅鷰𦧺騦𦨭㙟𦑩𠀡禃𦨴𦭛崬𣔙菏𦮝䛐𦲤画补𦶮墶"],["9ca1","㜜𢖍𧁋𧇍㱔𧊀𧊅銁𢅺𧊋錰𧋦𤧐氹钟𧑐𠻸蠧裵𢤦𨑳𡞱溸𤨪𡠠㦤㚹尐秣䔿暶𩲭𩢤襃𧟌𧡘囖䃟𡘊㦡𣜯𨃨𡏅熭荦𧧝𩆨婧䲷𧂯𨦫𧧽𧨊𧬋𧵦𤅺筃祾𨀉澵𪋟樃𨌘厢𦸇鎿栶靝𨅯𨀣𦦵𡏭𣈯𨁈嶅𨰰𨂃圕頣𨥉嶫𤦈斾槕叒𤪥𣾁㰑朶𨂐𨃴𨄮𡾡𨅏"],["9d40","𨆉𨆯𨈚𨌆𨌯𨎊㗊𨑨𨚪䣺揦𨥖砈鉕𨦸䏲𨧧䏟𨧨𨭆𨯔姸𨰉輋𨿅𩃬筑𩄐𩄼㷷𩅞𤫊运犏嚋𩓧𩗩𩖰𩖸𩜲𩣑𩥉𩥪𩧃𩨨𩬎𩵚𩶛纟𩻸𩼣䲤镇𪊓熢𪋿䶑递𪗋䶜𠲜达嗁"],["9da1","辺𢒰边𤪓䔉繿潖檱仪㓤𨬬𧢝㜺躀𡟵𨀤𨭬𨮙𧨾𦚯㷫𧙕𣲷𥘵𥥖亚𥺁𦉘嚿𠹭踎孭𣺈𤲞揞拐𡟶𡡻攰嘭𥱊吚𥌑㷆𩶘䱽嘢嘞罉𥻘奵𣵀蝰东𠿪𠵉𣚺脗鵞贘瘻鱅癎瞹鍅吲腈苷嘥脲萘肽嗪祢噃吖𠺝㗎嘅嗱曱𨋢㘭甴嗰喺咗啲𠱁𠲖廐𥅈𠹶𢱢"],["9e40","𠺢麫絚嗞𡁵抝靭咔賍燶酶揼掹揾啩𢭃鱲𢺳冚㓟𠶧冧呍唞唓癦踭𦢊疱肶蠄螆裇膶萜𡃁䓬猄𤜆宐茋𦢓噻𢛴𧴯𤆣𧵳𦻐𧊶酰𡇙鈈𣳼𪚩𠺬𠻹牦𡲢䝎𤿂𧿹𠿫䃺"],["9ea1","鱝攟𢶠䣳𤟠𩵼𠿬𠸊恢𧖣𠿭"],["9ead","𦁈𡆇熣纎鵐业丄㕷嬍沲卧㚬㧜卽㚥𤘘墚𤭮舭呋垪𥪕𠥹"],["9ec5","㩒𢑥獴𩺬䴉鯭𣳾𩼰䱛𤾩𩖞𩿞葜𣶶𧊲𦞳𣜠挮紥𣻷𣸬㨪逈勌㹴㙺䗩𠒎癀嫰𠺶硺𧼮墧䂿噼鮋嵴癔𪐴麅䳡痹㟻愙𣃚𤏲"],["9ef5","噝𡊩垧𤥣𩸆刴𧂮㖭汊鵼"],["9f40","籖鬹埞𡝬屓擓𩓐𦌵𧅤蚭𠴨𦴢𤫢𠵱"],["9f4f","凾𡼏嶎霃𡷑麁遌笟鬂峑箣扨挵髿篏鬪籾鬮籂粆鰕篼鬉鼗鰛𤤾齚啳寃俽麘俲剠㸆勑坧偖妷帒韈鶫轜呩鞴饀鞺匬愰"],["9fa1","椬叚鰊鴂䰻陁榀傦畆𡝭駚剳"],["9fae","酙隁酜"],["9fb2","酑𨺗捿𦴣櫊嘑醎畺抅𠏼獏籰𥰡𣳽"],["9fc1","𤤙盖鮝个𠳔莾衂"],["9fc9","届槀僭坺刟巵从氱𠇲伹咜哚劚趂㗾弌㗳"],["9fdb","歒酼龥鮗頮颴骺麨麄煺笔"],["9fe7","毺蠘罸"],["9feb","嘠𪙊蹷齓"],["9ff0","跔蹏鸜踁抂𨍽踨蹵竓𤩷稾磘泪詧瘇"],["a040","𨩚鼦泎蟖痃𪊲硓咢贌狢獱謭猂瓱賫𤪻蘯徺袠䒷"],["a055","𡠻𦸅"],["a058","詾𢔛"],["a05b","惽癧髗鵄鍮鮏蟵"],["a063","蠏賷猬霡鮰㗖犲䰇籑饊𦅙慙䰄麖慽"],["a073","坟慯抦戹拎㩜懢厪𣏵捤栂㗒"],["a0a1","嵗𨯂迚𨸹"],["a0a6","僙𡵆礆匲阸𠼻䁥"],["a0ae","矾"],["a0b0","糂𥼚糚稭聦聣絍甅瓲覔舚朌聢𧒆聛瓰脃眤覉𦟌畓𦻑螩蟎臈螌詉貭譃眫瓸蓚㘵榲趦"],["a0d4","覩瑨涹蟁𤀑瓧㷛煶悤憜㳑煢恷"],["a0e2","罱𨬭牐惩䭾删㰘𣳇𥻗𧙖𥔱𡥄𡋾𩤃𦷜𧂭峁𦆭𨨏𣙷𠃮𦡆𤼎䕢嬟𦍌齐麦𦉫"],["a3c0","␀",31,"␡"],["c6a1","①",9,"⑴",9,"ⅰ",9,"丶丿亅亠冂冖冫勹匸卩厶夊宀巛⼳广廴彐彡攴无疒癶辵隶¨ˆヽヾゝゞ〃仝々〆〇ー［］✽ぁ",23],["c740","す",58,"ァアィイ"],["c7a1","ゥ",81,"А",5,"ЁЖ",4],["c840","Л",26,"ёж",25,"⇧↸↹㇏𠃌乚𠂊刂䒑"],["c8a1","龰冈龱𧘇"],["c8cd","￢￤＇＂㈱№℡゛゜⺀⺄⺆⺇⺈⺊⺌⺍⺕⺜⺝⺥⺧⺪⺬⺮⺶⺼⺾⻆⻊⻌⻍⻏⻖⻗⻞⻣"],["c8f5","ʃɐɛɔɵœøŋʊɪ"],["f9fe","￭"],["fa40","𠕇鋛𠗟𣿅蕌䊵珯况㙉𤥂𨧤鍄𡧛苮𣳈砼杄拟𤤳𨦪𠊠𦮳𡌅侫𢓭倈𦴩𧪄𣘀𤪱𢔓倩𠍾徤𠎀𠍇滛𠐟偽儁㑺儎顬㝃萖𤦤𠒇兠𣎴兪𠯿𢃼𠋥𢔰𠖎𣈳𡦃宂蝽𠖳𣲙冲冸"],["faa1","鴴凉减凑㳜凓𤪦决凢卂凭菍椾𣜭彻刋刦刼劵剗劔効勅簕蕂勠蘍𦬓包𨫞啉滙𣾀𠥔𣿬匳卄𠯢泋𡜦栛珕恊㺪㣌𡛨燝䒢卭却𨚫卾卿𡖖𡘓矦厓𨪛厠厫厮玧𥝲㽙玜叁叅汉义埾叙㪫𠮏叠𣿫𢶣叶𠱷吓灹唫晗浛呭𦭓𠵴啝咏咤䞦𡜍𠻝㶴𠵍"],["fb40","𨦼𢚘啇䳭启琗喆喩嘅𡣗𤀺䕒𤐵暳𡂴嘷曍𣊊暤暭噍噏磱囱鞇叾圀囯园𨭦㘣𡉏坆𤆥汮炋坂㚱𦱾埦𡐖堃𡑔𤍣堦𤯵塜墪㕡壠壜𡈼壻寿坃𪅐𤉸鏓㖡够梦㛃湙"],["fba1","𡘾娤啓𡚒蔅姉𠵎𦲁𦴪𡟜姙𡟻𡞲𦶦浱𡠨𡛕姹𦹅媫婣㛦𤦩婷㜈媖瑥嫓𦾡𢕔㶅𡤑㜲𡚸広勐孶斈孼𧨎䀄䡝𠈄寕慠𡨴𥧌𠖥寳宝䴐尅𡭄尓珎尔𡲥𦬨屉䣝岅峩峯嶋𡷹𡸷崐崘嵆𡺤岺巗苼㠭𤤁𢁉𢅳芇㠶㯂帮檊幵幺𤒼𠳓厦亷廐厨𡝱帉廴𨒂"],["fc40","廹廻㢠廼栾鐛弍𠇁弢㫞䢮𡌺强𦢈𢏐彘𢑱彣鞽𦹮彲鍀𨨶徧嶶㵟𥉐𡽪𧃸𢙨釖𠊞𨨩怱暅𡡷㥣㷇㘹垐𢞴祱㹀悞悤悳𤦂𤦏𧩓璤僡媠慤萤慂慈𦻒憁凴𠙖憇宪𣾷"],["fca1","𢡟懓𨮝𩥝懐㤲𢦀𢣁怣慜攞掋𠄘担𡝰拕𢸍捬𤧟㨗搸揸𡎎𡟼撐澊𢸶頔𤂌𥜝擡擥鑻㩦携㩗敍漖𤨨𤨣斅敭敟𣁾斵𤥀䬷旑䃘𡠩无旣忟𣐀昘𣇷𣇸晄𣆤𣆥晋𠹵晧𥇦晳晴𡸽𣈱𨗴𣇈𥌓矅𢣷馤朂𤎜𤨡㬫槺𣟂杞杧杢𤇍𩃭柗䓩栢湐鈼栁𣏦𦶠桝"],["fd40","𣑯槡樋𨫟楳棃𣗍椁椀㴲㨁𣘼㮀枬楡𨩊䋼椶榘㮡𠏉荣傐槹𣙙𢄪橅𣜃檝㯳枱櫈𩆜㰍欝𠤣惞欵歴𢟍溵𣫛𠎵𡥘㝀吡𣭚毡𣻼毜氷𢒋𤣱𦭑汚舦汹𣶼䓅𣶽𤆤𤤌𤤀"],["fda1","𣳉㛥㳫𠴲鮃𣇹𢒑羏样𦴥𦶡𦷫涖浜湼漄𤥿𤂅𦹲蔳𦽴凇沜渝萮𨬡港𣸯瑓𣾂秌湏媑𣁋濸㜍澝𣸰滺𡒗𤀽䕕鏰潄潜㵎潴𩅰㴻澟𤅄濓𤂑𤅕𤀹𣿰𣾴𤄿凟𤅖𤅗𤅀𦇝灋灾炧炁烌烕烖烟䄄㷨熴熖𤉷焫煅媈煊煮岜𤍥煏鍢𤋁焬𤑚𤨧𤨢熺𨯨炽爎"],["fe40","鑂爕夑鑃爤鍁𥘅爮牀𤥴梽牕牗㹕𣁄栍漽犂猪猫𤠣𨠫䣭𨠄猨献珏玪𠰺𦨮珉瑉𤇢𡛧𤨤昣㛅𤦷𤦍𤧻珷琕椃𤨦琹𠗃㻗瑜𢢭瑠𨺲瑇珤瑶莹瑬㜰瑴鏱樬璂䥓𤪌"],["fea1","𤅟𤩹𨮏孆𨰃𡢞瓈𡦈甎瓩甞𨻙𡩋寗𨺬鎅畍畊畧畮𤾂㼄𤴓疎瑝疞疴瘂瘬癑癏癯癶𦏵皐臯㟸𦤑𦤎皡皥皷盌𦾟葢𥂝𥅽𡸜眞眦着撯𥈠睘𣊬瞯𨥤𨥨𡛁矴砉𡍶𤨒棊碯磇磓隥礮𥗠磗礴碱𧘌辸袄𨬫𦂃𢘜禆褀椂禀𥡗禝𧬹礼禩渪𧄦㺨秆𩄍秔"]]
-
-/***/ }),
-/* 718 */
-/***/ (function(module, exports) {
-
-module.exports = [["0","\u0000",127],["8141","갂갃갅갆갋",4,"갘갞갟갡갢갣갥",6,"갮갲갳갴"],["8161","갵갶갷갺갻갽갾갿걁",9,"걌걎",5,"걕"],["8181","걖걗걙걚걛걝",18,"걲걳걵걶걹걻",4,"겂겇겈겍겎겏겑겒겓겕",6,"겞겢",5,"겫겭겮겱",6,"겺겾겿곀곂곃곅곆곇곉곊곋곍",7,"곖곘",7,"곢곣곥곦곩곫곭곮곲곴곷",4,"곾곿괁괂괃괅괇",4,"괎괐괒괓"],["8241","괔괕괖괗괙괚괛괝괞괟괡",7,"괪괫괮",5],["8261","괶괷괹괺괻괽",6,"굆굈굊",5,"굑굒굓굕굖굗"],["8281","굙",7,"굢굤",7,"굮굯굱굲굷굸굹굺굾궀궃",4,"궊궋궍궎궏궑",10,"궞",5,"궥",17,"궸",7,"귂귃귅귆귇귉",6,"귒귔",7,"귝귞귟귡귢귣귥",18],["8341","귺귻귽귾긂",5,"긊긌긎",5,"긕",7],["8361","긝",18,"긲긳긵긶긹긻긼"],["8381","긽긾긿깂깄깇깈깉깋깏깑깒깓깕깗",4,"깞깢깣깤깦깧깪깫깭깮깯깱",6,"깺깾",5,"꺆",5,"꺍",46,"꺿껁껂껃껅",6,"껎껒",5,"껚껛껝",8],["8441","껦껧껩껪껬껮",5,"껵껶껷껹껺껻껽",8],["8461","꼆꼉꼊꼋꼌꼎꼏꼑",18],["8481","꼤",7,"꼮꼯꼱꼳꼵",6,"꼾꽀꽄꽅꽆꽇꽊",5,"꽑",10,"꽞",5,"꽦",18,"꽺",5,"꾁꾂꾃꾅꾆꾇꾉",6,"꾒꾓꾔꾖",5,"꾝",26,"꾺꾻꾽꾾"],["8541","꾿꿁",5,"꿊꿌꿏",4,"꿕",6,"꿝",4],["8561","꿢",5,"꿪",5,"꿲꿳꿵꿶꿷꿹",6,"뀂뀃"],["8581","뀅",6,"뀍뀎뀏뀑뀒뀓뀕",6,"뀞",9,"뀩",26,"끆끇끉끋끍끏끐끑끒끖끘끚끛끜끞",29,"끾끿낁낂낃낅",6,"낎낐낒",5,"낛낝낞낣낤"],["8641","낥낦낧낪낰낲낶낷낹낺낻낽",6,"냆냊",5,"냒"],["8661","냓냕냖냗냙",6,"냡냢냣냤냦",10],["8681","냱",22,"넊넍넎넏넑넔넕넖넗넚넞",4,"넦넧넩넪넫넭",6,"넶넺",5,"녂녃녅녆녇녉",6,"녒녓녖녗녙녚녛녝녞녟녡",22,"녺녻녽녾녿놁놃",4,"놊놌놎놏놐놑놕놖놗놙놚놛놝"],["8741","놞",9,"놩",15],["8761","놹",18,"뇍뇎뇏뇑뇒뇓뇕"],["8781","뇖",5,"뇞뇠",7,"뇪뇫뇭뇮뇯뇱",7,"뇺뇼뇾",5,"눆눇눉눊눍",6,"눖눘눚",5,"눡",18,"눵",6,"눽",26,"뉙뉚뉛뉝뉞뉟뉡",6,"뉪",4],["8841","뉯",4,"뉶",5,"뉽",6,"늆늇늈늊",4],["8861","늏늒늓늕늖늗늛",4,"늢늤늧늨늩늫늭늮늯늱늲늳늵늶늷"],["8881","늸",15,"닊닋닍닎닏닑닓",4,"닚닜닞닟닠닡닣닧닩닪닰닱닲닶닼닽닾댂댃댅댆댇댉",6,"댒댖",5,"댝",54,"덗덙덚덝덠덡덢덣"],["8941","덦덨덪덬덭덯덲덳덵덶덷덹",6,"뎂뎆",5,"뎍"],["8961","뎎뎏뎑뎒뎓뎕",10,"뎢",5,"뎩뎪뎫뎭"],["8981","뎮",21,"돆돇돉돊돍돏돑돒돓돖돘돚돜돞돟돡돢돣돥돦돧돩",18,"돽",18,"됑",6,"됙됚됛됝됞됟됡",6,"됪됬",7,"됵",15],["8a41","둅",10,"둒둓둕둖둗둙",6,"둢둤둦"],["8a61","둧",4,"둭",18,"뒁뒂"],["8a81","뒃",4,"뒉",19,"뒞",5,"뒥뒦뒧뒩뒪뒫뒭",7,"뒶뒸뒺",5,"듁듂듃듅듆듇듉",6,"듑듒듓듔듖",5,"듞듟듡듢듥듧",4,"듮듰듲",5,"듹",26,"딖딗딙딚딝"],["8b41","딞",5,"딦딫",4,"딲딳딵딶딷딹",6,"땂땆"],["8b61","땇땈땉땊땎땏땑땒땓땕",6,"땞땢",8],["8b81","땫",52,"떢떣떥떦떧떩떬떭떮떯떲떶",4,"떾떿뗁뗂뗃뗅",6,"뗎뗒",5,"뗙",18,"뗭",18],["8c41","똀",15,"똒똓똕똖똗똙",4],["8c61","똞",6,"똦",5,"똭",6,"똵",5],["8c81","똻",12,"뙉",26,"뙥뙦뙧뙩",50,"뚞뚟뚡뚢뚣뚥",5,"뚭뚮뚯뚰뚲",16],["8d41","뛃",16,"뛕",8],["8d61","뛞",17,"뛱뛲뛳뛵뛶뛷뛹뛺"],["8d81","뛻",4,"뜂뜃뜄뜆",33,"뜪뜫뜭뜮뜱",6,"뜺뜼",7,"띅띆띇띉띊띋띍",6,"띖",9,"띡띢띣띥띦띧띩",6,"띲띴띶",5,"띾띿랁랂랃랅",6,"랎랓랔랕랚랛랝랞"],["8e41","랟랡",6,"랪랮",5,"랶랷랹",8],["8e61","럂",4,"럈럊",19],["8e81","럞",13,"럮럯럱럲럳럵",6,"럾렂",4,"렊렋렍렎렏렑",6,"렚렜렞",5,"렦렧렩렪렫렭",6,"렶렺",5,"롁롂롃롅",11,"롒롔",7,"롞롟롡롢롣롥",6,"롮롰롲",5,"롹롺롻롽",7],["8f41","뢅",7,"뢎",17],["8f61","뢠",7,"뢩",6,"뢱뢲뢳뢵뢶뢷뢹",4],["8f81","뢾뢿룂룄룆",5,"룍룎룏룑룒룓룕",7,"룞룠룢",5,"룪룫룭룮룯룱",6,"룺룼룾",5,"뤅",18,"뤙",6,"뤡",26,"뤾뤿륁륂륃륅",6,"륍륎륐륒",5],["9041","륚륛륝륞륟륡",6,"륪륬륮",5,"륶륷륹륺륻륽"],["9061","륾",5,"릆릈릋릌릏",15],["9081","릟",12,"릮릯릱릲릳릵",6,"릾맀맂",5,"맊맋맍맓",4,"맚맜맟맠맢맦맧맩맪맫맭",6,"맶맻",4,"먂",5,"먉",11,"먖",33,"먺먻먽먾먿멁멃멄멅멆"],["9141","멇멊멌멏멐멑멒멖멗멙멚멛멝",6,"멦멪",5],["9161","멲멳멵멶멷멹",9,"몆몈몉몊몋몍",5],["9181","몓",20,"몪몭몮몯몱몳",4,"몺몼몾",5,"뫅뫆뫇뫉",14,"뫚",33,"뫽뫾뫿묁묂묃묅",7,"묎묐묒",5,"묙묚묛묝묞묟묡",6],["9241","묨묪묬",7,"묷묹묺묿",4,"뭆뭈뭊뭋뭌뭎뭑뭒"],["9261","뭓뭕뭖뭗뭙",7,"뭢뭤",7,"뭭",4],["9281","뭲",21,"뮉뮊뮋뮍뮎뮏뮑",18,"뮥뮦뮧뮩뮪뮫뮭",6,"뮵뮶뮸",7,"믁믂믃믅믆믇믉",6,"믑믒믔",35,"믺믻믽믾밁"],["9341","밃",4,"밊밎밐밒밓밙밚밠밡밢밣밦밨밪밫밬밮밯밲밳밵"],["9361","밶밷밹",6,"뱂뱆뱇뱈뱊뱋뱎뱏뱑",8],["9381","뱚뱛뱜뱞",37,"벆벇벉벊벍벏",4,"벖벘벛",4,"벢벣벥벦벩",6,"벲벶",5,"벾벿볁볂볃볅",7,"볎볒볓볔볖볗볙볚볛볝",22,"볷볹볺볻볽"],["9441","볾",5,"봆봈봊",5,"봑봒봓봕",8],["9461","봞",5,"봥",6,"봭",12],["9481","봺",5,"뵁",6,"뵊뵋뵍뵎뵏뵑",6,"뵚",9,"뵥뵦뵧뵩",22,"붂붃붅붆붋",4,"붒붔붖붗붘붛붝",6,"붥",10,"붱",6,"붹",24],["9541","뷒뷓뷖뷗뷙뷚뷛뷝",11,"뷪",5,"뷱"],["9561","뷲뷳뷵뷶뷷뷹",6,"븁븂븄븆",5,"븎븏븑븒븓"],["9581","븕",6,"븞븠",35,"빆빇빉빊빋빍빏",4,"빖빘빜빝빞빟빢빣빥빦빧빩빫",4,"빲빶",4,"빾빿뺁뺂뺃뺅",6,"뺎뺒",5,"뺚",13,"뺩",14],["9641","뺸",23,"뻒뻓"],["9661","뻕뻖뻙",6,"뻡뻢뻦",5,"뻭",8],["9681","뻶",10,"뼂",5,"뼊",13,"뼚뼞",33,"뽂뽃뽅뽆뽇뽉",6,"뽒뽓뽔뽖",44],["9741","뾃",16,"뾕",8],["9761","뾞",17,"뾱",7],["9781","뾹",11,"뿆",5,"뿎뿏뿑뿒뿓뿕",6,"뿝뿞뿠뿢",89,"쀽쀾쀿"],["9841","쁀",16,"쁒",5,"쁙쁚쁛"],["9861","쁝쁞쁟쁡",6,"쁪",15],["9881","쁺",21,"삒삓삕삖삗삙",6,"삢삤삦",5,"삮삱삲삷",4,"삾샂샃샄샆샇샊샋샍샎샏샑",6,"샚샞",5,"샦샧샩샪샫샭",6,"샶샸샺",5,"섁섂섃섅섆섇섉",6,"섑섒섓섔섖",5,"섡섢섥섨섩섪섫섮"],["9941","섲섳섴섵섷섺섻섽섾섿셁",6,"셊셎",5,"셖셗"],["9961","셙셚셛셝",6,"셦셪",5,"셱셲셳셵셶셷셹셺셻"],["9981","셼",8,"솆",5,"솏솑솒솓솕솗",4,"솞솠솢솣솤솦솧솪솫솭솮솯솱",11,"솾",5,"쇅쇆쇇쇉쇊쇋쇍",6,"쇕쇖쇙",6,"쇡쇢쇣쇥쇦쇧쇩",6,"쇲쇴",7,"쇾쇿숁숂숃숅",6,"숎숐숒",5,"숚숛숝숞숡숢숣"],["9a41","숤숥숦숧숪숬숮숰숳숵",16],["9a61","쉆쉇쉉",6,"쉒쉓쉕쉖쉗쉙",6,"쉡쉢쉣쉤쉦"],["9a81","쉧",4,"쉮쉯쉱쉲쉳쉵",6,"쉾슀슂",5,"슊",5,"슑",6,"슙슚슜슞",5,"슦슧슩슪슫슮",5,"슶슸슺",33,"싞싟싡싢싥",5,"싮싰싲싳싴싵싷싺싽싾싿쌁",6,"쌊쌋쌎쌏"],["9b41","쌐쌑쌒쌖쌗쌙쌚쌛쌝",6,"쌦쌧쌪",8],["9b61","쌳",17,"썆",7],["9b81","썎",25,"썪썫썭썮썯썱썳",4,"썺썻썾",5,"쎅쎆쎇쎉쎊쎋쎍",50,"쏁",22,"쏚"],["9c41","쏛쏝쏞쏡쏣",4,"쏪쏫쏬쏮",5,"쏶쏷쏹",5],["9c61","쏿",8,"쐉",6,"쐑",9],["9c81","쐛",8,"쐥",6,"쐭쐮쐯쐱쐲쐳쐵",6,"쐾",9,"쑉",26,"쑦쑧쑩쑪쑫쑭",6,"쑶쑷쑸쑺",5,"쒁",18,"쒕",6,"쒝",12],["9d41","쒪",13,"쒹쒺쒻쒽",8],["9d61","쓆",25],["9d81","쓠",8,"쓪",5,"쓲쓳쓵쓶쓷쓹쓻쓼쓽쓾씂",9,"씍씎씏씑씒씓씕",6,"씝",10,"씪씫씭씮씯씱",6,"씺씼씾",5,"앆앇앋앏앐앑앒앖앚앛앜앟앢앣앥앦앧앩",6,"앲앶",5,"앾앿얁얂얃얅얆얈얉얊얋얎얐얒얓얔"],["9e41","얖얙얚얛얝얞얟얡",7,"얪",9,"얶"],["9e61","얷얺얿",4,"엋엍엏엒엓엕엖엗엙",6,"엢엤엦엧"],["9e81","엨엩엪엫엯엱엲엳엵엸엹엺엻옂옃옄옉옊옋옍옎옏옑",6,"옚옝",6,"옦옧옩옪옫옯옱옲옶옸옺옼옽옾옿왂왃왅왆왇왉",6,"왒왖",5,"왞왟왡",10,"왭왮왰왲",5,"왺왻왽왾왿욁",6,"욊욌욎",5,"욖욗욙욚욛욝",6,"욦"],["9f41","욨욪",5,"욲욳욵욶욷욻",4,"웂웄웆",5,"웎"],["9f61","웏웑웒웓웕",6,"웞웟웢",5,"웪웫웭웮웯웱웲"],["9f81","웳",4,"웺웻웼웾",5,"윆윇윉윊윋윍",6,"윖윘윚",5,"윢윣윥윦윧윩",6,"윲윴윶윸윹윺윻윾윿읁읂읃읅",4,"읋읎읐읙읚읛읝읞읟읡",6,"읩읪읬",7,"읶읷읹읺읻읿잀잁잂잆잋잌잍잏잒잓잕잙잛",4,"잢잧",4,"잮잯잱잲잳잵잶잷"],["a041","잸잹잺잻잾쟂",5,"쟊쟋쟍쟏쟑",6,"쟙쟚쟛쟜"],["a061","쟞",5,"쟥쟦쟧쟩쟪쟫쟭",13],["a081","쟻",4,"젂젃젅젆젇젉젋",4,"젒젔젗",4,"젞젟젡젢젣젥",6,"젮젰젲",5,"젹젺젻젽젾젿졁",6,"졊졋졎",5,"졕",26,"졲졳졵졶졷졹졻",4,"좂좄좈좉좊좎",5,"좕",7,"좞좠좢좣좤"],["a141","좥좦좧좩",18,"좾좿죀죁"],["a161","죂죃죅죆죇죉죊죋죍",6,"죖죘죚",5,"죢죣죥"],["a181","죦",14,"죶",5,"죾죿줁줂줃줇",4,"줎　、。·‥…¨〃­―∥＼∼‘’“”〔〕〈",9,"±×÷≠≤≥∞∴°′″℃Å￠￡￥♂♀∠⊥⌒∂∇≡≒§※☆★○●◎◇◆□■△▲▽▼→←↑↓↔〓≪≫√∽∝∵∫∬∈∋⊆⊇⊂⊃∪∩∧∨￢"],["a241","줐줒",5,"줙",18],["a261","줭",6,"줵",18],["a281","쥈",7,"쥒쥓쥕쥖쥗쥙",6,"쥢쥤",7,"쥭쥮쥯⇒⇔∀∃´～ˇ˘˝˚˙¸˛¡¿ː∮∑∏¤℉‰◁◀▷▶♤♠♡♥♧♣⊙◈▣◐◑▒▤▥▨▧▦▩♨☏☎☜☞¶†‡↕↗↙↖↘♭♩♪♬㉿㈜№㏇™㏂㏘℡€®"],["a341","쥱쥲쥳쥵",6,"쥽",10,"즊즋즍즎즏"],["a361","즑",6,"즚즜즞",16],["a381","즯",16,"짂짃짅짆짉짋",4,"짒짔짗짘짛！",58,"￦］",32,"￣"],["a441","짞짟짡짣짥짦짨짩짪짫짮짲",5,"짺짻짽짾짿쨁쨂쨃쨄"],["a461","쨅쨆쨇쨊쨎",5,"쨕쨖쨗쨙",12],["a481","쨦쨧쨨쨪",28,"ㄱ",93],["a541","쩇",4,"쩎쩏쩑쩒쩓쩕",6,"쩞쩢",5,"쩩쩪"],["a561","쩫",17,"쩾",5,"쪅쪆"],["a581","쪇",16,"쪙",14,"ⅰ",9],["a5b0","Ⅰ",9],["a5c1","Α",16,"Σ",6],["a5e1","α",16,"σ",6],["a641","쪨",19,"쪾쪿쫁쫂쫃쫅"],["a661","쫆",5,"쫎쫐쫒쫔쫕쫖쫗쫚",5,"쫡",6],["a681","쫨쫩쫪쫫쫭",6,"쫵",18,"쬉쬊─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂┒┑┚┙┖┕┎┍┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃",7],["a741","쬋",4,"쬑쬒쬓쬕쬖쬗쬙",6,"쬢",7],["a761","쬪",22,"쭂쭃쭄"],["a781","쭅쭆쭇쭊쭋쭍쭎쭏쭑",6,"쭚쭛쭜쭞",5,"쭥",7,"㎕㎖㎗ℓ㎘㏄㎣㎤㎥㎦㎙",9,"㏊㎍㎎㎏㏏㎈㎉㏈㎧㎨㎰",9,"㎀",4,"㎺",5,"㎐",4,"Ω㏀㏁㎊㎋㎌㏖㏅㎭㎮㎯㏛㎩㎪㎫㎬㏝㏐㏓㏃㏉㏜㏆"],["a841","쭭",10,"쭺",14],["a861","쮉",18,"쮝",6],["a881","쮤",19,"쮹",11,"ÆЪĦ"],["a8a6","IJ"],["a8a8","ĿŁØŒºÞŦŊ"],["a8b1","㉠",27,"ⓐ",25,"①",14,"½⅓⅔¼¾⅛⅜⅝⅞"],["a941","쯅",14,"쯕",10],["a961","쯠쯡쯢쯣쯥쯦쯨쯪",18],["a981","쯽",14,"찎찏찑찒찓찕",6,"찞찟찠찣찤æđðħıijĸŀłøœßþŧŋʼn㈀",27,"⒜",25,"⑴",14,"¹²³⁴ⁿ₁₂₃₄"],["aa41","찥찦찪찫찭찯찱",6,"찺찿",4,"챆챇챉챊챋챍챎"],["aa61","챏",4,"챖챚",5,"챡챢챣챥챧챩",6,"챱챲"],["aa81","챳챴챶",29,"ぁ",82],["ab41","첔첕첖첗첚첛첝첞첟첡",6,"첪첮",5,"첶첷첹"],["ab61","첺첻첽",6,"쳆쳈쳊",5,"쳑쳒쳓쳕",5],["ab81","쳛",8,"쳥",6,"쳭쳮쳯쳱",12,"ァ",85],["ac41","쳾쳿촀촂",5,"촊촋촍촎촏촑",6,"촚촜촞촟촠"],["ac61","촡촢촣촥촦촧촩촪촫촭",11,"촺",4],["ac81","촿",28,"쵝쵞쵟А",5,"ЁЖ",25],["acd1","а",5,"ёж",25],["ad41","쵡쵢쵣쵥",6,"쵮쵰쵲",5,"쵹",7],["ad61","춁",6,"춉",10,"춖춗춙춚춛춝춞춟"],["ad81","춠춡춢춣춦춨춪",5,"춱",18,"췅"],["ae41","췆",5,"췍췎췏췑",16],["ae61","췢",5,"췩췪췫췭췮췯췱",6,"췺췼췾",4],["ae81","츃츅츆츇츉츊츋츍",6,"츕츖츗츘츚",5,"츢츣츥츦츧츩츪츫"],["af41","츬츭츮츯츲츴츶",19],["af61","칊",13,"칚칛칝칞칢",5,"칪칬"],["af81","칮",5,"칶칷칹칺칻칽",6,"캆캈캊",5,"캒캓캕캖캗캙"],["b041","캚",5,"캢캦",5,"캮",12],["b061","캻",5,"컂",19],["b081","컖",13,"컦컧컩컪컭",6,"컶컺",5,"가각간갇갈갉갊감",7,"같",4,"갠갤갬갭갯갰갱갸갹갼걀걋걍걔걘걜거걱건걷걸걺검겁것겄겅겆겉겊겋게겐겔겜겝겟겠겡겨격겪견겯결겸겹겻겼경곁계곈곌곕곗고곡곤곧골곪곬곯곰곱곳공곶과곽관괄괆"],["b141","켂켃켅켆켇켉",6,"켒켔켖",5,"켝켞켟켡켢켣"],["b161","켥",6,"켮켲",5,"켹",11],["b181","콅",14,"콖콗콙콚콛콝",6,"콦콨콪콫콬괌괍괏광괘괜괠괩괬괭괴괵괸괼굄굅굇굉교굔굘굡굣구국군굳굴굵굶굻굼굽굿궁궂궈궉권궐궜궝궤궷귀귁귄귈귐귑귓규균귤그극근귿글긁금급긋긍긔기긱긴긷길긺김깁깃깅깆깊까깍깎깐깔깖깜깝깟깠깡깥깨깩깬깰깸"],["b241","콭콮콯콲콳콵콶콷콹",6,"쾁쾂쾃쾄쾆",5,"쾍"],["b261","쾎",18,"쾢",5,"쾩"],["b281","쾪",5,"쾱",18,"쿅",6,"깹깻깼깽꺄꺅꺌꺼꺽꺾껀껄껌껍껏껐껑께껙껜껨껫껭껴껸껼꼇꼈꼍꼐꼬꼭꼰꼲꼴꼼꼽꼿꽁꽂꽃꽈꽉꽐꽜꽝꽤꽥꽹꾀꾄꾈꾐꾑꾕꾜꾸꾹꾼꿀꿇꿈꿉꿋꿍꿎꿔꿜꿨꿩꿰꿱꿴꿸뀀뀁뀄뀌뀐뀔뀜뀝뀨끄끅끈끊끌끎끓끔끕끗끙"],["b341","쿌",19,"쿢쿣쿥쿦쿧쿩"],["b361","쿪",5,"쿲쿴쿶",5,"쿽쿾쿿퀁퀂퀃퀅",5],["b381","퀋",5,"퀒",5,"퀙",19,"끝끼끽낀낄낌낍낏낑나낙낚난낟날낡낢남납낫",4,"낱낳내낵낸낼냄냅냇냈냉냐냑냔냘냠냥너넉넋넌널넒넓넘넙넛넜넝넣네넥넨넬넴넵넷넸넹녀녁년녈념녑녔녕녘녜녠노녹논놀놂놈놉놋농높놓놔놘놜놨뇌뇐뇔뇜뇝"],["b441","퀮",5,"퀶퀷퀹퀺퀻퀽",6,"큆큈큊",5],["b461","큑큒큓큕큖큗큙",6,"큡",10,"큮큯"],["b481","큱큲큳큵",6,"큾큿킀킂",18,"뇟뇨뇩뇬뇰뇹뇻뇽누눅눈눋눌눔눕눗눙눠눴눼뉘뉜뉠뉨뉩뉴뉵뉼늄늅늉느늑는늘늙늚늠늡늣능늦늪늬늰늴니닉닌닐닒님닙닛닝닢다닥닦단닫",4,"닳담답닷",4,"닿대댁댄댈댐댑댓댔댕댜더덕덖던덛덜덞덟덤덥"],["b541","킕",14,"킦킧킩킪킫킭",5],["b561","킳킶킸킺",5,"탂탃탅탆탇탊",5,"탒탖",4],["b581","탛탞탟탡탢탣탥",6,"탮탲",5,"탹",11,"덧덩덫덮데덱덴델뎀뎁뎃뎄뎅뎌뎐뎔뎠뎡뎨뎬도독돈돋돌돎돐돔돕돗동돛돝돠돤돨돼됐되된될됨됩됫됴두둑둔둘둠둡둣둥둬뒀뒈뒝뒤뒨뒬뒵뒷뒹듀듄듈듐듕드득든듣들듦듬듭듯등듸디딕딘딛딜딤딥딧딨딩딪따딱딴딸"],["b641","턅",7,"턎",17],["b661","턠",15,"턲턳턵턶턷턹턻턼턽턾"],["b681","턿텂텆",5,"텎텏텑텒텓텕",6,"텞텠텢",5,"텩텪텫텭땀땁땃땄땅땋때땍땐땔땜땝땟땠땡떠떡떤떨떪떫떰떱떳떴떵떻떼떽뗀뗄뗌뗍뗏뗐뗑뗘뗬또똑똔똘똥똬똴뙈뙤뙨뚜뚝뚠뚤뚫뚬뚱뛔뛰뛴뛸뜀뜁뜅뜨뜩뜬뜯뜰뜸뜹뜻띄띈띌띔띕띠띤띨띰띱띳띵라락란랄람랍랏랐랑랒랖랗"],["b741","텮",13,"텽",6,"톅톆톇톉톊"],["b761","톋",20,"톢톣톥톦톧"],["b781","톩",6,"톲톴톶톷톸톹톻톽톾톿퇁",14,"래랙랜랠램랩랫랬랭랴략랸럇량러럭런럴럼럽럿렀렁렇레렉렌렐렘렙렛렝려력련렬렴렵렷렸령례롄롑롓로록론롤롬롭롯롱롸롼뢍뢨뢰뢴뢸룀룁룃룅료룐룔룝룟룡루룩룬룰룸룹룻룽뤄뤘뤠뤼뤽륀륄륌륏륑류륙륜률륨륩"],["b841","퇐",7,"퇙",17],["b861","퇫",8,"퇵퇶퇷퇹",13],["b881","툈툊",5,"툑",24,"륫륭르륵른를름릅릇릉릊릍릎리릭린릴림립릿링마막만많",4,"맘맙맛망맞맡맣매맥맨맬맴맵맷맸맹맺먀먁먈먕머먹먼멀멂멈멉멋멍멎멓메멕멘멜멤멥멧멨멩며멱면멸몃몄명몇몌모목몫몬몰몲몸몹못몽뫄뫈뫘뫙뫼"],["b941","툪툫툮툯툱툲툳툵",6,"툾퉀퉂",5,"퉉퉊퉋퉌"],["b961","퉍",14,"퉝",6,"퉥퉦퉧퉨"],["b981","퉩",22,"튂튃튅튆튇튉튊튋튌묀묄묍묏묑묘묜묠묩묫무묵묶문묻물묽묾뭄뭅뭇뭉뭍뭏뭐뭔뭘뭡뭣뭬뮈뮌뮐뮤뮨뮬뮴뮷므믄믈믐믓미믹민믿밀밂밈밉밋밌밍및밑바",4,"받",4,"밤밥밧방밭배백밴밸뱀뱁뱃뱄뱅뱉뱌뱍뱐뱝버벅번벋벌벎범법벗"],["ba41","튍튎튏튒튓튔튖",5,"튝튞튟튡튢튣튥",6,"튭"],["ba61","튮튯튰튲",5,"튺튻튽튾틁틃",4,"틊틌",5],["ba81","틒틓틕틖틗틙틚틛틝",6,"틦",9,"틲틳틵틶틷틹틺벙벚베벡벤벧벨벰벱벳벴벵벼벽변별볍볏볐병볕볘볜보복볶본볼봄봅봇봉봐봔봤봬뵀뵈뵉뵌뵐뵘뵙뵤뵨부북분붇불붉붊붐붑붓붕붙붚붜붤붰붸뷔뷕뷘뷜뷩뷰뷴뷸븀븃븅브븍븐블븜븝븟비빅빈빌빎빔빕빗빙빚빛빠빡빤"],["bb41","틻",4,"팂팄팆",5,"팏팑팒팓팕팗",4,"팞팢팣"],["bb61","팤팦팧팪팫팭팮팯팱",6,"팺팾",5,"퍆퍇퍈퍉"],["bb81","퍊",31,"빨빪빰빱빳빴빵빻빼빽뺀뺄뺌뺍뺏뺐뺑뺘뺙뺨뻐뻑뻔뻗뻘뻠뻣뻤뻥뻬뼁뼈뼉뼘뼙뼛뼜뼝뽀뽁뽄뽈뽐뽑뽕뾔뾰뿅뿌뿍뿐뿔뿜뿟뿡쀼쁑쁘쁜쁠쁨쁩삐삑삔삘삠삡삣삥사삭삯산삳살삵삶삼삽삿샀상샅새색샌샐샘샙샛샜생샤"],["bc41","퍪",17,"퍾퍿펁펂펃펅펆펇"],["bc61","펈펉펊펋펎펒",5,"펚펛펝펞펟펡",6,"펪펬펮"],["bc81","펯",4,"펵펶펷펹펺펻펽",6,"폆폇폊",5,"폑",5,"샥샨샬샴샵샷샹섀섄섈섐섕서",4,"섣설섦섧섬섭섯섰성섶세섹센셀셈셉셋셌셍셔셕션셜셤셥셧셨셩셰셴셸솅소속솎손솔솖솜솝솟송솥솨솩솬솰솽쇄쇈쇌쇔쇗쇘쇠쇤쇨쇰쇱쇳쇼쇽숀숄숌숍숏숑수숙순숟술숨숩숫숭"],["bd41","폗폙",7,"폢폤",7,"폮폯폱폲폳폵폶폷"],["bd61","폸폹폺폻폾퐀퐂",5,"퐉",13],["bd81","퐗",5,"퐞",25,"숯숱숲숴쉈쉐쉑쉔쉘쉠쉥쉬쉭쉰쉴쉼쉽쉿슁슈슉슐슘슛슝스슥슨슬슭슴습슷승시식신싣실싫심십싯싱싶싸싹싻싼쌀쌈쌉쌌쌍쌓쌔쌕쌘쌜쌤쌥쌨쌩썅써썩썬썰썲썸썹썼썽쎄쎈쎌쏀쏘쏙쏜쏟쏠쏢쏨쏩쏭쏴쏵쏸쐈쐐쐤쐬쐰"],["be41","퐸",7,"푁푂푃푅",14],["be61","푔",7,"푝푞푟푡푢푣푥",7,"푮푰푱푲"],["be81","푳",4,"푺푻푽푾풁풃",4,"풊풌풎",5,"풕",8,"쐴쐼쐽쑈쑤쑥쑨쑬쑴쑵쑹쒀쒔쒜쒸쒼쓩쓰쓱쓴쓸쓺쓿씀씁씌씐씔씜씨씩씬씰씸씹씻씽아악안앉않알앍앎앓암압앗았앙앝앞애액앤앨앰앱앳앴앵야약얀얄얇얌얍얏양얕얗얘얜얠얩어억언얹얻얼얽얾엄",6,"엌엎"],["bf41","풞",10,"풪",14],["bf61","풹",18,"퓍퓎퓏퓑퓒퓓퓕"],["bf81","퓖",5,"퓝퓞퓠",7,"퓩퓪퓫퓭퓮퓯퓱",6,"퓹퓺퓼에엑엔엘엠엡엣엥여역엮연열엶엷염",5,"옅옆옇예옌옐옘옙옛옜오옥온올옭옮옰옳옴옵옷옹옻와왁완왈왐왑왓왔왕왜왝왠왬왯왱외왹왼욀욈욉욋욍요욕욘욜욤욥욧용우욱운울욹욺움웁웃웅워웍원월웜웝웠웡웨"],["c041","퓾",5,"픅픆픇픉픊픋픍",6,"픖픘",5],["c061","픞",25],["c081","픸픹픺픻픾픿핁핂핃핅",6,"핎핐핒",5,"핚핛핝핞핟핡핢핣웩웬웰웸웹웽위윅윈윌윔윕윗윙유육윤율윰윱윳융윷으윽은을읊음읍읏응",7,"읜읠읨읫이익인일읽읾잃임입잇있잉잊잎자작잔잖잗잘잚잠잡잣잤장잦재잭잰잴잼잽잿쟀쟁쟈쟉쟌쟎쟐쟘쟝쟤쟨쟬저적전절젊"],["c141","핤핦핧핪핬핮",5,"핶핷핹핺핻핽",6,"햆햊햋"],["c161","햌햍햎햏햑",19,"햦햧"],["c181","햨",31,"점접젓정젖제젝젠젤젬젭젯젱져젼졀졈졉졌졍졔조족존졸졺좀좁좃종좆좇좋좌좍좔좝좟좡좨좼좽죄죈죌죔죕죗죙죠죡죤죵주죽준줄줅줆줌줍줏중줘줬줴쥐쥑쥔쥘쥠쥡쥣쥬쥰쥴쥼즈즉즌즐즘즙즛증지직진짇질짊짐집짓"],["c241","헊헋헍헎헏헑헓",4,"헚헜헞",5,"헦헧헩헪헫헭헮"],["c261","헯",4,"헶헸헺",5,"혂혃혅혆혇혉",6,"혒"],["c281","혖",5,"혝혞혟혡혢혣혥",7,"혮",9,"혺혻징짖짙짚짜짝짠짢짤짧짬짭짯짰짱째짹짼쨀쨈쨉쨋쨌쨍쨔쨘쨩쩌쩍쩐쩔쩜쩝쩟쩠쩡쩨쩽쪄쪘쪼쪽쫀쫄쫌쫍쫏쫑쫓쫘쫙쫠쫬쫴쬈쬐쬔쬘쬠쬡쭁쭈쭉쭌쭐쭘쭙쭝쭤쭸쭹쮜쮸쯔쯤쯧쯩찌찍찐찔찜찝찡찢찧차착찬찮찰참찹찻"],["c341","혽혾혿홁홂홃홄홆홇홊홌홎홏홐홒홓홖홗홙홚홛홝",4],["c361","홢",4,"홨홪",5,"홲홳홵",11],["c381","횁횂횄횆",5,"횎횏횑횒횓횕",7,"횞횠횢",5,"횩횪찼창찾채책챈챌챔챕챗챘챙챠챤챦챨챰챵처척천철첨첩첫첬청체첵첸첼쳄쳅쳇쳉쳐쳔쳤쳬쳰촁초촉촌촐촘촙촛총촤촨촬촹최쵠쵤쵬쵭쵯쵱쵸춈추축춘출춤춥춧충춰췄췌췐취췬췰췸췹췻췽츄츈츌츔츙츠측츤츨츰츱츳층"],["c441","횫횭횮횯횱",7,"횺횼",7,"훆훇훉훊훋"],["c461","훍훎훏훐훒훓훕훖훘훚",5,"훡훢훣훥훦훧훩",4],["c481","훮훯훱훲훳훴훶",5,"훾훿휁휂휃휅",11,"휒휓휔치칙친칟칠칡침칩칫칭카칵칸칼캄캅캇캉캐캑캔캘캠캡캣캤캥캬캭컁커컥컨컫컬컴컵컷컸컹케켁켄켈켐켑켓켕켜켠켤켬켭켯켰켱켸코콕콘콜콤콥콧콩콰콱콴콸쾀쾅쾌쾡쾨쾰쿄쿠쿡쿤쿨쿰쿱쿳쿵쿼퀀퀄퀑퀘퀭퀴퀵퀸퀼"],["c541","휕휖휗휚휛휝휞휟휡",6,"휪휬휮",5,"휶휷휹"],["c561","휺휻휽",6,"흅흆흈흊",5,"흒흓흕흚",4],["c581","흟흢흤흦흧흨흪흫흭흮흯흱흲흳흵",6,"흾흿힀힂",5,"힊힋큄큅큇큉큐큔큘큠크큭큰클큼큽킁키킥킨킬킴킵킷킹타탁탄탈탉탐탑탓탔탕태택탠탤탬탭탯탰탱탸턍터턱턴털턺텀텁텃텄텅테텍텐텔템텝텟텡텨텬텼톄톈토톡톤톨톰톱톳통톺톼퇀퇘퇴퇸툇툉툐투툭툰툴툼툽툿퉁퉈퉜"],["c641","힍힎힏힑",6,"힚힜힞",5],["c6a1","퉤튀튁튄튈튐튑튕튜튠튤튬튱트특튼튿틀틂틈틉틋틔틘틜틤틥티틱틴틸팀팁팃팅파팍팎판팔팖팜팝팟팠팡팥패팩팬팰팸팹팻팼팽퍄퍅퍼퍽펀펄펌펍펏펐펑페펙펜펠펨펩펫펭펴편펼폄폅폈평폐폘폡폣포폭폰폴폼폽폿퐁"],["c7a1","퐈퐝푀푄표푠푤푭푯푸푹푼푿풀풂품풉풋풍풔풩퓌퓐퓔퓜퓟퓨퓬퓰퓸퓻퓽프픈플픔픕픗피픽핀필핌핍핏핑하학한할핥함합핫항해핵핸핼햄햅햇했행햐향허헉헌헐헒험헙헛헝헤헥헨헬헴헵헷헹혀혁현혈혐협혓혔형혜혠"],["c8a1","혤혭호혹혼홀홅홈홉홋홍홑화확환활홧황홰홱홴횃횅회획횐횔횝횟횡효횬횰횹횻후훅훈훌훑훔훗훙훠훤훨훰훵훼훽휀휄휑휘휙휜휠휨휩휫휭휴휵휸휼흄흇흉흐흑흔흖흗흘흙흠흡흣흥흩희흰흴흼흽힁히힉힌힐힘힙힛힝"],["caa1","伽佳假價加可呵哥嘉嫁家暇架枷柯歌珂痂稼苛茄街袈訶賈跏軻迦駕刻却各恪慤殼珏脚覺角閣侃刊墾奸姦干幹懇揀杆柬桿澗癎看磵稈竿簡肝艮艱諫間乫喝曷渴碣竭葛褐蝎鞨勘坎堪嵌感憾戡敢柑橄減甘疳監瞰紺邯鑑鑒龕"],["cba1","匣岬甲胛鉀閘剛堈姜岡崗康强彊慷江畺疆糠絳綱羌腔舡薑襁講鋼降鱇介价個凱塏愷愾慨改槪漑疥皆盖箇芥蓋豈鎧開喀客坑更粳羹醵倨去居巨拒据據擧渠炬祛距踞車遽鉅鋸乾件健巾建愆楗腱虔蹇鍵騫乞傑杰桀儉劍劒檢"],["cca1","瞼鈐黔劫怯迲偈憩揭擊格檄激膈覡隔堅牽犬甄絹繭肩見譴遣鵑抉決潔結缺訣兼慊箝謙鉗鎌京俓倞傾儆勁勍卿坰境庚徑慶憬擎敬景暻更梗涇炅烱璟璥瓊痙硬磬竟競絅經耕耿脛莖警輕逕鏡頃頸驚鯨係啓堺契季屆悸戒桂械"],["cda1","棨溪界癸磎稽系繫繼計誡谿階鷄古叩告呱固姑孤尻庫拷攷故敲暠枯槁沽痼皐睾稿羔考股膏苦苽菰藁蠱袴誥賈辜錮雇顧高鼓哭斛曲梏穀谷鵠困坤崑昆梱棍滾琨袞鯤汨滑骨供公共功孔工恐恭拱控攻珙空蚣貢鞏串寡戈果瓜"],["cea1","科菓誇課跨過鍋顆廓槨藿郭串冠官寬慣棺款灌琯瓘管罐菅觀貫關館刮恝括适侊光匡壙廣曠洸炚狂珖筐胱鑛卦掛罫乖傀塊壞怪愧拐槐魁宏紘肱轟交僑咬喬嬌嶠巧攪敎校橋狡皎矯絞翹膠蕎蛟較轎郊餃驕鮫丘久九仇俱具勾"],["cfa1","區口句咎嘔坵垢寇嶇廐懼拘救枸柩構歐毆毬求溝灸狗玖球瞿矩究絿耉臼舅舊苟衢謳購軀逑邱鉤銶駒驅鳩鷗龜國局菊鞠鞫麴君窘群裙軍郡堀屈掘窟宮弓穹窮芎躬倦券勸卷圈拳捲權淃眷厥獗蕨蹶闕机櫃潰詭軌饋句晷歸貴"],["d0a1","鬼龜叫圭奎揆槻珪硅窺竅糾葵規赳逵閨勻均畇筠菌鈞龜橘克剋劇戟棘極隙僅劤勤懃斤根槿瑾筋芹菫覲謹近饉契今妗擒昑檎琴禁禽芩衾衿襟金錦伋及急扱汲級給亘兢矜肯企伎其冀嗜器圻基埼夔奇妓寄岐崎己幾忌技旗旣"],["d1a1","朞期杞棋棄機欺氣汽沂淇玘琦琪璂璣畸畿碁磯祁祇祈祺箕紀綺羈耆耭肌記譏豈起錡錤飢饑騎騏驥麒緊佶吉拮桔金喫儺喇奈娜懦懶拏拿癩",5,"那樂",4,"諾酪駱亂卵暖欄煖爛蘭難鸞捏捺南嵐枏楠湳濫男藍襤拉"],["d2a1","納臘蠟衲囊娘廊",4,"乃來內奈柰耐冷女年撚秊念恬拈捻寧寗努勞奴弩怒擄櫓爐瑙盧",5,"駑魯",10,"濃籠聾膿農惱牢磊腦賂雷尿壘",7,"嫩訥杻紐勒",5,"能菱陵尼泥匿溺多茶"],["d3a1","丹亶但單團壇彖斷旦檀段湍短端簞緞蛋袒鄲鍛撻澾獺疸達啖坍憺擔曇淡湛潭澹痰聃膽蕁覃談譚錟沓畓答踏遝唐堂塘幢戇撞棠當糖螳黨代垈坮大對岱帶待戴擡玳臺袋貸隊黛宅德悳倒刀到圖堵塗導屠島嶋度徒悼挑掉搗桃"],["d4a1","棹櫂淘渡滔濤燾盜睹禱稻萄覩賭跳蹈逃途道都鍍陶韜毒瀆牘犢獨督禿篤纛讀墩惇敦旽暾沌焞燉豚頓乭突仝冬凍動同憧東桐棟洞潼疼瞳童胴董銅兜斗杜枓痘竇荳讀豆逗頭屯臀芚遁遯鈍得嶝橙燈登等藤謄鄧騰喇懶拏癩羅"],["d5a1","蘿螺裸邏樂洛烙珞絡落諾酪駱丹亂卵欄欒瀾爛蘭鸞剌辣嵐擥攬欖濫籃纜藍襤覽拉臘蠟廊朗浪狼琅瑯螂郞來崍徠萊冷掠略亮倆兩凉梁樑粮粱糧良諒輛量侶儷勵呂廬慮戾旅櫚濾礪藜蠣閭驢驪麗黎力曆歷瀝礫轢靂憐戀攣漣"],["d6a1","煉璉練聯蓮輦連鍊冽列劣洌烈裂廉斂殮濂簾獵令伶囹寧岺嶺怜玲笭羚翎聆逞鈴零靈領齡例澧禮醴隷勞怒撈擄櫓潞瀘爐盧老蘆虜路輅露魯鷺鹵碌祿綠菉錄鹿麓論壟弄朧瀧瓏籠聾儡瀨牢磊賂賚賴雷了僚寮廖料燎療瞭聊蓼"],["d7a1","遼鬧龍壘婁屢樓淚漏瘻累縷蔞褸鏤陋劉旒柳榴流溜瀏琉瑠留瘤硫謬類六戮陸侖倫崙淪綸輪律慄栗率隆勒肋凜凌楞稜綾菱陵俚利厘吏唎履悧李梨浬犁狸理璃異痢籬罹羸莉裏裡里釐離鯉吝潾燐璘藺躪隣鱗麟林淋琳臨霖砬"],["d8a1","立笠粒摩瑪痲碼磨馬魔麻寞幕漠膜莫邈万卍娩巒彎慢挽晩曼滿漫灣瞞萬蔓蠻輓饅鰻唜抹末沫茉襪靺亡妄忘忙望網罔芒茫莽輞邙埋妹媒寐昧枚梅每煤罵買賣邁魅脈貊陌驀麥孟氓猛盲盟萌冪覓免冕勉棉沔眄眠綿緬面麵滅"],["d9a1","蔑冥名命明暝椧溟皿瞑茗蓂螟酩銘鳴袂侮冒募姆帽慕摸摹暮某模母毛牟牡瑁眸矛耗芼茅謀謨貌木沐牧目睦穆鶩歿沒夢朦蒙卯墓妙廟描昴杳渺猫竗苗錨務巫憮懋戊拇撫无楙武毋無珷畝繆舞茂蕪誣貿霧鵡墨默們刎吻問文"],["daa1","汶紊紋聞蚊門雯勿沕物味媚尾嵋彌微未梶楣渼湄眉米美薇謎迷靡黴岷悶愍憫敏旻旼民泯玟珉緡閔密蜜謐剝博拍搏撲朴樸泊珀璞箔粕縛膊舶薄迫雹駁伴半反叛拌搬攀斑槃泮潘班畔瘢盤盼磐磻礬絆般蟠返頒飯勃拔撥渤潑"],["dba1","發跋醱鉢髮魃倣傍坊妨尨幇彷房放方旁昉枋榜滂磅紡肪膀舫芳蒡蚌訪謗邦防龐倍俳北培徘拜排杯湃焙盃背胚裴裵褙賠輩配陪伯佰帛柏栢白百魄幡樊煩燔番磻繁蕃藩飜伐筏罰閥凡帆梵氾汎泛犯範范法琺僻劈壁擘檗璧癖"],["dca1","碧蘗闢霹便卞弁變辨辯邊別瞥鱉鼈丙倂兵屛幷昞昺柄棅炳甁病秉竝輧餠騈保堡報寶普步洑湺潽珤甫菩補褓譜輔伏僕匐卜宓復服福腹茯蔔複覆輹輻馥鰒本乶俸奉封峯峰捧棒烽熢琫縫蓬蜂逢鋒鳳不付俯傅剖副否咐埠夫婦"],["dda1","孚孵富府復扶敷斧浮溥父符簿缶腐腑膚艀芙莩訃負賦賻赴趺部釜阜附駙鳧北分吩噴墳奔奮忿憤扮昐汾焚盆粉糞紛芬賁雰不佛弗彿拂崩朋棚硼繃鵬丕備匕匪卑妃婢庇悲憊扉批斐枇榧比毖毗毘沸泌琵痺砒碑秕秘粃緋翡肥"],["dea1","脾臂菲蜚裨誹譬費鄙非飛鼻嚬嬪彬斌檳殯浜濱瀕牝玭貧賓頻憑氷聘騁乍事些仕伺似使俟僿史司唆嗣四士奢娑寫寺射巳師徙思捨斜斯柶査梭死沙泗渣瀉獅砂社祀祠私篩紗絲肆舍莎蓑蛇裟詐詞謝賜赦辭邪飼駟麝削數朔索"],["dfa1","傘刪山散汕珊産疝算蒜酸霰乷撒殺煞薩三參杉森渗芟蔘衫揷澁鈒颯上傷像償商喪嘗孀尙峠常床庠廂想桑橡湘爽牀狀相祥箱翔裳觴詳象賞霜塞璽賽嗇塞穡索色牲生甥省笙墅壻嶼序庶徐恕抒捿敍暑曙書栖棲犀瑞筮絮緖署"],["e0a1","胥舒薯西誓逝鋤黍鼠夕奭席惜昔晳析汐淅潟石碩蓆釋錫仙僊先善嬋宣扇敾旋渲煽琁瑄璇璿癬禪線繕羨腺膳船蘚蟬詵跣選銑鐥饍鮮卨屑楔泄洩渫舌薛褻設說雪齧剡暹殲纖蟾贍閃陝攝涉燮葉城姓宬性惺成星晟猩珹盛省筬"],["e1a1","聖聲腥誠醒世勢歲洗稅笹細說貰召嘯塑宵小少巢所掃搔昭梳沼消溯瀟炤燒甦疏疎瘙笑篠簫素紹蔬蕭蘇訴逍遡邵銷韶騷俗屬束涑粟續謖贖速孫巽損蓀遜飡率宋悚松淞訟誦送頌刷殺灑碎鎖衰釗修受嗽囚垂壽嫂守岫峀帥愁"],["e2a1","戍手授搜收數樹殊水洙漱燧狩獸琇璲瘦睡秀穗竪粹綏綬繡羞脩茱蒐蓚藪袖誰讐輸遂邃酬銖銹隋隧隨雖需須首髓鬚叔塾夙孰宿淑潚熟琡璹肅菽巡徇循恂旬栒楯橓殉洵淳珣盾瞬筍純脣舜荀蓴蕣詢諄醇錞順馴戌術述鉥崇崧"],["e3a1","嵩瑟膝蝨濕拾習褶襲丞乘僧勝升承昇繩蠅陞侍匙嘶始媤尸屎屍市弑恃施是時枾柴猜矢示翅蒔蓍視試詩諡豕豺埴寔式息拭植殖湜熄篒蝕識軾食飾伸侁信呻娠宸愼新晨燼申神紳腎臣莘薪藎蜃訊身辛辰迅失室實悉審尋心沁"],["e4a1","沈深瀋甚芯諶什十拾雙氏亞俄兒啞娥峨我牙芽莪蛾衙訝阿雅餓鴉鵝堊岳嶽幄惡愕握樂渥鄂鍔顎鰐齷安岸按晏案眼雁鞍顔鮟斡謁軋閼唵岩巖庵暗癌菴闇壓押狎鴨仰央怏昻殃秧鴦厓哀埃崖愛曖涯碍艾隘靄厄扼掖液縊腋額"],["e5a1","櫻罌鶯鸚也倻冶夜惹揶椰爺耶若野弱掠略約若葯蒻藥躍亮佯兩凉壤孃恙揚攘敭暘梁楊樣洋瀁煬痒瘍禳穰糧羊良襄諒讓釀陽量養圄御於漁瘀禦語馭魚齬億憶抑檍臆偃堰彦焉言諺孼蘖俺儼嚴奄掩淹嶪業円予余勵呂女如廬"],["e6a1","旅歟汝濾璵礖礪與艅茹輿轝閭餘驪麗黎亦力域役易曆歷疫繹譯轢逆驛嚥堧姸娟宴年延憐戀捐挻撚椽沇沿涎涓淵演漣烟然煙煉燃燕璉硏硯秊筵緣練縯聯衍軟輦蓮連鉛鍊鳶列劣咽悅涅烈熱裂說閱厭廉念捻染殮炎焰琰艶苒"],["e7a1","簾閻髥鹽曄獵燁葉令囹塋寧嶺嶸影怜映暎楹榮永泳渶潁濚瀛瀯煐營獰玲瑛瑩瓔盈穎纓羚聆英詠迎鈴鍈零霙靈領乂倪例刈叡曳汭濊猊睿穢芮藝蘂禮裔詣譽豫醴銳隸霓預五伍俉傲午吾吳嗚塢墺奧娛寤悟惡懊敖旿晤梧汚澳"],["e8a1","烏熬獒筽蜈誤鰲鼇屋沃獄玉鈺溫瑥瘟穩縕蘊兀壅擁瓮甕癰翁邕雍饔渦瓦窩窪臥蛙蝸訛婉完宛梡椀浣玩琓琬碗緩翫脘腕莞豌阮頑曰往旺枉汪王倭娃歪矮外嵬巍猥畏了僚僥凹堯夭妖姚寥寮尿嶢拗搖撓擾料曜樂橈燎燿瑤療"],["e9a1","窈窯繇繞耀腰蓼蟯要謠遙遼邀饒慾欲浴縟褥辱俑傭冗勇埇墉容庸慂榕涌湧溶熔瑢用甬聳茸蓉踊鎔鏞龍于佑偶優又友右宇寓尤愚憂旴牛玗瑀盂祐禑禹紆羽芋藕虞迂遇郵釪隅雨雩勖彧旭昱栯煜稶郁頊云暈橒殞澐熉耘芸蕓"],["eaa1","運隕雲韻蔚鬱亐熊雄元原員圓園垣媛嫄寃怨愿援沅洹湲源爰猿瑗苑袁轅遠阮院願鴛月越鉞位偉僞危圍委威尉慰暐渭爲瑋緯胃萎葦蔿蝟衛褘謂違韋魏乳侑儒兪劉唯喩孺宥幼幽庾悠惟愈愉揄攸有杻柔柚柳楡楢油洧流游溜"],["eba1","濡猶猷琉瑜由留癒硫紐維臾萸裕誘諛諭踰蹂遊逾遺酉釉鍮類六堉戮毓肉育陸倫允奫尹崙淪潤玧胤贇輪鈗閏律慄栗率聿戎瀜絨融隆垠恩慇殷誾銀隱乙吟淫蔭陰音飮揖泣邑凝應膺鷹依倚儀宜意懿擬椅毅疑矣義艤薏蟻衣誼"],["eca1","議醫二以伊利吏夷姨履已弛彛怡易李梨泥爾珥理異痍痢移罹而耳肄苡荑裏裡貽貳邇里離飴餌匿溺瀷益翊翌翼謚人仁刃印吝咽因姻寅引忍湮燐璘絪茵藺蚓認隣靭靷鱗麟一佚佾壹日溢逸鎰馹任壬妊姙恁林淋稔臨荏賃入卄"],["eda1","立笠粒仍剩孕芿仔刺咨姉姿子字孜恣慈滋炙煮玆瓷疵磁紫者自茨蔗藉諮資雌作勺嚼斫昨灼炸爵綽芍酌雀鵲孱棧殘潺盞岑暫潛箴簪蠶雜丈仗匠場墻壯奬將帳庄張掌暲杖樟檣欌漿牆狀獐璋章粧腸臟臧莊葬蔣薔藏裝贓醬長"],["eea1","障再哉在宰才材栽梓渽滓災縡裁財載齋齎爭箏諍錚佇低儲咀姐底抵杵楮樗沮渚狙猪疽箸紵苧菹著藷詛貯躇這邸雎齟勣吊嫡寂摘敵滴狄炙的積笛籍績翟荻謫賊赤跡蹟迪迹適鏑佃佺傳全典前剪塡塼奠專展廛悛戰栓殿氈澱"],["efa1","煎琠田甸畑癲筌箋箭篆纏詮輾轉鈿銓錢鐫電顚顫餞切截折浙癤竊節絶占岾店漸点粘霑鮎點接摺蝶丁井亭停偵呈姃定幀庭廷征情挺政整旌晶晸柾楨檉正汀淀淨渟湞瀞炡玎珽町睛碇禎程穽精綎艇訂諪貞鄭酊釘鉦鋌錠霆靖"],["f0a1","靜頂鼎制劑啼堤帝弟悌提梯濟祭第臍薺製諸蹄醍除際霽題齊俎兆凋助嘲弔彫措操早晁曺曹朝條棗槽漕潮照燥爪璪眺祖祚租稠窕粗糟組繰肇藻蚤詔調趙躁造遭釣阻雕鳥族簇足鏃存尊卒拙猝倧宗從悰慫棕淙琮種終綜縱腫"],["f1a1","踪踵鍾鐘佐坐左座挫罪主住侏做姝胄呪周嗾奏宙州廚晝朱柱株注洲湊澍炷珠疇籌紂紬綢舟蛛註誅走躊輳週酎酒鑄駐竹粥俊儁准埈寯峻晙樽浚準濬焌畯竣蠢逡遵雋駿茁中仲衆重卽櫛楫汁葺增憎曾拯烝甑症繒蒸證贈之只"],["f2a1","咫地址志持指摯支旨智枝枳止池沚漬知砥祉祗紙肢脂至芝芷蜘誌識贄趾遲直稙稷織職唇嗔塵振搢晉晋桭榛殄津溱珍瑨璡畛疹盡眞瞋秦縉縝臻蔯袗診賑軫辰進鎭陣陳震侄叱姪嫉帙桎瓆疾秩窒膣蛭質跌迭斟朕什執潗緝輯"],["f3a1","鏶集徵懲澄且侘借叉嗟嵯差次此磋箚茶蹉車遮捉搾着窄錯鑿齪撰澯燦璨瓚竄簒纂粲纘讚贊鑽餐饌刹察擦札紮僭參塹慘慙懺斬站讒讖倉倡創唱娼廠彰愴敞昌昶暢槍滄漲猖瘡窓脹艙菖蒼債埰寀寨彩採砦綵菜蔡采釵冊柵策"],["f4a1","責凄妻悽處倜刺剔尺慽戚拓擲斥滌瘠脊蹠陟隻仟千喘天川擅泉淺玔穿舛薦賤踐遷釧闡阡韆凸哲喆徹撤澈綴輟轍鐵僉尖沾添甛瞻簽籤詹諂堞妾帖捷牒疊睫諜貼輒廳晴淸聽菁請靑鯖切剃替涕滯締諦逮遞體初剿哨憔抄招梢"],["f5a1","椒楚樵炒焦硝礁礎秒稍肖艸苕草蕉貂超酢醋醮促囑燭矗蜀觸寸忖村邨叢塚寵悤憁摠總聰蔥銃撮催崔最墜抽推椎楸樞湫皺秋芻萩諏趨追鄒酋醜錐錘鎚雛騶鰍丑畜祝竺筑築縮蓄蹙蹴軸逐春椿瑃出朮黜充忠沖蟲衝衷悴膵萃"],["f6a1","贅取吹嘴娶就炊翠聚脆臭趣醉驟鷲側仄厠惻測層侈値嗤峙幟恥梔治淄熾痔痴癡稚穉緇緻置致蚩輜雉馳齒則勅飭親七柒漆侵寢枕沈浸琛砧針鍼蟄秤稱快他咤唾墮妥惰打拖朶楕舵陀馱駝倬卓啄坼度托拓擢晫柝濁濯琢琸託"],["f7a1","鐸呑嘆坦彈憚歎灘炭綻誕奪脫探眈耽貪塔搭榻宕帑湯糖蕩兌台太怠態殆汰泰笞胎苔跆邰颱宅擇澤撑攄兎吐土討慟桶洞痛筒統通堆槌腿褪退頹偸套妬投透鬪慝特闖坡婆巴把播擺杷波派爬琶破罷芭跛頗判坂板版瓣販辦鈑"],["f8a1","阪八叭捌佩唄悖敗沛浿牌狽稗覇貝彭澎烹膨愎便偏扁片篇編翩遍鞭騙貶坪平枰萍評吠嬖幣廢弊斃肺蔽閉陛佈包匍匏咆哺圃布怖抛抱捕暴泡浦疱砲胞脯苞葡蒲袍褒逋鋪飽鮑幅暴曝瀑爆輻俵剽彪慓杓標漂瓢票表豹飇飄驃"],["f9a1","品稟楓諷豊風馮彼披疲皮被避陂匹弼必泌珌畢疋筆苾馝乏逼下何厦夏廈昰河瑕荷蝦賀遐霞鰕壑學虐謔鶴寒恨悍旱汗漢澣瀚罕翰閑閒限韓割轄函含咸啣喊檻涵緘艦銜陷鹹合哈盒蛤閤闔陜亢伉姮嫦巷恒抗杭桁沆港缸肛航"],["faa1","行降項亥偕咳垓奚孩害懈楷海瀣蟹解該諧邂駭骸劾核倖幸杏荇行享向嚮珦鄕響餉饗香噓墟虛許憲櫶獻軒歇險驗奕爀赫革俔峴弦懸晛泫炫玄玹現眩睍絃絢縣舷衒見賢鉉顯孑穴血頁嫌俠協夾峽挾浹狹脅脇莢鋏頰亨兄刑型"],["fba1","形泂滎瀅灐炯熒珩瑩荊螢衡逈邢鎣馨兮彗惠慧暳蕙蹊醯鞋乎互呼壕壺好岵弧戶扈昊晧毫浩淏湖滸澔濠濩灝狐琥瑚瓠皓祜糊縞胡芦葫蒿虎號蝴護豪鎬頀顥惑或酷婚昏混渾琿魂忽惚笏哄弘汞泓洪烘紅虹訌鴻化和嬅樺火畵"],["fca1","禍禾花華話譁貨靴廓擴攫確碻穫丸喚奐宦幻患換歡晥桓渙煥環紈還驩鰥活滑猾豁闊凰幌徨恍惶愰慌晃晄榥況湟滉潢煌璜皇篁簧荒蝗遑隍黃匯回廻徊恢悔懷晦會檜淮澮灰獪繪膾茴蛔誨賄劃獲宖橫鐄哮嚆孝效斅曉梟涍淆"],["fda1","爻肴酵驍侯候厚后吼喉嗅帿後朽煦珝逅勛勳塤壎焄熏燻薰訓暈薨喧暄煊萱卉喙毁彙徽揮暉煇諱輝麾休携烋畦虧恤譎鷸兇凶匈洶胸黑昕欣炘痕吃屹紇訖欠欽歆吸恰洽翕興僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲詰"]]
-
-/***/ }),
-/* 719 */
-/***/ (function(module, exports) {
-
-module.exports = [["0","\u0000",127],["8ea1","｡",62],["a1a1","　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈",9,"＋－±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇"],["a2a1","◆□■△▲▽▼※〒→←↑↓〓"],["a2ba","∈∋⊆⊇⊂⊃∪∩"],["a2ca","∧∨￢⇒⇔∀∃"],["a2dc","∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬"],["a2f2","ʼn♯♭♪†‡¶"],["a2fe","◯"],["a3b0","０",9],["a3c1","Ａ",25],["a3e1","ａ",25],["a4a1","ぁ",82],["a5a1","ァ",85],["a6a1","Α",16,"Σ",6],["a6c1","α",16,"σ",6],["a7a1","А",5,"ЁЖ",25],["a7d1","а",5,"ёж",25],["a8a1","─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"],["ada1","①",19,"Ⅰ",9],["adc0","㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡"],["addf","㍻〝〟№㏍℡㊤",4,"㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪"],["b0a1","亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭"],["b1a1","院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応"],["b2a1","押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改"],["b3a1","魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱"],["b4a1","粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄"],["b5a1","機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京"],["b6a1","供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈"],["b7a1","掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲"],["b8a1","検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向"],["b9a1","后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込"],["baa1","此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷"],["bba1","察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時"],["bca1","次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周"],["bda1","宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償"],["bea1","勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾"],["bfa1","拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾"],["c0a1","澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線"],["c1a1","繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎"],["c2a1","臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只"],["c3a1","叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵"],["c4a1","帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓"],["c5a1","邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到"],["c6a1","董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入"],["c7a1","如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦"],["c8a1","函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美"],["c9a1","鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服"],["caa1","福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋"],["cba1","法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満"],["cca1","漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒"],["cda1","諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃"],["cea1","痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯"],["cfa1","蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕"],["d0a1","弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲"],["d1a1","僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨"],["d2a1","辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨"],["d3a1","咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉"],["d4a1","圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩"],["d5a1","奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓"],["d6a1","屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏"],["d7a1","廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚"],["d8a1","悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛"],["d9a1","戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼"],["daa1","據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼"],["dba1","曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍"],["dca1","棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣"],["dda1","檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾"],["dea1","沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌"],["dfa1","漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼"],["e0a1","燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱"],["e1a1","瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰"],["e2a1","癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬"],["e3a1","磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐"],["e4a1","筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆"],["e5a1","紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺"],["e6a1","罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋"],["e7a1","隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙"],["e8a1","茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈"],["e9a1","蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙"],["eaa1","蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞"],["eba1","襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫"],["eca1","譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊"],["eda1","蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸"],["eea1","遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮"],["efa1","錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞"],["f0a1","陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰"],["f1a1","顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷"],["f2a1","髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈"],["f3a1","鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠"],["f4a1","堯槇遙瑤凜熙"],["f9a1","纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德"],["faa1","忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱"],["fba1","犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚"],["fca1","釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"],["fcf1","ⅰ",9,"￢￤＇＂"],["8fa2af","˘ˇ¸˙˝¯˛˚～΄΅"],["8fa2c2","¡¦¿"],["8fa2eb","ºª©®™¤№"],["8fa6e1","ΆΈΉΊΪ"],["8fa6e7","Ό"],["8fa6e9","ΎΫ"],["8fa6ec","Ώ"],["8fa6f1","άέήίϊΐόςύϋΰώ"],["8fa7c2","Ђ",10,"ЎЏ"],["8fa7f2","ђ",10,"ўџ"],["8fa9a1","ÆĐ"],["8fa9a4","Ħ"],["8fa9a6","IJ"],["8fa9a8","ŁĿ"],["8fa9ab","ŊØŒ"],["8fa9af","ŦÞ"],["8fa9c1","æđðħıijĸłŀʼnŋøœßŧþ"],["8faaa1","ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈËÊĚĖĒĘ"],["8faaba","ĜĞĢĠĤÍÌÏÎǏİĪĮĨĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙǕŴÝŸŶŹŽŻ"],["8faba1","áàäâăǎāąåãćĉčçċďéèëêěėēęǵĝğ"],["8fabbd","ġĥíìïîǐ"],["8fabc5","īįĩĵķĺľļńňņñóòöôǒőōõŕřŗśŝšşťţúùüûŭǔűūųůũǘǜǚǖŵýÿŷźžż"],["8fb0a1","丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄"],["8fb1a1","侅侉侊侌侎侐侒侓侔侗侙侚侞侟侲侷侹侻侼侽侾俀俁俅俆俈俉俋俌俍俏俒俜俠俢俰俲俼俽俿倀倁倄倇倊倌倎倐倓倗倘倛倜倝倞倢倧倮倰倲倳倵偀偁偂偅偆偊偌偎偑偒偓偗偙偟偠偢偣偦偧偪偭偰偱倻傁傃傄傆傊傎傏傐"],["8fb2a1","傒傓傔傖傛傜傞",4,"傪傯傰傹傺傽僀僃僄僇僌僎僐僓僔僘僜僝僟僢僤僦僨僩僯僱僶僺僾儃儆儇儈儋儌儍儎僲儐儗儙儛儜儝儞儣儧儨儬儭儯儱儳儴儵儸儹兂兊兏兓兕兗兘兟兤兦兾冃冄冋冎冘冝冡冣冭冸冺冼冾冿凂"],["8fb3a1","凈减凑凒凓凕凘凞凢凥凮凲凳凴凷刁刂刅划刓刕刖刘刢刨刱刲刵刼剅剉剕剗剘剚剜剟剠剡剦剮剷剸剹劀劂劅劊劌劓劕劖劗劘劚劜劤劥劦劧劯劰劶劷劸劺劻劽勀勄勆勈勌勏勑勔勖勛勜勡勥勨勩勪勬勰勱勴勶勷匀匃匊匋"],["8fb4a1","匌匑匓匘匛匜匞匟匥匧匨匩匫匬匭匰匲匵匼匽匾卂卌卋卙卛卡卣卥卬卭卲卹卾厃厇厈厎厓厔厙厝厡厤厪厫厯厲厴厵厷厸厺厽叀叅叏叒叓叕叚叝叞叠另叧叵吂吓吚吡吧吨吪启吱吴吵呃呄呇呍呏呞呢呤呦呧呩呫呭呮呴呿"],["8fb5a1","咁咃咅咈咉咍咑咕咖咜咟咡咦咧咩咪咭咮咱咷咹咺咻咿哆哊响哎哠哪哬哯哶哼哾哿唀唁唅唈唉唌唍唎唕唪唫唲唵唶唻唼唽啁啇啉啊啍啐啑啘啚啛啞啠啡啤啦啿喁喂喆喈喎喏喑喒喓喔喗喣喤喭喲喿嗁嗃嗆嗉嗋嗌嗎嗑嗒"],["8fb6a1","嗓嗗嗘嗛嗞嗢嗩嗶嗿嘅嘈嘊嘍",5,"嘙嘬嘰嘳嘵嘷嘹嘻嘼嘽嘿噀噁噃噄噆噉噋噍噏噔噞噠噡噢噣噦噩噭噯噱噲噵嚄嚅嚈嚋嚌嚕嚙嚚嚝嚞嚟嚦嚧嚨嚩嚫嚬嚭嚱嚳嚷嚾囅囉囊囋囏囐囌囍囙囜囝囟囡囤",4,"囱囫园"],["8fb7a1","囶囷圁圂圇圊圌圑圕圚圛圝圠圢圣圤圥圩圪圬圮圯圳圴圽圾圿坅坆坌坍坒坢坥坧坨坫坭",4,"坳坴坵坷坹坺坻坼坾垁垃垌垔垗垙垚垜垝垞垟垡垕垧垨垩垬垸垽埇埈埌埏埕埝埞埤埦埧埩埭埰埵埶埸埽埾埿堃堄堈堉埡"],["8fb8a1","堌堍堛堞堟堠堦堧堭堲堹堿塉塌塍塏塐塕塟塡塤塧塨塸塼塿墀墁墇墈墉墊墌墍墏墐墔墖墝墠墡墢墦墩墱墲壄墼壂壈壍壎壐壒壔壖壚壝壡壢壩壳夅夆夋夌夒夓夔虁夝夡夣夤夨夯夰夳夵夶夿奃奆奒奓奙奛奝奞奟奡奣奫奭"],["8fb9a1","奯奲奵奶她奻奼妋妌妎妒妕妗妟妤妧妭妮妯妰妳妷妺妼姁姃姄姈姊姍姒姝姞姟姣姤姧姮姯姱姲姴姷娀娄娌娍娎娒娓娞娣娤娧娨娪娭娰婄婅婇婈婌婐婕婞婣婥婧婭婷婺婻婾媋媐媓媖媙媜媞媟媠媢媧媬媱媲媳媵媸媺媻媿"],["8fbaa1","嫄嫆嫈嫏嫚嫜嫠嫥嫪嫮嫵嫶嫽嬀嬁嬈嬗嬴嬙嬛嬝嬡嬥嬭嬸孁孋孌孒孖孞孨孮孯孼孽孾孿宁宄宆宊宎宐宑宓宔宖宨宩宬宭宯宱宲宷宺宼寀寁寍寏寖",4,"寠寯寱寴寽尌尗尞尟尣尦尩尫尬尮尰尲尵尶屙屚屜屢屣屧屨屩"],["8fbba1","屭屰屴屵屺屻屼屽岇岈岊岏岒岝岟岠岢岣岦岪岲岴岵岺峉峋峒峝峗峮峱峲峴崁崆崍崒崫崣崤崦崧崱崴崹崽崿嵂嵃嵆嵈嵕嵑嵙嵊嵟嵠嵡嵢嵤嵪嵭嵰嵹嵺嵾嵿嶁嶃嶈嶊嶒嶓嶔嶕嶙嶛嶟嶠嶧嶫嶰嶴嶸嶹巃巇巋巐巎巘巙巠巤"],["8fbca1","巩巸巹帀帇帍帒帔帕帘帟帠帮帨帲帵帾幋幐幉幑幖幘幛幜幞幨幪",4,"幰庀庋庎庢庤庥庨庪庬庱庳庽庾庿廆廌廋廎廑廒廔廕廜廞廥廫异弆弇弈弎弙弜弝弡弢弣弤弨弫弬弮弰弴弶弻弽弿彀彄彅彇彍彐彔彘彛彠彣彤彧"],["8fbda1","彯彲彴彵彸彺彽彾徉徍徏徖徜徝徢徧徫徤徬徯徰徱徸忄忇忈忉忋忐",4,"忞忡忢忨忩忪忬忭忮忯忲忳忶忺忼怇怊怍怓怔怗怘怚怟怤怭怳怵恀恇恈恉恌恑恔恖恗恝恡恧恱恾恿悂悆悈悊悎悑悓悕悘悝悞悢悤悥您悰悱悷"],["8fbea1","悻悾惂惄惈惉惊惋惎惏惔惕惙惛惝惞惢惥惲惵惸惼惽愂愇愊愌愐",4,"愖愗愙愜愞愢愪愫愰愱愵愶愷愹慁慅慆慉慞慠慬慲慸慻慼慿憀憁憃憄憋憍憒憓憗憘憜憝憟憠憥憨憪憭憸憹憼懀懁懂懎懏懕懜懝懞懟懡懢懧懩懥"],["8fbfa1","懬懭懯戁戃戄戇戓戕戜戠戢戣戧戩戫戹戽扂扃扄扆扌扐扑扒扔扖扚扜扤扭扯扳扺扽抍抎抏抐抦抨抳抶抷抺抾抿拄拎拕拖拚拪拲拴拼拽挃挄挊挋挍挐挓挖挘挩挪挭挵挶挹挼捁捂捃捄捆捊捋捎捒捓捔捘捛捥捦捬捭捱捴捵"],["8fc0a1","捸捼捽捿掂掄掇掊掐掔掕掙掚掞掤掦掭掮掯掽揁揅揈揎揑揓揔揕揜揠揥揪揬揲揳揵揸揹搉搊搐搒搔搘搞搠搢搤搥搩搪搯搰搵搽搿摋摏摑摒摓摔摚摛摜摝摟摠摡摣摭摳摴摻摽撅撇撏撐撑撘撙撛撝撟撡撣撦撨撬撳撽撾撿"],["8fc1a1","擄擉擊擋擌擎擐擑擕擗擤擥擩擪擭擰擵擷擻擿攁攄攈攉攊攏攓攔攖攙攛攞攟攢攦攩攮攱攺攼攽敃敇敉敐敒敔敟敠敧敫敺敽斁斅斊斒斕斘斝斠斣斦斮斲斳斴斿旂旈旉旎旐旔旖旘旟旰旲旴旵旹旾旿昀昄昈昉昍昑昒昕昖昝"],["8fc2a1","昞昡昢昣昤昦昩昪昫昬昮昰昱昳昹昷晀晅晆晊晌晑晎晗晘晙晛晜晠晡曻晪晫晬晾晳晵晿晷晸晹晻暀晼暋暌暍暐暒暙暚暛暜暟暠暤暭暱暲暵暻暿曀曂曃曈曌曎曏曔曛曟曨曫曬曮曺朅朇朎朓朙朜朠朢朳朾杅杇杈杌杔杕杝"],["8fc3a1","杦杬杮杴杶杻极构枎枏枑枓枖枘枙枛枰枱枲枵枻枼枽柹柀柂柃柅柈柉柒柗柙柜柡柦柰柲柶柷桒栔栙栝栟栨栧栬栭栯栰栱栳栻栿桄桅桊桌桕桗桘桛桫桮",4,"桵桹桺桻桼梂梄梆梈梖梘梚梜梡梣梥梩梪梮梲梻棅棈棌棏"],["8fc4a1","棐棑棓棖棙棜棝棥棨棪棫棬棭棰棱棵棶棻棼棽椆椉椊椐椑椓椖椗椱椳椵椸椻楂楅楉楎楗楛楣楤楥楦楨楩楬楰楱楲楺楻楿榀榍榒榖榘榡榥榦榨榫榭榯榷榸榺榼槅槈槑槖槗槢槥槮槯槱槳槵槾樀樁樃樏樑樕樚樝樠樤樨樰樲"],["8fc5a1","樴樷樻樾樿橅橆橉橊橎橐橑橒橕橖橛橤橧橪橱橳橾檁檃檆檇檉檋檑檛檝檞檟檥檫檯檰檱檴檽檾檿櫆櫉櫈櫌櫐櫔櫕櫖櫜櫝櫤櫧櫬櫰櫱櫲櫼櫽欂欃欆欇欉欏欐欑欗欛欞欤欨欫欬欯欵欶欻欿歆歊歍歒歖歘歝歠歧歫歮歰歵歽"],["8fc6a1","歾殂殅殗殛殟殠殢殣殨殩殬殭殮殰殸殹殽殾毃毄毉毌毖毚毡毣毦毧毮毱毷毹毿氂氄氅氉氍氎氐氒氙氟氦氧氨氬氮氳氵氶氺氻氿汊汋汍汏汒汔汙汛汜汫汭汯汴汶汸汹汻沅沆沇沉沔沕沗沘沜沟沰沲沴泂泆泍泏泐泑泒泔泖"],["8fc7a1","泚泜泠泧泩泫泬泮泲泴洄洇洊洎洏洑洓洚洦洧洨汧洮洯洱洹洼洿浗浞浟浡浥浧浯浰浼涂涇涑涒涔涖涗涘涪涬涴涷涹涽涿淄淈淊淎淏淖淛淝淟淠淢淥淩淯淰淴淶淼渀渄渞渢渧渲渶渹渻渼湄湅湈湉湋湏湑湒湓湔湗湜湝湞"],["8fc8a1","湢湣湨湳湻湽溍溓溙溠溧溭溮溱溳溻溿滀滁滃滇滈滊滍滎滏滫滭滮滹滻滽漄漈漊漌漍漖漘漚漛漦漩漪漯漰漳漶漻漼漭潏潑潒潓潗潙潚潝潞潡潢潨潬潽潾澃澇澈澋澌澍澐澒澓澔澖澚澟澠澥澦澧澨澮澯澰澵澶澼濅濇濈濊"],["8fc9a1","濚濞濨濩濰濵濹濼濽瀀瀅瀆瀇瀍瀗瀠瀣瀯瀴瀷瀹瀼灃灄灈灉灊灋灔灕灝灞灎灤灥灬灮灵灶灾炁炅炆炔",4,"炛炤炫炰炱炴炷烊烑烓烔烕烖烘烜烤烺焃",4,"焋焌焏焞焠焫焭焯焰焱焸煁煅煆煇煊煋煐煒煗煚煜煞煠"],["8fcaa1","煨煹熀熅熇熌熒熚熛熠熢熯熰熲熳熺熿燀燁燄燋燌燓燖燙燚燜燸燾爀爇爈爉爓爗爚爝爟爤爫爯爴爸爹牁牂牃牅牎牏牐牓牕牖牚牜牞牠牣牨牫牮牯牱牷牸牻牼牿犄犉犍犎犓犛犨犭犮犱犴犾狁狇狉狌狕狖狘狟狥狳狴狺狻"],["8fcba1","狾猂猄猅猇猋猍猒猓猘猙猞猢猤猧猨猬猱猲猵猺猻猽獃獍獐獒獖獘獝獞獟獠獦獧獩獫獬獮獯獱獷獹獼玀玁玃玅玆玎玐玓玕玗玘玜玞玟玠玢玥玦玪玫玭玵玷玹玼玽玿珅珆珉珋珌珏珒珓珖珙珝珡珣珦珧珩珴珵珷珹珺珻珽"],["8fcca1","珿琀琁琄琇琊琑琚琛琤琦琨",9,"琹瑀瑃瑄瑆瑇瑋瑍瑑瑒瑗瑝瑢瑦瑧瑨瑫瑭瑮瑱瑲璀璁璅璆璇璉璏璐璑璒璘璙璚璜璟璠璡璣璦璨璩璪璫璮璯璱璲璵璹璻璿瓈瓉瓌瓐瓓瓘瓚瓛瓞瓟瓤瓨瓪瓫瓯瓴瓺瓻瓼瓿甆"],["8fcda1","甒甖甗甠甡甤甧甩甪甯甶甹甽甾甿畀畃畇畈畎畐畒畗畞畟畡畯畱畹",5,"疁疅疐疒疓疕疙疜疢疤疴疺疿痀痁痄痆痌痎痏痗痜痟痠痡痤痧痬痮痯痱痹瘀瘂瘃瘄瘇瘈瘊瘌瘏瘒瘓瘕瘖瘙瘛瘜瘝瘞瘣瘥瘦瘩瘭瘲瘳瘵瘸瘹"],["8fcea1","瘺瘼癊癀癁癃癄癅癉癋癕癙癟癤癥癭癮癯癱癴皁皅皌皍皕皛皜皝皟皠皢",6,"皪皭皽盁盅盉盋盌盎盔盙盠盦盨盬盰盱盶盹盼眀眆眊眎眒眔眕眗眙眚眜眢眨眭眮眯眴眵眶眹眽眾睂睅睆睊睍睎睏睒睖睗睜睞睟睠睢"],["8fcfa1","睤睧睪睬睰睲睳睴睺睽瞀瞄瞌瞍瞔瞕瞖瞚瞟瞢瞧瞪瞮瞯瞱瞵瞾矃矉矑矒矕矙矞矟矠矤矦矪矬矰矱矴矸矻砅砆砉砍砎砑砝砡砢砣砭砮砰砵砷硃硄硇硈硌硎硒硜硞硠硡硣硤硨硪确硺硾碊碏碔碘碡碝碞碟碤碨碬碭碰碱碲碳"],["8fd0a1","碻碽碿磇磈磉磌磎磒磓磕磖磤磛磟磠磡磦磪磲磳礀磶磷磺磻磿礆礌礐礚礜礞礟礠礥礧礩礭礱礴礵礻礽礿祄祅祆祊祋祏祑祔祘祛祜祧祩祫祲祹祻祼祾禋禌禑禓禔禕禖禘禛禜禡禨禩禫禯禱禴禸离秂秄秇秈秊秏秔秖秚秝秞"],["8fd1a1","秠秢秥秪秫秭秱秸秼稂稃稇稉稊稌稑稕稛稞稡稧稫稭稯稰稴稵稸稹稺穄穅穇穈穌穕穖穙穜穝穟穠穥穧穪穭穵穸穾窀窂窅窆窊窋窐窑窔窞窠窣窬窳窵窹窻窼竆竉竌竎竑竛竨竩竫竬竱竴竻竽竾笇笔笟笣笧笩笪笫笭笮笯笰"],["8fd2a1","笱笴笽笿筀筁筇筎筕筠筤筦筩筪筭筯筲筳筷箄箉箎箐箑箖箛箞箠箥箬箯箰箲箵箶箺箻箼箽篂篅篈篊篔篖篗篙篚篛篨篪篲篴篵篸篹篺篼篾簁簂簃簄簆簉簋簌簎簏簙簛簠簥簦簨簬簱簳簴簶簹簺籆籊籕籑籒籓籙",5],["8fd3a1","籡籣籧籩籭籮籰籲籹籼籽粆粇粏粔粞粠粦粰粶粷粺粻粼粿糄糇糈糉糍糏糓糔糕糗糙糚糝糦糩糫糵紃紇紈紉紏紑紒紓紖紝紞紣紦紪紭紱紼紽紾絀絁絇絈絍絑絓絗絙絚絜絝絥絧絪絰絸絺絻絿綁綂綃綅綆綈綋綌綍綑綖綗綝"],["8fd4a1","綞綦綧綪綳綶綷綹緂",4,"緌緍緎緗緙縀緢緥緦緪緫緭緱緵緶緹緺縈縐縑縕縗縜縝縠縧縨縬縭縯縳縶縿繄繅繇繎繐繒繘繟繡繢繥繫繮繯繳繸繾纁纆纇纊纍纑纕纘纚纝纞缼缻缽缾缿罃罄罇罏罒罓罛罜罝罡罣罤罥罦罭"],["8fd5a1","罱罽罾罿羀羋羍羏羐羑羖羗羜羡羢羦羪羭羴羼羿翀翃翈翎翏翛翟翣翥翨翬翮翯翲翺翽翾翿耇耈耊耍耎耏耑耓耔耖耝耞耟耠耤耦耬耮耰耴耵耷耹耺耼耾聀聄聠聤聦聭聱聵肁肈肎肜肞肦肧肫肸肹胈胍胏胒胔胕胗胘胠胭胮"],["8fd6a1","胰胲胳胶胹胺胾脃脋脖脗脘脜脞脠脤脧脬脰脵脺脼腅腇腊腌腒腗腠腡腧腨腩腭腯腷膁膐膄膅膆膋膎膖膘膛膞膢膮膲膴膻臋臃臅臊臎臏臕臗臛臝臞臡臤臫臬臰臱臲臵臶臸臹臽臿舀舃舏舓舔舙舚舝舡舢舨舲舴舺艃艄艅艆"],["8fd7a1","艋艎艏艑艖艜艠艣艧艭艴艻艽艿芀芁芃芄芇芉芊芎芑芔芖芘芚芛芠芡芣芤芧芨芩芪芮芰芲芴芷芺芼芾芿苆苐苕苚苠苢苤苨苪苭苯苶苷苽苾茀茁茇茈茊茋荔茛茝茞茟茡茢茬茭茮茰茳茷茺茼茽荂荃荄荇荍荎荑荕荖荗荰荸"],["8fd8a1","荽荿莀莂莄莆莍莒莔莕莘莙莛莜莝莦莧莩莬莾莿菀菇菉菏菐菑菔菝荓菨菪菶菸菹菼萁萆萊萏萑萕萙莭萯萹葅葇葈葊葍葏葑葒葖葘葙葚葜葠葤葥葧葪葰葳葴葶葸葼葽蒁蒅蒒蒓蒕蒞蒦蒨蒩蒪蒯蒱蒴蒺蒽蒾蓀蓂蓇蓈蓌蓏蓓"],["8fd9a1","蓜蓧蓪蓯蓰蓱蓲蓷蔲蓺蓻蓽蔂蔃蔇蔌蔎蔐蔜蔞蔢蔣蔤蔥蔧蔪蔫蔯蔳蔴蔶蔿蕆蕏",4,"蕖蕙蕜",6,"蕤蕫蕯蕹蕺蕻蕽蕿薁薅薆薉薋薌薏薓薘薝薟薠薢薥薧薴薶薷薸薼薽薾薿藂藇藊藋藎薭藘藚藟藠藦藨藭藳藶藼"],["8fdaa1","藿蘀蘄蘅蘍蘎蘐蘑蘒蘘蘙蘛蘞蘡蘧蘩蘶蘸蘺蘼蘽虀虂虆虒虓虖虗虘虙虝虠",4,"虩虬虯虵虶虷虺蚍蚑蚖蚘蚚蚜蚡蚦蚧蚨蚭蚱蚳蚴蚵蚷蚸蚹蚿蛀蛁蛃蛅蛑蛒蛕蛗蛚蛜蛠蛣蛥蛧蚈蛺蛼蛽蜄蜅蜇蜋蜎蜏蜐蜓蜔蜙蜞蜟蜡蜣"],["8fdba1","蜨蜮蜯蜱蜲蜹蜺蜼蜽蜾蝀蝃蝅蝍蝘蝝蝡蝤蝥蝯蝱蝲蝻螃",6,"螋螌螐螓螕螗螘螙螞螠螣螧螬螭螮螱螵螾螿蟁蟈蟉蟊蟎蟕蟖蟙蟚蟜蟟蟢蟣蟤蟪蟫蟭蟱蟳蟸蟺蟿蠁蠃蠆蠉蠊蠋蠐蠙蠒蠓蠔蠘蠚蠛蠜蠞蠟蠨蠭蠮蠰蠲蠵"],["8fdca1","蠺蠼衁衃衅衈衉衊衋衎衑衕衖衘衚衜衟衠衤衩衱衹衻袀袘袚袛袜袟袠袨袪袺袽袾裀裊",4,"裑裒裓裛裞裧裯裰裱裵裷褁褆褍褎褏褕褖褘褙褚褜褠褦褧褨褰褱褲褵褹褺褾襀襂襅襆襉襏襒襗襚襛襜襡襢襣襫襮襰襳襵襺"],["8fdda1","襻襼襽覉覍覐覔覕覛覜覟覠覥覰覴覵覶覷覼觔",4,"觥觩觫觭觱觳觶觹觽觿訄訅訇訏訑訒訔訕訞訠訢訤訦訫訬訯訵訷訽訾詀詃詅詇詉詍詎詓詖詗詘詜詝詡詥詧詵詶詷詹詺詻詾詿誀誃誆誋誏誐誒誖誗誙誟誧誩誮誯誳"],["8fdea1","誶誷誻誾諃諆諈諉諊諑諓諔諕諗諝諟諬諰諴諵諶諼諿謅謆謋謑謜謞謟謊謭謰謷謼譂",4,"譈譒譓譔譙譍譞譣譭譶譸譹譼譾讁讄讅讋讍讏讔讕讜讞讟谸谹谽谾豅豇豉豋豏豑豓豔豗豘豛豝豙豣豤豦豨豩豭豳豵豶豻豾貆"],["8fdfa1","貇貋貐貒貓貙貛貜貤貹貺賅賆賉賋賏賖賕賙賝賡賨賬賯賰賲賵賷賸賾賿贁贃贉贒贗贛赥赩赬赮赿趂趄趈趍趐趑趕趞趟趠趦趫趬趯趲趵趷趹趻跀跅跆跇跈跊跎跑跔跕跗跙跤跥跧跬跰趼跱跲跴跽踁踄踅踆踋踑踔踖踠踡踢"],["8fe0a1","踣踦踧踱踳踶踷踸踹踽蹀蹁蹋蹍蹎蹏蹔蹛蹜蹝蹞蹡蹢蹩蹬蹭蹯蹰蹱蹹蹺蹻躂躃躉躐躒躕躚躛躝躞躢躧躩躭躮躳躵躺躻軀軁軃軄軇軏軑軔軜軨軮軰軱軷軹軺軭輀輂輇輈輏輐輖輗輘輞輠輡輣輥輧輨輬輭輮輴輵輶輷輺轀轁"],["8fe1a1","轃轇轏轑",4,"轘轝轞轥辝辠辡辤辥辦辵辶辸达迀迁迆迊迋迍运迒迓迕迠迣迤迨迮迱迵迶迻迾适逄逈逌逘逛逨逩逯逪逬逭逳逴逷逿遃遄遌遛遝遢遦遧遬遰遴遹邅邈邋邌邎邐邕邗邘邙邛邠邡邢邥邰邲邳邴邶邽郌邾郃"],["8fe2a1","郄郅郇郈郕郗郘郙郜郝郟郥郒郶郫郯郰郴郾郿鄀鄄鄅鄆鄈鄍鄐鄔鄖鄗鄘鄚鄜鄞鄠鄥鄢鄣鄧鄩鄮鄯鄱鄴鄶鄷鄹鄺鄼鄽酃酇酈酏酓酗酙酚酛酡酤酧酭酴酹酺酻醁醃醅醆醊醎醑醓醔醕醘醞醡醦醨醬醭醮醰醱醲醳醶醻醼醽醿"],["8fe3a1","釂釃釅釓釔釗釙釚釞釤釥釩釪釬",5,"釷釹釻釽鈀鈁鈄鈅鈆鈇鈉鈊鈌鈐鈒鈓鈖鈘鈜鈝鈣鈤鈥鈦鈨鈮鈯鈰鈳鈵鈶鈸鈹鈺鈼鈾鉀鉂鉃鉆鉇鉊鉍鉎鉏鉑鉘鉙鉜鉝鉠鉡鉥鉧鉨鉩鉮鉯鉰鉵",4,"鉻鉼鉽鉿銈銉銊銍銎銒銗"],["8fe4a1","銙銟銠銤銥銧銨銫銯銲銶銸銺銻銼銽銿",4,"鋅鋆鋇鋈鋋鋌鋍鋎鋐鋓鋕鋗鋘鋙鋜鋝鋟鋠鋡鋣鋥鋧鋨鋬鋮鋰鋹鋻鋿錀錂錈錍錑錔錕錜錝錞錟錡錤錥錧錩錪錳錴錶錷鍇鍈鍉鍐鍑鍒鍕鍗鍘鍚鍞鍤鍥鍧鍩鍪鍭鍯鍰鍱鍳鍴鍶"],["8fe5a1","鍺鍽鍿鎀鎁鎂鎈鎊鎋鎍鎏鎒鎕鎘鎛鎞鎡鎣鎤鎦鎨鎫鎴鎵鎶鎺鎩鏁鏄鏅鏆鏇鏉",4,"鏓鏙鏜鏞鏟鏢鏦鏧鏹鏷鏸鏺鏻鏽鐁鐂鐄鐈鐉鐍鐎鐏鐕鐖鐗鐟鐮鐯鐱鐲鐳鐴鐻鐿鐽鑃鑅鑈鑊鑌鑕鑙鑜鑟鑡鑣鑨鑫鑭鑮鑯鑱鑲钄钃镸镹"],["8fe6a1","镾閄閈閌閍閎閝閞閟閡閦閩閫閬閴閶閺閽閿闆闈闉闋闐闑闒闓闙闚闝闞闟闠闤闦阝阞阢阤阥阦阬阱阳阷阸阹阺阼阽陁陒陔陖陗陘陡陮陴陻陼陾陿隁隂隃隄隉隑隖隚隝隟隤隥隦隩隮隯隳隺雊雒嶲雘雚雝雞雟雩雯雱雺霂"],["8fe7a1","霃霅霉霚霛霝霡霢霣霨霱霳靁靃靊靎靏靕靗靘靚靛靣靧靪靮靳靶靷靸靻靽靿鞀鞉鞕鞖鞗鞙鞚鞞鞟鞢鞬鞮鞱鞲鞵鞶鞸鞹鞺鞼鞾鞿韁韄韅韇韉韊韌韍韎韐韑韔韗韘韙韝韞韠韛韡韤韯韱韴韷韸韺頇頊頙頍頎頔頖頜頞頠頣頦"],["8fe8a1","頫頮頯頰頲頳頵頥頾顄顇顊顑顒顓顖顗顙顚顢顣顥顦顪顬颫颭颮颰颴颷颸颺颻颿飂飅飈飌飡飣飥飦飧飪飳飶餂餇餈餑餕餖餗餚餛餜餟餢餦餧餫餱",4,"餹餺餻餼饀饁饆饇饈饍饎饔饘饙饛饜饞饟饠馛馝馟馦馰馱馲馵"],["8fe9a1","馹馺馽馿駃駉駓駔駙駚駜駞駧駪駫駬駰駴駵駹駽駾騂騃騄騋騌騐騑騖騞騠騢騣騤騧騭騮騳騵騶騸驇驁驄驊驋驌驎驑驔驖驝骪骬骮骯骲骴骵骶骹骻骾骿髁髃髆髈髎髐髒髕髖髗髛髜髠髤髥髧髩髬髲髳髵髹髺髽髿",4],["8feaa1","鬄鬅鬈鬉鬋鬌鬍鬎鬐鬒鬖鬙鬛鬜鬠鬦鬫鬭鬳鬴鬵鬷鬹鬺鬽魈魋魌魕魖魗魛魞魡魣魥魦魨魪",4,"魳魵魷魸魹魿鮀鮄鮅鮆鮇鮉鮊鮋鮍鮏鮐鮔鮚鮝鮞鮦鮧鮩鮬鮰鮱鮲鮷鮸鮻鮼鮾鮿鯁鯇鯈鯎鯐鯗鯘鯝鯟鯥鯧鯪鯫鯯鯳鯷鯸"],["8feba1","鯹鯺鯽鯿鰀鰂鰋鰏鰑鰖鰘鰙鰚鰜鰞鰢鰣鰦",4,"鰱鰵鰶鰷鰽鱁鱃鱄鱅鱉鱊鱎鱏鱐鱓鱔鱖鱘鱛鱝鱞鱟鱣鱩鱪鱜鱫鱨鱮鱰鱲鱵鱷鱻鳦鳲鳷鳹鴋鴂鴑鴗鴘鴜鴝鴞鴯鴰鴲鴳鴴鴺鴼鵅鴽鵂鵃鵇鵊鵓鵔鵟鵣鵢鵥鵩鵪鵫鵰鵶鵷鵻"],["8feca1","鵼鵾鶃鶄鶆鶊鶍鶎鶒鶓鶕鶖鶗鶘鶡鶪鶬鶮鶱鶵鶹鶼鶿鷃鷇鷉鷊鷔鷕鷖鷗鷚鷞鷟鷠鷥鷧鷩鷫鷮鷰鷳鷴鷾鸊鸂鸇鸎鸐鸑鸒鸕鸖鸙鸜鸝鹺鹻鹼麀麂麃麄麅麇麎麏麖麘麛麞麤麨麬麮麯麰麳麴麵黆黈黋黕黟黤黧黬黭黮黰黱黲黵"],["8feda1","黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃",4,"齓齕齖齗齘齚齝齞齨齩齭",4,"齳齵齺齽龏龐龑龒龔龖龗龞龡龢龣龥"]]
-
-/***/ }),
-/* 720 */
-/***/ (function(module, exports) {
-
-module.exports = {"uChars":[128,165,169,178,184,216,226,235,238,244,248,251,253,258,276,284,300,325,329,334,364,463,465,467,469,471,473,475,477,506,594,610,712,716,730,930,938,962,970,1026,1104,1106,8209,8215,8218,8222,8231,8241,8244,8246,8252,8365,8452,8454,8458,8471,8482,8556,8570,8596,8602,8713,8720,8722,8726,8731,8737,8740,8742,8748,8751,8760,8766,8777,8781,8787,8802,8808,8816,8854,8858,8870,8896,8979,9322,9372,9548,9588,9616,9622,9634,9652,9662,9672,9676,9680,9702,9735,9738,9793,9795,11906,11909,11913,11917,11928,11944,11947,11951,11956,11960,11964,11979,12284,12292,12312,12319,12330,12351,12436,12447,12535,12543,12586,12842,12850,12964,13200,13215,13218,13253,13263,13267,13270,13384,13428,13727,13839,13851,14617,14703,14801,14816,14964,15183,15471,15585,16471,16736,17208,17325,17330,17374,17623,17997,18018,18212,18218,18301,18318,18760,18811,18814,18820,18823,18844,18848,18872,19576,19620,19738,19887,40870,59244,59336,59367,59413,59417,59423,59431,59437,59443,59452,59460,59478,59493,63789,63866,63894,63976,63986,64016,64018,64021,64025,64034,64037,64042,65074,65093,65107,65112,65127,65132,65375,65510,65536],"gbChars":[0,36,38,45,50,81,89,95,96,100,103,104,105,109,126,133,148,172,175,179,208,306,307,308,309,310,311,312,313,341,428,443,544,545,558,741,742,749,750,805,819,820,7922,7924,7925,7927,7934,7943,7944,7945,7950,8062,8148,8149,8152,8164,8174,8236,8240,8262,8264,8374,8380,8381,8384,8388,8390,8392,8393,8394,8396,8401,8406,8416,8419,8424,8437,8439,8445,8482,8485,8496,8521,8603,8936,8946,9046,9050,9063,9066,9076,9092,9100,9108,9111,9113,9131,9162,9164,9218,9219,11329,11331,11334,11336,11346,11361,11363,11366,11370,11372,11375,11389,11682,11686,11687,11692,11694,11714,11716,11723,11725,11730,11736,11982,11989,12102,12336,12348,12350,12384,12393,12395,12397,12510,12553,12851,12962,12973,13738,13823,13919,13933,14080,14298,14585,14698,15583,15847,16318,16434,16438,16481,16729,17102,17122,17315,17320,17402,17418,17859,17909,17911,17915,17916,17936,17939,17961,18664,18703,18814,18962,19043,33469,33470,33471,33484,33485,33490,33497,33501,33505,33513,33520,33536,33550,37845,37921,37948,38029,38038,38064,38065,38066,38069,38075,38076,38078,39108,39109,39113,39114,39115,39116,39265,39394,189000]}
-
-/***/ }),
-/* 721 */
-/***/ (function(module, exports) {
-
-module.exports = [["0","\u0000",128],["a1","｡",62],["8140","　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈",9,"＋－±×"],["8180","÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇◆□■△▲▽▼※〒→←↑↓〓"],["81b8","∈∋⊆⊇⊂⊃∪∩"],["81c8","∧∨￢⇒⇔∀∃"],["81da","∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬"],["81f0","ʼn♯♭♪†‡¶"],["81fc","◯"],["824f","０",9],["8260","Ａ",25],["8281","ａ",25],["829f","ぁ",82],["8340","ァ",62],["8380","ム",22],["839f","Α",16,"Σ",6],["83bf","α",16,"σ",6],["8440","А",5,"ЁЖ",25],["8470","а",5,"ёж",7],["8480","о",17],["849f","─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"],["8740","①",19,"Ⅰ",9],["875f","㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡"],["877e","㍻"],["8780","〝〟№㏍℡㊤",4,"㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪"],["889f","亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭"],["8940","院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円"],["8980","園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改"],["8a40","魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫"],["8a80","橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄"],["8b40","機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救"],["8b80","朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈"],["8c40","掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨"],["8c80","劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向"],["8d40","后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降"],["8d80","項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷"],["8e40","察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止"],["8e80","死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周"],["8f40","宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳"],["8f80","準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾"],["9040","拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨"],["9080","逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線"],["9140","繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻"],["9180","操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只"],["9240","叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄"],["9280","逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓"],["9340","邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬"],["9380","凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入"],["9440","如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅"],["9480","楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美"],["9540","鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷"],["9580","斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋"],["9640","法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆"],["9680","摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒"],["9740","諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲"],["9780","沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯"],["9840","蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕"],["989f","弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲"],["9940","僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭"],["9980","凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨"],["9a40","咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸"],["9a80","噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩"],["9b40","奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀"],["9b80","它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏"],["9c40","廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠"],["9c80","怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛"],["9d40","戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫"],["9d80","捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼"],["9e40","曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎"],["9e80","梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣"],["9f40","檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯"],["9f80","麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌"],["e040","漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝"],["e080","烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱"],["e140","瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿"],["e180","痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬"],["e240","磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰"],["e280","窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆"],["e340","紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷"],["e380","縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋"],["e440","隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤"],["e480","艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈"],["e540","蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬"],["e580","蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞"],["e640","襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧"],["e680","諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊"],["e740","蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜"],["e780","轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮"],["e840","錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙"],["e880","閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰"],["e940","顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃"],["e980","騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈"],["ea40","鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯"],["ea80","黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠堯槇遙瑤凜熙"],["ed40","纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏"],["ed80","塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱"],["ee40","犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙"],["ee80","蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"],["eeef","ⅰ",9,"￢￤＇＂"],["f040","",62],["f080","",124],["f140","",62],["f180","",124],["f240","",62],["f280","",124],["f340","",62],["f380","",124],["f440","",62],["f480","",124],["f540","",62],["f580","",124],["f640","",62],["f680","",124],["f740","",62],["f780","",124],["f840","",62],["f880","",124],["f940",""],["fa40","ⅰ",9,"Ⅰ",9,"￢￤＇＂㈱№℡∵纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊"],["fa80","兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯"],["fb40","涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神"],["fb80","祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙"],["fc40","髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"]]
-
-/***/ }),
-/* 722 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var Buffer = __webpack_require__(15).Buffer;
-
-// Note: UTF16-LE (or UCS2) codec is Node.js native. See encodings/internal.js
-
-// == UTF16-BE codec. ==========================================================
-
-exports.utf16be = Utf16BECodec;
-function Utf16BECodec() {
-}
-
-Utf16BECodec.prototype.encoder = Utf16BEEncoder;
-Utf16BECodec.prototype.decoder = Utf16BEDecoder;
-Utf16BECodec.prototype.bomAware = true;
-
-
-// -- Encoding
-
-function Utf16BEEncoder() {
-}
-
-Utf16BEEncoder.prototype.write = function(str) {
-    var buf = Buffer.from(str, 'ucs2');
-    for (var i = 0; i < buf.length; i += 2) {
-        var tmp = buf[i]; buf[i] = buf[i+1]; buf[i+1] = tmp;
-    }
-    return buf;
-}
-
-Utf16BEEncoder.prototype.end = function() {
-}
-
-
-// -- Decoding
-
-function Utf16BEDecoder() {
-    this.overflowByte = -1;
-}
-
-Utf16BEDecoder.prototype.write = function(buf) {
-    if (buf.length == 0)
-        return '';
-
-    var buf2 = Buffer.alloc(buf.length + 1),
-        i = 0, j = 0;
-
-    if (this.overflowByte !== -1) {
-        buf2[0] = buf[0];
-        buf2[1] = this.overflowByte;
-        i = 1; j = 2;
-    }
-
-    for (; i < buf.length-1; i += 2, j+= 2) {
-        buf2[j] = buf[i+1];
-        buf2[j+1] = buf[i];
-    }
-
-    this.overflowByte = (i == buf.length-1) ? buf[buf.length-1] : -1;
-
-    return buf2.slice(0, j).toString('ucs2');
-}
-
-Utf16BEDecoder.prototype.end = function() {
-}
-
-
-// == UTF-16 codec =============================================================
-// Decoder chooses automatically from UTF-16LE and UTF-16BE using BOM and space-based heuristic.
-// Defaults to UTF-16LE, as it's prevalent and default in Node.
-// http://en.wikipedia.org/wiki/UTF-16 and http://encoding.spec.whatwg.org/#utf-16le
-// Decoder default can be changed: iconv.decode(buf, 'utf16', {defaultEncoding: 'utf-16be'});
-
-// Encoder uses UTF-16LE and prepends BOM (which can be overridden with addBOM: false).
-
-exports.utf16 = Utf16Codec;
-function Utf16Codec(codecOptions, iconv) {
-    this.iconv = iconv;
-}
-
-Utf16Codec.prototype.encoder = Utf16Encoder;
-Utf16Codec.prototype.decoder = Utf16Decoder;
-
-
-// -- Encoding (pass-through)
-
-function Utf16Encoder(options, codec) {
-    options = options || {};
-    if (options.addBOM === undefined)
-        options.addBOM = true;
-    this.encoder = codec.iconv.getEncoder('utf-16le', options);
-}
-
-Utf16Encoder.prototype.write = function(str) {
-    return this.encoder.write(str);
-}
-
-Utf16Encoder.prototype.end = function() {
-    return this.encoder.end();
-}
-
-
-// -- Decoding
-
-function Utf16Decoder(options, codec) {
-    this.decoder = null;
-    this.initialBytes = [];
-    this.initialBytesLen = 0;
-
-    this.options = options || {};
-    this.iconv = codec.iconv;
-}
-
-Utf16Decoder.prototype.write = function(buf) {
-    if (!this.decoder) {
-        // Codec is not chosen yet. Accumulate initial bytes.
-        this.initialBytes.push(buf);
-        this.initialBytesLen += buf.length;
-        
-        if (this.initialBytesLen < 16) // We need more bytes to use space heuristic (see below)
-            return '';
-
-        // We have enough bytes -> detect endianness.
-        var buf = Buffer.concat(this.initialBytes),
-            encoding = detectEncoding(buf, this.options.defaultEncoding);
-        this.decoder = this.iconv.getDecoder(encoding, this.options);
-        this.initialBytes.length = this.initialBytesLen = 0;
-    }
-
-    return this.decoder.write(buf);
-}
-
-Utf16Decoder.prototype.end = function() {
-    if (!this.decoder) {
-        var buf = Buffer.concat(this.initialBytes),
-            encoding = detectEncoding(buf, this.options.defaultEncoding);
-        this.decoder = this.iconv.getDecoder(encoding, this.options);
-
-        var res = this.decoder.write(buf),
-            trail = this.decoder.end();
-
-        return trail ? (res + trail) : res;
-    }
-    return this.decoder.end();
-}
-
-function detectEncoding(buf, defaultEncoding) {
-    var enc = defaultEncoding || 'utf-16le';
-
-    if (buf.length >= 2) {
-        // Check BOM.
-        if (buf[0] == 0xFE && buf[1] == 0xFF) // UTF-16BE BOM
-            enc = 'utf-16be';
-        else if (buf[0] == 0xFF && buf[1] == 0xFE) // UTF-16LE BOM
-            enc = 'utf-16le';
-        else {
-            // No BOM found. Try to deduce encoding from initial content.
-            // Most of the time, the content has ASCII chars (U+00**), but the opposite (U+**00) is uncommon.
-            // So, we count ASCII as if it was LE or BE, and decide from that.
-            var asciiCharsLE = 0, asciiCharsBE = 0, // Counts of chars in both positions
-                _len = Math.min(buf.length - (buf.length % 2), 64); // Len is always even.
-
-            for (var i = 0; i < _len; i += 2) {
-                if (buf[i] === 0 && buf[i+1] !== 0) asciiCharsBE++;
-                if (buf[i] !== 0 && buf[i+1] === 0) asciiCharsLE++;
-            }
-
-            if (asciiCharsBE > asciiCharsLE)
-                enc = 'utf-16be';
-            else if (asciiCharsBE < asciiCharsLE)
-                enc = 'utf-16le';
-        }
-    }
-
-    return enc;
-}
-
-
-
-
-/***/ }),
-/* 723 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var Buffer = __webpack_require__(15).Buffer;
-
-// UTF-7 codec, according to https://tools.ietf.org/html/rfc2152
-// See also below a UTF-7-IMAP codec, according to http://tools.ietf.org/html/rfc3501#section-5.1.3
-
-exports.utf7 = Utf7Codec;
-exports.unicode11utf7 = 'utf7'; // Alias UNICODE-1-1-UTF-7
-function Utf7Codec(codecOptions, iconv) {
-    this.iconv = iconv;
-};
-
-Utf7Codec.prototype.encoder = Utf7Encoder;
-Utf7Codec.prototype.decoder = Utf7Decoder;
-Utf7Codec.prototype.bomAware = true;
-
-
-// -- Encoding
-
-var nonDirectChars = /[^A-Za-z0-9'\(\),-\.\/:\? \n\r\t]+/g;
-
-function Utf7Encoder(options, codec) {
-    this.iconv = codec.iconv;
-}
-
-Utf7Encoder.prototype.write = function(str) {
-    // Naive implementation.
-    // Non-direct chars are encoded as "+<base64>-"; single "+" char is encoded as "+-".
-    return Buffer.from(str.replace(nonDirectChars, function(chunk) {
-        return "+" + (chunk === '+' ? '' : 
-            this.iconv.encode(chunk, 'utf16-be').toString('base64').replace(/=+$/, '')) 
-            + "-";
-    }.bind(this)));
-}
-
-Utf7Encoder.prototype.end = function() {
-}
-
-
-// -- Decoding
-
-function Utf7Decoder(options, codec) {
-    this.iconv = codec.iconv;
-    this.inBase64 = false;
-    this.base64Accum = '';
-}
-
-var base64Regex = /[A-Za-z0-9\/+]/;
-var base64Chars = [];
-for (var i = 0; i < 256; i++)
-    base64Chars[i] = base64Regex.test(String.fromCharCode(i));
-
-var plusChar = '+'.charCodeAt(0), 
-    minusChar = '-'.charCodeAt(0),
-    andChar = '&'.charCodeAt(0);
-
-Utf7Decoder.prototype.write = function(buf) {
-    var res = "", lastI = 0,
-        inBase64 = this.inBase64,
-        base64Accum = this.base64Accum;
-
-    // The decoder is more involved as we must handle chunks in stream.
-
-    for (var i = 0; i < buf.length; i++) {
-        if (!inBase64) { // We're in direct mode.
-            // Write direct chars until '+'
-            if (buf[i] == plusChar) {
-                res += this.iconv.decode(buf.slice(lastI, i), "ascii"); // Write direct chars.
-                lastI = i+1;
-                inBase64 = true;
-            }
-        } else { // We decode base64.
-            if (!base64Chars[buf[i]]) { // Base64 ended.
-                if (i == lastI && buf[i] == minusChar) {// "+-" -> "+"
-                    res += "+";
-                } else {
-                    var b64str = base64Accum + buf.slice(lastI, i).toString();
-                    res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
-                }
-
-                if (buf[i] != minusChar) // Minus is absorbed after base64.
-                    i--;
-
-                lastI = i+1;
-                inBase64 = false;
-                base64Accum = '';
-            }
-        }
-    }
-
-    if (!inBase64) {
-        res += this.iconv.decode(buf.slice(lastI), "ascii"); // Write direct chars.
-    } else {
-        var b64str = base64Accum + buf.slice(lastI).toString();
-
-        var canBeDecoded = b64str.length - (b64str.length % 8); // Minimal chunk: 2 quads -> 2x3 bytes -> 3 chars.
-        base64Accum = b64str.slice(canBeDecoded); // The rest will be decoded in future.
-        b64str = b64str.slice(0, canBeDecoded);
-
-        res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
-    }
-
-    this.inBase64 = inBase64;
-    this.base64Accum = base64Accum;
-
-    return res;
-}
-
-Utf7Decoder.prototype.end = function() {
-    var res = "";
-    if (this.inBase64 && this.base64Accum.length > 0)
-        res = this.iconv.decode(Buffer.from(this.base64Accum, 'base64'), "utf16-be");
-
-    this.inBase64 = false;
-    this.base64Accum = '';
-    return res;
-}
-
-
-// UTF-7-IMAP codec.
-// RFC3501 Sec. 5.1.3 Modified UTF-7 (http://tools.ietf.org/html/rfc3501#section-5.1.3)
-// Differences:
-//  * Base64 part is started by "&" instead of "+"
-//  * Direct characters are 0x20-0x7E, except "&" (0x26)
-//  * In Base64, "," is used instead of "/"
-//  * Base64 must not be used to represent direct characters.
-//  * No implicit shift back from Base64 (should always end with '-')
-//  * String must end in non-shifted position.
-//  * "-&" while in base64 is not allowed.
-
-
-exports.utf7imap = Utf7IMAPCodec;
-function Utf7IMAPCodec(codecOptions, iconv) {
-    this.iconv = iconv;
-};
-
-Utf7IMAPCodec.prototype.encoder = Utf7IMAPEncoder;
-Utf7IMAPCodec.prototype.decoder = Utf7IMAPDecoder;
-Utf7IMAPCodec.prototype.bomAware = true;
-
-
-// -- Encoding
-
-function Utf7IMAPEncoder(options, codec) {
-    this.iconv = codec.iconv;
-    this.inBase64 = false;
-    this.base64Accum = Buffer.alloc(6);
-    this.base64AccumIdx = 0;
-}
-
-Utf7IMAPEncoder.prototype.write = function(str) {
-    var inBase64 = this.inBase64,
-        base64Accum = this.base64Accum,
-        base64AccumIdx = this.base64AccumIdx,
-        buf = Buffer.alloc(str.length*5 + 10), bufIdx = 0;
-
-    for (var i = 0; i < str.length; i++) {
-        var uChar = str.charCodeAt(i);
-        if (0x20 <= uChar && uChar <= 0x7E) { // Direct character or '&'.
-            if (inBase64) {
-                if (base64AccumIdx > 0) {
-                    bufIdx += buf.write(base64Accum.slice(0, base64AccumIdx).toString('base64').replace(/\//g, ',').replace(/=+$/, ''), bufIdx);
-                    base64AccumIdx = 0;
-                }
-
-                buf[bufIdx++] = minusChar; // Write '-', then go to direct mode.
-                inBase64 = false;
-            }
-
-            if (!inBase64) {
-                buf[bufIdx++] = uChar; // Write direct character
-
-                if (uChar === andChar)  // Ampersand -> '&-'
-                    buf[bufIdx++] = minusChar;
-            }
-
-        } else { // Non-direct character
-            if (!inBase64) {
-                buf[bufIdx++] = andChar; // Write '&', then go to base64 mode.
-                inBase64 = true;
-            }
-            if (inBase64) {
-                base64Accum[base64AccumIdx++] = uChar >> 8;
-                base64Accum[base64AccumIdx++] = uChar & 0xFF;
-
-                if (base64AccumIdx == base64Accum.length) {
-                    bufIdx += buf.write(base64Accum.toString('base64').replace(/\//g, ','), bufIdx);
-                    base64AccumIdx = 0;
-                }
-            }
-        }
-    }
-
-    this.inBase64 = inBase64;
-    this.base64AccumIdx = base64AccumIdx;
-
-    return buf.slice(0, bufIdx);
-}
-
-Utf7IMAPEncoder.prototype.end = function() {
-    var buf = Buffer.alloc(10), bufIdx = 0;
-    if (this.inBase64) {
-        if (this.base64AccumIdx > 0) {
-            bufIdx += buf.write(this.base64Accum.slice(0, this.base64AccumIdx).toString('base64').replace(/\//g, ',').replace(/=+$/, ''), bufIdx);
-            this.base64AccumIdx = 0;
-        }
-
-        buf[bufIdx++] = minusChar; // Write '-', then go to direct mode.
-        this.inBase64 = false;
-    }
-
-    return buf.slice(0, bufIdx);
-}
-
-
-// -- Decoding
-
-function Utf7IMAPDecoder(options, codec) {
-    this.iconv = codec.iconv;
-    this.inBase64 = false;
-    this.base64Accum = '';
-}
-
-var base64IMAPChars = base64Chars.slice();
-base64IMAPChars[','.charCodeAt(0)] = true;
-
-Utf7IMAPDecoder.prototype.write = function(buf) {
-    var res = "", lastI = 0,
-        inBase64 = this.inBase64,
-        base64Accum = this.base64Accum;
-
-    // The decoder is more involved as we must handle chunks in stream.
-    // It is forgiving, closer to standard UTF-7 (for example, '-' is optional at the end).
-
-    for (var i = 0; i < buf.length; i++) {
-        if (!inBase64) { // We're in direct mode.
-            // Write direct chars until '&'
-            if (buf[i] == andChar) {
-                res += this.iconv.decode(buf.slice(lastI, i), "ascii"); // Write direct chars.
-                lastI = i+1;
-                inBase64 = true;
-            }
-        } else { // We decode base64.
-            if (!base64IMAPChars[buf[i]]) { // Base64 ended.
-                if (i == lastI && buf[i] == minusChar) { // "&-" -> "&"
-                    res += "&";
-                } else {
-                    var b64str = base64Accum + buf.slice(lastI, i).toString().replace(/,/g, '/');
-                    res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
-                }
-
-                if (buf[i] != minusChar) // Minus may be absorbed after base64.
-                    i--;
-
-                lastI = i+1;
-                inBase64 = false;
-                base64Accum = '';
-            }
-        }
-    }
-
-    if (!inBase64) {
-        res += this.iconv.decode(buf.slice(lastI), "ascii"); // Write direct chars.
-    } else {
-        var b64str = base64Accum + buf.slice(lastI).toString().replace(/,/g, '/');
-
-        var canBeDecoded = b64str.length - (b64str.length % 8); // Minimal chunk: 2 quads -> 2x3 bytes -> 3 chars.
-        base64Accum = b64str.slice(canBeDecoded); // The rest will be decoded in future.
-        b64str = b64str.slice(0, canBeDecoded);
-
-        res += this.iconv.decode(Buffer.from(b64str, 'base64'), "utf16-be");
-    }
-
-    this.inBase64 = inBase64;
-    this.base64Accum = base64Accum;
-
-    return res;
-}
-
-Utf7IMAPDecoder.prototype.end = function() {
-    var res = "";
-    if (this.inBase64 && this.base64Accum.length > 0)
-        res = this.iconv.decode(Buffer.from(this.base64Accum, 'base64'), "utf16-be");
-
-    this.inBase64 = false;
-    this.base64Accum = '';
-    return res;
-}
-
-
-
-
-/***/ }),
-/* 724 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var BOMChar = '\uFEFF';
-
-exports.PrependBOM = PrependBOMWrapper
-function PrependBOMWrapper(encoder, options) {
-    this.encoder = encoder;
-    this.addBOM = true;
-}
-
-PrependBOMWrapper.prototype.write = function(str) {
-    if (this.addBOM) {
-        str = BOMChar + str;
-        this.addBOM = false;
-    }
-
-    return this.encoder.write(str);
-}
-
-PrependBOMWrapper.prototype.end = function() {
-    return this.encoder.end();
-}
-
-
-//------------------------------------------------------------------------------
-
-exports.StripBOM = StripBOMWrapper;
-function StripBOMWrapper(decoder, options) {
-    this.decoder = decoder;
-    this.pass = false;
-    this.options = options || {};
-}
-
-StripBOMWrapper.prototype.write = function(buf) {
-    var res = this.decoder.write(buf);
-    if (this.pass || !res)
-        return res;
-
-    if (res[0] === BOMChar) {
-        res = res.slice(1);
-        if (typeof this.options.stripBOM === 'function')
-            this.options.stripBOM();
-    }
-
-    this.pass = true;
-    return res;
-}
-
-StripBOMWrapper.prototype.end = function() {
-    return this.decoder.end();
-}
-
-
-
-/***/ }),
-/* 725 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var Buffer = __webpack_require__(64).Buffer;
-// Note: not polyfilled with safer-buffer on a purpose, as overrides Buffer
-
-// == Extend Node primitives to use iconv-lite =================================
-
-module.exports = function (iconv) {
-    var original = undefined; // Place to keep original methods.
-
-    // Node authors rewrote Buffer internals to make it compatible with
-    // Uint8Array and we cannot patch key functions since then.
-    // Note: this does use older Buffer API on a purpose
-    iconv.supportsNodeEncodingsExtension = !(Buffer.from || new Buffer(0) instanceof Uint8Array);
-
-    iconv.extendNodeEncodings = function extendNodeEncodings() {
-        if (original) return;
-        original = {};
-
-        if (!iconv.supportsNodeEncodingsExtension) {
-            console.error("ACTION NEEDED: require('iconv-lite').extendNodeEncodings() is not supported in your version of Node");
-            console.error("See more info at https://github.com/ashtuchkin/iconv-lite/wiki/Node-v4-compatibility");
-            return;
-        }
-
-        var nodeNativeEncodings = {
-            'hex': true, 'utf8': true, 'utf-8': true, 'ascii': true, 'binary': true, 
-            'base64': true, 'ucs2': true, 'ucs-2': true, 'utf16le': true, 'utf-16le': true,
-        };
-
-        Buffer.isNativeEncoding = function(enc) {
-            return enc && nodeNativeEncodings[enc.toLowerCase()];
-        }
-
-        // -- SlowBuffer -----------------------------------------------------------
-        var SlowBuffer = __webpack_require__(64).SlowBuffer;
-
-        original.SlowBufferToString = SlowBuffer.prototype.toString;
-        SlowBuffer.prototype.toString = function(encoding, start, end) {
-            encoding = String(encoding || 'utf8').toLowerCase();
-
-            // Use native conversion when possible
-            if (Buffer.isNativeEncoding(encoding))
-                return original.SlowBufferToString.call(this, encoding, start, end);
-
-            // Otherwise, use our decoding method.
-            if (typeof start == 'undefined') start = 0;
-            if (typeof end == 'undefined') end = this.length;
-            return iconv.decode(this.slice(start, end), encoding);
-        }
-
-        original.SlowBufferWrite = SlowBuffer.prototype.write;
-        SlowBuffer.prototype.write = function(string, offset, length, encoding) {
-            // Support both (string, offset, length, encoding)
-            // and the legacy (string, encoding, offset, length)
-            if (isFinite(offset)) {
-                if (!isFinite(length)) {
-                    encoding = length;
-                    length = undefined;
-                }
-            } else {  // legacy
-                var swap = encoding;
-                encoding = offset;
-                offset = length;
-                length = swap;
-            }
-
-            offset = +offset || 0;
-            var remaining = this.length - offset;
-            if (!length) {
-                length = remaining;
-            } else {
-                length = +length;
-                if (length > remaining) {
-                    length = remaining;
-                }
-            }
-            encoding = String(encoding || 'utf8').toLowerCase();
-
-            // Use native conversion when possible
-            if (Buffer.isNativeEncoding(encoding))
-                return original.SlowBufferWrite.call(this, string, offset, length, encoding);
-
-            if (string.length > 0 && (length < 0 || offset < 0))
-                throw new RangeError('attempt to write beyond buffer bounds');
-
-            // Otherwise, use our encoding method.
-            var buf = iconv.encode(string, encoding);
-            if (buf.length < length) length = buf.length;
-            buf.copy(this, offset, 0, length);
-            return length;
-        }
-
-        // -- Buffer ---------------------------------------------------------------
-
-        original.BufferIsEncoding = Buffer.isEncoding;
-        Buffer.isEncoding = function(encoding) {
-            return Buffer.isNativeEncoding(encoding) || iconv.encodingExists(encoding);
-        }
-
-        original.BufferByteLength = Buffer.byteLength;
-        Buffer.byteLength = SlowBuffer.byteLength = function(str, encoding) {
-            encoding = String(encoding || 'utf8').toLowerCase();
-
-            // Use native conversion when possible
-            if (Buffer.isNativeEncoding(encoding))
-                return original.BufferByteLength.call(this, str, encoding);
-
-            // Slow, I know, but we don't have a better way yet.
-            return iconv.encode(str, encoding).length;
-        }
-
-        original.BufferToString = Buffer.prototype.toString;
-        Buffer.prototype.toString = function(encoding, start, end) {
-            encoding = String(encoding || 'utf8').toLowerCase();
-
-            // Use native conversion when possible
-            if (Buffer.isNativeEncoding(encoding))
-                return original.BufferToString.call(this, encoding, start, end);
-
-            // Otherwise, use our decoding method.
-            if (typeof start == 'undefined') start = 0;
-            if (typeof end == 'undefined') end = this.length;
-            return iconv.decode(this.slice(start, end), encoding);
-        }
-
-        original.BufferWrite = Buffer.prototype.write;
-        Buffer.prototype.write = function(string, offset, length, encoding) {
-            var _offset = offset, _length = length, _encoding = encoding;
-            // Support both (string, offset, length, encoding)
-            // and the legacy (string, encoding, offset, length)
-            if (isFinite(offset)) {
-                if (!isFinite(length)) {
-                    encoding = length;
-                    length = undefined;
-                }
-            } else {  // legacy
-                var swap = encoding;
-                encoding = offset;
-                offset = length;
-                length = swap;
-            }
-
-            encoding = String(encoding || 'utf8').toLowerCase();
-
-            // Use native conversion when possible
-            if (Buffer.isNativeEncoding(encoding))
-                return original.BufferWrite.call(this, string, _offset, _length, _encoding);
-
-            offset = +offset || 0;
-            var remaining = this.length - offset;
-            if (!length) {
-                length = remaining;
-            } else {
-                length = +length;
-                if (length > remaining) {
-                    length = remaining;
-                }
-            }
-
-            if (string.length > 0 && (length < 0 || offset < 0))
-                throw new RangeError('attempt to write beyond buffer bounds');
-
-            // Otherwise, use our encoding method.
-            var buf = iconv.encode(string, encoding);
-            if (buf.length < length) length = buf.length;
-            buf.copy(this, offset, 0, length);
-            return length;
-
-            // TODO: Set _charsWritten.
-        }
-
-
-        // -- Readable -------------------------------------------------------------
-        if (iconv.supportsStreams) {
-            var Readable = __webpack_require__(23).Readable;
-
-            original.ReadableSetEncoding = Readable.prototype.setEncoding;
-            Readable.prototype.setEncoding = function setEncoding(enc, options) {
-                // Use our own decoder, it has the same interface.
-                // We cannot use original function as it doesn't handle BOM-s.
-                this._readableState.decoder = iconv.getDecoder(enc, options);
-                this._readableState.encoding = enc;
-            }
-
-            Readable.prototype.collect = iconv._collect;
-        }
-    }
-
-    // Remove iconv-lite Node primitive extensions.
-    iconv.undoExtendNodeEncodings = function undoExtendNodeEncodings() {
-        if (!iconv.supportsNodeEncodingsExtension)
-            return;
-        if (!original)
-            throw new Error("require('iconv-lite').undoExtendNodeEncodings(): Nothing to undo; extendNodeEncodings() is not called.")
-
-        delete Buffer.isNativeEncoding;
-
-        var SlowBuffer = __webpack_require__(64).SlowBuffer;
-
-        SlowBuffer.prototype.toString = original.SlowBufferToString;
-        SlowBuffer.prototype.write = original.SlowBufferWrite;
-
-        Buffer.isEncoding = original.BufferIsEncoding;
-        Buffer.byteLength = original.BufferByteLength;
-        Buffer.prototype.toString = original.BufferToString;
-        Buffer.prototype.write = original.BufferWrite;
-
-        if (iconv.supportsStreams) {
-            var Readable = __webpack_require__(23).Readable;
-
-            Readable.prototype.setEncoding = original.ReadableSetEncoding;
-            delete Readable.prototype.collect;
-        }
-
-        original = undefined;
-    }
-}
-
-
-/***/ }),
-/* 726 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// Some environments don't have global Buffer (e.g. React Native).
-// Solution would be installing npm modules "buffer" and "stream" explicitly.
-var Buffer = __webpack_require__(15).Buffer;
-
-var bomHandling = __webpack_require__(724),
-    iconv = module.exports;
-
-// All codecs and aliases are kept here, keyed by encoding name/alias.
-// They are lazy loaded in `iconv.getCodec` from `encodings/index.js`.
-iconv.encodings = null;
-
-// Characters emitted in case of error.
-iconv.defaultCharUnicode = '�';
-iconv.defaultCharSingleByte = '?';
-
-// Public API.
-iconv.encode = function encode(str, encoding, options) {
-    str = "" + (str || ""); // Ensure string.
-
-    var encoder = iconv.getEncoder(encoding, options);
-
-    var res = encoder.write(str);
-    var trail = encoder.end();
-    
-    return (trail && trail.length > 0) ? Buffer.concat([res, trail]) : res;
-}
-
-iconv.decode = function decode(buf, encoding, options) {
-    if (typeof buf === 'string') {
-        if (!iconv.skipDecodeWarning) {
-            console.error('Iconv-lite warning: decode()-ing strings is deprecated. Refer to https://github.com/ashtuchkin/iconv-lite/wiki/Use-Buffers-when-decoding');
-            iconv.skipDecodeWarning = true;
-        }
-
-        buf = Buffer.from("" + (buf || ""), "binary"); // Ensure buffer.
-    }
-
-    var decoder = iconv.getDecoder(encoding, options);
-
-    var res = decoder.write(buf);
-    var trail = decoder.end();
-
-    return trail ? (res + trail) : res;
-}
-
-iconv.encodingExists = function encodingExists(enc) {
-    try {
-        iconv.getCodec(enc);
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-
-// Legacy aliases to convert functions
-iconv.toEncoding = iconv.encode;
-iconv.fromEncoding = iconv.decode;
-
-// Search for a codec in iconv.encodings. Cache codec data in iconv._codecDataCache.
-iconv._codecDataCache = {};
-iconv.getCodec = function getCodec(encoding) {
-    if (!iconv.encodings)
-        iconv.encodings = __webpack_require__(712); // Lazy load all encoding definitions.
-    
-    // Canonicalize encoding name: strip all non-alphanumeric chars and appended year.
-    var enc = iconv._canonicalizeEncoding(encoding);
-
-    // Traverse iconv.encodings to find actual codec.
-    var codecOptions = {};
-    while (true) {
-        var codec = iconv._codecDataCache[enc];
-        if (codec)
-            return codec;
-
-        var codecDef = iconv.encodings[enc];
-
-        switch (typeof codecDef) {
-            case "string": // Direct alias to other encoding.
-                enc = codecDef;
-                break;
-
-            case "object": // Alias with options. Can be layered.
-                for (var key in codecDef)
-                    codecOptions[key] = codecDef[key];
-
-                if (!codecOptions.encodingName)
-                    codecOptions.encodingName = enc;
-                
-                enc = codecDef.type;
-                break;
-
-            case "function": // Codec itself.
-                if (!codecOptions.encodingName)
-                    codecOptions.encodingName = enc;
-
-                // The codec function must load all tables and return object with .encoder and .decoder methods.
-                // It'll be called only once (for each different options object).
-                codec = new codecDef(codecOptions, iconv);
-
-                iconv._codecDataCache[codecOptions.encodingName] = codec; // Save it to be reused later.
-                return codec;
-
-            default:
-                throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
-        }
-    }
-}
-
-iconv._canonicalizeEncoding = function(encoding) {
-    // Canonicalize encoding name: strip all non-alphanumeric chars and appended year.
-    return (''+encoding).toLowerCase().replace(/:\d{4}$|[^0-9a-z]/g, "");
-}
-
-iconv.getEncoder = function getEncoder(encoding, options) {
-    var codec = iconv.getCodec(encoding),
-        encoder = new codec.encoder(options, codec);
-
-    if (codec.bomAware && options && options.addBOM)
-        encoder = new bomHandling.PrependBOM(encoder, options);
-
-    return encoder;
-}
-
-iconv.getDecoder = function getDecoder(encoding, options) {
-    var codec = iconv.getCodec(encoding),
-        decoder = new codec.decoder(options, codec);
-
-    if (codec.bomAware && !(options && options.stripBOM === false))
-        decoder = new bomHandling.StripBOM(decoder, options);
-
-    return decoder;
-}
-
-
-// Load extensions in Node. All of them are omitted in Browserify build via 'browser' field in package.json.
-var nodeVer = typeof process !== 'undefined' && process.versions && process.versions.node;
-if (nodeVer) {
-
-    // Load streaming support in Node v0.10+
-    var nodeVerArr = nodeVer.split(".").map(Number);
-    if (nodeVerArr[0] > 0 || nodeVerArr[1] >= 10) {
-        __webpack_require__(727)(iconv);
-    }
-
-    // Load Node primitive extensions.
-    __webpack_require__(725)(iconv);
-}
-
-if (false) {
-    console.error("iconv-lite warning: javascript files use encoding different from utf-8. See https://github.com/ashtuchkin/iconv-lite/wiki/Javascript-source-file-encodings for more info.");
-}
-
-
-/***/ }),
-/* 727 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var Buffer = __webpack_require__(64).Buffer,
-    Transform = __webpack_require__(23).Transform;
-
-
-// == Exports ==================================================================
-module.exports = function(iconv) {
-    
-    // Additional Public API.
-    iconv.encodeStream = function encodeStream(encoding, options) {
-        return new IconvLiteEncoderStream(iconv.getEncoder(encoding, options), options);
-    }
-
-    iconv.decodeStream = function decodeStream(encoding, options) {
-        return new IconvLiteDecoderStream(iconv.getDecoder(encoding, options), options);
-    }
-
-    iconv.supportsStreams = true;
-
-
-    // Not published yet.
-    iconv.IconvLiteEncoderStream = IconvLiteEncoderStream;
-    iconv.IconvLiteDecoderStream = IconvLiteDecoderStream;
-    iconv._collect = IconvLiteDecoderStream.prototype.collect;
-};
-
-
-// == Encoder stream =======================================================
-function IconvLiteEncoderStream(conv, options) {
-    this.conv = conv;
-    options = options || {};
-    options.decodeStrings = false; // We accept only strings, so we don't need to decode them.
-    Transform.call(this, options);
-}
-
-IconvLiteEncoderStream.prototype = Object.create(Transform.prototype, {
-    constructor: { value: IconvLiteEncoderStream }
-});
-
-IconvLiteEncoderStream.prototype._transform = function(chunk, encoding, done) {
-    if (typeof chunk != 'string')
-        return done(new Error("Iconv encoding stream needs strings as its input."));
-    try {
-        var res = this.conv.write(chunk);
-        if (res && res.length) this.push(res);
-        done();
-    }
-    catch (e) {
-        done(e);
-    }
-}
-
-IconvLiteEncoderStream.prototype._flush = function(done) {
-    try {
-        var res = this.conv.end();
-        if (res && res.length) this.push(res);
-        done();
-    }
-    catch (e) {
-        done(e);
-    }
-}
-
-IconvLiteEncoderStream.prototype.collect = function(cb) {
-    var chunks = [];
-    this.on('error', cb);
-    this.on('data', function(chunk) { chunks.push(chunk); });
-    this.on('end', function() {
-        cb(null, Buffer.concat(chunks));
-    });
-    return this;
-}
-
-
-// == Decoder stream =======================================================
-function IconvLiteDecoderStream(conv, options) {
-    this.conv = conv;
-    options = options || {};
-    options.encoding = this.encoding = 'utf8'; // We output strings.
-    Transform.call(this, options);
-}
-
-IconvLiteDecoderStream.prototype = Object.create(Transform.prototype, {
-    constructor: { value: IconvLiteDecoderStream }
-});
-
-IconvLiteDecoderStream.prototype._transform = function(chunk, encoding, done) {
-    if (!Buffer.isBuffer(chunk))
-        return done(new Error("Iconv decoding stream needs buffers as its input."));
-    try {
-        var res = this.conv.write(chunk);
-        if (res && res.length) this.push(res, this.encoding);
-        done();
-    }
-    catch (e) {
-        done(e);
-    }
-}
-
-IconvLiteDecoderStream.prototype._flush = function(done) {
-    try {
-        var res = this.conv.end();
-        if (res && res.length) this.push(res, this.encoding);                
-        done();
-    }
-    catch (e) {
-        done(e);
-    }
-}
-
-IconvLiteDecoderStream.prototype.collect = function(cb) {
-    var res = '';
-    this.on('error', cb);
-    this.on('data', function(chunk) { res += chunk; });
-    this.on('end', function() {
-        cb(null, res);
-    });
-    return this;
-}
-
-
-
-/***/ }),
-/* 728 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const stripAnsi = __webpack_require__(329);
-const isFullwidthCodePoint = __webpack_require__(736);
-
-module.exports = str => {
-	if (typeof str !== 'string' || str.length === 0) {
-		return 0;
-	}
-
-	str = stripAnsi(str);
-
-	let width = 0;
-
-	for (let i = 0; i < str.length; i++) {
-		const code = str.codePointAt(i);
-
-		// Ignore control characters
-		if (code <= 0x1F || (code >= 0x7F && code <= 0x9F)) {
-			continue;
-		}
-
-		// Ignore combining characters
-		if (code >= 0x300 && code <= 0x36F) {
-			continue;
-		}
-
-		// Surrogates
-		if (code > 0xFFFF) {
-			i++;
-		}
-
-		width += isFullwidthCodePoint(code) ? 2 : 1;
-	}
-
-	return width;
-};
-
-
-/***/ }),
-/* 729 */
-/***/ (function(module, exports) {
-
-/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-// The _isBuffer check is for Safari 5-7 support, because it's missing
-// Object.prototype.constructor. Remove this eventually
-module.exports = function (obj) {
-  return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
-}
-
-function isBuffer (obj) {
-  return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
-}
-
-// For Node v0.10 support. Remove this eventually.
-function isSlowBuffer (obj) {
-  return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
-}
-
-
-/***/ }),
-/* 730 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const builtinModules = __webpack_require__(731);
-
-const moduleSet = new Set(builtinModules);
-
-module.exports = moduleName => {
-	if (typeof moduleName !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	return moduleSet.has(moduleName);
-};
-
-
-/***/ }),
-/* 731 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const blacklist = [
-	'freelist',
-	'sys'
-];
-
-module.exports = Object.keys(process.binding('natives'))
-	.filter(x => !/^_|^internal|\//.test(x) && blacklist.indexOf(x) === -1)
-	.sort();
-
-
-/***/ }),
-/* 732 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = function (buf) {
-  if (!buf || buf.length < 2) return false
-  return buf[0] === 0x78 && (buf[1] === 1 || buf[1] === 0x9c || buf[1] === 0xda)
-}
-
-
-/***/ }),
-/* 733 */
-/***/ (function(module, exports) {
-
-/*!
- * is-dotfile <https://github.com/jonschlinkert/is-dotfile>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-module.exports = function(str) {
-  if (str.charCodeAt(0) === 46 /* . */ && str.indexOf('/', 1) === -1) {
-    return true;
-  }
-  var slash = str.lastIndexOf('/');
-  return slash !== -1 ? str.charCodeAt(slash + 1) === 46  /* . */ : false;
-};
-
-
-/***/ }),
-/* 734 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-equal-shallow <https://github.com/jonschlinkert/is-equal-shallow>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isPrimitive = __webpack_require__(740);
-
-module.exports = function isEqual(a, b) {
-  if (!a && !b) { return true; }
-  if (!a && b || a && !b) { return false; }
-
-  var numKeysA = 0, numKeysB = 0, key;
-  for (key in b) {
-    numKeysB++;
-    if (!isPrimitive(b[key]) || !a.hasOwnProperty(key) || (a[key] !== b[key])) {
-      return false;
-    }
-  }
-  for (key in a) {
-    numKeysA++;
-  }
-  return numKeysA === numKeysB;
-};
-
-
-/***/ }),
-/* 735 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
-
-
-/***/ }),
-/* 736 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/* eslint-disable yoda */
-module.exports = x => {
-	if (Number.isNaN(x)) {
-		return false;
-	}
-
-	// code points are derived from:
-	// http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt
-	if (
-		x >= 0x1100 && (
-			x <= 0x115f ||  // Hangul Jamo
-			x === 0x2329 || // LEFT-POINTING ANGLE BRACKET
-			x === 0x232a || // RIGHT-POINTING ANGLE BRACKET
-			// CJK Radicals Supplement .. Enclosed CJK Letters and Months
-			(0x2e80 <= x && x <= 0x3247 && x !== 0x303f) ||
-			// Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
-			(0x3250 <= x && x <= 0x4dbf) ||
-			// CJK Unified Ideographs .. Yi Radicals
-			(0x4e00 <= x && x <= 0xa4c6) ||
-			// Hangul Jamo Extended-A
-			(0xa960 <= x && x <= 0xa97c) ||
-			// Hangul Syllables
-			(0xac00 <= x && x <= 0xd7a3) ||
-			// CJK Compatibility Ideographs
-			(0xf900 <= x && x <= 0xfaff) ||
-			// Vertical Forms
-			(0xfe10 <= x && x <= 0xfe19) ||
-			// CJK Compatibility Forms .. Small Form Variants
-			(0xfe30 <= x && x <= 0xfe6b) ||
-			// Halfwidth and Fullwidth Forms
-			(0xff01 <= x && x <= 0xff60) ||
-			(0xffe0 <= x && x <= 0xffe6) ||
-			// Kana Supplement
-			(0x1b000 <= x && x <= 0x1b001) ||
-			// Enclosed Ideographic Supplement
-			(0x1f200 <= x && x <= 0x1f251) ||
-			// CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
-			(0x20000 <= x && x <= 0x3fffd)
-		)
-	) {
-		return true;
-	}
-
-	return false;
-};
-
-
-/***/ }),
-/* 737 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/**
- * Check if a Buffer/Uint8Array is a GZIP file
- *
- * @param {Buffer} buf
- * @api public
- */
-
-module.exports = function (buf) {
-    if (!buf || buf.length < 3) {
-        return false;
-    }
-
-    return buf[0] === 31 && buf[1] === 139 && buf[2] === 8;
-};
-
-
-/***/ }),
-/* 738 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var toString = Object.prototype.toString;
-
-module.exports = function (x) {
-	var prototype;
-	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
-};
-
-
-/***/ }),
-/* 739 */
-/***/ (function(module, exports) {
-
-/*!
- * is-posix-bracket <https://github.com/jonschlinkert/is-posix-bracket>
- *
- * Copyright (c) 2015-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-module.exports = function isPosixBracket(str) {
-  return typeof str === 'string' && /\[([:.=+])(?:[^\[\]]|)+\1\]/.test(str);
-};
-
-
-/***/ }),
-/* 740 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-primitive <https://github.com/jonschlinkert/is-primitive>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-// see http://jsperf.com/testing-value-is-primitive/7
-module.exports = function isPrimitive(value) {
-  return value == null || (typeof value !== 'function' && typeof value !== 'object');
-};
-
-
-/***/ }),
-/* 741 */
-/***/ (function(module, exports) {
-
-module.exports = isPromise;
-
-function isPromise(obj) {
-  return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
-}
-
-
-/***/ }),
-/* 742 */
-/***/ (function(module, exports) {
-
-module.exports      = isTypedArray
-isTypedArray.strict = isStrictTypedArray
-isTypedArray.loose  = isLooseTypedArray
-
-var toString = Object.prototype.toString
-var names = {
-    '[object Int8Array]': true
-  , '[object Int16Array]': true
-  , '[object Int32Array]': true
-  , '[object Uint8Array]': true
-  , '[object Uint8ClampedArray]': true
-  , '[object Uint16Array]': true
-  , '[object Uint32Array]': true
-  , '[object Float32Array]': true
-  , '[object Float64Array]': true
-}
-
-function isTypedArray(arr) {
-  return (
-       isStrictTypedArray(arr)
-    || isLooseTypedArray(arr)
-  )
-}
-
-function isStrictTypedArray(arr) {
-  return (
-       arr instanceof Int8Array
-    || arr instanceof Int16Array
-    || arr instanceof Int32Array
-    || arr instanceof Uint8Array
-    || arr instanceof Uint8ClampedArray
-    || arr instanceof Uint16Array
-    || arr instanceof Uint32Array
-    || arr instanceof Float32Array
-    || arr instanceof Float64Array
-  )
-}
-
-function isLooseTypedArray(arr) {
-  return names[toString.call(arr)]
-}
-
-
-/***/ }),
-/* 743 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * is-windows <https://github.com/jonschlinkert/is-windows>
- *
- * Copyright © 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-(function(factory) {
-  if (exports && typeof exports === 'object' && typeof module !== 'undefined') {
-    module.exports = factory();
-  } else if (true) {
-    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-  } else if (typeof window !== 'undefined') {
-    window.isWindows = factory();
-  } else if (typeof global !== 'undefined') {
-    global.isWindows = factory();
-  } else if (typeof self !== 'undefined') {
-    self.isWindows = factory();
-  } else {
-    this.isWindows = factory();
-  }
-})(function() {
-  'use strict';
-  return function isWindows() {
-    return process && (process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE));
-  };
-});
-
-
-/***/ }),
-/* 744 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
- * JSONSchema Validator - Validates JavaScript objects using JSON Schemas
- *	(http://www.json.com/json-schema-proposal/)
- *
- * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
- * Licensed under the MIT (MIT-LICENSE.txt) license.
-To use the validator call the validate function with an instance object and an optional schema object.
-If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
-that schema will be used to validate and the schema parameter is not necessary (if both exist,
-both validations will occur).
-The validate method will return an array of validation errors. If there are no errors, then an
-empty list will be returned. A validation error will have two properties:
-"property" which indicates which property had the error
-"message" which indicates what the error was
- */
-(function (root, factory) {
-    if (true) {
-        // AMD. Register as an anonymous module.
-        !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = function () {
-            return factory();
-        }.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-    } else if (typeof module === 'object' && module.exports) {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like environments that support module.exports,
-        // like Node.
-        module.exports = factory();
-    } else {
-        // Browser globals
-        root.jsonSchema = factory();
-    }
-}(this, function () {// setup primitive classes to be JSON Schema types
-var exports = validate
-exports.Integer = {type:"integer"};
-var primitiveConstructors = {
-	String: String,
-	Boolean: Boolean,
-	Number: Number,
-	Object: Object,
-	Array: Array,
-	Date: Date
-}
-exports.validate = validate;
-function validate(/*Any*/instance,/*Object*/schema) {
-		// Summary:
-		//  	To use the validator call JSONSchema.validate with an instance object and an optional schema object.
-		// 		If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
-		// 		that schema will be used to validate and the schema parameter is not necessary (if both exist,
-		// 		both validations will occur).
-		// 		The validate method will return an object with two properties:
-		// 			valid: A boolean indicating if the instance is valid by the schema
-		// 			errors: An array of validation errors. If there are no errors, then an
-		// 					empty list will be returned. A validation error will have two properties:
-		// 						property: which indicates which property had the error
-		// 						message: which indicates what the error was
-		//
-		return validate(instance, schema, {changing: false});//, coerce: false, existingOnly: false});
-	};
-exports.checkPropertyChange = function(/*Any*/value,/*Object*/schema, /*String*/property) {
-		// Summary:
-		// 		The checkPropertyChange method will check to see if an value can legally be in property with the given schema
-		// 		This is slightly different than the validate method in that it will fail if the schema is readonly and it will
-		// 		not check for self-validation, it is assumed that the passed in value is already internally valid.
-		// 		The checkPropertyChange method will return the same object type as validate, see JSONSchema.validate for
-		// 		information.
-		//
-		return validate(value, schema, {changing: property || "property"});
-	};
-var validate = exports._validate = function(/*Any*/instance,/*Object*/schema,/*Object*/options) {
-
-	if (!options) options = {};
-	var _changing = options.changing;
-
-	function getType(schema){
-		return schema.type || (primitiveConstructors[schema.name] == schema && schema.name.toLowerCase());
-	}
-	var errors = [];
-	// validate a value against a property definition
-	function checkProp(value, schema, path,i){
-
-		var l;
-		path += path ? typeof i == 'number' ? '[' + i + ']' : typeof i == 'undefined' ? '' : '.' + i : i;
-		function addError(message){
-			errors.push({property:path,message:message});
-		}
-
-		if((typeof schema != 'object' || schema instanceof Array) && (path || typeof schema != 'function') && !(schema && getType(schema))){
-			if(typeof schema == 'function'){
-				if(!(value instanceof schema)){
-					addError("is not an instance of the class/constructor " + schema.name);
-				}
-			}else if(schema){
-				addError("Invalid schema/property definition " + schema);
-			}
-			return null;
-		}
-		if(_changing && schema.readonly){
-			addError("is a readonly field, it can not be changed");
-		}
-		if(schema['extends']){ // if it extends another schema, it must pass that schema as well
-			checkProp(value,schema['extends'],path,i);
-		}
-		// validate a value against a type definition
-		function checkType(type,value){
-			if(type){
-				if(typeof type == 'string' && type != 'any' &&
-						(type == 'null' ? value !== null : typeof value != type) &&
-						!(value instanceof Array && type == 'array') &&
-						!(value instanceof Date && type == 'date') &&
-						!(type == 'integer' && value%1===0)){
-					return [{property:path,message:(typeof value) + " value found, but a " + type + " is required"}];
-				}
-				if(type instanceof Array){
-					var unionErrors=[];
-					for(var j = 0; j < type.length; j++){ // a union type
-						if(!(unionErrors=checkType(type[j],value)).length){
-							break;
-						}
-					}
-					if(unionErrors.length){
-						return unionErrors;
-					}
-				}else if(typeof type == 'object'){
-					var priorErrors = errors;
-					errors = [];
-					checkProp(value,type,path);
-					var theseErrors = errors;
-					errors = priorErrors;
-					return theseErrors;
-				}
-			}
-			return [];
-		}
-		if(value === undefined){
-			if(schema.required){
-				addError("is missing and it is required");
-			}
-		}else{
-			errors = errors.concat(checkType(getType(schema),value));
-			if(schema.disallow && !checkType(schema.disallow,value).length){
-				addError(" disallowed value was matched");
-			}
-			if(value !== null){
-				if(value instanceof Array){
-					if(schema.items){
-						var itemsIsArray = schema.items instanceof Array;
-						var propDef = schema.items;
-						for (i = 0, l = value.length; i < l; i += 1) {
-							if (itemsIsArray)
-								propDef = schema.items[i];
-							if (options.coerce)
-								value[i] = options.coerce(value[i], propDef);
-							errors.concat(checkProp(value[i],propDef,path,i));
-						}
-					}
-					if(schema.minItems && value.length < schema.minItems){
-						addError("There must be a minimum of " + schema.minItems + " in the array");
-					}
-					if(schema.maxItems && value.length > schema.maxItems){
-						addError("There must be a maximum of " + schema.maxItems + " in the array");
-					}
-				}else if(schema.properties || schema.additionalProperties){
-					errors.concat(checkObj(value, schema.properties, path, schema.additionalProperties));
-				}
-				if(schema.pattern && typeof value == 'string' && !value.match(schema.pattern)){
-					addError("does not match the regex pattern " + schema.pattern);
-				}
-				if(schema.maxLength && typeof value == 'string' && value.length > schema.maxLength){
-					addError("may only be " + schema.maxLength + " characters long");
-				}
-				if(schema.minLength && typeof value == 'string' && value.length < schema.minLength){
-					addError("must be at least " + schema.minLength + " characters long");
-				}
-				if(typeof schema.minimum !== undefined && typeof value == typeof schema.minimum &&
-						schema.minimum > value){
-					addError("must have a minimum value of " + schema.minimum);
-				}
-				if(typeof schema.maximum !== undefined && typeof value == typeof schema.maximum &&
-						schema.maximum < value){
-					addError("must have a maximum value of " + schema.maximum);
-				}
-				if(schema['enum']){
-					var enumer = schema['enum'];
-					l = enumer.length;
-					var found;
-					for(var j = 0; j < l; j++){
-						if(enumer[j]===value){
-							found=1;
-							break;
-						}
-					}
-					if(!found){
-						addError("does not have a value in the enumeration " + enumer.join(", "));
-					}
-				}
-				if(typeof schema.maxDecimal == 'number' &&
-					(value.toString().match(new RegExp("\\.[0-9]{" + (schema.maxDecimal + 1) + ",}")))){
-					addError("may only have " + schema.maxDecimal + " digits of decimal places");
-				}
-			}
-		}
-		return null;
-	}
-	// validate an object against a schema
-	function checkObj(instance,objTypeDef,path,additionalProp){
-
-		if(typeof objTypeDef =='object'){
-			if(typeof instance != 'object' || instance instanceof Array){
-				errors.push({property:path,message:"an object is required"});
-			}
-			
-			for(var i in objTypeDef){ 
-				if(objTypeDef.hasOwnProperty(i)){
-					var value = instance[i];
-					// skip _not_ specified properties
-					if (value === undefined && options.existingOnly) continue;
-					var propDef = objTypeDef[i];
-					// set default
-					if(value === undefined && propDef["default"]){
-						value = instance[i] = propDef["default"];
-					}
-					if(options.coerce && i in instance){
-						value = instance[i] = options.coerce(value, propDef);
-					}
-					checkProp(value,propDef,path,i);
-				}
-			}
-		}
-		for(i in instance){
-			if(instance.hasOwnProperty(i) && !(i.charAt(0) == '_' && i.charAt(1) == '_') && objTypeDef && !objTypeDef[i] && additionalProp===false){
-				if (options.filter) {
-					delete instance[i];
-					continue;
-				} else {
-					errors.push({property:path,message:(typeof value) + "The property " + i +
-						" is not defined in the schema and the schema does not allow additional properties"});
-				}
-			}
-			var requires = objTypeDef && objTypeDef[i] && objTypeDef[i].requires;
-			if(requires && !(requires in instance)){
-				errors.push({property:path,message:"the presence of the property " + i + " requires that " + requires + " also be present"});
-			}
-			value = instance[i];
-			if(additionalProp && (!(objTypeDef && typeof objTypeDef == 'object') || !(i in objTypeDef))){
-				if(options.coerce){
-					value = instance[i] = options.coerce(value, additionalProp);
-				}
-				checkProp(value,additionalProp,path,i);
-			}
-			if(!_changing && value && value.$schema){
-				errors = errors.concat(checkProp(value,value.$schema,path,i));
-			}
-		}
-		return errors;
-	}
-	if(schema){
-		checkProp(instance,schema,'',_changing || '');
-	}
-	if(!_changing && instance && instance.$schema){
-		checkProp(instance,instance.$schema,'','');
-	}
-	return {valid:!errors.length,errors:errors};
-};
-exports.mustBeValid = function(result){
-	//	summary:
-	//		This checks to ensure that the result is valid and will throw an appropriate error message if it is not
-	// result: the result returned from checkPropertyChange or validate
-	if(!result.valid){
-		throw new TypeError(result.errors.map(function(error){return "for property " + error.property + ': ' + error.message;}).join(", \n"));
-	}
-}
-
-return exports;
-}));
-
-
-/***/ }),
-/* 745 */
-/***/ (function(module, exports) {
-
-exports = module.exports = stringify
-exports.getSerialize = serializer
-
-function stringify(obj, replacer, spaces, cycleReplacer) {
-  return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces)
-}
-
-function serializer(replacer, cycleReplacer) {
-  var stack = [], keys = []
-
-  if (cycleReplacer == null) cycleReplacer = function(key, value) {
-    if (stack[0] === value) return "[Circular ~]"
-    return "[Circular ~." + keys.slice(0, stack.indexOf(value)).join(".") + "]"
-  }
-
-  return function(key, value) {
-    if (stack.length > 0) {
-      var thisPos = stack.indexOf(this)
-      ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
-      ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
-      if (~stack.indexOf(value)) value = cycleReplacer.call(this, key, value)
-    }
-    else stack.push(value)
-
-    return replacer == null ? value : replacer.call(this, key, value)
-  }
-}
-
-
-/***/ }),
-/* 746 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- * lib/jsprim.js: utilities for primitive JavaScript types
- */
-
-var mod_assert = __webpack_require__(16);
-var mod_util = __webpack_require__(3);
-
-var mod_extsprintf = __webpack_require__(645);
-var mod_verror = __webpack_require__(960);
-var mod_jsonschema = __webpack_require__(744);
-
-/*
- * Public interface
- */
-exports.deepCopy = deepCopy;
-exports.deepEqual = deepEqual;
-exports.isEmpty = isEmpty;
-exports.hasKey = hasKey;
-exports.forEachKey = forEachKey;
-exports.pluck = pluck;
-exports.flattenObject = flattenObject;
-exports.flattenIter = flattenIter;
-exports.validateJsonObject = validateJsonObjectJS;
-exports.validateJsonObjectJS = validateJsonObjectJS;
-exports.randElt = randElt;
-exports.extraProperties = extraProperties;
-exports.mergeObjects = mergeObjects;
-
-exports.startsWith = startsWith;
-exports.endsWith = endsWith;
-
-exports.parseInteger = parseInteger;
-
-exports.iso8601 = iso8601;
-exports.rfc1123 = rfc1123;
-exports.parseDateTime = parseDateTime;
-
-exports.hrtimediff = hrtimeDiff;
-exports.hrtimeDiff = hrtimeDiff;
-exports.hrtimeAccum = hrtimeAccum;
-exports.hrtimeAdd = hrtimeAdd;
-exports.hrtimeNanosec = hrtimeNanosec;
-exports.hrtimeMicrosec = hrtimeMicrosec;
-exports.hrtimeMillisec = hrtimeMillisec;
-
-
-/*
- * Deep copy an acyclic *basic* Javascript object.  This only handles basic
- * scalars (strings, numbers, booleans) and arbitrarily deep arrays and objects
- * containing these.  This does *not* handle instances of other classes.
- */
-function deepCopy(obj)
-{
-	var ret, key;
-	var marker = '__deepCopy';
-
-	if (obj && obj[marker])
-		throw (new Error('attempted deep copy of cyclic object'));
-
-	if (obj && obj.constructor == Object) {
-		ret = {};
-		obj[marker] = true;
-
-		for (key in obj) {
-			if (key == marker)
-				continue;
-
-			ret[key] = deepCopy(obj[key]);
-		}
-
-		delete (obj[marker]);
-		return (ret);
-	}
-
-	if (obj && obj.constructor == Array) {
-		ret = [];
-		obj[marker] = true;
-
-		for (key = 0; key < obj.length; key++)
-			ret.push(deepCopy(obj[key]));
-
-		delete (obj[marker]);
-		return (ret);
-	}
-
-	/*
-	 * It must be a primitive type -- just return it.
-	 */
-	return (obj);
-}
-
-function deepEqual(obj1, obj2)
-{
-	if (typeof (obj1) != typeof (obj2))
-		return (false);
-
-	if (obj1 === null || obj2 === null || typeof (obj1) != 'object')
-		return (obj1 === obj2);
-
-	if (obj1.constructor != obj2.constructor)
-		return (false);
-
-	var k;
-	for (k in obj1) {
-		if (!obj2.hasOwnProperty(k))
-			return (false);
-
-		if (!deepEqual(obj1[k], obj2[k]))
-			return (false);
-	}
-
-	for (k in obj2) {
-		if (!obj1.hasOwnProperty(k))
-			return (false);
-	}
-
-	return (true);
-}
-
-function isEmpty(obj)
-{
-	var key;
-	for (key in obj)
-		return (false);
-	return (true);
-}
-
-function hasKey(obj, key)
-{
-	mod_assert.equal(typeof (key), 'string');
-	return (Object.prototype.hasOwnProperty.call(obj, key));
-}
-
-function forEachKey(obj, callback)
-{
-	for (var key in obj) {
-		if (hasKey(obj, key)) {
-			callback(key, obj[key]);
-		}
-	}
-}
-
-function pluck(obj, key)
-{
-	mod_assert.equal(typeof (key), 'string');
-	return (pluckv(obj, key));
-}
-
-function pluckv(obj, key)
-{
-	if (obj === null || typeof (obj) !== 'object')
-		return (undefined);
-
-	if (obj.hasOwnProperty(key))
-		return (obj[key]);
-
-	var i = key.indexOf('.');
-	if (i == -1)
-		return (undefined);
-
-	var key1 = key.substr(0, i);
-	if (!obj.hasOwnProperty(key1))
-		return (undefined);
-
-	return (pluckv(obj[key1], key.substr(i + 1)));
-}
-
-/*
- * Invoke callback(row) for each entry in the array that would be returned by
- * flattenObject(data, depth).  This is just like flattenObject(data,
- * depth).forEach(callback), except that the intermediate array is never
- * created.
- */
-function flattenIter(data, depth, callback)
-{
-	doFlattenIter(data, depth, [], callback);
-}
-
-function doFlattenIter(data, depth, accum, callback)
-{
-	var each;
-	var key;
-
-	if (depth === 0) {
-		each = accum.slice(0);
-		each.push(data);
-		callback(each);
-		return;
-	}
-
-	mod_assert.ok(data !== null);
-	mod_assert.equal(typeof (data), 'object');
-	mod_assert.equal(typeof (depth), 'number');
-	mod_assert.ok(depth >= 0);
-
-	for (key in data) {
-		each = accum.slice(0);
-		each.push(key);
-		doFlattenIter(data[key], depth - 1, each, callback);
-	}
-}
-
-function flattenObject(data, depth)
-{
-	if (depth === 0)
-		return ([ data ]);
-
-	mod_assert.ok(data !== null);
-	mod_assert.equal(typeof (data), 'object');
-	mod_assert.equal(typeof (depth), 'number');
-	mod_assert.ok(depth >= 0);
-
-	var rv = [];
-	var key;
-
-	for (key in data) {
-		flattenObject(data[key], depth - 1).forEach(function (p) {
-			rv.push([ key ].concat(p));
-		});
-	}
-
-	return (rv);
-}
-
-function startsWith(str, prefix)
-{
-	return (str.substr(0, prefix.length) == prefix);
-}
-
-function endsWith(str, suffix)
-{
-	return (str.substr(
-	    str.length - suffix.length, suffix.length) == suffix);
-}
-
-function iso8601(d)
-{
-	if (typeof (d) == 'number')
-		d = new Date(d);
-	mod_assert.ok(d.constructor === Date);
-	return (mod_extsprintf.sprintf('%4d-%02d-%02dT%02d:%02d:%02d.%03dZ',
-	    d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
-	    d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(),
-	    d.getUTCMilliseconds()));
-}
-
-var RFC1123_MONTHS = [
-    'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-var RFC1123_DAYS = [
-    'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-
-function rfc1123(date) {
-	return (mod_extsprintf.sprintf('%s, %02d %s %04d %02d:%02d:%02d GMT',
-	    RFC1123_DAYS[date.getUTCDay()], date.getUTCDate(),
-	    RFC1123_MONTHS[date.getUTCMonth()], date.getUTCFullYear(),
-	    date.getUTCHours(), date.getUTCMinutes(),
-	    date.getUTCSeconds()));
-}
-
-/*
- * Parses a date expressed as a string, as either a number of milliseconds since
- * the epoch or any string format that Date accepts, giving preference to the
- * former where these two sets overlap (e.g., small numbers).
- */
-function parseDateTime(str)
-{
-	/*
-	 * This is irritatingly implicit, but significantly more concise than
-	 * alternatives.  The "+str" will convert a string containing only a
-	 * number directly to a Number, or NaN for other strings.  Thus, if the
-	 * conversion succeeds, we use it (this is the milliseconds-since-epoch
-	 * case).  Otherwise, we pass the string directly to the Date
-	 * constructor to parse.
-	 */
-	var numeric = +str;
-	if (!isNaN(numeric)) {
-		return (new Date(numeric));
-	} else {
-		return (new Date(str));
-	}
-}
-
-
-/*
- * Number.*_SAFE_INTEGER isn't present before node v0.12, so we hardcode
- * the ES6 definitions here, while allowing for them to someday be higher.
- */
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
-var MIN_SAFE_INTEGER = Number.MIN_SAFE_INTEGER || -9007199254740991;
-
-
-/*
- * Default options for parseInteger().
- */
-var PI_DEFAULTS = {
-	base: 10,
-	allowSign: true,
-	allowPrefix: false,
-	allowTrailing: false,
-	allowImprecise: false,
-	trimWhitespace: false,
-	leadingZeroIsOctal: false
-};
-
-var CP_0 = 0x30;
-var CP_9 = 0x39;
-
-var CP_A = 0x41;
-var CP_B = 0x42;
-var CP_O = 0x4f;
-var CP_T = 0x54;
-var CP_X = 0x58;
-var CP_Z = 0x5a;
-
-var CP_a = 0x61;
-var CP_b = 0x62;
-var CP_o = 0x6f;
-var CP_t = 0x74;
-var CP_x = 0x78;
-var CP_z = 0x7a;
-
-var PI_CONV_DEC = 0x30;
-var PI_CONV_UC = 0x37;
-var PI_CONV_LC = 0x57;
-
-
-/*
- * A stricter version of parseInt() that provides options for changing what
- * is an acceptable string (for example, disallowing trailing characters).
- */
-function parseInteger(str, uopts)
-{
-	mod_assert.string(str, 'str');
-	mod_assert.optionalObject(uopts, 'options');
-
-	var baseOverride = false;
-	var options = PI_DEFAULTS;
-
-	if (uopts) {
-		baseOverride = hasKey(uopts, 'base');
-		options = mergeObjects(options, uopts);
-		mod_assert.number(options.base, 'options.base');
-		mod_assert.ok(options.base >= 2, 'options.base >= 2');
-		mod_assert.ok(options.base <= 36, 'options.base <= 36');
-		mod_assert.bool(options.allowSign, 'options.allowSign');
-		mod_assert.bool(options.allowPrefix, 'options.allowPrefix');
-		mod_assert.bool(options.allowTrailing,
-		    'options.allowTrailing');
-		mod_assert.bool(options.allowImprecise,
-		    'options.allowImprecise');
-		mod_assert.bool(options.trimWhitespace,
-		    'options.trimWhitespace');
-		mod_assert.bool(options.leadingZeroIsOctal,
-		    'options.leadingZeroIsOctal');
-
-		if (options.leadingZeroIsOctal) {
-			mod_assert.ok(!baseOverride,
-			    '"base" and "leadingZeroIsOctal" are ' +
-			    'mutually exclusive');
-		}
-	}
-
-	var c;
-	var pbase = -1;
-	var base = options.base;
-	var start;
-	var mult = 1;
-	var value = 0;
-	var idx = 0;
-	var len = str.length;
-
-	/* Trim any whitespace on the left side. */
-	if (options.trimWhitespace) {
-		while (idx < len && isSpace(str.charCodeAt(idx))) {
-			++idx;
-		}
-	}
-
-	/* Check the number for a leading sign. */
-	if (options.allowSign) {
-		if (str[idx] === '-') {
-			idx += 1;
-			mult = -1;
-		} else if (str[idx] === '+') {
-			idx += 1;
-		}
-	}
-
-	/* Parse the base-indicating prefix if there is one. */
-	if (str[idx] === '0') {
-		if (options.allowPrefix) {
-			pbase = prefixToBase(str.charCodeAt(idx + 1));
-			if (pbase !== -1 && (!baseOverride || pbase === base)) {
-				base = pbase;
-				idx += 2;
-			}
-		}
-
-		if (pbase === -1 && options.leadingZeroIsOctal) {
-			base = 8;
-		}
-	}
-
-	/* Parse the actual digits. */
-	for (start = idx; idx < len; ++idx) {
-		c = translateDigit(str.charCodeAt(idx));
-		if (c !== -1 && c < base) {
-			value *= base;
-			value += c;
-		} else {
-			break;
-		}
-	}
-
-	/* If we didn't parse any digits, we have an invalid number. */
-	if (start === idx) {
-		return (new Error('invalid number: ' + JSON.stringify(str)));
-	}
-
-	/* Trim any whitespace on the right side. */
-	if (options.trimWhitespace) {
-		while (idx < len && isSpace(str.charCodeAt(idx))) {
-			++idx;
-		}
-	}
-
-	/* Check for trailing characters. */
-	if (idx < len && !options.allowTrailing) {
-		return (new Error('trailing characters after number: ' +
-		    JSON.stringify(str.slice(idx))));
-	}
-
-	/* If our value is 0, we return now, to avoid returning -0. */
-	if (value === 0) {
-		return (0);
-	}
-
-	/* Calculate our final value. */
-	var result = value * mult;
-
-	/*
-	 * If the string represents a value that cannot be precisely represented
-	 * by JavaScript, then we want to check that:
-	 *
-	 * - We never increased the value past MAX_SAFE_INTEGER
-	 * - We don't make the result negative and below MIN_SAFE_INTEGER
-	 *
-	 * Because we only ever increment the value during parsing, there's no
-	 * chance of moving past MAX_SAFE_INTEGER and then dropping below it
-	 * again, losing precision in the process. This means that we only need
-	 * to do our checks here, at the end.
-	 */
-	if (!options.allowImprecise &&
-	    (value > MAX_SAFE_INTEGER || result < MIN_SAFE_INTEGER)) {
-		return (new Error('number is outside of the supported range: ' +
-		    JSON.stringify(str.slice(start, idx))));
-	}
-
-	return (result);
-}
-
-
-/*
- * Interpret a character code as a base-36 digit.
- */
-function translateDigit(d)
-{
-	if (d >= CP_0 && d <= CP_9) {
-		/* '0' to '9' -> 0 to 9 */
-		return (d - PI_CONV_DEC);
-	} else if (d >= CP_A && d <= CP_Z) {
-		/* 'A' - 'Z' -> 10 to 35 */
-		return (d - PI_CONV_UC);
-	} else if (d >= CP_a && d <= CP_z) {
-		/* 'a' - 'z' -> 10 to 35 */
-		return (d - PI_CONV_LC);
-	} else {
-		/* Invalid character code */
-		return (-1);
-	}
-}
-
-
-/*
- * Test if a value matches the ECMAScript definition of trimmable whitespace.
- */
-function isSpace(c)
-{
-	return (c === 0x20) ||
-	    (c >= 0x0009 && c <= 0x000d) ||
-	    (c === 0x00a0) ||
-	    (c === 0x1680) ||
-	    (c === 0x180e) ||
-	    (c >= 0x2000 && c <= 0x200a) ||
-	    (c === 0x2028) ||
-	    (c === 0x2029) ||
-	    (c === 0x202f) ||
-	    (c === 0x205f) ||
-	    (c === 0x3000) ||
-	    (c === 0xfeff);
-}
-
-
-/*
- * Determine which base a character indicates (e.g., 'x' indicates hex).
- */
-function prefixToBase(c)
-{
-	if (c === CP_b || c === CP_B) {
-		/* 0b/0B (binary) */
-		return (2);
-	} else if (c === CP_o || c === CP_O) {
-		/* 0o/0O (octal) */
-		return (8);
-	} else if (c === CP_t || c === CP_T) {
-		/* 0t/0T (decimal) */
-		return (10);
-	} else if (c === CP_x || c === CP_X) {
-		/* 0x/0X (hexadecimal) */
-		return (16);
-	} else {
-		/* Not a meaningful character */
-		return (-1);
-	}
-}
-
-
-function validateJsonObjectJS(schema, input)
-{
-	var report = mod_jsonschema.validate(input, schema);
-
-	if (report.errors.length === 0)
-		return (null);
-
-	/* Currently, we only do anything useful with the first error. */
-	var error = report.errors[0];
-
-	/* The failed property is given by a URI with an irrelevant prefix. */
-	var propname = error['property'];
-	var reason = error['message'].toLowerCase();
-	var i, j;
-
-	/*
-	 * There's at least one case where the property error message is
-	 * confusing at best.  We work around this here.
-	 */
-	if ((i = reason.indexOf('the property ')) != -1 &&
-	    (j = reason.indexOf(' is not defined in the schema and the ' +
-	    'schema does not allow additional properties')) != -1) {
-		i += 'the property '.length;
-		if (propname === '')
-			propname = reason.substr(i, j - i);
-		else
-			propname = propname + '.' + reason.substr(i, j - i);
-
-		reason = 'unsupported property';
-	}
-
-	var rv = new mod_verror.VError('property "%s": %s', propname, reason);
-	rv.jsv_details = error;
-	return (rv);
-}
-
-function randElt(arr)
-{
-	mod_assert.ok(Array.isArray(arr) && arr.length > 0,
-	    'randElt argument must be a non-empty array');
-
-	return (arr[Math.floor(Math.random() * arr.length)]);
-}
-
-function assertHrtime(a)
-{
-	mod_assert.ok(a[0] >= 0 && a[1] >= 0,
-	    'negative numbers not allowed in hrtimes');
-	mod_assert.ok(a[1] < 1e9, 'nanoseconds column overflow');
-}
-
-/*
- * Compute the time elapsed between hrtime readings A and B, where A is later
- * than B.  hrtime readings come from Node's process.hrtime().  There is no
- * defined way to represent negative deltas, so it's illegal to diff B from A
- * where the time denoted by B is later than the time denoted by A.  If this
- * becomes valuable, we can define a representation and extend the
- * implementation to support it.
- */
-function hrtimeDiff(a, b)
-{
-	assertHrtime(a);
-	assertHrtime(b);
-	mod_assert.ok(a[0] > b[0] || (a[0] == b[0] && a[1] >= b[1]),
-	    'negative differences not allowed');
-
-	var rv = [ a[0] - b[0], 0 ];
-
-	if (a[1] >= b[1]) {
-		rv[1] = a[1] - b[1];
-	} else {
-		rv[0]--;
-		rv[1] = 1e9 - (b[1] - a[1]);
-	}
-
-	return (rv);
-}
-
-/*
- * Convert a hrtime reading from the array format returned by Node's
- * process.hrtime() into a scalar number of nanoseconds.
- */
-function hrtimeNanosec(a)
-{
-	assertHrtime(a);
-
-	return (Math.floor(a[0] * 1e9 + a[1]));
-}
-
-/*
- * Convert a hrtime reading from the array format returned by Node's
- * process.hrtime() into a scalar number of microseconds.
- */
-function hrtimeMicrosec(a)
-{
-	assertHrtime(a);
-
-	return (Math.floor(a[0] * 1e6 + a[1] / 1e3));
-}
-
-/*
- * Convert a hrtime reading from the array format returned by Node's
- * process.hrtime() into a scalar number of milliseconds.
- */
-function hrtimeMillisec(a)
-{
-	assertHrtime(a);
-
-	return (Math.floor(a[0] * 1e3 + a[1] / 1e6));
-}
-
-/*
- * Add two hrtime readings A and B, overwriting A with the result of the
- * addition.  This function is useful for accumulating several hrtime intervals
- * into a counter.  Returns A.
- */
-function hrtimeAccum(a, b)
-{
-	assertHrtime(a);
-	assertHrtime(b);
-
-	/*
-	 * Accumulate the nanosecond component.
-	 */
-	a[1] += b[1];
-	if (a[1] >= 1e9) {
-		/*
-		 * The nanosecond component overflowed, so carry to the seconds
-		 * field.
-		 */
-		a[0]++;
-		a[1] -= 1e9;
-	}
-
-	/*
-	 * Accumulate the seconds component.
-	 */
-	a[0] += b[0];
-
-	return (a);
-}
-
-/*
- * Add two hrtime readings A and B, returning the result as a new hrtime array.
- * Does not modify either input argument.
- */
-function hrtimeAdd(a, b)
-{
-	assertHrtime(a);
-
-	var rv = [ a[0], a[1] ];
-
-	return (hrtimeAccum(rv, b));
-}
-
-
-/*
- * Check an object for unexpected properties.  Accepts the object to check, and
- * an array of allowed property names (strings).  Returns an array of key names
- * that were found on the object, but did not appear in the list of allowed
- * properties.  If no properties were found, the returned array will be of
- * zero length.
- */
-function extraProperties(obj, allowed)
-{
-	mod_assert.ok(typeof (obj) === 'object' && obj !== null,
-	    'obj argument must be a non-null object');
-	mod_assert.ok(Array.isArray(allowed),
-	    'allowed argument must be an array of strings');
-	for (var i = 0; i < allowed.length; i++) {
-		mod_assert.ok(typeof (allowed[i]) === 'string',
-		    'allowed argument must be an array of strings');
-	}
-
-	return (Object.keys(obj).filter(function (key) {
-		return (allowed.indexOf(key) === -1);
-	}));
-}
-
-/*
- * Given three sets of properties "provided" (may be undefined), "overrides"
- * (required), and "defaults" (may be undefined), construct an object containing
- * the union of these sets with "overrides" overriding "provided", and
- * "provided" overriding "defaults".  None of the input objects are modified.
- */
-function mergeObjects(provided, overrides, defaults)
-{
-	var rv, k;
-
-	rv = {};
-	if (defaults) {
-		for (k in defaults)
-			rv[k] = defaults[k];
-	}
-
-	if (provided) {
-		for (k in provided)
-			rv[k] = provided[k];
-	}
-
-	if (overrides) {
-		for (k in overrides)
-			rv[k] = overrides[k];
-	}
-
-	return (rv);
-}
-
-
-/***/ }),
-/* 747 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* eslint-disable no-nested-ternary */
-
-var arr = [];
-var charCodeCache = [];
-
-module.exports = function (a, b) {
-	if (a === b) {
-		return 0;
-	}
-
-	var swap = a;
-
-	// Swapping the strings if `a` is longer than `b` so we know which one is the
-	// shortest & which one is the longest
-	if (a.length > b.length) {
-		a = b;
-		b = swap;
-	}
-
-	var aLen = a.length;
-	var bLen = b.length;
-
-	if (aLen === 0) {
-		return bLen;
-	}
-
-	if (bLen === 0) {
-		return aLen;
-	}
-
-	// Performing suffix trimming:
-	// We can linearly drop suffix common to both strings since they
-	// don't increase distance at all
-	// Note: `~-` is the bitwise way to perform a `- 1` operation
-	while (aLen > 0 && (a.charCodeAt(~-aLen) === b.charCodeAt(~-bLen))) {
-		aLen--;
-		bLen--;
-	}
-
-	if (aLen === 0) {
-		return bLen;
-	}
-
-	// Performing prefix trimming
-	// We can linearly drop prefix common to both strings since they
-	// don't increase distance at all
-	var start = 0;
-
-	while (start < aLen && (a.charCodeAt(start) === b.charCodeAt(start))) {
-		start++;
-	}
-
-	aLen -= start;
-	bLen -= start;
-
-	if (aLen === 0) {
-		return bLen;
-	}
-
-	var bCharCode;
-	var ret;
-	var tmp;
-	var tmp2;
-	var i = 0;
-	var j = 0;
-
-	while (i < aLen) {
-		charCodeCache[start + i] = a.charCodeAt(start + i);
-		arr[i] = ++i;
-	}
-
-	while (j < bLen) {
-		bCharCode = b.charCodeAt(start + j);
-		tmp = j++;
-		ret = j;
-
-		for (i = 0; i < aLen; i++) {
-			tmp2 = bCharCode === charCodeCache[start + i] ? tmp : tmp + 1;
-			tmp = arr[i];
-			ret = arr[i] = tmp > ret ? tmp2 > ret ? ret + 1 : tmp2 : tmp2 > tmp ? tmp + 1 : tmp2;
-		}
-	}
-
-	return ret;
-};
-
-
-/***/ }),
-/* 748 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(module) {/**
- * lodash (Custom Build) <https://lodash.com/>
- * Build: `lodash modularize exports="npm" -o ./`
- * Copyright jQuery Foundation and other contributors <https://jquery.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-
-/** Used as the size to enable large array optimizations. */
-var LARGE_ARRAY_SIZE = 200;
-
-/** Used to stand-in for `undefined` hash values. */
-var HASH_UNDEFINED = '__lodash_hash_undefined__';
-
-/** Used as references for various `Number` constants. */
-var MAX_SAFE_INTEGER = 9007199254740991;
-
-/** `Object#toString` result references. */
-var argsTag = '[object Arguments]',
-    arrayTag = '[object Array]',
-    boolTag = '[object Boolean]',
-    dateTag = '[object Date]',
-    errorTag = '[object Error]',
-    funcTag = '[object Function]',
-    genTag = '[object GeneratorFunction]',
-    mapTag = '[object Map]',
-    numberTag = '[object Number]',
-    objectTag = '[object Object]',
-    promiseTag = '[object Promise]',
-    regexpTag = '[object RegExp]',
-    setTag = '[object Set]',
-    stringTag = '[object String]',
-    symbolTag = '[object Symbol]',
-    weakMapTag = '[object WeakMap]';
-
-var arrayBufferTag = '[object ArrayBuffer]',
-    dataViewTag = '[object DataView]',
-    float32Tag = '[object Float32Array]',
-    float64Tag = '[object Float64Array]',
-    int8Tag = '[object Int8Array]',
-    int16Tag = '[object Int16Array]',
-    int32Tag = '[object Int32Array]',
-    uint8Tag = '[object Uint8Array]',
-    uint8ClampedTag = '[object Uint8ClampedArray]',
-    uint16Tag = '[object Uint16Array]',
-    uint32Tag = '[object Uint32Array]';
-
-/**
- * Used to match `RegExp`
- * [syntax characters](http://ecma-international.org/ecma-262/6.0/#sec-patterns).
- */
-var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
-
-/** Used to match `RegExp` flags from their coerced string values. */
-var reFlags = /\w*$/;
-
-/** Used to detect host constructors (Safari). */
-var reIsHostCtor = /^\[object .+?Constructor\]$/;
-
-/** Used to detect unsigned integer values. */
-var reIsUint = /^(?:0|[1-9]\d*)$/;
-
-/** Used to identify `toStringTag` values supported by `_.clone`. */
-var cloneableTags = {};
-cloneableTags[argsTag] = cloneableTags[arrayTag] =
-cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] =
-cloneableTags[boolTag] = cloneableTags[dateTag] =
-cloneableTags[float32Tag] = cloneableTags[float64Tag] =
-cloneableTags[int8Tag] = cloneableTags[int16Tag] =
-cloneableTags[int32Tag] = cloneableTags[mapTag] =
-cloneableTags[numberTag] = cloneableTags[objectTag] =
-cloneableTags[regexpTag] = cloneableTags[setTag] =
-cloneableTags[stringTag] = cloneableTags[symbolTag] =
-cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
-cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
-cloneableTags[errorTag] = cloneableTags[funcTag] =
-cloneableTags[weakMapTag] = false;
-
-/** Used to determine if values are of the language type `Object`. */
-var objectTypes = {
-  'function': true,
-  'object': true
-};
-
-/** Detect free variable `exports`. */
-var freeExports = (objectTypes[typeof exports] && exports && !exports.nodeType)
-  ? exports
-  : undefined;
-
-/** Detect free variable `module`. */
-var freeModule = (objectTypes[typeof module] && module && !module.nodeType)
-  ? module
-  : undefined;
-
-/** Detect the popular CommonJS extension `module.exports`. */
-var moduleExports = (freeModule && freeModule.exports === freeExports)
-  ? freeExports
-  : undefined;
-
-/** Detect free variable `global` from Node.js. */
-var freeGlobal = checkGlobal(freeExports && freeModule && typeof global == 'object' && global);
-
-/** Detect free variable `self`. */
-var freeSelf = checkGlobal(objectTypes[typeof self] && self);
-
-/** Detect free variable `window`. */
-var freeWindow = checkGlobal(objectTypes[typeof window] && window);
-
-/** Detect `this` as the global object. */
-var thisGlobal = checkGlobal(objectTypes[typeof this] && this);
-
-/**
- * Used as a reference to the global object.
- *
- * The `this` value is used if it's the global object to avoid Greasemonkey's
- * restricted `window` object, otherwise the `window` object is used.
- */
-var root = freeGlobal ||
-  ((freeWindow !== (thisGlobal && thisGlobal.window)) && freeWindow) ||
-    freeSelf || thisGlobal || Function('return this')();
-
-/**
- * Adds the key-value `pair` to `map`.
- *
- * @private
- * @param {Object} map The map to modify.
- * @param {Array} pair The key-value pair to add.
- * @returns {Object} Returns `map`.
- */
-function addMapEntry(map, pair) {
-  // Don't return `Map#set` because it doesn't return the map instance in IE 11.
-  map.set(pair[0], pair[1]);
-  return map;
-}
-
-/**
- * Adds `value` to `set`.
- *
- * @private
- * @param {Object} set The set to modify.
- * @param {*} value The value to add.
- * @returns {Object} Returns `set`.
- */
-function addSetEntry(set, value) {
-  set.add(value);
-  return set;
-}
-
-/**
- * A specialized version of `_.forEach` for arrays without support for
- * iteratee shorthands.
- *
- * @private
- * @param {Array} array The array to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns `array`.
- */
-function arrayEach(array, iteratee) {
-  var index = -1,
-      length = array.length;
-
-  while (++index < length) {
-    if (iteratee(array[index], index, array) === false) {
-      break;
-    }
-  }
-  return array;
-}
-
-/**
- * Appends the elements of `values` to `array`.
- *
- * @private
- * @param {Array} array The array to modify.
- * @param {Array} values The values to append.
- * @returns {Array} Returns `array`.
- */
-function arrayPush(array, values) {
-  var index = -1,
-      length = values.length,
-      offset = array.length;
-
-  while (++index < length) {
-    array[offset + index] = values[index];
-  }
-  return array;
-}
-
-/**
- * A specialized version of `_.reduce` for arrays without support for
- * iteratee shorthands.
- *
- * @private
- * @param {Array} array The array to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @param {*} [accumulator] The initial value.
- * @param {boolean} [initAccum] Specify using the first element of `array` as
- *  the initial value.
- * @returns {*} Returns the accumulated value.
- */
-function arrayReduce(array, iteratee, accumulator, initAccum) {
-  var index = -1,
-      length = array.length;
-
-  if (initAccum && length) {
-    accumulator = array[++index];
-  }
-  while (++index < length) {
-    accumulator = iteratee(accumulator, array[index], index, array);
-  }
-  return accumulator;
-}
-
-/**
- * The base implementation of `_.times` without support for iteratee shorthands
- * or max array length checks.
- *
- * @private
- * @param {number} n The number of times to invoke `iteratee`.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns the array of results.
- */
-function baseTimes(n, iteratee) {
-  var index = -1,
-      result = Array(n);
-
-  while (++index < n) {
-    result[index] = iteratee(index);
-  }
-  return result;
-}
-
-/**
- * Checks if `value` is a global object.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {null|Object} Returns `value` if it's a global object, else `null`.
- */
-function checkGlobal(value) {
-  return (value && value.Object === Object) ? value : null;
-}
-
-/**
- * Checks if `value` is a host object in IE < 9.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
- */
-function isHostObject(value) {
-  // Many host objects are `Object` objects that can coerce to strings
-  // despite having improperly defined `toString` methods.
-  var result = false;
-  if (value != null && typeof value.toString != 'function') {
-    try {
-      result = !!(value + '');
-    } catch (e) {}
-  }
-  return result;
-}
-
-/**
- * Converts `map` to its key-value pairs.
- *
- * @private
- * @param {Object} map The map to convert.
- * @returns {Array} Returns the key-value pairs.
- */
-function mapToArray(map) {
-  var index = -1,
-      result = Array(map.size);
-
-  map.forEach(function(value, key) {
-    result[++index] = [key, value];
-  });
-  return result;
-}
-
-/**
- * Converts `set` to an array of its values.
- *
- * @private
- * @param {Object} set The set to convert.
- * @returns {Array} Returns the values.
- */
-function setToArray(set) {
-  var index = -1,
-      result = Array(set.size);
-
-  set.forEach(function(value) {
-    result[++index] = value;
-  });
-  return result;
-}
-
-/** Used for built-in method references. */
-var arrayProto = Array.prototype,
-    objectProto = Object.prototype;
-
-/** Used to resolve the decompiled source of functions. */
-var funcToString = Function.prototype.toString;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Used to resolve the
- * [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objectToString = objectProto.toString;
-
-/** Used to detect if a method is native. */
-var reIsNative = RegExp('^' +
-  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
-  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
-);
-
-/** Built-in value references. */
-var Buffer = moduleExports ? root.Buffer : undefined,
-    Symbol = root.Symbol,
-    Uint8Array = root.Uint8Array,
-    getOwnPropertySymbols = Object.getOwnPropertySymbols,
-    objectCreate = Object.create,
-    propertyIsEnumerable = objectProto.propertyIsEnumerable,
-    splice = arrayProto.splice;
-
-/* Built-in method references for those with the same name as other `lodash` methods. */
-var nativeGetPrototype = Object.getPrototypeOf,
-    nativeKeys = Object.keys;
-
-/* Built-in method references that are verified to be native. */
-var DataView = getNative(root, 'DataView'),
-    Map = getNative(root, 'Map'),
-    Promise = getNative(root, 'Promise'),
-    Set = getNative(root, 'Set'),
-    WeakMap = getNative(root, 'WeakMap'),
-    nativeCreate = getNative(Object, 'create');
-
-/** Used to detect maps, sets, and weakmaps. */
-var dataViewCtorString = toSource(DataView),
-    mapCtorString = toSource(Map),
-    promiseCtorString = toSource(Promise),
-    setCtorString = toSource(Set),
-    weakMapCtorString = toSource(WeakMap);
-
-/** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol ? Symbol.prototype : undefined,
-    symbolValueOf = symbolProto ? symbolProto.valueOf : undefined;
-
-/**
- * Creates a hash object.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function Hash(entries) {
-  var index = -1,
-      length = entries ? entries.length : 0;
-
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-
-/**
- * Removes all key-value entries from the hash.
- *
- * @private
- * @name clear
- * @memberOf Hash
- */
-function hashClear() {
-  this.__data__ = nativeCreate ? nativeCreate(null) : {};
-}
-
-/**
- * Removes `key` and its value from the hash.
- *
- * @private
- * @name delete
- * @memberOf Hash
- * @param {Object} hash The hash to modify.
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function hashDelete(key) {
-  return this.has(key) && delete this.__data__[key];
-}
-
-/**
- * Gets the hash value for `key`.
- *
- * @private
- * @name get
- * @memberOf Hash
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
- */
-function hashGet(key) {
-  var data = this.__data__;
-  if (nativeCreate) {
-    var result = data[key];
-    return result === HASH_UNDEFINED ? undefined : result;
-  }
-  return hasOwnProperty.call(data, key) ? data[key] : undefined;
-}
-
-/**
- * Checks if a hash value for `key` exists.
- *
- * @private
- * @name has
- * @memberOf Hash
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
- */
-function hashHas(key) {
-  var data = this.__data__;
-  return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key);
-}
-
-/**
- * Sets the hash `key` to `value`.
- *
- * @private
- * @name set
- * @memberOf Hash
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the hash instance.
- */
-function hashSet(key, value) {
-  var data = this.__data__;
-  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
-  return this;
-}
-
-// Add methods to `Hash`.
-Hash.prototype.clear = hashClear;
-Hash.prototype['delete'] = hashDelete;
-Hash.prototype.get = hashGet;
-Hash.prototype.has = hashHas;
-Hash.prototype.set = hashSet;
-
-/**
- * Creates an list cache object.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function ListCache(entries) {
-  var index = -1,
-      length = entries ? entries.length : 0;
-
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-
-/**
- * Removes all key-value entries from the list cache.
- *
- * @private
- * @name clear
- * @memberOf ListCache
- */
-function listCacheClear() {
-  this.__data__ = [];
-}
-
-/**
- * Removes `key` and its value from the list cache.
- *
- * @private
- * @name delete
- * @memberOf ListCache
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function listCacheDelete(key) {
-  var data = this.__data__,
-      index = assocIndexOf(data, key);
-
-  if (index < 0) {
-    return false;
-  }
-  var lastIndex = data.length - 1;
-  if (index == lastIndex) {
-    data.pop();
-  } else {
-    splice.call(data, index, 1);
-  }
-  return true;
-}
-
-/**
- * Gets the list cache value for `key`.
- *
- * @private
- * @name get
- * @memberOf ListCache
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
- */
-function listCacheGet(key) {
-  var data = this.__data__,
-      index = assocIndexOf(data, key);
-
-  return index < 0 ? undefined : data[index][1];
-}
-
-/**
- * Checks if a list cache value for `key` exists.
- *
- * @private
- * @name has
- * @memberOf ListCache
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
- */
-function listCacheHas(key) {
-  return assocIndexOf(this.__data__, key) > -1;
-}
-
-/**
- * Sets the list cache `key` to `value`.
- *
- * @private
- * @name set
- * @memberOf ListCache
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the list cache instance.
- */
-function listCacheSet(key, value) {
-  var data = this.__data__,
-      index = assocIndexOf(data, key);
-
-  if (index < 0) {
-    data.push([key, value]);
-  } else {
-    data[index][1] = value;
-  }
-  return this;
-}
-
-// Add methods to `ListCache`.
-ListCache.prototype.clear = listCacheClear;
-ListCache.prototype['delete'] = listCacheDelete;
-ListCache.prototype.get = listCacheGet;
-ListCache.prototype.has = listCacheHas;
-ListCache.prototype.set = listCacheSet;
-
-/**
- * Creates a map cache object to store key-value pairs.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function MapCache(entries) {
-  var index = -1,
-      length = entries ? entries.length : 0;
-
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-
-/**
- * Removes all key-value entries from the map.
- *
- * @private
- * @name clear
- * @memberOf MapCache
- */
-function mapCacheClear() {
-  this.__data__ = {
-    'hash': new Hash,
-    'map': new (Map || ListCache),
-    'string': new Hash
-  };
-}
-
-/**
- * Removes `key` and its value from the map.
- *
- * @private
- * @name delete
- * @memberOf MapCache
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function mapCacheDelete(key) {
-  return getMapData(this, key)['delete'](key);
-}
-
-/**
- * Gets the map value for `key`.
- *
- * @private
- * @name get
- * @memberOf MapCache
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
- */
-function mapCacheGet(key) {
-  return getMapData(this, key).get(key);
-}
-
-/**
- * Checks if a map value for `key` exists.
- *
- * @private
- * @name has
- * @memberOf MapCache
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
- */
-function mapCacheHas(key) {
-  return getMapData(this, key).has(key);
-}
-
-/**
- * Sets the map `key` to `value`.
- *
- * @private
- * @name set
- * @memberOf MapCache
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the map cache instance.
- */
-function mapCacheSet(key, value) {
-  getMapData(this, key).set(key, value);
-  return this;
-}
-
-// Add methods to `MapCache`.
-MapCache.prototype.clear = mapCacheClear;
-MapCache.prototype['delete'] = mapCacheDelete;
-MapCache.prototype.get = mapCacheGet;
-MapCache.prototype.has = mapCacheHas;
-MapCache.prototype.set = mapCacheSet;
-
-/**
- * Creates a stack cache object to store key-value pairs.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function Stack(entries) {
-  this.__data__ = new ListCache(entries);
-}
-
-/**
- * Removes all key-value entries from the stack.
- *
- * @private
- * @name clear
- * @memberOf Stack
- */
-function stackClear() {
-  this.__data__ = new ListCache;
-}
-
-/**
- * Removes `key` and its value from the stack.
- *
- * @private
- * @name delete
- * @memberOf Stack
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function stackDelete(key) {
-  return this.__data__['delete'](key);
-}
-
-/**
- * Gets the stack value for `key`.
- *
- * @private
- * @name get
- * @memberOf Stack
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
- */
-function stackGet(key) {
-  return this.__data__.get(key);
-}
-
-/**
- * Checks if a stack value for `key` exists.
- *
- * @private
- * @name has
- * @memberOf Stack
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
- */
-function stackHas(key) {
-  return this.__data__.has(key);
-}
-
-/**
- * Sets the stack `key` to `value`.
- *
- * @private
- * @name set
- * @memberOf Stack
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the stack cache instance.
- */
-function stackSet(key, value) {
-  var cache = this.__data__;
-  if (cache instanceof ListCache && cache.__data__.length == LARGE_ARRAY_SIZE) {
-    cache = this.__data__ = new MapCache(cache.__data__);
-  }
-  cache.set(key, value);
-  return this;
-}
-
-// Add methods to `Stack`.
-Stack.prototype.clear = stackClear;
-Stack.prototype['delete'] = stackDelete;
-Stack.prototype.get = stackGet;
-Stack.prototype.has = stackHas;
-Stack.prototype.set = stackSet;
-
-/**
- * Assigns `value` to `key` of `object` if the existing value is not equivalent
- * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
- * for equality comparisons.
- *
- * @private
- * @param {Object} object The object to modify.
- * @param {string} key The key of the property to assign.
- * @param {*} value The value to assign.
- */
-function assignValue(object, key, value) {
-  var objValue = object[key];
-  if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
-      (value === undefined && !(key in object))) {
-    object[key] = value;
-  }
-}
-
-/**
- * Gets the index at which the `key` is found in `array` of key-value pairs.
- *
- * @private
- * @param {Array} array The array to search.
- * @param {*} key The key to search for.
- * @returns {number} Returns the index of the matched value, else `-1`.
- */
-function assocIndexOf(array, key) {
-  var length = array.length;
-  while (length--) {
-    if (eq(array[length][0], key)) {
-      return length;
-    }
-  }
-  return -1;
-}
-
-/**
- * The base implementation of `_.assign` without support for multiple sources
- * or `customizer` functions.
- *
- * @private
- * @param {Object} object The destination object.
- * @param {Object} source The source object.
- * @returns {Object} Returns `object`.
- */
-function baseAssign(object, source) {
-  return object && copyObject(source, keys(source), object);
-}
-
-/**
- * The base implementation of `_.clone` and `_.cloneDeep` which tracks
- * traversed objects.
- *
- * @private
- * @param {*} value The value to clone.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @param {boolean} [isFull] Specify a clone including symbols.
- * @param {Function} [customizer] The function to customize cloning.
- * @param {string} [key] The key of `value`.
- * @param {Object} [object] The parent object of `value`.
- * @param {Object} [stack] Tracks traversed objects and their clone counterparts.
- * @returns {*} Returns the cloned value.
- */
-function baseClone(value, isDeep, isFull, customizer, key, object, stack) {
-  var result;
-  if (customizer) {
-    result = object ? customizer(value, key, object, stack) : customizer(value);
-  }
-  if (result !== undefined) {
-    return result;
-  }
-  if (!isObject(value)) {
-    return value;
-  }
-  var isArr = isArray(value);
-  if (isArr) {
-    result = initCloneArray(value);
-    if (!isDeep) {
-      return copyArray(value, result);
-    }
-  } else {
-    var tag = getTag(value),
-        isFunc = tag == funcTag || tag == genTag;
-
-    if (isBuffer(value)) {
-      return cloneBuffer(value, isDeep);
-    }
-    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
-      if (isHostObject(value)) {
-        return object ? value : {};
-      }
-      result = initCloneObject(isFunc ? {} : value);
-      if (!isDeep) {
-        return copySymbols(value, baseAssign(result, value));
-      }
-    } else {
-      if (!cloneableTags[tag]) {
-        return object ? value : {};
-      }
-      result = initCloneByTag(value, tag, baseClone, isDeep);
-    }
-  }
-  // Check for circular references and return its corresponding clone.
-  stack || (stack = new Stack);
-  var stacked = stack.get(value);
-  if (stacked) {
-    return stacked;
-  }
-  stack.set(value, result);
-
-  if (!isArr) {
-    var props = isFull ? getAllKeys(value) : keys(value);
-  }
-  // Recursively populate clone (susceptible to call stack limits).
-  arrayEach(props || value, function(subValue, key) {
-    if (props) {
-      key = subValue;
-      subValue = value[key];
-    }
-    assignValue(result, key, baseClone(subValue, isDeep, isFull, customizer, key, value, stack));
-  });
-  return result;
-}
-
-/**
- * The base implementation of `_.create` without support for assigning
- * properties to the created object.
- *
- * @private
- * @param {Object} prototype The object to inherit from.
- * @returns {Object} Returns the new object.
- */
-function baseCreate(proto) {
-  return isObject(proto) ? objectCreate(proto) : {};
-}
-
-/**
- * The base implementation of `getAllKeys` and `getAllKeysIn` which uses
- * `keysFunc` and `symbolsFunc` to get the enumerable property names and
- * symbols of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Function} keysFunc The function to get the keys of `object`.
- * @param {Function} symbolsFunc The function to get the symbols of `object`.
- * @returns {Array} Returns the array of property names and symbols.
- */
-function baseGetAllKeys(object, keysFunc, symbolsFunc) {
-  var result = keysFunc(object);
-  return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
-}
-
-/**
- * The base implementation of `_.has` without support for deep paths.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Array|string} key The key to check.
- * @returns {boolean} Returns `true` if `key` exists, else `false`.
- */
-function baseHas(object, key) {
-  // Avoid a bug in IE 10-11 where objects with a [[Prototype]] of `null`,
-  // that are composed entirely of index properties, return `false` for
-  // `hasOwnProperty` checks of them.
-  return hasOwnProperty.call(object, key) ||
-    (typeof object == 'object' && key in object && getPrototype(object) === null);
-}
-
-/**
- * The base implementation of `_.keys` which doesn't skip the constructor
- * property of prototypes or treat sparse arrays as dense.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- */
-function baseKeys(object) {
-  return nativeKeys(Object(object));
-}
-
-/**
- * The base implementation of `_.property` without support for deep paths.
- *
- * @private
- * @param {string} key The key of the property to get.
- * @returns {Function} Returns the new accessor function.
- */
-function baseProperty(key) {
-  return function(object) {
-    return object == null ? undefined : object[key];
-  };
-}
-
-/**
- * Creates a clone of  `buffer`.
- *
- * @private
- * @param {Buffer} buffer The buffer to clone.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Buffer} Returns the cloned buffer.
- */
-function cloneBuffer(buffer, isDeep) {
-  if (isDeep) {
-    return buffer.slice();
-  }
-  var result = new buffer.constructor(buffer.length);
-  buffer.copy(result);
-  return result;
-}
-
-/**
- * Creates a clone of `arrayBuffer`.
- *
- * @private
- * @param {ArrayBuffer} arrayBuffer The array buffer to clone.
- * @returns {ArrayBuffer} Returns the cloned array buffer.
- */
-function cloneArrayBuffer(arrayBuffer) {
-  var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
-  new Uint8Array(result).set(new Uint8Array(arrayBuffer));
-  return result;
-}
-
-/**
- * Creates a clone of `dataView`.
- *
- * @private
- * @param {Object} dataView The data view to clone.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Object} Returns the cloned data view.
- */
-function cloneDataView(dataView, isDeep) {
-  var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer;
-  return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
-}
-
-/**
- * Creates a clone of `map`.
- *
- * @private
- * @param {Object} map The map to clone.
- * @param {Function} cloneFunc The function to clone values.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Object} Returns the cloned map.
- */
-function cloneMap(map, isDeep, cloneFunc) {
-  var array = isDeep ? cloneFunc(mapToArray(map), true) : mapToArray(map);
-  return arrayReduce(array, addMapEntry, new map.constructor);
-}
-
-/**
- * Creates a clone of `regexp`.
- *
- * @private
- * @param {Object} regexp The regexp to clone.
- * @returns {Object} Returns the cloned regexp.
- */
-function cloneRegExp(regexp) {
-  var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
-  result.lastIndex = regexp.lastIndex;
-  return result;
-}
-
-/**
- * Creates a clone of `set`.
- *
- * @private
- * @param {Object} set The set to clone.
- * @param {Function} cloneFunc The function to clone values.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Object} Returns the cloned set.
- */
-function cloneSet(set, isDeep, cloneFunc) {
-  var array = isDeep ? cloneFunc(setToArray(set), true) : setToArray(set);
-  return arrayReduce(array, addSetEntry, new set.constructor);
-}
-
-/**
- * Creates a clone of the `symbol` object.
- *
- * @private
- * @param {Object} symbol The symbol object to clone.
- * @returns {Object} Returns the cloned symbol object.
- */
-function cloneSymbol(symbol) {
-  return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
-}
-
-/**
- * Creates a clone of `typedArray`.
- *
- * @private
- * @param {Object} typedArray The typed array to clone.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Object} Returns the cloned typed array.
- */
-function cloneTypedArray(typedArray, isDeep) {
-  var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
-  return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
-}
-
-/**
- * Copies the values of `source` to `array`.
- *
- * @private
- * @param {Array} source The array to copy values from.
- * @param {Array} [array=[]] The array to copy values to.
- * @returns {Array} Returns `array`.
- */
-function copyArray(source, array) {
-  var index = -1,
-      length = source.length;
-
-  array || (array = Array(length));
-  while (++index < length) {
-    array[index] = source[index];
-  }
-  return array;
-}
-
-/**
- * Copies properties of `source` to `object`.
- *
- * @private
- * @param {Object} source The object to copy properties from.
- * @param {Array} props The property identifiers to copy.
- * @param {Object} [object={}] The object to copy properties to.
- * @param {Function} [customizer] The function to customize copied values.
- * @returns {Object} Returns `object`.
- */
-function copyObject(source, props, object, customizer) {
-  object || (object = {});
-
-  var index = -1,
-      length = props.length;
-
-  while (++index < length) {
-    var key = props[index];
-
-    var newValue = customizer
-      ? customizer(object[key], source[key], key, object, source)
-      : source[key];
-
-    assignValue(object, key, newValue);
-  }
-  return object;
-}
-
-/**
- * Copies own symbol properties of `source` to `object`.
- *
- * @private
- * @param {Object} source The object to copy symbols from.
- * @param {Object} [object={}] The object to copy symbols to.
- * @returns {Object} Returns `object`.
- */
-function copySymbols(source, object) {
-  return copyObject(source, getSymbols(source), object);
-}
-
-/**
- * Creates an array of own enumerable property names and symbols of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names and symbols.
- */
-function getAllKeys(object) {
-  return baseGetAllKeys(object, keys, getSymbols);
-}
-
-/**
- * Gets the "length" property value of `object`.
- *
- * **Note:** This function is used to avoid a
- * [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792) that affects
- * Safari on at least iOS 8.1-8.3 ARM64.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {*} Returns the "length" value.
- */
-var getLength = baseProperty('length');
-
-/**
- * Gets the data for `map`.
- *
- * @private
- * @param {Object} map The map to query.
- * @param {string} key The reference key.
- * @returns {*} Returns the map data.
- */
-function getMapData(map, key) {
-  var data = map.__data__;
-  return isKeyable(key)
-    ? data[typeof key == 'string' ? 'string' : 'hash']
-    : data.map;
-}
-
-/**
- * Gets the native function at `key` of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {string} key The key of the method to get.
- * @returns {*} Returns the function if it's native, else `undefined`.
- */
-function getNative(object, key) {
-  var value = object[key];
-  return isNative(value) ? value : undefined;
-}
-
-/**
- * Gets the `[[Prototype]]` of `value`.
- *
- * @private
- * @param {*} value The value to query.
- * @returns {null|Object} Returns the `[[Prototype]]`.
- */
-function getPrototype(value) {
-  return nativeGetPrototype(Object(value));
-}
-
-/**
- * Creates an array of the own enumerable symbol properties of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of symbols.
- */
-function getSymbols(object) {
-  // Coerce `object` to an object to avoid non-object errors in V8.
-  // See https://bugs.chromium.org/p/v8/issues/detail?id=3443 for more details.
-  return getOwnPropertySymbols(Object(object));
-}
-
-// Fallback for IE < 11.
-if (!getOwnPropertySymbols) {
-  getSymbols = function() {
-    return [];
-  };
-}
-
-/**
- * Gets the `toStringTag` of `value`.
- *
- * @private
- * @param {*} value The value to query.
- * @returns {string} Returns the `toStringTag`.
- */
-function getTag(value) {
-  return objectToString.call(value);
-}
-
-// Fallback for data views, maps, sets, and weak maps in IE 11,
-// for data views in Edge, and promises in Node.js.
-if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
-    (Map && getTag(new Map) != mapTag) ||
-    (Promise && getTag(Promise.resolve()) != promiseTag) ||
-    (Set && getTag(new Set) != setTag) ||
-    (WeakMap && getTag(new WeakMap) != weakMapTag)) {
-  getTag = function(value) {
-    var result = objectToString.call(value),
-        Ctor = result == objectTag ? value.constructor : undefined,
-        ctorString = Ctor ? toSource(Ctor) : undefined;
-
-    if (ctorString) {
-      switch (ctorString) {
-        case dataViewCtorString: return dataViewTag;
-        case mapCtorString: return mapTag;
-        case promiseCtorString: return promiseTag;
-        case setCtorString: return setTag;
-        case weakMapCtorString: return weakMapTag;
-      }
-    }
-    return result;
-  };
-}
-
-/**
- * Initializes an array clone.
- *
- * @private
- * @param {Array} array The array to clone.
- * @returns {Array} Returns the initialized clone.
- */
-function initCloneArray(array) {
-  var length = array.length,
-      result = array.constructor(length);
-
-  // Add properties assigned by `RegExp#exec`.
-  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
-    result.index = array.index;
-    result.input = array.input;
-  }
-  return result;
-}
-
-/**
- * Initializes an object clone.
- *
- * @private
- * @param {Object} object The object to clone.
- * @returns {Object} Returns the initialized clone.
- */
-function initCloneObject(object) {
-  return (typeof object.constructor == 'function' && !isPrototype(object))
-    ? baseCreate(getPrototype(object))
-    : {};
-}
-
-/**
- * Initializes an object clone based on its `toStringTag`.
- *
- * **Note:** This function only supports cloning values with tags of
- * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
- *
- * @private
- * @param {Object} object The object to clone.
- * @param {string} tag The `toStringTag` of the object to clone.
- * @param {Function} cloneFunc The function to clone values.
- * @param {boolean} [isDeep] Specify a deep clone.
- * @returns {Object} Returns the initialized clone.
- */
-function initCloneByTag(object, tag, cloneFunc, isDeep) {
-  var Ctor = object.constructor;
-  switch (tag) {
-    case arrayBufferTag:
-      return cloneArrayBuffer(object);
-
-    case boolTag:
-    case dateTag:
-      return new Ctor(+object);
-
-    case dataViewTag:
-      return cloneDataView(object, isDeep);
-
-    case float32Tag: case float64Tag:
-    case int8Tag: case int16Tag: case int32Tag:
-    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
-      return cloneTypedArray(object, isDeep);
-
-    case mapTag:
-      return cloneMap(object, isDeep, cloneFunc);
-
-    case numberTag:
-    case stringTag:
-      return new Ctor(object);
-
-    case regexpTag:
-      return cloneRegExp(object);
-
-    case setTag:
-      return cloneSet(object, isDeep, cloneFunc);
-
-    case symbolTag:
-      return cloneSymbol(object);
-  }
-}
-
-/**
- * Creates an array of index keys for `object` values of arrays,
- * `arguments` objects, and strings, otherwise `null` is returned.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array|null} Returns index keys, else `null`.
- */
-function indexKeys(object) {
-  var length = object ? object.length : undefined;
-  if (isLength(length) &&
-      (isArray(object) || isString(object) || isArguments(object))) {
-    return baseTimes(length, String);
-  }
-  return null;
-}
-
-/**
- * Checks if `value` is a valid array-like index.
- *
- * @private
- * @param {*} value The value to check.
- * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
- * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
- */
-function isIndex(value, length) {
-  length = length == null ? MAX_SAFE_INTEGER : length;
-  return !!length &&
-    (typeof value == 'number' || reIsUint.test(value)) &&
-    (value > -1 && value % 1 == 0 && value < length);
-}
-
-/**
- * Checks if `value` is suitable for use as unique object key.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
- */
-function isKeyable(value) {
-  var type = typeof value;
-  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
-    ? (value !== '__proto__')
-    : (value === null);
-}
-
-/**
- * Checks if `value` is likely a prototype object.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
- */
-function isPrototype(value) {
-  var Ctor = value && value.constructor,
-      proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
-
-  return value === proto;
-}
-
-/**
- * Converts `func` to its source code.
- *
- * @private
- * @param {Function} func The function to process.
- * @returns {string} Returns the source code.
- */
-function toSource(func) {
-  if (func != null) {
-    try {
-      return funcToString.call(func);
-    } catch (e) {}
-    try {
-      return (func + '');
-    } catch (e) {}
-  }
-  return '';
-}
-
-/**
- * Performs a
- * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
- * comparison between two values to determine if they are equivalent.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to compare.
- * @param {*} other The other value to compare.
- * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
- * @example
- *
- * var object = { 'user': 'fred' };
- * var other = { 'user': 'fred' };
- *
- * _.eq(object, object);
- * // => true
- *
- * _.eq(object, other);
- * // => false
- *
- * _.eq('a', 'a');
- * // => true
- *
- * _.eq('a', Object('a'));
- * // => false
- *
- * _.eq(NaN, NaN);
- * // => true
- */
-function eq(value, other) {
-  return value === other || (value !== value && other !== other);
-}
-
-/**
- * Checks if `value` is likely an `arguments` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified,
- *  else `false`.
- * @example
- *
- * _.isArguments(function() { return arguments; }());
- * // => true
- *
- * _.isArguments([1, 2, 3]);
- * // => false
- */
-function isArguments(value) {
-  // Safari 8.1 incorrectly makes `arguments.callee` enumerable in strict mode.
-  return isArrayLikeObject(value) && hasOwnProperty.call(value, 'callee') &&
-    (!propertyIsEnumerable.call(value, 'callee') || objectToString.call(value) == argsTag);
-}
-
-/**
- * Checks if `value` is classified as an `Array` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @type {Function}
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified,
- *  else `false`.
- * @example
- *
- * _.isArray([1, 2, 3]);
- * // => true
- *
- * _.isArray(document.body.children);
- * // => false
- *
- * _.isArray('abc');
- * // => false
- *
- * _.isArray(_.noop);
- * // => false
- */
-var isArray = Array.isArray;
-
-/**
- * Checks if `value` is array-like. A value is considered array-like if it's
- * not a function and has a `value.length` that's an integer greater than or
- * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
- * @example
- *
- * _.isArrayLike([1, 2, 3]);
- * // => true
- *
- * _.isArrayLike(document.body.children);
- * // => true
- *
- * _.isArrayLike('abc');
- * // => true
- *
- * _.isArrayLike(_.noop);
- * // => false
- */
-function isArrayLike(value) {
-  return value != null && isLength(getLength(value)) && !isFunction(value);
-}
-
-/**
- * This method is like `_.isArrayLike` except that it also checks if `value`
- * is an object.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an array-like object,
- *  else `false`.
- * @example
- *
- * _.isArrayLikeObject([1, 2, 3]);
- * // => true
- *
- * _.isArrayLikeObject(document.body.children);
- * // => true
- *
- * _.isArrayLikeObject('abc');
- * // => false
- *
- * _.isArrayLikeObject(_.noop);
- * // => false
- */
-function isArrayLikeObject(value) {
-  return isObjectLike(value) && isArrayLike(value);
-}
-
-/**
- * Checks if `value` is a buffer.
- *
- * @static
- * @memberOf _
- * @since 4.3.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
- * @example
- *
- * _.isBuffer(new Buffer(2));
- * // => true
- *
- * _.isBuffer(new Uint8Array(2));
- * // => false
- */
-var isBuffer = !Buffer ? constant(false) : function(value) {
-  return value instanceof Buffer;
-};
-
-/**
- * Checks if `value` is classified as a `Function` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified,
- *  else `false`.
- * @example
- *
- * _.isFunction(_);
- * // => true
- *
- * _.isFunction(/abc/);
- * // => false
- */
-function isFunction(value) {
-  // The use of `Object#toString` avoids issues with the `typeof` operator
-  // in Safari 8 which returns 'object' for typed array and weak map constructors,
-  // and PhantomJS 1.9 which returns 'function' for `NodeList` instances.
-  var tag = isObject(value) ? objectToString.call(value) : '';
-  return tag == funcTag || tag == genTag;
-}
-
-/**
- * Checks if `value` is a valid array-like length.
- *
- * **Note:** This function is loosely based on
- * [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a valid length,
- *  else `false`.
- * @example
- *
- * _.isLength(3);
- * // => true
- *
- * _.isLength(Number.MIN_VALUE);
- * // => false
- *
- * _.isLength(Infinity);
- * // => false
- *
- * _.isLength('3');
- * // => false
- */
-function isLength(value) {
-  return typeof value == 'number' &&
-    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
-}
-
-/**
- * Checks if `value` is the
- * [language type](http://www.ecma-international.org/ecma-262/6.0/#sec-ecmascript-language-types)
- * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an object, else `false`.
- * @example
- *
- * _.isObject({});
- * // => true
- *
- * _.isObject([1, 2, 3]);
- * // => true
- *
- * _.isObject(_.noop);
- * // => true
- *
- * _.isObject(null);
- * // => false
- */
-function isObject(value) {
-  var type = typeof value;
-  return !!value && (type == 'object' || type == 'function');
-}
-
-/**
- * Checks if `value` is object-like. A value is object-like if it's not `null`
- * and has a `typeof` result of "object".
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
- * @example
- *
- * _.isObjectLike({});
- * // => true
- *
- * _.isObjectLike([1, 2, 3]);
- * // => true
- *
- * _.isObjectLike(_.noop);
- * // => false
- *
- * _.isObjectLike(null);
- * // => false
- */
-function isObjectLike(value) {
-  return !!value && typeof value == 'object';
-}
-
-/**
- * Checks if `value` is a native function.
- *
- * @static
- * @memberOf _
- * @since 3.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a native function,
- *  else `false`.
- * @example
- *
- * _.isNative(Array.prototype.push);
- * // => true
- *
- * _.isNative(_);
- * // => false
- */
-function isNative(value) {
-  if (!isObject(value)) {
-    return false;
-  }
-  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;
-  return pattern.test(toSource(value));
-}
-
-/**
- * Checks if `value` is classified as a `String` primitive or object.
- *
- * @static
- * @since 0.1.0
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is correctly classified,
- *  else `false`.
- * @example
- *
- * _.isString('abc');
- * // => true
- *
- * _.isString(1);
- * // => false
- */
-function isString(value) {
-  return typeof value == 'string' ||
-    (!isArray(value) && isObjectLike(value) && objectToString.call(value) == stringTag);
-}
-
-/**
- * Creates an array of the own enumerable property names of `object`.
- *
- * **Note:** Non-object values are coerced to objects. See the
- * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)
- * for more details.
- *
- * @static
- * @since 0.1.0
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.keys(new Foo);
- * // => ['a', 'b'] (iteration order is not guaranteed)
- *
- * _.keys('hi');
- * // => ['0', '1']
- */
-function keys(object) {
-  var isProto = isPrototype(object);
-  if (!(isProto || isArrayLike(object))) {
-    return baseKeys(object);
-  }
-  var indexes = indexKeys(object),
-      skipIndexes = !!indexes,
-      result = indexes || [],
-      length = result.length;
-
-  for (var key in object) {
-    if (baseHas(object, key) &&
-        !(skipIndexes && (key == 'length' || isIndex(key, length))) &&
-        !(isProto && key == 'constructor')) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-
-/**
- * Creates a function that returns `value`.
- *
- * @static
- * @memberOf _
- * @since 2.4.0
- * @category Util
- * @param {*} value The value to return from the new function.
- * @returns {Function} Returns the new constant function.
- * @example
- *
- * var object = { 'user': 'fred' };
- * var getter = _.constant(object);
- *
- * getter() === object;
- * // => true
- */
-function constant(value) {
-  return function() {
-    return value;
-  };
-}
-
-module.exports = baseClone;
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
-
-/***/ }),
-/* 749 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/**
- * lodash 4.3.2 (Custom Build) <https://lodash.com/>
- * Build: `lodash modularize exports="npm" -o ./`
- * Copyright 2012-2016 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright 2009-2016 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- * Available under MIT license <https://lodash.com/license>
- */
-var baseClone = __webpack_require__(748);
-
-/**
- * Creates a shallow clone of `value`.
- *
- * **Note:** This method is loosely based on the
- * [structured clone algorithm](https://mdn.io/Structured_clone_algorithm)
- * and supports cloning arrays, array buffers, booleans, date objects, maps,
- * numbers, `Object` objects, regexes, sets, strings, symbols, and typed
- * arrays. The own enumerable properties of `arguments` objects are cloned
- * as plain objects. An empty object is returned for uncloneable values such
- * as error objects, functions, DOM nodes, and WeakMaps.
- *
- * @static
- * @memberOf _
- * @category Lang
- * @param {*} value The value to clone.
- * @returns {*} Returns the cloned value.
- * @example
- *
- * var objects = [{ 'a': 1 }, { 'b': 2 }];
- *
- * var shallow = _.clone(objects);
- * console.log(shallow[0] === objects[0]);
- * // => true
- */
-function clone(value) {
-  return baseClone(value, false, true);
-}
-
-module.exports = clone;
-
-
-/***/ }),
-/* 750 */
-/***/ (function(module, exports) {
-
-/**
- * lodash (Custom Build) <https://lodash.com/>
- * Build: `lodash modularize exports="npm" -o ./`
- * Copyright jQuery Foundation and other contributors <https://jquery.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-
-/** Used as references for various `Number` constants. */
-var MAX_SAFE_INTEGER = 9007199254740991;
-
-/** `Object#toString` result references. */
-var argsTag = '[object Arguments]',
-    funcTag = '[object Function]',
-    genTag = '[object GeneratorFunction]',
-    mapTag = '[object Map]',
-    objectTag = '[object Object]',
-    promiseTag = '[object Promise]',
-    setTag = '[object Set]',
-    stringTag = '[object String]',
-    weakMapTag = '[object WeakMap]';
-
-var dataViewTag = '[object DataView]';
-
-/**
- * Used to match `RegExp`
- * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
- */
-var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
-
-/** Used to detect host constructors (Safari). */
-var reIsHostCtor = /^\[object .+?Constructor\]$/;
-
-/** Used to detect unsigned integer values. */
-var reIsUint = /^(?:0|[1-9]\d*)$/;
-
-/** Used to compose unicode character classes. */
-var rsAstralRange = '\\ud800-\\udfff',
-    rsComboMarksRange = '\\u0300-\\u036f\\ufe20-\\ufe23',
-    rsComboSymbolsRange = '\\u20d0-\\u20f0',
-    rsVarRange = '\\ufe0e\\ufe0f';
-
-/** Used to compose unicode capture groups. */
-var rsAstral = '[' + rsAstralRange + ']',
-    rsCombo = '[' + rsComboMarksRange + rsComboSymbolsRange + ']',
-    rsFitz = '\\ud83c[\\udffb-\\udfff]',
-    rsModifier = '(?:' + rsCombo + '|' + rsFitz + ')',
-    rsNonAstral = '[^' + rsAstralRange + ']',
-    rsRegional = '(?:\\ud83c[\\udde6-\\uddff]){2}',
-    rsSurrPair = '[\\ud800-\\udbff][\\udc00-\\udfff]',
-    rsZWJ = '\\u200d';
-
-/** Used to compose unicode regexes. */
-var reOptMod = rsModifier + '?',
-    rsOptVar = '[' + rsVarRange + ']?',
-    rsOptJoin = '(?:' + rsZWJ + '(?:' + [rsNonAstral, rsRegional, rsSurrPair].join('|') + ')' + rsOptVar + reOptMod + ')*',
-    rsSeq = rsOptVar + reOptMod + rsOptJoin,
-    rsSymbol = '(?:' + [rsNonAstral + rsCombo + '?', rsCombo, rsRegional, rsSurrPair, rsAstral].join('|') + ')';
-
-/** Used to match [string symbols](https://mathiasbynens.be/notes/javascript-unicode). */
-var reUnicode = RegExp(rsFitz + '(?=' + rsFitz + ')|' + rsSymbol + rsSeq, 'g');
-
-/** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */
-var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange  + rsComboMarksRange + rsComboSymbolsRange + rsVarRange + ']');
-
-/** Detect free variable `global` from Node.js. */
-var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
-
-/** Detect free variable `self`. */
-var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
-
-/** Used as a reference to the global object. */
-var root = freeGlobal || freeSelf || Function('return this')();
-
-/**
- * A specialized version of `_.map` for arrays without support for iteratee
- * shorthands.
- *
- * @private
- * @param {Array} [array] The array to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns the new mapped array.
- */
-function arrayMap(array, iteratee) {
-  var index = -1,
-      length = array ? array.length : 0,
-      result = Array(length);
-
-  while (++index < length) {
-    result[index] = iteratee(array[index], index, array);
-  }
-  return result;
-}
-
-/**
- * Converts an ASCII `string` to an array.
- *
- * @private
- * @param {string} string The string to convert.
- * @returns {Array} Returns the converted array.
- */
-function asciiToArray(string) {
-  return string.split('');
-}
-
-/**
- * The base implementation of `_.times` without support for iteratee shorthands
- * or max array length checks.
- *
- * @private
- * @param {number} n The number of times to invoke `iteratee`.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns the array of results.
- */
-function baseTimes(n, iteratee) {
-  var index = -1,
-      result = Array(n);
-
-  while (++index < n) {
-    result[index] = iteratee(index);
-  }
-  return result;
-}
-
-/**
- * The base implementation of `_.values` and `_.valuesIn` which creates an
- * array of `object` property values corresponding to the property names
- * of `props`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Array} props The property names to get values for.
- * @returns {Object} Returns the array of property values.
- */
-function baseValues(object, props) {
-  return arrayMap(props, function(key) {
-    return object[key];
-  });
-}
-
-/**
- * Gets the value at `key` of `object`.
- *
- * @private
- * @param {Object} [object] The object to query.
- * @param {string} key The key of the property to get.
- * @returns {*} Returns the property value.
- */
-function getValue(object, key) {
-  return object == null ? undefined : object[key];
-}
-
-/**
- * Checks if `string` contains Unicode symbols.
- *
- * @private
- * @param {string} string The string to inspect.
- * @returns {boolean} Returns `true` if a symbol is found, else `false`.
- */
-function hasUnicode(string) {
-  return reHasUnicode.test(string);
-}
-
-/**
- * Checks if `value` is a host object in IE < 9.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a host object, else `false`.
- */
-function isHostObject(value) {
-  // Many host objects are `Object` objects that can coerce to strings
-  // despite having improperly defined `toString` methods.
-  var result = false;
-  if (value != null && typeof value.toString != 'function') {
-    try {
-      result = !!(value + '');
-    } catch (e) {}
-  }
-  return result;
-}
-
-/**
- * Converts `iterator` to an array.
- *
- * @private
- * @param {Object} iterator The iterator to convert.
- * @returns {Array} Returns the converted array.
- */
-function iteratorToArray(iterator) {
-  var data,
-      result = [];
-
-  while (!(data = iterator.next()).done) {
-    result.push(data.value);
-  }
-  return result;
-}
-
-/**
- * Converts `map` to its key-value pairs.
- *
- * @private
- * @param {Object} map The map to convert.
- * @returns {Array} Returns the key-value pairs.
- */
-function mapToArray(map) {
-  var index = -1,
-      result = Array(map.size);
-
-  map.forEach(function(value, key) {
-    result[++index] = [key, value];
-  });
-  return result;
-}
-
-/**
- * Creates a unary function that invokes `func` with its argument transformed.
- *
- * @private
- * @param {Function} func The function to wrap.
- * @param {Function} transform The argument transform.
- * @returns {Function} Returns the new function.
- */
-function overArg(func, transform) {
-  return function(arg) {
-    return func(transform(arg));
-  };
-}
-
-/**
- * Converts `set` to an array of its values.
- *
- * @private
- * @param {Object} set The set to convert.
- * @returns {Array} Returns the values.
- */
-function setToArray(set) {
-  var index = -1,
-      result = Array(set.size);
-
-  set.forEach(function(value) {
-    result[++index] = value;
-  });
-  return result;
-}
-
-/**
- * Converts `string` to an array.
- *
- * @private
- * @param {string} string The string to convert.
- * @returns {Array} Returns the converted array.
- */
-function stringToArray(string) {
-  return hasUnicode(string)
-    ? unicodeToArray(string)
-    : asciiToArray(string);
-}
-
-/**
- * Converts a Unicode `string` to an array.
- *
- * @private
- * @param {string} string The string to convert.
- * @returns {Array} Returns the converted array.
- */
-function unicodeToArray(string) {
-  return string.match(reUnicode) || [];
-}
-
-/** Used for built-in method references. */
-var funcProto = Function.prototype,
-    objectProto = Object.prototype;
-
-/** Used to detect overreaching core-js shims. */
-var coreJsData = root['__core-js_shared__'];
-
-/** Used to detect methods masquerading as native. */
-var maskSrcKey = (function() {
-  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
-  return uid ? ('Symbol(src)_1.' + uid) : '';
-}());
-
-/** Used to resolve the decompiled source of functions. */
-var funcToString = funcProto.toString;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Used to resolve the
- * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
- * of values.
- */
-var objectToString = objectProto.toString;
-
-/** Used to detect if a method is native. */
-var reIsNative = RegExp('^' +
-  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
-  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
-);
-
-/** Built-in value references. */
-var Symbol = root.Symbol,
-    iteratorSymbol = Symbol ? Symbol.iterator : undefined,
-    propertyIsEnumerable = objectProto.propertyIsEnumerable;
-
-/* Built-in method references for those with the same name as other `lodash` methods. */
-var nativeKeys = overArg(Object.keys, Object);
-
-/* Built-in method references that are verified to be native. */
-var DataView = getNative(root, 'DataView'),
-    Map = getNative(root, 'Map'),
-    Promise = getNative(root, 'Promise'),
-    Set = getNative(root, 'Set'),
-    WeakMap = getNative(root, 'WeakMap');
-
-/** Used to detect maps, sets, and weakmaps. */
-var dataViewCtorString = toSource(DataView),
-    mapCtorString = toSource(Map),
-    promiseCtorString = toSource(Promise),
-    setCtorString = toSource(Set),
-    weakMapCtorString = toSource(WeakMap);
-
-/**
- * Creates an array of the enumerable property names of the array-like `value`.
- *
- * @private
- * @param {*} value The value to query.
- * @param {boolean} inherited Specify returning inherited property names.
- * @returns {Array} Returns the array of property names.
- */
-function arrayLikeKeys(value, inherited) {
-  // Safari 8.1 makes `arguments.callee` enumerable in strict mode.
-  // Safari 9 makes `arguments.length` enumerable in strict mode.
-  var result = (isArray(value) || isArguments(value))
-    ? baseTimes(value.length, String)
-    : [];
-
-  var length = result.length,
-      skipIndexes = !!length;
-
-  for (var key in value) {
-    if ((inherited || hasOwnProperty.call(value, key)) &&
-        !(skipIndexes && (key == 'length' || isIndex(key, length)))) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-
-/**
- * The base implementation of `getTag`.
- *
- * @private
- * @param {*} value The value to query.
- * @returns {string} Returns the `toStringTag`.
- */
-function baseGetTag(value) {
-  return objectToString.call(value);
-}
-
-/**
- * The base implementation of `_.isNative` without bad shim checks.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a native function,
- *  else `false`.
- */
-function baseIsNative(value) {
-  if (!isObject(value) || isMasked(value)) {
-    return false;
-  }
-  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;
-  return pattern.test(toSource(value));
-}
-
-/**
- * The base implementation of `_.keys` which doesn't treat sparse arrays as dense.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- */
-function baseKeys(object) {
-  if (!isPrototype(object)) {
-    return nativeKeys(object);
-  }
-  var result = [];
-  for (var key in Object(object)) {
-    if (hasOwnProperty.call(object, key) && key != 'constructor') {
-      result.push(key);
-    }
-  }
-  return result;
-}
-
-/**
- * Copies the values of `source` to `array`.
- *
- * @private
- * @param {Array} source The array to copy values from.
- * @param {Array} [array=[]] The array to copy values to.
- * @returns {Array} Returns `array`.
- */
-function copyArray(source, array) {
-  var index = -1,
-      length = source.length;
-
-  array || (array = Array(length));
-  while (++index < length) {
-    array[index] = source[index];
-  }
-  return array;
-}
-
-/**
- * Gets the native function at `key` of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {string} key The key of the method to get.
- * @returns {*} Returns the function if it's native, else `undefined`.
- */
-function getNative(object, key) {
-  var value = getValue(object, key);
-  return baseIsNative(value) ? value : undefined;
-}
-
-/**
- * Gets the `toStringTag` of `value`.
- *
- * @private
- * @param {*} value The value to query.
- * @returns {string} Returns the `toStringTag`.
- */
-var getTag = baseGetTag;
-
-// Fallback for data views, maps, sets, and weak maps in IE 11,
-// for data views in Edge < 14, and promises in Node.js.
-if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
-    (Map && getTag(new Map) != mapTag) ||
-    (Promise && getTag(Promise.resolve()) != promiseTag) ||
-    (Set && getTag(new Set) != setTag) ||
-    (WeakMap && getTag(new WeakMap) != weakMapTag)) {
-  getTag = function(value) {
-    var result = objectToString.call(value),
-        Ctor = result == objectTag ? value.constructor : undefined,
-        ctorString = Ctor ? toSource(Ctor) : undefined;
-
-    if (ctorString) {
-      switch (ctorString) {
-        case dataViewCtorString: return dataViewTag;
-        case mapCtorString: return mapTag;
-        case promiseCtorString: return promiseTag;
-        case setCtorString: return setTag;
-        case weakMapCtorString: return weakMapTag;
-      }
-    }
-    return result;
-  };
-}
-
-/**
- * Checks if `value` is a valid array-like index.
- *
- * @private
- * @param {*} value The value to check.
- * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
- * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
- */
-function isIndex(value, length) {
-  length = length == null ? MAX_SAFE_INTEGER : length;
-  return !!length &&
-    (typeof value == 'number' || reIsUint.test(value)) &&
-    (value > -1 && value % 1 == 0 && value < length);
-}
-
-/**
- * Checks if `func` has its source masked.
- *
- * @private
- * @param {Function} func The function to check.
- * @returns {boolean} Returns `true` if `func` is masked, else `false`.
- */
-function isMasked(func) {
-  return !!maskSrcKey && (maskSrcKey in func);
-}
-
-/**
- * Checks if `value` is likely a prototype object.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
- */
-function isPrototype(value) {
-  var Ctor = value && value.constructor,
-      proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
-
-  return value === proto;
-}
-
-/**
- * Converts `func` to its source code.
- *
- * @private
- * @param {Function} func The function to process.
- * @returns {string} Returns the source code.
- */
-function toSource(func) {
-  if (func != null) {
-    try {
-      return funcToString.call(func);
-    } catch (e) {}
-    try {
-      return (func + '');
-    } catch (e) {}
-  }
-  return '';
-}
-
-/**
- * Checks if `value` is likely an `arguments` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an `arguments` object,
- *  else `false`.
- * @example
- *
- * _.isArguments(function() { return arguments; }());
- * // => true
- *
- * _.isArguments([1, 2, 3]);
- * // => false
- */
-function isArguments(value) {
-  // Safari 8.1 makes `arguments.callee` enumerable in strict mode.
-  return isArrayLikeObject(value) && hasOwnProperty.call(value, 'callee') &&
-    (!propertyIsEnumerable.call(value, 'callee') || objectToString.call(value) == argsTag);
-}
-
-/**
- * Checks if `value` is classified as an `Array` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an array, else `false`.
- * @example
- *
- * _.isArray([1, 2, 3]);
- * // => true
- *
- * _.isArray(document.body.children);
- * // => false
- *
- * _.isArray('abc');
- * // => false
- *
- * _.isArray(_.noop);
- * // => false
- */
-var isArray = Array.isArray;
-
-/**
- * Checks if `value` is array-like. A value is considered array-like if it's
- * not a function and has a `value.length` that's an integer greater than or
- * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
- * @example
- *
- * _.isArrayLike([1, 2, 3]);
- * // => true
- *
- * _.isArrayLike(document.body.children);
- * // => true
- *
- * _.isArrayLike('abc');
- * // => true
- *
- * _.isArrayLike(_.noop);
- * // => false
- */
-function isArrayLike(value) {
-  return value != null && isLength(value.length) && !isFunction(value);
-}
-
-/**
- * This method is like `_.isArrayLike` except that it also checks if `value`
- * is an object.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an array-like object,
- *  else `false`.
- * @example
- *
- * _.isArrayLikeObject([1, 2, 3]);
- * // => true
- *
- * _.isArrayLikeObject(document.body.children);
- * // => true
- *
- * _.isArrayLikeObject('abc');
- * // => false
- *
- * _.isArrayLikeObject(_.noop);
- * // => false
- */
-function isArrayLikeObject(value) {
-  return isObjectLike(value) && isArrayLike(value);
-}
-
-/**
- * Checks if `value` is classified as a `Function` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a function, else `false`.
- * @example
- *
- * _.isFunction(_);
- * // => true
- *
- * _.isFunction(/abc/);
- * // => false
- */
-function isFunction(value) {
-  // The use of `Object#toString` avoids issues with the `typeof` operator
-  // in Safari 8-9 which returns 'object' for typed array and other constructors.
-  var tag = isObject(value) ? objectToString.call(value) : '';
-  return tag == funcTag || tag == genTag;
-}
-
-/**
- * Checks if `value` is a valid array-like length.
- *
- * **Note:** This method is loosely based on
- * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
- * @example
- *
- * _.isLength(3);
- * // => true
- *
- * _.isLength(Number.MIN_VALUE);
- * // => false
- *
- * _.isLength(Infinity);
- * // => false
- *
- * _.isLength('3');
- * // => false
- */
-function isLength(value) {
-  return typeof value == 'number' &&
-    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
-}
-
-/**
- * Checks if `value` is the
- * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
- * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an object, else `false`.
- * @example
- *
- * _.isObject({});
- * // => true
- *
- * _.isObject([1, 2, 3]);
- * // => true
- *
- * _.isObject(_.noop);
- * // => true
- *
- * _.isObject(null);
- * // => false
- */
-function isObject(value) {
-  var type = typeof value;
-  return !!value && (type == 'object' || type == 'function');
-}
-
-/**
- * Checks if `value` is object-like. A value is object-like if it's not `null`
- * and has a `typeof` result of "object".
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
- * @example
- *
- * _.isObjectLike({});
- * // => true
- *
- * _.isObjectLike([1, 2, 3]);
- * // => true
- *
- * _.isObjectLike(_.noop);
- * // => false
- *
- * _.isObjectLike(null);
- * // => false
- */
-function isObjectLike(value) {
-  return !!value && typeof value == 'object';
-}
-
-/**
- * Checks if `value` is classified as a `String` primitive or object.
- *
- * @static
- * @since 0.1.0
- * @memberOf _
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a string, else `false`.
- * @example
- *
- * _.isString('abc');
- * // => true
- *
- * _.isString(1);
- * // => false
- */
-function isString(value) {
-  return typeof value == 'string' ||
-    (!isArray(value) && isObjectLike(value) && objectToString.call(value) == stringTag);
-}
-
-/**
- * Converts `value` to an array.
- *
- * @static
- * @since 0.1.0
- * @memberOf _
- * @category Lang
- * @param {*} value The value to convert.
- * @returns {Array} Returns the converted array.
- * @example
- *
- * _.toArray({ 'a': 1, 'b': 2 });
- * // => [1, 2]
- *
- * _.toArray('abc');
- * // => ['a', 'b', 'c']
- *
- * _.toArray(1);
- * // => []
- *
- * _.toArray(null);
- * // => []
- */
-function toArray(value) {
-  if (!value) {
-    return [];
-  }
-  if (isArrayLike(value)) {
-    return isString(value) ? stringToArray(value) : copyArray(value);
-  }
-  if (iteratorSymbol && value[iteratorSymbol]) {
-    return iteratorToArray(value[iteratorSymbol]());
-  }
-  var tag = getTag(value),
-      func = tag == mapTag ? mapToArray : (tag == setTag ? setToArray : values);
-
-  return func(value);
-}
-
-/**
- * Creates an array of the own enumerable property names of `object`.
- *
- * **Note:** Non-object values are coerced to objects. See the
- * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
- * for more details.
- *
- * @static
- * @since 0.1.0
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property names.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.keys(new Foo);
- * // => ['a', 'b'] (iteration order is not guaranteed)
- *
- * _.keys('hi');
- * // => ['0', '1']
- */
-function keys(object) {
-  return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
-}
-
-/**
- * Creates an array of the own enumerable string keyed property values of `object`.
- *
- * **Note:** Non-object values are coerced to objects.
- *
- * @static
- * @since 0.1.0
- * @memberOf _
- * @category Object
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of property values.
- * @example
- *
- * function Foo() {
- *   this.a = 1;
- *   this.b = 2;
- * }
- *
- * Foo.prototype.c = 3;
- *
- * _.values(new Foo);
- * // => [1, 2] (iteration order is not guaranteed)
- *
- * _.values('hi');
- * // => ['h', 'i']
- */
-function values(object) {
-  return object ? baseValues(object, keys(object)) : [];
-}
-
-module.exports = toArray;
-
-
-/***/ }),
-/* 751 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var crypto = __webpack_require__(12)
-var max = Math.pow(2, 32)
-
-module.exports = random
-module.exports.cryptographic = true
-
-function random () {
-  var buf = crypto
-    .randomBytes(4)
-    .toString('hex')
-
-  return parseInt(buf, 16) / max
-}
-
-
-/***/ }),
-/* 752 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var chars = {}, unesc, temp;
-
-function reverse(object, prepender) {
-  return Object.keys(object).reduce(function(reversed, key) {
-    var newKey = prepender ? prepender + key : key; // Optionally prepend a string to key.
-    reversed[object[key]] = newKey; // Swap key and value.
-    return reversed; // Return the result.
-  }, {});
-}
-
-/**
- * Regex for common characters
- */
-
-chars.escapeRegex = {
-  '?': /\?/g,
-  '@': /\@/g,
-  '!': /\!/g,
-  '+': /\+/g,
-  '*': /\*/g,
-  '(': /\(/g,
-  ')': /\)/g,
-  '[': /\[/g,
-  ']': /\]/g
-};
-
-/**
- * Escape characters
- */
-
-chars.ESC = {
-  '?': '__UNESC_QMRK__',
-  '@': '__UNESC_AMPE__',
-  '!': '__UNESC_EXCL__',
-  '+': '__UNESC_PLUS__',
-  '*': '__UNESC_STAR__',
-  ',': '__UNESC_COMMA__',
-  '(': '__UNESC_LTPAREN__',
-  ')': '__UNESC_RTPAREN__',
-  '[': '__UNESC_LTBRACK__',
-  ']': '__UNESC_RTBRACK__'
-};
-
-/**
- * Unescape characters
- */
-
-chars.UNESC = unesc || (unesc = reverse(chars.ESC, '\\'));
-
-chars.ESC_TEMP = {
-  '?': '__TEMP_QMRK__',
-  '@': '__TEMP_AMPE__',
-  '!': '__TEMP_EXCL__',
-  '*': '__TEMP_STAR__',
-  '+': '__TEMP_PLUS__',
-  ',': '__TEMP_COMMA__',
-  '(': '__TEMP_LTPAREN__',
-  ')': '__TEMP_RTPAREN__',
-  '[': '__TEMP_LTBRACK__',
-  ']': '__TEMP_RTBRACK__'
-};
-
-chars.TEMP = temp || (temp = reverse(chars.ESC_TEMP));
-
-module.exports = chars;
-
-
-/***/ }),
-/* 753 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * micromatch <https://github.com/jonschlinkert/micromatch>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var utils = __webpack_require__(300);
-var Glob = __webpack_require__(754);
-
-/**
- * Expose `expand`
- */
-
-module.exports = expand;
-
-/**
- * Expand a glob pattern to resolve braces and
- * similar patterns before converting to regex.
- *
- * @param  {String|Array} `pattern`
- * @param  {Array} `files`
- * @param  {Options} `opts`
- * @return {Array}
- */
-
-function expand(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('micromatch.expand(): argument should be a string.');
-  }
-
-  var glob = new Glob(pattern, options || {});
-  var opts = glob.options;
-
-  if (!utils.isGlob(pattern)) {
-    glob.pattern = glob.pattern.replace(/([\/.])/g, '\\$1');
-    return glob;
-  }
-
-  glob.pattern = glob.pattern.replace(/(\+)(?!\()/g, '\\$1');
-  glob.pattern = glob.pattern.split('$').join('\\$');
-
-  if (typeof opts.braces !== 'boolean' && typeof opts.nobraces !== 'boolean') {
-    opts.braces = true;
-  }
-
-  if (glob.pattern === '.*') {
-    return {
-      pattern: '\\.' + star,
-      tokens: tok,
-      options: opts
-    };
-  }
-
-  if (glob.pattern === '*') {
-    return {
-      pattern: oneStar(opts.dot),
-      tokens: tok,
-      options: opts
-    };
-  }
-
-  // parse the glob pattern into tokens
-  glob.parse();
-  var tok = glob.tokens;
-  tok.is.negated = opts.negated;
-
-  // dotfile handling
-  if ((opts.dotfiles === true || tok.is.dotfile) && opts.dot !== false) {
-    opts.dotfiles = true;
-    opts.dot = true;
-  }
-
-  if ((opts.dotdirs === true || tok.is.dotdir) && opts.dot !== false) {
-    opts.dotdirs = true;
-    opts.dot = true;
-  }
-
-  // check for braces with a dotfile pattern
-  if (/[{,]\./.test(glob.pattern)) {
-    opts.makeRe = false;
-    opts.dot = true;
-  }
-
-  if (opts.nonegate !== true) {
-    opts.negated = glob.negated;
-  }
-
-  // if the leading character is a dot or a slash, escape it
-  if (glob.pattern.charAt(0) === '.' && glob.pattern.charAt(1) !== '/') {
-    glob.pattern = '\\' + glob.pattern;
-  }
-
-  /**
-   * Extended globs
-   */
-
-  // expand braces, e.g `{1..5}`
-  glob.track('before braces');
-  if (tok.is.braces) {
-    glob.braces();
-  }
-  glob.track('after braces');
-
-  // expand extglobs, e.g `foo/!(a|b)`
-  glob.track('before extglob');
-  if (tok.is.extglob) {
-    glob.extglob();
-  }
-  glob.track('after extglob');
-
-  // expand brackets, e.g `[[:alpha:]]`
-  glob.track('before brackets');
-  if (tok.is.brackets) {
-    glob.brackets();
-  }
-  glob.track('after brackets');
-
-  // special patterns
-  glob._replace('[!', '[^');
-  glob._replace('(?', '(%~');
-  glob._replace(/\[\]/, '\\[\\]');
-  glob._replace('/[', '/' + (opts.dot ? dotfiles : nodot) + '[', true);
-  glob._replace('/?', '/' + (opts.dot ? dotfiles : nodot) + '[^/]', true);
-  glob._replace('/.', '/(?=.)\\.', true);
-
-  // windows drives
-  glob._replace(/^(\w):([\\\/]+?)/gi, '(?=.)$1:$2', true);
-
-  // negate slashes in exclusion ranges
-  if (glob.pattern.indexOf('[^') !== -1) {
-    glob.pattern = negateSlash(glob.pattern);
-  }
-
-  if (opts.globstar !== false && glob.pattern === '**') {
-    glob.pattern = globstar(opts.dot);
-
-  } else {
-    glob.pattern = balance(glob.pattern, '[', ']');
-    glob.escape(glob.pattern);
-
-    // if the pattern has `**`
-    if (tok.is.globstar) {
-      glob.pattern = collapse(glob.pattern, '/**');
-      glob.pattern = collapse(glob.pattern, '**/');
-      glob._replace('/**/', '(?:/' + globstar(opts.dot) + '/|/)', true);
-      glob._replace(/\*{2,}/g, '**');
-
-      // 'foo/*'
-      glob._replace(/(\w+)\*(?!\/)/g, '$1[^/]*?', true);
-      glob._replace(/\*\*\/\*(\w)/g, globstar(opts.dot) + '\\/' + (opts.dot ? dotfiles : nodot) + '[^/]*?$1', true);
-
-      if (opts.dot !== true) {
-        glob._replace(/\*\*\/(.)/g, '(?:**\\/|)$1');
-      }
-
-      // 'foo/**' or '{**,*}', but not 'foo**'
-      if (tok.path.dirname !== '' || /,\*\*|\*\*,/.test(glob.orig)) {
-        glob._replace('**', globstar(opts.dot), true);
-      }
-    }
-
-    // ends with /*
-    glob._replace(/\/\*$/, '\\/' + oneStar(opts.dot), true);
-    // ends with *, no slashes
-    glob._replace(/(?!\/)\*$/, star, true);
-    // has 'n*.' (partial wildcard w/ file extension)
-    glob._replace(/([^\/]+)\*/, '$1' + oneStar(true), true);
-    // has '*'
-    glob._replace('*', oneStar(opts.dot), true);
-    glob._replace('?.', '?\\.', true);
-    glob._replace('?:', '?:', true);
-
-    glob._replace(/\?+/g, function(match) {
-      var len = match.length;
-      if (len === 1) {
-        return qmark;
-      }
-      return qmark + '{' + len + '}';
-    });
-
-    // escape '.abc' => '\\.abc'
-    glob._replace(/\.([*\w]+)/g, '\\.$1');
-    // fix '[^\\\\/]'
-    glob._replace(/\[\^[\\\/]+\]/g, qmark);
-    // '///' => '\/'
-    glob._replace(/\/+/g, '\\/');
-    // '\\\\\\' => '\\'
-    glob._replace(/\\{2,}/g, '\\');
-  }
-
-  // unescape previously escaped patterns
-  glob.unescape(glob.pattern);
-  glob._replace('__UNESC_STAR__', '*');
-
-  // escape dots that follow qmarks
-  glob._replace('?.', '?\\.');
-
-  // remove unnecessary slashes in character classes
-  glob._replace('[^\\/]', qmark);
-
-  if (glob.pattern.length > 1) {
-    if (/^[\[?*]/.test(glob.pattern)) {
-      // only prepend the string if we don't want to match dotfiles
-      glob.pattern = (opts.dot ? dotfiles : nodot) + glob.pattern;
-    }
-  }
-
-  return glob;
-}
-
-/**
- * Collapse repeated character sequences.
- *
- * ```js
- * collapse('a/../../../b', '../');
- * //=> 'a/../b'
- * ```
- *
- * @param  {String} `str`
- * @param  {String} `ch` Character sequence to collapse
- * @return {String}
- */
-
-function collapse(str, ch) {
-  var res = str.split(ch);
-  var isFirst = res[0] === '';
-  var isLast = res[res.length - 1] === '';
-  res = res.filter(Boolean);
-  if (isFirst) res.unshift('');
-  if (isLast) res.push('');
-  return res.join(ch);
-}
-
-/**
- * Negate slashes in exclusion ranges, per glob spec:
- *
- * ```js
- * negateSlash('[^foo]');
- * //=> '[^\\/foo]'
- * ```
- *
- * @param  {String} `str` glob pattern
- * @return {String}
- */
-
-function negateSlash(str) {
-  return str.replace(/\[\^([^\]]*?)\]/g, function(match, inner) {
-    if (inner.indexOf('/') === -1) {
-      inner = '\\/' + inner;
-    }
-    return '[^' + inner + ']';
-  });
-}
-
-/**
- * Escape imbalanced braces/bracket. This is a very
- * basic, naive implementation that only does enough
- * to serve the purpose.
- */
-
-function balance(str, a, b) {
-  var aarr = str.split(a);
-  var alen = aarr.join('').length;
-  var blen = str.split(b).join('').length;
-
-  if (alen !== blen) {
-    str = aarr.join('\\' + a);
-    return str.split(b).join('\\' + b);
-  }
-  return str;
-}
-
-/**
- * Special patterns to be converted to regex.
- * Heuristics are used to simplify patterns
- * and speed up processing.
- */
-
-/* eslint no-multi-spaces: 0 */
-var qmark       = '[^/]';
-var star        = qmark + '*?';
-var nodot       = '(?!\\.)(?=.)';
-var dotfileGlob = '(?:\\/|^)\\.{1,2}($|\\/)';
-var dotfiles    = '(?!' + dotfileGlob + ')(?=.)';
-var twoStarDot  = '(?:(?!' + dotfileGlob + ').)*?';
-
-/**
- * Create a regex for `*`.
- *
- * If `dot` is true, or the pattern does not begin with
- * a leading star, then return the simpler regex.
- */
-
-function oneStar(dotfile) {
-  return dotfile ? '(?!' + dotfileGlob + ')(?=.)' + star : (nodot + star);
-}
-
-function globstar(dotfile) {
-  if (dotfile) { return twoStarDot; }
-  return '(?:(?!(?:\\/|^)\\.).)*?';
-}
-
-
-/***/ }),
-/* 754 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var chars = __webpack_require__(752);
-var utils = __webpack_require__(300);
-
-/**
- * Expose `Glob`
- */
-
-var Glob = module.exports = function Glob(pattern, options) {
-  if (!(this instanceof Glob)) {
-    return new Glob(pattern, options);
-  }
-  this.options = options || {};
-  this.pattern = pattern;
-  this.history = [];
-  this.tokens = {};
-  this.init(pattern);
-};
-
-/**
- * Initialize defaults
- */
-
-Glob.prototype.init = function(pattern) {
-  this.orig = pattern;
-  this.negated = this.isNegated();
-  this.options.track = this.options.track || false;
-  this.options.makeRe = true;
-};
-
-/**
- * Push a change into `glob.history`. Useful
- * for debugging.
- */
-
-Glob.prototype.track = function(msg) {
-  if (this.options.track) {
-    this.history.push({msg: msg, pattern: this.pattern});
-  }
-};
-
-/**
- * Return true if `glob.pattern` was negated
- * with `!`, also remove the `!` from the pattern.
- *
- * @return {Boolean}
- */
-
-Glob.prototype.isNegated = function() {
-  if (this.pattern.charCodeAt(0) === 33 /* '!' */) {
-    this.pattern = this.pattern.slice(1);
-    return true;
-  }
-  return false;
-};
-
-/**
- * Expand braces in the given glob pattern.
- *
- * We only need to use the [braces] lib when
- * patterns are nested.
- */
-
-Glob.prototype.braces = function() {
-  if (this.options.nobraces !== true && this.options.nobrace !== true) {
-    // naive/fast check for imbalanced characters
-    var a = this.pattern.match(/[\{\(\[]/g);
-    var b = this.pattern.match(/[\}\)\]]/g);
-
-    // if imbalanced, don't optimize the pattern
-    if (a && b && (a.length !== b.length)) {
-      this.options.makeRe = false;
-    }
-
-    // expand brace patterns and join the resulting array
-    var expanded = utils.braces(this.pattern, this.options);
-    this.pattern = expanded.join('|');
-  }
-};
-
-/**
- * Expand bracket expressions in `glob.pattern`
- */
-
-Glob.prototype.brackets = function() {
-  if (this.options.nobrackets !== true) {
-    this.pattern = utils.brackets(this.pattern);
-  }
-};
-
-/**
- * Expand bracket expressions in `glob.pattern`
- */
-
-Glob.prototype.extglob = function() {
-  if (this.options.noextglob === true) return;
-
-  if (utils.isExtglob(this.pattern)) {
-    this.pattern = utils.extglob(this.pattern, {escape: true});
-  }
-};
-
-/**
- * Parse the given pattern
- */
-
-Glob.prototype.parse = function(pattern) {
-  this.tokens = utils.parseGlob(pattern || this.pattern, true);
-  return this.tokens;
-};
-
-/**
- * Replace `a` with `b`. Also tracks the change before and
- * after each replacement. This is disabled by default, but
- * can be enabled by setting `options.track` to true.
- *
- * Also, when the pattern is a string, `.split()` is used,
- * because it's much faster than replace.
- *
- * @param  {RegExp|String} `a`
- * @param  {String} `b`
- * @param  {Boolean} `escape` When `true`, escapes `*` and `?` in the replacement.
- * @return {String}
- */
-
-Glob.prototype._replace = function(a, b, escape) {
-  this.track('before (find): "' + a + '" (replace with): "' + b + '"');
-  if (escape) b = esc(b);
-  if (a && b && typeof a === 'string') {
-    this.pattern = this.pattern.split(a).join(b);
-  } else {
-    this.pattern = this.pattern.replace(a, b);
-  }
-  this.track('after');
-};
-
-/**
- * Escape special characters in the given string.
- *
- * @param  {String} `str` Glob pattern
- * @return {String}
- */
-
-Glob.prototype.escape = function(str) {
-  this.track('before escape: ');
-  var re = /["\\](['"]?[^"'\\]['"]?)/g;
-
-  this.pattern = str.replace(re, function($0, $1) {
-    var o = chars.ESC;
-    var ch = o && o[$1];
-    if (ch) {
-      return ch;
-    }
-    if (/[a-z]/i.test($0)) {
-      return $0.split('\\').join('');
-    }
-    return $0;
-  });
-
-  this.track('after escape: ');
-};
-
-/**
- * Unescape special characters in the given string.
- *
- * @param  {String} `str`
- * @return {String}
- */
-
-Glob.prototype.unescape = function(str) {
-  var re = /__([A-Z]+)_([A-Z]+)__/g;
-  this.pattern = str.replace(re, function($0, $1) {
-    return chars[$1][$0];
-  });
-  this.pattern = unesc(this.pattern);
-};
-
-/**
- * Escape/unescape utils
- */
-
-function esc(str) {
-  str = str.split('?').join('%~');
-  str = str.split('*').join('%%');
-  return str;
-}
-
-function unesc(str) {
-  str = str.split('%~').join('?');
-  str = str.split('%%').join('*');
-  return str;
-}
-
-
-/***/ }),
-/* 755 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * arr-diff <https://github.com/jonschlinkert/arr-diff>
- *
- * Copyright (c) 2014 Jon Schlinkert, contributors.
- * Licensed under the MIT License
- */
-
-
-
-var flatten = __webpack_require__(510);
-var slice = [].slice;
-
-/**
- * Return the difference between the first array and
- * additional arrays.
- *
- * ```js
- * var diff = require('{%= name %}');
- *
- * var a = ['a', 'b', 'c', 'd'];
- * var b = ['b', 'c'];
- *
- * console.log(diff(a, b))
- * //=> ['a', 'd']
- * ```
- *
- * @param  {Array} `a`
- * @param  {Array} `b`
- * @return {Array}
- * @api public
- */
-
-function diff(arr, arrays) {
-  var argsLen = arguments.length;
-  var len = arr.length, i = -1;
-  var res = [], arrays;
-
-  if (argsLen === 1) {
-    return arr;
-  }
-
-  if (argsLen > 2) {
-    arrays = flatten(slice.call(arguments, 1));
-  }
-
-  while (++i < len) {
-    if (!~arrays.indexOf(arr[i])) {
-      res.push(arr[i]);
-    }
-  }
-  return res;
-}
-
-/**
- * Expose `diff`
- */
-
-module.exports = diff;
-
-
-/***/ }),
-/* 756 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * array-unique <https://github.com/jonschlinkert/array-unique>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-module.exports = function unique(arr) {
-  if (!Array.isArray(arr)) {
-    throw new TypeError('array-unique expects an array.');
-  }
-
-  var len = arr.length;
-  var i = -1;
-
-  while (i++ < len) {
-    var j = i + 1;
-
-    for (; j < arr.length; ++j) {
-      if (arr[i] === arr[j]) {
-        arr.splice(j--, 1);
-      }
-    }
-  }
-  return arr;
-};
-
-
-/***/ }),
-/* 757 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * braces <https://github.com/jonschlinkert/braces>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT license.
- */
-
-
-
-/**
- * Module dependencies
- */
-
-var expand = __webpack_require__(640);
-var repeat = __webpack_require__(411);
-var tokens = __webpack_require__(778);
-
-/**
- * Expose `braces`
- */
-
-module.exports = function(str, options) {
-  if (typeof str !== 'string') {
-    throw new Error('braces expects a string');
-  }
-  return braces(str, options);
-};
-
-/**
- * Expand `{foo,bar}` or `{1..5}` braces in the
- * given `string`.
- *
- * @param  {String} `str`
- * @param  {Array} `arr`
- * @param  {Object} `options`
- * @return {Array}
- */
-
-function braces(str, arr, options) {
-  if (str === '') {
-    return [];
-  }
-
-  if (!Array.isArray(arr)) {
-    options = arr;
-    arr = [];
-  }
-
-  var opts = options || {};
-  arr = arr || [];
-
-  if (typeof opts.nodupes === 'undefined') {
-    opts.nodupes = true;
-  }
-
-  var fn = opts.fn;
-  var es6;
-
-  if (typeof opts === 'function') {
-    fn = opts;
-    opts = {};
-  }
-
-  if (!(patternRe instanceof RegExp)) {
-    patternRe = patternRegex();
-  }
-
-  var matches = str.match(patternRe) || [];
-  var m = matches[0];
-
-  switch(m) {
-    case '\\,':
-      return escapeCommas(str, arr, opts);
-    case '\\.':
-      return escapeDots(str, arr, opts);
-    case '\/.':
-      return escapePaths(str, arr, opts);
-    case ' ':
-      return splitWhitespace(str);
-    case '{,}':
-      return exponential(str, opts, braces);
-    case '{}':
-      return emptyBraces(str, arr, opts);
-    case '\\{':
-    case '\\}':
-      return escapeBraces(str, arr, opts);
-    case '${':
-      if (!/\{[^{]+\{/.test(str)) {
-        return arr.concat(str);
-      } else {
-        es6 = true;
-        str = tokens.before(str, es6Regex());
-      }
-  }
-
-  if (!(braceRe instanceof RegExp)) {
-    braceRe = braceRegex();
-  }
-
-  var match = braceRe.exec(str);
-  if (match == null) {
-    return [str];
-  }
-
-  var outter = match[1];
-  var inner = match[2];
-  if (inner === '') { return [str]; }
-
-  var segs, segsLength;
-
-  if (inner.indexOf('..') !== -1) {
-    segs = expand(inner, opts, fn) || inner.split(',');
-    segsLength = segs.length;
-
-  } else if (inner[0] === '"' || inner[0] === '\'') {
-    return arr.concat(str.split(/['"]/).join(''));
-
-  } else {
-    segs = inner.split(',');
-    if (opts.makeRe) {
-      return braces(str.replace(outter, wrap(segs, '|')), opts);
-    }
-
-    segsLength = segs.length;
-    if (segsLength === 1 && opts.bash) {
-      segs[0] = wrap(segs[0], '\\');
-    }
-  }
-
-  var len = segs.length;
-  var i = 0, val;
-
-  while (len--) {
-    var path = segs[i++];
-
-    if (/(\.[^.\/])/.test(path)) {
-      if (segsLength > 1) {
-        return segs;
-      } else {
-        return [str];
-      }
-    }
-
-    val = splice(str, outter, path);
-
-    if (/\{[^{}]+?\}/.test(val)) {
-      arr = braces(val, arr, opts);
-    } else if (val !== '') {
-      if (opts.nodupes && arr.indexOf(val) !== -1) { continue; }
-      arr.push(es6 ? tokens.after(val) : val);
-    }
-  }
-
-  if (opts.strict) { return filter(arr, filterEmpty); }
-  return arr;
-}
-
-/**
- * Expand exponential ranges
- *
- *   `a{,}{,}` => ['a', 'a', 'a', 'a']
- */
-
-function exponential(str, options, fn) {
-  if (typeof options === 'function') {
-    fn = options;
-    options = null;
-  }
-
-  var opts = options || {};
-  var esc = '__ESC_EXP__';
-  var exp = 0;
-  var res;
-
-  var parts = str.split('{,}');
-  if (opts.nodupes) {
-    return fn(parts.join(''), opts);
-  }
-
-  exp = parts.length - 1;
-  res = fn(parts.join(esc), opts);
-  var len = res.length;
-  var arr = [];
-  var i = 0;
-
-  while (len--) {
-    var ele = res[i++];
-    var idx = ele.indexOf(esc);
-
-    if (idx === -1) {
-      arr.push(ele);
-
-    } else {
-      ele = ele.split('__ESC_EXP__').join('');
-      if (!!ele && opts.nodupes !== false) {
-        arr.push(ele);
-
-      } else {
-        var num = Math.pow(2, exp);
-        arr.push.apply(arr, repeat(ele, num));
-      }
-    }
-  }
-  return arr;
-}
-
-/**
- * Wrap a value with parens, brackets or braces,
- * based on the given character/separator.
- *
- * @param  {String|Array} `val`
- * @param  {String} `ch`
- * @return {String}
- */
-
-function wrap(val, ch) {
-  if (ch === '|') {
-    return '(' + val.join(ch) + ')';
-  }
-  if (ch === ',') {
-    return '{' + val.join(ch) + '}';
-  }
-  if (ch === '-') {
-    return '[' + val.join(ch) + ']';
-  }
-  if (ch === '\\') {
-    return '\\{' + val + '\\}';
-  }
-}
-
-/**
- * Handle empty braces: `{}`
- */
-
-function emptyBraces(str, arr, opts) {
-  return braces(str.split('{}').join('\\{\\}'), arr, opts);
-}
-
-/**
- * Filter out empty-ish values
- */
-
-function filterEmpty(ele) {
-  return !!ele && ele !== '\\';
-}
-
-/**
- * Handle patterns with whitespace
- */
-
-function splitWhitespace(str) {
-  var segs = str.split(' ');
-  var len = segs.length;
-  var res = [];
-  var i = 0;
-
-  while (len--) {
-    res.push.apply(res, braces(segs[i++]));
-  }
-  return res;
-}
-
-/**
- * Handle escaped braces: `\\{foo,bar}`
- */
-
-function escapeBraces(str, arr, opts) {
-  if (!/\{[^{]+\{/.test(str)) {
-    return arr.concat(str.split('\\').join(''));
-  } else {
-    str = str.split('\\{').join('__LT_BRACE__');
-    str = str.split('\\}').join('__RT_BRACE__');
-    return map(braces(str, arr, opts), function(ele) {
-      ele = ele.split('__LT_BRACE__').join('{');
-      return ele.split('__RT_BRACE__').join('}');
-    });
-  }
-}
-
-/**
- * Handle escaped dots: `{1\\.2}`
- */
-
-function escapeDots(str, arr, opts) {
-  if (!/[^\\]\..+\\\./.test(str)) {
-    return arr.concat(str.split('\\').join(''));
-  } else {
-    str = str.split('\\.').join('__ESC_DOT__');
-    return map(braces(str, arr, opts), function(ele) {
-      return ele.split('__ESC_DOT__').join('.');
-    });
-  }
-}
-
-/**
- * Handle escaped dots: `{1\\.2}`
- */
-
-function escapePaths(str, arr, opts) {
-  str = str.split('\/.').join('__ESC_PATH__');
-  return map(braces(str, arr, opts), function(ele) {
-    return ele.split('__ESC_PATH__').join('\/.');
-  });
-}
-
-/**
- * Handle escaped commas: `{a\\,b}`
- */
-
-function escapeCommas(str, arr, opts) {
-  if (!/\w,/.test(str)) {
-    return arr.concat(str.split('\\').join(''));
-  } else {
-    str = str.split('\\,').join('__ESC_COMMA__');
-    return map(braces(str, arr, opts), function(ele) {
-      return ele.split('__ESC_COMMA__').join(',');
-    });
-  }
-}
-
-/**
- * Regex for common patterns
- */
-
-function patternRegex() {
-  return /\${|( (?=[{,}])|(?=[{,}]) )|{}|{,}|\\,(?=.*[{}])|\/\.(?=.*[{}])|\\\.(?={)|\\{|\\}/;
-}
-
-/**
- * Braces regex.
- */
-
-function braceRegex() {
-  return /.*(\\?\{([^}]+)\})/;
-}
-
-/**
- * es6 delimiter regex.
- */
-
-function es6Regex() {
-  return /\$\{([^}]+)\}/;
-}
-
-var braceRe;
-var patternRe;
-
-/**
- * Faster alternative to `String.replace()` when the
- * index of the token to be replaces can't be supplied
- */
-
-function splice(str, token, replacement) {
-  var i = str.indexOf(token);
-  return str.substr(0, i) + replacement
-    + str.substr(i + token.length);
-}
-
-/**
- * Fast array map
- */
-
-function map(arr, fn) {
-  if (arr == null) {
-    return [];
-  }
-
-  var len = arr.length;
-  var res = new Array(len);
-  var i = -1;
-
-  while (++i < len) {
-    res[i] = fn(arr[i], i, arr);
-  }
-
-  return res;
-}
-
-/**
- * Fast array filter
- */
-
-function filter(arr, cb) {
-  if (arr == null) return [];
-  if (typeof cb !== 'function') {
-    throw new TypeError('braces: filter expects a callback function.');
-  }
-
-  var len = arr.length;
-  var res = arr.slice();
-  var i = 0;
-
-  while (len--) {
-    if (!cb(arr[len], i++)) {
-      res.splice(len, 1);
-    }
-  }
-  return res;
-}
-
-
-/***/ }),
-/* 758 */
-/***/ (function(module, exports) {
-
-module.exports = {"application/1d-interleaved-parityfec":{"source":"iana"},"application/3gpdash-qoe-report+xml":{"source":"iana","compressible":true},"application/3gpp-ims+xml":{"source":"iana","compressible":true},"application/a2l":{"source":"iana"},"application/activemessage":{"source":"iana"},"application/activity+json":{"source":"iana","compressible":true},"application/alto-costmap+json":{"source":"iana","compressible":true},"application/alto-costmapfilter+json":{"source":"iana","compressible":true},"application/alto-directory+json":{"source":"iana","compressible":true},"application/alto-endpointcost+json":{"source":"iana","compressible":true},"application/alto-endpointcostparams+json":{"source":"iana","compressible":true},"application/alto-endpointprop+json":{"source":"iana","compressible":true},"application/alto-endpointpropparams+json":{"source":"iana","compressible":true},"application/alto-error+json":{"source":"iana","compressible":true},"application/alto-networkmap+json":{"source":"iana","compressible":true},"application/alto-networkmapfilter+json":{"source":"iana","compressible":true},"application/aml":{"source":"iana"},"application/andrew-inset":{"source":"iana","extensions":["ez"]},"application/applefile":{"source":"iana"},"application/applixware":{"source":"apache","extensions":["aw"]},"application/atf":{"source":"iana"},"application/atfx":{"source":"iana"},"application/atom+xml":{"source":"iana","compressible":true,"extensions":["atom"]},"application/atomcat+xml":{"source":"iana","compressible":true,"extensions":["atomcat"]},"application/atomdeleted+xml":{"source":"iana","compressible":true},"application/atomicmail":{"source":"iana"},"application/atomsvc+xml":{"source":"iana","compressible":true,"extensions":["atomsvc"]},"application/atxml":{"source":"iana"},"application/auth-policy+xml":{"source":"iana","compressible":true},"application/bacnet-xdd+zip":{"source":"iana","compressible":false},"application/batch-smtp":{"source":"iana"},"application/bdoc":{"compressible":false,"extensions":["bdoc"]},"application/beep+xml":{"source":"iana","compressible":true},"application/calendar+json":{"source":"iana","compressible":true},"application/calendar+xml":{"source":"iana","compressible":true},"application/call-completion":{"source":"iana"},"application/cals-1840":{"source":"iana"},"application/cbor":{"source":"iana"},"application/cccex":{"source":"iana"},"application/ccmp+xml":{"source":"iana","compressible":true},"application/ccxml+xml":{"source":"iana","compressible":true,"extensions":["ccxml"]},"application/cdfx+xml":{"source":"iana","compressible":true},"application/cdmi-capability":{"source":"iana","extensions":["cdmia"]},"application/cdmi-container":{"source":"iana","extensions":["cdmic"]},"application/cdmi-domain":{"source":"iana","extensions":["cdmid"]},"application/cdmi-object":{"source":"iana","extensions":["cdmio"]},"application/cdmi-queue":{"source":"iana","extensions":["cdmiq"]},"application/cdni":{"source":"iana"},"application/cea":{"source":"iana"},"application/cea-2018+xml":{"source":"iana","compressible":true},"application/cellml+xml":{"source":"iana","compressible":true},"application/cfw":{"source":"iana"},"application/clue_info+xml":{"source":"iana","compressible":true},"application/cms":{"source":"iana"},"application/cnrp+xml":{"source":"iana","compressible":true},"application/coap-group+json":{"source":"iana","compressible":true},"application/coap-payload":{"source":"iana"},"application/commonground":{"source":"iana"},"application/conference-info+xml":{"source":"iana","compressible":true},"application/cose":{"source":"iana"},"application/cose-key":{"source":"iana"},"application/cose-key-set":{"source":"iana"},"application/cpl+xml":{"source":"iana","compressible":true},"application/csrattrs":{"source":"iana"},"application/csta+xml":{"source":"iana","compressible":true},"application/cstadata+xml":{"source":"iana","compressible":true},"application/csvm+json":{"source":"iana","compressible":true},"application/cu-seeme":{"source":"apache","extensions":["cu"]},"application/cwt":{"source":"iana"},"application/cybercash":{"source":"iana"},"application/dart":{"compressible":true},"application/dash+xml":{"source":"iana","compressible":true,"extensions":["mpd"]},"application/dashdelta":{"source":"iana"},"application/davmount+xml":{"source":"iana","compressible":true,"extensions":["davmount"]},"application/dca-rft":{"source":"iana"},"application/dcd":{"source":"iana"},"application/dec-dx":{"source":"iana"},"application/dialog-info+xml":{"source":"iana","compressible":true},"application/dicom":{"source":"iana"},"application/dicom+json":{"source":"iana","compressible":true},"application/dicom+xml":{"source":"iana","compressible":true},"application/dii":{"source":"iana"},"application/dit":{"source":"iana"},"application/dns":{"source":"iana"},"application/dns+json":{"source":"iana","compressible":true},"application/docbook+xml":{"source":"apache","compressible":true,"extensions":["dbk"]},"application/dskpp+xml":{"source":"iana","compressible":true},"application/dssc+der":{"source":"iana","extensions":["dssc"]},"application/dssc+xml":{"source":"iana","compressible":true,"extensions":["xdssc"]},"application/dvcs":{"source":"iana"},"application/ecmascript":{"source":"iana","compressible":true,"extensions":["ecma","es"]},"application/edi-consent":{"source":"iana"},"application/edi-x12":{"source":"iana","compressible":false},"application/edifact":{"source":"iana","compressible":false},"application/efi":{"source":"iana"},"application/emergencycalldata.comment+xml":{"source":"iana","compressible":true},"application/emergencycalldata.control+xml":{"source":"iana","compressible":true},"application/emergencycalldata.deviceinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.ecall.msd":{"source":"iana"},"application/emergencycalldata.providerinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.serviceinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.subscriberinfo+xml":{"source":"iana","compressible":true},"application/emergencycalldata.veds+xml":{"source":"iana","compressible":true},"application/emma+xml":{"source":"iana","compressible":true,"extensions":["emma"]},"application/emotionml+xml":{"source":"iana","compressible":true},"application/encaprtp":{"source":"iana"},"application/epp+xml":{"source":"iana","compressible":true},"application/epub+zip":{"source":"iana","compressible":false,"extensions":["epub"]},"application/eshop":{"source":"iana"},"application/exi":{"source":"iana","extensions":["exi"]},"application/fastinfoset":{"source":"iana"},"application/fastsoap":{"source":"iana"},"application/fdt+xml":{"source":"iana","compressible":true},"application/fhir+json":{"source":"iana","compressible":true},"application/fhir+xml":{"source":"iana","compressible":true},"application/fido.trusted-apps+json":{"compressible":true},"application/fits":{"source":"iana"},"application/font-sfnt":{"source":"iana"},"application/font-tdpfr":{"source":"iana","extensions":["pfr"]},"application/font-woff":{"source":"iana","compressible":false},"application/framework-attributes+xml":{"source":"iana","compressible":true},"application/geo+json":{"source":"iana","compressible":true,"extensions":["geojson"]},"application/geo+json-seq":{"source":"iana"},"application/geoxacml+xml":{"source":"iana","compressible":true},"application/gltf-buffer":{"source":"iana"},"application/gml+xml":{"source":"iana","compressible":true,"extensions":["gml"]},"application/gpx+xml":{"source":"apache","compressible":true,"extensions":["gpx"]},"application/gxf":{"source":"apache","extensions":["gxf"]},"application/gzip":{"source":"iana","compressible":false,"extensions":["gz"]},"application/h224":{"source":"iana"},"application/held+xml":{"source":"iana","compressible":true},"application/hjson":{"extensions":["hjson"]},"application/http":{"source":"iana"},"application/hyperstudio":{"source":"iana","extensions":["stk"]},"application/ibe-key-request+xml":{"source":"iana","compressible":true},"application/ibe-pkg-reply+xml":{"source":"iana","compressible":true},"application/ibe-pp-data":{"source":"iana"},"application/iges":{"source":"iana"},"application/im-iscomposing+xml":{"source":"iana","compressible":true},"application/index":{"source":"iana"},"application/index.cmd":{"source":"iana"},"application/index.obj":{"source":"iana"},"application/index.response":{"source":"iana"},"application/index.vnd":{"source":"iana"},"application/inkml+xml":{"source":"iana","compressible":true,"extensions":["ink","inkml"]},"application/iotp":{"source":"iana"},"application/ipfix":{"source":"iana","extensions":["ipfix"]},"application/ipp":{"source":"iana"},"application/isup":{"source":"iana"},"application/its+xml":{"source":"iana","compressible":true},"application/java-archive":{"source":"apache","compressible":false,"extensions":["jar","war","ear"]},"application/java-serialized-object":{"source":"apache","compressible":false,"extensions":["ser"]},"application/java-vm":{"source":"apache","compressible":false,"extensions":["class"]},"application/javascript":{"source":"iana","charset":"UTF-8","compressible":true,"extensions":["js","mjs"]},"application/jf2feed+json":{"source":"iana","compressible":true},"application/jose":{"source":"iana"},"application/jose+json":{"source":"iana","compressible":true},"application/jrd+json":{"source":"iana","compressible":true},"application/json":{"source":"iana","charset":"UTF-8","compressible":true,"extensions":["json","map"]},"application/json-patch+json":{"source":"iana","compressible":true},"application/json-seq":{"source":"iana"},"application/json5":{"extensions":["json5"]},"application/jsonml+json":{"source":"apache","compressible":true,"extensions":["jsonml"]},"application/jwk+json":{"source":"iana","compressible":true},"application/jwk-set+json":{"source":"iana","compressible":true},"application/jwt":{"source":"iana"},"application/kpml-request+xml":{"source":"iana","compressible":true},"application/kpml-response+xml":{"source":"iana","compressible":true},"application/ld+json":{"source":"iana","compressible":true,"extensions":["jsonld"]},"application/lgr+xml":{"source":"iana","compressible":true},"application/link-format":{"source":"iana"},"application/load-control+xml":{"source":"iana","compressible":true},"application/lost+xml":{"source":"iana","compressible":true,"extensions":["lostxml"]},"application/lostsync+xml":{"source":"iana","compressible":true},"application/lxf":{"source":"iana"},"application/mac-binhex40":{"source":"iana","extensions":["hqx"]},"application/mac-compactpro":{"source":"apache","extensions":["cpt"]},"application/macwriteii":{"source":"iana"},"application/mads+xml":{"source":"iana","compressible":true,"extensions":["mads"]},"application/manifest+json":{"charset":"UTF-8","compressible":true,"extensions":["webmanifest"]},"application/marc":{"source":"iana","extensions":["mrc"]},"application/marcxml+xml":{"source":"iana","compressible":true,"extensions":["mrcx"]},"application/mathematica":{"source":"iana","extensions":["ma","nb","mb"]},"application/mathml+xml":{"source":"iana","compressible":true,"extensions":["mathml"]},"application/mathml-content+xml":{"source":"iana","compressible":true},"application/mathml-presentation+xml":{"source":"iana","compressible":true},"application/mbms-associated-procedure-description+xml":{"source":"iana","compressible":true},"application/mbms-deregister+xml":{"source":"iana","compressible":true},"application/mbms-envelope+xml":{"source":"iana","compressible":true},"application/mbms-msk+xml":{"source":"iana","compressible":true},"application/mbms-msk-response+xml":{"source":"iana","compressible":true},"application/mbms-protection-description+xml":{"source":"iana","compressible":true},"application/mbms-reception-report+xml":{"source":"iana","compressible":true},"application/mbms-register+xml":{"source":"iana","compressible":true},"application/mbms-register-response+xml":{"source":"iana","compressible":true},"application/mbms-schedule+xml":{"source":"iana","compressible":true},"application/mbms-user-service-description+xml":{"source":"iana","compressible":true},"application/mbox":{"source":"iana","extensions":["mbox"]},"application/media-policy-dataset+xml":{"source":"iana","compressible":true},"application/media_control+xml":{"source":"iana","compressible":true},"application/mediaservercontrol+xml":{"source":"iana","compressible":true,"extensions":["mscml"]},"application/merge-patch+json":{"source":"iana","compressible":true},"application/metalink+xml":{"source":"apache","compressible":true,"extensions":["metalink"]},"application/metalink4+xml":{"source":"iana","compressible":true,"extensions":["meta4"]},"application/mets+xml":{"source":"iana","compressible":true,"extensions":["mets"]},"application/mf4":{"source":"iana"},"application/mikey":{"source":"iana"},"application/mmt-usd+xml":{"source":"iana","compressible":true},"application/mods+xml":{"source":"iana","compressible":true,"extensions":["mods"]},"application/moss-keys":{"source":"iana"},"application/moss-signature":{"source":"iana"},"application/mosskey-data":{"source":"iana"},"application/mosskey-request":{"source":"iana"},"application/mp21":{"source":"iana","extensions":["m21","mp21"]},"application/mp4":{"source":"iana","extensions":["mp4s","m4p"]},"application/mpeg4-generic":{"source":"iana"},"application/mpeg4-iod":{"source":"iana"},"application/mpeg4-iod-xmt":{"source":"iana"},"application/mrb-consumer+xml":{"source":"iana","compressible":true},"application/mrb-publish+xml":{"source":"iana","compressible":true},"application/msc-ivr+xml":{"source":"iana","compressible":true},"application/msc-mixer+xml":{"source":"iana","compressible":true},"application/msword":{"source":"iana","compressible":false,"extensions":["doc","dot"]},"application/mud+json":{"source":"iana","compressible":true},"application/mxf":{"source":"iana","extensions":["mxf"]},"application/n-quads":{"source":"iana"},"application/n-triples":{"source":"iana"},"application/nasdata":{"source":"iana"},"application/news-checkgroups":{"source":"iana"},"application/news-groupinfo":{"source":"iana"},"application/news-transmission":{"source":"iana"},"application/nlsml+xml":{"source":"iana","compressible":true},"application/node":{"source":"iana"},"application/nss":{"source":"iana"},"application/ocsp-request":{"source":"iana"},"application/ocsp-response":{"source":"iana"},"application/octet-stream":{"source":"iana","compressible":false,"extensions":["bin","dms","lrf","mar","so","dist","distz","pkg","bpk","dump","elc","deploy","exe","dll","deb","dmg","iso","img","msi","msp","msm","buffer"]},"application/oda":{"source":"iana","extensions":["oda"]},"application/odx":{"source":"iana"},"application/oebps-package+xml":{"source":"iana","compressible":true,"extensions":["opf"]},"application/ogg":{"source":"iana","compressible":false,"extensions":["ogx"]},"application/omdoc+xml":{"source":"apache","compressible":true,"extensions":["omdoc"]},"application/onenote":{"source":"apache","extensions":["onetoc","onetoc2","onetmp","onepkg"]},"application/oxps":{"source":"iana","extensions":["oxps"]},"application/p2p-overlay+xml":{"source":"iana","compressible":true},"application/parityfec":{"source":"iana"},"application/passport":{"source":"iana"},"application/patch-ops-error+xml":{"source":"iana","compressible":true,"extensions":["xer"]},"application/pdf":{"source":"iana","compressible":false,"extensions":["pdf"]},"application/pdx":{"source":"iana"},"application/pgp-encrypted":{"source":"iana","compressible":false,"extensions":["pgp"]},"application/pgp-keys":{"source":"iana"},"application/pgp-signature":{"source":"iana","extensions":["asc","sig"]},"application/pics-rules":{"source":"apache","extensions":["prf"]},"application/pidf+xml":{"source":"iana","compressible":true},"application/pidf-diff+xml":{"source":"iana","compressible":true},"application/pkcs10":{"source":"iana","extensions":["p10"]},"application/pkcs12":{"source":"iana"},"application/pkcs7-mime":{"source":"iana","extensions":["p7m","p7c"]},"application/pkcs7-signature":{"source":"iana","extensions":["p7s"]},"application/pkcs8":{"source":"iana","extensions":["p8"]},"application/pkcs8-encrypted":{"source":"iana"},"application/pkix-attr-cert":{"source":"iana","extensions":["ac"]},"application/pkix-cert":{"source":"iana","extensions":["cer"]},"application/pkix-crl":{"source":"iana","extensions":["crl"]},"application/pkix-pkipath":{"source":"iana","extensions":["pkipath"]},"application/pkixcmp":{"source":"iana","extensions":["pki"]},"application/pls+xml":{"source":"iana","compressible":true,"extensions":["pls"]},"application/poc-settings+xml":{"source":"iana","compressible":true},"application/postscript":{"source":"iana","compressible":true,"extensions":["ai","eps","ps"]},"application/ppsp-tracker+json":{"source":"iana","compressible":true},"application/problem+json":{"source":"iana","compressible":true},"application/problem+xml":{"source":"iana","compressible":true},"application/provenance+xml":{"source":"iana","compressible":true},"application/prs.alvestrand.titrax-sheet":{"source":"iana"},"application/prs.cww":{"source":"iana","extensions":["cww"]},"application/prs.hpub+zip":{"source":"iana","compressible":false},"application/prs.nprend":{"source":"iana"},"application/prs.plucker":{"source":"iana"},"application/prs.rdf-xml-crypt":{"source":"iana"},"application/prs.xsf+xml":{"source":"iana","compressible":true},"application/pskc+xml":{"source":"iana","compressible":true,"extensions":["pskcxml"]},"application/qsig":{"source":"iana"},"application/raml+yaml":{"compressible":true,"extensions":["raml"]},"application/raptorfec":{"source":"iana"},"application/rdap+json":{"source":"iana","compressible":true},"application/rdf+xml":{"source":"iana","compressible":true,"extensions":["rdf","owl"]},"application/reginfo+xml":{"source":"iana","compressible":true,"extensions":["rif"]},"application/relax-ng-compact-syntax":{"source":"iana","extensions":["rnc"]},"application/remote-printing":{"source":"iana"},"application/reputon+json":{"source":"iana","compressible":true},"application/resource-lists+xml":{"source":"iana","compressible":true,"extensions":["rl"]},"application/resource-lists-diff+xml":{"source":"iana","compressible":true,"extensions":["rld"]},"application/rfc+xml":{"source":"iana","compressible":true},"application/riscos":{"source":"iana"},"application/rlmi+xml":{"source":"iana","compressible":true},"application/rls-services+xml":{"source":"iana","compressible":true,"extensions":["rs"]},"application/route-apd+xml":{"source":"iana","compressible":true},"application/route-s-tsid+xml":{"source":"iana","compressible":true},"application/route-usd+xml":{"source":"iana","compressible":true},"application/rpki-ghostbusters":{"source":"iana","extensions":["gbr"]},"application/rpki-manifest":{"source":"iana","extensions":["mft"]},"application/rpki-publication":{"source":"iana"},"application/rpki-roa":{"source":"iana","extensions":["roa"]},"application/rpki-updown":{"source":"iana"},"application/rsd+xml":{"source":"apache","compressible":true,"extensions":["rsd"]},"application/rss+xml":{"source":"apache","compressible":true,"extensions":["rss"]},"application/rtf":{"source":"iana","compressible":true,"extensions":["rtf"]},"application/rtploopback":{"source":"iana"},"application/rtx":{"source":"iana"},"application/samlassertion+xml":{"source":"iana","compressible":true},"application/samlmetadata+xml":{"source":"iana","compressible":true},"application/sbml+xml":{"source":"iana","compressible":true,"extensions":["sbml"]},"application/scaip+xml":{"source":"iana","compressible":true},"application/scim+json":{"source":"iana","compressible":true},"application/scvp-cv-request":{"source":"iana","extensions":["scq"]},"application/scvp-cv-response":{"source":"iana","extensions":["scs"]},"application/scvp-vp-request":{"source":"iana","extensions":["spq"]},"application/scvp-vp-response":{"source":"iana","extensions":["spp"]},"application/sdp":{"source":"iana","extensions":["sdp"]},"application/secevent+jwt":{"source":"iana"},"application/senml+cbor":{"source":"iana"},"application/senml+json":{"source":"iana","compressible":true},"application/senml+xml":{"source":"iana","compressible":true},"application/senml-exi":{"source":"iana"},"application/sensml+cbor":{"source":"iana"},"application/sensml+json":{"source":"iana","compressible":true},"application/sensml+xml":{"source":"iana","compressible":true},"application/sensml-exi":{"source":"iana"},"application/sep+xml":{"source":"iana","compressible":true},"application/sep-exi":{"source":"iana"},"application/session-info":{"source":"iana"},"application/set-payment":{"source":"iana"},"application/set-payment-initiation":{"source":"iana","extensions":["setpay"]},"application/set-registration":{"source":"iana"},"application/set-registration-initiation":{"source":"iana","extensions":["setreg"]},"application/sgml":{"source":"iana"},"application/sgml-open-catalog":{"source":"iana"},"application/shf+xml":{"source":"iana","compressible":true,"extensions":["shf"]},"application/sieve":{"source":"iana"},"application/simple-filter+xml":{"source":"iana","compressible":true},"application/simple-message-summary":{"source":"iana"},"application/simplesymbolcontainer":{"source":"iana"},"application/slate":{"source":"iana"},"application/smil":{"source":"iana"},"application/smil+xml":{"source":"iana","compressible":true,"extensions":["smi","smil"]},"application/smpte336m":{"source":"iana"},"application/soap+fastinfoset":{"source":"iana"},"application/soap+xml":{"source":"iana","compressible":true},"application/sparql-query":{"source":"iana","extensions":["rq"]},"application/sparql-results+xml":{"source":"iana","compressible":true,"extensions":["srx"]},"application/spirits-event+xml":{"source":"iana","compressible":true},"application/sql":{"source":"iana"},"application/srgs":{"source":"iana","extensions":["gram"]},"application/srgs+xml":{"source":"iana","compressible":true,"extensions":["grxml"]},"application/sru+xml":{"source":"iana","compressible":true,"extensions":["sru"]},"application/ssdl+xml":{"source":"apache","compressible":true,"extensions":["ssdl"]},"application/ssml+xml":{"source":"iana","compressible":true,"extensions":["ssml"]},"application/stix+json":{"source":"iana","compressible":true},"application/tamp-apex-update":{"source":"iana"},"application/tamp-apex-update-confirm":{"source":"iana"},"application/tamp-community-update":{"source":"iana"},"application/tamp-community-update-confirm":{"source":"iana"},"application/tamp-error":{"source":"iana"},"application/tamp-sequence-adjust":{"source":"iana"},"application/tamp-sequence-adjust-confirm":{"source":"iana"},"application/tamp-status-query":{"source":"iana"},"application/tamp-status-response":{"source":"iana"},"application/tamp-update":{"source":"iana"},"application/tamp-update-confirm":{"source":"iana"},"application/tar":{"compressible":true},"application/taxii+json":{"source":"iana","compressible":true},"application/tei+xml":{"source":"iana","compressible":true,"extensions":["tei","teicorpus"]},"application/thraud+xml":{"source":"iana","compressible":true,"extensions":["tfi"]},"application/timestamp-query":{"source":"iana"},"application/timestamp-reply":{"source":"iana"},"application/timestamped-data":{"source":"iana","extensions":["tsd"]},"application/tlsrpt+gzip":{"source":"iana"},"application/tlsrpt+json":{"source":"iana","compressible":true},"application/tnauthlist":{"source":"iana"},"application/trickle-ice-sdpfrag":{"source":"iana"},"application/trig":{"source":"iana"},"application/ttml+xml":{"source":"iana","compressible":true},"application/tve-trigger":{"source":"iana"},"application/ulpfec":{"source":"iana"},"application/urc-grpsheet+xml":{"source":"iana","compressible":true},"application/urc-ressheet+xml":{"source":"iana","compressible":true},"application/urc-targetdesc+xml":{"source":"iana","compressible":true},"application/urc-uisocketdesc+xml":{"source":"iana","compressible":true},"application/vcard+json":{"source":"iana","compressible":true},"application/vcard+xml":{"source":"iana","compressible":true},"application/vemmi":{"source":"iana"},"application/vividence.scriptfile":{"source":"apache"},"application/vnd.1000minds.decision-model+xml":{"source":"iana","compressible":true},"application/vnd.3gpp-prose+xml":{"source":"iana","compressible":true},"application/vnd.3gpp-prose-pc3ch+xml":{"source":"iana","compressible":true},"application/vnd.3gpp-v2x-local-service-information":{"source":"iana"},"application/vnd.3gpp.access-transfer-events+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.bsf+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.gmop+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcdata-payload":{"source":"iana"},"application/vnd.3gpp.mcdata-signalling":{"source":"iana"},"application/vnd.3gpp.mcptt-affiliation-command+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-floor-request+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-location-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-mbms-usage-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mcptt-signed+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.mid-call+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.pic-bw-large":{"source":"iana","extensions":["plb"]},"application/vnd.3gpp.pic-bw-small":{"source":"iana","extensions":["psb"]},"application/vnd.3gpp.pic-bw-var":{"source":"iana","extensions":["pvb"]},"application/vnd.3gpp.sms":{"source":"iana"},"application/vnd.3gpp.sms+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.srvcc-ext+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.srvcc-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.state-and-event-info+xml":{"source":"iana","compressible":true},"application/vnd.3gpp.ussd+xml":{"source":"iana","compressible":true},"application/vnd.3gpp2.bcmcsinfo+xml":{"source":"iana","compressible":true},"application/vnd.3gpp2.sms":{"source":"iana"},"application/vnd.3gpp2.tcap":{"source":"iana","extensions":["tcap"]},"application/vnd.3lightssoftware.imagescal":{"source":"iana"},"application/vnd.3m.post-it-notes":{"source":"iana","extensions":["pwn"]},"application/vnd.accpac.simply.aso":{"source":"iana","extensions":["aso"]},"application/vnd.accpac.simply.imp":{"source":"iana","extensions":["imp"]},"application/vnd.acucobol":{"source":"iana","extensions":["acu"]},"application/vnd.acucorp":{"source":"iana","extensions":["atc","acutc"]},"application/vnd.adobe.air-application-installer-package+zip":{"source":"apache","compressible":false,"extensions":["air"]},"application/vnd.adobe.flash.movie":{"source":"iana"},"application/vnd.adobe.formscentral.fcdt":{"source":"iana","extensions":["fcdt"]},"application/vnd.adobe.fxp":{"source":"iana","extensions":["fxp","fxpl"]},"application/vnd.adobe.partial-upload":{"source":"iana"},"application/vnd.adobe.xdp+xml":{"source":"iana","compressible":true,"extensions":["xdp"]},"application/vnd.adobe.xfdf":{"source":"iana","extensions":["xfdf"]},"application/vnd.aether.imp":{"source":"iana"},"application/vnd.afpc.afplinedata":{"source":"iana"},"application/vnd.afpc.modca":{"source":"iana"},"application/vnd.ah-barcode":{"source":"iana"},"application/vnd.ahead.space":{"source":"iana","extensions":["ahead"]},"application/vnd.airzip.filesecure.azf":{"source":"iana","extensions":["azf"]},"application/vnd.airzip.filesecure.azs":{"source":"iana","extensions":["azs"]},"application/vnd.amadeus+json":{"source":"iana","compressible":true},"application/vnd.amazon.ebook":{"source":"apache","extensions":["azw"]},"application/vnd.amazon.mobi8-ebook":{"source":"iana"},"application/vnd.americandynamics.acc":{"source":"iana","extensions":["acc"]},"application/vnd.amiga.ami":{"source":"iana","extensions":["ami"]},"application/vnd.amundsen.maze+xml":{"source":"iana","compressible":true},"application/vnd.android.package-archive":{"source":"apache","compressible":false,"extensions":["apk"]},"application/vnd.anki":{"source":"iana"},"application/vnd.anser-web-certificate-issue-initiation":{"source":"iana","extensions":["cii"]},"application/vnd.anser-web-funds-transfer-initiation":{"source":"apache","extensions":["fti"]},"application/vnd.antix.game-component":{"source":"iana","extensions":["atx"]},"application/vnd.apache.thrift.binary":{"source":"iana"},"application/vnd.apache.thrift.compact":{"source":"iana"},"application/vnd.apache.thrift.json":{"source":"iana"},"application/vnd.api+json":{"source":"iana","compressible":true},"application/vnd.apothekende.reservation+json":{"source":"iana","compressible":true},"application/vnd.apple.installer+xml":{"source":"iana","compressible":true,"extensions":["mpkg"]},"application/vnd.apple.mpegurl":{"source":"iana","extensions":["m3u8"]},"application/vnd.apple.pkpass":{"compressible":false,"extensions":["pkpass"]},"application/vnd.arastra.swi":{"source":"iana"},"application/vnd.aristanetworks.swi":{"source":"iana","extensions":["swi"]},"application/vnd.artisan+json":{"source":"iana","compressible":true},"application/vnd.artsquare":{"source":"iana"},"application/vnd.astraea-software.iota":{"source":"iana","extensions":["iota"]},"application/vnd.audiograph":{"source":"iana","extensions":["aep"]},"application/vnd.autopackage":{"source":"iana"},"application/vnd.avalon+json":{"source":"iana","compressible":true},"application/vnd.avistar+xml":{"source":"iana","compressible":true},"application/vnd.balsamiq.bmml+xml":{"source":"iana","compressible":true},"application/vnd.balsamiq.bmpr":{"source":"iana"},"application/vnd.banana-accounting":{"source":"iana"},"application/vnd.bbf.usp.msg":{"source":"iana"},"application/vnd.bbf.usp.msg+json":{"source":"iana","compressible":true},"application/vnd.bekitzur-stech+json":{"source":"iana","compressible":true},"application/vnd.bint.med-content":{"source":"iana"},"application/vnd.biopax.rdf+xml":{"source":"iana","compressible":true},"application/vnd.blink-idb-value-wrapper":{"source":"iana"},"application/vnd.blueice.multipass":{"source":"iana","extensions":["mpm"]},"application/vnd.bluetooth.ep.oob":{"source":"iana"},"application/vnd.bluetooth.le.oob":{"source":"iana"},"application/vnd.bmi":{"source":"iana","extensions":["bmi"]},"application/vnd.businessobjects":{"source":"iana","extensions":["rep"]},"application/vnd.byu.uapi+json":{"source":"iana","compressible":true},"application/vnd.cab-jscript":{"source":"iana"},"application/vnd.canon-cpdl":{"source":"iana"},"application/vnd.canon-lips":{"source":"iana"},"application/vnd.capasystems-pg+json":{"source":"iana","compressible":true},"application/vnd.cendio.thinlinc.clientconf":{"source":"iana"},"application/vnd.century-systems.tcp_stream":{"source":"iana"},"application/vnd.chemdraw+xml":{"source":"iana","compressible":true,"extensions":["cdxml"]},"application/vnd.chess-pgn":{"source":"iana"},"application/vnd.chipnuts.karaoke-mmd":{"source":"iana","extensions":["mmd"]},"application/vnd.cinderella":{"source":"iana","extensions":["cdy"]},"application/vnd.cirpack.isdn-ext":{"source":"iana"},"application/vnd.citationstyles.style+xml":{"source":"iana","compressible":true,"extensions":["csl"]},"application/vnd.claymore":{"source":"iana","extensions":["cla"]},"application/vnd.cloanto.rp9":{"source":"iana","extensions":["rp9"]},"application/vnd.clonk.c4group":{"source":"iana","extensions":["c4g","c4d","c4f","c4p","c4u"]},"application/vnd.cluetrust.cartomobile-config":{"source":"iana","extensions":["c11amc"]},"application/vnd.cluetrust.cartomobile-config-pkg":{"source":"iana","extensions":["c11amz"]},"application/vnd.coffeescript":{"source":"iana"},"application/vnd.collabio.xodocuments.document":{"source":"iana"},"application/vnd.collabio.xodocuments.document-template":{"source":"iana"},"application/vnd.collabio.xodocuments.presentation":{"source":"iana"},"application/vnd.collabio.xodocuments.presentation-template":{"source":"iana"},"application/vnd.collabio.xodocuments.spreadsheet":{"source":"iana"},"application/vnd.collabio.xodocuments.spreadsheet-template":{"source":"iana"},"application/vnd.collection+json":{"source":"iana","compressible":true},"application/vnd.collection.doc+json":{"source":"iana","compressible":true},"application/vnd.collection.next+json":{"source":"iana","compressible":true},"application/vnd.comicbook+zip":{"source":"iana","compressible":false},"application/vnd.comicbook-rar":{"source":"iana"},"application/vnd.commerce-battelle":{"source":"iana"},"application/vnd.commonspace":{"source":"iana","extensions":["csp"]},"application/vnd.contact.cmsg":{"source":"iana","extensions":["cdbcmsg"]},"application/vnd.coreos.ignition+json":{"source":"iana","compressible":true},"application/vnd.cosmocaller":{"source":"iana","extensions":["cmc"]},"application/vnd.crick.clicker":{"source":"iana","extensions":["clkx"]},"application/vnd.crick.clicker.keyboard":{"source":"iana","extensions":["clkk"]},"application/vnd.crick.clicker.palette":{"source":"iana","extensions":["clkp"]},"application/vnd.crick.clicker.template":{"source":"iana","extensions":["clkt"]},"application/vnd.crick.clicker.wordbank":{"source":"iana","extensions":["clkw"]},"application/vnd.criticaltools.wbs+xml":{"source":"iana","compressible":true,"extensions":["wbs"]},"application/vnd.ctc-posml":{"source":"iana","extensions":["pml"]},"application/vnd.ctct.ws+xml":{"source":"iana","compressible":true},"application/vnd.cups-pdf":{"source":"iana"},"application/vnd.cups-postscript":{"source":"iana"},"application/vnd.cups-ppd":{"source":"iana","extensions":["ppd"]},"application/vnd.cups-raster":{"source":"iana"},"application/vnd.cups-raw":{"source":"iana"},"application/vnd.curl":{"source":"iana"},"application/vnd.curl.car":{"source":"apache","extensions":["car"]},"application/vnd.curl.pcurl":{"source":"apache","extensions":["pcurl"]},"application/vnd.cyan.dean.root+xml":{"source":"iana","compressible":true},"application/vnd.cybank":{"source":"iana"},"application/vnd.d2l.coursepackage1p0+zip":{"source":"iana","compressible":false},"application/vnd.dart":{"source":"iana","compressible":true,"extensions":["dart"]},"application/vnd.data-vision.rdz":{"source":"iana","extensions":["rdz"]},"application/vnd.datapackage+json":{"source":"iana","compressible":true},"application/vnd.dataresource+json":{"source":"iana","compressible":true},"application/vnd.debian.binary-package":{"source":"iana"},"application/vnd.dece.data":{"source":"iana","extensions":["uvf","uvvf","uvd","uvvd"]},"application/vnd.dece.ttml+xml":{"source":"iana","compressible":true,"extensions":["uvt","uvvt"]},"application/vnd.dece.unspecified":{"source":"iana","extensions":["uvx","uvvx"]},"application/vnd.dece.zip":{"source":"iana","extensions":["uvz","uvvz"]},"application/vnd.denovo.fcselayout-link":{"source":"iana","extensions":["fe_launch"]},"application/vnd.desmume-movie":{"source":"iana"},"application/vnd.desmume.movie":{"source":"apache"},"application/vnd.dir-bi.plate-dl-nosuffix":{"source":"iana"},"application/vnd.dm.delegation+xml":{"source":"iana","compressible":true},"application/vnd.dna":{"source":"iana","extensions":["dna"]},"application/vnd.document+json":{"source":"iana","compressible":true},"application/vnd.dolby.mlp":{"source":"apache","extensions":["mlp"]},"application/vnd.dolby.mobile.1":{"source":"iana"},"application/vnd.dolby.mobile.2":{"source":"iana"},"application/vnd.doremir.scorecloud-binary-document":{"source":"iana"},"application/vnd.dpgraph":{"source":"iana","extensions":["dpg"]},"application/vnd.dreamfactory":{"source":"iana","extensions":["dfac"]},"application/vnd.drive+json":{"source":"iana","compressible":true},"application/vnd.ds-keypoint":{"source":"apache","extensions":["kpxx"]},"application/vnd.dtg.local":{"source":"iana"},"application/vnd.dtg.local.flash":{"source":"iana"},"application/vnd.dtg.local.html":{"source":"iana"},"application/vnd.dvb.ait":{"source":"iana","extensions":["ait"]},"application/vnd.dvb.dvbj":{"source":"iana"},"application/vnd.dvb.esgcontainer":{"source":"iana"},"application/vnd.dvb.ipdcdftnotifaccess":{"source":"iana"},"application/vnd.dvb.ipdcesgaccess":{"source":"iana"},"application/vnd.dvb.ipdcesgaccess2":{"source":"iana"},"application/vnd.dvb.ipdcesgpdd":{"source":"iana"},"application/vnd.dvb.ipdcroaming":{"source":"iana"},"application/vnd.dvb.iptv.alfec-base":{"source":"iana"},"application/vnd.dvb.iptv.alfec-enhancement":{"source":"iana"},"application/vnd.dvb.notif-aggregate-root+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-container+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-generic+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-ia-msglist+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-ia-registration-request+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-ia-registration-response+xml":{"source":"iana","compressible":true},"application/vnd.dvb.notif-init+xml":{"source":"iana","compressible":true},"application/vnd.dvb.pfr":{"source":"iana"},"application/vnd.dvb.service":{"source":"iana","extensions":["svc"]},"application/vnd.dxr":{"source":"iana"},"application/vnd.dynageo":{"source":"iana","extensions":["geo"]},"application/vnd.dzr":{"source":"iana"},"application/vnd.easykaraoke.cdgdownload":{"source":"iana"},"application/vnd.ecdis-update":{"source":"iana"},"application/vnd.ecip.rlp":{"source":"iana"},"application/vnd.ecowin.chart":{"source":"iana","extensions":["mag"]},"application/vnd.ecowin.filerequest":{"source":"iana"},"application/vnd.ecowin.fileupdate":{"source":"iana"},"application/vnd.ecowin.series":{"source":"iana"},"application/vnd.ecowin.seriesrequest":{"source":"iana"},"application/vnd.ecowin.seriesupdate":{"source":"iana"},"application/vnd.efi.img":{"source":"iana"},"application/vnd.efi.iso":{"source":"iana"},"application/vnd.emclient.accessrequest+xml":{"source":"iana","compressible":true},"application/vnd.enliven":{"source":"iana","extensions":["nml"]},"application/vnd.enphase.envoy":{"source":"iana"},"application/vnd.eprints.data+xml":{"source":"iana","compressible":true},"application/vnd.epson.esf":{"source":"iana","extensions":["esf"]},"application/vnd.epson.msf":{"source":"iana","extensions":["msf"]},"application/vnd.epson.quickanime":{"source":"iana","extensions":["qam"]},"application/vnd.epson.salt":{"source":"iana","extensions":["slt"]},"application/vnd.epson.ssf":{"source":"iana","extensions":["ssf"]},"application/vnd.ericsson.quickcall":{"source":"iana"},"application/vnd.espass-espass+zip":{"source":"iana","compressible":false},"application/vnd.eszigno3+xml":{"source":"iana","compressible":true,"extensions":["es3","et3"]},"application/vnd.etsi.aoc+xml":{"source":"iana","compressible":true},"application/vnd.etsi.asic-e+zip":{"source":"iana","compressible":false},"application/vnd.etsi.asic-s+zip":{"source":"iana","compressible":false},"application/vnd.etsi.cug+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvcommand+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvdiscovery+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvprofile+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsad-bc+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsad-cod+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsad-npvr+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvservice+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvsync+xml":{"source":"iana","compressible":true},"application/vnd.etsi.iptvueprofile+xml":{"source":"iana","compressible":true},"application/vnd.etsi.mcid+xml":{"source":"iana","compressible":true},"application/vnd.etsi.mheg5":{"source":"iana"},"application/vnd.etsi.overload-control-policy-dataset+xml":{"source":"iana","compressible":true},"application/vnd.etsi.pstn+xml":{"source":"iana","compressible":true},"application/vnd.etsi.sci+xml":{"source":"iana","compressible":true},"application/vnd.etsi.simservs+xml":{"source":"iana","compressible":true},"application/vnd.etsi.timestamp-token":{"source":"iana"},"application/vnd.etsi.tsl+xml":{"source":"iana","compressible":true},"application/vnd.etsi.tsl.der":{"source":"iana"},"application/vnd.eudora.data":{"source":"iana"},"application/vnd.evolv.ecig.profile":{"source":"iana"},"application/vnd.evolv.ecig.settings":{"source":"iana"},"application/vnd.evolv.ecig.theme":{"source":"iana"},"application/vnd.ezpix-album":{"source":"iana","extensions":["ez2"]},"application/vnd.ezpix-package":{"source":"iana","extensions":["ez3"]},"application/vnd.f-secure.mobile":{"source":"iana"},"application/vnd.fastcopy-disk-image":{"source":"iana"},"application/vnd.fdf":{"source":"iana","extensions":["fdf"]},"application/vnd.fdsn.mseed":{"source":"iana","extensions":["mseed"]},"application/vnd.fdsn.seed":{"source":"iana","extensions":["seed","dataless"]},"application/vnd.ffsns":{"source":"iana"},"application/vnd.filmit.zfc":{"source":"iana"},"application/vnd.fints":{"source":"iana"},"application/vnd.firemonkeys.cloudcell":{"source":"iana"},"application/vnd.flographit":{"source":"iana","extensions":["gph"]},"application/vnd.fluxtime.clip":{"source":"iana","extensions":["ftc"]},"application/vnd.font-fontforge-sfd":{"source":"iana"},"application/vnd.framemaker":{"source":"iana","extensions":["fm","frame","maker","book"]},"application/vnd.frogans.fnc":{"source":"iana","extensions":["fnc"]},"application/vnd.frogans.ltf":{"source":"iana","extensions":["ltf"]},"application/vnd.fsc.weblaunch":{"source":"iana","extensions":["fsc"]},"application/vnd.fujitsu.oasys":{"source":"iana","extensions":["oas"]},"application/vnd.fujitsu.oasys2":{"source":"iana","extensions":["oa2"]},"application/vnd.fujitsu.oasys3":{"source":"iana","extensions":["oa3"]},"application/vnd.fujitsu.oasysgp":{"source":"iana","extensions":["fg5"]},"application/vnd.fujitsu.oasysprs":{"source":"iana","extensions":["bh2"]},"application/vnd.fujixerox.art-ex":{"source":"iana"},"application/vnd.fujixerox.art4":{"source":"iana"},"application/vnd.fujixerox.ddd":{"source":"iana","extensions":["ddd"]},"application/vnd.fujixerox.docuworks":{"source":"iana","extensions":["xdw"]},"application/vnd.fujixerox.docuworks.binder":{"source":"iana","extensions":["xbd"]},"application/vnd.fujixerox.docuworks.container":{"source":"iana"},"application/vnd.fujixerox.hbpl":{"source":"iana"},"application/vnd.fut-misnet":{"source":"iana"},"application/vnd.fuzzysheet":{"source":"iana","extensions":["fzs"]},"application/vnd.genomatix.tuxedo":{"source":"iana","extensions":["txd"]},"application/vnd.geo+json":{"source":"iana","compressible":true},"application/vnd.geocube+xml":{"source":"iana","compressible":true},"application/vnd.geogebra.file":{"source":"iana","extensions":["ggb"]},"application/vnd.geogebra.tool":{"source":"iana","extensions":["ggt"]},"application/vnd.geometry-explorer":{"source":"iana","extensions":["gex","gre"]},"application/vnd.geonext":{"source":"iana","extensions":["gxt"]},"application/vnd.geoplan":{"source":"iana","extensions":["g2w"]},"application/vnd.geospace":{"source":"iana","extensions":["g3w"]},"application/vnd.gerber":{"source":"iana"},"application/vnd.globalplatform.card-content-mgt":{"source":"iana"},"application/vnd.globalplatform.card-content-mgt-response":{"source":"iana"},"application/vnd.gmx":{"source":"iana","extensions":["gmx"]},"application/vnd.google-apps.document":{"compressible":false,"extensions":["gdoc"]},"application/vnd.google-apps.presentation":{"compressible":false,"extensions":["gslides"]},"application/vnd.google-apps.spreadsheet":{"compressible":false,"extensions":["gsheet"]},"application/vnd.google-earth.kml+xml":{"source":"iana","compressible":true,"extensions":["kml"]},"application/vnd.google-earth.kmz":{"source":"iana","compressible":false,"extensions":["kmz"]},"application/vnd.gov.sk.e-form+xml":{"source":"iana","compressible":true},"application/vnd.gov.sk.e-form+zip":{"source":"iana","compressible":false},"application/vnd.gov.sk.xmldatacontainer+xml":{"source":"iana","compressible":true},"application/vnd.grafeq":{"source":"iana","extensions":["gqf","gqs"]},"application/vnd.gridmp":{"source":"iana"},"application/vnd.groove-account":{"source":"iana","extensions":["gac"]},"application/vnd.groove-help":{"source":"iana","extensions":["ghf"]},"application/vnd.groove-identity-message":{"source":"iana","extensions":["gim"]},"application/vnd.groove-injector":{"source":"iana","extensions":["grv"]},"application/vnd.groove-tool-message":{"source":"iana","extensions":["gtm"]},"application/vnd.groove-tool-template":{"source":"iana","extensions":["tpl"]},"application/vnd.groove-vcard":{"source":"iana","extensions":["vcg"]},"application/vnd.hal+json":{"source":"iana","compressible":true},"application/vnd.hal+xml":{"source":"iana","compressible":true,"extensions":["hal"]},"application/vnd.handheld-entertainment+xml":{"source":"iana","compressible":true,"extensions":["zmm"]},"application/vnd.hbci":{"source":"iana","extensions":["hbci"]},"application/vnd.hc+json":{"source":"iana","compressible":true},"application/vnd.hcl-bireports":{"source":"iana"},"application/vnd.hdt":{"source":"iana"},"application/vnd.heroku+json":{"source":"iana","compressible":true},"application/vnd.hhe.lesson-player":{"source":"iana","extensions":["les"]},"application/vnd.hp-hpgl":{"source":"iana","extensions":["hpgl"]},"application/vnd.hp-hpid":{"source":"iana","extensions":["hpid"]},"application/vnd.hp-hps":{"source":"iana","extensions":["hps"]},"application/vnd.hp-jlyt":{"source":"iana","extensions":["jlt"]},"application/vnd.hp-pcl":{"source":"iana","extensions":["pcl"]},"application/vnd.hp-pclxl":{"source":"iana","extensions":["pclxl"]},"application/vnd.httphone":{"source":"iana"},"application/vnd.hydrostatix.sof-data":{"source":"iana","extensions":["sfd-hdstx"]},"application/vnd.hyper+json":{"source":"iana","compressible":true},"application/vnd.hyper-item+json":{"source":"iana","compressible":true},"application/vnd.hyperdrive+json":{"source":"iana","compressible":true},"application/vnd.hzn-3d-crossword":{"source":"iana"},"application/vnd.ibm.afplinedata":{"source":"iana"},"application/vnd.ibm.electronic-media":{"source":"iana"},"application/vnd.ibm.minipay":{"source":"iana","extensions":["mpy"]},"application/vnd.ibm.modcap":{"source":"iana","extensions":["afp","listafp","list3820"]},"application/vnd.ibm.rights-management":{"source":"iana","extensions":["irm"]},"application/vnd.ibm.secure-container":{"source":"iana","extensions":["sc"]},"application/vnd.iccprofile":{"source":"iana","extensions":["icc","icm"]},"application/vnd.ieee.1905":{"source":"iana"},"application/vnd.igloader":{"source":"iana","extensions":["igl"]},"application/vnd.imagemeter.folder+zip":{"source":"iana","compressible":false},"application/vnd.imagemeter.image+zip":{"source":"iana","compressible":false},"application/vnd.immervision-ivp":{"source":"iana","extensions":["ivp"]},"application/vnd.immervision-ivu":{"source":"iana","extensions":["ivu"]},"application/vnd.ims.imsccv1p1":{"source":"iana"},"application/vnd.ims.imsccv1p2":{"source":"iana"},"application/vnd.ims.imsccv1p3":{"source":"iana"},"application/vnd.ims.lis.v2.result+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolconsumerprofile+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolproxy+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolproxy.id+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolsettings+json":{"source":"iana","compressible":true},"application/vnd.ims.lti.v2.toolsettings.simple+json":{"source":"iana","compressible":true},"application/vnd.informedcontrol.rms+xml":{"source":"iana","compressible":true},"application/vnd.informix-visionary":{"source":"iana"},"application/vnd.infotech.project":{"source":"iana"},"application/vnd.infotech.project+xml":{"source":"iana","compressible":true},"application/vnd.innopath.wamp.notification":{"source":"iana"},"application/vnd.insors.igm":{"source":"iana","extensions":["igm"]},"application/vnd.intercon.formnet":{"source":"iana","extensions":["xpw","xpx"]},"application/vnd.intergeo":{"source":"iana","extensions":["i2g"]},"application/vnd.intertrust.digibox":{"source":"iana"},"application/vnd.intertrust.nncp":{"source":"iana"},"application/vnd.intu.qbo":{"source":"iana","extensions":["qbo"]},"application/vnd.intu.qfx":{"source":"iana","extensions":["qfx"]},"application/vnd.iptc.g2.catalogitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.conceptitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.knowledgeitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.newsitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.newsmessage+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.packageitem+xml":{"source":"iana","compressible":true},"application/vnd.iptc.g2.planningitem+xml":{"source":"iana","compressible":true},"application/vnd.ipunplugged.rcprofile":{"source":"iana","extensions":["rcprofile"]},"application/vnd.irepository.package+xml":{"source":"iana","compressible":true,"extensions":["irp"]},"application/vnd.is-xpr":{"source":"iana","extensions":["xpr"]},"application/vnd.isac.fcs":{"source":"iana","extensions":["fcs"]},"application/vnd.jam":{"source":"iana","extensions":["jam"]},"application/vnd.japannet-directory-service":{"source":"iana"},"application/vnd.japannet-jpnstore-wakeup":{"source":"iana"},"application/vnd.japannet-payment-wakeup":{"source":"iana"},"application/vnd.japannet-registration":{"source":"iana"},"application/vnd.japannet-registration-wakeup":{"source":"iana"},"application/vnd.japannet-setstore-wakeup":{"source":"iana"},"application/vnd.japannet-verification":{"source":"iana"},"application/vnd.japannet-verification-wakeup":{"source":"iana"},"application/vnd.jcp.javame.midlet-rms":{"source":"iana","extensions":["rms"]},"application/vnd.jisp":{"source":"iana","extensions":["jisp"]},"application/vnd.joost.joda-archive":{"source":"iana","extensions":["joda"]},"application/vnd.jsk.isdn-ngn":{"source":"iana"},"application/vnd.kahootz":{"source":"iana","extensions":["ktz","ktr"]},"application/vnd.kde.karbon":{"source":"iana","extensions":["karbon"]},"application/vnd.kde.kchart":{"source":"iana","extensions":["chrt"]},"application/vnd.kde.kformula":{"source":"iana","extensions":["kfo"]},"application/vnd.kde.kivio":{"source":"iana","extensions":["flw"]},"application/vnd.kde.kontour":{"source":"iana","extensions":["kon"]},"application/vnd.kde.kpresenter":{"source":"iana","extensions":["kpr","kpt"]},"application/vnd.kde.kspread":{"source":"iana","extensions":["ksp"]},"application/vnd.kde.kword":{"source":"iana","extensions":["kwd","kwt"]},"application/vnd.kenameaapp":{"source":"iana","extensions":["htke"]},"application/vnd.kidspiration":{"source":"iana","extensions":["kia"]},"application/vnd.kinar":{"source":"iana","extensions":["kne","knp"]},"application/vnd.koan":{"source":"iana","extensions":["skp","skd","skt","skm"]},"application/vnd.kodak-descriptor":{"source":"iana","extensions":["sse"]},"application/vnd.las.las+json":{"source":"iana","compressible":true},"application/vnd.las.las+xml":{"source":"iana","compressible":true,"extensions":["lasxml"]},"application/vnd.leap+json":{"source":"iana","compressible":true},"application/vnd.liberty-request+xml":{"source":"iana","compressible":true},"application/vnd.llamagraphics.life-balance.desktop":{"source":"iana","extensions":["lbd"]},"application/vnd.llamagraphics.life-balance.exchange+xml":{"source":"iana","compressible":true,"extensions":["lbe"]},"application/vnd.lotus-1-2-3":{"source":"iana","extensions":["123"]},"application/vnd.lotus-approach":{"source":"iana","extensions":["apr"]},"application/vnd.lotus-freelance":{"source":"iana","extensions":["pre"]},"application/vnd.lotus-notes":{"source":"iana","extensions":["nsf"]},"application/vnd.lotus-organizer":{"source":"iana","extensions":["org"]},"application/vnd.lotus-screencam":{"source":"iana","extensions":["scm"]},"application/vnd.lotus-wordpro":{"source":"iana","extensions":["lwp"]},"application/vnd.macports.portpkg":{"source":"iana","extensions":["portpkg"]},"application/vnd.mapbox-vector-tile":{"source":"iana"},"application/vnd.marlin.drm.actiontoken+xml":{"source":"iana","compressible":true},"application/vnd.marlin.drm.conftoken+xml":{"source":"iana","compressible":true},"application/vnd.marlin.drm.license+xml":{"source":"iana","compressible":true},"application/vnd.marlin.drm.mdcf":{"source":"iana"},"application/vnd.mason+json":{"source":"iana","compressible":true},"application/vnd.maxmind.maxmind-db":{"source":"iana"},"application/vnd.mcd":{"source":"iana","extensions":["mcd"]},"application/vnd.medcalcdata":{"source":"iana","extensions":["mc1"]},"application/vnd.mediastation.cdkey":{"source":"iana","extensions":["cdkey"]},"application/vnd.meridian-slingshot":{"source":"iana"},"application/vnd.mfer":{"source":"iana","extensions":["mwf"]},"application/vnd.mfmp":{"source":"iana","extensions":["mfm"]},"application/vnd.micro+json":{"source":"iana","compressible":true},"application/vnd.micrografx.flo":{"source":"iana","extensions":["flo"]},"application/vnd.micrografx.igx":{"source":"iana","extensions":["igx"]},"application/vnd.microsoft.portable-executable":{"source":"iana"},"application/vnd.microsoft.windows.thumbnail-cache":{"source":"iana"},"application/vnd.miele+json":{"source":"iana","compressible":true},"application/vnd.mif":{"source":"iana","extensions":["mif"]},"application/vnd.minisoft-hp3000-save":{"source":"iana"},"application/vnd.mitsubishi.misty-guard.trustweb":{"source":"iana"},"application/vnd.mobius.daf":{"source":"iana","extensions":["daf"]},"application/vnd.mobius.dis":{"source":"iana","extensions":["dis"]},"application/vnd.mobius.mbk":{"source":"iana","extensions":["mbk"]},"application/vnd.mobius.mqy":{"source":"iana","extensions":["mqy"]},"application/vnd.mobius.msl":{"source":"iana","extensions":["msl"]},"application/vnd.mobius.plc":{"source":"iana","extensions":["plc"]},"application/vnd.mobius.txf":{"source":"iana","extensions":["txf"]},"application/vnd.mophun.application":{"source":"iana","extensions":["mpn"]},"application/vnd.mophun.certificate":{"source":"iana","extensions":["mpc"]},"application/vnd.motorola.flexsuite":{"source":"iana"},"application/vnd.motorola.flexsuite.adsi":{"source":"iana"},"application/vnd.motorola.flexsuite.fis":{"source":"iana"},"application/vnd.motorola.flexsuite.gotap":{"source":"iana"},"application/vnd.motorola.flexsuite.kmr":{"source":"iana"},"application/vnd.motorola.flexsuite.ttc":{"source":"iana"},"application/vnd.motorola.flexsuite.wem":{"source":"iana"},"application/vnd.motorola.iprm":{"source":"iana"},"application/vnd.mozilla.xul+xml":{"source":"iana","compressible":true,"extensions":["xul"]},"application/vnd.ms-3mfdocument":{"source":"iana"},"application/vnd.ms-artgalry":{"source":"iana","extensions":["cil"]},"application/vnd.ms-asf":{"source":"iana"},"application/vnd.ms-cab-compressed":{"source":"iana","extensions":["cab"]},"application/vnd.ms-color.iccprofile":{"source":"apache"},"application/vnd.ms-excel":{"source":"iana","compressible":false,"extensions":["xls","xlm","xla","xlc","xlt","xlw"]},"application/vnd.ms-excel.addin.macroenabled.12":{"source":"iana","extensions":["xlam"]},"application/vnd.ms-excel.sheet.binary.macroenabled.12":{"source":"iana","extensions":["xlsb"]},"application/vnd.ms-excel.sheet.macroenabled.12":{"source":"iana","extensions":["xlsm"]},"application/vnd.ms-excel.template.macroenabled.12":{"source":"iana","extensions":["xltm"]},"application/vnd.ms-fontobject":{"source":"iana","compressible":true,"extensions":["eot"]},"application/vnd.ms-htmlhelp":{"source":"iana","extensions":["chm"]},"application/vnd.ms-ims":{"source":"iana","extensions":["ims"]},"application/vnd.ms-lrm":{"source":"iana","extensions":["lrm"]},"application/vnd.ms-office.activex+xml":{"source":"iana","compressible":true},"application/vnd.ms-officetheme":{"source":"iana","extensions":["thmx"]},"application/vnd.ms-opentype":{"source":"apache","compressible":true},"application/vnd.ms-outlook":{"compressible":false,"extensions":["msg"]},"application/vnd.ms-package.obfuscated-opentype":{"source":"apache"},"application/vnd.ms-pki.seccat":{"source":"apache","extensions":["cat"]},"application/vnd.ms-pki.stl":{"source":"apache","extensions":["stl"]},"application/vnd.ms-playready.initiator+xml":{"source":"iana","compressible":true},"application/vnd.ms-powerpoint":{"source":"iana","compressible":false,"extensions":["ppt","pps","pot"]},"application/vnd.ms-powerpoint.addin.macroenabled.12":{"source":"iana","extensions":["ppam"]},"application/vnd.ms-powerpoint.presentation.macroenabled.12":{"source":"iana","extensions":["pptm"]},"application/vnd.ms-powerpoint.slide.macroenabled.12":{"source":"iana","extensions":["sldm"]},"application/vnd.ms-powerpoint.slideshow.macroenabled.12":{"source":"iana","extensions":["ppsm"]},"application/vnd.ms-powerpoint.template.macroenabled.12":{"source":"iana","extensions":["potm"]},"application/vnd.ms-printdevicecapabilities+xml":{"source":"iana","compressible":true},"application/vnd.ms-printing.printticket+xml":{"source":"apache","compressible":true},"application/vnd.ms-printschematicket+xml":{"source":"iana","compressible":true},"application/vnd.ms-project":{"source":"iana","extensions":["mpp","mpt"]},"application/vnd.ms-tnef":{"source":"iana"},"application/vnd.ms-windows.devicepairing":{"source":"iana"},"application/vnd.ms-windows.nwprinting.oob":{"source":"iana"},"application/vnd.ms-windows.printerpairing":{"source":"iana"},"application/vnd.ms-windows.wsd.oob":{"source":"iana"},"application/vnd.ms-wmdrm.lic-chlg-req":{"source":"iana"},"application/vnd.ms-wmdrm.lic-resp":{"source":"iana"},"application/vnd.ms-wmdrm.meter-chlg-req":{"source":"iana"},"application/vnd.ms-wmdrm.meter-resp":{"source":"iana"},"application/vnd.ms-word.document.macroenabled.12":{"source":"iana","extensions":["docm"]},"application/vnd.ms-word.template.macroenabled.12":{"source":"iana","extensions":["dotm"]},"application/vnd.ms-works":{"source":"iana","extensions":["wps","wks","wcm","wdb"]},"application/vnd.ms-wpl":{"source":"iana","extensions":["wpl"]},"application/vnd.ms-xpsdocument":{"source":"iana","compressible":false,"extensions":["xps"]},"application/vnd.msa-disk-image":{"source":"iana"},"application/vnd.mseq":{"source":"iana","extensions":["mseq"]},"application/vnd.msign":{"source":"iana"},"application/vnd.multiad.creator":{"source":"iana"},"application/vnd.multiad.creator.cif":{"source":"iana"},"application/vnd.music-niff":{"source":"iana"},"application/vnd.musician":{"source":"iana","extensions":["mus"]},"application/vnd.muvee.style":{"source":"iana","extensions":["msty"]},"application/vnd.mynfc":{"source":"iana","extensions":["taglet"]},"application/vnd.ncd.control":{"source":"iana"},"application/vnd.ncd.reference":{"source":"iana"},"application/vnd.nearst.inv+json":{"source":"iana","compressible":true},"application/vnd.nervana":{"source":"iana"},"application/vnd.netfpx":{"source":"iana"},"application/vnd.neurolanguage.nlu":{"source":"iana","extensions":["nlu"]},"application/vnd.nimn":{"source":"iana"},"application/vnd.nintendo.nitro.rom":{"source":"iana"},"application/vnd.nintendo.snes.rom":{"source":"iana"},"application/vnd.nitf":{"source":"iana","extensions":["ntf","nitf"]},"application/vnd.noblenet-directory":{"source":"iana","extensions":["nnd"]},"application/vnd.noblenet-sealer":{"source":"iana","extensions":["nns"]},"application/vnd.noblenet-web":{"source":"iana","extensions":["nnw"]},"application/vnd.nokia.catalogs":{"source":"iana"},"application/vnd.nokia.conml+wbxml":{"source":"iana"},"application/vnd.nokia.conml+xml":{"source":"iana","compressible":true},"application/vnd.nokia.iptv.config+xml":{"source":"iana","compressible":true},"application/vnd.nokia.isds-radio-presets":{"source":"iana"},"application/vnd.nokia.landmark+wbxml":{"source":"iana"},"application/vnd.nokia.landmark+xml":{"source":"iana","compressible":true},"application/vnd.nokia.landmarkcollection+xml":{"source":"iana","compressible":true},"application/vnd.nokia.n-gage.ac+xml":{"source":"iana","compressible":true},"application/vnd.nokia.n-gage.data":{"source":"iana","extensions":["ngdat"]},"application/vnd.nokia.n-gage.symbian.install":{"source":"iana","extensions":["n-gage"]},"application/vnd.nokia.ncd":{"source":"iana"},"application/vnd.nokia.pcd+wbxml":{"source":"iana"},"application/vnd.nokia.pcd+xml":{"source":"iana","compressible":true},"application/vnd.nokia.radio-preset":{"source":"iana","extensions":["rpst"]},"application/vnd.nokia.radio-presets":{"source":"iana","extensions":["rpss"]},"application/vnd.novadigm.edm":{"source":"iana","extensions":["edm"]},"application/vnd.novadigm.edx":{"source":"iana","extensions":["edx"]},"application/vnd.novadigm.ext":{"source":"iana","extensions":["ext"]},"application/vnd.ntt-local.content-share":{"source":"iana"},"application/vnd.ntt-local.file-transfer":{"source":"iana"},"application/vnd.ntt-local.ogw_remote-access":{"source":"iana"},"application/vnd.ntt-local.sip-ta_remote":{"source":"iana"},"application/vnd.ntt-local.sip-ta_tcp_stream":{"source":"iana"},"application/vnd.oasis.opendocument.chart":{"source":"iana","extensions":["odc"]},"application/vnd.oasis.opendocument.chart-template":{"source":"iana","extensions":["otc"]},"application/vnd.oasis.opendocument.database":{"source":"iana","extensions":["odb"]},"application/vnd.oasis.opendocument.formula":{"source":"iana","extensions":["odf"]},"application/vnd.oasis.opendocument.formula-template":{"source":"iana","extensions":["odft"]},"application/vnd.oasis.opendocument.graphics":{"source":"iana","compressible":false,"extensions":["odg"]},"application/vnd.oasis.opendocument.graphics-template":{"source":"iana","extensions":["otg"]},"application/vnd.oasis.opendocument.image":{"source":"iana","extensions":["odi"]},"application/vnd.oasis.opendocument.image-template":{"source":"iana","extensions":["oti"]},"application/vnd.oasis.opendocument.presentation":{"source":"iana","compressible":false,"extensions":["odp"]},"application/vnd.oasis.opendocument.presentation-template":{"source":"iana","extensions":["otp"]},"application/vnd.oasis.opendocument.spreadsheet":{"source":"iana","compressible":false,"extensions":["ods"]},"application/vnd.oasis.opendocument.spreadsheet-template":{"source":"iana","extensions":["ots"]},"application/vnd.oasis.opendocument.text":{"source":"iana","compressible":false,"extensions":["odt"]},"application/vnd.oasis.opendocument.text-master":{"source":"iana","extensions":["odm"]},"application/vnd.oasis.opendocument.text-template":{"source":"iana","extensions":["ott"]},"application/vnd.oasis.opendocument.text-web":{"source":"iana","extensions":["oth"]},"application/vnd.obn":{"source":"iana"},"application/vnd.ocf+cbor":{"source":"iana"},"application/vnd.oftn.l10n+json":{"source":"iana","compressible":true},"application/vnd.oipf.contentaccessdownload+xml":{"source":"iana","compressible":true},"application/vnd.oipf.contentaccessstreaming+xml":{"source":"iana","compressible":true},"application/vnd.oipf.cspg-hexbinary":{"source":"iana"},"application/vnd.oipf.dae.svg+xml":{"source":"iana","compressible":true},"application/vnd.oipf.dae.xhtml+xml":{"source":"iana","compressible":true},"application/vnd.oipf.mippvcontrolmessage+xml":{"source":"iana","compressible":true},"application/vnd.oipf.pae.gem":{"source":"iana"},"application/vnd.oipf.spdiscovery+xml":{"source":"iana","compressible":true},"application/vnd.oipf.spdlist+xml":{"source":"iana","compressible":true},"application/vnd.oipf.ueprofile+xml":{"source":"iana","compressible":true},"application/vnd.oipf.userprofile+xml":{"source":"iana","compressible":true},"application/vnd.olpc-sugar":{"source":"iana","extensions":["xo"]},"application/vnd.oma-scws-config":{"source":"iana"},"application/vnd.oma-scws-http-request":{"source":"iana"},"application/vnd.oma-scws-http-response":{"source":"iana"},"application/vnd.oma.bcast.associated-procedure-parameter+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.drm-trigger+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.imd+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.ltkm":{"source":"iana"},"application/vnd.oma.bcast.notification+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.provisioningtrigger":{"source":"iana"},"application/vnd.oma.bcast.sgboot":{"source":"iana"},"application/vnd.oma.bcast.sgdd+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.sgdu":{"source":"iana"},"application/vnd.oma.bcast.simple-symbol-container":{"source":"iana"},"application/vnd.oma.bcast.smartcard-trigger+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.sprov+xml":{"source":"iana","compressible":true},"application/vnd.oma.bcast.stkm":{"source":"iana"},"application/vnd.oma.cab-address-book+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-feature-handler+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-pcc+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-subs-invite+xml":{"source":"iana","compressible":true},"application/vnd.oma.cab-user-prefs+xml":{"source":"iana","compressible":true},"application/vnd.oma.dcd":{"source":"iana"},"application/vnd.oma.dcdc":{"source":"iana"},"application/vnd.oma.dd2+xml":{"source":"iana","compressible":true,"extensions":["dd2"]},"application/vnd.oma.drm.risd+xml":{"source":"iana","compressible":true},"application/vnd.oma.group-usage-list+xml":{"source":"iana","compressible":true},"application/vnd.oma.lwm2m+json":{"source":"iana","compressible":true},"application/vnd.oma.lwm2m+tlv":{"source":"iana"},"application/vnd.oma.pal+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.detailed-progress-report+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.final-report+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.groups+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.invocation-descriptor+xml":{"source":"iana","compressible":true},"application/vnd.oma.poc.optimized-progress-report+xml":{"source":"iana","compressible":true},"application/vnd.oma.push":{"source":"iana"},"application/vnd.oma.scidm.messages+xml":{"source":"iana","compressible":true},"application/vnd.oma.xcap-directory+xml":{"source":"iana","compressible":true},"application/vnd.omads-email+xml":{"source":"iana","compressible":true},"application/vnd.omads-file+xml":{"source":"iana","compressible":true},"application/vnd.omads-folder+xml":{"source":"iana","compressible":true},"application/vnd.omaloc-supl-init":{"source":"iana"},"application/vnd.onepager":{"source":"iana"},"application/vnd.onepagertamp":{"source":"iana"},"application/vnd.onepagertamx":{"source":"iana"},"application/vnd.onepagertat":{"source":"iana"},"application/vnd.onepagertatp":{"source":"iana"},"application/vnd.onepagertatx":{"source":"iana"},"application/vnd.openblox.game+xml":{"source":"iana","compressible":true},"application/vnd.openblox.game-binary":{"source":"iana"},"application/vnd.openeye.oeb":{"source":"iana"},"application/vnd.openofficeorg.extension":{"source":"apache","extensions":["oxt"]},"application/vnd.openstreetmap.data+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.custom-properties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.customxmlproperties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawing+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.chart+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramcolors+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramdata+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramlayout+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.drawingml.diagramstyle+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.extended-properties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.commentauthors+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.comments+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.handoutmaster+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.notesmaster+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.notesslide+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.presentation":{"source":"iana","compressible":false,"extensions":["pptx"]},"application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.presprops+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slide":{"source":"iana","extensions":["sldx"]},"application/vnd.openxmlformats-officedocument.presentationml.slide+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slidelayout+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slidemaster+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slideshow":{"source":"iana","extensions":["ppsx"]},"application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.slideupdateinfo+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.tablestyles+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.tags+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.template":{"source":"iana","extensions":["potx"]},"application/vnd.openxmlformats-officedocument.presentationml.template.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.presentationml.viewprops+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.calcchain+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.externallink+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcachedefinition+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcacherecords+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.pivottable+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.querytable+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionheaders+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionlog+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedstrings+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":{"source":"iana","compressible":false,"extensions":["xlsx"]},"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.sheetmetadata+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.tablesinglecells+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.template":{"source":"iana","extensions":["xltx"]},"application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.usernames+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.volatiledependencies+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.theme+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.themeoverride+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.vmldrawing":{"source":"iana"},"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.document":{"source":"iana","compressible":false,"extensions":["docx"]},"application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.fonttable+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.template":{"source":"iana","extensions":["dotx"]},"application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-officedocument.wordprocessingml.websettings+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-package.core-properties+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml":{"source":"iana","compressible":true},"application/vnd.openxmlformats-package.relationships+xml":{"source":"iana","compressible":true},"application/vnd.oracle.resource+json":{"source":"iana","compressible":true},"application/vnd.orange.indata":{"source":"iana"},"application/vnd.osa.netdeploy":{"source":"iana"},"application/vnd.osgeo.mapguide.package":{"source":"iana","extensions":["mgp"]},"application/vnd.osgi.bundle":{"source":"iana"},"application/vnd.osgi.dp":{"source":"iana","extensions":["dp"]},"application/vnd.osgi.subsystem":{"source":"iana","extensions":["esa"]},"application/vnd.otps.ct-kip+xml":{"source":"iana","compressible":true},"application/vnd.oxli.countgraph":{"source":"iana"},"application/vnd.pagerduty+json":{"source":"iana","compressible":true},"application/vnd.palm":{"source":"iana","extensions":["pdb","pqa","oprc"]},"application/vnd.panoply":{"source":"iana"},"application/vnd.paos+xml":{"source":"iana","compressible":true},"application/vnd.paos.xml":{"source":"apache"},"application/vnd.patentdive":{"source":"iana"},"application/vnd.pawaafile":{"source":"iana","extensions":["paw"]},"application/vnd.pcos":{"source":"iana"},"application/vnd.pg.format":{"source":"iana","extensions":["str"]},"application/vnd.pg.osasli":{"source":"iana","extensions":["ei6"]},"application/vnd.piaccess.application-licence":{"source":"iana"},"application/vnd.picsel":{"source":"iana","extensions":["efif"]},"application/vnd.pmi.widget":{"source":"iana","extensions":["wg"]},"application/vnd.poc.group-advertisement+xml":{"source":"iana","compressible":true},"application/vnd.pocketlearn":{"source":"iana","extensions":["plf"]},"application/vnd.powerbuilder6":{"source":"iana","extensions":["pbd"]},"application/vnd.powerbuilder6-s":{"source":"iana"},"application/vnd.powerbuilder7":{"source":"iana"},"application/vnd.powerbuilder7-s":{"source":"iana"},"application/vnd.powerbuilder75":{"source":"iana"},"application/vnd.powerbuilder75-s":{"source":"iana"},"application/vnd.preminet":{"source":"iana"},"application/vnd.previewsystems.box":{"source":"iana","extensions":["box"]},"application/vnd.proteus.magazine":{"source":"iana","extensions":["mgz"]},"application/vnd.psfs":{"source":"iana"},"application/vnd.publishare-delta-tree":{"source":"iana","extensions":["qps"]},"application/vnd.pvi.ptid1":{"source":"iana","extensions":["ptid"]},"application/vnd.pwg-multiplexed":{"source":"iana"},"application/vnd.pwg-xhtml-print+xml":{"source":"iana","compressible":true},"application/vnd.qualcomm.brew-app-res":{"source":"iana"},"application/vnd.quarantainenet":{"source":"iana"},"application/vnd.quark.quarkxpress":{"source":"iana","extensions":["qxd","qxt","qwd","qwt","qxl","qxb"]},"application/vnd.quobject-quoxdocument":{"source":"iana"},"application/vnd.radisys.moml+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-conf+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-conn+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-dialog+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-audit-stream+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-conf+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-base+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-fax-detect+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-fax-sendrecv+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-group+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-speech+xml":{"source":"iana","compressible":true},"application/vnd.radisys.msml-dialog-transform+xml":{"source":"iana","compressible":true},"application/vnd.rainstor.data":{"source":"iana"},"application/vnd.rapid":{"source":"iana"},"application/vnd.rar":{"source":"iana"},"application/vnd.realvnc.bed":{"source":"iana","extensions":["bed"]},"application/vnd.recordare.musicxml":{"source":"iana","extensions":["mxl"]},"application/vnd.recordare.musicxml+xml":{"source":"iana","compressible":true,"extensions":["musicxml"]},"application/vnd.renlearn.rlprint":{"source":"iana"},"application/vnd.restful+json":{"source":"iana","compressible":true},"application/vnd.rig.cryptonote":{"source":"iana","extensions":["cryptonote"]},"application/vnd.rim.cod":{"source":"apache","extensions":["cod"]},"application/vnd.rn-realmedia":{"source":"apache","extensions":["rm"]},"application/vnd.rn-realmedia-vbr":{"source":"apache","extensions":["rmvb"]},"application/vnd.route66.link66+xml":{"source":"iana","compressible":true,"extensions":["link66"]},"application/vnd.rs-274x":{"source":"iana"},"application/vnd.ruckus.download":{"source":"iana"},"application/vnd.s3sms":{"source":"iana"},"application/vnd.sailingtracker.track":{"source":"iana","extensions":["st"]},"application/vnd.sbm.cid":{"source":"iana"},"application/vnd.sbm.mid2":{"source":"iana"},"application/vnd.scribus":{"source":"iana"},"application/vnd.sealed.3df":{"source":"iana"},"application/vnd.sealed.csf":{"source":"iana"},"application/vnd.sealed.doc":{"source":"iana"},"application/vnd.sealed.eml":{"source":"iana"},"application/vnd.sealed.mht":{"source":"iana"},"application/vnd.sealed.net":{"source":"iana"},"application/vnd.sealed.ppt":{"source":"iana"},"application/vnd.sealed.tiff":{"source":"iana"},"application/vnd.sealed.xls":{"source":"iana"},"application/vnd.sealedmedia.softseal.html":{"source":"iana"},"application/vnd.sealedmedia.softseal.pdf":{"source":"iana"},"application/vnd.seemail":{"source":"iana","extensions":["see"]},"application/vnd.sema":{"source":"iana","extensions":["sema"]},"application/vnd.semd":{"source":"iana","extensions":["semd"]},"application/vnd.semf":{"source":"iana","extensions":["semf"]},"application/vnd.shana.informed.formdata":{"source":"iana","extensions":["ifm"]},"application/vnd.shana.informed.formtemplate":{"source":"iana","extensions":["itp"]},"application/vnd.shana.informed.interchange":{"source":"iana","extensions":["iif"]},"application/vnd.shana.informed.package":{"source":"iana","extensions":["ipk"]},"application/vnd.shootproof+json":{"source":"iana","compressible":true},"application/vnd.sigrok.session":{"source":"iana"},"application/vnd.simtech-mindmapper":{"source":"iana","extensions":["twd","twds"]},"application/vnd.siren+json":{"source":"iana","compressible":true},"application/vnd.smaf":{"source":"iana","extensions":["mmf"]},"application/vnd.smart.notebook":{"source":"iana"},"application/vnd.smart.teacher":{"source":"iana","extensions":["teacher"]},"application/vnd.software602.filler.form+xml":{"source":"iana","compressible":true},"application/vnd.software602.filler.form-xml-zip":{"source":"iana"},"application/vnd.solent.sdkm+xml":{"source":"iana","compressible":true,"extensions":["sdkm","sdkd"]},"application/vnd.spotfire.dxp":{"source":"iana","extensions":["dxp"]},"application/vnd.spotfire.sfs":{"source":"iana","extensions":["sfs"]},"application/vnd.sqlite3":{"source":"iana"},"application/vnd.sss-cod":{"source":"iana"},"application/vnd.sss-dtf":{"source":"iana"},"application/vnd.sss-ntf":{"source":"iana"},"application/vnd.stardivision.calc":{"source":"apache","extensions":["sdc"]},"application/vnd.stardivision.draw":{"source":"apache","extensions":["sda"]},"application/vnd.stardivision.impress":{"source":"apache","extensions":["sdd"]},"application/vnd.stardivision.math":{"source":"apache","extensions":["smf"]},"application/vnd.stardivision.writer":{"source":"apache","extensions":["sdw","vor"]},"application/vnd.stardivision.writer-global":{"source":"apache","extensions":["sgl"]},"application/vnd.stepmania.package":{"source":"iana","extensions":["smzip"]},"application/vnd.stepmania.stepchart":{"source":"iana","extensions":["sm"]},"application/vnd.street-stream":{"source":"iana"},"application/vnd.sun.wadl+xml":{"source":"iana","compressible":true,"extensions":["wadl"]},"application/vnd.sun.xml.calc":{"source":"apache","extensions":["sxc"]},"application/vnd.sun.xml.calc.template":{"source":"apache","extensions":["stc"]},"application/vnd.sun.xml.draw":{"source":"apache","extensions":["sxd"]},"application/vnd.sun.xml.draw.template":{"source":"apache","extensions":["std"]},"application/vnd.sun.xml.impress":{"source":"apache","extensions":["sxi"]},"application/vnd.sun.xml.impress.template":{"source":"apache","extensions":["sti"]},"application/vnd.sun.xml.math":{"source":"apache","extensions":["sxm"]},"application/vnd.sun.xml.writer":{"source":"apache","extensions":["sxw"]},"application/vnd.sun.xml.writer.global":{"source":"apache","extensions":["sxg"]},"application/vnd.sun.xml.writer.template":{"source":"apache","extensions":["stw"]},"application/vnd.sus-calendar":{"source":"iana","extensions":["sus","susp"]},"application/vnd.svd":{"source":"iana","extensions":["svd"]},"application/vnd.swiftview-ics":{"source":"iana"},"application/vnd.symbian.install":{"source":"apache","extensions":["sis","sisx"]},"application/vnd.syncml+xml":{"source":"iana","compressible":true,"extensions":["xsm"]},"application/vnd.syncml.dm+wbxml":{"source":"iana","extensions":["bdm"]},"application/vnd.syncml.dm+xml":{"source":"iana","compressible":true,"extensions":["xdm"]},"application/vnd.syncml.dm.notification":{"source":"iana"},"application/vnd.syncml.dmddf+wbxml":{"source":"iana"},"application/vnd.syncml.dmddf+xml":{"source":"iana","compressible":true},"application/vnd.syncml.dmtnds+wbxml":{"source":"iana"},"application/vnd.syncml.dmtnds+xml":{"source":"iana","compressible":true},"application/vnd.syncml.ds.notification":{"source":"iana"},"application/vnd.tableschema+json":{"source":"iana","compressible":true},"application/vnd.tao.intent-module-archive":{"source":"iana","extensions":["tao"]},"application/vnd.tcpdump.pcap":{"source":"iana","extensions":["pcap","cap","dmp"]},"application/vnd.think-cell.ppttc+json":{"source":"iana","compressible":true},"application/vnd.tmd.mediaflex.api+xml":{"source":"iana","compressible":true},"application/vnd.tml":{"source":"iana"},"application/vnd.tmobile-livetv":{"source":"iana","extensions":["tmo"]},"application/vnd.tri.onesource":{"source":"iana"},"application/vnd.trid.tpt":{"source":"iana","extensions":["tpt"]},"application/vnd.triscape.mxs":{"source":"iana","extensions":["mxs"]},"application/vnd.trueapp":{"source":"iana","extensions":["tra"]},"application/vnd.truedoc":{"source":"iana"},"application/vnd.ubisoft.webplayer":{"source":"iana"},"application/vnd.ufdl":{"source":"iana","extensions":["ufd","ufdl"]},"application/vnd.uiq.theme":{"source":"iana","extensions":["utz"]},"application/vnd.umajin":{"source":"iana","extensions":["umj"]},"application/vnd.unity":{"source":"iana","extensions":["unityweb"]},"application/vnd.uoml+xml":{"source":"iana","compressible":true,"extensions":["uoml"]},"application/vnd.uplanet.alert":{"source":"iana"},"application/vnd.uplanet.alert-wbxml":{"source":"iana"},"application/vnd.uplanet.bearer-choice":{"source":"iana"},"application/vnd.uplanet.bearer-choice-wbxml":{"source":"iana"},"application/vnd.uplanet.cacheop":{"source":"iana"},"application/vnd.uplanet.cacheop-wbxml":{"source":"iana"},"application/vnd.uplanet.channel":{"source":"iana"},"application/vnd.uplanet.channel-wbxml":{"source":"iana"},"application/vnd.uplanet.list":{"source":"iana"},"application/vnd.uplanet.list-wbxml":{"source":"iana"},"application/vnd.uplanet.listcmd":{"source":"iana"},"application/vnd.uplanet.listcmd-wbxml":{"source":"iana"},"application/vnd.uplanet.signal":{"source":"iana"},"application/vnd.uri-map":{"source":"iana"},"application/vnd.valve.source.material":{"source":"iana"},"application/vnd.vcx":{"source":"iana","extensions":["vcx"]},"application/vnd.vd-study":{"source":"iana"},"application/vnd.vectorworks":{"source":"iana"},"application/vnd.vel+json":{"source":"iana","compressible":true},"application/vnd.verimatrix.vcas":{"source":"iana"},"application/vnd.vidsoft.vidconference":{"source":"iana"},"application/vnd.visio":{"source":"iana","extensions":["vsd","vst","vss","vsw"]},"application/vnd.visionary":{"source":"iana","extensions":["vis"]},"application/vnd.vividence.scriptfile":{"source":"iana"},"application/vnd.vsf":{"source":"iana","extensions":["vsf"]},"application/vnd.wap.sic":{"source":"iana"},"application/vnd.wap.slc":{"source":"iana"},"application/vnd.wap.wbxml":{"source":"iana","extensions":["wbxml"]},"application/vnd.wap.wmlc":{"source":"iana","extensions":["wmlc"]},"application/vnd.wap.wmlscriptc":{"source":"iana","extensions":["wmlsc"]},"application/vnd.webturbo":{"source":"iana","extensions":["wtb"]},"application/vnd.wfa.p2p":{"source":"iana"},"application/vnd.wfa.wsc":{"source":"iana"},"application/vnd.windows.devicepairing":{"source":"iana"},"application/vnd.wmc":{"source":"iana"},"application/vnd.wmf.bootstrap":{"source":"iana"},"application/vnd.wolfram.mathematica":{"source":"iana"},"application/vnd.wolfram.mathematica.package":{"source":"iana"},"application/vnd.wolfram.player":{"source":"iana","extensions":["nbp"]},"application/vnd.wordperfect":{"source":"iana","extensions":["wpd"]},"application/vnd.wqd":{"source":"iana","extensions":["wqd"]},"application/vnd.wrq-hp3000-labelled":{"source":"iana"},"application/vnd.wt.stf":{"source":"iana","extensions":["stf"]},"application/vnd.wv.csp+wbxml":{"source":"iana"},"application/vnd.wv.csp+xml":{"source":"iana","compressible":true},"application/vnd.wv.ssp+xml":{"source":"iana","compressible":true},"application/vnd.xacml+json":{"source":"iana","compressible":true},"application/vnd.xara":{"source":"iana","extensions":["xar"]},"application/vnd.xfdl":{"source":"iana","extensions":["xfdl"]},"application/vnd.xfdl.webform":{"source":"iana"},"application/vnd.xmi+xml":{"source":"iana","compressible":true},"application/vnd.xmpie.cpkg":{"source":"iana"},"application/vnd.xmpie.dpkg":{"source":"iana"},"application/vnd.xmpie.plan":{"source":"iana"},"application/vnd.xmpie.ppkg":{"source":"iana"},"application/vnd.xmpie.xlim":{"source":"iana"},"application/vnd.yamaha.hv-dic":{"source":"iana","extensions":["hvd"]},"application/vnd.yamaha.hv-script":{"source":"iana","extensions":["hvs"]},"application/vnd.yamaha.hv-voice":{"source":"iana","extensions":["hvp"]},"application/vnd.yamaha.openscoreformat":{"source":"iana","extensions":["osf"]},"application/vnd.yamaha.openscoreformat.osfpvg+xml":{"source":"iana","compressible":true,"extensions":["osfpvg"]},"application/vnd.yamaha.remote-setup":{"source":"iana"},"application/vnd.yamaha.smaf-audio":{"source":"iana","extensions":["saf"]},"application/vnd.yamaha.smaf-phrase":{"source":"iana","extensions":["spf"]},"application/vnd.yamaha.through-ngn":{"source":"iana"},"application/vnd.yamaha.tunnel-udpencap":{"source":"iana"},"application/vnd.yaoweme":{"source":"iana"},"application/vnd.yellowriver-custom-menu":{"source":"iana","extensions":["cmp"]},"application/vnd.youtube.yt":{"source":"iana"},"application/vnd.zul":{"source":"iana","extensions":["zir","zirz"]},"application/vnd.zzazz.deck+xml":{"source":"iana","compressible":true,"extensions":["zaz"]},"application/voicexml+xml":{"source":"iana","compressible":true,"extensions":["vxml"]},"application/voucher-cms+json":{"source":"iana","compressible":true},"application/vq-rtcpxr":{"source":"iana"},"application/wasm":{"compressible":true,"extensions":["wasm"]},"application/watcherinfo+xml":{"source":"iana","compressible":true},"application/webpush-options+json":{"source":"iana","compressible":true},"application/whoispp-query":{"source":"iana"},"application/whoispp-response":{"source":"iana"},"application/widget":{"source":"iana","extensions":["wgt"]},"application/winhlp":{"source":"apache","extensions":["hlp"]},"application/wita":{"source":"iana"},"application/wordperfect5.1":{"source":"iana"},"application/wsdl+xml":{"source":"iana","compressible":true,"extensions":["wsdl"]},"application/wspolicy+xml":{"source":"iana","compressible":true,"extensions":["wspolicy"]},"application/x-7z-compressed":{"source":"apache","compressible":false,"extensions":["7z"]},"application/x-abiword":{"source":"apache","extensions":["abw"]},"application/x-ace-compressed":{"source":"apache","extensions":["ace"]},"application/x-amf":{"source":"apache"},"application/x-apple-diskimage":{"source":"apache","extensions":["dmg"]},"application/x-arj":{"compressible":false,"extensions":["arj"]},"application/x-authorware-bin":{"source":"apache","extensions":["aab","x32","u32","vox"]},"application/x-authorware-map":{"source":"apache","extensions":["aam"]},"application/x-authorware-seg":{"source":"apache","extensions":["aas"]},"application/x-bcpio":{"source":"apache","extensions":["bcpio"]},"application/x-bdoc":{"compressible":false,"extensions":["bdoc"]},"application/x-bittorrent":{"source":"apache","extensions":["torrent"]},"application/x-blorb":{"source":"apache","extensions":["blb","blorb"]},"application/x-bzip":{"source":"apache","compressible":false,"extensions":["bz"]},"application/x-bzip2":{"source":"apache","compressible":false,"extensions":["bz2","boz"]},"application/x-cbr":{"source":"apache","extensions":["cbr","cba","cbt","cbz","cb7"]},"application/x-cdlink":{"source":"apache","extensions":["vcd"]},"application/x-cfs-compressed":{"source":"apache","extensions":["cfs"]},"application/x-chat":{"source":"apache","extensions":["chat"]},"application/x-chess-pgn":{"source":"apache","extensions":["pgn"]},"application/x-chrome-extension":{"extensions":["crx"]},"application/x-cocoa":{"source":"nginx","extensions":["cco"]},"application/x-compress":{"source":"apache"},"application/x-conference":{"source":"apache","extensions":["nsc"]},"application/x-cpio":{"source":"apache","extensions":["cpio"]},"application/x-csh":{"source":"apache","extensions":["csh"]},"application/x-deb":{"compressible":false},"application/x-debian-package":{"source":"apache","extensions":["deb","udeb"]},"application/x-dgc-compressed":{"source":"apache","extensions":["dgc"]},"application/x-director":{"source":"apache","extensions":["dir","dcr","dxr","cst","cct","cxt","w3d","fgd","swa"]},"application/x-doom":{"source":"apache","extensions":["wad"]},"application/x-dtbncx+xml":{"source":"apache","compressible":true,"extensions":["ncx"]},"application/x-dtbook+xml":{"source":"apache","compressible":true,"extensions":["dtb"]},"application/x-dtbresource+xml":{"source":"apache","compressible":true,"extensions":["res"]},"application/x-dvi":{"source":"apache","compressible":false,"extensions":["dvi"]},"application/x-envoy":{"source":"apache","extensions":["evy"]},"application/x-eva":{"source":"apache","extensions":["eva"]},"application/x-font-bdf":{"source":"apache","extensions":["bdf"]},"application/x-font-dos":{"source":"apache"},"application/x-font-framemaker":{"source":"apache"},"application/x-font-ghostscript":{"source":"apache","extensions":["gsf"]},"application/x-font-libgrx":{"source":"apache"},"application/x-font-linux-psf":{"source":"apache","extensions":["psf"]},"application/x-font-pcf":{"source":"apache","extensions":["pcf"]},"application/x-font-snf":{"source":"apache","extensions":["snf"]},"application/x-font-speedo":{"source":"apache"},"application/x-font-sunos-news":{"source":"apache"},"application/x-font-type1":{"source":"apache","extensions":["pfa","pfb","pfm","afm"]},"application/x-font-vfont":{"source":"apache"},"application/x-freearc":{"source":"apache","extensions":["arc"]},"application/x-futuresplash":{"source":"apache","extensions":["spl"]},"application/x-gca-compressed":{"source":"apache","extensions":["gca"]},"application/x-glulx":{"source":"apache","extensions":["ulx"]},"application/x-gnumeric":{"source":"apache","extensions":["gnumeric"]},"application/x-gramps-xml":{"source":"apache","extensions":["gramps"]},"application/x-gtar":{"source":"apache","extensions":["gtar"]},"application/x-gzip":{"source":"apache"},"application/x-hdf":{"source":"apache","extensions":["hdf"]},"application/x-httpd-php":{"compressible":true,"extensions":["php"]},"application/x-install-instructions":{"source":"apache","extensions":["install"]},"application/x-iso9660-image":{"source":"apache","extensions":["iso"]},"application/x-java-archive-diff":{"source":"nginx","extensions":["jardiff"]},"application/x-java-jnlp-file":{"source":"apache","compressible":false,"extensions":["jnlp"]},"application/x-javascript":{"compressible":true},"application/x-latex":{"source":"apache","compressible":false,"extensions":["latex"]},"application/x-lua-bytecode":{"extensions":["luac"]},"application/x-lzh-compressed":{"source":"apache","extensions":["lzh","lha"]},"application/x-makeself":{"source":"nginx","extensions":["run"]},"application/x-mie":{"source":"apache","extensions":["mie"]},"application/x-mobipocket-ebook":{"source":"apache","extensions":["prc","mobi"]},"application/x-mpegurl":{"compressible":false},"application/x-ms-application":{"source":"apache","extensions":["application"]},"application/x-ms-shortcut":{"source":"apache","extensions":["lnk"]},"application/x-ms-wmd":{"source":"apache","extensions":["wmd"]},"application/x-ms-wmz":{"source":"apache","extensions":["wmz"]},"application/x-ms-xbap":{"source":"apache","extensions":["xbap"]},"application/x-msaccess":{"source":"apache","extensions":["mdb"]},"application/x-msbinder":{"source":"apache","extensions":["obd"]},"application/x-mscardfile":{"source":"apache","extensions":["crd"]},"application/x-msclip":{"source":"apache","extensions":["clp"]},"application/x-msdos-program":{"extensions":["exe"]},"application/x-msdownload":{"source":"apache","extensions":["exe","dll","com","bat","msi"]},"application/x-msmediaview":{"source":"apache","extensions":["mvb","m13","m14"]},"application/x-msmetafile":{"source":"apache","extensions":["wmf","wmz","emf","emz"]},"application/x-msmoney":{"source":"apache","extensions":["mny"]},"application/x-mspublisher":{"source":"apache","extensions":["pub"]},"application/x-msschedule":{"source":"apache","extensions":["scd"]},"application/x-msterminal":{"source":"apache","extensions":["trm"]},"application/x-mswrite":{"source":"apache","extensions":["wri"]},"application/x-netcdf":{"source":"apache","extensions":["nc","cdf"]},"application/x-ns-proxy-autoconfig":{"compressible":true,"extensions":["pac"]},"application/x-nzb":{"source":"apache","extensions":["nzb"]},"application/x-perl":{"source":"nginx","extensions":["pl","pm"]},"application/x-pilot":{"source":"nginx","extensions":["prc","pdb"]},"application/x-pkcs12":{"source":"apache","compressible":false,"extensions":["p12","pfx"]},"application/x-pkcs7-certificates":{"source":"apache","extensions":["p7b","spc"]},"application/x-pkcs7-certreqresp":{"source":"apache","extensions":["p7r"]},"application/x-rar-compressed":{"source":"apache","compressible":false,"extensions":["rar"]},"application/x-redhat-package-manager":{"source":"nginx","extensions":["rpm"]},"application/x-research-info-systems":{"source":"apache","extensions":["ris"]},"application/x-sea":{"source":"nginx","extensions":["sea"]},"application/x-sh":{"source":"apache","compressible":true,"extensions":["sh"]},"application/x-shar":{"source":"apache","extensions":["shar"]},"application/x-shockwave-flash":{"source":"apache","compressible":false,"extensions":["swf"]},"application/x-silverlight-app":{"source":"apache","extensions":["xap"]},"application/x-sql":{"source":"apache","extensions":["sql"]},"application/x-stuffit":{"source":"apache","compressible":false,"extensions":["sit"]},"application/x-stuffitx":{"source":"apache","extensions":["sitx"]},"application/x-subrip":{"source":"apache","extensions":["srt"]},"application/x-sv4cpio":{"source":"apache","extensions":["sv4cpio"]},"application/x-sv4crc":{"source":"apache","extensions":["sv4crc"]},"application/x-t3vm-image":{"source":"apache","extensions":["t3"]},"application/x-tads":{"source":"apache","extensions":["gam"]},"application/x-tar":{"source":"apache","compressible":true,"extensions":["tar"]},"application/x-tcl":{"source":"apache","extensions":["tcl","tk"]},"application/x-tex":{"source":"apache","extensions":["tex"]},"application/x-tex-tfm":{"source":"apache","extensions":["tfm"]},"application/x-texinfo":{"source":"apache","extensions":["texinfo","texi"]},"application/x-tgif":{"source":"apache","extensions":["obj"]},"application/x-ustar":{"source":"apache","extensions":["ustar"]},"application/x-virtualbox-hdd":{"compressible":true,"extensions":["hdd"]},"application/x-virtualbox-ova":{"compressible":true,"extensions":["ova"]},"application/x-virtualbox-ovf":{"compressible":true,"extensions":["ovf"]},"application/x-virtualbox-vbox":{"compressible":true,"extensions":["vbox"]},"application/x-virtualbox-vbox-extpack":{"compressible":false,"extensions":["vbox-extpack"]},"application/x-virtualbox-vdi":{"compressible":true,"extensions":["vdi"]},"application/x-virtualbox-vhd":{"compressible":true,"extensions":["vhd"]},"application/x-virtualbox-vmdk":{"compressible":true,"extensions":["vmdk"]},"application/x-wais-source":{"source":"apache","extensions":["src"]},"application/x-web-app-manifest+json":{"compressible":true,"extensions":["webapp"]},"application/x-www-form-urlencoded":{"source":"iana","compressible":true},"application/x-x509-ca-cert":{"source":"apache","extensions":["der","crt","pem"]},"application/x-xfig":{"source":"apache","extensions":["fig"]},"application/x-xliff+xml":{"source":"apache","compressible":true,"extensions":["xlf"]},"application/x-xpinstall":{"source":"apache","compressible":false,"extensions":["xpi"]},"application/x-xz":{"source":"apache","extensions":["xz"]},"application/x-zmachine":{"source":"apache","extensions":["z1","z2","z3","z4","z5","z6","z7","z8"]},"application/x400-bp":{"source":"iana"},"application/xacml+xml":{"source":"iana","compressible":true},"application/xaml+xml":{"source":"apache","compressible":true,"extensions":["xaml"]},"application/xcap-att+xml":{"source":"iana","compressible":true},"application/xcap-caps+xml":{"source":"iana","compressible":true},"application/xcap-diff+xml":{"source":"iana","compressible":true,"extensions":["xdf"]},"application/xcap-el+xml":{"source":"iana","compressible":true},"application/xcap-error+xml":{"source":"iana","compressible":true},"application/xcap-ns+xml":{"source":"iana","compressible":true},"application/xcon-conference-info+xml":{"source":"iana","compressible":true},"application/xcon-conference-info-diff+xml":{"source":"iana","compressible":true},"application/xenc+xml":{"source":"iana","compressible":true,"extensions":["xenc"]},"application/xhtml+xml":{"source":"iana","compressible":true,"extensions":["xhtml","xht"]},"application/xhtml-voice+xml":{"source":"apache","compressible":true},"application/xliff+xml":{"source":"iana","compressible":true},"application/xml":{"source":"iana","compressible":true,"extensions":["xml","xsl","xsd","rng"]},"application/xml-dtd":{"source":"iana","compressible":true,"extensions":["dtd"]},"application/xml-external-parsed-entity":{"source":"iana"},"application/xml-patch+xml":{"source":"iana","compressible":true},"application/xmpp+xml":{"source":"iana","compressible":true},"application/xop+xml":{"source":"iana","compressible":true,"extensions":["xop"]},"application/xproc+xml":{"source":"apache","compressible":true,"extensions":["xpl"]},"application/xslt+xml":{"source":"iana","compressible":true,"extensions":["xslt"]},"application/xspf+xml":{"source":"apache","compressible":true,"extensions":["xspf"]},"application/xv+xml":{"source":"iana","compressible":true,"extensions":["mxml","xhvml","xvml","xvm"]},"application/yang":{"source":"iana","extensions":["yang"]},"application/yang-data+json":{"source":"iana","compressible":true},"application/yang-data+xml":{"source":"iana","compressible":true},"application/yang-patch+json":{"source":"iana","compressible":true},"application/yang-patch+xml":{"source":"iana","compressible":true},"application/yin+xml":{"source":"iana","compressible":true,"extensions":["yin"]},"application/zip":{"source":"iana","compressible":false,"extensions":["zip"]},"application/zlib":{"source":"iana"},"audio/1d-interleaved-parityfec":{"source":"iana"},"audio/32kadpcm":{"source":"iana"},"audio/3gpp":{"source":"iana","compressible":false,"extensions":["3gpp"]},"audio/3gpp2":{"source":"iana"},"audio/aac":{"source":"iana"},"audio/ac3":{"source":"iana"},"audio/adpcm":{"source":"apache","extensions":["adp"]},"audio/amr":{"source":"iana"},"audio/amr-wb":{"source":"iana"},"audio/amr-wb+":{"source":"iana"},"audio/aptx":{"source":"iana"},"audio/asc":{"source":"iana"},"audio/atrac-advanced-lossless":{"source":"iana"},"audio/atrac-x":{"source":"iana"},"audio/atrac3":{"source":"iana"},"audio/basic":{"source":"iana","compressible":false,"extensions":["au","snd"]},"audio/bv16":{"source":"iana"},"audio/bv32":{"source":"iana"},"audio/clearmode":{"source":"iana"},"audio/cn":{"source":"iana"},"audio/dat12":{"source":"iana"},"audio/dls":{"source":"iana"},"audio/dsr-es201108":{"source":"iana"},"audio/dsr-es202050":{"source":"iana"},"audio/dsr-es202211":{"source":"iana"},"audio/dsr-es202212":{"source":"iana"},"audio/dv":{"source":"iana"},"audio/dvi4":{"source":"iana"},"audio/eac3":{"source":"iana"},"audio/encaprtp":{"source":"iana"},"audio/evrc":{"source":"iana"},"audio/evrc-qcp":{"source":"iana"},"audio/evrc0":{"source":"iana"},"audio/evrc1":{"source":"iana"},"audio/evrcb":{"source":"iana"},"audio/evrcb0":{"source":"iana"},"audio/evrcb1":{"source":"iana"},"audio/evrcnw":{"source":"iana"},"audio/evrcnw0":{"source":"iana"},"audio/evrcnw1":{"source":"iana"},"audio/evrcwb":{"source":"iana"},"audio/evrcwb0":{"source":"iana"},"audio/evrcwb1":{"source":"iana"},"audio/evs":{"source":"iana"},"audio/fwdred":{"source":"iana"},"audio/g711-0":{"source":"iana"},"audio/g719":{"source":"iana"},"audio/g722":{"source":"iana"},"audio/g7221":{"source":"iana"},"audio/g723":{"source":"iana"},"audio/g726-16":{"source":"iana"},"audio/g726-24":{"source":"iana"},"audio/g726-32":{"source":"iana"},"audio/g726-40":{"source":"iana"},"audio/g728":{"source":"iana"},"audio/g729":{"source":"iana"},"audio/g7291":{"source":"iana"},"audio/g729d":{"source":"iana"},"audio/g729e":{"source":"iana"},"audio/gsm":{"source":"iana"},"audio/gsm-efr":{"source":"iana"},"audio/gsm-hr-08":{"source":"iana"},"audio/ilbc":{"source":"iana"},"audio/ip-mr_v2.5":{"source":"iana"},"audio/isac":{"source":"apache"},"audio/l16":{"source":"iana"},"audio/l20":{"source":"iana"},"audio/l24":{"source":"iana","compressible":false},"audio/l8":{"source":"iana"},"audio/lpc":{"source":"iana"},"audio/melp":{"source":"iana"},"audio/melp1200":{"source":"iana"},"audio/melp2400":{"source":"iana"},"audio/melp600":{"source":"iana"},"audio/midi":{"source":"apache","extensions":["mid","midi","kar","rmi"]},"audio/mobile-xmf":{"source":"iana"},"audio/mp3":{"compressible":false,"extensions":["mp3"]},"audio/mp4":{"source":"iana","compressible":false,"extensions":["m4a","mp4a"]},"audio/mp4a-latm":{"source":"iana"},"audio/mpa":{"source":"iana"},"audio/mpa-robust":{"source":"iana"},"audio/mpeg":{"source":"iana","compressible":false,"extensions":["mpga","mp2","mp2a","mp3","m2a","m3a"]},"audio/mpeg4-generic":{"source":"iana"},"audio/musepack":{"source":"apache"},"audio/ogg":{"source":"iana","compressible":false,"extensions":["oga","ogg","spx"]},"audio/opus":{"source":"iana"},"audio/parityfec":{"source":"iana"},"audio/pcma":{"source":"iana"},"audio/pcma-wb":{"source":"iana"},"audio/pcmu":{"source":"iana"},"audio/pcmu-wb":{"source":"iana"},"audio/prs.sid":{"source":"iana"},"audio/qcelp":{"source":"iana"},"audio/raptorfec":{"source":"iana"},"audio/red":{"source":"iana"},"audio/rtp-enc-aescm128":{"source":"iana"},"audio/rtp-midi":{"source":"iana"},"audio/rtploopback":{"source":"iana"},"audio/rtx":{"source":"iana"},"audio/s3m":{"source":"apache","extensions":["s3m"]},"audio/silk":{"source":"apache","extensions":["sil"]},"audio/smv":{"source":"iana"},"audio/smv-qcp":{"source":"iana"},"audio/smv0":{"source":"iana"},"audio/sp-midi":{"source":"iana"},"audio/speex":{"source":"iana"},"audio/t140c":{"source":"iana"},"audio/t38":{"source":"iana"},"audio/telephone-event":{"source":"iana"},"audio/tone":{"source":"iana"},"audio/uemclip":{"source":"iana"},"audio/ulpfec":{"source":"iana"},"audio/usac":{"source":"iana"},"audio/vdvi":{"source":"iana"},"audio/vmr-wb":{"source":"iana"},"audio/vnd.3gpp.iufp":{"source":"iana"},"audio/vnd.4sb":{"source":"iana"},"audio/vnd.audiokoz":{"source":"iana"},"audio/vnd.celp":{"source":"iana"},"audio/vnd.cisco.nse":{"source":"iana"},"audio/vnd.cmles.radio-events":{"source":"iana"},"audio/vnd.cns.anp1":{"source":"iana"},"audio/vnd.cns.inf1":{"source":"iana"},"audio/vnd.dece.audio":{"source":"iana","extensions":["uva","uvva"]},"audio/vnd.digital-winds":{"source":"iana","extensions":["eol"]},"audio/vnd.dlna.adts":{"source":"iana"},"audio/vnd.dolby.heaac.1":{"source":"iana"},"audio/vnd.dolby.heaac.2":{"source":"iana"},"audio/vnd.dolby.mlp":{"source":"iana"},"audio/vnd.dolby.mps":{"source":"iana"},"audio/vnd.dolby.pl2":{"source":"iana"},"audio/vnd.dolby.pl2x":{"source":"iana"},"audio/vnd.dolby.pl2z":{"source":"iana"},"audio/vnd.dolby.pulse.1":{"source":"iana"},"audio/vnd.dra":{"source":"iana","extensions":["dra"]},"audio/vnd.dts":{"source":"iana","extensions":["dts"]},"audio/vnd.dts.hd":{"source":"iana","extensions":["dtshd"]},"audio/vnd.dvb.file":{"source":"iana"},"audio/vnd.everad.plj":{"source":"iana"},"audio/vnd.hns.audio":{"source":"iana"},"audio/vnd.lucent.voice":{"source":"iana","extensions":["lvp"]},"audio/vnd.ms-playready.media.pya":{"source":"iana","extensions":["pya"]},"audio/vnd.nokia.mobile-xmf":{"source":"iana"},"audio/vnd.nortel.vbk":{"source":"iana"},"audio/vnd.nuera.ecelp4800":{"source":"iana","extensions":["ecelp4800"]},"audio/vnd.nuera.ecelp7470":{"source":"iana","extensions":["ecelp7470"]},"audio/vnd.nuera.ecelp9600":{"source":"iana","extensions":["ecelp9600"]},"audio/vnd.octel.sbc":{"source":"iana"},"audio/vnd.presonus.multitrack":{"source":"iana"},"audio/vnd.qcelp":{"source":"iana"},"audio/vnd.rhetorex.32kadpcm":{"source":"iana"},"audio/vnd.rip":{"source":"iana","extensions":["rip"]},"audio/vnd.rn-realaudio":{"compressible":false},"audio/vnd.sealedmedia.softseal.mpeg":{"source":"iana"},"audio/vnd.vmx.cvsd":{"source":"iana"},"audio/vnd.wave":{"compressible":false},"audio/vorbis":{"source":"iana","compressible":false},"audio/vorbis-config":{"source":"iana"},"audio/wav":{"compressible":false,"extensions":["wav"]},"audio/wave":{"compressible":false,"extensions":["wav"]},"audio/webm":{"source":"apache","compressible":false,"extensions":["weba"]},"audio/x-aac":{"source":"apache","compressible":false,"extensions":["aac"]},"audio/x-aiff":{"source":"apache","extensions":["aif","aiff","aifc"]},"audio/x-caf":{"source":"apache","compressible":false,"extensions":["caf"]},"audio/x-flac":{"source":"apache","extensions":["flac"]},"audio/x-m4a":{"source":"nginx","extensions":["m4a"]},"audio/x-matroska":{"source":"apache","extensions":["mka"]},"audio/x-mpegurl":{"source":"apache","extensions":["m3u"]},"audio/x-ms-wax":{"source":"apache","extensions":["wax"]},"audio/x-ms-wma":{"source":"apache","extensions":["wma"]},"audio/x-pn-realaudio":{"source":"apache","extensions":["ram","ra"]},"audio/x-pn-realaudio-plugin":{"source":"apache","extensions":["rmp"]},"audio/x-realaudio":{"source":"nginx","extensions":["ra"]},"audio/x-tta":{"source":"apache"},"audio/x-wav":{"source":"apache","extensions":["wav"]},"audio/xm":{"source":"apache","extensions":["xm"]},"chemical/x-cdx":{"source":"apache","extensions":["cdx"]},"chemical/x-cif":{"source":"apache","extensions":["cif"]},"chemical/x-cmdf":{"source":"apache","extensions":["cmdf"]},"chemical/x-cml":{"source":"apache","extensions":["cml"]},"chemical/x-csml":{"source":"apache","extensions":["csml"]},"chemical/x-pdb":{"source":"apache"},"chemical/x-xyz":{"source":"apache","extensions":["xyz"]},"font/collection":{"source":"iana","extensions":["ttc"]},"font/otf":{"source":"iana","compressible":true,"extensions":["otf"]},"font/sfnt":{"source":"iana"},"font/ttf":{"source":"iana","extensions":["ttf"]},"font/woff":{"source":"iana","extensions":["woff"]},"font/woff2":{"source":"iana","extensions":["woff2"]},"image/aces":{"source":"iana"},"image/apng":{"compressible":false,"extensions":["apng"]},"image/bmp":{"source":"iana","compressible":true,"extensions":["bmp"]},"image/cgm":{"source":"iana","extensions":["cgm"]},"image/dicom-rle":{"source":"iana"},"image/emf":{"source":"iana"},"image/fits":{"source":"iana"},"image/g3fax":{"source":"iana","extensions":["g3"]},"image/gif":{"source":"iana","compressible":false,"extensions":["gif"]},"image/ief":{"source":"iana","extensions":["ief"]},"image/jls":{"source":"iana"},"image/jp2":{"source":"iana","compressible":false,"extensions":["jp2","jpg2"]},"image/jpeg":{"source":"iana","compressible":false,"extensions":["jpeg","jpg","jpe"]},"image/jpm":{"source":"iana","compressible":false,"extensions":["jpm"]},"image/jpx":{"source":"iana","compressible":false,"extensions":["jpx","jpf"]},"image/ktx":{"source":"iana","extensions":["ktx"]},"image/naplps":{"source":"iana"},"image/pjpeg":{"compressible":false},"image/png":{"source":"iana","compressible":false,"extensions":["png"]},"image/prs.btif":{"source":"iana","extensions":["btif"]},"image/prs.pti":{"source":"iana"},"image/pwg-raster":{"source":"iana"},"image/sgi":{"source":"apache","extensions":["sgi"]},"image/svg+xml":{"source":"iana","compressible":true,"extensions":["svg","svgz"]},"image/t38":{"source":"iana"},"image/tiff":{"source":"iana","compressible":false,"extensions":["tiff","tif"]},"image/tiff-fx":{"source":"iana"},"image/vnd.adobe.photoshop":{"source":"iana","compressible":true,"extensions":["psd"]},"image/vnd.airzip.accelerator.azv":{"source":"iana"},"image/vnd.cns.inf2":{"source":"iana"},"image/vnd.dece.graphic":{"source":"iana","extensions":["uvi","uvvi","uvg","uvvg"]},"image/vnd.djvu":{"source":"iana","extensions":["djvu","djv"]},"image/vnd.dvb.subtitle":{"source":"iana","extensions":["sub"]},"image/vnd.dwg":{"source":"iana","extensions":["dwg"]},"image/vnd.dxf":{"source":"iana","extensions":["dxf"]},"image/vnd.fastbidsheet":{"source":"iana","extensions":["fbs"]},"image/vnd.fpx":{"source":"iana","extensions":["fpx"]},"image/vnd.fst":{"source":"iana","extensions":["fst"]},"image/vnd.fujixerox.edmics-mmr":{"source":"iana","extensions":["mmr"]},"image/vnd.fujixerox.edmics-rlc":{"source":"iana","extensions":["rlc"]},"image/vnd.globalgraphics.pgb":{"source":"iana"},"image/vnd.microsoft.icon":{"source":"iana"},"image/vnd.mix":{"source":"iana"},"image/vnd.mozilla.apng":{"source":"iana"},"image/vnd.ms-modi":{"source":"iana","extensions":["mdi"]},"image/vnd.ms-photo":{"source":"apache","extensions":["wdp"]},"image/vnd.net-fpx":{"source":"iana","extensions":["npx"]},"image/vnd.radiance":{"source":"iana"},"image/vnd.sealed.png":{"source":"iana"},"image/vnd.sealedmedia.softseal.gif":{"source":"iana"},"image/vnd.sealedmedia.softseal.jpg":{"source":"iana"},"image/vnd.svf":{"source":"iana"},"image/vnd.tencent.tap":{"source":"iana"},"image/vnd.valve.source.texture":{"source":"iana"},"image/vnd.wap.wbmp":{"source":"iana","extensions":["wbmp"]},"image/vnd.xiff":{"source":"iana","extensions":["xif"]},"image/vnd.zbrush.pcx":{"source":"iana"},"image/webp":{"source":"apache","extensions":["webp"]},"image/wmf":{"source":"iana"},"image/x-3ds":{"source":"apache","extensions":["3ds"]},"image/x-cmu-raster":{"source":"apache","extensions":["ras"]},"image/x-cmx":{"source":"apache","extensions":["cmx"]},"image/x-freehand":{"source":"apache","extensions":["fh","fhc","fh4","fh5","fh7"]},"image/x-icon":{"source":"apache","compressible":true,"extensions":["ico"]},"image/x-jng":{"source":"nginx","extensions":["jng"]},"image/x-mrsid-image":{"source":"apache","extensions":["sid"]},"image/x-ms-bmp":{"source":"nginx","compressible":true,"extensions":["bmp"]},"image/x-pcx":{"source":"apache","extensions":["pcx"]},"image/x-pict":{"source":"apache","extensions":["pic","pct"]},"image/x-portable-anymap":{"source":"apache","extensions":["pnm"]},"image/x-portable-bitmap":{"source":"apache","extensions":["pbm"]},"image/x-portable-graymap":{"source":"apache","extensions":["pgm"]},"image/x-portable-pixmap":{"source":"apache","extensions":["ppm"]},"image/x-rgb":{"source":"apache","extensions":["rgb"]},"image/x-tga":{"source":"apache","extensions":["tga"]},"image/x-xbitmap":{"source":"apache","extensions":["xbm"]},"image/x-xcf":{"compressible":false},"image/x-xpixmap":{"source":"apache","extensions":["xpm"]},"image/x-xwindowdump":{"source":"apache","extensions":["xwd"]},"message/cpim":{"source":"iana"},"message/delivery-status":{"source":"iana"},"message/disposition-notification":{"source":"iana","extensions":["disposition-notification"]},"message/external-body":{"source":"iana"},"message/feedback-report":{"source":"iana"},"message/global":{"source":"iana","extensions":["u8msg"]},"message/global-delivery-status":{"source":"iana","extensions":["u8dsn"]},"message/global-disposition-notification":{"source":"iana","extensions":["u8mdn"]},"message/global-headers":{"source":"iana","extensions":["u8hdr"]},"message/http":{"source":"iana","compressible":false},"message/imdn+xml":{"source":"iana","compressible":true},"message/news":{"source":"iana"},"message/partial":{"source":"iana","compressible":false},"message/rfc822":{"source":"iana","compressible":true,"extensions":["eml","mime"]},"message/s-http":{"source":"iana"},"message/sip":{"source":"iana"},"message/sipfrag":{"source":"iana"},"message/tracking-status":{"source":"iana"},"message/vnd.si.simp":{"source":"iana"},"message/vnd.wfa.wsc":{"source":"iana","extensions":["wsc"]},"model/3mf":{"source":"iana"},"model/gltf+json":{"source":"iana","compressible":true,"extensions":["gltf"]},"model/gltf-binary":{"source":"iana","compressible":true,"extensions":["glb"]},"model/iges":{"source":"iana","compressible":false,"extensions":["igs","iges"]},"model/mesh":{"source":"iana","compressible":false,"extensions":["msh","mesh","silo"]},"model/stl":{"source":"iana"},"model/vnd.collada+xml":{"source":"iana","compressible":true,"extensions":["dae"]},"model/vnd.dwf":{"source":"iana","extensions":["dwf"]},"model/vnd.flatland.3dml":{"source":"iana"},"model/vnd.gdl":{"source":"iana","extensions":["gdl"]},"model/vnd.gs-gdl":{"source":"apache"},"model/vnd.gs.gdl":{"source":"iana"},"model/vnd.gtw":{"source":"iana","extensions":["gtw"]},"model/vnd.moml+xml":{"source":"iana","compressible":true},"model/vnd.mts":{"source":"iana","extensions":["mts"]},"model/vnd.opengex":{"source":"iana"},"model/vnd.parasolid.transmit.binary":{"source":"iana"},"model/vnd.parasolid.transmit.text":{"source":"iana"},"model/vnd.rosette.annotated-data-model":{"source":"iana"},"model/vnd.usdz+zip":{"source":"iana","compressible":false},"model/vnd.valve.source.compiled-map":{"source":"iana"},"model/vnd.vtu":{"source":"iana","extensions":["vtu"]},"model/vrml":{"source":"iana","compressible":false,"extensions":["wrl","vrml"]},"model/x3d+binary":{"source":"apache","compressible":false,"extensions":["x3db","x3dbz"]},"model/x3d+fastinfoset":{"source":"iana"},"model/x3d+vrml":{"source":"apache","compressible":false,"extensions":["x3dv","x3dvz"]},"model/x3d+xml":{"source":"iana","compressible":true,"extensions":["x3d","x3dz"]},"model/x3d-vrml":{"source":"iana"},"multipart/alternative":{"source":"iana","compressible":false},"multipart/appledouble":{"source":"iana"},"multipart/byteranges":{"source":"iana"},"multipart/digest":{"source":"iana"},"multipart/encrypted":{"source":"iana","compressible":false},"multipart/form-data":{"source":"iana","compressible":false},"multipart/header-set":{"source":"iana"},"multipart/mixed":{"source":"iana","compressible":false},"multipart/multilingual":{"source":"iana"},"multipart/parallel":{"source":"iana"},"multipart/related":{"source":"iana","compressible":false},"multipart/report":{"source":"iana"},"multipart/signed":{"source":"iana","compressible":false},"multipart/vnd.bint.med-plus":{"source":"iana"},"multipart/voice-message":{"source":"iana"},"multipart/x-mixed-replace":{"source":"iana"},"text/1d-interleaved-parityfec":{"source":"iana"},"text/cache-manifest":{"source":"iana","compressible":true,"extensions":["appcache","manifest"]},"text/calendar":{"source":"iana","extensions":["ics","ifb"]},"text/calender":{"compressible":true},"text/cmd":{"compressible":true},"text/coffeescript":{"extensions":["coffee","litcoffee"]},"text/css":{"source":"iana","charset":"UTF-8","compressible":true,"extensions":["css"]},"text/csv":{"source":"iana","compressible":true,"extensions":["csv"]},"text/csv-schema":{"source":"iana"},"text/directory":{"source":"iana"},"text/dns":{"source":"iana"},"text/ecmascript":{"source":"iana"},"text/encaprtp":{"source":"iana"},"text/enriched":{"source":"iana"},"text/fwdred":{"source":"iana"},"text/grammar-ref-list":{"source":"iana"},"text/html":{"source":"iana","compressible":true,"extensions":["html","htm","shtml"]},"text/jade":{"extensions":["jade"]},"text/javascript":{"source":"iana","compressible":true},"text/jcr-cnd":{"source":"iana"},"text/jsx":{"compressible":true,"extensions":["jsx"]},"text/less":{"extensions":["less"]},"text/markdown":{"source":"iana","compressible":true,"extensions":["markdown","md"]},"text/mathml":{"source":"nginx","extensions":["mml"]},"text/mizar":{"source":"iana"},"text/n3":{"source":"iana","compressible":true,"extensions":["n3"]},"text/parameters":{"source":"iana"},"text/parityfec":{"source":"iana"},"text/plain":{"source":"iana","compressible":true,"extensions":["txt","text","conf","def","list","log","in","ini"]},"text/provenance-notation":{"source":"iana"},"text/prs.fallenstein.rst":{"source":"iana"},"text/prs.lines.tag":{"source":"iana","extensions":["dsc"]},"text/prs.prop.logic":{"source":"iana"},"text/raptorfec":{"source":"iana"},"text/red":{"source":"iana"},"text/rfc822-headers":{"source":"iana"},"text/richtext":{"source":"iana","compressible":true,"extensions":["rtx"]},"text/rtf":{"source":"iana","compressible":true,"extensions":["rtf"]},"text/rtp-enc-aescm128":{"source":"iana"},"text/rtploopback":{"source":"iana"},"text/rtx":{"source":"iana"},"text/sgml":{"source":"iana","extensions":["sgml","sgm"]},"text/shex":{"extensions":["shex"]},"text/slim":{"extensions":["slim","slm"]},"text/strings":{"source":"iana"},"text/stylus":{"extensions":["stylus","styl"]},"text/t140":{"source":"iana"},"text/tab-separated-values":{"source":"iana","compressible":true,"extensions":["tsv"]},"text/troff":{"source":"iana","extensions":["t","tr","roff","man","me","ms"]},"text/turtle":{"source":"iana","charset":"UTF-8","extensions":["ttl"]},"text/ulpfec":{"source":"iana"},"text/uri-list":{"source":"iana","compressible":true,"extensions":["uri","uris","urls"]},"text/vcard":{"source":"iana","compressible":true,"extensions":["vcard"]},"text/vnd.a":{"source":"iana"},"text/vnd.abc":{"source":"iana"},"text/vnd.ascii-art":{"source":"iana"},"text/vnd.curl":{"source":"iana","extensions":["curl"]},"text/vnd.curl.dcurl":{"source":"apache","extensions":["dcurl"]},"text/vnd.curl.mcurl":{"source":"apache","extensions":["mcurl"]},"text/vnd.curl.scurl":{"source":"apache","extensions":["scurl"]},"text/vnd.debian.copyright":{"source":"iana"},"text/vnd.dmclientscript":{"source":"iana"},"text/vnd.dvb.subtitle":{"source":"iana","extensions":["sub"]},"text/vnd.esmertec.theme-descriptor":{"source":"iana"},"text/vnd.fly":{"source":"iana","extensions":["fly"]},"text/vnd.fmi.flexstor":{"source":"iana","extensions":["flx"]},"text/vnd.gml":{"source":"iana"},"text/vnd.graphviz":{"source":"iana","extensions":["gv"]},"text/vnd.hgl":{"source":"iana"},"text/vnd.in3d.3dml":{"source":"iana","extensions":["3dml"]},"text/vnd.in3d.spot":{"source":"iana","extensions":["spot"]},"text/vnd.iptc.newsml":{"source":"iana"},"text/vnd.iptc.nitf":{"source":"iana"},"text/vnd.latex-z":{"source":"iana"},"text/vnd.motorola.reflex":{"source":"iana"},"text/vnd.ms-mediapackage":{"source":"iana"},"text/vnd.net2phone.commcenter.command":{"source":"iana"},"text/vnd.radisys.msml-basic-layout":{"source":"iana"},"text/vnd.si.uricatalogue":{"source":"iana"},"text/vnd.sun.j2me.app-descriptor":{"source":"iana","extensions":["jad"]},"text/vnd.trolltech.linguist":{"source":"iana"},"text/vnd.wap.si":{"source":"iana"},"text/vnd.wap.sl":{"source":"iana"},"text/vnd.wap.wml":{"source":"iana","extensions":["wml"]},"text/vnd.wap.wmlscript":{"source":"iana","extensions":["wmls"]},"text/vtt":{"charset":"UTF-8","compressible":true,"extensions":["vtt"]},"text/x-asm":{"source":"apache","extensions":["s","asm"]},"text/x-c":{"source":"apache","extensions":["c","cc","cxx","cpp","h","hh","dic"]},"text/x-component":{"source":"nginx","extensions":["htc"]},"text/x-fortran":{"source":"apache","extensions":["f","for","f77","f90"]},"text/x-gwt-rpc":{"compressible":true},"text/x-handlebars-template":{"extensions":["hbs"]},"text/x-java-source":{"source":"apache","extensions":["java"]},"text/x-jquery-tmpl":{"compressible":true},"text/x-lua":{"extensions":["lua"]},"text/x-markdown":{"compressible":true,"extensions":["mkd"]},"text/x-nfo":{"source":"apache","extensions":["nfo"]},"text/x-opml":{"source":"apache","extensions":["opml"]},"text/x-org":{"compressible":true,"extensions":["org"]},"text/x-pascal":{"source":"apache","extensions":["p","pas"]},"text/x-processing":{"compressible":true,"extensions":["pde"]},"text/x-sass":{"extensions":["sass"]},"text/x-scss":{"extensions":["scss"]},"text/x-setext":{"source":"apache","extensions":["etx"]},"text/x-sfv":{"source":"apache","extensions":["sfv"]},"text/x-suse-ymp":{"compressible":true,"extensions":["ymp"]},"text/x-uuencode":{"source":"apache","extensions":["uu"]},"text/x-vcalendar":{"source":"apache","extensions":["vcs"]},"text/x-vcard":{"source":"apache","extensions":["vcf"]},"text/xml":{"source":"iana","compressible":true,"extensions":["xml"]},"text/xml-external-parsed-entity":{"source":"iana"},"text/yaml":{"extensions":["yaml","yml"]},"video/1d-interleaved-parityfec":{"source":"iana"},"video/3gpp":{"source":"iana","extensions":["3gp","3gpp"]},"video/3gpp-tt":{"source":"iana"},"video/3gpp2":{"source":"iana","extensions":["3g2"]},"video/bmpeg":{"source":"iana"},"video/bt656":{"source":"iana"},"video/celb":{"source":"iana"},"video/dv":{"source":"iana"},"video/encaprtp":{"source":"iana"},"video/h261":{"source":"iana","extensions":["h261"]},"video/h263":{"source":"iana","extensions":["h263"]},"video/h263-1998":{"source":"iana"},"video/h263-2000":{"source":"iana"},"video/h264":{"source":"iana","extensions":["h264"]},"video/h264-rcdo":{"source":"iana"},"video/h264-svc":{"source":"iana"},"video/h265":{"source":"iana"},"video/iso.segment":{"source":"iana"},"video/jpeg":{"source":"iana","extensions":["jpgv"]},"video/jpeg2000":{"source":"iana"},"video/jpm":{"source":"apache","extensions":["jpm","jpgm"]},"video/mj2":{"source":"iana","extensions":["mj2","mjp2"]},"video/mp1s":{"source":"iana"},"video/mp2p":{"source":"iana"},"video/mp2t":{"source":"iana","extensions":["ts"]},"video/mp4":{"source":"iana","compressible":false,"extensions":["mp4","mp4v","mpg4"]},"video/mp4v-es":{"source":"iana"},"video/mpeg":{"source":"iana","compressible":false,"extensions":["mpeg","mpg","mpe","m1v","m2v"]},"video/mpeg4-generic":{"source":"iana"},"video/mpv":{"source":"iana"},"video/nv":{"source":"iana"},"video/ogg":{"source":"iana","compressible":false,"extensions":["ogv"]},"video/parityfec":{"source":"iana"},"video/pointer":{"source":"iana"},"video/quicktime":{"source":"iana","compressible":false,"extensions":["qt","mov"]},"video/raptorfec":{"source":"iana"},"video/raw":{"source":"iana"},"video/rtp-enc-aescm128":{"source":"iana"},"video/rtploopback":{"source":"iana"},"video/rtx":{"source":"iana"},"video/smpte291":{"source":"iana"},"video/smpte292m":{"source":"iana"},"video/ulpfec":{"source":"iana"},"video/vc1":{"source":"iana"},"video/vnd.cctv":{"source":"iana"},"video/vnd.dece.hd":{"source":"iana","extensions":["uvh","uvvh"]},"video/vnd.dece.mobile":{"source":"iana","extensions":["uvm","uvvm"]},"video/vnd.dece.mp4":{"source":"iana"},"video/vnd.dece.pd":{"source":"iana","extensions":["uvp","uvvp"]},"video/vnd.dece.sd":{"source":"iana","extensions":["uvs","uvvs"]},"video/vnd.dece.video":{"source":"iana","extensions":["uvv","uvvv"]},"video/vnd.directv.mpeg":{"source":"iana"},"video/vnd.directv.mpeg-tts":{"source":"iana"},"video/vnd.dlna.mpeg-tts":{"source":"iana"},"video/vnd.dvb.file":{"source":"iana","extensions":["dvb"]},"video/vnd.fvt":{"source":"iana","extensions":["fvt"]},"video/vnd.hns.video":{"source":"iana"},"video/vnd.iptvforum.1dparityfec-1010":{"source":"iana"},"video/vnd.iptvforum.1dparityfec-2005":{"source":"iana"},"video/vnd.iptvforum.2dparityfec-1010":{"source":"iana"},"video/vnd.iptvforum.2dparityfec-2005":{"source":"iana"},"video/vnd.iptvforum.ttsavc":{"source":"iana"},"video/vnd.iptvforum.ttsmpeg2":{"source":"iana"},"video/vnd.motorola.video":{"source":"iana"},"video/vnd.motorola.videop":{"source":"iana"},"video/vnd.mpegurl":{"source":"iana","extensions":["mxu","m4u"]},"video/vnd.ms-playready.media.pyv":{"source":"iana","extensions":["pyv"]},"video/vnd.nokia.interleaved-multimedia":{"source":"iana"},"video/vnd.nokia.mp4vr":{"source":"iana"},"video/vnd.nokia.videovoip":{"source":"iana"},"video/vnd.objectvideo":{"source":"iana"},"video/vnd.radgamettools.bink":{"source":"iana"},"video/vnd.radgamettools.smacker":{"source":"iana"},"video/vnd.sealed.mpeg1":{"source":"iana"},"video/vnd.sealed.mpeg4":{"source":"iana"},"video/vnd.sealed.swf":{"source":"iana"},"video/vnd.sealedmedia.softseal.mov":{"source":"iana"},"video/vnd.uvvu.mp4":{"source":"iana","extensions":["uvu","uvvu"]},"video/vnd.vivo":{"source":"iana","extensions":["viv"]},"video/vp8":{"source":"iana"},"video/webm":{"source":"apache","compressible":false,"extensions":["webm"]},"video/x-f4v":{"source":"apache","extensions":["f4v"]},"video/x-fli":{"source":"apache","extensions":["fli"]},"video/x-flv":{"source":"apache","compressible":false,"extensions":["flv"]},"video/x-m4v":{"source":"apache","extensions":["m4v"]},"video/x-matroska":{"source":"apache","compressible":false,"extensions":["mkv","mk3d","mks"]},"video/x-mng":{"source":"apache","extensions":["mng"]},"video/x-ms-asf":{"source":"apache","extensions":["asf","asx"]},"video/x-ms-vob":{"source":"apache","extensions":["vob"]},"video/x-ms-wm":{"source":"apache","extensions":["wm"]},"video/x-ms-wmv":{"source":"apache","compressible":false,"extensions":["wmv"]},"video/x-ms-wmx":{"source":"apache","extensions":["wmx"]},"video/x-ms-wvx":{"source":"apache","extensions":["wvx"]},"video/x-msvideo":{"source":"apache","extensions":["avi"]},"video/x-sgi-movie":{"source":"apache","extensions":["movie"]},"video/x-smv":{"source":"apache","extensions":["smv"]},"x-conference/x-cooltalk":{"source":"apache","extensions":["ice"]},"x-shader/x-fragment":{"compressible":true},"x-shader/x-vertex":{"compressible":true}}
-
-/***/ }),
-/* 759 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*!
- * mime-db
- * Copyright(c) 2014 Jonathan Ong
- * MIT Licensed
- */
-
-/**
- * Module exports.
- */
-
-module.exports = __webpack_require__(758)
-
-
-/***/ }),
-/* 760 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = (to, from) => {
-	// TODO: use `Reflect.ownKeys()` when targeting Node.js 6
-	for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) {
-		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
-	}
-
-	return to;
-};
-
-
-/***/ }),
-/* 761 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const mkdirp = __webpack_require__(145)
-
-module.exports = function (dir, opts) {
-  return new Promise((resolve, reject) => {
-    mkdirp(dir, opts, (err, made) => err === null ? resolve(made) : reject(err))
-  })
-}
-
-
-/***/ }),
-/* 762 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-var Promise = __webpack_require__(345)
-var fs
-try {
-  fs = __webpack_require__(391)
-} catch(err) {
-  fs = __webpack_require__(5)
-}
-
-var api = [
-  'appendFile',
-  'chmod',
-  'chown',
-  'close',
-  'fchmod',
-  'fchown',
-  'fdatasync',
-  'fstat',
-  'fsync',
-  'ftruncate',
-  'futimes',
-  'lchown',
-  'link',
-  'lstat',
-  'mkdir',
-  'open',
-  'read',
-  'readFile',
-  'readdir',
-  'readlink',
-  'realpath',
-  'rename',
-  'rmdir',
-  'stat',
-  'symlink',
-  'truncate',
-  'unlink',
-  'utimes',
-  'write',
-  'writeFile'
-]
-
-typeof fs.access === 'function' && api.push('access')
-typeof fs.copyFile === 'function' && api.push('copyFile')
-typeof fs.mkdtemp === 'function' && api.push('mkdtemp')
-
-__webpack_require__(951).withCallback(fs, exports, api)
-
-exports.exists = function (filename, callback) {
-  // callback
-  if (typeof callback === 'function') {
-    return fs.stat(filename, function (err) {
-      callback(null, !err);
-    })
-  }
-  // or promise
-  return new Promise(function (resolve) {
-    fs.stat(filename, function (err) {
-      resolve(!err)
-    })
-  })
-}
-
-
-/***/ }),
-/* 763 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*jslint node: true*/
-var toArray = __webpack_require__(750);
-var emojiByName = __webpack_require__(764);
-
-"use strict";
-
-/**
- * regex to parse emoji in a string - finds emoji, e.g. :coffee:
- */
-var emojiNameRegex = /:([a-zA-Z0-9_\-\+]+):/g;
-
-/**
- * regex to trim whitespace
- * use instead of String.prototype.trim() for IE8 supprt
- */
-var trimSpaceRegex = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
-
-/**
- * Removes colons on either side
- * of the string if present
- * @param  {string} str
- * @return {string}
- */
-function stripColons (str) {
-  var colonIndex = str.indexOf(':');
-  if (colonIndex > -1) {
-    // :emoji: (http://www.emoji-cheat-sheet.com/)
-    if (colonIndex === str.length - 1) {
-      str = str.substring(0, colonIndex);
-      return stripColons(str);
-    } else {
-      str = str.substr(colonIndex + 1);
-      return stripColons(str);
-    }
-  }
-
-  return str;
-}
-
-/**
- * Adds colons to either side
- * of the string
- * @param {string} str
- * @return {string}
- */
-function wrapColons (str) {
-  return (typeof str === 'string' && str.length > 0) ? ':' + str + ':' : str;
-}
-
-/**
- * Ensure that the word is wrapped in colons
- * by only adding them, if they are not there.
- * @param {string} str
- * @return {string}
- */
-function ensureColons (str) {
-  return (typeof str === 'string' && str[0] !== ':') ? wrapColons(str) : str;
-}
-
-// Non spacing mark, some emoticons have them. It's the 'Variant Form',
-// which provides more information so that emoticons can be rendered as
-// more colorful graphics. FE0E is a unicode text version, where as FE0F
-// should be rendered as a graphical version. The code gracefully degrades.
-var NON_SPACING_MARK = String.fromCharCode(65039); // 65039 - '️' - 0xFE0F;
-var nonSpacingRegex = new RegExp(NON_SPACING_MARK, 'g')
-
-// Remove the non-spacing-mark from the code, never send a stripped version
-// to the client, as it kills graphical emoticons.
-function stripNSB (code) {
-  return code.replace(nonSpacingRegex, '');
-};
-
-// Reversed hash table, where as emojiByName contains a { heart: '❤' }
-// dictionary emojiByCode contains { ❤: 'heart' }. The codes are normalized
-// to the text version.
-var emojiByCode = Object.keys(emojiByName).reduce(function(h,k) {
-  h[stripNSB(emojiByName[k])] = k;
-  return h;
-}, {});
-
-/**
- * Emoji namespace
- */
-var Emoji = {
-  emoji: emojiByName,
-};
-
-/**
- * get emoji code from name
- * @param  {string} emoji
- * @return {string}
- */
-Emoji._get = function _get (emoji) {
-  if (emojiByName.hasOwnProperty(emoji)) {
-    return emojiByName[emoji];
-  }
-
-  return ensureColons(emoji);
-};
-
-/**
- * get emoji code from :emoji: string or name
- * @param  {string} emoji
- * @return {string}
- */
-Emoji.get = function get (emoji) {
-  emoji = stripColons(emoji);
-
-  return Emoji._get(emoji);
-};
-
-/**
- * find the emoji by either code or name
- * @param {string} nameOrCode The emoji to find, either `coffee`, `:coffee:` or `☕`;
- * @return {object}
- */
-Emoji.find = function find (nameOrCode) {
-  return Emoji.findByName(nameOrCode) || Emoji.findByCode(nameOrCode);
-};
-
-/**
- * find the emoji by name
- * @param {string} name The emoji to find either `coffee` or `:coffee:`;
- * @return {object}
- */
-Emoji.findByName = function findByName (name) {
-  var stripped = stripColons(name);
-  var emoji = emojiByName[stripped];
-
-  return emoji ? ({ emoji: emoji, key: stripped }) : undefined;
-};
-
-/**
- * find the emoji by code (emoji)
- * @param {string} code The emoji to find; for example `☕` or `☔`
- * @return {object}
- */
-Emoji.findByCode = function findByCode (code) {
-  var stripped = stripNSB(code);
-  var name = emojiByCode[stripped];
-
-  // lookup emoji to ensure the Variant Form is returned
-  return name ? ({ emoji: emojiByName[name], key: name }) : undefined;
-};
-
-
-/**
- * Check if an emoji is known by this library
- * @param {string} nameOrCode The emoji to validate, either `coffee`, `:coffee:` or `☕`;
- * @return {object}
- */
-Emoji.hasEmoji = function hasEmoji (nameOrCode) {
-  return Emoji.hasEmojiByName(nameOrCode) || Emoji.hasEmojiByCode(nameOrCode);
-};
-
-/**
- * Check if an emoji with given name is known by this library
- * @param {string} name The emoji to validate either `coffee` or `:coffee:`;
- * @return {object}
- */
-Emoji.hasEmojiByName = function hasEmojiByName (name) {
-  var result = Emoji.findByName(name);
-  return !!result && result.key === stripColons(name);
-};
-
-/**
- * Check if a given emoji is known by this library
- * @param {string} code The emoji to validate; for example `☕` or `☔`
- * @return {object}
- */
-Emoji.hasEmojiByCode = function hasEmojiByCode (code) {
-  var result = Emoji.findByCode(code);
-  return !!result && stripNSB(result.emoji) === stripNSB(code);
-};
-
-/**
- * get emoji name from code
- * @param  {string} emoji
- * @param  {boolean} includeColons should the result include the ::
- * @return {string}
- */
-Emoji.which = function which (emoji_code, includeColons) {
-  var code = stripNSB(emoji_code);
-  var word = emojiByCode[code];
-
-  return includeColons ? wrapColons(word) : word;
-};
-
-/**
- * emojify a string (replace :emoji: with an emoji)
- * @param  {string} str
- * @param  {function} on_missing (gets emoji name without :: and returns a proper emoji if no emoji was found)
- * @param  {function} format (wrap the returned emoji in a custom element)
- * @return {string}
- */
-Emoji.emojify = function emojify (str, on_missing, format) {
-  if (!str) return '';
-
-  return str.split(emojiNameRegex) // parse emoji via regex
-            .map(function parseEmoji(s, i) {
-              // every second element is an emoji, e.g. "test :fast_forward:" -> [ "test ", "fast_forward" ]
-              if (i % 2 === 0) return s;
-              var emoji = Emoji._get(s);
-              var isMissing = emoji.indexOf(':') > -1;
-
-              if (isMissing && typeof on_missing === 'function') {
-                return on_missing(s);
-              }
-
-              if (!isMissing && typeof format === 'function') {
-                return format(emoji, s);
-              }
-
-              return emoji;
-            })
-            .join('') // convert back to string
-  ;
-};
-
-/**
- * return a random emoji
- * @return {string}
- */
-Emoji.random = function random () {
-  var emojiKeys = Object.keys(emojiByName);
-  var randomIndex = Math.floor(Math.random() * emojiKeys.length);
-  var key = emojiKeys[randomIndex];
-  var emoji = Emoji._get(key);
-  return { key: key, emoji: emoji };
-}
-
-/**
- *  return an collection of potential emoji matches
- *  @param {string} str
- *  @return {Array.<Object>}
- */
-Emoji.search = function search (str) {
-  var emojiKeys = Object.keys(emojiByName);
-  var matcher = stripColons(str)
-  var matchingKeys = emojiKeys.filter(function(key) {
-    return key.toString().indexOf(matcher) === 0;
-  });
-  return matchingKeys.map(function(key) {
-    return {
-      key: key,
-      emoji: Emoji._get(key),
-    };
-  });
-}
-
-/**
- * unemojify a string (replace emoji with :emoji:)
- * @param  {string} str
- * @return {string}
- */
-Emoji.unemojify = function unemojify (str) {
-  if (!str) return '';
-  var words = toArray(str);
-
-  return words.map(function(word) {
-    return Emoji.which(word, true) || word;
-  }).join('');
-};
-
-/**
- * replace emojis with replacement value
- * @param {string} str
- * @param {function|string} the string or callback function to replace the emoji with
- * @param {boolean} should trailing whitespaces be cleaned? Defaults false
- * @return {string}
- */
-Emoji.replace = function replace (str, replacement, cleanSpaces) {
-  if (!str) return '';
-
-  var replace = typeof replacement === 'function' ? replacement : function() { return replacement; };
-  var words = toArray(str);
-
-  var replaced = words.map(function(word, idx) {
-    var emoji = Emoji.findByCode(word);
-    
-    if (emoji && cleanSpaces && words[idx + 1] === ' ') {
-      words[idx + 1] = '';
-    }
-
-    return emoji ? replace(emoji) : word;
-  }).join('');
-
-  return cleanSpaces ? replaced.replace(trimSpaceRegex, '') : replaced;
-};
-
-
-/**
- * remove all emojis from a string
- * @param {string} str
- * @return {string}
- */
-Emoji.strip = function strip (str) {
-  return Emoji.replace(str, '', true);
-};
-
-module.exports = Emoji;
-
-
-/***/ }),
-/* 764 */
-/***/ (function(module, exports) {
-
-module.exports = {"100":"💯","1234":"🔢","interrobang":"⁉️","tm":"™️","information_source":"ℹ️","left_right_arrow":"↔️","arrow_up_down":"↕️","arrow_upper_left":"↖️","arrow_upper_right":"↗️","arrow_lower_right":"↘️","arrow_lower_left":"↙️","keyboard":"⌨","sunny":"☀️","cloud":"☁️","umbrella":"☔️","showman":"☃","comet":"☄","ballot_box_with_check":"☑️","coffee":"☕️","shamrock":"☘","skull_and_crossbones":"☠","radioactive_sign":"☢","biohazard_sign":"☣","orthodox_cross":"☦","wheel_of_dharma":"☸","white_frowning_face":"☹","aries":"♈️","taurus":"♉️","sagittarius":"♐️","capricorn":"♑️","aquarius":"♒️","pisces":"♓️","spades":"♠️","clubs":"♣️","hearts":"♥️","diamonds":"♦️","hotsprings":"♨️","hammer_and_pick":"⚒","anchor":"⚓️","crossed_swords":"⚔","scales":"⚖","alembic":"⚗","gear":"⚙","scissors":"✂️","white_check_mark":"✅","airplane":"✈️","email":"✉️","envelope":"✉️","black_nib":"✒️","heavy_check_mark":"✔️","heavy_multiplication_x":"✖️","star_of_david":"✡","sparkles":"✨","eight_spoked_asterisk":"✳️","eight_pointed_black_star":"✴️","snowflake":"❄️","sparkle":"❇️","question":"❓","grey_question":"❔","grey_exclamation":"❕","exclamation":"❗️","heavy_exclamation_mark":"❗️","heavy_heart_exclamation_mark_ornament":"❣","heart":"❤️","heavy_plus_sign":"➕","heavy_minus_sign":"➖","heavy_division_sign":"➗","arrow_heading_up":"⤴️","arrow_heading_down":"⤵️","wavy_dash":"〰️","congratulations":"㊗️","secret":"㊙️","copyright":"©️","registered":"®️","bangbang":"‼️","leftwards_arrow_with_hook":"↩️","arrow_right_hook":"↪️","watch":"⌚️","hourglass":"⌛️","fast_forward":"⏩","rewind":"⏪","arrow_double_up":"⏫","arrow_double_down":"⏬","black_right_pointing_double_triangle_with_vertical_bar":"⏭","black_left_pointing_double_triangle_with_vertical_bar":"⏮","black_right_pointing_triangle_with_double_vertical_bar":"⏯","alarm_clock":"⏰","stopwatch":"⏱","timer_clock":"⏲","hourglass_flowing_sand":"⏳","double_vertical_bar":"⏸","black_square_for_stop":"⏹","black_circle_for_record":"⏺","m":"Ⓜ️","black_small_square":"▪️","white_small_square":"▫️","arrow_forward":"▶️","arrow_backward":"◀️","white_medium_square":"◻️","black_medium_square":"◼️","white_medium_small_square":"◽️","black_medium_small_square":"◾️","phone":"☎️","telephone":"☎️","point_up":"☝️","star_and_crescent":"☪","peace_symbol":"☮","yin_yang":"☯","relaxed":"☺️","gemini":"♊️","cancer":"♋️","leo":"♌️","virgo":"♍️","libra":"♎️","scorpius":"♏️","recycle":"♻️","wheelchair":"♿️","atom_symbol":"⚛","fleur_de_lis":"⚜","warning":"⚠️","zap":"⚡️","white_circle":"⚪️","black_circle":"⚫️","coffin":"⚰","funeral_urn":"⚱","soccer":"⚽️","baseball":"⚾️","snowman":"⛄️","partly_sunny":"⛅️","thunder_cloud_and_rain":"⛈","ophiuchus":"⛎","pick":"⛏","helmet_with_white_cross":"⛑","chains":"⛓","no_entry":"⛔️","shinto_shrine":"⛩","church":"⛪️","mountain":"⛰","umbrella_on_ground":"⛱","fountain":"⛲️","golf":"⛳️","ferry":"⛴","boat":"⛵️","sailboat":"⛵️","skier":"⛷","ice_skate":"⛸","person_with_ball":"⛹","tent":"⛺️","fuelpump":"⛽️","fist":"✊","hand":"✋","raised_hand":"✋","v":"✌️","writing_hand":"✍","pencil2":"✏️","latin_cross":"✝","x":"❌","negative_squared_cross_mark":"❎","arrow_right":"➡️","curly_loop":"➰","loop":"➿","arrow_left":"⬅️","arrow_up":"⬆️","arrow_down":"⬇️","black_large_square":"⬛️","white_large_square":"⬜️","star":"⭐️","o":"⭕️","part_alternation_mark":"〽️","mahjong":"🀄️","black_joker":"🃏","a":"🅰️","b":"🅱️","o2":"🅾️","parking":"🅿️","ab":"🆎","cl":"🆑","cool":"🆒","free":"🆓","id":"🆔","new":"🆕","ng":"🆖","ok":"🆗","sos":"🆘","up":"🆙","vs":"🆚","koko":"🈁","sa":"🈂️","u7121":"🈚️","u6307":"🈯️","u7981":"🈲","u7a7a":"🈳","u5408":"🈴","u6e80":"🈵","u6709":"🈶","u6708":"🈷️","u7533":"🈸","u5272":"🈹","u55b6":"🈺","ideograph_advantage":"🉐","accept":"🉑","cyclone":"🌀","foggy":"🌁","closed_umbrella":"🌂","night_with_stars":"🌃","sunrise_over_mountains":"🌄","sunrise":"🌅","city_sunset":"🌆","city_sunrise":"🌇","rainbow":"🌈","bridge_at_night":"🌉","ocean":"🌊","volcano":"🌋","milky_way":"🌌","earth_africa":"🌍","earth_americas":"🌎","earth_asia":"🌏","globe_with_meridians":"🌐","new_moon":"🌑","waxing_crescent_moon":"🌒","first_quarter_moon":"🌓","moon":"🌔","waxing_gibbous_moon":"🌔","full_moon":"🌕","waning_gibbous_moon":"🌖","last_quarter_moon":"🌗","waning_crescent_moon":"🌘","crescent_moon":"🌙","new_moon_with_face":"🌚","first_quarter_moon_with_face":"🌛","last_quarter_moon_with_face":"🌜","full_moon_with_face":"🌝","sun_with_face":"🌞","star2":"🌟","stars":"🌠","thermometer":"🌡","mostly_sunny":"🌤","sun_small_cloud":"🌤","barely_sunny":"🌥","sun_behind_cloud":"🌥","partly_sunny_rain":"🌦","sun_behind_rain_cloud":"🌦","rain_cloud":"🌧","snow_cloud":"🌨","lightning":"🌩","lightning_cloud":"🌩","tornado":"🌪","tornado_cloud":"🌪","fog":"🌫","wind_blowing_face":"🌬","hotdog":"🌭","taco":"🌮","burrito":"🌯","chestnut":"🌰","seedling":"🌱","evergreen_tree":"🌲","deciduous_tree":"🌳","palm_tree":"🌴","cactus":"🌵","hot_pepper":"🌶","tulip":"🌷","cherry_blossom":"🌸","rose":"🌹","hibiscus":"🌺","sunflower":"🌻","blossom":"🌼","corn":"🌽","ear_of_rice":"🌾","herb":"🌿","four_leaf_clover":"🍀","maple_leaf":"🍁","fallen_leaf":"🍂","leaves":"🍃","mushroom":"🍄","tomato":"🍅","eggplant":"🍆","grapes":"🍇","melon":"🍈","watermelon":"🍉","tangerine":"🍊","lemon":"🍋","banana":"🍌","pineapple":"🍍","apple":"🍎","green_apple":"🍏","pear":"🍐","peach":"🍑","cherries":"🍒","strawberry":"🍓","hamburger":"🍔","pizza":"🍕","meat_on_bone":"🍖","poultry_leg":"🍗","rice_cracker":"🍘","rice_ball":"🍙","rice":"🍚","curry":"🍛","ramen":"🍜","spaghetti":"🍝","bread":"🍞","fries":"🍟","sweet_potato":"🍠","dango":"🍡","oden":"🍢","sushi":"🍣","fried_shrimp":"🍤","fish_cake":"🍥","icecream":"🍦","shaved_ice":"🍧","ice_cream":"🍨","doughnut":"🍩","cookie":"🍪","chocolate_bar":"🍫","candy":"🍬","lollipop":"🍭","custard":"🍮","honey_pot":"🍯","cake":"🍰","bento":"🍱","stew":"🍲","egg":"🍳","fork_and_knife":"🍴","tea":"🍵","sake":"🍶","wine_glass":"🍷","cocktail":"🍸","tropical_drink":"🍹","beer":"🍺","beers":"🍻","baby_bottle":"🍼","knife_fork_plate":"🍽","champagne":"🍾","popcorn":"🍿","ribbon":"🎀","gift":"🎁","birthday":"🎂","jack_o_lantern":"🎃","christmas_tree":"🎄","santa":"🎅","fireworks":"🎆","sparkler":"🎇","balloon":"🎈","tada":"🎉","confetti_ball":"🎊","tanabata_tree":"🎋","crossed_flags":"🎌","bamboo":"🎍","dolls":"🎎","flags":"🎏","wind_chime":"🎐","rice_scene":"🎑","school_satchel":"🎒","mortar_board":"🎓","medal":"🎖","reminder_ribbon":"🎗","studio_microphone":"🎙","level_slider":"🎚","control_knobs":"🎛","film_frames":"🎞","admission_tickets":"🎟","carousel_horse":"🎠","ferris_wheel":"🎡","roller_coaster":"🎢","fishing_pole_and_fish":"🎣","microphone":"🎤","movie_camera":"🎥","cinema":"🎦","headphones":"🎧","art":"🎨","tophat":"🎩","circus_tent":"🎪","ticket":"🎫","clapper":"🎬","performing_arts":"🎭","video_game":"🎮","dart":"🎯","slot_machine":"🎰","8ball":"🎱","game_die":"🎲","bowling":"🎳","flower_playing_cards":"🎴","musical_note":"🎵","notes":"🎶","saxophone":"🎷","guitar":"🎸","musical_keyboard":"🎹","trumpet":"🎺","violin":"🎻","musical_score":"🎼","running_shirt_with_sash":"🎽","tennis":"🎾","ski":"🎿","basketball":"🏀","checkered_flag":"🏁","snowboarder":"🏂","runner":"🏃","running":"🏃","surfer":"🏄","sports_medal":"🏅","trophy":"🏆","horse_racing":"🏇","football":"🏈","rugby_football":"🏉","swimmer":"🏊","weight_lifter":"🏋","golfer":"🏌","racing_motorcycle":"🏍","racing_car":"🏎","cricket_bat_and_ball":"🏏","volleyball":"🏐","field_hockey_stick_and_ball":"🏑","ice_hockey_stick_and_puck":"🏒","table_tennis_paddle_and_ball":"🏓","snow_capped_mountain":"🏔","camping":"🏕","beach_with_umbrella":"🏖","building_construction":"🏗","house_buildings":"🏘","cityscape":"🏙","derelict_house_building":"🏚","classical_building":"🏛","desert":"🏜","desert_island":"🏝","national_park":"🏞","stadium":"🏟","house":"🏠","house_with_garden":"🏡","office":"🏢","post_office":"🏣","european_post_office":"🏤","hospital":"🏥","bank":"🏦","atm":"🏧","hotel":"🏨","love_hotel":"🏩","convenience_store":"🏪","school":"🏫","department_store":"🏬","factory":"🏭","izakaya_lantern":"🏮","lantern":"🏮","japanese_castle":"🏯","european_castle":"🏰","waving_white_flag":"🏳","waving_black_flag":"🏴","rosette":"🏵","label":"🏷","badminton_racquet_and_shuttlecock":"🏸","bow_and_arrow":"🏹","amphora":"🏺","skin-tone-2":"🏻","skin-tone-3":"🏼","skin-tone-4":"🏽","skin-tone-5":"🏾","skin-tone-6":"🏿","rat":"🐀","mouse2":"🐁","ox":"🐂","water_buffalo":"🐃","cow2":"🐄","tiger2":"🐅","leopard":"🐆","rabbit2":"🐇","cat2":"🐈","dragon":"🐉","crocodile":"🐊","whale2":"🐋","snail":"🐌","snake":"🐍","racehorse":"🐎","ram":"🐏","goat":"🐐","sheep":"🐑","monkey":"🐒","rooster":"🐓","chicken":"🐔","dog2":"🐕","pig2":"🐖","boar":"🐗","elephant":"🐘","octopus":"🐙","shell":"🐚","bug":"🐛","ant":"🐜","bee":"🐝","honeybee":"🐝","beetle":"🐞","fish":"🐟","tropical_fish":"🐠","blowfish":"🐡","turtle":"🐢","hatching_chick":"🐣","baby_chick":"🐤","hatched_chick":"🐥","bird":"🐦","penguin":"🐧","koala":"🐨","poodle":"🐩","dromedary_camel":"🐪","camel":"🐫","dolphin":"🐬","flipper":"🐬","mouse":"🐭","cow":"🐮","tiger":"🐯","rabbit":"🐰","cat":"🐱","dragon_face":"🐲","whale":"🐳","horse":"🐴","monkey_face":"🐵","dog":"🐶","pig":"🐷","frog":"🐸","hamster":"🐹","wolf":"🐺","bear":"🐻","panda_face":"🐼","pig_nose":"🐽","feet":"🐾","paw_prints":"🐾","chipmunk":"🐿","eyes":"👀","eye":"👁","ear":"👂","nose":"👃","lips":"👄","tongue":"👅","point_up_2":"👆","point_down":"👇","point_left":"👈","point_right":"👉","facepunch":"👊","punch":"👊","wave":"👋","ok_hand":"👌","+1":"👍","thumbsup":"👍","-1":"👎","thumbsdown":"👎","clap":"👏","open_hands":"👐","crown":"👑","womans_hat":"👒","eyeglasses":"👓","necktie":"👔","shirt":"👕","tshirt":"👕","jeans":"👖","dress":"👗","kimono":"👘","bikini":"👙","womans_clothes":"👚","purse":"👛","handbag":"👜","pouch":"👝","mans_shoe":"👞","shoe":"👞","athletic_shoe":"👟","high_heel":"👠","sandal":"👡","boot":"👢","footprints":"👣","bust_in_silhouette":"👤","busts_in_silhouette":"👥","boy":"👦","girl":"👧","man":"👨","woman":"👩","family":"👨‍👩‍👦","man-woman-boy":"👨‍👩‍👦","couple":"👫","man_and_woman_holding_hands":"👫","two_men_holding_hands":"👬","two_women_holding_hands":"👭","cop":"👮","dancers":"👯","bride_with_veil":"👰","person_with_blond_hair":"👱","man_with_gua_pi_mao":"👲","man_with_turban":"👳","older_man":"👴","older_woman":"👵","baby":"👶","construction_worker":"👷","princess":"👸","japanese_ogre":"👹","japanese_goblin":"👺","ghost":"👻","angel":"👼","alien":"👽","space_invader":"👾","imp":"👿","skull":"💀","information_desk_person":"💁","guardsman":"💂","dancer":"💃","lipstick":"💄","nail_care":"💅","massage":"💆","haircut":"💇","barber":"💈","syringe":"💉","pill":"💊","kiss":"💋","love_letter":"💌","ring":"💍","gem":"💎","couplekiss":"💏","bouquet":"💐","couple_with_heart":"💑","wedding":"💒","heartbeat":"💓","broken_heart":"💔","two_hearts":"💕","sparkling_heart":"💖","heartpulse":"💗","cupid":"💘","blue_heart":"💙","green_heart":"💚","yellow_heart":"💛","purple_heart":"💜","gift_heart":"💝","revolving_hearts":"💞","heart_decoration":"💟","diamond_shape_with_a_dot_inside":"💠","bulb":"💡","anger":"💢","bomb":"💣","zzz":"💤","boom":"💥","collision":"💥","sweat_drops":"💦","droplet":"💧","dash":"💨","hankey":"💩","poop":"💩","shit":"💩","muscle":"💪","dizzy":"💫","speech_balloon":"💬","thought_balloon":"💭","white_flower":"💮","moneybag":"💰","currency_exchange":"💱","heavy_dollar_sign":"💲","credit_card":"💳","yen":"💴","dollar":"💵","euro":"💶","pound":"💷","money_with_wings":"💸","chart":"💹","seat":"💺","computer":"💻","briefcase":"💼","minidisc":"💽","floppy_disk":"💾","cd":"💿","dvd":"📀","file_folder":"📁","open_file_folder":"📂","page_with_curl":"📃","page_facing_up":"📄","date":"📅","calendar":"📆","card_index":"📇","chart_with_upwards_trend":"📈","chart_with_downwards_trend":"📉","bar_chart":"📊","clipboard":"📋","pushpin":"📌","round_pushpin":"📍","paperclip":"📎","straight_ruler":"📏","triangular_ruler":"📐","bookmark_tabs":"📑","ledger":"📒","notebook":"📓","notebook_with_decorative_cover":"📔","closed_book":"📕","book":"📖","open_book":"📖","green_book":"📗","blue_book":"📘","orange_book":"📙","books":"📚","name_badge":"📛","scroll":"📜","memo":"📝","pencil":"📝","telephone_receiver":"📞","pager":"📟","fax":"📠","satellite":"🛰","loudspeaker":"📢","mega":"📣","outbox_tray":"📤","inbox_tray":"📥","package":"📦","e-mail":"📧","incoming_envelope":"📨","envelope_with_arrow":"📩","mailbox_closed":"📪","mailbox":"📫","mailbox_with_mail":"📬","mailbox_with_no_mail":"📭","postbox":"📮","postal_horn":"📯","newspaper":"📰","iphone":"📱","calling":"📲","vibration_mode":"📳","mobile_phone_off":"📴","no_mobile_phones":"📵","signal_strength":"📶","camera":"📷","camera_with_flash":"📸","video_camera":"📹","tv":"📺","radio":"📻","vhs":"📼","film_projector":"📽","prayer_beads":"📿","twisted_rightwards_arrows":"🔀","repeat":"🔁","repeat_one":"🔂","arrows_clockwise":"🔃","arrows_counterclockwise":"🔄","low_brightness":"🔅","high_brightness":"🔆","mute":"🔇","speaker":"🔈","sound":"🔉","loud_sound":"🔊","battery":"🔋","electric_plug":"🔌","mag":"🔍","mag_right":"🔎","lock_with_ink_pen":"🔏","closed_lock_with_key":"🔐","key":"🔑","lock":"🔒","unlock":"🔓","bell":"🔔","no_bell":"🔕","bookmark":"🔖","link":"🔗","radio_button":"🔘","back":"🔙","end":"🔚","on":"🔛","soon":"🔜","top":"🔝","underage":"🔞","keycap_ten":"🔟","capital_abcd":"🔠","abcd":"🔡","symbols":"🔣","abc":"🔤","fire":"🔥","flashlight":"🔦","wrench":"🔧","hammer":"🔨","nut_and_bolt":"🔩","hocho":"🔪","knife":"🔪","gun":"🔫","microscope":"🔬","cosmscript":"🔭","crystal_ball":"🔮","six_pointed_star":"🔯","beginner":"🔰","trident":"🔱","black_square_button":"🔲","white_square_button":"🔳","red_circle":"🔴","large_blue_circle":"🔵","large_orange_diamond":"🔶","large_blue_diamond":"🔷","small_orange_diamond":"🔸","small_blue_diamond":"🔹","small_red_triangle":"🔺","small_red_triangle_down":"🔻","arrow_up_small":"🔼","arrow_down_small":"🔽","om_symbol":"🕉","dove_of_peace":"🕊","kaaba":"🕋","mosque":"🕌","synagogue":"🕍","menorah_with_nine_branches":"🕎","clock1":"🕐","clock2":"🕑","clock3":"🕒","clock4":"🕓","clock5":"🕔","clock6":"🕕","clock7":"🕖","clock8":"🕗","clock9":"🕘","clock10":"🕙","clock11":"🕚","clock12":"🕛","clock130":"🕜","clock230":"🕝","clock330":"🕞","clock430":"🕟","clock530":"🕠","clock630":"🕡","clock730":"🕢","clock830":"🕣","clock930":"🕤","clock1030":"🕥","clock1130":"🕦","clock1230":"🕧","candle":"🕯","mantelpiece_clock":"🕰","hole":"🕳","man_in_business_suit_levitating":"🕴","sleuth_or_spy":"🕵","dark_sunglasses":"🕶","spider":"🕷","spider_web":"🕸","joystick":"🕹","linked_paperclips":"🖇","lower_left_ballpoint_pen":"🖊","lower_left_fountain_pen":"🖋","lower_left_paintbrush":"🖌","lower_left_crayon":"🖍","raised_hand_with_fingers_splayed":"🖐","middle_finger":"🖕","reversed_hand_with_middle_finger_extended":"🖕","spock-hand":"🖖","desktop_computer":"🖥","printer":"🖨","three_button_mouse":"🖱","trackball":"🖲","frame_with_picture":"🖼","card_index_dividers":"🗂","card_file_box":"🗃","file_cabinet":"🗄","wastebasket":"🗑","spiral_note_pad":"🗒","spiral_calendar_pad":"🗓","compression":"🗜","old_key":"🗝","rolled_up_newspaper":"🗞","dagger_knife":"🗡","speaking_head_in_silhouette":"🗣","left_speech_bubble":"🗨","right_anger_bubble":"🗯","ballot_box_with_ballot":"🗳","world_map":"🗺","mount_fuji":"🗻","tokyo_tower":"🗼","statue_of_liberty":"🗽","japan":"🗾","moyai":"🗿","grinning":"😀","grin":"😁","joy":"😂","smiley":"😃","smile":"😄","sweat_smile":"😅","laughing":"😆","satisfied":"😆","innocent":"😇","smiling_imp":"😈","wink":"😉","blush":"😊","yum":"😋","relieved":"😌","heart_eyes":"😍","sunglasses":"😎","smirk":"😏","neutral_face":"😐","expressionless":"😑","unamused":"😒","sweat":"😓","pensive":"😔","confused":"😕","confounded":"😖","kissing":"😗","kissing_heart":"😘","kissing_smiling_eyes":"😙","kissing_closed_eyes":"😚","stuck_out_tongue":"😛","stuck_out_tongue_winking_eye":"😜","stuck_out_tongue_closed_eyes":"😝","disappointed":"😞","worried":"😟","angry":"😠","rage":"😡","cry":"😢","persevere":"😣","triumph":"😤","disappointed_relieved":"😥","frowning":"😦","anguished":"😧","fearful":"😨","weary":"😩","sleepy":"😪","tired_face":"😫","grimacing":"😬","sob":"😭","open_mouth":"😮","hushed":"😯","cold_sweat":"😰","scream":"😱","astonished":"😲","flushed":"😳","sleeping":"😴","dizzy_face":"😵","no_mouth":"😶","mask":"😷","smile_cat":"😸","joy_cat":"😹","smiley_cat":"😺","heart_eyes_cat":"😻","smirk_cat":"😼","kissing_cat":"😽","pouting_cat":"😾","crying_cat_face":"😿","scream_cat":"🙀","slightly_frowning_face":"🙁","slightly_smiling_face":"🙂","upside_down_face":"🙃","face_with_rolling_eyes":"🙄","no_good":"🙅","ok_woman":"🙆","bow":"🙇","see_no_evil":"🙈","hear_no_evil":"🙉","speak_no_evil":"🙊","raising_hand":"🙋","raised_hands":"🙌","person_frowning":"🙍","person_with_pouting_face":"🙎","pray":"🙏","rocket":"🚀","helicopter":"🚁","steam_locomotive":"🚂","railway_car":"🚃","bullettrain_side":"🚄","bullettrain_front":"🚅","train2":"🚆","metro":"🚇","light_rail":"🚈","station":"🚉","tram":"🚊","train":"🚋","bus":"🚌","oncoming_bus":"🚍","trolleybus":"🚎","busstop":"🚏","minibus":"🚐","ambulance":"🚑","fire_engine":"🚒","police_car":"🚓","oncoming_police_car":"🚔","taxi":"🚕","oncoming_taxi":"🚖","car":"🚗","red_car":"🚗","oncoming_automobile":"🚘","blue_car":"🚙","truck":"🚚","articulated_lorry":"🚛","tractor":"🚜","monorail":"🚝","mountain_railway":"🚞","suspension_railway":"🚟","mountain_cableway":"🚠","aerial_tramway":"🚡","ship":"🚢","rowboat":"🚣","speedboat":"🚤","traffic_light":"🚥","vertical_traffic_light":"🚦","construction":"🚧","rotating_light":"🚨","triangular_flag_on_post":"🚩","door":"🚪","no_entry_sign":"🚫","smoking":"🚬","no_smoking":"🚭","put_litter_in_its_place":"🚮","do_not_litter":"🚯","potable_water":"🚰","non-potable_water":"🚱","bike":"🚲","no_bicycles":"🚳","bicyclist":"🚴","mountain_bicyclist":"🚵","walking":"🚶","no_pedestrians":"🚷","children_crossing":"🚸","mens":"🚹","womens":"🚺","restroom":"🚻","baby_symbol":"🚼","toilet":"🚽","wc":"🚾","shower":"🚿","bath":"🛀","bathtub":"🛁","passport_control":"🛂","customs":"🛃","baggage_claim":"🛄","left_luggage":"🛅","couch_and_lamp":"🛋","sleeping_accommodation":"🛌","shopping_bags":"🛍","bellhop_bell":"🛎","bed":"🛏","place_of_worship":"🛐","hammer_and_wrench":"🛠","shield":"🛡","oil_drum":"🛢","motorway":"🛣","railway_track":"🛤","motor_boat":"🛥","small_airplane":"🛩","airplane_departure":"🛫","airplane_arriving":"🛬","passenger_ship":"🛳","zipper_mouth_face":"🤐","money_mouth_face":"🤑","face_with_thermometer":"🤒","nerd_face":"🤓","thinking_face":"🤔","face_with_head_bandage":"🤕","robot_face":"🤖","hugging_face":"🤗","the_horns":"🤘","sign_of_the_horns":"🤘","crab":"🦀","lion_face":"🦁","scorpion":"🦂","turkey":"🦃","unicorn_face":"🦄","cheese_wedge":"🧀","hash":"#️⃣","keycap_star":"*⃣","zero":"0️⃣","one":"1️⃣","two":"2️⃣","three":"3️⃣","four":"4️⃣","five":"5️⃣","six":"6️⃣","seven":"7️⃣","eight":"8️⃣","nine":"9️⃣","flag-ac":"🇦🇨","flag-ad":"🇦🇩","flag-ae":"🇦🇪","flag-af":"🇦🇫","flag-ag":"🇦🇬","flag-ai":"🇦🇮","flag-al":"🇦🇱","flag-am":"🇦🇲","flag-ao":"🇦🇴","flag-aq":"🇦🇶","flag-ar":"🇦🇷","flag-as":"🇦🇸","flag-at":"🇦🇹","flag-au":"🇦🇺","flag-aw":"🇦🇼","flag-ax":"🇦🇽","flag-az":"🇦🇿","flag-ba":"🇧🇦","flag-bb":"🇧🇧","flag-bd":"🇧🇩","flag-be":"🇧🇪","flag-bf":"🇧🇫","flag-bg":"🇧🇬","flag-bh":"🇧🇭","flag-bi":"🇧🇮","flag-bj":"🇧🇯","flag-bl":"🇧🇱","flag-bm":"🇧🇲","flag-bn":"🇧🇳","flag-bo":"🇧🇴","flag-bq":"🇧🇶","flag-br":"🇧🇷","flag-bs":"🇧🇸","flag-bt":"🇧🇹","flag-bv":"🇧🇻","flag-bw":"🇧🇼","flag-by":"🇧🇾","flag-bz":"🇧🇿","flag-ca":"🇨🇦","flag-cc":"🇨🇨","flag-cd":"🇨🇩","flag-cf":"🇨🇫","flag-cg":"🇨🇬","flag-ch":"🇨🇭","flag-ci":"🇨🇮","flag-ck":"🇨🇰","flag-cl":"🇨🇱","flag-cm":"🇨🇲","flag-cn":"🇨🇳","cn":"🇨🇳","flag-co":"🇨🇴","flag-cp":"🇨🇵","flag-cr":"🇨🇷","flag-cu":"🇨🇺","flag-cv":"🇨🇻","flag-cw":"🇨🇼","flag-cx":"🇨🇽","flag-cy":"🇨🇾","flag-cz":"🇨🇿","flag-de":"🇩🇪","de":"🇩🇪","flag-dg":"🇩🇬","flag-dj":"🇩🇯","flag-dk":"🇩🇰","flag-dm":"🇩🇲","flag-do":"🇩🇴","flag-dz":"🇩🇿","flag-ea":"🇪🇦","flag-ec":"🇪🇨","flag-ee":"🇪🇪","flag-eg":"🇪🇬","flag-eh":"🇪🇭","flag-er":"🇪🇷","flag-es":"🇪🇸","es":"🇪🇸","flag-et":"🇪🇹","flag-eu":"🇪🇺","flag-fi":"🇫🇮","flag-fj":"🇫🇯","flag-fk":"🇫🇰","flag-fm":"🇫🇲","flag-fo":"🇫🇴","flag-fr":"🇫🇷","fr":"🇫🇷","flag-ga":"🇬🇦","flag-gb":"🇬🇧","gb":"🇬🇧","uk":"🇬🇧","flag-gd":"🇬🇩","flag-ge":"🇬🇪","flag-gf":"🇬🇫","flag-gg":"🇬🇬","flag-gh":"🇬🇭","flag-gi":"🇬🇮","flag-gl":"🇬🇱","flag-gm":"🇬🇲","flag-gn":"🇬🇳","flag-gp":"🇬🇵","flag-gq":"🇬🇶","flag-gr":"🇬🇷","flag-gs":"🇬🇸","flag-gt":"🇬🇹","flag-gu":"🇬🇺","flag-gw":"🇬🇼","flag-gy":"🇬🇾","flag-hk":"🇭🇰","flag-hm":"🇭🇲","flag-hn":"🇭🇳","flag-hr":"🇭🇷","flag-ht":"🇭🇹","flag-hu":"🇭🇺","flag-ic":"🇮🇨","flag-id":"🇮🇩","flag-ie":"🇮🇪","flag-il":"🇮🇱","flag-im":"🇮🇲","flag-in":"🇮🇳","flag-io":"🇮🇴","flag-iq":"🇮🇶","flag-ir":"🇮🇷","flag-is":"🇮🇸","flag-it":"🇮🇹","it":"🇮🇹","flag-je":"🇯🇪","flag-jm":"🇯🇲","flag-jo":"🇯🇴","flag-jp":"🇯🇵","jp":"🇯🇵","flag-ke":"🇰🇪","flag-kg":"🇰🇬","flag-kh":"🇰🇭","flag-ki":"🇰🇮","flag-km":"🇰🇲","flag-kn":"🇰🇳","flag-kp":"🇰🇵","flag-kr":"🇰🇷","kr":"🇰🇷","flag-kw":"🇰🇼","flag-ky":"🇰🇾","flag-kz":"🇰🇿","flag-la":"🇱🇦","flag-lb":"🇱🇧","flag-lc":"🇱🇨","flag-li":"🇱🇮","flag-lk":"🇱🇰","flag-lr":"🇱🇷","flag-ls":"🇱🇸","flag-lt":"🇱🇹","flag-lu":"🇱🇺","flag-lv":"🇱🇻","flag-ly":"🇱🇾","flag-ma":"🇲🇦","flag-mc":"🇲🇨","flag-md":"🇲🇩","flag-me":"🇲🇪","flag-mf":"🇲🇫","flag-mg":"🇲🇬","flag-mh":"🇲🇭","flag-mk":"🇲🇰","flag-ml":"🇲🇱","flag-mm":"🇲🇲","flag-mn":"🇲🇳","flag-mo":"🇲🇴","flag-mp":"🇲🇵","flag-mq":"🇲🇶","flag-mr":"🇲🇷","flag-ms":"🇲🇸","flag-mt":"🇲🇹","flag-mu":"🇲🇺","flag-mv":"🇲🇻","flag-mw":"🇲🇼","flag-mx":"🇲🇽","flag-my":"🇲🇾","flag-mz":"🇲🇿","flag-na":"🇳🇦","flag-nc":"🇳🇨","flag-ne":"🇳🇪","flag-nf":"🇳🇫","flag-ng":"🇳🇬","flag-ni":"🇳🇮","flag-nl":"🇳🇱","flag-no":"🇳🇴","flag-np":"🇳🇵","flag-nr":"🇳🇷","flag-nu":"🇳🇺","flag-nz":"🇳🇿","flag-om":"🇴🇲","flag-pa":"🇵🇦","flag-pe":"🇵🇪","flag-pf":"🇵🇫","flag-pg":"🇵🇬","flag-ph":"🇵🇭","flag-pk":"🇵🇰","flag-pl":"🇵🇱","flag-pm":"🇵🇲","flag-pn":"🇵🇳","flag-pr":"🇵🇷","flag-ps":"🇵🇸","flag-pt":"🇵🇹","flag-pw":"🇵🇼","flag-py":"🇵🇾","flag-qa":"🇶🇦","flag-re":"🇷🇪","flag-ro":"🇷🇴","flag-rs":"🇷🇸","flag-ru":"🇷🇺","ru":"🇷🇺","flag-rw":"🇷🇼","flag-sa":"🇸🇦","flag-sb":"🇸🇧","flag-sc":"🇸🇨","flag-sd":"🇸🇩","flag-se":"🇸🇪","flag-sg":"🇸🇬","flag-sh":"🇸🇭","flag-si":"🇸🇮","flag-sj":"🇸🇯","flag-sk":"🇸🇰","flag-sl":"🇸🇱","flag-sm":"🇸🇲","flag-sn":"🇸🇳","flag-so":"🇸🇴","flag-sr":"🇸🇷","flag-ss":"🇸🇸","flag-st":"🇸🇹","flag-sv":"🇸🇻","flag-sx":"🇸🇽","flag-sy":"🇸🇾","flag-sz":"🇸🇿","flag-ta":"🇹🇦","flag-tc":"🇹🇨","flag-td":"🇹🇩","flag-tf":"🇹🇫","flag-tg":"🇹🇬","flag-th":"🇹🇭","flag-tj":"🇹🇯","flag-tk":"🇹🇰","flag-tl":"🇹🇱","flag-tm":"🇹🇲","flag-tn":"🇹🇳","flag-to":"🇹🇴","flag-tr":"🇹🇷","flag-tt":"🇹🇹","flag-tv":"🇹🇻","flag-tw":"🇹🇼","flag-tz":"🇹🇿","flag-ua":"🇺🇦","flag-ug":"🇺🇬","flag-um":"🇺🇲","flag-us":"🇺🇸","us":"🇺🇸","flag-uy":"🇺🇾","flag-uz":"🇺🇿","flag-va":"🇻🇦","flag-vc":"🇻🇨","flag-ve":"🇻🇪","flag-vg":"🇻🇬","flag-vi":"🇻🇮","flag-vn":"🇻🇳","flag-vu":"🇻🇺","flag-wf":"🇼🇫","flag-ws":"🇼🇸","flag-xk":"🇽🇰","flag-ye":"🇾🇪","flag-yt":"🇾🇹","flag-za":"🇿🇦","flag-zm":"🇿🇲","flag-zw":"🇿🇼","man-man-boy":"👨‍👨‍👦","man-man-boy-boy":"👨‍👨‍👦‍👦","man-man-girl":"👨‍👨‍👧","man-man-girl-boy":"👨‍👨‍👧‍👦","man-man-girl-girl":"👨‍👨‍👧‍👧","man-woman-boy-boy":"👨‍👩‍👦‍👦","man-woman-girl":"👨‍👩‍👧","man-woman-girl-boy":"👨‍👩‍👧‍👦","man-woman-girl-girl":"👨‍👩‍👧‍👧","man-heart-man":"👨‍❤️‍👨","man-kiss-man":"👨‍❤️‍💋‍👨","woman-woman-boy":"👩‍👩‍👦","woman-woman-boy-boy":"👩‍👩‍👦‍👦","woman-woman-girl":"👩‍👩‍👧","woman-woman-girl-boy":"👩‍👩‍👧‍👦","woman-woman-girl-girl":"👩‍👩‍👧‍👧","woman-heart-woman":"👩‍❤️‍👩","woman-kiss-woman":"👩‍❤️‍💋‍👩"}
-
-/***/ }),
-/* 765 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*!
- * normalize-path <https://github.com/jonschlinkert/normalize-path>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-var removeTrailingSeparator = __webpack_require__(796);
-
-module.exports = function normalizePath(str, stripTrailing) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
-  str = str.replace(/[\\\/]+/g, '/');
-  if (stripTrailing !== false) {
-    str = removeTrailingSeparator(str);
-  }
-  return str;
-};
-
-
-/***/ }),
-/* 766 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-let path
-
-class LogicalTree {
-  constructor (name, address, opts) {
-    this.name = name
-    this.version = opts.version
-    this.address = address || ''
-    this.optional = !!opts.optional
-    this.dev = !!opts.dev
-    this.bundled = !!opts.bundled
-    this.resolved = opts.resolved
-    this.integrity = opts.integrity
-    this.dependencies = new Map()
-    this.requiredBy = new Set()
-  }
-
-  get isRoot () { return !this.requiredBy.size }
-
-  addDep (dep) {
-    this.dependencies.set(dep.name, dep)
-    dep.requiredBy.add(this)
-    return this
-  }
-
-  delDep (dep) {
-    this.dependencies.delete(dep.name)
-    dep.requiredBy.delete(this)
-    return this
-  }
-
-  getDep (name) {
-    return this.dependencies.get(name)
-  }
-
-  path (prefix) {
-    if (this.isRoot) {
-      // The address of the root is the prefix itself.
-      return prefix || ''
-    } else {
-      if (!path) { path = __webpack_require__(0) }
-      return path.join(
-        prefix || '',
-        'node_modules',
-        this.address.replace(/:/g, '/node_modules/')
-      )
-    }
-  }
-
-  // This finds cycles _from_ a given node: if some deeper dep has
-  // its own cycle, but that cycle does not refer to this node,
-  // it will return false.
-  hasCycle (_seen, _from) {
-    if (!_seen) { _seen = new Set() }
-    if (!_from) { _from = this }
-    for (let dep of this.dependencies.values()) {
-      if (_seen.has(dep)) { continue }
-      _seen.add(dep)
-      if (dep === _from || dep.hasCycle(_seen, _from)) {
-        return true
-      }
-    }
-    return false
-  }
-
-  forEachAsync (fn, opts, _pending) {
-    if (!opts) { opts = _pending || {} }
-    if (!_pending) { _pending = new Map() }
-    const P = opts.Promise || Promise
-    if (_pending.has(this)) {
-      return P.resolve(this.hasCycle() || _pending.get(this))
-    }
-    const pending = P.resolve().then(() => {
-      return fn(this, () => {
-        return promiseMap(
-          this.dependencies.values(),
-          dep => dep.forEachAsync(fn, opts, _pending),
-          opts
-        )
-      })
-    })
-    _pending.set(this, pending)
-    return pending
-  }
-
-  forEach (fn, _seen) {
-    if (!_seen) { _seen = new Set() }
-    if (_seen.has(this)) { return }
-    _seen.add(this)
-    fn(this, () => {
-      for (let dep of this.dependencies.values()) {
-        dep.forEach(fn, _seen)
-      }
-    })
-  }
-}
-
-module.exports = lockTree
-function lockTree (pkg, pkgLock, opts) {
-  const tree = makeNode(pkg.name, null, pkg)
-  const allDeps = new Map()
-  Array.from(
-    new Set(Object.keys(pkg.devDependencies || {})
-    .concat(Object.keys(pkg.optionalDependencies || {}))
-    .concat(Object.keys(pkg.dependencies || {})))
-  ).forEach(name => {
-    let dep = allDeps.get(name)
-    if (!dep) {
-      const depNode = (pkgLock.dependencies || {})[name]
-      dep = makeNode(name, name, depNode)
-    }
-    addChild(dep, tree, allDeps, pkgLock)
-  })
-  return tree
-}
-
-module.exports.node = makeNode
-function makeNode (name, address, opts) {
-  return new LogicalTree(name, address, opts || {})
-}
-
-function addChild (dep, tree, allDeps, pkgLock) {
-  tree.addDep(dep)
-  allDeps.set(dep.address, dep)
-  const addr = dep.address
-  const lockNode = atAddr(pkgLock, addr)
-  Object.keys(lockNode.requires || {}).forEach(name => {
-    const tdepAddr = reqAddr(pkgLock, name, addr)
-    let tdep = allDeps.get(tdepAddr)
-    if (!tdep) {
-      tdep = makeNode(name, tdepAddr, atAddr(pkgLock, tdepAddr))
-      addChild(tdep, dep, allDeps, pkgLock)
-    } else {
-      dep.addDep(tdep)
-    }
-  })
-}
-
-module.exports._reqAddr = reqAddr
-function reqAddr (pkgLock, name, fromAddr) {
-  const lockNode = atAddr(pkgLock, fromAddr)
-  const child = (lockNode.dependencies || {})[name]
-  if (child) {
-    return `${fromAddr}:${name}`
-  } else {
-    const parts = fromAddr.split(':')
-    while (parts.length) {
-      parts.pop()
-      const joined = parts.join(':')
-      const parent = atAddr(pkgLock, joined)
-      if (parent) {
-        const child = (parent.dependencies || {})[name]
-        if (child) {
-          return `${joined}${parts.length ? ':' : ''}${name}`
-        }
-      }
-    }
-    const err = new Error(`${name} not accessible from ${fromAddr}`)
-    err.pkgLock = pkgLock
-    err.target = name
-    err.from = fromAddr
-    throw err
-  }
-}
-
-module.exports._atAddr = atAddr
-function atAddr (pkgLock, addr) {
-  if (!addr.length) { return pkgLock }
-  const parts = addr.split(':')
-  return parts.reduce((acc, next) => {
-    return acc && (acc.dependencies || {})[next]
-  }, pkgLock)
-}
-
-function promiseMap (arr, fn, opts, _index) {
-  _index = _index || 0
-  const P = (opts && opts.Promise) || Promise
-  if (P.map) {
-    return P.map(arr, fn, opts)
-  } else {
-    if (!(arr instanceof Array)) {
-      arr = Array.from(arr)
-    }
-    if (_index >= arr.length) {
-      return P.resolve()
-    } else {
-      return P.resolve(fn(arr[_index], _index, arr))
-      .then(() => promiseMap(arr, fn, opts, _index + 1))
-    }
-  }
-}
-
-
-/***/ }),
-/* 767 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = Number.isNaN || function (x) {
-	return x !== x;
-};
-
-
-/***/ }),
-/* 768 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var crypto = __webpack_require__(12)
-  , qs = __webpack_require__(196)
-  ;
-
-function sha1 (key, body) {
-  return crypto.createHmac('sha1', key).update(body).digest('base64')
-}
-
-function rsa (key, body) {
-  return crypto.createSign("RSA-SHA1").update(body).sign(key, 'base64');
-}
-
-function rfc3986 (str) {
-  return encodeURIComponent(str)
-    .replace(/!/g,'%21')
-    .replace(/\*/g,'%2A')
-    .replace(/\(/g,'%28')
-    .replace(/\)/g,'%29')
-    .replace(/'/g,'%27')
-    ;
-}
-
-// Maps object to bi-dimensional array
-// Converts { foo: 'A', bar: [ 'b', 'B' ]} to
-// [ ['foo', 'A'], ['bar', 'b'], ['bar', 'B'] ]
-function map (obj) {
-  var key, val, arr = []
-  for (key in obj) {
-    val = obj[key]
-    if (Array.isArray(val))
-      for (var i = 0; i < val.length; i++)
-        arr.push([key, val[i]])
-    else if (typeof val === "object")
-      for (var prop in val)
-        arr.push([key + '[' + prop + ']', val[prop]]);
-    else
-      arr.push([key, val])
-  }
-  return arr
-}
-
-// Compare function for sort
-function compare (a, b) {
-  return a > b ? 1 : a < b ? -1 : 0
-}
-
-function generateBase (httpMethod, base_uri, params) {
-  // adapted from https://dev.twitter.com/docs/auth/oauth and 
-  // https://dev.twitter.com/docs/auth/creating-signature
-
-  // Parameter normalization
-  // http://tools.ietf.org/html/rfc5849#section-3.4.1.3.2
-  var normalized = map(params)
-  // 1.  First, the name and value of each parameter are encoded
-  .map(function (p) {
-    return [ rfc3986(p[0]), rfc3986(p[1] || '') ]
-  })
-  // 2.  The parameters are sorted by name, using ascending byte value
-  //     ordering.  If two or more parameters share the same name, they
-  //     are sorted by their value.
-  .sort(function (a, b) {
-    return compare(a[0], b[0]) || compare(a[1], b[1])
-  })
-  // 3.  The name of each parameter is concatenated to its corresponding
-  //     value using an "=" character (ASCII code 61) as a separator, even
-  //     if the value is empty.
-  .map(function (p) { return p.join('=') })
-   // 4.  The sorted name/value pairs are concatenated together into a
-   //     single string by using an "&" character (ASCII code 38) as
-   //     separator.
-  .join('&')
-
-  var base = [
-    rfc3986(httpMethod ? httpMethod.toUpperCase() : 'GET'),
-    rfc3986(base_uri),
-    rfc3986(normalized)
-  ].join('&')
-
-  return base
-}
-
-function hmacsign (httpMethod, base_uri, params, consumer_secret, token_secret) {
-  var base = generateBase(httpMethod, base_uri, params)
-  var key = [
-    consumer_secret || '',
-    token_secret || ''
-  ].map(rfc3986).join('&')
-
-  return sha1(key, base)
-}
-
-function rsasign (httpMethod, base_uri, params, private_key, token_secret) {
-  var base = generateBase(httpMethod, base_uri, params)
-  var key = private_key || ''
-
-  return rsa(key, base)
-}
-
-function plaintext (consumer_secret, token_secret) {
-  var key = [
-    consumer_secret || '',
-    token_secret || ''
-  ].map(rfc3986).join('&')
-
-  return key
-}
-
-function sign (signMethod, httpMethod, base_uri, params, consumer_secret, token_secret) {
-  var method
-  var skipArgs = 1
-
-  switch (signMethod) {
-    case 'RSA-SHA1':
-      method = rsasign
-      break
-    case 'HMAC-SHA1':
-      method = hmacsign
-      break
-    case 'PLAINTEXT':
-      method = plaintext
-      skipArgs = 4
-      break
-    default:
-     throw new Error("Signature method not supported: " + signMethod)
-  }
-
-  return method.apply(null, [].slice.call(arguments, skipArgs))
-}
-
-exports.hmacsign = hmacsign
-exports.rsasign = rsasign
-exports.plaintext = plaintext
-exports.sign = sign
-exports.rfc3986 = rfc3986
-exports.generateBase = generateBase
-
-
-
-/***/ }),
-/* 769 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * object.omit <https://github.com/jonschlinkert/object.omit>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isObject = __webpack_require__(735);
-var forOwn = __webpack_require__(770);
-
-module.exports = function omit(obj, keys) {
-  if (!isObject(obj)) return {};
-
-  keys = [].concat.apply([], [].slice.call(arguments, 1));
-  var last = keys[keys.length - 1];
-  var res = {}, fn;
-
-  if (typeof last === 'function') {
-    fn = keys.pop();
-  }
-
-  var isFunction = typeof fn === 'function';
-  if (!keys.length && !isFunction) {
-    return obj;
-  }
-
-  forOwn(obj, function(value, key) {
-    if (keys.indexOf(key) === -1) {
-
-      if (!isFunction) {
-        res[key] = value;
-      } else if (fn(value, key, obj)) {
-        res[key] = value;
-      }
-    }
-  });
-  return res;
-};
-
-
-/***/ }),
-/* 770 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * for-own <https://github.com/jonschlinkert/for-own>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var forIn = __webpack_require__(647);
-var hasOwn = Object.prototype.hasOwnProperty;
-
-module.exports = function forOwn(obj, fn, thisArg) {
-  forIn(obj, function(val, key) {
-    if (hasOwn.call(obj, key)) {
-      return fn.call(thisArg, obj[key], key, obj);
-    }
-  });
-};
-
-
-/***/ }),
-/* 771 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const mimicFn = __webpack_require__(760);
-
-module.exports = (fn, opts) => {
-	// TODO: Remove this in v3
-	if (opts === true) {
-		throw new TypeError('The second argument is now an options object');
-	}
-
-	if (typeof fn !== 'function') {
-		throw new TypeError('Expected a function');
-	}
-
-	opts = opts || {};
-
-	let ret;
-	let called = false;
-	const fnName = fn.displayName || fn.name || '<anonymous>';
-
-	const onetime = function () {
-		if (called) {
-			if (opts.throw === true) {
-				throw new Error(`Function \`${fnName}\` can only be called once`);
-			}
-
-			return ret;
-		}
-
-		called = true;
-		ret = fn.apply(this, arguments);
-		fn = null;
-
-		return ret;
-	};
-
-	mimicFn(onetime, fn);
-
-	return onetime;
-};
-
-
-/***/ }),
-/* 772 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var isWindows = process.platform === 'win32';
-var trailingSlashRe = isWindows ? /[^:]\\$/ : /.\/$/;
-
-// https://github.com/nodejs/node/blob/3e7a14381497a3b73dda68d05b5130563cdab420/lib/os.js#L25-L43
-module.exports = function () {
-	var path;
-
-	if (isWindows) {
-		path = process.env.TEMP ||
-			process.env.TMP ||
-			(process.env.SystemRoot || process.env.windir) + '\\temp';
-	} else {
-		path = process.env.TMPDIR ||
-			process.env.TMP ||
-			process.env.TEMP ||
-			'/tmp';
-	}
-
-	if (trailingSlashRe.test(path)) {
-		path = path.slice(0, -1);
-	}
-
-	return path;
-};
-
-
-/***/ }),
-/* 773 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * parse-glob <https://github.com/jonschlinkert/parse-glob>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-var isGlob = __webpack_require__(178);
-var findBase = __webpack_require__(652);
-var extglob = __webpack_require__(177);
-var dotfile = __webpack_require__(733);
-
-/**
- * Expose `cache`
- */
-
-var cache = module.exports.cache = {};
-
-/**
- * Parse a glob pattern into tokens.
- *
- * When no paths or '**' are in the glob, we use a
- * different strategy for parsing the filename, since
- * file names can contain braces and other difficult
- * patterns. such as:
- *
- *  - `*.{a,b}`
- *  - `(**|*.js)`
- */
-
-module.exports = function parseGlob(glob) {
-  if (cache.hasOwnProperty(glob)) {
-    return cache[glob];
-  }
-
-  var tok = {};
-  tok.orig = glob;
-  tok.is = {};
-
-  // unescape dots and slashes in braces/brackets
-  glob = escape(glob);
-
-  var parsed = findBase(glob);
-  tok.is.glob = parsed.isGlob;
-
-  tok.glob = parsed.glob;
-  tok.base = parsed.base;
-  var segs = /([^\/]*)$/.exec(glob);
-
-  tok.path = {};
-  tok.path.dirname = '';
-  tok.path.basename = segs[1] || '';
-  tok.path.dirname = glob.split(tok.path.basename).join('') || '';
-  var basename = (tok.path.basename || '').split('.') || '';
-  tok.path.filename = basename[0] || '';
-  tok.path.extname = basename.slice(1).join('.') || '';
-  tok.path.ext = '';
-
-  if (isGlob(tok.path.dirname) && !tok.path.basename) {
-    if (!/\/$/.test(tok.glob)) {
-      tok.path.basename = tok.glob;
-    }
-    tok.path.dirname = tok.base;
-  }
-
-  if (glob.indexOf('/') === -1 && !tok.is.globstar) {
-    tok.path.dirname = '';
-    tok.path.basename = tok.orig;
-  }
-
-  var dot = tok.path.basename.indexOf('.');
-  if (dot !== -1) {
-    tok.path.filename = tok.path.basename.slice(0, dot);
-    tok.path.extname = tok.path.basename.slice(dot);
-  }
-
-  if (tok.path.extname.charAt(0) === '.') {
-    var exts = tok.path.extname.split('.');
-    tok.path.ext = exts[exts.length - 1];
-  }
-
-  // unescape dots and slashes in braces/brackets
-  tok.glob = unescape(tok.glob);
-  tok.path.dirname = unescape(tok.path.dirname);
-  tok.path.basename = unescape(tok.path.basename);
-  tok.path.filename = unescape(tok.path.filename);
-  tok.path.extname = unescape(tok.path.extname);
-
-  // Booleans
-  var is = (glob && tok.is.glob);
-  tok.is.negated  = glob && glob.charAt(0) === '!';
-  tok.is.extglob  = glob && extglob(glob);
-  tok.is.braces   = has(is, glob, '{');
-  tok.is.brackets = has(is, glob, '[:');
-  tok.is.globstar = has(is, glob, '**');
-  tok.is.dotfile  = dotfile(tok.path.basename) || dotfile(tok.path.filename);
-  tok.is.dotdir   = dotdir(tok.path.dirname);
-  return (cache[glob] = tok);
-}
-
-/**
- * Returns true if the glob matches dot-directories.
- *
- * @param  {Object} `tok` The tokens object
- * @param  {Object} `path` The path object
- * @return {Object}
- */
-
-function dotdir(base) {
-  if (base.indexOf('/.') !== -1) {
-    return true;
-  }
-  if (base.charAt(0) === '.' && base.charAt(1) !== '/') {
-    return true;
-  }
-  return false;
-}
-
-/**
- * Returns true if the pattern has the given `ch`aracter(s)
- *
- * @param  {Object} `glob` The glob pattern.
- * @param  {Object} `ch` The character to test for
- * @return {Object}
- */
-
-function has(is, glob, ch) {
-  return is && glob.indexOf(ch) !== -1;
-}
-
-/**
- * Escape/unescape utils
- */
-
-function escape(str) {
-  var re = /\{([^{}]*?)}|\(([^()]*?)\)|\[([^\[\]]*?)\]/g;
-  return str.replace(re, function (outter, braces, parens, brackets) {
-    var inner = braces || parens || brackets;
-    if (!inner) { return outter; }
-    return outter.split(inner).join(esc(inner));
-  });
-}
-
-function esc(str) {
-  str = str.split('/').join('__SLASH__');
-  str = str.split('.').join('__DOT__');
-  return str;
-}
-
-function unescape(str) {
-  str = str.split('__SLASH__').join('/');
-  str = str.split('__DOT__').join('.');
-  return str;
-}
-
-
-/***/ }),
-/* 774 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isWindows = process.platform === 'win32';
-
-// Regex to split a windows path into three parts: [*, device, slash,
-// tail] windows-only
-var splitDeviceRe =
-    /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
-
-// Regex to split the tail part of the above into [*, dir, basename, ext]
-var splitTailRe =
-    /^([\s\S]*?)((?:\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))(?:[\\\/]*)$/;
-
-var win32 = {};
-
-// Function to split a filename into [root, dir, basename, ext]
-function win32SplitPath(filename) {
-  // Separate device+slash from tail
-  var result = splitDeviceRe.exec(filename),
-      device = (result[1] || '') + (result[2] || ''),
-      tail = result[3] || '';
-  // Split the tail into dir, basename and extension
-  var result2 = splitTailRe.exec(tail),
-      dir = result2[1],
-      basename = result2[2],
-      ext = result2[3];
-  return [device, dir, basename, ext];
-}
-
-win32.parse = function(pathString) {
-  if (typeof pathString !== 'string') {
-    throw new TypeError(
-        "Parameter 'pathString' must be a string, not " + typeof pathString
-    );
-  }
-  var allParts = win32SplitPath(pathString);
-  if (!allParts || allParts.length !== 4) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  return {
-    root: allParts[0],
-    dir: allParts[0] + allParts[1].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[3],
-    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
-  };
-};
-
-
-
-// Split a filename into [root, dir, basename, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
-var posix = {};
-
-
-function posixSplitPath(filename) {
-  return splitPathRe.exec(filename).slice(1);
-}
-
-
-posix.parse = function(pathString) {
-  if (typeof pathString !== 'string') {
-    throw new TypeError(
-        "Parameter 'pathString' must be a string, not " + typeof pathString
-    );
-  }
-  var allParts = posixSplitPath(pathString);
-  if (!allParts || allParts.length !== 4) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  allParts[1] = allParts[1] || '';
-  allParts[2] = allParts[2] || '';
-  allParts[3] = allParts[3] || '';
-
-  return {
-    root: allParts[0],
-    dir: allParts[0] + allParts[1].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[3],
-    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
-  };
-};
-
-
-if (isWindows)
-  module.exports = win32.parse;
-else /* posix */
-  module.exports = posix.parse;
-
-module.exports.posix = posix.parse;
-module.exports.win32 = win32.parse;
-
-
-/***/ }),
-/* 775 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var duplexify = __webpack_require__(386)
-var through = __webpack_require__(461)
-var bufferFrom = __webpack_require__(595)
-
-var noop = function() {}
-
-var isObject = function(data) {
-  return !Buffer.isBuffer(data) && typeof data !== 'string'
-}
-
-var peek = function(opts, onpeek) {
-  if (typeof opts === 'number') opts = {maxBuffer:opts}
-  if (typeof opts === 'function') return peek(null, opts)
-  if (!opts) opts = {}
-
-  var maxBuffer = typeof opts.maxBuffer === 'number' ? opts.maxBuffer : 65535
-  var strict = opts.strict
-  var newline = opts.newline !== false
-
-  var buffer = []
-  var bufferSize = 0
-  var dup = duplexify.obj()
-
-  var peeker = through.obj({highWaterMark:1}, function(data, enc, cb) {
-    if (isObject(data)) return ready(data, null, cb)
-    if (!Buffer.isBuffer(data)) data = bufferFrom(data)
-
-    if (newline) {
-      var nl = Array.prototype.indexOf.call(data, 10)
-      if (nl > 0 && data[nl-1] === 13) nl--
-
-      if (nl > -1) {
-        buffer.push(data.slice(0, nl))
-        return ready(Buffer.concat(buffer), data.slice(nl), cb)
-      }
-    }
-
-    buffer.push(data)
-    bufferSize += data.length
-
-    if (bufferSize < maxBuffer) return cb()
-    if (strict) return cb(new Error('No newline found'))
-    ready(Buffer.concat(buffer), null, cb)
-  })
-
-  var onpreend = function() {
-    if (strict) return dup.destroy(new Error('No newline found'))
-    dup.cork()
-    ready(Buffer.concat(buffer), null, function(err) {
-      if (err) return dup.destroy(err)
-      dup.uncork()
-    })
-  }
-
-  var ready = function(data, overflow, cb) {
-    dup.removeListener('preend', onpreend)
-    onpeek(data, function(err, parser) {
-      if (err) return cb(err)
-
-      dup.setWritable(parser)
-      dup.setReadable(parser)
-
-      if (data) parser.write(data)
-      if (overflow) parser.write(overflow)
-
-      overflow = buffer = peeker = null // free the data
-      cb()
-    })
-  }
-
-  dup.on('preend', onpreend)
-  dup.setWritable(peeker)
-
-  return dup
-}
-
-module.exports = peek
-
-
-/***/ }),
-/* 776 */
-/***/ (function(module, exports) {
-
-// Generated by CoffeeScript 1.12.2
-(function() {
-  var getNanoSeconds, hrtime, loadTime, moduleLoadTime, nodeLoadTime, upTime;
-
-  if ((typeof performance !== "undefined" && performance !== null) && performance.now) {
-    module.exports = function() {
-      return performance.now();
-    };
-  } else if ((typeof process !== "undefined" && process !== null) && process.hrtime) {
-    module.exports = function() {
-      return (getNanoSeconds() - nodeLoadTime) / 1e6;
-    };
-    hrtime = process.hrtime;
-    getNanoSeconds = function() {
-      var hr;
-      hr = hrtime();
-      return hr[0] * 1e9 + hr[1];
-    };
-    moduleLoadTime = getNanoSeconds();
-    upTime = process.uptime() * 1e9;
-    nodeLoadTime = moduleLoadTime - upTime;
-  } else if (Date.now) {
-    module.exports = function() {
-      return Date.now() - loadTime;
-    };
-    loadTime = Date.now();
-  } else {
-    module.exports = function() {
-      return new Date().getTime() - loadTime;
-    };
-    loadTime = new Date().getTime();
-  }
-
-}).call(this);
-
-//# sourceMappingURL=performance-now.js.map
-
-
-/***/ }),
-/* 777 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = (url, opts) => {
-	if (typeof url !== 'string') {
-		throw new TypeError(`Expected \`url\` to be of type \`string\`, got \`${typeof url}\``);
-	}
-
-	url = url.trim();
-	opts = Object.assign({https: false}, opts);
-
-	if (/^\.*\/|^(?!localhost)\w+:/.test(url)) {
-		return url;
-	}
-
-	return url.replace(/^(?!(?:\w+:)?\/\/)/, opts.https ? 'https://' : 'http://');
-};
-
-
-/***/ }),
-/* 778 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * preserve <https://github.com/jonschlinkert/preserve>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT license.
- */
-
-
-
-/**
- * Replace tokens in `str` with a temporary, heuristic placeholder.
- *
- * ```js
- * tokens.before('{a\\,b}');
- * //=> '{__ID1__}'
- * ```
- *
- * @param  {String} `str`
- * @return {String} String with placeholders.
- * @api public
- */
-
-exports.before = function before(str, re) {
-  return str.replace(re, function (match) {
-    var id = randomize();
-    cache[id] = match;
-    return '__ID' + id + '__';
-  });
-};
-
-/**
- * Replace placeholders in `str` with original tokens.
- *
- * ```js
- * tokens.after('{__ID1__}');
- * //=> '{a\\,b}'
- * ```
- *
- * @param  {String} `str` String with placeholders
- * @return {String} `str` String with original tokens.
- * @api public
- */
-
-exports.after = function after(str) {
-  return str.replace(/__ID(.{5})__/g, function (_, id) {
-    return cache[id];
-  });
-};
-
-function randomize() {
-  return Math.random().toString().slice(2, 7);
-}
-
-var cache = {};
-
-/***/ }),
-/* 779 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function makeSync(fs, name) {
-    const fn = fs[`${name}Sync`];
-
-    return function () {
-        const callback = arguments[arguments.length - 1];
-        const args = Array.prototype.slice.call(arguments, 0, -1);
-        let ret;
-
-        try {
-            ret = fn.apply(fs, args);
-        } catch (err) {
-            return callback(err);
-        }
-
-        callback(null, ret);
-    };
-}
-
-function syncFs(fs) {
-    const fns = ['mkdir', 'realpath', 'stat', 'rmdir', 'utimes'];
-    const obj = {};
-
-    // Create the sync versions of the methods that we need
-    fns.forEach((name) => {
-        obj[name] = makeSync(fs, name);
-    });
-
-    // Copy the rest of the functions
-    for (const key in fs) {
-        if (!obj[key]) {
-            obj[key] = fs[key];
-        }
-    }
-
-    return obj;
-}
-
-module.exports = syncFs;
-
-
-/***/ }),
-/* 780 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-/**
- * Key a method on your object with this symbol and you can get special
- * formatting for that value! See ShellStringText, ShellStringUnquoted, or
- * shellStringSemicolon for examples.
- * @ignore
- */
-const formatSymbol = Symbol('format');
-/**
- * This symbol is for implementing advanced behaviors like the need for extra
- * carets in Windows shell strings that use pipes. If present, it's called in
- * an earlier phase than formatSymbol, and is passed a mutable context that can
- * be read during the format phase to influence formatting.
- * @ignore
- */
-const preformatSymbol = Symbol('preformat');
-
-// When minimum Node version becomes 6, replace calls to sticky with /.../y and
-// inline execFrom.
-let stickySupported = true;
-try {
-  new RegExp('', 'y');
-} catch (e) {
-  stickySupported = false;
-}
-const sticky = stickySupported ? source => new RegExp(source, 'y') : source => new RegExp(`^(?:${source})`);
-const execFrom = stickySupported ? (re, haystack, index) => (re.lastIndex = index, re.exec(haystack)) : (re, haystack, index) => re.exec(haystack.substr(index));
-
-function quoteForCmd(text, forceQuote) {
-  let caretDepth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  // See the below blog post for an explanation of this function and
-  // quoteForWin32:
-  // https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
-  if (!text.length) {
-    return '""';
-  }
-  if (/[\n\r]/.test(text)) {
-    throw new Error("Line breaks can't be quoted on Windows");
-  }
-  const caretEscape = /["%]/.test(text);
-  text = quoteForWin32(text, forceQuote || !caretEscape && /[&()<>^|]/.test(text));
-  if (caretEscape) {
-    // See Win32Context for explanation of what caretDepth is for.
-    do {
-      text = text.replace(/[\t "%&()<>^|]/g, '^$&');
-    } while (caretDepth--);
-  }
-  return text;
-}
-const quoteForWin32 = (text, forceQuote) => forceQuote || /[\t "]/.test(text) ? `"${text.replace(/\\+(?=$|")/g, '$&$&').replace(/"/g, '\\"')}"` : text;
-const cmdMetaChars = /[\t\n\r "%&()<>^|]/;
-class Win32Context {
-  constructor() {
-    this.currentScope = newScope(null);
-    this.scopesByObject = new Map();
-  }
-  read(text) {
-    // When cmd.exe pipes to or from a batch file, it spawns a second copy of
-    // itself to run the inner command. This necessitates doubling up on carets
-    // so that escaped characters survive both cmd.exe invocations. See:
-    // https://stackoverflow.com/questions/8192318/why-does-delayed-expansion-fail-when-inside-a-piped-block-of-code#8194279
-    // https://ss64.com/nt/syntax-redirection.html
-    //
-    // Parentheses can create an additional subshell, requiring additional
-    // escaping... it's a mess.
-    //
-    // So here's what we do about it: we read all unquoted text in a shell
-    // string and put it through this tiny parser that looks for pipes,
-    // sequence operators (&, &&, ||), and parentheses. This can't be part of
-    // the main Puka parsing, because it can be affected by `unquoted(...)`
-    // values provided at evaluation time.
-    //
-    // Then, after associating each thing that needs to be quoted with a scope
-    // (via `mark()`), we can determine the depth of caret escaping required
-    // in each scope and pass it (via `Formatter::quote()`) to `quoteForCmd()`.
-    //
-    // See also `ShellStringText`, which holds the logic for the previous
-    // paragraph.
-    const length = text.length;
-    for (let pos = 0, match; pos < length;) {
-      if (match = execFrom(reUnimportant, text, pos)) {
-        pos += match[0].length;
-      }
-      if (pos >= length) break;
-      if (match = execFrom(reSeqOp, text, pos)) {
-        this.seq();
-        pos += match[0].length;
-      } else {
-        const char = text.charCodeAt(pos);
-        if (char === CARET) {
-          pos += 2;
-        } else if (char === QUOTE) {
-          // If you were foolish enough to leave a dangling quotation mark in
-          // an unquoted span... you're likely to have bigger problems than
-          // incorrect escaping. So we just do the simplest thing of looking for
-          // the end quote only in this piece of text.
-          pos += execFrom(reNotQuote, text, pos + 1)[0].length + 2;
-        } else {
-          if (char === OPEN_PAREN) {
-            this.enterScope();
-          } else if (char === CLOSE_PAREN) {
-            this.exitScope();
-          } else {
-            // (char === '|')
-            this.currentScope.depthDelta = 1;
-          }
-          pos++;
-        }
-      }
-    }
-  }
-  enterScope() {
-    this.currentScope = newScope(this.currentScope);
-  }
-  exitScope() {
-    this.currentScope = this.currentScope.parent || (this.currentScope.parent = newScope(null));
-  }
-  seq() {
-    // | binds tighter than sequence operators, so the latter create new sibling
-    // scopes for future |s to mutate.
-    this.currentScope = newScope(this.currentScope.parent);
-  }
-  mark(obj) {
-    this.scopesByObject.set(obj, this.currentScope);
-  }
-  at(obj) {
-    return { depth: getDepth(this.scopesByObject.get(obj)) };
-  }
-}
-const getDepth = scope => scope === null ? 0 : scope.depth !== -1 ? scope.depth : scope.depth = getDepth(scope.parent) + scope.depthDelta;
-const newScope = parent => ({ parent, depthDelta: 0, depth: -1 });
-const CARET = '^'.charCodeAt();
-const QUOTE = '"'.charCodeAt();
-const OPEN_PAREN = '('.charCodeAt();
-const CLOSE_PAREN = ')'.charCodeAt();
-const reNotQuote = sticky('[^"]*');
-const reSeqOp = sticky('&&?|\\|\\|');
-const reUnimportant = sticky('(?:>&|[^"$&()^|])+');
-
-const quoteForSh = (text, forceQuote) => text.length ? forceQuote || shMetaChars.test(text) ? `'${text.replace(/'/g, "'\\''")}'`.replace(/^(?:'')+(?!$)/, '').replace(/\\'''/g, "\\'") : text : "''";
-const shMetaChars = /[\t\n\r "#$&'()*;<>?\\`|~]/;
-
-/**
- * To get a Formatter, call `Formatter.for`.
- *
- * To create a new Formatter, pass an object to `Formatter.declare`.
- *
- * To set the global default Formatter, assign to `Formatter.default`.
- *
- * @class
- * @property {Formatter} default - The Formatter to be used when no platform
- * is provided—for example, when creating strings with `sh`.
- * @ignore
- */
-function Formatter() {}
-Object.assign(Formatter, /** @lends Formatter */{
-  /**
-   * Gets a Formatter that has been declared for the provided platform, or
-   * the base `'sh'` formatter if there is no Formatter specific to this
-   * platform, or the Formatter for the current platform if no specific platform
-   * is provided.
-   */
-  for(platform) {
-    return platform == null ? Formatter.default || (Formatter.default = Formatter.for(process.platform)) : Formatter._registry.get(platform) || Formatter._registry.get('sh');
-  },
-  /**
-   * Creates a new Formatter or mutates the properties on an existing
-   * Formatter. The `platform` key on the provided properties object determines
-   * when the Formatter is retrieved.
-   */
-  declare(props) {
-    const platform = props && props.platform || 'sh';
-    const existingFormatter = Formatter._registry.get(platform);
-    const formatter = Object.assign(existingFormatter || new Formatter(), props);
-    formatter.emptyString === void 0 && (formatter.emptyString = formatter.quote('', true));
-    existingFormatter || Formatter._registry.set(formatter.platform, formatter);
-  },
-  _registry: new Map(),
-  prototype: {
-    platform: 'sh',
-    quote: quoteForSh,
-    metaChars: shMetaChars,
-    hasExtraMetaChars: false,
-    statementSeparator: ';',
-    createContext() {
-      return defaultContext;
-    }
-  }
-});
-const defaultContext = {
-  at() {}
-};
-Formatter.declare();
-Formatter.declare({
-  platform: 'win32',
-  quote(text, forceQuote, opts) {
-    return quoteForCmd(text, forceQuote, opts && opts.depth || 0);
-  },
-  metaChars: cmdMetaChars,
-  hasExtraMetaChars: true,
-  statementSeparator: '&',
-  createContext(root) {
-    const context = new this.Context();
-    root[preformatSymbol](context);
-    return context;
-  },
-  Context: Win32Context
-});
-
-const isObject = any => any === Object(any);
-function memoize(f) {
-  const cache = new WeakMap();
-  return arg => {
-    let result = cache.get(arg);
-    if (result === void 0) {
-      result = f(arg);
-      cache.set(arg, result);
-    }
-    return result;
-  };
-}
-
-/**
- * Represents a contiguous span of text that may or must be quoted. The contents
- * may already contain quoted segments, which will always be quoted. If unquoted
- * segments also require quoting, the entire span will be quoted together.
- * @ignore
- */
-class ShellStringText {
-  constructor(contents, untested) {
-    this.contents = contents;
-    this.untested = untested;
-  }
-  [formatSymbol](formatter, context) {
-    const unformattedContents = this.contents;
-    const length = unformattedContents.length;
-    const contents = new Array(length);
-    for (let i = 0; i < length; i++) {
-      const c = unformattedContents[i];
-      contents[i] = isObject(c) && formatSymbol in c ? c[formatSymbol](formatter) : c;
-    }
-    for (let unquoted = true, i = 0; i < length; i++) {
-      const content = contents[i];
-      if (content === null) {
-        unquoted = !unquoted;
-      } else {
-        if (unquoted && (formatter.hasExtraMetaChars || this.untested && this.untested.has(i)) && formatter.metaChars.test(content)) {
-          return formatter.quote(contents.join(''), false, context.at(this));
-        }
-      }
-    }
-    const parts = [];
-    for (let quoted = null, i = 0; i < length; i++) {
-      const content = contents[i];
-      if (content === null) {
-        quoted = quoted ? (parts.push(formatter.quote(quoted.join(''), true, context.at(this))), null) : [];
-      } else {
-        (quoted || parts).push(content);
-      }
-    }
-    const result = parts.join('');
-    return result.length ? result : formatter.emptyString;
-  }
-  [preformatSymbol](context) {
-    context.mark(this);
-  }
-}
-
-/**
- * Represents a contiguous span of text that will not be quoted.
- * @ignore
- */
-class ShellStringUnquoted {
-  constructor(value) {
-    this.value = value;
-  }
-  [formatSymbol]() {
-    return this.value;
-  }
-  [preformatSymbol](context) {
-    context.read(this.value);
-  }
-}
-
-/**
- * Represents a semicolon... or an ampersand, on Windows.
- * @ignore
- */
-const shellStringSemicolon = {
-  [formatSymbol](formatter) {
-    return formatter.statementSeparator;
-  },
-  [preformatSymbol](context) {
-    context.seq();
-  }
-};
-
-const PLACEHOLDER = {};
-const parse = memoize(templateSpans => {
-  // These are the token types our DSL can recognize. Their values won't escape
-  // this function.
-  const TOKEN_TEXT = 0;
-  const TOKEN_QUOTE = 1;
-  const TOKEN_SEMI = 2;
-  const TOKEN_UNQUOTED = 3;
-  const TOKEN_SPACE = 4;
-  const TOKEN_REDIRECT = 5;
-  const result = [];
-  let placeholderCount = 0;
-  let prefix = null;
-  let onlyPrefixOnce = false;
-  let contents = [];
-  let quote = 0;
-  const lastSpan = templateSpans.length - 1;
-  for (let spanIndex = 0; spanIndex <= lastSpan; spanIndex++) {
-    const templateSpan = templateSpans[spanIndex];
-    const posEnd = templateSpan.length;
-    let tokenStart = 0;
-    if (spanIndex) {
-      placeholderCount++;
-      contents.push(PLACEHOLDER);
-    }
-    // For each span, we first do a recognizing pass in which we use regular
-    // expressions to identify the positions of tokens in the text, and then
-    // a second pass that actually splits the text into the minimum number of
-    // substrings necessary.
-    const recognized = []; // [type1, index1, type2, index2...]
-    let firstWordBreak = -1;
-    let lastWordBreak = -1;
-    {
-      let pos = 0,
-          match;
-      while (pos < posEnd) {
-        if (quote) {
-          if (match = execFrom(quote === CHAR_SQUO ? reQuotation1 : reQuotation2, templateSpan, pos)) {
-            recognized.push(TOKEN_TEXT, pos);
-            pos += match[0].length;
-          }
-          if (pos < posEnd) {
-            recognized.push(TOKEN_QUOTE, pos++);
-            quote = 0;
-          }
-        } else {
-          if (match = execFrom(reText, templateSpan, pos)) {
-            const setBreaks = match[1] != null;
-            setBreaks && firstWordBreak < 0 && (firstWordBreak = pos);
-            recognized.push(setBreaks ? TOKEN_UNQUOTED : TOKEN_TEXT, pos);
-            pos += match[0].length;
-            setBreaks && (lastWordBreak = pos);
-          }
-          if (match = execFrom(reRedirectOrSpace, templateSpan, pos)) {
-            firstWordBreak < 0 && (firstWordBreak = pos);
-            lastWordBreak = pos;
-            recognized.push(match[1] ? TOKEN_REDIRECT : TOKEN_SPACE, pos);
-            pos += match[0].length;
-          }
-          const char = templateSpan.charCodeAt(pos);
-          if (char === CHAR_SEMI) {
-            firstWordBreak < 0 && (firstWordBreak = pos);
-            recognized.push(TOKEN_SEMI, pos++);
-            lastWordBreak = pos;
-          } else if (char === CHAR_SQUO || char === CHAR_DQUO) {
-            recognized.push(TOKEN_QUOTE, pos++);
-            quote = char;
-          }
-        }
-      }
-    }
-    // Word breaks are only important if they separate words with placeholders,
-    // so we can ignore the first/last break if this is the first/last span.
-    spanIndex === 0 && (firstWordBreak = -1);
-    spanIndex === lastSpan && (lastWordBreak = posEnd);
-    // Here begins the second pass mentioned above. This loop runs one more
-    // iteration than there are tokens in recognized, because it handles tokens
-    // on a one-iteration delay; hence the i <= iEnd instead of i < iEnd.
-    const iEnd = recognized.length;
-    for (let i = 0, type = -1; i <= iEnd; i += 2) {
-      let typeNext = -1,
-          pos;
-      if (i === iEnd) {
-        pos = posEnd;
-      } else {
-        typeNext = recognized[i];
-        pos = recognized[i + 1];
-        // If the next token is space or redirect, but there's another word
-        // break in this span, then we can handle that token the same way we
-        // would handle unquoted text because it isn't being attached to a
-        // placeholder.
-        typeNext >= TOKEN_SPACE && pos !== lastWordBreak && (typeNext = TOKEN_UNQUOTED);
-      }
-      const breakHere = pos === firstWordBreak || pos === lastWordBreak;
-      if (pos && (breakHere || typeNext !== type)) {
-        let value = type === TOKEN_QUOTE ? null : type === TOKEN_SEMI ? shellStringSemicolon : templateSpan.substring(tokenStart, pos);
-        if (type >= TOKEN_SEMI) {
-          // This branch handles semicolons, unquoted text, spaces, and
-          // redirects. shellStringSemicolon is already a formatSymbol object;
-          // the rest need to be wrapped.
-          type === TOKEN_SEMI || (value = new ShellStringUnquoted(value));
-          // We don't need to check placeholderCount here like we do below;
-          // that's only relevant during the first word break of the span, and
-          // because this iteration of the loop is processing the token that
-          // was checked for breaks in the previous iteration, it will have
-          // already been handled. For the same reason, prefix is guaranteed to
-          // be null.
-          if (contents.length) {
-            result.push(new ShellStringText(contents, null));
-            contents = [];
-          }
-          // Only spaces and redirects become prefixes, but not if they've been
-          // rewritten to unquoted above.
-          if (type >= TOKEN_SPACE) {
-            prefix = value;
-            onlyPrefixOnce = type === TOKEN_SPACE;
-          } else {
-            result.push(value);
-          }
-        } else {
-          contents.push(value);
-        }
-        tokenStart = pos;
-      }
-      if (breakHere) {
-        if (placeholderCount) {
-          result.push({ contents, placeholderCount, prefix, onlyPrefixOnce });
-        } else {
-          // There's no prefix to handle in this branch; a prefix prior to this
-          // span would mean placeholderCount > 0, and a prefix in this span
-          // can't be created because spaces and redirects get rewritten to
-          // unquoted before the last word break.
-          contents.length && result.push(new ShellStringText(contents, null));
-        }
-        placeholderCount = 0;prefix = null;onlyPrefixOnce = false;
-        contents = [];
-      }
-      type = typeNext;
-    }
-  }
-  if (quote) {
-    throw new SyntaxError(`String is missing a ${String.fromCharCode(quote)} character`);
-  }
-  return result;
-});
-const CHAR_SEMI = ';'.charCodeAt();
-const CHAR_SQUO = "'".charCodeAt();
-const CHAR_DQUO = '"'.charCodeAt();
-const reQuotation1 = sticky("[^']+");
-const reQuotation2 = sticky('[^"]+');
-const reText = sticky('[^\\s"#$&\'();<>\\\\`|]+|([#$&()\\\\`|]+)');
-const reRedirectOrSpace = sticky('((?:\\s+\\d+|\\s*)[<>]+\\s*)|\\s+');
-
-class BitSet {
-  constructor() {
-    this.vector = new Int32Array(1);
-  }
-  has(n) {
-    return (this.vector[n >>> 5] & 1 << n) !== 0;
-  }
-  add(n) {
-    const i = n >>> 5,
-          requiredLength = i + 1;
-    let vector = this.vector;var _vector = vector;
-    let length = _vector.length;
-    if (requiredLength > length) {
-      while (requiredLength > (length *= 2));
-      const oldValues = vector;
-      vector = new Int32Array(length);
-      vector.set(oldValues);
-      this.vector = vector;
-    }
-    vector[i] |= 1 << n;
-  }
-}
-
-function evaluate(template, values) {
-  values = values.map(toStringishArray);
-  const children = [];
-  let valuesStart = 0;
-  for (let i = 0, iMax = template.length; i < iMax; i++) {
-    const word = template[i];
-    if (formatSymbol in word) {
-      children.push(word);
-      continue;
-    }
-    const contents = word.contents,
-          placeholderCount = word.placeholderCount,
-          prefix = word.prefix,
-          onlyPrefixOnce = word.onlyPrefixOnce;
-    const kMax = contents.length;
-    const valuesEnd = valuesStart + placeholderCount;
-    const tuples = cartesianProduct(values, valuesStart, valuesEnd);
-    valuesStart = valuesEnd;
-    for (let j = 0, jMax = tuples.length; j < jMax; j++) {
-      const needSpace = j > 0;
-      const tuple = tuples[j];
-      (needSpace || prefix) && children.push(needSpace && (onlyPrefixOnce || !prefix) ? unquotedSpace : prefix);
-      let interpolatedContents = [];
-      let untested = null;
-      let quoting = false;
-      let tupleIndex = 0;
-      for (let k = 0; k < kMax; k++) {
-        const content = contents[k];
-        if (content === PLACEHOLDER) {
-          const value = tuple[tupleIndex++];
-          if (quoting) {
-            interpolatedContents.push(value);
-          } else {
-            if (isObject(value) && formatSymbol in value) {
-              if (interpolatedContents.length) {
-                children.push(new ShellStringText(interpolatedContents, untested));
-                interpolatedContents = [];
-                untested = null;
-              }
-              children.push(value);
-            } else {
-              (untested || (untested = new BitSet())).add(interpolatedContents.length);
-              interpolatedContents.push(value);
-            }
-          }
-        } else {
-          interpolatedContents.push(content);
-          content === null && (quoting = !quoting);
-        }
-      }
-      if (interpolatedContents.length) {
-        children.push(new ShellStringText(interpolatedContents, untested));
-      }
-    }
-  }
-  return children;
-}
-const primToStringish = value => value == null ? '' + value : value;
-function toStringishArray(value) {
-  let array;
-  switch (true) {
-    default:
-      if (isObject(value)) {
-        if (Array.isArray(value)) {
-          array = value;break;
-        }
-        if (Symbol.iterator in value) {
-          array = Array.from(value);break;
-        }
-      }
-      array = [value];
-  }
-  return array.map(primToStringish);
-}
-function cartesianProduct(arrs, start, end) {
-  const size = end - start;
-  let resultLength = 1;
-  for (let i = start; i < end; i++) {
-    resultLength *= arrs[i].length;
-  }
-  if (resultLength > 1e6) {
-    throw new RangeError("Far too many elements to interpolate");
-  }
-  const result = new Array(resultLength);
-  const indices = new Array(size).fill(0);
-  for (let i = 0; i < resultLength; i++) {
-    const value = result[i] = new Array(size);
-    for (let j = 0; j < size; j++) {
-      value[j] = arrs[j + start][indices[j]];
-    }
-    for (let j = size - 1; j >= 0; j--) {
-      if (++indices[j] < arrs[j + start].length) break;
-      indices[j] = 0;
-    }
-  }
-  return result;
-}
-const unquotedSpace = new ShellStringUnquoted(' ');
-
-/**
- * A ShellString represents a shell command after it has been interpolated, but
- * before it has been formatted for a particular platform. ShellStrings are
- * useful if you want to prepare a command for a different platform than the
- * current one, for instance.
- *
- * To create a ShellString, use `ShellString.sh` the same way you would use
- * top-level `sh`.
- */
-class ShellString {
-  /** @hideconstructor */
-  constructor(children) {
-    this.children = children;
-  }
-  /**
-   * `ShellString.sh` is a template tag just like `sh`; the only difference is
-   * that this function returns a ShellString which has not yet been formatted
-   * into a String.
-   * @returns {ShellString}
-   * @function sh
-   * @static
-   * @memberof ShellString
-   */
-  static sh(templateSpans) {
-    for (var _len = arguments.length, values = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      values[_key - 1] = arguments[_key];
-    }
-    return new ShellString(evaluate(parse(templateSpans), values));
-  }
-  /**
-   * A method to format a ShellString into a regular String formatted for a
-   * particular platform.
-   *
-   * @param {String} [platform] a value that `process.platform` might take:
-   * `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
-   * When omitted, effectively the same as `process.platform`.
-   * @returns {String}
-   */
-  toString(platform) {
-    return this[formatSymbol](Formatter.for(platform));
-  }
-  [formatSymbol](formatter) {
-    let context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : formatter.createContext(this);
-    return this.children.map(child => child[formatSymbol](formatter, context)).join('');
-  }
-  [preformatSymbol](context) {
-    const children = this.children;
-    for (let i = 0, iMax = children.length; i < iMax; i++) {
-      const child = children[i];
-      if (preformatSymbol in child) {
-        child[preformatSymbol](context);
-      }
-    }
-  }
-}
-
-/**
- * A Windows-specific version of {@link quoteForShell}.
- * @param {String} text to be quoted
- * @param {Boolean} [forceQuote] whether to always add quotes even if the string
- * is already safe. Defaults to `false`.
- */
-
-/**
- * A Unix-specific version of {@link quoteForShell}.
- * @param {String} text to be quoted
- * @param {Boolean} [forceQuote] whether to always add quotes even if the string
- * is already safe. Defaults to `false`.
- */
-
-/**
- * Quotes a string for injecting into a shell command.
- *
- * This function is exposed for some hypothetical case when the `sh` DSL simply
- * won't do; `sh` is expected to be the more convenient option almost always.
- * Compare:
- *
- * ```javascript
- * console.log('cmd' + args.map(a => ' ' + quoteForShell(a)).join(''));
- * console.log(sh`cmd ${args}`); // same as above
- *
- * console.log('cmd' + args.map(a => ' ' + quoteForShell(a, true)).join(''));
- * console.log(sh`cmd "${args}"`); // same as above
- * ```
- *
- * Additionally, on Windows, `sh` checks the entire command string for pipes,
- * which subtly change how arguments need to be quoted. If your commands may
- * involve pipes, you are strongly encouraged to use `sh` and not try to roll
- * your own with `quoteForShell`.
- *
- * @param {String} text to be quoted
- * @param {Boolean} [forceQuote] whether to always add quotes even if the string
- * is already safe. Defaults to `false`.
- * @param {String} [platform] a value that `process.platform` might take:
- * `'win32'`, `'linux'`, etc.; determines how the string is to be formatted.
- * When omitted, effectively the same as `process.platform`.
- *
- * @returns {String} a string that is safe for the current (or specified)
- * platform.
- */
-function quoteForShell(text, forceQuote, platform) {
-  return Formatter.for(platform).quote(text, forceQuote);
-}
-
-/**
- * A string template tag for safely constructing cross-platform shell commands.
- *
- * An `sh` template is not actually treated as a literal string to be
- * interpolated; instead, it is a tiny DSL designed to make working with shell
- * strings safe, simple, and straightforward. To get started quickly, see the
- * examples below. {@link #the-sh-dsl More detailed documentation} is available
- * further down.
- *
- * @name sh
- * @example
- * const title = '"this" & "that"';
- * sh`script --title=${title}`; // => "script '--title=\"this\" & \"that\"'"
- * // Note: these examples show results for non-Windows platforms.
- * // On Windows, the above would instead be
- * // 'script ^"--title=\\^"this\\^" ^& \\^"that\\^"^"'.
- *
- * const names = ['file1', 'file 2'];
- * sh`rimraf ${names}.txt`; // => "rimraf file1.txt 'file 2.txt'"
- *
- * const cmd1 = ['cat', 'file 1.txt', 'file 2.txt'];
- * const cmd2 = ['use-input', '-abc'];
- * sh`${cmd1}|${cmd2}`; // => "cat 'file 1.txt' 'file 2.txt'|use-input -abc"
- *
- * @returns {String} - a string formatted for the platform Node is currently
- * running on.
- */
-const sh = function () {
-  return ShellString.sh.apply(ShellString, arguments).toString();
-};
-
-/**
- * This function permits raw strings to be interpolated into a `sh` template.
- *
- * **IMPORTANT**: If you're using Puka due to security concerns, make sure you
- * don't pass any untrusted content to `unquoted`. This may be obvious, but
- * stray punctuation in an `unquoted` section can compromise the safety of the
- * entire shell command.
- *
- * @param value - any value (it will be treated as a string)
- *
- * @example
- * const both = true;
- * sh`foo ${unquoted(both ? '&&' : '||')} bar`; // => 'foo && bar'
- */
-const unquoted = value => new ShellStringUnquoted(value);
-
-exports.Formatter = Formatter;
-exports.ShellString = ShellString;
-exports.ShellStringText = ShellStringText;
-exports.ShellStringUnquoted = ShellStringUnquoted;
-exports.quoteForCmd = quoteForCmd;
-exports.quoteForSh = quoteForSh;
-exports.quoteForShell = quoteForShell;
-exports.sh = sh;
-exports.shellStringSemicolon = shellStringSemicolon;
-exports.formatSymbol = formatSymbol;
-exports.preformatSymbol = preformatSymbol;
-exports.unquoted = unquoted;
-
-
-/***/ }),
-/* 781 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var once = __webpack_require__(83)
-var eos = __webpack_require__(173)
-var fs = __webpack_require__(5) // we only need fs to get the ReadStream and WriteStream prototypes
-
-var noop = function () {}
-
-var isFn = function (fn) {
-  return typeof fn === 'function'
-}
-
-var isFS = function (stream) {
-  if (!fs) return false // browser
-  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
-}
-
-var isRequest = function (stream) {
-  return stream.setHeader && isFn(stream.abort)
-}
-
-var destroyer = function (stream, reading, writing, callback) {
-  callback = once(callback)
-
-  var closed = false
-  stream.on('close', function () {
-    closed = true
-  })
-
-  eos(stream, {readable: reading, writable: writing}, function (err) {
-    if (err) return callback(err)
-    closed = true
-    callback()
-  })
-
-  var destroyed = false
-  return function (err) {
-    if (closed) return
-    if (destroyed) return
-    destroyed = true
-
-    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
-    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
-
-    if (isFn(stream.destroy)) return stream.destroy()
-
-    callback(err || new Error('stream was destroyed'))
-  }
-}
-
-var call = function (fn) {
-  fn()
-}
-
-var pipe = function (from, to) {
-  return from.pipe(to)
-}
-
-var pump = function () {
-  var streams = Array.prototype.slice.call(arguments)
-  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
-
-  if (Array.isArray(streams[0])) streams = streams[0]
-  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
-
-  var error
-  var destroys = streams.map(function (stream, i) {
-    var reading = i < streams.length - 1
-    var writing = i > 0
-    return destroyer(stream, reading, writing, function (err) {
-      if (!error) error = err
-      if (err) destroys.forEach(call)
-      if (reading) return
-      destroys.forEach(call)
-      callback(error)
-    })
-  })
-
-  return streams.reduce(pipe)
-}
-
-module.exports = pump
-
-
-/***/ }),
-/* 782 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var pump = __webpack_require__(783)
-var inherits = __webpack_require__(61)
-var Duplexify = __webpack_require__(386)
-
-var toArray = function(args) {
-  if (!args.length) return []
-  return Array.isArray(args[0]) ? args[0] : Array.prototype.slice.call(args)
-}
-
-var define = function(opts) {
-  var Pumpify = function() {
-    var streams = toArray(arguments)
-    if (!(this instanceof Pumpify)) return new Pumpify(streams)
-    Duplexify.call(this, null, null, opts)
-    if (streams.length) this.setPipeline(streams)
-  }
-
-  inherits(Pumpify, Duplexify)
-
-  Pumpify.prototype.setPipeline = function() {
-    var streams = toArray(arguments)
-    var self = this
-    var ended = false
-    var w = streams[0]
-    var r = streams[streams.length-1]
-
-    r = r.readable ? r : null
-    w = w.writable ? w : null
-
-    var onclose = function() {
-      streams[0].emit('error', new Error('stream was destroyed'))
-    }
-
-    this.on('close', onclose)
-    this.on('prefinish', function() {
-      if (!ended) self.cork()
-    })
-
-    pump(streams, function(err) {
-      self.removeListener('close', onclose)
-      if (err) return self.destroy(err.message === 'premature close' ? null : err)
-      ended = true
-      // pump ends after the last stream is not writable *but*
-      // pumpify still forwards the readable part so we need to catch errors
-      // still, so reenable autoDestroy in this case
-      if (self._autoDestroy === false) self._autoDestroy = true
-      self.uncork()
-    })
-
-    if (this.destroyed) return onclose()
-    this.setWritable(w)
-    this.setReadable(r)
-  }
-
-  return Pumpify
-}
-
-module.exports = define({autoDestroy:false, destroy:false})
-module.exports.obj = define({autoDestroy: false, destroy:false, objectMode:true, highWaterMark:16})
-module.exports.ctor = define
-
-
-/***/ }),
-/* 783 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var once = __webpack_require__(83)
-var eos = __webpack_require__(173)
-var fs = __webpack_require__(5) // we only need fs to get the ReadStream and WriteStream prototypes
-
-var noop = function () {}
-var ancient = /^v?\.0/.test(process.version)
-
-var isFn = function (fn) {
-  return typeof fn === 'function'
-}
-
-var isFS = function (stream) {
-  if (!ancient) return false // newer node version do not need to care about fs is a special way
-  if (!fs) return false // browser
-  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
-}
-
-var isRequest = function (stream) {
-  return stream.setHeader && isFn(stream.abort)
-}
-
-var destroyer = function (stream, reading, writing, callback) {
-  callback = once(callback)
-
-  var closed = false
-  stream.on('close', function () {
-    closed = true
-  })
-
-  eos(stream, {readable: reading, writable: writing}, function (err) {
-    if (err) return callback(err)
-    closed = true
-    callback()
-  })
-
-  var destroyed = false
-  return function (err) {
-    if (closed) return
-    if (destroyed) return
-    destroyed = true
-
-    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
-    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
-
-    if (isFn(stream.destroy)) return stream.destroy()
-
-    callback(err || new Error('stream was destroyed'))
-  }
-}
-
-var call = function (fn) {
-  fn()
-}
-
-var pipe = function (from, to) {
-  return from.pipe(to)
-}
-
-var pump = function () {
-  var streams = Array.prototype.slice.call(arguments)
-  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
-
-  if (Array.isArray(streams[0])) streams = streams[0]
-  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
-
-  var error
-  var destroys = streams.map(function (stream, i) {
-    var reading = i < streams.length - 1
-    var writing = i > 0
-    return destroyer(stream, reading, writing, function (err) {
-      if (!error) error = err
-      if (err) destroys.forEach(call)
-      if (reading) return
-      destroys.forEach(call)
-      callback(error)
-    })
-  })
-
-  streams.reduce(pipe)
-}
-
-module.exports = pump
-
-
-/***/ }),
-/* 784 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(405);
-
-var has = Object.prototype.hasOwnProperty;
-
-var defaults = {
-    allowDots: false,
-    allowPrototypes: false,
-    arrayLimit: 20,
-    decoder: utils.decode,
-    delimiter: '&',
-    depth: 5,
-    parameterLimit: 1000,
-    plainObjects: false,
-    strictNullHandling: false
-};
-
-var parseValues = function parseQueryStringValues(str, options) {
-    var obj = {};
-    var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, '') : str;
-    var limit = options.parameterLimit === Infinity ? undefined : options.parameterLimit;
-    var parts = cleanStr.split(options.delimiter, limit);
-
-    for (var i = 0; i < parts.length; ++i) {
-        var part = parts[i];
-
-        var bracketEqualsPos = part.indexOf(']=');
-        var pos = bracketEqualsPos === -1 ? part.indexOf('=') : bracketEqualsPos + 1;
-
-        var key, val;
-        if (pos === -1) {
-            key = options.decoder(part, defaults.decoder);
-            val = options.strictNullHandling ? null : '';
-        } else {
-            key = options.decoder(part.slice(0, pos), defaults.decoder);
-            val = options.decoder(part.slice(pos + 1), defaults.decoder);
-        }
-        if (has.call(obj, key)) {
-            obj[key] = [].concat(obj[key]).concat(val);
-        } else {
-            obj[key] = val;
-        }
-    }
-
-    return obj;
-};
-
-var parseObject = function (chain, val, options) {
-    var leaf = val;
-
-    for (var i = chain.length - 1; i >= 0; --i) {
-        var obj;
-        var root = chain[i];
-
-        if (root === '[]') {
-            obj = [];
-            obj = obj.concat(leaf);
-        } else {
-            obj = options.plainObjects ? Object.create(null) : {};
-            var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root;
-            var index = parseInt(cleanRoot, 10);
-            if (
-                !isNaN(index)
-                && root !== cleanRoot
-                && String(index) === cleanRoot
-                && index >= 0
-                && (options.parseArrays && index <= options.arrayLimit)
-            ) {
-                obj = [];
-                obj[index] = leaf;
-            } else {
-                obj[cleanRoot] = leaf;
-            }
-        }
-
-        leaf = obj;
-    }
-
-    return leaf;
-};
-
-var parseKeys = function parseQueryStringKeys(givenKey, val, options) {
-    if (!givenKey) {
-        return;
-    }
-
-    // Transform dot notation to bracket notation
-    var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
-
-    // The regex chunks
-
-    var brackets = /(\[[^[\]]*])/;
-    var child = /(\[[^[\]]*])/g;
-
-    // Get the parent
-
-    var segment = brackets.exec(key);
-    var parent = segment ? key.slice(0, segment.index) : key;
-
-    // Stash the parent if it exists
-
-    var keys = [];
-    if (parent) {
-        // If we aren't using plain objects, optionally prefix keys
-        // that would overwrite object prototype properties
-        if (!options.plainObjects && has.call(Object.prototype, parent)) {
-            if (!options.allowPrototypes) {
-                return;
-            }
-        }
-
-        keys.push(parent);
-    }
-
-    // Loop through children appending to the array until we hit depth
-
-    var i = 0;
-    while ((segment = child.exec(key)) !== null && i < options.depth) {
-        i += 1;
-        if (!options.plainObjects && has.call(Object.prototype, segment[1].slice(1, -1))) {
-            if (!options.allowPrototypes) {
-                return;
-            }
-        }
-        keys.push(segment[1]);
-    }
-
-    // If there's a remainder, just add whatever is left
-
-    if (segment) {
-        keys.push('[' + key.slice(segment.index) + ']');
-    }
-
-    return parseObject(keys, val, options);
-};
-
-module.exports = function (str, opts) {
-    var options = opts ? utils.assign({}, opts) : {};
-
-    if (options.decoder !== null && options.decoder !== undefined && typeof options.decoder !== 'function') {
-        throw new TypeError('Decoder has to be a function.');
-    }
-
-    options.ignoreQueryPrefix = options.ignoreQueryPrefix === true;
-    options.delimiter = typeof options.delimiter === 'string' || utils.isRegExp(options.delimiter) ? options.delimiter : defaults.delimiter;
-    options.depth = typeof options.depth === 'number' ? options.depth : defaults.depth;
-    options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : defaults.arrayLimit;
-    options.parseArrays = options.parseArrays !== false;
-    options.decoder = typeof options.decoder === 'function' ? options.decoder : defaults.decoder;
-    options.allowDots = typeof options.allowDots === 'boolean' ? options.allowDots : defaults.allowDots;
-    options.plainObjects = typeof options.plainObjects === 'boolean' ? options.plainObjects : defaults.plainObjects;
-    options.allowPrototypes = typeof options.allowPrototypes === 'boolean' ? options.allowPrototypes : defaults.allowPrototypes;
-    options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : defaults.parameterLimit;
-    options.strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
-
-    if (str === '' || str === null || typeof str === 'undefined') {
-        return options.plainObjects ? Object.create(null) : {};
-    }
-
-    var tempObj = typeof str === 'string' ? parseValues(str, options) : str;
-    var obj = options.plainObjects ? Object.create(null) : {};
-
-    // Iterate over the keys and setup the new object
-
-    var keys = Object.keys(tempObj);
-    for (var i = 0; i < keys.length; ++i) {
-        var key = keys[i];
-        var newObj = parseKeys(key, tempObj[key], options);
-        obj = utils.merge(obj, newObj, options);
-    }
-
-    return utils.compact(obj);
-};
-
-
-/***/ }),
-/* 785 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(405);
-var formats = __webpack_require__(403);
-
-var arrayPrefixGenerators = {
-    brackets: function brackets(prefix) { // eslint-disable-line func-name-matching
-        return prefix + '[]';
-    },
-    indices: function indices(prefix, key) { // eslint-disable-line func-name-matching
-        return prefix + '[' + key + ']';
-    },
-    repeat: function repeat(prefix) { // eslint-disable-line func-name-matching
-        return prefix;
-    }
-};
-
-var toISO = Date.prototype.toISOString;
-
-var defaults = {
-    delimiter: '&',
-    encode: true,
-    encoder: utils.encode,
-    encodeValuesOnly: false,
-    serializeDate: function serializeDate(date) { // eslint-disable-line func-name-matching
-        return toISO.call(date);
-    },
-    skipNulls: false,
-    strictNullHandling: false
-};
-
-var stringify = function stringify( // eslint-disable-line func-name-matching
-    object,
-    prefix,
-    generateArrayPrefix,
-    strictNullHandling,
-    skipNulls,
-    encoder,
-    filter,
-    sort,
-    allowDots,
-    serializeDate,
-    formatter,
-    encodeValuesOnly
-) {
-    var obj = object;
-    if (typeof filter === 'function') {
-        obj = filter(prefix, obj);
-    } else if (obj instanceof Date) {
-        obj = serializeDate(obj);
-    } else if (obj === null) {
-        if (strictNullHandling) {
-            return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder) : prefix;
-        }
-
-        obj = '';
-    }
-
-    if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || utils.isBuffer(obj)) {
-        if (encoder) {
-            var keyValue = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder);
-            return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder))];
-        }
-        return [formatter(prefix) + '=' + formatter(String(obj))];
-    }
-
-    var values = [];
-
-    if (typeof obj === 'undefined') {
-        return values;
-    }
-
-    var objKeys;
-    if (Array.isArray(filter)) {
-        objKeys = filter;
-    } else {
-        var keys = Object.keys(obj);
-        objKeys = sort ? keys.sort(sort) : keys;
-    }
-
-    for (var i = 0; i < objKeys.length; ++i) {
-        var key = objKeys[i];
-
-        if (skipNulls && obj[key] === null) {
-            continue;
-        }
-
-        if (Array.isArray(obj)) {
-            values = values.concat(stringify(
-                obj[key],
-                generateArrayPrefix(prefix, key),
-                generateArrayPrefix,
-                strictNullHandling,
-                skipNulls,
-                encoder,
-                filter,
-                sort,
-                allowDots,
-                serializeDate,
-                formatter,
-                encodeValuesOnly
-            ));
-        } else {
-            values = values.concat(stringify(
-                obj[key],
-                prefix + (allowDots ? '.' + key : '[' + key + ']'),
-                generateArrayPrefix,
-                strictNullHandling,
-                skipNulls,
-                encoder,
-                filter,
-                sort,
-                allowDots,
-                serializeDate,
-                formatter,
-                encodeValuesOnly
-            ));
-        }
-    }
-
-    return values;
-};
-
-module.exports = function (object, opts) {
-    var obj = object;
-    var options = opts ? utils.assign({}, opts) : {};
-
-    if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') {
-        throw new TypeError('Encoder has to be a function.');
-    }
-
-    var delimiter = typeof options.delimiter === 'undefined' ? defaults.delimiter : options.delimiter;
-    var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
-    var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : defaults.skipNulls;
-    var encode = typeof options.encode === 'boolean' ? options.encode : defaults.encode;
-    var encoder = typeof options.encoder === 'function' ? options.encoder : defaults.encoder;
-    var sort = typeof options.sort === 'function' ? options.sort : null;
-    var allowDots = typeof options.allowDots === 'undefined' ? false : options.allowDots;
-    var serializeDate = typeof options.serializeDate === 'function' ? options.serializeDate : defaults.serializeDate;
-    var encodeValuesOnly = typeof options.encodeValuesOnly === 'boolean' ? options.encodeValuesOnly : defaults.encodeValuesOnly;
-    if (typeof options.format === 'undefined') {
-        options.format = formats['default'];
-    } else if (!Object.prototype.hasOwnProperty.call(formats.formatters, options.format)) {
-        throw new TypeError('Unknown format option provided.');
-    }
-    var formatter = formats.formatters[options.format];
-    var objKeys;
-    var filter;
-
-    if (typeof options.filter === 'function') {
-        filter = options.filter;
-        obj = filter('', obj);
-    } else if (Array.isArray(options.filter)) {
-        filter = options.filter;
-        objKeys = filter;
-    }
-
-    var keys = [];
-
-    if (typeof obj !== 'object' || obj === null) {
-        return '';
-    }
-
-    var arrayFormat;
-    if (options.arrayFormat in arrayPrefixGenerators) {
-        arrayFormat = options.arrayFormat;
-    } else if ('indices' in options) {
-        arrayFormat = options.indices ? 'indices' : 'repeat';
-    } else {
-        arrayFormat = 'indices';
-    }
-
-    var generateArrayPrefix = arrayPrefixGenerators[arrayFormat];
-
-    if (!objKeys) {
-        objKeys = Object.keys(obj);
-    }
-
-    if (sort) {
-        objKeys.sort(sort);
-    }
-
-    for (var i = 0; i < objKeys.length; ++i) {
-        var key = objKeys[i];
-
-        if (skipNulls && obj[key] === null) {
-            continue;
-        }
-
-        keys = keys.concat(stringify(
-            obj[key],
-            key,
-            generateArrayPrefix,
-            strictNullHandling,
-            skipNulls,
-            encode ? encoder : null,
-            filter,
-            sort,
-            allowDots,
-            serializeDate,
-            formatter,
-            encodeValuesOnly
-        ));
-    }
-
-    var joined = keys.join(delimiter);
-    var prefix = options.addQueryPrefix === true ? '?' : '';
-
-    return joined.length > 0 ? prefix + joined : '';
-};
-
-
-/***/ }),
-/* 786 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var strictUriEncode = __webpack_require__(943);
-var objectAssign = __webpack_require__(303);
-var decodeComponent = __webpack_require__(630);
-
-function encoderForArrayFormat(opts) {
-	switch (opts.arrayFormat) {
-		case 'index':
-			return function (key, value, index) {
-				return value === null ? [
-					encode(key, opts),
-					'[',
-					index,
-					']'
-				].join('') : [
-					encode(key, opts),
-					'[',
-					encode(index, opts),
-					']=',
-					encode(value, opts)
-				].join('');
-			};
-
-		case 'bracket':
-			return function (key, value) {
-				return value === null ? encode(key, opts) : [
-					encode(key, opts),
-					'[]=',
-					encode(value, opts)
-				].join('');
-			};
-
-		default:
-			return function (key, value) {
-				return value === null ? encode(key, opts) : [
-					encode(key, opts),
-					'=',
-					encode(value, opts)
-				].join('');
-			};
-	}
-}
-
-function parserForArrayFormat(opts) {
-	var result;
-
-	switch (opts.arrayFormat) {
-		case 'index':
-			return function (key, value, accumulator) {
-				result = /\[(\d*)\]$/.exec(key);
-
-				key = key.replace(/\[\d*\]$/, '');
-
-				if (!result) {
-					accumulator[key] = value;
-					return;
-				}
-
-				if (accumulator[key] === undefined) {
-					accumulator[key] = {};
-				}
-
-				accumulator[key][result[1]] = value;
-			};
-
-		case 'bracket':
-			return function (key, value, accumulator) {
-				result = /(\[\])$/.exec(key);
-				key = key.replace(/\[\]$/, '');
-
-				if (!result) {
-					accumulator[key] = value;
-					return;
-				} else if (accumulator[key] === undefined) {
-					accumulator[key] = [value];
-					return;
-				}
-
-				accumulator[key] = [].concat(accumulator[key], value);
-			};
-
-		default:
-			return function (key, value, accumulator) {
-				if (accumulator[key] === undefined) {
-					accumulator[key] = value;
-					return;
-				}
-
-				accumulator[key] = [].concat(accumulator[key], value);
-			};
-	}
-}
-
-function encode(value, opts) {
-	if (opts.encode) {
-		return opts.strict ? strictUriEncode(value) : encodeURIComponent(value);
-	}
-
-	return value;
-}
-
-function keysSorter(input) {
-	if (Array.isArray(input)) {
-		return input.sort();
-	} else if (typeof input === 'object') {
-		return keysSorter(Object.keys(input)).sort(function (a, b) {
-			return Number(a) - Number(b);
-		}).map(function (key) {
-			return input[key];
-		});
-	}
-
-	return input;
-}
-
-function extract(str) {
-	var queryStart = str.indexOf('?');
-	if (queryStart === -1) {
-		return '';
-	}
-	return str.slice(queryStart + 1);
-}
-
-function parse(str, opts) {
-	opts = objectAssign({arrayFormat: 'none'}, opts);
-
-	var formatter = parserForArrayFormat(opts);
-
-	// Create an object with no prototype
-	// https://github.com/sindresorhus/query-string/issues/47
-	var ret = Object.create(null);
-
-	if (typeof str !== 'string') {
-		return ret;
-	}
-
-	str = str.trim().replace(/^[?#&]/, '');
-
-	if (!str) {
-		return ret;
-	}
-
-	str.split('&').forEach(function (param) {
-		var parts = param.replace(/\+/g, ' ').split('=');
-		// Firefox (pre 40) decodes `%3D` to `=`
-		// https://github.com/sindresorhus/query-string/pull/37
-		var key = parts.shift();
-		var val = parts.length > 0 ? parts.join('=') : undefined;
-
-		// missing `=` should be `null`:
-		// http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters
-		val = val === undefined ? null : decodeComponent(val);
-
-		formatter(decodeComponent(key), val, ret);
-	});
-
-	return Object.keys(ret).sort().reduce(function (result, key) {
-		var val = ret[key];
-		if (Boolean(val) && typeof val === 'object' && !Array.isArray(val)) {
-			// Sort object keys, not values
-			result[key] = keysSorter(val);
-		} else {
-			result[key] = val;
-		}
-
-		return result;
-	}, Object.create(null));
-}
-
-exports.extract = extract;
-exports.parse = parse;
-
-exports.stringify = function (obj, opts) {
-	var defaults = {
-		encode: true,
-		strict: true,
-		arrayFormat: 'none'
-	};
-
-	opts = objectAssign(defaults, opts);
-
-	if (opts.sort === false) {
-		opts.sort = function () {};
-	}
-
-	var formatter = encoderForArrayFormat(opts);
-
-	return obj ? Object.keys(obj).sort(opts.sort).map(function (key) {
-		var val = obj[key];
-
-		if (val === undefined) {
-			return '';
-		}
-
-		if (val === null) {
-			return encode(key, opts);
-		}
-
-		if (Array.isArray(val)) {
-			var result = [];
-
-			val.slice().forEach(function (val2) {
-				if (val2 === undefined) {
-					return;
-				}
-
-				result.push(formatter(key, val2, result.length));
-			});
-
-			return result.join('&');
-		}
-
-		return encode(key, opts) + '=' + encode(val, opts);
-	}).filter(function (x) {
-		return x.length > 0;
-	}).join('&') : '';
-};
-
-exports.parseUrl = function (str, opts) {
-	return {
-		url: str.split('?')[0] || '',
-		query: parse(extract(str), opts)
-	};
-};
-
-
-/***/ }),
-/* 787 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * randomatic <https://github.com/jonschlinkert/randomatic>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var isNumber = __webpack_require__(788);
-var typeOf = __webpack_require__(789);
-var mathRandom = __webpack_require__(751);
-
-/**
- * Expose `randomatic`
- */
-
-module.exports = randomatic;
-module.exports.isCrypto = !!mathRandom.cryptographic;
-
-/**
- * Available mask characters
- */
-
-var type = {
-  lower: 'abcdefghijklmnopqrstuvwxyz',
-  upper: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-  number: '0123456789',
-  special: '~!@#$%^&()_+-={}[];\',.'
-};
-
-type.all = type.lower + type.upper + type.number + type.special;
-
-/**
- * Generate random character sequences of a specified `length`,
- * based on the given `pattern`.
- *
- * @param {String} `pattern` The pattern to use for generating the random string.
- * @param {String} `length` The length of the string to generate.
- * @param {String} `options`
- * @return {String}
- * @api public
- */
-
-function randomatic(pattern, length, options) {
-  if (typeof pattern === 'undefined') {
-    throw new Error('randomatic expects a string or number.');
-  }
-
-  var custom = false;
-  if (arguments.length === 1) {
-    if (typeof pattern === 'string') {
-      length = pattern.length;
-
-    } else if (isNumber(pattern)) {
-      options = {};
-      length = pattern;
-      pattern = '*';
-    }
-  }
-
-  if (typeOf(length) === 'object' && length.hasOwnProperty('chars')) {
-    options = length;
-    pattern = options.chars;
-    length = pattern.length;
-    custom = true;
-  }
-
-  var opts = options || {};
-  var mask = '';
-  var res = '';
-
-  // Characters to be used
-  if (pattern.indexOf('?') !== -1) mask += opts.chars;
-  if (pattern.indexOf('a') !== -1) mask += type.lower;
-  if (pattern.indexOf('A') !== -1) mask += type.upper;
-  if (pattern.indexOf('0') !== -1) mask += type.number;
-  if (pattern.indexOf('!') !== -1) mask += type.special;
-  if (pattern.indexOf('*') !== -1) mask += type.all;
-  if (custom) mask += pattern;
-
-  while (length--) {
-    res += mask.charAt(parseInt(mathRandom() * mask.length, 10));
-  }
-  return res;
-};
-
-
-/***/ }),
-/* 788 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-module.exports = function isNumber(num) {
-  var type = typeof num;
-
-  if (type === 'string' || num instanceof String) {
-    // an empty string would be coerced to true with the below logic
-    if (!num.trim()) return false;
-  } else if (type !== 'number' && !(num instanceof Number)) {
-    return false;
-  }
-
-  return (num - num + 1) >= 0;
-};
-
-
-/***/ }),
-/* 789 */
-/***/ (function(module, exports) {
-
-var toString = Object.prototype.toString;
-
-module.exports = function kindOf(val) {
-  if (val === void 0) return 'undefined';
-  if (val === null) return 'null';
-
-  var type = typeof val;
-  if (type === 'boolean') return 'boolean';
-  if (type === 'string') return 'string';
-  if (type === 'number') return 'number';
-  if (type === 'symbol') return 'symbol';
-  if (type === 'function') {
-    return isGeneratorFn(val) ? 'generatorfunction' : 'function';
-  }
-
-  if (isArray(val)) return 'array';
-  if (isBuffer(val)) return 'buffer';
-  if (isArguments(val)) return 'arguments';
-  if (isDate(val)) return 'date';
-  if (isError(val)) return 'error';
-  if (isRegexp(val)) return 'regexp';
-
-  switch (ctorName(val)) {
-    case 'Symbol': return 'symbol';
-    case 'Promise': return 'promise';
-
-    // Set, Map, WeakSet, WeakMap
-    case 'WeakMap': return 'weakmap';
-    case 'WeakSet': return 'weakset';
-    case 'Map': return 'map';
-    case 'Set': return 'set';
-
-    // 8-bit typed arrays
-    case 'Int8Array': return 'int8array';
-    case 'Uint8Array': return 'uint8array';
-    case 'Uint8ClampedArray': return 'uint8clampedarray';
-
-    // 16-bit typed arrays
-    case 'Int16Array': return 'int16array';
-    case 'Uint16Array': return 'uint16array';
-
-    // 32-bit typed arrays
-    case 'Int32Array': return 'int32array';
-    case 'Uint32Array': return 'uint32array';
-    case 'Float32Array': return 'float32array';
-    case 'Float64Array': return 'float64array';
-  }
-
-  if (isGeneratorObj(val)) {
-    return 'generator';
-  }
-
-  // Non-plain objects
-  type = toString.call(val);
-  switch (type) {
-    case '[object Object]': return 'object';
-    // iterators
-    case '[object Map Iterator]': return 'mapiterator';
-    case '[object Set Iterator]': return 'setiterator';
-    case '[object String Iterator]': return 'stringiterator';
-    case '[object Array Iterator]': return 'arrayiterator';
-  }
-
-  // other
-  return type.slice(8, -1).toLowerCase().replace(/\s/g, '');
-};
-
-function ctorName(val) {
-  return val.constructor ? val.constructor.name : null;
-}
-
-function isArray(val) {
-  if (Array.isArray) return Array.isArray(val);
-  return val instanceof Array;
-}
-
-function isError(val) {
-  return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number');
-}
-
-function isDate(val) {
-  if (val instanceof Date) return true;
-  return typeof val.toDateString === 'function'
-    && typeof val.getDate === 'function'
-    && typeof val.setDate === 'function';
-}
-
-function isRegexp(val) {
-  if (val instanceof RegExp) return true;
-  return typeof val.flags === 'string'
-    && typeof val.ignoreCase === 'boolean'
-    && typeof val.multiline === 'boolean'
-    && typeof val.global === 'boolean';
-}
-
-function isGeneratorFn(name, val) {
-  return ctorName(name) === 'GeneratorFunction';
-}
-
-function isGeneratorObj(val) {
-  return typeof val.throw === 'function'
-    && typeof val.return === 'function'
-    && typeof val.next === 'function';
-}
-
-function isArguments(val) {
-  try {
-    if (typeof val.length === 'number' && typeof val.callee === 'function') {
-      return true;
-    }
-  } catch (err) {
-    if (err.message.indexOf('callee') !== -1) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * If you need to support Safari 5-7 (8-10 yr-old browser),
- * take a look at https://github.com/feross/is-buffer
- */
-
-function isBuffer(val) {
-  if (val.constructor && typeof val.constructor.isBuffer === 'function') {
-    return val.constructor.isBuffer(val);
-  }
-  return false;
-}
-
-
-/***/ }),
-/* 790 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-module.exports = read
-
-var readline = __webpack_require__(197)
-var Mute = __webpack_require__(401)
-
-function read (opts, cb) {
-  if (opts.num) {
-    throw new Error('read() no longer accepts a char number limit')
-  }
-
-  if (typeof opts.default !== 'undefined' &&
-      typeof opts.default !== 'string' &&
-      typeof opts.default !== 'number') {
-    throw new Error('default value must be string or number')
-  }
-
-  var input = opts.input || process.stdin
-  var output = opts.output || process.stdout
-  var prompt = (opts.prompt || '').trim() + ' '
-  var silent = opts.silent
-  var editDef = false
-  var timeout = opts.timeout
-
-  var def = opts.default || ''
-  if (def) {
-    if (silent) {
-      prompt += '(<default hidden>) '
-    } else if (opts.edit) {
-      editDef = true
-    } else {
-      prompt += '(' + def + ') '
-    }
-  }
-  var terminal = !!(opts.terminal || output.isTTY)
-
-  var m = new Mute({ replace: opts.replace, prompt: prompt })
-  m.pipe(output, {end: false})
-  output = m
-  var rlOpts = { input: input, output: output, terminal: terminal }
-
-  if (process.version.match(/^v0\.6/)) {
-    var rl = readline.createInterface(rlOpts.input, rlOpts.output)
-  } else {
-    var rl = readline.createInterface(rlOpts)
-  }
-
-
-  output.unmute()
-  rl.setPrompt(prompt)
-  rl.prompt()
-  if (silent) {
-    output.mute()
-  } else if (editDef) {
-    rl.line = def
-    rl.cursor = def.length
-    rl._refreshLine()
-  }
-
-  var called = false
-  rl.on('line', onLine)
-  rl.on('error', onError)
-
-  rl.on('SIGINT', function () {
-    rl.close()
-    onError(new Error('canceled'))
-  })
-
-  var timer
-  if (timeout) {
-    timer = setTimeout(function () {
-      onError(new Error('timed out'))
-    }, timeout)
-  }
-
-  function done () {
-    called = true
-    rl.close()
-
-    if (process.version.match(/^v0\.6/)) {
-      rl.input.removeAllListeners('data')
-      rl.input.removeAllListeners('keypress')
-      rl.input.pause()
-    }
-
-    clearTimeout(timer)
-    output.mute()
-    output.end()
-  }
-
-  function onError (er) {
-    if (called) return
-    done()
-    return cb(er)
-  }
-
-  function onLine (line) {
-    if (called) return
-    if (silent && terminal) {
-      output.unmute()
-      output.write('\r\n')
-    }
-    done()
-    // truncate the \n at the end.
-    line = line.replace(/\r?\n$/, '')
-    var isDefault = !!(editDef && line === def)
-    if (def && !line) {
-      isDefault = true
-      line = def
-    }
-    cb(null, line, isDefault)
-  }
-}
-
-
-/***/ }),
-/* 791 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(102).Duplex
-
-
-/***/ }),
-/* 792 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// a passthrough stream.
-// basically just the most minimal sort of Transform stream.
-// Every written chunk gets output as-is.
-
-
-
-module.exports = PassThrough;
-
-var Transform = __webpack_require__(407);
-
-/*<replacement>*/
-var util = __webpack_require__(113);
-util.inherits = __webpack_require__(61);
-/*</replacement>*/
-
-util.inherits(PassThrough, Transform);
-
-function PassThrough(options) {
-  if (!(this instanceof PassThrough)) return new PassThrough(options);
-
-  Transform.call(this, options);
-}
-
-PassThrough.prototype._transform = function (chunk, encoding, cb) {
-  cb(null, chunk);
-};
-
-/***/ }),
-/* 793 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var Buffer = __webpack_require__(45).Buffer;
-var util = __webpack_require__(3);
-
-function copyBuffer(src, target, offset) {
-  src.copy(target, offset);
-}
-
-module.exports = function () {
-  function BufferList() {
-    _classCallCheck(this, BufferList);
-
-    this.head = null;
-    this.tail = null;
-    this.length = 0;
-  }
-
-  BufferList.prototype.push = function push(v) {
-    var entry = { data: v, next: null };
-    if (this.length > 0) this.tail.next = entry;else this.head = entry;
-    this.tail = entry;
-    ++this.length;
-  };
-
-  BufferList.prototype.unshift = function unshift(v) {
-    var entry = { data: v, next: this.head };
-    if (this.length === 0) this.tail = entry;
-    this.head = entry;
-    ++this.length;
-  };
-
-  BufferList.prototype.shift = function shift() {
-    if (this.length === 0) return;
-    var ret = this.head.data;
-    if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next;
-    --this.length;
-    return ret;
-  };
-
-  BufferList.prototype.clear = function clear() {
-    this.head = this.tail = null;
-    this.length = 0;
-  };
-
-  BufferList.prototype.join = function join(s) {
-    if (this.length === 0) return '';
-    var p = this.head;
-    var ret = '' + p.data;
-    while (p = p.next) {
-      ret += s + p.data;
-    }return ret;
-  };
-
-  BufferList.prototype.concat = function concat(n) {
-    if (this.length === 0) return Buffer.alloc(0);
-    if (this.length === 1) return this.head.data;
-    var ret = Buffer.allocUnsafe(n >>> 0);
-    var p = this.head;
-    var i = 0;
-    while (p) {
-      copyBuffer(p.data, ret, i);
-      i += p.data.length;
-      p = p.next;
-    }
-    return ret;
-  };
-
-  return BufferList;
-}();
-
-if (util && util.inspect && util.inspect.custom) {
-  module.exports.prototype[util.inspect.custom] = function () {
-    var obj = util.inspect({ length: this.length });
-    return this.constructor.name + ' ' + obj;
-  };
-}
-
-/***/ }),
-/* 794 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(102).Transform
-
-
-/***/ }),
-/* 795 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * regex-cache <https://github.com/jonschlinkert/regex-cache>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var equal = __webpack_require__(734);
-var basic = {};
-var cache = {};
-
-/**
- * Expose `regexCache`
- */
-
-module.exports = regexCache;
-
-/**
- * Memoize the results of a call to the new RegExp constructor.
- *
- * @param  {Function} fn [description]
- * @param  {String} str [description]
- * @param  {Options} options [description]
- * @param  {Boolean} nocompare [description]
- * @return {RegExp}
- */
-
-function regexCache(fn, str, opts) {
-  var key = '_default_', regex, cached;
-
-  if (!str && !opts) {
-    if (typeof fn !== 'function') {
-      return fn;
-    }
-    return basic[key] || (basic[key] = fn(str));
-  }
-
-  var isString = typeof str === 'string';
-  if (isString) {
-    if (!opts) {
-      return basic[str] || (basic[str] = fn(str));
-    }
-    key = str;
-  } else {
-    opts = str;
-  }
-
-  cached = cache[key];
-  if (cached && equal(cached.opts, opts)) {
-    return cached.regex;
-  }
-
-  memo(key, opts, (regex = fn(str, opts)));
-  return regex;
-}
-
-function memo(key, opts, regex) {
-  cache[key] = {regex: regex, opts: opts};
-}
-
-/**
- * Expose `cache`
- */
-
-module.exports.cache = cache;
-module.exports.basic = basic;
-
-
-/***/ }),
-/* 796 */
-/***/ (function(module, exports) {
-
-var isWin = process.platform === 'win32';
-
-module.exports = function (str) {
-	var i = str.length - 1;
-	if (i < 2) {
-		return str;
-	}
-	while (isSeparator(str, i)) {
-		i--;
-	}
-	return str.substr(0, i + 1);
-};
-
-function isSeparator(str, i) {
-	var char = str[i];
-	return i > 0 && (char === '/' || (isWin && char === '\\'));
-}
-
-
-/***/ }),
-/* 797 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * repeat-string <https://github.com/jonschlinkert/repeat-string>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-
-
-/**
- * Results cache
- */
-
-var res = '';
-var cache;
-
-/**
- * Expose `repeat`
- */
-
-module.exports = repeat;
-
-/**
- * Repeat the given `string` the specified `number`
- * of times.
- *
- * **Example:**
- *
- * ```js
- * var repeat = require('repeat-string');
- * repeat('A', 5);
- * //=> AAAAA
- * ```
- *
- * @param {String} `string` The string to repeat
- * @param {Number} `number` The number of times to repeat the string
- * @return {String} Repeated string
- * @api public
- */
-
-function repeat(str, num) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
-
-  // cover common, quick use cases
-  if (num === 1) return str;
-  if (num === 2) return str + str;
-
-  var max = str.length * num;
-  if (cache !== str || typeof cache === 'undefined') {
-    cache = str;
-    res = '';
-  } else if (res.length >= max) {
-    return res.substr(0, max);
-  }
-
-  while (max > res.length && num > 1) {
-    if (num & 1) {
-      res += str;
-    }
-
-    num >>= 1;
-    str += str;
-  }
-
-  res += str;
-  res = res.substr(0, max);
-  return res;
-}
-
-
-/***/ }),
-/* 798 */
-/***/ (function(module, exports) {
-
-module.exports = {"name":"request-capture-har","version":"1.2.2","description":"Wrapper for request module that saves all traffic as a HAR file, useful for auto mocking a client","main":"request-capture-har.js","scripts":{"test":"semistandard","travis":"npm test && node request-capture-har.js"},"repository":{"type":"git","url":"git+https://github.com/paulirish/node-request-capture-har.git"},"keywords":["http","request","har"],"author":"Lars Thorup <lars@zealake.com> (http://github.com/larsthorup)","license":"MIT","bugs":{"url":"https://github.com/paulirish/node-request-capture-har/issues"},"homepage":"https://github.com/paulirish/node-request-capture-har#readme","files":["request-capture-har.js"],"devDependencies":{"semistandard":"^8.0.0"}}
-
-/***/ }),
-/* 799 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var fs = __webpack_require__(5);
-var pkg = __webpack_require__(798);
-
-function buildHarHeaders (headers) {
-  return headers ? Object.keys(headers).map(function (key) {
-    return {
-      name: key,
-      // header values are required to be strings
-      value: headers[key].toString()
-    };
-  }) : [];
-}
-
-function appendPostData (entry, request) {
-  if (!request.body) return;
-
-  entry.request.postData = {
-    mimeType: 'application/octet-stream',
-    text: request.body
-  };
-}
-
-function toMs (num) {
-  return Math.round(num * 1000) / 1000;
-}
-
-function HarWrapper (requestModule) {
-  this.requestModule = requestModule;
-  this.clear();
-}
-
-HarWrapper.prototype.request = function (options) {
-  // include detailed timing data in response object
-  Object.assign(options, { time: true });
-  var self = this;
-  // make call to true request module
-  return this.requestModule(options, function (err, incomingMessage, response) {
-    // create new har entry with reponse timings
-    if (!err) {
-      self.entries.push(self.buildHarEntry(incomingMessage));
-    }
-
-    // fire any callback provided in options, as request has ignored it
-    //     https://github.com/request/request/blob/v2.75.0/index.js#L40
-    if (typeof options.callback === 'function') {
-      options.callback.apply(null, arguments);
-    }
-  });
-};
-
-HarWrapper.prototype.clear = function () {
-  this.entries = [];
-  this.earliestTime = new Date(2099, 1, 1);
-};
-
-HarWrapper.prototype.saveHar = function (fileName) {
-  var httpArchive = {
-    log: {
-      version: '1.2',
-      creator: {name: 'request-capture-har', version: pkg.version},
-      pages: [{
-        startedDateTime: new Date(this.earliestTime).toISOString(),
-        id: 'request-capture-har',
-        title: 'request-capture-har',
-        pageTimings: { }
-      }],
-      entries: this.entries
-    }
-  };
-  fs.writeFileSync(fileName, JSON.stringify(httpArchive, null, 2));
-};
-
-HarWrapper.prototype.buildTimings = function (entry, response) {
-  var startTs = response.request.startTime;
-  var endTs = startTs + response.elapsedTime;
-  var totalTime = endTs - startTs;
-
-  if (new Date(startTs) < this.earliestTime) {
-    this.earliestTime = new Date(startTs);
-  }
-  entry.startedDateTime = new Date(startTs).toISOString();
-  entry.time = totalTime;
-
-  // new timing data added in request 2.81.0
-  if (response.timingPhases) {
-    entry.timings = {
-      'blocked': toMs(response.timingPhases.wait),
-      'dns': toMs(response.timingPhases.dns),
-      'connect': toMs(response.timingPhases.tcp),
-      'send': 0,
-      'wait': toMs(response.timingPhases.firstByte),
-      'receive': toMs(response.timingPhases.download)
-    };
-    return;
-  }
-
-  var responseStartTs = response.request.response.responseStartTime;
-
-  var waitingTime = responseStartTs - startTs;
-  var receiveTime = endTs - responseStartTs;
-  entry.timings = {
-    send: 0,
-    wait: waitingTime,
-    receive: receiveTime
-  };
-};
-
-HarWrapper.prototype.buildHarEntry = function (response) {
-  var entry = {
-    request: {
-      method: response.request.method,
-      url: response.request.uri.href,
-      httpVersion: 'HTTP/' + response.httpVersion,
-      cookies: [],
-      headers: buildHarHeaders(response.request.headers),
-      queryString: [],
-      headersSize: -1,
-      bodySize: -1
-    },
-    response: {
-      status: response.statusCode,
-      statusText: response.statusMessage,
-      httpVersion: 'HTTP/' + response.httpVersion,
-      cookies: [],
-      headers: buildHarHeaders(response.headers),
-      _transferSize: response.body.length,
-      content: {
-        size: response.body.length,
-        mimeType: response.headers['content-type']
-      },
-      redirectURL: '',
-      headersSize: -1,
-      bodySize: -1
-    },
-    cache: {}
-  };
-  this.buildTimings(entry, response);
-  appendPostData(entry, response.request);
-  return entry;
-};
-
-module.exports = HarWrapper;
-
-
-/***/ }),
-/* 800 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright 2010-2012 Mikeal Rogers
-//
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-
-
-
-var extend = __webpack_require__(269)
-var cookies = __webpack_require__(412)
-var helpers = __webpack_require__(305)
-
-var paramsHaveRequestBody = helpers.paramsHaveRequestBody
-
-// organize params for patch, post, put, head, del
-function initParams (uri, options, callback) {
-  if (typeof options === 'function') {
-    callback = options
-  }
-
-  var params = {}
-  if (typeof options === 'object') {
-    extend(params, options, {uri: uri})
-  } else if (typeof uri === 'string') {
-    extend(params, {uri: uri})
-  } else {
-    extend(params, uri)
-  }
-
-  params.callback = callback || params.callback
-  return params
-}
-
-function request (uri, options, callback) {
-  if (typeof uri === 'undefined') {
-    throw new Error('undefined is not a valid uri or options object.')
-  }
-
-  var params = initParams(uri, options, callback)
-
-  if (params.method === 'HEAD' && paramsHaveRequestBody(params)) {
-    throw new Error('HTTP HEAD requests MUST NOT include a request body.')
-  }
-
-  return new request.Request(params)
-}
-
-function verbFunc (verb) {
-  var method = verb.toUpperCase()
-  return function (uri, options, callback) {
-    var params = initParams(uri, options, callback)
-    params.method = method
-    return request(params, params.callback)
-  }
-}
-
-// define like this to please codeintel/intellisense IDEs
-request.get = verbFunc('get')
-request.head = verbFunc('head')
-request.options = verbFunc('options')
-request.post = verbFunc('post')
-request.put = verbFunc('put')
-request.patch = verbFunc('patch')
-request.del = verbFunc('delete')
-request['delete'] = verbFunc('delete')
-
-request.jar = function (store) {
-  return cookies.jar(store)
-}
-
-request.cookie = function (str) {
-  return cookies.parse(str)
-}
-
-function wrapRequestMethod (method, options, requester, verb) {
-  return function (uri, opts, callback) {
-    var params = initParams(uri, opts, callback)
-
-    var target = {}
-    extend(true, target, options, params)
-
-    target.pool = params.pool || options.pool
-
-    if (verb) {
-      target.method = verb.toUpperCase()
-    }
-
-    if (typeof requester === 'function') {
-      method = requester
-    }
-
-    return method(target, target.callback)
-  }
-}
-
-request.defaults = function (options, requester) {
-  var self = this
-
-  options = options || {}
-
-  if (typeof options === 'function') {
-    requester = options
-    options = {}
-  }
-
-  var defaults = wrapRequestMethod(self, options, requester)
-
-  var verbs = ['get', 'head', 'post', 'put', 'patch', 'del', 'delete']
-  verbs.forEach(function (verb) {
-    defaults[verb] = wrapRequestMethod(self[verb], options, requester, verb)
-  })
-
-  defaults.cookie = wrapRequestMethod(self.cookie, options, requester)
-  defaults.jar = self.jar
-  defaults.defaults = self.defaults
-  return defaults
-}
-
-request.forever = function (agentOptions, optionsArg) {
-  var options = {}
-  if (optionsArg) {
-    extend(options, optionsArg)
-  }
-  if (agentOptions) {
-    options.agentOptions = agentOptions
-  }
-
-  options.forever = true
-  return request.defaults(options)
-}
-
-// Exports
-
-module.exports = request
-request.Request = __webpack_require__(813)
-request.initParams = initParams
-
-// Backwards compatibility for request.debug
-Object.defineProperty(request, 'debug', {
-  enumerable: true,
-  get: function () {
-    return request.Request.debug
-  },
-  set: function (debug) {
-    request.Request.debug = debug
-  }
-})
-
-
-/***/ }),
-/* 801 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var caseless = __webpack_require__(231)
-var uuid = __webpack_require__(119)
-var helpers = __webpack_require__(305)
-
-var md5 = helpers.md5
-var toBase64 = helpers.toBase64
-
-function Auth (request) {
-  // define all public properties here
-  this.request = request
-  this.hasAuth = false
-  this.sentAuth = false
-  this.bearerToken = null
-  this.user = null
-  this.pass = null
-}
-
-Auth.prototype.basic = function (user, pass, sendImmediately) {
-  var self = this
-  if (typeof user !== 'string' || (pass !== undefined && typeof pass !== 'string')) {
-    self.request.emit('error', new Error('auth() received invalid user or password'))
-  }
-  self.user = user
-  self.pass = pass
-  self.hasAuth = true
-  var header = user + ':' + (pass || '')
-  if (sendImmediately || typeof sendImmediately === 'undefined') {
-    var authHeader = 'Basic ' + toBase64(header)
-    self.sentAuth = true
-    return authHeader
-  }
-}
-
-Auth.prototype.bearer = function (bearer, sendImmediately) {
-  var self = this
-  self.bearerToken = bearer
-  self.hasAuth = true
-  if (sendImmediately || typeof sendImmediately === 'undefined') {
-    if (typeof bearer === 'function') {
-      bearer = bearer()
-    }
-    var authHeader = 'Bearer ' + (bearer || '')
-    self.sentAuth = true
-    return authHeader
-  }
-}
-
-Auth.prototype.digest = function (method, path, authHeader) {
-  // TODO: More complete implementation of RFC 2617.
-  //   - handle challenge.domain
-  //   - support qop="auth-int" only
-  //   - handle Authentication-Info (not necessarily?)
-  //   - check challenge.stale (not necessarily?)
-  //   - increase nc (not necessarily?)
-  // For reference:
-  // http://tools.ietf.org/html/rfc2617#section-3
-  // https://github.com/bagder/curl/blob/master/lib/http_digest.c
-
-  var self = this
-
-  var challenge = {}
-  var re = /([a-z0-9_-]+)=(?:"([^"]+)"|([a-z0-9_-]+))/gi
-  for (;;) {
-    var match = re.exec(authHeader)
-    if (!match) {
-      break
-    }
-    challenge[match[1]] = match[2] || match[3]
-  }
-
-  /**
-   * RFC 2617: handle both MD5 and MD5-sess algorithms.
-   *
-   * If the algorithm directive's value is "MD5" or unspecified, then HA1 is
-   *   HA1=MD5(username:realm:password)
-   * If the algorithm directive's value is "MD5-sess", then HA1 is
-   *   HA1=MD5(MD5(username:realm:password):nonce:cnonce)
-   */
-  var ha1Compute = function (algorithm, user, realm, pass, nonce, cnonce) {
-    var ha1 = md5(user + ':' + realm + ':' + pass)
-    if (algorithm && algorithm.toLowerCase() === 'md5-sess') {
-      return md5(ha1 + ':' + nonce + ':' + cnonce)
-    } else {
-      return ha1
-    }
-  }
-
-  var qop = /(^|,)\s*auth\s*($|,)/.test(challenge.qop) && 'auth'
-  var nc = qop && '00000001'
-  var cnonce = qop && uuid().replace(/-/g, '')
-  var ha1 = ha1Compute(challenge.algorithm, self.user, challenge.realm, self.pass, challenge.nonce, cnonce)
-  var ha2 = md5(method + ':' + path)
-  var digestResponse = qop
-    ? md5(ha1 + ':' + challenge.nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + ha2)
-    : md5(ha1 + ':' + challenge.nonce + ':' + ha2)
-  var authValues = {
-    username: self.user,
-    realm: challenge.realm,
-    nonce: challenge.nonce,
-    uri: path,
-    qop: qop,
-    response: digestResponse,
-    nc: nc,
-    cnonce: cnonce,
-    algorithm: challenge.algorithm,
-    opaque: challenge.opaque
-  }
-
-  authHeader = []
-  for (var k in authValues) {
-    if (authValues[k]) {
-      if (k === 'qop' || k === 'nc' || k === 'algorithm') {
-        authHeader.push(k + '=' + authValues[k])
-      } else {
-        authHeader.push(k + '="' + authValues[k] + '"')
-      }
-    }
-  }
-  authHeader = 'Digest ' + authHeader.join(', ')
-  self.sentAuth = true
-  return authHeader
-}
-
-Auth.prototype.onRequest = function (user, pass, sendImmediately, bearer) {
-  var self = this
-  var request = self.request
-
-  var authHeader
-  if (bearer === undefined && user === undefined) {
-    self.request.emit('error', new Error('no auth mechanism defined'))
-  } else if (bearer !== undefined) {
-    authHeader = self.bearer(bearer, sendImmediately)
-  } else {
-    authHeader = self.basic(user, pass, sendImmediately)
-  }
-  if (authHeader) {
-    request.setHeader('authorization', authHeader)
-  }
-}
-
-Auth.prototype.onResponse = function (response) {
-  var self = this
-  var request = self.request
-
-  if (!self.hasAuth || self.sentAuth) { return null }
-
-  var c = caseless(response.headers)
-
-  var authHeader = c.get('www-authenticate')
-  var authVerb = authHeader && authHeader.split(' ')[0].toLowerCase()
-  request.debug('reauth', authVerb)
-
-  switch (authVerb) {
-    case 'basic':
-      return self.basic(self.user, self.pass, true)
-
-    case 'bearer':
-      return self.bearer(self.bearerToken, true)
-
-    case 'digest':
-      return self.digest(request.method, request.path, authHeader)
-  }
-}
-
-exports.Auth = Auth
-
-
-/***/ }),
-/* 802 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-function formatHostname (hostname) {
-  // canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
-  return hostname.replace(/^\.*/, '.').toLowerCase()
-}
-
-function parseNoProxyZone (zone) {
-  zone = zone.trim().toLowerCase()
-
-  var zoneParts = zone.split(':', 2)
-  var zoneHost = formatHostname(zoneParts[0])
-  var zonePort = zoneParts[1]
-  var hasPort = zone.indexOf(':') > -1
-
-  return {hostname: zoneHost, port: zonePort, hasPort: hasPort}
-}
-
-function uriInNoProxy (uri, noProxy) {
-  var port = uri.port || (uri.protocol === 'https:' ? '443' : '80')
-  var hostname = formatHostname(uri.hostname)
-  var noProxyList = noProxy.split(',')
-
-  // iterate through the noProxyList until it finds a match.
-  return noProxyList.map(parseNoProxyZone).some(function (noProxyZone) {
-    var isMatchedAt = hostname.indexOf(noProxyZone.hostname)
-    var hostnameMatched = (
-      isMatchedAt > -1 &&
-        (isMatchedAt === hostname.length - noProxyZone.hostname.length)
-    )
-
-    if (noProxyZone.hasPort) {
-      return (port === noProxyZone.port) && hostnameMatched
-    }
-
-    return hostnameMatched
-  })
-}
-
-function getProxyFromURI (uri) {
-  // Decide the proper request proxy to use based on the request URI object and the
-  // environmental variables (NO_PROXY, HTTP_PROXY, etc.)
-  // respect NO_PROXY environment variables (see: http://lynx.isc.org/current/breakout/lynx_help/keystrokes/environments.html)
-
-  var noProxy = process.env.NO_PROXY || process.env.no_proxy || ''
-
-  // if the noProxy is a wildcard then return null
-
-  if (noProxy === '*') {
-    return null
-  }
-
-  // if the noProxy is not empty and the uri is found return null
-
-  if (noProxy !== '' && uriInNoProxy(uri, noProxy)) {
-    return null
-  }
-
-  // Check for HTTP or HTTPS Proxy in environment Else default to null
-
-  if (uri.protocol === 'http:') {
-    return process.env.HTTP_PROXY ||
-      process.env.http_proxy || null
-  }
-
-  if (uri.protocol === 'https:') {
-    return process.env.HTTPS_PROXY ||
-      process.env.https_proxy ||
-      process.env.HTTP_PROXY ||
-      process.env.http_proxy || null
-  }
-
-  // if none of that works, return null
-  // (What uri protocol are you using then?)
-
-  return null
-}
-
-module.exports = getProxyFromURI
-
-
-/***/ }),
-/* 803 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var fs = __webpack_require__(5)
-var qs = __webpack_require__(196)
-var validate = __webpack_require__(677)
-var extend = __webpack_require__(269)
-
-function Har (request) {
-  this.request = request
-}
-
-Har.prototype.reducer = function (obj, pair) {
-  // new property ?
-  if (obj[pair.name] === undefined) {
-    obj[pair.name] = pair.value
-    return obj
-  }
-
-  // existing? convert to array
-  var arr = [
-    obj[pair.name],
-    pair.value
-  ]
-
-  obj[pair.name] = arr
-
-  return obj
-}
-
-Har.prototype.prep = function (data) {
-  // construct utility properties
-  data.queryObj = {}
-  data.headersObj = {}
-  data.postData.jsonObj = false
-  data.postData.paramsObj = false
-
-  // construct query objects
-  if (data.queryString && data.queryString.length) {
-    data.queryObj = data.queryString.reduce(this.reducer, {})
-  }
-
-  // construct headers objects
-  if (data.headers && data.headers.length) {
-    // loweCase header keys
-    data.headersObj = data.headers.reduceRight(function (headers, header) {
-      headers[header.name] = header.value
-      return headers
-    }, {})
-  }
-
-  // construct Cookie header
-  if (data.cookies && data.cookies.length) {
-    var cookies = data.cookies.map(function (cookie) {
-      return cookie.name + '=' + cookie.value
-    })
-
-    if (cookies.length) {
-      data.headersObj.cookie = cookies.join('; ')
-    }
-  }
-
-  // prep body
-  function some (arr) {
-    return arr.some(function (type) {
-      return data.postData.mimeType.indexOf(type) === 0
-    })
-  }
-
-  if (some([
-    'multipart/mixed',
-    'multipart/related',
-    'multipart/form-data',
-    'multipart/alternative'])) {
-    // reset values
-    data.postData.mimeType = 'multipart/form-data'
-  } else if (some([
-    'application/x-www-form-urlencoded'])) {
-    if (!data.postData.params) {
-      data.postData.text = ''
-    } else {
-      data.postData.paramsObj = data.postData.params.reduce(this.reducer, {})
-
-      // always overwrite
-      data.postData.text = qs.stringify(data.postData.paramsObj)
-    }
-  } else if (some([
-    'text/json',
-    'text/x-json',
-    'application/json',
-    'application/x-json'])) {
-    data.postData.mimeType = 'application/json'
-
-    if (data.postData.text) {
-      try {
-        data.postData.jsonObj = JSON.parse(data.postData.text)
-      } catch (e) {
-        this.request.debug(e)
-
-        // force back to text/plain
-        data.postData.mimeType = 'text/plain'
-      }
-    }
-  }
-
-  return data
-}
-
-Har.prototype.options = function (options) {
-  // skip if no har property defined
-  if (!options.har) {
-    return options
-  }
-
-  var har = {}
-  extend(har, options.har)
-
-  // only process the first entry
-  if (har.log && har.log.entries) {
-    har = har.log.entries[0]
-  }
-
-  // add optional properties to make validation successful
-  har.url = har.url || options.url || options.uri || options.baseUrl || '/'
-  har.httpVersion = har.httpVersion || 'HTTP/1.1'
-  har.queryString = har.queryString || []
-  har.headers = har.headers || []
-  har.cookies = har.cookies || []
-  har.postData = har.postData || {}
-  har.postData.mimeType = har.postData.mimeType || 'application/octet-stream'
-
-  har.bodySize = 0
-  har.headersSize = 0
-  har.postData.size = 0
-
-  if (!validate.request(har)) {
-    return options
-  }
-
-  // clean up and get some utility properties
-  var req = this.prep(har)
-
-  // construct new options
-  if (req.url) {
-    options.url = req.url
-  }
-
-  if (req.method) {
-    options.method = req.method
-  }
-
-  if (Object.keys(req.queryObj).length) {
-    options.qs = req.queryObj
-  }
-
-  if (Object.keys(req.headersObj).length) {
-    options.headers = req.headersObj
-  }
-
-  function test (type) {
-    return req.postData.mimeType.indexOf(type) === 0
-  }
-  if (test('application/x-www-form-urlencoded')) {
-    options.form = req.postData.paramsObj
-  } else if (test('application/json')) {
-    if (req.postData.jsonObj) {
-      options.body = req.postData.jsonObj
-      options.json = true
-    }
-  } else if (test('multipart/form-data')) {
-    options.formData = {}
-
-    req.postData.params.forEach(function (param) {
-      var attachment = {}
-
-      if (!param.fileName && !param.fileName && !param.contentType) {
-        options.formData[param.name] = param.value
-        return
-      }
-
-      // attempt to read from disk!
-      if (param.fileName && !param.value) {
-        attachment.value = fs.createReadStream(param.fileName)
-      } else if (param.value) {
-        attachment.value = param.value
-      }
-
-      if (param.fileName) {
-        attachment.options = {
-          filename: param.fileName,
-          contentType: param.contentType ? param.contentType : null
-        }
-      }
-
-      options.formData[param.name] = attachment
-    })
-  } else {
-    if (req.postData.text) {
-      options.body = req.postData.text
-    }
-  }
-
-  return options
-}
-
-exports.Har = Har
-
-
-/***/ }),
-/* 804 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var crypto = __webpack_require__(12)
-
-function randomString (size) {
-  var bits = (size + 1) * 6
-  var buffer = crypto.randomBytes(Math.ceil(bits / 8))
-  var string = buffer.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
-  return string.slice(0, size)
-}
-
-function calculatePayloadHash (payload, algorithm, contentType) {
-  var hash = crypto.createHash(algorithm)
-  hash.update('hawk.1.payload\n')
-  hash.update((contentType ? contentType.split(';')[0].trim().toLowerCase() : '') + '\n')
-  hash.update(payload || '')
-  hash.update('\n')
-  return hash.digest('base64')
-}
-
-exports.calculateMac = function (credentials, opts) {
-  var normalized = 'hawk.1.header\n' +
-    opts.ts + '\n' +
-    opts.nonce + '\n' +
-    (opts.method || '').toUpperCase() + '\n' +
-    opts.resource + '\n' +
-    opts.host.toLowerCase() + '\n' +
-    opts.port + '\n' +
-    (opts.hash || '') + '\n'
-
-  if (opts.ext) {
-    normalized = normalized + opts.ext.replace('\\', '\\\\').replace('\n', '\\n')
-  }
-
-  normalized = normalized + '\n'
-
-  if (opts.app) {
-    normalized = normalized + opts.app + '\n' + (opts.dlg || '') + '\n'
-  }
-
-  var hmac = crypto.createHmac(credentials.algorithm, credentials.key).update(normalized)
-  var digest = hmac.digest('base64')
-  return digest
-}
-
-exports.header = function (uri, method, opts) {
-  var timestamp = opts.timestamp || Math.floor((Date.now() + (opts.localtimeOffsetMsec || 0)) / 1000)
-  var credentials = opts.credentials
-  if (!credentials || !credentials.id || !credentials.key || !credentials.algorithm) {
-    return ''
-  }
-
-  if (['sha1', 'sha256'].indexOf(credentials.algorithm) === -1) {
-    return ''
-  }
-
-  var artifacts = {
-    ts: timestamp,
-    nonce: opts.nonce || randomString(6),
-    method: method,
-    resource: uri.pathname + (uri.search || ''),
-    host: uri.hostname,
-    port: uri.port || (uri.protocol === 'http:' ? 80 : 443),
-    hash: opts.hash,
-    ext: opts.ext,
-    app: opts.app,
-    dlg: opts.dlg
-  }
-
-  if (!artifacts.hash && (opts.payload || opts.payload === '')) {
-    artifacts.hash = calculatePayloadHash(opts.payload, credentials.algorithm, opts.contentType)
-  }
-
-  var mac = exports.calculateMac(credentials, artifacts)
-
-  var hasExt = artifacts.ext !== null && artifacts.ext !== undefined && artifacts.ext !== ''
-  var header = 'Hawk id="' + credentials.id +
-    '", ts="' + artifacts.ts +
-    '", nonce="' + artifacts.nonce +
-    (artifacts.hash ? '", hash="' + artifacts.hash : '') +
-    (hasExt ? '", ext="' + artifacts.ext.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : '') +
-    '", mac="' + mac + '"'
-
-  if (artifacts.app) {
-    header = header + ', app="' + artifacts.app + (artifacts.dlg ? '", dlg="' + artifacts.dlg : '') + '"'
-  }
-
-  return header
-}
-
-
-/***/ }),
-/* 805 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var uuid = __webpack_require__(119)
-var CombinedStream = __webpack_require__(385)
-var isstream = __webpack_require__(399)
-var Buffer = __webpack_require__(45).Buffer
-
-function Multipart (request) {
-  this.request = request
-  this.boundary = uuid()
-  this.chunked = false
-  this.body = null
-}
-
-Multipart.prototype.isChunked = function (options) {
-  var self = this
-  var chunked = false
-  var parts = options.data || options
-
-  if (!parts.forEach) {
-    self.request.emit('error', new Error('Argument error, options.multipart.'))
-  }
-
-  if (options.chunked !== undefined) {
-    chunked = options.chunked
-  }
-
-  if (self.request.getHeader('transfer-encoding') === 'chunked') {
-    chunked = true
-  }
-
-  if (!chunked) {
-    parts.forEach(function (part) {
-      if (typeof part.body === 'undefined') {
-        self.request.emit('error', new Error('Body attribute missing in multipart.'))
-      }
-      if (isstream(part.body)) {
-        chunked = true
-      }
-    })
-  }
-
-  return chunked
-}
-
-Multipart.prototype.setHeaders = function (chunked) {
-  var self = this
-
-  if (chunked && !self.request.hasHeader('transfer-encoding')) {
-    self.request.setHeader('transfer-encoding', 'chunked')
-  }
-
-  var header = self.request.getHeader('content-type')
-
-  if (!header || header.indexOf('multipart') === -1) {
-    self.request.setHeader('content-type', 'multipart/related; boundary=' + self.boundary)
-  } else {
-    if (header.indexOf('boundary') !== -1) {
-      self.boundary = header.replace(/.*boundary=([^\s;]+).*/, '$1')
-    } else {
-      self.request.setHeader('content-type', header + '; boundary=' + self.boundary)
-    }
-  }
-}
-
-Multipart.prototype.build = function (parts, chunked) {
-  var self = this
-  var body = chunked ? new CombinedStream() : []
-
-  function add (part) {
-    if (typeof part === 'number') {
-      part = part.toString()
-    }
-    return chunked ? body.append(part) : body.push(Buffer.from(part))
-  }
-
-  if (self.request.preambleCRLF) {
-    add('\r\n')
-  }
-
-  parts.forEach(function (part) {
-    var preamble = '--' + self.boundary + '\r\n'
-    Object.keys(part).forEach(function (key) {
-      if (key === 'body') { return }
-      preamble += key + ': ' + part[key] + '\r\n'
-    })
-    preamble += '\r\n'
-    add(preamble)
-    add(part.body)
-    add('\r\n')
-  })
-  add('--' + self.boundary + '--')
-
-  if (self.request.postambleCRLF) {
-    add('\r\n')
-  }
-
-  return body
-}
-
-Multipart.prototype.onRequest = function (options) {
-  var self = this
-
-  var chunked = self.isChunked(options)
-  var parts = options.data || options
-
-  self.setHeaders(chunked)
-  self.chunked = chunked
-  self.body = self.build(parts, chunked)
-}
-
-exports.Multipart = Multipart
-
-
-/***/ }),
-/* 806 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var url = __webpack_require__(24)
-var qs = __webpack_require__(404)
-var caseless = __webpack_require__(231)
-var uuid = __webpack_require__(119)
-var oauth = __webpack_require__(768)
-var crypto = __webpack_require__(12)
-var Buffer = __webpack_require__(45).Buffer
-
-function OAuth (request) {
-  this.request = request
-  this.params = null
-}
-
-OAuth.prototype.buildParams = function (_oauth, uri, method, query, form, qsLib) {
-  var oa = {}
-  for (var i in _oauth) {
-    oa['oauth_' + i] = _oauth[i]
-  }
-  if (!oa.oauth_version) {
-    oa.oauth_version = '1.0'
-  }
-  if (!oa.oauth_timestamp) {
-    oa.oauth_timestamp = Math.floor(Date.now() / 1000).toString()
-  }
-  if (!oa.oauth_nonce) {
-    oa.oauth_nonce = uuid().replace(/-/g, '')
-  }
-  if (!oa.oauth_signature_method) {
-    oa.oauth_signature_method = 'HMAC-SHA1'
-  }
-
-  var consumer_secret_or_private_key = oa.oauth_consumer_secret || oa.oauth_private_key // eslint-disable-line camelcase
-  delete oa.oauth_consumer_secret
-  delete oa.oauth_private_key
-
-  var token_secret = oa.oauth_token_secret // eslint-disable-line camelcase
-  delete oa.oauth_token_secret
-
-  var realm = oa.oauth_realm
-  delete oa.oauth_realm
-  delete oa.oauth_transport_method
-
-  var baseurl = uri.protocol + '//' + uri.host + uri.pathname
-  var params = qsLib.parse([].concat(query, form, qsLib.stringify(oa)).join('&'))
-
-  oa.oauth_signature = oauth.sign(
-    oa.oauth_signature_method,
-    method,
-    baseurl,
-    params,
-    consumer_secret_or_private_key, // eslint-disable-line camelcase
-    token_secret // eslint-disable-line camelcase
-  )
-
-  if (realm) {
-    oa.realm = realm
-  }
-
-  return oa
-}
-
-OAuth.prototype.buildBodyHash = function (_oauth, body) {
-  if (['HMAC-SHA1', 'RSA-SHA1'].indexOf(_oauth.signature_method || 'HMAC-SHA1') < 0) {
-    this.request.emit('error', new Error('oauth: ' + _oauth.signature_method +
-      ' signature_method not supported with body_hash signing.'))
-  }
-
-  var shasum = crypto.createHash('sha1')
-  shasum.update(body || '')
-  var sha1 = shasum.digest('hex')
-
-  return Buffer.from(sha1, 'hex').toString('base64')
-}
-
-OAuth.prototype.concatParams = function (oa, sep, wrap) {
-  wrap = wrap || ''
-
-  var params = Object.keys(oa).filter(function (i) {
-    return i !== 'realm' && i !== 'oauth_signature'
-  }).sort()
-
-  if (oa.realm) {
-    params.splice(0, 0, 'realm')
-  }
-  params.push('oauth_signature')
-
-  return params.map(function (i) {
-    return i + '=' + wrap + oauth.rfc3986(oa[i]) + wrap
-  }).join(sep)
-}
-
-OAuth.prototype.onRequest = function (_oauth) {
-  var self = this
-  self.params = _oauth
-
-  var uri = self.request.uri || {}
-  var method = self.request.method || ''
-  var headers = caseless(self.request.headers)
-  var body = self.request.body || ''
-  var qsLib = self.request.qsLib || qs
-
-  var form
-  var query
-  var contentType = headers.get('content-type') || ''
-  var formContentType = 'application/x-www-form-urlencoded'
-  var transport = _oauth.transport_method || 'header'
-
-  if (contentType.slice(0, formContentType.length) === formContentType) {
-    contentType = formContentType
-    form = body
-  }
-  if (uri.query) {
-    query = uri.query
-  }
-  if (transport === 'body' && (method !== 'POST' || contentType !== formContentType)) {
-    self.request.emit('error', new Error('oauth: transport_method of body requires POST ' +
-      'and content-type ' + formContentType))
-  }
-
-  if (!form && typeof _oauth.body_hash === 'boolean') {
-    _oauth.body_hash = self.buildBodyHash(_oauth, self.request.body.toString())
-  }
-
-  var oa = self.buildParams(_oauth, uri, method, query, form, qsLib)
-
-  switch (transport) {
-    case 'header':
-      self.request.setHeader('Authorization', 'OAuth ' + self.concatParams(oa, ',', '"'))
-      break
-
-    case 'query':
-      var href = self.request.uri.href += (query ? '&' : '?') + self.concatParams(oa, '&')
-      self.request.uri = url.parse(href)
-      self.request.path = self.request.uri.path
-      break
-
-    case 'body':
-      self.request.body = (form ? form + '&' : '') + self.concatParams(oa, '&')
-      break
-
-    default:
-      self.request.emit('error', new Error('oauth: transport_method invalid'))
-  }
-}
-
-exports.OAuth = OAuth
-
-
-/***/ }),
-/* 807 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var qs = __webpack_require__(404)
-var querystring = __webpack_require__(196)
-
-function Querystring (request) {
-  this.request = request
-  this.lib = null
-  this.useQuerystring = null
-  this.parseOptions = null
-  this.stringifyOptions = null
-}
-
-Querystring.prototype.init = function (options) {
-  if (this.lib) { return }
-
-  this.useQuerystring = options.useQuerystring
-  this.lib = (this.useQuerystring ? querystring : qs)
-
-  this.parseOptions = options.qsParseOptions || {}
-  this.stringifyOptions = options.qsStringifyOptions || {}
-}
-
-Querystring.prototype.stringify = function (obj) {
-  return (this.useQuerystring)
-    ? this.rfc3986(this.lib.stringify(obj,
-      this.stringifyOptions.sep || null,
-      this.stringifyOptions.eq || null,
-      this.stringifyOptions))
-    : this.lib.stringify(obj, this.stringifyOptions)
-}
-
-Querystring.prototype.parse = function (str) {
-  return (this.useQuerystring)
-    ? this.lib.parse(str,
-      this.parseOptions.sep || null,
-      this.parseOptions.eq || null,
-      this.parseOptions)
-    : this.lib.parse(str, this.parseOptions)
-}
-
-Querystring.prototype.rfc3986 = function (str) {
-  return str.replace(/[!'()*]/g, function (c) {
-    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
-  })
-}
-
-Querystring.prototype.unescape = querystring.unescape
-
-exports.Querystring = Querystring
-
-
-/***/ }),
-/* 808 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var url = __webpack_require__(24)
-var isUrl = /^https?:/
-
-function Redirect (request) {
-  this.request = request
-  this.followRedirect = true
-  this.followRedirects = true
-  this.followAllRedirects = false
-  this.followOriginalHttpMethod = false
-  this.allowRedirect = function () { return true }
-  this.maxRedirects = 10
-  this.redirects = []
-  this.redirectsFollowed = 0
-  this.removeRefererHeader = false
-}
-
-Redirect.prototype.onRequest = function (options) {
-  var self = this
-
-  if (options.maxRedirects !== undefined) {
-    self.maxRedirects = options.maxRedirects
-  }
-  if (typeof options.followRedirect === 'function') {
-    self.allowRedirect = options.followRedirect
-  }
-  if (options.followRedirect !== undefined) {
-    self.followRedirects = !!options.followRedirect
-  }
-  if (options.followAllRedirects !== undefined) {
-    self.followAllRedirects = options.followAllRedirects
-  }
-  if (self.followRedirects || self.followAllRedirects) {
-    self.redirects = self.redirects || []
-  }
-  if (options.removeRefererHeader !== undefined) {
-    self.removeRefererHeader = options.removeRefererHeader
-  }
-  if (options.followOriginalHttpMethod !== undefined) {
-    self.followOriginalHttpMethod = options.followOriginalHttpMethod
-  }
-}
-
-Redirect.prototype.redirectTo = function (response) {
-  var self = this
-  var request = self.request
-
-  var redirectTo = null
-  if (response.statusCode >= 300 && response.statusCode < 400 && response.caseless.has('location')) {
-    var location = response.caseless.get('location')
-    request.debug('redirect', location)
-
-    if (self.followAllRedirects) {
-      redirectTo = location
-    } else if (self.followRedirects) {
-      switch (request.method) {
-        case 'PATCH':
-        case 'PUT':
-        case 'POST':
-        case 'DELETE':
-          // Do not follow redirects
-          break
-        default:
-          redirectTo = location
-          break
-      }
-    }
-  } else if (response.statusCode === 401) {
-    var authHeader = request._auth.onResponse(response)
-    if (authHeader) {
-      request.setHeader('authorization', authHeader)
-      redirectTo = request.uri
-    }
-  }
-  return redirectTo
-}
-
-Redirect.prototype.onResponse = function (response) {
-  var self = this
-  var request = self.request
-
-  var redirectTo = self.redirectTo(response)
-  if (!redirectTo || !self.allowRedirect.call(request, response)) {
-    return false
-  }
-
-  request.debug('redirect to', redirectTo)
-
-  // ignore any potential response body.  it cannot possibly be useful
-  // to us at this point.
-  // response.resume should be defined, but check anyway before calling. Workaround for browserify.
-  if (response.resume) {
-    response.resume()
-  }
-
-  if (self.redirectsFollowed >= self.maxRedirects) {
-    request.emit('error', new Error('Exceeded maxRedirects. Probably stuck in a redirect loop ' + request.uri.href))
-    return false
-  }
-  self.redirectsFollowed += 1
-
-  if (!isUrl.test(redirectTo)) {
-    redirectTo = url.resolve(request.uri.href, redirectTo)
-  }
-
-  var uriPrev = request.uri
-  request.uri = url.parse(redirectTo)
-
-  // handle the case where we change protocol from https to http or vice versa
-  if (request.uri.protocol !== uriPrev.protocol) {
-    delete request.agent
-  }
-
-  self.redirects.push({ statusCode: response.statusCode, redirectUri: redirectTo })
-
-  if (self.followAllRedirects && request.method !== 'HEAD' &&
-    response.statusCode !== 401 && response.statusCode !== 307) {
-    request.method = self.followOriginalHttpMethod ? request.method : 'GET'
-  }
-  // request.method = 'GET' // Force all redirects to use GET || commented out fixes #215
-  delete request.src
-  delete request.req
-  delete request._started
-  if (response.statusCode !== 401 && response.statusCode !== 307) {
-    // Remove parameters from the previous response, unless this is the second request
-    // for a server that requires digest authentication.
-    delete request.body
-    delete request._form
-    if (request.headers) {
-      request.removeHeader('host')
-      request.removeHeader('content-type')
-      request.removeHeader('content-length')
-      if (request.uri.hostname !== request.originalHost.split(':')[0]) {
-        // Remove authorization if changing hostnames (but not if just
-        // changing ports or protocols).  This matches the behavior of curl:
-        // https://github.com/bagder/curl/blob/6beb0eee/lib/http.c#L710
-        request.removeHeader('authorization')
-      }
-    }
-  }
-
-  if (!self.removeRefererHeader) {
-    request.setHeader('referer', uriPrev.href)
-  }
-
-  request.emit('redirect')
-
-  request.init()
-
-  return true
-}
-
-exports.Redirect = Redirect
-
-
-/***/ }),
-/* 809 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var url = __webpack_require__(24)
-var tunnel = __webpack_require__(955)
-
-var defaultProxyHeaderWhiteList = [
-  'accept',
-  'accept-charset',
-  'accept-encoding',
-  'accept-language',
-  'accept-ranges',
-  'cache-control',
-  'content-encoding',
-  'content-language',
-  'content-location',
-  'content-md5',
-  'content-range',
-  'content-type',
-  'connection',
-  'date',
-  'expect',
-  'max-forwards',
-  'pragma',
-  'referer',
-  'te',
-  'user-agent',
-  'via'
-]
-
-var defaultProxyHeaderExclusiveList = [
-  'proxy-authorization'
-]
-
-function constructProxyHost (uriObject) {
-  var port = uriObject.port
-  var protocol = uriObject.protocol
-  var proxyHost = uriObject.hostname + ':'
-
-  if (port) {
-    proxyHost += port
-  } else if (protocol === 'https:') {
-    proxyHost += '443'
-  } else {
-    proxyHost += '80'
-  }
-
-  return proxyHost
-}
-
-function constructProxyHeaderWhiteList (headers, proxyHeaderWhiteList) {
-  var whiteList = proxyHeaderWhiteList
-    .reduce(function (set, header) {
-      set[header.toLowerCase()] = true
-      return set
-    }, {})
-
-  return Object.keys(headers)
-    .filter(function (header) {
-      return whiteList[header.toLowerCase()]
-    })
-    .reduce(function (set, header) {
-      set[header] = headers[header]
-      return set
-    }, {})
-}
-
-function constructTunnelOptions (request, proxyHeaders) {
-  var proxy = request.proxy
-
-  var tunnelOptions = {
-    proxy: {
-      host: proxy.hostname,
-      port: +proxy.port,
-      proxyAuth: proxy.auth,
-      headers: proxyHeaders
-    },
-    headers: request.headers,
-    ca: request.ca,
-    cert: request.cert,
-    key: request.key,
-    passphrase: request.passphrase,
-    pfx: request.pfx,
-    ciphers: request.ciphers,
-    rejectUnauthorized: request.rejectUnauthorized,
-    secureOptions: request.secureOptions,
-    secureProtocol: request.secureProtocol
-  }
-
-  return tunnelOptions
-}
-
-function constructTunnelFnName (uri, proxy) {
-  var uriProtocol = (uri.protocol === 'https:' ? 'https' : 'http')
-  var proxyProtocol = (proxy.protocol === 'https:' ? 'Https' : 'Http')
-  return [uriProtocol, proxyProtocol].join('Over')
-}
-
-function getTunnelFn (request) {
-  var uri = request.uri
-  var proxy = request.proxy
-  var tunnelFnName = constructTunnelFnName(uri, proxy)
-  return tunnel[tunnelFnName]
-}
-
-function Tunnel (request) {
-  this.request = request
-  this.proxyHeaderWhiteList = defaultProxyHeaderWhiteList
-  this.proxyHeaderExclusiveList = []
-  if (typeof request.tunnel !== 'undefined') {
-    this.tunnelOverride = request.tunnel
-  }
-}
-
-Tunnel.prototype.isEnabled = function () {
-  var self = this
-  var request = self.request
-    // Tunnel HTTPS by default. Allow the user to override this setting.
-
-  // If self.tunnelOverride is set (the user specified a value), use it.
-  if (typeof self.tunnelOverride !== 'undefined') {
-    return self.tunnelOverride
-  }
-
-  // If the destination is HTTPS, tunnel.
-  if (request.uri.protocol === 'https:') {
-    return true
-  }
-
-  // Otherwise, do not use tunnel.
-  return false
-}
-
-Tunnel.prototype.setup = function (options) {
-  var self = this
-  var request = self.request
-
-  options = options || {}
-
-  if (typeof request.proxy === 'string') {
-    request.proxy = url.parse(request.proxy)
-  }
-
-  if (!request.proxy || !request.tunnel) {
-    return false
-  }
-
-  // Setup Proxy Header Exclusive List and White List
-  if (options.proxyHeaderWhiteList) {
-    self.proxyHeaderWhiteList = options.proxyHeaderWhiteList
-  }
-  if (options.proxyHeaderExclusiveList) {
-    self.proxyHeaderExclusiveList = options.proxyHeaderExclusiveList
-  }
-
-  var proxyHeaderExclusiveList = self.proxyHeaderExclusiveList.concat(defaultProxyHeaderExclusiveList)
-  var proxyHeaderWhiteList = self.proxyHeaderWhiteList.concat(proxyHeaderExclusiveList)
-
-  // Setup Proxy Headers and Proxy Headers Host
-  // Only send the Proxy White Listed Header names
-  var proxyHeaders = constructProxyHeaderWhiteList(request.headers, proxyHeaderWhiteList)
-  proxyHeaders.host = constructProxyHost(request.uri)
-
-  proxyHeaderExclusiveList.forEach(request.removeHeader, request)
-
-  // Set Agent from Tunnel Data
-  var tunnelFn = getTunnelFn(request)
-  var tunnelOptions = constructTunnelOptions(request, proxyHeaders)
-  request.agent = tunnelFn(tunnelOptions)
-
-  return true
-}
-
-Tunnel.defaultProxyHeaderWhiteList = defaultProxyHeaderWhiteList
-Tunnel.defaultProxyHeaderExclusiveList = defaultProxyHeaderExclusiveList
-exports.Tunnel = Tunnel
-
-
-/***/ }),
-/* 810 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-var net = __webpack_require__(164);
-var urlParse = __webpack_require__(24).parse;
-var pubsuffix = __webpack_require__(415);
-var Store = __webpack_require__(416).Store;
-var MemoryCookieStore = __webpack_require__(811).MemoryCookieStore;
-var pathMatch = __webpack_require__(413).pathMatch;
-var VERSION = __webpack_require__(812).version;
-
-var punycode;
-try {
-  punycode = __webpack_require__(332);
-} catch(e) {
-  console.warn("cookie: can't load punycode; won't use punycode for domain normalization");
-}
-
-// From RFC6265 S4.1.1
-// note that it excludes \x3B ";"
-var COOKIE_OCTETS = /^[\x21\x23-\x2B\x2D-\x3A\x3C-\x5B\x5D-\x7E]+$/;
-
-var CONTROL_CHARS = /[\x00-\x1F]/;
-
-// From Chromium // '\r', '\n' and '\0' should be treated as a terminator in
-// the "relaxed" mode, see:
-// https://github.com/ChromiumWebApps/chromium/blob/b3d3b4da8bb94c1b2e061600df106d590fda3620/net/cookies/parsed_cookie.cc#L60
-var TERMINATORS = ['\n', '\r', '\0'];
-
-// RFC6265 S4.1.1 defines path value as 'any CHAR except CTLs or ";"'
-// Note ';' is \x3B
-var PATH_VALUE = /[\x20-\x3A\x3C-\x7E]+/;
-
-// date-time parsing constants (RFC6265 S5.1.1)
-
-var DATE_DELIM = /[\x09\x20-\x2F\x3B-\x40\x5B-\x60\x7B-\x7E]/;
-
-var MONTH_TO_NUM = {
-  jan:0, feb:1, mar:2, apr:3, may:4, jun:5,
-  jul:6, aug:7, sep:8, oct:9, nov:10, dec:11
-};
-var NUM_TO_MONTH = [
-  'Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'
-];
-var NUM_TO_DAY = [
-  'Sun','Mon','Tue','Wed','Thu','Fri','Sat'
-];
-
-var MAX_TIME = 2147483647000; // 31-bit max
-var MIN_TIME = 0; // 31-bit min
-
-/*
- * Parses a Natural number (i.e., non-negative integer) with either the
- *    <min>*<max>DIGIT ( non-digit *OCTET )
- * or
- *    <min>*<max>DIGIT
- * grammar (RFC6265 S5.1.1).
- *
- * The "trailingOK" boolean controls if the grammar accepts a
- * "( non-digit *OCTET )" trailer.
- */
-function parseDigits(token, minDigits, maxDigits, trailingOK) {
-  var count = 0;
-  while (count < token.length) {
-    var c = token.charCodeAt(count);
-    // "non-digit = %x00-2F / %x3A-FF"
-    if (c <= 0x2F || c >= 0x3A) {
-      break;
-    }
-    count++;
-  }
-
-  // constrain to a minimum and maximum number of digits.
-  if (count < minDigits || count > maxDigits) {
-    return null;
-  }
-
-  if (!trailingOK && count != token.length) {
-    return null;
-  }
-
-  return parseInt(token.substr(0,count), 10);
-}
-
-function parseTime(token) {
-  var parts = token.split(':');
-  var result = [0,0,0];
-
-  /* RF6256 S5.1.1:
-   *      time            = hms-time ( non-digit *OCTET )
-   *      hms-time        = time-field ":" time-field ":" time-field
-   *      time-field      = 1*2DIGIT
-   */
-
-  if (parts.length !== 3) {
-    return null;
-  }
-
-  for (var i = 0; i < 3; i++) {
-    // "time-field" must be strictly "1*2DIGIT", HOWEVER, "hms-time" can be
-    // followed by "( non-digit *OCTET )" so therefore the last time-field can
-    // have a trailer
-    var trailingOK = (i == 2);
-    var num = parseDigits(parts[i], 1, 2, trailingOK);
-    if (num === null) {
-      return null;
-    }
-    result[i] = num;
-  }
-
-  return result;
-}
-
-function parseMonth(token) {
-  token = String(token).substr(0,3).toLowerCase();
-  var num = MONTH_TO_NUM[token];
-  return num >= 0 ? num : null;
-}
-
-/*
- * RFC6265 S5.1.1 date parser (see RFC for full grammar)
- */
-function parseDate(str) {
-  if (!str) {
-    return;
-  }
-
-  /* RFC6265 S5.1.1:
-   * 2. Process each date-token sequentially in the order the date-tokens
-   * appear in the cookie-date
-   */
-  var tokens = str.split(DATE_DELIM);
-  if (!tokens) {
-    return;
-  }
-
-  var hour = null;
-  var minute = null;
-  var second = null;
-  var dayOfMonth = null;
-  var month = null;
-  var year = null;
-
-  for (var i=0; i<tokens.length; i++) {
-    var token = tokens[i].trim();
-    if (!token.length) {
-      continue;
-    }
-
-    var result;
-
-    /* 2.1. If the found-time flag is not set and the token matches the time
-     * production, set the found-time flag and set the hour- value,
-     * minute-value, and second-value to the numbers denoted by the digits in
-     * the date-token, respectively.  Skip the remaining sub-steps and continue
-     * to the next date-token.
-     */
-    if (second === null) {
-      result = parseTime(token);
-      if (result) {
-        hour = result[0];
-        minute = result[1];
-        second = result[2];
-        continue;
-      }
-    }
-
-    /* 2.2. If the found-day-of-month flag is not set and the date-token matches
-     * the day-of-month production, set the found-day-of- month flag and set
-     * the day-of-month-value to the number denoted by the date-token.  Skip
-     * the remaining sub-steps and continue to the next date-token.
-     */
-    if (dayOfMonth === null) {
-      // "day-of-month = 1*2DIGIT ( non-digit *OCTET )"
-      result = parseDigits(token, 1, 2, true);
-      if (result !== null) {
-        dayOfMonth = result;
-        continue;
-      }
-    }
-
-    /* 2.3. If the found-month flag is not set and the date-token matches the
-     * month production, set the found-month flag and set the month-value to
-     * the month denoted by the date-token.  Skip the remaining sub-steps and
-     * continue to the next date-token.
-     */
-    if (month === null) {
-      result = parseMonth(token);
-      if (result !== null) {
-        month = result;
-        continue;
-      }
-    }
-
-    /* 2.4. If the found-year flag is not set and the date-token matches the
-     * year production, set the found-year flag and set the year-value to the
-     * number denoted by the date-token.  Skip the remaining sub-steps and
-     * continue to the next date-token.
-     */
-    if (year === null) {
-      // "year = 2*4DIGIT ( non-digit *OCTET )"
-      result = parseDigits(token, 2, 4, true);
-      if (result !== null) {
-        year = result;
-        /* From S5.1.1:
-         * 3.  If the year-value is greater than or equal to 70 and less
-         * than or equal to 99, increment the year-value by 1900.
-         * 4.  If the year-value is greater than or equal to 0 and less
-         * than or equal to 69, increment the year-value by 2000.
-         */
-        if (year >= 70 && year <= 99) {
-          year += 1900;
-        } else if (year >= 0 && year <= 69) {
-          year += 2000;
-        }
-      }
-    }
-  }
-
-  /* RFC 6265 S5.1.1
-   * "5. Abort these steps and fail to parse the cookie-date if:
-   *     *  at least one of the found-day-of-month, found-month, found-
-   *        year, or found-time flags is not set,
-   *     *  the day-of-month-value is less than 1 or greater than 31,
-   *     *  the year-value is less than 1601,
-   *     *  the hour-value is greater than 23,
-   *     *  the minute-value is greater than 59, or
-   *     *  the second-value is greater than 59.
-   *     (Note that leap seconds cannot be represented in this syntax.)"
-   *
-   * So, in order as above:
-   */
-  if (
-    dayOfMonth === null || month === null || year === null || second === null ||
-    dayOfMonth < 1 || dayOfMonth > 31 ||
-    year < 1601 ||
-    hour > 23 ||
-    minute > 59 ||
-    second > 59
-  ) {
-    return;
-  }
-
-  return new Date(Date.UTC(year, month, dayOfMonth, hour, minute, second));
-}
-
-function formatDate(date) {
-  var d = date.getUTCDate(); d = d >= 10 ? d : '0'+d;
-  var h = date.getUTCHours(); h = h >= 10 ? h : '0'+h;
-  var m = date.getUTCMinutes(); m = m >= 10 ? m : '0'+m;
-  var s = date.getUTCSeconds(); s = s >= 10 ? s : '0'+s;
-  return NUM_TO_DAY[date.getUTCDay()] + ', ' +
-    d+' '+ NUM_TO_MONTH[date.getUTCMonth()] +' '+ date.getUTCFullYear() +' '+
-    h+':'+m+':'+s+' GMT';
-}
-
-// S5.1.2 Canonicalized Host Names
-function canonicalDomain(str) {
-  if (str == null) {
-    return null;
-  }
-  str = str.trim().replace(/^\./,''); // S4.1.2.3 & S5.2.3: ignore leading .
-
-  // convert to IDN if any non-ASCII characters
-  if (punycode && /[^\u0001-\u007f]/.test(str)) {
-    str = punycode.toASCII(str);
-  }
-
-  return str.toLowerCase();
-}
-
-// S5.1.3 Domain Matching
-function domainMatch(str, domStr, canonicalize) {
-  if (str == null || domStr == null) {
-    return null;
-  }
-  if (canonicalize !== false) {
-    str = canonicalDomain(str);
-    domStr = canonicalDomain(domStr);
-  }
-
-  /*
-   * "The domain string and the string are identical. (Note that both the
-   * domain string and the string will have been canonicalized to lower case at
-   * this point)"
-   */
-  if (str == domStr) {
-    return true;
-  }
-
-  /* "All of the following [three] conditions hold:" (order adjusted from the RFC) */
-
-  /* "* The string is a host name (i.e., not an IP address)." */
-  if (net.isIP(str)) {
-    return false;
-  }
-
-  /* "* The domain string is a suffix of the string" */
-  var idx = str.indexOf(domStr);
-  if (idx <= 0) {
-    return false; // it's a non-match (-1) or prefix (0)
-  }
-
-  // e.g "a.b.c".indexOf("b.c") === 2
-  // 5 === 3+2
-  if (str.length !== domStr.length + idx) { // it's not a suffix
-    return false;
-  }
-
-  /* "* The last character of the string that is not included in the domain
-  * string is a %x2E (".") character." */
-  if (str.substr(idx-1,1) !== '.') {
-    return false;
-  }
-
-  return true;
-}
-
-
-// RFC6265 S5.1.4 Paths and Path-Match
-
-/*
- * "The user agent MUST use an algorithm equivalent to the following algorithm
- * to compute the default-path of a cookie:"
- *
- * Assumption: the path (and not query part or absolute uri) is passed in.
- */
-function defaultPath(path) {
-  // "2. If the uri-path is empty or if the first character of the uri-path is not
-  // a %x2F ("/") character, output %x2F ("/") and skip the remaining steps.
-  if (!path || path.substr(0,1) !== "/") {
-    return "/";
-  }
-
-  // "3. If the uri-path contains no more than one %x2F ("/") character, output
-  // %x2F ("/") and skip the remaining step."
-  if (path === "/") {
-    return path;
-  }
-
-  var rightSlash = path.lastIndexOf("/");
-  if (rightSlash === 0) {
-    return "/";
-  }
-
-  // "4. Output the characters of the uri-path from the first character up to,
-  // but not including, the right-most %x2F ("/")."
-  return path.slice(0, rightSlash);
-}
-
-function trimTerminator(str) {
-  for (var t = 0; t < TERMINATORS.length; t++) {
-    var terminatorIdx = str.indexOf(TERMINATORS[t]);
-    if (terminatorIdx !== -1) {
-      str = str.substr(0,terminatorIdx);
-    }
-  }
-
-  return str;
-}
-
-function parseCookiePair(cookiePair, looseMode) {
-  cookiePair = trimTerminator(cookiePair);
-
-  var firstEq = cookiePair.indexOf('=');
-  if (looseMode) {
-    if (firstEq === 0) { // '=' is immediately at start
-      cookiePair = cookiePair.substr(1);
-      firstEq = cookiePair.indexOf('='); // might still need to split on '='
-    }
-  } else { // non-loose mode
-    if (firstEq <= 0) { // no '=' or is at start
-      return; // needs to have non-empty "cookie-name"
-    }
-  }
-
-  var cookieName, cookieValue;
-  if (firstEq <= 0) {
-    cookieName = "";
-    cookieValue = cookiePair.trim();
-  } else {
-    cookieName = cookiePair.substr(0, firstEq).trim();
-    cookieValue = cookiePair.substr(firstEq+1).trim();
-  }
-
-  if (CONTROL_CHARS.test(cookieName) || CONTROL_CHARS.test(cookieValue)) {
-    return;
-  }
-
-  var c = new Cookie();
-  c.key = cookieName;
-  c.value = cookieValue;
-  return c;
-}
-
-function parse(str, options) {
-  if (!options || typeof options !== 'object') {
-    options = {};
-  }
-  str = str.trim();
-
-  // We use a regex to parse the "name-value-pair" part of S5.2
-  var firstSemi = str.indexOf(';'); // S5.2 step 1
-  var cookiePair = (firstSemi === -1) ? str : str.substr(0, firstSemi);
-  var c = parseCookiePair(cookiePair, !!options.loose);
-  if (!c) {
-    return;
-  }
-
-  if (firstSemi === -1) {
-    return c;
-  }
-
-  // S5.2.3 "unparsed-attributes consist of the remainder of the set-cookie-string
-  // (including the %x3B (";") in question)." plus later on in the same section
-  // "discard the first ";" and trim".
-  var unparsed = str.slice(firstSemi + 1).trim();
-
-  // "If the unparsed-attributes string is empty, skip the rest of these
-  // steps."
-  if (unparsed.length === 0) {
-    return c;
-  }
-
-  /*
-   * S5.2 says that when looping over the items "[p]rocess the attribute-name
-   * and attribute-value according to the requirements in the following
-   * subsections" for every item.  Plus, for many of the individual attributes
-   * in S5.3 it says to use the "attribute-value of the last attribute in the
-   * cookie-attribute-list".  Therefore, in this implementation, we overwrite
-   * the previous value.
-   */
-  var cookie_avs = unparsed.split(';');
-  while (cookie_avs.length) {
-    var av = cookie_avs.shift().trim();
-    if (av.length === 0) { // happens if ";;" appears
-      continue;
-    }
-    var av_sep = av.indexOf('=');
-    var av_key, av_value;
-
-    if (av_sep === -1) {
-      av_key = av;
-      av_value = null;
-    } else {
-      av_key = av.substr(0,av_sep);
-      av_value = av.substr(av_sep+1);
-    }
-
-    av_key = av_key.trim().toLowerCase();
-
-    if (av_value) {
-      av_value = av_value.trim();
-    }
-
-    switch(av_key) {
-    case 'expires': // S5.2.1
-      if (av_value) {
-        var exp = parseDate(av_value);
-        // "If the attribute-value failed to parse as a cookie date, ignore the
-        // cookie-av."
-        if (exp) {
-          // over and underflow not realistically a concern: V8's getTime() seems to
-          // store something larger than a 32-bit time_t (even with 32-bit node)
-          c.expires = exp;
-        }
-      }
-      break;
-
-    case 'max-age': // S5.2.2
-      if (av_value) {
-        // "If the first character of the attribute-value is not a DIGIT or a "-"
-        // character ...[or]... If the remainder of attribute-value contains a
-        // non-DIGIT character, ignore the cookie-av."
-        if (/^-?[0-9]+$/.test(av_value)) {
-          var delta = parseInt(av_value, 10);
-          // "If delta-seconds is less than or equal to zero (0), let expiry-time
-          // be the earliest representable date and time."
-          c.setMaxAge(delta);
-        }
-      }
-      break;
-
-    case 'domain': // S5.2.3
-      // "If the attribute-value is empty, the behavior is undefined.  However,
-      // the user agent SHOULD ignore the cookie-av entirely."
-      if (av_value) {
-        // S5.2.3 "Let cookie-domain be the attribute-value without the leading %x2E
-        // (".") character."
-        var domain = av_value.trim().replace(/^\./, '');
-        if (domain) {
-          // "Convert the cookie-domain to lower case."
-          c.domain = domain.toLowerCase();
-        }
-      }
-      break;
-
-    case 'path': // S5.2.4
-      /*
-       * "If the attribute-value is empty or if the first character of the
-       * attribute-value is not %x2F ("/"):
-       *   Let cookie-path be the default-path.
-       * Otherwise:
-       *   Let cookie-path be the attribute-value."
-       *
-       * We'll represent the default-path as null since it depends on the
-       * context of the parsing.
-       */
-      c.path = av_value && av_value[0] === "/" ? av_value : null;
-      break;
-
-    case 'secure': // S5.2.5
-      /*
-       * "If the attribute-name case-insensitively matches the string "Secure",
-       * the user agent MUST append an attribute to the cookie-attribute-list
-       * with an attribute-name of Secure and an empty attribute-value."
-       */
-      c.secure = true;
-      break;
-
-    case 'httponly': // S5.2.6 -- effectively the same as 'secure'
-      c.httpOnly = true;
-      break;
-
-    default:
-      c.extensions = c.extensions || [];
-      c.extensions.push(av);
-      break;
-    }
-  }
-
-  return c;
-}
-
-// avoid the V8 deoptimization monster!
-function jsonParse(str) {
-  var obj;
-  try {
-    obj = JSON.parse(str);
-  } catch (e) {
-    return e;
-  }
-  return obj;
-}
-
-function fromJSON(str) {
-  if (!str) {
-    return null;
-  }
-
-  var obj;
-  if (typeof str === 'string') {
-    obj = jsonParse(str);
-    if (obj instanceof Error) {
-      return null;
-    }
-  } else {
-    // assume it's an Object
-    obj = str;
-  }
-
-  var c = new Cookie();
-  for (var i=0; i<Cookie.serializableProperties.length; i++) {
-    var prop = Cookie.serializableProperties[i];
-    if (obj[prop] === undefined ||
-        obj[prop] === Cookie.prototype[prop])
-    {
-      continue; // leave as prototype default
-    }
-
-    if (prop === 'expires' ||
-        prop === 'creation' ||
-        prop === 'lastAccessed')
-    {
-      if (obj[prop] === null) {
-        c[prop] = null;
-      } else {
-        c[prop] = obj[prop] == "Infinity" ?
-          "Infinity" : new Date(obj[prop]);
-      }
-    } else {
-      c[prop] = obj[prop];
-    }
-  }
-
-  return c;
-}
-
-/* Section 5.4 part 2:
- * "*  Cookies with longer paths are listed before cookies with
- *     shorter paths.
- *
- *  *  Among cookies that have equal-length path fields, cookies with
- *     earlier creation-times are listed before cookies with later
- *     creation-times."
- */
-
-function cookieCompare(a,b) {
-  var cmp = 0;
-
-  // descending for length: b CMP a
-  var aPathLen = a.path ? a.path.length : 0;
-  var bPathLen = b.path ? b.path.length : 0;
-  cmp = bPathLen - aPathLen;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  // ascending for time: a CMP b
-  var aTime = a.creation ? a.creation.getTime() : MAX_TIME;
-  var bTime = b.creation ? b.creation.getTime() : MAX_TIME;
-  cmp = aTime - bTime;
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  // break ties for the same millisecond (precision of JavaScript's clock)
-  cmp = a.creationIndex - b.creationIndex;
-
-  return cmp;
-}
-
-// Gives the permutation of all possible pathMatch()es of a given path. The
-// array is in longest-to-shortest order.  Handy for indexing.
-function permutePath(path) {
-  if (path === '/') {
-    return ['/'];
-  }
-  if (path.lastIndexOf('/') === path.length-1) {
-    path = path.substr(0,path.length-1);
-  }
-  var permutations = [path];
-  while (path.length > 1) {
-    var lindex = path.lastIndexOf('/');
-    if (lindex === 0) {
-      break;
-    }
-    path = path.substr(0,lindex);
-    permutations.push(path);
-  }
-  permutations.push('/');
-  return permutations;
-}
-
-function getCookieContext(url) {
-  if (url instanceof Object) {
-    return url;
-  }
-  // NOTE: decodeURI will throw on malformed URIs (see GH-32).
-  // Therefore, we will just skip decoding for such URIs.
-  try {
-    url = decodeURI(url);
-  }
-  catch(err) {
-    // Silently swallow error
-  }
-
-  return urlParse(url);
-}
-
-function Cookie(options) {
-  options = options || {};
-
-  Object.keys(options).forEach(function(prop) {
-    if (Cookie.prototype.hasOwnProperty(prop) &&
-        Cookie.prototype[prop] !== options[prop] &&
-        prop.substr(0,1) !== '_')
-    {
-      this[prop] = options[prop];
-    }
-  }, this);
-
-  this.creation = this.creation || new Date();
-
-  // used to break creation ties in cookieCompare():
-  Object.defineProperty(this, 'creationIndex', {
-    configurable: false,
-    enumerable: false, // important for assert.deepEqual checks
-    writable: true,
-    value: ++Cookie.cookiesCreated
-  });
-}
-
-Cookie.cookiesCreated = 0; // incremented each time a cookie is created
-
-Cookie.parse = parse;
-Cookie.fromJSON = fromJSON;
-
-Cookie.prototype.key = "";
-Cookie.prototype.value = "";
-
-// the order in which the RFC has them:
-Cookie.prototype.expires = "Infinity"; // coerces to literal Infinity
-Cookie.prototype.maxAge = null; // takes precedence over expires for TTL
-Cookie.prototype.domain = null;
-Cookie.prototype.path = null;
-Cookie.prototype.secure = false;
-Cookie.prototype.httpOnly = false;
-Cookie.prototype.extensions = null;
-
-// set by the CookieJar:
-Cookie.prototype.hostOnly = null; // boolean when set
-Cookie.prototype.pathIsDefault = null; // boolean when set
-Cookie.prototype.creation = null; // Date when set; defaulted by Cookie.parse
-Cookie.prototype.lastAccessed = null; // Date when set
-Object.defineProperty(Cookie.prototype, 'creationIndex', {
-  configurable: true,
-  enumerable: false,
-  writable: true,
-  value: 0
-});
-
-Cookie.serializableProperties = Object.keys(Cookie.prototype)
-  .filter(function(prop) {
-    return !(
-      Cookie.prototype[prop] instanceof Function ||
-      prop === 'creationIndex' ||
-      prop.substr(0,1) === '_'
-    );
-  });
-
-Cookie.prototype.inspect = function inspect() {
-  var now = Date.now();
-  return 'Cookie="'+this.toString() +
-    '; hostOnly='+(this.hostOnly != null ? this.hostOnly : '?') +
-    '; aAge='+(this.lastAccessed ? (now-this.lastAccessed.getTime())+'ms' : '?') +
-    '; cAge='+(this.creation ? (now-this.creation.getTime())+'ms' : '?') +
-    '"';
-};
-
-Cookie.prototype.toJSON = function() {
-  var obj = {};
-
-  var props = Cookie.serializableProperties;
-  for (var i=0; i<props.length; i++) {
-    var prop = props[i];
-    if (this[prop] === Cookie.prototype[prop]) {
-      continue; // leave as prototype default
-    }
-
-    if (prop === 'expires' ||
-        prop === 'creation' ||
-        prop === 'lastAccessed')
-    {
-      if (this[prop] === null) {
-        obj[prop] = null;
-      } else {
-        obj[prop] = this[prop] == "Infinity" ? // intentionally not ===
-          "Infinity" : this[prop].toISOString();
-      }
-    } else if (prop === 'maxAge') {
-      if (this[prop] !== null) {
-        // again, intentionally not ===
-        obj[prop] = (this[prop] == Infinity || this[prop] == -Infinity) ?
-          this[prop].toString() : this[prop];
-      }
-    } else {
-      if (this[prop] !== Cookie.prototype[prop]) {
-        obj[prop] = this[prop];
-      }
-    }
-  }
-
-  return obj;
-};
-
-Cookie.prototype.clone = function() {
-  return fromJSON(this.toJSON());
-};
-
-Cookie.prototype.validate = function validate() {
-  if (!COOKIE_OCTETS.test(this.value)) {
-    return false;
-  }
-  if (this.expires != Infinity && !(this.expires instanceof Date) && !parseDate(this.expires)) {
-    return false;
-  }
-  if (this.maxAge != null && this.maxAge <= 0) {
-    return false; // "Max-Age=" non-zero-digit *DIGIT
-  }
-  if (this.path != null && !PATH_VALUE.test(this.path)) {
-    return false;
-  }
-
-  var cdomain = this.cdomain();
-  if (cdomain) {
-    if (cdomain.match(/\.$/)) {
-      return false; // S4.1.2.3 suggests that this is bad. domainMatch() tests confirm this
-    }
-    var suffix = pubsuffix.getPublicSuffix(cdomain);
-    if (suffix == null) { // it's a public suffix
-      return false;
-    }
-  }
-  return true;
-};
-
-Cookie.prototype.setExpires = function setExpires(exp) {
-  if (exp instanceof Date) {
-    this.expires = exp;
-  } else {
-    this.expires = parseDate(exp) || "Infinity";
-  }
-};
-
-Cookie.prototype.setMaxAge = function setMaxAge(age) {
-  if (age === Infinity || age === -Infinity) {
-    this.maxAge = age.toString(); // so JSON.stringify() works
-  } else {
-    this.maxAge = age;
-  }
-};
-
-// gives Cookie header format
-Cookie.prototype.cookieString = function cookieString() {
-  var val = this.value;
-  if (val == null) {
-    val = '';
-  }
-  if (this.key === '') {
-    return val;
-  }
-  return this.key+'='+val;
-};
-
-// gives Set-Cookie header format
-Cookie.prototype.toString = function toString() {
-  var str = this.cookieString();
-
-  if (this.expires != Infinity) {
-    if (this.expires instanceof Date) {
-      str += '; Expires='+formatDate(this.expires);
-    } else {
-      str += '; Expires='+this.expires;
-    }
-  }
-
-  if (this.maxAge != null && this.maxAge != Infinity) {
-    str += '; Max-Age='+this.maxAge;
-  }
-
-  if (this.domain && !this.hostOnly) {
-    str += '; Domain='+this.domain;
-  }
-  if (this.path) {
-    str += '; Path='+this.path;
-  }
-
-  if (this.secure) {
-    str += '; Secure';
-  }
-  if (this.httpOnly) {
-    str += '; HttpOnly';
-  }
-  if (this.extensions) {
-    this.extensions.forEach(function(ext) {
-      str += '; '+ext;
-    });
-  }
-
-  return str;
-};
-
-// TTL() partially replaces the "expiry-time" parts of S5.3 step 3 (setCookie()
-// elsewhere)
-// S5.3 says to give the "latest representable date" for which we use Infinity
-// For "expired" we use 0
-Cookie.prototype.TTL = function TTL(now) {
-  /* RFC6265 S4.1.2.2 If a cookie has both the Max-Age and the Expires
-   * attribute, the Max-Age attribute has precedence and controls the
-   * expiration date of the cookie.
-   * (Concurs with S5.3 step 3)
-   */
-  if (this.maxAge != null) {
-    return this.maxAge<=0 ? 0 : this.maxAge*1000;
-  }
-
-  var expires = this.expires;
-  if (expires != Infinity) {
-    if (!(expires instanceof Date)) {
-      expires = parseDate(expires) || Infinity;
-    }
-
-    if (expires == Infinity) {
-      return Infinity;
-    }
-
-    return expires.getTime() - (now || Date.now());
-  }
-
-  return Infinity;
-};
-
-// expiryTime() replaces the "expiry-time" parts of S5.3 step 3 (setCookie()
-// elsewhere)
-Cookie.prototype.expiryTime = function expiryTime(now) {
-  if (this.maxAge != null) {
-    var relativeTo = now || this.creation || new Date();
-    var age = (this.maxAge <= 0) ? -Infinity : this.maxAge*1000;
-    return relativeTo.getTime() + age;
-  }
-
-  if (this.expires == Infinity) {
-    return Infinity;
-  }
-  return this.expires.getTime();
-};
-
-// expiryDate() replaces the "expiry-time" parts of S5.3 step 3 (setCookie()
-// elsewhere), except it returns a Date
-Cookie.prototype.expiryDate = function expiryDate(now) {
-  var millisec = this.expiryTime(now);
-  if (millisec == Infinity) {
-    return new Date(MAX_TIME);
-  } else if (millisec == -Infinity) {
-    return new Date(MIN_TIME);
-  } else {
-    return new Date(millisec);
-  }
-};
-
-// This replaces the "persistent-flag" parts of S5.3 step 3
-Cookie.prototype.isPersistent = function isPersistent() {
-  return (this.maxAge != null || this.expires != Infinity);
-};
-
-// Mostly S5.1.2 and S5.2.3:
-Cookie.prototype.cdomain =
-Cookie.prototype.canonicalizedDomain = function canonicalizedDomain() {
-  if (this.domain == null) {
-    return null;
-  }
-  return canonicalDomain(this.domain);
-};
-
-function CookieJar(store, options) {
-  if (typeof options === "boolean") {
-    options = {rejectPublicSuffixes: options};
-  } else if (options == null) {
-    options = {};
-  }
-  if (options.rejectPublicSuffixes != null) {
-    this.rejectPublicSuffixes = options.rejectPublicSuffixes;
-  }
-  if (options.looseMode != null) {
-    this.enableLooseMode = options.looseMode;
-  }
-
-  if (!store) {
-    store = new MemoryCookieStore();
-  }
-  this.store = store;
-}
-CookieJar.prototype.store = null;
-CookieJar.prototype.rejectPublicSuffixes = true;
-CookieJar.prototype.enableLooseMode = false;
-var CAN_BE_SYNC = [];
-
-CAN_BE_SYNC.push('setCookie');
-CookieJar.prototype.setCookie = function(cookie, url, options, cb) {
-  var err;
-  var context = getCookieContext(url);
-  if (options instanceof Function) {
-    cb = options;
-    options = {};
-  }
-
-  var host = canonicalDomain(context.hostname);
-  var loose = this.enableLooseMode;
-  if (options.loose != null) {
-    loose = options.loose;
-  }
-
-  // S5.3 step 1
-  if (!(cookie instanceof Cookie)) {
-    cookie = Cookie.parse(cookie, { loose: loose });
-  }
-  if (!cookie) {
-    err = new Error("Cookie failed to parse");
-    return cb(options.ignoreError ? null : err);
-  }
-
-  // S5.3 step 2
-  var now = options.now || new Date(); // will assign later to save effort in the face of errors
-
-  // S5.3 step 3: NOOP; persistent-flag and expiry-time is handled by getCookie()
-
-  // S5.3 step 4: NOOP; domain is null by default
-
-  // S5.3 step 5: public suffixes
-  if (this.rejectPublicSuffixes && cookie.domain) {
-    var suffix = pubsuffix.getPublicSuffix(cookie.cdomain());
-    if (suffix == null) { // e.g. "com"
-      err = new Error("Cookie has domain set to a public suffix");
-      return cb(options.ignoreError ? null : err);
-    }
-  }
-
-  // S5.3 step 6:
-  if (cookie.domain) {
-    if (!domainMatch(host, cookie.cdomain(), false)) {
-      err = new Error("Cookie not in this host's domain. Cookie:"+cookie.cdomain()+" Request:"+host);
-      return cb(options.ignoreError ? null : err);
-    }
-
-    if (cookie.hostOnly == null) { // don't reset if already set
-      cookie.hostOnly = false;
-    }
-
-  } else {
-    cookie.hostOnly = true;
-    cookie.domain = host;
-  }
-
-  //S5.2.4 If the attribute-value is empty or if the first character of the
-  //attribute-value is not %x2F ("/"):
-  //Let cookie-path be the default-path.
-  if (!cookie.path || cookie.path[0] !== '/') {
-    cookie.path = defaultPath(context.pathname);
-    cookie.pathIsDefault = true;
-  }
-
-  // S5.3 step 8: NOOP; secure attribute
-  // S5.3 step 9: NOOP; httpOnly attribute
-
-  // S5.3 step 10
-  if (options.http === false && cookie.httpOnly) {
-    err = new Error("Cookie is HttpOnly and this isn't an HTTP API");
-    return cb(options.ignoreError ? null : err);
-  }
-
-  var store = this.store;
-
-  if (!store.updateCookie) {
-    store.updateCookie = function(oldCookie, newCookie, cb) {
-      this.putCookie(newCookie, cb);
-    };
-  }
-
-  function withCookie(err, oldCookie) {
-    if (err) {
-      return cb(err);
-    }
-
-    var next = function(err) {
-      if (err) {
-        return cb(err);
-      } else {
-        cb(null, cookie);
-      }
-    };
-
-    if (oldCookie) {
-      // S5.3 step 11 - "If the cookie store contains a cookie with the same name,
-      // domain, and path as the newly created cookie:"
-      if (options.http === false && oldCookie.httpOnly) { // step 11.2
-        err = new Error("old Cookie is HttpOnly and this isn't an HTTP API");
-        return cb(options.ignoreError ? null : err);
-      }
-      cookie.creation = oldCookie.creation; // step 11.3
-      cookie.creationIndex = oldCookie.creationIndex; // preserve tie-breaker
-      cookie.lastAccessed = now;
-      // Step 11.4 (delete cookie) is implied by just setting the new one:
-      store.updateCookie(oldCookie, cookie, next); // step 12
-
-    } else {
-      cookie.creation = cookie.lastAccessed = now;
-      store.putCookie(cookie, next); // step 12
-    }
-  }
-
-  store.findCookie(cookie.domain, cookie.path, cookie.key, withCookie);
-};
-
-// RFC6365 S5.4
-CAN_BE_SYNC.push('getCookies');
-CookieJar.prototype.getCookies = function(url, options, cb) {
-  var context = getCookieContext(url);
-  if (options instanceof Function) {
-    cb = options;
-    options = {};
-  }
-
-  var host = canonicalDomain(context.hostname);
-  var path = context.pathname || '/';
-
-  var secure = options.secure;
-  if (secure == null && context.protocol &&
-      (context.protocol == 'https:' || context.protocol == 'wss:'))
-  {
-    secure = true;
-  }
-
-  var http = options.http;
-  if (http == null) {
-    http = true;
-  }
-
-  var now = options.now || Date.now();
-  var expireCheck = options.expire !== false;
-  var allPaths = !!options.allPaths;
-  var store = this.store;
-
-  function matchingCookie(c) {
-    // "Either:
-    //   The cookie's host-only-flag is true and the canonicalized
-    //   request-host is identical to the cookie's domain.
-    // Or:
-    //   The cookie's host-only-flag is false and the canonicalized
-    //   request-host domain-matches the cookie's domain."
-    if (c.hostOnly) {
-      if (c.domain != host) {
-        return false;
-      }
-    } else {
-      if (!domainMatch(host, c.domain, false)) {
-        return false;
-      }
-    }
-
-    // "The request-uri's path path-matches the cookie's path."
-    if (!allPaths && !pathMatch(path, c.path)) {
-      return false;
-    }
-
-    // "If the cookie's secure-only-flag is true, then the request-uri's
-    // scheme must denote a "secure" protocol"
-    if (c.secure && !secure) {
-      return false;
-    }
-
-    // "If the cookie's http-only-flag is true, then exclude the cookie if the
-    // cookie-string is being generated for a "non-HTTP" API"
-    if (c.httpOnly && !http) {
-      return false;
-    }
-
-    // deferred from S5.3
-    // non-RFC: allow retention of expired cookies by choice
-    if (expireCheck && c.expiryTime() <= now) {
-      store.removeCookie(c.domain, c.path, c.key, function(){}); // result ignored
-      return false;
-    }
-
-    return true;
-  }
-
-  store.findCookies(host, allPaths ? null : path, function(err,cookies) {
-    if (err) {
-      return cb(err);
-    }
-
-    cookies = cookies.filter(matchingCookie);
-
-    // sorting of S5.4 part 2
-    if (options.sort !== false) {
-      cookies = cookies.sort(cookieCompare);
-    }
-
-    // S5.4 part 3
-    var now = new Date();
-    cookies.forEach(function(c) {
-      c.lastAccessed = now;
-    });
-    // TODO persist lastAccessed
-
-    cb(null,cookies);
-  });
-};
-
-CAN_BE_SYNC.push('getCookieString');
-CookieJar.prototype.getCookieString = function(/*..., cb*/) {
-  var args = Array.prototype.slice.call(arguments,0);
-  var cb = args.pop();
-  var next = function(err,cookies) {
-    if (err) {
-      cb(err);
-    } else {
-      cb(null, cookies
-        .sort(cookieCompare)
-        .map(function(c){
-          return c.cookieString();
-        })
-        .join('; '));
-    }
-  };
-  args.push(next);
-  this.getCookies.apply(this,args);
-};
-
-CAN_BE_SYNC.push('getSetCookieStrings');
-CookieJar.prototype.getSetCookieStrings = function(/*..., cb*/) {
-  var args = Array.prototype.slice.call(arguments,0);
-  var cb = args.pop();
-  var next = function(err,cookies) {
-    if (err) {
-      cb(err);
-    } else {
-      cb(null, cookies.map(function(c){
-        return c.toString();
-      }));
-    }
-  };
-  args.push(next);
-  this.getCookies.apply(this,args);
-};
-
-CAN_BE_SYNC.push('serialize');
-CookieJar.prototype.serialize = function(cb) {
-  var type = this.store.constructor.name;
-  if (type === 'Object') {
-    type = null;
-  }
-
-  // update README.md "Serialization Format" if you change this, please!
-  var serialized = {
-    // The version of tough-cookie that serialized this jar. Generally a good
-    // practice since future versions can make data import decisions based on
-    // known past behavior. When/if this matters, use `semver`.
-    version: 'tough-cookie@'+VERSION,
-
-    // add the store type, to make humans happy:
-    storeType: type,
-
-    // CookieJar configuration:
-    rejectPublicSuffixes: !!this.rejectPublicSuffixes,
-
-    // this gets filled from getAllCookies:
-    cookies: []
-  };
-
-  if (!(this.store.getAllCookies &&
-        typeof this.store.getAllCookies === 'function'))
-  {
-    return cb(new Error('store does not support getAllCookies and cannot be serialized'));
-  }
-
-  this.store.getAllCookies(function(err,cookies) {
-    if (err) {
-      return cb(err);
-    }
-
-    serialized.cookies = cookies.map(function(cookie) {
-      // convert to serialized 'raw' cookies
-      cookie = (cookie instanceof Cookie) ? cookie.toJSON() : cookie;
-
-      // Remove the index so new ones get assigned during deserialization
-      delete cookie.creationIndex;
-
-      return cookie;
-    });
-
-    return cb(null, serialized);
-  });
-};
-
-// well-known name that JSON.stringify calls
-CookieJar.prototype.toJSON = function() {
-  return this.serializeSync();
-};
-
-// use the class method CookieJar.deserialize instead of calling this directly
-CAN_BE_SYNC.push('_importCookies');
-CookieJar.prototype._importCookies = function(serialized, cb) {
-  var jar = this;
-  var cookies = serialized.cookies;
-  if (!cookies || !Array.isArray(cookies)) {
-    return cb(new Error('serialized jar has no cookies array'));
-  }
-  cookies = cookies.slice(); // do not modify the original
-
-  function putNext(err) {
-    if (err) {
-      return cb(err);
-    }
-
-    if (!cookies.length) {
-      return cb(err, jar);
-    }
-
-    var cookie;
-    try {
-      cookie = fromJSON(cookies.shift());
-    } catch (e) {
-      return cb(e);
-    }
-
-    if (cookie === null) {
-      return putNext(null); // skip this cookie
-    }
-
-    jar.store.putCookie(cookie, putNext);
-  }
-
-  putNext();
-};
-
-CookieJar.deserialize = function(strOrObj, store, cb) {
-  if (arguments.length !== 3) {
-    // store is optional
-    cb = store;
-    store = null;
-  }
-
-  var serialized;
-  if (typeof strOrObj === 'string') {
-    serialized = jsonParse(strOrObj);
-    if (serialized instanceof Error) {
-      return cb(serialized);
-    }
-  } else {
-    serialized = strOrObj;
-  }
-
-  var jar = new CookieJar(store, serialized.rejectPublicSuffixes);
-  jar._importCookies(serialized, function(err) {
-    if (err) {
-      return cb(err);
-    }
-    cb(null, jar);
-  });
-};
-
-CookieJar.deserializeSync = function(strOrObj, store) {
-  var serialized = typeof strOrObj === 'string' ?
-    JSON.parse(strOrObj) : strOrObj;
-  var jar = new CookieJar(store, serialized.rejectPublicSuffixes);
-
-  // catch this mistake early:
-  if (!jar.store.synchronous) {
-    throw new Error('CookieJar store is not synchronous; use async API instead.');
-  }
-
-  jar._importCookiesSync(serialized);
-  return jar;
-};
-CookieJar.fromJSON = CookieJar.deserializeSync;
-
-CAN_BE_SYNC.push('clone');
-CookieJar.prototype.clone = function(newStore, cb) {
-  if (arguments.length === 1) {
-    cb = newStore;
-    newStore = null;
-  }
-
-  this.serialize(function(err,serialized) {
-    if (err) {
-      return cb(err);
-    }
-    CookieJar.deserialize(newStore, serialized, cb);
-  });
-};
-
-// Use a closure to provide a true imperative API for synchronous stores.
-function syncWrap(method) {
-  return function() {
-    if (!this.store.synchronous) {
-      throw new Error('CookieJar store is not synchronous; use async API instead.');
-    }
-
-    var args = Array.prototype.slice.call(arguments);
-    var syncErr, syncResult;
-    args.push(function syncCb(err, result) {
-      syncErr = err;
-      syncResult = result;
-    });
-    this[method].apply(this, args);
-
-    if (syncErr) {
-      throw syncErr;
-    }
-    return syncResult;
-  };
-}
-
-// wrap all declared CAN_BE_SYNC methods in the sync wrapper
-CAN_BE_SYNC.forEach(function(method) {
-  CookieJar.prototype[method+'Sync'] = syncWrap(method);
-});
-
-module.exports = {
-  CookieJar: CookieJar,
-  Cookie: Cookie,
-  Store: Store,
-  MemoryCookieStore: MemoryCookieStore,
-  parseDate: parseDate,
-  formatDate: formatDate,
-  parse: parse,
-  fromJSON: fromJSON,
-  domainMatch: domainMatch,
-  defaultPath: defaultPath,
-  pathMatch: pathMatch,
-  getPublicSuffix: pubsuffix.getPublicSuffix,
-  cookieCompare: cookieCompare,
-  permuteDomain: __webpack_require__(414).permuteDomain,
-  permutePath: permutePath,
-  canonicalDomain: canonicalDomain
-};
-
-
-/***/ }),
-/* 811 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-var Store = __webpack_require__(416).Store;
-var permuteDomain = __webpack_require__(414).permuteDomain;
-var pathMatch = __webpack_require__(413).pathMatch;
-var util = __webpack_require__(3);
-
-function MemoryCookieStore() {
-  Store.call(this);
-  this.idx = {};
-}
-util.inherits(MemoryCookieStore, Store);
-exports.MemoryCookieStore = MemoryCookieStore;
-MemoryCookieStore.prototype.idx = null;
-
-// Since it's just a struct in RAM, this Store is synchronous
-MemoryCookieStore.prototype.synchronous = true;
-
-// force a default depth:
-MemoryCookieStore.prototype.inspect = function() {
-  return "{ idx: "+util.inspect(this.idx, false, 2)+' }';
-};
-
-MemoryCookieStore.prototype.findCookie = function(domain, path, key, cb) {
-  if (!this.idx[domain]) {
-    return cb(null,undefined);
-  }
-  if (!this.idx[domain][path]) {
-    return cb(null,undefined);
-  }
-  return cb(null,this.idx[domain][path][key]||null);
-};
-
-MemoryCookieStore.prototype.findCookies = function(domain, path, cb) {
-  var results = [];
-  if (!domain) {
-    return cb(null,[]);
-  }
-
-  var pathMatcher;
-  if (!path) {
-    // null means "all paths"
-    pathMatcher = function matchAll(domainIndex) {
-      for (var curPath in domainIndex) {
-        var pathIndex = domainIndex[curPath];
-        for (var key in pathIndex) {
-          results.push(pathIndex[key]);
-        }
-      }
-    };
-
-  } else {
-    pathMatcher = function matchRFC(domainIndex) {
-       //NOTE: we should use path-match algorithm from S5.1.4 here
-       //(see : https://github.com/ChromiumWebApps/chromium/blob/b3d3b4da8bb94c1b2e061600df106d590fda3620/net/cookies/canonical_cookie.cc#L299)
-       Object.keys(domainIndex).forEach(function (cookiePath) {
-         if (pathMatch(path, cookiePath)) {
-           var pathIndex = domainIndex[cookiePath];
-
-           for (var key in pathIndex) {
-             results.push(pathIndex[key]);
-           }
-         }
-       });
-     };
-  }
-
-  var domains = permuteDomain(domain) || [domain];
-  var idx = this.idx;
-  domains.forEach(function(curDomain) {
-    var domainIndex = idx[curDomain];
-    if (!domainIndex) {
-      return;
-    }
-    pathMatcher(domainIndex);
-  });
-
-  cb(null,results);
-};
-
-MemoryCookieStore.prototype.putCookie = function(cookie, cb) {
-  if (!this.idx[cookie.domain]) {
-    this.idx[cookie.domain] = {};
-  }
-  if (!this.idx[cookie.domain][cookie.path]) {
-    this.idx[cookie.domain][cookie.path] = {};
-  }
-  this.idx[cookie.domain][cookie.path][cookie.key] = cookie;
-  cb(null);
-};
-
-MemoryCookieStore.prototype.updateCookie = function(oldCookie, newCookie, cb) {
-  // updateCookie() may avoid updating cookies that are identical.  For example,
-  // lastAccessed may not be important to some stores and an equality
-  // comparison could exclude that field.
-  this.putCookie(newCookie,cb);
-};
-
-MemoryCookieStore.prototype.removeCookie = function(domain, path, key, cb) {
-  if (this.idx[domain] && this.idx[domain][path] && this.idx[domain][path][key]) {
-    delete this.idx[domain][path][key];
-  }
-  cb(null);
-};
-
-MemoryCookieStore.prototype.removeCookies = function(domain, path, cb) {
-  if (this.idx[domain]) {
-    if (path) {
-      delete this.idx[domain][path];
-    } else {
-      delete this.idx[domain];
-    }
-  }
-  return cb(null);
-};
-
-MemoryCookieStore.prototype.getAllCookies = function(cb) {
-  var cookies = [];
-  var idx = this.idx;
-
-  var domains = Object.keys(idx);
-  domains.forEach(function(domain) {
-    var paths = Object.keys(idx[domain]);
-    paths.forEach(function(path) {
-      var keys = Object.keys(idx[domain][path]);
-      keys.forEach(function(key) {
-        if (key !== null) {
-          cookies.push(idx[domain][path][key]);
-        }
-      });
-    });
-  });
-
-  // Sort by creationIndex so deserializing retains the creation order.
-  // When implementing your own store, this SHOULD retain the order too
-  cookies.sort(function(a,b) {
-    return (a.creationIndex||0) - (b.creationIndex||0);
-  });
-
-  cb(null, cookies);
-};
-
-
-/***/ }),
-/* 812 */
-/***/ (function(module, exports) {
-
-module.exports = {"author":{"name":"Jeremy Stashewsky","email":"jstashewsky@salesforce.com","website":"https://github.com/stash"},"contributors":[{"name":"Alexander Savin","website":"https://github.com/apsavin"},{"name":"Ian Livingstone","website":"https://github.com/ianlivingstone"},{"name":"Ivan Nikulin","website":"https://github.com/inikulin"},{"name":"Lalit Kapoor","website":"https://github.com/lalitkapoor"},{"name":"Sam Thompson","website":"https://github.com/sambthompson"},{"name":"Sebastian Mayr","website":"https://github.com/Sebmaster"}],"license":"BSD-3-Clause","name":"tough-cookie","description":"RFC6265 Cookies and Cookie Jar for node.js","keywords":["HTTP","cookie","cookies","set-cookie","cookiejar","jar","RFC6265","RFC2965"],"version":"2.3.4","homepage":"https://github.com/salesforce/tough-cookie","repository":{"type":"git","url":"git://github.com/salesforce/tough-cookie.git"},"bugs":{"url":"https://github.com/salesforce/tough-cookie/issues"},"main":"./lib/cookie","files":["lib"],"scripts":{"suffixup":"curl -o public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat && ./generate-pubsuffix.js","test":"vows test/*_test.js"},"engines":{"node":">=0.8"},"devDependencies":{"async":"^1.4.2","string.prototype.repeat":"^0.2.0","vows":"^0.8.1"},"dependencies":{"punycode":"^1.4.1"}}
-
-/***/ }),
-/* 813 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var http = __webpack_require__(87)
-var https = __webpack_require__(195)
-var url = __webpack_require__(24)
-var util = __webpack_require__(3)
-var stream = __webpack_require__(23)
-var zlib = __webpack_require__(198)
-var aws2 = __webpack_require__(521)
-var aws4 = __webpack_require__(522)
-var httpSignature = __webpack_require__(680)
-var mime = __webpack_require__(400)
-var caseless = __webpack_require__(231)
-var ForeverAgent = __webpack_require__(648)
-var FormData = __webpack_require__(649)
-var extend = __webpack_require__(269)
-var isstream = __webpack_require__(399)
-var isTypedArray = __webpack_require__(742).strict
-var helpers = __webpack_require__(305)
-var cookies = __webpack_require__(412)
-var getProxyFromURI = __webpack_require__(802)
-var Querystring = __webpack_require__(807).Querystring
-var Har = __webpack_require__(803).Har
-var Auth = __webpack_require__(801).Auth
-var OAuth = __webpack_require__(806).OAuth
-var hawk = __webpack_require__(804)
-var Multipart = __webpack_require__(805).Multipart
-var Redirect = __webpack_require__(808).Redirect
-var Tunnel = __webpack_require__(809).Tunnel
-var now = __webpack_require__(776)
-var Buffer = __webpack_require__(45).Buffer
-
-var safeStringify = helpers.safeStringify
-var isReadStream = helpers.isReadStream
-var toBase64 = helpers.toBase64
-var defer = helpers.defer
-var copy = helpers.copy
-var version = helpers.version
-var globalCookieJar = cookies.jar()
-
-var globalPool = {}
-
-function filterForNonReserved (reserved, options) {
-  // Filter out properties that are not reserved.
-  // Reserved values are passed in at call site.
-
-  var object = {}
-  for (var i in options) {
-    var notReserved = (reserved.indexOf(i) === -1)
-    if (notReserved) {
-      object[i] = options[i]
-    }
-  }
-  return object
-}
-
-function filterOutReservedFunctions (reserved, options) {
-  // Filter out properties that are functions and are reserved.
-  // Reserved values are passed in at call site.
-
-  var object = {}
-  for (var i in options) {
-    var isReserved = !(reserved.indexOf(i) === -1)
-    var isFunction = (typeof options[i] === 'function')
-    if (!(isReserved && isFunction)) {
-      object[i] = options[i]
-    }
-  }
-  return object
-}
-
-// Return a simpler request object to allow serialization
-function requestToJSON () {
-  var self = this
-  return {
-    uri: self.uri,
-    method: self.method,
-    headers: self.headers
-  }
-}
-
-// Return a simpler response object to allow serialization
-function responseToJSON () {
-  var self = this
-  return {
-    statusCode: self.statusCode,
-    body: self.body,
-    headers: self.headers,
-    request: requestToJSON.call(self.request)
-  }
-}
-
-function Request (options) {
-  // if given the method property in options, set property explicitMethod to true
-
-  // extend the Request instance with any non-reserved properties
-  // remove any reserved functions from the options object
-  // set Request instance to be readable and writable
-  // call init
-
-  var self = this
-
-  // start with HAR, then override with additional options
-  if (options.har) {
-    self._har = new Har(self)
-    options = self._har.options(options)
-  }
-
-  stream.Stream.call(self)
-  var reserved = Object.keys(Request.prototype)
-  var nonReserved = filterForNonReserved(reserved, options)
-
-  extend(self, nonReserved)
-  options = filterOutReservedFunctions(reserved, options)
-
-  self.readable = true
-  self.writable = true
-  if (options.method) {
-    self.explicitMethod = true
-  }
-  self._qs = new Querystring(self)
-  self._auth = new Auth(self)
-  self._oauth = new OAuth(self)
-  self._multipart = new Multipart(self)
-  self._redirect = new Redirect(self)
-  self._tunnel = new Tunnel(self)
-  self.init(options)
-}
-
-util.inherits(Request, stream.Stream)
-
-// Debugging
-Request.debug = process.env.NODE_DEBUG && /\brequest\b/.test(process.env.NODE_DEBUG)
-function debug () {
-  if (Request.debug) {
-    console.error('REQUEST %s', util.format.apply(util, arguments))
-  }
-}
-Request.prototype.debug = debug
-
-Request.prototype.init = function (options) {
-  // init() contains all the code to setup the request object.
-  // the actual outgoing request is not started until start() is called
-  // this function is called from both the constructor and on redirect.
-  var self = this
-  if (!options) {
-    options = {}
-  }
-  self.headers = self.headers ? copy(self.headers) : {}
-
-  // Delete headers with value undefined since they break
-  // ClientRequest.OutgoingMessage.setHeader in node 0.12
-  for (var headerName in self.headers) {
-    if (typeof self.headers[headerName] === 'undefined') {
-      delete self.headers[headerName]
-    }
-  }
-
-  caseless.httpify(self, self.headers)
-
-  if (!self.method) {
-    self.method = options.method || 'GET'
-  }
-  if (!self.localAddress) {
-    self.localAddress = options.localAddress
-  }
-
-  self._qs.init(options)
-
-  debug(options)
-  if (!self.pool && self.pool !== false) {
-    self.pool = globalPool
-  }
-  self.dests = self.dests || []
-  self.__isRequestRequest = true
-
-  // Protect against double callback
-  if (!self._callback && self.callback) {
-    self._callback = self.callback
-    self.callback = function () {
-      if (self._callbackCalled) {
-        return // Print a warning maybe?
-      }
-      self._callbackCalled = true
-      self._callback.apply(self, arguments)
-    }
-    self.on('error', self.callback.bind())
-    self.on('complete', self.callback.bind(self, null))
-  }
-
-  // People use this property instead all the time, so support it
-  if (!self.uri && self.url) {
-    self.uri = self.url
-    delete self.url
-  }
-
-  // If there's a baseUrl, then use it as the base URL (i.e. uri must be
-  // specified as a relative path and is appended to baseUrl).
-  if (self.baseUrl) {
-    if (typeof self.baseUrl !== 'string') {
-      return self.emit('error', new Error('options.baseUrl must be a string'))
-    }
-
-    if (typeof self.uri !== 'string') {
-      return self.emit('error', new Error('options.uri must be a string when using options.baseUrl'))
-    }
-
-    if (self.uri.indexOf('//') === 0 || self.uri.indexOf('://') !== -1) {
-      return self.emit('error', new Error('options.uri must be a path when using options.baseUrl'))
-    }
-
-    // Handle all cases to make sure that there's only one slash between
-    // baseUrl and uri.
-    var baseUrlEndsWithSlash = self.baseUrl.lastIndexOf('/') === self.baseUrl.length - 1
-    var uriStartsWithSlash = self.uri.indexOf('/') === 0
-
-    if (baseUrlEndsWithSlash && uriStartsWithSlash) {
-      self.uri = self.baseUrl + self.uri.slice(1)
-    } else if (baseUrlEndsWithSlash || uriStartsWithSlash) {
-      self.uri = self.baseUrl + self.uri
-    } else if (self.uri === '') {
-      self.uri = self.baseUrl
-    } else {
-      self.uri = self.baseUrl + '/' + self.uri
-    }
-    delete self.baseUrl
-  }
-
-  // A URI is needed by this point, emit error if we haven't been able to get one
-  if (!self.uri) {
-    return self.emit('error', new Error('options.uri is a required argument'))
-  }
-
-  // If a string URI/URL was given, parse it into a URL object
-  if (typeof self.uri === 'string') {
-    self.uri = url.parse(self.uri)
-  }
-
-  // Some URL objects are not from a URL parsed string and need href added
-  if (!self.uri.href) {
-    self.uri.href = url.format(self.uri)
-  }
-
-  // DEPRECATED: Warning for users of the old Unix Sockets URL Scheme
-  if (self.uri.protocol === 'unix:') {
-    return self.emit('error', new Error('`unix://` URL scheme is no longer supported. Please use the format `http://unix:SOCKET:PATH`'))
-  }
-
-  // Support Unix Sockets
-  if (self.uri.host === 'unix') {
-    self.enableUnixSocket()
-  }
-
-  if (self.strictSSL === false) {
-    self.rejectUnauthorized = false
-  }
-
-  if (!self.uri.pathname) { self.uri.pathname = '/' }
-
-  if (!(self.uri.host || (self.uri.hostname && self.uri.port)) && !self.uri.isUnix) {
-    // Invalid URI: it may generate lot of bad errors, like 'TypeError: Cannot call method `indexOf` of undefined' in CookieJar
-    // Detect and reject it as soon as possible
-    var faultyUri = url.format(self.uri)
-    var message = 'Invalid URI "' + faultyUri + '"'
-    if (Object.keys(options).length === 0) {
-      // No option ? This can be the sign of a redirect
-      // As this is a case where the user cannot do anything (they didn't call request directly with this URL)
-      // they should be warned that it can be caused by a redirection (can save some hair)
-      message += '. This can be caused by a crappy redirection.'
-    }
-    // This error was fatal
-    self.abort()
-    return self.emit('error', new Error(message))
-  }
-
-  if (!self.hasOwnProperty('proxy')) {
-    self.proxy = getProxyFromURI(self.uri)
-  }
-
-  self.tunnel = self._tunnel.isEnabled()
-  if (self.proxy) {
-    self._tunnel.setup(options)
-  }
-
-  self._redirect.onRequest(options)
-
-  self.setHost = false
-  if (!self.hasHeader('host')) {
-    var hostHeaderName = self.originalHostHeaderName || 'host'
-    // When used with an IPv6 address, `host` will provide
-    // the correct bracketed format, unlike using `hostname` and
-    // optionally adding the `port` when necessary.
-    self.setHeader(hostHeaderName, self.uri.host)
-    self.setHost = true
-  }
-
-  self.jar(self._jar || options.jar)
-
-  if (!self.uri.port) {
-    if (self.uri.protocol === 'http:') { self.uri.port = 80 } else if (self.uri.protocol === 'https:') { self.uri.port = 443 }
-  }
-
-  if (self.proxy && !self.tunnel) {
-    self.port = self.proxy.port
-    self.host = self.proxy.hostname
-  } else {
-    self.port = self.uri.port
-    self.host = self.uri.hostname
-  }
-
-  if (options.form) {
-    self.form(options.form)
-  }
-
-  if (options.formData) {
-    var formData = options.formData
-    var requestForm = self.form()
-    var appendFormValue = function (key, value) {
-      if (value && value.hasOwnProperty('value') && value.hasOwnProperty('options')) {
-        requestForm.append(key, value.value, value.options)
-      } else {
-        requestForm.append(key, value)
-      }
-    }
-    for (var formKey in formData) {
-      if (formData.hasOwnProperty(formKey)) {
-        var formValue = formData[formKey]
-        if (formValue instanceof Array) {
-          for (var j = 0; j < formValue.length; j++) {
-            appendFormValue(formKey, formValue[j])
-          }
-        } else {
-          appendFormValue(formKey, formValue)
-        }
-      }
-    }
-  }
-
-  if (options.qs) {
-    self.qs(options.qs)
-  }
-
-  if (self.uri.path) {
-    self.path = self.uri.path
-  } else {
-    self.path = self.uri.pathname + (self.uri.search || '')
-  }
-
-  if (self.path.length === 0) {
-    self.path = '/'
-  }
-
-  // Auth must happen last in case signing is dependent on other headers
-  if (options.aws) {
-    self.aws(options.aws)
-  }
-
-  if (options.hawk) {
-    self.hawk(options.hawk)
-  }
-
-  if (options.httpSignature) {
-    self.httpSignature(options.httpSignature)
-  }
-
-  if (options.auth) {
-    if (Object.prototype.hasOwnProperty.call(options.auth, 'username')) {
-      options.auth.user = options.auth.username
-    }
-    if (Object.prototype.hasOwnProperty.call(options.auth, 'password')) {
-      options.auth.pass = options.auth.password
-    }
-
-    self.auth(
-      options.auth.user,
-      options.auth.pass,
-      options.auth.sendImmediately,
-      options.auth.bearer
-    )
-  }
-
-  if (self.gzip && !self.hasHeader('accept-encoding')) {
-    self.setHeader('accept-encoding', 'gzip, deflate')
-  }
-
-  if (self.uri.auth && !self.hasHeader('authorization')) {
-    var uriAuthPieces = self.uri.auth.split(':').map(function (item) { return self._qs.unescape(item) })
-    self.auth(uriAuthPieces[0], uriAuthPieces.slice(1).join(':'), true)
-  }
-
-  if (!self.tunnel && self.proxy && self.proxy.auth && !self.hasHeader('proxy-authorization')) {
-    var proxyAuthPieces = self.proxy.auth.split(':').map(function (item) { return self._qs.unescape(item) })
-    var authHeader = 'Basic ' + toBase64(proxyAuthPieces.join(':'))
-    self.setHeader('proxy-authorization', authHeader)
-  }
-
-  if (self.proxy && !self.tunnel) {
-    self.path = (self.uri.protocol + '//' + self.uri.host + self.path)
-  }
-
-  if (options.json) {
-    self.json(options.json)
-  }
-  if (options.multipart) {
-    self.multipart(options.multipart)
-  }
-
-  if (options.time) {
-    self.timing = true
-
-    // NOTE: elapsedTime is deprecated in favor of .timings
-    self.elapsedTime = self.elapsedTime || 0
-  }
-
-  function setContentLength () {
-    if (isTypedArray(self.body)) {
-      self.body = Buffer.from(self.body)
-    }
-
-    if (!self.hasHeader('content-length')) {
-      var length
-      if (typeof self.body === 'string') {
-        length = Buffer.byteLength(self.body)
-      } else if (Array.isArray(self.body)) {
-        length = self.body.reduce(function (a, b) { return a + b.length }, 0)
-      } else {
-        length = self.body.length
-      }
-
-      if (length) {
-        self.setHeader('content-length', length)
-      } else {
-        self.emit('error', new Error('Argument error, options.body.'))
-      }
-    }
-  }
-  if (self.body && !isstream(self.body)) {
-    setContentLength()
-  }
-
-  if (options.oauth) {
-    self.oauth(options.oauth)
-  } else if (self._oauth.params && self.hasHeader('authorization')) {
-    self.oauth(self._oauth.params)
-  }
-
-  var protocol = self.proxy && !self.tunnel ? self.proxy.protocol : self.uri.protocol
-  var defaultModules = {'http:': http, 'https:': https}
-  var httpModules = self.httpModules || {}
-
-  self.httpModule = httpModules[protocol] || defaultModules[protocol]
-
-  if (!self.httpModule) {
-    return self.emit('error', new Error('Invalid protocol: ' + protocol))
-  }
-
-  if (options.ca) {
-    self.ca = options.ca
-  }
-
-  if (!self.agent) {
-    if (options.agentOptions) {
-      self.agentOptions = options.agentOptions
-    }
-
-    if (options.agentClass) {
-      self.agentClass = options.agentClass
-    } else if (options.forever) {
-      var v = version()
-      // use ForeverAgent in node 0.10- only
-      if (v.major === 0 && v.minor <= 10) {
-        self.agentClass = protocol === 'http:' ? ForeverAgent : ForeverAgent.SSL
-      } else {
-        self.agentClass = self.httpModule.Agent
-        self.agentOptions = self.agentOptions || {}
-        self.agentOptions.keepAlive = true
-      }
-    } else {
-      self.agentClass = self.httpModule.Agent
-    }
-  }
-
-  if (self.pool === false) {
-    self.agent = false
-  } else {
-    self.agent = self.agent || self.getNewAgent()
-  }
-
-  self.on('pipe', function (src) {
-    if (self.ntick && self._started) {
-      self.emit('error', new Error('You cannot pipe to this stream after the outbound request has started.'))
-    }
-    self.src = src
-    if (isReadStream(src)) {
-      if (!self.hasHeader('content-type')) {
-        self.setHeader('content-type', mime.lookup(src.path))
-      }
-    } else {
-      if (src.headers) {
-        for (var i in src.headers) {
-          if (!self.hasHeader(i)) {
-            self.setHeader(i, src.headers[i])
-          }
-        }
-      }
-      if (self._json && !self.hasHeader('content-type')) {
-        self.setHeader('content-type', 'application/json')
-      }
-      if (src.method && !self.explicitMethod) {
-        self.method = src.method
-      }
-    }
-
-  // self.on('pipe', function () {
-  //   console.error('You have already piped to this stream. Pipeing twice is likely to break the request.')
-  // })
-  })
-
-  defer(function () {
-    if (self._aborted) {
-      return
-    }
-
-    var end = function () {
-      if (self._form) {
-        if (!self._auth.hasAuth) {
-          self._form.pipe(self)
-        } else if (self._auth.hasAuth && self._auth.sentAuth) {
-          self._form.pipe(self)
-        }
-      }
-      if (self._multipart && self._multipart.chunked) {
-        self._multipart.body.pipe(self)
-      }
-      if (self.body) {
-        if (isstream(self.body)) {
-          self.body.pipe(self)
-        } else {
-          setContentLength()
-          if (Array.isArray(self.body)) {
-            self.body.forEach(function (part) {
-              self.write(part)
-            })
-          } else {
-            self.write(self.body)
-          }
-          self.end()
-        }
-      } else if (self.requestBodyStream) {
-        console.warn('options.requestBodyStream is deprecated, please pass the request object to stream.pipe.')
-        self.requestBodyStream.pipe(self)
-      } else if (!self.src) {
-        if (self._auth.hasAuth && !self._auth.sentAuth) {
-          self.end()
-          return
-        }
-        if (self.method !== 'GET' && typeof self.method !== 'undefined') {
-          self.setHeader('content-length', 0)
-        }
-        self.end()
-      }
-    }
-
-    if (self._form && !self.hasHeader('content-length')) {
-      // Before ending the request, we had to compute the length of the whole form, asyncly
-      self.setHeader(self._form.getHeaders(), true)
-      self._form.getLength(function (err, length) {
-        if (!err && !isNaN(length)) {
-          self.setHeader('content-length', length)
-        }
-        end()
-      })
-    } else {
-      end()
-    }
-
-    self.ntick = true
-  })
-}
-
-Request.prototype.getNewAgent = function () {
-  var self = this
-  var Agent = self.agentClass
-  var options = {}
-  if (self.agentOptions) {
-    for (var i in self.agentOptions) {
-      options[i] = self.agentOptions[i]
-    }
-  }
-  if (self.ca) {
-    options.ca = self.ca
-  }
-  if (self.ciphers) {
-    options.ciphers = self.ciphers
-  }
-  if (self.secureProtocol) {
-    options.secureProtocol = self.secureProtocol
-  }
-  if (self.secureOptions) {
-    options.secureOptions = self.secureOptions
-  }
-  if (typeof self.rejectUnauthorized !== 'undefined') {
-    options.rejectUnauthorized = self.rejectUnauthorized
-  }
-
-  if (self.cert && self.key) {
-    options.key = self.key
-    options.cert = self.cert
-  }
-
-  if (self.pfx) {
-    options.pfx = self.pfx
-  }
-
-  if (self.passphrase) {
-    options.passphrase = self.passphrase
-  }
-
-  var poolKey = ''
-
-  // different types of agents are in different pools
-  if (Agent !== self.httpModule.Agent) {
-    poolKey += Agent.name
-  }
-
-  // ca option is only relevant if proxy or destination are https
-  var proxy = self.proxy
-  if (typeof proxy === 'string') {
-    proxy = url.parse(proxy)
-  }
-  var isHttps = (proxy && proxy.protocol === 'https:') || this.uri.protocol === 'https:'
-
-  if (isHttps) {
-    if (options.ca) {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.ca
-    }
-
-    if (typeof options.rejectUnauthorized !== 'undefined') {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.rejectUnauthorized
-    }
-
-    if (options.cert) {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.cert.toString('ascii') + options.key.toString('ascii')
-    }
-
-    if (options.pfx) {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.pfx.toString('ascii')
-    }
-
-    if (options.ciphers) {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.ciphers
-    }
-
-    if (options.secureProtocol) {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.secureProtocol
-    }
-
-    if (options.secureOptions) {
-      if (poolKey) {
-        poolKey += ':'
-      }
-      poolKey += options.secureOptions
-    }
-  }
-
-  if (self.pool === globalPool && !poolKey && Object.keys(options).length === 0 && self.httpModule.globalAgent) {
-    // not doing anything special.  Use the globalAgent
-    return self.httpModule.globalAgent
-  }
-
-  // we're using a stored agent.  Make sure it's protocol-specific
-  poolKey = self.uri.protocol + poolKey
-
-  // generate a new agent for this setting if none yet exists
-  if (!self.pool[poolKey]) {
-    self.pool[poolKey] = new Agent(options)
-    // properly set maxSockets on new agents
-    if (self.pool.maxSockets) {
-      self.pool[poolKey].maxSockets = self.pool.maxSockets
-    }
-  }
-
-  return self.pool[poolKey]
-}
-
-Request.prototype.start = function () {
-  // start() is called once we are ready to send the outgoing HTTP request.
-  // this is usually called on the first write(), end() or on nextTick()
-  var self = this
-
-  if (self.timing) {
-    // All timings will be relative to this request's startTime.  In order to do this,
-    // we need to capture the wall-clock start time (via Date), immediately followed
-    // by the high-resolution timer (via now()).  While these two won't be set
-    // at the _exact_ same time, they should be close enough to be able to calculate
-    // high-resolution, monotonically non-decreasing timestamps relative to startTime.
-    var startTime = new Date().getTime()
-    var startTimeNow = now()
-  }
-
-  if (self._aborted) {
-    return
-  }
-
-  self._started = true
-  self.method = self.method || 'GET'
-  self.href = self.uri.href
-
-  if (self.src && self.src.stat && self.src.stat.size && !self.hasHeader('content-length')) {
-    self.setHeader('content-length', self.src.stat.size)
-  }
-  if (self._aws) {
-    self.aws(self._aws, true)
-  }
-
-  // We have a method named auth, which is completely different from the http.request
-  // auth option.  If we don't remove it, we're gonna have a bad time.
-  var reqOptions = copy(self)
-  delete reqOptions.auth
-
-  debug('make request', self.uri.href)
-
-  // node v6.8.0 now supports a `timeout` value in `http.request()`, but we
-  // should delete it for now since we handle timeouts manually for better
-  // consistency with node versions before v6.8.0
-  delete reqOptions.timeout
-
-  try {
-    self.req = self.httpModule.request(reqOptions)
-  } catch (err) {
-    self.emit('error', err)
-    return
-  }
-
-  if (self.timing) {
-    self.startTime = startTime
-    self.startTimeNow = startTimeNow
-
-    // Timing values will all be relative to startTime (by comparing to startTimeNow
-    // so we have an accurate clock)
-    self.timings = {}
-  }
-
-  var timeout
-  if (self.timeout && !self.timeoutTimer) {
-    if (self.timeout < 0) {
-      timeout = 0
-    } else if (typeof self.timeout === 'number' && isFinite(self.timeout)) {
-      timeout = self.timeout
-    }
-  }
-
-  self.req.on('response', self.onRequestResponse.bind(self))
-  self.req.on('error', self.onRequestError.bind(self))
-  self.req.on('drain', function () {
-    self.emit('drain')
-  })
-
-  self.req.on('socket', function (socket) {
-    // `._connecting` was the old property which was made public in node v6.1.0
-    var isConnecting = socket._connecting || socket.connecting
-    if (self.timing) {
-      self.timings.socket = now() - self.startTimeNow
-
-      if (isConnecting) {
-        var onLookupTiming = function () {
-          self.timings.lookup = now() - self.startTimeNow
-        }
-
-        var onConnectTiming = function () {
-          self.timings.connect = now() - self.startTimeNow
-        }
-
-        socket.once('lookup', onLookupTiming)
-        socket.once('connect', onConnectTiming)
-
-        // clean up timing event listeners if needed on error
-        self.req.once('error', function () {
-          socket.removeListener('lookup', onLookupTiming)
-          socket.removeListener('connect', onConnectTiming)
-        })
-      }
-    }
-
-    var setReqTimeout = function () {
-      // This timeout sets the amount of time to wait *between* bytes sent
-      // from the server once connected.
-      //
-      // In particular, it's useful for erroring if the server fails to send
-      // data halfway through streaming a response.
-      self.req.setTimeout(timeout, function () {
-        if (self.req) {
-          self.abort()
-          var e = new Error('ESOCKETTIMEDOUT')
-          e.code = 'ESOCKETTIMEDOUT'
-          e.connect = false
-          self.emit('error', e)
-        }
-      })
-    }
-    if (timeout !== undefined) {
-      // Only start the connection timer if we're actually connecting a new
-      // socket, otherwise if we're already connected (because this is a
-      // keep-alive connection) do not bother. This is important since we won't
-      // get a 'connect' event for an already connected socket.
-      if (isConnecting) {
-        var onReqSockConnect = function () {
-          socket.removeListener('connect', onReqSockConnect)
-          clearTimeout(self.timeoutTimer)
-          self.timeoutTimer = null
-          setReqTimeout()
-        }
-
-        socket.on('connect', onReqSockConnect)
-
-        self.req.on('error', function (err) { // eslint-disable-line handle-callback-err
-          socket.removeListener('connect', onReqSockConnect)
-        })
-
-        // Set a timeout in memory - this block will throw if the server takes more
-        // than `timeout` to write the HTTP status and headers (corresponding to
-        // the on('response') event on the client). NB: this measures wall-clock
-        // time, not the time between bytes sent by the server.
-        self.timeoutTimer = setTimeout(function () {
-          socket.removeListener('connect', onReqSockConnect)
-          self.abort()
-          var e = new Error('ETIMEDOUT')
-          e.code = 'ETIMEDOUT'
-          e.connect = true
-          self.emit('error', e)
-        }, timeout)
-      } else {
-        // We're already connected
-        setReqTimeout()
-      }
-    }
-    self.emit('socket', socket)
-  })
-
-  self.emit('request', self.req)
-}
-
-Request.prototype.onRequestError = function (error) {
-  var self = this
-  if (self._aborted) {
-    return
-  }
-  if (self.req && self.req._reusedSocket && error.code === 'ECONNRESET' &&
-    self.agent.addRequestNoreuse) {
-    self.agent = { addRequest: self.agent.addRequestNoreuse.bind(self.agent) }
-    self.start()
-    self.req.end()
-    return
-  }
-  if (self.timeout && self.timeoutTimer) {
-    clearTimeout(self.timeoutTimer)
-    self.timeoutTimer = null
-  }
-  self.emit('error', error)
-}
-
-Request.prototype.onRequestResponse = function (response) {
-  var self = this
-
-  if (self.timing) {
-    self.timings.response = now() - self.startTimeNow
-  }
-
-  debug('onRequestResponse', self.uri.href, response.statusCode, response.headers)
-  response.on('end', function () {
-    if (self.timing) {
-      self.timings.end = now() - self.startTimeNow
-      response.timingStart = self.startTime
-
-      // fill in the blanks for any periods that didn't trigger, such as
-      // no lookup or connect due to keep alive
-      if (!self.timings.socket) {
-        self.timings.socket = 0
-      }
-      if (!self.timings.lookup) {
-        self.timings.lookup = self.timings.socket
-      }
-      if (!self.timings.connect) {
-        self.timings.connect = self.timings.lookup
-      }
-      if (!self.timings.response) {
-        self.timings.response = self.timings.connect
-      }
-
-      debug('elapsed time', self.timings.end)
-
-      // elapsedTime includes all redirects
-      self.elapsedTime += Math.round(self.timings.end)
-
-      // NOTE: elapsedTime is deprecated in favor of .timings
-      response.elapsedTime = self.elapsedTime
-
-      // timings is just for the final fetch
-      response.timings = self.timings
-
-      // pre-calculate phase timings as well
-      response.timingPhases = {
-        wait: self.timings.socket,
-        dns: self.timings.lookup - self.timings.socket,
-        tcp: self.timings.connect - self.timings.lookup,
-        firstByte: self.timings.response - self.timings.connect,
-        download: self.timings.end - self.timings.response,
-        total: self.timings.end
-      }
-    }
-    debug('response end', self.uri.href, response.statusCode, response.headers)
-  })
-
-  if (self._aborted) {
-    debug('aborted', self.uri.href)
-    response.resume()
-    return
-  }
-
-  self.response = response
-  response.request = self
-  response.toJSON = responseToJSON
-
-  // XXX This is different on 0.10, because SSL is strict by default
-  if (self.httpModule === https &&
-    self.strictSSL && (!response.hasOwnProperty('socket') ||
-    !response.socket.authorized)) {
-    debug('strict ssl error', self.uri.href)
-    var sslErr = response.hasOwnProperty('socket') ? response.socket.authorizationError : self.uri.href + ' does not support SSL'
-    self.emit('error', new Error('SSL Error: ' + sslErr))
-    return
-  }
-
-  // Save the original host before any redirect (if it changes, we need to
-  // remove any authorization headers).  Also remember the case of the header
-  // name because lots of broken servers expect Host instead of host and we
-  // want the caller to be able to specify this.
-  self.originalHost = self.getHeader('host')
-  if (!self.originalHostHeaderName) {
-    self.originalHostHeaderName = self.hasHeader('host')
-  }
-  if (self.setHost) {
-    self.removeHeader('host')
-  }
-  if (self.timeout && self.timeoutTimer) {
-    clearTimeout(self.timeoutTimer)
-    self.timeoutTimer = null
-  }
-
-  var targetCookieJar = (self._jar && self._jar.setCookie) ? self._jar : globalCookieJar
-  var addCookie = function (cookie) {
-    // set the cookie if it's domain in the href's domain.
-    try {
-      targetCookieJar.setCookie(cookie, self.uri.href, {ignoreError: true})
-    } catch (e) {
-      self.emit('error', e)
-    }
-  }
-
-  response.caseless = caseless(response.headers)
-
-  if (response.caseless.has('set-cookie') && (!self._disableCookies)) {
-    var headerName = response.caseless.has('set-cookie')
-    if (Array.isArray(response.headers[headerName])) {
-      response.headers[headerName].forEach(addCookie)
-    } else {
-      addCookie(response.headers[headerName])
-    }
-  }
-
-  if (self._redirect.onResponse(response)) {
-    return // Ignore the rest of the response
-  } else {
-    // Be a good stream and emit end when the response is finished.
-    // Hack to emit end on close because of a core bug that never fires end
-    response.on('close', function () {
-      if (!self._ended) {
-        self.response.emit('end')
-      }
-    })
-
-    response.once('end', function () {
-      self._ended = true
-    })
-
-    var noBody = function (code) {
-      return (
-        self.method === 'HEAD' ||
-        // Informational
-        (code >= 100 && code < 200) ||
-        // No Content
-        code === 204 ||
-        // Not Modified
-        code === 304
-      )
-    }
-
-    var responseContent
-    if (self.gzip && !noBody(response.statusCode)) {
-      var contentEncoding = response.headers['content-encoding'] || 'identity'
-      contentEncoding = contentEncoding.trim().toLowerCase()
-
-      // Be more lenient with decoding compressed responses, since (very rarely)
-      // servers send slightly invalid gzip responses that are still accepted
-      // by common browsers.
-      // Always using Z_SYNC_FLUSH is what cURL does.
-      var zlibOptions = {
-        flush: zlib.Z_SYNC_FLUSH,
-        finishFlush: zlib.Z_SYNC_FLUSH
-      }
-
-      if (contentEncoding === 'gzip') {
-        responseContent = zlib.createGunzip(zlibOptions)
-        response.pipe(responseContent)
-      } else if (contentEncoding === 'deflate') {
-        responseContent = zlib.createInflate(zlibOptions)
-        response.pipe(responseContent)
-      } else {
-        // Since previous versions didn't check for Content-Encoding header,
-        // ignore any invalid values to preserve backwards-compatibility
-        if (contentEncoding !== 'identity') {
-          debug('ignoring unrecognized Content-Encoding ' + contentEncoding)
-        }
-        responseContent = response
-      }
-    } else {
-      responseContent = response
-    }
-
-    if (self.encoding) {
-      if (self.dests.length !== 0) {
-        console.error('Ignoring encoding parameter as this stream is being piped to another stream which makes the encoding option invalid.')
-      } else {
-        responseContent.setEncoding(self.encoding)
-      }
-    }
-
-    if (self._paused) {
-      responseContent.pause()
-    }
-
-    self.responseContent = responseContent
-
-    self.emit('response', response)
-
-    self.dests.forEach(function (dest) {
-      self.pipeDest(dest)
-    })
-
-    responseContent.on('data', function (chunk) {
-      if (self.timing && !self.responseStarted) {
-        self.responseStartTime = (new Date()).getTime()
-
-        // NOTE: responseStartTime is deprecated in favor of .timings
-        response.responseStartTime = self.responseStartTime
-      }
-      self._destdata = true
-      self.emit('data', chunk)
-    })
-    responseContent.once('end', function (chunk) {
-      self.emit('end', chunk)
-    })
-    responseContent.on('error', function (error) {
-      self.emit('error', error)
-    })
-    responseContent.on('close', function () { self.emit('close') })
-
-    if (self.callback) {
-      self.readResponseBody(response)
-    } else { // if no callback
-      self.on('end', function () {
-        if (self._aborted) {
-          debug('aborted', self.uri.href)
-          return
-        }
-        self.emit('complete', response)
-      })
-    }
-  }
-  debug('finish init function', self.uri.href)
-}
-
-Request.prototype.readResponseBody = function (response) {
-  var self = this
-  debug("reading response's body")
-  var buffers = []
-  var bufferLength = 0
-  var strings = []
-
-  self.on('data', function (chunk) {
-    if (!Buffer.isBuffer(chunk)) {
-      strings.push(chunk)
-    } else if (chunk.length) {
-      bufferLength += chunk.length
-      buffers.push(chunk)
-    }
-  })
-  self.on('end', function () {
-    debug('end event', self.uri.href)
-    if (self._aborted) {
-      debug('aborted', self.uri.href)
-      // `buffer` is defined in the parent scope and used in a closure it exists for the life of the request.
-      // This can lead to leaky behavior if the user retains a reference to the request object.
-      buffers = []
-      bufferLength = 0
-      return
-    }
-
-    if (bufferLength) {
-      debug('has body', self.uri.href, bufferLength)
-      response.body = Buffer.concat(buffers, bufferLength)
-      if (self.encoding !== null) {
-        response.body = response.body.toString(self.encoding)
-      }
-      // `buffer` is defined in the parent scope and used in a closure it exists for the life of the Request.
-      // This can lead to leaky behavior if the user retains a reference to the request object.
-      buffers = []
-      bufferLength = 0
-    } else if (strings.length) {
-      // The UTF8 BOM [0xEF,0xBB,0xBF] is converted to [0xFE,0xFF] in the JS UTC16/UCS2 representation.
-      // Strip this value out when the encoding is set to 'utf8', as upstream consumers won't expect it and it breaks JSON.parse().
-      if (self.encoding === 'utf8' && strings[0].length > 0 && strings[0][0] === '\uFEFF') {
-        strings[0] = strings[0].substring(1)
-      }
-      response.body = strings.join('')
-    }
-
-    if (self._json) {
-      try {
-        response.body = JSON.parse(response.body, self._jsonReviver)
-      } catch (e) {
-        debug('invalid JSON received', self.uri.href)
-      }
-    }
-    debug('emitting complete', self.uri.href)
-    if (typeof response.body === 'undefined' && !self._json) {
-      response.body = self.encoding === null ? Buffer.alloc(0) : ''
-    }
-    self.emit('complete', response, response.body)
-  })
-}
-
-Request.prototype.abort = function () {
-  var self = this
-  self._aborted = true
-
-  if (self.req) {
-    self.req.abort()
-  } else if (self.response) {
-    self.response.destroy()
-  }
-
-  self.emit('abort')
-}
-
-Request.prototype.pipeDest = function (dest) {
-  var self = this
-  var response = self.response
-  // Called after the response is received
-  if (dest.headers && !dest.headersSent) {
-    if (response.caseless.has('content-type')) {
-      var ctname = response.caseless.has('content-type')
-      if (dest.setHeader) {
-        dest.setHeader(ctname, response.headers[ctname])
-      } else {
-        dest.headers[ctname] = response.headers[ctname]
-      }
-    }
-
-    if (response.caseless.has('content-length')) {
-      var clname = response.caseless.has('content-length')
-      if (dest.setHeader) {
-        dest.setHeader(clname, response.headers[clname])
-      } else {
-        dest.headers[clname] = response.headers[clname]
-      }
-    }
-  }
-  if (dest.setHeader && !dest.headersSent) {
-    for (var i in response.headers) {
-      // If the response content is being decoded, the Content-Encoding header
-      // of the response doesn't represent the piped content, so don't pass it.
-      if (!self.gzip || i !== 'content-encoding') {
-        dest.setHeader(i, response.headers[i])
-      }
-    }
-    dest.statusCode = response.statusCode
-  }
-  if (self.pipefilter) {
-    self.pipefilter(response, dest)
-  }
-}
-
-Request.prototype.qs = function (q, clobber) {
-  var self = this
-  var base
-  if (!clobber && self.uri.query) {
-    base = self._qs.parse(self.uri.query)
-  } else {
-    base = {}
-  }
-
-  for (var i in q) {
-    base[i] = q[i]
-  }
-
-  var qs = self._qs.stringify(base)
-
-  if (qs === '') {
-    return self
-  }
-
-  self.uri = url.parse(self.uri.href.split('?')[0] + '?' + qs)
-  self.url = self.uri
-  self.path = self.uri.path
-
-  if (self.uri.host === 'unix') {
-    self.enableUnixSocket()
-  }
-
-  return self
-}
-Request.prototype.form = function (form) {
-  var self = this
-  if (form) {
-    if (!/^application\/x-www-form-urlencoded\b/.test(self.getHeader('content-type'))) {
-      self.setHeader('content-type', 'application/x-www-form-urlencoded')
-    }
-    self.body = (typeof form === 'string')
-      ? self._qs.rfc3986(form.toString('utf8'))
-      : self._qs.stringify(form).toString('utf8')
-    return self
-  }
-  // create form-data object
-  self._form = new FormData()
-  self._form.on('error', function (err) {
-    err.message = 'form-data: ' + err.message
-    self.emit('error', err)
-    self.abort()
-  })
-  return self._form
-}
-Request.prototype.multipart = function (multipart) {
-  var self = this
-
-  self._multipart.onRequest(multipart)
-
-  if (!self._multipart.chunked) {
-    self.body = self._multipart.body
-  }
-
-  return self
-}
-Request.prototype.json = function (val) {
-  var self = this
-
-  if (!self.hasHeader('accept')) {
-    self.setHeader('accept', 'application/json')
-  }
-
-  if (typeof self.jsonReplacer === 'function') {
-    self._jsonReplacer = self.jsonReplacer
-  }
-
-  self._json = true
-  if (typeof val === 'boolean') {
-    if (self.body !== undefined) {
-      if (!/^application\/x-www-form-urlencoded\b/.test(self.getHeader('content-type'))) {
-        self.body = safeStringify(self.body, self._jsonReplacer)
-      } else {
-        self.body = self._qs.rfc3986(self.body)
-      }
-      if (!self.hasHeader('content-type')) {
-        self.setHeader('content-type', 'application/json')
-      }
-    }
-  } else {
-    self.body = safeStringify(val, self._jsonReplacer)
-    if (!self.hasHeader('content-type')) {
-      self.setHeader('content-type', 'application/json')
-    }
-  }
-
-  if (typeof self.jsonReviver === 'function') {
-    self._jsonReviver = self.jsonReviver
-  }
-
-  return self
-}
-Request.prototype.getHeader = function (name, headers) {
-  var self = this
-  var result, re, match
-  if (!headers) {
-    headers = self.headers
-  }
-  Object.keys(headers).forEach(function (key) {
-    if (key.length !== name.length) {
-      return
-    }
-    re = new RegExp(name, 'i')
-    match = key.match(re)
-    if (match) {
-      result = headers[key]
-    }
-  })
-  return result
-}
-Request.prototype.enableUnixSocket = function () {
-  // Get the socket & request paths from the URL
-  var unixParts = this.uri.path.split(':')
-  var host = unixParts[0]
-  var path = unixParts[1]
-  // Apply unix properties to request
-  this.socketPath = host
-  this.uri.pathname = path
-  this.uri.path = path
-  this.uri.host = host
-  this.uri.hostname = host
-  this.uri.isUnix = true
-}
-
-Request.prototype.auth = function (user, pass, sendImmediately, bearer) {
-  var self = this
-
-  self._auth.onRequest(user, pass, sendImmediately, bearer)
-
-  return self
-}
-Request.prototype.aws = function (opts, now) {
-  var self = this
-
-  if (!now) {
-    self._aws = opts
-    return self
-  }
-
-  if (opts.sign_version === 4 || opts.sign_version === '4') {
-    // use aws4
-    var options = {
-      host: self.uri.host,
-      path: self.uri.path,
-      method: self.method,
-      headers: {
-        'content-type': self.getHeader('content-type') || ''
-      },
-      body: self.body
-    }
-    var signRes = aws4.sign(options, {
-      accessKeyId: opts.key,
-      secretAccessKey: opts.secret,
-      sessionToken: opts.session
-    })
-    self.setHeader('authorization', signRes.headers.Authorization)
-    self.setHeader('x-amz-date', signRes.headers['X-Amz-Date'])
-    if (signRes.headers['X-Amz-Security-Token']) {
-      self.setHeader('x-amz-security-token', signRes.headers['X-Amz-Security-Token'])
-    }
-  } else {
-    // default: use aws-sign2
-    var date = new Date()
-    self.setHeader('date', date.toUTCString())
-    var auth = {
-      key: opts.key,
-      secret: opts.secret,
-      verb: self.method.toUpperCase(),
-      date: date,
-      contentType: self.getHeader('content-type') || '',
-      md5: self.getHeader('content-md5') || '',
-      amazonHeaders: aws2.canonicalizeHeaders(self.headers)
-    }
-    var path = self.uri.path
-    if (opts.bucket && path) {
-      auth.resource = '/' + opts.bucket + path
-    } else if (opts.bucket && !path) {
-      auth.resource = '/' + opts.bucket
-    } else if (!opts.bucket && path) {
-      auth.resource = path
-    } else if (!opts.bucket && !path) {
-      auth.resource = '/'
-    }
-    auth.resource = aws2.canonicalizeResource(auth.resource)
-    self.setHeader('authorization', aws2.authorization(auth))
-  }
-
-  return self
-}
-Request.prototype.httpSignature = function (opts) {
-  var self = this
-  httpSignature.signRequest({
-    getHeader: function (header) {
-      return self.getHeader(header, self.headers)
-    },
-    setHeader: function (header, value) {
-      self.setHeader(header, value)
-    },
-    method: self.method,
-    path: self.path
-  }, opts)
-  debug('httpSignature authorization', self.getHeader('authorization'))
-
-  return self
-}
-Request.prototype.hawk = function (opts) {
-  var self = this
-  self.setHeader('Authorization', hawk.header(self.uri, self.method, opts))
-}
-Request.prototype.oauth = function (_oauth) {
-  var self = this
-
-  self._oauth.onRequest(_oauth)
-
-  return self
-}
-
-Request.prototype.jar = function (jar) {
-  var self = this
-  var cookies
-
-  if (self._redirect.redirectsFollowed === 0) {
-    self.originalCookieHeader = self.getHeader('cookie')
-  }
-
-  if (!jar) {
-    // disable cookies
-    cookies = false
-    self._disableCookies = true
-  } else {
-    var targetCookieJar = (jar && jar.getCookieString) ? jar : globalCookieJar
-    var urihref = self.uri.href
-    // fetch cookie in the Specified host
-    if (targetCookieJar) {
-      cookies = targetCookieJar.getCookieString(urihref)
-    }
-  }
-
-  // if need cookie and cookie is not empty
-  if (cookies && cookies.length) {
-    if (self.originalCookieHeader) {
-      // Don't overwrite existing Cookie header
-      self.setHeader('cookie', self.originalCookieHeader + '; ' + cookies)
-    } else {
-      self.setHeader('cookie', cookies)
-    }
-  }
-  self._jar = jar
-  return self
-}
-
-// Stream API
-Request.prototype.pipe = function (dest, opts) {
-  var self = this
-
-  if (self.response) {
-    if (self._destdata) {
-      self.emit('error', new Error('You cannot pipe after data has been emitted from the response.'))
-    } else if (self._ended) {
-      self.emit('error', new Error('You cannot pipe after the response has been ended.'))
-    } else {
-      stream.Stream.prototype.pipe.call(self, dest, opts)
-      self.pipeDest(dest)
-      return dest
-    }
-  } else {
-    self.dests.push(dest)
-    stream.Stream.prototype.pipe.call(self, dest, opts)
-    return dest
-  }
-}
-Request.prototype.write = function () {
-  var self = this
-  if (self._aborted) { return }
-
-  if (!self._started) {
-    self.start()
-  }
-  if (self.req) {
-    return self.req.write.apply(self.req, arguments)
-  }
-}
-Request.prototype.end = function (chunk) {
-  var self = this
-  if (self._aborted) { return }
-
-  if (chunk) {
-    self.write(chunk)
-  }
-  if (!self._started) {
-    self.start()
-  }
-  if (self.req) {
-    self.req.end()
-  }
-}
-Request.prototype.pause = function () {
-  var self = this
-  if (!self.responseContent) {
-    self._paused = true
-  } else {
-    self.responseContent.pause.apply(self.responseContent, arguments)
-  }
-}
-Request.prototype.resume = function () {
-  var self = this
-  if (!self.responseContent) {
-    self._paused = false
-  } else {
-    self.responseContent.resume.apply(self.responseContent, arguments)
-  }
-}
-Request.prototype.destroy = function () {
-  var self = this
-  if (!self._ended) {
-    self.end()
-  } else if (self.response) {
-    self.response.destroy()
-  }
-}
-
-Request.defaultProxyHeaderWhiteList =
-  Tunnel.defaultProxyHeaderWhiteList.slice()
-
-Request.defaultProxyHeaderExclusiveList =
-  Tunnel.defaultProxyHeaderExclusiveList.slice()
-
-// Exports
-
-Request.prototype.toJSON = requestToJSON
-module.exports = Request
-
-
-/***/ }),
-/* 814 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var core = __webpack_require__(306);
-var async = __webpack_require__(815);
-async.core = core;
-async.isCore = function isCore(x) { return core[x]; };
-async.sync = __webpack_require__(817);
-
-exports = async;
-module.exports = async;
-
-
-/***/ }),
-/* 815 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var core = __webpack_require__(306);
-var fs = __webpack_require__(5);
-var path = __webpack_require__(0);
-var caller = __webpack_require__(417);
-var nodeModulesPaths = __webpack_require__(418);
-
-var defaultIsFile = function isFile(file, cb) {
-    fs.stat(file, function (err, stat) {
-        if (!err) {
-            return cb(null, stat.isFile() || stat.isFIFO());
-        }
-        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
-        return cb(err);
-    });
-};
-
-module.exports = function resolve(x, options, callback) {
-    var cb = callback;
-    var opts = options || {};
-    if (typeof opts === 'function') {
-        cb = opts;
-        opts = {};
-    }
-    if (typeof x !== 'string') {
-        var err = new TypeError('Path must be a string.');
-        return process.nextTick(function () {
-            cb(err);
-        });
-    }
-
-    var isFile = opts.isFile || defaultIsFile;
-    var readFile = opts.readFile || fs.readFile;
-
-    var extensions = opts.extensions || ['.js'];
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
-
-    opts.paths = opts.paths || [];
-
-    if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
-        var res = path.resolve(basedir, x);
-        if (x === '..' || x.slice(-1) === '/') res += '/';
-        if (/\/$/.test(x) && res === basedir) {
-            loadAsDirectory(res, opts.package, onfile);
-        } else loadAsFile(res, opts.package, onfile);
-    } else loadNodeModules(x, basedir, function (err, n, pkg) {
-        if (err) cb(err);
-        else if (n) cb(null, n, pkg);
-        else if (core[x]) return cb(null, x);
-        else {
-            var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-            moduleError.code = 'MODULE_NOT_FOUND';
-            cb(moduleError);
-        }
-    });
-
-    function onfile(err, m, pkg) {
-        if (err) cb(err);
-        else if (m) cb(null, m, pkg);
-        else loadAsDirectory(res, function (err, d, pkg) {
-            if (err) cb(err);
-            else if (d) cb(null, d, pkg);
-            else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
-    }
-
-    function loadAsFile(x, thePackage, callback) {
-        var loadAsFilePackage = thePackage;
-        var cb = callback;
-        if (typeof loadAsFilePackage === 'function') {
-            cb = loadAsFilePackage;
-            loadAsFilePackage = undefined;
-        }
-
-        var exts = [''].concat(extensions);
-        load(exts, x, loadAsFilePackage);
-
-        function load(exts, x, loadPackage) {
-            if (exts.length === 0) return cb(null, undefined, loadPackage);
-            var file = x + exts[0];
-
-            var pkg = loadPackage;
-            if (pkg) onpkg(null, pkg);
-            else loadpkg(path.dirname(file), onpkg);
-
-            function onpkg(err, pkg_, dir) {
-                pkg = pkg_;
-                if (err) return cb(err);
-                if (dir && pkg && opts.pathFilter) {
-                    var rfile = path.relative(dir, file);
-                    var rel = rfile.slice(0, rfile.length - exts[0].length);
-                    var r = opts.pathFilter(pkg, x, rel);
-                    if (r) return load(
-                        [''].concat(extensions.slice()),
-                        path.resolve(dir, r),
-                        pkg
-                    );
-                }
-                isFile(file, onex);
-            }
-            function onex(err, ex) {
-                if (err) return cb(err);
-                if (ex) return cb(null, file, pkg);
-                load(exts.slice(1), x, pkg);
-            }
-        }
-    }
-
-    function loadpkg(dir, cb) {
-        if (dir === '' || dir === '/') return cb(null);
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return cb(null);
-        }
-        if (/[/\\]node_modules[/\\]*$/.test(dir)) return cb(null);
-
-        var pkgfile = path.join(dir, 'package.json');
-        isFile(pkgfile, function (err, ex) {
-            // on err, ex is false
-            if (!ex) return loadpkg(path.dirname(dir), cb);
-
-            readFile(pkgfile, function (err, body) {
-                if (err) cb(err);
-                try { var pkg = JSON.parse(body); } catch (jsonErr) {}
-
-                if (pkg && opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, pkgfile);
-                }
-                cb(null, pkg, dir);
-            });
-        });
-    }
-
-    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
-        var cb = callback;
-        var fpkg = loadAsDirectoryPackage;
-        if (typeof fpkg === 'function') {
-            cb = fpkg;
-            fpkg = opts.package;
-        }
-
-        var pkgfile = path.join(x, 'package.json');
-        isFile(pkgfile, function (err, ex) {
-            if (err) return cb(err);
-            if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
-
-            readFile(pkgfile, function (err, body) {
-                if (err) return cb(err);
-                try {
-                    var pkg = JSON.parse(body);
-                } catch (jsonErr) {}
-
-                if (opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, pkgfile);
-                }
-
-                if (pkg.main) {
-                    if (pkg.main === '.' || pkg.main === './') {
-                        pkg.main = 'index';
-                    }
-                    loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
-                        if (err) return cb(err);
-                        if (m) return cb(null, m, pkg);
-                        if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
-
-                        var dir = path.resolve(x, pkg.main);
-                        loadAsDirectory(dir, pkg, function (err, n, pkg) {
-                            if (err) return cb(err);
-                            if (n) return cb(null, n, pkg);
-                            loadAsFile(path.join(x, 'index'), pkg, cb);
-                        });
-                    });
-                    return;
-                }
-
-                loadAsFile(path.join(x, '/index'), pkg, cb);
-            });
-        });
-    }
-
-    function processDirs(cb, dirs) {
-        if (dirs.length === 0) return cb(null, undefined);
-        var dir = dirs[0];
-
-        var file = path.join(dir, x);
-        loadAsFile(file, opts.package, onfile);
-
-        function onfile(err, m, pkg) {
-            if (err) return cb(err);
-            if (m) return cb(null, m, pkg);
-            loadAsDirectory(path.join(dir, x), opts.package, ondir);
-        }
-
-        function ondir(err, n, pkg) {
-            if (err) return cb(err);
-            if (n) return cb(null, n, pkg);
-            processDirs(cb, dirs.slice(1));
-        }
-    }
-    function loadNodeModules(x, start, cb) {
-        processDirs(cb, nodeModulesPaths(start, opts));
-    }
-};
-
-
-/***/ }),
-/* 816 */
-/***/ (function(module, exports) {
-
-module.exports = {"assert":true,"async_hooks":">= 8","buffer_ieee754":"< 0.9.7","buffer":true,"child_process":true,"cluster":true,"console":true,"constants":true,"crypto":true,"_debugger":"< 8","dgram":true,"dns":true,"domain":true,"events":true,"freelist":"< 6","fs":true,"fs/promises":">= 10 && < 10.1","_http_agent":">= 0.11.1","_http_client":">= 0.11.1","_http_common":">= 0.11.1","_http_incoming":">= 0.11.1","_http_outgoing":">= 0.11.1","_http_server":">= 0.11.1","http":true,"http2":">= 8.8","https":true,"inspector":">= 8.0.0","_linklist":"< 8","module":true,"net":true,"node-inspect/lib/_inspect":">= 7.6.0","node-inspect/lib/internal/inspect_client":">= 7.6.0","node-inspect/lib/internal/inspect_repl":">= 7.6.0","os":true,"path":true,"perf_hooks":">= 8.5","process":">= 1","punycode":true,"querystring":true,"readline":true,"repl":true,"smalloc":">= 0.11.5 && < 3","_stream_duplex":">= 0.9.4","_stream_transform":">= 0.9.4","_stream_wrap":">= 1.4.1","_stream_passthrough":">= 0.9.4","_stream_readable":">= 0.9.4","_stream_writable":">= 0.9.4","stream":true,"string_decoder":true,"sys":true,"timers":true,"_tls_common":">= 0.11.13","_tls_legacy":">= 0.11.3 && < 10","_tls_wrap":">= 0.11.3","tls":true,"trace_events":">= 10","tty":true,"url":true,"util":true,"v8/tools/arguments":">= 10","v8/tools/codemap":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/consarray":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/csvparser":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/logreader":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/profile_view":[">= 4.4.0 && < 5",">= 5.2.0"],"v8/tools/splaytree":[">= 4.4.0 && < 5",">= 5.2.0"],"v8":">= 1","vm":true,"zlib":true}
-
-/***/ }),
-/* 817 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var core = __webpack_require__(306);
-var fs = __webpack_require__(5);
-var path = __webpack_require__(0);
-var caller = __webpack_require__(417);
-var nodeModulesPaths = __webpack_require__(418);
-
-var defaultIsFile = function isFile(file) {
-    try {
-        var stat = fs.statSync(file);
-    } catch (e) {
-        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
-        throw e;
-    }
-    return stat.isFile() || stat.isFIFO();
-};
-
-module.exports = function (x, options) {
-    if (typeof x !== 'string') {
-        throw new TypeError('Path must be a string.');
-    }
-    var opts = options || {};
-    var isFile = opts.isFile || defaultIsFile;
-    var readFileSync = opts.readFileSync || fs.readFileSync;
-
-    var extensions = opts.extensions || ['.js'];
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
-
-    opts.paths = opts.paths || [];
-
-    if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
-        var res = path.resolve(basedir, x);
-        if (x === '..' || x.slice(-1) === '/') res += '/';
-        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
-        if (m) return m;
-    } else {
-        var n = loadNodeModulesSync(x, basedir);
-        if (n) return n;
-    }
-
-    if (core[x]) return x;
-
-    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-    err.code = 'MODULE_NOT_FOUND';
-    throw err;
-
-    function loadAsFileSync(x) {
-        var pkg = loadpkg(path.dirname(x));
-
-        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
-            var rfile = path.relative(pkg.dir, x);
-            var r = opts.pathFilter(pkg.pkg, x, rfile);
-            if (r) {
-                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
-            }
-        }
-
-        if (isFile(x)) {
-            return x;
-        }
-
-        for (var i = 0; i < extensions.length; i++) {
-            var file = x + extensions[i];
-            if (isFile(file)) {
-                return file;
-            }
-        }
-    }
-
-    function loadpkg(dir) {
-        if (dir === '' || dir === '/') return;
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return;
-        }
-        if (/[/\\]node_modules[/\\]*$/.test(dir)) return;
-
-        var pkgfile = path.join(dir, 'package.json');
-
-        if (!isFile(pkgfile)) {
-            return loadpkg(path.dirname(dir));
-        }
-
-        var body = readFileSync(pkgfile);
-
-        try {
-            var pkg = JSON.parse(body);
-        } catch (jsonErr) {}
-
-        if (pkg && opts.packageFilter) {
-            pkg = opts.packageFilter(pkg, dir);
-        }
-
-        return { pkg: pkg, dir: dir };
-    }
-
-    function loadAsDirectorySync(x) {
-        var pkgfile = path.join(x, '/package.json');
-        if (isFile(pkgfile)) {
-            try {
-                var body = readFileSync(pkgfile, 'UTF8');
-                var pkg = JSON.parse(body);
-
-                if (opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, x);
-                }
-
-                if (pkg.main) {
-                    if (pkg.main === '.' || pkg.main === './') {
-                        pkg.main = 'index';
-                    }
-                    var m = loadAsFileSync(path.resolve(x, pkg.main));
-                    if (m) return m;
-                    var n = loadAsDirectorySync(path.resolve(x, pkg.main));
-                    if (n) return n;
-                }
-            } catch (e) {}
-        }
-
-        return loadAsFileSync(path.join(x, '/index'));
-    }
-
-    function loadNodeModulesSync(x, start) {
-        var dirs = nodeModulesPaths(start, opts);
-        for (var i = 0; i < dirs.length; i++) {
-            var dir = dirs[i];
-            var m = loadAsFileSync(path.join(dir, '/', x));
-            if (m) return m;
-            var n = loadAsDirectorySync(path.join(dir, '/', x));
-            if (n) return n;
-        }
-    }
-};
-
-
-/***/ }),
-/* 818 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const onetime = __webpack_require__(771);
-const signalExit = __webpack_require__(451);
-
-module.exports = onetime(() => {
-	signalExit(() => {
-		process.stderr.write('\u001b[?25h');
-	}, {alwaysLast: true});
-});
-
-
-/***/ }),
-/* 819 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(820);
-
-/***/ }),
-/* 820 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var RetryOperation = __webpack_require__(821);
-
-exports.operation = function(options) {
-  var timeouts = exports.timeouts(options);
-  return new RetryOperation(timeouts, {
-      forever: options && options.forever,
-      unref: options && options.unref
-  });
-};
-
-exports.timeouts = function(options) {
-  if (options instanceof Array) {
-    return [].concat(options);
-  }
-
-  var opts = {
-    retries: 10,
-    factor: 2,
-    minTimeout: 1 * 1000,
-    maxTimeout: Infinity,
-    randomize: false
-  };
-  for (var key in options) {
-    opts[key] = options[key];
-  }
-
-  if (opts.minTimeout > opts.maxTimeout) {
-    throw new Error('minTimeout is greater than maxTimeout');
-  }
-
-  var timeouts = [];
-  for (var i = 0; i < opts.retries; i++) {
-    timeouts.push(this.createTimeout(i, opts));
-  }
-
-  if (options && options.forever && !timeouts.length) {
-    timeouts.push(this.createTimeout(i, opts));
-  }
-
-  // sort the array numerically ascending
-  timeouts.sort(function(a,b) {
-    return a - b;
-  });
-
-  return timeouts;
-};
-
-exports.createTimeout = function(attempt, opts) {
-  var random = (opts.randomize)
-    ? (Math.random() + 1)
-    : 1;
-
-  var timeout = Math.round(random * opts.minTimeout * Math.pow(opts.factor, attempt));
-  timeout = Math.min(timeout, opts.maxTimeout);
-
-  return timeout;
-};
-
-exports.wrap = function(obj, options, methods) {
-  if (options instanceof Array) {
-    methods = options;
-    options = null;
-  }
-
-  if (!methods) {
-    methods = [];
-    for (var key in obj) {
-      if (typeof obj[key] === 'function') {
-        methods.push(key);
-      }
-    }
-  }
-
-  for (var i = 0; i < methods.length; i++) {
-    var method   = methods[i];
-    var original = obj[method];
-
-    obj[method] = function retryWrapper() {
-      var op       = exports.operation(options);
-      var args     = Array.prototype.slice.call(arguments);
-      var callback = args.pop();
-
-      args.push(function(err) {
-        if (op.retry(err)) {
-          return;
-        }
-        if (err) {
-          arguments[0] = op.mainError();
-        }
-        callback.apply(this, arguments);
-      });
-
-      op.attempt(function() {
-        original.apply(obj, args);
-      });
-    };
-    obj[method].options = options;
-  }
-};
-
-
-/***/ }),
-/* 821 */
-/***/ (function(module, exports) {
-
-function RetryOperation(timeouts, options) {
-  // Compatibility for the old (timeouts, retryForever) signature
-  if (typeof options === 'boolean') {
-    options = { forever: options };
-  }
-
-  this._timeouts = timeouts;
-  this._options = options || {};
-  this._fn = null;
-  this._errors = [];
-  this._attempts = 1;
-  this._operationTimeout = null;
-  this._operationTimeoutCb = null;
-  this._timeout = null;
-
-  if (this._options.forever) {
-    this._cachedTimeouts = this._timeouts.slice(0);
-  }
-}
-module.exports = RetryOperation;
-
-RetryOperation.prototype.stop = function() {
-  if (this._timeout) {
-    clearTimeout(this._timeout);
-  }
-
-  this._timeouts       = [];
-  this._cachedTimeouts = null;
-};
-
-RetryOperation.prototype.retry = function(err) {
-  if (this._timeout) {
-    clearTimeout(this._timeout);
-  }
-
-  if (!err) {
-    return false;
-  }
-
-  this._errors.push(err);
-
-  var timeout = this._timeouts.shift();
-  if (timeout === undefined) {
-    if (this._cachedTimeouts) {
-      // retry forever, only keep last error
-      this._errors.splice(this._errors.length - 1, this._errors.length);
-      this._timeouts = this._cachedTimeouts.slice(0);
-      timeout = this._timeouts.shift();
-    } else {
-      return false;
-    }
-  }
-
-  var self = this;
-  var timer = setTimeout(function() {
-    self._attempts++;
-
-    if (self._operationTimeoutCb) {
-      self._timeout = setTimeout(function() {
-        self._operationTimeoutCb(self._attempts);
-      }, self._operationTimeout);
-
-      if (this._options.unref) {
-          self._timeout.unref();
-      }
-    }
-
-    self._fn(self._attempts);
-  }, timeout);
-
-  if (this._options.unref) {
-      timer.unref();
-  }
-
-  return true;
-};
-
-RetryOperation.prototype.attempt = function(fn, timeoutOps) {
-  this._fn = fn;
-
-  if (timeoutOps) {
-    if (timeoutOps.timeout) {
-      this._operationTimeout = timeoutOps.timeout;
-    }
-    if (timeoutOps.cb) {
-      this._operationTimeoutCb = timeoutOps.cb;
-    }
-  }
-
-  var self = this;
-  if (this._operationTimeoutCb) {
-    this._timeout = setTimeout(function() {
-      self._operationTimeoutCb();
-    }, self._operationTimeout);
-  }
-
-  this._fn(this._attempts);
-};
-
-RetryOperation.prototype.try = function(fn) {
-  console.log('Using RetryOperation.try() is deprecated');
-  this.attempt(fn);
-};
-
-RetryOperation.prototype.start = function(fn) {
-  console.log('Using RetryOperation.start() is deprecated');
-  this.attempt(fn);
-};
-
-RetryOperation.prototype.start = RetryOperation.prototype.try;
-
-RetryOperation.prototype.errors = function() {
-  return this._errors;
-};
-
-RetryOperation.prototype.attempts = function() {
-  return this._attempts;
-};
-
-RetryOperation.prototype.mainError = function() {
-  if (this._errors.length === 0) {
-    return null;
-  }
-
-  var counts = {};
-  var mainError = null;
-  var mainErrorCount = 0;
-
-  for (var i = 0; i < this._errors.length; i++) {
-    var error = this._errors[i];
-    var message = error.message;
-    var count = (counts[message] || 0) + 1;
-
-    counts[message] = count;
-
-    if (count >= mainErrorCount) {
-      mainError = error;
-      mainErrorCount = count;
-    }
-  }
-
-  return mainError;
-};
-
-
-/***/ }),
-/* 822 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SubscribeOnObservable; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__ = __webpack_require__(438);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isNumeric__ = __webpack_require__(190);
-/** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */
-
-
-
-
-var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubscribeOnObservable, _super);
-    function SubscribeOnObservable(source, delayTime, scheduler) {
-        if (delayTime === void 0) {
-            delayTime = 0;
-        }
-        if (scheduler === void 0) {
-            scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__["a" /* asap */];
-        }
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.delayTime = delayTime;
-        _this.scheduler = scheduler;
-        if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isNumeric__["a" /* isNumeric */])(delayTime) || delayTime < 0) {
-            _this.delayTime = 0;
-        }
-        if (!scheduler || typeof scheduler.schedule !== 'function') {
-            _this.scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__["a" /* asap */];
-        }
-        return _this;
-    }
-    SubscribeOnObservable.create = function (source, delay, scheduler) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (scheduler === void 0) {
-            scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__["a" /* asap */];
-        }
-        return new SubscribeOnObservable(source, delay, scheduler);
-    };
-    SubscribeOnObservable.dispatch = function (arg) {
-        var source = arg.source, subscriber = arg.subscriber;
-        return this.add(source.subscribe(subscriber));
-    };
-    SubscribeOnObservable.prototype._subscribe = function (subscriber) {
-        var delay = this.delayTime;
-        var source = this.source;
-        var scheduler = this.scheduler;
-        return scheduler.schedule(SubscribeOnObservable.dispatch, delay, {
-            source: source, subscriber: subscriber
-        });
-    };
-    return SubscribeOnObservable;
-}(__WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */]));
-
-//# sourceMappingURL=SubscribeOnObservable.js.map
-
-
-/***/ }),
-/* 823 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = bindCallback;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-
-
-function bindCallback(callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-            };
-        }
-    }
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var context = this;
-        var subject;
-        var params = {
-            context: context,
-            subject: subject,
-            callbackFunc: callbackFunc,
-            scheduler: scheduler,
-        };
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            if (!scheduler) {
-                if (!subject) {
-                    subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
-                    var handler = function () {
-                        var innerArgs = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            innerArgs[_i] = arguments[_i];
-                        }
-                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
-                        subject.complete();
-                    };
-                    try {
-                        callbackFunc.apply(context, args.concat([handler]));
-                    }
-                    catch (err) {
-                        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_canReportError__["a" /* canReportError */])(subject)) {
-                            subject.error(err);
-                        }
-                        else {
-                            console.warn(err);
-                        }
-                    }
-                }
-                return subject.subscribe(subscriber);
-            }
-            else {
-                var state = {
-                    args: args, subscriber: subscriber, params: params,
-                };
-                return scheduler.schedule(dispatch, 0, state);
-            }
-        });
-    };
-}
-function dispatch(state) {
-    var _this = this;
-    var self = this;
-    var args = state.args, subscriber = state.subscriber, params = state.params;
-    var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler;
-    var subject = params.subject;
-    if (!subject) {
-        subject = params.subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
-        var handler = function () {
-            var innerArgs = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                innerArgs[_i] = arguments[_i];
-            }
-            var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
-            _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
-        };
-        try {
-            callbackFunc.apply(context, args.concat([handler]));
-        }
-        catch (err) {
-            subject.error(err);
-        }
-    }
-    this.add(subject.subscribe(subscriber));
-}
-function dispatchNext(state) {
-    var value = state.value, subject = state.subject;
-    subject.next(value);
-    subject.complete();
-}
-function dispatchError(state) {
-    var err = state.err, subject = state.subject;
-    subject.error(err);
-}
-//# sourceMappingURL=bindCallback.js.map
-
-
-/***/ }),
-/* 824 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = bindNodeCallback;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(46);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isArray__ = __webpack_require__(41);
-/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
-
-
-
-
-
-
-function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isScheduler__["a" /* isScheduler */])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-            };
-        }
-    }
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var params = {
-            subject: undefined,
-            args: args,
-            callbackFunc: callbackFunc,
-            scheduler: scheduler,
-            context: this,
-        };
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var context = params.context;
-            var subject = params.subject;
-            if (!scheduler) {
-                if (!subject) {
-                    subject = params.subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
-                    var handler = function () {
-                        var innerArgs = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            innerArgs[_i] = arguments[_i];
-                        }
-                        var err = innerArgs.shift();
-                        if (err) {
-                            subject.error(err);
-                            return;
-                        }
-                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
-                        subject.complete();
-                    };
-                    try {
-                        callbackFunc.apply(context, args.concat([handler]));
-                    }
-                    catch (err) {
-                        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_canReportError__["a" /* canReportError */])(subject)) {
-                            subject.error(err);
-                        }
-                        else {
-                            console.warn(err);
-                        }
-                    }
-                }
-                return subject.subscribe(subscriber);
-            }
-            else {
-                return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context });
-            }
-        });
-    };
-}
-function dispatch(state) {
-    var _this = this;
-    var params = state.params, subscriber = state.subscriber, context = state.context;
-    var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler;
-    var subject = params.subject;
-    if (!subject) {
-        subject = params.subject = new __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__["a" /* AsyncSubject */]();
-        var handler = function () {
-            var innerArgs = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                innerArgs[_i] = arguments[_i];
-            }
-            var err = innerArgs.shift();
-            if (err) {
-                _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
-            }
-            else {
-                var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
-                _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
-            }
-        };
-        try {
-            callbackFunc.apply(context, args.concat([handler]));
-        }
-        catch (err) {
-            this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
-        }
-    }
-    this.add(subject.subscribe(subscriber));
-}
-function dispatchNext(arg) {
-    var value = arg.value, subject = arg.subject;
-    subject.next(value);
-    subject.complete();
-}
-function dispatchError(arg) {
-    var err = arg.err, subject = arg.subject;
-    subject.error(err);
-}
-//# sourceMappingURL=bindNodeCallback.js.map
-
-
-/***/ }),
-/* 825 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = forkJoin;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(46);
-/** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */
-
-
-
-
-
-
-
-function forkJoin() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    var resultSelector;
-    if (typeof sources[sources.length - 1] === 'function') {
-        resultSelector = sources.pop();
-    }
-    if (sources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(sources[0])) {
-        sources = sources[0];
-    }
-    if (sources.length === 0) {
-        return __WEBPACK_IMPORTED_MODULE_3__empty__["b" /* EMPTY */];
-    }
-    if (resultSelector) {
-        return forkJoin(sources).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__operators_map__["a" /* map */])(function (args) { return resultSelector.apply(void 0, args); }));
-    }
-    return new __WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */](function (subscriber) {
-        return new ForkJoinSubscriber(subscriber, sources);
-    });
-}
-var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ForkJoinSubscriber, _super);
-    function ForkJoinSubscriber(destination, sources) {
-        var _this = _super.call(this, destination) || this;
-        _this.sources = sources;
-        _this.completed = 0;
-        _this.haveValues = 0;
-        var len = sources.length;
-        _this.values = new Array(len);
-        for (var i = 0; i < len; i++) {
-            var source = sources[i];
-            var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(_this, source, null, i);
-            if (innerSubscription) {
-                _this.add(innerSubscription);
-            }
-        }
-        return _this;
-    }
-    ForkJoinSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.values[outerIndex] = innerValue;
-        if (!innerSub._hasValue) {
-            innerSub._hasValue = true;
-            this.haveValues++;
-        }
-    };
-    ForkJoinSubscriber.prototype.notifyComplete = function (innerSub) {
-        var _a = this, destination = _a.destination, haveValues = _a.haveValues, values = _a.values;
-        var len = values.length;
-        if (!innerSub._hasValue) {
-            destination.complete();
-            return;
-        }
-        this.completed++;
-        if (this.completed !== len) {
-            return;
-        }
-        if (haveValues === len) {
-            destination.next(values);
-        }
-        destination.complete();
-    };
-    return ForkJoinSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=forkJoin.js.map
-
-
-/***/ }),
-/* 826 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = fromEvent;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
-
-
-
-
-var toString = Object.prototype.toString;
-function fromEvent(target, eventName, options, resultSelector) {
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(options)) {
-        resultSelector = options;
-        options = undefined;
-    }
-    if (resultSelector) {
-        return fromEvent(target, eventName, options).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        function handler(e) {
-            if (arguments.length > 1) {
-                subscriber.next(Array.prototype.slice.call(arguments));
-            }
-            else {
-                subscriber.next(e);
-            }
-        }
-        setupSubscription(target, eventName, handler, subscriber, options);
-    });
-}
-function setupSubscription(sourceObj, eventName, handler, subscriber, options) {
-    var unsubscribe;
-    if (isEventTarget(sourceObj)) {
-        var source_1 = sourceObj;
-        sourceObj.addEventListener(eventName, handler, options);
-        unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); };
-    }
-    else if (isJQueryStyleEventEmitter(sourceObj)) {
-        var source_2 = sourceObj;
-        sourceObj.on(eventName, handler);
-        unsubscribe = function () { return source_2.off(eventName, handler); };
-    }
-    else if (isNodeStyleEventEmitter(sourceObj)) {
-        var source_3 = sourceObj;
-        sourceObj.addListener(eventName, handler);
-        unsubscribe = function () { return source_3.removeListener(eventName, handler); };
-    }
-    else if (sourceObj && sourceObj.length) {
-        for (var i = 0, len = sourceObj.length; i < len; i++) {
-            setupSubscription(sourceObj[i], eventName, handler, subscriber, options);
-        }
-    }
-    else {
-        throw new TypeError('Invalid event target');
-    }
-    subscriber.add(unsubscribe);
-}
-function isNodeStyleEventEmitter(sourceObj) {
-    return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function';
-}
-function isJQueryStyleEventEmitter(sourceObj) {
-    return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function';
-}
-function isEventTarget(sourceObj) {
-    return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function';
-}
-//# sourceMappingURL=fromEvent.js.map
-
-
-/***/ }),
-/* 827 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = fromEventPattern;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
-
-
-
-
-function fromEventPattern(addHandler, removeHandler, resultSelector) {
-    if (resultSelector) {
-        return fromEventPattern(addHandler, removeHandler).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__operators_map__["a" /* map */])(function (args) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_isArray__["a" /* isArray */])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var handler = function () {
-            var e = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                e[_i] = arguments[_i];
-            }
-            return subscriber.next(e.length === 1 ? e[0] : e);
-        };
-        var retValue;
-        try {
-            retValue = addHandler(handler);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(removeHandler)) {
-            return undefined;
-        }
-        return function () { return removeHandler(handler, retValue); };
-    });
-}
-//# sourceMappingURL=fromEventPattern.js.map
-
-
-/***/ }),
-/* 828 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = fromIterable;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_iterator__ = __webpack_require__(151);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToIterable__ = __webpack_require__(448);
-/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator,_util_subscribeToIterable PURE_IMPORTS_END */
-
-
-
-
-function fromIterable(input, scheduler) {
-    if (!input) {
-        throw new Error('Iterable cannot be null');
-    }
-    if (!scheduler) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToIterable__["a" /* subscribeToIterable */])(input));
-    }
-    else {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-            var iterator;
-            sub.add(function () {
-                if (iterator && typeof iterator.return === 'function') {
-                    iterator.return();
-                }
-            });
-            sub.add(scheduler.schedule(function () {
-                iterator = input[__WEBPACK_IMPORTED_MODULE_2__symbol_iterator__["a" /* iterator */]]();
-                sub.add(scheduler.schedule(function () {
-                    if (subscriber.closed) {
-                        return;
-                    }
-                    var value;
-                    var done;
-                    try {
-                        var result = iterator.next();
-                        value = result.value;
-                        done = result.done;
-                    }
-                    catch (err) {
-                        subscriber.error(err);
-                        return;
-                    }
-                    if (done) {
-                        subscriber.complete();
-                    }
-                    else {
-                        subscriber.next(value);
-                        this.schedule();
-                    }
-                }));
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromIterable.js.map
-
-
-/***/ }),
-/* 829 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = fromObservable;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(117);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__ = __webpack_require__(449);
-/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable,_util_subscribeToObservable PURE_IMPORTS_END */
-
-
-
-
-function fromObservable(input, scheduler) {
-    if (!scheduler) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__["a" /* subscribeToObservable */])(input));
-    }
-    else {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-            sub.add(scheduler.schedule(function () {
-                var observable = input[__WEBPACK_IMPORTED_MODULE_2__symbol_observable__["a" /* observable */]]();
-                sub.add(observable.subscribe({
-                    next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); },
-                    error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); },
-                    complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); },
-                }));
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromObservable.js.map
-
-
-/***/ }),
-/* 830 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = fromPromise;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToPromise__ = __webpack_require__(450);
-/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToPromise PURE_IMPORTS_END */
-
-
-
-function fromPromise(input, scheduler) {
-    if (!scheduler) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToPromise__["a" /* subscribeToPromise */])(input));
-    }
-    else {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-            sub.add(scheduler.schedule(function () {
-                return input.then(function (value) {
-                    sub.add(scheduler.schedule(function () {
-                        subscriber.next(value);
-                        sub.add(scheduler.schedule(function () { return subscriber.complete(); }));
-                    }));
-                }, function (err) {
-                    sub.add(scheduler.schedule(function () { return subscriber.error(err); }));
-                });
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromPromise.js.map
-
-
-/***/ }),
-/* 831 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = generate;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) {
-    var resultSelector;
-    var initialState;
-    if (arguments.length == 1) {
-        var options = initialStateOrOptions;
-        initialState = options.initialState;
-        condition = options.condition;
-        iterate = options.iterate;
-        resultSelector = options.resultSelector || __WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */];
-        scheduler = options.scheduler;
-    }
-    else if (resultSelectorOrObservable === undefined || __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isScheduler__["a" /* isScheduler */])(resultSelectorOrObservable)) {
-        initialState = initialStateOrOptions;
-        resultSelector = __WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */];
-        scheduler = resultSelectorOrObservable;
-    }
-    else {
-        initialState = initialStateOrOptions;
-        resultSelector = resultSelectorOrObservable;
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var state = initialState;
-        if (scheduler) {
-            return scheduler.schedule(dispatch, 0, {
-                subscriber: subscriber,
-                iterate: iterate,
-                condition: condition,
-                resultSelector: resultSelector,
-                state: state
-            });
-        }
-        do {
-            if (condition) {
-                var conditionResult = void 0;
-                try {
-                    conditionResult = condition(state);
-                }
-                catch (err) {
-                    subscriber.error(err);
-                    return undefined;
-                }
-                if (!conditionResult) {
-                    subscriber.complete();
-                    break;
-                }
-            }
-            var value = void 0;
-            try {
-                value = resultSelector(state);
-            }
-            catch (err) {
-                subscriber.error(err);
-                return undefined;
-            }
-            subscriber.next(value);
-            if (subscriber.closed) {
-                break;
-            }
-            try {
-                state = iterate(state);
-            }
-            catch (err) {
-                subscriber.error(err);
-                return undefined;
-            }
-        } while (true);
-        return undefined;
-    });
-}
-function dispatch(state) {
-    var subscriber = state.subscriber, condition = state.condition;
-    if (subscriber.closed) {
-        return undefined;
-    }
-    if (state.needIterate) {
-        try {
-            state.state = state.iterate(state.state);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-    }
-    else {
-        state.needIterate = true;
-    }
-    if (condition) {
-        var conditionResult = void 0;
-        try {
-            conditionResult = condition(state.state);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        if (!conditionResult) {
-            subscriber.complete();
-            return undefined;
-        }
-        if (subscriber.closed) {
-            return undefined;
-        }
-    }
-    var value;
-    try {
-        value = state.resultSelector(state.state);
-    }
-    catch (err) {
-        subscriber.error(err);
-        return undefined;
-    }
-    if (subscriber.closed) {
-        return undefined;
-    }
-    subscriber.next(value);
-    if (subscriber.closed) {
-        return undefined;
-    }
-    return this.schedule(state);
-}
-//# sourceMappingURL=generate.js.map
-
-
-/***/ }),
-/* 832 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = iif;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__defer__ = __webpack_require__(310);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */
-
-
-function iif(condition, trueResult, falseResult) {
-    if (trueResult === void 0) {
-        trueResult = __WEBPACK_IMPORTED_MODULE_1__empty__["b" /* EMPTY */];
-    }
-    if (falseResult === void 0) {
-        falseResult = __WEBPACK_IMPORTED_MODULE_1__empty__["b" /* EMPTY */];
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__defer__["a" /* defer */])(function () { return condition() ? trueResult : falseResult; });
-}
-//# sourceMappingURL=iif.js.map
-
-
-/***/ }),
-/* 833 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = interval;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
-/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */
-
-
-
-function interval(period, scheduler) {
-    if (period === void 0) {
-        period = 0;
-    }
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
-    }
-    if (!__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isNumeric__["a" /* isNumeric */])(period) || period < 0) {
-        period = 0;
-    }
-    if (!scheduler || typeof scheduler.schedule !== 'function') {
-        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period }));
-        return subscriber;
-    });
-}
-function dispatch(state) {
-    var subscriber = state.subscriber, counter = state.counter, period = state.period;
-    subscriber.next(counter);
-    this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period);
-}
-//# sourceMappingURL=interval.js.map
-
-
-/***/ }),
-/* 834 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = onErrorResumeNext;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(62);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */
-
-
-
-
-function onErrorResumeNext() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    if (sources.length === 0) {
-        return __WEBPACK_IMPORTED_MODULE_3__empty__["b" /* EMPTY */];
-    }
-    var first = sources[0], remainder = sources.slice(1);
-    if (sources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(first)) {
-        return onErrorResumeNext.apply(void 0, first);
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); };
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(first).subscribe({
-            next: function (value) { subscriber.next(value); },
-            error: subNext,
-            complete: subNext,
-        });
-    });
-}
-//# sourceMappingURL=onErrorResumeNext.js.map
-
-
-/***/ }),
-/* 835 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = pairs;
-/* unused harmony export dispatch */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
-
-
-function pairs(obj, scheduler) {
-    if (!scheduler) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var keys = Object.keys(obj);
-            for (var i = 0; i < keys.length && !subscriber.closed; i++) {
-                var key = keys[i];
-                if (obj.hasOwnProperty(key)) {
-                    subscriber.next([key, obj[key]]);
-                }
-            }
-            subscriber.complete();
-        });
-    }
-    else {
-        return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-            var keys = Object.keys(obj);
-            var subscription = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-            subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj }));
-            return subscription;
-        });
-    }
-}
-function dispatch(state) {
-    var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj;
-    if (!subscriber.closed) {
-        if (index < keys.length) {
-            var key = keys[index];
-            subscriber.next([key, obj[key]]);
-            subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj }));
-        }
-        else {
-            subscriber.complete();
-        }
-    }
-}
-//# sourceMappingURL=pairs.js.map
-
-
-/***/ }),
-/* 836 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = range;
-/* unused harmony export dispatch */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-function range(start, count, scheduler) {
-    if (start === void 0) {
-        start = 0;
-    }
-    if (count === void 0) {
-        count = 0;
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var index = 0;
-        var current = start;
-        if (scheduler) {
-            return scheduler.schedule(dispatch, 0, {
-                index: index, count: count, start: start, subscriber: subscriber
-            });
-        }
-        else {
-            do {
-                if (index++ >= count) {
-                    subscriber.complete();
-                    break;
-                }
-                subscriber.next(current++);
-                if (subscriber.closed) {
-                    break;
-                }
-            } while (true);
-        }
-        return undefined;
-    });
-}
-function dispatch(state) {
-    var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber;
-    if (index >= count) {
-        subscriber.complete();
-        return;
-    }
-    subscriber.next(start);
-    if (subscriber.closed) {
-        return;
-    }
-    state.index = index + 1;
-    state.start = start + 1;
-    this.schedule(state);
-}
-//# sourceMappingURL=range.js.map
-
-
-/***/ }),
-/* 837 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = using;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(62);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
-
-
-
-function using(resourceFactory, observableFactory) {
-    return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) {
-        var resource;
-        try {
-            resource = resourceFactory();
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var result;
-        try {
-            result = observableFactory(resource);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var source = result ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(result) : __WEBPACK_IMPORTED_MODULE_2__empty__["b" /* EMPTY */];
-        var subscription = source.subscribe(subscriber);
-        return function () {
-            subscription.unsubscribe();
-            if (resource) {
-                resource.unsubscribe();
-            }
-        };
-    });
-}
-//# sourceMappingURL=using.js.map
-
-
-/***/ }),
-/* 838 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = auditTime;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__audit__ = __webpack_require__(428);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_timer__ = __webpack_require__(427);
-/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
-
-
-
-function auditTime(duration, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__audit__["a" /* audit */])(function () { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_timer__["a" /* timer */])(duration, scheduler); });
-}
-//# sourceMappingURL=auditTime.js.map
-
-
-/***/ }),
-/* 839 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = buffer;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function buffer(closingNotifier) {
-    return function bufferOperatorFunction(source) {
-        return source.lift(new BufferOperator(closingNotifier));
-    };
-}
-var BufferOperator = /*@__PURE__*/ (function () {
-    function BufferOperator(closingNotifier) {
-        this.closingNotifier = closingNotifier;
-    }
-    BufferOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier));
-    };
-    return BufferOperator;
-}());
-var BufferSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferSubscriber, _super);
-    function BufferSubscriber(destination, closingNotifier) {
-        var _this = _super.call(this, destination) || this;
-        _this.buffer = [];
-        _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, closingNotifier));
-        return _this;
-    }
-    BufferSubscriber.prototype._next = function (value) {
-        this.buffer.push(value);
-    };
-    BufferSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var buffer = this.buffer;
-        this.buffer = [];
-        this.destination.next(buffer);
-    };
-    return BufferSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=buffer.js.map
-
-
-/***/ }),
-/* 840 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = bufferCount;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function bufferCount(bufferSize, startBufferEvery) {
-    if (startBufferEvery === void 0) {
-        startBufferEvery = null;
-    }
-    return function bufferCountOperatorFunction(source) {
-        return source.lift(new BufferCountOperator(bufferSize, startBufferEvery));
-    };
-}
-var BufferCountOperator = /*@__PURE__*/ (function () {
-    function BufferCountOperator(bufferSize, startBufferEvery) {
-        this.bufferSize = bufferSize;
-        this.startBufferEvery = startBufferEvery;
-        if (!startBufferEvery || bufferSize === startBufferEvery) {
-            this.subscriberClass = BufferCountSubscriber;
-        }
-        else {
-            this.subscriberClass = BufferSkipCountSubscriber;
-        }
-    }
-    BufferCountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery));
-    };
-    return BufferCountOperator;
-}());
-var BufferCountSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferCountSubscriber, _super);
-    function BufferCountSubscriber(destination, bufferSize) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferSize = bufferSize;
-        _this.buffer = [];
-        return _this;
-    }
-    BufferCountSubscriber.prototype._next = function (value) {
-        var buffer = this.buffer;
-        buffer.push(value);
-        if (buffer.length == this.bufferSize) {
-            this.destination.next(buffer);
-            this.buffer = [];
-        }
-    };
-    BufferCountSubscriber.prototype._complete = function () {
-        var buffer = this.buffer;
-        if (buffer.length > 0) {
-            this.destination.next(buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    return BufferCountSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferSkipCountSubscriber, _super);
-    function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferSize = bufferSize;
-        _this.startBufferEvery = startBufferEvery;
-        _this.buffers = [];
-        _this.count = 0;
-        return _this;
-    }
-    BufferSkipCountSubscriber.prototype._next = function (value) {
-        var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count;
-        this.count++;
-        if (count % startBufferEvery === 0) {
-            buffers.push([]);
-        }
-        for (var i = buffers.length; i--;) {
-            var buffer = buffers[i];
-            buffer.push(value);
-            if (buffer.length === bufferSize) {
-                buffers.splice(i, 1);
-                this.destination.next(buffer);
-            }
-        }
-    };
-    BufferSkipCountSubscriber.prototype._complete = function () {
-        var _a = this, buffers = _a.buffers, destination = _a.destination;
-        while (buffers.length > 0) {
-            var buffer = buffers.shift();
-            if (buffer.length > 0) {
-                destination.next(buffer);
-            }
-        }
-        _super.prototype._complete.call(this);
-    };
-    return BufferSkipCountSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=bufferCount.js.map
-
-
-/***/ }),
-/* 841 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = bufferTime;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-function bufferTime(bufferTimeSpan) {
-    var length = arguments.length;
-    var scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_isScheduler__["a" /* isScheduler */])(arguments[arguments.length - 1])) {
-        scheduler = arguments[arguments.length - 1];
-        length--;
-    }
-    var bufferCreationInterval = null;
-    if (length >= 2) {
-        bufferCreationInterval = arguments[1];
-    }
-    var maxBufferSize = Number.POSITIVE_INFINITY;
-    if (length >= 3) {
-        maxBufferSize = arguments[2];
-    }
-    return function bufferTimeOperatorFunction(source) {
-        return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler));
-    };
-}
-var BufferTimeOperator = /*@__PURE__*/ (function () {
-    function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
-        this.bufferTimeSpan = bufferTimeSpan;
-        this.bufferCreationInterval = bufferCreationInterval;
-        this.maxBufferSize = maxBufferSize;
-        this.scheduler = scheduler;
-    }
-    BufferTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler));
-    };
-    return BufferTimeOperator;
-}());
-var Context = /*@__PURE__*/ (function () {
-    function Context() {
-        this.buffer = [];
-    }
-    return Context;
-}());
-var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferTimeSubscriber, _super);
-    function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferTimeSpan = bufferTimeSpan;
-        _this.bufferCreationInterval = bufferCreationInterval;
-        _this.maxBufferSize = maxBufferSize;
-        _this.scheduler = scheduler;
-        _this.contexts = [];
-        var context = _this.openContext();
-        _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0;
-        if (_this.timespanOnly) {
-            var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan };
-            _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
-        }
-        else {
-            var closeState = { subscriber: _this, context: context };
-            var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler };
-            _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState));
-            _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState));
-        }
-        return _this;
-    }
-    BufferTimeSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        var len = contexts.length;
-        var filledBufferContext;
-        for (var i = 0; i < len; i++) {
-            var context_1 = contexts[i];
-            var buffer = context_1.buffer;
-            buffer.push(value);
-            if (buffer.length == this.maxBufferSize) {
-                filledBufferContext = context_1;
-            }
-        }
-        if (filledBufferContext) {
-            this.onBufferFull(filledBufferContext);
-        }
-    };
-    BufferTimeSubscriber.prototype._error = function (err) {
-        this.contexts.length = 0;
-        _super.prototype._error.call(this, err);
-    };
-    BufferTimeSubscriber.prototype._complete = function () {
-        var _a = this, contexts = _a.contexts, destination = _a.destination;
-        while (contexts.length > 0) {
-            var context_2 = contexts.shift();
-            destination.next(context_2.buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    BufferTimeSubscriber.prototype._unsubscribe = function () {
-        this.contexts = null;
-    };
-    BufferTimeSubscriber.prototype.onBufferFull = function (context) {
-        this.closeContext(context);
-        var closeAction = context.closeAction;
-        closeAction.unsubscribe();
-        this.remove(closeAction);
-        if (!this.closed && this.timespanOnly) {
-            context = this.openContext();
-            var bufferTimeSpan = this.bufferTimeSpan;
-            var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan };
-            this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
-        }
-    };
-    BufferTimeSubscriber.prototype.openContext = function () {
-        var context = new Context();
-        this.contexts.push(context);
-        return context;
-    };
-    BufferTimeSubscriber.prototype.closeContext = function (context) {
-        this.destination.next(context.buffer);
-        var contexts = this.contexts;
-        var spliceIndex = contexts ? contexts.indexOf(context) : -1;
-        if (spliceIndex >= 0) {
-            contexts.splice(contexts.indexOf(context), 1);
-        }
-    };
-    return BufferTimeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_2__Subscriber__["a" /* Subscriber */]));
-function dispatchBufferTimeSpanOnly(state) {
-    var subscriber = state.subscriber;
-    var prevContext = state.context;
-    if (prevContext) {
-        subscriber.closeContext(prevContext);
-    }
-    if (!subscriber.closed) {
-        state.context = subscriber.openContext();
-        state.context.closeAction = this.schedule(state, state.bufferTimeSpan);
-    }
-}
-function dispatchBufferCreation(state) {
-    var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler;
-    var context = subscriber.openContext();
-    var action = this;
-    if (!subscriber.closed) {
-        subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context }));
-        action.schedule(state, bufferCreationInterval);
-    }
-}
-function dispatchBufferClose(arg) {
-    var subscriber = arg.subscriber, context = arg.context;
-    subscriber.closeContext(context);
-}
-//# sourceMappingURL=bufferTime.js.map
-
-
-/***/ }),
-/* 842 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = bufferToggle;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */
-
-
-
-
-function bufferToggle(openings, closingSelector) {
-    return function bufferToggleOperatorFunction(source) {
-        return source.lift(new BufferToggleOperator(openings, closingSelector));
-    };
-}
-var BufferToggleOperator = /*@__PURE__*/ (function () {
-    function BufferToggleOperator(openings, closingSelector) {
-        this.openings = openings;
-        this.closingSelector = closingSelector;
-    }
-    BufferToggleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector));
-    };
-    return BufferToggleOperator;
-}());
-var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferToggleSubscriber, _super);
-    function BufferToggleSubscriber(destination, openings, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.openings = openings;
-        _this.closingSelector = closingSelector;
-        _this.contexts = [];
-        _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, openings));
-        return _this;
-    }
-    BufferToggleSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        var len = contexts.length;
-        for (var i = 0; i < len; i++) {
-            contexts[i].buffer.push(value);
-        }
-    };
-    BufferToggleSubscriber.prototype._error = function (err) {
-        var contexts = this.contexts;
-        while (contexts.length > 0) {
-            var context_1 = contexts.shift();
-            context_1.subscription.unsubscribe();
-            context_1.buffer = null;
-            context_1.subscription = null;
-        }
-        this.contexts = null;
-        _super.prototype._error.call(this, err);
-    };
-    BufferToggleSubscriber.prototype._complete = function () {
-        var contexts = this.contexts;
-        while (contexts.length > 0) {
-            var context_2 = contexts.shift();
-            this.destination.next(context_2.buffer);
-            context_2.subscription.unsubscribe();
-            context_2.buffer = null;
-            context_2.subscription = null;
-        }
-        this.contexts = null;
-        _super.prototype._complete.call(this);
-    };
-    BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue);
-    };
-    BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.closeBuffer(innerSub.context);
-    };
-    BufferToggleSubscriber.prototype.openBuffer = function (value) {
-        try {
-            var closingSelector = this.closingSelector;
-            var closingNotifier = closingSelector.call(this, value);
-            if (closingNotifier) {
-                this.trySubscribe(closingNotifier);
-            }
-        }
-        catch (err) {
-            this._error(err);
-        }
-    };
-    BufferToggleSubscriber.prototype.closeBuffer = function (context) {
-        var contexts = this.contexts;
-        if (contexts && context) {
-            var buffer = context.buffer, subscription = context.subscription;
-            this.destination.next(buffer);
-            contexts.splice(contexts.indexOf(context), 1);
-            this.remove(subscription);
-            subscription.unsubscribe();
-        }
-    };
-    BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) {
-        var contexts = this.contexts;
-        var buffer = [];
-        var subscription = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-        var context = { buffer: buffer, subscription: subscription };
-        contexts.push(context);
-        var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier, context);
-        if (!innerSubscription || innerSubscription.closed) {
-            this.closeBuffer(context);
-        }
-        else {
-            innerSubscription.context = context;
-            this.add(innerSubscription);
-            subscription.add(innerSubscription);
-        }
-    };
-    return BufferToggleSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=bufferToggle.js.map
-
-
-/***/ }),
-/* 843 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = bufferWhen;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-
-function bufferWhen(closingSelector) {
-    return function (source) {
-        return source.lift(new BufferWhenOperator(closingSelector));
-    };
-}
-var BufferWhenOperator = /*@__PURE__*/ (function () {
-    function BufferWhenOperator(closingSelector) {
-        this.closingSelector = closingSelector;
-    }
-    BufferWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector));
-    };
-    return BufferWhenOperator;
-}());
-var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](BufferWhenSubscriber, _super);
-    function BufferWhenSubscriber(destination, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.closingSelector = closingSelector;
-        _this.subscribing = false;
-        _this.openBuffer();
-        return _this;
-    }
-    BufferWhenSubscriber.prototype._next = function (value) {
-        this.buffer.push(value);
-    };
-    BufferWhenSubscriber.prototype._complete = function () {
-        var buffer = this.buffer;
-        if (buffer) {
-            this.destination.next(buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    BufferWhenSubscriber.prototype._unsubscribe = function () {
-        this.buffer = null;
-        this.subscribing = false;
-    };
-    BufferWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.openBuffer();
-    };
-    BufferWhenSubscriber.prototype.notifyComplete = function () {
-        if (this.subscribing) {
-            this.complete();
-        }
-        else {
-            this.openBuffer();
-        }
-    };
-    BufferWhenSubscriber.prototype.openBuffer = function () {
-        var closingSubscription = this.closingSubscription;
-        if (closingSubscription) {
-            this.remove(closingSubscription);
-            closingSubscription.unsubscribe();
-        }
-        var buffer = this.buffer;
-        if (this.buffer) {
-            this.destination.next(buffer);
-        }
-        this.buffer = [];
-        var closingNotifier = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.closingSelector)();
-        if (closingNotifier === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-            this.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
-        }
-        else {
-            closingSubscription = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]();
-            this.closingSubscription = closingSubscription;
-            this.add(closingSubscription);
-            this.subscribing = true;
-            closingSubscription.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier));
-            this.subscribing = false;
-        }
-    };
-    return BufferWhenSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=bufferWhen.js.map
-
-
-/***/ }),
-/* 844 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = catchError;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-function catchError(selector) {
-    return function catchErrorOperatorFunction(source) {
-        var operator = new CatchOperator(selector);
-        var caught = source.lift(operator);
-        return (operator.caught = caught);
-    };
-}
-var CatchOperator = /*@__PURE__*/ (function () {
-    function CatchOperator(selector) {
-        this.selector = selector;
-    }
-    CatchOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught));
-    };
-    return CatchOperator;
-}());
-var CatchSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CatchSubscriber, _super);
-    function CatchSubscriber(destination, selector, caught) {
-        var _this = _super.call(this, destination) || this;
-        _this.selector = selector;
-        _this.caught = caught;
-        return _this;
-    }
-    CatchSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var result = void 0;
-            try {
-                result = this.selector(err, this.caught);
-            }
-            catch (err2) {
-                _super.prototype.error.call(this, err2);
-                return;
-            }
-            this._unsubscribeAndRecycle();
-            var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
-            this.add(innerSubscriber);
-            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, undefined, undefined, innerSubscriber);
-        }
-    };
-    return CatchSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=catchError.js.map
-
-
-/***/ }),
-/* 845 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = combineAll;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_combineLatest__ = __webpack_require__(309);
-/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */
-
-function combineAll(project) {
-    return function (source) { return source.lift(new __WEBPACK_IMPORTED_MODULE_0__observable_combineLatest__["b" /* CombineLatestOperator */](project)); };
-}
-//# sourceMappingURL=combineAll.js.map
-
-
-/***/ }),
-/* 846 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = combineLatest;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_combineLatest__ = __webpack_require__(309);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_from__ = __webpack_require__(62);
-/** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */
-
-
-
-var none = {};
-function combineLatest() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var project = null;
-    if (typeof observables[observables.length - 1] === 'function') {
-        project = observables.pop();
-    }
-    if (observables.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(observables[0])) {
-        observables = observables[0].slice();
-    }
-    return function (source) { return source.lift.call(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_from__["a" /* from */])([source].concat(observables)), new __WEBPACK_IMPORTED_MODULE_1__observable_combineLatest__["b" /* CombineLatestOperator */](project)); };
-}
-//# sourceMappingURL=combineLatest.js.map
-
-
-/***/ }),
-/* 847 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = concat;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_concat__ = __webpack_require__(186);
-/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
-
-function concat() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function (source) { return source.lift.call(__WEBPACK_IMPORTED_MODULE_0__observable_concat__["a" /* concat */].apply(void 0, [source].concat(observables))); };
-}
-//# sourceMappingURL=concat.js.map
-
-
-/***/ }),
-/* 848 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = concatMapTo;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__concatMap__ = __webpack_require__(430);
-/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
-
-function concatMapTo(innerObservable, resultSelector) {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__concatMap__["a" /* concatMap */])(function () { return innerObservable; }, resultSelector);
-}
-//# sourceMappingURL=concatMapTo.js.map
-
-
-/***/ }),
-/* 849 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = count;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function count(predicate) {
-    return function (source) { return source.lift(new CountOperator(predicate, source)); };
-}
-var CountOperator = /*@__PURE__*/ (function () {
-    function CountOperator(predicate, source) {
-        this.predicate = predicate;
-        this.source = source;
-    }
-    CountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source));
-    };
-    return CountOperator;
-}());
-var CountSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CountSubscriber, _super);
-    function CountSubscriber(destination, predicate, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.count = 0;
-        _this.index = 0;
-        return _this;
-    }
-    CountSubscriber.prototype._next = function (value) {
-        if (this.predicate) {
-            this._tryPredicate(value);
-        }
-        else {
-            this.count++;
-        }
-    };
-    CountSubscriber.prototype._tryPredicate = function (value) {
-        var result;
-        try {
-            result = this.predicate(value, this.index++, this.source);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (result) {
-            this.count++;
-        }
-    };
-    CountSubscriber.prototype._complete = function () {
-        this.destination.next(this.count);
-        this.destination.complete();
-    };
-    return CountSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=count.js.map
-
-
-/***/ }),
-/* 850 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = debounce;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function debounce(durationSelector) {
-    return function (source) { return source.lift(new DebounceOperator(durationSelector)); };
-}
-var DebounceOperator = /*@__PURE__*/ (function () {
-    function DebounceOperator(durationSelector) {
-        this.durationSelector = durationSelector;
-    }
-    DebounceOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector));
-    };
-    return DebounceOperator;
-}());
-var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DebounceSubscriber, _super);
-    function DebounceSubscriber(destination, durationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.durationSelector = durationSelector;
-        _this.hasValue = false;
-        _this.durationSubscription = null;
-        return _this;
-    }
-    DebounceSubscriber.prototype._next = function (value) {
-        try {
-            var result = this.durationSelector.call(this, value);
-            if (result) {
-                this._tryNext(value, result);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    DebounceSubscriber.prototype._complete = function () {
-        this.emitValue();
-        this.destination.complete();
-    };
-    DebounceSubscriber.prototype._tryNext = function (value, duration) {
-        var subscription = this.durationSubscription;
-        this.value = value;
-        this.hasValue = true;
-        if (subscription) {
-            subscription.unsubscribe();
-            this.remove(subscription);
-        }
-        subscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, duration);
-        if (subscription && !subscription.closed) {
-            this.add(this.durationSubscription = subscription);
-        }
-    };
-    DebounceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.emitValue();
-    };
-    DebounceSubscriber.prototype.notifyComplete = function () {
-        this.emitValue();
-    };
-    DebounceSubscriber.prototype.emitValue = function () {
-        if (this.hasValue) {
-            var value = this.value;
-            var subscription = this.durationSubscription;
-            if (subscription) {
-                this.durationSubscription = null;
-                subscription.unsubscribe();
-                this.remove(subscription);
-            }
-            this.value = null;
-            this.hasValue = false;
-            _super.prototype._next.call(this, value);
-        }
-    };
-    return DebounceSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=debounce.js.map
-
-
-/***/ }),
-/* 851 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = debounceTime;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
-/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
-
-
-
-function debounceTime(dueTime, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
-    }
-    return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); };
-}
-var DebounceTimeOperator = /*@__PURE__*/ (function () {
-    function DebounceTimeOperator(dueTime, scheduler) {
-        this.dueTime = dueTime;
-        this.scheduler = scheduler;
-    }
-    DebounceTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler));
-    };
-    return DebounceTimeOperator;
-}());
-var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DebounceTimeSubscriber, _super);
-    function DebounceTimeSubscriber(destination, dueTime, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.dueTime = dueTime;
-        _this.scheduler = scheduler;
-        _this.debouncedSubscription = null;
-        _this.lastValue = null;
-        _this.hasValue = false;
-        return _this;
-    }
-    DebounceTimeSubscriber.prototype._next = function (value) {
-        this.clearDebounce();
-        this.lastValue = value;
-        this.hasValue = true;
-        this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this));
-    };
-    DebounceTimeSubscriber.prototype._complete = function () {
-        this.debouncedNext();
-        this.destination.complete();
-    };
-    DebounceTimeSubscriber.prototype.debouncedNext = function () {
-        this.clearDebounce();
-        if (this.hasValue) {
-            var lastValue = this.lastValue;
-            this.lastValue = null;
-            this.hasValue = false;
-            this.destination.next(lastValue);
-        }
-    };
-    DebounceTimeSubscriber.prototype.clearDebounce = function () {
-        var debouncedSubscription = this.debouncedSubscription;
-        if (debouncedSubscription !== null) {
-            this.remove(debouncedSubscription);
-            debouncedSubscription.unsubscribe();
-            this.debouncedSubscription = null;
-        }
-    };
-    return DebounceTimeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-function dispatchNext(subscriber) {
-    subscriber.debouncedNext();
-}
-//# sourceMappingURL=debounceTime.js.map
-
-
-/***/ }),
-/* 852 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = delay;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(443);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Notification__ = __webpack_require__(184);
-/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
-
-
-
-
-
-function delay(delay, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_1__scheduler_async__["a" /* async */];
-    }
-    var absoluteDelay = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isDate__["a" /* isDate */])(delay);
-    var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay);
-    return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); };
-}
-var DelayOperator = /*@__PURE__*/ (function () {
-    function DelayOperator(delay, scheduler) {
-        this.delay = delay;
-        this.scheduler = scheduler;
-    }
-    DelayOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler));
-    };
-    return DelayOperator;
-}());
-var DelaySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DelaySubscriber, _super);
-    function DelaySubscriber(destination, delay, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.delay = delay;
-        _this.scheduler = scheduler;
-        _this.queue = [];
-        _this.active = false;
-        _this.errored = false;
-        return _this;
-    }
-    DelaySubscriber.dispatch = function (state) {
-        var source = state.source;
-        var queue = source.queue;
-        var scheduler = state.scheduler;
-        var destination = state.destination;
-        while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) {
-            queue.shift().notification.observe(destination);
-        }
-        if (queue.length > 0) {
-            var delay_1 = Math.max(0, queue[0].time - scheduler.now());
-            this.schedule(state, delay_1);
-        }
-        else {
-            this.unsubscribe();
-            source.active = false;
-        }
-    };
-    DelaySubscriber.prototype._schedule = function (scheduler) {
-        this.active = true;
-        var destination = this.destination;
-        destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
-            source: this, destination: this.destination, scheduler: scheduler
-        }));
-    };
-    DelaySubscriber.prototype.scheduleNotification = function (notification) {
-        if (this.errored === true) {
-            return;
-        }
-        var scheduler = this.scheduler;
-        var message = new DelayMessage(scheduler.now() + this.delay, notification);
-        this.queue.push(message);
-        if (this.active === false) {
-            this._schedule(scheduler);
-        }
-    };
-    DelaySubscriber.prototype._next = function (value) {
-        this.scheduleNotification(__WEBPACK_IMPORTED_MODULE_4__Notification__["a" /* Notification */].createNext(value));
-    };
-    DelaySubscriber.prototype._error = function (err) {
-        this.errored = true;
-        this.queue = [];
-        this.destination.error(err);
-        this.unsubscribe();
-    };
-    DelaySubscriber.prototype._complete = function () {
-        this.scheduleNotification(__WEBPACK_IMPORTED_MODULE_4__Notification__["a" /* Notification */].createComplete());
-        this.unsubscribe();
-    };
-    return DelaySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
-var DelayMessage = /*@__PURE__*/ (function () {
-    function DelayMessage(time, notification) {
-        this.time = time;
-        this.notification = notification;
-    }
-    return DelayMessage;
-}());
-//# sourceMappingURL=delay.js.map
-
-
-/***/ }),
-/* 853 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = delayWhen;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(11);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-function delayWhen(delayDurationSelector, subscriptionDelay) {
-    if (subscriptionDelay) {
-        return function (source) {
-            return new SubscriptionDelayObservable(source, subscriptionDelay)
-                .lift(new DelayWhenOperator(delayDurationSelector));
-        };
-    }
-    return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); };
-}
-var DelayWhenOperator = /*@__PURE__*/ (function () {
-    function DelayWhenOperator(delayDurationSelector) {
-        this.delayDurationSelector = delayDurationSelector;
-    }
-    DelayWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector));
-    };
-    return DelayWhenOperator;
-}());
-var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DelayWhenSubscriber, _super);
-    function DelayWhenSubscriber(destination, delayDurationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.delayDurationSelector = delayDurationSelector;
-        _this.completed = false;
-        _this.delayNotifierSubscriptions = [];
-        _this.index = 0;
-        return _this;
-    }
-    DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(outerValue);
-        this.removeSubscription(innerSub);
-        this.tryComplete();
-    };
-    DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) {
-        var value = this.removeSubscription(innerSub);
-        if (value) {
-            this.destination.next(value);
-        }
-        this.tryComplete();
-    };
-    DelayWhenSubscriber.prototype._next = function (value) {
-        var index = this.index++;
-        try {
-            var delayNotifier = this.delayDurationSelector(value, index);
-            if (delayNotifier) {
-                this.tryDelay(delayNotifier, value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    DelayWhenSubscriber.prototype._complete = function () {
-        this.completed = true;
-        this.tryComplete();
-        this.unsubscribe();
-    };
-    DelayWhenSubscriber.prototype.removeSubscription = function (subscription) {
-        subscription.unsubscribe();
-        var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription);
-        if (subscriptionIdx !== -1) {
-            this.delayNotifierSubscriptions.splice(subscriptionIdx, 1);
-        }
-        return subscription.outerValue;
-    };
-    DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) {
-        var notifierSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, delayNotifier, value);
-        if (notifierSubscription && !notifierSubscription.closed) {
-            var destination = this.destination;
-            destination.add(notifierSubscription);
-            this.delayNotifierSubscriptions.push(notifierSubscription);
-        }
-    };
-    DelayWhenSubscriber.prototype.tryComplete = function () {
-        if (this.completed && this.delayNotifierSubscriptions.length === 0) {
-            this.destination.complete();
-        }
-    };
-    return DelayWhenSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubscriptionDelayObservable, _super);
-    function SubscriptionDelayObservable(source, subscriptionDelay) {
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.subscriptionDelay = subscriptionDelay;
-        return _this;
-    }
-    SubscriptionDelayObservable.prototype._subscribe = function (subscriber) {
-        this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source));
-    };
-    return SubscriptionDelayObservable;
-}(__WEBPACK_IMPORTED_MODULE_2__Observable__["a" /* Observable */]));
-var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubscriptionDelaySubscriber, _super);
-    function SubscriptionDelaySubscriber(parent, source) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.source = source;
-        _this.sourceSubscribed = false;
-        return _this;
-    }
-    SubscriptionDelaySubscriber.prototype._next = function (unused) {
-        this.subscribeToSource();
-    };
-    SubscriptionDelaySubscriber.prototype._error = function (err) {
-        this.unsubscribe();
-        this.parent.error(err);
-    };
-    SubscriptionDelaySubscriber.prototype._complete = function () {
-        this.unsubscribe();
-        this.subscribeToSource();
-    };
-    SubscriptionDelaySubscriber.prototype.subscribeToSource = function () {
-        if (!this.sourceSubscribed) {
-            this.sourceSubscribed = true;
-            this.unsubscribe();
-            this.source.subscribe(this.parent);
-        }
-    };
-    return SubscriptionDelaySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=delayWhen.js.map
-
-
-/***/ }),
-/* 854 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = dematerialize;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function dematerialize() {
-    return function dematerializeOperatorFunction(source) {
-        return source.lift(new DeMaterializeOperator());
-    };
-}
-var DeMaterializeOperator = /*@__PURE__*/ (function () {
-    function DeMaterializeOperator() {
-    }
-    DeMaterializeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DeMaterializeSubscriber(subscriber));
-    };
-    return DeMaterializeOperator;
-}());
-var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DeMaterializeSubscriber, _super);
-    function DeMaterializeSubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    DeMaterializeSubscriber.prototype._next = function (value) {
-        value.observe(this.destination);
-    };
-    return DeMaterializeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=dematerialize.js.map
-
-
-/***/ }),
-/* 855 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = distinct;
-/* unused harmony export DistinctSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function distinct(keySelector, flushes) {
-    return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); };
-}
-var DistinctOperator = /*@__PURE__*/ (function () {
-    function DistinctOperator(keySelector, flushes) {
-        this.keySelector = keySelector;
-        this.flushes = flushes;
-    }
-    DistinctOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes));
-    };
-    return DistinctOperator;
-}());
-var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DistinctSubscriber, _super);
-    function DistinctSubscriber(destination, keySelector, flushes) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.values = new Set();
-        if (flushes) {
-            _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, flushes));
-        }
-        return _this;
-    }
-    DistinctSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.values.clear();
-    };
-    DistinctSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    DistinctSubscriber.prototype._next = function (value) {
-        if (this.keySelector) {
-            this._useKeySelector(value);
-        }
-        else {
-            this._finalizeNext(value, value);
-        }
-    };
-    DistinctSubscriber.prototype._useKeySelector = function (value) {
-        var key;
-        var destination = this.destination;
-        try {
-            key = this.keySelector(value);
-        }
-        catch (err) {
-            destination.error(err);
-            return;
-        }
-        this._finalizeNext(key, value);
-    };
-    DistinctSubscriber.prototype._finalizeNext = function (key, value) {
-        var values = this.values;
-        if (!values.has(key)) {
-            values.add(key);
-            this.destination.next(value);
-        }
-    };
-    return DistinctSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-
-//# sourceMappingURL=distinct.js.map
-
-
-/***/ }),
-/* 856 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilKeyChanged;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__distinctUntilChanged__ = __webpack_require__(431);
-/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
-
-function distinctUntilKeyChanged(key, compare) {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__distinctUntilChanged__["a" /* distinctUntilChanged */])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
-}
-//# sourceMappingURL=distinctUntilKeyChanged.js.map
-
-
-/***/ }),
-/* 857 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = elementAt;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__ = __webpack_require__(188);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(146);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__take__ = __webpack_require__(319);
-/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
-
-
-
-
-
-function elementAt(index, defaultValue) {
-    if (index < 0) {
-        throw new __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */]();
-    }
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) {
-        return source.pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(function (v, i) { return i === index; }), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__take__["a" /* take */])(1), hasDefaultValue
-            ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__["a" /* defaultIfEmpty */])(defaultValue)
-            : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__["a" /* throwIfEmpty */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */](); }));
-    };
-}
-//# sourceMappingURL=elementAt.js.map
-
-
-/***/ }),
-/* 858 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = endWith;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(85);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-
-function endWith() {
-    var array = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        array[_i] = arguments[_i];
-    }
-    return function (source) {
-        var scheduler = array[array.length - 1];
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
-            array.pop();
-        }
-        else {
-            scheduler = null;
-        }
-        var len = array.length;
-        if (len === 1 && !scheduler) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(source, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_scalar__["a" /* scalar */])(array[0]));
-        }
-        else if (len > 0) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(source, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__observable_fromArray__["a" /* fromArray */])(array, scheduler));
-        }
-        else {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(source, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_empty__["a" /* empty */])(scheduler));
-        }
-    };
-}
-//# sourceMappingURL=endWith.js.map
-
-
-/***/ }),
-/* 859 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = every;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function every(predicate, thisArg) {
-    return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); };
-}
-var EveryOperator = /*@__PURE__*/ (function () {
-    function EveryOperator(predicate, thisArg, source) {
-        this.predicate = predicate;
-        this.thisArg = thisArg;
-        this.source = source;
-    }
-    EveryOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source));
-    };
-    return EveryOperator;
-}());
-var EverySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](EverySubscriber, _super);
-    function EverySubscriber(destination, predicate, thisArg, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.thisArg = thisArg;
-        _this.source = source;
-        _this.index = 0;
-        _this.thisArg = thisArg || _this;
-        return _this;
-    }
-    EverySubscriber.prototype.notifyComplete = function (everyValueMatch) {
-        this.destination.next(everyValueMatch);
-        this.destination.complete();
-    };
-    EverySubscriber.prototype._next = function (value) {
-        var result = false;
-        try {
-            result = this.predicate.call(this.thisArg, value, this.index++, this.source);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (!result) {
-            this.notifyComplete(false);
-        }
-    };
-    EverySubscriber.prototype._complete = function () {
-        this.notifyComplete(true);
-    };
-    return EverySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=every.js.map
-
-
-/***/ }),
-/* 860 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = exhaust;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function exhaust() {
-    return function (source) { return source.lift(new SwitchFirstOperator()); };
-}
-var SwitchFirstOperator = /*@__PURE__*/ (function () {
-    function SwitchFirstOperator() {
-    }
-    SwitchFirstOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SwitchFirstSubscriber(subscriber));
-    };
-    return SwitchFirstOperator;
-}());
-var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SwitchFirstSubscriber, _super);
-    function SwitchFirstSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasCompleted = false;
-        _this.hasSubscription = false;
-        return _this;
-    }
-    SwitchFirstSubscriber.prototype._next = function (value) {
-        if (!this.hasSubscription) {
-            this.hasSubscription = true;
-            this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, value));
-        }
-    };
-    SwitchFirstSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (!this.hasSubscription) {
-            this.destination.complete();
-        }
-    };
-    SwitchFirstSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.remove(innerSub);
-        this.hasSubscription = false;
-        if (this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return SwitchFirstSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=exhaust.js.map
-
-
-/***/ }),
-/* 861 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = exhaustMap;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__map__ = __webpack_require__(46);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__observable_from__ = __webpack_require__(62);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
-
-
-
-
-
-
-function exhaustMap(project, resultSelector) {
-    if (resultSelector) {
-        return function (source) { return source.pipe(exhaustMap(function (a, i) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__observable_from__["a" /* from */])(project(a, i)).pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
-    }
-    return function (source) {
-        return source.lift(new ExhauseMapOperator(project));
-    };
-}
-var ExhauseMapOperator = /*@__PURE__*/ (function () {
-    function ExhauseMapOperator(project) {
-        this.project = project;
-    }
-    ExhauseMapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project));
-    };
-    return ExhauseMapOperator;
-}());
-var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ExhaustMapSubscriber, _super);
-    function ExhaustMapSubscriber(destination, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.hasSubscription = false;
-        _this.hasCompleted = false;
-        _this.index = 0;
-        return _this;
-    }
-    ExhaustMapSubscriber.prototype._next = function (value) {
-        if (!this.hasSubscription) {
-            this.tryNext(value);
-        }
-    };
-    ExhaustMapSubscriber.prototype.tryNext = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.hasSubscription = true;
-        this._innerSub(result, value, index);
-    };
-    ExhaustMapSubscriber.prototype._innerSub = function (result, value, index) {
-        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index, innerSubscriber);
-    };
-    ExhaustMapSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (!this.hasSubscription) {
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    ExhaustMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    ExhaustMapSubscriber.prototype.notifyError = function (err) {
-        this.destination.error(err);
-    };
-    ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.hasSubscription = false;
-        if (this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return ExhaustMapSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=exhaustMap.js.map
-
-
-/***/ }),
-/* 862 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = expand;
-/* unused harmony export ExpandOperator */
-/* unused harmony export ExpandSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-function expand(project, concurrent, scheduler) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (scheduler === void 0) {
-        scheduler = undefined;
-    }
-    concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent;
-    return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); };
-}
-var ExpandOperator = /*@__PURE__*/ (function () {
-    function ExpandOperator(project, concurrent, scheduler) {
-        this.project = project;
-        this.concurrent = concurrent;
-        this.scheduler = scheduler;
-    }
-    ExpandOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler));
-    };
-    return ExpandOperator;
-}());
-
-var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ExpandSubscriber, _super);
-    function ExpandSubscriber(destination, project, concurrent, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.concurrent = concurrent;
-        _this.scheduler = scheduler;
-        _this.index = 0;
-        _this.active = 0;
-        _this.hasCompleted = false;
-        if (concurrent < Number.POSITIVE_INFINITY) {
-            _this.buffer = [];
-        }
-        return _this;
-    }
-    ExpandSubscriber.dispatch = function (arg) {
-        var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index;
-        subscriber.subscribeToProjection(result, value, index);
-    };
-    ExpandSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        if (destination.closed) {
-            this._complete();
-            return;
-        }
-        var index = this.index++;
-        if (this.active < this.concurrent) {
-            destination.next(value);
-            var result = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_tryCatch__["a" /* tryCatch */])(this.project)(value, index);
-            if (result === __WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */]) {
-                destination.error(__WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */].e);
-            }
-            else if (!this.scheduler) {
-                this.subscribeToProjection(result, value, index);
-            }
-            else {
-                var state = { subscriber: this, result: result, value: value, index: index };
-                var destination_1 = this.destination;
-                destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state));
-            }
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) {
-        this.active++;
-        var destination = this.destination;
-        destination.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index));
-    };
-    ExpandSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (this.hasCompleted && this.active === 0) {
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    ExpandSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this._next(innerValue);
-    };
-    ExpandSubscriber.prototype.notifyComplete = function (innerSub) {
-        var buffer = this.buffer;
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.active--;
-        if (buffer && buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        if (this.hasCompleted && this.active === 0) {
-            this.destination.complete();
-        }
-    };
-    return ExpandSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-
-//# sourceMappingURL=expand.js.map
-
-
-/***/ }),
-/* 863 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = finalize;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */
-
-
-
-function finalize(callback) {
-    return function (source) { return source.lift(new FinallyOperator(callback)); };
-}
-var FinallyOperator = /*@__PURE__*/ (function () {
-    function FinallyOperator(callback) {
-        this.callback = callback;
-    }
-    FinallyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new FinallySubscriber(subscriber, this.callback));
-    };
-    return FinallyOperator;
-}());
-var FinallySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FinallySubscriber, _super);
-    function FinallySubscriber(destination, callback) {
-        var _this = _super.call(this, destination) || this;
-        _this.add(new __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */](callback));
-        return _this;
-    }
-    return FinallySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=finalize.js.map
-
-
-/***/ }),
-/* 864 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = findIndex;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__operators_find__ = __webpack_require__(432);
-/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
-
-function findIndex(predicate, thisArg) {
-    return function (source) { return source.lift(new __WEBPACK_IMPORTED_MODULE_0__operators_find__["b" /* FindValueOperator */](predicate, source, true, thisArg)); };
-}
-//# sourceMappingURL=findIndex.js.map
-
-
-/***/ }),
-/* 865 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = first;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(153);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__take__ = __webpack_require__(319);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(146);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__ = __webpack_require__(188);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(118);
-/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
-
-
-
-
-
-
-function first(predicate, defaultValue) {
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) { return source.pipe(predicate ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(function (v, i) { return predicate(v, i, source); }) : __WEBPACK_IMPORTED_MODULE_5__util_identity__["a" /* identity */], __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__take__["a" /* take */])(1), hasDefaultValue ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__["a" /* defaultIfEmpty */])(defaultValue) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__["a" /* throwIfEmpty */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__["a" /* EmptyError */](); })); };
-}
-//# sourceMappingURL=first.js.map
-
-
-/***/ }),
-/* 866 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = ignoreElements;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function ignoreElements() {
-    return function ignoreElementsOperatorFunction(source) {
-        return source.lift(new IgnoreElementsOperator());
-    };
-}
-var IgnoreElementsOperator = /*@__PURE__*/ (function () {
-    function IgnoreElementsOperator() {
-    }
-    IgnoreElementsOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new IgnoreElementsSubscriber(subscriber));
-    };
-    return IgnoreElementsOperator;
-}());
-var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](IgnoreElementsSubscriber, _super);
-    function IgnoreElementsSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    IgnoreElementsSubscriber.prototype._next = function (unused) {
-    };
-    return IgnoreElementsSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=ignoreElements.js.map
-
-
-/***/ }),
-/* 867 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isEmpty;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function isEmpty() {
-    return function (source) { return source.lift(new IsEmptyOperator()); };
-}
-var IsEmptyOperator = /*@__PURE__*/ (function () {
-    function IsEmptyOperator() {
-    }
-    IsEmptyOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new IsEmptySubscriber(observer));
-    };
-    return IsEmptyOperator;
-}());
-var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](IsEmptySubscriber, _super);
-    function IsEmptySubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) {
-        var destination = this.destination;
-        destination.next(isEmpty);
-        destination.complete();
-    };
-    IsEmptySubscriber.prototype._next = function (value) {
-        this.notifyComplete(false);
-    };
-    IsEmptySubscriber.prototype._complete = function () {
-        this.notifyComplete(true);
-    };
-    return IsEmptySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=isEmpty.js.map
-
-
-/***/ }),
-/* 868 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = last;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(153);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__takeLast__ = __webpack_require__(320);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__ = __webpack_require__(188);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__ = __webpack_require__(146);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(118);
-/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
-
-
-
-
-
-
-function last(predicate, defaultValue) {
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) { return source.pipe(predicate ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(function (v, i) { return predicate(v, i, source); }) : __WEBPACK_IMPORTED_MODULE_5__util_identity__["a" /* identity */], __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__takeLast__["a" /* takeLast */])(1), hasDefaultValue ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__["a" /* defaultIfEmpty */])(defaultValue) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__["a" /* throwIfEmpty */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__["a" /* EmptyError */](); })); };
-}
-//# sourceMappingURL=last.js.map
-
-
-/***/ }),
-/* 869 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = mapTo;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function mapTo(value) {
-    return function (source) { return source.lift(new MapToOperator(value)); };
-}
-var MapToOperator = /*@__PURE__*/ (function () {
-    function MapToOperator(value) {
-        this.value = value;
-    }
-    MapToOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MapToSubscriber(subscriber, this.value));
-    };
-    return MapToOperator;
-}());
-var MapToSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MapToSubscriber, _super);
-    function MapToSubscriber(destination, value) {
-        var _this = _super.call(this, destination) || this;
-        _this.value = value;
-        return _this;
-    }
-    MapToSubscriber.prototype._next = function (x) {
-        this.destination.next(this.value);
-    };
-    return MapToSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=mapTo.js.map
-
-
-/***/ }),
-/* 870 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = materialize;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(184);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
-
-
-
-function materialize() {
-    return function materializeOperatorFunction(source) {
-        return source.lift(new MaterializeOperator());
-    };
-}
-var MaterializeOperator = /*@__PURE__*/ (function () {
-    function MaterializeOperator() {
-    }
-    MaterializeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MaterializeSubscriber(subscriber));
-    };
-    return MaterializeOperator;
-}());
-var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MaterializeSubscriber, _super);
-    function MaterializeSubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    MaterializeSubscriber.prototype._next = function (value) {
-        this.destination.next(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createNext(value));
-    };
-    MaterializeSubscriber.prototype._error = function (err) {
-        var destination = this.destination;
-        destination.next(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createError(err));
-        destination.complete();
-    };
-    MaterializeSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        destination.next(__WEBPACK_IMPORTED_MODULE_2__Notification__["a" /* Notification */].createComplete());
-        destination.complete();
-    };
-    return MaterializeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=materialize.js.map
-
-
-/***/ }),
-/* 871 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = max;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
-
-function max(comparer) {
-    var max = (typeof comparer === 'function')
-        ? function (x, y) { return comparer(x, y) > 0 ? x : y; }
-        : function (x, y) { return x > y ? x : y; };
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__reduce__["a" /* reduce */])(max);
-}
-//# sourceMappingURL=max.js.map
-
-
-/***/ }),
-/* 872 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = merge;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_merge__ = __webpack_require__(424);
-/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */
-
-function merge() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function (source) { return source.lift.call(__WEBPACK_IMPORTED_MODULE_0__observable_merge__["a" /* merge */].apply(void 0, [source].concat(observables))); };
-}
-//# sourceMappingURL=merge.js.map
-
-
-/***/ }),
-/* 873 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = mergeMapTo;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
-/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
-
-function mergeMapTo(innerObservable, resultSelector, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (typeof resultSelector === 'function') {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(function () { return innerObservable; }, resultSelector, concurrent);
-    }
-    if (typeof resultSelector === 'number') {
-        concurrent = resultSelector;
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(function () { return innerObservable; }, concurrent);
-}
-//# sourceMappingURL=mergeMapTo.js.map
-
-
-/***/ }),
-/* 874 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = mergeScan;
-/* unused harmony export MergeScanOperator */
-/* unused harmony export MergeScanSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__InnerSubscriber__ = __webpack_require__(84);
-/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */
-
-
-
-
-
-
-function mergeScan(accumulator, seed, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); };
-}
-var MergeScanOperator = /*@__PURE__*/ (function () {
-    function MergeScanOperator(accumulator, seed, concurrent) {
-        this.accumulator = accumulator;
-        this.seed = seed;
-        this.concurrent = concurrent;
-    }
-    MergeScanOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent));
-    };
-    return MergeScanOperator;
-}());
-
-var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MergeScanSubscriber, _super);
-    function MergeScanSubscriber(destination, accumulator, acc, concurrent) {
-        var _this = _super.call(this, destination) || this;
-        _this.accumulator = accumulator;
-        _this.acc = acc;
-        _this.concurrent = concurrent;
-        _this.hasValue = false;
-        _this.hasCompleted = false;
-        _this.buffer = [];
-        _this.active = 0;
-        _this.index = 0;
-        return _this;
-    }
-    MergeScanSubscriber.prototype._next = function (value) {
-        if (this.active < this.concurrent) {
-            var index = this.index++;
-            var ish = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__util_tryCatch__["a" /* tryCatch */])(this.accumulator)(this.acc, value);
-            var destination = this.destination;
-            if (ish === __WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */]) {
-                destination.error(__WEBPACK_IMPORTED_MODULE_2__util_errorObject__["a" /* errorObject */].e);
-            }
-            else {
-                this.active++;
-                this._innerSub(ish, value, index);
-            }
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    MergeScanSubscriber.prototype._innerSub = function (ish, value, index) {
-        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_5__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(this, ish, value, index, innerSubscriber);
-    };
-    MergeScanSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (this.active === 0 && this.buffer.length === 0) {
-            if (this.hasValue === false) {
-                this.destination.next(this.acc);
-            }
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var destination = this.destination;
-        this.acc = innerValue;
-        this.hasValue = true;
-        destination.next(innerValue);
-    };
-    MergeScanSubscriber.prototype.notifyComplete = function (innerSub) {
-        var buffer = this.buffer;
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.active--;
-        if (buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        else if (this.active === 0 && this.hasCompleted) {
-            if (this.hasValue === false) {
-                this.destination.next(this.acc);
-            }
-            this.destination.complete();
-        }
-    };
-    return MergeScanSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
-
-//# sourceMappingURL=mergeScan.js.map
-
-
-/***/ }),
-/* 875 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = min;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
-
-function min(comparer) {
-    var min = (typeof comparer === 'function')
-        ? function (x, y) { return comparer(x, y) < 0 ? x : y; }
-        : function (x, y) { return x < y ? x : y; };
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__reduce__["a" /* reduce */])(min);
-}
-//# sourceMappingURL=min.js.map
-
-
-/***/ }),
-/* 876 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = onErrorResumeNext;
-/* unused harmony export onErrorResumeNextStatic */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_from__ = __webpack_require__(62);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-
-function onErrorResumeNext() {
-    var nextSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        nextSources[_i] = arguments[_i];
-    }
-    if (nextSources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(nextSources[0])) {
-        nextSources = nextSources[0];
-    }
-    return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); };
-}
-function onErrorResumeNextStatic() {
-    var nextSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        nextSources[_i] = arguments[_i];
-    }
-    var source = null;
-    if (nextSources.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(nextSources[0])) {
-        nextSources = nextSources[0];
-    }
-    source = nextSources.shift();
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_from__["a" /* from */])(source, null).lift(new OnErrorResumeNextOperator(nextSources));
-}
-var OnErrorResumeNextOperator = /*@__PURE__*/ (function () {
-    function OnErrorResumeNextOperator(nextSources) {
-        this.nextSources = nextSources;
-    }
-    OnErrorResumeNextOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources));
-    };
-    return OnErrorResumeNextOperator;
-}());
-var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](OnErrorResumeNextSubscriber, _super);
-    function OnErrorResumeNextSubscriber(destination, nextSources) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.nextSources = nextSources;
-        return _this;
-    }
-    OnErrorResumeNextSubscriber.prototype.notifyError = function (error, innerSub) {
-        this.subscribeToNextSource();
-    };
-    OnErrorResumeNextSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.subscribeToNextSource();
-    };
-    OnErrorResumeNextSubscriber.prototype._error = function (err) {
-        this.subscribeToNextSource();
-        this.unsubscribe();
-    };
-    OnErrorResumeNextSubscriber.prototype._complete = function () {
-        this.subscribeToNextSource();
-        this.unsubscribe();
-    };
-    OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () {
-        var next = this.nextSources.shift();
-        if (next) {
-            var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_4__InnerSubscriber__["a" /* InnerSubscriber */](this, undefined, undefined);
-            var destination = this.destination;
-            destination.add(innerSubscriber);
-            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, next, undefined, undefined, innerSubscriber);
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    return OnErrorResumeNextSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=onErrorResumeNext.js.map
-
-
-/***/ }),
-/* 877 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = pairwise;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function pairwise() {
-    return function (source) { return source.lift(new PairwiseOperator()); };
-}
-var PairwiseOperator = /*@__PURE__*/ (function () {
-    function PairwiseOperator() {
-    }
-    PairwiseOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new PairwiseSubscriber(subscriber));
-    };
-    return PairwiseOperator;
-}());
-var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](PairwiseSubscriber, _super);
-    function PairwiseSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasPrev = false;
-        return _this;
-    }
-    PairwiseSubscriber.prototype._next = function (value) {
-        if (this.hasPrev) {
-            this.destination.next([this.prev, value]);
-        }
-        else {
-            this.hasPrev = true;
-        }
-        this.prev = value;
-    };
-    return PairwiseSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=pairwise.js.map
-
-
-/***/ }),
-/* 878 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = partition;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_not__ = __webpack_require__(931);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
-/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */
-
-
-function partition(predicate, thisArg) {
-    return function (source) {
-        return [
-            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(predicate, thisArg)(source),
-            __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__filter__["a" /* filter */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_not__["a" /* not */])(predicate, thisArg))(source)
-        ];
-    };
-}
-//# sourceMappingURL=partition.js.map
-
-
-/***/ }),
-/* 879 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = pluck;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
-
-function pluck() {
-    var properties = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        properties[_i] = arguments[_i];
-    }
-    var length = properties.length;
-    if (length === 0) {
-        throw new Error('list of properties cannot be empty.');
-    }
-    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__map__["a" /* map */])(plucker(properties, length))(source); };
-}
-function plucker(props, length) {
-    var mapper = function (x) {
-        var currentProp = x;
-        for (var i = 0; i < length; i++) {
-            var p = currentProp[props[i]];
-            if (typeof p !== 'undefined') {
-                currentProp = p;
-            }
-            else {
-                return undefined;
-            }
-        }
-        return currentProp;
-    };
-    return mapper;
-}
-//# sourceMappingURL=pluck.js.map
-
-
-/***/ }),
-/* 880 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = publish;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
-/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
-
-
-function publish(selector) {
-    return selector ?
-        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(function () { return new __WEBPACK_IMPORTED_MODULE_0__Subject__["a" /* Subject */](); }, selector) :
-        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(new __WEBPACK_IMPORTED_MODULE_0__Subject__["a" /* Subject */]());
-}
-//# sourceMappingURL=publish.js.map
-
-
-/***/ }),
-/* 881 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = publishBehavior;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__ = __webpack_require__(419);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
-/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
-
-
-function publishBehavior(value) {
-    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(new __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__["a" /* BehaviorSubject */](value))(source); };
-}
-//# sourceMappingURL=publishBehavior.js.map
-
-
-/***/ }),
-/* 882 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = publishLast;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
-/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
-
-
-function publishLast() {
-    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(new __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__["a" /* AsyncSubject */]())(source); };
-}
-//# sourceMappingURL=publishLast.js.map
-
-
-/***/ }),
-/* 883 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = publishReplay;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(308);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
-/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
-
-
-function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
-    if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') {
-        scheduler = selectorOrScheduler;
-    }
-    var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined;
-    var subject = new __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__["a" /* ReplaySubject */](bufferSize, windowTime, scheduler);
-    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__multicast__["a" /* multicast */])(function () { return subject; }, selector)(source); };
-}
-//# sourceMappingURL=publishReplay.js.map
-
-
-/***/ }),
-/* 884 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = race;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_race__ = __webpack_require__(426);
-/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */
-
-
-function race() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function raceOperatorFunction(source) {
-        if (observables.length === 1 && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(observables[0])) {
-            observables = observables[0];
-        }
-        return source.lift.call(__WEBPACK_IMPORTED_MODULE_1__observable_race__["a" /* race */].apply(void 0, [source].concat(observables)));
-    };
-}
-//# sourceMappingURL=race.js.map
-
-
-/***/ }),
-/* 885 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = repeat;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
-/** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */
-
-
-
-function repeat(count) {
-    if (count === void 0) {
-        count = -1;
-    }
-    return function (source) {
-        if (count === 0) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_empty__["a" /* empty */])();
-        }
-        else if (count < 0) {
-            return source.lift(new RepeatOperator(-1, source));
-        }
-        else {
-            return source.lift(new RepeatOperator(count - 1, source));
-        }
-    };
-}
-var RepeatOperator = /*@__PURE__*/ (function () {
-    function RepeatOperator(count, source) {
-        this.count = count;
-        this.source = source;
-    }
-    RepeatOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source));
-    };
-    return RepeatOperator;
-}());
-var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RepeatSubscriber, _super);
-    function RepeatSubscriber(destination, count, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.count = count;
-        _this.source = source;
-        return _this;
-    }
-    RepeatSubscriber.prototype.complete = function () {
-        if (!this.isStopped) {
-            var _a = this, source = _a.source, count = _a.count;
-            if (count === 0) {
-                return _super.prototype.complete.call(this);
-            }
-            else if (count > -1) {
-                this.count = count - 1;
-            }
-            source.subscribe(this._unsubscribeAndRecycle());
-        }
-    };
-    return RepeatSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=repeat.js.map
-
-
-/***/ }),
-/* 886 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = repeatWhen;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-
-function repeatWhen(notifier) {
-    return function (source) { return source.lift(new RepeatWhenOperator(notifier)); };
-}
-var RepeatWhenOperator = /*@__PURE__*/ (function () {
-    function RepeatWhenOperator(notifier) {
-        this.notifier = notifier;
-    }
-    RepeatWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source));
-    };
-    return RepeatWhenOperator;
-}());
-var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RepeatWhenSubscriber, _super);
-    function RepeatWhenSubscriber(destination, notifier, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.notifier = notifier;
-        _this.source = source;
-        _this.sourceIsBeingSubscribedTo = true;
-        return _this;
-    }
-    RepeatWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.sourceIsBeingSubscribedTo = true;
-        this.source.subscribe(this);
-    };
-    RepeatWhenSubscriber.prototype.notifyComplete = function (innerSub) {
-        if (this.sourceIsBeingSubscribedTo === false) {
-            return _super.prototype.complete.call(this);
-        }
-    };
-    RepeatWhenSubscriber.prototype.complete = function () {
-        this.sourceIsBeingSubscribedTo = false;
-        if (!this.isStopped) {
-            if (!this.retries) {
-                this.subscribeToRetries();
-            }
-            if (!this.retriesSubscription || this.retriesSubscription.closed) {
-                return _super.prototype.complete.call(this);
-            }
-            this._unsubscribeAndRecycle();
-            this.notifications.next();
-        }
-    };
-    RepeatWhenSubscriber.prototype._unsubscribe = function () {
-        var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription;
-        if (notifications) {
-            notifications.unsubscribe();
-            this.notifications = null;
-        }
-        if (retriesSubscription) {
-            retriesSubscription.unsubscribe();
-            this.retriesSubscription = null;
-        }
-        this.retries = null;
-    };
-    RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () {
-        var _unsubscribe = this._unsubscribe;
-        this._unsubscribe = null;
-        _super.prototype._unsubscribeAndRecycle.call(this);
-        this._unsubscribe = _unsubscribe;
-        return this;
-    };
-    RepeatWhenSubscriber.prototype.subscribeToRetries = function () {
-        this.notifications = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
-        var retries = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.notifier)(this.notifications);
-        if (retries === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-            return _super.prototype.complete.call(this);
-        }
-        this.retries = retries;
-        this.retriesSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, retries);
-    };
-    return RepeatWhenSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=repeatWhen.js.map
-
-
-/***/ }),
-/* 887 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = retry;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function retry(count) {
-    if (count === void 0) {
-        count = -1;
-    }
-    return function (source) { return source.lift(new RetryOperator(count, source)); };
-}
-var RetryOperator = /*@__PURE__*/ (function () {
-    function RetryOperator(count, source) {
-        this.count = count;
-        this.source = source;
-    }
-    RetryOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source));
-    };
-    return RetryOperator;
-}());
-var RetrySubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RetrySubscriber, _super);
-    function RetrySubscriber(destination, count, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.count = count;
-        _this.source = source;
-        return _this;
-    }
-    RetrySubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var _a = this, source = _a.source, count = _a.count;
-            if (count === 0) {
-                return _super.prototype.error.call(this, err);
-            }
-            else if (count > -1) {
-                this.count = count - 1;
-            }
-            source.subscribe(this._unsubscribeAndRecycle());
-        }
-    };
-    return RetrySubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=retry.js.map
-
-
-/***/ }),
-/* 888 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = retryWhen;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-
-function retryWhen(notifier) {
-    return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); };
-}
-var RetryWhenOperator = /*@__PURE__*/ (function () {
-    function RetryWhenOperator(notifier, source) {
-        this.notifier = notifier;
-        this.source = source;
-    }
-    RetryWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
-    };
-    return RetryWhenOperator;
-}());
-var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RetryWhenSubscriber, _super);
-    function RetryWhenSubscriber(destination, notifier, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.notifier = notifier;
-        _this.source = source;
-        return _this;
-    }
-    RetryWhenSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var errors = this.errors;
-            var retries = this.retries;
-            var retriesSubscription = this.retriesSubscription;
-            if (!retries) {
-                errors = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
-                retries = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.notifier)(errors);
-                if (retries === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-                    return _super.prototype.error.call(this, __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
-                }
-                retriesSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, retries);
-            }
-            else {
-                this.errors = null;
-                this.retriesSubscription = null;
-            }
-            this._unsubscribeAndRecycle();
-            this.errors = errors;
-            this.retries = retries;
-            this.retriesSubscription = retriesSubscription;
-            errors.next(err);
-        }
-    };
-    RetryWhenSubscriber.prototype._unsubscribe = function () {
-        var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription;
-        if (errors) {
-            errors.unsubscribe();
-            this.errors = null;
-        }
-        if (retriesSubscription) {
-            retriesSubscription.unsubscribe();
-            this.retriesSubscription = null;
-        }
-        this.retries = null;
-    };
-    RetryWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var _unsubscribe = this._unsubscribe;
-        this._unsubscribe = null;
-        this._unsubscribeAndRecycle();
-        this._unsubscribe = _unsubscribe;
-        this.source.subscribe(this);
-    };
-    return RetryWhenSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=retryWhen.js.map
-
-
-/***/ }),
-/* 889 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = sample;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function sample(notifier) {
-    return function (source) { return source.lift(new SampleOperator(notifier)); };
-}
-var SampleOperator = /*@__PURE__*/ (function () {
-    function SampleOperator(notifier) {
-        this.notifier = notifier;
-    }
-    SampleOperator.prototype.call = function (subscriber, source) {
-        var sampleSubscriber = new SampleSubscriber(subscriber);
-        var subscription = source.subscribe(sampleSubscriber);
-        subscription.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(sampleSubscriber, this.notifier));
-        return subscription;
-    };
-    return SampleOperator;
-}());
-var SampleSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SampleSubscriber, _super);
-    function SampleSubscriber() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.hasValue = false;
-        return _this;
-    }
-    SampleSubscriber.prototype._next = function (value) {
-        this.value = value;
-        this.hasValue = true;
-    };
-    SampleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.emitValue();
-    };
-    SampleSubscriber.prototype.notifyComplete = function () {
-        this.emitValue();
-    };
-    SampleSubscriber.prototype.emitValue = function () {
-        if (this.hasValue) {
-            this.hasValue = false;
-            this.destination.next(this.value);
-        }
-    };
-    return SampleSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=sample.js.map
-
-
-/***/ }),
-/* 890 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = sampleTime;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
-/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
-
-
-
-function sampleTime(period, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
-    }
-    return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); };
-}
-var SampleTimeOperator = /*@__PURE__*/ (function () {
-    function SampleTimeOperator(period, scheduler) {
-        this.period = period;
-        this.scheduler = scheduler;
-    }
-    SampleTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler));
-    };
-    return SampleTimeOperator;
-}());
-var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SampleTimeSubscriber, _super);
-    function SampleTimeSubscriber(destination, period, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.period = period;
-        _this.scheduler = scheduler;
-        _this.hasValue = false;
-        _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period }));
-        return _this;
-    }
-    SampleTimeSubscriber.prototype._next = function (value) {
-        this.lastValue = value;
-        this.hasValue = true;
-    };
-    SampleTimeSubscriber.prototype.notifyNext = function () {
-        if (this.hasValue) {
-            this.hasValue = false;
-            this.destination.next(this.lastValue);
-        }
-    };
-    return SampleTimeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-function dispatchNotification(state) {
-    var subscriber = state.subscriber, period = state.period;
-    subscriber.notifyNext();
-    this.schedule(state, period);
-}
-//# sourceMappingURL=sampleTime.js.map
-
-
-/***/ }),
-/* 891 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = sequenceEqual;
-/* unused harmony export SequenceEqualOperator */
-/* unused harmony export SequenceEqualSubscriber */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
-
-
-
-
-function sequenceEqual(compareTo, comparor) {
-    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparor)); };
-}
-var SequenceEqualOperator = /*@__PURE__*/ (function () {
-    function SequenceEqualOperator(compareTo, comparor) {
-        this.compareTo = compareTo;
-        this.comparor = comparor;
-    }
-    SequenceEqualOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparor));
-    };
-    return SequenceEqualOperator;
-}());
-
-var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SequenceEqualSubscriber, _super);
-    function SequenceEqualSubscriber(destination, compareTo, comparor) {
-        var _this = _super.call(this, destination) || this;
-        _this.compareTo = compareTo;
-        _this.comparor = comparor;
-        _this._a = [];
-        _this._b = [];
-        _this._oneComplete = false;
-        _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
-        return _this;
-    }
-    SequenceEqualSubscriber.prototype._next = function (value) {
-        if (this._oneComplete && this._b.length === 0) {
-            this.emit(false);
-        }
-        else {
-            this._a.push(value);
-            this.checkValues();
-        }
-    };
-    SequenceEqualSubscriber.prototype._complete = function () {
-        if (this._oneComplete) {
-            this.emit(this._a.length === 0 && this._b.length === 0);
-        }
-        else {
-            this._oneComplete = true;
-        }
-        this.unsubscribe();
-    };
-    SequenceEqualSubscriber.prototype.checkValues = function () {
-        var _c = this, _a = _c._a, _b = _c._b, comparor = _c.comparor;
-        while (_a.length > 0 && _b.length > 0) {
-            var a = _a.shift();
-            var b = _b.shift();
-            var areEqual = false;
-            if (comparor) {
-                areEqual = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(comparor)(a, b);
-                if (areEqual === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-                    this.destination.error(__WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e);
-                }
-            }
-            else {
-                areEqual = a === b;
-            }
-            if (!areEqual) {
-                this.emit(false);
-            }
-        }
-    };
-    SequenceEqualSubscriber.prototype.emit = function (value) {
-        var destination = this.destination;
-        destination.next(value);
-        destination.complete();
-    };
-    SequenceEqualSubscriber.prototype.nextB = function (value) {
-        if (this._oneComplete && this._a.length === 0) {
-            this.emit(false);
-        }
-        else {
-            this._b.push(value);
-            this.checkValues();
-        }
-    };
-    SequenceEqualSubscriber.prototype.completeB = function () {
-        if (this._oneComplete) {
-            this.emit(this._a.length === 0 && this._b.length === 0);
-        }
-        else {
-            this._oneComplete = true;
-        }
-    };
-    return SequenceEqualSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-
-var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SequenceEqualCompareToSubscriber, _super);
-    function SequenceEqualCompareToSubscriber(destination, parent) {
-        var _this = _super.call(this, destination) || this;
-        _this.parent = parent;
-        return _this;
-    }
-    SequenceEqualCompareToSubscriber.prototype._next = function (value) {
-        this.parent.nextB(value);
-    };
-    SequenceEqualCompareToSubscriber.prototype._error = function (err) {
-        this.parent.error(err);
-        this.unsubscribe();
-    };
-    SequenceEqualCompareToSubscriber.prototype._complete = function () {
-        this.parent.completeB();
-        this.unsubscribe();
-    };
-    return SequenceEqualCompareToSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=sequenceEqual.js.map
-
-
-/***/ }),
-/* 892 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = share;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__multicast__ = __webpack_require__(116);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__refCount__ = __webpack_require__(316);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(36);
-/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
-
-
-
-function shareSubjectFactory() {
-    return new __WEBPACK_IMPORTED_MODULE_2__Subject__["a" /* Subject */]();
-}
-function share() {
-    return function (source) { return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__refCount__["a" /* refCount */])()(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__multicast__["a" /* multicast */])(shareSubjectFactory)(source)); };
-}
-//# sourceMappingURL=share.js.map
-
-
-/***/ }),
-/* 893 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = shareReplay;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(308);
-/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */
-
-function shareReplay(bufferSize, windowTime, scheduler) {
-    if (bufferSize === void 0) {
-        bufferSize = Number.POSITIVE_INFINITY;
-    }
-    if (windowTime === void 0) {
-        windowTime = Number.POSITIVE_INFINITY;
-    }
-    return function (source) { return source.lift(shareReplayOperator(bufferSize, windowTime, scheduler)); };
-}
-function shareReplayOperator(bufferSize, windowTime, scheduler) {
-    var subject;
-    var refCount = 0;
-    var subscription;
-    var hasError = false;
-    var isComplete = false;
-    return function shareReplayOperation(source) {
-        refCount++;
-        if (!subject || hasError) {
-            hasError = false;
-            subject = new __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__["a" /* ReplaySubject */](bufferSize, windowTime, scheduler);
-            subscription = source.subscribe({
-                next: function (value) { subject.next(value); },
-                error: function (err) {
-                    hasError = true;
-                    subject.error(err);
-                },
-                complete: function () {
-                    isComplete = true;
-                    subject.complete();
-                },
-            });
-        }
-        var innerSub = subject.subscribe(this);
-        return function () {
-            refCount--;
-            innerSub.unsubscribe();
-            if (subscription && refCount === 0 && isComplete) {
-                subscription.unsubscribe();
-            }
-        };
-    };
-}
-//# sourceMappingURL=shareReplay.js.map
-
-
-/***/ }),
-/* 894 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = single;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_EmptyError__ = __webpack_require__(153);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */
-
-
-
-function single(predicate) {
-    return function (source) { return source.lift(new SingleOperator(predicate, source)); };
-}
-var SingleOperator = /*@__PURE__*/ (function () {
-    function SingleOperator(predicate, source) {
-        this.predicate = predicate;
-        this.source = source;
-    }
-    SingleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source));
-    };
-    return SingleOperator;
-}());
-var SingleSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SingleSubscriber, _super);
-    function SingleSubscriber(destination, predicate, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.seenValue = false;
-        _this.index = 0;
-        return _this;
-    }
-    SingleSubscriber.prototype.applySingleValue = function (value) {
-        if (this.seenValue) {
-            this.destination.error('Sequence contains more than one element');
-        }
-        else {
-            this.seenValue = true;
-            this.singleValue = value;
-        }
-    };
-    SingleSubscriber.prototype._next = function (value) {
-        var index = this.index++;
-        if (this.predicate) {
-            this.tryNext(value, index);
-        }
-        else {
-            this.applySingleValue(value);
-        }
-    };
-    SingleSubscriber.prototype.tryNext = function (value, index) {
-        try {
-            if (this.predicate(value, index, this.source)) {
-                this.applySingleValue(value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    SingleSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        if (this.index > 0) {
-            destination.next(this.seenValue ? this.singleValue : undefined);
-            destination.complete();
-        }
-        else {
-            destination.error(new __WEBPACK_IMPORTED_MODULE_2__util_EmptyError__["a" /* EmptyError */]);
-        }
-    };
-    return SingleSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=single.js.map
-
-
-/***/ }),
-/* 895 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = skip;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function skip(count) {
-    return function (source) { return source.lift(new SkipOperator(count)); };
-}
-var SkipOperator = /*@__PURE__*/ (function () {
-    function SkipOperator(total) {
-        this.total = total;
-    }
-    SkipOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SkipSubscriber(subscriber, this.total));
-    };
-    return SkipOperator;
-}());
-var SkipSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipSubscriber, _super);
-    function SkipSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.count = 0;
-        return _this;
-    }
-    SkipSubscriber.prototype._next = function (x) {
-        if (++this.count > this.total) {
-            this.destination.next(x);
-        }
-    };
-    return SkipSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=skip.js.map
-
-
-/***/ }),
-/* 896 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = skipLast;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */
-
-
-
-function skipLast(count) {
-    return function (source) { return source.lift(new SkipLastOperator(count)); };
-}
-var SkipLastOperator = /*@__PURE__*/ (function () {
-    function SkipLastOperator(_skipCount) {
-        this._skipCount = _skipCount;
-        if (this._skipCount < 0) {
-            throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */];
-        }
-    }
-    SkipLastOperator.prototype.call = function (subscriber, source) {
-        if (this._skipCount === 0) {
-            return source.subscribe(new __WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */](subscriber));
-        }
-        else {
-            return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount));
-        }
-    };
-    return SkipLastOperator;
-}());
-var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipLastSubscriber, _super);
-    function SkipLastSubscriber(destination, _skipCount) {
-        var _this = _super.call(this, destination) || this;
-        _this._skipCount = _skipCount;
-        _this._count = 0;
-        _this._ring = new Array(_skipCount);
-        return _this;
-    }
-    SkipLastSubscriber.prototype._next = function (value) {
-        var skipCount = this._skipCount;
-        var count = this._count++;
-        if (count < skipCount) {
-            this._ring[count] = value;
-        }
-        else {
-            var currentIndex = count % skipCount;
-            var ring = this._ring;
-            var oldValue = ring[currentIndex];
-            ring[currentIndex] = value;
-            this.destination.next(oldValue);
-        }
-    };
-    return SkipLastSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=skipLast.js.map
-
-
-/***/ }),
-/* 897 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = skipUntil;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__ = __webpack_require__(84);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-function skipUntil(notifier) {
-    return function (source) { return source.lift(new SkipUntilOperator(notifier)); };
-}
-var SkipUntilOperator = /*@__PURE__*/ (function () {
-    function SkipUntilOperator(notifier) {
-        this.notifier = notifier;
-    }
-    SkipUntilOperator.prototype.call = function (destination, source) {
-        return source.subscribe(new SkipUntilSubscriber(destination, this.notifier));
-    };
-    return SkipUntilOperator;
-}());
-var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipUntilSubscriber, _super);
-    function SkipUntilSubscriber(destination, notifier) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasValue = false;
-        var innerSubscriber = new __WEBPACK_IMPORTED_MODULE_2__InnerSubscriber__["a" /* InnerSubscriber */](_this, undefined, undefined);
-        _this.add(innerSubscriber);
-        _this.innerSubscription = innerSubscriber;
-        __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(_this, notifier, undefined, undefined, innerSubscriber);
-        return _this;
-    }
-    SkipUntilSubscriber.prototype._next = function (value) {
-        if (this.hasValue) {
-            _super.prototype._next.call(this, value);
-        }
-    };
-    SkipUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.hasValue = true;
-        if (this.innerSubscription) {
-            this.innerSubscription.unsubscribe();
-        }
-    };
-    SkipUntilSubscriber.prototype.notifyComplete = function () {
-    };
-    return SkipUntilSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=skipUntil.js.map
-
-
-/***/ }),
-/* 898 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = skipWhile;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function skipWhile(predicate) {
-    return function (source) { return source.lift(new SkipWhileOperator(predicate)); };
-}
-var SkipWhileOperator = /*@__PURE__*/ (function () {
-    function SkipWhileOperator(predicate) {
-        this.predicate = predicate;
-    }
-    SkipWhileOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate));
-    };
-    return SkipWhileOperator;
-}());
-var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SkipWhileSubscriber, _super);
-    function SkipWhileSubscriber(destination, predicate) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.skipping = true;
-        _this.index = 0;
-        return _this;
-    }
-    SkipWhileSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        if (this.skipping) {
-            this.tryCallPredicate(value);
-        }
-        if (!this.skipping) {
-            destination.next(value);
-        }
-    };
-    SkipWhileSubscriber.prototype.tryCallPredicate = function (value) {
-        try {
-            var result = this.predicate(value, this.index++);
-            this.skipping = Boolean(result);
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    return SkipWhileSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=skipWhile.js.map
-
-
-/***/ }),
-/* 899 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = startWith;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(85);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-
-function startWith() {
-    var array = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        array[_i] = arguments[_i];
-    }
-    return function (source) {
-        var scheduler = array[array.length - 1];
-        if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isScheduler__["a" /* isScheduler */])(scheduler)) {
-            array.pop();
-        }
-        else {
-            scheduler = null;
-        }
-        var len = array.length;
-        if (len === 1 && !scheduler) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__observable_scalar__["a" /* scalar */])(array[0]), source);
-        }
-        else if (len > 0) {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__observable_fromArray__["a" /* fromArray */])(array, scheduler), source);
-        }
-        else {
-            return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_concat__["a" /* concat */])(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_empty__["a" /* empty */])(scheduler), source);
-        }
-    };
-}
-//# sourceMappingURL=startWith.js.map
-
-
-/***/ }),
-/* 900 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = subscribeOn;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_SubscribeOnObservable__ = __webpack_require__(822);
-/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
-
-function subscribeOn(scheduler, delay) {
-    if (delay === void 0) {
-        delay = 0;
-    }
-    return function subscribeOnOperatorFunction(source) {
-        return source.lift(new SubscribeOnOperator(scheduler, delay));
-    };
-}
-var SubscribeOnOperator = /*@__PURE__*/ (function () {
-    function SubscribeOnOperator(scheduler, delay) {
-        this.scheduler = scheduler;
-        this.delay = delay;
-    }
-    SubscribeOnOperator.prototype.call = function (subscriber, source) {
-        return new __WEBPACK_IMPORTED_MODULE_0__observable_SubscribeOnObservable__["a" /* SubscribeOnObservable */](source, this.delay, this.scheduler).subscribe(subscriber);
-    };
-    return SubscribeOnOperator;
-}());
-//# sourceMappingURL=subscribeOn.js.map
-
-
-/***/ }),
-/* 901 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = switchAll;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(318);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
-/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
-
-
-function switchAll() {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__switchMap__["a" /* switchMap */])(__WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */]);
-}
-//# sourceMappingURL=switchAll.js.map
-
-
-/***/ }),
-/* 902 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = switchMapTo;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(318);
-/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
-
-function switchMapTo(innerObservable, resultSelector) {
-    return resultSelector ? __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__switchMap__["a" /* switchMap */])(function () { return innerObservable; }, resultSelector) : __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__switchMap__["a" /* switchMap */])(function () { return innerObservable; });
-}
-//# sourceMappingURL=switchMapTo.js.map
-
-
-/***/ }),
-/* 903 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = takeUntil;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function takeUntil(notifier) {
-    return function (source) { return source.lift(new TakeUntilOperator(notifier)); };
-}
-var TakeUntilOperator = /*@__PURE__*/ (function () {
-    function TakeUntilOperator(notifier) {
-        this.notifier = notifier;
-    }
-    TakeUntilOperator.prototype.call = function (subscriber, source) {
-        var takeUntilSubscriber = new TakeUntilSubscriber(subscriber);
-        var notifierSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(takeUntilSubscriber, this.notifier);
-        if (notifierSubscription && !takeUntilSubscriber.seenValue) {
-            takeUntilSubscriber.add(notifierSubscription);
-            return source.subscribe(takeUntilSubscriber);
-        }
-        return takeUntilSubscriber;
-    };
-    return TakeUntilOperator;
-}());
-var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeUntilSubscriber, _super);
-    function TakeUntilSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.seenValue = false;
-        return _this;
-    }
-    TakeUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.seenValue = true;
-        this.complete();
-    };
-    TakeUntilSubscriber.prototype.notifyComplete = function () {
-    };
-    return TakeUntilSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=takeUntil.js.map
-
-
-/***/ }),
-/* 904 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = takeWhile;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function takeWhile(predicate) {
-    return function (source) { return source.lift(new TakeWhileOperator(predicate)); };
-}
-var TakeWhileOperator = /*@__PURE__*/ (function () {
-    function TakeWhileOperator(predicate) {
-        this.predicate = predicate;
-    }
-    TakeWhileOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate));
-    };
-    return TakeWhileOperator;
-}());
-var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeWhileSubscriber, _super);
-    function TakeWhileSubscriber(destination, predicate) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.index = 0;
-        return _this;
-    }
-    TakeWhileSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        var result;
-        try {
-            result = this.predicate(value, this.index++);
-        }
-        catch (err) {
-            destination.error(err);
-            return;
-        }
-        this.nextOrComplete(value, result);
-    };
-    TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) {
-        var destination = this.destination;
-        if (Boolean(predicateResult)) {
-            destination.next(value);
-        }
-        else {
-            destination.complete();
-        }
-    };
-    return TakeWhileSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=takeWhile.js.map
-
-
-/***/ }),
-/* 905 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = throttleTime;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throttle__ = __webpack_require__(436);
-/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
-
-
-
-
-function throttleTime(duration, scheduler, config) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
-    }
-    if (config === void 0) {
-        config = __WEBPACK_IMPORTED_MODULE_3__throttle__["b" /* defaultThrottleConfig */];
-    }
-    return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); };
-}
-var ThrottleTimeOperator = /*@__PURE__*/ (function () {
-    function ThrottleTimeOperator(duration, scheduler, leading, trailing) {
-        this.duration = duration;
-        this.scheduler = scheduler;
-        this.leading = leading;
-        this.trailing = trailing;
-    }
-    ThrottleTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing));
-    };
-    return ThrottleTimeOperator;
-}());
-var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ThrottleTimeSubscriber, _super);
-    function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) {
-        var _this = _super.call(this, destination) || this;
-        _this.duration = duration;
-        _this.scheduler = scheduler;
-        _this.leading = leading;
-        _this.trailing = trailing;
-        _this._hasTrailingValue = false;
-        _this._trailingValue = null;
-        return _this;
-    }
-    ThrottleTimeSubscriber.prototype._next = function (value) {
-        if (this.throttled) {
-            if (this.trailing) {
-                this._trailingValue = value;
-                this._hasTrailingValue = true;
-            }
-        }
-        else {
-            this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this }));
-            if (this.leading) {
-                this.destination.next(value);
-            }
-        }
-    };
-    ThrottleTimeSubscriber.prototype._complete = function () {
-        if (this._hasTrailingValue) {
-            this.destination.next(this._trailingValue);
-            this.destination.complete();
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    ThrottleTimeSubscriber.prototype.clearThrottle = function () {
-        var throttled = this.throttled;
-        if (throttled) {
-            if (this.trailing && this._hasTrailingValue) {
-                this.destination.next(this._trailingValue);
-                this._trailingValue = null;
-                this._hasTrailingValue = false;
-            }
-            throttled.unsubscribe();
-            this.remove(throttled);
-            this.throttled = null;
-        }
-    };
-    return ThrottleTimeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-function dispatchNext(arg) {
-    var subscriber = arg.subscriber;
-    subscriber.clearThrottle();
-}
-//# sourceMappingURL=throttleTime.js.map
-
-
-/***/ }),
-/* 906 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = timeInterval;
-/* unused harmony export TimeInterval */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scan__ = __webpack_require__(317);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_defer__ = __webpack_require__(310);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
-
-
-
-
-function timeInterval(scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
-    }
-    return function (source) {
-        return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__observable_defer__["a" /* defer */])(function () {
-            return source.pipe(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__scan__["a" /* scan */])(function (_a, value) {
-                var current = _a.current;
-                return ({ value: value, current: scheduler.now(), last: current });
-            }, { current: scheduler.now(), value: undefined, last: undefined }), __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__map__["a" /* map */])(function (_a) {
-                var current = _a.current, last = _a.last, value = _a.value;
-                return new TimeInterval(value, current - last);
-            }));
-        });
-    };
-}
-var TimeInterval = /*@__PURE__*/ (function () {
-    function TimeInterval(value, interval) {
-        this.value = value;
-        this.interval = interval;
-    }
-    return TimeInterval;
-}());
-
-//# sourceMappingURL=timeInterval.js.map
-
-
-/***/ }),
-/* 907 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = timeout;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_TimeoutError__ = __webpack_require__(440);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__timeoutWith__ = __webpack_require__(437);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_throwError__ = __webpack_require__(313);
-/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
-
-
-
-
-function timeout(due, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__timeoutWith__["a" /* timeoutWith */])(due, __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__observable_throwError__["a" /* throwError */])(new __WEBPACK_IMPORTED_MODULE_1__util_TimeoutError__["a" /* TimeoutError */]()), scheduler);
-}
-//# sourceMappingURL=timeout.js.map
-
-
-/***/ }),
-/* 908 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = timestamp;
-/* unused harmony export Timestamp */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
-
-
-function timestamp(scheduler) {
-    if (scheduler === void 0) {
-        scheduler = __WEBPACK_IMPORTED_MODULE_0__scheduler_async__["a" /* async */];
-    }
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__map__["a" /* map */])(function (value) { return new Timestamp(value, scheduler.now()); });
-}
-var Timestamp = /*@__PURE__*/ (function () {
-    function Timestamp(value, timestamp) {
-        this.value = value;
-        this.timestamp = timestamp;
-    }
-    return Timestamp;
-}());
-
-//# sourceMappingURL=timestamp.js.map
-
-
-/***/ }),
-/* 909 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = toArray;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
-
-function toArrayReducer(arr, item, index) {
-    if (index === 0) {
-        return [item];
-    }
-    arr.push(item);
-    return arr;
-}
-function toArray() {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__reduce__["a" /* reduce */])(toArrayReducer, []);
-}
-//# sourceMappingURL=toArray.js.map
-
-
-/***/ }),
-/* 910 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = window;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-function window(windowBoundaries) {
-    return function windowOperatorFunction(source) {
-        return source.lift(new WindowOperator(windowBoundaries));
-    };
-}
-var WindowOperator = /*@__PURE__*/ (function () {
-    function WindowOperator(windowBoundaries) {
-        this.windowBoundaries = windowBoundaries;
-    }
-    WindowOperator.prototype.call = function (subscriber, source) {
-        var windowSubscriber = new WindowSubscriber(subscriber);
-        var sourceSubscription = source.subscribe(windowSubscriber);
-        if (!sourceSubscription.closed) {
-            windowSubscriber.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__["a" /* subscribeToResult */])(windowSubscriber, this.windowBoundaries));
-        }
-        return sourceSubscription;
-    };
-    return WindowOperator;
-}());
-var WindowSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowSubscriber, _super);
-    function WindowSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.window = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
-        destination.next(_this.window);
-        return _this;
-    }
-    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.openWindow();
-    };
-    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
-        this._complete();
-    };
-    WindowSubscriber.prototype._next = function (value) {
-        this.window.next(value);
-    };
-    WindowSubscriber.prototype._error = function (err) {
-        this.window.error(err);
-        this.destination.error(err);
-    };
-    WindowSubscriber.prototype._complete = function () {
-        this.window.complete();
-        this.destination.complete();
-    };
-    WindowSubscriber.prototype._unsubscribe = function () {
-        this.window = null;
-    };
-    WindowSubscriber.prototype.openWindow = function () {
-        var prevWindow = this.window;
-        if (prevWindow) {
-            prevWindow.complete();
-        }
-        var destination = this.destination;
-        var newWindow = this.window = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
-        destination.next(newWindow);
-    };
-    return WindowSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=window.js.map
-
-
-/***/ }),
-/* 911 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = windowCount;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(36);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */
-
-
-
-function windowCount(windowSize, startWindowEvery) {
-    if (startWindowEvery === void 0) {
-        startWindowEvery = 0;
-    }
-    return function windowCountOperatorFunction(source) {
-        return source.lift(new WindowCountOperator(windowSize, startWindowEvery));
-    };
-}
-var WindowCountOperator = /*@__PURE__*/ (function () {
-    function WindowCountOperator(windowSize, startWindowEvery) {
-        this.windowSize = windowSize;
-        this.startWindowEvery = startWindowEvery;
-    }
-    WindowCountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery));
-    };
-    return WindowCountOperator;
-}());
-var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowCountSubscriber, _super);
-    function WindowCountSubscriber(destination, windowSize, startWindowEvery) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.windowSize = windowSize;
-        _this.startWindowEvery = startWindowEvery;
-        _this.windows = [new __WEBPACK_IMPORTED_MODULE_2__Subject__["a" /* Subject */]()];
-        _this.count = 0;
-        destination.next(_this.windows[0]);
-        return _this;
-    }
-    WindowCountSubscriber.prototype._next = function (value) {
-        var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize;
-        var destination = this.destination;
-        var windowSize = this.windowSize;
-        var windows = this.windows;
-        var len = windows.length;
-        for (var i = 0; i < len && !this.closed; i++) {
-            windows[i].next(value);
-        }
-        var c = this.count - windowSize + 1;
-        if (c >= 0 && c % startWindowEvery === 0 && !this.closed) {
-            windows.shift().complete();
-        }
-        if (++this.count % startWindowEvery === 0 && !this.closed) {
-            var window_1 = new __WEBPACK_IMPORTED_MODULE_2__Subject__["a" /* Subject */]();
-            windows.push(window_1);
-            destination.next(window_1);
-        }
-    };
-    WindowCountSubscriber.prototype._error = function (err) {
-        var windows = this.windows;
-        if (windows) {
-            while (windows.length > 0 && !this.closed) {
-                windows.shift().error(err);
-            }
-        }
-        this.destination.error(err);
-    };
-    WindowCountSubscriber.prototype._complete = function () {
-        var windows = this.windows;
-        if (windows) {
-            while (windows.length > 0 && !this.closed) {
-                windows.shift().complete();
-            }
-        }
-        this.destination.complete();
-    };
-    WindowCountSubscriber.prototype._unsubscribe = function () {
-        this.count = 0;
-        this.windows = null;
-    };
-    return WindowCountSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */]));
-//# sourceMappingURL=windowCount.js.map
-
-
-/***/ }),
-/* 912 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = windowTime;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(190);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(48);
-/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-
-
-function windowTime(windowTimeSpan) {
-    var scheduler = __WEBPACK_IMPORTED_MODULE_2__scheduler_async__["a" /* async */];
-    var windowCreationInterval = null;
-    var maxWindowSize = Number.POSITIVE_INFINITY;
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(arguments[3])) {
-        scheduler = arguments[3];
-    }
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(arguments[2])) {
-        scheduler = arguments[2];
-    }
-    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isNumeric__["a" /* isNumeric */])(arguments[2])) {
-        maxWindowSize = arguments[2];
-    }
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_isScheduler__["a" /* isScheduler */])(arguments[1])) {
-        scheduler = arguments[1];
-    }
-    else if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_4__util_isNumeric__["a" /* isNumeric */])(arguments[1])) {
-        windowCreationInterval = arguments[1];
-    }
-    return function windowTimeOperatorFunction(source) {
-        return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler));
-    };
-}
-var WindowTimeOperator = /*@__PURE__*/ (function () {
-    function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
-        this.windowTimeSpan = windowTimeSpan;
-        this.windowCreationInterval = windowCreationInterval;
-        this.maxWindowSize = maxWindowSize;
-        this.scheduler = scheduler;
-    }
-    WindowTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler));
-    };
-    return WindowTimeOperator;
-}());
-var CountedSubject = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CountedSubject, _super);
-    function CountedSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this._numberOfNextedValues = 0;
-        return _this;
-    }
-    CountedSubject.prototype.next = function (value) {
-        this._numberOfNextedValues++;
-        _super.prototype.next.call(this, value);
-    };
-    Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", {
-        get: function () {
-            return this._numberOfNextedValues;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return CountedSubject;
-}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]));
-var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowTimeSubscriber, _super);
-    function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.windowTimeSpan = windowTimeSpan;
-        _this.windowCreationInterval = windowCreationInterval;
-        _this.maxWindowSize = maxWindowSize;
-        _this.scheduler = scheduler;
-        _this.windows = [];
-        var window = _this.openWindow();
-        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
-            var closeState = { subscriber: _this, window: window, context: null };
-            var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler };
-            _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState));
-            _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState));
-        }
-        else {
-            var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan };
-            _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState));
-        }
-        return _this;
-    }
-    WindowTimeSubscriber.prototype._next = function (value) {
-        var windows = this.windows;
-        var len = windows.length;
-        for (var i = 0; i < len; i++) {
-            var window_1 = windows[i];
-            if (!window_1.closed) {
-                window_1.next(value);
-                if (window_1.numberOfNextedValues >= this.maxWindowSize) {
-                    this.closeWindow(window_1);
-                }
-            }
-        }
-    };
-    WindowTimeSubscriber.prototype._error = function (err) {
-        var windows = this.windows;
-        while (windows.length > 0) {
-            windows.shift().error(err);
-        }
-        this.destination.error(err);
-    };
-    WindowTimeSubscriber.prototype._complete = function () {
-        var windows = this.windows;
-        while (windows.length > 0) {
-            var window_2 = windows.shift();
-            if (!window_2.closed) {
-                window_2.complete();
-            }
-        }
-        this.destination.complete();
-    };
-    WindowTimeSubscriber.prototype.openWindow = function () {
-        var window = new CountedSubject();
-        this.windows.push(window);
-        var destination = this.destination;
-        destination.next(window);
-        return window;
-    };
-    WindowTimeSubscriber.prototype.closeWindow = function (window) {
-        window.complete();
-        var windows = this.windows;
-        windows.splice(windows.indexOf(window), 1);
-    };
-    return WindowTimeSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */]));
-function dispatchWindowTimeSpanOnly(state) {
-    var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window;
-    if (window) {
-        subscriber.closeWindow(window);
-    }
-    state.window = subscriber.openWindow();
-    this.schedule(state, windowTimeSpan);
-}
-function dispatchWindowCreation(state) {
-    var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval;
-    var window = subscriber.openWindow();
-    var action = this;
-    var context = { action: action, subscription: null };
-    var timeSpanState = { subscriber: subscriber, window: window, context: context };
-    context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState);
-    action.add(context.subscription);
-    action.schedule(state, windowCreationInterval);
-}
-function dispatchWindowClose(state) {
-    var subscriber = state.subscriber, window = state.window, context = state.context;
-    if (context && context.action && context.subscription) {
-        context.action.remove(context.subscription);
-    }
-    subscriber.closeWindow(window);
-}
-//# sourceMappingURL=windowTime.js.map
-
-
-/***/ }),
-/* 913 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = windowToggle;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-
-
-function windowToggle(openings, closingSelector) {
-    return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); };
-}
-var WindowToggleOperator = /*@__PURE__*/ (function () {
-    function WindowToggleOperator(openings, closingSelector) {
-        this.openings = openings;
-        this.closingSelector = closingSelector;
-    }
-    WindowToggleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector));
-    };
-    return WindowToggleOperator;
-}());
-var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowToggleSubscriber, _super);
-    function WindowToggleSubscriber(destination, openings, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.openings = openings;
-        _this.closingSelector = closingSelector;
-        _this.contexts = [];
-        _this.add(_this.openSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__["a" /* subscribeToResult */])(_this, openings, openings));
-        return _this;
-    }
-    WindowToggleSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        if (contexts) {
-            var len = contexts.length;
-            for (var i = 0; i < len; i++) {
-                contexts[i].window.next(value);
-            }
-        }
-    };
-    WindowToggleSubscriber.prototype._error = function (err) {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_1 = contexts[index];
-                context_1.window.error(err);
-                context_1.subscription.unsubscribe();
-            }
-        }
-        _super.prototype._error.call(this, err);
-    };
-    WindowToggleSubscriber.prototype._complete = function () {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_2 = contexts[index];
-                context_2.window.complete();
-                context_2.subscription.unsubscribe();
-            }
-        }
-        _super.prototype._complete.call(this);
-    };
-    WindowToggleSubscriber.prototype._unsubscribe = function () {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_3 = contexts[index];
-                context_3.window.unsubscribe();
-                context_3.subscription.unsubscribe();
-            }
-        }
-    };
-    WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        if (outerValue === this.openings) {
-            var closingSelector = this.closingSelector;
-            var closingNotifier = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(closingSelector)(innerValue);
-            if (closingNotifier === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) {
-                return this.error(__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e);
-            }
-            else {
-                var window_1 = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
-                var subscription = new __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */]();
-                var context_4 = { window: window_1, subscription: subscription };
-                this.contexts.push(context_4);
-                var innerSubscription = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier, context_4);
-                if (innerSubscription.closed) {
-                    this.closeWindow(this.contexts.length - 1);
-                }
-                else {
-                    innerSubscription.context = context_4;
-                    subscription.add(innerSubscription);
-                }
-                this.destination.next(window_1);
-            }
-        }
-        else {
-            this.closeWindow(this.contexts.indexOf(outerValue));
-        }
-    };
-    WindowToggleSubscriber.prototype.notifyError = function (err) {
-        this.error(err);
-    };
-    WindowToggleSubscriber.prototype.notifyComplete = function (inner) {
-        if (inner !== this.openSubscription) {
-            this.closeWindow(this.contexts.indexOf(inner.context));
-        }
-    };
-    WindowToggleSubscriber.prototype.closeWindow = function (index) {
-        if (index === -1) {
-            return;
-        }
-        var contexts = this.contexts;
-        var context = contexts[index];
-        var window = context.window, subscription = context.subscription;
-        contexts.splice(index, 1);
-        window.complete();
-        subscription.unsubscribe();
-    };
-    return WindowToggleSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=windowToggle.js.map
-
-
-/***/ }),
-/* 914 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = windowWhen;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(47);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-
-
-
-function windowWhen(closingSelector) {
-    return function windowWhenOperatorFunction(source) {
-        return source.lift(new WindowOperator(closingSelector));
-    };
-}
-var WindowOperator = /*@__PURE__*/ (function () {
-    function WindowOperator(closingSelector) {
-        this.closingSelector = closingSelector;
-    }
-    WindowOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector));
-    };
-    return WindowOperator;
-}());
-var WindowSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WindowSubscriber, _super);
-    function WindowSubscriber(destination, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.closingSelector = closingSelector;
-        _this.openWindow();
-        return _this;
-    }
-    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.openWindow(innerSub);
-    };
-    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.openWindow(innerSub);
-    };
-    WindowSubscriber.prototype._next = function (value) {
-        this.window.next(value);
-    };
-    WindowSubscriber.prototype._error = function (err) {
-        this.window.error(err);
-        this.destination.error(err);
-        this.unsubscribeClosingNotification();
-    };
-    WindowSubscriber.prototype._complete = function () {
-        this.window.complete();
-        this.destination.complete();
-        this.unsubscribeClosingNotification();
-    };
-    WindowSubscriber.prototype.unsubscribeClosingNotification = function () {
-        if (this.closingNotification) {
-            this.closingNotification.unsubscribe();
-        }
-    };
-    WindowSubscriber.prototype.openWindow = function (innerSub) {
-        if (innerSub === void 0) {
-            innerSub = null;
-        }
-        if (innerSub) {
-            this.remove(innerSub);
-            innerSub.unsubscribe();
-        }
-        var prevWindow = this.window;
-        if (prevWindow) {
-            prevWindow.complete();
-        }
-        var window = this.window = new __WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */]();
-        this.destination.next(window);
-        var closingNotifier = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_tryCatch__["a" /* tryCatch */])(this.closingSelector)();
-        if (closingNotifier === __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */]) {
-            var err = __WEBPACK_IMPORTED_MODULE_3__util_errorObject__["a" /* errorObject */].e;
-            this.destination.error(err);
-            this.window.error(err);
-        }
-        else {
-            this.add(this.closingNotification = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, closingNotifier));
-        }
-    };
-    return WindowSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=windowWhen.js.map
-
-
-/***/ }),
-/* 915 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = withLatestFrom;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(13);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
-
-function withLatestFrom() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    return function (source) {
-        var project;
-        if (typeof args[args.length - 1] === 'function') {
-            project = args.pop();
-        }
-        var observables = args;
-        return source.lift(new WithLatestFromOperator(observables, project));
-    };
-}
-var WithLatestFromOperator = /*@__PURE__*/ (function () {
-    function WithLatestFromOperator(observables, project) {
-        this.observables = observables;
-        this.project = project;
-    }
-    WithLatestFromOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project));
-    };
-    return WithLatestFromOperator;
-}());
-var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](WithLatestFromSubscriber, _super);
-    function WithLatestFromSubscriber(destination, observables, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.observables = observables;
-        _this.project = project;
-        _this.toRespond = [];
-        var len = observables.length;
-        _this.values = new Array(len);
-        for (var i = 0; i < len; i++) {
-            _this.toRespond.push(i);
-        }
-        for (var i = 0; i < len; i++) {
-            var observable = observables[i];
-            _this.add(__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(_this, observable, observable, i));
-        }
-        return _this;
-    }
-    WithLatestFromSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.values[outerIndex] = innerValue;
-        var toRespond = this.toRespond;
-        if (toRespond.length > 0) {
-            var found = toRespond.indexOf(outerIndex);
-            if (found !== -1) {
-                toRespond.splice(found, 1);
-            }
-        }
-    };
-    WithLatestFromSubscriber.prototype.notifyComplete = function () {
-    };
-    WithLatestFromSubscriber.prototype._next = function (value) {
-        if (this.toRespond.length === 0) {
-            var args = [value].concat(this.values);
-            if (this.project) {
-                this._tryProject(args);
-            }
-            else {
-                this.destination.next(args);
-            }
-        }
-    };
-    WithLatestFromSubscriber.prototype._tryProject = function (args) {
-        var result;
-        try {
-            result = this.project.apply(this, args);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return WithLatestFromSubscriber;
-}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */]));
-//# sourceMappingURL=withLatestFrom.js.map
-
-
-/***/ }),
-/* 916 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = zip;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(314);
-/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
-
-function zip() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function zipOperatorFunction(source) {
-        return source.lift.call(__WEBPACK_IMPORTED_MODULE_0__observable_zip__["a" /* zip */].apply(void 0, [source].concat(observables)));
-    };
-}
-//# sourceMappingURL=zip.js.map
-
-
-/***/ }),
-/* 917 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = zipAll;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(314);
-/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
-
-function zipAll(project) {
-    return function (source) { return source.lift(new __WEBPACK_IMPORTED_MODULE_0__observable_zip__["b" /* ZipOperator */](project)); };
-}
-//# sourceMappingURL=zipAll.js.map
-
-
-/***/ }),
-/* 918 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Action; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
-
-
-var Action = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Action, _super);
-    function Action(scheduler, work) {
-        return _super.call(this) || this;
-    }
-    Action.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return this;
-    };
-    return Action;
-}(__WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */]));
-
-//# sourceMappingURL=Action.js.map
-
-
-/***/ }),
-/* 919 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameAction; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(149);
-/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
-
-
-var AnimationFrameAction = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnimationFrameAction, _super);
-    function AnimationFrameAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && delay > 0) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        scheduler.actions.push(this);
-        return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); }));
-    };
-    AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
-        }
-        if (scheduler.actions.length === 0) {
-            cancelAnimationFrame(id);
-            scheduler.scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AnimationFrameAction;
-}(__WEBPACK_IMPORTED_MODULE_1__AsyncAction__["a" /* AsyncAction */]));
-
-//# sourceMappingURL=AnimationFrameAction.js.map
-
-
-/***/ }),
-/* 920 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameScheduler; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
-
-
-var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnimationFrameScheduler, _super);
-    function AnimationFrameScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    AnimationFrameScheduler.prototype.flush = function (action) {
-        this.active = true;
-        this.scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        var index = -1;
-        var count = actions.length;
-        action = action || actions.shift();
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (++index < count && (action = actions.shift()));
-        this.active = false;
-        if (error) {
-            while (++index < count && (action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AnimationFrameScheduler;
-}(__WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */]));
-
-//# sourceMappingURL=AnimationFrameScheduler.js.map
-
-
-/***/ }),
-/* 921 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapAction; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_Immediate__ = __webpack_require__(927);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncAction__ = __webpack_require__(149);
-/** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */
-
-
-
-var AsapAction = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsapAction, _super);
-    function AsapAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && delay > 0) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        scheduler.actions.push(this);
-        return scheduler.scheduled || (scheduler.scheduled = __WEBPACK_IMPORTED_MODULE_1__util_Immediate__["a" /* Immediate */].setImmediate(scheduler.flush.bind(scheduler, null)));
-    };
-    AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
-        }
-        if (scheduler.actions.length === 0) {
-            __WEBPACK_IMPORTED_MODULE_1__util_Immediate__["a" /* Immediate */].clearImmediate(id);
-            scheduler.scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AsapAction;
-}(__WEBPACK_IMPORTED_MODULE_2__AsyncAction__["a" /* AsyncAction */]));
-
-//# sourceMappingURL=AsapAction.js.map
-
-
-/***/ }),
-/* 922 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapScheduler; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
-
-
-var AsapScheduler = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsapScheduler, _super);
-    function AsapScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    AsapScheduler.prototype.flush = function (action) {
-        this.active = true;
-        this.scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        var index = -1;
-        var count = actions.length;
-        action = action || actions.shift();
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (++index < count && (action = actions.shift()));
-        this.active = false;
-        if (error) {
-            while (++index < count && (action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsapScheduler;
-}(__WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */]));
-
-//# sourceMappingURL=AsapScheduler.js.map
-
-
-/***/ }),
-/* 923 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueAction; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(149);
-/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
-
-
-var QueueAction = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](QueueAction, _super);
-    function QueueAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    QueueAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay > 0) {
-            return _super.prototype.schedule.call(this, state, delay);
-        }
-        this.delay = delay;
-        this.state = state;
-        this.scheduler.flush(this);
-        return this;
-    };
-    QueueAction.prototype.execute = function (state, delay) {
-        return (delay > 0 || this.closed) ?
-            _super.prototype.execute.call(this, state, delay) :
-            this._execute(state, delay);
-    };
-    QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        return scheduler.flush(this);
-    };
-    return QueueAction;
-}(__WEBPACK_IMPORTED_MODULE_1__AsyncAction__["a" /* AsyncAction */]));
-
-//# sourceMappingURL=QueueAction.js.map
-
-
-/***/ }),
-/* 924 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueScheduler; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(150);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
-
-
-var QueueScheduler = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](QueueScheduler, _super);
-    function QueueScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return QueueScheduler;
-}(__WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */]));
-
-//# sourceMappingURL=QueueScheduler.js.map
-
-
-/***/ }),
-/* 925 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VirtualTimeScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return VirtualAction; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(149);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncScheduler__ = __webpack_require__(150);
-/** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
-
-
-
-var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](VirtualTimeScheduler, _super);
-    function VirtualTimeScheduler(SchedulerAction, maxFrames) {
-        if (SchedulerAction === void 0) {
-            SchedulerAction = VirtualAction;
-        }
-        if (maxFrames === void 0) {
-            maxFrames = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this;
-        _this.maxFrames = maxFrames;
-        _this.frame = 0;
-        _this.index = -1;
-        return _this;
-    }
-    VirtualTimeScheduler.prototype.flush = function () {
-        var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
-        var error, action;
-        while ((action = actions.shift()) && (this.frame = action.delay) <= maxFrames) {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        }
-        if (error) {
-            while (action = actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    VirtualTimeScheduler.frameTimeFactor = 10;
-    return VirtualTimeScheduler;
-}(__WEBPACK_IMPORTED_MODULE_2__AsyncScheduler__["a" /* AsyncScheduler */]));
-
-var VirtualAction = /*@__PURE__*/ (function (_super) {
-    __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](VirtualAction, _super);
-    function VirtualAction(scheduler, work, index) {
-        if (index === void 0) {
-            index = scheduler.index += 1;
-        }
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.index = index;
-        _this.active = true;
-        _this.index = scheduler.index = index;
-        return _this;
-    }
-    VirtualAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (!this.id) {
-            return _super.prototype.schedule.call(this, state, delay);
-        }
-        this.active = false;
-        var action = new VirtualAction(this.scheduler, this.work);
-        this.add(action);
-        return action.schedule(state, delay);
-    };
-    VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        this.delay = scheduler.frame + delay;
-        var actions = scheduler.actions;
-        actions.push(this);
-        actions.sort(VirtualAction.sortActions);
-        return true;
-    };
-    VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return undefined;
-    };
-    VirtualAction.prototype._execute = function (state, delay) {
-        if (this.active === true) {
-            return _super.prototype._execute.call(this, state, delay);
-        }
-    };
-    VirtualAction.sortActions = function (a, b) {
-        if (a.delay === b.delay) {
-            if (a.index === b.index) {
-                return 0;
-            }
-            else if (a.index > b.index) {
-                return 1;
-            }
-            else {
-                return -1;
-            }
-        }
-        else if (a.delay > b.delay) {
-            return 1;
-        }
-        else {
-            return -1;
-        }
-    };
-    return VirtualAction;
-}(__WEBPACK_IMPORTED_MODULE_1__AsyncAction__["a" /* AsyncAction */]));
-
-//# sourceMappingURL=VirtualTimeScheduler.js.map
-
-
-/***/ }),
-/* 926 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrame; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AnimationFrameAction__ = __webpack_require__(919);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AnimationFrameScheduler__ = __webpack_require__(920);
-/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */
-
-
-var animationFrame = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AnimationFrameScheduler__["a" /* AnimationFrameScheduler */](__WEBPACK_IMPORTED_MODULE_0__AnimationFrameAction__["a" /* AnimationFrameAction */]);
-//# sourceMappingURL=animationFrame.js.map
-
-
-/***/ }),
-/* 927 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Immediate; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var nextHandle = 1;
-var tasksByHandle = {};
-function runIfPresent(handle) {
-    var cb = tasksByHandle[handle];
-    if (cb) {
-        cb();
-    }
-}
-var Immediate = {
-    setImmediate: function (cb) {
-        var handle = nextHandle++;
-        tasksByHandle[handle] = cb;
-        Promise.resolve().then(function () { return runIfPresent(handle); });
-        return handle;
-    },
-    clearImmediate: function (handle) {
-        delete tasksByHandle[handle];
-    },
-};
-//# sourceMappingURL=Immediate.js.map
-
-
-/***/ }),
-/* 928 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isInteropObservable;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(117);
-/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
-
-function isInteropObservable(input) {
-    return input && typeof input[__WEBPACK_IMPORTED_MODULE_0__symbol_observable__["a" /* observable */]] === 'function';
-}
-//# sourceMappingURL=isInteropObservable.js.map
-
-
-/***/ }),
-/* 929 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isIterable;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(151);
-/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
-
-function isIterable(input) {
-    return input && typeof input[__WEBPACK_IMPORTED_MODULE_0__symbol_iterator__["a" /* iterator */]] === 'function';
-}
-//# sourceMappingURL=isIterable.js.map
-
-
-/***/ }),
-/* 930 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isObservable;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(11);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-function isObservable(obj) {
-    return !!obj && (obj instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function'));
-}
-//# sourceMappingURL=isObservable.js.map
-
-
-/***/ }),
-/* 931 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = not;
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function not(pred, thisArg) {
-    function notPred() {
-        return !(notPred.pred.apply(notPred.thisArg, arguments));
-    }
-    notPred.pred = pred;
-    notPred.thisArg = thisArg;
-    return notPred;
-}
-//# sourceMappingURL=not.js.map
-
-
-/***/ }),
-/* 932 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = toSubscriber;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__ = __webpack_require__(321);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(420);
-/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */
-
-
-
-function toSubscriber(nextOrObserver, error, complete) {
-    if (nextOrObserver) {
-        if (nextOrObserver instanceof __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */]) {
-            return nextOrObserver;
-        }
-        if (nextOrObserver[__WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__["a" /* rxSubscriber */]]) {
-            return nextOrObserver[__WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__["a" /* rxSubscriber */]]();
-        }
-    }
-    if (!nextOrObserver && !error && !complete) {
-        return new __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */](__WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]);
-    }
-    return new __WEBPACK_IMPORTED_MODULE_0__Subscriber__["a" /* Subscriber */](nextOrObserver, error, complete);
-}
-//# sourceMappingURL=toSubscriber.js.map
-
-
-/***/ }),
-/* 933 */
-/***/ (function(module, exports) {
-
-// This is not the set of all possible signals.
-//
-// It IS, however, the set of all signals that trigger
-// an exit on either Linux or BSD systems.  Linux is a
-// superset of the signal names supported on BSD, and
-// the unknown signals just fail to register, so we can
-// catch that easily enough.
-//
-// Don't bother with SIGKILL.  It's uncatchable, which
-// means that we can't fire any callbacks anyway.
-//
-// If a user does happen to register a handler on a non-
-// fatal signal like SIGWINCH or something, and then
-// exit, it'll end up firing `process.emit('exit')`, so
-// the handler will be fired anyway.
-//
-// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
-// artificially, inherently leave the process in a
-// state from which it is not safe to try and enter JS
-// listeners.
-module.exports = [
-  'SIGABRT',
-  'SIGALRM',
-  'SIGHUP',
-  'SIGINT',
-  'SIGTERM'
-]
-
-if (process.platform !== 'win32') {
-  module.exports.push(
-    'SIGVTALRM',
-    'SIGXCPU',
-    'SIGXFSZ',
-    'SIGUSR2',
-    'SIGTRAP',
-    'SIGSYS',
-    'SIGQUIT',
-    'SIGIOT'
-    // should detect profiler and enable/disable accordingly.
-    // see #21
-    // 'SIGPROF'
-  )
-}
-
-if (process.platform === 'linux') {
-  module.exports.push(
-    'SIGIO',
-    'SIGPOLL',
-    'SIGPWR',
-    'SIGSTKFLT',
-    'SIGUNUSED'
-  )
-}
-
-
-/***/ }),
-/* 934 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const isPlainObj = __webpack_require__(738);
-
-module.exports = (obj, opts) => {
-	if (!isPlainObj(obj)) {
-		throw new TypeError('Expected a plain object');
-	}
-
-	opts = opts || {};
-
-	// DEPRECATED
-	if (typeof opts === 'function') {
-		throw new TypeError('Specify the compare function as an option instead');
-	}
-
-	const deep = opts.deep;
-	const seenInput = [];
-	const seenOutput = [];
-
-	const sortKeys = x => {
-		const seenIndex = seenInput.indexOf(x);
-
-		if (seenIndex !== -1) {
-			return seenOutput[seenIndex];
-		}
-
-		const ret = {};
-		const keys = Object.keys(x).sort(opts.compare);
-
-		seenInput.push(x);
-		seenOutput.push(ret);
-
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			const val = x[key];
-
-			if (deep && Array.isArray(val)) {
-				const retArr = [];
-
-				for (let j = 0; j < val.length; j++) {
-					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
-				}
-
-				ret[key] = retArr;
-				continue;
-			}
-
-			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
-		}
-
-		return ret;
-	};
-
-	return sortKeys(obj);
-};
-
-
-/***/ }),
-/* 935 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-Copyright 2015 Kyle E. Mitchell
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-var parse = __webpack_require__(452)
-var spdxLicenseIds = __webpack_require__(453)
-
-function valid (string) {
-  try {
-    parse(string)
-    return true
-  } catch (error) {
-    return false
-  }
-}
-
-// Common transpositions of license identifier acronyms
-var transpositions = [
-  ['APGL', 'AGPL'],
-  ['Gpl', 'GPL'],
-  ['GLP', 'GPL'],
-  ['APL', 'Apache'],
-  ['ISD', 'ISC'],
-  ['GLP', 'GPL'],
-  ['IST', 'ISC'],
-  ['Claude', 'Clause'],
-  [' or later', '+'],
-  [' International', ''],
-  ['GNU', 'GPL'],
-  ['GUN', 'GPL'],
-  ['+', ''],
-  ['GNU GPL', 'GPL'],
-  ['GNU/GPL', 'GPL'],
-  ['GNU GLP', 'GPL'],
-  ['GNU General Public License', 'GPL'],
-  ['Gnu public license', 'GPL'],
-  ['GNU Public License', 'GPL'],
-  ['GNU GENERAL PUBLIC LICENSE', 'GPL'],
-  ['MTI', 'MIT'],
-  ['Mozilla Public License', 'MPL'],
-  ['WTH', 'WTF'],
-  ['-License', '']
-]
-
-var TRANSPOSED = 0
-var CORRECT = 1
-
-// Simple corrections to nearly valid identifiers.
-var transforms = [
-  // e.g. 'mit'
-  function (argument) {
-    return argument.toUpperCase()
-  },
-  // e.g. 'MIT '
-  function (argument) {
-    return argument.trim()
-  },
-  // e.g. 'M.I.T.'
-  function (argument) {
-    return argument.replace(/\./g, '')
-  },
-  // e.g. 'Apache- 2.0'
-  function (argument) {
-    return argument.replace(/\s+/g, '')
-  },
-  // e.g. 'CC BY 4.0''
-  function (argument) {
-    return argument.replace(/\s+/g, '-')
-  },
-  // e.g. 'LGPLv2.1'
-  function (argument) {
-    return argument.replace('v', '-')
-  },
-  // e.g. 'Apache 2.0'
-  function (argument) {
-    return argument.replace(/,?\s*(\d)/, '-$1')
-  },
-  // e.g. 'GPL 2'
-  function (argument) {
-    return argument.replace(/,?\s*(\d)/, '-$1.0')
-  },
-  // e.g. 'Apache Version 2.0'
-  function (argument) {
-    return argument
-      .replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2')
-  },
-  // e.g. 'Apache Version 2'
-  function (argument) {
-    return argument
-      .replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0')
-  },
-  // e.g. 'ZLIB'
-  function (argument) {
-    return argument[0].toUpperCase() + argument.slice(1)
-  },
-  // e.g. 'MPL/2.0'
-  function (argument) {
-    return argument.replace('/', '-')
-  },
-  // e.g. 'Apache 2'
-  function (argument) {
-    return argument
-      .replace(/\s*V\s*(\d)/, '-$1')
-      .replace(/(\d)$/, '$1.0')
-  },
-  // e.g. 'GPL-2.0', 'GPL-3.0'
-  function (argument) {
-    if (argument.indexOf('3.0') !== -1) {
-      return argument + '-or-later'
-    } else {
-      return argument + '-only'
-    }
-  },
-  // e.g. 'GPL-2.0-'
-  function (argument) {
-    return argument + 'only'
-  },
-  // e.g. 'GPL2'
-  function (argument) {
-    return argument.replace(/(\d)$/, '-$1.0')
-  },
-  // e.g. 'BSD 3'
-  function (argument) {
-    return argument.replace(/(-| )?(\d)$/, '-$2-Clause')
-  },
-  // e.g. 'BSD clause 3'
-  function (argument) {
-    return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause')
-  },
-  // e.g. 'BY-NC-4.0'
-  function (argument) {
-    return 'CC-' + argument
-  },
-  // e.g. 'BY-NC'
-  function (argument) {
-    return 'CC-' + argument + '-4.0'
-  },
-  // e.g. 'Attribution-NonCommercial'
-  function (argument) {
-    return argument
-      .replace('Attribution', 'BY')
-      .replace('NonCommercial', 'NC')
-      .replace('NoDerivatives', 'ND')
-      .replace(/ (\d)/, '-$1')
-      .replace(/ ?International/, '')
-  },
-  // e.g. 'Attribution-NonCommercial'
-  function (argument) {
-    return 'CC-' +
-      argument
-        .replace('Attribution', 'BY')
-        .replace('NonCommercial', 'NC')
-        .replace('NoDerivatives', 'ND')
-        .replace(/ (\d)/, '-$1')
-        .replace(/ ?International/, '') +
-      '-4.0'
-  }
-]
-
-var licensesWithVersions = spdxLicenseIds
-  .map(function (id) {
-    var match = /^(.*)-\d+\.\d+$/.exec(id)
-    return match
-      ? [match[0], match[1]]
-      : [id, null]
-  })
-  .reduce(function (objectMap, item) {
-    var key = item[1]
-    objectMap[key] = objectMap[key] || []
-    objectMap[key].push(item[0])
-    return objectMap
-  }, {})
-
-var licensesWithOneVersion = Object.keys(licensesWithVersions)
-  .map(function makeEntries (key) {
-    return [key, licensesWithVersions[key]]
-  })
-  .filter(function identifySoleVersions (item) {
-    return (
-      // Licenses has just one valid version suffix.
-      item[1].length === 1 &&
-      item[0] !== null &&
-      // APL will be considered Apache, rather than APL-1.0
-      item[0] !== 'APL'
-    )
-  })
-  .map(function createLastResorts (item) {
-    return [item[0], item[1][0]]
-  })
-
-licensesWithVersions = undefined
-
-// If all else fails, guess that strings containing certain substrings
-// meant to identify certain licenses.
-var lastResorts = [
-  ['UNLI', 'Unlicense'],
-  ['WTF', 'WTFPL'],
-  ['2 CLAUSE', 'BSD-2-Clause'],
-  ['2-CLAUSE', 'BSD-2-Clause'],
-  ['3 CLAUSE', 'BSD-3-Clause'],
-  ['3-CLAUSE', 'BSD-3-Clause'],
-  ['AFFERO', 'AGPL-3.0-or-later'],
-  ['AGPL', 'AGPL-3.0-or-later'],
-  ['APACHE', 'Apache-2.0'],
-  ['ARTISTIC', 'Artistic-2.0'],
-  ['Affero', 'AGPL-3.0-or-later'],
-  ['BEER', 'Beerware'],
-  ['BOOST', 'BSL-1.0'],
-  ['BSD', 'BSD-2-Clause'],
-  ['CDDL', 'CDDL-1.1'],
-  ['ECLIPSE', 'EPL-1.0'],
-  ['FUCK', 'WTFPL'],
-  ['GNU', 'GPL-3.0-or-later'],
-  ['LGPL', 'LGPL-3.0-or-later'],
-  ['GPLV1', 'GPL-1.0-only'],
-  ['GPLV2', 'GPL-2.0-only'],
-  ['GPL', 'GPL-3.0-or-later'],
-  ['MIT +NO-FALSE-ATTRIBS', 'MITNFA'],
-  ['MIT', 'MIT'],
-  ['MPL', 'MPL-2.0'],
-  ['X11', 'X11'],
-  ['ZLIB', 'Zlib']
-].concat(licensesWithOneVersion)
-
-var SUBSTRING = 0
-var IDENTIFIER = 1
-
-var validTransformation = function (identifier) {
-  for (var i = 0; i < transforms.length; i++) {
-    var transformed = transforms[i](identifier).trim()
-    if (transformed !== identifier && valid(transformed)) {
-      return transformed
-    }
-  }
-  return null
-}
-
-var validLastResort = function (identifier) {
-  var upperCased = identifier.toUpperCase()
-  for (var i = 0; i < lastResorts.length; i++) {
-    var lastResort = lastResorts[i]
-    if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) {
-      return lastResort[IDENTIFIER]
-    }
-  }
-  return null
-}
-
-var anyCorrection = function (identifier, check) {
-  for (var i = 0; i < transpositions.length; i++) {
-    var transposition = transpositions[i]
-    var transposed = transposition[TRANSPOSED]
-    if (identifier.indexOf(transposed) > -1) {
-      var corrected = identifier.replace(
-        transposed,
-        transposition[CORRECT]
-      )
-      var checked = check(corrected)
-      if (checked !== null) {
-        return checked
-      }
-    }
-  }
-  return null
-}
-
-module.exports = function (identifier) {
-  var validArugment = (
-    typeof identifier === 'string' &&
-    identifier.trim().length !== 0
-  )
-  if (!validArugment) {
-    throw Error('Invalid argument. Expected non-empty string.')
-  }
-  identifier = identifier.replace(/\+$/, '').trim()
-  if (valid(identifier)) {
-    return upgradeGPLs(identifier)
-  }
-  var transformed = validTransformation(identifier)
-  if (transformed !== null) {
-    return upgradeGPLs(transformed)
-  }
-  transformed = anyCorrection(identifier, function (argument) {
-    if (valid(argument)) {
-      return argument
-    }
-    return validTransformation(argument)
-  })
-  if (transformed !== null) {
-    return upgradeGPLs(transformed)
-  }
-  transformed = validLastResort(identifier)
-  if (transformed !== null) {
-    return upgradeGPLs(transformed)
-  }
-  transformed = anyCorrection(identifier, validLastResort)
-  if (transformed !== null) {
-    return upgradeGPLs(transformed)
-  }
-  return null
-}
-
-function upgradeGPLs (value) {
-  if ([
-    'GPL-1.0', 'LGPL-1.0', 'AGPL-1.0',
-    'GPL-2.0', 'LGPL-2.0', 'AGPL-2.0',
-    'LGPL-2.1'
-  ].indexOf(value) !== -1) {
-    return value + '-only'
-  } else if (['GPL-3.0', 'LGPL-3.0', 'AGPL-3.0'].indexOf(value) !== -1) {
-    return value + '-or-later'
-  } else {
-    return value
-  }
-}
-
-
-/***/ }),
-/* 936 */
-/***/ (function(module, exports) {
-
-module.exports = ["389-exception","Autoconf-exception-2.0","Autoconf-exception-3.0","Bison-exception-2.2","Bootloader-exception","CLISP-exception-2.0","Classpath-exception-2.0","DigiRule-FOSS-exception","FLTK-exception","Fawkes-Runtime-exception","Font-exception-2.0","GCC-exception-2.0","GCC-exception-3.1","LZMA-exception","Libtool-exception","Linux-syscall-note","Nokia-Qt-exception-1.1","OCCT-exception-1.0","Qwt-exception-1.0","WxWindows-exception-3.1","eCos-exception-2.0","freertos-exception-2.0","gnu-javamail-exception","i2p-gpl-java-exception","mif-exception","openvpn-openssl-exception","u-boot-exception-2.0"]
-
-/***/ }),
-/* 937 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// The ABNF grammar in the spec is totally ambiguous.
-//
-// This parser follows the operator precedence defined in the
-// `Order of Precedence and Parentheses` section.
-
-module.exports = function (tokens) {
-  var index = 0
-
-  function hasMore () {
-    return index < tokens.length
-  }
-
-  function token () {
-    return hasMore() ? tokens[index] : null
-  }
-
-  function next () {
-    if (!hasMore()) {
-      throw new Error()
-    }
-    index++
-  }
-
-  function parseOperator (operator) {
-    var t = token()
-    if (t && t.type === 'OPERATOR' && operator === t.string) {
-      next()
-      return t.string
-    }
-  }
-
-  function parseWith () {
-    if (parseOperator('WITH')) {
-      var t = token()
-      if (t && t.type === 'EXCEPTION') {
-        next()
-        return t.string
-      }
-      throw new Error('Expected exception after `WITH`')
-    }
-  }
-
-  function parseLicenseRef () {
-    // TODO: Actually, everything is concatenated into one string
-    // for backward-compatibility but it could be better to return
-    // a nice structure.
-    var begin = index
-    var string = ''
-    var t = token()
-    if (t.type === 'DOCUMENTREF') {
-      next()
-      string += 'DocumentRef-' + t.string + ':'
-      if (!parseOperator(':')) {
-        throw new Error('Expected `:` after `DocumentRef-...`')
-      }
-    }
-    t = token()
-    if (t.type === 'LICENSEREF') {
-      next()
-      string += 'LicenseRef-' + t.string
-      return {license: string}
-    }
-    index = begin
-  }
-
-  function parseLicense () {
-    var t = token()
-    if (t && t.type === 'LICENSE') {
-      next()
-      var node = {license: t.string}
-      if (parseOperator('+')) {
-        node.plus = true
-      }
-      var exception = parseWith()
-      if (exception) {
-        node.exception = exception
-      }
-      return node
-    }
-  }
-
-  function parseParenthesizedExpression () {
-    var left = parseOperator('(')
-    if (!left) {
-      return
-    }
-
-    var expr = parseExpression()
-
-    if (!parseOperator(')')) {
-      throw new Error('Expected `)`')
-    }
-
-    return expr
-  }
-
-  function parseAtom () {
-    return (
-      parseParenthesizedExpression() ||
-      parseLicenseRef() ||
-      parseLicense()
-    )
-  }
-
-  function makeBinaryOpParser (operator, nextParser) {
-    return function parseBinaryOp () {
-      var left = nextParser()
-      if (!left) {
-        return
-      }
-
-      if (!parseOperator(operator)) {
-        return left
-      }
-
-      var right = parseBinaryOp()
-      if (!right) {
-        throw new Error('Expected expression')
-      }
-      return {
-        left: left,
-        conjunction: operator.toLowerCase(),
-        right: right
-      }
-    }
-  }
-
-  var parseAnd = makeBinaryOpParser('AND', parseAtom)
-  var parseExpression = makeBinaryOpParser('OR', parseAnd)
-
-  var node = parseExpression()
-  if (!node || hasMore()) {
-    throw new Error('Syntax error')
-  }
-  return node
-}
-
-
-/***/ }),
-/* 938 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var licenses = []
-  .concat(__webpack_require__(453))
-  .concat(__webpack_require__(939))
-var exceptions = __webpack_require__(936)
-
-module.exports = function (source) {
-  var index = 0
-
-  function hasMore () {
-    return index < source.length
-  }
-
-  // `value` can be a regexp or a string.
-  // If it is recognized, the matching source string is returned and
-  // the index is incremented. Otherwise `undefined` is returned.
-  function read (value) {
-    if (value instanceof RegExp) {
-      var chars = source.slice(index)
-      var match = chars.match(value)
-      if (match) {
-        index += match[0].length
-        return match[0]
-      }
-    } else {
-      if (source.indexOf(value, index) === index) {
-        index += value.length
-        return value
-      }
-    }
-  }
-
-  function skipWhitespace () {
-    read(/[ ]*/)
-  }
-
-  function operator () {
-    var string
-    var possibilities = ['WITH', 'AND', 'OR', '(', ')', ':', '+']
-    for (var i = 0; i < possibilities.length; i++) {
-      string = read(possibilities[i])
-      if (string) {
-        break
-      }
-    }
-
-    if (string === '+' && index > 1 && source[index - 2] === ' ') {
-      throw new Error('Space before `+`')
-    }
-
-    return string && {
-      type: 'OPERATOR',
-      string: string
-    }
-  }
-
-  function idstring () {
-    return read(/[A-Za-z0-9-.]+/)
-  }
-
-  function expectIdstring () {
-    var string = idstring()
-    if (!string) {
-      throw new Error('Expected idstring at offset ' + index)
-    }
-    return string
-  }
-
-  function documentRef () {
-    if (read('DocumentRef-')) {
-      var string = expectIdstring()
-      return {type: 'DOCUMENTREF', string: string}
-    }
-  }
-
-  function licenseRef () {
-    if (read('LicenseRef-')) {
-      var string = expectIdstring()
-      return {type: 'LICENSEREF', string: string}
-    }
-  }
-
-  function identifier () {
-    var begin = index
-    var string = idstring()
-
-    if (licenses.indexOf(string) !== -1) {
-      return {
-        type: 'LICENSE',
-        string: string
-      }
-    } else if (exceptions.indexOf(string) !== -1) {
-      return {
-        type: 'EXCEPTION',
-        string: string
-      }
-    }
-
-    index = begin
-  }
-
-  // Tries to read the next token. Returns `undefined` if no token is
-  // recognized.
-  function parseToken () {
-    // Ordering matters
-    return (
-      operator() ||
-      documentRef() ||
-      licenseRef() ||
-      identifier()
-    )
-  }
-
-  var tokens = []
-  while (hasMore()) {
-    skipWhitespace()
-    if (!hasMore()) {
-      break
-    }
-
-    var token = parseToken()
-    if (!token) {
-      throw new Error('Unexpected `' + source[index] +
-                      '` at offset ' + index)
-    }
-
-    tokens.push(token)
-  }
-  return tokens
-}
-
-
-/***/ }),
-/* 939 */
-/***/ (function(module, exports) {
-
-module.exports = ["AGPL-3.0","eCos-2.0","GFDL-1.1","GFDL-1.2","GFDL-1.3","GPL-1.0","GPL-2.0-with-autoconf-exception","GPL-2.0-with-bison-exception","GPL-2.0-with-classpath-exception","GPL-2.0-with-font-exception","GPL-2.0-with-GCC-exception","GPL-2.0","GPL-3.0-with-autoconf-exception","GPL-3.0-with-GCC-exception","GPL-3.0","LGPL-2.0","LGPL-2.1","LGPL-3.0","Nunit","StandardML-NJ","wxWindows"]
-
-/***/ }),
-/* 940 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Joyent, Inc.
-
-module.exports = {
-	read: read,
-	verify: verify,
-	sign: sign,
-	signAsync: signAsync,
-	write: write,
-
-	/* Internal private API */
-	fromBuffer: fromBuffer,
-	toBuffer: toBuffer
-};
-
-var assert = __webpack_require__(16);
-var SSHBuffer = __webpack_require__(159);
-var crypto = __webpack_require__(12);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var Identity = __webpack_require__(158);
-var rfc4253 = __webpack_require__(103);
-var Signature = __webpack_require__(74);
-var utils = __webpack_require__(26);
-var Certificate = __webpack_require__(155);
-
-function verify(cert, key) {
-	/*
-	 * We always give an issuerKey, so if our verify() is being called then
-	 * there was no signature. Return false.
-	 */
-	return (false);
-}
-
-var TYPES = {
-	'user': 1,
-	'host': 2
-};
-Object.keys(TYPES).forEach(function (k) { TYPES[TYPES[k]] = k; });
-
-var ECDSA_ALGO = /^ecdsa-sha2-([^@-]+)-cert-v01@openssh.com$/;
-
-function read(buf, options) {
-	if (Buffer.isBuffer(buf))
-		buf = buf.toString('ascii');
-	var parts = buf.trim().split(/[ \t\n]+/g);
-	if (parts.length < 2 || parts.length > 3)
-		throw (new Error('Not a valid SSH certificate line'));
-
-	var algo = parts[0];
-	var data = parts[1];
-
-	data = Buffer.from(data, 'base64');
-	return (fromBuffer(data, algo));
-}
-
-function fromBuffer(data, algo, partial) {
-	var sshbuf = new SSHBuffer({ buffer: data });
-	var innerAlgo = sshbuf.readString();
-	if (algo !== undefined && innerAlgo !== algo)
-		throw (new Error('SSH certificate algorithm mismatch'));
-	if (algo === undefined)
-		algo = innerAlgo;
-
-	var cert = {};
-	cert.signatures = {};
-	cert.signatures.openssh = {};
-
-	cert.signatures.openssh.nonce = sshbuf.readBuffer();
-
-	var key = {};
-	var parts = (key.parts = []);
-	key.type = getAlg(algo);
-
-	var partCount = algs.info[key.type].parts.length;
-	while (parts.length < partCount)
-		parts.push(sshbuf.readPart());
-	assert.ok(parts.length >= 1, 'key must have at least one part');
-
-	var algInfo = algs.info[key.type];
-	if (key.type === 'ecdsa') {
-		var res = ECDSA_ALGO.exec(algo);
-		assert.ok(res !== null);
-		assert.strictEqual(res[1], parts[0].data.toString());
-	}
-
-	for (var i = 0; i < algInfo.parts.length; ++i) {
-		parts[i].name = algInfo.parts[i];
-		if (parts[i].name !== 'curve' &&
-		    algInfo.normalize !== false) {
-			var p = parts[i];
-			p.data = utils.mpNormalize(p.data);
-		}
-	}
-
-	cert.subjectKey = new Key(key);
-
-	cert.serial = sshbuf.readInt64();
-
-	var type = TYPES[sshbuf.readInt()];
-	assert.string(type, 'valid cert type');
-
-	cert.signatures.openssh.keyId = sshbuf.readString();
-
-	var principals = [];
-	var pbuf = sshbuf.readBuffer();
-	var psshbuf = new SSHBuffer({ buffer: pbuf });
-	while (!psshbuf.atEnd())
-		principals.push(psshbuf.readString());
-	if (principals.length === 0)
-		principals = ['*'];
-
-	cert.subjects = principals.map(function (pr) {
-		if (type === 'user')
-			return (Identity.forUser(pr));
-		else if (type === 'host')
-			return (Identity.forHost(pr));
-		throw (new Error('Unknown identity type ' + type));
-	});
-
-	cert.validFrom = int64ToDate(sshbuf.readInt64());
-	cert.validUntil = int64ToDate(sshbuf.readInt64());
-
-	cert.signatures.openssh.critical = sshbuf.readBuffer();
-	cert.signatures.openssh.exts = sshbuf.readBuffer();
-
-	/* reserved */
-	sshbuf.readBuffer();
-
-	var signingKeyBuf = sshbuf.readBuffer();
-	cert.issuerKey = rfc4253.read(signingKeyBuf);
-
-	/*
-	 * OpenSSH certs don't give the identity of the issuer, just their
-	 * public key. So, we use an Identity that matches anything. The
-	 * isSignedBy() function will later tell you if the key matches.
-	 */
-	cert.issuer = Identity.forHost('**');
-
-	var sigBuf = sshbuf.readBuffer();
-	cert.signatures.openssh.signature =
-	    Signature.parse(sigBuf, cert.issuerKey.type, 'ssh');
-
-	if (partial !== undefined) {
-		partial.remainder = sshbuf.remainder();
-		partial.consumed = sshbuf._offset;
-	}
-
-	return (new Certificate(cert));
-}
-
-function int64ToDate(buf) {
-	var i = buf.readUInt32BE(0) * 4294967296;
-	i += buf.readUInt32BE(4);
-	var d = new Date();
-	d.setTime(i * 1000);
-	d.sourceInt64 = buf;
-	return (d);
-}
-
-function dateToInt64(date) {
-	if (date.sourceInt64 !== undefined)
-		return (date.sourceInt64);
-	var i = Math.round(date.getTime() / 1000);
-	var upper = Math.floor(i / 4294967296);
-	var lower = Math.floor(i % 4294967296);
-	var buf = Buffer.alloc(8);
-	buf.writeUInt32BE(upper, 0);
-	buf.writeUInt32BE(lower, 4);
-	return (buf);
-}
-
-function sign(cert, key) {
-	if (cert.signatures.openssh === undefined)
-		cert.signatures.openssh = {};
-	try {
-		var blob = toBuffer(cert, true);
-	} catch (e) {
-		delete (cert.signatures.openssh);
-		return (false);
-	}
-	var sig = cert.signatures.openssh;
-	var hashAlgo = undefined;
-	if (key.type === 'rsa' || key.type === 'dsa')
-		hashAlgo = 'sha1';
-	var signer = key.createSign(hashAlgo);
-	signer.write(blob);
-	sig.signature = signer.sign();
-	return (true);
-}
-
-function signAsync(cert, signer, done) {
-	if (cert.signatures.openssh === undefined)
-		cert.signatures.openssh = {};
-	try {
-		var blob = toBuffer(cert, true);
-	} catch (e) {
-		delete (cert.signatures.openssh);
-		done(e);
-		return;
-	}
-	var sig = cert.signatures.openssh;
-
-	signer(blob, function (err, signature) {
-		if (err) {
-			done(err);
-			return;
-		}
-		try {
-			/*
-			 * This will throw if the signature isn't of a
-			 * type/algo that can be used for SSH.
-			 */
-			signature.toBuffer('ssh');
-		} catch (e) {
-			done(e);
-			return;
-		}
-		sig.signature = signature;
-		done();
-	});
-}
-
-function write(cert, options) {
-	if (options === undefined)
-		options = {};
-
-	var blob = toBuffer(cert);
-	var out = getCertType(cert.subjectKey) + ' ' + blob.toString('base64');
-	if (options.comment)
-		out = out + ' ' + options.comment;
-	return (out);
-}
-
-
-function toBuffer(cert, noSig) {
-	assert.object(cert.signatures.openssh, 'signature for openssh format');
-	var sig = cert.signatures.openssh;
-
-	if (sig.nonce === undefined)
-		sig.nonce = crypto.randomBytes(16);
-	var buf = new SSHBuffer({});
-	buf.writeString(getCertType(cert.subjectKey));
-	buf.writeBuffer(sig.nonce);
-
-	var key = cert.subjectKey;
-	var algInfo = algs.info[key.type];
-	algInfo.parts.forEach(function (part) {
-		buf.writePart(key.part[part]);
-	});
-
-	buf.writeInt64(cert.serial);
-
-	var type = cert.subjects[0].type;
-	assert.notStrictEqual(type, 'unknown');
-	cert.subjects.forEach(function (id) {
-		assert.strictEqual(id.type, type);
-	});
-	type = TYPES[type];
-	buf.writeInt(type);
-
-	if (sig.keyId === undefined) {
-		sig.keyId = cert.subjects[0].type + '_' +
-		    (cert.subjects[0].uid || cert.subjects[0].hostname);
-	}
-	buf.writeString(sig.keyId);
-
-	var sub = new SSHBuffer({});
-	cert.subjects.forEach(function (id) {
-		if (type === TYPES.host)
-			sub.writeString(id.hostname);
-		else if (type === TYPES.user)
-			sub.writeString(id.uid);
-	});
-	buf.writeBuffer(sub.toBuffer());
-
-	buf.writeInt64(dateToInt64(cert.validFrom));
-	buf.writeInt64(dateToInt64(cert.validUntil));
-
-	if (sig.critical === undefined)
-		sig.critical = Buffer.alloc(0);
-	buf.writeBuffer(sig.critical);
-
-	if (sig.exts === undefined)
-		sig.exts = Buffer.alloc(0);
-	buf.writeBuffer(sig.exts);
-
-	/* reserved */
-	buf.writeBuffer(Buffer.alloc(0));
-
-	sub = rfc4253.write(cert.issuerKey);
-	buf.writeBuffer(sub);
-
-	if (!noSig)
-		buf.writeBuffer(sig.signature.toBuffer('ssh'));
-
-	return (buf.toBuffer());
-}
-
-function getAlg(certType) {
-	if (certType === 'ssh-rsa-cert-v01@openssh.com')
-		return ('rsa');
-	if (certType === 'ssh-dss-cert-v01@openssh.com')
-		return ('dsa');
-	if (certType.match(ECDSA_ALGO))
-		return ('ecdsa');
-	if (certType === 'ssh-ed25519-cert-v01@openssh.com')
-		return ('ed25519');
-	throw (new Error('Unsupported cert type ' + certType));
-}
-
-function getCertType(key) {
-	if (key.type === 'rsa')
-		return ('ssh-rsa-cert-v01@openssh.com');
-	if (key.type === 'dsa')
-		return ('ssh-dss-cert-v01@openssh.com');
-	if (key.type === 'ecdsa')
-		return ('ecdsa-sha2-' + key.curve + '-cert-v01@openssh.com');
-	if (key.type === 'ed25519')
-		return ('ssh-ed25519-cert-v01@openssh.com');
-	throw (new Error('Unsupported key type ' + key.type));
-}
-
-
-/***/ }),
-/* 941 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2016 Joyent, Inc.
-
-var x509 = __webpack_require__(457);
-
-module.exports = {
-	read: read,
-	verify: x509.verify,
-	sign: x509.sign,
-	write: write
-};
-
-var assert = __webpack_require__(16);
-var asn1 = __webpack_require__(65);
-var Buffer = __webpack_require__(15).Buffer;
-var algs = __webpack_require__(32);
-var utils = __webpack_require__(26);
-var Key = __webpack_require__(27);
-var PrivateKey = __webpack_require__(33);
-var pem = __webpack_require__(86);
-var Identity = __webpack_require__(158);
-var Signature = __webpack_require__(74);
-var Certificate = __webpack_require__(155);
-
-function read(buf, options) {
-	if (typeof (buf) !== 'string') {
-		assert.buffer(buf, 'buf');
-		buf = buf.toString('ascii');
-	}
-
-	var lines = buf.trim().split(/[\r\n]+/g);
-
-	var m = lines[0].match(/*JSSTYLED*/
-	    /[-]+[ ]*BEGIN CERTIFICATE[ ]*[-]+/);
-	assert.ok(m, 'invalid PEM header');
-
-	var m2 = lines[lines.length - 1].match(/*JSSTYLED*/
-	    /[-]+[ ]*END CERTIFICATE[ ]*[-]+/);
-	assert.ok(m2, 'invalid PEM footer');
-
-	var headers = {};
-	while (true) {
-		lines = lines.slice(1);
-		m = lines[0].match(/*JSSTYLED*/
-		    /^([A-Za-z0-9-]+): (.+)$/);
-		if (!m)
-			break;
-		headers[m[1].toLowerCase()] = m[2];
-	}
-
-	/* Chop off the first and last lines */
-	lines = lines.slice(0, -1).join('');
-	buf = Buffer.from(lines, 'base64');
-
-	return (x509.read(buf, options));
-}
-
-function write(cert, options) {
-	var dbuf = x509.write(cert, options);
-
-	var header = 'CERTIFICATE';
-	var tmp = dbuf.toString('base64');
-	var len = tmp.length + (tmp.length / 64) +
-	    18 + 16 + header.length*2 + 10;
-	var buf = Buffer.alloc(len);
-	var o = 0;
-	o += buf.write('-----BEGIN ' + header + '-----\n', o);
-	for (var i = 0; i < tmp.length; ) {
-		var limit = i + 64;
-		if (limit > tmp.length)
-			limit = tmp.length;
-		o += buf.write(tmp.slice(i, limit), o);
-		buf[o++] = 10;
-		i = limit;
-	}
-	o += buf.write('-----END ' + header + '-----\n', o);
-
-	return (buf.slice(0, o));
-}
-
-
-/***/ }),
-/* 942 */
-/***/ (function(module, exports) {
-
-module.exports = shift
-
-function shift (stream) {
-  var rs = stream._readableState
-  if (!rs) return null
-  return rs.objectMode ? stream.read() : stream.read(getStateLength(rs))
-}
-
-function getStateLength (state) {
-  if (state.buffer.length) {
-    // Since node 6.3.0 state.buffer is a BufferList not an array
-    if (state.buffer.head) {
-      return state.buffer.head.data.length
-    }
-
-    return state.buffer[0].length
-  }
-
-  return state.length
-}
-
-
-/***/ }),
-/* 943 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function (str) {
-	return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
-		return '%' + c.charCodeAt(0).toString(16).toUpperCase();
-	});
-};
-
-
-/***/ }),
-/* 944 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var resolvePkg = __webpack_require__(679);
-
-/* @private
- *
- * given the name of a descendent module this module locates and returns its
- * package.json. In addition, it provides the baseDir.
- *
- * @method pkg
- * @param {String} name
- * @param {String} dir (optional) root directory to begin resolution
- */
-module.exports = function pkg(name, dir) {
-  if (name !== './') { name += '/'; }
-
-  var packagePath = resolvePkg(name, dir);
-  if (packagePath === null) { return null; }
-
-  var thePackage = require(packagePath);
-
-  thePackage.baseDir = packagePath.slice(0, packagePath.length - 12 /* index of `/package.json` */);
-
-  return thePackage;
-};
-
-
-/***/ }),
-/* 945 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var stripAnsi = __webpack_require__(947);
-var codePointAt = __webpack_require__(607);
-var isFullwidthCodePoint = __webpack_require__(946);
-
-// https://github.com/nodejs/io.js/blob/cff7300a578be1b10001f2d967aaedc88aee6402/lib/readline.js#L1345
-module.exports = function (str) {
-	if (typeof str !== 'string' || str.length === 0) {
-		return 0;
-	}
-
-	var width = 0;
-
-	str = stripAnsi(str);
-
-	for (var i = 0; i < str.length; i++) {
-		var code = codePointAt(str, i);
-
-		// ignore control characters
-		if (code <= 0x1f || (code >= 0x7f && code <= 0x9f)) {
-			continue;
-		}
-
-		// surrogates
-		if (code >= 0x10000) {
-			i++;
-		}
-
-		if (isFullwidthCodePoint(code)) {
-			width += 2;
-		} else {
-			width++;
-		}
-	}
-
-	return width;
-};
-
-
-/***/ }),
-/* 946 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var numberIsNan = __webpack_require__(767);
-
-module.exports = function (x) {
-	if (numberIsNan(x)) {
-		return false;
-	}
-
-	// https://github.com/nodejs/io.js/blob/cff7300a578be1b10001f2d967aaedc88aee6402/lib/readline.js#L1369
-
-	// code points are derived from:
-	// http://www.unix.org/Public/UNIDATA/EastAsianWidth.txt
-	if (x >= 0x1100 && (
-		x <= 0x115f ||  // Hangul Jamo
-		0x2329 === x || // LEFT-POINTING ANGLE BRACKET
-		0x232a === x || // RIGHT-POINTING ANGLE BRACKET
-		// CJK Radicals Supplement .. Enclosed CJK Letters and Months
-		(0x2e80 <= x && x <= 0x3247 && x !== 0x303f) ||
-		// Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
-		0x3250 <= x && x <= 0x4dbf ||
-		// CJK Unified Ideographs .. Yi Radicals
-		0x4e00 <= x && x <= 0xa4c6 ||
-		// Hangul Jamo Extended-A
-		0xa960 <= x && x <= 0xa97c ||
-		// Hangul Syllables
-		0xac00 <= x && x <= 0xd7a3 ||
-		// CJK Compatibility Ideographs
-		0xf900 <= x && x <= 0xfaff ||
-		// Vertical Forms
-		0xfe10 <= x && x <= 0xfe19 ||
-		// CJK Compatibility Forms .. Small Form Variants
-		0xfe30 <= x && x <= 0xfe6b ||
-		// Halfwidth and Fullwidth Forms
-		0xff01 <= x && x <= 0xff60 ||
-		0xffe0 <= x && x <= 0xffe6 ||
-		// Kana Supplement
-		0x1b000 <= x && x <= 0x1b001 ||
-		// Enclosed Ideographic Supplement
-		0x1f200 <= x && x <= 0x1f251 ||
-		// CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
-		0x20000 <= x && x <= 0x3fffd)) {
-		return true;
-	}
-
-	return false;
-}
-
-
-/***/ }),
-/* 947 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var ansiRegex = __webpack_require__(505)();
-
-module.exports = function (str) {
-	return typeof str === 'string' ? str.replace(ansiRegex, '') : str;
-};
-
-
-/***/ }),
-/* 948 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = () => {
-	const pattern = [
-		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)',
-		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))'
-	].join('|');
-
-	return new RegExp(pattern, 'g');
-};
-
-
-/***/ }),
-/* 949 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var util = __webpack_require__(3)
-var bl = __webpack_require__(592)
-var xtend = __webpack_require__(465)
-var headers = __webpack_require__(459)
-
-var Writable = __webpack_require__(102).Writable
-var PassThrough = __webpack_require__(102).PassThrough
-
-var noop = function () {}
-
-var overflow = function (size) {
-  size &= 511
-  return size && 512 - size
-}
-
-var emptyStream = function (self, offset) {
-  var s = new Source(self, offset)
-  s.end()
-  return s
-}
-
-var mixinPax = function (header, pax) {
-  if (pax.path) header.name = pax.path
-  if (pax.linkpath) header.linkname = pax.linkpath
-  if (pax.size) header.size = parseInt(pax.size, 10)
-  header.pax = pax
-  return header
-}
-
-var Source = function (self, offset) {
-  this._parent = self
-  this.offset = offset
-  PassThrough.call(this)
-}
-
-util.inherits(Source, PassThrough)
-
-Source.prototype.destroy = function (err) {
-  this._parent.destroy(err)
-}
-
-var Extract = function (opts) {
-  if (!(this instanceof Extract)) return new Extract(opts)
-  Writable.call(this, opts)
-
-  opts = opts || {}
-
-  this._offset = 0
-  this._buffer = bl()
-  this._missing = 0
-  this._partial = false
-  this._onparse = noop
-  this._header = null
-  this._stream = null
-  this._overflow = null
-  this._cb = null
-  this._locked = false
-  this._destroyed = false
-  this._pax = null
-  this._paxGlobal = null
-  this._gnuLongPath = null
-  this._gnuLongLinkPath = null
-
-  var self = this
-  var b = self._buffer
-
-  var oncontinue = function () {
-    self._continue()
-  }
-
-  var onunlock = function (err) {
-    self._locked = false
-    if (err) return self.destroy(err)
-    if (!self._stream) oncontinue()
-  }
-
-  var onstreamend = function () {
-    self._stream = null
-    var drain = overflow(self._header.size)
-    if (drain) self._parse(drain, ondrain)
-    else self._parse(512, onheader)
-    if (!self._locked) oncontinue()
-  }
-
-  var ondrain = function () {
-    self._buffer.consume(overflow(self._header.size))
-    self._parse(512, onheader)
-    oncontinue()
-  }
-
-  var onpaxglobalheader = function () {
-    var size = self._header.size
-    self._paxGlobal = headers.decodePax(b.slice(0, size))
-    b.consume(size)
-    onstreamend()
-  }
-
-  var onpaxheader = function () {
-    var size = self._header.size
-    self._pax = headers.decodePax(b.slice(0, size))
-    if (self._paxGlobal) self._pax = xtend(self._paxGlobal, self._pax)
-    b.consume(size)
-    onstreamend()
-  }
-
-  var ongnulongpath = function () {
-    var size = self._header.size
-    this._gnuLongPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding)
-    b.consume(size)
-    onstreamend()
-  }
-
-  var ongnulonglinkpath = function () {
-    var size = self._header.size
-    this._gnuLongLinkPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding)
-    b.consume(size)
-    onstreamend()
-  }
-
-  var onheader = function () {
-    var offset = self._offset
-    var header
-    try {
-      header = self._header = headers.decode(b.slice(0, 512), opts.filenameEncoding)
-    } catch (err) {
-      self.emit('error', err)
-    }
-    b.consume(512)
-
-    if (!header) {
-      self._parse(512, onheader)
-      oncontinue()
-      return
-    }
-    if (header.type === 'gnu-long-path') {
-      self._parse(header.size, ongnulongpath)
-      oncontinue()
-      return
-    }
-    if (header.type === 'gnu-long-link-path') {
-      self._parse(header.size, ongnulonglinkpath)
-      oncontinue()
-      return
-    }
-    if (header.type === 'pax-global-header') {
-      self._parse(header.size, onpaxglobalheader)
-      oncontinue()
-      return
-    }
-    if (header.type === 'pax-header') {
-      self._parse(header.size, onpaxheader)
-      oncontinue()
-      return
-    }
-
-    if (self._gnuLongPath) {
-      header.name = self._gnuLongPath
-      self._gnuLongPath = null
-    }
-
-    if (self._gnuLongLinkPath) {
-      header.linkname = self._gnuLongLinkPath
-      self._gnuLongLinkPath = null
-    }
-
-    if (self._pax) {
-      self._header = header = mixinPax(header, self._pax)
-      self._pax = null
-    }
-
-    self._locked = true
-
-    if (!header.size || header.type === 'directory') {
-      self._parse(512, onheader)
-      self.emit('entry', header, emptyStream(self, offset), onunlock)
-      return
-    }
-
-    self._stream = new Source(self, offset)
-
-    self.emit('entry', header, self._stream, onunlock)
-    self._parse(header.size, onstreamend)
-    oncontinue()
-  }
-
-  this._onheader = onheader
-  this._parse(512, onheader)
-}
-
-util.inherits(Extract, Writable)
-
-Extract.prototype.destroy = function (err) {
-  if (this._destroyed) return
-  this._destroyed = true
-
-  if (err) this.emit('error', err)
-  this.emit('close')
-  if (this._stream) this._stream.emit('close')
-}
-
-Extract.prototype._parse = function (size, onparse) {
-  if (this._destroyed) return
-  this._offset += size
-  this._missing = size
-  if (onparse === this._onheader) this._partial = false
-  this._onparse = onparse
-}
-
-Extract.prototype._continue = function () {
-  if (this._destroyed) return
-  var cb = this._cb
-  this._cb = noop
-  if (this._overflow) this._write(this._overflow, undefined, cb)
-  else cb()
-}
-
-Extract.prototype._write = function (data, enc, cb) {
-  if (this._destroyed) return
-
-  var s = this._stream
-  var b = this._buffer
-  var missing = this._missing
-  if (data.length) this._partial = true
-
-  // we do not reach end-of-chunk now. just forward it
-
-  if (data.length < missing) {
-    this._missing -= data.length
-    this._overflow = null
-    if (s) return s.write(data, cb)
-    b.append(data)
-    return cb()
-  }
-
-  // end-of-chunk. the parser should call cb.
-
-  this._cb = cb
-  this._missing = 0
-
-  var overflow = null
-  if (data.length > missing) {
-    overflow = data.slice(missing)
-    data = data.slice(0, missing)
-  }
-
-  if (s) s.end(data)
-  else b.append(data)
-
-  this._overflow = overflow
-  this._onparse()
-}
-
-Extract.prototype._final = function (cb) {
-  if (this._partial) return this.destroy(new Error('Unexpected end of data'))
-  cb()
-}
-
-module.exports = Extract
-
-
-/***/ }),
-/* 950 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var constants = __webpack_require__(651)
-var eos = __webpack_require__(173)
-var util = __webpack_require__(3)
-var alloc = __webpack_require__(380)
-var toBuffer = __webpack_require__(462)
-
-var Readable = __webpack_require__(102).Readable
-var Writable = __webpack_require__(102).Writable
-var StringDecoder = __webpack_require__(333).StringDecoder
-
-var headers = __webpack_require__(459)
-
-var DMODE = parseInt('755', 8)
-var FMODE = parseInt('644', 8)
-
-var END_OF_TAR = alloc(1024)
-
-var noop = function () {}
-
-var overflow = function (self, size) {
-  size &= 511
-  if (size) self.push(END_OF_TAR.slice(0, 512 - size))
-}
-
-function modeToType (mode) {
-  switch (mode & constants.S_IFMT) {
-    case constants.S_IFBLK: return 'block-device'
-    case constants.S_IFCHR: return 'character-device'
-    case constants.S_IFDIR: return 'directory'
-    case constants.S_IFIFO: return 'fifo'
-    case constants.S_IFLNK: return 'symlink'
-  }
-
-  return 'file'
-}
-
-var Sink = function (to) {
-  Writable.call(this)
-  this.written = 0
-  this._to = to
-  this._destroyed = false
-}
-
-util.inherits(Sink, Writable)
-
-Sink.prototype._write = function (data, enc, cb) {
-  this.written += data.length
-  if (this._to.push(data)) return cb()
-  this._to._drain = cb
-}
-
-Sink.prototype.destroy = function () {
-  if (this._destroyed) return
-  this._destroyed = true
-  this.emit('close')
-}
-
-var LinkSink = function () {
-  Writable.call(this)
-  this.linkname = ''
-  this._decoder = new StringDecoder('utf-8')
-  this._destroyed = false
-}
-
-util.inherits(LinkSink, Writable)
-
-LinkSink.prototype._write = function (data, enc, cb) {
-  this.linkname += this._decoder.write(data)
-  cb()
-}
-
-LinkSink.prototype.destroy = function () {
-  if (this._destroyed) return
-  this._destroyed = true
-  this.emit('close')
-}
-
-var Void = function () {
-  Writable.call(this)
-  this._destroyed = false
-}
-
-util.inherits(Void, Writable)
-
-Void.prototype._write = function (data, enc, cb) {
-  cb(new Error('No body allowed for this entry'))
-}
-
-Void.prototype.destroy = function () {
-  if (this._destroyed) return
-  this._destroyed = true
-  this.emit('close')
-}
-
-var Pack = function (opts) {
-  if (!(this instanceof Pack)) return new Pack(opts)
-  Readable.call(this, opts)
-
-  this._drain = noop
-  this._finalized = false
-  this._finalizing = false
-  this._destroyed = false
-  this._stream = null
-}
-
-util.inherits(Pack, Readable)
-
-Pack.prototype.entry = function (header, buffer, callback) {
-  if (this._stream) throw new Error('already piping an entry')
-  if (this._finalized || this._destroyed) return
-
-  if (typeof buffer === 'function') {
-    callback = buffer
-    buffer = null
-  }
-
-  if (!callback) callback = noop
-
-  var self = this
-
-  if (!header.size || header.type === 'symlink') header.size = 0
-  if (!header.type) header.type = modeToType(header.mode)
-  if (!header.mode) header.mode = header.type === 'directory' ? DMODE : FMODE
-  if (!header.uid) header.uid = 0
-  if (!header.gid) header.gid = 0
-  if (!header.mtime) header.mtime = new Date()
-
-  if (typeof buffer === 'string') buffer = toBuffer(buffer)
-  if (Buffer.isBuffer(buffer)) {
-    header.size = buffer.length
-    this._encode(header)
-    this.push(buffer)
-    overflow(self, header.size)
-    process.nextTick(callback)
-    return new Void()
-  }
-
-  if (header.type === 'symlink' && !header.linkname) {
-    var linkSink = new LinkSink()
-    eos(linkSink, function (err) {
-      if (err) { // stream was closed
-        self.destroy()
-        return callback(err)
-      }
-
-      header.linkname = linkSink.linkname
-      self._encode(header)
-      callback()
-    })
-
-    return linkSink
-  }
-
-  this._encode(header)
-
-  if (header.type !== 'file' && header.type !== 'contiguous-file') {
-    process.nextTick(callback)
-    return new Void()
-  }
-
-  var sink = new Sink(this)
-
-  this._stream = sink
-
-  eos(sink, function (err) {
-    self._stream = null
-
-    if (err) { // stream was closed
-      self.destroy()
-      return callback(err)
-    }
-
-    if (sink.written !== header.size) { // corrupting tar
-      self.destroy()
-      return callback(new Error('size mismatch'))
-    }
-
-    overflow(self, header.size)
-    if (self._finalizing) self.finalize()
-    callback()
-  })
-
-  return sink
-}
-
-Pack.prototype.finalize = function () {
-  if (this._stream) {
-    this._finalizing = true
-    return
-  }
-
-  if (this._finalized) return
-  this._finalized = true
-  this.push(END_OF_TAR)
-  this.push(null)
-}
-
-Pack.prototype.destroy = function (err) {
-  if (this._destroyed) return
-  this._destroyed = true
-
-  if (err) this.emit('error', err)
-  this.emit('close')
-  if (this._stream && this._stream.destroy) this._stream.destroy()
-}
-
-Pack.prototype._encode = function (header) {
-  if (!header.pax) {
-    var buf = headers.encode(header)
-    if (buf) {
-      this.push(buf)
-      return
-    }
-  }
-  this._encodePax(header)
-}
-
-Pack.prototype._encodePax = function (header) {
-  var paxHeader = headers.encodePax({
-    name: header.name,
-    linkname: header.linkname,
-    pax: header.pax
-  })
-
-  var newHeader = {
-    name: 'PaxHeader',
-    mode: header.mode,
-    uid: header.uid,
-    gid: header.gid,
-    size: paxHeader.length,
-    mtime: header.mtime,
-    type: 'pax-header',
-    linkname: header.linkname && 'PaxHeader',
-    uname: header.uname,
-    gname: header.gname,
-    devmajor: header.devmajor,
-    devminor: header.devminor
-  }
-
-  this.push(headers.encode(newHeader))
-  this.push(paxHeader)
-  overflow(this, paxHeader.length)
-
-  newHeader.size = header.size
-  newHeader.type = header.type
-  this.push(headers.encode(newHeader))
-}
-
-Pack.prototype._read = function (n) {
-  var drain = this._drain
-  this._drain = noop
-  drain()
-}
-
-module.exports = Pack
-
-
-/***/ }),
-/* 951 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-var thenify = __webpack_require__(952)
-
-module.exports = thenifyAll
-thenifyAll.withCallback = withCallback
-thenifyAll.thenify = thenify
-
-/**
- * Promisifies all the selected functions in an object.
- *
- * @param {Object} source the source object for the async functions
- * @param {Object} [destination] the destination to set all the promisified methods
- * @param {Array} [methods] an array of method names of `source`
- * @return {Object}
- * @api public
- */
-
-function thenifyAll(source, destination, methods) {
-  return promisifyAll(source, destination, methods, thenify)
-}
-
-/**
- * Promisifies all the selected functions in an object and backward compatible with callback.
- *
- * @param {Object} source the source object for the async functions
- * @param {Object} [destination] the destination to set all the promisified methods
- * @param {Array} [methods] an array of method names of `source`
- * @return {Object}
- * @api public
- */
-
-function withCallback(source, destination, methods) {
-  return promisifyAll(source, destination, methods, thenify.withCallback)
-}
-
-function promisifyAll(source, destination, methods, promisify) {
-  if (!destination) {
-    destination = {};
-    methods = Object.keys(source)
-  }
-
-  if (Array.isArray(destination)) {
-    methods = destination
-    destination = {}
-  }
-
-  if (!methods) {
-    methods = Object.keys(source)
-  }
-
-  if (typeof source === 'function') destination = promisify(source)
-
-  methods.forEach(function (name) {
-    // promisify only if it's a function
-    if (typeof source[name] === 'function') destination[name] = promisify(source[name])
-  })
-
-  // proxy the rest
-  Object.keys(source).forEach(function (name) {
-    if (deprecated(source, name)) return
-    if (destination[name]) return
-    destination[name] = source[name]
-  })
-
-  return destination
-}
-
-function deprecated(source, name) {
-  var desc = Object.getOwnPropertyDescriptor(source, name)
-  if (!desc || !desc.get) return false
-  if (desc.get.name === 'deprecated') return true
-  return false
-}
-
-
-/***/ }),
-/* 952 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-var Promise = __webpack_require__(345)
-var assert = __webpack_require__(28)
-
-module.exports = thenify
-
-/**
- * Turn async functions into promises
- *
- * @param {Function} $$__fn__$$
- * @return {Function}
- * @api public
- */
-
-function thenify($$__fn__$$, options) {
-  assert(typeof $$__fn__$$ === 'function')
-  return eval(createWrapper($$__fn__$$.name, options))
-}
-
-/**
- * Turn async functions into promises and backward compatible with callback
- *
- * @param {Function} $$__fn__$$
- * @return {Function}
- * @api public
- */
-
-thenify.withCallback = function ($$__fn__$$, options) {
-  assert(typeof $$__fn__$$ === 'function')
-  options = options || {}
-  options.withCallback = true
-  if (options.multiArgs === undefined) options.multiArgs = true
-  return eval(createWrapper($$__fn__$$.name, options))
-}
-
-function createCallback(resolve, reject, multiArgs) {
-  return function(err, value) {
-    if (err) return reject(err)
-    var length = arguments.length
-
-    if (length <= 2 || !multiArgs) return resolve(value)
-
-    if (Array.isArray(multiArgs)) {
-      var values = {}
-      for (var i = 1; i < length; i++) values[multiArgs[i - 1]] = arguments[i]
-      return resolve(values)
-    }
-
-    var values = new Array(length - 1)
-    for (var i = 1; i < length; ++i) values[i - 1] = arguments[i]
-    resolve(values)
-  }
-}
-
-function createWrapper(name, options) {
-  name = (name || '').replace(/\s|bound(?!$)/g, '')
-  options = options || {}
-  // default to true
-  var multiArgs = options.multiArgs !== undefined ? options.multiArgs : true
-  multiArgs = 'var multiArgs = ' + JSON.stringify(multiArgs) + '\n'
-
-  var withCallback = options.withCallback ?
-    'var lastType = typeof arguments[len - 1]\n'
-    + 'if (lastType === "function") return $$__fn__$$.apply(self, arguments)\n'
-   : ''
-
-  return '(function ' + name + '() {\n'
-    + 'var self = this\n'
-    + 'var len = arguments.length\n'
-    + multiArgs
-    + withCallback
-    + 'var args = new Array(len + 1)\n'
-    + 'for (var i = 0; i < len; ++i) args[i] = arguments[i]\n'
-    + 'var lastIndex = i\n'
-    + 'return new Promise(function (resolve, reject) {\n'
-      + 'args[lastIndex] = createCallback(resolve, reject, multiArgs)\n'
-      + '$$__fn__$$.apply(self, args)\n'
-    + '})\n'
-  + '})'
-}
-
-
-/***/ }),
-/* 953 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(23)
-
-// through
-//
-// a stream that does nothing but re-emit the input.
-// useful for aggregating a series of changing but not ending streams into one stream)
-
-exports = module.exports = through
-through.through = through
-
-//create a readable writable stream.
-
-function through (write, end, opts) {
-  write = write || function (data) { this.queue(data) }
-  end = end || function () { this.queue(null) }
-
-  var ended = false, destroyed = false, buffer = [], _ended = false
-  var stream = new Stream()
-  stream.readable = stream.writable = true
-  stream.paused = false
-
-//  stream.autoPause   = !(opts && opts.autoPause   === false)
-  stream.autoDestroy = !(opts && opts.autoDestroy === false)
-
-  stream.write = function (data) {
-    write.call(this, data)
-    return !stream.paused
-  }
-
-  function drain() {
-    while(buffer.length && !stream.paused) {
-      var data = buffer.shift()
-      if(null === data)
-        return stream.emit('end')
-      else
-        stream.emit('data', data)
-    }
-  }
-
-  stream.queue = stream.push = function (data) {
-//    console.error(ended)
-    if(_ended) return stream
-    if(data === null) _ended = true
-    buffer.push(data)
-    drain()
-    return stream
-  }
-
-  //this will be registered as the first 'end' listener
-  //must call destroy next tick, to make sure we're after any
-  //stream piped from here.
-  //this is only a problem if end is not emitted synchronously.
-  //a nicer way to do this is to make sure this is the last listener for 'end'
-
-  stream.on('end', function () {
-    stream.readable = false
-    if(!stream.writable && stream.autoDestroy)
-      process.nextTick(function () {
-        stream.destroy()
-      })
-  })
-
-  function _end () {
-    stream.writable = false
-    end.call(stream)
-    if(!stream.readable && stream.autoDestroy)
-      stream.destroy()
-  }
-
-  stream.end = function (data) {
-    if(ended) return
-    ended = true
-    if(arguments.length) stream.write(data)
-    _end() // will emit or queue
-    return stream
-  }
-
-  stream.destroy = function () {
-    if(destroyed) return
-    destroyed = true
-    ended = true
-    buffer.length = 0
-    stream.writable = stream.readable = false
-    stream.emit('close')
-    return stream
-  }
-
-  stream.pause = function () {
-    if(stream.paused) return
-    stream.paused = true
-    return stream
-  }
-
-  stream.resume = function () {
-    if(stream.paused) {
-      stream.paused = false
-      stream.emit('resume')
-    }
-    drain()
-    //may have become paused again,
-    //as drain emits 'data'.
-    if(!stream.paused)
-      stream.emit('drain')
-    return stream
-  }
-  return stream
-}
-
-
-
-/***/ }),
-/* 954 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*!
- * Tmp
- *
- * Copyright (c) 2011-2017 KARASZI Istvan <github@spam.raszi.hu>
- *
- * MIT Licensed
- */
-
-/*
- * Module dependencies.
- */
-const fs = __webpack_require__(5);
-const path = __webpack_require__(0);
-const crypto = __webpack_require__(12);
-const osTmpDir = __webpack_require__(772);
-const _c = process.binding('constants');
-
-/*
- * The working inner variables.
- */
-const
-  /**
-   * The temporary directory.
-   * @type {string}
-   */
-  tmpDir = osTmpDir(),
-
-  // the random characters to choose from
-  RANDOM_CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz',
-
-  TEMPLATE_PATTERN = /XXXXXX/,
-
-  DEFAULT_TRIES = 3,
-
-  CREATE_FLAGS = (_c.O_CREAT || _c.fs.O_CREAT) | (_c.O_EXCL || _c.fs.O_EXCL) | (_c.O_RDWR || _c.fs.O_RDWR),
-
-  EBADF = _c.EBADF || _c.os.errno.EBADF,
-  ENOENT = _c.ENOENT || _c.os.errno.ENOENT,
-
-  DIR_MODE = 448 /* 0o700 */,
-  FILE_MODE = 384 /* 0o600 */,
-
-  // this will hold the objects need to be removed on exit
-  _removeObjects = [];
-
-var
-  _gracefulCleanup = false,
-  _uncaughtException = false;
-
-/**
- * Random name generator based on crypto.
- * Adapted from http://blog.tompawlak.org/how-to-generate-random-values-nodejs-javascript
- *
- * @param {number} howMany
- * @returns {string} the generated random name
- * @private
- */
-function _randomChars(howMany) {
-  var
-    value = [],
-    rnd = null;
-
-  // make sure that we do not fail because we ran out of entropy
-  try {
-    rnd = crypto.randomBytes(howMany);
-  } catch (e) {
-    rnd = crypto.pseudoRandomBytes(howMany);
-  }
-
-  for (var i = 0; i < howMany; i++) {
-    value.push(RANDOM_CHARS[rnd[i] % RANDOM_CHARS.length]);
-  }
-
-  return value.join('');
-}
-
-/**
- * Checks whether the `obj` parameter is defined or not.
- *
- * @param {Object} obj
- * @returns {boolean} true if the object is undefined
- * @private
- */
-function _isUndefined(obj) {
-  return typeof obj === 'undefined';
-}
-
-/**
- * Parses the function arguments.
- *
- * This function helps to have optional arguments.
- *
- * @param {(Options|Function)} options
- * @param {Function} callback
- * @returns {Array} parsed arguments
- * @private
- */
-function _parseArguments(options, callback) {
-  if (typeof options == 'function') {
-    return [callback || {}, options];
-  }
-
-  if (_isUndefined(options)) {
-    return [{}, callback];
-  }
-
-  return [options, callback];
-}
-
-/**
- * Generates a new temporary name.
- *
- * @param {Object} opts
- * @returns {string} the new random name according to opts
- * @private
- */
-function _generateTmpName(opts) {
-  if (opts.name) {
-    return path.join(opts.dir || tmpDir, opts.name);
-  }
-
-  // mkstemps like template
-  if (opts.template) {
-    return opts.template.replace(TEMPLATE_PATTERN, _randomChars(6));
-  }
-
-  // prefix and postfix
-  const name = [
-    opts.prefix || 'tmp-',
-    process.pid,
-    _randomChars(12),
-    opts.postfix || ''
-  ].join('');
-
-  return path.join(opts.dir || tmpDir, name);
-}
-
-/**
- * Gets a temporary file name.
- *
- * @param {(Options|tmpNameCallback)} options options or callback
- * @param {?tmpNameCallback} callback the callback function
- */
-function tmpName(options, callback) {
-  var
-    args = _parseArguments(options, callback),
-    opts = args[0],
-    cb = args[1],
-    tries = opts.name ? 1 : opts.tries || DEFAULT_TRIES;
-
-  if (isNaN(tries) || tries < 0)
-    return cb(new Error('Invalid tries'));
-
-  if (opts.template && !opts.template.match(TEMPLATE_PATTERN))
-    return cb(new Error('Invalid template provided'));
-
-  (function _getUniqueName() {
-    const name = _generateTmpName(opts);
-
-    // check whether the path exists then retry if needed
-    fs.stat(name, function (err) {
-      if (!err) {
-        if (tries-- > 0) return _getUniqueName();
-
-        return cb(new Error('Could not get a unique tmp filename, max tries reached ' + name));
-      }
-
-      cb(null, name);
-    });
-  }());
-}
-
-/**
- * Synchronous version of tmpName.
- *
- * @param {Object} options
- * @returns {string} the generated random name
- * @throws {Error} if the options are invalid or could not generate a filename
- */
-function tmpNameSync(options) {
-  var
-    args = _parseArguments(options),
-    opts = args[0],
-    tries = opts.name ? 1 : opts.tries || DEFAULT_TRIES;
-
-  if (isNaN(tries) || tries < 0)
-    throw new Error('Invalid tries');
-
-  if (opts.template && !opts.template.match(TEMPLATE_PATTERN))
-    throw new Error('Invalid template provided');
-
-  do {
-    const name = _generateTmpName(opts);
-    try {
-      fs.statSync(name);
-    } catch (e) {
-      return name;
-    }
-  } while (tries-- > 0);
-
-  throw new Error('Could not get a unique tmp filename, max tries reached');
-}
-
-/**
- * Creates and opens a temporary file.
- *
- * @param {(Options|fileCallback)} options the config options or the callback function
- * @param {?fileCallback} callback
- */
-function file(options, callback) {
-  var
-    args = _parseArguments(options, callback),
-    opts = args[0],
-    cb = args[1];
-
-  opts.postfix = (_isUndefined(opts.postfix)) ? '.tmp' : opts.postfix;
-
-  // gets a temporary filename
-  tmpName(opts, function _tmpNameCreated(err, name) {
-    if (err) return cb(err);
-
-    // create and open the file
-    fs.open(name, CREATE_FLAGS, opts.mode || FILE_MODE, function _fileCreated(err, fd) {
-      if (err) return cb(err);
-
-      if (opts.discardDescriptor) {
-        return fs.close(fd, function _discardCallback(err) {
-          if (err) {
-            // Low probability, and the file exists, so this could be
-            // ignored.  If it isn't we certainly need to unlink the
-            // file, and if that fails too its error is more
-            // important.
-            try {
-              fs.unlinkSync(name);
-            } catch (e) {
-              if (!isENOENT(e)) {
-                err = e;
-              }
-            }
-            return cb(err);
-          }
-          cb(null, name, undefined, _prepareTmpFileRemoveCallback(name, -1, opts));
-        });
-      }
-      if (opts.detachDescriptor) {
-        return cb(null, name, fd, _prepareTmpFileRemoveCallback(name, -1, opts));
-      }
-      cb(null, name, fd, _prepareTmpFileRemoveCallback(name, fd, opts));
-    });
-  });
-}
-
-/**
- * Synchronous version of file.
- *
- * @param {Options} options
- * @returns {FileSyncObject} object consists of name, fd and removeCallback
- * @throws {Error} if cannot create a file
- */
-function fileSync(options) {
-  var
-    args = _parseArguments(options),
-    opts = args[0];
-
-  opts.postfix = opts.postfix || '.tmp';
-
-  const discardOrDetachDescriptor = opts.discardDescriptor || opts.detachDescriptor;
-  const name = tmpNameSync(opts);
-  var fd = fs.openSync(name, CREATE_FLAGS, opts.mode || FILE_MODE);
-  if (opts.discardDescriptor) {
-    fs.closeSync(fd); 
-    fd = undefined;
-  }
-
-  return {
-    name: name,
-    fd: fd,
-    removeCallback: _prepareTmpFileRemoveCallback(name, discardOrDetachDescriptor ? -1 : fd, opts)
-  };
-}
-
-/**
- * Removes files and folders in a directory recursively.
- *
- * @param {string} root
- * @private
- */
-function _rmdirRecursiveSync(root) {
-  const dirs = [root];
-
-  do {
-    var
-      dir = dirs.pop(),
-      deferred = false,
-      files = fs.readdirSync(dir);
-
-    for (var i = 0, length = files.length; i < length; i++) {
-      var
-        file = path.join(dir, files[i]),
-        stat = fs.lstatSync(file); // lstat so we don't recurse into symlinked directories
-
-      if (stat.isDirectory()) {
-        if (!deferred) {
-          deferred = true;
-          dirs.push(dir);
-        }
-        dirs.push(file);
-      } else {
-        fs.unlinkSync(file);
-      }
-    }
-
-    if (!deferred) {
-      fs.rmdirSync(dir);
-    }
-  } while (dirs.length !== 0);
-}
-
-/**
- * Creates a temporary directory.
- *
- * @param {(Options|dirCallback)} options the options or the callback function
- * @param {?dirCallback} callback
- */
-function dir(options, callback) {
-  var
-    args = _parseArguments(options, callback),
-    opts = args[0],
-    cb = args[1];
-
-  // gets a temporary filename
-  tmpName(opts, function _tmpNameCreated(err, name) {
-    if (err) return cb(err);
-
-    // create the directory
-    fs.mkdir(name, opts.mode || DIR_MODE, function _dirCreated(err) {
-      if (err) return cb(err);
-
-      cb(null, name, _prepareTmpDirRemoveCallback(name, opts));
-    });
-  });
-}
-
-/**
- * Synchronous version of dir.
- *
- * @param {Options} options
- * @returns {DirSyncObject} object consists of name and removeCallback
- * @throws {Error} if it cannot create a directory
- */
-function dirSync(options) {
-  var
-    args = _parseArguments(options),
-    opts = args[0];
-
-  const name = tmpNameSync(opts);
-  fs.mkdirSync(name, opts.mode || DIR_MODE);
-
-  return {
-    name: name,
-    removeCallback: _prepareTmpDirRemoveCallback(name, opts)
-  };
-}
-
-/**
- * Prepares the callback for removal of the temporary file.
- *
- * @param {string} name the path of the file
- * @param {number} fd file descriptor
- * @param {Object} opts
- * @returns {fileCallback}
- * @private
- */
-function _prepareTmpFileRemoveCallback(name, fd, opts) {
-  const removeCallback = _prepareRemoveCallback(function _removeCallback(fdPath) {
-    try {
-      if (0 <= fdPath[0]) {
-        fs.closeSync(fdPath[0]);
-      }
-    }
-    catch (e) {
-      // under some node/windows related circumstances, a temporary file
-      // may have not be created as expected or the file was already closed
-      // by the user, in which case we will simply ignore the error
-      if (!isEBADF(e) && !isENOENT(e)) {
-        // reraise any unanticipated error
-        throw e;
-      }
-    }
-    try {
-      fs.unlinkSync(fdPath[1]);
-    }
-    catch (e) {
-      if (!isENOENT(e)) {
-        // reraise any unanticipated error
-        throw e;
-      }
-    }
-  }, [fd, name]);
-
-  if (!opts.keep) {
-    _removeObjects.unshift(removeCallback);
-  }
-
-  return removeCallback;
-}
-
-/**
- * Prepares the callback for removal of the temporary directory.
- *
- * @param {string} name
- * @param {Object} opts
- * @returns {Function} the callback
- * @private
- */
-function _prepareTmpDirRemoveCallback(name, opts) {
-  const removeFunction = opts.unsafeCleanup ? _rmdirRecursiveSync : fs.rmdirSync.bind(fs);
-  const removeCallback = _prepareRemoveCallback(removeFunction, name);
-
-  if (!opts.keep) {
-    _removeObjects.unshift(removeCallback);
-  }
-
-  return removeCallback;
-}
-
-/**
- * Creates a guarded function wrapping the removeFunction call.
- *
- * @param {Function} removeFunction
- * @param {Object} arg
- * @returns {Function}
- * @private
- */
-function _prepareRemoveCallback(removeFunction, arg) {
-  var called = false;
-
-  return function _cleanupCallback(next) {
-    if (!called) {
-      const index = _removeObjects.indexOf(_cleanupCallback);
-      if (index >= 0) {
-        _removeObjects.splice(index, 1);
-      }
-
-      called = true;
-      removeFunction(arg);
-    }
-
-    if (next) next(null);
-  };
-}
-
-/**
- * The garbage collector.
- *
- * @private
- */
-function _garbageCollector() {
-  if (_uncaughtException && !_gracefulCleanup) {
-    return;
-  }
-
-  // the function being called removes itself from _removeObjects,
-  // loop until _removeObjects is empty
-  while (_removeObjects.length) {
-    try {
-      _removeObjects[0].call(null);
-    } catch (e) {
-      // already removed?
-    }
-  }
-}
-
-/**
- * Helper for testing against EBADF to compensate changes made to Node 7.x under Windows.
- */
-function isEBADF(error) {
-  return isExpectedError(error, -EBADF, 'EBADF');
-}
-
-/**
- * Helper for testing against ENOENT to compensate changes made to Node 7.x under Windows.
- */
-function isENOENT(error) {
-  return isExpectedError(error, -ENOENT, 'ENOENT');
-}
-
-/**
- * Helper to determine whether the expected error code matches the actual code and errno,
- * which will differ between the supported node versions.
- *
- * - Node >= 7.0:
- *   error.code {String}
- *   error.errno {String|Number} any numerical value will be negated
- *
- * - Node >= 6.0 < 7.0:
- *   error.code {String}
- *   error.errno {Number} negated
- *
- * - Node >= 4.0 < 6.0: introduces SystemError
- *   error.code {String}
- *   error.errno {Number} negated
- *
- * - Node >= 0.10 < 4.0:
- *   error.code {Number} negated
- *   error.errno n/a
- */
-function isExpectedError(error, code, errno) {
-  return error.code == code || error.code == errno;
-}
-
-/**
- * Sets the graceful cleanup.
- *
- * Also removes the created files and directories when an uncaught exception occurs.
- */
-function setGracefulCleanup() {
-  _gracefulCleanup = true;
-}
-
-const version = process.versions.node.split('.').map(function (value) {
-  return parseInt(value, 10);
-});
-
-if (version[0] === 0 && (version[1] < 9 || version[1] === 9 && version[2] < 5)) {
-  process.addListener('uncaughtException', function _uncaughtExceptionThrown(err) {
-    _uncaughtException = true;
-    _garbageCollector();
-
-    throw err;
-  });
-}
-
-process.addListener('exit', function _exit(code) {
-  if (code) _uncaughtException = true;
-  _garbageCollector();
-});
-
-/**
- * Configuration options.
- *
- * @typedef {Object} Options
- * @property {?number} tries the number of tries before give up the name generation
- * @property {?string} template the "mkstemp" like filename template
- * @property {?string} name fix name
- * @property {?string} dir the tmp directory to use
- * @property {?string} prefix prefix for the generated name
- * @property {?string} postfix postfix for the generated name
- */
-
-/**
- * @typedef {Object} FileSyncObject
- * @property {string} name the name of the file
- * @property {string} fd the file descriptor
- * @property {fileCallback} removeCallback the callback function to remove the file
- */
-
-/**
- * @typedef {Object} DirSyncObject
- * @property {string} name the name of the directory
- * @property {fileCallback} removeCallback the callback function to remove the directory
- */
-
-/**
- * @callback tmpNameCallback
- * @param {?Error} err the error object if anything goes wrong
- * @param {string} name the temporary file name
- */
-
-/**
- * @callback fileCallback
- * @param {?Error} err the error object if anything goes wrong
- * @param {string} name the temporary file name
- * @param {number} fd the file descriptor
- * @param {cleanupCallback} fn the cleanup callback function
- */
-
-/**
- * @callback dirCallback
- * @param {?Error} err the error object if anything goes wrong
- * @param {string} name the temporary file name
- * @param {cleanupCallback} fn the cleanup callback function
- */
-
-/**
- * Removes the temporary created file or directory.
- *
- * @callback cleanupCallback
- * @param {simpleCallback} [next] function to call after entry was removed
- */
-
-/**
- * Callback function for function composition.
- * @see {@link https://github.com/raszi/node-tmp/issues/57|raszi/node-tmp#57}
- *
- * @callback simpleCallback
- */
-
-// exporting all the needed methods
-module.exports.tmpdir = tmpDir;
-
-module.exports.dir = dir;
-module.exports.dirSync = dirSync;
-
-module.exports.file = file;
-module.exports.fileSync = fileSync;
-
-module.exports.tmpName = tmpName;
-module.exports.tmpNameSync = tmpNameSync;
-
-module.exports.setGracefulCleanup = setGracefulCleanup;
-
-
-/***/ }),
-/* 955 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var net = __webpack_require__(164)
-  , tls = __webpack_require__(467)
-  , http = __webpack_require__(87)
-  , https = __webpack_require__(195)
-  , events = __webpack_require__(76)
-  , assert = __webpack_require__(28)
-  , util = __webpack_require__(3)
-  , Buffer = __webpack_require__(45).Buffer
-  ;
-
-exports.httpOverHttp = httpOverHttp
-exports.httpsOverHttp = httpsOverHttp
-exports.httpOverHttps = httpOverHttps
-exports.httpsOverHttps = httpsOverHttps
-
-
-function httpOverHttp(options) {
-  var agent = new TunnelingAgent(options)
-  agent.request = http.request
-  return agent
-}
-
-function httpsOverHttp(options) {
-  var agent = new TunnelingAgent(options)
-  agent.request = http.request
-  agent.createSocket = createSecureSocket
-  agent.defaultPort = 443
-  return agent
-}
-
-function httpOverHttps(options) {
-  var agent = new TunnelingAgent(options)
-  agent.request = https.request
-  return agent
-}
-
-function httpsOverHttps(options) {
-  var agent = new TunnelingAgent(options)
-  agent.request = https.request
-  agent.createSocket = createSecureSocket
-  agent.defaultPort = 443
-  return agent
-}
-
-
-function TunnelingAgent(options) {
-  var self = this
-  self.options = options || {}
-  self.proxyOptions = self.options.proxy || {}
-  self.maxSockets = self.options.maxSockets || http.Agent.defaultMaxSockets
-  self.requests = []
-  self.sockets = []
-
-  self.on('free', function onFree(socket, host, port) {
-    for (var i = 0, len = self.requests.length; i < len; ++i) {
-      var pending = self.requests[i]
-      if (pending.host === host && pending.port === port) {
-        // Detect the request to connect same origin server,
-        // reuse the connection.
-        self.requests.splice(i, 1)
-        pending.request.onSocket(socket)
-        return
-      }
-    }
-    socket.destroy()
-    self.removeSocket(socket)
-  })
-}
-util.inherits(TunnelingAgent, events.EventEmitter)
-
-TunnelingAgent.prototype.addRequest = function addRequest(req, options) {
-  var self = this
-
-   // Legacy API: addRequest(req, host, port, path)
-  if (typeof options === 'string') {
-    options = {
-      host: options,
-      port: arguments[2],
-      path: arguments[3]
-    };
-  }
-
-  if (self.sockets.length >= this.maxSockets) {
-    // We are over limit so we'll add it to the queue.
-    self.requests.push({host: options.host, port: options.port, request: req})
-    return
-  }
-
-  // If we are under maxSockets create a new one.
-  self.createConnection({host: options.host, port: options.port, request: req})
-}
-
-TunnelingAgent.prototype.createConnection = function createConnection(pending) {
-  var self = this
-
-  self.createSocket(pending, function(socket) {
-    socket.on('free', onFree)
-    socket.on('close', onCloseOrRemove)
-    socket.on('agentRemove', onCloseOrRemove)
-    pending.request.onSocket(socket)
-
-    function onFree() {
-      self.emit('free', socket, pending.host, pending.port)
-    }
-
-    function onCloseOrRemove(err) {
-      self.removeSocket(socket)
-      socket.removeListener('free', onFree)
-      socket.removeListener('close', onCloseOrRemove)
-      socket.removeListener('agentRemove', onCloseOrRemove)
-    }
-  })
-}
-
-TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
-  var self = this
-  var placeholder = {}
-  self.sockets.push(placeholder)
-
-  var connectOptions = mergeOptions({}, self.proxyOptions,
-    { method: 'CONNECT'
-    , path: options.host + ':' + options.port
-    , agent: false
-    }
-  )
-  if (connectOptions.proxyAuth) {
-    connectOptions.headers = connectOptions.headers || {}
-    connectOptions.headers['Proxy-Authorization'] = 'Basic ' +
-        Buffer.from(connectOptions.proxyAuth).toString('base64')
-  }
-
-  debug('making CONNECT request')
-  var connectReq = self.request(connectOptions)
-  connectReq.useChunkedEncodingByDefault = false // for v0.6
-  connectReq.once('response', onResponse) // for v0.6
-  connectReq.once('upgrade', onUpgrade)   // for v0.6
-  connectReq.once('connect', onConnect)   // for v0.7 or later
-  connectReq.once('error', onError)
-  connectReq.end()
-
-  function onResponse(res) {
-    // Very hacky. This is necessary to avoid http-parser leaks.
-    res.upgrade = true
-  }
-
-  function onUpgrade(res, socket, head) {
-    // Hacky.
-    process.nextTick(function() {
-      onConnect(res, socket, head)
-    })
-  }
-
-  function onConnect(res, socket, head) {
-    connectReq.removeAllListeners()
-    socket.removeAllListeners()
-
-    if (res.statusCode === 200) {
-      assert.equal(head.length, 0)
-      debug('tunneling connection has established')
-      self.sockets[self.sockets.indexOf(placeholder)] = socket
-      cb(socket)
-    } else {
-      debug('tunneling socket could not be established, statusCode=%d', res.statusCode)
-      var error = new Error('tunneling socket could not be established, ' + 'statusCode=' + res.statusCode)
-      error.code = 'ECONNRESET'
-      options.request.emit('error', error)
-      self.removeSocket(placeholder)
-    }
-  }
-
-  function onError(cause) {
-    connectReq.removeAllListeners()
-
-    debug('tunneling socket could not be established, cause=%s\n', cause.message, cause.stack)
-    var error = new Error('tunneling socket could not be established, ' + 'cause=' + cause.message)
-    error.code = 'ECONNRESET'
-    options.request.emit('error', error)
-    self.removeSocket(placeholder)
-  }
-}
-
-TunnelingAgent.prototype.removeSocket = function removeSocket(socket) {
-  var pos = this.sockets.indexOf(socket)
-  if (pos === -1) return
-
-  this.sockets.splice(pos, 1)
-
-  var pending = this.requests.shift()
-  if (pending) {
-    // If we have pending requests and a socket gets closed a new one
-    // needs to be created to take over in the pool for the one that closed.
-    this.createConnection(pending)
-  }
-}
-
-function createSecureSocket(options, cb) {
-  var self = this
-  TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
-    // 0 is dummy port for v0.6
-    var secureSocket = tls.connect(0, mergeOptions({}, self.options,
-      { servername: options.host
-      , socket: socket
-      }
-    ))
-    self.sockets[self.sockets.indexOf(socket)] = secureSocket
-    cb(secureSocket)
-  })
-}
-
-
-function mergeOptions(target) {
-  for (var i = 1, len = arguments.length; i < len; ++i) {
-    var overrides = arguments[i]
-    if (typeof overrides === 'object') {
-      var keys = Object.keys(overrides)
-      for (var j = 0, keyLen = keys.length; j < keyLen; ++j) {
-        var k = keys[j]
-        if (overrides[k] !== undefined) {
-          target[k] = overrides[k]
-        }
-      }
-    }
-  }
-  return target
-}
-
-
-var debug
-if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
-  debug = function() {
-    var args = Array.prototype.slice.call(arguments)
-    if (typeof args[0] === 'string') {
-      args[0] = 'TUNNEL: ' + args[0]
-    } else {
-      args.unshift('TUNNEL:')
-    }
-    console.error.apply(console, args)
-  }
-} else {
-  debug = function() {}
-}
-exports.debug = debug // for test
-
-
-/***/ }),
-/* 956 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-/**
- * For Node.js, simply re-export the core `util.deprecate` function.
- */
-
-module.exports = __webpack_require__(3).deprecate;
-
-
-/***/ }),
-/* 957 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var rng = __webpack_require__(464);
-var bytesToUuid = __webpack_require__(463);
-
-// **`v1()` - Generate time-based UUID**
-//
-// Inspired by https://github.com/LiosK/UUID.js
-// and http://docs.python.org/library/uuid.html
-
-var _nodeId;
-var _clockseq;
-
-// Previous uuid creation time
-var _lastMSecs = 0;
-var _lastNSecs = 0;
-
-// See https://github.com/broofa/node-uuid for API details
-function v1(options, buf, offset) {
-  var i = buf && offset || 0;
-  var b = buf || [];
-
-  options = options || {};
-  var node = options.node || _nodeId;
-  var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq;
-
-  // node and clockseq need to be initialized to random values if they're not
-  // specified.  We do this lazily to minimize issues related to insufficient
-  // system entropy.  See #189
-  if (node == null || clockseq == null) {
-    var seedBytes = rng();
-    if (node == null) {
-      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
-      node = _nodeId = [
-        seedBytes[0] | 0x01,
-        seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]
-      ];
-    }
-    if (clockseq == null) {
-      // Per 4.2.2, randomize (14 bit) clockseq
-      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
-    }
-  }
-
-  // UUID timestamps are 100 nano-second units since the Gregorian epoch,
-  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
-  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
-  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
-  var msecs = options.msecs !== undefined ? options.msecs : new Date().getTime();
-
-  // Per 4.2.1.2, use count of uuid's generated during the current clock
-  // cycle to simulate higher resolution clock
-  var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1;
-
-  // Time since last uuid creation (in msecs)
-  var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000;
-
-  // Per 4.2.1.2, Bump clockseq on clock regression
-  if (dt < 0 && options.clockseq === undefined) {
-    clockseq = clockseq + 1 & 0x3fff;
-  }
-
-  // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
-  // time interval
-  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
-    nsecs = 0;
-  }
-
-  // Per 4.2.1.2 Throw error if too many uuids are requested
-  if (nsecs >= 10000) {
-    throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
-  }
-
-  _lastMSecs = msecs;
-  _lastNSecs = nsecs;
-  _clockseq = clockseq;
-
-  // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
-  msecs += 12219292800000;
-
-  // `time_low`
-  var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
-  b[i++] = tl >>> 24 & 0xff;
-  b[i++] = tl >>> 16 & 0xff;
-  b[i++] = tl >>> 8 & 0xff;
-  b[i++] = tl & 0xff;
-
-  // `time_mid`
-  var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
-  b[i++] = tmh >>> 8 & 0xff;
-  b[i++] = tmh & 0xff;
-
-  // `time_high_and_version`
-  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
-  b[i++] = tmh >>> 16 & 0xff;
-
-  // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
-  b[i++] = clockseq >>> 8 | 0x80;
-
-  // `clock_seq_low`
-  b[i++] = clockseq & 0xff;
-
-  // `node`
-  for (var n = 0; n < 6; ++n) {
-    b[i + n] = node[n];
-  }
-
-  return buf ? buf : bytesToUuid(b);
-}
-
-module.exports = v1;
-
-
-/***/ }),
-/* 958 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var rng = __webpack_require__(464);
-var bytesToUuid = __webpack_require__(463);
-
-function v4(options, buf, offset) {
-  var i = buf && offset || 0;
-
-  if (typeof(options) == 'string') {
-    buf = options === 'binary' ? new Array(16) : null;
-    options = null;
-  }
-  options = options || {};
-
-  var rnds = options.random || (options.rng || rng)();
-
-  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-  rnds[6] = (rnds[6] & 0x0f) | 0x40;
-  rnds[8] = (rnds[8] & 0x3f) | 0x80;
-
-  // Copy bytes to buffer, if provided
-  if (buf) {
-    for (var ii = 0; ii < 16; ++ii) {
-      buf[i + ii] = rnds[ii];
-    }
-  }
-
-  return buf || bytesToUuid(rnds);
-}
-
-module.exports = v4;
-
-
-/***/ }),
-/* 959 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var parse = __webpack_require__(452);
-var correct = __webpack_require__(935);
-
-var genericWarning = (
-  'license should be ' +
-  'a valid SPDX license expression (without "LicenseRef"), ' +
-  '"UNLICENSED", or ' +
-  '"SEE LICENSE IN <filename>"'
-);
-
-var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
-
-function startsWith(prefix, string) {
-  return string.slice(0, prefix.length) === prefix;
-}
-
-function usesLicenseRef(ast) {
-  if (ast.hasOwnProperty('license')) {
-    var license = ast.license;
-    return (
-      startsWith('LicenseRef', license) ||
-      startsWith('DocumentRef', license)
-    );
-  } else {
-    return (
-      usesLicenseRef(ast.left) ||
-      usesLicenseRef(ast.right)
-    );
-  }
-}
-
-module.exports = function(argument) {
-  var ast;
-
-  try {
-    ast = parse(argument);
-  } catch (e) {
-    var match
-    if (
-      argument === 'UNLICENSED' ||
-      argument === 'UNLICENCED'
-    ) {
-      return {
-        validForOldPackages: true,
-        validForNewPackages: true,
-        unlicensed: true
-      };
-    } else if (match = fileReferenceRE.exec(argument)) {
-      return {
-        validForOldPackages: true,
-        validForNewPackages: true,
-        inFile: match[1]
-      };
-    } else {
-      var result = {
-        validForOldPackages: false,
-        validForNewPackages: false,
-        warnings: [genericWarning]
-      };
-      if (argument.trim().length !== 0) {
-        var corrected = correct(argument);
-        if (corrected) {
-          result.warnings.push(
-            'license is similar to the valid expression "' + corrected + '"'
-          );
-        }
-      }
-      return result;
-    }
-  }
-
-  if (usesLicenseRef(ast)) {
-    return {
-      validForNewPackages: false,
-      validForOldPackages: false,
-      spdx: true,
-      warnings: [genericWarning]
-    };
-  } else {
-    return {
-      validForNewPackages: true,
-      validForOldPackages: true,
-      spdx: true
-    };
-  }
-};
-
-
-/***/ }),
-/* 960 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- * verror.js: richer JavaScript errors
- */
-
-var mod_assertplus = __webpack_require__(16);
-var mod_util = __webpack_require__(3);
-
-var mod_extsprintf = __webpack_require__(961);
-var mod_isError = __webpack_require__(113).isError;
-var sprintf = mod_extsprintf.sprintf;
-
-/*
- * Public interface
- */
-
-/* So you can 'var VError = require('verror')' */
-module.exports = VError;
-/* For compatibility */
-VError.VError = VError;
-/* Other exported classes */
-VError.SError = SError;
-VError.WError = WError;
-VError.MultiError = MultiError;
-
-/*
- * Common function used to parse constructor arguments for VError, WError, and
- * SError.  Named arguments to this function:
- *
- *     strict		force strict interpretation of sprintf arguments, even
- *     			if the options in "argv" don't say so
- *
- *     argv		error's constructor arguments, which are to be
- *     			interpreted as described in README.md.  For quick
- *     			reference, "argv" has one of the following forms:
- *
- *          [ sprintf_args... ]           (argv[0] is a string)
- *          [ cause, sprintf_args... ]    (argv[0] is an Error)
- *          [ options, sprintf_args... ]  (argv[0] is an object)
- *
- * This function normalizes these forms, producing an object with the following
- * properties:
- *
- *    options           equivalent to "options" in third form.  This will never
- *    			be a direct reference to what the caller passed in
- *    			(i.e., it may be a shallow copy), so it can be freely
- *    			modified.
- *
- *    shortmessage      result of sprintf(sprintf_args), taking options.strict
- *    			into account as described in README.md.
- */
-function parseConstructorArguments(args)
-{
-	var argv, options, sprintf_args, shortmessage, k;
-
-	mod_assertplus.object(args, 'args');
-	mod_assertplus.bool(args.strict, 'args.strict');
-	mod_assertplus.array(args.argv, 'args.argv');
-	argv = args.argv;
-
-	/*
-	 * First, figure out which form of invocation we've been given.
-	 */
-	if (argv.length === 0) {
-		options = {};
-		sprintf_args = [];
-	} else if (mod_isError(argv[0])) {
-		options = { 'cause': argv[0] };
-		sprintf_args = argv.slice(1);
-	} else if (typeof (argv[0]) === 'object') {
-		options = {};
-		for (k in argv[0]) {
-			options[k] = argv[0][k];
-		}
-		sprintf_args = argv.slice(1);
-	} else {
-		mod_assertplus.string(argv[0],
-		    'first argument to VError, SError, or WError ' +
-		    'constructor must be a string, object, or Error');
-		options = {};
-		sprintf_args = argv;
-	}
-
-	/*
-	 * Now construct the error's message.
-	 *
-	 * extsprintf (which we invoke here with our caller's arguments in order
-	 * to construct this Error's message) is strict in its interpretation of
-	 * values to be processed by the "%s" specifier.  The value passed to
-	 * extsprintf must actually be a string or something convertible to a
-	 * String using .toString().  Passing other values (notably "null" and
-	 * "undefined") is considered a programmer error.  The assumption is
-	 * that if you actually want to print the string "null" or "undefined",
-	 * then that's easy to do that when you're calling extsprintf; on the
-	 * other hand, if you did NOT want that (i.e., there's actually a bug
-	 * where the program assumes some variable is non-null and tries to
-	 * print it, which might happen when constructing a packet or file in
-	 * some specific format), then it's better to stop immediately than
-	 * produce bogus output.
-	 *
-	 * However, sometimes the bug is only in the code calling VError, and a
-	 * programmer might prefer to have the error message contain "null" or
-	 * "undefined" rather than have the bug in the error path crash the
-	 * program (making the first bug harder to identify).  For that reason,
-	 * by default VError converts "null" or "undefined" arguments to their
-	 * string representations and passes those to extsprintf.  Programmers
-	 * desiring the strict behavior can use the SError class or pass the
-	 * "strict" option to the VError constructor.
-	 */
-	mod_assertplus.object(options);
-	if (!options.strict && !args.strict) {
-		sprintf_args = sprintf_args.map(function (a) {
-			return (a === null ? 'null' :
-			    a === undefined ? 'undefined' : a);
-		});
-	}
-
-	if (sprintf_args.length === 0) {
-		shortmessage = '';
-	} else {
-		shortmessage = sprintf.apply(null, sprintf_args);
-	}
-
-	return ({
-	    'options': options,
-	    'shortmessage': shortmessage
-	});
-}
-
-/*
- * See README.md for reference documentation.
- */
-function VError()
-{
-	var args, obj, parsed, cause, ctor, message, k;
-
-	args = Array.prototype.slice.call(arguments, 0);
-
-	/*
-	 * This is a regrettable pattern, but JavaScript's built-in Error class
-	 * is defined to work this way, so we allow the constructor to be called
-	 * without "new".
-	 */
-	if (!(this instanceof VError)) {
-		obj = Object.create(VError.prototype);
-		VError.apply(obj, arguments);
-		return (obj);
-	}
-
-	/*
-	 * For convenience and backwards compatibility, we support several
-	 * different calling forms.  Normalize them here.
-	 */
-	parsed = parseConstructorArguments({
-	    'argv': args,
-	    'strict': false
-	});
-
-	/*
-	 * If we've been given a name, apply it now.
-	 */
-	if (parsed.options.name) {
-		mod_assertplus.string(parsed.options.name,
-		    'error\'s "name" must be a string');
-		this.name = parsed.options.name;
-	}
-
-	/*
-	 * For debugging, we keep track of the original short message (attached
-	 * this Error particularly) separately from the complete message (which
-	 * includes the messages of our cause chain).
-	 */
-	this.jse_shortmsg = parsed.shortmessage;
-	message = parsed.shortmessage;
-
-	/*
-	 * If we've been given a cause, record a reference to it and update our
-	 * message appropriately.
-	 */
-	cause = parsed.options.cause;
-	if (cause) {
-		mod_assertplus.ok(mod_isError(cause), 'cause is not an Error');
-		this.jse_cause = cause;
-
-		if (!parsed.options.skipCauseMessage) {
-			message += ': ' + cause.message;
-		}
-	}
-
-	/*
-	 * If we've been given an object with properties, shallow-copy that
-	 * here.  We don't want to use a deep copy in case there are non-plain
-	 * objects here, but we don't want to use the original object in case
-	 * the caller modifies it later.
-	 */
-	this.jse_info = {};
-	if (parsed.options.info) {
-		for (k in parsed.options.info) {
-			this.jse_info[k] = parsed.options.info[k];
-		}
-	}
-
-	this.message = message;
-	Error.call(this, message);
-
-	if (Error.captureStackTrace) {
-		ctor = parsed.options.constructorOpt || this.constructor;
-		Error.captureStackTrace(this, ctor);
-	}
-
-	return (this);
-}
-
-mod_util.inherits(VError, Error);
-VError.prototype.name = 'VError';
-
-VError.prototype.toString = function ve_toString()
-{
-	var str = (this.hasOwnProperty('name') && this.name ||
-		this.constructor.name || this.constructor.prototype.name);
-	if (this.message)
-		str += ': ' + this.message;
-
-	return (str);
-};
-
-/*
- * This method is provided for compatibility.  New callers should use
- * VError.cause() instead.  That method also uses the saner `null` return value
- * when there is no cause.
- */
-VError.prototype.cause = function ve_cause()
-{
-	var cause = VError.cause(this);
-	return (cause === null ? undefined : cause);
-};
-
-/*
- * Static methods
- *
- * These class-level methods are provided so that callers can use them on
- * instances of Errors that are not VErrors.  New interfaces should be provided
- * only using static methods to eliminate the class of programming mistake where
- * people fail to check whether the Error object has the corresponding methods.
- */
-
-VError.cause = function (err)
-{
-	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
-	return (mod_isError(err.jse_cause) ? err.jse_cause : null);
-};
-
-VError.info = function (err)
-{
-	var rv, cause, k;
-
-	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
-	cause = VError.cause(err);
-	if (cause !== null) {
-		rv = VError.info(cause);
-	} else {
-		rv = {};
-	}
-
-	if (typeof (err.jse_info) == 'object' && err.jse_info !== null) {
-		for (k in err.jse_info) {
-			rv[k] = err.jse_info[k];
-		}
-	}
-
-	return (rv);
-};
-
-VError.findCauseByName = function (err, name)
-{
-	var cause;
-
-	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
-	mod_assertplus.string(name, 'name');
-	mod_assertplus.ok(name.length > 0, 'name cannot be empty');
-
-	for (cause = err; cause !== null; cause = VError.cause(cause)) {
-		mod_assertplus.ok(mod_isError(cause));
-		if (cause.name == name) {
-			return (cause);
-		}
-	}
-
-	return (null);
-};
-
-VError.hasCauseWithName = function (err, name)
-{
-	return (VError.findCauseByName(err, name) !== null);
-};
-
-VError.fullStack = function (err)
-{
-	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
-
-	var cause = VError.cause(err);
-
-	if (cause) {
-		return (err.stack + '\ncaused by: ' + VError.fullStack(cause));
-	}
-
-	return (err.stack);
-};
-
-VError.errorFromList = function (errors)
-{
-	mod_assertplus.arrayOfObject(errors, 'errors');
-
-	if (errors.length === 0) {
-		return (null);
-	}
-
-	errors.forEach(function (e) {
-		mod_assertplus.ok(mod_isError(e));
-	});
-
-	if (errors.length == 1) {
-		return (errors[0]);
-	}
-
-	return (new MultiError(errors));
-};
-
-VError.errorForEach = function (err, func)
-{
-	mod_assertplus.ok(mod_isError(err), 'err must be an Error');
-	mod_assertplus.func(func, 'func');
-
-	if (err instanceof MultiError) {
-		err.errors().forEach(function iterError(e) { func(e); });
-	} else {
-		func(err);
-	}
-};
-
-
-/*
- * SError is like VError, but stricter about types.  You cannot pass "null" or
- * "undefined" as string arguments to the formatter.
- */
-function SError()
-{
-	var args, obj, parsed, options;
-
-	args = Array.prototype.slice.call(arguments, 0);
-	if (!(this instanceof SError)) {
-		obj = Object.create(SError.prototype);
-		SError.apply(obj, arguments);
-		return (obj);
-	}
-
-	parsed = parseConstructorArguments({
-	    'argv': args,
-	    'strict': true
-	});
-
-	options = parsed.options;
-	VError.call(this, options, '%s', parsed.shortmessage);
-
-	return (this);
-}
-
-/*
- * We don't bother setting SError.prototype.name because once constructed,
- * SErrors are just like VErrors.
- */
-mod_util.inherits(SError, VError);
-
-
-/*
- * Represents a collection of errors for the purpose of consumers that generally
- * only deal with one error.  Callers can extract the individual errors
- * contained in this object, but may also just treat it as a normal single
- * error, in which case a summary message will be printed.
- */
-function MultiError(errors)
-{
-	mod_assertplus.array(errors, 'list of errors');
-	mod_assertplus.ok(errors.length > 0, 'must be at least one error');
-	this.ase_errors = errors;
-
-	VError.call(this, {
-	    'cause': errors[0]
-	}, 'first of %d error%s', errors.length, errors.length == 1 ? '' : 's');
-}
-
-mod_util.inherits(MultiError, VError);
-MultiError.prototype.name = 'MultiError';
-
-MultiError.prototype.errors = function me_errors()
-{
-	return (this.ase_errors.slice(0));
-};
-
-
-/*
- * See README.md for reference details.
- */
-function WError()
-{
-	var args, obj, parsed, options;
-
-	args = Array.prototype.slice.call(arguments, 0);
-	if (!(this instanceof WError)) {
-		obj = Object.create(WError.prototype);
-		WError.apply(obj, args);
-		return (obj);
-	}
-
-	parsed = parseConstructorArguments({
-	    'argv': args,
-	    'strict': false
-	});
-
-	options = parsed.options;
-	options['skipCauseMessage'] = true;
-	VError.call(this, options, '%s', parsed.shortmessage);
-
-	return (this);
-}
-
-mod_util.inherits(WError, VError);
-WError.prototype.name = 'WError';
-
-WError.prototype.toString = function we_toString()
-{
-	var str = (this.hasOwnProperty('name') && this.name ||
-		this.constructor.name || this.constructor.prototype.name);
-	if (this.message)
-		str += ': ' + this.message;
-	if (this.jse_cause && this.jse_cause.message)
-		str += '; caused by ' + this.jse_cause.toString();
-
-	return (str);
-};
-
-/*
- * For purely historical reasons, WError's cause() function allows you to set
- * the cause.
- */
-WError.prototype.cause = function we_cause(c)
-{
-	if (mod_isError(c))
-		this.jse_cause = c;
-
-	return (this.jse_cause);
-};
-
-
-/***/ }),
-/* 961 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- * extsprintf.js: extended POSIX-style sprintf
- */
-
-var mod_assert = __webpack_require__(28);
-var mod_util = __webpack_require__(3);
-
-/*
- * Public interface
- */
-exports.sprintf = jsSprintf;
-exports.printf = jsPrintf;
-exports.fprintf = jsFprintf;
-
-/*
- * Stripped down version of s[n]printf(3c).  We make a best effort to throw an
- * exception when given a format string we don't understand, rather than
- * ignoring it, so that we won't break existing programs if/when we go implement
- * the rest of this.
- *
- * This implementation currently supports specifying
- *	- field alignment ('-' flag),
- * 	- zero-pad ('0' flag)
- *	- always show numeric sign ('+' flag),
- *	- field width
- *	- conversions for strings, decimal integers, and floats (numbers).
- *	- argument size specifiers.  These are all accepted but ignored, since
- *	  Javascript has no notion of the physical size of an argument.
- *
- * Everything else is currently unsupported, most notably precision, unsigned
- * numbers, non-decimal numbers, and characters.
- */
-function jsSprintf(ofmt)
-{
-	var regex = [
-	    '([^%]*)',				/* normal text */
-	    '%',				/* start of format */
-	    '([\'\\-+ #0]*?)',			/* flags (optional) */
-	    '([1-9]\\d*)?',			/* width (optional) */
-	    '(\\.([1-9]\\d*))?',		/* precision (optional) */
-	    '[lhjztL]*?',			/* length mods (ignored) */
-	    '([diouxXfFeEgGaAcCsSp%jr])'	/* conversion */
-	].join('');
-
-	var re = new RegExp(regex);
-
-	/* variadic arguments used to fill in conversion specifiers */
-	var args = Array.prototype.slice.call(arguments, 1);
-	/* remaining format string */
-	var fmt = ofmt;
-
-	/* components of the current conversion specifier */
-	var flags, width, precision, conversion;
-	var left, pad, sign, arg, match;
-
-	/* return value */
-	var ret = '';
-
-	/* current variadic argument (1-based) */
-	var argn = 1;
-	/* 0-based position in the format string that we've read */
-	var posn = 0;
-	/* 1-based position in the format string of the current conversion */
-	var convposn;
-	/* current conversion specifier */
-	var curconv;
-
-	mod_assert.equal('string', typeof (fmt),
-	    'first argument must be a format string');
-
-	while ((match = re.exec(fmt)) !== null) {
-		ret += match[1];
-		fmt = fmt.substring(match[0].length);
-
-		/*
-		 * Update flags related to the current conversion specifier's
-		 * position so that we can report clear error messages.
-		 */
-		curconv = match[0].substring(match[1].length);
-		convposn = posn + match[1].length + 1;
-		posn += match[0].length;
-
-		flags = match[2] || '';
-		width = match[3] || 0;
-		precision = match[4] || '';
-		conversion = match[6];
-		left = false;
-		sign = false;
-		pad = ' ';
-
-		if (conversion == '%') {
-			ret += '%';
-			continue;
-		}
-
-		if (args.length === 0) {
-			throw (jsError(ofmt, convposn, curconv,
-			    'has no matching argument ' +
-			    '(too few arguments passed)'));
-		}
-
-		arg = args.shift();
-		argn++;
-
-		if (flags.match(/[\' #]/)) {
-			throw (jsError(ofmt, convposn, curconv,
-			    'uses unsupported flags'));
-		}
-
-		if (precision.length > 0) {
-			throw (jsError(ofmt, convposn, curconv,
-			    'uses non-zero precision (not supported)'));
-		}
-
-		if (flags.match(/-/))
-			left = true;
-
-		if (flags.match(/0/))
-			pad = '0';
-
-		if (flags.match(/\+/))
-			sign = true;
-
-		switch (conversion) {
-		case 's':
-			if (arg === undefined || arg === null) {
-				throw (jsError(ofmt, convposn, curconv,
-				    'attempted to print undefined or null ' +
-				    'as a string (argument ' + argn + ' to ' +
-				    'sprintf)'));
-			}
-			ret += doPad(pad, width, left, arg.toString());
-			break;
-
-		case 'd':
-			arg = Math.floor(arg);
-			/*jsl:fallthru*/
-		case 'f':
-			sign = sign && arg > 0 ? '+' : '';
-			ret += sign + doPad(pad, width, left,
-			    arg.toString());
-			break;
-
-		case 'x':
-			ret += doPad(pad, width, left, arg.toString(16));
-			break;
-
-		case 'j': /* non-standard */
-			if (width === 0)
-				width = 10;
-			ret += mod_util.inspect(arg, false, width);
-			break;
-
-		case 'r': /* non-standard */
-			ret += dumpException(arg);
-			break;
-
-		default:
-			throw (jsError(ofmt, convposn, curconv,
-			    'is not supported'));
-		}
-	}
-
-	ret += fmt;
-	return (ret);
-}
-
-function jsError(fmtstr, convposn, curconv, reason) {
-	mod_assert.equal(typeof (fmtstr), 'string');
-	mod_assert.equal(typeof (curconv), 'string');
-	mod_assert.equal(typeof (convposn), 'number');
-	mod_assert.equal(typeof (reason), 'string');
-	return (new Error('format string "' + fmtstr +
-	    '": conversion specifier "' + curconv + '" at character ' +
-	    convposn + ' ' + reason));
-}
-
-function jsPrintf() {
-	var args = Array.prototype.slice.call(arguments);
-	args.unshift(process.stdout);
-	jsFprintf.apply(null, args);
-}
-
-function jsFprintf(stream) {
-	var args = Array.prototype.slice.call(arguments, 1);
-	return (stream.write(jsSprintf.apply(this, args)));
-}
-
-function doPad(chr, width, left, str)
-{
-	var ret = str;
-
-	while (ret.length < width) {
-		if (left)
-			ret += chr;
-		else
-			ret = chr + ret;
-	}
-
-	return (ret);
-}
-
-/*
- * This function dumps long stack traces for exceptions having a cause() method.
- * See node-verror for an example.
- */
-function dumpException(ex)
-{
-	var ret;
-
-	if (!(ex instanceof Error))
-		throw (new Error(jsSprintf('invalid type for %%r: %j', ex)));
-
-	/* Note that V8 prepends "ex.stack" with ex.toString(). */
-	ret = 'EXCEPTION: ' + ex.constructor.name + ': ' + ex.stack;
-
-	if (ex.cause && typeof (ex.cause) === 'function') {
-		var cex = ex.cause();
-		if (cex) {
-			ret += '\nCaused by: ' + dumpException(cex);
-		}
-	}
-
-	return (ret);
-}
-
-
-/***/ }),
-/* 962 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const lenient = __webpack_require__(963);
-
-module.exports = (val, opts) => {
-	val = String(val).trim();
-	opts = Object.assign({
-		lenient: false,
-		default: null
-	}, opts);
-
-	if (opts.default !== null && typeof opts.default !== 'boolean') {
-		throw new TypeError(`Expected the \`default\` option to be of type \`boolean\`, got \`${typeof opts.default}\``);
-	}
-
-	if (/^(?:y|yes|true|1)$/i.test(val)) {
-		return true;
-	}
-
-	if (/^(?:n|no|false|0)$/i.test(val)) {
-		return false;
-	}
-
-	if (opts.lenient === true) {
-		return lenient(val, opts);
-	}
-
-	return opts.default;
-};
-
-
-/***/ }),
-/* 963 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const YES_MATCH_SCORE_THRESHOLD = 2;
-const NO_MATCH_SCORE_THRESHOLD = 1.25;
-
-const yMatch = new Map([
-	[5, 0.25],
-	[6, 0.25],
-	[7, 0.25],
-	['t', 0.75],
-	['y', 1],
-	['u', 0.75],
-	['g', 0.25],
-	['h', 0.25],
-	['k', 0.25]
-]);
-
-const eMatch = new Map([
-	[2, 0.25],
-	[3, 0.25],
-	[4, 0.25],
-	['w', 0.75],
-	['e', 1],
-	['r', 0.75],
-	['s', 0.25],
-	['d', 0.25],
-	['f', 0.25]
-]);
-
-const sMatch = new Map([
-	['q', 0.25],
-	['w', 0.25],
-	['e', 0.25],
-	['a', 0.75],
-	['s', 1],
-	['d', 0.75],
-	['z', 0.25],
-	['x', 0.25],
-	['c', 0.25]
-]);
-
-const nMatch = new Map([
-	['h', 0.25],
-	['j', 0.25],
-	['k', 0.25],
-	['b', 0.75],
-	['n', 1],
-	['m', 0.75]
-]);
-
-const oMatch = new Map([
-	[9, 0.25],
-	[0, 0.25],
-	['i', 0.75],
-	['o', 1],
-	['p', 0.75],
-	['k', 0.25],
-	['l', 0.25]
-]);
-
-function getYesMatchScore(val) {
-	let score = 0;
-	const y = val[0];
-	const e = val[1];
-	const s = val[2];
-
-	if (yMatch.has(y)) {
-		score += yMatch.get(y);
-	}
-
-	if (eMatch.has(e)) {
-		score += eMatch.get(e);
-	}
-
-	if (sMatch.has(s)) {
-		score += sMatch.get(s);
-	}
-
-	return score;
-}
-
-function getNoMatchScore(val) {
-	let score = 0;
-	const n = val[0];
-	const o = val[1];
-
-	if (nMatch.has(n)) {
-		score += nMatch.get(n);
-	}
-
-	if (oMatch.has(o)) {
-		score += oMatch.get(o);
-	}
-
-	return score;
-}
-
-module.exports = (val, opts) => {
-	if (getYesMatchScore(val) >= YES_MATCH_SCORE_THRESHOLD) {
-		return true;
-	}
-
-	if (getNoMatchScore(val) >= NO_MATCH_SCORE_THRESHOLD) {
-		return false;
-	}
-
-	return opts.default;
-};
-
-
-/***/ }),
-/* 964 */
-/***/ (function(module, exports) {
-
-module.exports = require("dns");
-
-/***/ }),
-/* 965 */
-/***/ (function(module, exports) {
-
-module.exports = require("domain");
-
-/***/ })
-/******/ ]);
\ No newline at end of file
diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index 7ab98cd1..00000000
--- a/.yarnrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-registry "https://registry.npmjs.org/"
-save-exact true
-save-prefix false
-workspaces-experimental true
-yarn-path ".yarn/releases/yarn-1.18.0.cjs"
diff --git a/.yarnrc.yml b/.yarnrc.yml
deleted file mode 100644
index 8d823cc3..00000000
--- a/.yarnrc.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-enableGlobalCache: true
-
-nodeLinker: node-modules
diff --git a/LICENSE-Apache b/LICENSE-Apache
index 9acc9b1b..aee5c634 100644
--- a/LICENSE-Apache
+++ b/LICENSE-Apache
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
index e6388ba7..67cd0859 100644
--- a/LICENSE-MIT
+++ b/LICENSE-MIT
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 8fa7ca5c..53237030 100644
--- a/README.md
+++ b/README.md
@@ -623,13 +623,13 @@ yarn build
 Then `cd` into a package and run the tests
 
 ```
-cd ./packages/wasm-ast-types
+cd ./packages/ast
 yarn test:watch
 ```
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-ast-types/README.md) in the `wasm-ast-types` package.
+See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `wasm-ast-types` package.
 
 ## Related
 
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 5dc0d928..11319723 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -22,7 +22,7 @@ export interface AccountsNftReadOnlyInterface {
     startAfter
   }: {
     limit?: number;
-    startAfter?: string[][];
+    startAfter?: [string, string][];
   }) => Promise<ArrayOfSharesResponseItem>;
   allPreviousOwners: () => Promise<String>;
   ownerOf: ({
@@ -139,7 +139,7 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
     startAfter
   }: {
     limit?: number;
-    startAfter?: string[][];
+    startAfter?: [string, string][];
   }): Promise<ArrayOfSharesResponseItem> => {
     return this.client.queryContractSmart(this.contractAddress, {
       all_debt_shares: {
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
index 87c16e6b..900ba87a 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
@@ -178,7 +178,7 @@ export function useAccountsNftAllPreviousOwnersQuery<TData = String>({
 export interface AccountsNftAllDebtSharesQuery<TData> extends AccountsNftReactQuery<ArrayOfSharesResponseItem, TData> {
   args: {
     limit?: number;
-    startAfter?: string[][];
+    startAfter?: [string, string][];
   };
 }
 export function useAccountsNftAllDebtSharesQuery<TData = ArrayOfSharesResponseItem>({
diff --git a/babel.config.js b/babel.config.js
deleted file mode 100644
index 9a8b4ef7..00000000
--- a/babel.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  babelrcRoots: 'packages/*',
-  presets: ['@pyramation/env'],
-};
diff --git a/lerna.json b/lerna.json
index 3cb6af1d..75f2aab3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,5 @@
 {
-  "lerna": "3.4.2",
-  "useWorkspaces": true,
+  "lerna": "6",
   "conventionalCommits": true,
   "npmClient": "yarn",
   "npmClientArgs": [
@@ -13,7 +12,7 @@
   "registry": "https://registry.npmjs.org",
   "command": {
     "create": {
-      "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen",
+      "homepage": "https://github.com/cosmwasm/ts-codegen",
       "license": "SEE LICENSE IN LICENSE",
       "access": "restricted"
     },
diff --git a/package.json b/package.json
index 707d8556..c9d0d74e 100644
--- a/package.json
+++ b/package.json
@@ -1,31 +1,40 @@
 {
-  "name": "@cosmwasm/ts-codegen",
-  "version": "0.0.1",
+  "name": "@cosmology/ts-codegen",
+  "version": "1.0.0",
   "publishConfig": {
     "access": "restricted"
   },
   "private": true,
   "scripts": {
-    "build": "lerna run prepare --parallel",
-    "buidl": "lerna run buidl --parallel",
-    "bootstrap": "lerna bootstrap --use-workspaces",
-    "lint": "lerna run lint",
-    "format": "lerna run format",
-    "test": "lerna run test --stream"
+    "clean": "lerna run clean",
+    "build": "lerna run build",
+    "symlink": "symlink-workspace --logLevel info",
+    "postinstall": "yarn symlink"
   },
   "devDependencies": {
-    "@babel/cli": "7.18.10",
-    "@babel/core": "7.18.10",
-    "@babel/eslint-parser": "^7.18.9",
-    "@pyramation/babel-preset-env": "0.1.0",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^28.1.3",
-    "eslint": "8.21.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "jest": "28.1.3",
-    "lerna": "4.0.0",
-    "prettier": "2.7.1"
+    "@types/jest": "^29.5.11",
+    "@types/jest-in-case": "^1.0.2",
+    "@types/node": "^20.12.7",
+    "@types/mkdirp": "1.0.2",
+    "@typescript-eslint/eslint-plugin": "^6.18.1",
+    "@typescript-eslint/parser": "^6.18.1",
+    "copyfiles": "^2.4.1",
+    "del-cli": "^5.1.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "eslint-plugin-unused-imports": "^3.0.0",
+    "eslint": "^8.56.0",
+    "glob": "8.0.3",
+    "jest-in-case": "^1.0.2",
+    "jest": "^29.6.2",
+    "lerna": "^6",
+    "mkdirp": "1.0.2",
+    "prettier": "^3.0.2",
+    "strip-ansi": "^6",
+    "symlink-workspace": "^1.1.0",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.1.6"
   },
   "workspaces": [
     "packages/*"
@@ -33,8 +42,5 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/cosmwasm/ts-codegen"
-  },
-  "dependencies": {
-    "@jest/transform": "28.1.3"
   }
 }
diff --git a/packages/ts-codegen/.babelrc.js b/packages/ts-codegen/.babelrc.js
deleted file mode 100644
index 57dd0148..00000000
--- a/packages/ts-codegen/.babelrc.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const useESModules = !!process.env.MODULE;
-
-module.exports = (api) => {
-  api.cache(() => process.env.MODULE);
-  return {
-    plugins: [
-      ['@babel/transform-runtime', { useESModules }],
-      '@babel/proposal-object-rest-spread',
-      '@babel/proposal-class-properties',
-      '@babel/proposal-export-default-from'
-    ],
-    presets: useESModules ? ['@babel/typescript'] : ['@babel/typescript', '@babel/env']
-  };
-};
diff --git a/packages/ts-codegen/.editorconfig b/packages/ts-codegen/.editorconfig
deleted file mode 100644
index 4a7ea303..00000000
--- a/packages/ts-codegen/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/packages/ts-codegen/.eslintignore b/packages/ts-codegen/.eslintignore
deleted file mode 100644
index 38ba4849..00000000
--- a/packages/ts-codegen/.eslintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules/
-dist/
-main/
-module/
-coverage/
\ No newline at end of file
diff --git a/packages/ts-codegen/.gitignore b/packages/ts-codegen/.gitignore
deleted file mode 100644
index 88dd9e52..00000000
--- a/packages/ts-codegen/.gitignore
+++ /dev/null
@@ -1,49 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# dist
-main
-module
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-
-# Editors
-.idea
-
-# Lib
-lib
-
-# npm package lock
-package-lock.json
-yarn.lock
-
-# others
-.DS_Store
-testgen
\ No newline at end of file
diff --git a/packages/ts-codegen/.npmignore b/packages/ts-codegen/.npmignore
deleted file mode 100644
index b8deaa43..00000000
--- a/packages/ts-codegen/.npmignore
+++ /dev/null
@@ -1,44 +0,0 @@
-*.log
-npm-debug.log*
-
-protobuf
-out
-*.proto
-
-# snapshots
-*.snap
-
-# Coverage directory used by tools like istanbul
-coverage
-.nyc_output
-
-# Dependency directories
-node_modules
-
-# npm package lock
-package-lock.json
-yarn.lock
-
-# project files
-__snapshots__
-__output__
-__fixtures__
-__tests__
-.babelrc
-.babelrc.js
-.editorconfig
-.eslintignore
-.eslintrc
-.eslintrc.js
-.gitignore
-.travis.yml
-.vscode
-*.spec.ts
-*.spec.js
-*.test.ts
-*.test.js
-CHANGELOG.md
-examples
-jest.config.js
-package.json
-test
diff --git a/packages/ts-codegen/.npmrc b/packages/ts-codegen/.npmrc
deleted file mode 100644
index a21347f1..00000000
--- a/packages/ts-codegen/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-scripts-prepend-node-path=true
\ No newline at end of file
diff --git a/packages/ts-codegen/.vscode/settings.json b/packages/ts-codegen/.vscode/settings.json
deleted file mode 100644
index a304b6bd..00000000
--- a/packages/ts-codegen/.vscode/settings.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "editor.formatOnSave": true,
-    "[javascriptreact]": {
-        "editor.formatOnSave": false
-    },
-    "[javascript]": {
-        "editor.formatOnSave": false
-    },
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-    },
-    "eslint.validate": [
-        "javascript",
-        "javascriptreact"
-    ],
-    "editor.insertSpaces": true,
-    "editor.tabSize": 2
-}
\ No newline at end of file
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 0722d282..d83c6900 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -683,7 +683,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.5.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/@cosmwasm/ts-codegen@0.5.0...@cosmwasm/ts-codegen@0.5.1) (2022-08-01)
+## [0.5.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.5.0...@cosmwasm/ts-codegen@0.5.1) (2022-08-01)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
 
@@ -691,7 +691,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.5.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/@cosmwasm/ts-codegen@0.4.2...@cosmwasm/ts-codegen@0.5.0) (2022-08-01)
+# [0.5.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.4.2...@cosmwasm/ts-codegen@0.5.0) (2022-08-01)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
 
@@ -699,7 +699,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.4.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/@cosmwasm/ts-codegen@0.4.1...@cosmwasm/ts-codegen@0.4.2) (2022-07-29)
+## [0.4.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.4.1...@cosmwasm/ts-codegen@0.4.2) (2022-07-29)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
 
@@ -707,7 +707,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.4.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/@cosmwasm/ts-codegen@0.4.0...@cosmwasm/ts-codegen@0.4.1) (2022-07-29)
+## [0.4.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.4.0...@cosmwasm/ts-codegen@0.4.1) (2022-07-29)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
 
@@ -723,7 +723,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.9](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.8...cosmwasm-typescript-gen@0.3.9) (2022-07-15)
+## [0.3.9](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.8...cosmwasm-typescript-gen@0.3.9) (2022-07-15)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -731,7 +731,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.8](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.7...cosmwasm-typescript-gen@0.3.8) (2022-07-15)
+## [0.3.8](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.7...cosmwasm-typescript-gen@0.3.8) (2022-07-15)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -739,7 +739,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.7](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.6...cosmwasm-typescript-gen@0.3.7) (2022-07-06)
+## [0.3.7](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.6...cosmwasm-typescript-gen@0.3.7) (2022-07-06)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -747,7 +747,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.5...cosmwasm-typescript-gen@0.3.6) (2022-06-25)
+## [0.3.6](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.5...cosmwasm-typescript-gen@0.3.6) (2022-06-25)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -755,7 +755,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.4...cosmwasm-typescript-gen@0.3.5) (2022-06-22)
+## [0.3.5](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.4...cosmwasm-typescript-gen@0.3.5) (2022-06-22)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -763,7 +763,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.3...cosmwasm-typescript-gen@0.3.4) (2022-06-17)
+## [0.3.4](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.3...cosmwasm-typescript-gen@0.3.4) (2022-06-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -771,7 +771,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.2...cosmwasm-typescript-gen@0.3.3) (2022-06-17)
+## [0.3.3](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.2...cosmwasm-typescript-gen@0.3.3) (2022-06-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -779,7 +779,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.1...cosmwasm-typescript-gen@0.3.2) (2022-06-17)
+## [0.3.2](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.1...cosmwasm-typescript-gen@0.3.2) (2022-06-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -787,7 +787,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.3.0...cosmwasm-typescript-gen@0.3.1) (2022-06-16)
+## [0.3.1](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.3.0...cosmwasm-typescript-gen@0.3.1) (2022-06-16)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -795,7 +795,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.3.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.15...cosmwasm-typescript-gen@0.3.0) (2022-06-16)
+# [0.3.0](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.15...cosmwasm-typescript-gen@0.3.0) (2022-06-16)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -803,7 +803,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.15](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.14...cosmwasm-typescript-gen@0.2.15) (2022-06-14)
+## [0.2.15](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.14...cosmwasm-typescript-gen@0.2.15) (2022-06-14)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -811,7 +811,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.14](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.13...cosmwasm-typescript-gen@0.2.14) (2022-05-27)
+## [0.2.14](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.13...cosmwasm-typescript-gen@0.2.14) (2022-05-27)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -819,7 +819,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.13](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.12...cosmwasm-typescript-gen@0.2.13) (2022-05-25)
+## [0.2.13](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.12...cosmwasm-typescript-gen@0.2.13) (2022-05-25)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -827,7 +827,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.12](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.11...cosmwasm-typescript-gen@0.2.12) (2022-05-25)
+## [0.2.12](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.11...cosmwasm-typescript-gen@0.2.12) (2022-05-25)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -835,7 +835,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.11](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.10...cosmwasm-typescript-gen@0.2.11) (2022-05-20)
+## [0.2.11](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.10...cosmwasm-typescript-gen@0.2.11) (2022-05-20)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -843,7 +843,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.10](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.9...cosmwasm-typescript-gen@0.2.10) (2022-05-16)
+## [0.2.10](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.9...cosmwasm-typescript-gen@0.2.10) (2022-05-16)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -851,7 +851,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.9](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.8...cosmwasm-typescript-gen@0.2.9) (2022-05-06)
+## [0.2.9](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.8...cosmwasm-typescript-gen@0.2.9) (2022-05-06)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -859,7 +859,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.8](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.7...cosmwasm-typescript-gen@0.2.8) (2022-05-06)
+## [0.2.8](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.7...cosmwasm-typescript-gen@0.2.8) (2022-05-06)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -867,7 +867,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.7](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.6...cosmwasm-typescript-gen@0.2.7) (2022-05-06)
+## [0.2.7](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.6...cosmwasm-typescript-gen@0.2.7) (2022-05-06)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -875,7 +875,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.5...cosmwasm-typescript-gen@0.2.6) (2022-05-06)
+## [0.2.6](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.5...cosmwasm-typescript-gen@0.2.6) (2022-05-06)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -883,7 +883,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.4...cosmwasm-typescript-gen@0.2.5) (2022-05-04)
+## [0.2.5](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.4...cosmwasm-typescript-gen@0.2.5) (2022-05-04)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -891,7 +891,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.3...cosmwasm-typescript-gen@0.2.4) (2022-05-04)
+## [0.2.4](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.3...cosmwasm-typescript-gen@0.2.4) (2022-05-04)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -899,7 +899,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.2...cosmwasm-typescript-gen@0.2.3) (2022-05-04)
+## [0.2.3](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.2...cosmwasm-typescript-gen@0.2.3) (2022-05-04)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -907,7 +907,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.1...cosmwasm-typescript-gen@0.2.2) (2022-04-30)
+## [0.2.2](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.1...cosmwasm-typescript-gen@0.2.2) (2022-04-30)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -915,7 +915,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.2.0...cosmwasm-typescript-gen@0.2.1) (2022-04-30)
+## [0.2.1](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.2.0...cosmwasm-typescript-gen@0.2.1) (2022-04-30)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -923,7 +923,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.2.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.12...cosmwasm-typescript-gen@0.2.0) (2022-04-25)
+# [0.2.0](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.12...cosmwasm-typescript-gen@0.2.0) (2022-04-25)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -931,7 +931,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.12](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.11...cosmwasm-typescript-gen@0.1.12) (2022-04-20)
+## [0.1.12](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.11...cosmwasm-typescript-gen@0.1.12) (2022-04-20)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -939,7 +939,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.11](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.10...cosmwasm-typescript-gen@0.1.11) (2022-04-20)
+## [0.1.11](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.10...cosmwasm-typescript-gen@0.1.11) (2022-04-20)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -947,7 +947,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.10](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.9...cosmwasm-typescript-gen@0.1.10) (2022-04-19)
+## [0.1.10](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.9...cosmwasm-typescript-gen@0.1.10) (2022-04-19)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -955,7 +955,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.9](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.8...cosmwasm-typescript-gen@0.1.9) (2022-04-19)
+## [0.1.9](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.8...cosmwasm-typescript-gen@0.1.9) (2022-04-19)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -963,7 +963,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.8](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.7...cosmwasm-typescript-gen@0.1.8) (2022-04-19)
+## [0.1.8](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.7...cosmwasm-typescript-gen@0.1.8) (2022-04-19)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -971,7 +971,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.7](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.6...cosmwasm-typescript-gen@0.1.7) (2022-04-18)
+## [0.1.7](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.6...cosmwasm-typescript-gen@0.1.7) (2022-04-18)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -979,7 +979,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.5...cosmwasm-typescript-gen@0.1.6) (2022-04-18)
+## [0.1.6](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.5...cosmwasm-typescript-gen@0.1.6) (2022-04-18)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -987,7 +987,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.4...cosmwasm-typescript-gen@0.1.5) (2022-04-18)
+## [0.1.5](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.4...cosmwasm-typescript-gen@0.1.5) (2022-04-18)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -995,7 +995,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.3...cosmwasm-typescript-gen@0.1.4) (2022-04-18)
+## [0.1.4](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.3...cosmwasm-typescript-gen@0.1.4) (2022-04-18)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1003,7 +1003,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.2...cosmwasm-typescript-gen@0.1.3) (2022-04-18)
+## [0.1.3](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.2...cosmwasm-typescript-gen@0.1.3) (2022-04-18)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1011,7 +1011,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.1...cosmwasm-typescript-gen@0.1.2) (2022-04-17)
+## [0.1.2](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.1...cosmwasm-typescript-gen@0.1.2) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1019,7 +1019,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.1.0...cosmwasm-typescript-gen@0.1.1) (2022-04-17)
+## [0.1.1](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.1.0...cosmwasm-typescript-gen@0.1.1) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1027,7 +1027,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.1.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.25...cosmwasm-typescript-gen@0.1.0) (2022-04-17)
+# [0.1.0](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.25...cosmwasm-typescript-gen@0.1.0) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1035,7 +1035,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.25](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.24...cosmwasm-typescript-gen@0.0.25) (2022-04-17)
+## [0.0.25](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.24...cosmwasm-typescript-gen@0.0.25) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1043,7 +1043,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.24](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.23...cosmwasm-typescript-gen@0.0.24) (2022-04-17)
+## [0.0.24](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.23...cosmwasm-typescript-gen@0.0.24) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1051,7 +1051,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.23](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.22...cosmwasm-typescript-gen@0.0.23) (2022-04-17)
+## [0.0.23](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.22...cosmwasm-typescript-gen@0.0.23) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1059,7 +1059,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.22](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.21...cosmwasm-typescript-gen@0.0.22) (2022-04-17)
+## [0.0.22](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.21...cosmwasm-typescript-gen@0.0.22) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1067,7 +1067,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.21](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.20...cosmwasm-typescript-gen@0.0.21) (2022-04-17)
+## [0.0.21](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.20...cosmwasm-typescript-gen@0.0.21) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1075,7 +1075,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.20](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmwasm-typescript-gen@0.0.19...cosmwasm-typescript-gen@0.0.20) (2022-04-17)
+## [0.0.20](https://github.com/cosmwasm/ts-codegen/compare/cosmwasm-typescript-gen@0.0.19...cosmwasm-typescript-gen@0.0.20) (2022-04-17)
 
 **Note:** Version bump only for package cosmwasm-typescript-gen
 
@@ -1091,7 +1091,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.18](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.17...cosmscript@0.0.18) (2022-04-17)
+## [0.0.18](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.17...cosmscript@0.0.18) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1099,7 +1099,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.17](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.16...cosmscript@0.0.17) (2022-04-17)
+## [0.0.17](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.16...cosmscript@0.0.17) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1107,7 +1107,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.16](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.15...cosmscript@0.0.16) (2022-04-17)
+## [0.0.16](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.15...cosmscript@0.0.16) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1115,7 +1115,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.15](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.14...cosmscript@0.0.15) (2022-04-17)
+## [0.0.15](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.14...cosmscript@0.0.15) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1123,7 +1123,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.14](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.13...cosmscript@0.0.14) (2022-04-17)
+## [0.0.14](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.13...cosmscript@0.0.14) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1131,7 +1131,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.13](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.12...cosmscript@0.0.13) (2022-04-17)
+## [0.0.13](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.12...cosmscript@0.0.13) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1139,7 +1139,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.12](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.11...cosmscript@0.0.12) (2022-04-17)
+## [0.0.12](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.11...cosmscript@0.0.12) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1147,7 +1147,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.11](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.10...cosmscript@0.0.11) (2022-04-17)
+## [0.0.11](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.10...cosmscript@0.0.11) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1155,7 +1155,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.10](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.9...cosmscript@0.0.10) (2022-04-17)
+## [0.0.10](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.9...cosmscript@0.0.10) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1163,7 +1163,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.9](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.8...cosmscript@0.0.9) (2022-04-17)
+## [0.0.9](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.8...cosmscript@0.0.9) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1171,7 +1171,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.8](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.7...cosmscript@0.0.8) (2022-04-17)
+## [0.0.8](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.7...cosmscript@0.0.8) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1179,7 +1179,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.7](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.6...cosmscript@0.0.7) (2022-04-17)
+## [0.0.7](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.6...cosmscript@0.0.7) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1187,7 +1187,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.5...cosmscript@0.0.6) (2022-04-17)
+## [0.0.6](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.5...cosmscript@0.0.6) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1195,7 +1195,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.4...cosmscript@0.0.5) (2022-04-17)
+## [0.0.5](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.4...cosmscript@0.0.5) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
@@ -1203,7 +1203,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/cosmscript@0.0.3...cosmscript@0.0.4) (2022-04-17)
+## [0.0.4](https://github.com/cosmwasm/ts-codegen/compare/cosmscript@0.0.3...cosmscript@0.0.4) (2022-04-17)
 
 **Note:** Version bump only for package cosmscript
 
diff --git a/packages/ts-codegen/LICENSE-Apache b/packages/ts-codegen/LICENSE-Apache
index 9acc9b1b..aee5c634 100644
--- a/packages/ts-codegen/LICENSE-Apache
+++ b/packages/ts-codegen/LICENSE-Apache
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/packages/ts-codegen/LICENSE-MIT b/packages/ts-codegen/LICENSE-MIT
index 5a949f08..67cd0859 100644
--- a/packages/ts-codegen/LICENSE-MIT
+++ b/packages/ts-codegen/LICENSE-MIT
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 8fa7ca5c..53237030 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -623,13 +623,13 @@ yarn build
 Then `cd` into a package and run the tests
 
 ```
-cd ./packages/wasm-ast-types
+cd ./packages/ast
 yarn test:watch
 ```
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/wasm-ast-types/README.md) in the `wasm-ast-types` package.
+See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `wasm-ast-types` package.
 
 ## Related
 
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index d7f5762d..34f6b618 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -3,28 +3,28 @@
 exports[`options tsClient.enabled 1`] = `
 TSBuilder {
   "builderContext": BuilderContext {
-    "providers": Object {},
+    "providers": {},
   },
-  "files": Array [],
-  "options": Object {
-    "bundle": Object {
+  "files": [],
+  "options": {
+    "bundle": {
       "bundleFile": "bundle.ts",
       "enabled": true,
       "scope": "contracts",
     },
-    "client": Object {
+    "client": {
       "enabled": true,
       "execExtendsQuery": true,
       "noImplicitOverride": false,
     },
     "enabled": true,
-    "messageBuilder": Object {
+    "messageBuilder": {
       "enabled": false,
     },
-    "messageComposer": Object {
+    "messageComposer": {
       "enabled": false,
     },
-    "reactQuery": Object {
+    "reactQuery": {
       "camelize": true,
       "enabled": true,
       "mutations": false,
@@ -32,37 +32,37 @@ TSBuilder {
       "queryKeys": false,
       "version": "v4",
     },
-    "recoil": Object {
+    "recoil": {
       "enabled": false,
     },
-    "types": Object {
+    "types": {
       "aliasExecuteMsg": false,
       "enabled": true,
     },
     "useShorthandCtor": true,
   },
-  "plugins": Array [
+  "plugins": [
     TypesPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -70,10 +70,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -83,25 +83,25 @@ TSBuilder {
     },
     ClientPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -109,10 +109,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -122,25 +122,25 @@ TSBuilder {
     },
     MessageComposerPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -148,10 +148,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -161,25 +161,25 @@ TSBuilder {
     },
     ReactQueryPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -187,10 +187,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -200,25 +200,25 @@ TSBuilder {
     },
     RecoilPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -226,40 +226,40 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
         "useShorthandCtor": true,
       },
-      "utils": Object {
+      "utils": {
         "selectorFamily": "recoil",
       },
     },
     MessageBuilderPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -267,10 +267,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -280,25 +280,25 @@ TSBuilder {
     },
     ContractsContextProviderPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": true,
           "mutations": false,
@@ -306,16 +306,16 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
         "useShorthandCtor": true,
       },
-      "utils": Object {
+      "utils": {
         "ContractBase": "__contractContextBase__",
         "IContractConstructor": "__contractContextBase__",
         "IEmptyClient": "__contractContextBase__",
@@ -328,28 +328,28 @@ TSBuilder {
 exports[`options undefined 1`] = `
 TSBuilder {
   "builderContext": BuilderContext {
-    "providers": Object {},
+    "providers": {},
   },
-  "files": Array [],
-  "options": Object {
-    "bundle": Object {
+  "files": [],
+  "options": {
+    "bundle": {
       "bundleFile": "bundle.ts",
       "enabled": true,
       "scope": "contracts",
     },
-    "client": Object {
+    "client": {
       "enabled": true,
       "execExtendsQuery": true,
       "noImplicitOverride": false,
     },
     "enabled": true,
-    "messageBuilder": Object {
+    "messageBuilder": {
       "enabled": false,
     },
-    "messageComposer": Object {
+    "messageComposer": {
       "enabled": false,
     },
-    "reactQuery": Object {
+    "reactQuery": {
       "camelize": true,
       "enabled": false,
       "mutations": false,
@@ -357,37 +357,37 @@ TSBuilder {
       "queryKeys": false,
       "version": "v4",
     },
-    "recoil": Object {
+    "recoil": {
       "enabled": false,
     },
-    "types": Object {
+    "types": {
       "aliasExecuteMsg": false,
       "enabled": true,
     },
     "useShorthandCtor": true,
   },
-  "plugins": Array [
+  "plugins": [
     TypesPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -395,10 +395,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -408,25 +408,25 @@ TSBuilder {
     },
     ClientPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -434,10 +434,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -447,25 +447,25 @@ TSBuilder {
     },
     MessageComposerPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -473,10 +473,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -486,25 +486,25 @@ TSBuilder {
     },
     ReactQueryPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -512,10 +512,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -525,25 +525,25 @@ TSBuilder {
     },
     RecoilPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -551,40 +551,40 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
         "useShorthandCtor": true,
       },
-      "utils": Object {
+      "utils": {
         "selectorFamily": "recoil",
       },
     },
     MessageBuilderPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -592,10 +592,10 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
@@ -605,25 +605,25 @@ TSBuilder {
     },
     ContractsContextProviderPlugin {
       "builder": [Circular],
-      "option": Object {
-        "bundle": Object {
+      "option": {
+        "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
           "scope": "contracts",
         },
-        "client": Object {
+        "client": {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
         },
         "enabled": true,
-        "messageBuilder": Object {
+        "messageBuilder": {
           "enabled": false,
         },
-        "messageComposer": Object {
+        "messageComposer": {
           "enabled": false,
         },
-        "reactQuery": Object {
+        "reactQuery": {
           "camelize": true,
           "enabled": false,
           "mutations": false,
@@ -631,16 +631,16 @@ TSBuilder {
           "queryKeys": false,
           "version": "v4",
         },
-        "recoil": Object {
+        "recoil": {
           "enabled": false,
         },
-        "types": Object {
+        "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
         },
         "useShorthandCtor": true,
       },
-      "utils": Object {
+      "utils": {
         "ContractBase": "__contractContextBase__",
         "IContractConstructor": "__contractContextBase__",
         "IEmptyClient": "__contractContextBase__",
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 83845297..cd34be26 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -14,7 +14,9 @@ it('options undefined', async () => {
         outPath,
         options: undefined
     });
+    // @ts-ignore
     delete builder.contracts;
+    // @ts-ignore
     delete builder.outPath;
     expect(builder).toMatchSnapshot();
 });
@@ -39,14 +41,16 @@ it('options tsClient.enabled', async () => {
             }
         }
     });
+    // @ts-ignore
     delete builder.contracts;
+    // @ts-ignore
     delete builder.outPath;
     expect(builder).toMatchSnapshot();
 });
 
 it('builder invoke', async () => {
     const outPath = OUTPUT_DIR + '/invoke/';
-    const s = (str) => FIXTURE_DIR + str;
+    const s = (str: string) => FIXTURE_DIR + str;
     const builder = new TSBuilder({
         contracts: [
             s('/vectis/factory'),
@@ -76,7 +80,7 @@ it('builder invoke', async () => {
 
 it('builder default', async () => {
     const outPath = OUTPUT_DIR + '/default/';
-    const s = (str) => FIXTURE_DIR + str;
+    const s = (str: string) => FIXTURE_DIR + str;
     await codegen({
         contracts: [
             s('/vectis/factory'),
@@ -123,7 +127,7 @@ it('builder default', async () => {
 
 it('builder no extends', async () => {
     const outPath = OUTPUT_DIR + '/no-extends/';
-    const s = (str) => FIXTURE_DIR + str;
+    const s = (str: string) => FIXTURE_DIR + str;
     await codegen({
         contracts: [
             s('/vectis/factory'),
@@ -167,7 +171,7 @@ it('builder no extends', async () => {
 it('builder set bundler path', async () => {
     const outPath = OUTPUT_DIR + '/bundler_test/contracts';
     const bundlerPath = OUTPUT_DIR + '/bundler_test/';
-    const s = (str) => FIXTURE_DIR + str;
+    const s = (str: string) => FIXTURE_DIR + str;
     await codegen({
         contracts: [
             s('/vectis/factory'),
diff --git a/packages/ts-codegen/__tests__/bundler.test.ts b/packages/ts-codegen/__tests__/bundler.test.ts
index ba8d6eaa..6e4913ff 100644
--- a/packages/ts-codegen/__tests__/bundler.test.ts
+++ b/packages/ts-codegen/__tests__/bundler.test.ts
@@ -2,14 +2,21 @@ import generate from '@babel/generator';
 import cases from 'jest-in-case'
 import * as t from '@babel/types';
 import {
+    BundleData,
     recursiveModuleBundle
 } from '../src/bundler';
 
-const preview = (ast) => {
+const preview = (ast: any) => {
+    // @ts-ignore
     return generate(t.program(ast)).code;
 }
 
-cases(`recursiveModuleBundle`, opts => {
+interface JestBundleData {
+    name: string;
+    data: BundleData
+}
+
+cases(`recursiveModuleBundle`, (opts: JestBundleData) => {
     expect(preview(recursiveModuleBundle(opts.data))).toMatchSnapshot();
 }, [
     {
diff --git a/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts b/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
index f3748160..5fdddbd6 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
@@ -1,28 +1,27 @@
 import { TSBuilder } from '../src/builder';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
-const OUTPUT_DIR = __dirname + '/../../../__output__';
 
 it('issue-98', async () => {
   const outPath = FIXTURE_DIR + '/issues/98/out';
   const schemaDir = FIXTURE_DIR + '/issues/98/';
 
   const builder = new TSBuilder({
-      contracts: [
-        schemaDir
-      ],
-      outPath,
-      options: {
-          types: {
-              enabled: true
-          },
-          client: {
-              enabled: true
-          },
-          reactQuery: {
-              enabled: true
-          }
+    contracts: [
+      schemaDir
+    ],
+    outPath,
+    options: {
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true
+      },
+      reactQuery: {
+        enabled: true
       }
+    }
   });
   await builder.build();
 });
\ No newline at end of file
diff --git a/packages/ts-codegen/jest.config.js b/packages/ts-codegen/jest.config.js
new file mode 100644
index 00000000..0aa3aaa4
--- /dev/null
+++ b/packages/ts-codegen/jest.config.js
@@ -0,0 +1,18 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    preset: "ts-jest",
+    testEnvironment: "node",
+    transform: {
+        "^.+\\.tsx?$": [
+            "ts-jest",
+            {
+                babelConfig: false,
+                tsconfig: "tsconfig.json",
+            },
+        ],
+    },
+    transformIgnorePatterns: [`/node_modules/*`],
+    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+    moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+    modulePathIgnorePatterns: ["dist/*"]
+};
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index faaf53f4..9881c262 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -5,69 +5,37 @@
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
   "license": "SEE LICENSE IN LICENSE",
-  "main": "main/index.js",
-  "module": "module/index.js",
-  "typings": "types/src/index.d.ts",
+  "main": "index.js",
+  "module": "esm/index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public",
+    "directory": "dist"
+  },
   "bin": {
     "cosmwasm-ts-codegen": "main/ts-codegen.js"
   },
-  "directories": {
-    "lib": "src",
-    "test": "__tests__"
-  },
-  "files": [
-    "types",
-    "main",
-    "src",
-    "module"
-  ],
   "scripts": {
-    "build:main": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"",
-    "build:module": "cross-env MODULE=true babel src --out-dir module --delete-dir-on-start  --extensions \".tsx,.ts,.js\"",
-    "build:ts": "tsc --project ./tsconfig.json",
-    "build": "npm run build:module && npm run build:main",
-    "buidl": "npm run build && npm run build:ts",
+    "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
+    "clean": "del dist/**",
     "prepare": "npm run build",
-    "dev": "cross-env NODE_ENV=development babel-node src/ts-codegen --extensions \".tsx,.ts,.js\"",
-    "watch": "cross-env NODE_ENV=development babel-watch src/ts-codegen --extensions \".tsx,.ts,.js\"",
-    "file": "cross-env NODE_ENV=development babel-watch src/file --extensions \".tsx,.ts,.js\"",
-    "lint": "eslint .",
-    "format": "eslint . --fix",
+    "codegen": "ts-node ./scripts/build.ts",
+    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "test": "jest",
     "test:watch": "jest --watch",
-    "test:debug": "node --inspect node_modules/.bin/jest --runInBand"
-  },
-  "publishConfig": {
-    "access": "public"
+    "dev": "ts-node src/ts-codegen",
+    "file": "ts-node src/file"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/cosmwasm/ts-codegen"
   },
-  "keywords": [],
   "bugs": {
     "url": "https://github.com/cosmwasm/ts-codegen/issues"
   },
   "devDependencies": {
-    "@babel/cli": "7.18.10",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/node": "^7.18.10",
     "@cosmjs/cosmwasm-stargate": "0.30.1",
-    "@types/jest": "^28.1.6",
-    "ast-stringify": "0.1.0",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "28.1.3",
-    "babel-watch": "^7.0.0",
-    "cross-env": "^7.0.2",
-    "eslint": "8.21.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^28.1.3",
-    "jest-in-case": "^1.0.2",
-    "prettier": "^2.7.1",
-    "regenerator-runtime": "^0.13.7",
-    "ts-jest": "^28.0.7",
-    "typescript": "^4.7.4"
+    "ast-stringify": "0.1.0"
   },
   "dependencies": {
     "@babel/core": "7.18.10",
@@ -83,19 +51,22 @@
     "@babel/traverse": "7.18.11",
     "@babel/types": "7.18.10",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
+    "@types/shelljs": "0.8.15",
+    "@types/rimraf": "3.0.2",
     "case": "1.6.3",
     "dargs": "7.0.0",
     "deepmerge": "4.2.2",
-    "dotty": "0.1.2",
+    "nested-obj": "0.0.1",
     "fuzzy": "0.1.3",
     "glob": "8.0.3",
     "inquirerer": "0.1.3",
-    "long": "^5.2.0",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.26.4"
-  }
+    "wasm-ast-types": "^0.26.4",
+    "@cosmology/ts-codegen-types": "0.26.4"
+  },
+  "keywords": ["cosmwasm", "interchain", "smart contracts", "codegen"]
 }
diff --git a/packages/ts-codegen/scripts/cmds.js b/packages/ts-codegen/scripts/cmds.ts
similarity index 83%
rename from packages/ts-codegen/scripts/cmds.js
rename to packages/ts-codegen/scripts/cmds.ts
index e8247279..82f057bb 100644
--- a/packages/ts-codegen/scripts/cmds.js
+++ b/packages/ts-codegen/scripts/cmds.ts
@@ -27,13 +27,13 @@ const out = `
 ${imports}
 const Commands = {};
 ${paths
-  .map((a) => {
-    return `Commands['${a.param}'] = _${a.safe};`;
-  })
-  .join('\n')}
+    .map((a) => {
+      return `Commands['${a.param}'] = _${a.safe};`;
+    })
+    .join('\n')}
 
   export { Commands }; 
 
   `;
 
-fs.writeFileSync(`${__dirname}/../src/cmds.js`, out);
+fs.writeFileSync(`${__dirname}/../src/cmds.ts`, out);
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 0c7b7f68..bddcb521 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,4 +1,4 @@
-import { RenderOptions, defaultOptions, RenderContext, ContractInfo, MessageComposerOptions, BuilderContext } from "wasm-ast-types";
+import { RenderOptions, defaultOptions, ContractInfo, BuilderContext } from "wasm-ast-types";
 
 import { header } from '../utils/header';
 import { join } from "path";
@@ -79,7 +79,7 @@ export interface ContractFile {
     dir: string;
 }
 
-function getContract(contractOpt): ContractFile {
+function getContract(contractOpt: ContractFile | string): ContractFile {
     if (typeof contractOpt === 'string') {
         const name = basename(contractOpt);
         const contractName = pascal(name);
@@ -104,7 +104,7 @@ export class TSBuilder {
     protected files: BuilderFile[] = [];
 
     loadDefaultPlugins() {
-        [].push.apply(this.plugins, [
+        this.plugins.push(
             new TypesPlugin(this.options),
             new ClientPlugin(this.options),
             new MessageComposerPlugin(this.options),
@@ -112,7 +112,7 @@ export class TSBuilder {
             new RecoilPlugin(this.options),
             new MessageBuilderPlugin(this.options),
             new ContractsContextProviderPlugin(this.options),
-        ]);
+        );
     }
 
     constructor({ contracts, outPath, options, plugins }: TSBuilderInput) {
@@ -129,7 +129,7 @@ export class TSBuilder {
         this.loadDefaultPlugins();
 
         if (plugins && plugins.length) {
-            [].push.apply(this.plugins, plugins);
+            this.plugins.push(...plugins);
         }
 
         this.plugins.forEach(plugin => plugin.setBuilder(this))
@@ -158,7 +158,7 @@ export class TSBuilder {
         for (const plugin of this.plugins) {
             let files = await plugin.render(name, contractInfo, this.outPath);
             if (files && files.length) {
-                [].push.apply(this.files, files);
+                this.files.push(...files);
             }
         }
     }
@@ -179,7 +179,7 @@ export class TSBuilder {
         );
 
         if (files && files.length) {
-            [].push.apply(this.files, files);
+            this.files.push(...files);
         }
 
         const helpers = createHelpers({
@@ -190,7 +190,7 @@ export class TSBuilder {
         }, this.builderContext);
 
         if (helpers && helpers.length) {
-            [].push.apply(this.files, helpers);
+            this.files.push(...helpers);
         }
 
         if (this.options.bundle.enabled) {
@@ -207,7 +207,7 @@ export class TSBuilder {
             bundleFile
         );
         const bundleVariables = {};
-        const importPaths = [];
+        const importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[] = [];
 
         allFiles.forEach(file => {
             createFileBundle(
@@ -221,11 +221,14 @@ export class TSBuilder {
         });
 
         const ast = recursiveModuleBundle(bundleVariables);
+        const nodes = [
+            ...importPaths,
+            ...ast
+        ];
+        // @ts-ignore
         let code = generate(t.program(
-            [
-                ...importPaths,
-                ...ast
-            ]
+            // @ts-ignore
+            nodes
         )).code;
 
         if (this.options?.bundle?.bundlePath) {
diff --git a/packages/ts-codegen/src/bundler/bundler.ts b/packages/ts-codegen/src/bundler/bundler.ts
index 743151e9..711c5062 100644
--- a/packages/ts-codegen/src/bundler/bundler.ts
+++ b/packages/ts-codegen/src/bundler/bundler.ts
@@ -1,12 +1,19 @@
 import * as t from '@babel/types';
-import * as dotty from 'dotty';
+import nested from 'nested-obj';
+
 import {
     relative, dirname, extname
 } from 'path';
 
-export const recursiveModuleBundle = (obj) => {
+export interface BundleData {
+    __export?: boolean;
+    [key: string]: boolean | BundleData;
+}
+
+export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration[] => {
     return Object.keys(obj).map(key => {
-        if (obj[key]?.__export) {
+        const value = obj[key];
+        if (typeof value === 'object' && value && value.__export) {
             // e.g. abci
             // 1. create variable for abci
             // 2. splat ALL _0, parms into abci
@@ -33,18 +40,17 @@ export const recursiveModuleBundle = (obj) => {
 
             // return nmspc;
             return t.exportNamedDeclaration(nmspc, []);
-
-
-
-        } else {
+        } else if (typeof value === 'object' && value) {
             // you can make a namespace for obj[key]
             // e.g. libs
             return t.exportNamedDeclaration(
                 t.tsModuleDeclaration(
                     t.identifier(key),
-                    t.tsModuleBlock(recursiveModuleBundle(obj[key]))
+                    t.tsModuleBlock(recursiveModuleBundle(obj[key] as BundleData))
                 )
             )
+        } else {
+            throw new Error('Invalid structure for BundleData');
         }
     });
 };
@@ -57,11 +63,17 @@ export const importNamespace = (ident: string, path: string) => t.importDeclarat
 );
 
 let counter = 0;
-export const createFileBundle = (pkg, filename, bundleFile, importPaths, bundleVariables) => {
+export const createFileBundle = (
+    pkg: string,
+    filename: string,
+    bundleFile: string,
+    importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[],
+    bundleVariables: BundleData
+) => {
     let rel = relative(dirname(bundleFile), filename);
     if (!rel.startsWith('.')) rel = `./${rel}`;
     const variable = `_${counter++}`;
     importPaths.push(importNamespace(variable, rel));
-    dotty.put(bundleVariables, pkg + '.__export', true);
-    dotty.put(bundleVariables, pkg + '.' + variable, true);
+    nested.set(bundleVariables, pkg + '.__export', true);
+    nested.set(bundleVariables, pkg + '.' + variable, true);
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/src/cli.js b/packages/ts-codegen/src/cli.ts
similarity index 100%
rename from packages/ts-codegen/src/cli.js
rename to packages/ts-codegen/src/cli.ts
diff --git a/packages/ts-codegen/src/cmds.js b/packages/ts-codegen/src/cmds.ts
similarity index 100%
rename from packages/ts-codegen/src/cmds.js
rename to packages/ts-codegen/src/cmds.ts
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 54cde020..0d8c85f5 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -1,12 +1,13 @@
 import * as shell from 'shelljs';
 import { prompt } from '../utils/prompt';
 import dargs from 'dargs';
+import { MinimistArgs } from '../types';
 const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
 
 const repo = 'https://github.com/cosmology-tech/ts-codegen-module-boilerplate';
-export default async argv => {
+export default async (argv: MinimistArgs) => {
     if (!shell.which('git')) {
         shell.echo('Sorry, this script requires git');
         return shell.exit(1);
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index ce3cc49c..ac222d6e 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -1,8 +1,10 @@
+// @ts-nocheck
 import { prompt } from '../utils/prompt';
 import codegen from '../index';
 import { TSBuilderOptions } from '../builder';
+import { MinimistArgs } from '../types';
 
-export default async (argv) => {
+export default async (argv: MinimistArgs) => {
     const questions = [
         {
             _: true,
@@ -53,6 +55,7 @@ export default async (argv) => {
     ///////// REACT QUERY
     const questions2 = [];
     if (plugin.includes('react-query')) {
+        // @ts-ignore
         [].push.apply(questions2, [
             {
                 type: 'confirm',
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index 2005cf3f..a1c1811f 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -7,20 +7,21 @@ import { prompt } from '../utils/prompt';
 import { parse } from 'parse-package-name';
 import { tmpdir } from 'os';
 import { readFileSync, writeFileSync } from 'fs';
+import { MinimistArgs } from '../types';
 
 const TMPDIR = tmpdir();
 const rnd = () =>
     Math.random().toString(36).substring(2, 15) +
     Math.random().toString(36).substring(2, 15);
 
-const getPackages = (names) => {
+const getPackages = (names: string[]) => {
     return names.map(pkg => {
         const { name, version } = parse(pkg);
         return `${name}@${version}`
     }).join(' ');
 };
 
-export default async (argv) => {
+export default async (argv: MinimistArgs) => {
 
     // don't prompt if we got this...
     if (argv._.length) {
diff --git a/packages/ts-codegen/src/file.js b/packages/ts-codegen/src/file.ts
similarity index 100%
rename from packages/ts-codegen/src/file.js
rename to packages/ts-codegen/src/file.ts
diff --git a/packages/ts-codegen/src/generators/client.ts b/packages/ts-codegen/src/generators/client.ts
index 2b838e41..ee2073e7 100644
--- a/packages/ts-codegen/src/generators/client.ts
+++ b/packages/ts-codegen/src/generators/client.ts
@@ -89,6 +89,7 @@ export default async (
   }
   const imports = context.getImports();
   const code = header + generate(
+    // @ts-ignore
     t.program([
       ...imports,
       ...body
diff --git a/packages/ts-codegen/src/generators/message-composer.ts b/packages/ts-codegen/src/generators/message-composer.ts
index f60645a4..e4ab4962 100644
--- a/packages/ts-codegen/src/generators/message-composer.ts
+++ b/packages/ts-codegen/src/generators/message-composer.ts
@@ -66,6 +66,7 @@ export default async (
   }
   const imports = context.getImports();
   const code = header + generate(
+    // @ts-ignore
     t.program([
       ...imports,
       ...body
diff --git a/packages/ts-codegen/src/generators/msg-builder.ts b/packages/ts-codegen/src/generators/msg-builder.ts
index af5d7779..b8da536c 100644
--- a/packages/ts-codegen/src/generators/msg-builder.ts
+++ b/packages/ts-codegen/src/generators/msg-builder.ts
@@ -62,6 +62,7 @@ export default async (
     delete context.utils.Coin;
   }
   const imports = context.getImports();
+  // @ts-ignore
   const code = header + generate(t.program([...imports, ...body])).code;
 
   mkdirp(outPath);
diff --git a/packages/ts-codegen/src/generators/react-query.ts b/packages/ts-codegen/src/generators/react-query.ts
index cdeed267..42d67da0 100644
--- a/packages/ts-codegen/src/generators/react-query.ts
+++ b/packages/ts-codegen/src/generators/react-query.ts
@@ -82,6 +82,7 @@ export default async (
   }
   const imports = context.getImports();
   const code = header + generate(
+    // @ts-ignore
     t.program([
       ...imports,
       ...body
diff --git a/packages/ts-codegen/src/generators/recoil.ts b/packages/ts-codegen/src/generators/recoil.ts
index aac4e3cc..aae72b0a 100644
--- a/packages/ts-codegen/src/generators/recoil.ts
+++ b/packages/ts-codegen/src/generators/recoil.ts
@@ -60,9 +60,8 @@ export default async (
       QueryClient
     ));
 
-    [].push.apply(body,
-      w.createRecoilSelectors(context, name, QueryClient, QueryMsg)
-    );
+    const selectors = w.createRecoilSelectors(context, name, QueryClient, QueryMsg);
+    body.push(...selectors);
 
   }
 
@@ -72,6 +71,7 @@ export default async (
   }
   const imports = context.getImports();
   const code = header + generate(
+    // @ts-ignore
     t.program([
       ...imports,
       ...body
diff --git a/packages/ts-codegen/src/generators/types.ts b/packages/ts-codegen/src/generators/types.ts
index 96f184fc..06545336 100644
--- a/packages/ts-codegen/src/generators/types.ts
+++ b/packages/ts-codegen/src/generators/types.ts
@@ -73,6 +73,7 @@ export default async (
 
   const imports = context.getImports();
   const code = header + generate(
+    // @ts-ignore
     t.program([
       ...imports,
       ...body
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 21d54db3..9b1f26a8 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -23,7 +23,7 @@ export interface IBuilderPlugin {
 
   builder?: TSBuilder;
 
-  setBuilder(builder: TSBuilder);
+  setBuilder(builder: TSBuilder): void;
 
   /**
    * render generated cdoe.
@@ -43,8 +43,7 @@ export interface IBuilderPlugin {
  * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
  */
 export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
-  implements IBuilderPlugin
-{
+  implements IBuilderPlugin {
   builder?: TSBuilder;
   option: TOpt;
   utils: UtilMapping;
@@ -54,7 +53,7 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
     this.builder = builder;
   }
 
-  setBuilder(builder: TSBuilder) {
+  setBuilder(builder: TSBuilder): void {
     this.builder = builder;
   }
 
@@ -79,8 +78,8 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
 
     return results.map((result) => {
       const imports = context.getImports(this.utils, result.localname);
-      const code =
-        header + generate(t.program([...imports, ...result.body])).code;
+      // @ts-ignore
+      const code = header + generate(t.program([...imports, ...result.body])).code;
 
       mkdirp(outPath);
       const filename = join(outPath, result.localname);
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index db26109e..f9daca0c 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -4,10 +4,10 @@ import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
 import { BuilderFileType, TSBuilderOptions } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
-export const GetLocalNameByContractName = (name) =>
+export const GetLocalNameByContractName = (name: string) =>
   `${pascal(name)}.provider.ts`;
 
-export const GetLocalBaseNameByContractName = (name) =>
+export const GetLocalBaseNameByContractName = (name: string) =>
   `${pascal(name)}.provider`;
 
 export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index 17b29164..c081618d 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -10,6 +10,7 @@ import {
 } from 'wasm-ast-types';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
+import { JSONSchema } from '@pyramation/json-schema-to-typescript';
 
 export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
   utils: UtilMapping = {
@@ -67,10 +68,9 @@ export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
       body.push(w.createRecoilQueryClientType());
       body.push(w.createRecoilQueryClient(context, name, QueryClient));
 
-      [].push.apply(
-        body,
-        w.createRecoilSelectors(context, name, QueryClient, QueryMsg)
-      );
+      const selectors = w.createRecoilSelectors(context, name, QueryClient, QueryMsg);
+
+      body.push(...selectors);
     }
 
     if (typeHash.hasOwnProperty('Coin')) {
diff --git a/packages/ts-codegen/src/ts-codegen.js b/packages/ts-codegen/src/ts-codegen.ts
similarity index 100%
rename from packages/ts-codegen/src/ts-codegen.js
rename to packages/ts-codegen/src/ts-codegen.ts
diff --git a/packages/ts-codegen/src/types.ts b/packages/ts-codegen/src/types.ts
new file mode 100644
index 00000000..89e03677
--- /dev/null
+++ b/packages/ts-codegen/src/types.ts
@@ -0,0 +1,4 @@
+export interface MinimistArgs {
+  _: string[]; // Positional arguments array
+  [key: string]: string | string[] | boolean | number | undefined; // Flexible types for all keys
+}
diff --git a/packages/ts-codegen/src/utils/clean.ts b/packages/ts-codegen/src/utils/clean.ts
index d788871a..8e258cb4 100644
--- a/packages/ts-codegen/src/utils/clean.ts
+++ b/packages/ts-codegen/src/utils/clean.ts
@@ -1,4 +1,4 @@
-export const clean = (obj) => {
+export const clean = (obj: any): any => {
     var copy;
     // Handle the 3 simple types, and null or undefined
     if (null == obj || 'object' != typeof obj) return obj;
@@ -32,9 +32,11 @@ export const clean = (obj) => {
                     case 'end':
                         break;
                     default:
+                        // @ts-ignore
                         copy[attr] = clean(obj[attr]);
                 }
             } else {
+                // @ts-ignore
                 copy[attr] = clean(obj[attr]);
             }
         }
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index b62351b0..51a37785 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -1,6 +1,6 @@
 import { pascal } from "case";
 
-const cleanFor = (str) => {
+const cleanFor = (str: string) => {
     /*
         1. look at first char after _for_
         2. ONLY if you find capitals after, modify it
@@ -13,7 +13,7 @@ const cleanFor = (str) => {
     return str;
 };
 
-const cleanNullable = (str) => {
+const cleanNullable = (str: string) => {
     if (/^Nullable_/.test(str)) {
         str = str.replace(/^Nullable_/, 'Nullable');
     }
@@ -21,7 +21,7 @@ const cleanNullable = (str) => {
     return str;
 };
 
-export const cleanse = (obj) => {
+export const cleanse = (obj: any): any => {
     var copy;
     // Handle the 3 simple types, and null or undefined
     if (null == obj || 'object' != typeof obj) return obj;
@@ -58,27 +58,33 @@ export const cleanse = (obj) => {
             if (obj.hasOwnProperty(attr)) {
 
                 if (/_for_/.test(attr)) {
+                    // @ts-ignore
                     copy[cleanFor(attr)] = cleanse(obj[attr]);
                 } else if (/^Nullable_/.test(attr)) {
+                    // @ts-ignore
                     copy[cleanNullable(attr)] = cleanse(obj[attr]);
                 } else {
                     switch (attr) {
                         case 'title':
                         case '$ref':
                             if (typeof obj[attr] === 'string') {
+                                // @ts-ignore
                                 copy[attr] = cleanse(
                                     cleanNullable(cleanFor(obj[attr]))
                                 );
                             } else {
+                                // @ts-ignore
                                 copy[attr] = cleanse(obj[attr]);
                             }
                             break;
                         default:
+                            // @ts-ignore
                             copy[attr] = cleanse(obj[attr]);
                     }
                 }
 
             } else {
+                // @ts-ignore
                 copy[attr] = cleanse(obj[attr]);
             }
         }
diff --git a/packages/ts-codegen/src/utils/files.ts b/packages/ts-codegen/src/utils/files.ts
index ba1f87c6..adece2bd 100644
--- a/packages/ts-codegen/src/utils/files.ts
+++ b/packages/ts-codegen/src/utils/files.ts
@@ -16,7 +16,7 @@ export const writeAstToFile = (
   isEslintDisable = false
 ) => {
   const ast = t.program(program);
-  const content = generate(ast).code;
+  const content = generate(ast as any).code;
 
   if (removeUnusedImports) {
     const plugins: ParserPlugin[] = ["typescript"];
@@ -24,8 +24,8 @@ export const writeAstToFile = (
       sourceType: "module",
       plugins,
     });
-    traverse(newAst, unused);
-    const content2 = generate(newAst).code;
+    traverse(newAst as any, unused);
+    const content2 = generate(newAst as any).code;
     writeContentToFile(
       outPath,
       content2,
diff --git a/packages/ts-codegen/src/utils/parse.ts b/packages/ts-codegen/src/utils/parse.ts
index b640114a..627bcdc3 100644
--- a/packages/ts-codegen/src/utils/parse.ts
+++ b/packages/ts-codegen/src/utils/parse.ts
@@ -1,9 +1,9 @@
 import babelTraverse from '@babel/traverse';
 import { parse, ParserPlugin } from '@babel/parser';
 
-export const parser = (codes) => {
+export const parser = (codes: string[]) => {
 
-    const hash = {};
+    const hash: Record<string, any> = {};
     codes.forEach(code => {
 
         const plugins: ParserPlugin[] = [
@@ -16,19 +16,19 @@ export const parser = (codes) => {
         });
 
         const visitor = visitorFn({
-            addType(key, node) {
+            addType(key: string, node: any) {
                 hash[key] = node;
             }
         })
-        babelTraverse(ast, visitor);
+        babelTraverse(ast as any, visitor);
     });
 
     return hash;
 
 }
 
-const visitorFn = (parser) => ({
-    TSTypeAliasDeclaration(path) {
+const visitorFn = (parser: any) => ({
+    TSTypeAliasDeclaration(path: any) {
         parser.addType(path.node.id.name, path.parentPath.node);
         // if (path.node.id.name.endsWith('For_Empty')) {
         //     const newName = path.node.id.name.replace(/For_Empty$/, '_for_Empty');
@@ -38,7 +38,7 @@ const visitorFn = (parser) => ({
         //     parser.addType(path.node.id.name, path.parentPath.node);
         // }
     },
-    TSInterfaceDeclaration(path) {
+    TSInterfaceDeclaration(path: any) {
         parser.addType(path.node.id.name, path.parentPath.node);
     }
 });
diff --git a/packages/ts-codegen/src/utils/prompt.js b/packages/ts-codegen/src/utils/prompt.ts
similarity index 99%
rename from packages/ts-codegen/src/utils/prompt.js
rename to packages/ts-codegen/src/utils/prompt.ts
index 51fd0aa1..3de0db51 100644
--- a/packages/ts-codegen/src/utils/prompt.js
+++ b/packages/ts-codegen/src/utils/prompt.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { filter } from 'fuzzy';
 import { prompt as inquirerer } from 'inquirerer';
 
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 9c4b3cb6..6781aa2c 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -3,7 +3,8 @@ import { readFileSync } from 'fs';
 import { cleanse } from './cleanse';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
-import { ContractInfo, JSONSchema } from 'wasm-ast-types';
+import { ContractInfo } from 'wasm-ast-types';
+import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
 interface ReadSchemaOpts {
     schemaDir: string;
     clean?: boolean;
@@ -12,11 +13,11 @@ interface ReadSchemaOpts {
 export const readSchemas = async ({
     schemaDir, clean = true
 }: ReadSchemaOpts): Promise<ContractInfo> => {
-    const fn = clean ? cleanse : (str) => str;
+    const fn = clean ? cleanse : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
     const files = glob(schemaDir + '/**/*.json')
         .filter(file => !file.match(/\/raw\//));
 
-    const schemas = files
+    const schemas: JSONSchema[] = files
         .map(file => JSON.parse(readFileSync(file, 'utf-8')));
 
     if (schemas.length > 1) {
@@ -35,7 +36,7 @@ export const readSchemas = async ({
         throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
     }
 
-    const idlObject = schemas[0];
+    const idlObject: Partial<IDLObject> = schemas[0] as Partial<IDLObject>;
     const {
         contract_name,
         contract_version,
@@ -56,15 +57,16 @@ export const readSchemas = async ({
     }
 
     // TODO use contract_name, etc.
+    const idl: Partial<IDLObject> = {
+        instantiate,
+        execute,
+        query,
+        migrate,
+        sudo
+    };
     return {
         schemas: [
-            ...Object.values(fn({
-                instantiate,
-                execute,
-                query,
-                migrate,
-                sudo
-            })).filter(Boolean),
+            ...Object.values(fn(idl)).filter(Boolean),
             ...Object.values(fn({ ...responses })).filter(Boolean)
         ],
         responses,
@@ -72,19 +74,19 @@ export const readSchemas = async ({
     };
 };
 
-export const findQueryMsg = (schemas) => {
-    const QueryMsg = schemas.find(schema => schema.title === 'QueryMsg');
-    return QueryMsg;
+export const findQueryMsg = (schemas: JSONSchema[]): QueryMsg => {
+    const queryMsg = schemas.find(schema => schema.title === 'QueryMsg');
+    return queryMsg as QueryMsg;
 };
 
-export const findExecuteMsg = (schemas) => {
-    const ExecuteMsg = schemas.find(schema =>
-      schema.title.startsWith('ExecuteMsg')
+export const findExecuteMsg = (schemas: JSONSchema[]): ExecuteMsg => {
+    const executeMsg = schemas.find(schema =>
+        schema.title.startsWith('ExecuteMsg')
     );
-    return ExecuteMsg;
+    return executeMsg as ExecuteMsg;
 };
 
-export const findAndParseTypes = async (schemas) => {
+export const findAndParseTypes = async (schemas: JSONSchema[]) => {
     const Types = schemas;
     const allTypes = [];
     for (const typ in Types) {
@@ -94,7 +96,7 @@ export const findAndParseTypes = async (schemas) => {
                 Types[typ].definitions[key].title = key;
             }
         }
-        const result = await compile(Types[typ], Types[typ].title);
+        const result = await compile(Types[typ] as any, Types[typ].title);
         allTypes.push(result);
     }
     const typeHash = parser(allTypes);
diff --git a/packages/ts-codegen/tsconfig.esm.json b/packages/ts-codegen/tsconfig.esm.json
new file mode 100644
index 00000000..800d7506
--- /dev/null
+++ b/packages/ts-codegen/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/esm",
+    "module": "es2022",
+    "rootDir": "src/",
+    "declaration": false
+  }
+}
diff --git a/packages/ts-codegen/tsconfig.json b/packages/ts-codegen/tsconfig.json
index 0a55df78..1a9d5696 100644
--- a/packages/ts-codegen/tsconfig.json
+++ b/packages/ts-codegen/tsconfig.json
@@ -1,19 +1,9 @@
 {
-    "compilerOptions": {
-        "allowJs": true,
-        "esModuleInterop": true,
-        "declaration": true,
-        "declarationDir": "./types",
-        "emitDeclarationOnly": true,
-        "isolatedModules": true,
-        "resolveJsonModule": true
-    },
-    "include": [
-        "src/**/*"
-    ],
-    "exclude": [
-        "node_modules",
-        "src/**/*.spec.ts",
-        "src/**/*.test.ts"
-    ]
-}
\ No newline at end of file
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src/"
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["dist", "node_modules", "**/*.spec.*", "**/*.test.*"]
+}
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
deleted file mode 100644
index d193445b..00000000
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { RenderOptions, BuilderContext } from "wasm-ast-types";
-import { IBuilderPlugin } from '../plugins';
-export interface TSBuilderInput {
-    contracts: Array<ContractFile | string>;
-    outPath: string;
-    options?: TSBuilderOptions;
-    plugins?: IBuilderPlugin[];
-}
-export interface BundleOptions {
-    enabled?: boolean;
-    scope?: string;
-    bundleFile?: string;
-    bundlePath?: string;
-}
-export interface UseContractsOptions {
-    enabled?: boolean;
-}
-export declare type TSBuilderOptions = {
-    bundle?: BundleOptions;
-    /**
-     * Enable using shorthand constructor.
-     * Default: true
-     */
-    useShorthandCtor?: boolean;
-    useContractsHooks?: UseContractsOptions;
-} & RenderOptions;
-export declare type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
-export interface BuilderFile {
-    type: BuilderFileType;
-    pluginType?: string;
-    contract: string;
-    localname: string;
-    filename: string;
-}
-export interface ContractFile {
-    name: string;
-    dir: string;
-}
-export declare class TSBuilder {
-    contracts: Array<ContractFile | string>;
-    outPath: string;
-    options?: TSBuilderOptions;
-    plugins: IBuilderPlugin[];
-    builderContext: BuilderContext;
-    protected files: BuilderFile[];
-    loadDefaultPlugins(): void;
-    constructor({ contracts, outPath, options, plugins }: TSBuilderInput);
-    build(): Promise<void>;
-    private process;
-    private render;
-    private after;
-    bundle(): Promise<void>;
-}
diff --git a/packages/ts-codegen/types/src/builder/index.d.ts b/packages/ts-codegen/types/src/builder/index.d.ts
deleted file mode 100644
index ecea700b..00000000
--- a/packages/ts-codegen/types/src/builder/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './builder';
diff --git a/packages/ts-codegen/types/src/bundler/bundler.d.ts b/packages/ts-codegen/types/src/bundler/bundler.d.ts
deleted file mode 100644
index 1630371b..00000000
--- a/packages/ts-codegen/types/src/bundler/bundler.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as t from '@babel/types';
-export declare const recursiveModuleBundle: (obj: any) => any;
-export declare const importNamespace: (ident: string, path: string) => t.ImportDeclaration;
-export declare const createFileBundle: (pkg: any, filename: any, bundleFile: any, importPaths: any, bundleVariables: any) => void;
diff --git a/packages/ts-codegen/types/src/bundler/index.d.ts b/packages/ts-codegen/types/src/bundler/index.d.ts
deleted file mode 100644
index 86bd4845..00000000
--- a/packages/ts-codegen/types/src/bundler/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './bundler';
diff --git a/packages/ts-codegen/types/src/cli.d.ts b/packages/ts-codegen/types/src/cli.d.ts
deleted file mode 100644
index d0e8c93e..00000000
--- a/packages/ts-codegen/types/src/cli.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export function cli(argv: any): Promise<void>;
diff --git a/packages/ts-codegen/types/src/cmds.d.ts b/packages/ts-codegen/types/src/cmds.d.ts
deleted file mode 100644
index 2ef15a37..00000000
--- a/packages/ts-codegen/types/src/cmds.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const Commands: typeof Commands;
diff --git a/packages/ts-codegen/types/src/commands/create-boilerplate.d.ts b/packages/ts-codegen/types/src/commands/create-boilerplate.d.ts
deleted file mode 100644
index 66df6c71..00000000
--- a/packages/ts-codegen/types/src/commands/create-boilerplate.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare const _default: (argv: any) => Promise<any>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/commands/generate.d.ts b/packages/ts-codegen/types/src/commands/generate.d.ts
deleted file mode 100644
index d83188a8..00000000
--- a/packages/ts-codegen/types/src/commands/generate.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare const _default: (argv: any) => Promise<void>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/commands/install.d.ts b/packages/ts-codegen/types/src/commands/install.d.ts
deleted file mode 100644
index d83188a8..00000000
--- a/packages/ts-codegen/types/src/commands/install.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare const _default: (argv: any) => Promise<void>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/file.d.ts b/packages/ts-codegen/types/src/file.d.ts
deleted file mode 100644
index b7988016..00000000
--- a/packages/ts-codegen/types/src/file.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};
diff --git a/packages/ts-codegen/types/src/generators/client.d.ts b/packages/ts-codegen/types/src/generators/client.d.ts
deleted file mode 100644
index b6aed11a..00000000
--- a/packages/ts-codegen/types/src/generators/client.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ContractInfo } from "wasm-ast-types";
-import { TSClientOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, tsClientOptions?: TSClientOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/generators/create-helpers.d.ts b/packages/ts-codegen/types/src/generators/create-helpers.d.ts
deleted file mode 100644
index 9246c147..00000000
--- a/packages/ts-codegen/types/src/generators/create-helpers.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { BuilderFile, TSBuilderInput } from "../builder";
-import { BuilderContext } from "wasm-ast-types";
-export declare const createHelpers: (input: TSBuilderInput, builderContext: BuilderContext) => BuilderFile[];
diff --git a/packages/ts-codegen/types/src/generators/message-composer.d.ts b/packages/ts-codegen/types/src/generators/message-composer.d.ts
deleted file mode 100644
index e2f4a834..00000000
--- a/packages/ts-codegen/types/src/generators/message-composer.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ContractInfo } from "wasm-ast-types";
-import { MessageComposerOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageComposerOptions?: MessageComposerOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/generators/msg-builder.d.ts b/packages/ts-codegen/types/src/generators/msg-builder.d.ts
deleted file mode 100644
index 80f07209..00000000
--- a/packages/ts-codegen/types/src/generators/msg-builder.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ContractInfo } from "wasm-ast-types";
-import { MessageBuilderOptions } from 'wasm-ast-types';
-import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageBuilderOptions?: MessageBuilderOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/generators/msg-builder.ts b/packages/ts-codegen/types/src/generators/msg-builder.ts
deleted file mode 100644
index ac8b6b7b..00000000
--- a/packages/ts-codegen/types/src/generators/msg-builder.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ContractInfo } from "wasm-ast-types";
-import { MessageBuilderOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, messageBuilderOptions?: MessageBuilderOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/generators/react-query.d.ts b/packages/ts-codegen/types/src/generators/react-query.d.ts
deleted file mode 100644
index 0e7d1cd1..00000000
--- a/packages/ts-codegen/types/src/generators/react-query.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { ReactQueryOptions, ContractInfo } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-declare const _default: (contractName: string, contractInfo: ContractInfo, outPath: string, reactQueryOptions?: ReactQueryOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/generators/recoil.d.ts b/packages/ts-codegen/types/src/generators/recoil.d.ts
deleted file mode 100644
index cb352533..00000000
--- a/packages/ts-codegen/types/src/generators/recoil.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { ContractInfo, RecoilOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, recoilOptions?: RecoilOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/generators/types.d.ts b/packages/ts-codegen/types/src/generators/types.d.ts
deleted file mode 100644
index d49e838d..00000000
--- a/packages/ts-codegen/types/src/generators/types.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { ContractInfo, TSTypesOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-declare const _default: (name: string, contractInfo: ContractInfo, outPath: string, tsTypesOptions?: TSTypesOptions) => Promise<BuilderFile[]>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
deleted file mode 100644
index cd8c6596..00000000
--- a/packages/ts-codegen/types/src/helpers/contractContextBase.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n  TSign?: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => TSign;\n  TQuery?: new (\n    client: CosmWasmClient,\n    contractAddress: string\n  ) => TQuery;\n  TMsgComposer?: new (\n    sender: string,\n    contractAddress: string\n  ) => TMsgComposer;\n\n  constructor(\n    address: string | undefined,\n    cosmWasmClient: CosmWasmClient | undefined,\n    signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {\n    this.address = address;\n    this.cosmWasmClient = cosmWasmClient;\n    this.signingCosmWasmClient = signingCosmWasmClient;\n    this.TSign = TSign;\n    this.TQuery = TQuery;\n    this.TMsgComposer = TMsgComposer;\n  }\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
diff --git a/packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts b/packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts
deleted file mode 100644
index d582a1e9..00000000
--- a/packages/ts-codegen/types/src/helpers/contractContextBaseShortHandCtor.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const contractContextBaseShortHandCtor = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
diff --git a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
deleted file mode 100644
index 5e9f80e1..00000000
--- a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\nexport interface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
diff --git a/packages/ts-codegen/types/src/helpers/index.d.ts b/packages/ts-codegen/types/src/helpers/index.d.ts
deleted file mode 100644
index de7142d8..00000000
--- a/packages/ts-codegen/types/src/helpers/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './contractContextBase';
-export * from './contractContextBaseShortHandCtor';
-export * from './contractsContextTSX';
diff --git a/packages/ts-codegen/types/src/index.d.ts b/packages/ts-codegen/types/src/index.d.ts
deleted file mode 100644
index e53bb80f..00000000
--- a/packages/ts-codegen/types/src/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TSBuilderInput } from './builder';
-export { default as generateTypes } from './generators/types';
-export { default as generateClient } from './generators/client';
-export { default as generateMessageComposer } from './generators/message-composer';
-export { default as generateReactQuery } from './generators/react-query';
-export { default as generateRecoil } from './generators/recoil';
-export * from './utils';
-export * from './builder';
-export * from './bundler';
-export * from './plugins';
-declare const _default: (input: TSBuilderInput) => Promise<void>;
-export default _default;
diff --git a/packages/ts-codegen/types/src/plugins/client.d.ts b/packages/ts-codegen/types/src/plugins/client.d.ts
deleted file mode 100644
index 1cb58168..00000000
--- a/packages/ts-codegen/types/src/plugins/client.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { RenderContext, ContractInfo, RenderContextBase, RenderOptions } from "wasm-ast-types";
-import { BuilderFileType } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
-export declare const TYPE = "client";
-export declare class ClientPlugin extends BuilderPluginBase<RenderOptions> {
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/index.d.ts b/packages/ts-codegen/types/src/plugins/index.d.ts
deleted file mode 100644
index b6bdd472..00000000
--- a/packages/ts-codegen/types/src/plugins/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./plugin-base";
diff --git a/packages/ts-codegen/types/src/plugins/message-builder.d.ts b/packages/ts-codegen/types/src/plugins/message-builder.d.ts
deleted file mode 100644
index 8c0aeb4a..00000000
--- a/packages/ts-codegen/types/src/plugins/message-builder.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-export declare class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/message-composer.d.ts b/packages/ts-codegen/types/src/plugins/message-composer.d.ts
deleted file mode 100644
index 43c536b9..00000000
--- a/packages/ts-codegen/types/src/plugins/message-composer.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ContractInfo, RenderContextBase, RenderContext, RenderOptions } from "wasm-ast-types";
-import { BuilderFileType } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
-export declare const TYPE = "message-composer";
-export declare class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/msg-builder.d.ts b/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
deleted file mode 100644
index 8c0aeb4a..00000000
--- a/packages/ts-codegen/types/src/plugins/msg-builder.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RenderContext, RenderContextBase, ContractInfo, RenderOptions } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-export declare class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/plugin-base.d.ts b/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
deleted file mode 100644
index 742356f8..00000000
--- a/packages/ts-codegen/types/src/plugins/plugin-base.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ContractInfo, UtilMapping, IContext } from "wasm-ast-types";
-import { BuilderFile, BuilderFileType, TSBuilder } from "../builder";
-/**
- * IBuilderPlugin is a common plugin that render generated code.
- */
-export interface IBuilderPlugin {
-    /**
-     * a mapping of utils will be used in generated code.
-     */
-    utils: UtilMapping;
-    builder?: TSBuilder;
-    setBuilder(builder: TSBuilder): any;
-    /**
-     * render generated cdoe.
-     * @param name the name of contract
-     * @param contractInfo contract
-     * @param outPath the path of generated code.
-     * @returns info of generated files.
-     */
-    render(name: string, contractInfo: ContractInfo, outPath: string): Promise<BuilderFile[]>;
-}
-/**
- * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
- */
-export declare abstract class BuilderPluginBase<TOpt extends {
-    enabled?: boolean;
-}> implements IBuilderPlugin {
-    builder?: TSBuilder;
-    option: TOpt;
-    utils: UtilMapping;
-    constructor(opt: TOpt, builder?: TSBuilder);
-    setBuilder(builder: TSBuilder): void;
-    render(name: string, contractInfo: ContractInfo, outPath: string): Promise<BuilderFile[]>;
-    /**
-     * init context here
-     * @param contract
-     * @param options
-     */
-    abstract initContext(contract: ContractInfo, options?: TOpt): IContext;
-    /**
-     * render generated code here.
-     * @param name
-     * @param context
-     */
-    abstract doRender(name: string, context: IContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/provider-bundle.d.ts b/packages/ts-codegen/types/src/plugins/provider-bundle.d.ts
deleted file mode 100644
index e50caa8e..00000000
--- a/packages/ts-codegen/types/src/plugins/provider-bundle.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
-import { BuilderFileType, TSBuilderOptions } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
-export declare class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOptions> {
-    constructor(opt: TSBuilderOptions);
-    initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/provider.d.ts b/packages/ts-codegen/types/src/plugins/provider.d.ts
deleted file mode 100644
index 94bd36f5..00000000
--- a/packages/ts-codegen/types/src/plugins/provider.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
-import { BuilderFileType, TSBuilderOptions } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
-export declare const GetLocalNameByContractName: (name: any) => string;
-export declare const GetLocalBaseNameByContractName: (name: any) => string;
-export declare class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderOptions> {
-    constructor(opt: TSBuilderOptions);
-    initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/react-query.d.ts b/packages/ts-codegen/types/src/plugins/react-query.d.ts
deleted file mode 100644
index ff34e39a..00000000
--- a/packages/ts-codegen/types/src/plugins/react-query.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ContractInfo, RenderOptions, RenderContextBase, RenderContext } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-export declare class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/recoil.d.ts b/packages/ts-codegen/types/src/plugins/recoil.d.ts
deleted file mode 100644
index 16c70a39..00000000
--- a/packages/ts-codegen/types/src/plugins/recoil.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ContractInfo, RenderContext, RenderContextBase, UtilMapping, RenderOptions } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-export declare class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
-    utils: UtilMapping;
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/types.d.ts b/packages/ts-codegen/types/src/plugins/types.d.ts
deleted file mode 100644
index b45d780c..00000000
--- a/packages/ts-codegen/types/src/plugins/types.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ContractInfo, RenderContext, RenderContextBase, RenderOptions } from 'wasm-ast-types';
-import { BuilderFileType } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-export declare class TypesPlugin extends BuilderPluginBase<RenderOptions> {
-    initContext(contract: ContractInfo, options?: RenderOptions): RenderContextBase<RenderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/plugins/use-contracts.d.ts b/packages/ts-codegen/types/src/plugins/use-contracts.d.ts
deleted file mode 100644
index 4b0fce32..00000000
--- a/packages/ts-codegen/types/src/plugins/use-contracts.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ContractInfo, RenderContextBase, RenderContext } from 'wasm-ast-types';
-import { BuilderFileType, TSBuilderOptions } from '../builder';
-import { BuilderPluginBase } from './plugin-base';
-export declare class ContractsContextPlugin extends BuilderPluginBase<TSBuilderOptions> {
-    initContext(contract: ContractInfo, options?: TSBuilderOptions): RenderContextBase<TSBuilderOptions>;
-    doRender(name: string, context: RenderContext): Promise<{
-        type: BuilderFileType;
-        pluginType?: string;
-        localname: string;
-        body: any[];
-    }[]>;
-}
diff --git a/packages/ts-codegen/types/src/ts-codegen.d.ts b/packages/ts-codegen/types/src/ts-codegen.d.ts
deleted file mode 100644
index b7988016..00000000
--- a/packages/ts-codegen/types/src/ts-codegen.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};
diff --git a/packages/ts-codegen/types/src/types.d.ts b/packages/ts-codegen/types/src/types.d.ts
deleted file mode 100644
index e390180c..00000000
--- a/packages/ts-codegen/types/src/types.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { JSONSchema } from "wasm-ast-types";
-interface KeyedSchema {
-    [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;
-}
-export {};
diff --git a/packages/ts-codegen/types/src/utils/clean.d.ts b/packages/ts-codegen/types/src/utils/clean.d.ts
deleted file mode 100644
index 2e476b2d..00000000
--- a/packages/ts-codegen/types/src/utils/clean.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const clean: (obj: any) => any;
diff --git a/packages/ts-codegen/types/src/utils/cleanse.d.ts b/packages/ts-codegen/types/src/utils/cleanse.d.ts
deleted file mode 100644
index 55da38ab..00000000
--- a/packages/ts-codegen/types/src/utils/cleanse.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const cleanse: (obj: any) => any;
diff --git a/packages/ts-codegen/types/src/utils/files.d.ts b/packages/ts-codegen/types/src/utils/files.d.ts
deleted file mode 100644
index 313b5cc1..00000000
--- a/packages/ts-codegen/types/src/utils/files.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as t from "@babel/types";
-export declare const writeAstToFile: (outPath: string, program: t.Statement[], filename: string, removeUnusedImports?: boolean, isTsDisable?: boolean, isEslintDisable?: boolean) => void;
-export declare const writeContentToFile: (outPath: string, content: string, filename: string, isTsDisable?: boolean, isEslintDisable?: boolean) => void;
diff --git a/packages/ts-codegen/types/src/utils/header.d.ts b/packages/ts-codegen/types/src/utils/header.d.ts
deleted file mode 100644
index 0782b410..00000000
--- a/packages/ts-codegen/types/src/utils/header.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const header: string;
diff --git a/packages/ts-codegen/types/src/utils/index.d.ts b/packages/ts-codegen/types/src/utils/index.d.ts
deleted file mode 100644
index e84d06c3..00000000
--- a/packages/ts-codegen/types/src/utils/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './schemas';
diff --git a/packages/ts-codegen/types/src/utils/parse.d.ts b/packages/ts-codegen/types/src/utils/parse.d.ts
deleted file mode 100644
index 41803c26..00000000
--- a/packages/ts-codegen/types/src/utils/parse.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const parser: (codes: any) => {};
diff --git a/packages/ts-codegen/types/src/utils/prompt.d.ts b/packages/ts-codegen/types/src/utils/prompt.d.ts
deleted file mode 100644
index c76480c9..00000000
--- a/packages/ts-codegen/types/src/utils/prompt.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function getFuzzySearch(list: any): (answers: any, input: any) => Promise<any>;
-export function getFuzzySearchNames(nameValueItemList: any): (answers: any, input: any) => Promise<any>;
-export function prompt(questions?: any[], argv?: {}): Promise<any>;
diff --git a/packages/ts-codegen/types/src/utils/schemas.d.ts b/packages/ts-codegen/types/src/utils/schemas.d.ts
deleted file mode 100644
index 8e19d7a1..00000000
--- a/packages/ts-codegen/types/src/utils/schemas.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ContractInfo } from 'wasm-ast-types';
-interface ReadSchemaOpts {
-    schemaDir: string;
-    clean?: boolean;
-}
-export declare const readSchemas: ({ schemaDir, clean }: ReadSchemaOpts) => Promise<ContractInfo>;
-export declare const findQueryMsg: (schemas: any) => any;
-export declare const findExecuteMsg: (schemas: any) => any;
-export declare const findAndParseTypes: (schemas: any) => Promise<{}>;
-export {};
diff --git a/packages/ts-codegen/types/src/utils/unused.d.ts b/packages/ts-codegen/types/src/utils/unused.d.ts
deleted file mode 100644
index 13b921b4..00000000
--- a/packages/ts-codegen/types/src/utils/unused.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export declare const unused: {
-    Program: {
-        exit: (path: any) => void;
-    };
-};
diff --git a/.eslintrc.js b/packages/types/.eslintrc.js
similarity index 92%
rename from .eslintrc.js
rename to packages/types/.eslintrc.js
index 2c15ee90..2718e8bc 100644
--- a/.eslintrc.js
+++ b/packages/types/.eslintrc.js
@@ -2,11 +2,6 @@ module.exports = {
   plugins: ['prettier'],
   extends: ['eslint:recommended', 'prettier'],
   parser: '@babel/eslint-parser',
-  settings: {
-    next: {
-      rootDir: 'packages/next/'
-    }
-  },
   parserOptions: {
     ecmaVersion: 11,
     requireConfigFile: false,
@@ -37,7 +32,7 @@ module.exports = {
       0,
       {
         ignoreSiblings: true,
-        argsIgnorePattern: 'res|next|^_'
+        argsIgnorePattern: 'React|res|next|^_'
       }
     ],
     'prefer-const': [
diff --git a/packages/types/LICENSE-Apache b/packages/types/LICENSE-Apache
new file mode 100644
index 00000000..aee5c634
--- /dev/null
+++ b/packages/types/LICENSE-Apache
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/packages/types/LICENSE-MIT b/packages/types/LICENSE-MIT
new file mode 100644
index 00000000..67cd0859
--- /dev/null
+++ b/packages/types/LICENSE-MIT
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/packages/types/README.md b/packages/types/README.md
new file mode 100644
index 00000000..1f1bafac
--- /dev/null
+++ b/packages/types/README.md
@@ -0,0 +1,153 @@
+# wasm-ast-types
+
+## working with ASTs
+
+### 1 edit the fixture
+
+edit `./scripts/fixture.ts`, for example:
+
+```js
+// ./scripts/fixture.ts
+export interface InstantiateMsg {
+    admin?: string | null;
+    members: Member[];
+}
+```
+
+### 2 run AST generator
+
+```
+yarn test:ast
+```
+
+### 3 look at the JSON produced
+
+```
+code ./scripts/test-output.json
+```
+
+We use the npm module `ast-stringify` to strip out unneccesary props, and generate a JSON for reference.
+
+You will see a `File` and `Program`... only concern yourself with the `body[]`:
+
+```json
+{
+  "type": "File",
+  "errors": [],
+  "program": {
+    "type": "Program",
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "exportKind": "type",
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "TSInterfaceDeclaration",
+          "id": {
+            "type": "Identifier",
+            "name": "InstantiateMsg"
+          },
+          "body": {
+            "type": "TSInterfaceBody",
+            "body": [
+              {
+                "type": "TSPropertySignature",
+                "key": {
+                  "type": "Identifier",
+                  "name": "admin"
+                },
+                "computed": false,
+                "optional": true,
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSUnionType",
+                    "types": [
+                      {
+                        "type": "TSStringKeyword"
+                      },
+                      {
+                        "type": "TSNullKeyword"
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "TSPropertySignature",
+                "key": {
+                  "type": "Identifier",
+                  "name": "members"
+                },
+                "computed": false,
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSArrayType",
+                    "elementType": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "Member"
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": []
+}
+```
+
+### 4 code with `@babel/types` using the JSON as a reference
+
+NOTE: 4 continued ideally you should be writing a test with your generator!
+
+```js
+import * as t from '@babel/types';
+
+export const createNewGenerator = () => {
+    return t.exportNamedDeclaration(
+        t.tsInterfaceDeclaration(
+            t.identifier('InstantiateMsg'),
+            null,
+            [],
+            t.tsInterfaceBody([
+                // ... more code ...
+            ])
+        )
+    );
+};
+```
+
+## Related
+
+Checkout these related projects:
+
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
+* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
+* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
+* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+
+## Credits
+
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
+
+
+## Disclaimer
+
+AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
+
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
diff --git a/packages/types/jest.config.js b/packages/types/jest.config.js
new file mode 100644
index 00000000..0aa3aaa4
--- /dev/null
+++ b/packages/types/jest.config.js
@@ -0,0 +1,18 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    preset: "ts-jest",
+    testEnvironment: "node",
+    transform: {
+        "^.+\\.tsx?$": [
+            "ts-jest",
+            {
+                babelConfig: false,
+                tsconfig: "tsconfig.json",
+            },
+        ],
+    },
+    transformIgnorePatterns: [`/node_modules/*`],
+    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+    moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+    modulePathIgnorePatterns: ["dist/*"]
+};
diff --git a/packages/types/package.json b/packages/types/package.json
new file mode 100644
index 00000000..ff339a8b
--- /dev/null
+++ b/packages/types/package.json
@@ -0,0 +1,74 @@
+{
+  "name": "@cosmology/ts-codegen-types",
+  "version": "0.26.4",
+  "description": "CosmWasm TSCodegen Types",
+  "author": "Dan Lynch <pyramation@gmail.com>",
+  "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",
+  "license": "SEE LICENSE IN LICENSE",
+  "main": "index.js",
+  "module": "esm/index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public",
+    "directory": "dist"
+  },
+  "scripts": {
+    "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
+    "clean": "del dist/**",
+    "prepare": "npm run build",
+    "codegen": "ts-node ./scripts/build.ts",
+    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:ast": "cross-env NODE_ENV=development babel-node scripts/test-ast.js",
+    "dev": "ts-node src/ts-codegen",
+    "file": "ts-node src/file"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cosmwasm/ts-codegen"
+  },
+  "keywords": [],
+  "bugs": {
+    "url": "https://github.com/cosmwasm/ts-codegen/issues"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.18.10",
+    "@babel/core": "7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/generator": "7.18.12",
+    "@babel/node": "^7.18.10",
+    "@babel/parser": "^7.18.11",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-export-default-from": "7.18.10",
+    "@babel/plugin-proposal-object-rest-spread": "7.18.9",
+    "@babel/plugin-transform-runtime": "7.18.10",
+    "@babel/preset-env": "7.18.10",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/traverse": "7.18.11",
+    "@types/jest": "^28.1.6",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-jest": "^28.1.3",
+    "babel-watch": "^7.0.0",
+    "cross-env": "^7.0.2",
+    "eslint": "8.21.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "glob": "8.0.3",
+    "jest": "28.1.3",
+    "jest-in-case": "^1.0.2",
+    "mkdirp": "1.0.4",
+    "prettier": "^2.7.1",
+    "regenerator-runtime": "^0.13.7",
+    "ts-jest": "^28.0.7",
+    "typescript": "^4.7.4"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.18.9",
+    "@babel/types": "7.18.10",
+    "@jest/transform": "28.1.3",
+    "ast-stringify": "0.1.0",
+    "case": "1.6.3",
+    "deepmerge": "4.2.2"
+  }
+}
diff --git a/packages/types/src/idl.ts b/packages/types/src/idl.ts
new file mode 100644
index 00000000..b619650f
--- /dev/null
+++ b/packages/types/src/idl.ts
@@ -0,0 +1,16 @@
+import { JSONSchema } from "./types";
+
+export interface KeyedSchema {
+  [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;
+}
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
new file mode 100644
index 00000000..3e6fc52b
--- /dev/null
+++ b/packages/types/src/index.ts
@@ -0,0 +1,2 @@
+export * from './idl';
+export * from './types';
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
new file mode 100644
index 00000000..6421b3d7
--- /dev/null
+++ b/packages/types/src/types.ts
@@ -0,0 +1,55 @@
+export declare type fieldType = 'Long' | 'Coin' | 'Duration' | 'Height' | string;
+export interface Field {
+  name: string;
+  type: fieldType;
+  node: any;
+};
+export interface Interface {
+  name: string;
+  fields: Field[]
+};
+
+export interface QueryMsg {
+  $schema: string;
+  title: "QueryMsg";
+  oneOf?: any;
+  allOf?: any;
+  anyOf?: any;
+}
+
+export interface ExecuteMsg {
+  $schema: string;
+  title: "ExecuteMsg" | "ExecuteMsg_for_Empty";
+  oneOf?: any;
+  allOf?: any;
+  anyOf?: any;
+}
+
+export interface JSONSchema {
+  $ref?: string;
+  $schema?: string;
+  additionalProperties?: boolean;
+  allOf?: JSONSchema[];
+  anyOf?: JSONSchema[];
+  definitions?: Record<string, JSONSchema>;
+  description?: string;
+  oneOf?: JSONSchema[];
+  properties?: Record<string, JSONSchema>;
+  patternProperties?: Record<string, JSONSchema>;
+  items?: JSONSchema | JSONSchema[];
+  additionalItems?: JSONSchema;
+  required?: string[];
+  title?: string;
+  type?: string;
+}
+
+
+// this is actually what items ends up being most of the time:
+export type JSONSchemaType =
+  | { type: 'integer'; format?: 'int32' | 'int64' }
+  | { type: 'number'; format?: 'float' | 'double' }
+  | { type: 'string'; format?: 'date-time' | 'email' | 'hostname' | 'ipv4' | 'ipv6' | 'uri' }
+  | { type: 'boolean' }
+  | { type: 'object'; properties?: { [key: string]: JSONSchemaType }; required?: string[] }
+  | { type: 'array'; items?: JSONSchemaType | JSONSchemaType[]; maxItems?: number; minItems?: number }
+  | JSONSchemaType[]; // For tuple definitions
diff --git a/packages/types/tsconfig.esm.json b/packages/types/tsconfig.esm.json
new file mode 100644
index 00000000..800d7506
--- /dev/null
+++ b/packages/types/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/esm",
+    "module": "es2022",
+    "rootDir": "src/",
+    "declaration": false
+  }
+}
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
new file mode 100644
index 00000000..1a9d5696
--- /dev/null
+++ b/packages/types/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src/"
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["dist", "node_modules", "**/*.spec.*", "**/*.test.*"]
+}
diff --git a/packages/wasm-ast-types/.babelrc.js b/packages/wasm-ast-types/.babelrc.js
deleted file mode 100644
index 57dd0148..00000000
--- a/packages/wasm-ast-types/.babelrc.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const useESModules = !!process.env.MODULE;
-
-module.exports = (api) => {
-  api.cache(() => process.env.MODULE);
-  return {
-    plugins: [
-      ['@babel/transform-runtime', { useESModules }],
-      '@babel/proposal-object-rest-spread',
-      '@babel/proposal-class-properties',
-      '@babel/proposal-export-default-from'
-    ],
-    presets: useESModules ? ['@babel/typescript'] : ['@babel/typescript', '@babel/env']
-  };
-};
diff --git a/packages/wasm-ast-types/.editorconfig b/packages/wasm-ast-types/.editorconfig
deleted file mode 100644
index 4a7ea303..00000000
--- a/packages/wasm-ast-types/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/packages/wasm-ast-types/.eslintignore b/packages/wasm-ast-types/.eslintignore
deleted file mode 100644
index 38ba4849..00000000
--- a/packages/wasm-ast-types/.eslintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules/
-dist/
-main/
-module/
-coverage/
\ No newline at end of file
diff --git a/packages/wasm-ast-types/.gitignore b/packages/wasm-ast-types/.gitignore
deleted file mode 100644
index d93985ec..00000000
--- a/packages/wasm-ast-types/.gitignore
+++ /dev/null
@@ -1,48 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# dist
-main
-module
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-
-# Editors
-.idea
-
-# Lib
-lib
-
-# npm package lock
-package-lock.json
-yarn.lock
-
-# others
-.DS_Store
\ No newline at end of file
diff --git a/packages/wasm-ast-types/.npmignore b/packages/wasm-ast-types/.npmignore
deleted file mode 100644
index 235c0803..00000000
--- a/packages/wasm-ast-types/.npmignore
+++ /dev/null
@@ -1,43 +0,0 @@
-*.log
-npm-debug.log*
-
-protobuf
-out
-*.proto
-
-# snapshots
-*.snap
-
-# Coverage directory used by tools like istanbul
-coverage
-.nyc_output
-
-# Dependency directories
-node_modules
-
-# npm package lock
-package-lock.json
-yarn.lock
-
-# project files
-__snapshots__
-__fixtures__
-__tests__
-.babelrc
-.babelrc.js
-.editorconfig
-.eslintignore
-.eslintrc
-.eslintrc.js
-.gitignore
-.travis.yml
-.vscode
-CHANGELOG.md
-examples
-jest.config.js
-package.json
-test
-*.test.ts
-*.test.js
-*.spec.ts
-*.spec.js
diff --git a/packages/wasm-ast-types/.npmrc b/packages/wasm-ast-types/.npmrc
deleted file mode 100644
index a21347f1..00000000
--- a/packages/wasm-ast-types/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-scripts-prepend-node-path=true
\ No newline at end of file
diff --git a/packages/wasm-ast-types/.vscode/settings.json b/packages/wasm-ast-types/.vscode/settings.json
deleted file mode 100644
index a304b6bd..00000000
--- a/packages/wasm-ast-types/.vscode/settings.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "editor.formatOnSave": true,
-    "[javascriptreact]": {
-        "editor.formatOnSave": false
-    },
-    "[javascript]": {
-        "editor.formatOnSave": false
-    },
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-    },
-    "eslint.validate": [
-        "javascript",
-        "javascriptreact"
-    ],
-    "editor.insertSpaces": true,
-    "editor.tabSize": 2
-}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/wasm-ast-types/CHANGELOG.md
index 6b038db6..4b7756a4 100644
--- a/packages/wasm-ast-types/CHANGELOG.md
+++ b/packages/wasm-ast-types/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.26.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.3...wasm-ast-types@0.26.4) (2024-01-19)
+## [0.26.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.3...wasm-ast-types@0.26.4) (2024-01-19)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -11,7 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.26.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.2...wasm-ast-types@0.26.3) (2024-01-19)
+## [0.26.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.2...wasm-ast-types@0.26.3) (2024-01-19)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -19,7 +19,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.26.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.1...wasm-ast-types@0.26.2) (2023-08-11)
+## [0.26.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.1...wasm-ast-types@0.26.2) (2023-08-11)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -27,7 +27,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.26.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.26.0...wasm-ast-types@0.26.1) (2023-08-09)
+## [0.26.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.0...wasm-ast-types@0.26.1) (2023-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -35,7 +35,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.26.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.25.0...wasm-ast-types@0.26.0) (2023-08-09)
+# [0.26.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.25.0...wasm-ast-types@0.26.0) (2023-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -43,7 +43,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.25.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.24.0...wasm-ast-types@0.25.0) (2023-07-28)
+# [0.25.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.24.0...wasm-ast-types@0.25.0) (2023-07-28)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -51,7 +51,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.24.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.23.1...wasm-ast-types@0.24.0) (2023-07-14)
+# [0.24.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.23.1...wasm-ast-types@0.24.0) (2023-07-14)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -59,7 +59,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.23.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.23.0...wasm-ast-types@0.23.1) (2023-06-07)
+## [0.23.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.23.0...wasm-ast-types@0.23.1) (2023-06-07)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -67,7 +67,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.23.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.22.0...wasm-ast-types@0.23.0) (2023-05-24)
+# [0.23.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.22.0...wasm-ast-types@0.23.0) (2023-05-24)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -75,7 +75,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.22.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.21.0...wasm-ast-types@0.22.0) (2023-05-24)
+# [0.22.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.21.0...wasm-ast-types@0.22.0) (2023-05-24)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -83,7 +83,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.21.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.20.0...wasm-ast-types@0.21.0) (2023-05-17)
+# [0.21.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.20.0...wasm-ast-types@0.21.0) (2023-05-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -91,7 +91,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.20.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.19.0...wasm-ast-types@0.20.0) (2023-04-17)
+# [0.20.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.19.0...wasm-ast-types@0.20.0) (2023-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -99,7 +99,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.19.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.2...wasm-ast-types@0.19.0) (2023-04-10)
+# [0.19.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.18.2...wasm-ast-types@0.19.0) (2023-04-10)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -107,7 +107,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.18.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.1...wasm-ast-types@0.18.2) (2023-03-02)
+## [0.18.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.18.1...wasm-ast-types@0.18.2) (2023-03-02)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -115,7 +115,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.18.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.18.0...wasm-ast-types@0.18.1) (2023-03-02)
+## [0.18.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.18.0...wasm-ast-types@0.18.1) (2023-03-02)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -123,7 +123,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.18.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.17.0...wasm-ast-types@0.18.0) (2023-02-26)
+# [0.18.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.17.0...wasm-ast-types@0.18.0) (2023-02-26)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -131,7 +131,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.17.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.16.0...wasm-ast-types@0.17.0) (2022-12-02)
+# [0.17.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.16.0...wasm-ast-types@0.17.0) (2022-12-02)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -139,7 +139,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.16.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.15.0...wasm-ast-types@0.16.0) (2022-11-25)
+# [0.16.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.15.0...wasm-ast-types@0.16.0) (2022-11-25)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -147,7 +147,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.15.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.14.0...wasm-ast-types@0.15.0) (2022-11-09)
+# [0.15.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.14.0...wasm-ast-types@0.15.0) (2022-11-09)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -155,7 +155,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.14.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.13.0...wasm-ast-types@0.14.0) (2022-10-26)
+# [0.14.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.13.0...wasm-ast-types@0.14.0) (2022-10-26)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -163,7 +163,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.13.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.12.0...wasm-ast-types@0.13.0) (2022-10-11)
+# [0.13.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.12.0...wasm-ast-types@0.13.0) (2022-10-11)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -171,7 +171,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.12.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.3...wasm-ast-types@0.12.0) (2022-10-11)
+# [0.12.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.3...wasm-ast-types@0.12.0) (2022-10-11)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -179,7 +179,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.11.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.2...wasm-ast-types@0.11.3) (2022-09-14)
+## [0.11.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.2...wasm-ast-types@0.11.3) (2022-09-14)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -187,7 +187,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.11.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.1...wasm-ast-types@0.11.2) (2022-09-14)
+## [0.11.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.1...wasm-ast-types@0.11.2) (2022-09-14)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -195,7 +195,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.11.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.11.0...wasm-ast-types@0.11.1) (2022-09-13)
+## [0.11.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.0...wasm-ast-types@0.11.1) (2022-09-13)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -203,7 +203,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.11.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.10.0...wasm-ast-types@0.11.0) (2022-09-13)
+# [0.11.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.10.0...wasm-ast-types@0.11.0) (2022-09-13)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -211,7 +211,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.10.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.9.0...wasm-ast-types@0.10.0) (2022-09-13)
+# [0.10.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.9.0...wasm-ast-types@0.10.0) (2022-09-13)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -219,7 +219,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.9.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.2...wasm-ast-types@0.9.0) (2022-08-23)
+# [0.9.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.8.2...wasm-ast-types@0.9.0) (2022-08-23)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -227,7 +227,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.8.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.1...wasm-ast-types@0.8.2) (2022-08-22)
+## [0.8.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.8.1...wasm-ast-types@0.8.2) (2022-08-22)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -235,7 +235,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.8.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.8.0...wasm-ast-types@0.8.1) (2022-08-13)
+## [0.8.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.8.0...wasm-ast-types@0.8.1) (2022-08-13)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -243,7 +243,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.8.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.7.2...wasm-ast-types@0.8.0) (2022-08-09)
+# [0.8.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.7.2...wasm-ast-types@0.8.0) (2022-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -251,7 +251,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.7.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.7.1...wasm-ast-types@0.7.2) (2022-08-09)
+## [0.7.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.7.1...wasm-ast-types@0.7.2) (2022-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -259,7 +259,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.7.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.7.0...wasm-ast-types@0.7.1) (2022-08-09)
+## [0.7.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.7.0...wasm-ast-types@0.7.1) (2022-08-09)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -267,7 +267,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.7.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.6.2...wasm-ast-types@0.7.0) (2022-08-08)
+# [0.7.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.6.2...wasm-ast-types@0.7.0) (2022-08-08)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -275,7 +275,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.6.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.6.1...wasm-ast-types@0.6.2) (2022-08-08)
+## [0.6.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.6.1...wasm-ast-types@0.6.2) (2022-08-08)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -283,7 +283,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.6.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.6.0...wasm-ast-types@0.6.1) (2022-08-07)
+## [0.6.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.6.0...wasm-ast-types@0.6.1) (2022-08-07)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -291,7 +291,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.6.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.5.1...wasm-ast-types@0.6.0) (2022-08-07)
+# [0.6.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.5.1...wasm-ast-types@0.6.0) (2022-08-07)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -299,7 +299,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.5.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.5.0...wasm-ast-types@0.5.1) (2022-08-06)
+## [0.5.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.5.0...wasm-ast-types@0.5.1) (2022-08-06)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -307,7 +307,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.5.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.4.3...wasm-ast-types@0.5.0) (2022-08-05)
+# [0.5.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.3...wasm-ast-types@0.5.0) (2022-08-05)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -315,7 +315,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.4.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.4.2...wasm-ast-types@0.4.3) (2022-08-04)
+## [0.4.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.2...wasm-ast-types@0.4.3) (2022-08-04)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -323,7 +323,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.4.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.4.1...wasm-ast-types@0.4.2) (2022-08-04)
+## [0.4.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.1...wasm-ast-types@0.4.2) (2022-08-04)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -331,7 +331,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.4.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.4.0...wasm-ast-types@0.4.1) (2022-08-01)
+## [0.4.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.0...wasm-ast-types@0.4.1) (2022-08-01)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -339,7 +339,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.4.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.7...wasm-ast-types@0.4.0) (2022-08-01)
+# [0.4.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.7...wasm-ast-types@0.4.0) (2022-08-01)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -347,7 +347,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.7](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.6...wasm-ast-types@0.3.7) (2022-07-15)
+## [0.3.7](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.6...wasm-ast-types@0.3.7) (2022-07-15)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -355,7 +355,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.5...wasm-ast-types@0.3.6) (2022-07-15)
+## [0.3.6](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.5...wasm-ast-types@0.3.6) (2022-07-15)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -363,7 +363,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.4...wasm-ast-types@0.3.5) (2022-06-25)
+## [0.3.5](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.4...wasm-ast-types@0.3.5) (2022-06-25)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -371,7 +371,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.3...wasm-ast-types@0.3.4) (2022-06-22)
+## [0.3.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.3...wasm-ast-types@0.3.4) (2022-06-22)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -379,7 +379,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.2...wasm-ast-types@0.3.3) (2022-06-17)
+## [0.3.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.2...wasm-ast-types@0.3.3) (2022-06-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -387,7 +387,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.1...wasm-ast-types@0.3.2) (2022-06-17)
+## [0.3.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.1...wasm-ast-types@0.3.2) (2022-06-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -395,7 +395,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.3.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.3.0...wasm-ast-types@0.3.1) (2022-06-17)
+## [0.3.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.0...wasm-ast-types@0.3.1) (2022-06-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -403,7 +403,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.3.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.6...wasm-ast-types@0.3.0) (2022-06-16)
+# [0.3.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.6...wasm-ast-types@0.3.0) (2022-06-16)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -411,7 +411,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.5...wasm-ast-types@0.2.6) (2022-06-14)
+## [0.2.6](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.5...wasm-ast-types@0.2.6) (2022-06-14)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -419,7 +419,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.4...wasm-ast-types@0.2.5) (2022-05-25)
+## [0.2.5](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.4...wasm-ast-types@0.2.5) (2022-05-25)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -427,7 +427,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.3...wasm-ast-types@0.2.4) (2022-05-04)
+## [0.2.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.3...wasm-ast-types@0.2.4) (2022-05-04)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -435,7 +435,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.2...wasm-ast-types@0.2.3) (2022-05-04)
+## [0.2.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.2...wasm-ast-types@0.2.3) (2022-05-04)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -443,7 +443,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.1...wasm-ast-types@0.2.2) (2022-04-30)
+## [0.2.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.1...wasm-ast-types@0.2.2) (2022-04-30)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -451,7 +451,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.2.0...wasm-ast-types@0.2.1) (2022-04-30)
+## [0.2.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.0...wasm-ast-types@0.2.1) (2022-04-30)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -459,7 +459,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.2.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.1.4...wasm-ast-types@0.2.0) (2022-04-25)
+# [0.2.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.4...wasm-ast-types@0.2.0) (2022-04-25)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -467,7 +467,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.1.3...wasm-ast-types@0.1.4) (2022-04-20)
+## [0.1.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.3...wasm-ast-types@0.1.4) (2022-04-20)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -475,7 +475,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.3](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.1.2...wasm-ast-types@0.1.3) (2022-04-19)
+## [0.1.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.2...wasm-ast-types@0.1.3) (2022-04-19)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -483,7 +483,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.2](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.1.1...wasm-ast-types@0.1.2) (2022-04-19)
+## [0.1.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.1...wasm-ast-types@0.1.2) (2022-04-19)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -491,7 +491,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.1.1](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.1.0...wasm-ast-types@0.1.1) (2022-04-19)
+## [0.1.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.0...wasm-ast-types@0.1.1) (2022-04-19)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -499,7 +499,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [0.1.0](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.12...wasm-ast-types@0.1.0) (2022-04-17)
+# [0.1.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.12...wasm-ast-types@0.1.0) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -507,7 +507,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.12](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.11...wasm-ast-types@0.0.12) (2022-04-17)
+## [0.0.12](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.11...wasm-ast-types@0.0.12) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -515,7 +515,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.11](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.10...wasm-ast-types@0.0.11) (2022-04-17)
+## [0.0.11](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.10...wasm-ast-types@0.0.11) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -523,7 +523,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.10](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.9...wasm-ast-types@0.0.10) (2022-04-17)
+## [0.0.10](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.9...wasm-ast-types@0.0.10) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -531,7 +531,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.9](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.8...wasm-ast-types@0.0.9) (2022-04-17)
+## [0.0.9](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.8...wasm-ast-types@0.0.9) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -539,7 +539,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.8](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.7...wasm-ast-types@0.0.8) (2022-04-17)
+## [0.0.8](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.7...wasm-ast-types@0.0.8) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -547,7 +547,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.7](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.6...wasm-ast-types@0.0.7) (2022-04-17)
+## [0.0.7](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.6...wasm-ast-types@0.0.7) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -555,7 +555,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.6](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.5...wasm-ast-types@0.0.6) (2022-04-17)
+## [0.0.6](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.5...wasm-ast-types@0.0.6) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -563,7 +563,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.5](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.4...wasm-ast-types@0.0.5) (2022-04-17)
+## [0.0.5](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.4...wasm-ast-types@0.0.5) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
@@ -571,7 +571,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.0.4](https://github.com/pyramation/cosmwasm-typescript-gen/compare/wasm-ast-types@0.0.3...wasm-ast-types@0.0.4) (2022-04-17)
+## [0.0.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.3...wasm-ast-types@0.0.4) (2022-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
 
diff --git a/packages/wasm-ast-types/LICENSE-Apache b/packages/wasm-ast-types/LICENSE-Apache
index 9acc9b1b..aee5c634 100644
--- a/packages/wasm-ast-types/LICENSE-Apache
+++ b/packages/wasm-ast-types/LICENSE-Apache
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright (c) 2024 Web, Inc. <developers@cosmology.zone>
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/packages/wasm-ast-types/LICENSE-MIT b/packages/wasm-ast-types/LICENSE-MIT
index e6388ba7..67cd0859 100644
--- a/packages/wasm-ast-types/LICENSE-MIT
+++ b/packages/wasm-ast-types/LICENSE-MIT
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Dan Lynch <pyramation@gmail.com>
+Copyright (c) 2024 Interweb, Inc. <developers@cosmology.zone>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/wasm-ast-types/README.md b/packages/wasm-ast-types/README.md
index 1f1bafac..a7b6404b 100644
--- a/packages/wasm-ast-types/README.md
+++ b/packages/wasm-ast-types/README.md
@@ -1,4 +1,4 @@
-# wasm-ast-types
+# ast
 
 ## working with ASTs
 
diff --git a/packages/wasm-ast-types/src/utils/__snapshots__/babel.spec.ts.snap b/packages/wasm-ast-types/__tests__/babel/__snapshots__/babel.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/utils/__snapshots__/babel.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/babel/__snapshots__/babel.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/babel/babel.test.ts b/packages/wasm-ast-types/__tests__/babel/babel.test.ts
new file mode 100644
index 00000000..439d98af
--- /dev/null
+++ b/packages/wasm-ast-types/__tests__/babel/babel.test.ts
@@ -0,0 +1,483 @@
+import * as t from '@babel/types';
+
+import { importStmt } from '../../src/utils/babel';
+import {
+    arrowFunctionExpression,
+    bindMethod,
+    classDeclaration,
+    classProperty,
+    promiseTypeAnnotation,
+    typedIdentifier
+} from '../../src/utils/babel';
+import { expectCode } from '../../test-utils';
+
+it('top import', async () => {
+    expectCode(
+        importStmt(
+            ['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'],
+            '@cosmjs/cosmwasm-stargate'
+        )
+    );
+});
+
+it('interfaces', async () => {
+    expectCode(
+        t.program([
+            t.exportNamedDeclaration(
+                t.tsInterfaceDeclaration(
+                    t.identifier('SG721ReadOnlyInstance'),
+                    null,
+                    [],
+                    t.tSInterfaceBody([
+                        t.tSPropertySignature(
+                            t.identifier('contractAddress'),
+                            t.tsTypeAnnotation(t.tsStringKeyword())
+                        ),
+                        // methods
+
+                        t.tSPropertySignature(
+                            t.identifier('tokens'),
+                            t.tsTypeAnnotation(
+                                t.tsFunctionType(
+                                    null,
+                                    [
+                                        typedIdentifier(
+                                            'owner',
+                                            t.tsTypeAnnotation(t.tsStringKeyword())
+                                        ),
+                                        typedIdentifier(
+                                            'startAfter',
+                                            t.tsTypeAnnotation(t.tsStringKeyword()),
+                                            true
+                                        ),
+                                        typedIdentifier(
+                                            'limit',
+                                            t.tsTypeAnnotation(t.tsStringKeyword()),
+                                            true
+                                        )
+                                    ],
+                                    promiseTypeAnnotation('TokensResponse')
+                                )
+                            )
+                        )
+                    ])
+                )
+            ),
+
+            // extends
+
+            t.exportNamedDeclaration(
+                t.tsInterfaceDeclaration(
+                    t.identifier('SG721Instance'),
+                    null,
+                    [
+                        t.tSExpressionWithTypeArguments(
+                            t.identifier('SG721ReadOnlyInstance')
+                        )
+                    ],
+                    t.tSInterfaceBody([
+                        // contract address
+
+                        t.tSPropertySignature(
+                            t.identifier('contractAddress'),
+                            t.tsTypeAnnotation(t.tsStringKeyword())
+                        ),
+
+                        // METHOD
+                        t.tSPropertySignature(
+                            t.identifier('mint'),
+                            t.tsTypeAnnotation(
+                                t.tsFunctionType(
+                                    null,
+                                    [
+                                        typedIdentifier(
+                                            'sender',
+                                            t.tsTypeAnnotation(t.tsStringKeyword())
+                                        ),
+                                        typedIdentifier(
+                                            'anotherProp',
+                                            t.tsTypeAnnotation(t.tsStringKeyword())
+                                        ),
+                                        typedIdentifier(
+                                            'prop3',
+                                            t.tsTypeAnnotation(t.tsStringKeyword())
+                                        )
+                                    ],
+                                    promiseTypeAnnotation('ExecuteResult')
+                                )
+                            )
+                        )
+                    ])
+                )
+            )
+        ])
+    );
+});
+
+it('readonly classes', async () => {
+    expectCode(
+        t.program([
+            t.exportNamedDeclaration(
+                classDeclaration(
+                    'SG721QueryClient',
+                    [
+                        // client
+                        classProperty(
+                            'client',
+                            t.tsTypeAnnotation(
+                                t.tsTypeReference(t.identifier('CosmWasmClient'))
+                            )
+                        ),
+
+                        // contractAddress
+                        classProperty(
+                            'contractAddress',
+                            t.tsTypeAnnotation(t.tsStringKeyword())
+                        ),
+
+                        // constructor
+                        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
+                                bindMethod('approval'),
+                                bindMethod('otherProp'),
+                                bindMethod('hello'),
+                                bindMethod('mintme')
+                            ])
+                        ),
+
+                        // methods:
+                        t.classProperty(
+                            t.identifier('approval'),
+                            arrowFunctionExpression(
+                                [
+                                    // props
+                                    typedIdentifier(
+                                        'owner',
+                                        t.tsTypeAnnotation(t.tsStringKeyword())
+                                    ),
+                                    //
+                                    typedIdentifier(
+                                        'spender',
+                                        t.tsTypeAnnotation(t.tsStringKeyword())
+                                    )
+                                ],
+                                t.blockStatement([
+                                    t.returnStatement(
+                                        t.callExpression(
+                                            t.memberExpression(
+                                                t.memberExpression(
+                                                    t.thisExpression(),
+                                                    t.identifier('client')
+                                                ),
+                                                t.identifier('queryContractSmart')
+                                            ),
+                                            [
+                                                t.memberExpression(
+                                                    t.thisExpression(),
+                                                    t.identifier('contractAddress')
+                                                ),
+                                                t.objectExpression([
+                                                    // props
+                                                    t.objectProperty(
+                                                        t.identifier('owner'),
+                                                        t.identifier('owner'),
+                                                        false,
+                                                        true
+                                                    ),
+
+                                                    t.objectProperty(
+                                                        t.identifier('spender'),
+                                                        t.identifier('spender'),
+                                                        false,
+                                                        true
+                                                    )
+                                                ])
+                                            ]
+                                        )
+                                    )
+                                ]),
+                                t.tsTypeAnnotation(
+                                    t.tsTypeReference(
+                                        t.identifier('Promise'),
+                                        t.tsTypeParameterInstantiation([
+                                            t.tSTypeReference(t.identifier('ApprovalResponse'))
+                                        ])
+                                    )
+                                ),
+                                true
+                            )
+                        )
+                    ],
+                    [
+                        t.tSExpressionWithTypeArguments(
+                            t.identifier('SG721ReadOnlyInstance')
+                        )
+                    ]
+                )
+            )
+        ])
+    );
+});
+
+it('mutation classes', async () => {
+    expectCode(
+        t.program([
+            t.exportNamedDeclaration(
+                classDeclaration(
+                    'SG721Client',
+                    [
+                        // client
+                        classProperty(
+                            'client',
+                            t.tsTypeAnnotation(
+                                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                            )
+                        ),
+
+                        // contractAddress
+                        classProperty(
+                            'contractAddress',
+                            t.tsTypeAnnotation(t.tsStringKeyword())
+                        ),
+
+                        // constructor
+                        t.classMethod(
+                            'constructor',
+                            t.identifier('constructor'),
+                            [
+                                typedIdentifier(
+                                    'client',
+                                    t.tsTypeAnnotation(
+                                        t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                                    )
+                                ),
+                                typedIdentifier(
+                                    'contractAddress',
+                                    t.tsTypeAnnotation(t.tsStringKeyword())
+                                )
+                            ],
+                            t.blockStatement([
+                                // super()
+                                t.expressionStatement(
+                                    t.callExpression(t.super(), [
+                                        t.identifier('client'),
+                                        t.identifier('contractAddress')
+                                    ])
+                                ),
+
+                                // 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
+                                bindMethod('approval'),
+                                bindMethod('otherProp'),
+                                bindMethod('hello'),
+                                bindMethod('mintme')
+                            ])
+                        ),
+
+                        // methods:
+                        t.classProperty(
+                            t.identifier('mint'),
+                            arrowFunctionExpression(
+                                [
+                                    // props
+                                    typedIdentifier(
+                                        'sender',
+                                        t.tsTypeAnnotation(t.tsStringKeyword())
+                                    ),
+                                    typedIdentifier(
+                                        'tokenId',
+                                        t.tsTypeAnnotation(t.tsStringKeyword())
+                                    ),
+                                    typedIdentifier(
+                                        'owner',
+                                        t.tsTypeAnnotation(t.tsStringKeyword())
+                                    ),
+                                    typedIdentifier(
+                                        'token_uri',
+                                        t.tsTypeAnnotation(t.tsStringKeyword())
+                                    )
+                                ],
+                                t.blockStatement([
+                                    t.returnStatement(
+                                        t.awaitExpression(
+                                            t.callExpression(
+                                                t.memberExpression(
+                                                    t.memberExpression(
+                                                        t.thisExpression(),
+                                                        t.identifier('client')
+                                                    ),
+                                                    t.identifier('execute')
+                                                ),
+                                                [
+                                                    t.identifier('sender'),
+                                                    t.memberExpression(
+                                                        t.thisExpression(),
+                                                        t.identifier('contractAddress')
+                                                    ),
+                                                    t.objectExpression([
+                                                        t.objectProperty(
+                                                            t.identifier('mint'),
+                                                            t.objectExpression([
+                                                                t.objectProperty(
+                                                                    t.identifier('token_id'),
+                                                                    t.identifier('tokenId')
+                                                                ),
+                                                                t.objectProperty(
+                                                                    t.identifier('owner'),
+                                                                    t.identifier('owner')
+                                                                ),
+                                                                t.objectProperty(
+                                                                    t.identifier('token_uri'),
+                                                                    t.identifier('token_uri')
+                                                                ),
+                                                                t.objectProperty(
+                                                                    t.identifier('expression'),
+                                                                    t.objectExpression([])
+                                                                )
+                                                            ])
+                                                        )
+                                                    ]),
+                                                    t.stringLiteral('auto')
+                                                ]
+                                            )
+                                        )
+                                    )
+                                ]),
+                                // return type
+                                t.tsTypeAnnotation(
+                                    t.tsTypeReference(
+                                        t.identifier('Promise'),
+                                        t.tsTypeParameterInstantiation([
+                                            t.tSTypeReference(t.identifier('ExecuteResult'))
+                                        ])
+                                    )
+                                ),
+                                true
+                            )
+                        )
+                    ],
+                    [
+                        t.tSExpressionWithTypeArguments(
+                            t.identifier('SG721ReadOnlyInstance')
+                        )
+                    ],
+                    t.identifier('SG721QueryClient')
+                )
+            )
+        ])
+    );
+});
+
+it('object parms', () => {
+    const obj = t.objectPattern([
+        t.objectProperty(
+            t.identifier('includeExpired'),
+            t.identifier('includeExpired'),
+            false,
+            true
+        ),
+        t.objectProperty(
+            t.identifier('tokenId'),
+            t.identifier('tokenId'),
+            false,
+            true
+        )
+    ]);
+    obj.typeAnnotation = t.tsTypeAnnotation(
+        t.tsTypeLiteral([
+            t.tsPropertySignature(
+                t.identifier('includeExpired'),
+                t.tsTypeAnnotation(t.tsBooleanKeyword())
+            ),
+            t.tsPropertySignature(
+                t.identifier('tokenId'),
+                t.tsTypeAnnotation(t.tsStringKeyword())
+            )
+        ])
+    );
+    expectCode(
+        t.program([
+            t.expressionStatement(
+                t.assignmentExpression(
+                    '=',
+                    t.identifier('ownerOf'),
+                    arrowFunctionExpression(
+                        [obj],
+                        t.blockStatement(
+                            [
+                                // body
+                            ],
+                            []
+                        ),
+                        t.tsTypeAnnotation(
+                            t.tsTypeReference(
+                                t.identifier('Promise'),
+                                t.tsTypeParameterInstantiation([
+                                    t.tsTypeReference(t.identifier('OwnerOfResponse'))
+                                ])
+                            )
+                        )
+                    )
+                )
+            )
+        ])
+    );
+});
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.account-nfts.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays-ref.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays-ref.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.arrays.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-named-groups.test.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.empty-enums.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.empty-enums.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-101.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-103.test.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-71.test.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issue-98.test.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.test.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.issues.test.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.sg721.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.sg721.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.vectis.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
diff --git a/packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap b/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.account-nfts.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.account-nfts.test.ts
new file mode 100644
index 00000000..656a5163
--- /dev/null
+++ b/packages/wasm-ast-types/__tests__/client/ts-client.account-nfts.test.ts
@@ -0,0 +1,38 @@
+import {
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
+} from '../../src';
+import { expectCode, makeContext } from '../../test-utils';
+import { nftIdlVersion } from '../../test-utils/fixtures';
+
+const message = nftIdlVersion.query;
+const ctx = makeContext(message);
+
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(ctx, message));
+});
+
+it('query classes', () => {
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message)
+  );
+});
+
+// it('query classes response', () => {
+//     expectCode(createTypeInterface(
+//         ctx,
+//         contract.responses.all_debt_shares
+//     ))
+// });
+
+it('execute classes array types', () => {
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, message)
+  );
+});
+
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, message));
+});
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.arrays-ref.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.arrays-ref.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.arrays-ref.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.arrays-ref.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.arrays.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.arrays.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.arrays.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.cw-named-groups.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.cw-named-groups.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.cw-named-groups.test.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.cw-named-groups.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.cw-proposal-single.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.cw-proposal-single.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.cw-proposal-single.test.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.cw-proposal-single.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.empty-enums.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.empty-enums.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.empty-enums.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.empty-enums.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-101.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.issue-101.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.issue-101.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.issue-101.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.issue-103.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.issue-103.test.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.issue-103.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-71.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.issue-71.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.issue-71.test.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.issue-71.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issue-98.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.issue-98.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.issue-98.test.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.issue-98.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.issues.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.issues.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.issues.test.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.issues.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.overrides.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.overrides.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.overrides.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.overrides.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.sg721.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.sg721.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.sg721.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.sg721.test.ts
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.vectis.test.ts b/packages/wasm-ast-types/__tests__/client/ts-client.vectis.test.ts
new file mode 100644
index 00000000..8c15859a
--- /dev/null
+++ b/packages/wasm-ast-types/__tests__/client/ts-client.vectis.test.ts
@@ -0,0 +1,94 @@
+import {
+  expectCode,
+  makeContext,
+} from '../../test-utils';
+
+import {
+  vectisCanExecuteRelayResponse,
+  vectisCosmosMsgForEmpty,
+  vectisExecuteMsgForEmpty,
+  vectisInfoResponse,
+  vectisRelayTransaction
+} from '../../test-utils/fixtures';
+
+import { ExecuteMsg } from '../../src';
+
+import {
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
+} from '../../src';
+
+it('cosmos_msg_for__empty', () => {
+  const ctx = makeContext(vectisCosmosMsgForEmpty);
+  expectCode(createTypeInterface(ctx, vectisCosmosMsgForEmpty));
+});
+
+it('execute_msg_for__empty', () => {
+  const ctx = makeContext(vectisExecuteMsgForEmpty);
+  expectCode(createTypeInterface(ctx, vectisExecuteMsgForEmpty));
+});
+
+it('can_execute_relay_response', () => {
+  const ctx = makeContext(vectisCanExecuteRelayResponse);
+  expectCode(createTypeInterface(ctx, vectisCanExecuteRelayResponse));
+});
+
+it('info_response', () => {
+  const ctx = makeContext(vectisInfoResponse);
+  expectCode(createTypeInterface(ctx, vectisInfoResponse));
+});
+
+it('relay_transaction', () => {
+  const ctx = makeContext(vectisRelayTransaction);
+  expectCode(createTypeInterface(ctx, vectisRelayTransaction));
+});
+
+it('query classes', () => {
+  const ctx = makeContext(vectisCosmosMsgForEmpty);
+  expectCode(
+    createQueryClass(
+      ctx,
+      'SG721QueryClient',
+      'SG721ReadOnlyInstance',
+      // @ts-ignore
+      vectisCosmosMsgForEmpty
+    )
+  );
+});
+
+it('query classes', () => {
+  const ctx = makeContext(vectisExecuteMsgForEmpty);
+  expectCode(
+    createQueryClass(
+      ctx,
+      'SG721QueryClient',
+      'SG721ReadOnlyInstance',
+      // @ts-ignore
+      vectisExecuteMsgForEmpty
+    )
+  );
+});
+
+it('execute classes array types', () => {
+  const ctx = makeContext(vectisExecuteMsgForEmpty);
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      null,
+      // @ts-ignore
+      vectisExecuteMsgForEmpty as ExecuteMsg
+    )
+  );
+});
+
+it('execute interfaces no extends', () => {
+  const ctx = makeContext(vectisExecuteMsgForEmpty);
+  expectCode(
+    // @ts-ignore
+    createExecuteInterface(ctx, 'SG721Instance', null, vectisExecuteMsgForEmpty)
+  );
+});
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts b/packages/wasm-ast-types/__tests__/client/ts-client.wager.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/test/ts-client.wager.spec.ts
rename to packages/wasm-ast-types/__tests__/client/ts-client.wager.test.ts
diff --git a/packages/wasm-ast-types/src/message-builder/__snapshots__/message-builder.spec.ts.snap b/packages/wasm-ast-types/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/message-builder/__snapshots__/message-builder.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
diff --git a/packages/wasm-ast-types/src/message-builder/message-builder.spec.ts b/packages/wasm-ast-types/__tests__/message-builder/message-builder.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/message-builder/message-builder.spec.ts
rename to packages/wasm-ast-types/__tests__/message-builder/message-builder.test.ts
diff --git a/packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap b/packages/wasm-ast-types/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/message-composer/__snapshots__/message-composer.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.spec.ts b/packages/wasm-ast-types/__tests__/message-composer/message-composer.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/message-composer/message-composer.spec.ts
rename to packages/wasm-ast-types/__tests__/message-composer/message-composer.test.ts
diff --git a/packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap b/packages/wasm-ast-types/__tests__/provider/__snapshots__/provider.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/provider/__snapshots__/provider.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/provider/__snapshots__/provider.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/provider/provider.test.ts b/packages/wasm-ast-types/__tests__/provider/provider.test.ts
new file mode 100644
index 00000000..aca34848
--- /dev/null
+++ b/packages/wasm-ast-types/__tests__/provider/provider.test.ts
@@ -0,0 +1,81 @@
+import {
+  createGettingProviders,
+  createIContractsContext,
+  createProvider
+} from '../../src/provider/provider';
+import { PROVIDER_TYPES } from '../../src/utils/constants';
+import { expectCode } from '../../test-utils';
+
+it('execute class', () => {
+  const info = {};
+
+  info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: 'WhitelistClient'
+  };
+
+  info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: 'WhitelistQueryClient'
+  };
+
+  info[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] = {
+    classname: 'WhitelistMessageComposer'
+  };
+
+  expectCode(createProvider('Whitelist', info));
+});
+
+it('execute class without message composer', () => {
+  const info = {};
+
+  info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: 'WhitelistClient'
+  };
+
+  info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: 'WhitelistQueryClient'
+  };
+
+  expectCode(createProvider('Whitelist', info));
+});
+
+it('create IContractsContext', () => {
+  const info = {
+    Whitelist: {},
+    Marketplace: {}
+  };
+
+  info['Whitelist'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: 'WhitelistClient'
+  };
+
+  info['Whitelist'][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: 'WhitelistQueryClient'
+  };
+
+  info['Marketplace'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: 'MarketplaceClient'
+  };
+
+  expectCode(createIContractsContext(info));
+});
+
+it('create getProviders', () => {
+  const info = {
+    Whitelist: {},
+    Marketplace: {}
+  };
+
+  info['Whitelist'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: 'WhitelistClient'
+  };
+
+  info['Whitelist'][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
+    classname: 'WhitelistQueryClient'
+  };
+
+  info['Marketplace'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
+    classname: 'MarketplaceClient'
+  };
+
+  expectCode(createGettingProviders(info));
+});
diff --git a/packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap b/packages/wasm-ast-types/__tests__/react-query/__snapshots__/react-query.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/react-query/__snapshots__/react-query.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/react-query/__snapshots__/react-query.test.ts.snap
diff --git a/packages/wasm-ast-types/src/react-query/react-query.spec.ts b/packages/wasm-ast-types/__tests__/react-query/react-query.test.ts
similarity index 100%
rename from packages/wasm-ast-types/src/react-query/react-query.spec.ts
rename to packages/wasm-ast-types/__tests__/react-query/react-query.test.ts
diff --git a/packages/wasm-ast-types/src/recoil/__snapshots__/recoil.spec.ts.snap b/packages/wasm-ast-types/__tests__/recoil/__snapshots__/recoil.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/src/recoil/__snapshots__/recoil.spec.ts.snap
rename to packages/wasm-ast-types/__tests__/recoil/__snapshots__/recoil.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/recoil/recoil.test.ts b/packages/wasm-ast-types/__tests__/recoil/recoil.test.ts
new file mode 100644
index 00000000..8837ca94
--- /dev/null
+++ b/packages/wasm-ast-types/__tests__/recoil/recoil.test.ts
@@ -0,0 +1,35 @@
+import * as t from '@babel/types';
+
+import query_msg from '../../../../__fixtures__/basic/query_msg.json';
+import {
+  createRecoilQueryClient,
+  createRecoilSelector,
+  createRecoilSelectors
+} from '../../src/recoil/recoil';
+import { expectCode, makeContext } from '../../test-utils';
+
+const ctx = makeContext(query_msg);
+
+it('selector', () => {
+  expectCode(
+    createRecoilSelector(
+      ctx,
+      'SG721',
+      'SG721QueryClient',
+      'governanceModules',
+      'GovernanceModulesResponse'
+    )
+  );
+});
+
+it('selectors', () => {
+  expectCode(
+    t.program(
+      createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', query_msg)
+    )
+  );
+});
+
+it('client', () => {
+  expectCode(createRecoilQueryClient(ctx, 'SG721', 'SG721QueryClient'));
+});
diff --git a/packages/wasm-ast-types/jest.config.js b/packages/wasm-ast-types/jest.config.js
new file mode 100644
index 00000000..0aa3aaa4
--- /dev/null
+++ b/packages/wasm-ast-types/jest.config.js
@@ -0,0 +1,18 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    preset: "ts-jest",
+    testEnvironment: "node",
+    transform: {
+        "^.+\\.tsx?$": [
+            "ts-jest",
+            {
+                babelConfig: false,
+                tsconfig: "tsconfig.json",
+            },
+        ],
+    },
+    transformIgnorePatterns: [`/node_modules/*`],
+    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+    moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+    modulePathIgnorePatterns: ["dist/*"]
+};
diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json
index 2b95d6f7..69fe1cdd 100644
--- a/packages/wasm-ast-types/package.json
+++ b/packages/wasm-ast-types/package.json
@@ -3,87 +3,38 @@
   "version": "0.26.4",
   "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",
+  "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
   "license": "SEE LICENSE IN LICENSE",
-  "main": "main/index.js",
-  "module": "module/index.js",
-  "typings": "types/index.d.ts",
-  "directories": {
-    "lib": "src",
-    "test": "__tests__"
+  "main": "index.js",
+  "module": "esm/index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public",
+    "directory": "dist"
   },
-  "files": [
-    "types",
-    "main",
-    "src",
-    "module"
-  ],
   "scripts": {
-    "build:main": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"",
-    "build:module": "cross-env MODULE=true babel src --out-dir module --delete-dir-on-start  --extensions \".tsx,.ts,.js\"",
-    "build:ts": "tsc --project ./tsconfig.json",
-    "build": "npm run build:module && npm run build:main",
-    "buidl": "npm run build && npm run build:ts",
+    "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
+    "clean": "del dist/**",
     "prepare": "npm run build",
-    "lint": "eslint .",
-    "format": "eslint . --fix",
+    "codegen": "ts-node ./scripts/build.ts",
+    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "test": "jest",
-    "test:ast": "cross-env NODE_ENV=development babel-node scripts/test-ast.js",
     "test:watch": "jest --watch",
-    "test:debug": "node --inspect node_modules/.bin/jest --runInBand"
-  },
-  "jest": {
-    "testPathIgnorePatterns": [
-      "main/",
-      "module/"
-    ]
-  },
-  "publishConfig": {
-    "access": "public"
+    "test:ast": "ts-node scripts/test-ast.ts",
+    "dev": "ts-node src/ts-codegen",
+    "file": "ts-node src/file"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pyramation/cosmwasm-typescript-gen"
+    "url": "https://github.com/cosmwasm/ts-codegen"
   },
   "keywords": [],
   "bugs": {
-    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/issues"
-  },
-  "devDependencies": {
-    "@babel/cli": "7.18.10",
-    "@babel/core": "7.18.10",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/generator": "7.18.12",
-    "@babel/node": "^7.18.10",
-    "@babel/parser": "^7.18.11",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-export-default-from": "7.18.10",
-    "@babel/plugin-proposal-object-rest-spread": "7.18.9",
-    "@babel/plugin-transform-runtime": "7.18.10",
-    "@babel/preset-env": "7.18.10",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/traverse": "7.18.11",
-    "@types/jest": "^28.1.6",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^28.1.3",
-    "babel-watch": "^7.0.0",
-    "cross-env": "^7.0.2",
-    "eslint": "8.21.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "glob": "8.0.3",
-    "jest": "28.1.3",
-    "jest-in-case": "^1.0.2",
-    "mkdirp": "1.0.4",
-    "prettier": "^2.7.1",
-    "regenerator-runtime": "^0.13.7",
-    "ts-jest": "^28.0.7",
-    "typescript": "^4.7.4"
+    "url": "https://github.com/cosmwasm/ts-codegen/issues"
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.9",
     "@babel/types": "7.18.10",
-    "@jest/transform": "28.1.3",
+    "@cosmology/ts-codegen-types": "0.26.4",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/wasm-ast-types/scripts/test-ast.js b/packages/wasm-ast-types/scripts/test-ast.ts
similarity index 96%
rename from packages/wasm-ast-types/scripts/test-ast.js
rename to packages/wasm-ast-types/scripts/test-ast.ts
index bcf1ef97..667c3102 100644
--- a/packages/wasm-ast-types/scripts/test-ast.js
+++ b/packages/wasm-ast-types/scripts/test-ast.ts
@@ -15,6 +15,7 @@ const main = async () => {
 
   const ast = parse(readFileSync(__dirname + '/fixture.ts', 'utf-8'), {
     sourceType: 'module',
+    // @ts-ignore
     plugins
   });
 
diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/wasm-ast-types/src/client/client.ts
index 055cf6cb..fb02a2e8 100644
--- a/packages/wasm-ast-types/src/client/client.ts
+++ b/packages/wasm-ast-types/src/client/client.ts
@@ -12,7 +12,7 @@ import {
   typedIdentifier
 } from '../utils';
 
-import { ExecuteMsg, JSONSchema, QueryMsg } from '../types';
+import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
 
 import {
   createTypedObjectParams,
@@ -245,10 +245,10 @@ export const createWasmExecMethod = (
     arrowFunctionExpression(
       param
         ? [
-            // props
-            param,
-            ...CONSTANT_EXEC_PARAMS
-          ]
+          // props
+          param,
+          ...CONSTANT_EXEC_PARAMS
+        ]
         : CONSTANT_EXEC_PARAMS,
       t.blockStatement([
         t.returnStatement(
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
deleted file mode 100644
index 0f07a397..00000000
--- a/packages/wasm-ast-types/src/client/test/ts-client.account-nfts.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import contract from '../../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
-
-import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
-} from '../client'
-import { expectCode, printCode, makeContext } from '../../../test-utils';
-
-const message = contract.query
-const ctx = makeContext(message);
-
-it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        message
-    ))
-})
-
-
-it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        message
-    ))
-});
-
-// it('query classes response', () => {
-//     expectCode(createTypeInterface(
-//         ctx,
-//         contract.responses.all_debt_shares
-//     ))
-// });
-
-it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        message
-    ))
-});
-
-it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        message
-    ))
-});
diff --git a/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts b/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts
deleted file mode 100644
index dde93637..00000000
--- a/packages/wasm-ast-types/src/client/test/ts-client.vectis.spec.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import cosmos_msg_for__empty from '../../../../../__fixtures__/vectis/govec/cosmos_msg_for__empty.json';
-import execute_msg_for__empty from '../../../../../__fixtures__/vectis/govec/execute_msg_for__empty.json';
-import can_execute_relay_response from '../../../../../__fixtures__/vectis/govec/can_execute_relay_response.json';
-import info_response from '../../../../../__fixtures__/vectis/govec/info_response.json';
-import relay_transaction from '../../../../../__fixtures__/vectis/govec/relay_transaction.json';
-
-import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
-} from '../client';
-
-import { RenderContext } from '../../context';
-import { expectCode, makeContext } from '../../../test-utils';
-
-it('cosmos_msg_for__empty', () => {
-    const ctx = makeContext(cosmos_msg_for__empty);
-    expectCode(createTypeInterface(
-        ctx,
-        cosmos_msg_for__empty
-    ))
-});
-
-it('execute_msg_for__empty', () => {
-    const ctx = makeContext(execute_msg_for__empty);
-    expectCode(createTypeInterface(
-        ctx,
-        execute_msg_for__empty
-    ))
-})
-
-it('can_execute_relay_response', () => {
-    const ctx = makeContext(can_execute_relay_response);
-    expectCode(createTypeInterface(
-        ctx,
-        can_execute_relay_response
-    ))
-})
-
-it('info_response', () => {
-    const ctx = makeContext(info_response);
-    expectCode(createTypeInterface(
-        ctx,
-        info_response
-    ))
-})
-
-it('relay_transaction', () => {
-    const ctx = makeContext(relay_transaction);
-    expectCode(createTypeInterface(
-        ctx,
-        relay_transaction
-    ))
-})
-
-
-it('query classes', () => {
-    const ctx = makeContext(cosmos_msg_for__empty);
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        cosmos_msg_for__empty
-    ))
-});
-
-it('query classes', () => {
-    const ctx = makeContext(execute_msg_for__empty);
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        execute_msg_for__empty
-    ))
-});
-
-it('execute classes array types', () => {
-    const ctx = makeContext(execute_msg_for__empty);
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execute_msg_for__empty
-    ))
-});
-
-it('execute interfaces no extends', () => {
-    const ctx = makeContext(execute_msg_for__empty);
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        execute_msg_for__empty
-    ))
-});
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/wasm-ast-types/src/context/context.ts
index c67beaf6..d464c0e0 100644
--- a/packages/wasm-ast-types/src/context/context.ts
+++ b/packages/wasm-ast-types/src/context/context.ts
@@ -1,4 +1,5 @@
-import { JSONSchema } from "../types";
+import * as t from '@babel/types';
+import { JSONSchema, IDLObject } from "@cosmology/ts-codegen-types";
 import { refLookup } from "../utils";
 import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
 import deepmerge from "deepmerge";
@@ -37,26 +38,10 @@ export interface TSTypesOptions {
 }
 
 /// END Plugin Types
-
-interface KeyedSchema {
-  [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;
-}
-
 export interface ContractInfo {
   schemas: JSONSchema[];
   responses?: Record<string, JSONSchema>;
-  idlObject?: IDLObject;
+  idlObject?: Partial<IDLObject>;
 };
 export interface RenderOptions {
   enabled?: boolean;
@@ -75,9 +60,9 @@ export interface ProviderInfo {
 }
 
 export interface IContext {
-  refLookup($ref: string);
-  addUtil(util: string);
-  getImports(registeredUtils?: UtilMapping, filepath?: string);
+  refLookup($ref: string): JSONSchema;
+  addUtil(util: string): void;
+  getImports(registeredUtils?: UtilMapping, filepath?: string): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[];
 }
 
 export interface IRenderContext<TOpt = RenderOptions> extends IContext {
@@ -175,7 +160,7 @@ export class BuilderContext {
 export abstract class RenderContextBase<TOpt = RenderOptions> implements IRenderContext<TOpt> {
   builderContext: BuilderContext;
   contract: ContractInfo;
-  utils: string[] = [];
+  utils: Record<string, boolean> = {};
   schema: JSONSchema;
   options: TOpt;
 
@@ -194,10 +179,10 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
    * @param options
    */
   abstract mergeDefaultOpt(options: TOpt): TOpt;
-  refLookup($ref: string) {
+  refLookup($ref: string): JSONSchema {
     return refLookup($ref, this.schema)
   }
-  addUtil(util: string) {
+  addUtil(util: string): void {
     this.utils[util] = true;
   }
   addProviderInfo(contractName: string, type: string, classname: string, filename: string): void {
@@ -210,7 +195,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
   } {
     return this.builderContext.providers;
   }
-  getImports(registeredUtils?: UtilMapping, filepath?: string) {
+  getImports(registeredUtils?: UtilMapping, filepath?: string): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] {
     return getImportStatements(
       convertUtilsToImportList(
         this,
diff --git a/packages/wasm-ast-types/src/context/imports.ts b/packages/wasm-ast-types/src/context/imports.ts
index 444a9ddb..7044b72c 100644
--- a/packages/wasm-ast-types/src/context/imports.ts
+++ b/packages/wasm-ast-types/src/context/imports.ts
@@ -14,12 +14,12 @@ export interface ImportObj {
 export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
 export type UtilMapping = {
   [key: string]:
-    | ImportObj
-    | string
-    | GetUtilFn
+  | ImportObj
+  | string
+  | GetUtilFn
 };
 
-const makeReactQuerySwitch = (varName) => {
+const makeReactQuerySwitch = (varName: string) => {
   return (context: RenderContext) => {
     switch (context.options.reactQuery.version) {
       case 'v4':
@@ -70,7 +70,7 @@ export const convertUtilsToImportList = (
   return utils.map((util) => {
     let result = null;
 
-    if(registeredUtils){
+    if (registeredUtils) {
       result = convertUtil(context, util, registeredUtils);
 
       if (result) {
@@ -91,7 +91,7 @@ export const convertUtilsToImportList = (
 export const convertUtil = (
   context: RenderContext,
   util: string,
-  registeredUtils: object
+  registeredUtils: any
 ): ImportObj => {
   if (!registeredUtils.hasOwnProperty(util)) return null;
   if (typeof registeredUtils[util] === 'string') {
@@ -112,79 +112,79 @@ export const convertUtil = (
 export const getImportStatements = (
   list: ImportObj[],
   filepath?: string
-) => {
+): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] => {
 
   // swap helpers with helpers file...
   const modifiedImports = list.map(imp => {
-      if (filepath && UTIL_HELPERS.includes(imp.path)) {
-          const name = imp.path.replace(/__/g, '');
-          return {
-              ...imp,
-              path: getRelativePath(filepath, `./${name}`)
-          }
+    if (filepath && UTIL_HELPERS.includes(imp.path)) {
+      const name = imp.path.replace(/__/g, '');
+      return {
+        ...imp,
+        path: getRelativePath(filepath, `./${name}`)
       }
-      return imp;
+    }
+    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);
+  const imports = modifiedImports.reduce((m: Record<string, ImportObj[]>, obj) => {
+    m[obj.path] = m[obj.path] || [];
+    const exists = m[obj.path].find((el: ImportObj) =>
+      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];
-      }
+    // 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;
+    if (!exists) {
+      m[obj.path].push(obj);
+    }
+    return m;
   }, {})
 
 
   return Object.entries(imports)
-      .reduce((m, [importPath, imports]: [string, ImportObj[]]) => {
-          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)
-                  )
+    .reduce((m, [importPath, imports]: [string, ImportObj[]]) => {
+      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)
               )
-          }
-          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)
-                  )
+            ],
+            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)
               )
-          }
-          return m;
-      }, [])
+            ],
+            t.stringLiteral(namespaced[0].path)
+          )
+        )
+      }
+      return m;
+    }, [])
 };
 
 export const getRelativePath = (f1: string, f2: string) => {
diff --git a/packages/wasm-ast-types/src/index.ts b/packages/wasm-ast-types/src/index.ts
index 0c135b31..6f029f5f 100644
--- a/packages/wasm-ast-types/src/index.ts
+++ b/packages/wasm-ast-types/src/index.ts
@@ -4,6 +4,5 @@ export * from './context';
 export * from './recoil';
 export * from './message-composer';
 export * from './react-query';
-export * from './types';
 export * from './message-builder';
 export * from './provider';
diff --git a/packages/wasm-ast-types/src/message-builder/message-builder.ts b/packages/wasm-ast-types/src/message-builder/message-builder.ts
index 16171c08..30758a10 100644
--- a/packages/wasm-ast-types/src/message-builder/message-builder.ts
+++ b/packages/wasm-ast-types/src/message-builder/message-builder.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
 import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
-import { ExecuteMsg, QueryMsg } from '../types';
+import { ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
 import { createTypedObjectParams } from '../utils/types';
 import { RenderContext } from '../context';
 import { getWasmMethodArgs } from '../client/client';
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.ts b/packages/wasm-ast-types/src/message-composer/message-composer.ts
index 841d666b..97e5af67 100644
--- a/packages/wasm-ast-types/src/message-composer/message-composer.ts
+++ b/packages/wasm-ast-types/src/message-composer/message-composer.ts
@@ -10,7 +10,7 @@ import {
   OPTIONAL_FUNDS_PARAM,
   typedIdentifier
 } from '../utils';
-import { ExecuteMsg, JSONSchema } from '../types';
+import { ExecuteMsg, JSONSchema } from '@cosmology/ts-codegen-types';
 import { createTypedObjectParams } from '../utils/types';
 import { RenderContext } from '../context';
 import { getWasmMethodArgs } from '../client/client';
@@ -50,10 +50,10 @@ const createWasmExecMethodMessageComposer = (
     arrowFunctionExpression(
       param
         ? [
-            // props
-            param,
-            ...constantParams
-          ]
+          // props
+          param,
+          ...constantParams
+        ]
         : constantParams,
       t.blockStatement([
         t.returnStatement(
diff --git a/packages/wasm-ast-types/src/provider/provider.spec.ts b/packages/wasm-ast-types/src/provider/provider.spec.ts
deleted file mode 100644
index fb333df9..00000000
--- a/packages/wasm-ast-types/src/provider/provider.spec.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-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 { createGettingProviders, createIContractsContext, createProvider } from "./provider";
-
-import { expectCode, makeContext } from "../../test-utils";
-import { PROVIDER_TYPES } from "../utils/constants";
-
-it("execute class", () => {
-  let info = {};
-
-  info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "WhitelistClient",
-  };
-
-  info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: "WhitelistQueryClient",
-  };
-
-  info[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] = {
-    classname: "WhitelistMessageComposer",
-  };
-
-  expectCode(createProvider("Whitelist", info));
-});
-
-it("execute class without message composer", () => {
-  let info = {};
-
-  info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "WhitelistClient",
-  };
-
-  info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: "WhitelistQueryClient",
-  };
-
-  expectCode(createProvider("Whitelist", info));
-});
-
-it("create IContractsContext", () => {
-  let info = {
-    Whitelist: {},
-    Marketplace: {},
-  };
-
-  info["Whitelist"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "WhitelistClient",
-  };
-
-  info["Whitelist"][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: "WhitelistQueryClient",
-  };
-
-  info["Marketplace"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "MarketplaceClient",
-  };
-
-  expectCode(createIContractsContext(info));
-});
-
-it("create getProviders", () => {
-  let info = {
-    Whitelist: {},
-    Marketplace: {},
-  };
-
-  info["Whitelist"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "WhitelistClient",
-  };
-
-  info["Whitelist"][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: "WhitelistQueryClient",
-  };
-
-  info["Marketplace"][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: "MarketplaceClient",
-  };
-
-  expectCode(createGettingProviders(info));
-});
diff --git a/packages/wasm-ast-types/src/provider/provider.ts b/packages/wasm-ast-types/src/provider/provider.ts
index bcdaf493..6939e90f 100644
--- a/packages/wasm-ast-types/src/provider/provider.ts
+++ b/packages/wasm-ast-types/src/provider/provider.ts
@@ -1,6 +1,6 @@
 import * as t from "@babel/types";
 import { camel, pascal } from "case";
-import { ProviderInfo, RenderContext } from "../context";
+import { ProviderInfo } from "../context";
 import { PROVIDER_TYPES } from "../utils/constants";
 import { identifier, tsObjectPattern } from "../utils";
 
@@ -63,7 +63,7 @@ export const createProvider = (
               t.identifier(
                 providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
                   ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
-                      .classname
+                    .classname
                   : "undefined"
               ),
             ])
@@ -125,7 +125,7 @@ export const createIContractsContext = (providerInfos: {
   );
 };
 
-let PROVIDER_MAPPING = {};
+let PROVIDER_MAPPING: Record<string, string> = {};
 
 PROVIDER_MAPPING[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = "ISigningClientProvider";
 PROVIDER_MAPPING[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = "IQueryClientProvider";
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/wasm-ast-types/src/react-query/react-query.ts
index 3a0d50c1..c5f38203 100644
--- a/packages/wasm-ast-types/src/react-query/react-query.ts
+++ b/packages/wasm-ast-types/src/react-query/react-query.ts
@@ -1,11 +1,10 @@
 import type { Expression } from '@babel/types';
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { ExecuteMsg, QueryMsg } from '../types';
+import { JSONSchema, ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
 import {
   callExpression,
   createTypedObjectParams,
-  FIXED_EXECUTE_PARAMS,
   getMessageProperties,
   identifier,
   OPTIONAL_FUNDS_PARAM,
@@ -20,13 +19,11 @@ import {
   shorthandProperty
 } from '../utils/babel';
 import {
-  getParamsTypeAnnotation,
   getPropertyType,
   getResponseType
 } from '../utils/types';
 import { ReactQueryOptions, RenderContext } from '../context';
-import { JSONSchema } from '../types';
-import { ArrowFunctionExpression, objectExpression } from '@babel/types';
+import { ArrowFunctionExpression } from '@babel/types';
 import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
 
 interface ReactQueryHookQuery {
@@ -183,7 +180,7 @@ function buildQueryFn(
   options: ReactQueryOptions
 ): ArrowFunctionExpression {
   const keys = Object.keys(jsonschema.properties ?? {});
-  let args = [];
+  let args: t.ObjectExpression[] = [];
   if (keys.length) {
     args = [
       t.objectExpression([
@@ -247,36 +244,36 @@ const ENABLED_QUERY_OPTION = t.objectProperty(
 function buildQueryOptions(options: ReactQueryOptions) {
   return options.optionalClient
     ? t.objectExpression([
-        t.spreadElement(t.identifier('options')),
-        t.objectProperty(
-          t.identifier('enabled'),
-          t.logicalExpression(
-            '&&',
-            t.unaryExpression(
-              '!',
-              t.unaryExpression('!', t.identifier('client'))
-            ),
-            t.conditionalExpression(
-              // explicitly check for undefined
-              t.binaryExpression(
-                '!=',
-                t.optionalMemberExpression(
-                  t.identifier('options'),
-                  t.identifier('enabled'),
-                  false,
-                  true
-                ),
-                t.identifier('undefined')
-              ),
-              t.memberExpression(
+      t.spreadElement(t.identifier('options')),
+      t.objectProperty(
+        t.identifier('enabled'),
+        t.logicalExpression(
+          '&&',
+          t.unaryExpression(
+            '!',
+            t.unaryExpression('!', t.identifier('client'))
+          ),
+          t.conditionalExpression(
+            // explicitly check for undefined
+            t.binaryExpression(
+              '!=',
+              t.optionalMemberExpression(
                 t.identifier('options'),
-                t.identifier('enabled')
+                t.identifier('enabled'),
+                false,
+                true
               ),
-              t.booleanLiteral(true)
-            )
+              t.identifier('undefined')
+            ),
+            t.memberExpression(
+              t.identifier('options'),
+              t.identifier('enabled')
+            ),
+            t.booleanLiteral(true)
           )
         )
-      ])
+      )
+    ])
     : t.identifier('options');
 }
 
@@ -896,9 +893,9 @@ function createReactQueryHookGenericInterface({
       t.tsTypeAnnotation(
         options.optionalClient
           ? t.tsUnionType([
-              t.tsTypeReference(t.identifier(QueryClient)),
-              t.tsUndefinedKeyword()
-            ])
+            t.tsTypeReference(t.identifier(QueryClient)),
+            t.tsUndefinedKeyword()
+          ])
           : t.tsTypeReference(t.identifier(QueryClient))
       ),
       false
@@ -908,17 +905,17 @@ function createReactQueryHookGenericInterface({
       t.tsTypeAnnotation(
         options.version === 'v4'
           ? t.tSIntersectionType([
-              omitTypeReference(
-                typedUseQueryOptions,
-                "'queryKey' | 'queryFn' | 'initialData'"
-              ),
-              t.tSTypeLiteral([
-                t.tsPropertySignature(
-                  t.identifier('initialData?'),
-                  t.tsTypeAnnotation(t.tsUndefinedKeyword())
-                )
-              ])
+            omitTypeReference(
+              typedUseQueryOptions,
+              "'queryKey' | 'queryFn' | 'initialData'"
+            ),
+            t.tSTypeLiteral([
+              t.tsPropertySignature(
+                t.identifier('initialData?'),
+                t.tsTypeAnnotation(t.tsUndefinedKeyword())
+              )
             ])
+          ])
           : typedUseQueryOptions
       ),
       true
diff --git a/packages/wasm-ast-types/src/recoil/recoil.spec.ts b/packages/wasm-ast-types/src/recoil/recoil.spec.ts
deleted file mode 100644
index 0719711d..00000000
--- a/packages/wasm-ast-types/src/recoil/recoil.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as t from '@babel/types';
-import query_msg from '../../../../__fixtures__/basic/query_msg.json';
-import {
-    createRecoilSelector,
-    createRecoilSelectors,
-    createRecoilQueryClient,
-} from './recoil';
-import { RenderContext } from '../context';
-import { expectCode, makeContext } from '../../test-utils';
-
-const ctx = makeContext(query_msg);
-
-it('selector', () => {
-    expectCode(createRecoilSelector(
-        ctx,
-        'SG721',
-        'SG721QueryClient',
-        'governanceModules',
-        'GovernanceModulesResponse'
-    ))
-});
-
-it('selectors', () => {
-    expectCode(t.program(createRecoilSelectors(
-        ctx,
-        'SG721',
-        'SG721QueryClient',
-        query_msg
-    )))
-});
-
-it('client', () => {
-    expectCode(createRecoilQueryClient(
-        ctx,
-        'SG721',
-        'SG721QueryClient'
-    ))
-});
diff --git a/packages/wasm-ast-types/src/recoil/recoil.ts b/packages/wasm-ast-types/src/recoil/recoil.ts
index fb4e02f8..5148214e 100644
--- a/packages/wasm-ast-types/src/recoil/recoil.ts
+++ b/packages/wasm-ast-types/src/recoil/recoil.ts
@@ -5,7 +5,7 @@ import {
   getMessageProperties,
   getResponseType
 } from '../utils';
-import { QueryMsg } from '../types';
+import { JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
 import { RenderContext } from '../context';
 
 export const createRecoilSelector = (
@@ -159,9 +159,9 @@ export const createRecoilSelectors = (
   keyPrefix: string,
   QueryClient: string,
   queryMsg: QueryMsg
-) => {
+): t.ExportNamedDeclaration[] => {
   return getMessageProperties(queryMsg)
-    .map(schema => {
+    .map((schema: JSONSchema) => {
 
       const underscoreName = Object.keys(schema.properties)[0];
       const methodName = camel(underscoreName);
diff --git a/packages/wasm-ast-types/src/types.ts b/packages/wasm-ast-types/src/types.ts
deleted file mode 100644
index 45ebae6b..00000000
--- a/packages/wasm-ast-types/src/types.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-export declare type fieldType = 'Long' | 'Coin' | 'Duration' | 'Height' | string;
-export interface Field {
-    name: string;
-    type: fieldType;
-    node: any;
-};
-export interface Interface {
-    name: string;
-    fields: Field[]
-};
-
-export interface QueryMsg {
-    $schema: string;
-    title: "QueryMsg";
-    oneOf?: any;
-    allOf?: any;
-    anyOf?: any;
-}
-
-export interface ExecuteMsg {
-    $schema: string;
-    title: "ExecuteMsg" | "ExecuteMsg_for_Empty";
-    oneOf?: any;
-    allOf?: any;
-    anyOf?: any;
-}
-
-export interface JSONSchema {
-    $ref?: string;
-    $schema?: string;
-    additionalProperties?: boolean;
-    allOf?: JSONSchema[];
-    anyOf?: JSONSchema[];
-    definitions?: Record<string, JSONSchema>;
-    description?: string;
-    oneOf?: JSONSchema[];
-    properties?: Record<string, JSONSchema>;
-    patternProperties?: Record<string, JSONSchema>;
-    items?: JSONSchema | JSONSchema[];
-    additionalItems?: JSONSchema;
-    required?: string[];
-    title?: string;
-    type?: string;
-}
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/utils/babel.spec.ts b/packages/wasm-ast-types/src/utils/babel.spec.ts
deleted file mode 100644
index 77f8abec..00000000
--- a/packages/wasm-ast-types/src/utils/babel.spec.ts
+++ /dev/null
@@ -1,511 +0,0 @@
-import { importStmt } from './babel'
-import * as t from '@babel/types';
-
-import {
-    bindMethod,
-    typedIdentifier,
-    promiseTypeAnnotation,
-    classDeclaration,
-    classProperty,
-    arrowFunctionExpression
-} from './babel'
-import { expectCode } from '../../test-utils';
-
-it('top import', async () => {
-    expectCode(
-        importStmt([
-            'CosmWasmClient',
-            'ExecuteResult',
-            'SigningCosmWasmClient'
-        ], '@cosmjs/cosmwasm-stargate')
-    );
-});
-
-it('interfaces', async () => {
-    expectCode(
-        t.program(
-            [
-                t.exportNamedDeclaration(
-                    t.tsInterfaceDeclaration(
-                        t.identifier('SG721ReadOnlyInstance'),
-                        null,
-                        [],
-                        t.tSInterfaceBody(
-                            [
-                                t.tSPropertySignature(
-                                    t.identifier('contractAddress'),
-                                    t.tsTypeAnnotation(
-                                        t.tsStringKeyword()
-                                    )
-                                ),
-                                // methods
-
-                                t.tSPropertySignature(
-                                    t.identifier('tokens'),
-                                    t.tsTypeAnnotation(
-                                        t.tsFunctionType(
-                                            null,
-                                            [
-                                                typedIdentifier('owner', t.tsTypeAnnotation(
-                                                    t.tsStringKeyword()
-                                                )),
-                                                typedIdentifier('startAfter', t.tsTypeAnnotation(
-                                                    t.tsStringKeyword()
-                                                ), true),
-                                                typedIdentifier('limit', t.tsTypeAnnotation(
-                                                    t.tsStringKeyword()
-                                                ), true)
-                                            ],
-                                            promiseTypeAnnotation('TokensResponse')
-                                        )
-                                    )
-                                )
-                            ]
-                        )
-                    )
-                ),
-
-                // extends 
-
-                t.exportNamedDeclaration(
-                    t.tsInterfaceDeclaration(
-                        t.identifier('SG721Instance'),
-                        null,
-                        [
-                            t.tSExpressionWithTypeArguments(
-                                t.identifier('SG721ReadOnlyInstance')
-                            )
-                        ],
-                        t.tSInterfaceBody(
-                            [
-
-                                // contract address
-
-                                t.tSPropertySignature(
-                                    t.identifier('contractAddress'),
-                                    t.tsTypeAnnotation(
-                                        t.tsStringKeyword()
-                                    )
-                                ),
-
-                                // METHOD
-                                t.tSPropertySignature(
-                                    t.identifier('mint'),
-                                    t.tsTypeAnnotation(
-                                        t.tsFunctionType(
-                                            null,
-                                            [
-                                                typedIdentifier('sender', t.tsTypeAnnotation(
-                                                    t.tsStringKeyword()
-                                                )),
-                                                typedIdentifier('anotherProp', t.tsTypeAnnotation(
-                                                    t.tsStringKeyword()
-                                                )),
-                                                typedIdentifier('prop3', t.tsTypeAnnotation(
-                                                    t.tsStringKeyword()
-                                                ))
-                                            ],
-                                            promiseTypeAnnotation('ExecuteResult')
-                                        )
-                                    )
-                                )
-                            ]
-                        )
-                    )
-                )
-
-            ]
-        )
-    )
-
-});
-
-
-it('readonly classes', async () => {
-    expectCode(
-        t.program(
-            [
-
-                t.exportNamedDeclaration(
-                    classDeclaration('SG721QueryClient',
-                        [
-                            // client
-                            classProperty('client', t.tsTypeAnnotation(
-                                t.tsTypeReference(t.identifier('CosmWasmClient'))
-                            )),
-
-                            // contractAddress
-                            classProperty('contractAddress', t.tsTypeAnnotation(
-                                t.tsStringKeyword()
-                            )),
-
-                            // constructor
-                            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
-                                        bindMethod('approval'),
-                                        bindMethod('otherProp'),
-                                        bindMethod('hello'),
-                                        bindMethod('mintme')
-                                    ]
-                                )),
-
-                            // methods:
-                            t.classProperty(
-                                t.identifier('approval'),
-                                arrowFunctionExpression(
-                                    [
-                                        // props
-                                        typedIdentifier('owner', t.tsTypeAnnotation(
-                                            t.tsStringKeyword()
-                                        )),
-                                        // 
-                                        typedIdentifier('spender', t.tsTypeAnnotation(
-                                            t.tsStringKeyword()
-                                        ))
-                                    ],
-                                    t.blockStatement(
-                                        [
-                                            t.returnStatement(
-                                                t.callExpression(
-                                                    t.memberExpression(
-                                                        t.memberExpression(
-                                                            t.thisExpression(),
-                                                            t.identifier('client')
-                                                        ),
-                                                        t.identifier('queryContractSmart')
-                                                    ),
-                                                    [
-                                                        t.memberExpression(t.thisExpression(), t.identifier('contractAddress')),
-                                                        t.objectExpression([
-                                                            // props
-                                                            t.objectProperty(
-                                                                t.identifier('owner'),
-                                                                t.identifier('owner'),
-                                                                false,
-                                                                true
-                                                            ),
-
-                                                            t.objectProperty(
-                                                                t.identifier('spender'),
-                                                                t.identifier('spender'),
-                                                                false,
-                                                                true
-                                                            ),
-
-                                                        ])
-                                                    ]
-                                                )
-                                            )
-                                        ]
-                                    ),
-                                    t.tsTypeAnnotation(
-                                        t.tsTypeReference(
-                                            t.identifier('Promise'),
-                                            t.tsTypeParameterInstantiation(
-                                                [
-                                                    t.tSTypeReference(
-                                                        t.identifier('ApprovalResponse')
-                                                    )
-                                                ]
-                                            )
-                                        )
-                                    ),
-                                    true
-                                )
-                            )
-
-                        ],
-                        [
-                            t.tSExpressionWithTypeArguments(
-                                t.identifier('SG721ReadOnlyInstance')
-                            )
-                        ])
-                ),
-
-
-
-
-
-            ]
-        )
-    )
-
-});
-
-it('mutation classes', async () => {
-    expectCode(
-        t.program(
-            [
-
-                t.exportNamedDeclaration(
-                    classDeclaration('SG721Client',
-                        [
-                            // client
-                            classProperty('client', t.tsTypeAnnotation(
-                                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
-                            )),
-
-                            // contractAddress
-                            classProperty('contractAddress', t.tsTypeAnnotation(
-                                t.tsStringKeyword()
-                            )),
-
-                            // constructor
-                            t.classMethod('constructor',
-                                t.identifier('constructor'),
-                                [
-                                    typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))),
-                                    typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))
-                                ],
-                                t.blockStatement(
-                                    [
-                                        // super()
-                                        t.expressionStatement(t.callExpression(
-                                            t.super(),
-                                            [
-                                                t.identifier('client'),
-                                                t.identifier('contractAddress')
-                                            ]
-                                        )),
-
-                                        // 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
-                                        bindMethod('approval'),
-                                        bindMethod('otherProp'),
-                                        bindMethod('hello'),
-                                        bindMethod('mintme')
-                                    ]
-                                )),
-
-                            // methods:
-                            t.classProperty(
-                                t.identifier('mint'),
-                                arrowFunctionExpression(
-                                    [
-                                        // props
-                                        typedIdentifier('sender', t.tsTypeAnnotation(
-                                            t.tsStringKeyword()
-                                        )),
-                                        typedIdentifier('tokenId', t.tsTypeAnnotation(
-                                            t.tsStringKeyword()
-                                        )),
-                                        typedIdentifier('owner', t.tsTypeAnnotation(
-                                            t.tsStringKeyword()
-                                        )),
-                                        typedIdentifier('token_uri', t.tsTypeAnnotation(
-                                            t.tsStringKeyword()
-                                        ))
-                                    ],
-                                    t.blockStatement(
-                                        [
-                                            t.returnStatement(
-                                                t.awaitExpression(
-                                                    t.callExpression(
-                                                        t.memberExpression(
-                                                            t.memberExpression(
-                                                                t.thisExpression(),
-                                                                t.identifier('client')
-                                                            ),
-                                                            t.identifier('execute')
-                                                        ),
-                                                        [
-                                                            t.identifier('sender'),
-                                                            t.memberExpression(
-                                                                t.thisExpression(),
-                                                                t.identifier('contractAddress')
-                                                            ),
-                                                            t.objectExpression(
-                                                                [
-                                                                    t.objectProperty(
-                                                                        t.identifier('mint'),
-                                                                        t.objectExpression([
-                                                                            t.objectProperty(
-                                                                                t.identifier('token_id'),
-                                                                                t.identifier('tokenId')
-                                                                            ),
-                                                                            t.objectProperty(
-                                                                                t.identifier('owner'),
-                                                                                t.identifier('owner')
-                                                                            ),
-                                                                            t.objectProperty(
-                                                                                t.identifier('token_uri'),
-                                                                                t.identifier('token_uri')
-                                                                            ),
-                                                                            t.objectProperty(
-                                                                                t.identifier('expression'),
-                                                                                t.objectExpression([])
-                                                                            )
-                                                                        ])
-                                                                    )
-
-                                                                ]
-                                                            ),
-                                                            t.stringLiteral('auto')
-                                                        ]
-                                                    )
-                                                )
-                                            )
-                                        ]
-                                    ),
-                                    // return type
-                                    t.tsTypeAnnotation(
-                                        t.tsTypeReference(
-                                            t.identifier('Promise'),
-                                            t.tsTypeParameterInstantiation(
-                                                [
-                                                    t.tSTypeReference(
-                                                        t.identifier('ExecuteResult')
-                                                    )
-                                                ]
-                                            )
-                                        )
-                                    ),
-                                    true
-                                )
-                            )
-
-                        ],
-                        [
-                            t.tSExpressionWithTypeArguments(
-                                t.identifier('SG721ReadOnlyInstance')
-                            )
-                        ],
-                        t.identifier('SG721QueryClient')
-                    )
-                ),
-
-
-
-
-
-            ]
-        )
-    )
-
-});
-
-it('object parms', () => {
-
-    const obj = t.objectPattern(
-        [
-            t.objectProperty(
-                t.identifier('includeExpired'),
-                t.identifier('includeExpired'),
-                false,
-                true
-            ),
-            t.objectProperty(
-                t.identifier('tokenId'),
-                t.identifier('tokenId'),
-                false,
-                true
-            )
-        ]
-    );
-    obj.typeAnnotation = t.tsTypeAnnotation(
-        t.tsTypeLiteral(
-            [
-                t.tsPropertySignature(
-                    t.identifier('includeExpired'),
-                    t.tsTypeAnnotation(
-                        t.tsBooleanKeyword()
-                    )
-                ),
-                t.tsPropertySignature(
-                    t.identifier('tokenId'),
-                    t.tsTypeAnnotation(
-                        t.tsStringKeyword()
-                    )
-                )
-            ]
-        )
-    )
-    expectCode(
-        t.program(
-            [
-                t.expressionStatement(
-                    t.assignmentExpression(
-                        '=',
-                        t.identifier('ownerOf'),
-                        arrowFunctionExpression(
-                            [
-                                obj
-                            ],
-                            t.blockStatement(
-                                [
-                                    // body
-                                ],
-                                []
-                            ),
-                            t.tsTypeAnnotation(
-                                t.tsTypeReference(
-                                    t.identifier('Promise'),
-                                    t.tsTypeParameterInstantiation(
-                                        [
-                                            t.tsTypeReference(
-                                                t.identifier('OwnerOfResponse')
-                                            )
-                                        ]
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            ]
-        )
-    );
-})
diff --git a/packages/wasm-ast-types/src/utils/babel.ts b/packages/wasm-ast-types/src/utils/babel.ts
index 93e68dee..e61e547f 100644
--- a/packages/wasm-ast-types/src/utils/babel.ts
+++ b/packages/wasm-ast-types/src/utils/babel.ts
@@ -1,8 +1,9 @@
 import * as t from '@babel/types';
 import { snake } from "case";
-import { Field, QueryMsg, ExecuteMsg } from '../types';
+import { Field } from '@cosmology/ts-codegen-types';
 import { TSTypeAnnotation, TSExpressionWithTypeArguments, Noop, TypeAnnotation } from '@babel/types';
 import { refLookup } from './ref';
+import { JSONSchema } from '@cosmology/ts-codegen-types';
 
 // t.TSPropertySignature - kind?
 export const propertySignature = (
@@ -13,7 +14,7 @@ export const propertySignature = (
     return {
         type: 'TSPropertySignature',
         key: t.identifier(name),
-      kind: 'get',
+        kind: 'get',
         typeAnnotation,
         optional
     }
@@ -32,25 +33,25 @@ export const tsTypeOperator = (typeAnnotation: t.TSType, operator: string) => {
     return obj;
 };
 
-export const getMessageProperties = (msg) => {
-    let results = [];
-    let objs = [];
+export const getMessageProperties = (msg: JSONSchema): JSONSchema[] => {
+    let results: JSONSchema[] = [];
+    let objs: JSONSchema[] = [];
     if (msg.anyOf) { objs = msg.anyOf; }
     else if (msg.oneOf) { objs = msg.oneOf; }
     else if (msg.allOf) { objs = msg.allOf; }
 
     for (const obj of objs) {
-      if(obj.properties){
-        results.push(obj);
-      } else{
-        if(obj.$ref){
-          const ref = refLookup(obj.$ref, msg)
+        if (obj.properties) {
+            results.push(obj);
+        } else {
+            if (obj.$ref) {
+                const ref = refLookup(obj.$ref, msg)
 
-          const refProps = getMessageProperties(ref);
+                const refProps = getMessageProperties(ref);
 
-          results = [...results, ...refProps];
+                results = [...results, ...refProps];
+            }
         }
-      }
     }
 
     return results;
@@ -118,7 +119,7 @@ export const typedIdentifier = (name: string, typeAnnotation: TSTypeAnnotation,
     return type;
 }
 
-export const promiseTypeAnnotation = (name) => {
+export const promiseTypeAnnotation = (name: string): t.TSTypeAnnotation => {
     return t.tsTypeAnnotation(
         t.tsTypeReference(
             t.identifier('Promise'),
@@ -132,14 +133,14 @@ export const promiseTypeAnnotation = (name) => {
 }
 
 export const abstractClassDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
-  const declaration = classDeclaration(
-    name,
-    body,
-    implementsExressions,
-    superClass
-  );
-  declaration.abstract = true
-  return declaration;
+    const declaration = classDeclaration(
+        name,
+        body,
+        implementsExressions,
+        superClass
+    );
+    declaration.abstract = true
+    return declaration;
 };
 
 export const classDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
@@ -182,7 +183,7 @@ export const arrowFunctionExpression = (
 };
 
 
-export const recursiveNamespace = (names, moduleBlockBody) => {
+export const recursiveNamespace = (names: string[], moduleBlockBody: any): t.ExportNamedDeclaration[] => {
     if (!names || !names.length) return moduleBlockBody;
     const name = names.pop();
     const body = [
@@ -196,7 +197,7 @@ export const recursiveNamespace = (names, moduleBlockBody) => {
     return body;
 };
 
-export const arrayTypeNDimensions = (body, n) => {
+export const arrayTypeNDimensions = (body: any, n: number): t.TSArrayType => {
     if (!n) return t.tsArrayType(body);
     return t.tsArrayType(
         arrayTypeNDimensions(body, n - 1)
@@ -207,8 +208,9 @@ export const FieldTypeAsts = {
     string: () => {
         return t.tsStringKeyword()
     },
-    array: (type) => {
-        return t.tsArrayType(FieldTypeAsts[type]())
+    array: (type: 'string' | 'Duration' | 'Height' | 'Coin' | 'Long'): t.TSArrayType => {
+        const result = FieldTypeAsts[type]();
+        return t.tsArrayType(result)
     },
     Duration: () => {
         return t.tsTypeReference(t.identifier('Duration'))
@@ -224,17 +226,17 @@ export const FieldTypeAsts = {
     }
 };
 
-export const shorthandProperty = (prop: string) => {
+export const shorthandProperty = (prop: string): t.ObjectProperty => {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
 };
 
-export const importStmt = (names: string[], path: string) => {
+export const importStmt = (names: string[], path: string): t.ImportDeclaration => {
     return t.importDeclaration(
         names.map(name => t.importSpecifier(t.identifier(name), t.identifier(name))),
         t.stringLiteral(path));
 };
 
-export const importAs = (name: string, importAs: string, importPath: string) => {
+export const importAs = (name: string, importAs: string, importPath: string): t.ImportDeclaration => {
     return t.importDeclaration(
         [
             t.importSpecifier(
@@ -246,7 +248,7 @@ export const importAs = (name: string, importAs: string, importPath: string) =>
     )
 };
 
-export const importAminoMsg = () => {
+export const importAminoMsg = (): t.ImportDeclaration => {
     return importStmt(['AminoMsg'], '@cosmjs/amino');
 };
 
@@ -265,7 +267,7 @@ export const getFieldDimensionality = (field: Field) => {
     };
 }
 
-export const memberExpressionOrIdentifier = (names) => {
+export const memberExpressionOrIdentifier = (names: string[]): t.MemberExpression | t.Identifier => {
     if (names.length === 1) {
         return t.identifier(names[0])
     }
@@ -284,7 +286,7 @@ export const memberExpressionOrIdentifier = (names) => {
     )
 };
 
-export const memberExpressionOrIdentifierSnake = (names) => {
+export const memberExpressionOrIdentifierSnake = (names: string[]): t.MemberExpression | t.Identifier => {
     if (names.length === 1) {
         return t.identifier(snake(names[0]))
     }
diff --git a/packages/wasm-ast-types/src/utils/ref.ts b/packages/wasm-ast-types/src/utils/ref.ts
index 8c720289..1a6e8587 100644
--- a/packages/wasm-ast-types/src/utils/ref.ts
+++ b/packages/wasm-ast-types/src/utils/ref.ts
@@ -1,6 +1,6 @@
-import { JSONSchema } from "../types";
+import { JSONSchema } from "@cosmology/ts-codegen-types";
 
-export const refLookup = ($ref: string, schema: JSONSchema) => {
+export const refLookup = ($ref: string, schema: JSONSchema): JSONSchema => {
   const refName = $ref.replace('#/definitions/', '')
   return schema.definitions?.[refName];
 }
\ No newline at end of file
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/wasm-ast-types/src/utils/types.ts
index 8693107d..b88f59f1 100644
--- a/packages/wasm-ast-types/src/utils/types.ts
+++ b/packages/wasm-ast-types/src/utils/types.ts
@@ -1,9 +1,8 @@
 import * as t from '@babel/types';
-import { camel, pascal, snake } from 'case';
+import { camel, pascal } from 'case';
 import { propertySignature } from './babel';
-import { TSTypeAnnotation } from '@babel/types';
 import { RenderContext } from '../context';
-import { JSONSchema } from '../types';
+import { JSONSchema } from '@cosmology/ts-codegen-types';
 
 export function getResponseType(
   context: RenderContext,
@@ -18,24 +17,24 @@ export function getResponseType(
   );
 };
 
-const getTypeStrFromRef = ($ref) => {
+const getTypeStrFromRef = ($ref: string): string => {
   if ($ref?.startsWith('#/definitions/')) {
     return $ref.replace('#/definitions/', '');
   }
   throw new Error('what is $ref: ' + $ref);
 }
 
-export const getTypeFromRef = ($ref) => {
+export const getTypeFromRef = ($ref: string) => {
   return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)))
 }
 
-const getArrayTypeFromRef = ($ref) => {
+const getArrayTypeFromRef = ($ref: string) => {
   return t.tsArrayType(
     getTypeFromRef($ref)
   );
 }
 
-const getTypeOrRef = (obj) => {
+const getTypeOrRef = (obj: JSONSchema): t.TSType => {
   if (obj.type) {
     return getType(obj.type)
   }
@@ -45,18 +44,15 @@ const getTypeOrRef = (obj) => {
   throw new Error('contact maintainers cannot find type for ' + obj)
 }
 
-const getArrayTypeFromItems = (items) => {
-  // passing in [{"type":"string"}]
+
+const getArrayTypeFromItems = (items: JSONSchema | JSONSchema[]): t.TSArrayType => {
   if (Array.isArray(items)) {
-    if (items[0]?.type === 'array') {
-      return getArrayTypeFromItems(
-        items[0]
-      );
-    }
     return t.tsArrayType(
-      t.tsArrayType(
-        getTypeOrRef(items[0])
-      )
+      t.tsTupleType(items.map(item => getTypeOrRef(item)))
+    );
+  } else if (items.type === 'array' && items.items) {
+    return t.tsArrayType(
+      getArrayTypeFromItems(items.items)
     );
   }
 
@@ -79,11 +75,10 @@ const getArrayTypeFromItems = (items) => {
     }
   }
 
-
   return t.tsArrayType(
     getType(detect.type)
   );
-}
+};
 
 
 export const detectType = (type: string | string[]) => {
diff --git a/packages/wasm-ast-types/test-utils/fixtures.ts b/packages/wasm-ast-types/test-utils/fixtures.ts
new file mode 100644
index 00000000..c7769c0b
--- /dev/null
+++ b/packages/wasm-ast-types/test-utils/fixtures.ts
@@ -0,0 +1,17 @@
+// @ts-nocheck
+import { JSONSchema } from '../src/types';
+
+import canExecuteRelayResponseData from '../../../__fixtures__/vectis/govec/can_execute_relay_response.json';
+import cosmosMsgForEmptyData from '../../../__fixtures__/vectis/govec/cosmos_msg_for__empty.json';
+import executeMsgForEmptyData from '../../../__fixtures__/vectis/govec/execute_msg_for__empty.json';
+import infoResponseData from '../../../__fixtures__/vectis/govec/info_response.json';
+import relayTransactionData from '../../../__fixtures__/vectis/govec/relay_transaction.json';
+
+import nftIdlVersionData from '../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
+
+export const nftIdlVersion: JSONSchema = nftIdlVersionData;
+export const vectisCanExecuteRelayResponse: JSONSchema = canExecuteRelayResponseData;
+export const vectisCosmosMsgForEmpty: JSONSchema = cosmosMsgForEmptyData;
+export const vectisExecuteMsgForEmpty: JSONSchema = executeMsgForEmptyData;
+export const vectisInfoResponse: JSONSchema = infoResponseData;
+export const vectisRelayTransaction: JSONSchema = relayTransactionData;
diff --git a/packages/wasm-ast-types/test-utils/index.ts b/packages/wasm-ast-types/test-utils/index.ts
index 1d489368..04bca77e 100644
--- a/packages/wasm-ast-types/test-utils/index.ts
+++ b/packages/wasm-ast-types/test-utils/index.ts
@@ -1,40 +1 @@
-import generate from '@babel/generator';
-import { sync as glob } from 'glob';
-import { readFileSync } from 'fs';
-import { join } from 'path';
-import { JSONSchema } from '../src/types';
-import { RenderContext, RenderOptions } from '../src/context';
-
-export const expectCode = (ast) => {
-    expect(
-        generate(ast).code
-    ).toMatchSnapshot();
-}
-
-export const printCode = (ast) => {
-    console.log(
-        generate(ast).code
-    );
-}
-
-export const makeContext = (
-    schema: JSONSchema,
-    options?: RenderOptions,
-    responses?: Record<string, JSONSchema>
-) => {
-    return new RenderContext({
-        schemas: [schema],
-        responses
-    }, options)
-};
-
-interface GlobContract {
-    name: `/${string}.json`;
-    content: JSONSchema;
-}
-
-export const globContracts = (p: string): GlobContract[] => {
-    return glob(join(__dirname, '/../../../__fixtures__/', p, '/*.json')).map(file => {
-        return { name: file.split('__fixtures__')[1], content: JSON.parse(readFileSync(file, 'utf-8')) }
-    });
-};
+export * from './utils';
diff --git a/packages/wasm-ast-types/test-utils/utils.ts b/packages/wasm-ast-types/test-utils/utils.ts
new file mode 100644
index 00000000..28b283da
--- /dev/null
+++ b/packages/wasm-ast-types/test-utils/utils.ts
@@ -0,0 +1,42 @@
+import generate from '@babel/generator';
+import { sync as glob } from 'glob';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { JSONSchema } from '../src/types';
+import { RenderContext, RenderOptions } from '../src/context';
+
+export const expectCode = (ast: any): void => {
+  expect(
+    generate(ast).code
+  ).toMatchSnapshot();
+}
+
+export const printCode = (ast: any): void => {
+  console.log(
+    generate(ast).code
+  );
+}
+
+export const makeContext = (
+  schema: JSONSchema,
+  options?: RenderOptions,
+  responses?: Record<string, JSONSchema>
+) => {
+  return new RenderContext({
+    schemas: [schema],
+    responses
+  }, options)
+};
+
+interface GlobContract {
+  name: `/${string}.json`;
+  content: JSONSchema;
+}
+
+export const globContracts = (p: string): GlobContract[] => {
+  // @ts-ignore
+  const contracts: GlobContract[] = glob(join(__dirname, '/../../../__fixtures__/', p, '/*.json')).map(file => {
+    return { name: file.split('__fixtures__')[1], content: JSON.parse(readFileSync(file, 'utf-8')) }
+  });
+  return contracts;
+};
diff --git a/packages/wasm-ast-types/tsconfig.esm.json b/packages/wasm-ast-types/tsconfig.esm.json
new file mode 100644
index 00000000..800d7506
--- /dev/null
+++ b/packages/wasm-ast-types/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/esm",
+    "module": "es2022",
+    "rootDir": "src/",
+    "declaration": false
+  }
+}
diff --git a/packages/wasm-ast-types/tsconfig.json b/packages/wasm-ast-types/tsconfig.json
index 88828ac5..87d14d59 100644
--- a/packages/wasm-ast-types/tsconfig.json
+++ b/packages/wasm-ast-types/tsconfig.json
@@ -1,20 +1,9 @@
 {
-    "compilerOptions": {
-        "allowJs": true,
-        "declaration": true,
-        "declarationDir": "./types",
-        "emitDeclarationOnly": true,
-        "esModuleInterop": true,
-        "isolatedModules": true,
-        "resolveJsonModule": true
-    },
-    "include": [
-        "src/**/*"
-    ],
-    "exclude": [
-        "node_modules",
-        "test-utils",
-        "src/**/*.spec.ts",
-        "src/**/*.test.ts"
-    ]
-}
\ No newline at end of file
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src/"
+  },
+  "include": ["src/**/*.ts", "__tests__/babel/babel.spec.ts", "__tests__/recoil/recoil.spec.ts", "__tests__/provider/provider.spec.ts"],
+  "exclude": ["dist", "node_modules", "**/*.spec.*", "**/*.test.*"]
+}
diff --git a/packages/wasm-ast-types/types/client/client.d.ts b/packages/wasm-ast-types/types/client/client.d.ts
deleted file mode 100644
index bc1e484a..00000000
--- a/packages/wasm-ast-types/types/client/client.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as t from '@babel/types';
-import { ExecuteMsg, JSONSchema, QueryMsg } from '../types';
-import { RenderContext } from '../context';
-export declare const CONSTANT_EXEC_PARAMS: (t.AssignmentPattern | t.Identifier)[];
-export declare const createWasmQueryMethod: (context: RenderContext, jsonschema: any) => t.ClassProperty;
-export declare const createQueryClass: (context: RenderContext, className: string, implementsClassName: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration;
-export declare const getWasmMethodArgs: (context: RenderContext, jsonschema: JSONSchema) => t.ObjectProperty[];
-export declare const createWasmExecMethod: (context: RenderContext, jsonschema: JSONSchema) => t.ClassProperty;
-export declare const createExecuteClass: (context: RenderContext, className: string, implementsClassName: string, extendsClassName: string | null, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
-export declare const createExecuteInterface: (context: RenderContext, className: string, extendsClassName: string | null, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
-export declare const createPropertyFunctionWithObjectParams: (context: RenderContext, methodName: string, responseType: string, jsonschema: JSONSchema) => t.TSPropertySignature;
-export declare const createPropertyFunctionWithObjectParamsForExec: (context: RenderContext, methodName: string, responseType: string, jsonschema: JSONSchema) => t.TSPropertySignature;
-export declare const createQueryInterface: (context: RenderContext, className: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration;
-export declare const createTypeOrInterface: (context: RenderContext, Type: string, jsonschema: JSONSchema) => t.ExportNamedDeclaration;
-export declare const createTypeInterface: (context: RenderContext, jsonschema: JSONSchema) => t.ExportNamedDeclaration;
diff --git a/packages/wasm-ast-types/types/client/index.d.ts b/packages/wasm-ast-types/types/client/index.d.ts
deleted file mode 100644
index 4f1cce44..00000000
--- a/packages/wasm-ast-types/types/client/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './client';
diff --git a/packages/wasm-ast-types/types/context/context.d.ts b/packages/wasm-ast-types/types/context/context.d.ts
deleted file mode 100644
index 654e43d8..00000000
--- a/packages/wasm-ast-types/types/context/context.d.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { JSONSchema } from "../types";
-import { UtilMapping } from "./imports";
-export interface ReactQueryOptions {
-    enabled?: boolean;
-    optionalClient?: boolean;
-    version?: 'v3' | 'v4';
-    mutations?: boolean;
-    camelize?: boolean;
-    queryKeys?: boolean;
-    queryFactory?: boolean;
-}
-export interface TSClientOptions {
-    enabled?: boolean;
-    execExtendsQuery?: boolean;
-    noImplicitOverride?: boolean;
-}
-export interface MessageComposerOptions {
-    enabled?: boolean;
-}
-export interface MessageBuilderOptions {
-    enabled?: boolean;
-}
-export interface RecoilOptions {
-    enabled?: boolean;
-}
-export interface TSTypesOptions {
-    enabled?: boolean;
-    aliasExecuteMsg?: boolean;
-    aliasEntryPoints?: boolean;
-}
-interface KeyedSchema {
-    [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;
-}
-export interface ContractInfo {
-    schemas: JSONSchema[];
-    responses?: Record<string, JSONSchema>;
-    idlObject?: IDLObject;
-}
-export interface RenderOptions {
-    enabled?: boolean;
-    types?: TSTypesOptions;
-    recoil?: RecoilOptions;
-    messageComposer?: MessageComposerOptions;
-    messageBuilder?: MessageBuilderOptions;
-    client?: TSClientOptions;
-    reactQuery?: ReactQueryOptions;
-}
-export interface ProviderInfo {
-    classname: string;
-    filename: string;
-    basename: string;
-}
-export interface IContext {
-    refLookup($ref: string): any;
-    addUtil(util: string): any;
-    getImports(registeredUtils?: UtilMapping, filepath?: string): any;
-}
-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;
-        };
-    };
-}
-export declare const defaultOptions: RenderOptions;
-export declare const getDefinitionSchema: (schemas: JSONSchema[]) => JSONSchema;
-export declare class BuilderContext {
-    providers: {
-        [key: string]: {
-            [key: string]: ProviderInfo;
-        };
-    };
-    addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
-    getProviderInfos(): {
-        [key: string]: {
-            [key: string]: ProviderInfo;
-        };
-    };
-}
-/**
- * context object for generating code.
- * only mergeDefaultOpt needs to implementing for combine options and default options.
- * @param TOpt option type
- */
-export declare 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);
-    /**
-     * merge options and default options
-     * @param options
-     */
-    abstract mergeDefaultOpt(options: TOpt): TOpt;
-    refLookup($ref: string): JSONSchema;
-    addUtil(util: string): void;
-    addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
-    getProviderInfos(): {
-        [key: string]: {
-            [key: string]: ProviderInfo;
-        };
-    };
-    getImports(registeredUtils?: UtilMapping, filepath?: string): any;
-}
-export declare class RenderContext extends RenderContextBase {
-    mergeDefaultOpt(options: RenderOptions): RenderOptions;
-}
-export {};
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
deleted file mode 100644
index 55ca6708..00000000
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { RenderContext } from './context';
-export interface ImportObj {
-    type: 'import' | 'default' | 'namespace';
-    name: string;
-    path: string;
-    importAs?: string;
-}
-export declare type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
-export declare type UtilMapping = {
-    [key: string]: ImportObj | string | GetUtilFn;
-};
-export declare const UTILS: {
-    selectorFamily: string;
-    MsgExecuteContract: string;
-    MsgExecuteContractEncodeObject: string;
-    Coin: string;
-    toUtf8: string;
-    StdFee: string;
-    CosmWasmClient: string;
-    ExecuteResult: string;
-    SigningCosmWasmClient: string;
-    useQuery: (context: RenderContext) => {
-        type: string;
-        path: string;
-        name: any;
-    };
-    UseQueryOptions: (context: RenderContext) => {
-        type: string;
-        path: string;
-        name: any;
-    };
-    useMutation: (context: RenderContext) => {
-        type: string;
-        path: string;
-        name: any;
-    };
-    UseMutationOptions: (context: RenderContext) => {
-        type: string;
-        path: string;
-        name: any;
-    };
-};
-export declare const UTIL_HELPERS: string[];
-export declare const convertUtilsToImportList: (context: RenderContext, utils: string[], registeredUtils?: UtilMapping) => ImportObj[];
-export declare const convertUtil: (context: RenderContext, util: string, registeredUtils: object) => ImportObj;
-export declare const getImportStatements: (list: ImportObj[], filepath?: string) => any[];
-export declare const getRelativePath: (f1: string, f2: string) => string;
diff --git a/packages/wasm-ast-types/types/context/index.d.ts b/packages/wasm-ast-types/types/context/index.d.ts
deleted file mode 100644
index 6a003172..00000000
--- a/packages/wasm-ast-types/types/context/index.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './context';
-export * from './imports';
diff --git a/packages/wasm-ast-types/types/index.d.ts b/packages/wasm-ast-types/types/index.d.ts
deleted file mode 100644
index 0c135b31..00000000
--- a/packages/wasm-ast-types/types/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './utils';
-export * from './client';
-export * from './context';
-export * from './recoil';
-export * from './message-composer';
-export * from './react-query';
-export * from './types';
-export * from './message-builder';
-export * from './provider';
diff --git a/packages/wasm-ast-types/types/message-builder/index.d.ts b/packages/wasm-ast-types/types/message-builder/index.d.ts
deleted file mode 100644
index e054b30f..00000000
--- a/packages/wasm-ast-types/types/message-builder/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './message-builder';
diff --git a/packages/wasm-ast-types/types/message-builder/message-builder.d.ts b/packages/wasm-ast-types/types/message-builder/message-builder.d.ts
deleted file mode 100644
index 79ac38d1..00000000
--- a/packages/wasm-ast-types/types/message-builder/message-builder.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-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;
diff --git a/packages/wasm-ast-types/types/message-composer/index.d.ts b/packages/wasm-ast-types/types/message-composer/index.d.ts
deleted file mode 100644
index cd64f6f4..00000000
--- a/packages/wasm-ast-types/types/message-composer/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './message-composer';
diff --git a/packages/wasm-ast-types/types/message-composer/message-composer.d.ts b/packages/wasm-ast-types/types/message-composer/message-composer.d.ts
deleted file mode 100644
index d59abd82..00000000
--- a/packages/wasm-ast-types/types/message-composer/message-composer.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as t from '@babel/types';
-import { ExecuteMsg } from '../types';
-import { RenderContext } from '../context';
-export declare const createMessageComposerClass: (context: RenderContext, className: string, implementsClassName: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
-export declare const createMessageComposerInterface: (context: RenderContext, className: string, execMsg: ExecuteMsg) => t.ExportNamedDeclaration;
diff --git a/packages/wasm-ast-types/types/provider/index.d.ts b/packages/wasm-ast-types/types/provider/index.d.ts
deleted file mode 100644
index 03be03e5..00000000
--- a/packages/wasm-ast-types/types/provider/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './provider';
diff --git a/packages/wasm-ast-types/types/provider/provider.d.ts b/packages/wasm-ast-types/types/provider/provider.d.ts
deleted file mode 100644
index 9d89a784..00000000
--- a/packages/wasm-ast-types/types/provider/provider.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as t from "@babel/types";
-import { ProviderInfo } from "../context";
-export declare const createProvider: (name: string, providerInfos: {
-    [key: string]: ProviderInfo;
-}) => t.ExportNamedDeclaration;
-export declare const createIContractsContext: (providerInfos: {
-    [key: string]: {
-        [key: string]: ProviderInfo;
-    };
-}) => t.ExportNamedDeclaration;
-export declare const createProperty: (name: string, providerInfos: {
-    [key: string]: ProviderInfo;
-}) => t.TSTypeElement;
-export declare const createGettingProviders: (providerInfos: {
-    [key: string]: {
-        [key: string]: ProviderInfo;
-    };
-}) => t.ExportNamedDeclaration;
diff --git a/packages/wasm-ast-types/types/react-query/index.d.ts b/packages/wasm-ast-types/types/react-query/index.d.ts
deleted file mode 100644
index 82818ecb..00000000
--- a/packages/wasm-ast-types/types/react-query/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './react-query';
diff --git a/packages/wasm-ast-types/types/react-query/react-query.d.ts b/packages/wasm-ast-types/types/react-query/react-query.d.ts
deleted file mode 100644
index 0684ece4..00000000
--- a/packages/wasm-ast-types/types/react-query/react-query.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as t from '@babel/types';
-import { ExecuteMsg, QueryMsg } from '../types';
-import { RenderContext } from '../context';
-import { JSONSchema } from '../types';
-interface ReactQueryHookQuery {
-    context: RenderContext;
-    hookName: string;
-    hookParamsTypeName: string;
-    hookKeyName: string;
-    queryKeysName: string;
-    responseType: string;
-    methodName: string;
-    jsonschema: any;
-}
-interface ReactQueryHooks {
-    context: RenderContext;
-    queryMsg: QueryMsg;
-    contractName: string;
-    QueryClient: string;
-}
-export declare const createReactQueryHooks: ({ context, queryMsg, contractName, QueryClient }: ReactQueryHooks) => any[];
-export declare const createReactQueryHook: ({ context, hookName, hookParamsTypeName, responseType, hookKeyName, queryKeysName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
-interface ReactQueryMutationHookInterface {
-    context: RenderContext;
-    ExecuteClient: string;
-    mutationHookParamsTypeName: string;
-    jsonschema: JSONSchema;
-    useMutationTypeParameter: t.TSTypeParameterInstantiation;
-}
-/**
- * Example:
-```
- export interface Cw721RevokeMutation {
-  client: Cw721Client;
-  msg: {
-    spender: string;
-    tokenId: string;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-```
- */
-export declare const createReactQueryMutationArgsInterface: ({ context, ExecuteClient, mutationHookParamsTypeName, useMutationTypeParameter, jsonschema }: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
-interface ReactQueryMutationHooks {
-    context: RenderContext;
-    execMsg: ExecuteMsg;
-    contractName: string;
-    ExecuteClient: string;
-}
-export declare const createReactQueryMutationHooks: ({ context, execMsg, contractName, ExecuteClient }: ReactQueryMutationHooks) => any;
-interface ReactQueryMutationHook {
-    context: RenderContext;
-    mutationHookName: string;
-    mutationHookParamsTypeName: string;
-    execMethodName: string;
-    useMutationTypeParameter: t.TSTypeParameterInstantiation;
-    hasMsg: boolean;
-}
-/**
- *
- * Example:
-```
-export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateMembersMutation, 'args'>) =>
-  useMutation<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>(
-    ({ args }) => client.updateMembers(args),
-    options
-  )
-```
- */
-export declare const createReactQueryMutationHook: ({ context, mutationHookName, mutationHookParamsTypeName, execMethodName, useMutationTypeParameter, hasMsg }: ReactQueryMutationHook) => t.ExportNamedDeclaration;
-interface ReactQueryHookQueryInterface {
-    context: RenderContext;
-    QueryClient: string;
-    hookParamsTypeName: string;
-    queryInterfaceName: string;
-    responseType: string;
-    jsonschema: any;
-}
-export declare const createReactQueryHookInterface: ({ context, QueryClient, hookParamsTypeName, queryInterfaceName, responseType, jsonschema }: ReactQueryHookQueryInterface) => t.ExportNamedDeclaration;
-export {};
diff --git a/packages/wasm-ast-types/types/recoil/index.d.ts b/packages/wasm-ast-types/types/recoil/index.d.ts
deleted file mode 100644
index 6a1d327f..00000000
--- a/packages/wasm-ast-types/types/recoil/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './recoil';
diff --git a/packages/wasm-ast-types/types/recoil/recoil.d.ts b/packages/wasm-ast-types/types/recoil/recoil.d.ts
deleted file mode 100644
index e296e779..00000000
--- a/packages/wasm-ast-types/types/recoil/recoil.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as t from '@babel/types';
-import { QueryMsg } from '../types';
-import { RenderContext } from '../context';
-export declare const createRecoilSelector: (context: RenderContext, keyPrefix: string, QueryClient: string, methodName: string, responseType: string) => t.ExportNamedDeclaration;
-export declare const createRecoilSelectors: (context: RenderContext, keyPrefix: string, QueryClient: string, queryMsg: QueryMsg) => t.ExportNamedDeclaration[];
-export declare const createRecoilQueryClientType: () => {
-    type: string;
-    id: {
-        type: string;
-        name: string;
-    };
-    typeAnnotation: {
-        type: string;
-        members: {
-            type: string;
-            key: {
-                type: string;
-                name: string;
-            };
-            computed: boolean;
-            typeAnnotation: {
-                type: string;
-                typeAnnotation: {
-                    type: string;
-                };
-            };
-        }[];
-    };
-};
-export declare const createRecoilQueryClient: (context: RenderContext, keyPrefix: string, QueryClient: string) => t.ExportNamedDeclaration;
diff --git a/packages/wasm-ast-types/types/types.d.ts b/packages/wasm-ast-types/types/types.d.ts
deleted file mode 100644
index e8a763c2..00000000
--- a/packages/wasm-ast-types/types/types.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-export declare type fieldType = 'Long' | 'Coin' | 'Duration' | 'Height' | string;
-export interface Field {
-    name: string;
-    type: fieldType;
-    node: any;
-}
-export interface Interface {
-    name: string;
-    fields: Field[];
-}
-export interface QueryMsg {
-    $schema: string;
-    title: "QueryMsg";
-    oneOf?: any;
-    allOf?: any;
-    anyOf?: any;
-}
-export interface ExecuteMsg {
-    $schema: string;
-    title: "ExecuteMsg" | "ExecuteMsg_for_Empty";
-    oneOf?: any;
-    allOf?: any;
-    anyOf?: any;
-}
-export interface JSONSchema {
-    $ref?: string;
-    $schema?: string;
-    additionalProperties?: boolean;
-    allOf?: JSONSchema[];
-    anyOf?: JSONSchema[];
-    definitions?: Record<string, JSONSchema>;
-    description?: string;
-    oneOf?: JSONSchema[];
-    properties?: Record<string, JSONSchema>;
-    patternProperties?: Record<string, JSONSchema>;
-    items?: JSONSchema | JSONSchema[];
-    additionalItems?: JSONSchema;
-    required?: string[];
-    title?: string;
-    type?: string;
-}
diff --git a/packages/wasm-ast-types/types/utils/babel.d.ts b/packages/wasm-ast-types/types/utils/babel.d.ts
deleted file mode 100644
index c7a4ccb4..00000000
--- a/packages/wasm-ast-types/types/utils/babel.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import * as t from '@babel/types';
-import { Field } from '../types';
-import { TSTypeAnnotation, TSExpressionWithTypeArguments } from '@babel/types';
-export declare const propertySignature: (name: string, typeAnnotation: TSTypeAnnotation, optional?: boolean) => t.TSPropertySignature;
-export declare const identifier: (name: string, typeAnnotation: t.TSTypeAnnotation, optional?: boolean) => t.Identifier;
-export declare const tsTypeOperator: (typeAnnotation: t.TSType, operator: string) => t.TSTypeOperator;
-export declare const getMessageProperties: (msg: any) => any[];
-export declare const tsPropertySignature: (key: t.Expression, typeAnnotation: t.TSTypeAnnotation, optional: boolean) => t.TSPropertySignature;
-export declare const tsObjectPattern: (properties: (t.RestElement | t.ObjectProperty)[], typeAnnotation: t.TSTypeAnnotation) => t.ObjectPattern;
-export declare const callExpression: (callee: t.Expression | t.V8IntrinsicIdentifier, _arguments: (t.Expression | t.SpreadElement | t.ArgumentPlaceholder)[], typeParameters: t.TSTypeParameterInstantiation) => t.CallExpression;
-export declare const bindMethod: (name: string) => t.ExpressionStatement;
-export declare const typedIdentifier: (name: string, typeAnnotation: TSTypeAnnotation, optional?: boolean) => t.Identifier;
-export declare const promiseTypeAnnotation: (name: any) => t.TSTypeAnnotation;
-export declare const abstractClassDeclaration: (name: string, body: any[], implementsExressions?: TSExpressionWithTypeArguments[], superClass?: t.Identifier) => t.ClassDeclaration;
-export declare const classDeclaration: (name: string, body: any[], implementsExressions?: TSExpressionWithTypeArguments[], superClass?: t.Identifier) => t.ClassDeclaration;
-export declare const classProperty: (name: string, typeAnnotation?: TSTypeAnnotation, isReadonly?: boolean, isStatic?: boolean, noImplicitOverride?: boolean) => t.ClassProperty;
-export declare const arrowFunctionExpression: (params: (t.Identifier | t.Pattern | t.RestElement)[], body: t.BlockStatement, returnType: t.TSTypeAnnotation, isAsync?: boolean) => t.ArrowFunctionExpression;
-export declare const recursiveNamespace: (names: any, moduleBlockBody: any) => any;
-export declare const arrayTypeNDimensions: (body: any, n: any) => any;
-export declare const FieldTypeAsts: {
-    string: () => t.TSStringKeyword;
-    array: (type: any) => t.TSArrayType;
-    Duration: () => t.TSTypeReference;
-    Height: () => t.TSTypeReference;
-    Coin: () => t.TSTypeReference;
-    Long: () => t.TSTypeReference;
-};
-export declare const shorthandProperty: (prop: string) => t.ObjectProperty;
-export declare const importStmt: (names: string[], path: string) => t.ImportDeclaration;
-export declare const importAs: (name: string, importAs: string, importPath: string) => t.ImportDeclaration;
-export declare const importAminoMsg: () => t.ImportDeclaration;
-export declare const getFieldDimensionality: (field: Field) => {
-    typeName: string;
-    dimensions: number;
-    isArray: boolean;
-};
-export declare const memberExpressionOrIdentifier: (names: any) => any;
-export declare const memberExpressionOrIdentifierSnake: (names: any) => any;
-/**
- * If optional, return a conditional, otherwise just the expression
- */
-export declare const optionalConditionalExpression: (test: t.Expression, expression: t.Expression, alternate: t.Expression, optional?: boolean) => t.Expression;
-export declare const typeRefOrUnionWithUndefined: (identifier: t.Identifier, optional?: boolean) => t.TSType;
-export declare const parameterizedTypeReference: (identifier: string, from: t.TSType, omit: string | Array<string>) => t.TSTypeReference;
-/**
- * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....
- * Omit<Cw4UpdateMembersMutation, 'args'>
- */
-export declare const omitTypeReference: (from: t.TSType, omit: string | Array<string>) => t.TSTypeReference;
-export declare const pickTypeReference: (from: t.TSType, pick: string | Array<string>) => t.TSTypeReference;
diff --git a/packages/wasm-ast-types/types/utils/constants.d.ts b/packages/wasm-ast-types/types/utils/constants.d.ts
deleted file mode 100644
index 5910254f..00000000
--- a/packages/wasm-ast-types/types/utils/constants.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as t from '@babel/types';
-export declare const OPTIONAL_FUNDS_PARAM: t.Identifier;
-export declare const OPTIONAL_FEE_PARAM: t.Identifier;
-export declare const OPTIONAL_MEMO_PARAM: t.Identifier;
-export declare const FIXED_EXECUTE_PARAMS: t.Identifier[];
-export declare const PROVIDER_TYPES: {
-    SIGNING_CLIENT_TYPE: string;
-    QUERY_CLIENT_TYPE: string;
-    MESSAGE_COMPOSER_TYPE: string;
-    PROVIDER_TYPE: string;
-};
diff --git a/packages/wasm-ast-types/types/utils/index.d.ts b/packages/wasm-ast-types/types/utils/index.d.ts
deleted file mode 100644
index 29c1c58e..00000000
--- a/packages/wasm-ast-types/types/utils/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './babel';
-export * from './types';
-export * from './ref';
-export { OPTIONAL_FUNDS_PARAM } from './constants';
-export { FIXED_EXECUTE_PARAMS } from './constants';
-export { PROVIDER_TYPES } from './constants';
diff --git a/packages/wasm-ast-types/types/utils/ref.d.ts b/packages/wasm-ast-types/types/utils/ref.d.ts
deleted file mode 100644
index 30c8b2c1..00000000
--- a/packages/wasm-ast-types/types/utils/ref.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { JSONSchema } from "../types";
-export declare const refLookup: ($ref: string, schema: JSONSchema) => JSONSchema;
diff --git a/packages/wasm-ast-types/types/utils/types.d.ts b/packages/wasm-ast-types/types/utils/types.d.ts
deleted file mode 100644
index 297309dc..00000000
--- a/packages/wasm-ast-types/types/utils/types.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as t from '@babel/types';
-import { TSTypeAnnotation } from '@babel/types';
-import { RenderContext } from '../context';
-import { JSONSchema } from '../types';
-export declare function getResponseType(context: RenderContext, underscoreName: string): string;
-export declare const getTypeFromRef: ($ref: any) => t.TSTypeReference;
-export declare const detectType: (type: string | string[]) => {
-    type: string;
-    optional: boolean;
-};
-export declare const getTypeInfo: (info: JSONSchema) => {
-    type: any;
-    optional: any;
-};
-export declare const getType: (type: string) => t.TSBooleanKeyword | t.TSNumberKeyword | t.TSStringKeyword;
-export declare const getPropertyType: (context: RenderContext, schema: JSONSchema, prop: string) => {
-    type: any;
-    optional: boolean;
-};
-export declare function getPropertySignatureFromProp(context: RenderContext, jsonschema: JSONSchema, prop: string, camelize: boolean): t.TSPropertySignature;
-export declare const getParamsTypeAnnotation: (context: RenderContext, jsonschema: any, camelize?: boolean) => t.TSTypeAnnotation;
-export declare const createTypedObjectParams: (context: RenderContext, jsonschema: JSONSchema, camelize?: boolean) => (t.Identifier | t.Pattern | t.RestElement);
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..4c8a664f
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "strictNullChecks": false,
+    "skipLibCheck": true,
+    "sourceMap": false,
+    "declaration": true,
+    "resolveJsonModule": true,
+    "moduleResolution": "node"
+  },
+  "exclude": ["dist", "node_modules"]
+}
diff --git a/yarn.lock b/yarn.lock
index d9b1e18d..c556db3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4,20 +4,20 @@
 
 "@aashutoshrathi/word-wrap@^1.2.3":
   version "1.2.6"
-  resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
 "@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
-  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
 "@babel/cli@7.18.10":
   version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a"
   integrity sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.8"
@@ -31,22 +31,22 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.4.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.8.3":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3"
-  integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
   dependencies:
-    "@babel/highlight" "^7.22.10"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.9.6":
-  version "7.22.9"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
-  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.23.5":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
+  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
 "@babel/core@7.18.10":
   version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
   integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
@@ -65,53 +65,31 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz#aad442c7bcd1582252cb4576747ace35bc122f35"
-  integrity sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
+  integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.10"
-    "@babel/generator" "^7.22.10"
-    "@babel/helper-compilation-targets" "^7.22.10"
-    "@babel/helper-module-transforms" "^7.22.9"
-    "@babel/helpers" "^7.22.10"
-    "@babel/parser" "^7.22.10"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.10"
-    "@babel/types" "^7.22.10"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.4"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.24.4"
+    "@babel/parser" "^7.24.4"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.1"
+    "@babel/types" "^7.24.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
+    json5 "^2.2.3"
     semver "^6.3.1"
 
 "@babel/eslint-parser@^7.18.9":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.10.tgz#bfdf3d1b32ad573fe7c1c3447e0b485e3a41fd09"
-  integrity sha512-0J8DNPRXQRLeR9rPaUMM3fA+RbixjnVLe/MRMYCkp3hzgsSuxCHQ8NN8xQG1wIHKJ4a1DTROTvFJdW+B5/eOsg==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32"
+  integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
@@ -119,67 +97,67 @@
 
 "@babel/generator@7.18.12":
   version "7.18.12"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4"
   integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==
   dependencies:
     "@babel/types" "^7.18.10"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.18.10", "@babel/generator@^7.22.10", "@babel/generator@^7.7.2", "@babel/generator@^7.9.6":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz#c92254361f398e160645ac58831069707382b722"
-  integrity sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==
+"@babel/generator@^7.18.10", "@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
+  integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
   dependencies:
-    "@babel/types" "^7.22.10"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
   integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz#573e735937e99ea75ea30788b57eb52fab7468c9"
-  integrity sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
   dependencies:
-    "@babel/types" "^7.22.10"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.10", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.9.6":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz#01d648bbc25dd88f513d862ee0df27b7d4e67024"
-  integrity sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.5"
-    browserslist "^4.21.9"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz#dd2612d59eac45588021ac3d6fa976d08f4e95a3"
-  integrity sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3"
+  integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-replace-supers" "^7.24.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.9"
-  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6"
-  integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     regexpu-core "^5.3.1"
@@ -187,7 +165,7 @@
 
 "@babel/helper-define-polyfill-provider@^0.3.2", "@babel/helper-define-polyfill-provider@^0.3.3":
   version "0.3.3"
-  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
   integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
@@ -197,150 +175,151 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
-  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
-  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
   integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
-  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
+"@babel/helper-member-expression-to-functions@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
-  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.1":
+  version "7.24.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
+  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.0"
 
-"@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.9.0":
-  version "7.22.9"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
-  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
+"@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-simple-access" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
   integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
-  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
+  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
 
-"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5":
-  version "7.22.9"
-  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
-  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
+"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-wrap-function" "^7.22.9"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
-  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
+"@babel/helper-replace-supers@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1"
+  integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
   integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
   integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.18.10", "@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+"@babel/helper-string-parser@^7.18.10", "@babel/helper-string-parser@^7.23.4":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
-  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
-  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helper-wrap-function@^7.22.9":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz#d845e043880ed0b8c18bd194a12005cb16d2f614"
-  integrity sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.10"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
-"@babel/helpers@^7.18.9", "@babel/helpers@^7.22.10", "@babel/helpers@^7.9.6":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz#ae6005c539dfbcb5cd71fb51bfc8a52ba63bc37a"
-  integrity sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==
+"@babel/helpers@^7.18.9", "@babel/helpers@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
+  integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.10"
-    "@babel/types" "^7.22.10"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.1"
+    "@babel/types" "^7.24.0"
 
-"@babel/highlight@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7"
-  integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==
+"@babel/highlight@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
+  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
 "@babel/node@^7.18.10":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/node/-/node-7.22.10.tgz#865ef915633790b1e11c091896bb44ab36cd14b6"
-  integrity sha512-FpSgdjIPabpEetDxtKYAcXCs0qRh12S2D40rhpRoo0w5h7/7Tu2ZroaX99cbKFNDODiSs484sZ1q0kutJbZ2iQ==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.23.9.tgz#fc40dc371439f1a45535ebf515232f4f046ef7a9"
+  integrity sha512-/d4ju/POwlGIJlZ+NqWH1qu61wt6ZlTZZZutrK2MOSdaH1JCh726nLw/GSvAjG+LTY6CO9SsB8uWcttnFKm6yg==
   dependencies:
-    "@babel/register" "^7.22.5"
+    "@babel/register" "^7.23.7"
     commander "^4.0.1"
     core-js "^3.30.2"
     node-environment-flags "^1.0.5"
@@ -349,33 +328,33 @@
 
 "@babel/parser@7.18.11":
   version "7.18.11"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9"
   integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.22.10", "@babel/parser@^7.22.5", "@babel/parser@^7.9.6":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
-  integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
-  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz#b645d9ba8c2bc5b7af50f0fe949f9edbeb07c8cf"
+  integrity sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
-  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz#da8261f2697f0f41b0855b91d3a20a1fbfd271d3"
+  integrity sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.24.1"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.10", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
+"@babel/plugin-proposal-async-generator-functions@^7.18.10":
   version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
   integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -385,32 +364,24 @@
 
 "@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-properties@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-proposal-class-static-block@^7.18.6":
   version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
   integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.21.0"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.18.6", "@babel/plugin-proposal-dynamic-import@^7.8.3":
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
   integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -418,31 +389,23 @@
 
 "@babel/plugin-proposal-export-default-from@7.18.10":
   version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.18.10.tgz#091f4794dbce4027c03cf4ebc64d3fb96b75c206"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.18.10.tgz#091f4794dbce4027c03cf4ebc64d3fb96b75c206"
   integrity sha512-5H2N3R2aQFxkV4PIBUR/i7PUSwgTZjouJKzI8eKswfIjT0PhvzkPn0t0wIS5zn6maQuvtT0t1oHtMUz61LOuow==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-default-from" "^7.18.6"
 
-"@babel/plugin-proposal-export-default-from@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz#4cb7c2fdeaed490b60d9bfd3dc8a20f81f9c2e7c"
-  integrity sha512-PYtv2S2OdCdp7GSPDg5ndGZFm9DmWFvuLoS5nBxZCgOBggluLnhTScspJxng96alHQzPyrrHxvC9/w4bFuspeA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-export-default-from" "^7.8.3"
-
 "@babel/plugin-proposal-export-namespace-from@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
   integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.18.6", "@babel/plugin-proposal-json-strings@^7.8.3":
+"@babel/plugin-proposal-json-strings@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
   integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -450,23 +413,23 @@
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
   version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
   integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.18.6", "@babel/plugin-proposal-numeric-separator@^7.8.3":
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
   integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -474,7 +437,7 @@
 
 "@babel/plugin-proposal-object-rest-spread@7.18.9":
   version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
   integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
   dependencies:
     "@babel/compat-data" "^7.18.8"
@@ -483,18 +446,9 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.18.8"
 
-"@babel/plugin-proposal-object-rest-spread@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-
-"@babel/plugin-proposal-object-rest-spread@^7.18.9", "@babel/plugin-proposal-object-rest-spread@^7.9.6":
+"@babel/plugin-proposal-object-rest-spread@^7.18.9":
   version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
   integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
   dependencies:
     "@babel/compat-data" "^7.20.5"
@@ -503,17 +457,17 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6", "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
   integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.9.0":
+"@babel/plugin-proposal-optional-chaining@^7.18.9":
   version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
@@ -522,7 +476,7 @@
 
 "@babel/plugin-proposal-private-methods@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
@@ -530,7 +484,7 @@
 
 "@babel/plugin-proposal-private-property-in-object@^7.18.6":
   version "7.21.11"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
   integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -538,405 +492,366 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-bigint@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
   integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
   integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.18.6", "@babel/plugin-syntax-export-default-from@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.22.5.tgz#ac3a24b362a04415a017ab96b9b4483d0e2a6e44"
-  integrity sha512-ODAqWWXB/yReh/jVQDag/3/tl6lgBueQkk/TcfW/59Oykm4c8a55XloX0CTk2k2VJiFWMgHby9xNX29IbCv9dQ==
+"@babel/plugin-syntax-export-default-from@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.1.tgz#a92852e694910ae4295e6e51e87b83507ed5e6e8"
+  integrity sha512-cNXSxv9eTkGUtd0PsNMK8Yx5xeScxfpWOUAxE+ZPAXXEcAMOC3fk7LRdXq5fvpra2pLx2p1YtkAhpUbB2SwaRA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
   integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-import-assertions@^7.18.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
-  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971"
+  integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
-  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
+"@babel/plugin-syntax-jsx@^7.24.1", "@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
+  integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
   integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
-  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+"@babel/plugin-syntax-typescript@^7.24.1", "@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844"
+  integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-arrow-functions@^7.18.6", "@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
-  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27"
+  integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-async-to-generator@^7.18.6", "@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
-  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz#0e220703b89f2216800ce7b1c53cb0cf521c37f4"
+  integrity sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==
   dependencies:
-    "@babel/helper-module-imports" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/helper-module-imports" "^7.24.1"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
 
-"@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
-  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz#1c94799e20fcd5c4d4589523bbc57b7692979380"
+  integrity sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-block-scoping@^7.18.9", "@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz#88a1dccc3383899eb5e660534a76a22ecee64faa"
-  integrity sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==
+"@babel/plugin-transform-block-scoping@^7.18.9":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012"
+  integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-classes@^7.18.9", "@babel/plugin-transform-classes@^7.9.5":
-  version "7.22.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
-  integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
+"@babel/plugin-transform-classes@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1"
+  integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-replace-supers" "^7.24.1"
     "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.18.9", "@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
-  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
+"@babel/plugin-transform-computed-properties@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz#bc7e787f8e021eccfb677af5f13c29a9934ed8a7"
+  integrity sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/template" "^7.24.0"
 
-"@babel/plugin-transform-destructuring@^7.18.9", "@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz#38e2273814a58c810b6c34ea293be4973c4eb5e2"
-  integrity sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==
+"@babel/plugin-transform-destructuring@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345"
+  integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
-  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz#d56913d2f12795cc9930801b84c6f8c47513ac13"
+  integrity sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
-  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz#5347a797fe82b8d09749d10e9f5b83665adbca88"
+  integrity sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
-  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz#6650ebeb5bd5c012d5f5f90a26613a08162e8ba4"
+  integrity sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-for-of@^7.18.8", "@babel/plugin-transform-for-of@^7.9.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
-  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
+"@babel/plugin-transform-for-of@^7.18.8":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz#67448446b67ab6c091360ce3717e7d3a59e202fd"
+  integrity sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
-  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz#8cba6f7730626cc4dfe4ca2fa516215a0592b361"
+  integrity sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
-  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz#0a1982297af83e6b3c94972686067df588c5c096"
+  integrity sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
-  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz#896d23601c92f437af8b01371ad34beb75df4489"
+  integrity sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-modules-amd@^7.18.6", "@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
-  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
+"@babel/plugin-transform-modules-amd@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz#b6d829ed15258536977e9c7cc6437814871ffa39"
+  integrity sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.6", "@babel/plugin-transform-modules-commonjs@^7.22.5", "@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
-  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
+"@babel/plugin-transform-modules-commonjs@^7.18.6", "@babel/plugin-transform-modules-commonjs@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9"
+  integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.9", "@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
-  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
+"@babel/plugin-transform-modules-systemjs@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz#2b9625a3d4e445babac9788daec39094e6b11e3e"
+  integrity sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
-  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz#69220c66653a19cf2c0872b9c762b9a48b8bebef"
+  integrity sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
   integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
-  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz#29c59988fa3d0157de1c871a28cd83096363cc34"
+  integrity sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
-  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz#e71d6ab13483cca89ed95a474f542bbfc20a0520"
+  integrity sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-replace-supers" "^7.24.1"
 
-"@babel/plugin-transform-optional-chaining@^7.22.5":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz#076d28a7e074392e840d4ae587d83445bac0372a"
-  integrity sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==
+"@babel/plugin-transform-optional-chaining@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6"
+  integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.18.8", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.9.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
-  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
-  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-react-display-name@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b"
-  integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-react-jsx-development@^7.9.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
-  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
-  dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.22.5"
-
-"@babel/plugin-transform-react-jsx-self@^7.9.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz#ca2fdc11bc20d4d46de01137318b13d04e481d8e"
-  integrity sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-react-jsx-source@^7.9.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz#49af1615bfdf6ed9d3e9e43e425e0b2b65d15b6c"
-  integrity sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==
+"@babel/plugin-transform-parameters@^7.18.8", "@babel/plugin-transform-parameters@^7.20.7":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510"
+  integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.9.4":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416"
-  integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz#d6a9aeab96f03749f4eebeb0b6ea8e90ec958825"
+  integrity sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-jsx" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-regenerator@^7.18.6", "@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
-  integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
+"@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz#625b7545bae52363bdc1fbbdc7252b5046409c8c"
+  integrity sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
     regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
-  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz#8de729f5ecbaaf5cf83b67de13bad38a21be57c1"
+  integrity sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/plugin-transform-runtime@7.18.10":
   version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
   integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
@@ -946,80 +861,70 @@
     babel-plugin-polyfill-regenerator "^0.4.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-runtime@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
-  integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    resolve "^1.8.1"
-    semver "^5.5.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
-  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55"
+  integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-spread@^7.18.9", "@babel/plugin-transform-spread@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
-  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
+"@babel/plugin-transform-spread@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz#a1acf9152cbf690e4da0ba10790b3ac7d2b2b391"
+  integrity sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
-  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz#f03e672912c6e203ed8d6e0271d9c2113dc031b9"
+  integrity sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
-  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7"
+  integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
-  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7"
+  integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-typescript@^7.22.5":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz#aadd98fab871f0bb5717bcc24c31aaaa455af923"
-  integrity sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==
+"@babel/plugin-transform-typescript@^7.24.1":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz#03e0492537a4b953e491f53f2bc88245574ebd15"
+  integrity sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.10"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-typescript" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.24.4"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/plugin-syntax-typescript" "^7.24.1"
 
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
-  integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz#fb3fa16676549ac7c7449db9b342614985c2a3a4"
+  integrity sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
-  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz#57c3c191d68f998ac46b708380c1ce4d13536385"
+  integrity sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/preset-env@7.18.10":
   version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
   integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
   dependencies:
     "@babel/compat-data" "^7.18.8"
@@ -1098,75 +1003,9 @@
     core-js-compat "^3.22.1"
     semver "^6.3.0"
 
-"@babel/preset-env@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.6"
-    browserslist "^4.11.1"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.5":
+"@babel/preset-modules@^0.1.5":
   version "0.1.6"
-  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
   integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -1175,64 +1014,52 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@7.9.4":
-  version "7.9.4"
-  resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
-  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.9.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
-
 "@babel/preset-typescript@^7.18.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
-  integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec"
+  integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    "@babel/plugin-syntax-jsx" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
-    "@babel/plugin-transform-typescript" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-validator-option" "^7.23.5"
+    "@babel/plugin-syntax-jsx" "^7.24.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.24.1"
+    "@babel/plugin-transform-typescript" "^7.24.1"
 
-"@babel/register@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939"
-  integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==
+"@babel/register@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.23.7.tgz#485a5e7951939d21304cae4af1719fdb887bc038"
+  integrity sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
     make-dir "^2.1.0"
-    pirates "^4.0.5"
+    pirates "^4.0.6"
     source-map-support "^0.5.16"
 
 "@babel/regjsgen@^0.8.0":
   version "0.8.0"
-  resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.18.9", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682"
-  integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.18.9", "@babel/runtime@^7.8.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
+  integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.18.10", "@babel/template@^7.22.5", "@babel/template@^7.3.3", "@babel/template@^7.8.6":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
+  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
   dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
 
 "@babel/traverse@7.18.11":
   version "7.18.11"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f"
   integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
@@ -1246,48 +1073,48 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.22.10", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.6":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz#20252acb240e746d27c2e82b4484f199cf8141aa"
-  integrity sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==
+"@babel/traverse@^7.18.10", "@babel/traverse@^7.24.1", "@babel/traverse@^7.7.2":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
+  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
   dependencies:
-    "@babel/code-frame" "^7.22.10"
-    "@babel/generator" "^7.22.10"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/code-frame" "^7.24.1"
+    "@babel/generator" "^7.24.1"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.22.10"
-    "@babel/types" "^7.22.10"
-    debug "^4.1.0"
+    "@babel/parser" "^7.24.1"
+    "@babel/types" "^7.24.0"
+    debug "^4.3.1"
     globals "^11.1.0"
 
 "@babel/types@7.18.10":
   version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
   integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
   dependencies:
     "@babel/helper-string-parser" "^7.18.10"
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.9.6":
-  version "7.22.10"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03"
-  integrity sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==
+"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
   dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
-  resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@confio/ics23@^0.6.8":
   version "0.6.8"
-  resolved "https://registry.npmjs.org/@confio/ics23/-/ics23-0.6.8.tgz#2a6b4f1f2b7b20a35d9a0745bb5a446e72930b3d"
+  resolved "https://registry.yarnpkg.com/@confio/ics23/-/ics23-0.6.8.tgz#2a6b4f1f2b7b20a35d9a0745bb5a446e72930b3d"
   integrity sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==
   dependencies:
     "@noble/hashes" "^1.0.0"
@@ -1295,7 +1122,7 @@
 
 "@cosmjs/amino@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/amino/-/amino-0.30.1.tgz#7c18c14627361ba6c88e3495700ceea1f76baace"
+  resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.30.1.tgz#7c18c14627361ba6c88e3495700ceea1f76baace"
   integrity sha512-yNHnzmvAlkETDYIpeCTdVqgvrdt1qgkOXwuRVi8s27UKI5hfqyE9fJ/fuunXE6ZZPnKkjIecDznmuUOMrMvw4w==
   dependencies:
     "@cosmjs/crypto" "^0.30.1"
@@ -1305,7 +1132,7 @@
 
 "@cosmjs/cosmwasm-stargate@0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.30.1.tgz#6f9ca310f75433a3e30d683bc6aa24eadb345d79"
+  resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.30.1.tgz#6f9ca310f75433a3e30d683bc6aa24eadb345d79"
   integrity sha512-W/6SLUCJAJGBN+sJLXouLZikVgmqDd9LCdlMzQaxczcCHTWeJAmRvOiZGSZaSy3shw/JN1qc6g6PKpvTVgj10A==
   dependencies:
     "@cosmjs/amino" "^0.30.1"
@@ -1322,7 +1149,7 @@
 
 "@cosmjs/crypto@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/crypto/-/crypto-0.30.1.tgz#21e94d5ca8f8ded16eee1389d2639cb5c43c3eb5"
+  resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.30.1.tgz#21e94d5ca8f8ded16eee1389d2639cb5c43c3eb5"
   integrity sha512-rAljUlake3MSXs9xAm87mu34GfBLN0h/1uPPV6jEwClWjNkAMotzjC0ab9MARy5FFAvYHL3lWb57bhkbt2GtzQ==
   dependencies:
     "@cosmjs/encoding" "^0.30.1"
@@ -1335,7 +1162,7 @@
 
 "@cosmjs/encoding@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058"
+  resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058"
   integrity sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ==
   dependencies:
     base64-js "^1.3.0"
@@ -1344,7 +1171,7 @@
 
 "@cosmjs/json-rpc@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.30.1.tgz#16f21305fc167598c8a23a45549b85106b2372bc"
+  resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.30.1.tgz#16f21305fc167598c8a23a45549b85106b2372bc"
   integrity sha512-pitfC/2YN9t+kXZCbNuyrZ6M8abnCC2n62m+JtU9vQUfaEtVsgy+1Fk4TRQ175+pIWSdBMFi2wT8FWVEE4RhxQ==
   dependencies:
     "@cosmjs/stream" "^0.30.1"
@@ -1352,14 +1179,14 @@
 
 "@cosmjs/math@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/math/-/math-0.30.1.tgz#8b816ef4de5d3afa66cb9fdfb5df2357a7845b8a"
+  resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.30.1.tgz#8b816ef4de5d3afa66cb9fdfb5df2357a7845b8a"
   integrity sha512-yaoeI23pin9ZiPHIisa6qqLngfnBR/25tSaWpkTm8Cy10MX70UF5oN4+/t1heLaM6SSmRrhk3psRkV4+7mH51Q==
   dependencies:
     bn.js "^5.2.0"
 
 "@cosmjs/proto-signing@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/proto-signing/-/proto-signing-0.30.1.tgz#f0dda372488df9cd2677150b89b3e9c72b3cb713"
+  resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.30.1.tgz#f0dda372488df9cd2677150b89b3e9c72b3cb713"
   integrity sha512-tXh8pPYXV4aiJVhTKHGyeZekjj+K9s2KKojMB93Gcob2DxUjfKapFYBMJSgfKPuWUPEmyr8Q9km2hplI38ILgQ==
   dependencies:
     "@cosmjs/amino" "^0.30.1"
@@ -1372,7 +1199,7 @@
 
 "@cosmjs/socket@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.30.1.tgz#00b22f4b5e2ab01f4d82ccdb7b2e59536bfe5ce0"
+  resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.30.1.tgz#00b22f4b5e2ab01f4d82ccdb7b2e59536bfe5ce0"
   integrity sha512-r6MpDL+9N+qOS/D5VaxnPaMJ3flwQ36G+vPvYJsXArj93BjgyFB7BwWwXCQDzZ+23cfChPUfhbINOenr8N2Kow==
   dependencies:
     "@cosmjs/stream" "^0.30.1"
@@ -1382,7 +1209,7 @@
 
 "@cosmjs/stargate@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/stargate/-/stargate-0.30.1.tgz#e1b22e1226cffc6e93914a410755f1f61057ba04"
+  resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.30.1.tgz#e1b22e1226cffc6e93914a410755f1f61057ba04"
   integrity sha512-RdbYKZCGOH8gWebO7r6WvNnQMxHrNXInY/gPHPzMjbQF6UatA6fNM2G2tdgS5j5u7FTqlCI10stNXrknaNdzog==
   dependencies:
     "@confio/ics23" "^0.6.8"
@@ -1400,14 +1227,14 @@
 
 "@cosmjs/stream@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.30.1.tgz#ba038a2aaf41343696b1e6e759d8e03a9516ec1a"
+  resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.30.1.tgz#ba038a2aaf41343696b1e6e759d8e03a9516ec1a"
   integrity sha512-Fg0pWz1zXQdoxQZpdHRMGvUH5RqS6tPv+j9Eh7Q953UjMlrwZVo0YFLC8OTf/HKVf10E4i0u6aM8D69Q6cNkgQ==
   dependencies:
     xstream "^11.14.0"
 
 "@cosmjs/tendermint-rpc@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.30.1.tgz#c16378892ba1ac63f72803fdf7567eab9d4f0aa0"
+  resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.30.1.tgz#c16378892ba1ac63f72803fdf7567eab9d4f0aa0"
   integrity sha512-Z3nCwhXSbPZJ++v85zHObeUggrEHVfm1u18ZRwXxFE9ZMl5mXTybnwYhczuYOl7KRskgwlB+rID0WYACxj4wdQ==
   dependencies:
     "@cosmjs/crypto" "^0.30.1"
@@ -1423,12 +1250,31 @@
 
 "@cosmjs/utils@^0.30.1":
   version "0.30.1"
-  resolved "https://registry.npmjs.org/@cosmjs/utils/-/utils-0.30.1.tgz#6d92582341be3c2ec8d82090253cfa4b7f959edb"
+  resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.30.1.tgz#6d92582341be3c2ec8d82090253cfa4b7f959edb"
   integrity sha512-KvvX58MGMWh7xA+N+deCfunkA/ZNDvFLw4YbOmX3f/XBIkqrVY7qlotfy2aNb1kgp6h4B6Yc8YawJPDTfvWX7g==
 
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
 "@eslint/eslintrc@^1.3.0":
   version "1.4.1"
-  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
   integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
   dependencies:
     ajv "^6.12.4"
@@ -1441,38 +1287,94 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1":
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
+"@gar/promisify@^1.1.3":
   version "1.1.3"
-  resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@humanwhocodes/config-array@^0.10.4":
   version "0.10.7"
-  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
   integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
 "@humanwhocodes/gitignore-to-minimatch@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
   integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
 
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
-  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
-  resolved "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
+  resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
+"@isaacs/string-locale-compare@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
+  integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
   integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
@@ -1481,14 +1383,14 @@
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
-"@istanbuljs/schema@^0.1.2":
+"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
   version "0.1.3"
-  resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
 "@jest/console@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
   integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -1498,9 +1400,21 @@
     jest-util "^28.1.3"
     slash "^3.0.0"
 
+"@jest/console@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
+  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    slash "^3.0.0"
+
 "@jest/core@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7"
   integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==
   dependencies:
     "@jest/console" "^28.1.3"
@@ -1533,9 +1447,43 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/core@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
+  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/reporters" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.7.0"
+    jest-config "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-resolve-dependencies "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    jest-watcher "^29.7.0"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
 "@jest/environment@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e"
   integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==
   dependencies:
     "@jest/fake-timers" "^28.1.3"
@@ -1543,24 +1491,49 @@
     "@types/node" "*"
     jest-mock "^28.1.3"
 
+"@jest/environment@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
+  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
+  dependencies:
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
+
 "@jest/expect-utils@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
   integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==
   dependencies:
     jest-get-type "^28.0.2"
 
+"@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
+  dependencies:
+    jest-get-type "^29.6.3"
+
 "@jest/expect@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72"
   integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==
   dependencies:
     expect "^28.1.3"
     jest-snapshot "^28.1.3"
 
+"@jest/expect@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
+  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
+  dependencies:
+    expect "^29.7.0"
+    jest-snapshot "^29.7.0"
+
 "@jest/fake-timers@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e"
   integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -1570,18 +1543,40 @@
     jest-mock "^28.1.3"
     jest-util "^28.1.3"
 
+"@jest/fake-timers@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
+  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
 "@jest/globals@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333"
   integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==
   dependencies:
     "@jest/environment" "^28.1.3"
     "@jest/expect" "^28.1.3"
     "@jest/types" "^28.1.3"
 
+"@jest/globals@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
+  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    jest-mock "^29.7.0"
+
 "@jest/reporters@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a"
   integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
@@ -1610,25 +1605,71 @@
     terminal-link "^2.0.0"
     v8-to-istanbul "^9.0.1"
 
+"@jest/reporters@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
+  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^6.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
+    slash "^3.0.0"
+    string-length "^4.0.1"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
+
 "@jest/schemas@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
   integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
   dependencies:
     "@sinclair/typebox" "^0.24.1"
 
+"@jest/schemas@^29.4.3", "@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+  dependencies:
+    "@sinclair/typebox" "^0.27.8"
+
 "@jest/source-map@^28.1.2":
   version "28.1.2"
-  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24"
   integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.13"
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
 
+"@jest/source-map@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
+  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.18"
+    callsites "^3.0.0"
+    graceful-fs "^4.2.9"
+
 "@jest/test-result@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
   integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
   dependencies:
     "@jest/console" "^28.1.3"
@@ -1636,9 +1677,19 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
+"@jest/test-result@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
+  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
 "@jest/test-sequencer@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3"
   integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==
   dependencies:
     "@jest/test-result" "^28.1.3"
@@ -1646,9 +1697,19 @@
     jest-haste-map "^28.1.3"
     slash "^3.0.0"
 
+"@jest/test-sequencer@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
+  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
+  dependencies:
+    "@jest/test-result" "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    slash "^3.0.0"
+
 "@jest/transform@28.1.3", "@jest/transform@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
   integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -1667,9 +1728,30 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.1"
 
+"@jest/transform@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    babel-plugin-istanbul "^6.1.1"
+    chalk "^4.0.0"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    write-file-atomic "^4.0.2"
+
 "@jest/types@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
   integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
   dependencies:
     "@jest/schemas" "^28.1.3"
@@ -1679,734 +1761,179 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
-  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
+"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.15"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.19"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.8":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@jsdevtools/ono@^7.1.3":
   version "7.1.3"
-  resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
+  resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@lerna/add@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
-  integrity sha512-cpmAH1iS3k8JBxNvnMqrGTTjbY/ZAiKa1ChJzFevMYY3eeqbvhsBKnBcxjRXtdrJ6bd3dCQM+ZtK+0i682Fhng==
-  dependencies:
-    "@lerna/bootstrap" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    dedent "^0.7.0"
-    npm-package-arg "^8.1.0"
-    p-map "^4.0.0"
-    pacote "^11.2.6"
-    semver "^7.3.4"
-
-"@lerna/bootstrap@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-4.0.0.tgz#5f5c5e2c6cfc8fcec50cb2fbe569a8c607101891"
-  integrity sha512-RkS7UbeM2vu+kJnHzxNRCLvoOP9yGNgkzRdy4UV2hNalD7EP41bLvRVOwRYQ7fhc2QcbhnKNdOBihYRL0LcKtw==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/has-npm-version" "4.0.0"
-    "@lerna/npm-install" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/rimraf-dir" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/symlink-binary" "4.0.0"
-    "@lerna/symlink-dependencies" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    dedent "^0.7.0"
-    get-port "^5.1.1"
-    multimatch "^5.0.0"
-    npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
-    p-map "^4.0.0"
-    p-map-series "^2.1.0"
-    p-waterfall "^2.1.1"
-    read-package-tree "^5.3.1"
-    semver "^7.3.4"
-
-"@lerna/changed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-4.0.0.tgz#b9fc76cea39b9292a6cd263f03eb57af85c9270b"
-  integrity sha512-cD+KuPRp6qiPOD+BO6S6SN5cARspIaWSOqGBpGnYzLb4uWT8Vk4JzKyYtc8ym1DIwyoFXHosXt8+GDAgR8QrgQ==
-  dependencies:
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/listable" "4.0.0"
-    "@lerna/output" "4.0.0"
-
-"@lerna/check-working-tree@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz#257e36a602c00142e76082a19358e3e1ae8dbd58"
-  integrity sha512-/++bxM43jYJCshBiKP5cRlCTwSJdRSxVmcDAXM+1oUewlZJVSVlnks5eO0uLxokVFvLhHlC5kHMc7gbVFPHv6Q==
-  dependencies:
-    "@lerna/collect-uncommitted" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-
-"@lerna/child-process@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/child-process/-/child-process-4.0.0.tgz#341b96a57dffbd9705646d316e231df6fa4df6e1"
-  integrity sha512-XtCnmCT9eyVsUUHx6y/CTBYdV9g2Cr/VxyseTWBgfIur92/YKClfEtJTbOh94jRT62hlKLqSvux/UhxXVh613Q==
+"@lerna/child-process@6.6.2":
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-6.6.2.tgz#5d803c8dee81a4e013dc428292e77b365cba876c"
+  integrity sha512-QyKIWEnKQFnYu2ey+SAAm1A5xjzJLJJj3bhIZd3QKyXKKjaJ0hlxam/OsWSltxTNbcyH1jRJjC6Cxv31usv0Ag==
   dependencies:
     chalk "^4.1.0"
     execa "^5.0.0"
     strong-log-transformer "^2.1.0"
 
-"@lerna/clean@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-4.0.0.tgz#8f778b6f2617aa2a936a6b5e085ae62498e57dc5"
-  integrity sha512-uugG2iN9k45ITx2jtd8nEOoAtca8hNlDCUM0N3lFgU/b1mEQYAPRkqr1qs4FLRl/Y50ZJ41wUz1eazS+d/0osA==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/rimraf-dir" "4.0.0"
-    p-map "^4.0.0"
-    p-map-series "^2.1.0"
-    p-waterfall "^2.1.1"
-
-"@lerna/cli@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-4.0.0.tgz#8eabd334558836c1664df23f19acb95e98b5bbf3"
-  integrity sha512-Neaw3GzFrwZiRZv2g7g6NwFjs3er1vhraIniEs0jjVLPMNC4eata0na3GfE5yibkM/9d3gZdmihhZdZ3EBdvYA==
-  dependencies:
-    "@lerna/global-options" "4.0.0"
-    dedent "^0.7.0"
-    npmlog "^4.1.2"
-    yargs "^16.2.0"
-
-"@lerna/collect-uncommitted@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz#855cd64612969371cfc2453b90593053ff1ba779"
-  integrity sha512-ufSTfHZzbx69YNj7KXQ3o66V4RC76ffOjwLX0q/ab//61bObJ41n03SiQEhSlmpP+gmFbTJ3/7pTe04AHX9m/g==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    chalk "^4.1.0"
-    npmlog "^4.1.2"
-
-"@lerna/collect-updates@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-4.0.0.tgz#8e208b1bafd98a372ff1177f7a5e288f6bea8041"
-  integrity sha512-bnNGpaj4zuxsEkyaCZLka9s7nMs58uZoxrRIPJ+nrmrZYp1V5rrd+7/NYTuunOhY2ug1sTBvTAxj3NZQ+JKnOw==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    minimatch "^3.0.4"
-    npmlog "^4.1.2"
-    slash "^3.0.0"
-
-"@lerna/command@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/command/-/command-4.0.0.tgz#991c7971df8f5bf6ae6e42c808869a55361c1b98"
-  integrity sha512-LM9g3rt5FsPNFqIHUeRwWXLNHJ5NKzOwmVKZ8anSp4e1SPrv2HNc1V02/9QyDDZK/w+5POXH5lxZUI1CHaOK/A==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/project" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    "@lerna/write-log-file" "4.0.0"
-    clone-deep "^4.0.1"
-    dedent "^0.7.0"
-    execa "^5.0.0"
-    is-ci "^2.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/conventional-commits@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz#660fb2c7b718cb942ead70110df61f18c6f99750"
-  integrity sha512-CSUQRjJHFrH8eBn7+wegZLV3OrNc0Y1FehYfYGhjLE2SIfpCL4bmfu/ViYuHh9YjwHaA+4SX6d3hR+xkeseKmw==
-  dependencies:
-    "@lerna/validation-error" "4.0.0"
-    conventional-changelog-angular "^5.0.12"
-    conventional-changelog-core "^4.2.2"
-    conventional-recommended-bump "^6.1.0"
-    fs-extra "^9.1.0"
-    get-stream "^6.0.0"
-    lodash.template "^4.5.0"
-    npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
-    pify "^5.0.0"
-    semver "^7.3.4"
-
-"@lerna/create-symlink@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-4.0.0.tgz#8c5317ce5ae89f67825443bd7651bf4121786228"
-  integrity sha512-I0phtKJJdafUiDwm7BBlEUOtogmu8+taxq6PtIrxZbllV9hWg59qkpuIsiFp+no7nfRVuaasNYHwNUhDAVQBig==
-  dependencies:
-    cmd-shim "^4.1.0"
-    fs-extra "^9.1.0"
-    npmlog "^4.1.2"
-
-"@lerna/create@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/create/-/create-4.0.0.tgz#b6947e9b5dfb6530321952998948c3e63d64d730"
-  integrity sha512-mVOB1niKByEUfxlbKTM1UNECWAjwUdiioIbRQZEeEabtjCL69r9rscIsjlGyhGWCfsdAG5wfq4t47nlDXdLLag==
+"@lerna/create@6.6.2":
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-6.6.2.tgz#39a36d80cddb355340c297ed785aa76f4498177f"
+  integrity sha512-xQ+1Y7D+9etvUlE+unhG/TwmM6XBzGIdFBaNoW8D8kyOa9M2Jf3vdEtAxVa7mhRz66CENfhL/+I/QkVaa7pwbQ==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/child-process" "6.6.2"
     dedent "^0.7.0"
     fs-extra "^9.1.0"
-    globby "^11.0.2"
-    init-package-json "^2.0.2"
-    npm-package-arg "^8.1.0"
+    init-package-json "^3.0.2"
+    npm-package-arg "8.1.1"
     p-reduce "^2.1.0"
-    pacote "^11.2.6"
+    pacote "15.1.1"
     pify "^5.0.0"
     semver "^7.3.4"
     slash "^3.0.0"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^3.0.0"
-    whatwg-url "^8.4.0"
+    validate-npm-package-name "^4.0.0"
     yargs-parser "20.2.4"
 
-"@lerna/describe-ref@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-4.0.0.tgz#53c53b4ea65fdceffa072a62bfebe6772c45d9ec"
-  integrity sha512-eTU5+xC4C5Gcgz+Ey4Qiw9nV2B4JJbMulsYJMW8QjGcGh8zudib7Sduj6urgZXUYNyhYpRs+teci9M2J8u+UvQ==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/diff@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-4.0.0.tgz#6d3071817aaa4205a07bf77cfc6e932796d48b92"
-  integrity sha512-jYPKprQVg41+MUMxx6cwtqsNm0Yxx9GDEwdiPLwcUTFx+/qKCEwifKNJ1oGIPBxyEHX2PFCOjkK39lHoj2qiag==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/exec@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-4.0.0.tgz#eb6cb95cb92d42590e9e2d628fcaf4719d4a8be6"
-  integrity sha512-VGXtL/b/JfY84NB98VWZpIExfhLOzy0ozm/0XaS4a2SmkAJc5CeUfrhvHxxkxiTBLkU+iVQUyYEoAT0ulQ8PCw==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/profiler" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    p-map "^4.0.0"
-
-"@lerna/filter-options@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-4.0.0.tgz#ac94cc515d7fa3b47e2f7d74deddeabb1de5e9e6"
-  integrity sha512-vV2ANOeZhOqM0rzXnYcFFCJ/kBWy/3OA58irXih9AMTAlQLymWAK0akWybl++sUJ4HB9Hx12TOqaXbYS2NM5uw==
-  dependencies:
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/filter-packages" "4.0.0"
-    dedent "^0.7.0"
-    npmlog "^4.1.2"
-
-"@lerna/filter-packages@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-4.0.0.tgz#b1f70d70e1de9cdd36a4e50caa0ac501f8d012f2"
-  integrity sha512-+4AJIkK7iIiOaqCiVTYJxh/I9qikk4XjNQLhE3kixaqgMuHl1NQ99qXRR0OZqAWB9mh8Z1HA9bM5K1HZLBTOqA==
-  dependencies:
-    "@lerna/validation-error" "4.0.0"
-    multimatch "^5.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/get-npm-exec-opts@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz#dc955be94a4ae75c374ef9bce91320887d34608f"
-  integrity sha512-yvmkerU31CTWS2c7DvmAWmZVeclPBqI7gPVr5VATUKNWJ/zmVcU4PqbYoLu92I9Qc4gY1TuUplMNdNuZTSL7IQ==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/get-packed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-4.0.0.tgz#0989d61624ac1f97e393bdad2137c49cd7a37823"
-  integrity sha512-rfWONRsEIGyPJTxFzC8ECb3ZbsDXJbfqWYyeeQQDrJRPnEJErlltRLPLgC2QWbxFgFPsoDLeQmFHJnf0iDfd8w==
-  dependencies:
-    fs-extra "^9.1.0"
-    ssri "^8.0.1"
-    tar "^6.1.0"
-
-"@lerna/github-client@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/github-client/-/github-client-4.0.0.tgz#2ced67721363ef70f8e12ffafce4410918f4a8a4"
-  integrity sha512-2jhsldZtTKXYUBnOm23Lb0Fx8G4qfSXF9y7UpyUgWUj+YZYd+cFxSuorwQIgk5P4XXrtVhsUesIsli+BYSThiw==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@octokit/plugin-enterprise-rest" "^6.0.1"
-    "@octokit/rest" "^18.1.0"
-    git-url-parse "^11.4.4"
-    npmlog "^4.1.2"
-
-"@lerna/gitlab-client@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz#00dad73379c7b38951d4b4ded043504c14e2b67d"
-  integrity sha512-OMUpGSkeDWFf7BxGHlkbb35T7YHqVFCwBPSIR6wRsszY8PAzCYahtH3IaJzEJyUg6vmZsNl0FSr3pdA2skhxqA==
-  dependencies:
-    node-fetch "^2.6.1"
-    npmlog "^4.1.2"
-    whatwg-url "^8.4.0"
-
-"@lerna/global-options@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-4.0.0.tgz#c7d8b0de6a01d8a845e2621ea89e7f60f18c6a5f"
-  integrity sha512-TRMR8afAHxuYBHK7F++Ogop2a82xQjoGna1dvPOY6ltj/pEx59pdgcJfYcynYqMkFIk8bhLJJN9/ndIfX29FTQ==
-
-"@lerna/has-npm-version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz#d3fc3292c545eb28bd493b36e6237cf0279f631c"
-  integrity sha512-LQ3U6XFH8ZmLCsvsgq1zNDqka0Xzjq5ibVN+igAI5ccRWNaUsE/OcmsyMr50xAtNQMYMzmpw5GVLAivT2/YzCg==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    semver "^7.3.4"
-
-"@lerna/import@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/import/-/import-4.0.0.tgz#bde656c4a451fa87ae41733ff8a8da60547c5465"
-  integrity sha512-FaIhd+4aiBousKNqC7TX1Uhe97eNKf5/SC7c5WZANVWtC7aBWdmswwDt3usrzCNpj6/Wwr9EtEbYROzxKH8ffg==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    dedent "^0.7.0"
-    fs-extra "^9.1.0"
-    p-map-series "^2.1.0"
-
-"@lerna/info@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/info/-/info-4.0.0.tgz#b9fb0e479d60efe1623603958a831a88b1d7f1fc"
-  integrity sha512-8Uboa12kaCSZEn4XRfPz5KU9XXoexSPS4oeYGj76s2UQb1O1GdnEyfjyNWoUl1KlJ2i/8nxUskpXIftoFYH0/Q==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/output" "4.0.0"
-    envinfo "^7.7.4"
-
-"@lerna/init@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/init/-/init-4.0.0.tgz#dadff67e6dfb981e8ccbe0e6a310e837962f6c7a"
-  integrity sha512-wY6kygop0BCXupzWj5eLvTUqdR7vIAm0OgyV9WHpMYQGfs1V22jhztt8mtjCloD/O0nEe4tJhdG62XU5aYmPNQ==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    fs-extra "^9.1.0"
-    p-map "^4.0.0"
-    write-json-file "^4.3.0"
-
-"@lerna/link@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/link/-/link-4.0.0.tgz#c3a38aabd44279d714e90f2451e31b63f0fb65ba"
-  integrity sha512-KlvPi7XTAcVOByfaLlOeYOfkkDcd+bejpHMCd1KcArcFTwijOwXOVi24DYomIeHvy6HsX/IUquJ4PPUJIeB4+w==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/symlink-dependencies" "4.0.0"
-    p-map "^4.0.0"
-    slash "^3.0.0"
-
-"@lerna/list@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/list/-/list-4.0.0.tgz#24b4e6995bd73f81c556793fe502b847efd9d1d7"
-  integrity sha512-L2B5m3P+U4Bif5PultR4TI+KtW+SArwq1i75QZ78mRYxPc0U/piau1DbLOmwrdqr99wzM49t0Dlvl6twd7GHFg==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/listable" "4.0.0"
-    "@lerna/output" "4.0.0"
-
-"@lerna/listable@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-4.0.0.tgz#d00d6cb4809b403f2b0374fc521a78e318b01214"
-  integrity sha512-/rPOSDKsOHs5/PBLINZOkRIX1joOXUXEtyUs5DHLM8q6/RP668x/1lFhw6Dx7/U+L0+tbkpGtZ1Yt0LewCLgeQ==
-  dependencies:
-    "@lerna/query-graph" "4.0.0"
-    chalk "^4.1.0"
-    columnify "^1.5.4"
-
-"@lerna/log-packed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-4.0.0.tgz#95168fe2e26ac6a71e42f4be857519b77e57a09f"
-  integrity sha512-+dpCiWbdzgMAtpajLToy9PO713IHoE6GV/aizXycAyA07QlqnkpaBNZ8DW84gHdM1j79TWockGJo9PybVhrrZQ==
-  dependencies:
-    byte-size "^7.0.0"
-    columnify "^1.5.4"
-    has-unicode "^2.0.1"
-    npmlog "^4.1.2"
-
-"@lerna/npm-conf@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-4.0.0.tgz#b259fd1e1cee2bf5402b236e770140ff9ade7fd2"
-  integrity sha512-uS7H02yQNq3oejgjxAxqq/jhwGEE0W0ntr8vM3EfpCW1F/wZruwQw+7bleJQ9vUBjmdXST//tk8mXzr5+JXCfw==
-  dependencies:
-    config-chain "^1.1.12"
-    pify "^5.0.0"
-
-"@lerna/npm-dist-tag@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz#d1e99b4eccd3414142f0548ad331bf2d53f3257a"
-  integrity sha512-F20sg28FMYTgXqEQihgoqSfwmq+Id3zT23CnOwD+XQMPSy9IzyLf1fFVH319vXIw6NF6Pgs4JZN2Qty6/CQXGw==
-  dependencies:
-    "@lerna/otplease" "4.0.0"
-    npm-package-arg "^8.1.0"
-    npm-registry-fetch "^9.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/npm-install@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-4.0.0.tgz#31180be3ab3b7d1818a1a0c206aec156b7094c78"
-  integrity sha512-aKNxq2j3bCH3eXl3Fmu4D54s/YLL9WSwV8W7X2O25r98wzrO38AUN6AB9EtmAx+LV/SP15et7Yueg9vSaanRWg==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/get-npm-exec-opts" "4.0.0"
-    fs-extra "^9.1.0"
-    npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
-    signal-exit "^3.0.3"
-    write-pkg "^4.0.0"
-
-"@lerna/npm-publish@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-4.0.0.tgz#84eb62e876fe949ae1fd62c60804423dbc2c4472"
-  integrity sha512-vQb7yAPRo5G5r77DRjHITc9piR9gvEKWrmfCH7wkfBnGWEqu7n8/4bFQ7lhnkujvc8RXOsYpvbMQkNfkYibD/w==
-  dependencies:
-    "@lerna/otplease" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    fs-extra "^9.1.0"
-    libnpmpublish "^4.0.0"
-    npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
-    pify "^5.0.0"
-    read-package-json "^3.0.0"
-
-"@lerna/npm-run-script@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz#dfebf4f4601442e7c0b5214f9fb0d96c9350743b"
-  integrity sha512-Jmyh9/IwXJjOXqKfIgtxi0bxi1pUeKe5bD3S81tkcy+kyng/GNj9WSqD5ZggoNP2NP//s4CLDAtUYLdP7CU9rA==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/get-npm-exec-opts" "4.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/otplease@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/otplease/-/otplease-4.0.0.tgz#84972eb43448f8a1077435ba1c5e59233b725850"
-  integrity sha512-Sgzbqdk1GH4psNiT6hk+BhjOfIr/5KhGBk86CEfHNJTk9BK4aZYyJD4lpDbDdMjIV4g03G7pYoqHzH765T4fxw==
-  dependencies:
-    "@lerna/prompt" "4.0.0"
-
-"@lerna/output@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/output/-/output-4.0.0.tgz#b1d72215c0e35483e4f3e9994debc82c621851f2"
-  integrity sha512-Un1sHtO1AD7buDQrpnaYTi2EG6sLF+KOPEAMxeUYG5qG3khTs2Zgzq5WE3dt2N/bKh7naESt20JjIW6tBELP0w==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/pack-directory@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-4.0.0.tgz#8b617db95d20792f043aaaa13a9ccc0e04cb4c74"
-  integrity sha512-NJrmZNmBHS+5aM+T8N6FVbaKFScVqKlQFJNY2k7nsJ/uklNKsLLl6VhTQBPwMTbf6Tf7l6bcKzpy7aePuq9UiQ==
-  dependencies:
-    "@lerna/get-packed" "4.0.0"
-    "@lerna/package" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    npm-packlist "^2.1.4"
-    npmlog "^4.1.2"
-    tar "^6.1.0"
-    temp-write "^4.0.0"
-
-"@lerna/package-graph@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-4.0.0.tgz#16a00253a8ac810f72041481cb46bcee8d8123dd"
-  integrity sha512-QED2ZCTkfXMKFoTGoccwUzjHtZMSf3UKX14A4/kYyBms9xfFsesCZ6SLI5YeySEgcul8iuIWfQFZqRw+Qrjraw==
-  dependencies:
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
-    semver "^7.3.4"
-
-"@lerna/package@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/package/-/package-4.0.0.tgz#1b4c259c4bcff45c876ee1d591a043aacbc0d6b7"
-  integrity sha512-l0M/izok6FlyyitxiQKr+gZLVFnvxRQdNhzmQ6nRnN9dvBJWn+IxxpM+cLqGACatTnyo9LDzNTOj2Db3+s0s8Q==
-  dependencies:
-    load-json-file "^6.2.0"
-    npm-package-arg "^8.1.0"
-    write-pkg "^4.0.0"
-
-"@lerna/prerelease-id-from-version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz#c7e0676fcee1950d85630e108eddecdd5b48c916"
-  integrity sha512-GQqguzETdsYRxOSmdFZ6zDBXDErIETWOqomLERRY54f4p+tk4aJjoVdd9xKwehC9TBfIFvlRbL1V9uQGHh1opg==
-  dependencies:
-    semver "^7.3.4"
-
-"@lerna/profiler@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/profiler/-/profiler-4.0.0.tgz#8a53ab874522eae15d178402bff90a14071908e9"
-  integrity sha512-/BaEbqnVh1LgW/+qz8wCuI+obzi5/vRE8nlhjPzdEzdmWmZXuCKyWSEzAyHOJWw1ntwMiww5dZHhFQABuoFz9Q==
-  dependencies:
-    fs-extra "^9.1.0"
-    npmlog "^4.1.2"
-    upath "^2.0.1"
-
-"@lerna/project@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/project/-/project-4.0.0.tgz#ff84893935833533a74deff30c0e64ddb7f0ba6b"
-  integrity sha512-o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==
-  dependencies:
-    "@lerna/package" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    cosmiconfig "^7.0.0"
-    dedent "^0.7.0"
-    dot-prop "^6.0.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.2"
-    load-json-file "^6.2.0"
-    npmlog "^4.1.2"
-    p-map "^4.0.0"
-    resolve-from "^5.0.0"
-    write-json-file "^4.3.0"
-
-"@lerna/prompt@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-4.0.0.tgz#5ec69a803f3f0db0ad9f221dad64664d3daca41b"
-  integrity sha512-4Ig46oCH1TH5M7YyTt53fT6TuaKMgqUUaqdgxvp6HP6jtdak6+amcsqB8YGz2eQnw/sdxunx84DfI9XpoLj4bQ==
-  dependencies:
-    inquirer "^7.3.3"
-    npmlog "^4.1.2"
-
-"@lerna/publish@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-4.0.0.tgz#f67011305adeba120066a3b6d984a5bb5fceef65"
-  integrity sha512-K8jpqjHrChH22qtkytA5GRKIVFEtqBF6JWj1I8dWZtHs4Jywn8yB1jQ3BAMLhqmDJjWJtRck0KXhQQKzDK2UPg==
-  dependencies:
-    "@lerna/check-working-tree" "4.0.0"
-    "@lerna/child-process" "4.0.0"
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    "@lerna/log-packed" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/npm-dist-tag" "4.0.0"
-    "@lerna/npm-publish" "4.0.0"
-    "@lerna/otplease" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/pack-directory" "4.0.0"
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    "@lerna/version" "4.0.0"
-    fs-extra "^9.1.0"
-    libnpmaccess "^4.0.1"
-    npm-package-arg "^8.1.0"
-    npm-registry-fetch "^9.0.0"
-    npmlog "^4.1.2"
-    p-map "^4.0.0"
-    p-pipe "^3.1.0"
-    pacote "^11.2.6"
-    semver "^7.3.4"
-
-"@lerna/pulse-till-done@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz#04bace7d483a8205c187b806bcd8be23d7bb80a3"
-  integrity sha512-Frb4F7QGckaybRhbF7aosLsJ5e9WuH7h0KUkjlzSByVycxY91UZgaEIVjS2oN9wQLrheLMHl6SiFY0/Pvo0Cxg==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/query-graph@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-4.0.0.tgz#09dd1c819ac5ee3f38db23931143701f8a6eef63"
-  integrity sha512-YlP6yI3tM4WbBmL9GCmNDoeQyzcyg1e4W96y/PKMZa5GbyUvkS2+Jc2kwPD+5KcXou3wQZxSPzR3Te5OenaDdg==
-  dependencies:
-    "@lerna/package-graph" "4.0.0"
-
-"@lerna/resolve-symlink@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz#6d006628a210c9b821964657a9e20a8c9a115e14"
-  integrity sha512-RtX8VEUzqT+uLSCohx8zgmjc6zjyRlh6i/helxtZTMmc4+6O4FS9q5LJas2uGO2wKvBlhcD6siibGt7dIC3xZA==
-  dependencies:
-    fs-extra "^9.1.0"
-    npmlog "^4.1.2"
-    read-cmd-shim "^2.0.0"
-
-"@lerna/rimraf-dir@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz#2edf3b62d4eb0ef4e44e430f5844667d551ec25a"
-  integrity sha512-QNH9ABWk9mcMJh2/muD9iYWBk1oQd40y6oH+f3wwmVGKYU5YJD//+zMiBI13jxZRtwBx0vmBZzkBkK1dR11cBg==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    npmlog "^4.1.2"
-    path-exists "^4.0.0"
-    rimraf "^3.0.2"
-
-"@lerna/run-lifecycle@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz#e648a46f9210a9bcd7c391df6844498cb5079334"
-  integrity sha512-IwxxsajjCQQEJAeAaxF8QdEixfI7eLKNm4GHhXHrgBu185JcwScFZrj9Bs+PFKxwb+gNLR4iI5rpUdY8Y0UdGQ==
-  dependencies:
-    "@lerna/npm-conf" "4.0.0"
-    npm-lifecycle "^3.1.5"
-    npmlog "^4.1.2"
-
-"@lerna/run-topologically@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-4.0.0.tgz#af846eeee1a09b0c2be0d1bfb5ef0f7b04bb1827"
-  integrity sha512-EVZw9hGwo+5yp+VL94+NXRYisqgAlj0jWKWtAIynDCpghRxCE5GMO3xrQLmQgqkpUl9ZxQFpICgYv5DW4DksQA==
-  dependencies:
-    "@lerna/query-graph" "4.0.0"
-    p-queue "^6.6.2"
-
-"@lerna/run@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/run/-/run-4.0.0.tgz#4bc7fda055a729487897c23579694f6183c91262"
-  integrity sha512-9giulCOzlMPzcZS/6Eov6pxE9gNTyaXk0Man+iCIdGJNMrCnW7Dme0Z229WWP/UoxDKg71F2tMsVVGDiRd8fFQ==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/npm-run-script" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/profiler" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/timer" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    p-map "^4.0.0"
-
-"@lerna/symlink-binary@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz#21009f62d53a425f136cb4c1a32c6b2a0cc02d47"
-  integrity sha512-zualodWC4q1QQc1pkz969hcFeWXOsVYZC5AWVtAPTDfLl+TwM7eG/O6oP+Rr3fFowspxo6b1TQ6sYfDV6HXNWA==
-  dependencies:
-    "@lerna/create-symlink" "4.0.0"
-    "@lerna/package" "4.0.0"
-    fs-extra "^9.1.0"
-    p-map "^4.0.0"
-
-"@lerna/symlink-dependencies@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz#8910eca084ae062642d0490d8972cf2d98e9ebbd"
-  integrity sha512-BABo0MjeUHNAe2FNGty1eantWp8u83BHSeIMPDxNq0MuW2K3CiQRaeWT3EGPAzXpGt0+hVzBrA6+OT0GPn7Yuw==
-  dependencies:
-    "@lerna/create-symlink" "4.0.0"
-    "@lerna/resolve-symlink" "4.0.0"
-    "@lerna/symlink-binary" "4.0.0"
-    fs-extra "^9.1.0"
-    p-map "^4.0.0"
-    p-map-series "^2.1.0"
-
-"@lerna/timer@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/timer/-/timer-4.0.0.tgz#a52e51bfcd39bfd768988049ace7b15c1fd7a6da"
-  integrity sha512-WFsnlaE7SdOvjuyd05oKt8Leg3ENHICnvX3uYKKdByA+S3g+TCz38JsNs7OUZVt+ba63nC2nbXDlUnuT2Xbsfg==
-
-"@lerna/validation-error@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-4.0.0.tgz#af9d62fe8304eaa2eb9a6ba1394f9aa807026d35"
-  integrity sha512-1rBOM5/koiVWlRi3V6dB863E1YzJS8v41UtsHgMr6gB2ncJ2LsQtMKlJpi3voqcgh41H8UsPXR58RrrpPpufyw==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/version/-/version-4.0.0.tgz#532659ec6154d8a8789c5ab53878663e244e3228"
-  integrity sha512-otUgiqs5W9zGWJZSCCMRV/2Zm2A9q9JwSDS7s/tlKq4mWCYriWo7+wsHEA/nPTMDyYyBO5oyZDj+3X50KDUzeA==
-  dependencies:
-    "@lerna/check-working-tree" "4.0.0"
-    "@lerna/child-process" "4.0.0"
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/conventional-commits" "4.0.0"
-    "@lerna/github-client" "4.0.0"
-    "@lerna/gitlab-client" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    chalk "^4.1.0"
-    dedent "^0.7.0"
-    load-json-file "^6.2.0"
-    minimatch "^3.0.4"
-    npmlog "^4.1.2"
-    p-map "^4.0.0"
-    p-pipe "^3.1.0"
-    p-reduce "^2.1.0"
-    p-waterfall "^2.1.1"
-    semver "^7.3.4"
-    slash "^3.0.0"
-    temp-write "^4.0.0"
-    write-json-file "^4.3.0"
-
-"@lerna/write-log-file@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-4.0.0.tgz#18221a38a6a307d6b0a5844dd592ad53fa27091e"
-  integrity sha512-XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg==
-  dependencies:
-    npmlog "^4.1.2"
-    write-file-atomic "^3.0.3"
+"@lerna/legacy-package-management@6.6.2":
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/@lerna/legacy-package-management/-/legacy-package-management-6.6.2.tgz#411c395e72e563ab98f255df77e4068627a85bb0"
+  integrity sha512-0hZxUPKnHwehUO2xC4ldtdX9bW0W1UosxebDIQlZL2STnZnA2IFmIk2lJVUyFW+cmTPQzV93jfS0i69T9Z+teg==
+  dependencies:
+    "@npmcli/arborist" "6.2.3"
+    "@npmcli/run-script" "4.1.7"
+    "@nrwl/devkit" ">=15.5.2 < 16"
+    "@octokit/rest" "19.0.3"
+    byte-size "7.0.0"
+    chalk "4.1.0"
+    clone-deep "4.0.1"
+    cmd-shim "5.0.0"
+    columnify "1.6.0"
+    config-chain "1.1.12"
+    conventional-changelog-core "4.2.4"
+    conventional-recommended-bump "6.1.0"
+    cosmiconfig "7.0.0"
+    dedent "0.7.0"
+    dot-prop "6.0.1"
+    execa "5.0.0"
+    file-url "3.0.0"
+    find-up "5.0.0"
+    fs-extra "9.1.0"
+    get-port "5.1.1"
+    get-stream "6.0.0"
+    git-url-parse "13.1.0"
+    glob-parent "5.1.2"
+    globby "11.1.0"
+    graceful-fs "4.2.10"
+    has-unicode "2.0.1"
+    inquirer "8.2.4"
+    is-ci "2.0.0"
+    is-stream "2.0.0"
+    libnpmpublish "7.1.4"
+    load-json-file "6.2.0"
+    make-dir "3.1.0"
+    minimatch "3.0.5"
+    multimatch "5.0.0"
+    node-fetch "2.6.7"
+    npm-package-arg "8.1.1"
+    npm-packlist "5.1.1"
+    npm-registry-fetch "14.0.3"
+    npmlog "6.0.2"
+    p-map "4.0.0"
+    p-map-series "2.1.0"
+    p-queue "6.6.2"
+    p-waterfall "2.1.1"
+    pacote "15.1.1"
+    pify "5.0.0"
+    pretty-format "29.4.3"
+    read-cmd-shim "3.0.0"
+    read-package-json "5.0.1"
+    resolve-from "5.0.0"
+    semver "7.3.8"
+    signal-exit "3.0.7"
+    slash "3.0.0"
+    ssri "9.0.1"
+    strong-log-transformer "2.1.0"
+    tar "6.1.11"
+    temp-dir "1.0.0"
+    tempy "1.0.0"
+    upath "2.0.1"
+    uuid "8.3.2"
+    write-file-atomic "4.0.1"
+    write-pkg "4.0.0"
+    yargs "16.2.0"
 
 "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
   version "2.1.8-no-fsevents.3"
-  resolved "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
   integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
 
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
-  resolved "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
   integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
   dependencies:
     eslint-scope "5.1.1"
 
 "@noble/hashes@^1", "@noble/hashes@^1.0.0":
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9"
-  integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
+  integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
   integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
@@ -2414,211 +1941,425 @@
 
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
-  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/ci-detect@^1.0.0":
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
-  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
+"@npmcli/arborist@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-6.2.3.tgz#31f8aed2588341864d3811151d929c01308f8e71"
+  integrity sha512-lpGOC2ilSJXcc2zfW9QtukcCTcMbl3fVI0z4wvFB2AFIl0C+Q6Wv7ccrpdrQa8rvJ1ZVuc6qkX7HVTyKlzGqKA==
+  dependencies:
+    "@isaacs/string-locale-compare" "^1.1.0"
+    "@npmcli/fs" "^3.1.0"
+    "@npmcli/installed-package-contents" "^2.0.0"
+    "@npmcli/map-workspaces" "^3.0.2"
+    "@npmcli/metavuln-calculator" "^5.0.0"
+    "@npmcli/name-from-folder" "^2.0.0"
+    "@npmcli/node-gyp" "^3.0.0"
+    "@npmcli/package-json" "^3.0.0"
+    "@npmcli/query" "^3.0.0"
+    "@npmcli/run-script" "^6.0.0"
+    bin-links "^4.0.1"
+    cacache "^17.0.4"
+    common-ancestor-path "^1.0.1"
+    hosted-git-info "^6.1.1"
+    json-parse-even-better-errors "^3.0.0"
+    json-stringify-nice "^1.1.4"
+    minimatch "^6.1.6"
+    nopt "^7.0.0"
+    npm-install-checks "^6.0.0"
+    npm-package-arg "^10.1.0"
+    npm-pick-manifest "^8.0.1"
+    npm-registry-fetch "^14.0.3"
+    npmlog "^7.0.1"
+    pacote "^15.0.8"
+    parse-conflict-json "^3.0.0"
+    proc-log "^3.0.0"
+    promise-all-reject-late "^1.0.0"
+    promise-call-limit "^1.0.1"
+    read-package-json-fast "^3.0.2"
+    semver "^7.3.7"
+    ssri "^10.0.1"
+    treeverse "^3.0.0"
+    walk-up-path "^1.0.0"
+
+"@npmcli/fs@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
+  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
+  dependencies:
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
 
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
+"@npmcli/fs@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
+  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
   dependencies:
-    "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/git@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
-  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
+"@npmcli/git@^4.0.0", "@npmcli/git@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.1.0.tgz#ab0ad3fd82bc4d8c1351b6c62f0fa56e8fe6afa6"
+  integrity sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==
   dependencies:
-    "@npmcli/promise-spawn" "^1.3.2"
-    lru-cache "^6.0.0"
-    mkdirp "^1.0.4"
-    npm-pick-manifest "^6.1.1"
+    "@npmcli/promise-spawn" "^6.0.0"
+    lru-cache "^7.4.4"
+    npm-pick-manifest "^8.0.0"
+    proc-log "^3.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
-    which "^2.0.2"
+    which "^3.0.0"
 
-"@npmcli/installed-package-contents@^1.0.6":
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
-  integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
+"@npmcli/installed-package-contents@^2.0.0", "@npmcli/installed-package-contents@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33"
+  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
   dependencies:
-    npm-bundled "^1.1.1"
-    npm-normalize-package-bin "^1.0.1"
+    npm-bundled "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
 
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+"@npmcli/map-workspaces@^3.0.2":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz#27dc06c20c35ef01e45a08909cab9cb3da08cea6"
+  integrity sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==
+  dependencies:
+    "@npmcli/name-from-folder" "^2.0.0"
+    glob "^10.2.2"
+    minimatch "^9.0.0"
+    read-package-json-fast "^3.0.0"
+
+"@npmcli/metavuln-calculator@^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-5.0.1.tgz#426b3e524c2008bcc82dbc2ef390aefedd643d76"
+  integrity sha512-qb8Q9wIIlEPj3WeA1Lba91R4ZboPL0uspzV0F9uwP+9AYMVB2zOoa7Pbk12g6D2NHAinSbHh6QYmGuRyHZ874Q==
+  dependencies:
+    cacache "^17.0.0"
+    json-parse-even-better-errors "^3.0.0"
+    pacote "^15.0.0"
+    semver "^7.3.5"
+
+"@npmcli/move-file@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
+  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
   dependencies:
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/node-gyp@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
-  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
+"@npmcli/name-from-folder@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz#c44d3a7c6d5c184bb6036f4d5995eee298945815"
+  integrity sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==
 
-"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
-  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+"@npmcli/node-gyp@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
+  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+
+"@npmcli/node-gyp@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
+  integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
+
+"@npmcli/package-json@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-3.1.1.tgz#5628332aac90fa1b4d6f98e03988c5958b35e0c5"
+  integrity sha512-+UW0UWOYFKCkvszLoTwrYGrjNrT8tI5Ckeb/h+Z1y1fsNJEctl7HmerA5j2FgmoqFaLI2gsA1X9KgMFqx/bRmA==
+  dependencies:
+    "@npmcli/git" "^4.1.0"
+    glob "^10.2.2"
+    json-parse-even-better-errors "^3.0.0"
+    normalize-package-data "^5.0.0"
+    npm-normalize-package-bin "^3.0.1"
+    proc-log "^3.0.0"
+
+"@npmcli/promise-spawn@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
+  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/run-script@^1.8.2":
-  version "1.8.6"
-  resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
-  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
+"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2"
+  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
   dependencies:
-    "@npmcli/node-gyp" "^1.0.2"
-    "@npmcli/promise-spawn" "^1.3.2"
-    node-gyp "^7.1.0"
-    read-package-json-fast "^2.0.1"
+    which "^3.0.0"
 
-"@octokit/auth-token@^2.4.4":
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
-  integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==
+"@npmcli/query@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-3.1.0.tgz#bc202c59e122a06cf8acab91c795edda2cdad42c"
+  integrity sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==
   dependencies:
-    "@octokit/types" "^6.0.3"
+    postcss-selector-parser "^6.0.10"
 
-"@octokit/core@^3.5.1":
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085"
-  integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==
-  dependencies:
-    "@octokit/auth-token" "^2.4.4"
-    "@octokit/graphql" "^4.5.8"
-    "@octokit/request" "^5.6.3"
-    "@octokit/request-error" "^2.0.5"
-    "@octokit/types" "^6.0.3"
+"@npmcli/run-script@4.1.7":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.1.7.tgz#b1a2f57568eb738e45e9ea3123fb054b400a86f7"
+  integrity sha512-WXr/MyM4tpKA4BotB81NccGAv8B48lNH0gRoILucbcAhTQXLCoi6HflMV3KdXubIqvP9SuLsFn68Z7r4jl+ppw==
+  dependencies:
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/promise-spawn" "^3.0.0"
+    node-gyp "^9.0.0"
+    read-package-json-fast "^2.0.3"
+    which "^2.0.2"
+
+"@npmcli/run-script@^6.0.0":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885"
+  integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==
+  dependencies:
+    "@npmcli/node-gyp" "^3.0.0"
+    "@npmcli/promise-spawn" "^6.0.0"
+    node-gyp "^9.0.0"
+    read-package-json-fast "^3.0.0"
+    which "^3.0.0"
+
+"@nrwl/cli@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.7.tgz#1db113f5cb1cfe63213097be1ece041eef33da1f"
+  integrity sha512-1jtHBDuJzA57My5nLzYiM372mJW0NY6rFKxlWt5a0RLsAZdPTHsd8lE3Gs9XinGC1jhXbruWmhhnKyYtZvX/zA==
+  dependencies:
+    nx "15.9.7"
+
+"@nrwl/devkit@>=15.5.2 < 16":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.9.7.tgz#14d19ec82ff4209c12147a97f1cdea05d8f6c087"
+  integrity sha512-Sb7Am2TMT8AVq8e+vxOlk3AtOA2M0qCmhBzoM1OJbdHaPKc0g0UgSnWRml1kPGg5qfPk72tWclLoZJ5/ut0vTg==
+  dependencies:
+    ejs "^3.1.7"
+    ignore "^5.0.4"
+    semver "7.5.4"
+    tmp "~0.2.1"
+    tslib "^2.3.0"
+
+"@nrwl/nx-darwin-arm64@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.7.tgz#a2cb7390c782b8acf3bb8806a3002620226a933d"
+  integrity sha512-aBUgnhlkrgC0vu0fK6eb9Vob7eFnkuknrK+YzTjmLrrZwj7FGNAeyGXSlyo1dVokIzjVKjJg2saZZ0WQbfuCJw==
+
+"@nrwl/nx-darwin-x64@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.7.tgz#af0437e726aeb97eb660646bfd9a7da5ba7a0a6f"
+  integrity sha512-L+elVa34jhGf1cmn38Z0sotQatmLovxoASCIw5r1CBZZeJ5Tg7Y9nOwjRiDixZxNN56hPKXm6xl9EKlVHVeKlg==
+
+"@nrwl/nx-linux-arm-gnueabihf@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.7.tgz#e29f4d31afa903bfb4d0fd7421e19be1086eae87"
+  integrity sha512-pqmfqqEUGFu6PmmHKyXyUw1Al0Ki8PSaR0+ndgCAb1qrekVDGDfznJfaqxN0JSLeolPD6+PFtLyXNr9ZyPFlFg==
+
+"@nrwl/nx-linux-arm64-gnu@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.7.tgz#eb2880a24d3268dd93583d21a6a0b9ff96bb23b4"
+  integrity sha512-NYOa/eRrqmM+In5g3M0rrPVIS9Z+q6fvwXJYf/KrjOHqqan/KL+2TOfroA30UhcBrwghZvib7O++7gZ2hzwOnA==
+
+"@nrwl/nx-linux-arm64-musl@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.7.tgz#5d04913c4672a96cefa78491824620d8a8bcfd7f"
+  integrity sha512-zyStqjEcmbvLbejdTOrLUSEdhnxNtdQXlmOuymznCzYUEGRv+4f7OAepD3yRoR0a/57SSORZmmGQB7XHZoYZJA==
+
+"@nrwl/nx-linux-x64-gnu@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.7.tgz#cf7f61fd87f35a793e6824952a6eb12242fe43fd"
+  integrity sha512-saNK5i2A8pKO3Il+Ejk/KStTApUpWgCxjeUz9G+T8A+QHeDloZYH2c7pU/P3jA9QoNeKwjVO9wYQllPL9loeVg==
+
+"@nrwl/nx-linux-x64-musl@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.7.tgz#2bec23c3696780540eb47fa1358dda780c84697f"
+  integrity sha512-extIUThYN94m4Vj4iZggt6hhMZWQSukBCo8pp91JHnDcryBg7SnYmnikwtY1ZAFyyRiNFBLCKNIDFGkKkSrZ9Q==
+
+"@nrwl/nx-win32-arm64-msvc@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.7.tgz#21b56ef3ab4190370effea71bd83fdc3e47ec69c"
+  integrity sha512-GSQ54hJ5AAnKZb4KP4cmBnJ1oC4ILxnrG1mekxeM65c1RtWg9NpBwZ8E0gU3xNrTv8ZNsBeKi/9UhXBxhsIh8A==
+
+"@nrwl/nx-win32-x64-msvc@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.7.tgz#1677ab1dcce921706b5677dc2844e3e0027f8bd5"
+  integrity sha512-x6URof79RPd8AlapVbPefUD3ynJZpmah3tYaYZ9xZRMXojVtEHV8Qh5vysKXQ1rNYJiiB8Ah6evSKWLbAH60tw==
+
+"@nrwl/tao@15.9.7":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.7.tgz#c0e78c99caa6742762f7558f20d8524bc9015e97"
+  integrity sha512-OBnHNvQf3vBH0qh9YnvBQQWyyFZ+PWguF6dJ8+1vyQYlrLVk/XZ8nJ4ukWFb+QfPv/O8VBmqaofaOI9aFC4yTw==
+  dependencies:
+    nx "15.9.7"
+
+"@octokit/auth-token@^3.0.0":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db"
+  integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==
+
+"@octokit/core@^4.0.0":
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907"
+  integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==
+  dependencies:
+    "@octokit/auth-token" "^3.0.0"
+    "@octokit/graphql" "^5.0.0"
+    "@octokit/request" "^6.0.0"
+    "@octokit/request-error" "^3.0.0"
+    "@octokit/types" "^9.0.0"
     before-after-hook "^2.2.0"
     universal-user-agent "^6.0.0"
 
-"@octokit/endpoint@^6.0.1":
-  version "6.0.12"
-  resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
-  integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
+"@octokit/endpoint@^7.0.0":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.6.tgz#791f65d3937555141fb6c08f91d618a7d645f1e2"
+  integrity sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==
   dependencies:
-    "@octokit/types" "^6.0.3"
+    "@octokit/types" "^9.0.0"
     is-plain-object "^5.0.0"
     universal-user-agent "^6.0.0"
 
-"@octokit/graphql@^4.5.8":
-  version "4.8.0"
-  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3"
-  integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
+"@octokit/graphql@^5.0.0":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.6.tgz#9eac411ac4353ccc5d3fca7d76736e6888c5d248"
+  integrity sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==
   dependencies:
-    "@octokit/request" "^5.6.0"
-    "@octokit/types" "^6.0.3"
+    "@octokit/request" "^6.0.0"
+    "@octokit/types" "^9.0.0"
     universal-user-agent "^6.0.0"
 
 "@octokit/openapi-types@^12.11.0":
   version "12.11.0"
-  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0"
   integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==
 
-"@octokit/plugin-enterprise-rest@^6.0.1":
+"@octokit/openapi-types@^14.0.0":
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-14.0.0.tgz#949c5019028c93f189abbc2fb42f333290f7134a"
+  integrity sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw==
+
+"@octokit/openapi-types@^18.0.0":
+  version "18.1.1"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.1.1.tgz#09bdfdabfd8e16d16324326da5148010d765f009"
+  integrity sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==
+
+"@octokit/plugin-enterprise-rest@6.0.1":
   version "6.0.1"
-  resolved "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
   integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==
 
-"@octokit/plugin-paginate-rest@^2.16.8":
-  version "2.21.3"
-  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz#7f12532797775640dbb8224da577da7dc210c87e"
-  integrity sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==
+"@octokit/plugin-paginate-rest@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-3.1.0.tgz#86f8be759ce2d6d7c879a31490fd2f7410b731f0"
+  integrity sha512-+cfc40pMzWcLkoDcLb1KXqjX0jTGYXjKuQdFQDc6UAknISJHnZTiBqld6HDwRJvD4DsouDKrWXNbNV0lE/3AXA==
   dependencies:
-    "@octokit/types" "^6.40.0"
+    "@octokit/types" "^6.41.0"
 
 "@octokit/plugin-request-log@^1.0.4":
   version "1.0.4"
-  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
   integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
 
-"@octokit/plugin-rest-endpoint-methods@^5.12.0":
-  version "5.16.2"
-  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz#7ee8bf586df97dd6868cf68f641354e908c25342"
-  integrity sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==
+"@octokit/plugin-rest-endpoint-methods@^6.0.0":
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.8.1.tgz#97391fda88949eb15f68dc291957ccbe1d3e8ad1"
+  integrity sha512-QrlaTm8Lyc/TbU7BL/8bO49vp+RZ6W3McxxmmQTgYxf2sWkO8ZKuj4dLhPNJD6VCUW1hetCmeIM0m6FTVpDiEg==
   dependencies:
-    "@octokit/types" "^6.39.0"
+    "@octokit/types" "^8.1.1"
     deprecation "^2.3.1"
 
-"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
-  integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
+"@octokit/request-error@^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69"
+  integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==
   dependencies:
-    "@octokit/types" "^6.0.3"
+    "@octokit/types" "^9.0.0"
     deprecation "^2.0.0"
     once "^1.4.0"
 
-"@octokit/request@^5.6.0", "@octokit/request@^5.6.3":
-  version "5.6.3"
-  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
-  integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
+"@octokit/request@^6.0.0":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.8.tgz#aaf480b32ab2b210e9dadd8271d187c93171d8eb"
+  integrity sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==
   dependencies:
-    "@octokit/endpoint" "^6.0.1"
-    "@octokit/request-error" "^2.1.0"
-    "@octokit/types" "^6.16.1"
+    "@octokit/endpoint" "^7.0.0"
+    "@octokit/request-error" "^3.0.0"
+    "@octokit/types" "^9.0.0"
     is-plain-object "^5.0.0"
     node-fetch "^2.6.7"
     universal-user-agent "^6.0.0"
 
-"@octokit/rest@^18.1.0":
-  version "18.12.0"
-  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881"
-  integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
+"@octokit/rest@19.0.3":
+  version "19.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.3.tgz#b9a4e8dc8d53e030d611c053153ee6045f080f02"
+  integrity sha512-5arkTsnnRT7/sbI4fqgSJ35KiFaN7zQm0uQiQtivNQLI8RQx8EHwJCajcTUwmaCMNDg7tdCvqAnc7uvHHPxrtQ==
   dependencies:
-    "@octokit/core" "^3.5.1"
-    "@octokit/plugin-paginate-rest" "^2.16.8"
+    "@octokit/core" "^4.0.0"
+    "@octokit/plugin-paginate-rest" "^3.0.0"
     "@octokit/plugin-request-log" "^1.0.4"
-    "@octokit/plugin-rest-endpoint-methods" "^5.12.0"
+    "@octokit/plugin-rest-endpoint-methods" "^6.0.0"
 
-"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.39.0", "@octokit/types@^6.40.0":
+"@octokit/types@^6.41.0":
   version "6.41.0"
-  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04"
   integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==
   dependencies:
     "@octokit/openapi-types" "^12.11.0"
 
+"@octokit/types@^8.1.1":
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-8.2.1.tgz#a6de091ae68b5541f8d4fcf9a12e32836d4648aa"
+  integrity sha512-8oWMUji8be66q2B9PmEIUyQm00VPDPun07umUWSaCwxmeaquFBro4Hcc3ruVoDo3zkQyZBlRvhIMEYS3pBhanw==
+  dependencies:
+    "@octokit/openapi-types" "^14.0.0"
+
+"@octokit/types@^9.0.0":
+  version "9.3.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5"
+  integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==
+  dependencies:
+    "@octokit/openapi-types" "^18.0.0"
+
+"@parcel/watcher@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
+  integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==
+  dependencies:
+    node-addon-api "^3.2.1"
+    node-gyp-build "^4.3.0"
+
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
   integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
 
 "@protobufjs/base64@^1.1.2":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
   integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
 
 "@protobufjs/codegen@^2.0.4":
   version "2.0.4"
-  resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
   integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
 
 "@protobufjs/eventemitter@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
   integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
 
 "@protobufjs/fetch@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
   integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
   dependencies:
     "@protobufjs/aspromise" "^1.1.1"
@@ -2626,46 +2367,32 @@
 
 "@protobufjs/float@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
   integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
 
 "@protobufjs/inquire@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
   integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
 
 "@protobufjs/path@^1.1.2":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
   integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
 
 "@protobufjs/pool@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
   integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
 
 "@protobufjs/utf8@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@pyramation/babel-preset-env@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/@pyramation/babel-preset-env/-/babel-preset-env-0.1.0.tgz#cb9bf3a507d79b9ceb8b7e83815ed1a672209952"
-  integrity sha512-NgyUnQv5gDe4mTe0SbS3thOyV/XPdVKFx1KYtWARKTPCH4430nMyCrguAR9BJ1q1FLilGQdnr3JbGS1pPTRtrA==
-  dependencies:
-    "@babel/core" "7.9.6"
-    "@babel/plugin-proposal-class-properties" "7.8.3"
-    "@babel/plugin-proposal-export-default-from" "7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "7.9.6"
-    "@babel/plugin-transform-runtime" "7.9.6"
-    "@babel/preset-env" "7.9.6"
-    "@babel/preset-react" "7.9.4"
-    babel-plugin-macros "2.8.0"
-
 "@pyramation/json-schema-ref-parser@9.0.6":
   version "9.0.6"
-  resolved "https://registry.npmjs.org/@pyramation/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#556e416ce7dcc15a3c1afd04d6a059e03ed09aeb"
+  resolved "https://registry.yarnpkg.com/@pyramation/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#556e416ce7dcc15a3c1afd04d6a059e03ed09aeb"
   integrity sha512-L5kToHAEc1Q87R8ZwWFaNa4tPHr8Hnm+U+DRdUVq3tUtk+EX4pCqSd34Z6EMxNi/bjTzt1syAG9J2Oo1YFlqSg==
   dependencies:
     "@jsdevtools/ono" "^7.1.3"
@@ -2674,7 +2401,7 @@
 
 "@pyramation/json-schema-to-typescript@ 11.0.4":
   version "11.0.4"
-  resolved "https://registry.npmjs.org/@pyramation/json-schema-to-typescript/-/json-schema-to-typescript-11.0.4.tgz#959bdb631dad336e1fdbf608a9b5908ab0da1d6b"
+  resolved "https://registry.yarnpkg.com/@pyramation/json-schema-to-typescript/-/json-schema-to-typescript-11.0.4.tgz#959bdb631dad336e1fdbf608a9b5908ab0da1d6b"
   integrity sha512-+aSzXDLhMHOEdV2cJ7Tjg/9YenjHU5BCmClVygzwxJZ1R16NOfEn7lTAwVzb/2jivOSnhjHzMJbnSf8b6rd1zg==
   dependencies:
     "@pyramation/json-schema-ref-parser" "9.0.6"
@@ -2692,34 +2419,115 @@
     mz "^2.7.0"
     prettier "^2.6.2"
 
+"@sigstore/bundle@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
+  integrity sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+
+"@sigstore/protobuf-specs@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-1.0.0.tgz#6b08ebc2f6c92aa5acb07a49784cb6738796f7b4"
+  integrity sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
+
+"@sigstore/tuf@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.3.tgz#2a65986772ede996485728f027b0514c0b70b160"
+  integrity sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
+
 "@sinclair/typebox@^0.24.1":
   version "0.24.51"
-  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
   integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
 
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.6"
-  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
   integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
   dependencies:
     type-detect "4.0.8"
 
+"@sinonjs/commons@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
+  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
+  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+
 "@sinonjs/fake-timers@^9.1.2":
   version "9.1.2"
-  resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
   integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
+"@tsconfig/node10@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
+  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
+"@tufjs/canonical-json@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
+  integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
+
+"@tufjs/models@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
+  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
+  dependencies:
+    "@tufjs/canonical-json" "1.0.0"
+    minimatch "^9.0.0"
 
 "@types/babel__core@^7.1.14":
-  version "7.20.1"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
-  integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
   dependencies:
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
@@ -2728,189 +2536,372 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
+  version "7.6.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
+  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.1"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf"
-  integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd"
+  integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/glob@^7.1.3":
+"@types/glob@*":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
+"@types/glob@^7.1.3", "@types/glob@~7.2.0":
   version "7.2.0"
-  resolved "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
   integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/graceful-fs@^4.1.3":
-  version "4.1.6"
-  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
-  integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
   dependencies:
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
 
 "@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
+"@types/jest-in-case@^1.0.2":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/jest-in-case/-/jest-in-case-1.0.9.tgz#1cc6b6271f309d5537018900d6e8a8b9d6868a01"
+  integrity sha512-tapHpzWGjCC/hxYJyzbJ/5ZV6rA2153Sve5lGJUAIA1Jzrphfp27TznAWfGeXf+d8TLN7zMujaC0UwNQwSJaQg==
+  dependencies:
+    "@types/jest" "*"
+    "@types/node" "*"
+
+"@types/jest@*", "@types/jest@^29.5.11":
+  version "29.5.12"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
+  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
 "@types/jest@^28.1.6":
   version "28.1.8"
-  resolved "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz#6936409f3c9724ea431efd412ea0238a0f03b09b"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.8.tgz#6936409f3c9724ea431efd412ea0238a0f03b09b"
   integrity sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==
   dependencies:
     expect "^28.0.0"
     pretty-format "^28.0.0"
 
-"@types/json-schema@^7.0.11":
-  version "7.0.12"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
-  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+"@types/json-schema@^7.0.11", "@types/json-schema@^7.0.12":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/lodash@^4.14.182":
-  version "4.14.197"
-  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.197.tgz#e95c5ddcc814ec3e84c891910a01e0c8a378c54b"
-  integrity sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
+  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
 
 "@types/long@^4.0.1":
   version "4.0.2"
-  resolved "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/minimatch@*":
+"@types/minimatch@*", "@types/minimatch@^5.1.2":
   version "5.1.2"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/minimatch@^3.0.3":
   version "3.0.5"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/minimist@^1.2.0":
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+"@types/minimist@^1.2.0", "@types/minimist@^1.2.2":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
+  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "20.4.9"
-  resolved "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz#c7164e0f8d3f12dfae336af0b1f7fdec8c6b204f"
-  integrity sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==
+"@types/mkdirp@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.2.tgz#8d0bad7aa793abe551860be1f7ae7f3198c16666"
+  integrity sha512-o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@^20.12.7":
+  version "20.12.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
+  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
+  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
 "@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
+  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
 "@types/prettier@^2.1.5", "@types/prettier@^2.6.1":
   version "2.7.3"
-  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
   integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
 
+"@types/rimraf@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
+  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@types/semver@^7.5.0":
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
+
+"@types/shelljs@0.8.15":
+  version "0.8.15"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.15.tgz#22c6ab9dfe05cec57d8e6cb1a95ea173aee9fcac"
+  integrity sha512-vzmnCHl6hViPu9GNLQJ+DZFd6BQI2DBTUeOvYHqkWQLMfKAAQYMb/xAmZkTogZI/vqXHCWkqDRymDI5p0QTi5Q==
+  dependencies:
+    "@types/glob" "~7.2.0"
+    "@types/node" "*"
+
 "@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
 "@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+  version "21.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^17.0.8":
-  version "17.0.24"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
-  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
+  version "17.0.32"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
+  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
   dependencies:
     "@types/yargs-parser" "*"
 
+"@typescript-eslint/eslint-plugin@^6.18.1":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
+  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/type-utils" "6.21.0"
+    "@typescript-eslint/utils" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/parser@^6.18.1":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
+  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
+  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
+  dependencies:
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+
+"@typescript-eslint/type-utils@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
+  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/utils" "6.21.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/types@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
+  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
+
+"@typescript-eslint/typescript-estree@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
+  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
+  dependencies:
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
+  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    semver "^7.5.4"
+
+"@typescript-eslint/visitor-keys@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
+  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
+  dependencies:
+    "@typescript-eslint/types" "6.21.0"
+    eslint-visitor-keys "^3.4.1"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
+"@yarnpkg/lockfile@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
+"@yarnpkg/parsers@3.0.0-rc.46":
+  version "3.0.0-rc.46"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01"
+  integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==
+  dependencies:
+    js-yaml "^3.10.0"
+    tslib "^2.4.0"
+
+"@zkochan/js-yaml@0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
+  integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==
+  dependencies:
+    argparse "^2.0.1"
+
 JSONStream@^1.0.4:
   version "1.3.5"
-  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
   integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@1:
+abbrev@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
-  version "8.10.0"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
-  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+acorn-walk@^8.1.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
+  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
+
+acorn@^8.4.1, acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 add-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3:
+agentkeepalive@^4.2.1:
   version "4.5.0"
-  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
   integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
   dependencies:
     humanize-ms "^1.2.1"
 
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
+aggregate-error@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
+  integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==
+  dependencies:
+    clean-stack "^4.0.0"
+    indent-string "^5.0.0"
+
+ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -2918,230 +2909,243 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ansi-colors@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
+
 ansi-escapes@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
   integrity sha512-tH/fSoQp4DrEodDK3QpdiWiZTSe7sBJ9eOqcQBZ0o9HTM+5M/viSEn+sPMoTuPjQQ8n++w3QJoPEjt8LVPcrCg==
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-escapes@^4.2.1:
   version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
   integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
   integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 ansi-styles@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 any-promise@^1.0.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
 anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-aproba@^2.0.0:
+"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.7"
-  resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
-  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+are-we-there-yet@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    readable-stream "^3.6.0"
+
+are-we-there-yet@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz#aed25dd0eae514660d49ac2b2366b175c614785a"
+  integrity sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 argparse@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-buffer-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
-  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
   dependencies:
-    call-bind "^1.0.2"
-    is-array-buffer "^3.0.1"
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
 
 array-differ@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
   integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
 
 array-ify@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
   integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==
 
 array-union@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.reduce@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
-  integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
+array.prototype.reduce@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz#6aadc2f995af29cb887eb866d981dc85ab6f7dc7"
+  integrity sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
     es-array-method-boxes-properly "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
     is-string "^1.0.7"
 
-arraybuffer.prototype.slice@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
-  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    get-intrinsic "^1.2.1"
-    is-array-buffer "^3.0.2"
+arraybuffer.prototype.slice@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
     is-shared-array-buffer "^1.0.2"
 
 arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 arrify@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asap@^2.0.0:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
-
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
 ast-stringify@0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/ast-stringify/-/ast-stringify-0.1.0.tgz#5c6439fbfb4513dcc26c7d34464ccd084ed91cb7"
+  resolved "https://registry.yarnpkg.com/ast-stringify/-/ast-stringify-0.1.0.tgz#5c6439fbfb4513dcc26c7d34464ccd084ed91cb7"
   integrity sha512-J1PgFYV3RG6r37+M6ySZJH406hR82okwGvFM9hLXpOvdx4WC4GEW8/qiw6pi1hKTrqcRvoHP8a7mp87egYr6iA==
   dependencies:
     "@babel/runtime" "^7.11.2"
 
+async@^3.2.3:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.12.0"
-  resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
-  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
 
 axios@^0.21.2:
   version "0.21.4"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^1.0.0:
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-core@7.0.0-bridge.0:
   version "7.0.0-bridge.0"
-  resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-jest@28.1.3, babel-jest@^28.1.3:
+babel-jest@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
   integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
   dependencies:
     "@jest/transform" "^28.1.3"
@@ -3152,9 +3156,22 @@ babel-jest@28.1.3, babel-jest@^28.1.3:
     graceful-fs "^4.2.9"
     slash "^3.0.0"
 
+babel-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
+  dependencies:
+    "@jest/transform" "^29.7.0"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.6.3"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    slash "^3.0.0"
+
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
-  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -3165,7 +3182,7 @@ babel-plugin-istanbul@^6.1.1:
 
 babel-plugin-jest-hoist@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
   integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
   dependencies:
     "@babel/template" "^7.3.3"
@@ -3173,18 +3190,19 @@ babel-plugin-jest-hoist@^28.1.3:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
-  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
+babel-plugin-jest-hoist@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+  integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    cosmiconfig "^6.0.0"
-    resolve "^1.12.0"
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.1.14"
+    "@types/babel__traverse" "^7.0.6"
 
 babel-plugin-polyfill-corejs2@^0.3.2:
   version "0.3.3"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
   integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
@@ -3193,7 +3211,7 @@ babel-plugin-polyfill-corejs2@^0.3.2:
 
 babel-plugin-polyfill-corejs3@^0.5.3:
   version "0.5.3"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
   integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.2"
@@ -3201,14 +3219,14 @@ babel-plugin-polyfill-corejs3@^0.5.3:
 
 babel-plugin-polyfill-regenerator@^0.4.0:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
   integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
   integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
@@ -3226,15 +3244,23 @@ babel-preset-current-node-syntax@^1.0.0:
 
 babel-preset-jest@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
   integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
   dependencies:
     babel-plugin-jest-hoist "^28.1.3"
     babel-preset-current-node-syntax "^1.0.0"
 
+babel-preset-jest@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
+  dependencies:
+    babel-plugin-jest-hoist "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
+
 babel-watch@^7.0.0:
   version "7.8.1"
-  resolved "https://registry.npmjs.org/babel-watch/-/babel-watch-7.8.1.tgz#3be4016d61bfefae9522c116ef9ba209088e6498"
+  resolved "https://registry.yarnpkg.com/babel-watch/-/babel-watch-7.8.1.tgz#3be4016d61bfefae9522c116ef9ba209088e6498"
   integrity sha512-TnAlLAaorqMruh3BaTiXbbuv/b8iHqqvlljaWkCCJQLRsVFn7nUKO+38+DGxEaFvlj/IgIlQlx+DMirxSHiC4g==
   dependencies:
     chalk "^4.1.0"
@@ -3250,49 +3276,61 @@ babel-watch@^7.0.0:
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.0:
+base64-js@^1.3.0, base64-js@^1.3.1:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
 bech32@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
+  resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
 before-after-hook@^2.2.0:
   version "2.2.3"
-  resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
   integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
+bin-links@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.3.tgz#9e4a3c5900830aee3d7f52178b65e01dcdde64a5"
+  integrity sha512-obsRaULtJurnfox/MDwgq6Yo9kzbv1CPTk/1/s7Z/61Lezc8IKkFCOXNeVLXz0456WRzBQmSsDWlai2tIhBsfA==
+  dependencies:
+    cmd-shim "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+    read-cmd-shim "^4.0.0"
+    write-file-atomic "^5.0.0"
+
 binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
+  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
+
+bl@^4.0.3, bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
 
 bn.js@^4.11.9:
   version "4.12.0"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.2.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -3300,146 +3338,198 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
 brorand@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
-browserslist@^4.11.1, browserslist@^4.21.9:
-  version "4.21.10"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.22.2, browserslist@^4.23.0:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
-    node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
 
 bs-logger@0.x:
   version "0.2.6"
-  resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
   dependencies:
     fast-json-stable-stringify "2.x"
 
 bser@2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
   integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 builtins@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
+builtins@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.1.0.tgz#6d85eeb360c4ebc166c3fdef922a15aa7316a5e8"
+  integrity sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==
+  dependencies:
+    semver "^7.0.0"
 
-byte-size@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3"
-  integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==
+byte-size@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.0.tgz#36528cd1ca87d39bd9abd51f5715dc93b6ceb032"
+  integrity sha512-NNiBxKgxybMBtWdmvx7ZITJi4ZG+CYUgwOSZTfqB1qogkRHrhbQE/R2r5Fh94X+InN5MCYz6SvB/ejHMj/HbsQ==
 
-cacache@^15.0.5, cacache@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
+cacache@^16.1.0:
+  version "16.1.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
+  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
   dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
     chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
     infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
     p-map "^4.0.0"
     promise-inflight "^1.0.1"
     rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^2.0.0"
+
+cacache@^17.0.0, cacache@^17.0.4:
+  version "17.1.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.4.tgz#b3ff381580b47e85c6e64f801101508e26604b35"
+  integrity sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^7.7.1"
+    minipass "^7.0.3"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
 
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 call-me-maybe@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
   integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase-keys@^6.2.2:
   version "6.2.2"
-  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
   integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
     camelcase "^5.3.1"
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
+camelcase-keys@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
+  integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==
+  dependencies:
+    camelcase "^6.3.0"
+    map-obj "^4.1.0"
+    quick-lru "^5.1.1"
+    type-fest "^1.2.1"
+
 camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
+camelcase@^6.2.0, camelcase@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001517:
-  version "1.0.30001519"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz#3e7b8b8a7077e78b0eb054d69e6edf5c7df35601"
-  integrity sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==
+caniuse-lite@^1.0.30001587:
+  version "1.0.30001610"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz#2f44ed6e21d359e914271ae35b68903632628ccf"
+  integrity sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==
 
 case@1.6.3:
   version "1.6.3"
-  resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
+  resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
   integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+chalk@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
 chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
   dependencies:
     ansi-styles "^2.2.1"
@@ -3450,40 +3540,32 @@ chalk@^1.0.0, chalk@^1.1.3:
 
 chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 char-regex@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
 chardet@^0.4.0:
   version "0.4.2"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
   integrity sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==
 
 chardet@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 chokidar@^3.4.0, chokidar@^3.4.3:
-  version "3.5.3"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -3495,74 +3577,86 @@ chokidar@^3.4.0, chokidar@^3.4.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 chownr@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 ci-info@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-ci-info@^3.2.0:
-  version "3.8.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+ci-info@^3.2.0, ci-info@^3.6.1:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 cjs-module-lexer@^1.0.0:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
   integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
+clean-stack@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31"
+  integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==
+  dependencies:
+    escape-string-regexp "5.0.0"
+
 cli-color@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz#73769ba969080629670f3f2ef69a4bf4e7cc1879"
-  integrity sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.4.tgz#d658080290968816b322248b7306fad2346fb2c8"
+  integrity sha512-zlnpg0jNcibNrO7GG9IeHH7maWFeCz+Ja1wx/7tZNU5ASSSSZ+/qZciM0/LHCYxSdqv5h2sdbQ/PXYdOuetXvA==
   dependencies:
     d "^1.0.1"
-    es5-ext "^0.10.61"
+    es5-ext "^0.10.64"
     es6-iterator "^2.0.3"
     memoizee "^0.4.15"
     timers-ext "^0.1.7"
 
+cli-cursor@3.1.0, cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
+cli-spinners@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
+cli-spinners@^2.5.0:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
 
 cli-width@^2.0.0:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
 cli-width@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
 cliui@^7.0.2:
   version "7.0.4"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
   integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
@@ -3571,16 +3665,16 @@ cliui@^7.0.2:
 
 cliui@^8.0.1:
   version "8.0.1"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
   integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clone-deep@^4.0.1:
+clone-deep@4.0.1, clone-deep@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
   integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
   dependencies:
     is-plain-object "^2.0.4"
@@ -3589,93 +3683,103 @@ clone-deep@^4.0.1:
 
 clone@^1.0.2:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-cmd-shim@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
-  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
+cmd-shim@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
+  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
+cmd-shim@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.2.tgz#435fd9e5c95340e61715e19f90209ed6fcd9e0a4"
+  integrity sha512-+FFYbB0YLaAkhkcrjkyNLYDiOsFSfRjwjY19LXk/psmMx1z00xlCv7hhQoTGXXIKi+YXHL/iiFo8NqMVQX9nOw==
+
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
   integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colors@^1.1.2:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@^1.5.4:
+columnify@1.6.0:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
   integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
   dependencies:
     strip-ansi "^6.0.1"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@^4.0.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
 commander@^6.2.0:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
+common-ancestor-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
+  integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 compare-func@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
+  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
   integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==
   dependencies:
     array-ify "^1.0.0"
@@ -3683,12 +3787,12 @@ compare-func@^2.0.0:
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
   integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
   dependencies:
     buffer-from "^1.0.0"
@@ -3696,30 +3800,30 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-config-chain@^1.1.12:
-  version "1.1.13"
-  resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+config-chain@1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
   dependencies:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
-conventional-changelog-angular@^5.0.12:
-  version "5.0.13"
-  resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c"
-  integrity sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==
+conventional-changelog-angular@5.0.12:
+  version "5.0.12"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9"
+  integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==
   dependencies:
     compare-func "^2.0.0"
     q "^1.5.1"
 
-conventional-changelog-core@^4.2.2:
+conventional-changelog-core@4.2.4:
   version "4.2.4"
-  resolved "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz#e50d047e8ebacf63fac3dc67bf918177001e1e9f"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz#e50d047e8ebacf63fac3dc67bf918177001e1e9f"
   integrity sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==
   dependencies:
     add-stream "^1.0.0"
@@ -3739,12 +3843,12 @@ conventional-changelog-core@^4.2.2:
 
 conventional-changelog-preset-loader@^2.3.4:
   version "2.3.4"
-  resolved "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c"
   integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==
 
 conventional-changelog-writer@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359"
   integrity sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==
   dependencies:
     conventional-commits-filter "^2.0.7"
@@ -3759,7 +3863,7 @@ conventional-changelog-writer@^5.0.0:
 
 conventional-commits-filter@^2.0.7:
   version "2.0.7"
-  resolved "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3"
   integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==
   dependencies:
     lodash.ismatch "^4.4.0"
@@ -3767,7 +3871,7 @@ conventional-commits-filter@^2.0.7:
 
 conventional-commits-parser@^3.2.0:
   version "3.2.4"
-  resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972"
   integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==
   dependencies:
     JSONStream "^1.0.4"
@@ -3777,9 +3881,9 @@ conventional-commits-parser@^3.2.0:
     split2 "^3.0.0"
     through2 "^4.0.0"
 
-conventional-recommended-bump@^6.1.0:
+conventional-recommended-bump@6.1.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55"
   integrity sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==
   dependencies:
     concat-stream "^2.0.0"
@@ -3791,48 +3895,50 @@ conventional-recommended-bump@^6.1.0:
     meow "^8.0.0"
     q "^1.5.1"
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.6.2:
-  version "3.32.0"
-  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.0.tgz#f41574b6893ab15ddb0ac1693681bd56c8550a90"
-  integrity sha512-7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw==
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
+copyfiles@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5"
+  integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==
   dependencies:
-    browserslist "^4.21.9"
+    glob "^7.0.5"
+    minimatch "^3.0.3"
+    mkdirp "^1.0.4"
+    noms "0.0.0"
+    through2 "^2.0.1"
+    untildify "^4.0.0"
+    yargs "^16.1.0"
 
-core-js@^3.30.2:
-  version "3.32.0"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz#7643d353d899747ab1f8b03d2803b0312a0fb3b6"
-  integrity sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww==
+core-js-compat@^3.21.0, core-js-compat@^3.22.1:
+  version "3.37.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73"
+  integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA==
+  dependencies:
+    browserslist "^4.23.0"
 
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+core-js@^3.30.2:
+  version "3.37.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb"
+  integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==
 
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.7.2"
-
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+cosmiconfig@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -3842,68 +3948,111 @@ cosmiconfig@^7.0.0:
 
 cosmjs-types@^0.7.1:
   version "0.7.2"
-  resolved "https://registry.npmjs.org/cosmjs-types/-/cosmjs-types-0.7.2.tgz#a757371abd340949c5bd5d49c6f8379ae1ffd7e2"
+  resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.7.2.tgz#a757371abd340949c5bd5d49c6f8379ae1ffd7e2"
   integrity sha512-vf2uLyktjr/XVAgEq0DjMxeAWh1yYREe7AMHDKd7EiHVqxBPCaBS+qEEQUkXbR9ndnckqr1sUG8BQhazh4X5lA==
   dependencies:
     long "^4.0.0"
     protobufjs "~6.11.2"
 
+create-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
+  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    prompts "^2.0.1"
+
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 cross-env@^7.0.2:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
   integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+d@1, d@^1.0.1, d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
+  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
   dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
+    es5-ext "^0.10.64"
+    type "^2.7.2"
 
 dargs@7.0.0, dargs@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
   integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
   dependencies:
-    assert-plus "^1.0.0"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
 
 dateformat@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debuglog@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
-
 decamelize-keys@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
   integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
   dependencies:
     decamelize "^1.1.0"
@@ -3911,147 +4060,204 @@ decamelize-keys@^1.1.0:
 
 decamelize@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+decamelize@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
+  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
 
-dedent@^0.7.0:
+dedent@0.7.0, dedent@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
+dedent@^1.0.0:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a"
+  integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==
+
 deep-is@^0.1.3:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@4.2.2:
   version "4.2.2"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
 deepmerge@^4.2.2:
   version "4.3.1"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 defaults@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
   integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
+define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+del-cli@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-5.1.0.tgz#740eca1c7a9eb13043e68d8a361cf0ff9a18d5c8"
+  integrity sha512-xwMeh2acluWeccsfzE7VLsG3yTr7nWikbfw+xhMnpRrF15pGSkw+3/vJZWlGoE4I86UiLRNHicmKt4tkIX9Jtg==
+  dependencies:
+    del "^7.1.0"
+    meow "^10.1.3"
+
+del@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
+  integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
+  dependencies:
+    globby "^11.0.1"
+    graceful-fs "^4.2.4"
+    is-glob "^4.0.1"
+    is-path-cwd "^2.2.0"
+    is-path-inside "^3.0.2"
+    p-map "^4.0.0"
+    rimraf "^3.0.2"
+    slash "^3.0.0"
+
+del@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-7.1.0.tgz#0de0044d556b649ff05387f1fa7c885e155fd1b6"
+  integrity sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg==
+  dependencies:
+    globby "^13.1.2"
+    graceful-fs "^4.2.10"
+    is-glob "^4.0.3"
+    is-path-cwd "^3.0.0"
+    is-path-inside "^4.0.0"
+    p-map "^5.5.0"
+    rimraf "^3.0.2"
+    slash "^4.0.0"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 delegates@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
 detect-indent@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==
 
-detect-indent@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
-  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
-
 detect-newline@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-dezalgo@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
-  integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
-  dependencies:
-    asap "^2.0.0"
-    wrappy "1"
-
 diff-sequences@^28.1.1:
   version "28.1.1"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 dir-glob@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
   integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
     path-type "^4.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
   integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
-dot-prop@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
-  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+dot-prop@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
+  integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
   dependencies:
     is-obj "^2.0.0"
 
-dot-prop@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
-  integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
+dot-prop@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
     is-obj "^2.0.0"
 
-dotty@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/dotty/-/dotty-0.1.2.tgz#512d44cc4111a724931226259297f235e8484f6f"
-  integrity sha512-V0EWmKeH3DEhMwAZ+8ZB2Ao4OK6p++Z0hsDtZq3N0+0ZMVqkzrcEGROvOnZpLnvBg5PTNG23JEDLAm64gPaotQ==
+dotenv@~10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
 duplexer@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
+ejs@^3.1.7:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
+    jake "^10.8.5"
 
-electron-to-chromium@^1.4.477:
-  version "1.4.488"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.488.tgz#442b1855f8c84fb1ed79f518985c65db94f64cc9"
-  integrity sha512-Dv4sTjiW7t/UWGL+H8ZkgIjtUAVZDgb/PwGWvMsCT7jipzUV/u5skbLXPFKb6iV0tiddVi/bcS2/kUrczeWgIQ==
+electron-to-chromium@^1.4.668:
+  version "1.4.737"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz#3a774a58e04980741f65d440f5fdf57af18b6dde"
+  integrity sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw==
 
 elliptic@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.5.tgz#c715e09f78b6923977610d4c2346d6ce22e6dded"
+  integrity sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"
@@ -4063,123 +4269,174 @@ elliptic@^6.5.4:
 
 emittery@^0.10.2:
   version "0.10.2"
-  resolved "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-encoding@^0.1.12:
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
+encoding@^0.1.13:
   version "0.1.13"
-  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
   dependencies:
     iconv-lite "^0.6.2"
 
+end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+enquirer@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 env-paths@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.4:
-  version "7.10.0"
-  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
-  integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.12.0.tgz#b56723b39c2053d67ea5714f026d05d4f5cc7acd"
+  integrity sha512-Iw9rQJBGpJRd3rwXm9ft/JiGoAZmLxxJZELYDQoPRZ4USVhkKtIcNBPw6U+/K2mBpaqM25JSV6Yl4Az9vO2wJg==
 
 err-code@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
 error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
-  version "1.22.1"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
-  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.1"
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.1"
-    get-symbol-description "^1.0.0"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.5"
-    is-array-buffer "^3.0.2"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    is-shared-array-buffer "^1.0.3"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.3"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.0"
-    safe-array-concat "^1.0.0"
-    safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-buffer "^1.0.0"
-    typed-array-byte-length "^1.0.0"
-    typed-array-byte-offset "^1.0.0"
-    typed-array-length "^1.0.4"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.10"
+    which-typed-array "^1.1.15"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
   integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.2.1, es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
   integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.61, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.62"
-  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
-  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.64"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
+  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
   dependencies:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.3"
+    esniff "^2.0.1"
     next-tick "^1.1.0"
 
 es6-iterator@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
   dependencies:
     d "1"
@@ -4187,16 +4444,16 @@ es6-iterator@^2.0.3:
     es6-symbol "^3.1.1"
 
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
+  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
   dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
+    d "^1.0.2"
+    ext "^1.7.0"
 
 es6-weak-map@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
   integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
@@ -4205,48 +4462,75 @@ es6-weak-map@^2.0.3:
     es6-symbol "^3.1.1"
 
 escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+
+escape-string-regexp@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-prettier@^8.5.0:
   version "8.10.0"
-  resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
   integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
 
+eslint-config-prettier@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
+  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
+
 eslint-plugin-prettier@^4.2.1:
   version "4.2.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
   integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
+eslint-plugin-simple-import-sort@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
+  integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
+
+eslint-plugin-unused-imports@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.1.0.tgz#db015b569d3774e17a482388c95c17bd303bc602"
+  integrity sha512-9l1YFCzXKkw1qtAru1RWUtG2EVDZY0a0eChKXcL+EZ5jitG7qxdctu4RnvhOJHv4xfmUf7h+JJPINlVpGhZMrw==
+  dependencies:
+    eslint-rule-composer "^0.3.0"
+
+eslint-rule-composer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+
 eslint-scope@5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
+eslint-scope@^7.1.1, eslint-scope@^7.2.2:
   version "7.2.2"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
@@ -4254,24 +4538,24 @@ eslint-scope@^7.1.1:
 
 eslint-utils@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
   integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
 eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
-  version "3.4.2"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
-  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@8.21.0:
   version "8.21.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef"
   integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==
   dependencies:
     "@eslint/eslintrc" "^1.3.0"
@@ -4283,40 +4567,94 @@ eslint@8.21.0:
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.3"
-    esquery "^1.4.0"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.3"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^6.0.1"
+    globals "^13.15.0"
+    globby "^11.1.0"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
+    strip-json-comments "^3.1.0"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+eslint@^8.56.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
-    globby "^11.1.0"
-    grapheme-splitter "^1.0.4"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.3, espree@^9.4.0:
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
+espree@^9.3.3, espree@^9.4.0, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
     acorn "^8.9.0"
@@ -4325,41 +4663,41 @@ espree@^9.3.3, espree@^9.4.0:
 
 esprima@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
+esquery@^1.4.0, esquery@^1.4.2:
   version "1.5.0"
-  resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 event-emitter@^0.3.5:
   version "0.3.5"
-  resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
   dependencies:
     d "1"
@@ -4367,12 +4705,27 @@ event-emitter@^0.3.5:
 
 eventemitter3@^4.0.4:
   version "4.0.7"
-  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
+execa@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
+  integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
 execa@^5.0.0:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
@@ -4387,12 +4740,12 @@ execa@^5.0.0:
 
 exit@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expect@^28.0.0, expect@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
   integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
   dependencies:
     "@jest/expect-utils" "^28.1.3"
@@ -4401,21 +4754,32 @@ expect@^28.0.0, expect@^28.1.3:
     jest-message-util "^28.1.3"
     jest-util "^28.1.3"
 
-ext@^1.1.2:
+expect@^29.0.0, expect@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
+  dependencies:
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
+ext@^1.7.0:
   version "1.7.0"
-  resolved "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
   integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
   dependencies:
     type "^2.7.2"
 
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 external-editor@^2.0.4:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
   dependencies:
     chardet "^0.4.0"
@@ -4424,37 +4788,38 @@ external-editor@^2.0.4:
 
 external-editor@^3.0.3:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.2.9:
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+fast-glob@3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-glob@^3.2.9, fast-glob@^3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -4462,144 +4827,165 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
     reusify "^1.0.4"
 
 fb-watchman@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
   integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
+figures@3.2.0, figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
   integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
+file-url@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz#247a586a746ce9f7a8ed05560290968afc262a77"
+  integrity sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA==
+
+filelist@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+  dependencies:
+    minimatch "^5.0.1"
+
 fill-range@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
   integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
-filter-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
-  integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
-
 find-cache-dir@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-up@5.0.0, find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-up@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
   integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
+flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-follow-redirects@^1.14.0:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.14.0, follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
-  resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
   integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
   dependencies:
     is-callable "^1.1.3"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.6"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fs-extra@^9.1.0:
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@9.1.0, fs-extra@^9.1.0:
   version "9.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
     at-least-node "^1.0.0"
@@ -4607,107 +4993,131 @@ fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+fs-extra@^11.1.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
   dependencies:
-    minipass "^2.6.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
 
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
   dependencies:
     minipass "^3.0.0"
 
+fs-minipass@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
+  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
+  dependencies:
+    minipass "^7.0.3"
+
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
   integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^2.3.2, fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 fuzzy@0.1.3:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
+  resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
   integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
+gauge@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.1.tgz#1efc801b8ff076b86ef3e9a7a280a975df572112"
+  integrity sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^4.0.1"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
+gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
-  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-package-type@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
 get-pkg-repo@^4.0.0:
   version "4.2.1"
-  resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385"
+  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385"
   integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==
   dependencies:
     "@hutson/parse-repository-url" "^3.0.0"
@@ -4715,39 +5125,38 @@ get-pkg-repo@^4.0.0:
     through2 "^2.0.0"
     yargs "^16.2.0"
 
-get-port@^5.1.1:
+get-port@5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
 get-stdin@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
+get-stream@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
+  integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
+
 get-stream@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
   dependencies:
-    assert-plus "^1.0.0"
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
 
 git-raw-commits@^2.0.8:
   version "2.0.11"
-  resolved "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
   integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==
   dependencies:
     dargs "^7.0.0"
@@ -4758,7 +5167,7 @@ git-raw-commits@^2.0.8:
 
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
   integrity sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==
   dependencies:
     gitconfiglocal "^1.0.0"
@@ -4766,58 +5175,70 @@ git-remote-origin-url@^2.0.0:
 
 git-semver-tags@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780"
   integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==
   dependencies:
     meow "^8.0.0"
     semver "^6.0.0"
 
-git-up@^4.0.0:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/git-up/-/git-up-4.0.5.tgz#e7bb70981a37ea2fb8fe049669800a1f9a01d759"
-  integrity sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==
+git-up@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467"
+  integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==
   dependencies:
-    is-ssh "^1.3.0"
-    parse-url "^6.0.0"
+    is-ssh "^1.4.0"
+    parse-url "^8.1.0"
 
-git-url-parse@^11.4.4:
-  version "11.6.0"
-  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605"
-  integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==
+git-url-parse@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.0.tgz#07e136b5baa08d59fabdf0e33170de425adf07b4"
+  integrity sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==
   dependencies:
-    git-up "^4.0.0"
+    git-up "^7.0.0"
 
 gitconfiglocal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
   integrity sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==
   dependencies:
     ini "^1.3.2"
 
-glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
     is-glob "^4.0.3"
 
 glob-promise@^4.2.2:
   version "4.2.2"
-  resolved "https://registry.npmjs.org/glob-promise/-/glob-promise-4.2.2.tgz#15f44bcba0e14219cd93af36da6bb905ff007877"
+  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-4.2.2.tgz#15f44bcba0e14219cd93af36da6bb905ff007877"
   integrity sha512-xcUzJ8NWN5bktoTIX7eOclO1Npxd/dyVqUJxlLIDasT4C7KZyqlPIwkdJ0Ypiy3p2ZKahTjK4M9uC3sNSfNMzw==
   dependencies:
     "@types/glob" "^7.1.3"
 
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@8.0.3:
   version "8.0.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
   integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -4826,9 +5247,31 @@ glob@8.0.3:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@8.1.0, glob@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
+glob@^10.0.0, glob@^10.2.2:
+  version "10.3.12"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
+  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.6"
+    minimatch "^9.0.1"
+    minipass "^7.0.4"
+    path-scurry "^1.10.2"
+
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
@@ -4838,28 +5281,38 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^9.2.0:
+  version "9.3.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21"
+  integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    minimatch "^8.0.2"
+    minipass "^4.2.4"
+    path-scurry "^1.6.1"
+
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.15.0, globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
 globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
     define-properties "^1.1.3"
 
-globby@^11.0.2, globby@^11.1.0:
+globby@11.1.0, globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -4869,26 +5322,47 @@ globby@^11.0.2, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+globby@^13.1.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
+  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
+  dependencies:
+    dir-glob "^3.0.1"
+    fast-glob "^3.3.0"
+    ignore "^5.2.4"
+    merge2 "^1.4.1"
+    slash "^4.0.0"
+
 gopd@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
   integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.9:
+graceful-fs@4.2.10:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 handlebars@^4.7.7:
   version "4.7.8"
-  resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
   integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==
   dependencies:
     minimist "^1.2.5"
@@ -4898,93 +5372,80 @@ handlebars@^4.7.7:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 hard-rejection@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
   dependencies:
-    get-intrinsic "^1.1.1"
+    es-define-property "^1.0.0"
 
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+has-proto@^1.0.1, has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
 
 has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
   dependencies:
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
 
-has-unicode@^2.0.0, has-unicode@^2.0.1:
+has-unicode@2.0.1, has-unicode@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
-  resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 hmac-drbg@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
   dependencies:
     hash.js "^1.0.3"
@@ -4993,54 +5454,66 @@ hmac-drbg@^1.0.1:
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
+hosted-git-info@^3.0.6:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
+  integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 hosted-git-info@^4.0.0, hosted-git-info@^4.0.1:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
     lru-cache "^6.0.0"
 
+hosted-git-info@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f"
+  integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==
+  dependencies:
+    lru-cache "^7.5.1"
+
+hosted-git-info@^6.0.0, hosted-git-info@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
+  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
+  dependencies:
+    lru-cache "^7.5.1"
+
 html-escaper@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-http-cache-semantics@^4.1.0:
+http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
-    "@tootallnate/once" "1"
+    "@tootallnate/once" "2"
     agent-base "6"
     debug "4"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 https-proxy-agent@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
@@ -5048,45 +5521,57 @@ https-proxy-agent@^5.0.0:
 
 human-signals@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 humanize-ms@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
   integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
   dependencies:
     ms "^2.0.0"
 
 iconv-lite@^0.4.17, iconv-lite@^0.4.24:
   version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.6.2:
   version "0.6.3"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-ignore-walk@^3.0.3:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
-  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+ignore-walk@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
+  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
   dependencies:
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
+
+ignore-walk@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
+  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
+  dependencies:
+    minimatch "^9.0.0"
 
-ignore@^5.2.0:
-  version "5.2.4"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
@@ -5094,7 +5579,7 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
 
 import-local@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
   integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
   dependencies:
     pkg-dir "^4.2.0"
@@ -5102,58 +5587,63 @@ import-local@^3.0.2:
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
+indent-string@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
+  integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
+
 infer-owner@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.2, ini@^1.3.4:
   version "1.3.8"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-init-package-json@^2.0.2:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
-  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
+init-package-json@3.0.2, init-package-json@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
+  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
   dependencies:
-    npm-package-arg "^8.1.5"
+    npm-package-arg "^9.0.1"
     promzard "^0.3.0"
-    read "~1.0.1"
-    read-package-json "^4.1.1"
+    read "^1.0.7"
+    read-package-json "^5.0.0"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^3.0.0"
+    validate-npm-package-name "^4.0.0"
 
 inquirer-autocomplete-prompt@^0.11.1:
   version "0.11.1"
-  resolved "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-0.11.1.tgz#f90ca9510a4c489882e9be294934bd8c2e575e09"
+  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-0.11.1.tgz#f90ca9510a4c489882e9be294934bd8c2e575e09"
   integrity sha512-VM4eNiyRD4CeUc2cyKni+F8qgHwL9WC4LdOr+mEC85qP/QNsDV+ysVqUrJYhw1TmDQu1QVhc8hbaL7wfk8SJxw==
   dependencies:
     ansi-escapes "^2.0.0"
@@ -5166,7 +5656,7 @@ inquirer-autocomplete-prompt@^0.11.1:
 
 inquirer@3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-3.1.1.tgz#87621c4fba4072f48a8dd71c9f9df6f100b2d534"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.1.1.tgz#87621c4fba4072f48a8dd71c9f9df6f100b2d534"
   integrity sha512-H50sHQwgvvaTBd3HpKMVtL/u6LoHDvYym51gd7bGQe/+9HkCE+J0/3N5FJLfd6O6oz44hHewC2Pc2LodzWVafQ==
   dependencies:
     ansi-escapes "^2.0.0"
@@ -5184,9 +5674,30 @@ inquirer@3.1.1:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@8.2.4:
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4"
+  integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.1"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.21"
+    mute-stream "0.0.8"
+    ora "^5.4.1"
+    run-async "^2.4.0"
+    rxjs "^7.5.5"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+    wrap-ansi "^7.0.0"
+
 inquirer@^6.0.0:
   version "6.5.2"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
   integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
@@ -5203,91 +5714,88 @@ inquirer@^6.0.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^7.3.3:
-  version "7.3.3"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+inquirer@^8.2.4:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562"
+  integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
+    chalk "^4.1.1"
     cli-cursor "^3.1.0"
     cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.19"
+    lodash "^4.17.21"
     mute-stream "0.0.8"
+    ora "^5.4.1"
     run-async "^2.4.0"
-    rxjs "^6.6.0"
+    rxjs "^7.5.5"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
+    wrap-ansi "^6.0.1"
 
 inquirerer@0.1.3:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/inquirerer/-/inquirerer-0.1.3.tgz#ecf91dc672b3bf45211d7f64bf5e8d5e171fd2ad"
+  resolved "https://registry.yarnpkg.com/inquirerer/-/inquirerer-0.1.3.tgz#ecf91dc672b3bf45211d7f64bf5e8d5e171fd2ad"
   integrity sha512-yGgLUOqPxTsINBjZNZeLi3cv2zgxXtw9feaAOSJf2j6AqIT5Uxs5ZOqOrfAf+xP65Sicla1FD3iDxa3D6TsCAQ==
   dependencies:
     colors "^1.1.2"
     inquirer "^6.0.0"
     inquirer-autocomplete-prompt "^0.11.1"
 
-internal-slot@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
-  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
   dependencies:
-    get-intrinsic "^1.2.0"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    hasown "^2.0.0"
     side-channel "^1.0.4"
 
 interpret@^1.0.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+ip-address@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
+  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
   dependencies:
-    loose-envify "^1.0.0"
-
-ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+    jsbn "1.1.0"
+    sprintf-js "^1.1.3"
 
-is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
-  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    is-typed-array "^1.1.10"
+    get-intrinsic "^1.2.1"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
   integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
   dependencies:
     has-bigints "^1.0.1"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
   dependencies:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
   integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
     call-bind "^1.0.2"
@@ -5295,223 +5803,260 @@ is-boolean-object@^1.1.0:
 
 is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^2.0.0:
+is-ci@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
   integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.13.0, is-core-module@^2.5.0:
-  version "2.13.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
   dependencies:
-    has "^1.0.3"
+    is-typed-array "^1.1.13"
 
 is-date-object@^1.0.1:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-docker@^2.0.0, is-docker@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-fn@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-lambda@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
   integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
 is-number-object@^1.0.4:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
   integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-obj@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
+is-path-cwd@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-3.0.0.tgz#889b41e55c8588b1eb2a96a61d05740a674521c7"
+  integrity sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==
+
+is-path-inside@^3.0.2, is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+is-path-inside@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
+  integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==
+
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
-is-plain-obj@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
 is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-plain-object@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
 is-promise@^2.2.2:
   version "2.2.2"
-  resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
 is-regex@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
+  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
 
-is-ssh@^1.3.0:
+is-ssh@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
+  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
   integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
   dependencies:
     protocols "^2.0.1"
 
+is-stream@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
 is-stream@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
     has-symbols "^1.0.2"
 
 is-text-path@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
   integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.12"
-  resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
-  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
   dependencies:
-    which-typed-array "^1.1.11"
+    which-typed-array "^1.1.14"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
 is-weakref@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
 
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
+
 isarray@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 isomorphic-ws@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
   integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
 istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
   integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
     "@babel/core" "^7.12.3"
@@ -5520,9 +6065,20 @@ istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
     istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz#91655936cf7380e4e473383081e38478b69993b1"
+  integrity sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==
+  dependencies:
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^7.5.4"
+
 istanbul-lib-report@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
   integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
@@ -5531,7 +6087,7 @@ istanbul-lib-report@^3.0.0:
 
 istanbul-lib-source-maps@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
   integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
@@ -5539,24 +6095,52 @@ istanbul-lib-source-maps@^4.0.0:
     source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
-  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+jackspeak@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
+jake@^10.8.5:
+  version "10.8.7"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
+  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
+  dependencies:
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.4"
+    minimatch "^3.1.2"
+
 jest-changed-files@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831"
   integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==
   dependencies:
     execa "^5.0.0"
     p-limit "^3.1.0"
 
+jest-changed-files@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
+  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
+  dependencies:
+    execa "^5.0.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+
 jest-circus@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4"
   integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -5579,9 +6163,35 @@ jest-circus@^28.1.3:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-circus@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
+  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^1.0.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.7.0"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+    pretty-format "^29.7.0"
+    pure-rand "^6.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-cli@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2"
   integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==
   dependencies:
     "@jest/core" "^28.1.3"
@@ -5597,9 +6207,26 @@ jest-cli@^28.1.3:
     prompts "^2.0.1"
     yargs "^17.3.1"
 
+jest-cli@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
+  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
+  dependencies:
+    "@jest/core" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    create-jest "^29.7.0"
+    exit "^0.1.2"
+    import-local "^3.0.2"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    yargs "^17.3.1"
+
 jest-config@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60"
   integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -5625,9 +6252,37 @@ jest-config@^28.1.3:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
+jest-config@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
+  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-jest "^29.7.0"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
 jest-diff@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
   integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==
   dependencies:
     chalk "^4.0.0"
@@ -5635,16 +6290,33 @@ jest-diff@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
+jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
 jest-docblock@^28.1.1:
   version "28.1.1"
-  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8"
   integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==
   dependencies:
     detect-newline "^3.0.0"
 
+jest-docblock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
+  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
+  dependencies:
+    detect-newline "^3.0.0"
+
 jest-each@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81"
   integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -5653,9 +6325,20 @@ jest-each@^28.1.3:
     jest-util "^28.1.3"
     pretty-format "^28.1.3"
 
+jest-each@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
+  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    jest-get-type "^29.6.3"
+    jest-util "^29.7.0"
+    pretty-format "^29.7.0"
+
 jest-environment-node@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5"
   integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -5665,14 +6348,31 @@ jest-environment-node@^28.1.3:
     jest-mock "^28.1.3"
     jest-util "^28.1.3"
 
+jest-environment-node@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
+  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
 jest-get-type@^28.0.2:
   version "28.0.2"
-  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
   integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
 
+jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
+
 jest-haste-map@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
   integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -5689,22 +6389,49 @@ jest-haste-map@^28.1.3:
   optionalDependencies:
     fsevents "^2.3.2"
 
+jest-haste-map@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+  integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/graceful-fs" "^4.1.3"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
+    micromatch "^4.0.4"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
 jest-in-case@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/jest-in-case/-/jest-in-case-1.0.2.tgz#56744b5af33222bd0abab70cf919f1d170ab75cc"
+  resolved "https://registry.yarnpkg.com/jest-in-case/-/jest-in-case-1.0.2.tgz#56744b5af33222bd0abab70cf919f1d170ab75cc"
   integrity sha512-2DE6Gdwnh5jkCYTePWoQinF+zne3lCADibXoYJEt8PS84JaRug0CyAOrEgzMxbzln3YcSY2PBeru7ct4tbflYA==
 
 jest-leak-detector@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d"
   integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==
   dependencies:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
+jest-leak-detector@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
+  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
+  dependencies:
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
 jest-matcher-utils@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
   integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
   dependencies:
     chalk "^4.0.0"
@@ -5712,9 +6439,19 @@ jest-matcher-utils@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
+jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
 jest-message-util@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
   integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==
   dependencies:
     "@babel/code-frame" "^7.12.13"
@@ -5727,35 +6464,72 @@ jest-message-util@^28.1.3:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.6.3"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da"
   integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==
   dependencies:
     "@jest/types" "^28.1.3"
     "@types/node" "*"
 
+jest-mock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
+  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-util "^29.7.0"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
 jest-regex-util@^28.0.2:
   version "28.0.2"
-  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
   integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
 
+jest-regex-util@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
+
 jest-resolve-dependencies@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66"
   integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==
   dependencies:
     jest-regex-util "^28.0.2"
     jest-snapshot "^28.1.3"
 
+jest-resolve-dependencies@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
+  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
+  dependencies:
+    jest-regex-util "^29.6.3"
+    jest-snapshot "^29.7.0"
+
 jest-resolve@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8"
   integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==
   dependencies:
     chalk "^4.0.0"
@@ -5768,9 +6542,24 @@ jest-resolve@^28.1.3:
     resolve.exports "^1.1.0"
     slash "^3.0.0"
 
+jest-resolve@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
+  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
+  dependencies:
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    resolve "^1.20.0"
+    resolve.exports "^2.0.0"
+    slash "^3.0.0"
+
 jest-runner@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1"
   integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==
   dependencies:
     "@jest/console" "^28.1.3"
@@ -5795,9 +6584,36 @@ jest-runner@^28.1.3:
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
+jest-runner@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
+  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/environment" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-leak-detector "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-resolve "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-util "^29.7.0"
+    jest-watcher "^29.7.0"
+    jest-worker "^29.7.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
 jest-runtime@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f"
   integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -5823,9 +6639,37 @@ jest-runtime@^28.1.3:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
+jest-runtime@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
+  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/globals" "^29.7.0"
+    "@jest/source-map" "^29.6.3"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
 jest-snapshot@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"
   integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -5852,9 +6696,35 @@ jest-snapshot@^28.1.3:
     pretty-format "^28.1.3"
     semver "^7.3.5"
 
+jest-snapshot@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
+  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
+    chalk "^4.0.0"
+    expect "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    natural-compare "^1.4.0"
+    pretty-format "^29.7.0"
+    semver "^7.5.3"
+
 jest-util@^28.0.0, jest-util@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
   integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -5864,9 +6734,21 @@ jest-util@^28.0.0, jest-util@^28.1.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.0.0, jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-validate@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df"
   integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -5876,9 +6758,21 @@ jest-validate@^28.1.3:
     leven "^3.1.0"
     pretty-format "^28.1.3"
 
+jest-validate@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
+  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^29.6.3"
+    leven "^3.1.0"
+    pretty-format "^29.7.0"
+
 jest-watcher@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
   integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
   dependencies:
     "@jest/test-result" "^28.1.3"
@@ -5890,18 +6784,42 @@ jest-watcher@^28.1.3:
     jest-util "^28.1.3"
     string-length "^4.0.1"
 
+jest-watcher@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
+  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
+  dependencies:
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    jest-util "^29.7.0"
+    string-length "^4.0.1"
+
 jest-worker@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
   integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@28.1.3, jest@^28.1.3:
+jest-worker@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
+  dependencies:
+    "@types/node" "*"
+    jest-util "^29.7.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+jest@28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b"
   integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==
   dependencies:
     "@jest/core" "^28.1.3"
@@ -5909,79 +6827,104 @@ jest@28.1.3, jest@^28.1.3:
     import-local "^3.0.2"
     jest-cli "^28.1.3"
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+jest@^29.6.2:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
+  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
+  dependencies:
+    "@jest/core" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    import-local "^3.0.2"
+    jest-cli "^29.7.0"
+
+js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
+js-yaml@4.1.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+js-yaml@^3.10.0, js-yaml@^3.13.1:
   version "3.14.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+jsbn@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-parse-even-better-errors@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
+  integrity sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-nice@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
+  integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
+
+json-stringify-safe@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^2.1.2, json5@^2.2.1, json5@^2.2.2:
+json5@^2.2.1, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonc-parser@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
+
 jsonfile@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
   integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
     universalify "^2.0.0"
@@ -5990,124 +6933,180 @@ jsonfile@^6.0.1:
 
 jsonparse@^1.2.0, jsonparse@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+just-diff-apply@^5.2.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f"
+  integrity sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==
+
+just-diff@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285"
+  integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==
+
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
+    json-buffer "3.0.1"
 
 kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-lerna@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz#b139d685d50ea0ca1be87713a7c2f44a5b678e9e"
-  integrity sha512-DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg==
-  dependencies:
-    "@lerna/add" "4.0.0"
-    "@lerna/bootstrap" "4.0.0"
-    "@lerna/changed" "4.0.0"
-    "@lerna/clean" "4.0.0"
-    "@lerna/cli" "4.0.0"
-    "@lerna/create" "4.0.0"
-    "@lerna/diff" "4.0.0"
-    "@lerna/exec" "4.0.0"
-    "@lerna/import" "4.0.0"
-    "@lerna/info" "4.0.0"
-    "@lerna/init" "4.0.0"
-    "@lerna/link" "4.0.0"
-    "@lerna/list" "4.0.0"
-    "@lerna/publish" "4.0.0"
-    "@lerna/run" "4.0.0"
-    "@lerna/version" "4.0.0"
+lerna@^6:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.6.2.tgz#ad921f913aca4e7307123a598768b6f15ca5804f"
+  integrity sha512-W4qrGhcdutkRdHEaDf9eqp7u4JvI+1TwFy5woX6OI8WPe4PYBdxuILAsvhp614fUG41rKSGDKlOh+AWzdSidTg==
+  dependencies:
+    "@lerna/child-process" "6.6.2"
+    "@lerna/create" "6.6.2"
+    "@lerna/legacy-package-management" "6.6.2"
+    "@npmcli/arborist" "6.2.3"
+    "@npmcli/run-script" "4.1.7"
+    "@nrwl/devkit" ">=15.5.2 < 16"
+    "@octokit/plugin-enterprise-rest" "6.0.1"
+    "@octokit/rest" "19.0.3"
+    byte-size "7.0.0"
+    chalk "4.1.0"
+    clone-deep "4.0.1"
+    cmd-shim "5.0.0"
+    columnify "1.6.0"
+    config-chain "1.1.12"
+    conventional-changelog-angular "5.0.12"
+    conventional-changelog-core "4.2.4"
+    conventional-recommended-bump "6.1.0"
+    cosmiconfig "7.0.0"
+    dedent "0.7.0"
+    dot-prop "6.0.1"
+    envinfo "^7.7.4"
+    execa "5.0.0"
+    fs-extra "9.1.0"
+    get-port "5.1.1"
+    get-stream "6.0.0"
+    git-url-parse "13.1.0"
+    glob-parent "5.1.2"
+    globby "11.1.0"
+    graceful-fs "4.2.10"
+    has-unicode "2.0.1"
     import-local "^3.0.2"
-    npmlog "^4.1.2"
+    init-package-json "3.0.2"
+    inquirer "^8.2.4"
+    is-ci "2.0.0"
+    is-stream "2.0.0"
+    js-yaml "^4.1.0"
+    libnpmaccess "^6.0.3"
+    libnpmpublish "7.1.4"
+    load-json-file "6.2.0"
+    make-dir "3.1.0"
+    minimatch "3.0.5"
+    multimatch "5.0.0"
+    node-fetch "2.6.7"
+    npm-package-arg "8.1.1"
+    npm-packlist "5.1.1"
+    npm-registry-fetch "^14.0.3"
+    npmlog "^6.0.2"
+    nx ">=15.5.2 < 16"
+    p-map "4.0.0"
+    p-map-series "2.1.0"
+    p-pipe "3.1.0"
+    p-queue "6.6.2"
+    p-reduce "2.1.0"
+    p-waterfall "2.1.1"
+    pacote "15.1.1"
+    pify "5.0.0"
+    read-cmd-shim "3.0.0"
+    read-package-json "5.0.1"
+    resolve-from "5.0.0"
+    rimraf "^4.4.1"
+    semver "^7.3.8"
+    signal-exit "3.0.7"
+    slash "3.0.0"
+    ssri "9.0.1"
+    strong-log-transformer "2.1.0"
+    tar "6.1.11"
+    temp-dir "1.0.0"
+    typescript "^3 || ^4"
+    upath "^2.0.1"
+    uuid "8.3.2"
+    validate-npm-package-license "3.0.4"
+    validate-npm-package-name "4.0.0"
+    write-file-atomic "4.0.1"
+    write-pkg "4.0.0"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
 
 leven@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
 levn@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
   integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-libnpmaccess@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
-  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
+libnpmaccess@^6.0.3:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.4.tgz#2dd158bd8a071817e2207d3b201d37cf1ad6ae6b"
+  integrity sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^8.1.2"
-    npm-registry-fetch "^11.0.0"
-
-libnpmpublish@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
-  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
-  dependencies:
-    normalize-package-data "^3.0.2"
-    npm-package-arg "^8.1.2"
-    npm-registry-fetch "^11.0.0"
-    semver "^7.1.3"
-    ssri "^8.0.1"
+    npm-package-arg "^9.0.1"
+    npm-registry-fetch "^13.0.0"
+
+libnpmpublish@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-7.1.4.tgz#a0d138e00e52a0c71ffc82273acf0082fc2dfb36"
+  integrity sha512-mMntrhVwut5prP4rJ228eEbEyvIzLWhqFuY90j5QeXBCTT2pWSMno7Yo2S2qplPUr02zPurGH4heGLZ+wORczg==
+  dependencies:
+    ci-info "^3.6.1"
+    normalize-package-data "^5.0.0"
+    npm-package-arg "^10.1.0"
+    npm-registry-fetch "^14.0.3"
+    proc-log "^3.0.0"
+    semver "^7.3.7"
+    sigstore "^1.4.0"
+    ssri "^10.0.1"
 
 libsodium-wrappers@^0.7.6:
-  version "0.7.11"
-  resolved "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz#53bd20606dffcc54ea2122133c7da38218f575f7"
-  integrity sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz#83299e06ee1466057ba0e64e532777d2929b90d3"
+  integrity sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==
   dependencies:
-    libsodium "^0.7.11"
+    libsodium "^0.7.13"
 
-libsodium@^0.7.11:
-  version "0.7.11"
-  resolved "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz#cd10aae7bcc34a300cc6ad0ac88fcca674cfbc2e"
-  integrity sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A==
+libsodium@^0.7.13:
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.13.tgz#230712ec0b7447c57b39489c48a4af01985fb393"
+  integrity sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
+lines-and-columns@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
+  integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
 
-load-json-file@^6.2.0:
+load-json-file@6.2.0:
   version "6.2.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
   integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==
   dependencies:
     graceful-fs "^4.1.15"
@@ -6115,9 +7114,19 @@ load-json-file@^6.2.0:
     strip-bom "^4.0.0"
     type-fest "^0.6.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
   integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
   dependencies:
     p-locate "^2.0.0"
@@ -6125,7 +7134,7 @@ locate-path@^2.0.0:
 
 locate-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
   integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
@@ -6133,201 +7142,187 @@ locate-path@^3.0.0:
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
 locate-path@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
   integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
   dependencies:
     p-locate "^5.0.0"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.ismatch@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
 lodash.isregexp@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz#e13e647b30cd559752a04cd912086faf7da1c30b"
+  resolved "https://registry.yarnpkg.com/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz#e13e647b30cd559752a04cd912086faf7da1c30b"
   integrity sha512-rw9+95tYcUa9nQ1FgdtKvO+hReLGNqnNMHfLq8SwK5Mo6D0R0tIsnRHGHaTHSKeYBaLCJ1JvXWdz4UmpPZ2bag==
 
 lodash.isstring@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
 
 lodash.memoize@4.x:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
-lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.7.0:
+lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
 long@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-long@^5.2.0:
-  version "5.2.3"
-  resolved "https://registry.npmjs.org/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
-  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
+lru-cache@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
 
 lru-cache@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
   integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
 
 lru-cache@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
   integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
 lru-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
   integrity sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==
   dependencies:
     es5-ext "~0.10.2"
 
+make-dir@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
   dependencies:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
 make-dir@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
   integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
   dependencies:
     semver "^7.5.3"
 
-make-error@1.x:
+make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
-  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^8.0.9:
-  version "8.0.14"
-  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
-  integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==
+make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
+  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
   dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.0.5"
+    agentkeepalive "^4.2.1"
+    cacache "^16.1.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
+    http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
     minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
+    minipass-fetch "^2.0.3"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^5.0.0"
-    ssri "^8.0.0"
-
-make-fetch-happen@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^9.0.0"
+
+make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
+    negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
 
 makeerror@1.0.12:
   version "1.0.12"
-  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
   integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
     tmpl "1.0.5"
 
 map-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
-map-obj@^4.0.0:
+map-obj@^4.0.0, map-obj@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 memoizee@^0.4.15:
   version "0.4.15"
-  resolved "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
   integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
   dependencies:
     d "^1.0.1"
@@ -6339,9 +7334,27 @@ memoizee@^0.4.15:
     next-tick "^1.1.0"
     timers-ext "^0.1.7"
 
+meow@^10.1.3:
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f"
+  integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==
+  dependencies:
+    "@types/minimist" "^1.2.2"
+    camelcase-keys "^7.0.0"
+    decamelize "^5.0.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.2"
+    read-pkg-up "^8.0.0"
+    redent "^4.0.0"
+    trim-newlines "^4.0.2"
+    type-fest "^1.2.2"
+    yargs-parser "^20.2.9"
+
 meow@^8.0.0:
   version "8.1.2"
-  resolved "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
   integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==
   dependencies:
     "@types/minimist" "^1.2.0"
@@ -6358,17 +7371,17 @@ meow@^8.0.0:
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.4:
   version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
     braces "^3.0.2"
@@ -6376,58 +7389,93 @@ micromatch@^4.0.4:
 
 mime-db@1.52.0:
   version "1.52.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@~2.1.19:
+mime-types@^2.1.12:
   version "2.1.35"
-  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-min-indent@^1.0.0:
+min-indent@^1.0.0, min-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
+  integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimatch@^5.0.1:
   version "5.1.6"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^6.1.6:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42"
+  integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^8.0.2:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229"
+  integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^9.0.0, minimatch@^9.0.1:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
@@ -6436,91 +7484,97 @@ minimist-options@4.1.0:
 
 minimist@1.2.6:
   version "1.2.6"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
   integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
+minipass-fetch@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
+  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+  dependencies:
+    minipass "^3.1.6"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-fetch@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
+  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
   dependencies:
-    minipass "^3.1.0"
+    minipass "^7.0.3"
     minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
+    minizlib "^2.1.2"
   optionalDependencies:
-    encoding "^0.1.12"
+    encoding "^0.1.13"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
   integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
   dependencies:
     minipass "^3.0.0"
 
 minipass-json-stream@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
+  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
   integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
   dependencies:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.4:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
 minipass-sized@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
   integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
   version "3.3.6"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
+minipass@^4.0.0, minipass@^4.2.4:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
+  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
+
 minipass@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-minizlib@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3, minipass@^7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
-minizlib@^2.0.0, minizlib@^2.1.1:
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
@@ -6528,43 +7582,46 @@ minizlib@^2.0.0, minizlib@^2.1.1:
 
 mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
+  resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
   dependencies:
     chownr "^2.0.0"
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
+mkdirp@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.2.tgz#5ccd93437619ca7050b538573fc918327eba98fb"
+  integrity sha512-N2REVrJ/X/jGPfit2d7zea2J1pf7EAR5chIUcfHffAZ7gmlam5U65sAm76+o4ntQbSRdTjYf7qZz3chuHlwXEA==
+
 mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mkdirp@^0.5.1, mkdirp@^0.5.5:
-  version "0.5.6"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
+mkdirp@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.0.tgz#758101231418bda24435c0888a91d9bd91f1372d"
+  integrity sha512-7+JDnNsyCvZXoUJdkMR0oUE2AmAdsNXGTmRbiOjYIwQ6q+bL6NwrozGQdPcmYaNcrhH37F50HHBUzoaBV6FITQ==
 
 modify-values@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 ms@2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 ms@^2.0.0:
   version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-multimatch@^5.0.0:
+multimatch@5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6"
   integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
   dependencies:
     "@types/minimatch" "^3.0.3"
@@ -6575,17 +7632,17 @@ multimatch@^5.0.0:
 
 mute-stream@0.0.7:
   version "0.0.7"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
 
 mute-stream@0.0.8, mute-stream@~0.0.4:
   version "0.0.8"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 mz@^2.7.0:
   version "2.7.0"
-  resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
   integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
   dependencies:
     any-promise "^1.0.0"
@@ -6594,100 +7651,113 @@ mz@^2.7.0:
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.2:
+negotiator@^0.6.3:
   version "0.6.3"
-  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.6.2:
   version "2.6.2"
-  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+nested-obj@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/nested-obj/-/nested-obj-0.0.1.tgz#efe1da127c3d00826fa10ec25673e0f9ec1224fd"
+  integrity sha512-kB1WKTng+IePQhZVs1UXtFaHBx4QEM5a0XKGAzYfCKvdx5DhNjCytNDWMUGpNNpHLotln+tiwcA52kWCIgGq1Q==
+
 next-tick@1, next-tick@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
+node-addon-api@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
 node-environment-flags@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
   integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
-node-fetch@^2.6.1, node-fetch@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
-  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
+node-fetch@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-gyp@^5.0.2:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
-  integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
+node-fetch@^2.6.7:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.2"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.1.2"
-    request "^2.88.0"
-    rimraf "^2.6.3"
-    semver "^5.7.1"
-    tar "^4.4.12"
-    which "^1.3.1"
-
-node-gyp@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
-  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+    whatwg-url "^5.0.0"
+
+node-gyp-build@^4.3.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
+  integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
+
+node-gyp@^9.0.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
+  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
   dependencies:
     env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
     glob "^7.1.4"
-    graceful-fs "^4.2.3"
-    nopt "^5.0.0"
-    npmlog "^4.1.2"
-    request "^2.88.2"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
     rimraf "^3.0.2"
-    semver "^7.3.2"
-    tar "^6.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
-  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+noms@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
+  integrity sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==
   dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
+    inherits "^2.0.1"
+    readable-stream "~1.0.31"
 
-nopt@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
-  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
   dependencies:
-    abbrev "1"
+    abbrev "^1.0.0"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+nopt@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
+  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
+  dependencies:
+    abbrev "^2.0.0"
+
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -6697,7 +7767,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-
 
 normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
     hosted-git-info "^4.0.1"
@@ -6705,191 +7775,311 @@ normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
+  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
+normalize-package-data@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-5.0.0.tgz#abcb8d7e724c40d88462b84982f7cbf6859b4588"
+  integrity sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==
+  dependencies:
+    hosted-git-info "^6.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-url@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-
-npm-bundled@^1.1.1:
+npm-bundled@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
-  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+npm-bundled@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
+  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
   dependencies:
-    semver "^7.1.1"
+    npm-normalize-package-bin "^3.0.0"
 
-npm-lifecycle@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309"
-  integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==
+npm-install-checks@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.3.0.tgz#046552d8920e801fa9f919cad569545d60e826fe"
+  integrity sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==
   dependencies:
-    byline "^5.0.0"
-    graceful-fs "^4.1.15"
-    node-gyp "^5.0.2"
-    resolve-from "^4.0.0"
-    slide "^1.1.6"
-    uid-number "0.0.6"
-    umask "^1.1.0"
-    which "^1.3.1"
+    semver "^7.1.1"
 
-npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
-  version "8.1.5"
-  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
-  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+npm-normalize-package-bin@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff"
+  integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==
+
+npm-normalize-package-bin@^3.0.0, npm-normalize-package-bin@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
+  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
+
+npm-package-arg@8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.1.tgz#00ebf16ac395c63318e67ce66780a06db6df1b04"
+  integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==
   dependencies:
-    hosted-git-info "^4.0.1"
-    semver "^7.3.4"
+    hosted-git-info "^3.0.6"
+    semver "^7.0.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^2.1.4:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
-  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
+npm-package-arg@^10.0.0, npm-package-arg@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-10.1.0.tgz#827d1260a683806685d17193073cc152d3c7e9b1"
+  integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
   dependencies:
-    glob "^7.1.6"
-    ignore-walk "^3.0.3"
-    npm-bundled "^1.1.1"
-    npm-normalize-package-bin "^1.0.1"
+    hosted-git-info "^6.0.0"
+    proc-log "^3.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^5.0.0"
 
-npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
-  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+npm-package-arg@^9.0.1:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.2.tgz#fc8acecb00235f42270dda446f36926ddd9ac2bc"
+  integrity sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    proc-log "^2.0.1"
+    semver "^7.3.5"
+    validate-npm-package-name "^4.0.0"
+
+npm-packlist@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
+  integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
   dependencies:
-    npm-install-checks "^4.0.0"
+    glob "^8.0.1"
+    ignore-walk "^5.0.1"
+    npm-bundled "^1.1.2"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^8.1.2"
-    semver "^7.3.4"
 
-npm-registry-fetch@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
-  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
+npm-packlist@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-7.0.4.tgz#033bf74110eb74daf2910dc75144411999c5ff32"
+  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
+  dependencies:
+    ignore-walk "^6.0.0"
+
+npm-pick-manifest@^8.0.0, npm-pick-manifest@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz#2159778d9c7360420c925c1a2287b5a884c713aa"
+  integrity sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==
   dependencies:
-    make-fetch-happen "^9.0.1"
-    minipass "^3.1.3"
-    minipass-fetch "^1.3.0"
+    npm-install-checks "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+    npm-package-arg "^10.0.0"
+    semver "^7.3.5"
+
+npm-registry-fetch@14.0.3:
+  version "14.0.3"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz#8545e321c2b36d2c6fe6e009e77e9f0e527f547b"
+  integrity sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==
+  dependencies:
+    make-fetch-happen "^11.0.0"
+    minipass "^4.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^10.0.0"
+    proc-log "^3.0.0"
+
+npm-registry-fetch@^13.0.0:
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
+  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
+  dependencies:
+    make-fetch-happen "^10.0.6"
+    minipass "^3.1.6"
+    minipass-fetch "^2.0.3"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.0.0"
-    npm-package-arg "^8.0.0"
+    minizlib "^2.1.2"
+    npm-package-arg "^9.0.1"
+    proc-log "^2.0.0"
 
-npm-registry-fetch@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
-  integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==
+npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3:
+  version "14.0.5"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d"
+  integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==
   dependencies:
-    "@npmcli/ci-detect" "^1.0.0"
-    lru-cache "^6.0.0"
-    make-fetch-happen "^8.0.9"
-    minipass "^3.1.3"
-    minipass-fetch "^1.3.0"
+    make-fetch-happen "^11.0.0"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.0.0"
-    npm-package-arg "^8.0.0"
+    minizlib "^2.1.2"
+    npm-package-arg "^10.0.0"
+    proc-log "^3.0.0"
 
 npm-run-path@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+npmlog@6.0.2, npmlog@^6.0.0, npmlog@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1, object-assign@^4.1.0:
+npmlog@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8"
+  integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==
+  dependencies:
+    are-we-there-yet "^4.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^5.0.0"
+    set-blocking "^2.0.0"
+
+nx@15.9.7, "nx@>=15.5.2 < 16":
+  version "15.9.7"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.7.tgz#f0e713cedb8637a517d9c4795c99afec4959a1b6"
+  integrity sha512-1qlEeDjX9OKZEryC8i4bA+twNg+lB5RKrozlNwWx/lLJHqWPUfvUTvxh+uxlPYL9KzVReQjUuxMLFMsHNqWUrA==
+  dependencies:
+    "@nrwl/cli" "15.9.7"
+    "@nrwl/tao" "15.9.7"
+    "@parcel/watcher" "2.0.4"
+    "@yarnpkg/lockfile" "^1.1.0"
+    "@yarnpkg/parsers" "3.0.0-rc.46"
+    "@zkochan/js-yaml" "0.0.6"
+    axios "^1.0.0"
+    chalk "^4.1.0"
+    cli-cursor "3.1.0"
+    cli-spinners "2.6.1"
+    cliui "^7.0.2"
+    dotenv "~10.0.0"
+    enquirer "~2.3.6"
+    fast-glob "3.2.7"
+    figures "3.2.0"
+    flat "^5.0.2"
+    fs-extra "^11.1.0"
+    glob "7.1.4"
+    ignore "^5.0.4"
+    js-yaml "4.1.0"
+    jsonc-parser "3.2.0"
+    lines-and-columns "~2.0.3"
+    minimatch "3.0.5"
+    npm-run-path "^4.0.1"
+    open "^8.4.0"
+    semver "7.5.4"
+    string-width "^4.2.3"
+    strong-log-transformer "^2.1.0"
+    tar-stream "~2.2.0"
+    tmp "~0.2.1"
+    tsconfig-paths "^4.1.2"
+    tslib "^2.3.0"
+    v8-compile-cache "2.3.0"
+    yargs "^17.6.2"
+    yargs-parser "21.1.1"
+  optionalDependencies:
+    "@nrwl/nx-darwin-arm64" "15.9.7"
+    "@nrwl/nx-darwin-x64" "15.9.7"
+    "@nrwl/nx-linux-arm-gnueabihf" "15.9.7"
+    "@nrwl/nx-linux-arm64-gnu" "15.9.7"
+    "@nrwl/nx-linux-arm64-musl" "15.9.7"
+    "@nrwl/nx-linux-x64-gnu" "15.9.7"
+    "@nrwl/nx-linux-x64-musl" "15.9.7"
+    "@nrwl/nx-win32-arm64-msvc" "15.9.7"
+    "@nrwl/nx-win32-x64-msvc" "15.9.7"
+
+object-assign@^4.0.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
 object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.assign@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
 object.getownpropertydescriptors@^2.0.3:
-  version "2.1.6"
-  resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
-  integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
-  dependencies:
-    array.prototype.reduce "^1.0.5"
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.21.2"
-    safe-array-concat "^1.0.0"
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923"
+  integrity sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==
+  dependencies:
+    array.prototype.reduce "^1.0.6"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+    gopd "^1.0.1"
+    safe-array-concat "^1.1.2"
 
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
   integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
   dependencies:
     mimic-fn "^1.0.0"
 
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
-optionator@^0.9.1:
+open@^8.4.0:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
+optionator@^0.9.1, optionator@^0.9.3:
   version "0.9.3"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
   integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
     "@aashutoshrathi/word-wrap" "^1.2.3"
@@ -6899,172 +8089,213 @@ optionator@^0.9.1:
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
+ora@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^1.1.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
 p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
   integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
 p-locate@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
   integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
   dependencies:
     p-limit "^3.0.2"
 
-p-map-series@^2.1.0:
+p-map-series@2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2"
+  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2"
   integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==
 
-p-map@^4.0.0:
+p-map@4.0.0, p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
-p-pipe@^3.1.0:
+p-map@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715"
+  integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==
+  dependencies:
+    aggregate-error "^4.0.0"
+
+p-pipe@3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
+  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
   integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==
 
-p-queue@^6.6.2:
+p-queue@6.6.2:
   version "6.6.2"
-  resolved "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
   integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
   dependencies:
     eventemitter3 "^4.0.4"
     p-timeout "^3.2.0"
 
-p-reduce@^2.0.0, p-reduce@^2.1.0:
+p-reduce@2.1.0, p-reduce@^2.0.0, p-reduce@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
   integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
 
 p-timeout@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
   integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-p-waterfall@^2.1.1:
+p-waterfall@2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz#63153a774f472ccdc4eb281cdb2967fcf158b2ee"
+  resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-2.1.1.tgz#63153a774f472ccdc4eb281cdb2967fcf158b2ee"
   integrity sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==
   dependencies:
     p-reduce "^2.0.0"
 
-pacote@^11.2.6:
-  version "11.3.5"
-  resolved "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
-  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
-  dependencies:
-    "@npmcli/git" "^2.1.0"
-    "@npmcli/installed-package-contents" "^1.0.6"
-    "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^1.8.2"
-    cacache "^15.0.5"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    infer-owner "^1.0.4"
-    minipass "^3.1.3"
-    mkdirp "^1.0.3"
-    npm-package-arg "^8.0.1"
-    npm-packlist "^2.1.4"
-    npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^11.0.0"
+pacote@15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348"
+  integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==
+  dependencies:
+    "@npmcli/git" "^4.0.0"
+    "@npmcli/installed-package-contents" "^2.0.1"
+    "@npmcli/promise-spawn" "^6.0.1"
+    "@npmcli/run-script" "^6.0.0"
+    cacache "^17.0.0"
+    fs-minipass "^3.0.0"
+    minipass "^4.0.0"
+    npm-package-arg "^10.0.0"
+    npm-packlist "^7.0.0"
+    npm-pick-manifest "^8.0.0"
+    npm-registry-fetch "^14.0.0"
+    proc-log "^3.0.0"
     promise-retry "^2.0.1"
-    read-package-json-fast "^2.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.1.0"
+    read-package-json "^6.0.0"
+    read-package-json-fast "^3.0.0"
+    sigstore "^1.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+
+pacote@^15.0.0, pacote@^15.0.8:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
+  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
+  dependencies:
+    "@npmcli/git" "^4.0.0"
+    "@npmcli/installed-package-contents" "^2.0.1"
+    "@npmcli/promise-spawn" "^6.0.1"
+    "@npmcli/run-script" "^6.0.0"
+    cacache "^17.0.0"
+    fs-minipass "^3.0.0"
+    minipass "^5.0.0"
+    npm-package-arg "^10.0.0"
+    npm-packlist "^7.0.0"
+    npm-pick-manifest "^8.0.0"
+    npm-registry-fetch "^14.0.0"
+    proc-log "^3.0.0"
+    promise-retry "^2.0.1"
+    read-package-json "^6.0.0"
+    read-package-json-fast "^3.0.0"
+    sigstore "^1.3.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
 
 pako@^2.0.2:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
   integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
 
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
+parse-conflict-json@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz#67dc55312781e62aa2ddb91452c7606d1969960c"
+  integrity sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==
+  dependencies:
+    json-parse-even-better-errors "^3.0.0"
+    just-diff "^6.0.0"
+    just-diff-apply "^5.2.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
   integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
@@ -7072,7 +8303,7 @@ parse-json@^4.0.0:
 
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -7082,150 +8313,169 @@ parse-json@^5.0.0, parse-json@^5.2.0:
 
 parse-package-name@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-package-name/-/parse-package-name-1.0.0.tgz#1a108757e4ffc6889d5e78bcc4932a97c097a5a7"
+  resolved "https://registry.yarnpkg.com/parse-package-name/-/parse-package-name-1.0.0.tgz#1a108757e4ffc6889d5e78bcc4932a97c097a5a7"
   integrity sha512-kBeTUtcj+SkyfaW4+KBe0HtsloBJ/mKTPoxpVdA57GZiPerREsUWJOhVj9anXweFiJkm5y8FG1sxFZkZ0SN6wg==
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
-parse-path@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea"
-  integrity sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==
+parse-path@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b"
+  integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==
   dependencies:
-    is-ssh "^1.3.0"
-    protocols "^1.4.0"
-    qs "^6.9.4"
-    query-string "^6.13.8"
+    protocols "^2.0.0"
 
-parse-url@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz#4acab8982cef1846a0f8675fa686cef24b2f6f9b"
-  integrity sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==
+parse-url@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d"
+  integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==
   dependencies:
-    is-ssh "^1.3.0"
-    normalize-url "^6.1.0"
-    parse-path "^4.0.0"
-    protocols "^1.4.0"
+    parse-path "^7.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.10.2, path-scurry@^1.6.1:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
+  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
   integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
 picocolors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+pify@5.0.0, pify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
+  integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
+
 pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pify@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
-  integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
-
-pirates@^4.0.4, pirates@^4.0.5:
+pirates@^4.0.4, pirates@^4.0.6:
   version "4.0.6"
-  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
   integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
   integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
 
 pkg-dir@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+
+postcss-selector-parser@^6.0.10:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
+  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
   integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@2.7.1:
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
-
 prettier@^2.6.2, prettier@^2.7.1:
   version "2.8.8"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
+prettier@^3.0.2:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
+  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+
+pretty-format@29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.3.tgz#25500ada21a53c9e8423205cf0337056b201244c"
+  integrity sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty-format@^28.0.0, pretty-format@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
   integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
   dependencies:
     "@jest/schemas" "^28.1.3"
@@ -7233,19 +8483,48 @@ pretty-format@^28.0.0, pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.0.0, pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
+proc-log@^2.0.0, proc-log@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+
+proc-log@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
+  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+promise-all-reject-late@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
+  integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
+
+promise-call-limit@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.2.tgz#f64b8dd9ef7693c9c7613e7dfe8d6d24de3031ea"
+  integrity sha512-1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
 promise-retry@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
   integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
   dependencies:
     err-code "^2.0.2"
@@ -7253,7 +8532,7 @@ promise-retry@^2.0.1:
 
 prompts@^2.0.1:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
     kleur "^3.0.3"
@@ -7261,20 +8540,20 @@ prompts@^2.0.1:
 
 promzard@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
   integrity sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw==
   dependencies:
     read "1"
 
 proto-list@~1.2.1:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
 protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
-  version "6.11.3"
-  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+  version "6.11.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
+  integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -7290,123 +8569,110 @@ protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
     "@types/node" ">=13.7.0"
     long "^4.0.0"
 
-protocols@^1.4.0:
-  version "1.4.8"
-  resolved "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8"
-  integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==
-
-protocols@^2.0.1:
+protocols@^2.0.0, protocols@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
+  resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
   integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
 
-psl@^1.1.28:
-  version "1.9.0"
-  resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+punycode@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+pure-rand@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
+  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
 
 q@^1.5.1:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qs@^6.9.4:
-  version "6.11.2"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
-  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
-  dependencies:
-    side-channel "^1.0.4"
-
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
-query-string@^6.13.8:
-  version "6.14.1"
-  resolved "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
-  integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    filter-obj "^1.1.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
-
 queue-microtask@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 quick-lru@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 react-is@^18.0.0:
   version "18.2.0"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-read-cmd-shim@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
-  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
+read-cmd-shim@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz#62b8c638225c61e6cc607f8f4b779f3b8238f155"
+  integrity sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==
+
+read-cmd-shim@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb"
+  integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==
 
-read-package-json-fast@^2.0.1:
+read-package-json-fast@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
   dependencies:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
-  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
+read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
+  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
   dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
+    json-parse-even-better-errors "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
 
-read-package-json@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9"
-  integrity sha512-aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng==
+read-package-json@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
+  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
   dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^3.0.0"
-    npm-normalize-package-bin "^1.0.0"
+    glob "^8.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
-  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
+read-package-json@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa"
+  integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==
   dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^3.0.0"
-    npm-normalize-package-bin "^1.0.0"
+    glob "^8.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^2.0.0"
 
-read-package-tree@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
-  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
+read-package-json@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.4.tgz#90318824ec456c287437ea79595f4c2854708836"
+  integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==
   dependencies:
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    util-promisify "^2.1.0"
+    glob "^10.2.2"
+    json-parse-even-better-errors "^3.0.0"
+    normalize-package-data "^5.0.0"
+    npm-normalize-package-bin "^3.0.0"
 
 read-pkg-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
   integrity sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==
   dependencies:
     find-up "^2.0.0"
@@ -7414,16 +8680,25 @@ read-pkg-up@^3.0.0:
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
   integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
     find-up "^4.1.0"
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
+read-pkg-up@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670"
+  integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==
+  dependencies:
+    find-up "^5.0.0"
+    read-pkg "^6.0.0"
+    type-fest "^1.0.1"
+
 read-pkg@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
   integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
   dependencies:
     load-json-file "^4.0.0"
@@ -7432,7 +8707,7 @@ read-pkg@^3.0.0:
 
 read-pkg@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
@@ -7440,25 +8715,45 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-read@1, read@~1.0.1:
+read-pkg@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c"
+  integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^3.0.2"
+    parse-json "^5.2.0"
+    type-fest "^1.0.1"
+
+read@1, read@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.6, readable-stream@~2.3.6:
+readable-stream@~1.0.31:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@~2.3.6:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
@@ -7469,89 +8764,88 @@ readable-stream@^2.0.6, readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readdir-scoped-modules@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
-  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
 readdirp@~3.6.0:
   version "3.6.0"
-  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
   integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
 readonly-date@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz#5af785464d8c7d7c40b9d738cbde8c646f97dcd9"
+  resolved "https://registry.yarnpkg.com/readonly-date/-/readonly-date-1.0.0.tgz#5af785464d8c7d7c40b9d738cbde8c646f97dcd9"
   integrity sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ==
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
   dependencies:
     resolve "^1.1.6"
 
 redent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
   integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
+redent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9"
+  integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==
+  dependencies:
+    indent-string "^5.0.0"
+    strip-indent "^4.0.0"
+
 regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
+  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
   dependencies:
     regenerate "^1.4.2"
 
 regenerate@^1.4.2:
   version "1.4.2"
-  resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.13.7:
   version "0.13.11"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
 regenerator-runtime@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
-  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
 regenerator-transform@^0.15.2:
   version "0.15.2"
-  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
   integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
-  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+regexp.prototype.flags@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
+  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    functions-have-names "^1.2.3"
+    call-bind "^1.0.6"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.1"
 
 regexpp@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^5.3.1:
   version "5.3.2"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
   integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
     "@babel/regjsgen" "^0.8.0"
@@ -7563,68 +8857,47 @@ regexpu-core@^5.3.1:
 
 regjsparser@^0.9.1:
   version "0.9.1"
-  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
   integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
-request@^2.88.0, request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
   integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
     resolve-from "^5.0.0"
 
+resolve-from@5.0.0, resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
 resolve.exports@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
   integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.22.4"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
-  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
+
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
     is-core-module "^2.13.0"
     path-parse "^1.0.7"
@@ -7632,7 +8905,7 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20
 
 restore-cursor@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
   integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
   dependencies:
     onetime "^2.0.0"
@@ -7640,7 +8913,7 @@ restore-cursor@^2.0.0:
 
 restore-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
   integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
     onetime "^5.1.0"
@@ -7648,137 +8921,187 @@ restore-cursor@^3.1.0:
 
 retry@^0.12.0:
   version "0.12.0"
-  resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 reusify@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+rimraf@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.0.tgz#5bda14e410d7e4dd522154891395802ce032c2cb"
+  integrity sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==
+  dependencies:
+    glob "^10.0.0"
+
+rimraf@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.4.1.tgz#bd33364f67021c5b79e93d7f4fa0568c7c21b755"
+  integrity sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==
   dependencies:
-    glob "^7.1.3"
+    glob "^9.2.0"
 
 run-async@^2.2.0, run-async@^2.3.0, run-async@^2.4.0:
   version "2.4.1"
-  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
 
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
   integrity sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==
   dependencies:
     rx-lite "*"
 
 rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
   integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==
 
-rxjs@^6.4.0, rxjs@^6.6.0:
+rxjs@^6.4.0:
   version "6.6.7"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
-safe-array-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
-  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+rxjs@^7.5.5:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
+safe-array-concat@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
+  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
     is-regex "^1.1.4"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.0:
   version "5.7.2"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.3:
+semver@7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@7.5.4:
   version "7.5.4"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
+set-function-name@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
 shallow-clone@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
   integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
   dependencies:
     kind-of "^6.0.2"
 
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shelljs@0.8.5:
   version "0.8.5"
-  resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
   integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
   dependencies:
     glob "^7.0.0"
@@ -7786,92 +9109,88 @@ shelljs@0.8.5:
     rechoir "^0.6.2"
 
 side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@3.0.7, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.0.2:
+signal-exit@^4.0.1, signal-exit@^4.0.2:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
+sigstore@^1.0.0, sigstore@^1.3.0, sigstore@^1.4.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.9.0.tgz#1e7ad8933aa99b75c6898ddd0eeebc3eb0d59875"
+  integrity sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    "@sigstore/sign" "^1.0.0"
+    "@sigstore/tuf" "^1.0.3"
+    make-fetch-happen "^11.0.1"
+
 sisteransi@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
+slash@3.0.0, slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slash@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slide@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
+slash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
 smart-buffer@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-socks-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e"
-  integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "4"
-    socks "^2.3.3"
-
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks@^2.3.3, socks@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
+socks@^2.6.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
   dependencies:
-    ip "^2.0.0"
+    ip-address "^9.0.5"
     smart-buffer "^4.2.0"
 
 sort-keys@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
   integrity sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==
   dependencies:
     is-plain-obj "^1.0.0"
 
-sort-keys@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18"
-  integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==
-  dependencies:
-    is-plain-obj "^2.0.0"
-
 source-map-support@0.5.13:
   version "0.5.13"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
   integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -7879,131 +9198,104 @@ source-map-support@0.5.13:
 
 source-map-support@^0.5.16, source-map-support@^0.5.19:
   version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.5.0:
-  version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 spdx-correct@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
   integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
+  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.13"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
-  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
-
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
+  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
 
 split2@^3.0.0:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
   integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
   dependencies:
     readable-stream "^3.0.0"
 
 split@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
   integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
+sprintf-js@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-ssri@^8.0.0, ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+ssri@9.0.1, ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
   dependencies:
     minipass "^3.1.1"
 
+ssri@^10.0.0, ssri@^10.0.1:
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
+  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
+  dependencies:
+    minipass "^7.0.3"
+
 stack-utils@^2.0.3:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
-
 string-argv@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
   integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
 string-length@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
@@ -8012,111 +9304,140 @@ string-width@^1.0.1:
 
 string-width@^2.0.0, string-width@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
 
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
   integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-ansi@^5.1.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
-    ansi-regex "^5.0.1"
+    ansi-regex "^6.0.1"
 
 strip-bom@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-bom@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-indent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
   integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
   dependencies:
     min-indent "^1.0.0"
 
+strip-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
+  integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==
+  dependencies:
+    min-indent "^1.0.1"
+
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strong-log-transformer@^2.1.0:
+strong-log-transformer@2.1.0, strong-log-transformer@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
   integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
   dependencies:
     duplexer "^0.1.1"
@@ -8125,33 +9446,33 @@ strong-log-transformer@^2.1.0:
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-color@^8.0.0:
   version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
     has-flag "^4.0.0"
 
 supports-hyperlinks@^2.0.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
   integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
@@ -8159,31 +9480,52 @@ supports-hyperlinks@^2.0.0:
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 symbol-observable@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
-tar@^4.4.12:
-  version "4.4.19"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
-  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
+symlink-workspace@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/symlink-workspace/-/symlink-workspace-1.1.0.tgz#476811e1fb5a00c529e44c8b37765dbefff77e19"
+  integrity sha512-7kF6g/7bpDRCi7KdJNPnMrXURehpb6Sd5yHePSnHT+8pD2uec5Se3KPHwyUFFK/vEYhgKX6qabtr1Qmrtzjr8g==
+  dependencies:
+    chalk "4.1.2"
+    glob "8.1.0"
+    minimist "^1.2.8"
+    mkdirp "3.0.0"
+    rimraf "5.0.0"
+
+tar-stream@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+tar@6.1.11:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
-    chownr "^1.1.4"
-    fs-minipass "^1.2.7"
-    minipass "^2.9.0"
-    minizlib "^1.3.3"
-    mkdirp "^0.5.5"
-    safe-buffer "^5.2.1"
-    yallist "^3.1.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
 
-tar@^6.0.2, tar@^6.1.0:
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
-  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
+tar@^6.1.11, tar@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -8192,25 +9534,30 @@ tar@^6.0.2, tar@^6.1.0:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-temp-dir@^1.0.0:
+temp-dir@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==
 
-temp-write@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/temp-write/-/temp-write-4.0.0.tgz#cd2e0825fc826ae72d201dc26eef3bf7e6fc9320"
-  integrity sha512-HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==
+temp-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
+  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
+
+tempy@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tempy/-/tempy-1.0.0.tgz#4f192b3ee3328a2684d0e3fc5c491425395aab65"
+  integrity sha512-eLXG5B1G0mRPHmgH2WydPl5v4jH35qEn3y/rA/aahKhIa91Pn119SsU7n7v/433gtT9ONzC8ISvNHIh2JSTm0w==
   dependencies:
-    graceful-fs "^4.1.15"
+    del "^6.0.0"
     is-stream "^2.0.0"
-    make-dir "^3.0.0"
-    temp-dir "^1.0.0"
-    uuid "^3.3.2"
+    temp-dir "^2.0.0"
+    type-fest "^0.16.0"
+    unique-string "^2.0.0"
 
 terminal-link@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
   integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
   dependencies:
     ansi-escapes "^4.2.1"
@@ -8218,7 +9565,7 @@ terminal-link@^2.0.0:
 
 test-exclude@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
   integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
@@ -8227,31 +9574,31 @@ test-exclude@^6.0.0:
 
 text-extensions@^1.0.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
 text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 thenify-all@^1.0.0:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
   integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
   dependencies:
     thenify ">= 3.1.0 < 4"
 
 "thenify@>= 3.1.0 < 4":
   version "3.3.1"
-  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
   integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
   dependencies:
     any-promise "^1.0.0"
 
-through2@^2.0.0:
+through2@^2.0.0, through2@^2.0.1:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -8259,19 +9606,19 @@ through2@^2.0.0:
 
 through2@^4.0.0:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
   integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
   dependencies:
     readable-stream "3"
 
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 timers-ext@^0.1.7:
   version "0.1.7"
-  resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
   integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
   dependencies:
     es5-ext "~0.10.46"
@@ -8279,56 +9626,61 @@ timers-ext@^0.1.7:
 
 tmp@^0.0.33:
   version "0.0.33"
-  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@~0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 tmpl@1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
-  dependencies:
-    punycode "^2.1.1"
-
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
+treeverse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-3.0.0.tgz#dd82de9eb602115c6ebd77a574aae67003cb48c8"
+  integrity sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
+trim-newlines@^4.0.2:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
+  integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
+
+ts-api-utils@^1.0.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+
 ts-jest@^28.0.7:
   version "28.0.8"
-  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
   integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==
   dependencies:
     bs-logger "0.x"
@@ -8340,149 +9692,191 @@ ts-jest@^28.0.7:
     semver "7.x"
     yargs-parser "^21.0.1"
 
+ts-jest@^29.1.1:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09"
+  integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==
+  dependencies:
+    bs-logger "0.x"
+    fast-json-stable-stringify "2.x"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
+    lodash.memoize "4.x"
+    make-error "1.x"
+    semver "^7.5.3"
+    yargs-parser "^21.0.1"
+
+ts-node@^10.9.2:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
+tsconfig-paths@^4.1.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@^1.9.0:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
+tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+tuf-js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
+  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
+  dependencies:
+    "@tufjs/models" "1.0.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
   integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
     prelude-ls "^1.2.1"
 
 type-detect@4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-fest@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
+  integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
+
 type-fest@^0.18.0:
   version "0.18.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
 type-fest@^0.20.2:
   version "0.20.2"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-fest@^0.21.3:
   version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 type-fest@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
   integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
 
 type-fest@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
 type-fest@^0.8.1:
   version "0.8.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
+  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
 type@^2.7.2:
   version "2.7.2"
-  resolved "https://registry.npmjs.org/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
   integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
 
-typed-array-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
-  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+typed-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
-    is-typed-array "^1.1.10"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
 
-typed-array-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
-  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+typed-array-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    has-proto "^1.0.1"
-    is-typed-array "^1.1.10"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
 
-typed-array-byte-offset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
-  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+typed-array-byte-offset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    has-proto "^1.0.1"
-    is-typed-array "^1.1.10"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
 
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+typed-array-length@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
+  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    is-typed-array "^1.1.9"
-
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript@^4.7.4:
+"typescript@^3 || ^4", typescript@^4.7.4:
   version "4.9.5"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
+typescript@^5.1.6:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+
 uglify-js@^3.1.4:
   version "3.17.4"
-  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
-uid-number@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-  integrity sha512-c461FXIljswCuscZn67xq9PpszkPT6RjheWFQTgCyabJrTUozElanb0YEqv2UGgk247YpcJkFBuSGNvBlpXM9w==
-
-umask@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
-  integrity sha512-lE/rxOhmiScJu9L6RTNVgB/zZbF+vGC0/p6D3xnkAePI2o0sMyFG966iR5Ki50OI/0mNi2yaRnxfLsPmEZF/JA==
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
   integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
     call-bind "^1.0.2"
@@ -8490,14 +9884,19 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
   integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
     unicode-canonical-property-names-ecmascript "^2.0.0"
@@ -8505,171 +9904,196 @@ unicode-match-property-ecmascript@^2.0.0:
 
 unicode-match-property-value-ecmascript@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
   integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+unique-filename@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
+  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
   dependencies:
-    unique-slug "^2.0.0"
+    unique-slug "^3.0.0"
 
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+unique-filename@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
+  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
+  dependencies:
+    unique-slug "^4.0.0"
+
+unique-slug@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
+  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-slug@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
+  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
   dependencies:
     imurmurhash "^0.1.4"
 
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
 universal-user-agent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
-  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa"
+  integrity sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==
 
 universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-upath@^2.0.1:
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
+upath@2.0.1, upath@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
-  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util-promisify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
-  integrity sha512-K+5eQPYs14b3+E+hmE2J6gCZ4JmMl9DbYS6BeP2CHq6WMuNxErxf5B/n0fz85L8zUuoO6rIzNNmIQDu/j+1OcA==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-
 util@^0.10.3:
   version "0.10.4"
-  resolved "https://registry.npmjs.org/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
   integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+uuid@8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
+v8-compile-cache@2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
+v8-compile-cache@^2.0.3:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
+  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
+
 v8-to-istanbul@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
-  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
+  integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
+    convert-source-map "^2.0.0"
 
 v8flags@^3.1.1:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
   integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
-validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
+validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate-npm-package-name@4.0.0, validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+  dependencies:
+    builtins "^5.0.0"
+
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
   integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
     builtins "^1.0.3"
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+validate-npm-package-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
+  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
   dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
+    builtins "^5.0.0"
+
+walk-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
+  integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==
 
 walker@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
     makeerror "1.0.12"
 
-wcwidth@^1.0.0:
+wcwidth@^1.0.0, wcwidth@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
   integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
 whatwg-url@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
   integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^8.4.0:
-  version "8.7.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
     is-bigint "^1.0.1"
@@ -8678,87 +10102,111 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.10, which-typed-array@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
+  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
     gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-
-which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
+    has-tostringtag "^1.0.2"
 
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+which@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1"
+  integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
 wordwrap@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
+write-file-atomic@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
+  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 write-file-atomic@^2.4.2:
   version "2.4.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
   integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-write-file-atomic@^4.0.1:
+write-file-atomic@^4.0.1, write-file-atomic@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
+write-file-atomic@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
+  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^4.0.1"
+
 write-json-file@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
   integrity sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==
   dependencies:
     detect-indent "^5.0.0"
@@ -8768,21 +10216,9 @@ write-json-file@^3.2.0:
     sort-keys "^2.0.0"
     write-file-atomic "^2.4.2"
 
-write-json-file@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d"
-  integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==
-  dependencies:
-    detect-indent "^6.0.0"
-    graceful-fs "^4.1.15"
-    is-plain-obj "^2.0.0"
-    make-dir "^3.0.0"
-    sort-keys "^4.0.0"
-    write-file-atomic "^3.0.0"
-
-write-pkg@^4.0.0:
+write-pkg@4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz#675cc04ef6c11faacbbc7771b24c0abbf2a20039"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-4.0.0.tgz#675cc04ef6c11faacbbc7771b24c0abbf2a20039"
   integrity sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==
   dependencies:
     sort-keys "^2.0.0"
@@ -8791,12 +10227,12 @@ write-pkg@^4.0.0:
 
 ws@^7:
   version "7.5.9"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 xstream@^11.14.0:
   version "11.14.0"
-  resolved "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz#2c071d26b18310523b6877e86b4e54df068a9ae5"
+  resolved "https://registry.yarnpkg.com/xstream/-/xstream-11.14.0.tgz#2c071d26b18310523b6877e86b4e54df068a9ae5"
   integrity sha512-1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==
   dependencies:
     globalthis "^1.0.1"
@@ -8804,47 +10240,47 @@ xstream@^11.14.0:
 
 xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^5.0.5:
   version "5.0.8"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
+yallist@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.7.2:
+yaml@^1.10.0:
   version "1.10.2"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@20.2.4:
   version "20.2.4"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.3:
-  version "20.2.9"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs-parser@^21.0.1, yargs-parser@^21.1.1:
+yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^16.2.0:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0:
   version "16.2.0"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
     cliui "^7.0.2"
@@ -8855,9 +10291,9 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.3.1:
+yargs@^17.3.1, yargs@^17.6.2:
   version "17.7.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
@@ -8868,7 +10304,12 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

From 97976a00d4bce851f5760b66d627185130e91e77 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 18:54:47 -0700
Subject: [PATCH 180/287] ast

---
 packages/{wasm-ast-types => ast}/.eslintrc.js                     | 0
 packages/{wasm-ast-types => ast}/CHANGELOG.md                     | 0
 packages/{wasm-ast-types => ast}/LICENSE-Apache                   | 0
 packages/{wasm-ast-types => ast}/LICENSE-MIT                      | 0
 packages/{wasm-ast-types => ast}/README.md                        | 0
 .../__tests__/babel/__snapshots__/babel.test.ts.snap              | 0
 packages/{wasm-ast-types => ast}/__tests__/babel/babel.test.ts    | 0
 .../client/__snapshots__/ts-client.account-nfts.spec.ts.snap      | 0
 .../client/__snapshots__/ts-client.arrays-ref.spec.ts.snap        | 0
 .../__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap  | 0
 .../client/__snapshots__/ts-client.cw-named-groups.test.ts.snap   | 0
 .../__snapshots__/ts-client.cw-proposal-single.test.ts.snap       | 0
 .../client/__snapshots__/ts-client.empty-enums.spec.ts.snap       | 0
 .../client/__snapshots__/ts-client.issue-101.spec.ts.snap         | 0
 .../client/__snapshots__/ts-client.issue-103.test.ts.snap         | 0
 .../client/__snapshots__/ts-client.issue-71.test.ts.snap          | 0
 .../client/__snapshots__/ts-client.issue-98.test.ts.snap          | 0
 .../__tests__/client/__snapshots__/ts-client.issues.test.ts.snap  | 0
 .../client/__snapshots__/ts-client.overrides.spec.ts.snap         | 0
 .../__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap   | 0
 .../__tests__/client/__snapshots__/ts-client.spec.ts.snap         | 0
 .../__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap  | 0
 .../__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap   | 0
 .../__tests__/client/ts-client.account-nfts.test.ts               | 0
 .../__tests__/client/ts-client.arrays-ref.test.ts                 | 0
 .../__tests__/client/ts-client.arrays.test.ts                     | 0
 .../__tests__/client/ts-client.cw-named-groups.test.ts            | 0
 .../__tests__/client/ts-client.cw-proposal-single.test.ts         | 0
 .../__tests__/client/ts-client.empty-enums.test.ts                | 0
 .../__tests__/client/ts-client.issue-101.test.ts                  | 0
 .../__tests__/client/ts-client.issue-103.test.ts                  | 0
 .../__tests__/client/ts-client.issue-71.test.ts                   | 0
 .../__tests__/client/ts-client.issue-98.test.ts                   | 0
 .../__tests__/client/ts-client.issues.test.ts                     | 0
 .../__tests__/client/ts-client.overrides.test.ts                  | 0
 .../__tests__/client/ts-client.sg721.test.ts                      | 0
 .../{wasm-ast-types => ast}/__tests__/client/ts-client.test.ts    | 0
 .../__tests__/client/ts-client.vectis.test.ts                     | 0
 .../__tests__/client/ts-client.wager.test.ts                      | 0
 .../message-builder/__snapshots__/message-builder.test.ts.snap    | 0
 .../__tests__/message-builder/message-builder.test.ts             | 0
 .../message-composer/__snapshots__/message-composer.test.ts.snap  | 0
 .../__tests__/message-composer/message-composer.test.ts           | 0
 .../__tests__/provider/__snapshots__/provider.test.ts.snap        | 0
 .../{wasm-ast-types => ast}/__tests__/provider/provider.test.ts   | 0
 .../__tests__/react-query/__snapshots__/react-query.test.ts.snap  | 0
 .../__tests__/react-query/react-query.test.ts                     | 0
 .../__tests__/recoil/__snapshots__/recoil.test.ts.snap            | 0
 packages/{wasm-ast-types => ast}/__tests__/recoil/recoil.test.ts  | 0
 packages/{wasm-ast-types => ast}/jest.config.js                   | 0
 packages/{wasm-ast-types => ast}/package.json                     | 0
 packages/{wasm-ast-types => ast}/scripts/.gitignore               | 0
 packages/{wasm-ast-types => ast}/scripts/.npmignore               | 0
 packages/{wasm-ast-types => ast}/scripts/test-ast.ts              | 0
 packages/{wasm-ast-types => ast}/src/client/client.ts             | 0
 packages/{wasm-ast-types => ast}/src/client/index.ts              | 0
 packages/{wasm-ast-types => ast}/src/context/context.ts           | 0
 packages/{wasm-ast-types => ast}/src/context/imports.ts           | 0
 packages/{wasm-ast-types => ast}/src/context/index.ts             | 0
 packages/{wasm-ast-types => ast}/src/index.ts                     | 0
 packages/{wasm-ast-types => ast}/src/message-builder/index.ts     | 0
 .../src/message-builder/message-builder.ts                        | 0
 packages/{wasm-ast-types => ast}/src/message-composer/index.ts    | 0
 .../src/message-composer/message-composer.ts                      | 0
 packages/{wasm-ast-types => ast}/src/provider/index.ts            | 0
 packages/{wasm-ast-types => ast}/src/provider/provider.ts         | 0
 packages/{wasm-ast-types => ast}/src/react-query/index.ts         | 0
 packages/{wasm-ast-types => ast}/src/react-query/react-query.ts   | 0
 packages/{wasm-ast-types => ast}/src/recoil/index.ts              | 0
 packages/{wasm-ast-types => ast}/src/recoil/recoil.ts             | 0
 packages/{wasm-ast-types => ast}/src/utils/babel.ts               | 0
 packages/{wasm-ast-types => ast}/src/utils/constants.ts           | 0
 packages/{wasm-ast-types => ast}/src/utils/index.ts               | 0
 packages/{wasm-ast-types => ast}/src/utils/ref.ts                 | 0
 packages/{wasm-ast-types => ast}/src/utils/types.ts               | 0
 packages/{wasm-ast-types => ast}/test-utils/fixtures.ts           | 0
 packages/{wasm-ast-types => ast}/test-utils/index.ts              | 0
 packages/{wasm-ast-types => ast}/test-utils/utils.ts              | 0
 packages/{wasm-ast-types => ast}/tsconfig.esm.json                | 0
 packages/{wasm-ast-types => ast}/tsconfig.json                    | 0
 80 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/{wasm-ast-types => ast}/.eslintrc.js (100%)
 rename packages/{wasm-ast-types => ast}/CHANGELOG.md (100%)
 rename packages/{wasm-ast-types => ast}/LICENSE-Apache (100%)
 rename packages/{wasm-ast-types => ast}/LICENSE-MIT (100%)
 rename packages/{wasm-ast-types => ast}/README.md (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/babel/__snapshots__/babel.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/babel/babel.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.account-nfts.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.arrays-ref.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.arrays.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.cw-named-groups.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.cw-proposal-single.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.empty-enums.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.issue-101.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.issue-103.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.issue-71.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.issue-98.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.issues.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.overrides.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.sg721.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.vectis.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/client/ts-client.wager.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/message-builder/message-builder.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/message-composer/message-composer.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/provider/__snapshots__/provider.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/provider/provider.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/react-query/__snapshots__/react-query.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/react-query/react-query.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/recoil/__snapshots__/recoil.test.ts.snap (100%)
 rename packages/{wasm-ast-types => ast}/__tests__/recoil/recoil.test.ts (100%)
 rename packages/{wasm-ast-types => ast}/jest.config.js (100%)
 rename packages/{wasm-ast-types => ast}/package.json (100%)
 rename packages/{wasm-ast-types => ast}/scripts/.gitignore (100%)
 rename packages/{wasm-ast-types => ast}/scripts/.npmignore (100%)
 rename packages/{wasm-ast-types => ast}/scripts/test-ast.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/client/client.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/client/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/context/context.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/context/imports.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/context/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/message-builder/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/message-builder/message-builder.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/message-composer/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/message-composer/message-composer.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/provider/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/provider/provider.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/react-query/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/react-query/react-query.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/recoil/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/recoil/recoil.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/utils/babel.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/utils/constants.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/utils/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/utils/ref.ts (100%)
 rename packages/{wasm-ast-types => ast}/src/utils/types.ts (100%)
 rename packages/{wasm-ast-types => ast}/test-utils/fixtures.ts (100%)
 rename packages/{wasm-ast-types => ast}/test-utils/index.ts (100%)
 rename packages/{wasm-ast-types => ast}/test-utils/utils.ts (100%)
 rename packages/{wasm-ast-types => ast}/tsconfig.esm.json (100%)
 rename packages/{wasm-ast-types => ast}/tsconfig.json (100%)

diff --git a/packages/wasm-ast-types/.eslintrc.js b/packages/ast/.eslintrc.js
similarity index 100%
rename from packages/wasm-ast-types/.eslintrc.js
rename to packages/ast/.eslintrc.js
diff --git a/packages/wasm-ast-types/CHANGELOG.md b/packages/ast/CHANGELOG.md
similarity index 100%
rename from packages/wasm-ast-types/CHANGELOG.md
rename to packages/ast/CHANGELOG.md
diff --git a/packages/wasm-ast-types/LICENSE-Apache b/packages/ast/LICENSE-Apache
similarity index 100%
rename from packages/wasm-ast-types/LICENSE-Apache
rename to packages/ast/LICENSE-Apache
diff --git a/packages/wasm-ast-types/LICENSE-MIT b/packages/ast/LICENSE-MIT
similarity index 100%
rename from packages/wasm-ast-types/LICENSE-MIT
rename to packages/ast/LICENSE-MIT
diff --git a/packages/wasm-ast-types/README.md b/packages/ast/README.md
similarity index 100%
rename from packages/wasm-ast-types/README.md
rename to packages/ast/README.md
diff --git a/packages/wasm-ast-types/__tests__/babel/__snapshots__/babel.test.ts.snap b/packages/ast/__tests__/babel/__snapshots__/babel.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/babel/__snapshots__/babel.test.ts.snap
rename to packages/ast/__tests__/babel/__snapshots__/babel.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/babel/babel.test.ts b/packages/ast/__tests__/babel/babel.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/babel/babel.test.ts
rename to packages/ast/__tests__/babel/babel.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.account-nfts.test.ts b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.account-nfts.test.ts
rename to packages/ast/__tests__/client/ts-client.account-nfts.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.arrays-ref.test.ts b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.arrays-ref.test.ts
rename to packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.arrays.test.ts b/packages/ast/__tests__/client/ts-client.arrays.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.arrays.test.ts
rename to packages/ast/__tests__/client/ts-client.arrays.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.cw-named-groups.test.ts b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.cw-named-groups.test.ts
rename to packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.cw-proposal-single.test.ts b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.cw-proposal-single.test.ts
rename to packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.empty-enums.test.ts b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.empty-enums.test.ts
rename to packages/ast/__tests__/client/ts-client.empty-enums.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.issue-101.test.ts b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.issue-101.test.ts
rename to packages/ast/__tests__/client/ts-client.issue-101.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.issue-103.test.ts b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.issue-103.test.ts
rename to packages/ast/__tests__/client/ts-client.issue-103.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.issue-71.test.ts b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.issue-71.test.ts
rename to packages/ast/__tests__/client/ts-client.issue-71.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.issue-98.test.ts b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.issue-98.test.ts
rename to packages/ast/__tests__/client/ts-client.issue-98.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.issues.test.ts b/packages/ast/__tests__/client/ts-client.issues.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.issues.test.ts
rename to packages/ast/__tests__/client/ts-client.issues.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.overrides.test.ts b/packages/ast/__tests__/client/ts-client.overrides.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.overrides.test.ts
rename to packages/ast/__tests__/client/ts-client.overrides.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.sg721.test.ts b/packages/ast/__tests__/client/ts-client.sg721.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.sg721.test.ts
rename to packages/ast/__tests__/client/ts-client.sg721.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.test.ts b/packages/ast/__tests__/client/ts-client.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.test.ts
rename to packages/ast/__tests__/client/ts-client.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.vectis.test.ts b/packages/ast/__tests__/client/ts-client.vectis.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.vectis.test.ts
rename to packages/ast/__tests__/client/ts-client.vectis.test.ts
diff --git a/packages/wasm-ast-types/__tests__/client/ts-client.wager.test.ts b/packages/ast/__tests__/client/ts-client.wager.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/client/ts-client.wager.test.ts
rename to packages/ast/__tests__/client/ts-client.wager.test.ts
diff --git a/packages/wasm-ast-types/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap b/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
rename to packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/message-builder/message-builder.test.ts b/packages/ast/__tests__/message-builder/message-builder.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/message-builder/message-builder.test.ts
rename to packages/ast/__tests__/message-builder/message-builder.test.ts
diff --git a/packages/wasm-ast-types/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
rename to packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/message-composer/message-composer.test.ts b/packages/ast/__tests__/message-composer/message-composer.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/message-composer/message-composer.test.ts
rename to packages/ast/__tests__/message-composer/message-composer.test.ts
diff --git a/packages/wasm-ast-types/__tests__/provider/__snapshots__/provider.test.ts.snap b/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/provider/__snapshots__/provider.test.ts.snap
rename to packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/provider/provider.test.ts b/packages/ast/__tests__/provider/provider.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/provider/provider.test.ts
rename to packages/ast/__tests__/provider/provider.test.ts
diff --git a/packages/wasm-ast-types/__tests__/react-query/__snapshots__/react-query.test.ts.snap b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/react-query/__snapshots__/react-query.test.ts.snap
rename to packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/react-query/react-query.test.ts b/packages/ast/__tests__/react-query/react-query.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/react-query/react-query.test.ts
rename to packages/ast/__tests__/react-query/react-query.test.ts
diff --git a/packages/wasm-ast-types/__tests__/recoil/__snapshots__/recoil.test.ts.snap b/packages/ast/__tests__/recoil/__snapshots__/recoil.test.ts.snap
similarity index 100%
rename from packages/wasm-ast-types/__tests__/recoil/__snapshots__/recoil.test.ts.snap
rename to packages/ast/__tests__/recoil/__snapshots__/recoil.test.ts.snap
diff --git a/packages/wasm-ast-types/__tests__/recoil/recoil.test.ts b/packages/ast/__tests__/recoil/recoil.test.ts
similarity index 100%
rename from packages/wasm-ast-types/__tests__/recoil/recoil.test.ts
rename to packages/ast/__tests__/recoil/recoil.test.ts
diff --git a/packages/wasm-ast-types/jest.config.js b/packages/ast/jest.config.js
similarity index 100%
rename from packages/wasm-ast-types/jest.config.js
rename to packages/ast/jest.config.js
diff --git a/packages/wasm-ast-types/package.json b/packages/ast/package.json
similarity index 100%
rename from packages/wasm-ast-types/package.json
rename to packages/ast/package.json
diff --git a/packages/wasm-ast-types/scripts/.gitignore b/packages/ast/scripts/.gitignore
similarity index 100%
rename from packages/wasm-ast-types/scripts/.gitignore
rename to packages/ast/scripts/.gitignore
diff --git a/packages/wasm-ast-types/scripts/.npmignore b/packages/ast/scripts/.npmignore
similarity index 100%
rename from packages/wasm-ast-types/scripts/.npmignore
rename to packages/ast/scripts/.npmignore
diff --git a/packages/wasm-ast-types/scripts/test-ast.ts b/packages/ast/scripts/test-ast.ts
similarity index 100%
rename from packages/wasm-ast-types/scripts/test-ast.ts
rename to packages/ast/scripts/test-ast.ts
diff --git a/packages/wasm-ast-types/src/client/client.ts b/packages/ast/src/client/client.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/client.ts
rename to packages/ast/src/client/client.ts
diff --git a/packages/wasm-ast-types/src/client/index.ts b/packages/ast/src/client/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/client/index.ts
rename to packages/ast/src/client/index.ts
diff --git a/packages/wasm-ast-types/src/context/context.ts b/packages/ast/src/context/context.ts
similarity index 100%
rename from packages/wasm-ast-types/src/context/context.ts
rename to packages/ast/src/context/context.ts
diff --git a/packages/wasm-ast-types/src/context/imports.ts b/packages/ast/src/context/imports.ts
similarity index 100%
rename from packages/wasm-ast-types/src/context/imports.ts
rename to packages/ast/src/context/imports.ts
diff --git a/packages/wasm-ast-types/src/context/index.ts b/packages/ast/src/context/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/context/index.ts
rename to packages/ast/src/context/index.ts
diff --git a/packages/wasm-ast-types/src/index.ts b/packages/ast/src/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/index.ts
rename to packages/ast/src/index.ts
diff --git a/packages/wasm-ast-types/src/message-builder/index.ts b/packages/ast/src/message-builder/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/message-builder/index.ts
rename to packages/ast/src/message-builder/index.ts
diff --git a/packages/wasm-ast-types/src/message-builder/message-builder.ts b/packages/ast/src/message-builder/message-builder.ts
similarity index 100%
rename from packages/wasm-ast-types/src/message-builder/message-builder.ts
rename to packages/ast/src/message-builder/message-builder.ts
diff --git a/packages/wasm-ast-types/src/message-composer/index.ts b/packages/ast/src/message-composer/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/message-composer/index.ts
rename to packages/ast/src/message-composer/index.ts
diff --git a/packages/wasm-ast-types/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
similarity index 100%
rename from packages/wasm-ast-types/src/message-composer/message-composer.ts
rename to packages/ast/src/message-composer/message-composer.ts
diff --git a/packages/wasm-ast-types/src/provider/index.ts b/packages/ast/src/provider/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/provider/index.ts
rename to packages/ast/src/provider/index.ts
diff --git a/packages/wasm-ast-types/src/provider/provider.ts b/packages/ast/src/provider/provider.ts
similarity index 100%
rename from packages/wasm-ast-types/src/provider/provider.ts
rename to packages/ast/src/provider/provider.ts
diff --git a/packages/wasm-ast-types/src/react-query/index.ts b/packages/ast/src/react-query/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/react-query/index.ts
rename to packages/ast/src/react-query/index.ts
diff --git a/packages/wasm-ast-types/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
similarity index 100%
rename from packages/wasm-ast-types/src/react-query/react-query.ts
rename to packages/ast/src/react-query/react-query.ts
diff --git a/packages/wasm-ast-types/src/recoil/index.ts b/packages/ast/src/recoil/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/recoil/index.ts
rename to packages/ast/src/recoil/index.ts
diff --git a/packages/wasm-ast-types/src/recoil/recoil.ts b/packages/ast/src/recoil/recoil.ts
similarity index 100%
rename from packages/wasm-ast-types/src/recoil/recoil.ts
rename to packages/ast/src/recoil/recoil.ts
diff --git a/packages/wasm-ast-types/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
similarity index 100%
rename from packages/wasm-ast-types/src/utils/babel.ts
rename to packages/ast/src/utils/babel.ts
diff --git a/packages/wasm-ast-types/src/utils/constants.ts b/packages/ast/src/utils/constants.ts
similarity index 100%
rename from packages/wasm-ast-types/src/utils/constants.ts
rename to packages/ast/src/utils/constants.ts
diff --git a/packages/wasm-ast-types/src/utils/index.ts b/packages/ast/src/utils/index.ts
similarity index 100%
rename from packages/wasm-ast-types/src/utils/index.ts
rename to packages/ast/src/utils/index.ts
diff --git a/packages/wasm-ast-types/src/utils/ref.ts b/packages/ast/src/utils/ref.ts
similarity index 100%
rename from packages/wasm-ast-types/src/utils/ref.ts
rename to packages/ast/src/utils/ref.ts
diff --git a/packages/wasm-ast-types/src/utils/types.ts b/packages/ast/src/utils/types.ts
similarity index 100%
rename from packages/wasm-ast-types/src/utils/types.ts
rename to packages/ast/src/utils/types.ts
diff --git a/packages/wasm-ast-types/test-utils/fixtures.ts b/packages/ast/test-utils/fixtures.ts
similarity index 100%
rename from packages/wasm-ast-types/test-utils/fixtures.ts
rename to packages/ast/test-utils/fixtures.ts
diff --git a/packages/wasm-ast-types/test-utils/index.ts b/packages/ast/test-utils/index.ts
similarity index 100%
rename from packages/wasm-ast-types/test-utils/index.ts
rename to packages/ast/test-utils/index.ts
diff --git a/packages/wasm-ast-types/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
similarity index 100%
rename from packages/wasm-ast-types/test-utils/utils.ts
rename to packages/ast/test-utils/utils.ts
diff --git a/packages/wasm-ast-types/tsconfig.esm.json b/packages/ast/tsconfig.esm.json
similarity index 100%
rename from packages/wasm-ast-types/tsconfig.esm.json
rename to packages/ast/tsconfig.esm.json
diff --git a/packages/wasm-ast-types/tsconfig.json b/packages/ast/tsconfig.json
similarity index 100%
rename from packages/wasm-ast-types/tsconfig.json
rename to packages/ast/tsconfig.json

From 4c447e44ce0d8af696caa3fae306c5e9038f1035 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 21:13:38 -0700
Subject: [PATCH 181/287] tests

---
 .../babel/__snapshots__/babel.test.ts.snap    |   8 +-
 ...ap => ts-client.account-nfts.test.ts.snap} |  70 ++--
 .../ts-client.cw-named-groups.test.ts.snap    |  16 +-
 .../ts-client.cw-proposal-single.test.ts.snap |  40 +--
 ...nap => ts-client.empty-enums.test.ts.snap} |   2 -
 ....snap => ts-client.issue-101.test.ts.snap} |  10 +-
 .../ts-client.issue-103.test.ts.snap          |   8 -
 .../ts-client.issue-71.test.ts.snap           |  52 ++-
 .../ts-client.issue-98.test.ts.snap           |  16 +-
 .../ts-client.issues.test.ts.snap             | 208 +++++------
 ....snap => ts-client.overrides.test.ts.snap} |  90 +++--
 ...c.ts.snap => ts-client.sg721.test.ts.snap} |  36 +-
 ...nt.spec.ts.snap => ts-client.test.ts.snap} |  62 ++--
 ....ts.snap => ts-client.vectis.test.ts.snap} |  38 +--
 ...c.ts.snap => ts-client.wager.test.ts.snap} |   6 +-
 .../client/ts-client.account-nfts.test.ts     |   8 +-
 .../client/ts-client.arrays-ref.test.ts       |  19 +-
 .../__tests__/client/ts-client.arrays.test.ts |  24 +-
 .../client/ts-client.cw-named-groups.test.ts  |  20 +-
 .../ts-client.cw-proposal-single.test.ts      |  26 +-
 .../client/ts-client.empty-enums.test.ts      |  13 +-
 .../client/ts-client.issue-101.test.ts        |  36 +-
 .../client/ts-client.issue-103.test.ts        |  22 +-
 .../client/ts-client.issue-71.test.ts         |  15 +-
 .../client/ts-client.issue-98.test.ts         |  16 +-
 .../__tests__/client/ts-client.issues.test.ts |  14 +-
 .../client/ts-client.overrides.test.ts        |  27 +-
 .../__tests__/client/ts-client.sg721.test.ts  |  17 +-
 .../ast/__tests__/client/ts-client.test.ts    | 104 +++---
 .../__tests__/client/ts-client.vectis.test.ts |  17 +-
 .../__tests__/client/ts-client.wager.test.ts  |  28 +-
 .../message-builder.test.ts.snap              |  34 +-
 .../message-builder/message-builder.test.ts   |  22 +-
 .../message-composer.test.ts.snap             |  24 +-
 .../message-composer/message-composer.test.ts |  23 +-
 .../__snapshots__/provider.test.ts.snap       |   2 -
 .../ast/__tests__/provider/provider.test.ts   |  24 +-
 .../__snapshots__/react-query.test.ts.snap    | 323 ++++++++++--------
 .../__tests__/react-query/react-query.test.ts |  39 +--
 .../recoil/__snapshots__/recoil.test.ts.snap  |  54 +--
 packages/ast/__tests__/recoil/recoil.test.ts  |  10 +-
 packages/ast/src/client/client.ts             |   2 +-
 .../src/message-composer/message-composer.ts  |   4 +-
 packages/ast/test-utils/fixtures.ts           |  17 -
 packages/ast/test-utils/utils.ts              |  63 +++-
 packages/types/src/idl.ts                     |   8 +-
 46 files changed, 851 insertions(+), 866 deletions(-)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.account-nfts.spec.ts.snap => ts-client.account-nfts.test.ts.snap} (76%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.empty-enums.spec.ts.snap => ts-client.empty-enums.test.ts.snap} (99%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.issue-101.spec.ts.snap => ts-client.issue-101.test.ts.snap} (72%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.overrides.spec.ts.snap => ts-client.overrides.test.ts.snap} (76%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.sg721.spec.ts.snap => ts-client.sg721.test.ts.snap} (80%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.spec.ts.snap => ts-client.test.ts.snap} (83%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.vectis.spec.ts.snap => ts-client.vectis.test.ts.snap} (82%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.wager.spec.ts.snap => ts-client.wager.test.ts.snap} (98%)
 delete mode 100644 packages/ast/test-utils/fixtures.ts

diff --git a/packages/ast/__tests__/babel/__snapshots__/babel.test.ts.snap b/packages/ast/__tests__/babel/__snapshots__/babel.test.ts.snap
index ce165728..786bf336 100644
--- a/packages/ast/__tests__/babel/__snapshots__/babel.test.ts.snap
+++ b/packages/ast/__tests__/babel/__snapshots__/babel.test.ts.snap
@@ -15,7 +15,6 @@ exports[`mutation classes 1`] = `
 "export class SG721Client extends SG721QueryClient implements SG721ReadOnlyInstance {
   client: SigningCosmWasmClient;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -25,7 +24,6 @@ exports[`mutation classes 1`] = `
     this.hello = this.hello.bind(this);
     this.mintme = this.mintme.bind(this);
   }
-
   mint = async (sender: string, tokenId: string, owner: string, token_uri: string): Promise<ExecuteResult> => {
     return await this.client.execute(sender, this.contractAddress, {
       mint: {
@@ -34,7 +32,7 @@ exports[`mutation classes 1`] = `
         token_uri: token_uri,
         expression: {}
       }
-    }, \\"auto\\");
+    }, "auto");
   };
 }"
 `;
@@ -53,7 +51,6 @@ exports[`readonly classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -62,7 +59,6 @@ exports[`readonly classes 1`] = `
     this.hello = this.hello.bind(this);
     this.mintme = this.mintme.bind(this);
   }
-
   approval = async (owner: string, spender: string): Promise<ApprovalResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       owner,
@@ -72,4 +68,4 @@ exports[`readonly classes 1`] = `
 }"
 `;
 
-exports[`top import 1`] = `"import { CosmWasmClient, ExecuteResult, SigningCosmWasmClient } from \\"@cosmjs/cosmwasm-stargate\\";"`;
+exports[`top import 1`] = `"import { CosmWasmClient, ExecuteResult, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";"`;
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
similarity index 76%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
index 70d9f1b6..eca178c7 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
@@ -5,7 +5,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -26,8 +25,7 @@ exports[`execute classes array types 1`] = `
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-
-  proposedNewOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  proposedNewOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proposed_new_owner: {}
     }, fee, memo, _funds);
@@ -38,7 +36,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allowed_vaults: {
         limit,
@@ -51,8 +49,8 @@ exports[`execute classes array types 1`] = `
     startAfter
   }: {
     limit?: number;
-    startAfter?: string[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    startAfter?: [string, string][];
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
         limit,
@@ -60,7 +58,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee, memo, _funds);
   };
-  allPreviousOwners = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  allPreviousOwners = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_previous_owners: {}
     }, fee, memo, _funds);
@@ -71,7 +69,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       owner_of: {
         include_expired: includeExpired,
@@ -87,7 +85,7 @@ exports[`execute classes array types 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approval: {
         include_expired: includeExpired,
@@ -102,7 +100,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approvals: {
         include_expired: includeExpired,
@@ -120,7 +118,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_operators: {
         include_expired: includeExpired,
@@ -130,12 +128,12 @@ exports[`execute classes array types 1`] = `
       }
     }, fee, memo, _funds);
   };
-  numTokens = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  numTokens = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       num_tokens: {}
     }, fee, memo, _funds);
   };
-  contractInfo = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  contractInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       contract_info: {}
     }, fee, memo, _funds);
@@ -144,7 +142,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       nft_info: {
         token_id: tokenId
@@ -157,7 +155,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_nft_info: {
         include_expired: includeExpired,
@@ -173,7 +171,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       tokens: {
         limit,
@@ -188,7 +186,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_tokens: {
         limit,
@@ -196,7 +194,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee, memo, _funds);
   };
-  minter = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  minter = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       minter: {}
     }, fee, memo, _funds);
@@ -208,29 +206,29 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  proposedNewOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  proposedNewOwner: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allowedVaults: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allDebtShares: ({
     limit,
     startAfter
   }: {
     limit?: number;
-    startAfter?: string[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  allPreviousOwners: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+    startAfter?: [string, string][];
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  allPreviousOwners: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   ownerOf: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approval: ({
     includeExpired,
     spender,
@@ -239,14 +237,14 @@ exports[`execute interfaces no extends 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approvals: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allOperators: ({
     includeExpired,
     limit,
@@ -257,21 +255,21 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  numTokens: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  contractInfo: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  numTokens: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  contractInfo: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   nftInfo: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allNftInfo: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   tokens: ({
     limit,
     owner,
@@ -280,15 +278,15 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allTokens: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  minter: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  minter: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -298,7 +296,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -318,7 +315,6 @@ exports[`query classes 1`] = `
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-
   proposedNewOwner = async (): Promise<ProposedNewOwnerResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       proposed_new_owner: {}
@@ -343,7 +339,7 @@ exports[`query classes 1`] = `
     startAfter
   }: {
     limit?: number;
-    startAfter?: string[][];
+    startAfter?: [string, string][];
   }): Promise<AllDebtSharesResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       all_debt_shares: {
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
index 92121685..659ba662 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
@@ -5,7 +5,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -14,7 +13,6 @@ exports[`execute classes array types 1`] = `
     this.removeGroup = this.removeGroup.bind(this);
     this.updateOwner = this.updateOwner.bind(this);
   }
-
   update = async ({
     addressesToAdd,
     addressesToRemove,
@@ -23,7 +21,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -36,7 +34,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -47,7 +45,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
@@ -69,17 +67,17 @@ exports[`execute interfaces no extends 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -89,7 +87,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -97,7 +94,6 @@ exports[`query classes 1`] = `
     this.removeGroup = this.removeGroup.bind(this);
     this.updateOwner = this.updateOwner.bind(this);
   }
-
   update = async ({
     addressesToAdd,
     addressesToRemove,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
index 034b1eb3..701f2c97 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
@@ -5,7 +5,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -20,7 +19,6 @@ exports[`execute classes array types 1`] = `
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = async ({
     description,
     msgs,
@@ -29,7 +27,7 @@ exports[`execute classes array types 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -44,7 +42,7 @@ exports[`execute classes array types 1`] = `
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -56,7 +54,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -67,7 +65,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -90,7 +88,7 @@ exports[`execute classes array types 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -107,7 +105,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -118,7 +116,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -129,7 +127,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -140,7 +138,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
@@ -162,24 +160,24 @@ exports[`execute interfaces no extends 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -196,27 +194,27 @@ exports[`execute interfaces no extends 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -226,7 +224,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -241,7 +238,6 @@ exports[`query classes 1`] = `
     this.voteHooks = this.voteHooks.bind(this);
     this.info = this.info.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap
similarity index 99%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap
index fd66d75b..9eb8ebee 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap
@@ -4,12 +4,10 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
similarity index 72%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
index 1a480530..15e95ef0 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
@@ -8,8 +8,8 @@ exports[`execute interfaces no extends 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateOwnership: (action: Action, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  updateOwnership: (action: Action, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -18,7 +18,6 @@ exports[`ownership client with tuple 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -26,19 +25,18 @@ exports[`ownership client with tuple 1`] = `
     this.setFactory = this.setFactory.bind(this);
     this.updateOwnership = this.updateOwnership.bind(this);
   }
-
   setFactory = async ({
     newFactory
   }: {
     newFactory: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_factory: {
         new_factory: newFactory
       }
     }, fee, memo, _funds);
   };
-  updateOwnership = async (action: Action, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateOwnership = async (action: Action, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_ownership: action
     }, fee, memo, _funds);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
index ba311655..3e03cdbc 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
@@ -5,13 +5,11 @@ exports[`execute execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
@@ -28,12 +26,10 @@ exports[`execute query classes 1`] = `
 "export class QueryClient implements ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
@@ -44,13 +40,11 @@ exports[`query execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
@@ -67,12 +61,10 @@ exports[`query query classes 1`] = `
 "export class QueryClient implements ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
index 6d9321de..67429f9f 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -1,11 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`execute class /issues/71/execute_msg.json 1`] = `
+exports[`execute class /execute_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -21,7 +20,6 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     this.dropOwnershipProposal = this.dropOwnershipProposal.bind(this);
     this.claimOwnership = this.claimOwnership.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
@@ -30,7 +28,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -47,7 +45,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         fee_collector: feeCollector,
@@ -64,7 +62,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_pool_config: {
         is_disabled: isDisabled,
@@ -77,7 +75,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_to_registery: {
         new_pool_config: newPoolConfig
@@ -96,7 +94,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_pool_instance: {
         asset_infos: assetInfos,
@@ -121,7 +119,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       join_pool: {
         assets,
@@ -139,7 +137,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       swap: {
         recipient,
@@ -153,7 +151,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
   }: {
     expiresIn: number;
     owner: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         expires_in: expiresIn,
@@ -161,12 +159,12 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
       }
     }, fee, memo, _funds);
   };
-  dropOwnershipProposal = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  dropOwnershipProposal = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       drop_ownership_proposal: {}
     }, fee, memo, _funds);
   };
-  claimOwnership = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  claimOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       claim_ownership: {}
     }, fee, memo, _funds);
@@ -174,7 +172,7 @@ exports[`execute class /issues/71/execute_msg.json 1`] = `
 }"
 `;
 
-exports[`execute interface /issues/71/execute_msg.json 1`] = `
+exports[`execute interface /execute_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
@@ -186,7 +184,7 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     feeCollector,
     generatorAddress,
@@ -195,7 +193,7 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updatePoolConfig: ({
     isDisabled,
     newFeeInfo,
@@ -204,12 +202,12 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addToRegistery: ({
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createPoolInstance: ({
     assetInfos,
     initParams,
@@ -222,7 +220,7 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   joinPool: ({
     assets,
     autoStake,
@@ -237,33 +235,32 @@ exports[`execute interface /issues/71/execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   swap: ({
     recipient,
     swapRequest
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   proposeNewOwner: ({
     expiresIn,
     owner
   }: {
     expiresIn: number;
     owner: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  dropOwnershipProposal: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  claimOwnership: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  dropOwnershipProposal: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  claimOwnership: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/71/execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
+exports[`execute_msg_for__empty /execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
-exports[`query classes /issues/71/execute_msg.json 1`] = `
+exports[`query classes /execute_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -278,7 +275,6 @@ exports[`query classes /issues/71/execute_msg.json 1`] = `
     this.dropOwnershipProposal = this.dropOwnershipProposal.bind(this);
     this.claimOwnership = this.claimOwnership.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
index b3e4ecb2..f64d0922 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -5,7 +5,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -14,8 +13,7 @@ exports[`execute classes array types 1`] = `
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-
-  getConfig = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getConfig = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_config: {}
     }, fee, memo, _funds);
@@ -26,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugins: {
         limit,
@@ -38,7 +36,7 @@ exports[`execute classes array types 1`] = `
     id
   }: {
     id: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugin_by_id: {
         id
@@ -52,19 +50,19 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getConfig: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getConfig: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getPlugins: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getPluginById: ({
     id
   }: {
     id: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -74,7 +72,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -82,7 +79,6 @@ exports[`query classes 1`] = `
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-
   getConfig = async (): Promise<GetConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       get_config: {}
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
index 590aac7f..dce4a1c6 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
@@ -1,56 +1,49 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`execute class /issues/55/batch.json 1`] = `
+exports[`execute class /batch.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`execute class /issues/55/denom_response.json 1`] = `
+exports[`execute class /denom_response.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`execute class /issues/55/edge.json 1`] = `
+exports[`execute class /edge.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`execute class /issues/55/execute_msg.json 1`] = `
+exports[`execute class /execute_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -70,14 +63,13 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     this.createGraphFromFile = this.createGraphFromFile.bind(this);
     this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
   }
-
   createEdge = async ({
     amount,
     creditor
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -93,7 +85,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -106,7 +98,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -117,7 +109,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -128,9 +120,9 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: Addr[][];
+    graph: [Addr, Addr, number][][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -142,9 +134,9 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: Addr[][];
+    graph: [Addr, Addr, number][][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -156,7 +148,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -166,15 +158,15 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
   updateEdges = async ({
     edges
   }: {
-    edges: number[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    edges: [number, number][][];
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee, memo, _funds);
   };
-  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee, memo, _funds);
@@ -183,14 +175,14 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee, memo, _funds);
   };
-  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee, memo, _funds);
@@ -199,7 +191,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -210,7 +202,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -221,7 +213,7 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
@@ -231,42 +223,37 @@ exports[`execute class /issues/55/execute_msg.json 1`] = `
 }"
 `;
 
-exports[`execute class /issues/55/instantiate_msg.json 1`] = `
+exports[`execute class /instantiate_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`execute class /issues/55/network.json 1`] = `
+exports[`execute class /network.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`execute class /issues/55/query_msg.json 1`] = `
+exports[`execute class /query_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -284,18 +271,17 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
-
-  getDenom = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getDenom = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_denom: {}
     }, fee, memo, _funds);
   };
-  getOwner = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_owner: {}
     }, fee, memo, _funds);
   };
-  allEdges = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  allEdges = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_edges: {}
     }, fee, memo, _funds);
@@ -304,7 +290,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_edge: {
         edge_id: edgeId
@@ -315,7 +301,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     batchId
   }: {
     batchId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_batch: {
         batch_id: batchId
@@ -326,7 +312,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_graph: {
         graph_id: graphId
@@ -337,7 +323,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_by_address: {
         address
@@ -348,7 +334,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_as_counterparty: {
         address
@@ -359,7 +345,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_per_address: {
         address
@@ -370,7 +356,7 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_credit_per_address: {
         address
@@ -381,14 +367,14 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_by_graph: {
         graph_id: graphId
       }
     }, fee, memo, _funds);
   };
-  getTotalDebt = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getTotalDebt = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt: {}
     }, fee, memo, _funds);
@@ -396,28 +382,28 @@ exports[`execute class /issues/55/query_msg.json 1`] = `
 }"
 `;
 
-exports[`execute interface /issues/55/batch.json 1`] = `
+exports[`execute interface /batch.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
 }"
 `;
 
-exports[`execute interface /issues/55/denom_response.json 1`] = `
+exports[`execute interface /denom_response.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
 }"
 `;
 
-exports[`execute interface /issues/55/edge.json 1`] = `
+exports[`execute interface /edge.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
 }"
 `;
 
-exports[`execute interface /issues/55/execute_msg.json 1`] = `
+exports[`execute interface /execute_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
@@ -427,7 +413,7 @@ exports[`execute interface /issues/55/execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editEdge: ({
     amount,
     creditor,
@@ -436,145 +422,145 @@ exports[`execute interface /issues/55/execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
-    graph: Addr[][];
+    graph: [Addr, Addr, number][][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
-    graph: Addr[][];
+    graph: [Addr, Addr, number][][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateEdges: ({
     edges
   }: {
-    edges: number[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+    edges: [number, number][][];
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  findSavings: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  reset: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
-exports[`execute interface /issues/55/instantiate_msg.json 1`] = `
+exports[`execute interface /instantiate_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
 }"
 `;
 
-exports[`execute interface /issues/55/network.json 1`] = `
+exports[`execute interface /network.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
 }"
 `;
 
-exports[`execute interface /issues/55/query_msg.json 1`] = `
+exports[`execute interface /query_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getDenom: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  getOwner: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  allEdges: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getDenom: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getOwner: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  allEdges: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   oneEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   oneBatch: ({
     batchId
   }: {
     batchId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   oneGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getEdgesByAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getEdgesAsCounterparty: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getTotalDebtPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getTotalCreditPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   getTotalDebtByGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebt: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getTotalDebt: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/55/batch.json 1`] = `
+exports[`execute_msg_for__empty /batch.json 1`] = `
 "export interface Batch {
   batchId: number;
-  setoffs: number[][];
+  setoffs: [number, number][][];
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/55/denom_response.json 1`] = `
+exports[`execute_msg_for__empty /denom_response.json 1`] = `
 "export interface DenomResponse {
   denom: string;
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/55/edge.json 1`] = `
+exports[`execute_msg_for__empty /edge.json 1`] = `
 "export interface Edge {
   amount: number;
   creditor: Addr;
@@ -584,67 +570,60 @@ exports[`execute_msg_for__empty /issues/55/edge.json 1`] = `
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/55/execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
+exports[`execute_msg_for__empty /execute_msg.json 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
-exports[`execute_msg_for__empty /issues/55/instantiate_msg.json 1`] = `
+exports[`execute_msg_for__empty /instantiate_msg.json 1`] = `
 "export interface InstantiateMsg {
   denom: string;
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/55/network.json 1`] = `
+exports[`execute_msg_for__empty /network.json 1`] = `
 "export interface Network {
   denom: string;
   owner: Addr;
 }"
 `;
 
-exports[`execute_msg_for__empty /issues/55/query_msg.json 1`] = `"export type QueryMsg = QueryMsg;"`;
+exports[`execute_msg_for__empty /query_msg.json 1`] = `"export type QueryMsg = QueryMsg;"`;
 
-exports[`query classes /issues/55/batch.json 1`] = `
+exports[`query classes /batch.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`query classes /issues/55/denom_response.json 1`] = `
+exports[`query classes /denom_response.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`query classes /issues/55/edge.json 1`] = `
+exports[`query classes /edge.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`query classes /issues/55/execute_msg.json 1`] = `
+exports[`query classes /execute_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -663,7 +642,6 @@ exports[`query classes /issues/55/execute_msg.json 1`] = `
     this.createGraphFromFile = this.createGraphFromFile.bind(this);
     this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
   }
-
   createEdge = async ({
     amount,
     creditor
@@ -721,7 +699,7 @@ exports[`query classes /issues/55/execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: Addr[][];
+    graph: [Addr, Addr, number][][];
     graphId: number;
   }): Promise<CreateGraphSimplifiedResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
@@ -735,7 +713,7 @@ exports[`query classes /issues/55/execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: Addr[][];
+    graph: [Addr, Addr, number][][];
     graphId: number;
   }): Promise<EditGraphSimplifiedResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
@@ -759,7 +737,7 @@ exports[`query classes /issues/55/execute_msg.json 1`] = `
   updateEdges = async ({
     edges
   }: {
-    edges: number[][];
+    edges: [number, number][][];
   }): Promise<UpdateEdgesResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       update_edges: {
@@ -824,37 +802,32 @@ exports[`query classes /issues/55/execute_msg.json 1`] = `
 }"
 `;
 
-exports[`query classes /issues/55/instantiate_msg.json 1`] = `
+exports[`query classes /instantiate_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`query classes /issues/55/network.json 1`] = `
+exports[`query classes /network.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }"
 `;
 
-exports[`query classes /issues/55/query_msg.json 1`] = `
+exports[`query classes /query_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -871,7 +844,6 @@ exports[`query classes /issues/55/query_msg.json 1`] = `
     this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
-
   getDenom = async (): Promise<GetDenomResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       get_denom: {}
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
similarity index 76%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
index 66212ac8..56f11aa0 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
@@ -5,7 +5,6 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -20,14 +19,13 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -43,7 +41,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -60,7 +58,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -75,7 +73,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -89,7 +87,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -101,7 +99,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -118,7 +116,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -132,7 +130,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -147,7 +145,6 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -161,14 +158,13 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -184,7 +180,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -201,7 +197,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -216,7 +212,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -230,7 +226,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -242,7 +238,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -259,7 +255,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -273,7 +269,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -288,7 +284,6 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   override client: SigningCosmWasmClient;
   sender: string;
   override contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -303,14 +298,13 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -326,7 +320,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -343,7 +337,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -358,7 +352,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -372,7 +366,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -384,7 +378,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -401,7 +395,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -415,7 +409,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -430,7 +424,6 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -445,14 +438,13 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -468,7 +460,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -485,7 +477,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -500,7 +492,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -514,7 +506,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -526,7 +518,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -543,7 +535,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -557,7 +549,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -572,7 +564,6 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -586,14 +577,13 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -609,7 +599,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -626,7 +616,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -641,7 +631,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -655,7 +645,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -667,7 +657,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -684,7 +674,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -698,7 +688,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
similarity index 80%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
index 92b55319..d04d3f90 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
@@ -5,7 +5,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -19,14 +18,13 @@ exports[`execute classes array types 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -42,7 +40,7 @@ exports[`execute classes array types 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -59,7 +57,7 @@ exports[`execute classes array types 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -74,7 +72,7 @@ exports[`execute classes array types 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -88,7 +86,7 @@ exports[`execute classes array types 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -100,7 +98,7 @@ exports[`execute classes array types 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -117,7 +115,7 @@ exports[`execute classes array types 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -131,7 +129,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -151,7 +149,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -160,7 +158,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -169,26 +167,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -199,12 +197,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -214,7 +212,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -227,7 +224,6 @@ exports[`query classes 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
similarity index 83%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
index a70c59a9..0fa38069 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
@@ -41,7 +41,6 @@ exports[`execute classes 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -56,14 +55,13 @@ exports[`execute classes 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -79,7 +77,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -96,7 +94,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -111,7 +109,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -125,7 +123,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -137,7 +135,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -154,7 +152,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -168,7 +166,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -183,7 +181,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -192,7 +189,6 @@ exports[`execute classes array types 1`] = `
     this.removeGroup = this.removeGroup.bind(this);
     this.updateOwner = this.updateOwner.bind(this);
   }
-
   update = async ({
     addressesToAdd,
     addressesToRemove,
@@ -201,7 +197,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -214,7 +210,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -225,7 +221,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
@@ -240,7 +236,6 @@ exports[`execute classes no extends 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -254,14 +249,13 @@ exports[`execute classes no extends 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -277,7 +271,7 @@ exports[`execute classes no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -294,7 +288,7 @@ exports[`execute classes no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -309,7 +303,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -323,7 +317,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -335,7 +329,7 @@ exports[`execute classes no extends 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -352,7 +346,7 @@ exports[`execute classes no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -366,7 +360,7 @@ exports[`execute classes no extends 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -386,7 +380,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -395,7 +389,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -404,26 +398,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -434,12 +428,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -482,7 +476,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -499,7 +492,6 @@ exports[`query classes 1`] = `
     this.minter = this.minter.bind(this);
     this.collectionInfo = this.collectionInfo.bind(this);
   }
-
   ownerOf = async ({
     includeExpired,
     tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
similarity index 82%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
index 9810be84..800b5ba5 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
@@ -13,7 +13,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -27,19 +26,18 @@ exports[`execute classes array types 1`] = `
     this.updateGuardians = this.updateGuardians.bind(this);
     this.updateLabel = this.updateLabel.bind(this);
   }
-
   execute = async ({
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee, memo, _funds);
   };
-  revertFreezeStatus = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee, memo, _funds);
@@ -48,7 +46,7 @@ exports[`execute classes array types 1`] = `
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -59,7 +57,7 @@ exports[`execute classes array types 1`] = `
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -70,7 +68,7 @@ exports[`execute classes array types 1`] = `
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -81,7 +79,7 @@ exports[`execute classes array types 1`] = `
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -94,7 +92,7 @@ exports[`execute classes array types 1`] = `
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -106,7 +104,7 @@ exports[`execute classes array types 1`] = `
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
@@ -124,40 +122,40 @@ exports[`execute interfaces no extends 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -182,7 +180,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -192,7 +189,6 @@ exports[`query classes 1`] = `
     this.distribution = this.distribution.bind(this);
     this.wasm = this.wasm.bind(this);
   }
-
   bank = async (bankMsg: BankMsg): Promise<BankResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       bank: bankMsg
@@ -225,7 +221,6 @@ exports[`query classes 2`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -238,7 +233,6 @@ exports[`query classes 2`] = `
     this.updateGuardians = this.updateGuardians.bind(this);
     this.updateLabel = this.updateLabel.bind(this);
   }
-
   execute = async ({
     msgs
   }: {
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
similarity index 98%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
index 8d311888..c409351a 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
@@ -86,7 +86,6 @@ exports[`query classes 1`] = `
 "export class WagerQueryClient implements WagerReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -95,7 +94,6 @@ exports[`query classes 1`] = `
     this.tokenStatus = this.tokenStatus.bind(this);
     this.config = this.config.bind(this);
   }
-
   wagers = async (): Promise<WagersResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       wagers: {}
@@ -104,7 +102,7 @@ exports[`query classes 1`] = `
   wager = async ({
     token
   }: {
-    token: Addr[][];
+    token: [Addr, number][];
   }): Promise<WagerResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       wager: {
@@ -115,7 +113,7 @@ exports[`query classes 1`] = `
   tokenStatus = async ({
     token
   }: {
-    token: Addr[][];
+    token: [Addr, number][];
   }): Promise<TokenStatusResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       token_status: {
diff --git a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
index 656a5163..2c8249cd 100644
--- a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
+++ b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
@@ -5,8 +5,14 @@ import {
   createTypeInterface
 } from '../../src';
 import { expectCode, makeContext } from '../../test-utils';
-import { nftIdlVersion } from '../../test-utils/fixtures';
+import { JSONSchema } from '@cosmology/ts-codegen-types';
 
+import nftIdlVersionData from '../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
+
+// @ts-ignore
+export const nftIdlVersion: JSONSchema = nftIdlVersionData;
+
+// @ts-ignore
 const message = nftIdlVersion.query;
 const ctx = makeContext(message);
 
diff --git a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
index bd31bf19..e96fe9ee 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
@@ -1,20 +1,19 @@
-import message from '../../../../../__fixtures__/misc/schema/arrays-ref.json';
-
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { RenderContext } from '../../context';
-import { expectCode, makeContext } from '../../../test-utils';
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
-const ctx = makeContext(message);
+const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays-ref.json');
+const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays-ref.json');
+const ctx = makeContext(queryMsg);
 
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
         ctx,
-        message
+        queryMsg
     ))
 })
 
@@ -24,7 +23,7 @@ it('query classes', () => {
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        message
+        queryMsg
     ))
 });
 
@@ -34,7 +33,7 @@ it('execute classes array types', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        message
+        execMsg
     ))
 });
 
@@ -43,6 +42,6 @@ it('execute interfaces no extends', () => {
         ctx,
         'SG721Instance',
         null,
-        message
+        execMsg
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.arrays.test.ts b/packages/ast/__tests__/client/ts-client.arrays.test.ts
index 1945ada0..094cc75b 100644
--- a/packages/ast/__tests__/client/ts-client.arrays.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays.test.ts
@@ -1,20 +1,20 @@
-import message from '../../../../../__fixtures__/misc/schema/arrays.json';
-
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode, printCode, makeContext } from '../../../test-utils';
-import { getPropertyType } from '../../utils';
-
-const ctx = makeContext(message);
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import { getPropertyType } from '../../src/utils';
+const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
+const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
+const ctx = makeContext(queryMsg);
 
 it('getPropertyType', () => {
     const ast = getPropertyType(
         ctx,
-        message.oneOf[0].properties.update_edges,
+        // @ts-ignore
+        queryMsg.oneOf[0].properties.update_edges,
         'edges3'
     );
     expectCode(ast.type)
@@ -24,7 +24,7 @@ it('getPropertyType', () => {
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
         ctx,
-        message
+        queryMsg
     ))
 })
 
@@ -34,7 +34,7 @@ it('query classes', () => {
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        message
+        queryMsg
     ))
 });
 
@@ -44,7 +44,7 @@ it('execute classes array types', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        message
+        execMsg
     ))
 });
 
@@ -53,6 +53,6 @@ it('execute interfaces no extends', () => {
         ctx,
         'SG721Instance',
         null,
-        message
+        execMsg
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
index e88f1f52..959313a5 100644
--- a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
@@ -1,20 +1,18 @@
-import execute_msg from '../../../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
-
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { RenderContext } from '../../context';
-import { expectCode, makeContext } from '../../../test-utils';
-
-const ctx = makeContext(execute_msg);
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+const execMsg = getMsgExecuteLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
+const queryMsg = getMsgQueryLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
+const ctx = makeContext(execMsg);
 
 it('execute_msg', () => {
     expectCode(createTypeInterface(
         ctx,
-        execute_msg
+        execMsg
     ))
 })
 
@@ -24,7 +22,7 @@ it('query classes', () => {
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        execute_msg
+        queryMsg
     ))
 });
 
@@ -34,7 +32,7 @@ it('execute classes array types', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        execute_msg
+        execMsg
     ))
 });
 
@@ -43,6 +41,6 @@ it('execute interfaces no extends', () => {
         ctx,
         'SG721Instance',
         null,
-        execute_msg
+        execMsg
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
index 77ed57fa..ac989d48 100644
--- a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
@@ -1,50 +1,50 @@
-import execute_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/execute_msg.json';
-import query_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/query_msg.json';
-
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode, makeContext } from '../../../test-utils';
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+
+const execMsg = getMsgExecuteLegacyFixture('daodao/cw-proposal-single', '/execute_msg.json');
+const queryMsg = getMsgQueryLegacyFixture('daodao/cw-proposal-single', '/query_msg.json');
 
 it('execute_msg_for', () => {
-    const ctx = makeContext(execute_msg);
+    const ctx = makeContext(execMsg);
     expectCode(createTypeInterface(
         ctx,
-        execute_msg
+        execMsg
     ))
 })
 
 
 it('query classes', () => {
-    const ctx = makeContext(query_msg);
+    const ctx = makeContext(queryMsg);
     expectCode(createQueryClass(
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        query_msg
+        queryMsg
     ))
 });
 
 it('execute classes array types', () => {
-    const ctx = makeContext(execute_msg);
+    const ctx = makeContext(execMsg);
     expectCode(createExecuteClass(
         ctx,
         'SG721Client',
         'SG721Instance',
         null,
-        execute_msg
+        execMsg
     ))
 });
 
 it('execute interfaces no extends', () => {
-    const ctx = makeContext(execute_msg);
+    const ctx = makeContext(execMsg);
     expectCode(createExecuteInterface(
         ctx,
         'SG721Instance',
         null,
-        execute_msg
+        execMsg
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
index f6d5daa3..14d4a697 100644
--- a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
+++ b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
@@ -1,19 +1,18 @@
-import query_msg from '../../../../../__fixtures__/daodao/cw-admin-factory/query_msg.json';
-
 import {
     createQueryClass,
     createQueryInterface
-} from '../client'
-import { expectCode, makeContext } from '../../../test-utils';
+} from '../../src'
+import { expectCode, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
-const ctx = makeContext(query_msg);
+const queryMsg = getMsgQueryLegacyFixture('daodao/cw-admin-factory', '/query_msg.json');
+const ctx = makeContext(queryMsg);
 
 it('query classes', () => {
     expectCode(createQueryClass(
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        query_msg
+        queryMsg
     ))
 });
 
@@ -22,7 +21,7 @@ it('query interface', () => {
         createQueryInterface(
             ctx,
             'ReadOnlyInstance',
-            query_msg
+            queryMsg
         )
     )
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-101.test.ts b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
index 71b4efa1..3f43382c 100644
--- a/packages/ast/__tests__/client/ts-client.issue-101.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
@@ -1,17 +1,9 @@
-import { createExecuteClass, createExecuteInterface } from '../client';
-import { expectCode, makeContext } from '../../../test-utils';
-import ownership from '../../../../../__fixtures__/basic/ownership.json';
+import { ExecuteMsg } from '@cosmology/ts-codegen-types';
+import { createExecuteClass, createExecuteInterface } from '../../src';
+import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
-
-// it('query classes', () => {
-//     const ctx = makeContext(cosmos_msg_for__empty);
-//     expectCode(createQueryClass(
-//         ctx,
-//         'SG721QueryClient',
-//         'SG721ReadOnlyInstance',
-//         cosmos_msg_for__empty
-//     ))
-// });
+const contract = globLegacyContracts('basic').find(c => c.name === '/ownership.json')!;
+const ownership = contract.content;
 
 it('execute interfaces no extends', () => {
   const ctx = makeContext(ownership);
@@ -19,19 +11,19 @@ it('execute interfaces no extends', () => {
     ctx,
     'OwnershipInstance',
     null,
-    ownership
+    ownership as ExecuteMsg
   ))
 });
 
 it('ownership client with tuple', () => {
-    const ctx = makeContext(ownership);
-    expectCode(createExecuteClass(
-        ctx,
-        'OwnershipClient',
-        'OwnershipInstance',
-        null,
-        ownership
-    ))
+  const ctx = makeContext(ownership);
+  expectCode(createExecuteClass(
+    ctx,
+    'OwnershipClient',
+    'OwnershipInstance',
+    null,
+    ownership as ExecuteMsg
+  ))
 });
 
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-103.test.ts b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
index 4f394115..776ca6f6 100644
--- a/packages/ast/__tests__/client/ts-client.issue-103.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
@@ -1,15 +1,20 @@
-import contract from '../../../../../__fixtures__/issues/103/schema.json';
-
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode, printCode, makeContext } from '../../../test-utils';
+} from '../../src';
+
+import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
+
+const globbed = globLegacyContracts('issues/103').find(c => c.name === '/schema.json')!;
+const contract = globbed.content;
 
-const queryMessage = contract.query
-const executeMessage = contract.execute
+
+// @ts-ignore
+const queryMessage = contract.query;
+// @ts-ignore
+const executeMessage = contract.execute;
 const queryCtx = makeContext(queryMessage);
 const executeCtx = makeContext(executeMessage);
 
@@ -34,7 +39,7 @@ describe('query', () => {
     it('query classes response', () => {
         expectCode(createTypeInterface(
             queryCtx,
-            contract.query
+            queryMessage
         ))
     });
 
@@ -80,7 +85,8 @@ describe('execute', () => {
     it('query classes response', () => {
         expectCode(createTypeInterface(
             executeCtx,
-            contract.query
+            // @ts-ignore
+            queryMessage
         ))
     });
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-71.test.ts b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
index 18f48125..99dd2e28 100644
--- a/packages/ast/__tests__/client/ts-client.issue-71.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
@@ -1,14 +1,15 @@
-import { globContracts, makeContext } from '../../../test-utils'
+import { globLegacyContracts, makeContext } from '../../test-utils'
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode } from '../../../test-utils';
+} from '../../src'
+import { expectCode } from '../../test-utils';
 import cases from 'jest-in-case';
+import { ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
 
-const contracts = globContracts('issues/71');
+const contracts = globLegacyContracts('issues/71');
 
 cases('execute_msg_for__empty', async opts => {
     const ctx = makeContext(opts.content);
@@ -24,7 +25,7 @@ cases('query classes', async opts => {
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        opts.content
+        opts.content as QueryMsg
     ))
 }, contracts);
 
@@ -35,7 +36,7 @@ cases('execute class', async opts => {
         'SG721Client',
         'SG721Instance',
         null,
-        opts.content
+        opts.content as ExecuteMsg
     ))
 }, contracts);
 
@@ -45,7 +46,7 @@ cases('execute interface', async opts => {
         ctx,
         'SG721Instance',
         null,
-        opts.content
+        opts.content as ExecuteMsg
     ))
 }, contracts);
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-98.test.ts b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
index d5fa6905..86acb3b7 100644
--- a/packages/ast/__tests__/client/ts-client.issue-98.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
@@ -1,14 +1,16 @@
-import contract from '../../../../../__fixtures__/issues/98/schema.json';
-
+import { ExecuteMsg } from '@cosmology/ts-codegen-types';
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode, printCode, makeContext } from '../../../test-utils';
+} from '../../src';
+
+import { expectCode, makeContext, globIdlBasedContracts } from '../../test-utils';
 
-const message = contract.query
+const contract = globIdlBasedContracts('issues/98').find(c => c.name === '/schema.json')!;
+
+const message = contract.content.query
 const ctx = makeContext(message);
 
 it('execute_msg_for__empty', () => {
@@ -41,7 +43,8 @@ it('execute classes array types', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        message
+        // @ts-ignore
+        message as ExecuteMsg
     ))
 });
 
@@ -50,6 +53,7 @@ it('execute interfaces no extends', () => {
         ctx,
         'SG721Instance',
         null,
+        // @ts-ignore
         message
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.issues.test.ts b/packages/ast/__tests__/client/ts-client.issues.test.ts
index d1b70188..854c481d 100644
--- a/packages/ast/__tests__/client/ts-client.issues.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issues.test.ts
@@ -1,14 +1,14 @@
-import { globContracts, makeContext } from '../../../test-utils'
+import { ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode } from '../../../test-utils';
+} from '../../src'
+import { globLegacyContracts, makeContext, expectCode } from '../../test-utils';
 import cases from 'jest-in-case';
 
-const contracts = globContracts('issues/55');
+const contracts = globLegacyContracts('issues/55');
 
 
 cases('execute_msg_for__empty', async opts => {
@@ -25,7 +25,7 @@ cases('query classes', async opts => {
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        opts.content
+        opts.content as QueryMsg
     ))
 }, contracts);
 
@@ -36,7 +36,7 @@ cases('execute class', async opts => {
         'SG721Client',
         'SG721Instance',
         null,
-        opts.content
+        opts.content as ExecuteMsg
     ))
 }, contracts);
 
@@ -46,7 +46,7 @@ cases('execute interface', async opts => {
         ctx,
         'SG721Instance',
         null,
-        opts.content
+        opts.content as ExecuteMsg
     ))
 }, contracts);
 
diff --git a/packages/ast/__tests__/client/ts-client.overrides.test.ts b/packages/ast/__tests__/client/ts-client.overrides.test.ts
index c653d8b5..4de4cf64 100644
--- a/packages/ast/__tests__/client/ts-client.overrides.test.ts
+++ b/packages/ast/__tests__/client/ts-client.overrides.test.ts
@@ -1,17 +1,10 @@
-import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
-} from '../client'
-import { expectCode, makeContext } from '../../../test-utils';
+    createExecuteClass
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
 
-const ctx = makeContext(execute_msg_for__empty);
-
-describe('exec', () => {
-
-})
+const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const ctx = makeContext(execMsg);
 
 it('Impl, execExtends, noExtendsClass', () => {
     ctx.options.client.noImplicitOverride = false;
@@ -21,7 +14,7 @@ it('Impl, execExtends, noExtendsClass', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        execute_msg_for__empty
+        execMsg
     ))
 });
 
@@ -33,7 +26,7 @@ it('Impl, execExtends, ExtendsClass', () => {
         'SG721Client',
         'SG721Instance',
         'ExtendsClassName',
-        execute_msg_for__empty
+        execMsg
     ))
 });
 
@@ -45,7 +38,7 @@ it('noImpl, execExtends, ExtendsClass', () => {
         'SG721Client',
         'SG721Instance',
         'ExtendsClassName',
-        execute_msg_for__empty
+        execMsg
     ))
 });
 
@@ -57,7 +50,7 @@ it('noImpl, noExecExtends, ExtendsClass', () => {
         'SG721Client',
         'SG721Instance',
         'ExtendsClassName',
-        execute_msg_for__empty
+        execMsg
     ))
 });
 
@@ -69,6 +62,6 @@ it('noImpl, noExecExtends, noExtendsClass', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        execute_msg_for__empty
+        execMsg
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.sg721.test.ts b/packages/ast/__tests__/client/ts-client.sg721.test.ts
index 69f2f971..5674c322 100644
--- a/packages/ast/__tests__/client/ts-client.sg721.test.ts
+++ b/packages/ast/__tests__/client/ts-client.sg721.test.ts
@@ -1,18 +1,19 @@
-import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
 import {
     createQueryClass,
     createExecuteClass,
     createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode, makeContext } from '../../../test-utils';
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
-const ctx = makeContext(execute_msg_for__empty);
+const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const queryMsg = getMsgQueryLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const ctx = makeContext(execMsg);
 
 it('execute_msg_for__empty', () => {
     expectCode(createTypeInterface(
         ctx,
-        execute_msg_for__empty
+        execMsg
     ))
 })
 
@@ -22,7 +23,7 @@ it('query classes', () => {
         ctx,
         'SG721QueryClient',
         'SG721ReadOnlyInstance',
-        execute_msg_for__empty
+        queryMsg
     ))
 });
 
@@ -32,7 +33,7 @@ it('execute classes array types', () => {
         'SG721Client',
         'SG721Instance',
         null,
-        execute_msg_for__empty
+        execMsg
     ))
 });
 
@@ -41,6 +42,6 @@ it('execute interfaces no extends', () => {
         ctx,
         'SG721Instance',
         null,
-        execute_msg_for__empty
+        execMsg
     ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.test.ts b/packages/ast/__tests__/client/ts-client.test.ts
index e8decbb5..89d3889e 100644
--- a/packages/ast/__tests__/client/ts-client.test.ts
+++ b/packages/ast/__tests__/client/ts-client.test.ts
@@ -1,166 +1,166 @@
-import execute_msg_named_groups from '../../../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
-
-import query_msg from '../../../../../__fixtures__/basic/query_msg.json';
-import execute_msg from '../../../../../__fixtures__/basic/execute_msg_for__empty.json';
-import approval_response from '../../../../../__fixtures__/basic/approval_response.json';
-import all_nft_info_response from '../../../../../__fixtures__/basic/all_nft_info_response.json';
-import approvals_response from '../../../../../__fixtures__/basic/approvals_response.json';
-import collection_info_response from '../../../../../__fixtures__/basic/collection_info_response.json';
-import contract_info_response from '../../../../../__fixtures__/basic/contract_info_response.json';
-import instantiate_msg from '../../../../../__fixtures__/basic/instantiate_msg.json';
-import nft_info_response from '../../../../../__fixtures__/basic/nft_info_response.json';
-import num_tokens_response from '../../../../../__fixtures__/basic/num_tokens_response.json';
-import operators_response from '../../../../../__fixtures__/basic/operators_response.json';
-import owner_of_response from '../../../../../__fixtures__/basic/owner_of_response.json';
-import tokens_response from '../../../../../__fixtures__/basic/tokens_response.json';
-
 import {
   createQueryClass,
   createQueryInterface,
   createExecuteClass,
   createExecuteInterface,
   createTypeInterface
-} from '../client';
+} from '../../src';
+import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+
+const daodaoCwNamedGroupsExecuteMsg = getMsgExecuteLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
+
+const queryMsgData = getMsgQueryLegacyFixture('basic', '/query_msg.json');
+const executeMsgData = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const approvalResponseData = getLegacyFixture('basic', '/approval_response.json');
+const allNftInfoResponseData = getLegacyFixture('basic', '/all_nft_info_response.json');
+const approvalsResponseData = getLegacyFixture('basic', '/approvals_response.json');
+const collectionInfoResponseData = getLegacyFixture('basic', '/collection_info_response.json');
+const contractInfoResponseData = getLegacyFixture('basic', '/contract_info_response.json');
+const instantiateMsgData = getLegacyFixture('basic', '/instantiate_msg.json');
+const nftInfoResponseData = getLegacyFixture('basic', '/nft_info_response.json');
+const numTokensResponseData = getLegacyFixture('basic', '/num_tokens_response.json');
+const operatorsResponseData = getLegacyFixture('basic', '/operators_response.json');
+const ownerOfResponseData = getLegacyFixture('basic', '/owner_of_response.json');
+const tokensResponseData = getLegacyFixture('basic', '/tokens_response.json');
 
-import { expectCode, makeContext } from '../../../test-utils';
 
 it('approval_response', () => {
-  const ctx = makeContext(approval_response);
+  const ctx = makeContext(approvalResponseData);
   expectCode(createTypeInterface(
     ctx,
-    approval_response
+    approvalResponseData
   ))
 });
 
 it('all_nft_info_response', () => {
-  const ctx = makeContext(all_nft_info_response);
+  const ctx = makeContext(allNftInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
-    all_nft_info_response
+    allNftInfoResponseData
   ))
 })
 it('approvals_response', () => {
-  const ctx = makeContext(approvals_response);
+  const ctx = makeContext(approvalsResponseData);
   expectCode(createTypeInterface(
     ctx,
-    approvals_response
+    approvalsResponseData
   ))
 })
 it('collection_info_response', () => {
-  const ctx = makeContext(collection_info_response);
+  const ctx = makeContext(collectionInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
-    collection_info_response
+    collectionInfoResponseData
   ))
 })
 it('contract_info_response', () => {
-  const ctx = makeContext(contract_info_response);
+  const ctx = makeContext(contractInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
-    contract_info_response
+    contractInfoResponseData
   ))
 })
 it('instantiate_msg', () => {
-  const ctx = makeContext(instantiate_msg);
+  const ctx = makeContext(instantiateMsgData);
   expectCode(createTypeInterface(
     ctx,
-    instantiate_msg
+    instantiateMsgData
   ))
 })
 it('nft_info_response', () => {
-  const ctx = makeContext(nft_info_response);
+  const ctx = makeContext(nftInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
-    nft_info_response
+    nftInfoResponseData
   ))
 })
 it('num_tokens_response', () => {
-  const ctx = makeContext(num_tokens_response);
+  const ctx = makeContext(numTokensResponseData);
   expectCode(createTypeInterface(
     ctx,
-    num_tokens_response
+    numTokensResponseData
   ))
 })
 it('operators_response', () => {
-  const ctx = makeContext(operators_response);
+  const ctx = makeContext(operatorsResponseData);
   expectCode(createTypeInterface(
     ctx,
-    operators_response
+    operatorsResponseData
   ))
 })
 it('owner_of_response', () => {
-  const ctx = makeContext(owner_of_response);
+  const ctx = makeContext(ownerOfResponseData);
   expectCode(createTypeInterface(
     ctx,
-    owner_of_response
+    ownerOfResponseData
   ))
 })
 it('tokens_response', () => {
-  const ctx = makeContext(tokens_response);
+  const ctx = makeContext(tokensResponseData);
   expectCode(createTypeInterface(
     ctx,
-    tokens_response
+    tokensResponseData
   ))
 })
 
 it('query classes', () => {
-  const ctx = makeContext(query_msg);
+  const ctx = makeContext(queryMsgData);
   expectCode(createQueryClass(
     ctx,
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
-    query_msg
+    queryMsgData
   ))
 });
 
 it('execute classes', () => {
-  const ctx = makeContext(execute_msg);
+  const ctx = makeContext(executeMsgData);
   expectCode(createExecuteClass(
     ctx,
     'SG721Client',
     'SG721Instance',
     'SG721QueryClient',
-    execute_msg
+    executeMsgData
   ))
 });
 
 it('execute classes no extends', () => {
-  const ctx = makeContext(execute_msg);
+  const ctx = makeContext(executeMsgData);
   expectCode(createExecuteClass(
     ctx,
     'SG721Client',
     'SG721Instance',
     null,
-    execute_msg
+    executeMsgData
   ))
 });
 
 it('execute classes array types', () => {
-  const ctx = makeContext(execute_msg_named_groups);
+  const ctx = makeContext(daodaoCwNamedGroupsExecuteMsg);
   expectCode(createExecuteClass(
     ctx,
     'SG721Client',
     'SG721Instance',
     null,
-    execute_msg_named_groups
+    daodaoCwNamedGroupsExecuteMsg
   ))
 });
 
 it('execute interfaces no extends', () => {
-  const ctx = makeContext(execute_msg);
+  const ctx = makeContext(executeMsgData);
   expectCode(createExecuteInterface(
     ctx,
     'SG721Instance',
     null,
-    execute_msg
+    executeMsgData
   ))
 });
 
 it('query interfaces', () => {
-  const ctx = makeContext(query_msg);
+  const ctx = makeContext(queryMsgData);
   expectCode(createQueryInterface(
     ctx,
     'SG721ReadOnlyInstance',
-    query_msg
+    queryMsgData
   ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.vectis.test.ts b/packages/ast/__tests__/client/ts-client.vectis.test.ts
index 8c15859a..af42914e 100644
--- a/packages/ast/__tests__/client/ts-client.vectis.test.ts
+++ b/packages/ast/__tests__/client/ts-client.vectis.test.ts
@@ -1,17 +1,10 @@
 import {
   expectCode,
+  getLegacyFixture,
   makeContext,
 } from '../../test-utils';
 
-import {
-  vectisCanExecuteRelayResponse,
-  vectisCosmosMsgForEmpty,
-  vectisExecuteMsgForEmpty,
-  vectisInfoResponse,
-  vectisRelayTransaction
-} from '../../test-utils/fixtures';
-
-import { ExecuteMsg } from '../../src';
+import { ExecuteMsg } from '@cosmology/ts-codegen-types';
 
 import {
   createExecuteClass,
@@ -20,6 +13,12 @@ import {
   createTypeInterface
 } from '../../src';
 
+const vectisCanExecuteRelayResponse = getLegacyFixture('vectis/govec', '/can_execute_relay_response.json');
+const vectisCosmosMsgForEmpty = getLegacyFixture('vectis/govec', '/cosmos_msg_for__empty.json');
+const vectisExecuteMsgForEmpty = getLegacyFixture('vectis/govec', '/execute_msg_for__empty.json');
+const vectisInfoResponse = getLegacyFixture('vectis/govec', '/info_response.json');
+const vectisRelayTransaction = getLegacyFixture('vectis/govec', '/relay_transaction.json');
+
 it('cosmos_msg_for__empty', () => {
   const ctx = makeContext(vectisCosmosMsgForEmpty);
   expectCode(createTypeInterface(ctx, vectisCosmosMsgForEmpty));
diff --git a/packages/ast/__tests__/client/ts-client.wager.test.ts b/packages/ast/__tests__/client/ts-client.wager.test.ts
index aa43f26b..db1d3562 100644
--- a/packages/ast/__tests__/client/ts-client.wager.test.ts
+++ b/packages/ast/__tests__/client/ts-client.wager.test.ts
@@ -1,11 +1,12 @@
-import wagerJson from '../../../../../__fixtures__/wager/cw-wager.json';
 import {
     createQueryClass,
     createExecuteClass,
-    createExecuteInterface,
     createTypeInterface
-} from '../client'
-import { expectCode, makeContext } from '../../../test-utils';
+} from '../../src'
+import { expectCode, globIdlBasedContracts, makeContext } from '../../test-utils';
+
+const globbed = globIdlBasedContracts('wager').find(c => c.name === '/cw-wager.json')!;
+const wagerJson = globbed.content;
 
 const queryCtx = makeContext(wagerJson.query);
 const executeCtx = makeContext(wagerJson.execute);
@@ -42,22 +43,3 @@ it('execute classes', () => {
         wagerJson.execute
     ))
 });
-
-// it('execute classes array types', () => {
-//     expectCode(createExecuteClass(
-//         ctx,
-//         'SG721Client',
-//         'SG721Instance',
-//         null,
-//         wagerJson
-//     ))
-// });
-
-// it('execute interfaces no extends', () => {
-//     expectCode(createExecuteInterface(
-//         ctx,
-//         'SG721Instance',
-//         null,
-//         wagerJson
-//     ))
-// });
diff --git a/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap b/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
index 7cd08cb3..b9daf0fd 100644
--- a/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
+++ b/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
@@ -7,7 +7,7 @@ exports[`execute class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     transfer_nft: unknown;
-  }>[\\"transfer_nft\\"]>): ExecuteMsg_for_Empty => {
+  }>["transfer_nft"]>): ExecuteMsg_for_Empty => {
     return {
       transfer_nft: ({
         recipient,
@@ -21,7 +21,7 @@ exports[`execute class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     send_nft: unknown;
-  }>[\\"send_nft\\"]>): ExecuteMsg_for_Empty => {
+  }>["send_nft"]>): ExecuteMsg_for_Empty => {
     return {
       send_nft: ({
         contract,
@@ -36,7 +36,7 @@ exports[`execute class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     approve: unknown;
-  }>[\\"approve\\"]>): ExecuteMsg_for_Empty => {
+  }>["approve"]>): ExecuteMsg_for_Empty => {
     return {
       approve: ({
         expires,
@@ -50,7 +50,7 @@ exports[`execute class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     revoke: unknown;
-  }>[\\"revoke\\"]>): ExecuteMsg_for_Empty => {
+  }>["revoke"]>): ExecuteMsg_for_Empty => {
     return {
       revoke: ({
         spender,
@@ -63,7 +63,7 @@ exports[`execute class 1`] = `
     operator
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     approve_all: unknown;
-  }>[\\"approve_all\\"]>): ExecuteMsg_for_Empty => {
+  }>["approve_all"]>): ExecuteMsg_for_Empty => {
     return {
       approve_all: ({
         expires,
@@ -75,7 +75,7 @@ exports[`execute class 1`] = `
     operator
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     revoke_all: unknown;
-  }>[\\"revoke_all\\"]>): ExecuteMsg_for_Empty => {
+  }>["revoke_all"]>): ExecuteMsg_for_Empty => {
     return {
       revoke_all: ({
         operator
@@ -89,7 +89,7 @@ exports[`execute class 1`] = `
     tokenUri
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     mint: unknown;
-  }>[\\"mint\\"]>): ExecuteMsg_for_Empty => {
+  }>["mint"]>): ExecuteMsg_for_Empty => {
     return {
       mint: ({
         extension,
@@ -103,7 +103,7 @@ exports[`execute class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<ExecuteMsg_for_Empty, {
     burn: unknown;
-  }>[\\"burn\\"]>): ExecuteMsg_for_Empty => {
+  }>["burn"]>): ExecuteMsg_for_Empty => {
     return {
       burn: ({
         token_id: tokenId
@@ -119,7 +119,7 @@ exports[`ownership 1`] = `
     newFactory
   }: CamelCasedProperties<Extract<ExecuteMsg, {
     set_factory: unknown;
-  }>[\\"set_factory\\"]>): ExecuteMsg => {
+  }>["set_factory"]>): ExecuteMsg => {
     return {
       set_factory: ({
         new_factory: newFactory
@@ -141,7 +141,7 @@ exports[`query class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<QueryMsg, {
     owner_of: unknown;
-  }>[\\"owner_of\\"]>): QueryMsg => {
+  }>["owner_of"]>): QueryMsg => {
     return {
       owner_of: ({
         include_expired: includeExpired,
@@ -155,7 +155,7 @@ exports[`query class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<QueryMsg, {
     approval: unknown;
-  }>[\\"approval\\"]>): QueryMsg => {
+  }>["approval"]>): QueryMsg => {
     return {
       approval: ({
         include_expired: includeExpired,
@@ -169,7 +169,7 @@ exports[`query class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<QueryMsg, {
     approvals: unknown;
-  }>[\\"approvals\\"]>): QueryMsg => {
+  }>["approvals"]>): QueryMsg => {
     return {
       approvals: ({
         include_expired: includeExpired,
@@ -184,7 +184,7 @@ exports[`query class 1`] = `
     startAfter
   }: CamelCasedProperties<Extract<QueryMsg, {
     all_operators: unknown;
-  }>[\\"all_operators\\"]>): QueryMsg => {
+  }>["all_operators"]>): QueryMsg => {
     return {
       all_operators: ({
         include_expired: includeExpired,
@@ -208,7 +208,7 @@ exports[`query class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<QueryMsg, {
     nft_info: unknown;
-  }>[\\"nft_info\\"]>): QueryMsg => {
+  }>["nft_info"]>): QueryMsg => {
     return {
       nft_info: ({
         token_id: tokenId
@@ -220,7 +220,7 @@ exports[`query class 1`] = `
     tokenId
   }: CamelCasedProperties<Extract<QueryMsg, {
     all_nft_info: unknown;
-  }>[\\"all_nft_info\\"]>): QueryMsg => {
+  }>["all_nft_info"]>): QueryMsg => {
     return {
       all_nft_info: ({
         include_expired: includeExpired,
@@ -234,7 +234,7 @@ exports[`query class 1`] = `
     startAfter
   }: CamelCasedProperties<Extract<QueryMsg, {
     tokens: unknown;
-  }>[\\"tokens\\"]>): QueryMsg => {
+  }>["tokens"]>): QueryMsg => {
     return {
       tokens: ({
         limit,
@@ -248,7 +248,7 @@ exports[`query class 1`] = `
     startAfter
   }: CamelCasedProperties<Extract<QueryMsg, {
     all_tokens: unknown;
-  }>[\\"all_tokens\\"]>): QueryMsg => {
+  }>["all_tokens"]>): QueryMsg => {
     return {
       all_tokens: ({
         limit,
diff --git a/packages/ast/__tests__/message-builder/message-builder.test.ts b/packages/ast/__tests__/message-builder/message-builder.test.ts
index ef0b4a0c..33f9a980 100644
--- a/packages/ast/__tests__/message-builder/message-builder.test.ts
+++ b/packages/ast/__tests__/message-builder/message-builder.test.ts
@@ -1,24 +1,26 @@
-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 {
   createMessageBuilderClass,
-} from './message-builder'
-import { expectCode, makeContext } from '../../test-utils';
+} from '../../src'
+import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+
+const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json')
+const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
+const ownership = getLegacyFixture('basic', '/ownership.json')
+
 
 it('execute class', () => {
-  const ctx = makeContext(execute_msg);
-  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', execute_msg))
+  const ctx = makeContext(execMsg);
+  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', execMsg))
 });
 
 
 it('query class', () => {
-  const ctx = makeContext(query_msg);
-  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', query_msg))
+  const ctx = makeContext(queryMsg);
+  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', queryMsg))
 });
 
 it('ownership', () => {
   const ctx = makeContext(ownership);
+  // @ts-ignore
   expectCode(createMessageBuilderClass(ctx, 'Ownership', ownership))
 });
diff --git a/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
index 2fdcb0a8..974d5993 100644
--- a/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
+++ b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
@@ -71,7 +71,6 @@ exports[`execute classes 1`] = `
 "export class SG721MessageComposer implements SG721Message {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -84,7 +83,6 @@ exports[`execute classes 1`] = `
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = ({
     recipient,
     tokenId
@@ -93,7 +91,7 @@ exports[`execute classes 1`] = `
     tokenId: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -117,7 +115,7 @@ exports[`execute classes 1`] = `
     tokenId: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -142,7 +140,7 @@ exports[`execute classes 1`] = `
     tokenId: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -165,7 +163,7 @@ exports[`execute classes 1`] = `
     tokenId: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -187,7 +185,7 @@ exports[`execute classes 1`] = `
     operator: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -207,7 +205,7 @@ exports[`execute classes 1`] = `
     operator: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -232,7 +230,7 @@ exports[`execute classes 1`] = `
     tokenUri?: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -254,7 +252,7 @@ exports[`execute classes 1`] = `
     tokenId: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -274,21 +272,19 @@ exports[`ownershipClass 1`] = `
 "export class OwnershipMessageComposer implements OwnershipMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.setFactory = this.setFactory.bind(this);
     this.updateOwnership = this.updateOwnership.bind(this);
   }
-
   setFactory = ({
     newFactory
   }: {
     newFactory: string;
   }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
@@ -303,7 +299,7 @@ exports[`ownershipClass 1`] = `
   };
   updateOwnership = (action: Action, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
-      typeUrl: \\"/cosmwasm.wasm.v1.MsgExecuteContract\\",
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
         sender: this.sender,
         contract: this.contractAddress,
diff --git a/packages/ast/__tests__/message-composer/message-composer.test.ts b/packages/ast/__tests__/message-composer/message-composer.test.ts
index e8a8f62b..66c3d3e0 100644
--- a/packages/ast/__tests__/message-composer/message-composer.test.ts
+++ b/packages/ast/__tests__/message-composer/message-composer.test.ts
@@ -1,29 +1,28 @@
-import execute_msg from "../../../../__fixtures__/basic/execute_msg_for__empty.json";
-import ownership from "../../../../__fixtures__/basic/ownership.json";
-
 import {
   createMessageComposerClass,
   createMessageComposerInterface,
-} from "./message-composer";
-import { expectCode, makeContext } from "../../test-utils";
-import * as t from "@babel/types";
-import { createReactQueryMutationHooks } from "../react-query";
+} from "../../src";
+import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, makeContext } from "../../test-utils";
+
+const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
+const ownership = getLegacyFixture('basic', '/ownership.json')
+
 
 it("execute classes", () => {
-  const ctx = makeContext(execute_msg);
+  const ctx = makeContext(execMsg);
   expectCode(
     createMessageComposerClass(
       ctx,
       "SG721MessageComposer",
       "SG721Message",
-      execute_msg
+      execMsg
     )
   );
 });
 
 it("createMessageComposerInterface", () => {
-  const ctx = makeContext(execute_msg);
-  expectCode(createMessageComposerInterface(ctx, "SG721Message", execute_msg));
+  const ctx = makeContext(execMsg);
+  expectCode(createMessageComposerInterface(ctx, "SG721Message", execMsg));
 });
 
 it("ownershipClass", () => {
@@ -33,6 +32,7 @@ it("ownershipClass", () => {
       ctx,
       "OwnershipMessageComposer",
       "OwnershipMessage",
+      // @ts-ignore
       ownership
     )
   );
@@ -41,6 +41,7 @@ it("ownershipClass", () => {
 it("ownershipInterface", () => {
   const ownershipCtx = makeContext(ownership);
   expectCode(
+    // @ts-ignore
     createMessageComposerInterface(ownershipCtx, "OwnershipMessage", ownership)
   );
 });
diff --git a/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap b/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
index 7520f8ff..3fb0645c 100644
--- a/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
+++ b/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
@@ -31,7 +31,6 @@ exports[`execute class 1`] = `
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, WhitelistClient, WhitelistQueryClient, WhitelistMessageComposer);
   }
-
 }"
 `;
 
@@ -44,6 +43,5 @@ exports[`execute class without message composer 1`] = `
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, WhitelistClient, WhitelistQueryClient, undefined);
   }
-
 }"
 `;
diff --git a/packages/ast/__tests__/provider/provider.test.ts b/packages/ast/__tests__/provider/provider.test.ts
index aca34848..3cf5568c 100644
--- a/packages/ast/__tests__/provider/provider.test.ts
+++ b/packages/ast/__tests__/provider/provider.test.ts
@@ -6,8 +6,20 @@ import {
 import { PROVIDER_TYPES } from '../../src/utils/constants';
 import { expectCode } from '../../test-utils';
 
+
+// Use 'typeof PROVIDER_TYPES[keyof typeof PROVIDER_TYPES]' to extract the values of PROVIDER_TYPES.
+type ProviderTypes = typeof PROVIDER_TYPES[keyof typeof PROVIDER_TYPES];
+interface TestProviderInfo {
+  classname: string;
+}
+
+// Use the values from PROVIDER_TYPES as the keys for TestProviderInfos
+type ProviderInfos = {
+  [key in ProviderTypes]: TestProviderInfo
+};
+
 it('execute class', () => {
-  const info = {};
+  const info: ProviderInfos = {} as ProviderInfos;
 
   info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
     classname: 'WhitelistClient'
@@ -21,11 +33,12 @@ it('execute class', () => {
     classname: 'WhitelistMessageComposer'
   };
 
+  // @ts-ignore
   expectCode(createProvider('Whitelist', info));
 });
 
 it('execute class without message composer', () => {
-  const info = {};
+  const info: ProviderInfos = {};
 
   info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
     classname: 'WhitelistClient'
@@ -35,14 +48,15 @@ it('execute class without message composer', () => {
     classname: 'WhitelistQueryClient'
   };
 
+  // @ts-ignore
   expectCode(createProvider('Whitelist', info));
 });
 
 it('create IContractsContext', () => {
-  const info = {
+  const info: any = {
     Whitelist: {},
     Marketplace: {}
-  };
+  }
 
   info['Whitelist'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
     classname: 'WhitelistClient'
@@ -60,7 +74,7 @@ it('create IContractsContext', () => {
 });
 
 it('create getProviders', () => {
-  const info = {
+  const info: any = {
     Whitelist: {},
     Marketplace: {}
   };
diff --git a/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
index 0da3f360..d327a9fb 100644
--- a/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
+++ b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
@@ -10,14 +10,14 @@ export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
 }: Sg721CollectionInfoQuery<TData>) {
-  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
+  return useQuery<CollectionInfoResponse, Error, TData>(["sg721CollectionInfo", client.contractAddress], () => client.collectionInfo(), options);
 }
 export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
 export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
 }: Sg721MinterQuery<TData>) {
-  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
+  return useQuery<MinterResponse, Error, TData>(["sg721Minter", client.contractAddress], () => client.minter(), options);
 }
 export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
@@ -30,7 +30,7 @@ export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   args,
   options
 }: Sg721AllTokensQuery<TData>) {
-  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+  return useQuery<AllTokensResponse, Error, TData>(["sg721AllTokens", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
@@ -47,7 +47,7 @@ export function useSg721TokensQuery<TData = TokensResponse>({
   args,
   options
 }: Sg721TokensQuery<TData>) {
-  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+  return useQuery<TokensResponse, Error, TData>(["sg721Tokens", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -64,7 +64,7 @@ export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   args,
   options
 }: Sg721AllNftInfoQuery<TData>) {
-  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, TData>(["sg721AllNftInfo", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -79,7 +79,7 @@ export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   args,
   options
 }: Sg721NftInfoQuery<TData>) {
-  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+  return useQuery<NftInfoResponse, Error, TData>(["sg721NftInfo", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
@@ -88,14 +88,14 @@ export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
 }: Sg721ContractInfoQuery<TData>) {
-  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
+  return useQuery<ContractInfoResponse, Error, TData>(["sg721ContractInfo", client.contractAddress], () => client.contractInfo(), options);
 }
 export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
 export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
 }: Sg721NumTokensQuery<TData>) {
-  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
+  return useQuery<NumTokensResponse, Error, TData>(["sg721NumTokens", client.contractAddress], () => client.numTokens(), options);
 }
 export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
@@ -110,7 +110,7 @@ export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   args,
   options
 }: Sg721AllOperatorsQuery<TData>) {
-  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, TData>(["sg721AllOperators", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -128,7 +128,7 @@ export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   args,
   options
 }: Sg721ApprovalsQuery<TData>) {
-  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+  return useQuery<ApprovalsResponse, Error, TData>(["sg721Approvals", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -145,7 +145,7 @@ export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   args,
   options
 }: Sg721ApprovalQuery<TData>) {
-  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
+  return useQuery<ApprovalResponse, Error, TData>(["sg721Approval", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -162,7 +162,7 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   args,
   options
 }: Sg721OwnerOfQuery<TData>) {
-  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, TData>(["sg721OwnerOf", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -179,7 +179,8 @@ export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
 }: Sg721CollectionInfoQuery<TData>) {
-  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<CollectionInfoResponse, Error, TData>(["sg721CollectionInfo", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -188,7 +189,8 @@ export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
 }: Sg721MinterQuery<TData>) {
-  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<MinterResponse, Error, TData>(["sg721Minter", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -203,10 +205,11 @@ export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   args,
   options
 }: Sg721AllTokensQuery<TData>) {
-  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
+  return useQuery<AllTokensResponse, Error, TData>(["sg721AllTokens", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -222,11 +225,12 @@ export function useSg721TokensQuery<TData = TokensResponse>({
   args,
   options
 }: Sg721TokensQuery<TData>) {
-  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
+  return useQuery<TokensResponse, Error, TData>(["sg721Tokens", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -241,10 +245,11 @@ export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   args,
   options
 }: Sg721AllNftInfoQuery<TData>) {
-  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, TData>(["sg721AllNftInfo", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -258,9 +263,10 @@ export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   args,
   options
 }: Sg721NftInfoQuery<TData>) {
-  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
+  return useQuery<NftInfoResponse, Error, TData>(["sg721NftInfo", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -269,7 +275,8 @@ export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
 }: Sg721ContractInfoQuery<TData>) {
-  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<ContractInfoResponse, Error, TData>(["sg721ContractInfo", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -278,7 +285,8 @@ export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
 }: Sg721NumTokensQuery<TData>) {
-  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<NumTokensResponse, Error, TData>(["sg721NumTokens", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -295,12 +303,13 @@ export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   args,
   options
 }: Sg721AllOperatorsQuery<TData>) {
-  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, TData>(["sg721AllOperators", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -315,10 +324,11 @@ export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   args,
   options
 }: Sg721ApprovalsQuery<TData>) {
-  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
+  return useQuery<ApprovalsResponse, Error, TData>(["sg721Approvals", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -334,11 +344,12 @@ export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   args,
   options
 }: Sg721ApprovalQuery<TData>) {
-  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
+  return useQuery<ApprovalResponse, Error, TData>(["sg721Approval", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -353,10 +364,11 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   args,
   options
 }: Sg721OwnerOfQuery<TData>) {
-  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, TData>(["sg721OwnerOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }"
@@ -365,7 +377,7 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
 exports[`createReactQueryHooks 3`] = `
 "export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient;
-  options?: Omit<UseQueryOptions<TResponse, Error, TData>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
 }
@@ -374,14 +386,14 @@ export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
 }: Sg721CollectionInfoQuery<TData>) {
-  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client.contractAddress], () => client.collectionInfo(), options);
+  return useQuery<CollectionInfoResponse, Error, TData>(["sg721CollectionInfo", client.contractAddress], () => client.collectionInfo(), options);
 }
 export interface Sg721MinterQuery<TData> extends Sg721ReactQuery<MinterResponse, TData> {}
 export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
 }: Sg721MinterQuery<TData>) {
-  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client.contractAddress], () => client.minter(), options);
+  return useQuery<MinterResponse, Error, TData>(["sg721Minter", client.contractAddress], () => client.minter(), options);
 }
 export interface Sg721AllTokensQuery<TData> extends Sg721ReactQuery<AllTokensResponse, TData> {
   args: {
@@ -394,7 +406,7 @@ export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   args,
   options
 }: Sg721AllTokensQuery<TData>) {
-  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
+  return useQuery<AllTokensResponse, Error, TData>(["sg721AllTokens", client.contractAddress, JSON.stringify(args)], () => client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
@@ -411,7 +423,7 @@ export function useSg721TokensQuery<TData = TokensResponse>({
   args,
   options
 }: Sg721TokensQuery<TData>) {
-  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client.contractAddress, JSON.stringify(args)], () => client.tokens({
+  return useQuery<TokensResponse, Error, TData>(["sg721Tokens", client.contractAddress, JSON.stringify(args)], () => client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
@@ -428,7 +440,7 @@ export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   args,
   options
 }: Sg721AllNftInfoQuery<TData>) {
-  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, TData>(["sg721AllNftInfo", client.contractAddress, JSON.stringify(args)], () => client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -443,7 +455,7 @@ export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   args,
   options
 }: Sg721NftInfoQuery<TData>) {
-  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
+  return useQuery<NftInfoResponse, Error, TData>(["sg721NftInfo", client.contractAddress, JSON.stringify(args)], () => client.nftInfo({
     tokenId: args.tokenId
   }), options);
 }
@@ -452,14 +464,14 @@ export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
 }: Sg721ContractInfoQuery<TData>) {
-  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client.contractAddress], () => client.contractInfo(), options);
+  return useQuery<ContractInfoResponse, Error, TData>(["sg721ContractInfo", client.contractAddress], () => client.contractInfo(), options);
 }
 export interface Sg721NumTokensQuery<TData> extends Sg721ReactQuery<NumTokensResponse, TData> {}
 export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
 }: Sg721NumTokensQuery<TData>) {
-  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client.contractAddress], () => client.numTokens(), options);
+  return useQuery<NumTokensResponse, Error, TData>(["sg721NumTokens", client.contractAddress], () => client.numTokens(), options);
 }
 export interface Sg721AllOperatorsQuery<TData> extends Sg721ReactQuery<AllOperatorsResponse, TData> {
   args: {
@@ -474,7 +486,7 @@ export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   args,
   options
 }: Sg721AllOperatorsQuery<TData>) {
-  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, TData>(["sg721AllOperators", client.contractAddress, JSON.stringify(args)], () => client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
@@ -492,7 +504,7 @@ export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   args,
   options
 }: Sg721ApprovalsQuery<TData>) {
-  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client.contractAddress, JSON.stringify(args)], () => client.approvals({
+  return useQuery<ApprovalsResponse, Error, TData>(["sg721Approvals", client.contractAddress, JSON.stringify(args)], () => client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -509,7 +521,7 @@ export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   args,
   options
 }: Sg721ApprovalQuery<TData>) {
-  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client.contractAddress, JSON.stringify(args)], () => client.approval({
+  return useQuery<ApprovalResponse, Error, TData>(["sg721Approval", client.contractAddress, JSON.stringify(args)], () => client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
@@ -526,7 +538,7 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   args,
   options
 }: Sg721OwnerOfQuery<TData>) {
-  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, TData>(["sg721OwnerOf", client.contractAddress, JSON.stringify(args)], () => client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
   }), options);
@@ -536,7 +548,7 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
 exports[`createReactQueryHooks 4`] = `
 "export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient | undefined;
-  options?: Omit<UseQueryOptions<TResponse, Error, TData>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
 }
@@ -545,7 +557,8 @@ export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
 }: Sg721CollectionInfoQuery<TData>) {
-  return useQuery<CollectionInfoResponse, Error, TData>([\\"sg721CollectionInfo\\", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<CollectionInfoResponse, Error, TData>(["sg721CollectionInfo", client?.contractAddress], () => client ? client.collectionInfo() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -554,7 +567,8 @@ export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
 }: Sg721MinterQuery<TData>) {
-  return useQuery<MinterResponse, Error, TData>([\\"sg721Minter\\", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<MinterResponse, Error, TData>(["sg721Minter", client?.contractAddress], () => client ? client.minter() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -569,10 +583,11 @@ export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   args,
   options
 }: Sg721AllTokensQuery<TData>) {
-  return useQuery<AllTokensResponse, Error, TData>([\\"sg721AllTokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
+  return useQuery<AllTokensResponse, Error, TData>(["sg721AllTokens", client?.contractAddress, JSON.stringify(args)], () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -588,11 +603,12 @@ export function useSg721TokensQuery<TData = TokensResponse>({
   args,
   options
 }: Sg721TokensQuery<TData>) {
-  return useQuery<TokensResponse, Error, TData>([\\"sg721Tokens\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
+  return useQuery<TokensResponse, Error, TData>(["sg721Tokens", client?.contractAddress, JSON.stringify(args)], () => client ? client.tokens({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -607,10 +623,11 @@ export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   args,
   options
 }: Sg721AllNftInfoQuery<TData>) {
-  return useQuery<AllNftInfoResponse, Error, TData>([\\"sg721AllNftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
+  return useQuery<AllNftInfoResponse, Error, TData>(["sg721AllNftInfo", client?.contractAddress, JSON.stringify(args)], () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -624,9 +641,10 @@ export function useSg721NftInfoQuery<TData = NftInfoResponse>({
   args,
   options
 }: Sg721NftInfoQuery<TData>) {
-  return useQuery<NftInfoResponse, Error, TData>([\\"sg721NftInfo\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
+  return useQuery<NftInfoResponse, Error, TData>(["sg721NftInfo", client?.contractAddress, JSON.stringify(args)], () => client ? client.nftInfo({
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -635,7 +653,8 @@ export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
 }: Sg721ContractInfoQuery<TData>) {
-  return useQuery<ContractInfoResponse, Error, TData>([\\"sg721ContractInfo\\", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<ContractInfoResponse, Error, TData>(["sg721ContractInfo", client?.contractAddress], () => client ? client.contractInfo() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -644,7 +663,8 @@ export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
 }: Sg721NumTokensQuery<TData>) {
-  return useQuery<NumTokensResponse, Error, TData>([\\"sg721NumTokens\\", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<NumTokensResponse, Error, TData>(["sg721NumTokens", client?.contractAddress], () => client ? client.numTokens() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -661,12 +681,13 @@ export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
   args,
   options
 }: Sg721AllOperatorsQuery<TData>) {
-  return useQuery<AllOperatorsResponse, Error, TData>([\\"sg721AllOperators\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
+  return useQuery<AllOperatorsResponse, Error, TData>(["sg721AllOperators", client?.contractAddress, JSON.stringify(args)], () => client ? client.allOperators({
     includeExpired: args.includeExpired,
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -681,10 +702,11 @@ export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   args,
   options
 }: Sg721ApprovalsQuery<TData>) {
-  return useQuery<ApprovalsResponse, Error, TData>([\\"sg721Approvals\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
+  return useQuery<ApprovalsResponse, Error, TData>(["sg721Approvals", client?.contractAddress, JSON.stringify(args)], () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -700,11 +722,12 @@ export function useSg721ApprovalQuery<TData = ApprovalResponse>({
   args,
   options
 }: Sg721ApprovalQuery<TData>) {
-  return useQuery<ApprovalResponse, Error, TData>([\\"sg721Approval\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
+  return useQuery<ApprovalResponse, Error, TData>(["sg721Approval", client?.contractAddress, JSON.stringify(args)], () => client ? client.approval({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -719,10 +742,11 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   args,
   options
 }: Sg721OwnerOfQuery<TData>) {
-  return useQuery<OwnerOfResponse, Error, TData>([\\"sg721OwnerOf\\", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
+  return useQuery<OwnerOfResponse, Error, TData>(["sg721OwnerOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }"
@@ -731,57 +755,70 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
 exports[`createReactQueryHooks 5`] = `
 "export const sg721QueryKeys = {
   contract: ([{
-    contract: \\"sg721\\"
+    contract: "sg721"
   }] as const),
-  address: (contractAddress: string | undefined) => ([{ ...sg721QueryKeys.contract[0],
+  address: (contractAddress: string | undefined) => ([{
+    ...sg721QueryKeys.contract[0],
     address: contractAddress
   }] as const),
-  ownerOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"owner_of\\",
+  ownerOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "owner_of",
     args
   }] as const),
-  approval: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"approval\\",
+  approval: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "approval",
     args
   }] as const),
-  approvals: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"approvals\\",
+  approvals: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "approvals",
     args
   }] as const),
-  allOperators: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"all_operators\\",
+  allOperators: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "all_operators",
     args
   }] as const),
-  numTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"num_tokens\\",
+  numTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "num_tokens",
     args
   }] as const),
-  contractInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"contract_info\\",
+  contractInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "contract_info",
     args
   }] as const),
-  nftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"nft_info\\",
+  nftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "nft_info",
     args
   }] as const),
-  allNftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"all_nft_info\\",
+  allNftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "all_nft_info",
     args
   }] as const),
-  tokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"tokens\\",
+  tokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "tokens",
     args
   }] as const),
-  allTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"all_tokens\\",
+  allTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "all_tokens",
     args
   }] as const),
-  minter: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"minter\\",
+  minter: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "minter",
     args
   }] as const),
-  collectionInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...sg721QueryKeys.address(contractAddress)[0],
-    method: \\"collection_info\\",
+  collectionInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...sg721QueryKeys.address(contractAddress)[0],
+    method: "collection_info",
     args
   }] as const)
 };
@@ -795,7 +832,7 @@ export const sg721Queries = {
     queryFn: () => client ? client.ownerOf({
       includeExpired: args.includeExpired,
       tokenId: args.tokenId
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -809,7 +846,7 @@ export const sg721Queries = {
       includeExpired: args.includeExpired,
       spender: args.spender,
       tokenId: args.tokenId
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -822,7 +859,7 @@ export const sg721Queries = {
     queryFn: () => client ? client.approvals({
       includeExpired: args.includeExpired,
       tokenId: args.tokenId
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -837,7 +874,7 @@ export const sg721Queries = {
       limit: args.limit,
       owner: args.owner,
       startAfter: args.startAfter
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -846,7 +883,7 @@ export const sg721Queries = {
     options
   }: Sg721NumTokensQuery<TData>): UseQueryOptions<NumTokensResponse, Error, TData> => ({
     queryKey: sg721QueryKeys.numTokens(client?.contractAddress),
-    queryFn: () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")),
+    queryFn: () => client ? client.numTokens() : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -855,7 +892,7 @@ export const sg721Queries = {
     options
   }: Sg721ContractInfoQuery<TData>): UseQueryOptions<ContractInfoResponse, Error, TData> => ({
     queryKey: sg721QueryKeys.contractInfo(client?.contractAddress),
-    queryFn: () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")),
+    queryFn: () => client ? client.contractInfo() : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -867,7 +904,7 @@ export const sg721Queries = {
     queryKey: sg721QueryKeys.nftInfo(client?.contractAddress, args),
     queryFn: () => client ? client.nftInfo({
       tokenId: args.tokenId
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -880,7 +917,7 @@ export const sg721Queries = {
     queryFn: () => client ? client.allNftInfo({
       includeExpired: args.includeExpired,
       tokenId: args.tokenId
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -894,7 +931,7 @@ export const sg721Queries = {
       limit: args.limit,
       owner: args.owner,
       startAfter: args.startAfter
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -907,7 +944,7 @@ export const sg721Queries = {
     queryFn: () => client ? client.allTokens({
       limit: args.limit,
       startAfter: args.startAfter
-    }) : Promise.reject(new Error(\\"Invalid client\\")),
+    }) : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -916,7 +953,7 @@ export const sg721Queries = {
     options
   }: Sg721MinterQuery<TData>): UseQueryOptions<MinterResponse, Error, TData> => ({
     queryKey: sg721QueryKeys.minter(client?.contractAddress),
-    queryFn: () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")),
+    queryFn: () => client ? client.minter() : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   }),
@@ -925,14 +962,14 @@ export const sg721Queries = {
     options
   }: Sg721CollectionInfoQuery<TData>): UseQueryOptions<CollectionInfoResponse, Error, TData> => ({
     queryKey: sg721QueryKeys.collectionInfo(client?.contractAddress),
-    queryFn: () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")),
+    queryFn: () => client ? client.collectionInfo() : Promise.reject(new Error("Invalid client")),
     ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   })
 };
 export interface Sg721ReactQuery<TResponse, TData = TResponse> {
   client: Sg721QueryClient | undefined;
-  options?: Omit<UseQueryOptions<TResponse, Error, TData>, \\"'queryKey' | 'queryFn' | 'initialData'\\"> & {
+  options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
 }
@@ -941,7 +978,8 @@ export function useSg721CollectionInfoQuery<TData = CollectionInfoResponse>({
   client,
   options
 }: Sg721CollectionInfoQuery<TData>) {
-  return useQuery<CollectionInfoResponse, Error, TData>(sg721QueryKeys.collectionInfo(client?.contractAddress), () => client ? client.collectionInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<CollectionInfoResponse, Error, TData>(sg721QueryKeys.collectionInfo(client?.contractAddress), () => client ? client.collectionInfo() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -950,7 +988,8 @@ export function useSg721MinterQuery<TData = MinterResponse>({
   client,
   options
 }: Sg721MinterQuery<TData>) {
-  return useQuery<MinterResponse, Error, TData>(sg721QueryKeys.minter(client?.contractAddress), () => client ? client.minter() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<MinterResponse, Error, TData>(sg721QueryKeys.minter(client?.contractAddress), () => client ? client.minter() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -968,7 +1007,8 @@ export function useSg721AllTokensQuery<TData = AllTokensResponse>({
   return useQuery<AllTokensResponse, Error, TData>(sg721QueryKeys.allTokens(client?.contractAddress, args), () => client ? client.allTokens({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -988,7 +1028,8 @@ export function useSg721TokensQuery<TData = TokensResponse>({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1006,7 +1047,8 @@ export function useSg721AllNftInfoQuery<TData = AllNftInfoResponse>({
   return useQuery<AllNftInfoResponse, Error, TData>(sg721QueryKeys.allNftInfo(client?.contractAddress, args), () => client ? client.allNftInfo({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1022,7 +1064,8 @@ export function useSg721NftInfoQuery<TData = NftInfoResponse>({
 }: Sg721NftInfoQuery<TData>) {
   return useQuery<NftInfoResponse, Error, TData>(sg721QueryKeys.nftInfo(client?.contractAddress, args), () => client ? client.nftInfo({
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1031,7 +1074,8 @@ export function useSg721ContractInfoQuery<TData = ContractInfoResponse>({
   client,
   options
 }: Sg721ContractInfoQuery<TData>) {
-  return useQuery<ContractInfoResponse, Error, TData>(sg721QueryKeys.contractInfo(client?.contractAddress), () => client ? client.contractInfo() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<ContractInfoResponse, Error, TData>(sg721QueryKeys.contractInfo(client?.contractAddress), () => client ? client.contractInfo() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1040,7 +1084,8 @@ export function useSg721NumTokensQuery<TData = NumTokensResponse>({
   client,
   options
 }: Sg721NumTokensQuery<TData>) {
-  return useQuery<NumTokensResponse, Error, TData>(sg721QueryKeys.numTokens(client?.contractAddress), () => client ? client.numTokens() : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  return useQuery<NumTokensResponse, Error, TData>(sg721QueryKeys.numTokens(client?.contractAddress), () => client ? client.numTokens() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1062,7 +1107,8 @@ export function useSg721AllOperatorsQuery<TData = AllOperatorsResponse>({
     limit: args.limit,
     owner: args.owner,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1080,7 +1126,8 @@ export function useSg721ApprovalsQuery<TData = ApprovalsResponse>({
   return useQuery<ApprovalsResponse, Error, TData>(sg721QueryKeys.approvals(client?.contractAddress, args), () => client ? client.approvals({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1100,7 +1147,8 @@ export function useSg721ApprovalQuery<TData = ApprovalResponse>({
     includeExpired: args.includeExpired,
     spender: args.spender,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -1118,7 +1166,8 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
   return useQuery<OwnerOfResponse, Error, TData>(sg721QueryKeys.ownerOf(client?.contractAddress, args), () => client ? client.ownerOf({
     includeExpired: args.includeExpired,
     tokenId: args.tokenId
-  }) : Promise.reject(new Error(\\"Invalid client\\")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }"
@@ -1131,12 +1180,12 @@ exports[`createReactQueryHooks 6`] = `
     tokenId: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721BurnMutation>, \\"mutationFn\\">) {
+export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721BurnMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721BurnMutation>(({
     client,
     msg,
@@ -1156,12 +1205,12 @@ export interface Sg721MintMutation {
     tokenUri?: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721MintMutation>, \\"mutationFn\\">) {
+export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721MintMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721MintMutation>(({
     client,
     msg,
@@ -1178,12 +1227,12 @@ export interface Sg721RevokeAllMutation {
     operator: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeAllMutation>, \\"mutationFn\\">) {
+export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeAllMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721RevokeAllMutation>(({
     client,
     msg,
@@ -1201,12 +1250,12 @@ export interface Sg721ApproveAllMutation {
     operator: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveAllMutation>, \\"mutationFn\\">) {
+export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveAllMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721ApproveAllMutation>(({
     client,
     msg,
@@ -1224,12 +1273,12 @@ export interface Sg721RevokeMutation {
     tokenId: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeMutation>, \\"mutationFn\\">) {
+export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721RevokeMutation>(({
     client,
     msg,
@@ -1248,12 +1297,12 @@ export interface Sg721ApproveMutation {
     tokenId: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveMutation>, \\"mutationFn\\">) {
+export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721ApproveMutation>(({
     client,
     msg,
@@ -1272,12 +1321,12 @@ export interface Sg721SendNftMutation {
     tokenId: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721SendNftMutation>, \\"mutationFn\\">) {
+export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721SendNftMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721SendNftMutation>(({
     client,
     msg,
@@ -1295,12 +1344,12 @@ export interface Sg721TransferNftMutation {
     tokenId: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721TransferNftMutation>, \\"mutationFn\\">) {
+export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721TransferNftMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, Sg721TransferNftMutation>(({
     client,
     msg,
@@ -1318,12 +1367,12 @@ exports[`ownership 1`] = `
   client: OwnershipClient;
   msg: Action;
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>, \\"mutationFn\\">) {
+export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>(({
     client,
     msg,
@@ -1340,12 +1389,12 @@ export interface OwnershipSetFactoryMutation {
     newFactory: string;
   };
   args?: {
-    fee?: number | StdFee | \\"auto\\";
+    fee?: number | StdFee | "auto";
     memo?: string;
     funds?: Coin[];
   };
 }
-export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipSetFactoryMutation>, \\"mutationFn\\">) {
+export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipSetFactoryMutation>, "mutationFn">) {
   return useMutation<ExecuteResult, Error, OwnershipSetFactoryMutation>(({
     client,
     msg,
diff --git a/packages/ast/__tests__/react-query/react-query.test.ts b/packages/ast/__tests__/react-query/react-query.test.ts
index bad63977..8a998e1c 100644
--- a/packages/ast/__tests__/react-query/react-query.test.ts
+++ b/packages/ast/__tests__/react-query/react-query.test.ts
@@ -1,25 +1,25 @@
 import * as t from '@babel/types';
-import query_msg from '../../../../__fixtures__/basic/query_msg.json';
-import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
-import ownership from '../../../../__fixtures__/basic/ownership.json';
-
-
 import {
   createReactQueryHooks,
   createReactQueryMutationHooks,
-} from './react-query'
-import { expectCode, makeContext } from '../../test-utils';
+} from '../../src'
+import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, globLegacyContracts, makeContext } from '../../test-utils';
+
+const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json')
+const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
+const ownership = getLegacyFixture('basic', '/ownership.json')
+
 
 it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: makeContext(query_msg, {
+        context: makeContext(queryMsg, {
           reactQuery: {
             version: 'v3',
           }
         }),
-        queryMsg: query_msg,
+        queryMsg: queryMsg,
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
@@ -27,13 +27,13 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: makeContext(query_msg, {
+        context: makeContext(queryMsg, {
           reactQuery: {
             version: 'v3',
             optionalClient: true
           }
         }),
-        queryMsg: query_msg,
+        queryMsg: queryMsg,
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
@@ -41,12 +41,12 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: makeContext(query_msg, {
+        context: makeContext(queryMsg, {
           reactQuery: {
             version: 'v4'
           }
         }),
-        queryMsg: query_msg,
+        queryMsg: queryMsg,
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
@@ -54,13 +54,13 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryHooks(
       {
-        context: makeContext(query_msg, {
+        context: makeContext(queryMsg, {
           reactQuery: {
             optionalClient: true,
             version: 'v4'
           }
         }),
-        queryMsg: query_msg,
+        queryMsg: queryMsg,
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
@@ -68,7 +68,7 @@ it('createReactQueryHooks', () => {
   expectCode(
     t.program(
       createReactQueryHooks({
-        context: makeContext(query_msg, {
+        context: makeContext(queryMsg, {
           reactQuery: {
             optionalClient: true,
             version: 'v4',
@@ -76,7 +76,7 @@ it('createReactQueryHooks', () => {
             queryFactory: true
           }
         }),
-        queryMsg: query_msg,
+        queryMsg: queryMsg,
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       })
@@ -85,12 +85,12 @@ it('createReactQueryHooks', () => {
   expectCode(t.program(
     createReactQueryMutationHooks(
       {
-        context: makeContext(execute_msg, {
+        context: makeContext(execMsg, {
           reactQuery: {
             version: 'v3'
           }
         }),
-        execMsg: execute_msg,
+        execMsg: execMsg,
         contractName: 'Sg721',
         ExecuteClient: 'Sg721Client',
       }
@@ -106,6 +106,7 @@ it('ownership', () => {
             version: 'v3'
           }
         }),
+        // @ts-ignore
         execMsg: ownership,
         contractName: 'Ownership',
         ExecuteClient: 'OwnershipClient',
diff --git a/packages/ast/__tests__/recoil/__snapshots__/recoil.test.ts.snap b/packages/ast/__tests__/recoil/__snapshots__/recoil.test.ts.snap
index 912fff3e..cb1f8052 100644
--- a/packages/ast/__tests__/recoil/__snapshots__/recoil.test.ts.snap
+++ b/packages/ast/__tests__/recoil/__snapshots__/recoil.test.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`client 1`] = `
 "export const queryClient = selectorFamily<SG721QueryClient, QueryClientParams>({
-  key: \\"sG721QueryClient\\",
+  key: "sG721QueryClient",
   get: ({
     contractAddress
   }) => ({
@@ -16,9 +16,9 @@ exports[`client 1`] = `
 
 exports[`selector 1`] = `
 "export const governanceModulesSelector = selectorFamily<GovernanceModulesResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"governanceModules\\"]>;
+  params: Parameters<SG721QueryClient["governanceModules"]>;
 }>({
-  key: \\"sG721GovernanceModules\\",
+  key: "sG721GovernanceModules",
   get: ({
     params,
     ...queryClientParams
@@ -33,9 +33,9 @@ exports[`selector 1`] = `
 
 exports[`selectors 1`] = `
 "export const ownerOfSelector = selectorFamily<OwnerOfResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"ownerOf\\"]>;
+  params: Parameters<SG721QueryClient["ownerOf"]>;
 }>({
-  key: \\"sG721OwnerOf\\",
+  key: "sG721OwnerOf",
   get: ({
     params,
     ...queryClientParams
@@ -47,9 +47,9 @@ exports[`selectors 1`] = `
   }
 });
 export const approvalSelector = selectorFamily<ApprovalResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"approval\\"]>;
+  params: Parameters<SG721QueryClient["approval"]>;
 }>({
-  key: \\"sG721Approval\\",
+  key: "sG721Approval",
   get: ({
     params,
     ...queryClientParams
@@ -61,9 +61,9 @@ export const approvalSelector = selectorFamily<ApprovalResponse, QueryClientPara
   }
 });
 export const approvalsSelector = selectorFamily<ApprovalsResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"approvals\\"]>;
+  params: Parameters<SG721QueryClient["approvals"]>;
 }>({
-  key: \\"sG721Approvals\\",
+  key: "sG721Approvals",
   get: ({
     params,
     ...queryClientParams
@@ -75,9 +75,9 @@ export const approvalsSelector = selectorFamily<ApprovalsResponse, QueryClientPa
   }
 });
 export const allOperatorsSelector = selectorFamily<AllOperatorsResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"allOperators\\"]>;
+  params: Parameters<SG721QueryClient["allOperators"]>;
 }>({
-  key: \\"sG721AllOperators\\",
+  key: "sG721AllOperators",
   get: ({
     params,
     ...queryClientParams
@@ -89,9 +89,9 @@ export const allOperatorsSelector = selectorFamily<AllOperatorsResponse, QueryCl
   }
 });
 export const numTokensSelector = selectorFamily<NumTokensResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"numTokens\\"]>;
+  params: Parameters<SG721QueryClient["numTokens"]>;
 }>({
-  key: \\"sG721NumTokens\\",
+  key: "sG721NumTokens",
   get: ({
     params,
     ...queryClientParams
@@ -103,9 +103,9 @@ export const numTokensSelector = selectorFamily<NumTokensResponse, QueryClientPa
   }
 });
 export const contractInfoSelector = selectorFamily<ContractInfoResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"contractInfo\\"]>;
+  params: Parameters<SG721QueryClient["contractInfo"]>;
 }>({
-  key: \\"sG721ContractInfo\\",
+  key: "sG721ContractInfo",
   get: ({
     params,
     ...queryClientParams
@@ -117,9 +117,9 @@ export const contractInfoSelector = selectorFamily<ContractInfoResponse, QueryCl
   }
 });
 export const nftInfoSelector = selectorFamily<NftInfoResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"nftInfo\\"]>;
+  params: Parameters<SG721QueryClient["nftInfo"]>;
 }>({
-  key: \\"sG721NftInfo\\",
+  key: "sG721NftInfo",
   get: ({
     params,
     ...queryClientParams
@@ -131,9 +131,9 @@ export const nftInfoSelector = selectorFamily<NftInfoResponse, QueryClientParams
   }
 });
 export const allNftInfoSelector = selectorFamily<AllNftInfoResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"allNftInfo\\"]>;
+  params: Parameters<SG721QueryClient["allNftInfo"]>;
 }>({
-  key: \\"sG721AllNftInfo\\",
+  key: "sG721AllNftInfo",
   get: ({
     params,
     ...queryClientParams
@@ -145,9 +145,9 @@ export const allNftInfoSelector = selectorFamily<AllNftInfoResponse, QueryClient
   }
 });
 export const tokensSelector = selectorFamily<TokensResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"tokens\\"]>;
+  params: Parameters<SG721QueryClient["tokens"]>;
 }>({
-  key: \\"sG721Tokens\\",
+  key: "sG721Tokens",
   get: ({
     params,
     ...queryClientParams
@@ -159,9 +159,9 @@ export const tokensSelector = selectorFamily<TokensResponse, QueryClientParams &
   }
 });
 export const allTokensSelector = selectorFamily<AllTokensResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"allTokens\\"]>;
+  params: Parameters<SG721QueryClient["allTokens"]>;
 }>({
-  key: \\"sG721AllTokens\\",
+  key: "sG721AllTokens",
   get: ({
     params,
     ...queryClientParams
@@ -173,9 +173,9 @@ export const allTokensSelector = selectorFamily<AllTokensResponse, QueryClientPa
   }
 });
 export const minterSelector = selectorFamily<MinterResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"minter\\"]>;
+  params: Parameters<SG721QueryClient["minter"]>;
 }>({
-  key: \\"sG721Minter\\",
+  key: "sG721Minter",
   get: ({
     params,
     ...queryClientParams
@@ -187,9 +187,9 @@ export const minterSelector = selectorFamily<MinterResponse, QueryClientParams &
   }
 });
 export const collectionInfoSelector = selectorFamily<CollectionInfoResponse, QueryClientParams & {
-  params: Parameters<SG721QueryClient[\\"collectionInfo\\"]>;
+  params: Parameters<SG721QueryClient["collectionInfo"]>;
 }>({
-  key: \\"sG721CollectionInfo\\",
+  key: "sG721CollectionInfo",
   get: ({
     params,
     ...queryClientParams
diff --git a/packages/ast/__tests__/recoil/recoil.test.ts b/packages/ast/__tests__/recoil/recoil.test.ts
index 8837ca94..430c1750 100644
--- a/packages/ast/__tests__/recoil/recoil.test.ts
+++ b/packages/ast/__tests__/recoil/recoil.test.ts
@@ -1,14 +1,16 @@
 import * as t from '@babel/types';
 
-import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import {
   createRecoilQueryClient,
   createRecoilSelector,
   createRecoilSelectors
 } from '../../src/recoil/recoil';
-import { expectCode, makeContext } from '../../test-utils';
+import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
+import { QueryMsg } from '@cosmology/ts-codegen-types';
 
-const ctx = makeContext(query_msg);
+const globbed = globLegacyContracts('basic').find(c => c.name === '/query_msg.json');
+const queryMsg = globbed.content as QueryMsg;
+const ctx = makeContext(queryMsg);
 
 it('selector', () => {
   expectCode(
@@ -25,7 +27,7 @@ it('selector', () => {
 it('selectors', () => {
   expectCode(
     t.program(
-      createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', query_msg)
+      createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', queryMsg)
     )
   );
 });
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index fb02a2e8..29c40c61 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -322,7 +322,7 @@ export const createExecuteClass = (
     );
   }
 
-  [].push.apply(blockStmt, [
+  blockStmt.push(...[
     // client/contract set
     t.expressionStatement(
       t.assignmentExpression(
diff --git a/packages/ast/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
index 97e5af67..5ff36814 100644
--- a/packages/ast/src/message-composer/message-composer.ts
+++ b/packages/ast/src/message-composer/message-composer.ts
@@ -142,7 +142,7 @@ export const createMessageComposerClass = (
 
   const blockStmt = [];
 
-  [].push.apply(blockStmt, [
+  blockStmt.push(...[
     t.expressionStatement(
       t.assignmentExpression(
         '=',
@@ -210,7 +210,7 @@ export const createMessageComposerInterface = (
     );
   });
 
-  const extendsAst = [];
+  const extendsAst: t.TSExpressionWithTypeArguments[] = [];
 
   return t.exportNamedDeclaration(
     t.tsInterfaceDeclaration(
diff --git a/packages/ast/test-utils/fixtures.ts b/packages/ast/test-utils/fixtures.ts
deleted file mode 100644
index c7769c0b..00000000
--- a/packages/ast/test-utils/fixtures.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// @ts-nocheck
-import { JSONSchema } from '../src/types';
-
-import canExecuteRelayResponseData from '../../../__fixtures__/vectis/govec/can_execute_relay_response.json';
-import cosmosMsgForEmptyData from '../../../__fixtures__/vectis/govec/cosmos_msg_for__empty.json';
-import executeMsgForEmptyData from '../../../__fixtures__/vectis/govec/execute_msg_for__empty.json';
-import infoResponseData from '../../../__fixtures__/vectis/govec/info_response.json';
-import relayTransactionData from '../../../__fixtures__/vectis/govec/relay_transaction.json';
-
-import nftIdlVersionData from '../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
-
-export const nftIdlVersion: JSONSchema = nftIdlVersionData;
-export const vectisCanExecuteRelayResponse: JSONSchema = canExecuteRelayResponseData;
-export const vectisCosmosMsgForEmpty: JSONSchema = cosmosMsgForEmptyData;
-export const vectisExecuteMsgForEmpty: JSONSchema = executeMsgForEmptyData;
-export const vectisInfoResponse: JSONSchema = infoResponseData;
-export const vectisRelayTransaction: JSONSchema = relayTransactionData;
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index 28b283da..aa6ad208 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -2,7 +2,7 @@ import generate from '@babel/generator';
 import { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { JSONSchema } from '../src/types';
+import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
 import { RenderContext, RenderOptions } from '../src/context';
 
 export const expectCode = (ast: any): void => {
@@ -28,15 +28,68 @@ export const makeContext = (
   }, options)
 };
 
-interface GlobContract {
+interface GlobContractLegacy {
   name: `/${string}.json`;
   content: JSONSchema;
 }
 
-export const globContracts = (p: string): GlobContract[] => {
+interface GlobContract {
+  name: `/${string}.json`;
+  content: IDLObject;
+}
+
+const fixtureDir = join(__dirname, '../../../__fixtures__');
+const globCache: Record<string, GlobContractLegacy[] | GlobContract[]> = {};
+
+export const globIdlBasedContracts = (p: string): GlobContract[] => {
+  if (globCache[p]) return globCache[p] as GlobContract[];
   // @ts-ignore
-  const contracts: GlobContract[] = glob(join(__dirname, '/../../../__fixtures__/', p, '/*.json')).map(file => {
-    return { name: file.split('__fixtures__')[1], content: JSON.parse(readFileSync(file, 'utf-8')) }
+  const contracts: GlobContract[] = glob(join(fixtureDir, p, '/*.json')).map(file => {
+    return {
+      name: file.split(join('__fixtures__', p))[1],
+      content: JSON.parse(readFileSync(file, 'utf-8'))
+    }
   });
+  globCache[p] = contracts;
   return contracts;
 };
+
+export const globLegacyContracts = (p: string): GlobContractLegacy[] => {
+  if (globCache[p]) return globCache[p] as GlobContractLegacy[];
+  // @ts-ignore
+  const contracts: GlobContractLegacy[] = glob(join(fixtureDir, p, '/*.json')).map(file => {
+    return {
+      name: file.split(join('__fixtures__', p))[1],
+      content: JSON.parse(readFileSync(file, 'utf-8'))
+    }
+  });
+  globCache[p] = contracts;
+  return contracts;
+};
+
+export const getMsgExecuteLegacyFixture = (
+  p: string,
+  name: `/${string}.json`
+): ExecuteMsg => {
+  const contracts = globLegacyContracts(p);
+  const contract = contracts.find(a => a.name === name);
+  return contract.content as ExecuteMsg;
+};
+
+export const getMsgQueryLegacyFixture = (
+  p: string,
+  name: `/${string}.json`
+): QueryMsg => {
+  const contracts = globLegacyContracts(p);
+  const contract = contracts.find(a => a.name === name);
+  return contract.content as QueryMsg;
+};
+
+export const getLegacyFixture = (
+  p: string,
+  name: `/${string}.json`
+): JSONSchema => {
+  const contracts = globLegacyContracts(p);
+  const contract = contracts.find(a => a.name === name);
+  return contract.content as JSONSchema;
+};
diff --git a/packages/types/src/idl.ts b/packages/types/src/idl.ts
index b619650f..5c48c3a6 100644
--- a/packages/types/src/idl.ts
+++ b/packages/types/src/idl.ts
@@ -1,4 +1,4 @@
-import { JSONSchema } from "./types";
+import { ExecuteMsg, JSONSchema, QueryMsg } from "./types";
 
 export interface KeyedSchema {
   [key: string]: JSONSchema;
@@ -8,9 +8,9 @@ export interface IDLObject {
   contract_version: string;
   idl_version: string;
   instantiate: JSONSchema;
-  execute: JSONSchema;
-  query: JSONSchema;
+  execute: ExecuteMsg;
+  query: QueryMsg;
   migrate: JSONSchema;
   sudo: JSONSchema;
   responses: KeyedSchema;
-}
+}
\ No newline at end of file

From 05043a04d5844f70dad2899f2cff5dc45e3fafc3 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 23:29:02 -0700
Subject: [PATCH 182/287] arrays

---
 __fixtures__/misc/schema/arrays-nested.json   |  31 +++
 .../misc/schema/arrays-top-level.json         |   5 +
 .../ts-client.account-nfts.test.ts.snap       |   6 +-
 .../ts-client.arrays-item-tuples.test.ts.snap |  93 ++++++++
 ...snap => ts-client.arrays-ref.test.ts.snap} |  60 +++---
 ....ts.snap => ts-client.arrays.test.ts.snap} |   8 +-
 .../ts-client.issues.test.ts.snap             |  20 +-
 .../ts-client.wager.test.ts.snap              |  14 +-
 .../ts-client.arrays-item-tuples.test.ts      |  42 ++++
 .../__snapshots__/interfaces.test.ts.snap     |  15 ++
 .../ast/__tests__/types/interfaces.test.ts    |  32 +++
 packages/ast/src/client/client.ts             |  28 ++-
 packages/ast/src/context/context.ts           |   2 +
 packages/ast/src/utils/types.ts               | 199 +++++++++---------
 packages/types/src/types.ts                   |   2 +-
 15 files changed, 388 insertions(+), 169 deletions(-)
 create mode 100644 __fixtures__/misc/schema/arrays-nested.json
 create mode 100644 __fixtures__/misc/schema/arrays-top-level.json
 create mode 100644 packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.arrays-ref.spec.ts.snap => ts-client.arrays-ref.test.ts.snap} (76%)
 rename packages/ast/__tests__/client/__snapshots__/{ts-client.arrays.spec.ts.snap => ts-client.arrays.test.ts.snap} (91%)
 create mode 100644 packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
 create mode 100644 packages/ast/__tests__/types/__snapshots__/interfaces.test.ts.snap
 create mode 100644 packages/ast/__tests__/types/interfaces.test.ts

diff --git a/__fixtures__/misc/schema/arrays-nested.json b/__fixtures__/misc/schema/arrays-nested.json
new file mode 100644
index 00000000..f0660bae
--- /dev/null
+++ b/__fixtures__/misc/schema/arrays-nested.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "description": "...",
+  "type": "object",
+  "properties": {
+    "prop1": {
+        "type": [
+            "array",
+            "null"
+        ],
+        "items": {
+            "type": [
+                "array",
+                "null"
+            ],
+            "items": [
+                {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                {
+                    "type": "string"
+                },
+                {
+                    "type": "number"
+                }
+            ]
+        }
+    }
+  }
+}
\ No newline at end of file
diff --git a/__fixtures__/misc/schema/arrays-top-level.json b/__fixtures__/misc/schema/arrays-top-level.json
new file mode 100644
index 00000000..45c99582
--- /dev/null
+++ b/__fixtures__/misc/schema/arrays-top-level.json
@@ -0,0 +1,5 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "description": "...",
+  "type": ["number", "string", "null"]
+}
\ No newline at end of file
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
index eca178c7..6b626799 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
@@ -49,7 +49,7 @@ exports[`execute classes array types 1`] = `
     startAfter
   }: {
     limit?: number;
-    startAfter?: [string, string][];
+    startAfter?: string[][];
   }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
@@ -219,7 +219,7 @@ exports[`execute interfaces no extends 1`] = `
     startAfter
   }: {
     limit?: number;
-    startAfter?: [string, string][];
+    startAfter?: string[][];
   }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   allPreviousOwners: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   ownerOf: ({
@@ -339,7 +339,7 @@ exports[`query classes 1`] = `
     startAfter
   }: {
     limit?: number;
-    startAfter?: [string, string][];
+    startAfter?: string[][];
   }): Promise<AllDebtSharesResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       all_debt_shares: {
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
new file mode 100644
index 00000000..f910883e
--- /dev/null
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
@@ -0,0 +1,93 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute classes array types 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.updateEdges = this.updateEdges.bind(this);
+  }
+  updateEdges = async ({
+    edges3,
+    edges2,
+    edges,
+    nested,
+    supernested
+  }: {
+    edges3?: number[][][];
+    edges2: number[][][];
+    edges: number[][];
+    nested: number[][][];
+    supernested: string[][][][][][];
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_edges: {
+        edges3,
+        edges2,
+        edges,
+        nested,
+        supernested
+      }
+    }, fee, memo, _funds);
+  };
+}"
+`;
+
+exports[`execute interfaces no extends 1`] = `
+"export interface SG721Instance {
+  contractAddress: string;
+  sender: string;
+  updateEdges: ({
+    edges3,
+    edges2,
+    edges,
+    nested,
+    supernested
+  }: {
+    edges3?: number[][][];
+    edges2: number[][][];
+    edges: number[][];
+    nested: number[][][];
+    supernested: string[][][][][][];
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+}"
+`;
+
+exports[`query classes 1`] = `
+"export class SG721QueryClient implements SG721ReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.updateEdges = this.updateEdges.bind(this);
+  }
+  updateEdges = async ({
+    edges3,
+    edges2,
+    edges,
+    nested,
+    supernested
+  }: {
+    edges3?: number[][][];
+    edges2: number[][][];
+    edges: number[][];
+    nested: number[][][];
+    supernested: string[][][][][][];
+  }): Promise<UpdateEdgesResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      update_edges: {
+        edges3,
+        edges2,
+        edges,
+        nested,
+        supernested
+      }
+    });
+  };
+}"
+`;
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
similarity index 76%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
index 14cfcf4c..990790e4 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
@@ -5,7 +5,6 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -25,14 +24,13 @@ exports[`execute classes array types 1`] = `
     this.createGraphFromFile = this.createGraphFromFile.bind(this);
     this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
   }
-
   createEdge = async ({
     amount,
     creditor
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -48,7 +46,7 @@ exports[`execute classes array types 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -61,7 +59,7 @@ exports[`execute classes array types 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -72,7 +70,7 @@ exports[`execute classes array types 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -85,7 +83,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -99,7 +97,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -111,7 +109,7 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -122,14 +120,14 @@ exports[`execute classes array types 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee, memo, _funds);
   };
-  findSavings = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee, memo, _funds);
@@ -138,14 +136,14 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee, memo, _funds);
   };
-  reset = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee, memo, _funds);
@@ -154,7 +152,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -165,7 +163,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -176,7 +174,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
@@ -196,7 +194,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editEdge: ({
     amount,
     creditor,
@@ -205,63 +203,63 @@ exports[`execute interfaces no extends 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  findSavings: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  reset: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -271,7 +269,6 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -290,7 +287,6 @@ exports[`query classes 1`] = `
     this.createGraphFromFile = this.createGraphFromFile.bind(this);
     this.applySetOffFromFile = this.applySetOffFromFile.bind(this);
   }
-
   createEdge = async ({
     amount,
     creditor
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
similarity index 91%
rename from packages/ast/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
rename to packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
index 6a8486b4..f9532ee9 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.spec.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
@@ -5,14 +5,12 @@ exports[`execute classes array types 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.updateEdges = this.updateEdges.bind(this);
   }
-
   updateEdges = async ({
     edges3,
     edges2,
@@ -25,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
@@ -55,7 +53,7 @@ exports[`execute interfaces no extends 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -67,13 +65,11 @@ exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.updateEdges = this.updateEdges.bind(this);
   }
-
   updateEdges = async ({
     edges3,
     edges2,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
index dce4a1c6..3e85c7fb 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
@@ -120,7 +120,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: [Addr, Addr, number][][];
+    graph: Addr[][];
     graphId: number;
   }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
@@ -134,7 +134,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: [Addr, Addr, number][][];
+    graph: Addr[][];
     graphId: number;
   }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
@@ -158,7 +158,7 @@ exports[`execute class /execute_msg.json 1`] = `
   updateEdges = async ({
     edges
   }: {
-    edges: [number, number][][];
+    edges: number[][];
   }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
@@ -437,14 +437,14 @@ exports[`execute interface /execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: [Addr, Addr, number][][];
+    graph: Addr[][];
     graphId: number;
   }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
-    graph: [Addr, Addr, number][][];
+    graph: Addr[][];
     graphId: number;
   }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
@@ -455,7 +455,7 @@ exports[`execute interface /execute_msg.json 1`] = `
   updateEdges: ({
     edges
   }: {
-    edges: [number, number][][];
+    edges: number[][];
   }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   findSavings: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
@@ -550,7 +550,7 @@ exports[`execute interface /query_msg.json 1`] = `
 exports[`execute_msg_for__empty /batch.json 1`] = `
 "export interface Batch {
   batchId: number;
-  setoffs: [number, number][][];
+  setoffs: number[][];
 }"
 `;
 
@@ -699,7 +699,7 @@ exports[`query classes /execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: [Addr, Addr, number][][];
+    graph: Addr[][];
     graphId: number;
   }): Promise<CreateGraphSimplifiedResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
@@ -713,7 +713,7 @@ exports[`query classes /execute_msg.json 1`] = `
     graph,
     graphId
   }: {
-    graph: [Addr, Addr, number][][];
+    graph: Addr[][];
     graphId: number;
   }): Promise<EditGraphSimplifiedResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
@@ -737,7 +737,7 @@ exports[`query classes /execute_msg.json 1`] = `
   updateEdges = async ({
     edges
   }: {
-    edges: [number, number][][];
+    edges: number[][];
   }): Promise<UpdateEdgesResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       update_edges: {
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
index c409351a..3bd71164 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
@@ -7,7 +7,6 @@ exports[`execute classes 1`] = `
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -17,12 +16,11 @@ exports[`execute classes 1`] = `
     this.wager = this.wager.bind(this);
     this.cancel = this.cancel.bind(this);
   }
-
   updateConfig = async ({
     params
   }: {
     params: ParamInfo;
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         params
@@ -37,7 +35,7 @@ exports[`execute classes 1`] = `
     currentPrices: number[][];
     prevPrices: number[][];
     wagerKey: Addr[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
         current_prices: currentPrices,
@@ -56,7 +54,7 @@ exports[`execute classes 1`] = `
     currency: Currency;
     expiry: number;
     token: Addr[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       wager: {
         against_currencies: againstCurrencies,
@@ -70,7 +68,7 @@ exports[`execute classes 1`] = `
     token
   }: {
     token: Addr[][];
-  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cancel: {
         token
@@ -102,7 +100,7 @@ exports[`query classes 1`] = `
   wager = async ({
     token
   }: {
-    token: [Addr, number][];
+    token: Addr[][];
   }): Promise<WagerResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       wager: {
@@ -113,7 +111,7 @@ exports[`query classes 1`] = `
   tokenStatus = async ({
     token
   }: {
-    token: [Addr, number][];
+    token: Addr[][];
   }): Promise<TokenStatusResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       token_status: {
diff --git a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
new file mode 100644
index 00000000..a322770a
--- /dev/null
+++ b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
@@ -0,0 +1,42 @@
+import {
+  createQueryClass,
+  createExecuteClass,
+  createExecuteInterface
+} from '../../src'
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
+const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
+const ctx = makeContext(queryMsg, {
+  types: {
+    itemsUseTuples: true
+  }
+});
+console.log(JSON.stringify(ctx, null, 2))
+
+it('query classes', () => {
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
+});
+
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
+});
+
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    execMsg
+  ))
+});
diff --git a/packages/ast/__tests__/types/__snapshots__/interfaces.test.ts.snap b/packages/ast/__tests__/types/__snapshots__/interfaces.test.ts.snap
new file mode 100644
index 00000000..0afaa211
--- /dev/null
+++ b/packages/ast/__tests__/types/__snapshots__/interfaces.test.ts.snap
@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`nested 1`] = `
+"export interface Type {
+  prop1?: number[][][];
+}"
+`;
+
+exports[`nested ctx 1`] = `
+"export interface Type {
+  prop1?: number[][][];
+}"
+`;
+
+exports[`top level 1`] = `"export type Type = number | string | null;"`;
diff --git a/packages/ast/__tests__/types/interfaces.test.ts b/packages/ast/__tests__/types/interfaces.test.ts
new file mode 100644
index 00000000..bb8eda6c
--- /dev/null
+++ b/packages/ast/__tests__/types/interfaces.test.ts
@@ -0,0 +1,32 @@
+import * as t from '@babel/types';
+
+import { expectCode, getLegacyFixture, makeContext } from '../../test-utils';
+import { createTypeOrInterface } from '../../src';
+
+const topLevel = getLegacyFixture('misc/schema', '/arrays-top-level.json');
+const nested = getLegacyFixture('misc/schema', '/arrays-nested.json');
+
+
+it('top level', async () => {
+  expectCode(
+    createTypeOrInterface(makeContext(topLevel), 'Type', topLevel)
+  );
+});
+
+it('nested', async () => {
+  const ctx = makeContext(nested);
+  expectCode(
+    createTypeOrInterface(ctx, 'Type', nested)
+  );
+});
+
+it('nested ctx', async () => {
+  const ctx = makeContext(nested, {
+    types: {
+      itemsUseTuples: true
+    }
+  });
+  expectCode(
+    createTypeOrInterface(ctx, 'Type', nested)
+  );
+});
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 29c40c61..d95654d0 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -9,7 +9,8 @@ import {
   getMessageProperties,
   OPTIONAL_FUNDS_PARAM,
   promiseTypeAnnotation,
-  typedIdentifier
+  typedIdentifier,
+  getTypeOrRef
 } from '../utils';
 
 import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
@@ -538,25 +539,33 @@ export const createTypeOrInterface = (
   Type: string,
   jsonschema: JSONSchema
 ) => {
+  // Handle non-object and potentially union or referenced types
   if (jsonschema.type !== 'object') {
     if (!jsonschema.type) {
-      return t.exportNamedDeclaration(
-        t.tsTypeAliasDeclaration(
-          t.identifier(Type),
-          null,
-          t.tsTypeReference(t.identifier(jsonschema.title))
-        )
-      );
+      if (jsonschema.title) {
+        return t.exportNamedDeclaration(
+          t.tsTypeAliasDeclaration(
+            t.identifier(Type),
+            null,
+            t.tsTypeReference(t.identifier(jsonschema.title))
+          )
+        );
+      } else {
+        throw new Error('Schema must have a type or title!');
+      }
     }
 
+    // Use getTypeOrRef to handle string, array of strings, or $ref
+    const typeAnnotation = getTypeOrRef(jsonschema);
     return t.exportNamedDeclaration(
       t.tsTypeAliasDeclaration(
         t.identifier(Type),
         null,
-        getType(jsonschema.type)
+        typeAnnotation
       )
     );
   }
+  // Handle object type schemas
   const props = Object.keys(jsonschema.properties ?? {}).map((prop) => {
     const { type, optional } = getPropertyType(context, jsonschema, prop);
     return propertySignature(camel(prop), t.tsTypeAnnotation(type), optional);
@@ -568,7 +577,6 @@ export const createTypeOrInterface = (
       null,
       [],
       t.tsInterfaceBody(
-        // @ts-ignore:next-line
         [...props]
       )
     )
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index d464c0e0..263bd4b4 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -32,6 +32,7 @@ export interface RecoilOptions {
 }
 export interface TSTypesOptions {
   enabled?: boolean;
+  itemsUseTuples?: boolean;
   // deprecated
   aliasExecuteMsg?: boolean;
   aliasEntryPoints?: boolean;
@@ -81,6 +82,7 @@ export const defaultOptions: RenderOptions = {
   enabled: true,
   types: {
     enabled: true,
+    itemsUseTuples: false,
     aliasExecuteMsg: false
   },
   client: {
diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index b88f59f1..c6fa68d6 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -34,53 +34,65 @@ const getArrayTypeFromRef = ($ref: string) => {
   );
 }
 
-const getTypeOrRef = (obj: JSONSchema): t.TSType => {
-  if (obj.type) {
-    return getType(obj.type)
-  }
+
+export const getTypeOrRef = (obj: JSONSchema): t.TSType => {
   if (obj.$ref) {
     return getTypeFromRef(obj.$ref);
+  } else if (typeof obj.type === 'string') {
+    return getType(obj.type);
+  } else if (Array.isArray(obj.type)) {
+    // Handle array of types by creating a union type
+    console.log(obj.type);
+    const types = obj.type.map(t => getType(t));
+    return t.tsUnionType(types);
+  } else {
+    throw new Error('Type definition not supported or missing: ' + JSON.stringify(obj));
   }
-  throw new Error('contact maintainers cannot find type for ' + obj)
-}
-
+};
 
-const getArrayTypeFromItems = (items: JSONSchema | JSONSchema[]): t.TSArrayType => {
+const getArrayTypeFromItems = (
+  context: RenderContext,
+  items: JSONSchema | JSONSchema[]
+): t.TSArrayType => {
   if (Array.isArray(items)) {
-    return t.tsArrayType(
-      t.tsTupleType(items.map(item => getTypeOrRef(item)))
-    );
-  } else if (items.type === 'array' && items.items) {
-    return t.tsArrayType(
-      getArrayTypeFromItems(items.items)
-    );
-  }
-
-  // passing in {"items": [{"type":"string"}]}
-  const detect = detectType(items.type);
+    // if (context.options.types.itemsUseTuples === true) {
+    // Using the modified method with tsTupleType
+    // return t.tsArrayType(
+    // t.tsTupleType(items.map(item => getTypeOrRef(item)))
+    // );
+    // } else {
+    // Using the original method with nested arrays
+    if (items.length > 0 && items[0].type === 'array') {
+      return getArrayTypeFromItems(context, items[0]);
+    }
+    return items.length > 0 ? t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0]))) : t.tsArrayType(t.tsArrayType(t.tsAnyKeyword()));
+    // }
+  } else {
+    const detect = detectType(items.type);
 
-  if (detect.type === 'array') {
-    if (Array.isArray(items.items)) {
-      return t.tsArrayType(
-        t.tsArrayType(
-          getTypeOrRef(items.items[0])
-        )
-      );
-    } else {
-      return t.tsArrayType(
-        getArrayTypeFromItems(
-          items.items
-        )
-      );
+    if (detect.type === 'array') {
+      if (Array.isArray(items.items)) {
+        return t.tsArrayType(
+          t.tsArrayType(
+            getTypeOrRef(items.items[0])
+          )
+        );
+      } else if (items.items) {
+        return t.tsArrayType(
+          getArrayTypeFromItems(context, items.items)
+        );
+      } else {
+        // Handle the case where items.items is undefined for array types
+        return t.tsArrayType(t.tsAnyKeyword())
+      }
     }
-  }
 
-  return t.tsArrayType(
-    getType(detect.type)
-  );
+    return t.tsArrayType(
+      getType(detect.type)
+    );
+  }
 };
 
-
 export const detectType = (type: string | string[]) => {
   let optional = false;
   let theType = '';
@@ -104,56 +116,52 @@ export const detectType = (type: string | string[]) => {
   };
 }
 
-export const getTypeInfo = (info: JSONSchema) => {
+export const getTypeInfo = (
+  context: RenderContext,
+  info: JSONSchema
+) => {
   let type = undefined;
   let optional = undefined;
 
+  // Handle nullable types using 'anyOf' schema
   if (Array.isArray(info.anyOf)) {
-    // assuming 2nd is null, but let's check to ensure
     if (info.anyOf.length !== 2) {
-      throw new Error('case not handled by transpiler. contact maintainers.')
+      throw new Error('case not handled by transpiler. contact maintainers.');
     }
     const [nullableType, nullType] = info.anyOf;
     if (nullType?.type !== 'null') {
-      throw new Error('[nullableType.type]: case not handled by transpiler. contact maintainers.')
+      throw new Error('[nullableType.type]: case not handled by transpiler. contact maintainers.');
     }
     if (!nullableType?.$ref) {
       if (nullableType.title) {
         type = t.tsTypeReference(t.identifier(nullableType.title));
       } else {
-        throw new Error('[nullableType.title] case not handled by transpiler. contact maintainers.')
+        throw new Error('[nullableType.title] case not handled by transpiler. contact maintainers.');
       }
     } else {
-      type = getTypeFromRef(nullableType?.$ref);
+      type = getTypeFromRef(nullableType.$ref);
     }
     optional = true;
-  }
-
-
-  if (typeof info.type === 'string') {
+  } else if (typeof info.type === 'string') {
+    console.log('is string')
+    // Process type when it's explicitly defined
     if (info.type === 'array') {
       if (typeof info.items === 'object' && !Array.isArray(info.items)) {
         if (info.items.$ref) {
           type = getArrayTypeFromRef(info.items.$ref);
         } else if (info.items.title) {
-          type = t.tsArrayType(
-            t.tsTypeReference(
-              t.identifier(info.items.title)
-            )
-          );
+          type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
         } else if (info.items.type) {
-          type = getArrayTypeFromItems(info.items);
+          type = getArrayTypeFromItems(context, info.items);
         } else {
-          throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
         }
+        // type = getArrayTypeFromItems(context, info.items);
       } else {
         if (Array.isArray(info.items)) {
-          type = getArrayTypeFromItems(info.items);
-          // console.log(typeof info.items === 'object');
-          // console.log(Array.isArray(info.items));
-          // console.log(info);
+          type = getArrayTypeFromItems(context, info.items);
         } else {
-          throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
         }
       }
     } else {
@@ -161,70 +169,53 @@ export const getTypeInfo = (info: JSONSchema) => {
       type = getType(detect.type);
       optional = detect.optional;
     }
-  }
-
-  if (Array.isArray(info.type)) {
-    // assuming 2nd is null, but let's check to ensure
+  } else if (Array.isArray(info.type)) {
+    console.log('is arr', info.type)
+    // Handle multiple types, typically nullable types
     if (info.type.length !== 2) {
-      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2))
+      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
     const [nullableType, nullType] = info.type;
     if (nullType !== 'null') {
-      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2))
+      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
 
     if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
-
       if (info.items.type) {
         const detect = detectType(info.items.type);
         if (detect.type === 'array') {
-          // wen recursion?
-          type = t.tsArrayType(
-            getArrayTypeFromItems(info.items)
-          );
+          console.log('items type')
+          type = t.tsArrayType(getArrayTypeFromItems(context, info.items));
         } else {
-          type = t.tsArrayType(
-            getType(detect.type)
-          );
+          type = t.tsArrayType(getType(detect.type));
         }
         optional = detect.optional;
       } else if (info.items.$ref) {
         type = getArrayTypeFromRef(info.items.$ref);
-        // } else if (info.items.title) {
-        //   type = t.tsArrayType(
-        //     t.tsTypeReference(
-        //       t.identifier(info.items.title)
-        //     )
-        //   );
       } else if (info.items.type) {
-        type = getArrayTypeFromItems(info.items);
+        type = getArrayTypeFromItems(context, info.items);
       } else {
-        throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
-
     } else {
       const detect = detectType(nullableType);
       optional = detect.optional;
       if (detect.type === 'array') {
-        type = getArrayTypeFromItems(
-          info.items
-        );
+        type = getArrayTypeFromItems(context, info.items);
       } else {
         type = getType(detect.type);
       }
-
     }
 
-    optional = true;
+    optional = true;  // Ensure optional is set for nullable types
   }
+  console.log({ type })
 
   return {
     type,
     optional
   };
-
-}
-
+};
 
 export const getType = (type: string) => {
   switch (type) {
@@ -234,6 +225,10 @@ export const getType = (type: string) => {
       return t.tSBooleanKeyword();
     case 'integer':
       return t.tsNumberKeyword();
+    case 'null':
+      return t.tsNullKeyword();
+    case 'number':
+      return t.tsNumberKeyword();
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
   }
@@ -258,11 +253,12 @@ export const getPropertyType = (
     type = getTypeFromRef(info.$ref)
   }
 
-  const typeInfo = getTypeInfo(info);
+  const typeInfo = getTypeInfo(context, info);
   if (typeof typeInfo.optional !== 'undefined') {
     optional = typeInfo.optional;
   }
   if (typeof typeInfo.type !== 'undefined') {
+    console.log(JSON.stringify(typeInfo, null, 2))
     type = typeInfo.type;
   }
 
@@ -303,7 +299,10 @@ export function getPropertySignatureFromProp(
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    });
+    }).filter(a => typeof a === 'string');
+    // ONLY SUPPORT string types for now!
+    // e.g. NOT supporting nullable types or type: string[] yet
+
     // @ts-ignore:next-line
     const uniqUnionTypes = [...new Set(unionTypes)];
 
@@ -312,7 +311,7 @@ export function getPropertySignatureFromProp(
         camelize ? camel(prop) : prop,
         t.tsTypeAnnotation(
           t.tsTypeReference(
-            t.identifier(uniqUnionTypes[0])
+            t.identifier(uniqUnionTypes[0] as string)
           )
         ),
         isOptional
@@ -324,7 +323,7 @@ export function getPropertySignatureFromProp(
           t.tsUnionType(
             uniqUnionTypes.map(typ =>
               t.tsTypeReference(
-                t.identifier(typ)
+                t.identifier(typ as string)
               )
             )
           )
@@ -338,15 +337,17 @@ export function getPropertySignatureFromProp(
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    });
-    // @ts-ignore:next-line
+    }).filter(a => typeof a === 'string');
+    // ONLY SUPPORT string types for now!
+    // e.g. NOT supporting nullable types or type: string[] yet
+
     const uniqUnionTypes = [...new Set(unionTypes)];
     if (uniqUnionTypes.length === 1) {
       return propertySignature(
         camelize ? camel(prop) : prop,
         t.tsTypeAnnotation(
           t.tsTypeReference(
-            t.identifier(uniqUnionTypes[0])
+            t.identifier(uniqUnionTypes[0] as string)
           )
         ),
         isOptional
@@ -358,7 +359,7 @@ export function getPropertySignatureFromProp(
           t.tsUnionType(
             uniqUnionTypes.map(typ =>
               t.tsTypeReference(
-                t.identifier(typ)
+                t.identifier(typ as string)
               )
             )
           )
@@ -470,4 +471,4 @@ export const createTypedObjectParams = (
   );
 
   return obj;
-};
+};
\ No newline at end of file
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
index 6421b3d7..a2985cfe 100644
--- a/packages/types/src/types.ts
+++ b/packages/types/src/types.ts
@@ -40,7 +40,7 @@ export interface JSONSchema {
   additionalItems?: JSONSchema;
   required?: string[];
   title?: string;
-  type?: string;
+  type?: string | string[]
 }
 
 

From bdb023beb68dcbf3774a1ac482c9684876ae6c40 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 23:30:12 -0700
Subject: [PATCH 183/287] logs

---
 packages/ast/src/utils/types.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index c6fa68d6..932cad42 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -42,7 +42,6 @@ export const getTypeOrRef = (obj: JSONSchema): t.TSType => {
     return getType(obj.type);
   } else if (Array.isArray(obj.type)) {
     // Handle array of types by creating a union type
-    console.log(obj.type);
     const types = obj.type.map(t => getType(t));
     return t.tsUnionType(types);
   } else {
@@ -143,7 +142,6 @@ export const getTypeInfo = (
     }
     optional = true;
   } else if (typeof info.type === 'string') {
-    console.log('is string')
     // Process type when it's explicitly defined
     if (info.type === 'array') {
       if (typeof info.items === 'object' && !Array.isArray(info.items)) {
@@ -170,7 +168,6 @@ export const getTypeInfo = (
       optional = detect.optional;
     }
   } else if (Array.isArray(info.type)) {
-    console.log('is arr', info.type)
     // Handle multiple types, typically nullable types
     if (info.type.length !== 2) {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
@@ -184,7 +181,6 @@ export const getTypeInfo = (
       if (info.items.type) {
         const detect = detectType(info.items.type);
         if (detect.type === 'array') {
-          console.log('items type')
           type = t.tsArrayType(getArrayTypeFromItems(context, info.items));
         } else {
           type = t.tsArrayType(getType(detect.type));
@@ -209,8 +205,6 @@ export const getTypeInfo = (
 
     optional = true;  // Ensure optional is set for nullable types
   }
-  console.log({ type })
-
   return {
     type,
     optional
@@ -258,7 +252,6 @@ export const getPropertyType = (
     optional = typeInfo.optional;
   }
   if (typeof typeInfo.type !== 'undefined') {
-    console.log(JSON.stringify(typeInfo, null, 2))
     type = typeInfo.type;
   }
 

From b81b533d64b23c94adedf007117cbbae8bd6c6d9 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 23:30:50 -0700
Subject: [PATCH 184/287] logs

---
 .../ast/__tests__/client/ts-client.arrays-item-tuples.test.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
index a322770a..ae379a1d 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
@@ -11,7 +11,6 @@ const ctx = makeContext(queryMsg, {
     itemsUseTuples: true
   }
 });
-console.log(JSON.stringify(ctx, null, 2))
 
 it('query classes', () => {
   expectCode(createQueryClass(

From 1a6347a28bcf60d95973465a0cb9629930a0e96e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 23:40:15 -0700
Subject: [PATCH 185/287] minimist args

---
 packages/ts-codegen/package.json                       |  2 +-
 packages/ts-codegen/scripts/cmds.ts                    | 10 ++++++++--
 packages/ts-codegen/src/cli.ts                         |  3 ++-
 packages/ts-codegen/src/cmds.ts                        |  7 +++++--
 packages/ts-codegen/src/commands/create-boilerplate.ts |  2 +-
 packages/ts-codegen/src/commands/generate.ts           |  2 +-
 packages/ts-codegen/src/commands/install.ts            |  2 +-
 packages/{ts-codegen/src/types.ts => types/src/cli.ts} |  0
 packages/types/src/index.ts                            |  1 +
 9 files changed, 20 insertions(+), 9 deletions(-)
 rename packages/{ts-codegen/src/types.ts => types/src/cli.ts} (100%)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 9881c262..2f061753 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -19,7 +19,7 @@
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
     "clean": "del dist/**",
     "prepare": "npm run build",
-    "codegen": "ts-node ./scripts/build.ts",
+    "cmds": "ts-node ./scripts/cmds.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "test": "jest",
     "test:watch": "jest --watch",
diff --git a/packages/ts-codegen/scripts/cmds.ts b/packages/ts-codegen/scripts/cmds.ts
index 82f057bb..baf611fa 100644
--- a/packages/ts-codegen/scripts/cmds.ts
+++ b/packages/ts-codegen/scripts/cmds.ts
@@ -4,7 +4,13 @@ const glob = require('glob').sync;
 const Case = require('case');
 const srcDir = path.resolve(`${__dirname}/../src/commands`);
 
-const paths = glob(`${srcDir}/**.[j|t]s`).map((file) => {
+interface PathObj {
+  name: string;
+  param: string;
+  safe: string;
+  path: string
+}
+const paths: PathObj[] = glob(`${srcDir}/**.[j|t]s`).map((file: string) => {
   const [, name] = file.match(/\/(.*)\.[j|t]s$/);
   return {
     name: path.basename(name),
@@ -25,7 +31,7 @@ const imports = paths
 
 const out = `
 ${imports}
-const Commands = {};
+const Commands: any = {};
 ${paths
     .map((a) => {
       return `Commands['${a.param}'] = _${a.safe};`;
diff --git a/packages/ts-codegen/src/cli.ts b/packages/ts-codegen/src/cli.ts
index f661ddc5..c13f8c21 100644
--- a/packages/ts-codegen/src/cli.ts
+++ b/packages/ts-codegen/src/cli.ts
@@ -1,5 +1,6 @@
 import { prompt } from './utils/prompt';
 import { Commands as commands } from './cmds';
+import { MinimistArgs } from '@cosmology/ts-codegen-types';
 
 const question = [
   {
@@ -11,7 +12,7 @@ const question = [
   }
 ];
 
-export const cli = async (argv) => {
+export const cli = async (argv: MinimistArgs) => {
   var { cmd } = await prompt(question, argv);
   if (typeof commands[cmd] === 'function') {
     await commands[cmd](argv);
diff --git a/packages/ts-codegen/src/cmds.ts b/packages/ts-codegen/src/cmds.ts
index 93fdec85..d4e90c3b 100644
--- a/packages/ts-codegen/src/cmds.ts
+++ b/packages/ts-codegen/src/cmds.ts
@@ -1,9 +1,12 @@
+
 import _create_boilerplate from './commands/create-boilerplate';
 import _generate from './commands/generate';
 import _install from './commands/install';
-const Commands = {};
+const Commands: any = {};
 Commands['create-boilerplate'] = _create_boilerplate;
 Commands['generate'] = _generate;
 Commands['install'] = _install;
 
-export { Commands };
+  export { Commands }; 
+
+  
\ No newline at end of file
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 0d8c85f5..a0da86c2 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -1,7 +1,7 @@
 import * as shell from 'shelljs';
 import { prompt } from '../utils/prompt';
 import dargs from 'dargs';
-import { MinimistArgs } from '../types';
+import { MinimistArgs } from '@cosmology/ts-codegen-types';
 const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index ac222d6e..1d78731a 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -2,7 +2,7 @@
 import { prompt } from '../utils/prompt';
 import codegen from '../index';
 import { TSBuilderOptions } from '../builder';
-import { MinimistArgs } from '../types';
+import { MinimistArgs } from '@cosmology/ts-codegen-types';
 
 export default async (argv: MinimistArgs) => {
     const questions = [
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index a1c1811f..d16053e7 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -7,7 +7,7 @@ import { prompt } from '../utils/prompt';
 import { parse } from 'parse-package-name';
 import { tmpdir } from 'os';
 import { readFileSync, writeFileSync } from 'fs';
-import { MinimistArgs } from '../types';
+import { MinimistArgs } from '@cosmology/ts-codegen-types';
 
 const TMPDIR = tmpdir();
 const rnd = () =>
diff --git a/packages/ts-codegen/src/types.ts b/packages/types/src/cli.ts
similarity index 100%
rename from packages/ts-codegen/src/types.ts
rename to packages/types/src/cli.ts
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 3e6fc52b..82430e55 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -1,2 +1,3 @@
+export * from './cli';
 export * from './idl';
 export * from './types';

From 786b7df547d880f504ac8b215523c2552bfef153 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 16 Apr 2024 23:42:41 -0700
Subject: [PATCH 186/287] snaps

---
 .../accounts-nft/AccountsNft.client.ts           |  4 ++--
 .../accounts-nft/AccountsNft.react-query.ts      |  2 +-
 .../__tests__/__snapshots__/builder.test.ts.snap | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 11319723..5dc0d928 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -22,7 +22,7 @@ export interface AccountsNftReadOnlyInterface {
     startAfter
   }: {
     limit?: number;
-    startAfter?: [string, string][];
+    startAfter?: string[][];
   }) => Promise<ArrayOfSharesResponseItem>;
   allPreviousOwners: () => Promise<String>;
   ownerOf: ({
@@ -139,7 +139,7 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
     startAfter
   }: {
     limit?: number;
-    startAfter?: [string, string][];
+    startAfter?: string[][];
   }): Promise<ArrayOfSharesResponseItem> => {
     return this.client.queryContractSmart(this.contractAddress, {
       all_debt_shares: {
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
index 900ba87a..87c16e6b 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.react-query.ts
@@ -178,7 +178,7 @@ export function useAccountsNftAllPreviousOwnersQuery<TData = String>({
 export interface AccountsNftAllDebtSharesQuery<TData> extends AccountsNftReactQuery<ArrayOfSharesResponseItem, TData> {
   args: {
     limit?: number;
-    startAfter?: [string, string][];
+    startAfter?: string[][];
   };
 }
 export function useAccountsNftAllDebtSharesQuery<TData = ArrayOfSharesResponseItem>({
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 34f6b618..2eaed3b8 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -38,6 +38,7 @@ TSBuilder {
     "types": {
       "aliasExecuteMsg": false,
       "enabled": true,
+      "itemsUseTuples": false,
     },
     "useShorthandCtor": true,
   },
@@ -76,6 +77,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -115,6 +117,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -154,6 +157,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -193,6 +197,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -232,6 +237,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -273,6 +279,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -312,6 +319,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -363,6 +371,7 @@ TSBuilder {
     "types": {
       "aliasExecuteMsg": false,
       "enabled": true,
+      "itemsUseTuples": false,
     },
     "useShorthandCtor": true,
   },
@@ -401,6 +410,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -440,6 +450,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -479,6 +490,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -518,6 +530,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -557,6 +570,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -598,6 +612,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },
@@ -637,6 +652,7 @@ TSBuilder {
         "types": {
           "aliasExecuteMsg": false,
           "enabled": true,
+          "itemsUseTuples": false,
         },
         "useShorthandCtor": true,
       },

From 7d55265f8f7cb567b921b78b9df5ca996bf9c8b6 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:05:03 -0700
Subject: [PATCH 187/287] chore(release): publish

 - wasm-ast-types@1.0.0
 - @cosmwasm/ts-codegen@1.0.0
 - @cosmology/ts-codegen-types@1.0.0
---
 packages/ast/CHANGELOG.md        |  8 ++++++++
 packages/ast/package.json        |  4 ++--
 packages/ts-codegen/CHANGELOG.md |  8 ++++++++
 packages/ts-codegen/package.json | 17 +++++++++++------
 packages/types/CHANGELOG.md      |  8 ++++++++
 packages/types/package.json      |  2 +-
 6 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 packages/types/CHANGELOG.md

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 4b7756a4..35a68cd6 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.4...wasm-ast-types@1.0.0) (2024-04-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [0.26.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.3...wasm-ast-types@0.26.4) (2024-01-19)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 69fe1cdd..ab3296d0 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.26.4",
+  "version": "1.0.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/types": "7.18.10",
-    "@cosmology/ts-codegen-types": "0.26.4",
+    "@cosmology/ts-codegen-types": "^1.0.0",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index d83c6900..a55d2c0d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.7...@cosmwasm/ts-codegen@1.0.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [0.35.7](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.6...@cosmwasm/ts-codegen@0.35.7) (2024-01-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 2f061753..350f3e10 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "0.35.7",
+  "version": "1.0.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -50,23 +50,28 @@
     "@babel/runtime": "^7.18.9",
     "@babel/traverse": "7.18.11",
     "@babel/types": "7.18.10",
+    "@cosmology/ts-codegen-types": "^1.0.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
-    "@types/shelljs": "0.8.15",
     "@types/rimraf": "3.0.2",
+    "@types/shelljs": "0.8.15",
     "case": "1.6.3",
     "dargs": "7.0.0",
     "deepmerge": "4.2.2",
-    "nested-obj": "0.0.1",
     "fuzzy": "0.1.3",
     "glob": "8.0.3",
     "inquirerer": "0.1.3",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
+    "nested-obj": "0.0.1",
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^0.26.4",
-    "@cosmology/ts-codegen-types": "0.26.4"
+    "wasm-ast-types": "^1.0.0"
   },
-  "keywords": ["cosmwasm", "interchain", "smart contracts", "codegen"]
+  "keywords": [
+    "cosmwasm",
+    "interchain",
+    "smart contracts",
+    "codegen"
+  ]
 }
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
new file mode 100644
index 00000000..1631255d
--- /dev/null
+++ b/packages/types/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 1.0.0 (2024-04-17)
+
+**Note:** Version bump only for package @cosmology/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index ff339a8b..c81c5103 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmology/ts-codegen-types",
-  "version": "0.26.4",
+  "version": "1.0.0",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",

From 5474d5019f19c29bf3afae7481f89f54db94c03f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:11:39 -0700
Subject: [PATCH 188/287] pkg

---
 packages/ts-codegen/package.json | 11 --------
 packages/types/package.json      | 45 +-------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 350f3e10..9baa74a1 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -38,17 +38,6 @@
     "ast-stringify": "0.1.0"
   },
   "dependencies": {
-    "@babel/core": "7.18.10",
-    "@babel/generator": "7.18.12",
-    "@babel/parser": "7.18.11",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-export-default-from": "7.18.10",
-    "@babel/plugin-proposal-object-rest-spread": "7.18.9",
-    "@babel/plugin-transform-runtime": "7.18.10",
-    "@babel/preset-env": "7.18.10",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/runtime": "^7.18.9",
-    "@babel/traverse": "7.18.11",
     "@babel/types": "7.18.10",
     "@cosmology/ts-codegen-types": "^1.0.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
diff --git a/packages/types/package.json b/packages/types/package.json
index c81c5103..9d692626 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -16,13 +16,9 @@
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
     "clean": "del dist/**",
     "prepare": "npm run build",
-    "codegen": "ts-node ./scripts/build.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "test": "jest",
-    "test:watch": "jest --watch",
-    "test:ast": "cross-env NODE_ENV=development babel-node scripts/test-ast.js",
-    "dev": "ts-node src/ts-codegen",
-    "file": "ts-node src/file"
+    "test:watch": "jest --watch"
   },
   "repository": {
     "type": "git",
@@ -31,44 +27,5 @@
   "keywords": [],
   "bugs": {
     "url": "https://github.com/cosmwasm/ts-codegen/issues"
-  },
-  "devDependencies": {
-    "@babel/cli": "7.18.10",
-    "@babel/core": "7.18.10",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/generator": "7.18.12",
-    "@babel/node": "^7.18.10",
-    "@babel/parser": "^7.18.11",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-export-default-from": "7.18.10",
-    "@babel/plugin-proposal-object-rest-spread": "7.18.9",
-    "@babel/plugin-transform-runtime": "7.18.10",
-    "@babel/preset-env": "7.18.10",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/traverse": "7.18.11",
-    "@types/jest": "^28.1.6",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^28.1.3",
-    "babel-watch": "^7.0.0",
-    "cross-env": "^7.0.2",
-    "eslint": "8.21.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "glob": "8.0.3",
-    "jest": "28.1.3",
-    "jest-in-case": "^1.0.2",
-    "mkdirp": "1.0.4",
-    "prettier": "^2.7.1",
-    "regenerator-runtime": "^0.13.7",
-    "ts-jest": "^28.0.7",
-    "typescript": "^4.7.4"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.18.9",
-    "@babel/types": "7.18.10",
-    "@jest/transform": "28.1.3",
-    "ast-stringify": "0.1.0",
-    "case": "1.6.3",
-    "deepmerge": "4.2.2"
   }
 }

From afb15536e0fcacee1c5960586582ceeac8710f5f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:29:01 -0700
Subject: [PATCH 189/287] snaps and readme

---
 README.md                                     |  201 +-
 __fixtures__/issues/98/out/98.client.ts       |    4 -
 __fixtures__/issues/98/out/bundle.ts          |    3 +-
 .../contracts/CwAdminFactory.client.ts        |    4 -
 .../CwAdminFactory.message-composer.ts        |    2 -
 .../contracts/CwAdminFactory.provider.ts      |    1 -
 .../contracts/CwCodeIdRegistry.client.ts      |    4 -
 .../CwCodeIdRegistry.message-composer.ts      |    2 -
 .../contracts/CwCodeIdRegistry.provider.ts    |    1 -
 .../bundler_test/contracts/CwSingle.client.ts |    4 -
 .../contracts/CwSingle.message-composer.ts    |    2 -
 .../contracts/CwSingle.provider.ts            |    1 -
 .../bundler_test/contracts/Factory.client.ts  |    4 -
 .../contracts/Factory.message-composer.ts     |    2 -
 .../contracts/Factory.provider.ts             |    1 -
 .../bundler_test/contracts/Minter.client.ts   |    4 -
 .../contracts/Minter.message-composer.ts      |    2 -
 .../bundler_test/contracts/Minter.provider.ts |    1 -
 __output__/builder/bundler_test/index.ts      |   24 +-
 .../builder/default/CwAdminFactory.client.ts  |    4 -
 .../CwAdminFactory.message-composer.ts        |    2 -
 .../default/CwAdminFactory.provider.ts        |    1 -
 .../default/CwCodeIdRegistry.client.ts        |    4 -
 .../CwCodeIdRegistry.message-composer.ts      |    2 -
 .../default/CwCodeIdRegistry.provider.ts      |    1 -
 __output__/builder/default/CwSingle.client.ts |    4 -
 .../default/CwSingle.message-composer.ts      |    2 -
 .../builder/default/CwSingle.provider.ts      |    1 -
 __output__/builder/default/Factory.client.ts  |    4 -
 .../default/Factory.message-composer.ts       |    2 -
 .../builder/default/Factory.provider.ts       |    1 -
 __output__/builder/default/Minter.client.ts   |    4 -
 .../default/Minter.message-composer.ts        |    2 -
 __output__/builder/default/Minter.provider.ts |    1 -
 __output__/builder/default/index.ts           |   24 +-
 .../builder/invoke/CwAdminFactory.client.ts   |    4 -
 .../builder/invoke/CwCodeIdRegistry.client.ts |    4 -
 __output__/builder/invoke/CwSingle.client.ts  |    4 -
 __output__/builder/invoke/Factory.client.ts   |    4 -
 __output__/builder/invoke/Minter.client.ts    |    4 -
 __output__/builder/invoke/bundle.ts           |   15 +-
 .../no-extends/CwAdminFactory.client.ts       |    4 -
 .../CwAdminFactory.message-composer.ts        |    2 -
 .../no-extends/CwCodeIdRegistry.client.ts     |    4 -
 .../CwCodeIdRegistry.message-composer.ts      |    2 -
 .../builder/no-extends/CwSingle.client.ts     |    4 -
 .../no-extends/CwSingle.message-composer.ts   |    2 -
 .../builder/no-extends/Factory.client.ts      |    4 -
 .../no-extends/Factory.message-composer.ts    |    2 -
 .../builder/no-extends/Minter.client.ts       |    4 -
 .../no-extends/Minter.message-composer.ts     |    2 -
 __output__/builder/no-extends/index.ts        |   15 +-
 .../cw-admin-factory/CwAdminFactory.client.ts |    4 -
 .../CwAdminFactory.message-composer.ts        |    2 -
 .../CwCodeIdRegistry.client.ts                |    4 -
 .../CwCodeIdRegistry.message-composer.ts      |    2 -
 .../cw-named-groups/CwNamedGroups.client.ts   |    4 -
 .../CwNamedGroups.message-composer.ts         |    2 -
 .../CwProposalSingle.client.ts                |    4 -
 .../CwProposalSingle.message-composer.ts      |    2 -
 .../accounts-nft/AccountsNft.client.ts        |    4 -
 .../AccountsNft.message-composer.ts           |    2 -
 .../Cw3FixedMultiSig.client.ts                |    4 -
 .../Cw3FixedMultiSig.message-composer.ts      |    2 -
 .../idl-version/cw4-group/Cw4Group.client.ts  |    4 -
 .../cw4-group/Cw4Group.message-composer.ts    |    2 -
 .../idl-version/cyberpunk/CyberPunk.client.ts |    4 -
 .../cyberpunk/CyberPunk.message-composer.ts   |    2 -
 .../idl-version/hackatom/HackAtom.client.ts   |    4 -
 .../hackatom/HackAtom.message-composer.ts     |    2 -
 __output__/minter/Minter.client.ts            |    4 -
 __output__/minter/Minter.message-composer.ts  |    2 -
 .../sg721-updatable/Sg721Updatable.client.ts  |    4 -
 .../Sg721Updatable.message-composer.ts        |    2 -
 __output__/sg721-updatable/bundle.ts          |    3 +-
 __output__/sg721/Sg721.client.ts              |    4 -
 __output__/sg721/Sg721.message-builder.ts     |  250 ++
 __output__/sg721/Sg721.message-composer.ts    |    2 -
 .../Factory.react-query.ts                    |   18 +-
 .../Factory.react-query.ts                    |   39 +-
 .../factory-query-keys/Factory.react-query.ts |   21 +-
 __output__/vectis/factory/Factory.client.ts   |    4 -
 .../factory/Factory.message-composer.ts       |    2 -
 __output__/vectis/govec/Govec.client.ts       |    4 -
 .../vectis/govec/Govec.message-composer.ts    |    2 -
 __output__/vectis/proxy/Proxy.client.ts       |    4 -
 .../vectis/proxy/Proxy.message-composer.ts    |    2 -
 .../ts-codegen/__tests__/ts-codegen.test.ts   |   14 +-
 packages/ts-codegen/package.json              |    2 +-
 .../{msg-builder.ts => message-builder.ts}    |    0
 packages/ts-codegen/src/index.ts              |    1 +
 yarn.lock                                     | 2583 +----------------
 92 files changed, 548 insertions(+), 2879 deletions(-)
 create mode 100644 __output__/sg721/Sg721.message-builder.ts
 rename packages/ts-codegen/src/generators/{msg-builder.ts => message-builder.ts} (100%)

diff --git a/README.md b/README.md
index 53237030..793c665a 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
 
 
 ```
-npm install -g @cosmwasm/ts-codegen
+npm install @cosmwasm/ts-codegen
 ```
 
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
@@ -28,7 +28,6 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
   - [Table of contents](#table-of-contents)
-- [QuickStart](#quickstart)
 - [Usage](#usage)
     - [Programmatic Usage](#programmatic-usage)
     - [Types](#types)
@@ -47,35 +46,9 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Exporting Schemas](#exporting-schemas)
 - [Developing](#developing)
 - [Related](#related)
-## Quickstart
-
-Clone your project and `cd` into your contracts folder
-
-```sh
-git clone https://github.com/public-awesome/launchpad.git
-cd launchpad/contracts/sg721-base/
-```
-
-Run `cosmwasm-ts-codegen` to generate your code.
-
-```sh
-cosmwasm-ts-codegen generate \
-          --plugin client \
-          --schema ./schema \
-          --out ./ts \
-          --name SG721 \
-          --no-bundle
-```
-
-The output will be in the folder specified by `--out`, enjoy!
 
 ## Usage
 
-You can get started quickly using our `cli` by globally installing via npm:
-
-```
-npm install -g @cosmwasm/ts-codegen
-```
 ### Programmatic Usage
 
 For production usage, we recommend setting up a build script that uses the main entry point:
@@ -137,7 +110,7 @@ codegen({
 
 Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
 
-[see example output code](https://gist.github.com/pyramation/107d4e8e30dc5eb3ffc07bc3000f4dd0)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
 
 #### Types Options
 
@@ -151,7 +124,7 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
 
-[see example output code](https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts )
 
 #### Client Options
 
@@ -161,20 +134,12 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 | `client.execExtendsQuery`               | execute should extend query message clients          |
 | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
-#### Client via CLI
 
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
- ```
 ### React Query
 
 Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
 
-[see example output code](https://gist.github.com/pyramation/70aef28fd3af0ee164f7711704d3dfc0)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
 
 #### React Query Options
 
@@ -189,50 +154,11 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
-#### React Query via CLI
-
-Here is an example without optional client, using v3 for `react-query`, without mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --version v3 \
-    --no-optionalClient \
-    --no-mutations
-```
-
-Example with optional client, using v4, with mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --optionalClient \
-    --version v4 \
-    --mutations
-```
-
 ### Recoil
 
 Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
 
-[see example output code](https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731)
-
-#### Recoil via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin recoil \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
 
 #### Recoil Options
 
@@ -244,17 +170,8 @@ cosmwasm-ts-codegen generate \
 
 Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
 
-[see example output code](https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 
-#### Message Composer via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin message-composer \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
 #### Message Composer Options
 
 | option                         | description                                                         |
@@ -267,15 +184,6 @@ Generate raw message jsons for use in your application with the `message-builder
 
 [see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
 
-#### Message Builder via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin message-builder \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
 #### Message Builder Options
 
 | option                   | description                        |
@@ -426,6 +334,32 @@ Without using shorthand constructor:
 
 ### CLI Usage and Examples
 
+You can get started quickly using our `cli` by globally installing via npm:
+
+```
+npm install @cosmwasm/ts-codegen
+```
+
+Clone your project and `cd` into your contracts folder
+
+```sh
+git clone https://github.com/public-awesome/launchpad.git
+cd launchpad/contracts/whitelists/
+```
+
+Run `cosmwasm-ts-codegen` to generate your code.
+
+```sh
+cosmwasm-ts-codegen generate \
+          --plugin client \
+          --schema ./schema \
+          --out ./ts \
+          --name Whitelist \
+          --no-bundle
+```
+
+The output will be in the folder specified by `--out`, enjoy!
+
 #### Interactive prompt
 
 The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
@@ -506,6 +440,77 @@ cosmwasm-ts-codegen generate \
           --name SG721
 ```
 
+#### Client via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+
+#### React Query via CLI
+
+Here is an example without optional client, using v3 for `react-query`, without mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --version v3 \
+    --no-optionalClient \
+    --no-mutations
+```
+
+Example with optional client, using v4, with mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --optionalClient \
+    --version v4 \
+    --mutations
+```
+
+#### Recoil via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin recoil \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Composer via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-composer \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Builder via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-builder \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+
 ### Advanced Usage
 
 for lower-level access, you can import the various plugins directly:
diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
index a0e4740d..7817e157 100644
--- a/__fixtures__/issues/98/out/98.client.ts
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -26,7 +26,6 @@ export interface 98ReadOnlyInterface {
 export class 98QueryClient implements 98ReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -34,7 +33,6 @@ export class 98QueryClient implements 98ReadOnlyInterface {
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-
   getConfig = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       get_config: {}
@@ -128,7 +126,6 @@ export class 98Client extends 98QueryClient implements 98Interface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -141,7 +138,6 @@ export class 98Client extends 98QueryClient implements 98Interface {
     this.updateRegistryFee = this.updateRegistryFee.bind(this);
     this.updateDaoAddr = this.updateDaoAddr.bind(this);
   }
-
   proxyInstallPlugin = async ({
     id,
     instantiateMsg
diff --git a/__fixtures__/issues/98/out/bundle.ts b/__fixtures__/issues/98/out/bundle.ts
index 4f76a61e..d66bc6b2 100644
--- a/__fixtures__/issues/98/out/bundle.ts
+++ b/__fixtures__/issues/98/out/bundle.ts
@@ -8,7 +8,8 @@ import * as _0 from "./98.types";
 import * as _1 from "./98.client";
 import * as _2 from "./98.react-query";
 export namespace contracts {
-  export const 98 = { ..._0,
+  export const 98 = {
+    ..._0,
     ..._1,
     ..._2
   };
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
index edbba1e6..fb33d959 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
@@ -13,12 +13,10 @@ export interface CwAdminFactoryReadOnlyInterface {
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }
 export interface CwAdminFactoryInterface {
   contractAddress: string;
@@ -37,14 +35,12 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = async ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index bef32013..b0de6f1a 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -25,13 +25,11 @@ export interface CwAdminFactoryMsg {
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
index 24c5a646..30f56f80 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.provider.ts
@@ -15,5 +15,4 @@ export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFa
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
index d95b2ee4..e3df2f84 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
@@ -37,7 +37,6 @@ export interface CwCodeIdRegistryReadOnlyInterface {
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -46,7 +45,6 @@ export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInte
     this.infoForCodeId = this.infoForCodeId.bind(this);
     this.listRegistrations = this.listRegistrations.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -151,7 +149,6 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -162,7 +159,6 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index 5e2f60b2..d5747de7 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -61,7 +61,6 @@ export interface CwCodeIdRegistryMsg {
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -71,7 +70,6 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = ({
     amount,
     msg,
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
index eee19b43..c557a452 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.provider.ts
@@ -15,5 +15,4 @@ export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCod
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
index 62d3092c..fbca68aa 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
@@ -53,7 +53,6 @@ export interface CwSingleReadOnlyInterface {
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
     this.voteHooks = this.voteHooks.bind(this);
     this.info = this.info.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -236,7 +234,6 @@ export class CwSingleClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -251,7 +248,6 @@ export class CwSingleClient implements CwSingleInterface {
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = async ({
     description,
     msgs,
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index 1fcde7c6..a7afb565 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -78,7 +78,6 @@ export interface CwSingleMsg {
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -92,7 +91,6 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = ({
     description,
     msgs,
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
index 2bd53f0f..408f01ce 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.provider.ts
@@ -15,5 +15,4 @@ export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient,
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts
index 8c545bda..1e352243 100644
--- a/__output__/builder/bundler_test/contracts/Factory.client.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.client.ts
@@ -37,7 +37,6 @@ export interface FactoryReadOnlyInterface {
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -48,7 +47,6 @@ export class FactoryQueryClient implements FactoryReadOnlyInterface {
     this.govecAddr = this.govecAddr.bind(this);
     this.adminAddr = this.adminAddr.bind(this);
   }
-
   wallets = async ({
     limit,
     startAfter
@@ -156,7 +154,6 @@ export class FactoryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -169,7 +166,6 @@ export class FactoryClient implements FactoryInterface {
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = async ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index d5100d04..c326c30c 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -56,7 +56,6 @@ export interface FactoryMsg {
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class FactoryMsgComposer implements FactoryMsg {
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/bundler_test/contracts/Factory.provider.ts b/__output__/builder/bundler_test/contracts/Factory.provider.ts
index c60015f4..b0a2f512 100644
--- a/__output__/builder/bundler_test/contracts/Factory.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.provider.ts
@@ -15,5 +15,4 @@ export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, Fac
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
index 6901674a..23c2502b 100644
--- a/__output__/builder/bundler_test/contracts/Minter.client.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -22,7 +22,6 @@ export interface MinterReadOnlyInterface {
 export class MinterQueryClient implements MinterReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -32,7 +31,6 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
     this.mintPrice = this.mintPrice.bind(this);
     this.mintCount = this.mintCount.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -98,7 +96,6 @@ export class MinterClient implements MinterInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -111,7 +108,6 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 28a24747..84cbf7bc 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -40,7 +40,6 @@ export interface MinterMsg {
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -52,7 +51,6 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
diff --git a/__output__/builder/bundler_test/contracts/Minter.provider.ts b/__output__/builder/bundler_test/contracts/Minter.provider.ts
index 8d3a1eaa..1940cd8e 100644
--- a/__output__/builder/bundler_test/contracts/Minter.provider.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.provider.ts
@@ -15,5 +15,4 @@ export class Minter extends ContractBase<MinterClient, MinterQueryClient, Minter
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
index a0b6bbbd..d55d8a32 100644
--- a/__output__/builder/bundler_test/index.ts
+++ b/__output__/builder/bundler_test/index.ts
@@ -39,46 +39,54 @@ import * as _114 from "./contracts/contractContextBase";
 import * as _115 from "./contracts/contracts-context";
 export namespace smart {
   export namespace contracts {
-    export const Factory = { ..._83,
+    export const Factory = {
+      ..._83,
       ..._84,
       ..._85,
       ..._86,
       ..._87,
       ..._88
     };
-    export const Minter = { ..._89,
+    export const Minter = {
+      ..._89,
       ..._90,
       ..._91,
       ..._92,
       ..._93,
       ..._94
     };
-    export const CwAdminFactory = { ..._95,
+    export const CwAdminFactory = {
+      ..._95,
       ..._96,
       ..._97,
       ..._98,
       ..._99,
       ..._100
     };
-    export const CwCodeIdRegistry = { ..._101,
+    export const CwCodeIdRegistry = {
+      ..._101,
       ..._102,
       ..._103,
       ..._104,
       ..._105,
       ..._106
     };
-    export const CwSingle = { ..._107,
+    export const CwSingle = {
+      ..._107,
       ..._108,
       ..._109,
       ..._110,
       ..._111,
       ..._112
     };
-    export const contractContextProviders = { ..._113
+    export const contractContextProviders = {
+      ..._113
     };
-    export const contractContextBase = { ..._114
+    export const contractContextBase = {
+      ..._114
     };
-    export const contractsContext = { ..._115
+    export const contractsContext = {
+      ..._115
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwAdminFactory.client.ts b/__output__/builder/default/CwAdminFactory.client.ts
index 7a3c1f78..79d446bd 100644
--- a/__output__/builder/default/CwAdminFactory.client.ts
+++ b/__output__/builder/default/CwAdminFactory.client.ts
@@ -13,12 +13,10 @@ export interface CwAdminFactoryReadOnlyInterface {
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }
 export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
@@ -37,7 +35,6 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -45,7 +42,6 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = async ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index bef32013..b0de6f1a 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -25,13 +25,11 @@ export interface CwAdminFactoryMsg {
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/default/CwAdminFactory.provider.ts b/__output__/builder/default/CwAdminFactory.provider.ts
index 24c5a646..30f56f80 100644
--- a/__output__/builder/default/CwAdminFactory.provider.ts
+++ b/__output__/builder/default/CwAdminFactory.provider.ts
@@ -15,5 +15,4 @@ export class CwAdminFactory extends ContractBase<CwAdminFactoryClient, CwAdminFa
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, CwAdminFactoryClient, CwAdminFactoryQueryClient, CwAdminFactoryMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.client.ts b/__output__/builder/default/CwCodeIdRegistry.client.ts
index 5e0b5f2c..18742aa4 100644
--- a/__output__/builder/default/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.client.ts
@@ -37,7 +37,6 @@ export interface CwCodeIdRegistryReadOnlyInterface {
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -46,7 +45,6 @@ export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInte
     this.infoForCodeId = this.infoForCodeId.bind(this);
     this.listRegistrations = this.listRegistrations.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -151,7 +149,6 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -163,7 +160,6 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index 5e2f60b2..d5747de7 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -61,7 +61,6 @@ export interface CwCodeIdRegistryMsg {
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -71,7 +70,6 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = ({
     amount,
     msg,
diff --git a/__output__/builder/default/CwCodeIdRegistry.provider.ts b/__output__/builder/default/CwCodeIdRegistry.provider.ts
index eee19b43..c557a452 100644
--- a/__output__/builder/default/CwCodeIdRegistry.provider.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.provider.ts
@@ -15,5 +15,4 @@ export class CwCodeIdRegistry extends ContractBase<CwCodeIdRegistryClient, CwCod
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, CwCodeIdRegistryClient, CwCodeIdRegistryQueryClient, CwCodeIdRegistryMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.client.ts b/__output__/builder/default/CwSingle.client.ts
index 69625750..c74d6e75 100644
--- a/__output__/builder/default/CwSingle.client.ts
+++ b/__output__/builder/default/CwSingle.client.ts
@@ -53,7 +53,6 @@ export interface CwSingleReadOnlyInterface {
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
     this.voteHooks = this.voteHooks.bind(this);
     this.info = this.info.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -236,7 +234,6 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -252,7 +249,6 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = async ({
     description,
     msgs,
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index 1fcde7c6..a7afb565 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -78,7 +78,6 @@ export interface CwSingleMsg {
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -92,7 +91,6 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = ({
     description,
     msgs,
diff --git a/__output__/builder/default/CwSingle.provider.ts b/__output__/builder/default/CwSingle.provider.ts
index 2bd53f0f..408f01ce 100644
--- a/__output__/builder/default/CwSingle.provider.ts
+++ b/__output__/builder/default/CwSingle.provider.ts
@@ -15,5 +15,4 @@ export class CwSingle extends ContractBase<CwSingleClient, CwSingleQueryClient,
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, CwSingleClient, CwSingleQueryClient, CwSingleMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.client.ts b/__output__/builder/default/Factory.client.ts
index 7ef4e86f..3519112a 100644
--- a/__output__/builder/default/Factory.client.ts
+++ b/__output__/builder/default/Factory.client.ts
@@ -37,7 +37,6 @@ export interface FactoryReadOnlyInterface {
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -48,7 +47,6 @@ export class FactoryQueryClient implements FactoryReadOnlyInterface {
     this.govecAddr = this.govecAddr.bind(this);
     this.adminAddr = this.adminAddr.bind(this);
   }
-
   wallets = async ({
     limit,
     startAfter
@@ -156,7 +154,6 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -170,7 +167,6 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = async ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index d5100d04..c326c30c 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -56,7 +56,6 @@ export interface FactoryMsg {
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class FactoryMsgComposer implements FactoryMsg {
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/default/Factory.provider.ts b/__output__/builder/default/Factory.provider.ts
index c60015f4..b0a2f512 100644
--- a/__output__/builder/default/Factory.provider.ts
+++ b/__output__/builder/default/Factory.provider.ts
@@ -15,5 +15,4 @@ export class Factory extends ContractBase<FactoryClient, FactoryQueryClient, Fac
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, FactoryClient, FactoryQueryClient, FactoryMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts
index 24fd0088..fd00b521 100644
--- a/__output__/builder/default/Minter.client.ts
+++ b/__output__/builder/default/Minter.client.ts
@@ -22,7 +22,6 @@ export interface MinterReadOnlyInterface {
 export class MinterQueryClient implements MinterReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -32,7 +31,6 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
     this.mintPrice = this.mintPrice.bind(this);
     this.mintCount = this.mintCount.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -98,7 +96,6 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -112,7 +109,6 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 28a24747..84cbf7bc 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -40,7 +40,6 @@ export interface MinterMsg {
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -52,7 +51,6 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
diff --git a/__output__/builder/default/Minter.provider.ts b/__output__/builder/default/Minter.provider.ts
index 8d3a1eaa..1940cd8e 100644
--- a/__output__/builder/default/Minter.provider.ts
+++ b/__output__/builder/default/Minter.provider.ts
@@ -15,5 +15,4 @@ export class Minter extends ContractBase<MinterClient, MinterQueryClient, Minter
   }: IContractConstructor) {
     super(address, cosmWasmClient, signingCosmWasmClient, MinterClient, MinterQueryClient, MinterMsgComposer);
   }
-
 }
\ No newline at end of file
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index 64ec085e..ef0f3c6e 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -44,7 +44,8 @@ import * as _51 from "./contractContextBase";
 import * as _52 from "./contracts-context";
 export namespace smart {
   export namespace contracts {
-    export const Factory = { ..._15,
+    export const Factory = {
+      ..._15,
       ..._16,
       ..._17,
       ..._18,
@@ -52,7 +53,8 @@ export namespace smart {
       ..._20,
       ..._21
     };
-    export const Minter = { ..._22,
+    export const Minter = {
+      ..._22,
       ..._23,
       ..._24,
       ..._25,
@@ -60,7 +62,8 @@ export namespace smart {
       ..._27,
       ..._28
     };
-    export const CwAdminFactory = { ..._29,
+    export const CwAdminFactory = {
+      ..._29,
       ..._30,
       ..._31,
       ..._32,
@@ -68,7 +71,8 @@ export namespace smart {
       ..._34,
       ..._35
     };
-    export const CwCodeIdRegistry = { ..._36,
+    export const CwCodeIdRegistry = {
+      ..._36,
       ..._37,
       ..._38,
       ..._39,
@@ -76,7 +80,8 @@ export namespace smart {
       ..._41,
       ..._42
     };
-    export const CwSingle = { ..._43,
+    export const CwSingle = {
+      ..._43,
       ..._44,
       ..._45,
       ..._46,
@@ -84,11 +89,14 @@ export namespace smart {
       ..._48,
       ..._49
     };
-    export const contractContextProviders = { ..._50
+    export const contractContextProviders = {
+      ..._50
     };
-    export const contractContextBase = { ..._51
+    export const contractContextBase = {
+      ..._51
     };
-    export const contractsContext = { ..._52
+    export const contractsContext = {
+      ..._52
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwAdminFactory.client.ts b/__output__/builder/invoke/CwAdminFactory.client.ts
index 7a3c1f78..79d446bd 100644
--- a/__output__/builder/invoke/CwAdminFactory.client.ts
+++ b/__output__/builder/invoke/CwAdminFactory.client.ts
@@ -13,12 +13,10 @@ export interface CwAdminFactoryReadOnlyInterface {
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }
 export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
@@ -37,7 +35,6 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -45,7 +42,6 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = async ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.client.ts b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
index 5e0b5f2c..18742aa4 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
@@ -37,7 +37,6 @@ export interface CwCodeIdRegistryReadOnlyInterface {
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -46,7 +45,6 @@ export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInte
     this.infoForCodeId = this.infoForCodeId.bind(this);
     this.listRegistrations = this.listRegistrations.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -151,7 +149,6 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -163,7 +160,6 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
diff --git a/__output__/builder/invoke/CwSingle.client.ts b/__output__/builder/invoke/CwSingle.client.ts
index 69625750..c74d6e75 100644
--- a/__output__/builder/invoke/CwSingle.client.ts
+++ b/__output__/builder/invoke/CwSingle.client.ts
@@ -53,7 +53,6 @@ export interface CwSingleReadOnlyInterface {
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
     this.voteHooks = this.voteHooks.bind(this);
     this.info = this.info.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -236,7 +234,6 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -252,7 +249,6 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = async ({
     description,
     msgs,
diff --git a/__output__/builder/invoke/Factory.client.ts b/__output__/builder/invoke/Factory.client.ts
index 7ef4e86f..3519112a 100644
--- a/__output__/builder/invoke/Factory.client.ts
+++ b/__output__/builder/invoke/Factory.client.ts
@@ -37,7 +37,6 @@ export interface FactoryReadOnlyInterface {
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -48,7 +47,6 @@ export class FactoryQueryClient implements FactoryReadOnlyInterface {
     this.govecAddr = this.govecAddr.bind(this);
     this.adminAddr = this.adminAddr.bind(this);
   }
-
   wallets = async ({
     limit,
     startAfter
@@ -156,7 +154,6 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -170,7 +167,6 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = async ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts
index 24fd0088..fd00b521 100644
--- a/__output__/builder/invoke/Minter.client.ts
+++ b/__output__/builder/invoke/Minter.client.ts
@@ -22,7 +22,6 @@ export interface MinterReadOnlyInterface {
 export class MinterQueryClient implements MinterReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -32,7 +31,6 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
     this.mintPrice = this.mintPrice.bind(this);
     this.mintCount = this.mintCount.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -98,7 +96,6 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -112,7 +109,6 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
diff --git a/__output__/builder/invoke/bundle.ts b/__output__/builder/invoke/bundle.ts
index 689fc350..e2473ca0 100644
--- a/__output__/builder/invoke/bundle.ts
+++ b/__output__/builder/invoke/bundle.ts
@@ -20,23 +20,28 @@ import * as _12 from "./CwSingle.types";
 import * as _13 from "./CwSingle.client";
 import * as _14 from "./CwSingle.react-query";
 export namespace contracts {
-  export const Factory = { ..._0,
+  export const Factory = {
+    ..._0,
     ..._1,
     ..._2
   };
-  export const Minter = { ..._3,
+  export const Minter = {
+    ..._3,
     ..._4,
     ..._5
   };
-  export const CwAdminFactory = { ..._6,
+  export const CwAdminFactory = {
+    ..._6,
     ..._7,
     ..._8
   };
-  export const CwCodeIdRegistry = { ..._9,
+  export const CwCodeIdRegistry = {
+    ..._9,
     ..._10,
     ..._11
   };
-  export const CwSingle = { ..._12,
+  export const CwSingle = {
+    ..._12,
     ..._13,
     ..._14
   };
diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts
index edbba1e6..fb33d959 100644
--- a/__output__/builder/no-extends/CwAdminFactory.client.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.client.ts
@@ -13,12 +13,10 @@ export interface CwAdminFactoryReadOnlyInterface {
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }
 export interface CwAdminFactoryInterface {
   contractAddress: string;
@@ -37,14 +35,12 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = async ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index bef32013..b0de6f1a 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -25,13 +25,11 @@ export interface CwAdminFactoryMsg {
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
index d95b2ee4..e3df2f84 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
@@ -37,7 +37,6 @@ export interface CwCodeIdRegistryReadOnlyInterface {
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -46,7 +45,6 @@ export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInte
     this.infoForCodeId = this.infoForCodeId.bind(this);
     this.listRegistrations = this.listRegistrations.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -151,7 +149,6 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -162,7 +159,6 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index 5e2f60b2..d5747de7 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -61,7 +61,6 @@ export interface CwCodeIdRegistryMsg {
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -71,7 +70,6 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = ({
     amount,
     msg,
diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts
index 62d3092c..fbca68aa 100644
--- a/__output__/builder/no-extends/CwSingle.client.ts
+++ b/__output__/builder/no-extends/CwSingle.client.ts
@@ -53,7 +53,6 @@ export interface CwSingleReadOnlyInterface {
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
     this.voteHooks = this.voteHooks.bind(this);
     this.info = this.info.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -236,7 +234,6 @@ export class CwSingleClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -251,7 +248,6 @@ export class CwSingleClient implements CwSingleInterface {
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = async ({
     description,
     msgs,
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index 1fcde7c6..a7afb565 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -78,7 +78,6 @@ export interface CwSingleMsg {
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -92,7 +91,6 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = ({
     description,
     msgs,
diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts
index 8c545bda..1e352243 100644
--- a/__output__/builder/no-extends/Factory.client.ts
+++ b/__output__/builder/no-extends/Factory.client.ts
@@ -37,7 +37,6 @@ export interface FactoryReadOnlyInterface {
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -48,7 +47,6 @@ export class FactoryQueryClient implements FactoryReadOnlyInterface {
     this.govecAddr = this.govecAddr.bind(this);
     this.adminAddr = this.adminAddr.bind(this);
   }
-
   wallets = async ({
     limit,
     startAfter
@@ -156,7 +154,6 @@ export class FactoryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -169,7 +166,6 @@ export class FactoryClient implements FactoryInterface {
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = async ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index d5100d04..c326c30c 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -56,7 +56,6 @@ export interface FactoryMsg {
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class FactoryMsgComposer implements FactoryMsg {
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = ({
     createWalletMsg
   }: {
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
index 6901674a..23c2502b 100644
--- a/__output__/builder/no-extends/Minter.client.ts
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -22,7 +22,6 @@ export interface MinterReadOnlyInterface {
 export class MinterQueryClient implements MinterReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -32,7 +31,6 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
     this.mintPrice = this.mintPrice.bind(this);
     this.mintCount = this.mintCount.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -98,7 +96,6 @@ export class MinterClient implements MinterInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
@@ -111,7 +108,6 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 28a24747..84cbf7bc 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -40,7 +40,6 @@ export interface MinterMsg {
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -52,7 +51,6 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
index b6cee78c..411acd2a 100644
--- a/__output__/builder/no-extends/index.ts
+++ b/__output__/builder/no-extends/index.ts
@@ -36,35 +36,40 @@ import * as _81 from "./CwSingle.recoil";
 import * as _82 from "./CwSingle.message-builder";
 export namespace smart {
   export namespace contracts {
-    export const Factory = { ..._53,
+    export const Factory = {
+      ..._53,
       ..._54,
       ..._55,
       ..._56,
       ..._57,
       ..._58
     };
-    export const Minter = { ..._59,
+    export const Minter = {
+      ..._59,
       ..._60,
       ..._61,
       ..._62,
       ..._63,
       ..._64
     };
-    export const CwAdminFactory = { ..._65,
+    export const CwAdminFactory = {
+      ..._65,
       ..._66,
       ..._67,
       ..._68,
       ..._69,
       ..._70
     };
-    export const CwCodeIdRegistry = { ..._71,
+    export const CwCodeIdRegistry = {
+      ..._71,
       ..._72,
       ..._73,
       ..._74,
       ..._75,
       ..._76
     };
-    export const CwSingle = { ..._77,
+    export const CwSingle = {
+      ..._77,
       ..._78,
       ..._79,
       ..._80,
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
index 7a3c1f78..79d446bd 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
@@ -13,12 +13,10 @@ export interface CwAdminFactoryReadOnlyInterface {
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
-
 }
 export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
@@ -37,7 +35,6 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -45,7 +42,6 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = async ({
     codeId,
     instantiateMsg,
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index 96fcfa44..ef8311ee 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -25,13 +25,11 @@ export interface CwAdminFactoryMessage {
 export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.instantiateContractWithSelfAdmin = this.instantiateContractWithSelfAdmin.bind(this);
   }
-
   instantiateContractWithSelfAdmin = ({
     codeId,
     instantiateMsg,
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
index 5e0b5f2c..18742aa4 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
@@ -37,7 +37,6 @@ export interface CwCodeIdRegistryReadOnlyInterface {
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -46,7 +45,6 @@ export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInte
     this.infoForCodeId = this.infoForCodeId.bind(this);
     this.listRegistrations = this.listRegistrations.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -151,7 +149,6 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -163,7 +160,6 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = async ({
     amount,
     msg,
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index 9c28ec26..ba91d227 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -61,7 +61,6 @@ export interface CwCodeIdRegistryMessage {
 export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -71,7 +70,6 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage
     this.unregister = this.unregister.bind(this);
     this.updateConfig = this.updateConfig.bind(this);
   }
-
   receive = ({
     amount,
     msg,
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
index 25793dcc..ade530c1 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
@@ -39,7 +39,6 @@ export interface CwNamedGroupsReadOnlyInterface {
 export class CwNamedGroupsQueryClient implements CwNamedGroupsReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -48,7 +47,6 @@ export class CwNamedGroupsQueryClient implements CwNamedGroupsReadOnlyInterface
     this.listAddresses = this.listAddresses.bind(this);
     this.isAddressInGroup = this.isAddressInGroup.bind(this);
   }
-
   dump = async (): Promise<DumpResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       dump: {}
@@ -130,7 +128,6 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -140,7 +137,6 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     this.removeGroup = this.removeGroup.bind(this);
     this.updateOwner = this.updateOwner.bind(this);
   }
-
   update = async ({
     addressesToAdd,
     addressesToRemove,
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index a5416273..52b9f471 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -35,7 +35,6 @@ export interface CwNamedGroupsMessage {
 export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -43,7 +42,6 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
     this.removeGroup = this.removeGroup.bind(this);
     this.updateOwner = this.updateOwner.bind(this);
   }
-
   update = ({
     addressesToAdd,
     addressesToRemove,
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
index 2c19498a..154e018c 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
@@ -53,7 +53,6 @@ export interface CwProposalSingleReadOnlyInterface {
 export class CwProposalSingleQueryClient implements CwProposalSingleReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class CwProposalSingleQueryClient implements CwProposalSingleReadOnlyInte
     this.voteHooks = this.voteHooks.bind(this);
     this.info = this.info.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -236,7 +234,6 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -252,7 +249,6 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = async ({
     description,
     msgs,
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index d6b1c420..1c44cfbf 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -78,7 +78,6 @@ export interface CwProposalSingleMessage {
 export class CwProposalSingleMessageComposer implements CwProposalSingleMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -92,7 +91,6 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage
     this.addVoteHook = this.addVoteHook.bind(this);
     this.removeVoteHook = this.removeVoteHook.bind(this);
   }
-
   propose = ({
     description,
     msgs,
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 5dc0d928..fab4fc8e 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -94,7 +94,6 @@ export interface AccountsNftReadOnlyInterface {
 export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -114,7 +113,6 @@ export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-
   proposedNewOwner = async (): Promise<String> => {
     return this.client.queryContractSmart(this.contractAddress, {
       proposed_new_owner: {}
@@ -358,7 +356,6 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -375,7 +372,6 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     this.revokeAll = this.revokeAll.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   proposeNewOwner = async ({
     newOwner
   }: {
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index 4d7ecf3b..fa57f3ac 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -76,7 +76,6 @@ export interface AccountsNftMessage {
 export class AccountsNftMessageComposer implements AccountsNftMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -91,7 +90,6 @@ export class AccountsNftMessageComposer implements AccountsNftMessage {
     this.revokeAll = this.revokeAll.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   proposeNewOwner = ({
     newOwner
   }: {
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
index 98d790bf..7fbfc8c0 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
@@ -61,7 +61,6 @@ export interface Cw3FixedMultiSigReadOnlyInterface {
 export class Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -74,7 +73,6 @@ export class Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigReadOnlyInte
     this.voter = this.voter.bind(this);
     this.listVoters = this.listVoters.bind(this);
   }
-
   threshold = async (): Promise<ThresholdResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       threshold: {}
@@ -212,7 +210,6 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -223,7 +220,6 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     this.execute = this.execute.bind(this);
     this.close = this.close.bind(this);
   }
-
   propose = async ({
     description,
     latest,
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index 64013370..c7484e9f 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -43,7 +43,6 @@ export interface Cw3FixedMultiSigMessage {
 export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -52,7 +51,6 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage
     this.execute = this.execute.bind(this);
     this.close = this.close.bind(this);
   }
-
   propose = ({
     description,
     latest,
diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts
index 9b68c374..00a7fd20 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.client.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts
@@ -30,7 +30,6 @@ export interface Cw4GroupReadOnlyInterface {
 export class Cw4GroupQueryClient implements Cw4GroupReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -40,7 +39,6 @@ export class Cw4GroupQueryClient implements Cw4GroupReadOnlyInterface {
     this.member = this.member.bind(this);
     this.hooks = this.hooks.bind(this);
   }
-
   admin = async (): Promise<AdminResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       admin: {}
@@ -115,7 +113,6 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -126,7 +123,6 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     this.addHook = this.addHook.bind(this);
     this.removeHook = this.removeHook.bind(this);
   }
-
   updateAdmin = async ({
     admin
   }: {
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index 3c24b2d7..2345afa9 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -38,7 +38,6 @@ export interface Cw4GroupMessage {
 export class Cw4GroupMessageComposer implements Cw4GroupMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -47,7 +46,6 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage {
     this.addHook = this.addHook.bind(this);
     this.removeHook = this.removeHook.bind(this);
   }
-
   updateAdmin = ({
     admin
   }: {
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
index fc2fd386..29a05fce 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -14,13 +14,11 @@ export interface CyberPunkReadOnlyInterface {
 export class CyberPunkQueryClient implements CyberPunkReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.mirrorEnv = this.mirrorEnv.bind(this);
   }
-
   mirrorEnv = async (): Promise<Env> => {
     return this.client.queryContractSmart(this.contractAddress, {
       mirror_env: {}
@@ -43,7 +41,6 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -52,7 +49,6 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
     this.argon2 = this.argon2.bind(this);
     this.mirrorEnv = this.mirrorEnv.bind(this);
   }
-
   argon2 = async ({
     memCost,
     timeCost
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index aca7c528..c8537bb4 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -24,14 +24,12 @@ export interface CyberPunkMessage {
 export class CyberPunkMessageComposer implements CyberPunkMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
     this.argon2 = this.argon2.bind(this);
     this.mirrorEnv = this.mirrorEnv.bind(this);
   }
-
   argon2 = ({
     memCost,
     timeCost
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
index c3139417..76b3ebf6 100644
--- a/__output__/idl-version/hackatom/HackAtom.client.ts
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -27,7 +27,6 @@ export interface HackAtomReadOnlyInterface {
 export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -36,7 +35,6 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
     this.recurse = this.recurse.bind(this);
     this.getInt = this.getInt.bind(this);
   }
-
   verifier = async (): Promise<VerifierResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       verifier: {}
@@ -93,7 +91,6 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -108,7 +105,6 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-
   release = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       release: {}
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index d839559c..3bcafb96 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -27,7 +27,6 @@ export interface HackAtomMessage {
 export class HackAtomMessageComposer implements HackAtomMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -40,7 +39,6 @@ export class HackAtomMessageComposer implements HackAtomMessage {
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-
   release = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts
index 24fd0088..fd00b521 100644
--- a/__output__/minter/Minter.client.ts
+++ b/__output__/minter/Minter.client.ts
@@ -22,7 +22,6 @@ export interface MinterReadOnlyInterface {
 export class MinterQueryClient implements MinterReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -32,7 +31,6 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
     this.mintPrice = this.mintPrice.bind(this);
     this.mintCount = this.mintCount.bind(this);
   }
-
   config = async (): Promise<ConfigResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {}
@@ -98,7 +96,6 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -112,7 +109,6 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 57ecfa82..670ef93c 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -40,7 +40,6 @@ export interface MinterMessage {
 export class MinterMessageComposer implements MinterMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -52,7 +51,6 @@ export class MinterMessageComposer implements MinterMessage {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-
   mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
diff --git a/__output__/sg721-updatable/Sg721Updatable.client.ts b/__output__/sg721-updatable/Sg721Updatable.client.ts
index bdc3b8c6..1cee0d5b 100644
--- a/__output__/sg721-updatable/Sg721Updatable.client.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.client.ts
@@ -79,7 +79,6 @@ export interface Sg721UpdatableReadOnlyInterface {
 export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -96,7 +95,6 @@ export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterfac
     this.minter = this.minter.bind(this);
     this.collectionInfo = this.collectionInfo.bind(this);
   }
-
   ownerOf = async ({
     includeExpired,
     tokenId
@@ -328,7 +326,6 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -350,7 +347,6 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-
   freezeTokenMetadata = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_token_metadata: {}
diff --git a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
index aae3f337..fbf817fe 100644
--- a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
@@ -97,7 +97,6 @@ export interface Sg721UpdatableMsg {
 export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -117,7 +116,6 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-
   freezeTokenMetadata = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
diff --git a/__output__/sg721-updatable/bundle.ts b/__output__/sg721-updatable/bundle.ts
index e36ed81d..68f5eb80 100644
--- a/__output__/sg721-updatable/bundle.ts
+++ b/__output__/sg721-updatable/bundle.ts
@@ -9,7 +9,8 @@ import * as _1 from "./Sg721Updatable.client";
 import * as _2 from "./Sg721Updatable.message-composer";
 import * as _3 from "./Sg721Updatable.react-query";
 export namespace contracts {
-  export const Sg721Updatable = { ..._0,
+  export const Sg721Updatable = {
+    ..._0,
     ..._1,
     ..._2,
     ..._3
diff --git a/__output__/sg721/Sg721.client.ts b/__output__/sg721/Sg721.client.ts
index ef6d836b..a71b1eca 100644
--- a/__output__/sg721/Sg721.client.ts
+++ b/__output__/sg721/Sg721.client.ts
@@ -79,7 +79,6 @@ export interface Sg721ReadOnlyInterface {
 export class Sg721QueryClient implements Sg721ReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -96,7 +95,6 @@ export class Sg721QueryClient implements Sg721ReadOnlyInterface {
     this.minter = this.minter.bind(this);
     this.collectionInfo = this.collectionInfo.bind(this);
   }
-
   ownerOf = async ({
     includeExpired,
     tokenId
@@ -307,7 +305,6 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -322,7 +319,6 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = async ({
     recipient,
     tokenId
diff --git a/__output__/sg721/Sg721.message-builder.ts b/__output__/sg721/Sg721.message-builder.ts
new file mode 100644
index 00000000..f8ad1106
--- /dev/null
+++ b/__output__/sg721/Sg721.message-builder.ts
@@ -0,0 +1,250 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
+import { CamelCasedProperties } from "type-fest";
+export abstract class Sg721ExecuteMsgBuilder {
+  static transferNft = ({
+    recipient,
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    transfer_nft: unknown;
+  }>["transfer_nft"]>): ExecuteMsgForEmpty => {
+    return {
+      transfer_nft: ({
+        recipient,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static sendNft = ({
+    contract,
+    msg,
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    send_nft: unknown;
+  }>["send_nft"]>): ExecuteMsgForEmpty => {
+    return {
+      send_nft: ({
+        contract,
+        msg,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approve = ({
+    expires,
+    spender,
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    approve: unknown;
+  }>["approve"]>): ExecuteMsgForEmpty => {
+    return {
+      approve: ({
+        expires,
+        spender,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static revoke = ({
+    spender,
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    revoke: unknown;
+  }>["revoke"]>): ExecuteMsgForEmpty => {
+    return {
+      revoke: ({
+        spender,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approveAll = ({
+    expires,
+    operator
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    approve_all: unknown;
+  }>["approve_all"]>): ExecuteMsgForEmpty => {
+    return {
+      approve_all: ({
+        expires,
+        operator
+      } as const)
+    };
+  };
+  static revokeAll = ({
+    operator
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    revoke_all: unknown;
+  }>["revoke_all"]>): ExecuteMsgForEmpty => {
+    return {
+      revoke_all: ({
+        operator
+      } as const)
+    };
+  };
+  static mint = ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    mint: unknown;
+  }>["mint"]>): ExecuteMsgForEmpty => {
+    return {
+      mint: ({
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      } as const)
+    };
+  };
+  static burn = ({
+    tokenId
+  }: CamelCasedProperties<Extract<ExecuteMsgForEmpty, {
+    burn: unknown;
+  }>["burn"]>): ExecuteMsgForEmpty => {
+    return {
+      burn: ({
+        token_id: tokenId
+      } as const)
+    };
+  };
+}
+export abstract class Sg721QueryMsgBuilder {
+  static ownerOf = ({
+    includeExpired,
+    tokenId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    owner_of: unknown;
+  }>["owner_of"]>): QueryMsg => {
+    return {
+      owner_of: ({
+        include_expired: includeExpired,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approval = ({
+    includeExpired,
+    spender,
+    tokenId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    approval: unknown;
+  }>["approval"]>): QueryMsg => {
+    return {
+      approval: ({
+        include_expired: includeExpired,
+        spender,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static approvals = ({
+    includeExpired,
+    tokenId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    approvals: unknown;
+  }>["approvals"]>): QueryMsg => {
+    return {
+      approvals: ({
+        include_expired: includeExpired,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static allOperators = ({
+    includeExpired,
+    limit,
+    owner,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    all_operators: unknown;
+  }>["all_operators"]>): QueryMsg => {
+    return {
+      all_operators: ({
+        include_expired: includeExpired,
+        limit,
+        owner,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static numTokens = (): QueryMsg => {
+    return {
+      num_tokens: ({} as const)
+    };
+  };
+  static contractInfo = (): QueryMsg => {
+    return {
+      contract_info: ({} as const)
+    };
+  };
+  static nftInfo = ({
+    tokenId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    nft_info: unknown;
+  }>["nft_info"]>): QueryMsg => {
+    return {
+      nft_info: ({
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static allNftInfo = ({
+    includeExpired,
+    tokenId
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    all_nft_info: unknown;
+  }>["all_nft_info"]>): QueryMsg => {
+    return {
+      all_nft_info: ({
+        include_expired: includeExpired,
+        token_id: tokenId
+      } as const)
+    };
+  };
+  static tokens = ({
+    limit,
+    owner,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    tokens: unknown;
+  }>["tokens"]>): QueryMsg => {
+    return {
+      tokens: ({
+        limit,
+        owner,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static allTokens = ({
+    limit,
+    startAfter
+  }: CamelCasedProperties<Extract<QueryMsg, {
+    all_tokens: unknown;
+  }>["all_tokens"]>): QueryMsg => {
+    return {
+      all_tokens: ({
+        limit,
+        start_after: startAfter
+      } as const)
+    };
+  };
+  static minter = (): QueryMsg => {
+    return {
+      minter: ({} as const)
+    };
+  };
+  static collectionInfo = (): QueryMsg => {
+    return {
+      collection_info: ({} as const)
+    };
+  };
+}
\ No newline at end of file
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index b405a89f..8cfa79d1 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -76,7 +76,6 @@ export interface Sg721Message {
 export class Sg721MessageComposer implements Sg721Message {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -89,7 +88,6 @@ export class Sg721MessageComposer implements Sg721Message {
     this.mint = this.mint.bind(this);
     this.burn = this.burn.bind(this);
   }
-
   transferNft = ({
     recipient,
     tokenId
diff --git a/__output__/vectis/factory-optional-client/Factory.react-query.ts b/__output__/vectis/factory-optional-client/Factory.react-query.ts
index 1f00b810..918a5c63 100644
--- a/__output__/vectis/factory-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-optional-client/Factory.react-query.ts
@@ -18,7 +18,8 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -27,7 +28,8 @@ export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -36,7 +38,8 @@ export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -52,7 +55,8 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
 }: FactoryCodeIdQuery<TData>) {
   return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
     ty: args.ty
-  }) : Promise.reject(new Error("Invalid client")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -72,7 +76,8 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
-  }) : Promise.reject(new Error("Invalid client")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -90,7 +95,8 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error("Invalid client")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
index 812d7ffc..fc93c6b6 100644
--- a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
@@ -11,30 +11,37 @@ export const factoryQueryKeys = {
   contract: ([{
     contract: "factory"
   }] as const),
-  address: (contractAddress: string | undefined) => ([{ ...factoryQueryKeys.contract[0],
+  address: (contractAddress: string | undefined) => ([{
+    ...factoryQueryKeys.contract[0],
     address: contractAddress
   }] as const),
-  wallets: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  wallets: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets",
     args
   }] as const),
-  walletsOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  walletsOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets_of",
     args
   }] as const),
-  codeId: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  codeId: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "code_id",
     args
   }] as const),
-  fee: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  fee: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "fee",
     args
   }] as const),
-  govecAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  govecAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "govec_addr",
     args
   }] as const),
-  adminAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  adminAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "admin_addr",
     args
   }] as const)
@@ -50,7 +57,8 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client?.contractAddress), () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client?.contractAddress), () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -59,7 +67,8 @@ export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client?.contractAddress), () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), { ...options,
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client?.contractAddress), () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -68,7 +77,8 @@ export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client?.contractAddress), () => client ? client.fee() : Promise.reject(new Error("Invalid client")), { ...options,
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client?.contractAddress), () => client ? client.fee() : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -84,7 +94,8 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
 }: FactoryCodeIdQuery<TData>) {
   return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client?.contractAddress, args), () => client ? client.codeId({
     ty: args.ty
-  }) : Promise.reject(new Error("Invalid client")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -104,7 +115,8 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
-  }) : Promise.reject(new Error("Invalid client")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
@@ -122,7 +134,8 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client?.contractAddress, args), () => client ? client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error("Invalid client")), { ...options,
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
     enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
   });
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index f49b6b05..220f0ab8 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -11,30 +11,37 @@ export const factoryQueryKeys = {
   contract: ([{
     contract: "factory"
   }] as const),
-  address: (contractAddress: string) => ([{ ...factoryQueryKeys.contract[0],
+  address: (contractAddress: string) => ([{
+    ...factoryQueryKeys.contract[0],
     address: contractAddress
   }] as const),
-  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets",
     args
   }] as const),
-  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "wallets_of",
     args
   }] as const),
-  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "code_id",
     args
   }] as const),
-  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "fee",
     args
   }] as const),
-  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "govec_addr",
     args
   }] as const),
-  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{ ...factoryQueryKeys.address(contractAddress)[0],
+  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
     method: "admin_addr",
     args
   }] as const)
diff --git a/__output__/vectis/factory/Factory.client.ts b/__output__/vectis/factory/Factory.client.ts
index 7ef4e86f..3519112a 100644
--- a/__output__/vectis/factory/Factory.client.ts
+++ b/__output__/vectis/factory/Factory.client.ts
@@ -37,7 +37,6 @@ export interface FactoryReadOnlyInterface {
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
@@ -48,7 +47,6 @@ export class FactoryQueryClient implements FactoryReadOnlyInterface {
     this.govecAddr = this.govecAddr.bind(this);
     this.adminAddr = this.adminAddr.bind(this);
   }
-
   wallets = async ({
     limit,
     startAfter
@@ -156,7 +154,6 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -170,7 +167,6 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = async ({
     createWalletMsg
   }: {
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index 9b9ae7c4..ef38fb4c 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -56,7 +56,6 @@ export interface FactoryMessage {
 export class FactoryMessageComposer implements FactoryMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -68,7 +67,6 @@ export class FactoryMessageComposer implements FactoryMessage {
     this.updateGovecAddr = this.updateGovecAddr.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
   }
-
   createWallet = ({
     createWalletMsg
   }: {
diff --git a/__output__/vectis/govec/Govec.client.ts b/__output__/vectis/govec/Govec.client.ts
index 0e457046..47431fc8 100644
--- a/__output__/vectis/govec/Govec.client.ts
+++ b/__output__/vectis/govec/Govec.client.ts
@@ -19,14 +19,12 @@ export interface GovecReadOnlyInterface {
 export class GovecQueryClient implements GovecReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.info = this.info.bind(this);
     this.canExecuteRelay = this.canExecuteRelay.bind(this);
   }
-
   info = async (): Promise<InfoResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       info: {}
@@ -90,7 +88,6 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -105,7 +102,6 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     this.updateGuardians = this.updateGuardians.bind(this);
     this.updateLabel = this.updateLabel.bind(this);
   }
-
   execute = async ({
     msgs
   }: {
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index 404dda41..579faa6b 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -53,7 +53,6 @@ export interface GovecMessage {
 export class GovecMessageComposer implements GovecMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -66,7 +65,6 @@ export class GovecMessageComposer implements GovecMessage {
     this.updateGuardians = this.updateGuardians.bind(this);
     this.updateLabel = this.updateLabel.bind(this);
   }
-
   execute = ({
     msgs
   }: {
diff --git a/__output__/vectis/proxy/Proxy.client.ts b/__output__/vectis/proxy/Proxy.client.ts
index 39b36049..19998e28 100644
--- a/__output__/vectis/proxy/Proxy.client.ts
+++ b/__output__/vectis/proxy/Proxy.client.ts
@@ -19,14 +19,12 @@ export interface ProxyReadOnlyInterface {
 export class ProxyQueryClient implements ProxyReadOnlyInterface {
   client: CosmWasmClient;
   contractAddress: string;
-
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.info = this.info.bind(this);
     this.canExecuteRelay = this.canExecuteRelay.bind(this);
   }
-
   info = async (): Promise<InfoResponse> => {
     return this.client.queryContractSmart(this.contractAddress, {
       info: {}
@@ -90,7 +88,6 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   client: SigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
@@ -105,7 +102,6 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     this.updateGuardians = this.updateGuardians.bind(this);
     this.updateLabel = this.updateLabel.bind(this);
   }
-
   execute = async ({
     msgs
   }: {
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index 29ad852e..69486527 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -53,7 +53,6 @@ export interface ProxyMessage {
 export class ProxyMessageComposer implements ProxyMessage {
   sender: string;
   contractAddress: string;
-
   constructor(sender: string, contractAddress: string) {
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -66,7 +65,6 @@ export class ProxyMessageComposer implements ProxyMessage {
     this.updateGuardians = this.updateGuardians.bind(this);
     this.updateLabel = this.updateLabel.bind(this);
   }
-
   execute = ({
     msgs
   }: {
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 692ee668..756af964 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -2,6 +2,7 @@ import { readSchemas } from '../src/utils';
 import generateTypes from '../src/generators/types';
 import generateClient from '../src/generators/client';
 import generateMessageComposer from '../src/generators/message-composer';
+import generateMessageBuilder from '../src/generators/message-builder';
 import generateReactQuery from '../src/generators/react-query';
 import generateRecoil from '../src/generators/recoil';
 
@@ -36,12 +37,12 @@ it('queryKeys', async () => {
 })
 
 it('queryFactory', async () => {
-  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
-  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-  const contractInfo = await readSchemas({
-    schemaDir
-  });
-  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
+    const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
+    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+    const contractInfo = await readSchemas({
+        schemaDir
+    });
+    await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
 })
 
 
@@ -129,6 +130,7 @@ it('sg721', async () => {
     await generateTypes('Sg721', contractInfo, out);
     await generateClient('Sg721', contractInfo, out);
     await generateMessageComposer('Sg721', contractInfo, out);
+    await generateMessageBuilder('Sg721', contractInfo, out);
     await generateRecoil('Sg721', contractInfo, out);
     await generateReactQuery('Sg721', contractInfo, out);
 })
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 9baa74a1..1a9875aa 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -13,7 +13,7 @@
     "directory": "dist"
   },
   "bin": {
-    "cosmwasm-ts-codegen": "main/ts-codegen.js"
+    "cosmwasm-ts-codegen": "ts-codegen.js"
   },
   "scripts": {
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
diff --git a/packages/ts-codegen/src/generators/msg-builder.ts b/packages/ts-codegen/src/generators/message-builder.ts
similarity index 100%
rename from packages/ts-codegen/src/generators/msg-builder.ts
rename to packages/ts-codegen/src/generators/message-builder.ts
diff --git a/packages/ts-codegen/src/index.ts b/packages/ts-codegen/src/index.ts
index f037df7b..91e984ef 100644
--- a/packages/ts-codegen/src/index.ts
+++ b/packages/ts-codegen/src/index.ts
@@ -3,6 +3,7 @@ import { TSBuilder, TSBuilderInput } from './builder';
 export { default as generateTypes } from './generators/types';
 export { default as generateClient } from './generators/client';
 export { default as generateMessageComposer } from './generators/message-composer';
+export { default as generateMessageBuilder } from './generators/message-builder';
 export { default as generateReactQuery } from './generators/react-query';
 export { default as generateRecoil } from './generators/recoil';
 
diff --git a/yarn.lock b/yarn.lock
index c556db3e..1cd56560 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,7 +7,7 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
+"@ampproject/remapping@^2.2.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
   integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
@@ -15,23 +15,7 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/cli@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a"
-  integrity sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.8"
-    commander "^4.0.1"
-    convert-source-map "^1.1.0"
-    fs-readdir-recursive "^1.1.0"
-    glob "^7.2.0"
-    make-dir "^2.1.0"
-    slash "^2.0.0"
-  optionalDependencies:
-    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
-    chokidar "^3.4.0"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
   version "7.24.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
   integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
@@ -39,32 +23,11 @@
     "@babel/highlight" "^7.24.2"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.23.5":
+"@babel/compat-data@^7.23.5":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
   integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
-"@babel/core@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
-  integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.10"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.10"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.18.10"
-    "@babel/types" "^7.18.10"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
 "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
@@ -86,25 +49,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/eslint-parser@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32"
-  integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ==
-  dependencies:
-    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
-    eslint-visitor-keys "^2.1.0"
-    semver "^6.3.1"
-
-"@babel/generator@7.18.12":
-  version "7.18.12"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4"
-  integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==
-  dependencies:
-    "@babel/types" "^7.18.10"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.18.10", "@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
+"@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
   integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
@@ -114,21 +59,7 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
-  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.23.6":
+"@babel/helper-compilation-targets@^7.23.6":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
   integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
@@ -139,48 +70,12 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3"
-  integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.24.1"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    semver "^6.3.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
-  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
-
-"@babel/helper-define-polyfill-provider@^0.3.2", "@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
-
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20":
+"@babel/helper-environment-visitor@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -188,28 +83,21 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
-"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
+"@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
   integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
-  dependencies:
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.1":
+"@babel/helper-module-imports@^7.22.15":
   version "7.24.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
   integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
   dependencies:
     "@babel/types" "^7.24.0"
 
-"@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.23.3":
+"@babel/helper-module-transforms@^7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
   integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
@@ -220,36 +108,11 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
   integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
 
-"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
-  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
-
-"@babel/helper-replace-supers@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1"
-  integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
@@ -257,14 +120,7 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
@@ -281,21 +137,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.23.5":
+"@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
-  dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
-
-"@babel/helpers@^7.18.9", "@babel/helpers@^7.24.4":
+"@babel/helpers@^7.24.4":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
   integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
@@ -314,192 +161,11 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/node@^7.18.10":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.23.9.tgz#fc40dc371439f1a45535ebf515232f4f046ef7a9"
-  integrity sha512-/d4ju/POwlGIJlZ+NqWH1qu61wt6ZlTZZZutrK2MOSdaH1JCh726nLw/GSvAjG+LTY6CO9SsB8uWcttnFKm6yg==
-  dependencies:
-    "@babel/register" "^7.23.7"
-    commander "^4.0.1"
-    core-js "^3.30.2"
-    node-environment-flags "^1.0.5"
-    regenerator-runtime "^0.14.0"
-    v8flags "^3.1.1"
-
-"@babel/parser@7.18.11":
-  version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9"
-  integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
   integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz#b645d9ba8c2bc5b7af50f0fe949f9edbeb07c8cf"
-  integrity sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz#da8261f2697f0f41b0855b91d3a20a1fbfd271d3"
-  integrity sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.24.1"
-
-"@babel/plugin-proposal-async-generator-functions@^7.18.10":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-default-from@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.18.10.tgz#091f4794dbce4027c03cf4ebc64d3fb96b75c206"
-  integrity sha512-5H2N3R2aQFxkV4PIBUR/i7PUSwgTZjouJKzI8eKswfIjT0PhvzkPn0t0wIS5zn6maQuvtT0t1oHtMUz61LOuow==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-default-from" "^7.18.6"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
-  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
-  integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
-  dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.18.8"
-
-"@babel/plugin-proposal-object-rest-spread@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.18.9":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
-  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-private-methods@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
-  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.21.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
-  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
-  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -514,48 +180,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-export-default-from@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.1.tgz#a92852e694910ae4295e6e51e87b83507ed5e6e8"
-  integrity sha512-cNXSxv9eTkGUtd0PsNMK8Yx5xeScxfpWOUAxE+ZPAXXEcAMOC3fk7LRdXq5fvpra2pLx2p1YtkAhpUbB2SwaRA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-import-assertions@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971"
-  integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -570,14 +201,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.24.1", "@babel/plugin-syntax-jsx@^7.7.2":
+"@babel/plugin-syntax-jsx@^7.7.2":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
   integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -591,7 +222,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
@@ -619,436 +250,28 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.24.1", "@babel/plugin-syntax-typescript@^7.7.2":
+"@babel/plugin-syntax-typescript@^7.7.2":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844"
   integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-arrow-functions@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27"
-  integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-async-to-generator@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz#0e220703b89f2216800ce7b1c53cb0cf521c37f4"
-  integrity sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.24.1"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz#1c94799e20fcd5c4d4589523bbc57b7692979380"
-  integrity sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-block-scoping@^7.18.9":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012"
-  integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-classes@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1"
-  integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-replace-supers" "^7.24.1"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz#bc7e787f8e021eccfb677af5f13c29a9934ed8a7"
-  integrity sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/template" "^7.24.0"
-
-"@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345"
-  integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz#d56913d2f12795cc9930801b84c6f8c47513ac13"
-  integrity sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz#5347a797fe82b8d09749d10e9f5b83665adbca88"
-  integrity sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz#6650ebeb5bd5c012d5f5f90a26613a08162e8ba4"
-  integrity sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-for-of@^7.18.8":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz#67448446b67ab6c091360ce3717e7d3a59e202fd"
-  integrity sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-
-"@babel/plugin-transform-function-name@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz#8cba6f7730626cc4dfe4ca2fa516215a0592b361"
-  integrity sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-literals@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz#0a1982297af83e6b3c94972686067df588c5c096"
-  integrity sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz#896d23601c92f437af8b01371ad34beb75df4489"
-  integrity sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-modules-amd@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz#b6d829ed15258536977e9c7cc6437814871ffa39"
-  integrity sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.18.6", "@babel/plugin-transform-modules-commonjs@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9"
-  integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-simple-access" "^7.22.5"
-
-"@babel/plugin-transform-modules-systemjs@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz#2b9625a3d4e445babac9788daec39094e6b11e3e"
-  integrity sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz#69220c66653a19cf2c0872b9c762b9a48b8bebef"
-  integrity sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
-  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz#29c59988fa3d0157de1c871a28cd83096363cc34"
-  integrity sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-object-super@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz#e71d6ab13483cca89ed95a474f542bbfc20a0520"
-  integrity sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-replace-supers" "^7.24.1"
-
-"@babel/plugin-transform-optional-chaining@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6"
-  integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-transform-parameters@^7.18.8", "@babel/plugin-transform-parameters@^7.20.7":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510"
-  integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz#d6a9aeab96f03749f4eebeb0b6ea8e90ec958825"
-  integrity sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz#625b7545bae52363bdc1fbbdc7252b5046409c8c"
-  integrity sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    regenerator-transform "^0.15.2"
-
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz#8de729f5ecbaaf5cf83b67de13bad38a21be57c1"
-  integrity sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-runtime@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
-  integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
-    semver "^6.3.0"
-
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55"
-  integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-spread@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz#a1acf9152cbf690e4da0ba10790b3ac7d2b2b391"
-  integrity sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz#f03e672912c6e203ed8d6e0271d9c2113dc031b9"
-  integrity sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7"
-  integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7"
-  integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-typescript@^7.24.1":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz#03e0492537a4b953e491f53f2bc88245574ebd15"
-  integrity sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.24.4"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/plugin-syntax-typescript" "^7.24.1"
-
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz#fb3fa16676549ac7c7449db9b342614985c2a3a4"
-  integrity sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz#57c3c191d68f998ac46b708380c1ce4d13536385"
-  integrity sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
-"@babel/preset-env@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
-  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
-  dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.18.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.18.9"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.18.6"
-    "@babel/plugin-transform-async-to-generator" "^7.18.6"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.18.9"
-    "@babel/plugin-transform-classes" "^7.18.9"
-    "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.18.9"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.18.8"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.18.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.18.8"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.18.6"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.18.9"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.10"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
-    core-js-compat "^3.22.1"
-    semver "^6.3.0"
-
-"@babel/preset-modules@^0.1.5":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
-  integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/preset-typescript@^7.18.6":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec"
-  integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-validator-option" "^7.23.5"
-    "@babel/plugin-syntax-jsx" "^7.24.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.24.1"
-    "@babel/plugin-transform-typescript" "^7.24.1"
-
-"@babel/register@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.23.7.tgz#485a5e7951939d21304cae4af1719fdb887bc038"
-  integrity sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==
-  dependencies:
-    clone-deep "^4.0.1"
-    find-cache-dir "^2.0.0"
-    make-dir "^2.1.0"
-    pirates "^4.0.6"
-    source-map-support "^0.5.16"
-
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.18.9", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.11.2":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
   integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3":
+"@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
   integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
@@ -1057,23 +280,7 @@
     "@babel/parser" "^7.24.0"
     "@babel/types" "^7.24.0"
 
-"@babel/traverse@7.18.11":
-  version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f"
-  integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.10"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.11"
-    "@babel/types" "^7.18.10"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.24.1", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
   integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
@@ -1098,7 +305,7 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
   integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
@@ -1272,21 +479,6 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
-  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.4.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
 "@eslint/eslintrc@^2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
@@ -1312,15 +504,6 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.10.4":
-  version "0.10.7"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
-  integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
-
 "@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
@@ -1330,21 +513,11 @@
     debug "^4.3.1"
     minimatch "^3.0.5"
 
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
 "@humanwhocodes/object-schema@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
@@ -1388,18 +561,6 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
-  integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    slash "^3.0.0"
-
 "@jest/console@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
@@ -1412,41 +573,6 @@
     jest-util "^29.7.0"
     slash "^3.0.0"
 
-"@jest/core@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7"
-  integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/reporters" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-changed-files "^28.1.3"
-    jest-config "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-resolve-dependencies "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    jest-watcher "^28.1.3"
-    micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
-
 "@jest/core@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
@@ -1481,16 +607,6 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e"
-  integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==
-  dependencies:
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    jest-mock "^28.1.3"
-
 "@jest/environment@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
@@ -1501,13 +617,6 @@
     "@types/node" "*"
     jest-mock "^29.7.0"
 
-"@jest/expect-utils@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
-  integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==
-  dependencies:
-    jest-get-type "^28.0.2"
-
 "@jest/expect-utils@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
@@ -1515,14 +624,6 @@
   dependencies:
     jest-get-type "^29.6.3"
 
-"@jest/expect@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72"
-  integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==
-  dependencies:
-    expect "^28.1.3"
-    jest-snapshot "^28.1.3"
-
 "@jest/expect@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
@@ -1531,18 +632,6 @@
     expect "^29.7.0"
     jest-snapshot "^29.7.0"
 
-"@jest/fake-timers@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e"
-  integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@sinonjs/fake-timers" "^9.1.2"
-    "@types/node" "*"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
-
 "@jest/fake-timers@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
@@ -1555,15 +644,6 @@
     jest-mock "^29.7.0"
     jest-util "^29.7.0"
 
-"@jest/globals@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333"
-  integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/types" "^28.1.3"
-
 "@jest/globals@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
@@ -1574,37 +654,6 @@
     "@jest/types" "^29.6.3"
     jest-mock "^29.7.0"
 
-"@jest/reporters@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a"
-  integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^5.1.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^9.0.1"
-
 "@jest/reporters@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
@@ -1635,13 +684,6 @@
     strip-ansi "^6.0.0"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
-  integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
-  dependencies:
-    "@sinclair/typebox" "^0.24.1"
-
 "@jest/schemas@^29.4.3", "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -1649,15 +691,6 @@
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
-"@jest/source-map@^28.1.2":
-  version "28.1.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24"
-  integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.13"
-    callsites "^3.0.0"
-    graceful-fs "^4.2.9"
-
 "@jest/source-map@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
@@ -1667,16 +700,6 @@
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
 
-"@jest/test-result@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
-  integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
 "@jest/test-result@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
@@ -1687,16 +710,6 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3"
-  integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==
-  dependencies:
-    "@jest/test-result" "^28.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    slash "^3.0.0"
-
 "@jest/test-sequencer@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
@@ -1707,27 +720,6 @@
     jest-haste-map "^29.7.0"
     slash "^3.0.0"
 
-"@jest/transform@28.1.3", "@jest/transform@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
-  integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
-    slash "^3.0.0"
-    write-file-atomic "^4.0.1"
-
 "@jest/transform@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
@@ -1749,18 +741,6 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
-"@jest/types@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
-  integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
 "@jest/types@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
@@ -1773,7 +753,7 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+"@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
   integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
@@ -1805,7 +785,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.8":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -1914,18 +894,6 @@
     write-pkg "4.0.0"
     yargs "16.2.0"
 
-"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
-  version "2.1.8-no-fsevents.3"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
-  integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
-
-"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
-  version "5.1.1-v1"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
-  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
-  dependencies:
-    eslint-scope "5.1.1"
-
 "@noble/hashes@^1", "@noble/hashes@^1.0.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
@@ -2448,23 +1416,11 @@
     "@sigstore/protobuf-specs" "^0.2.0"
     tuf-js "^1.1.7"
 
-"@sinclair/typebox@^0.24.1":
-  version "0.24.51"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
-  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
-
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
-  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
-  dependencies:
-    type-detect "4.0.8"
-
 "@sinonjs/commons@^3.0.0":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
@@ -2479,13 +1435,6 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@sinonjs/fake-timers@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
-  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
 "@tootallnate/once@2":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
@@ -2615,14 +1564,6 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/jest@^28.1.6":
-  version "28.1.8"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.8.tgz#6936409f3c9724ea431efd412ea0238a0f03b09b"
-  integrity sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==
-  dependencies:
-    expect "^28.0.0"
-    pretty-format "^28.0.0"
-
 "@types/json-schema@^7.0.11", "@types/json-schema@^7.0.12":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
@@ -2677,7 +1618,7 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
   integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
-"@types/prettier@^2.1.5", "@types/prettier@^2.6.1":
+"@types/prettier@^2.6.1":
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
   integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
@@ -2899,7 +1840,7 @@ aggregate-error@^4.0.0:
     clean-stack "^4.0.0"
     indent-string "^5.0.0"
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2990,7 +1931,7 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -3033,14 +1974,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-buffer-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
-  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
-  dependencies:
-    call-bind "^1.0.5"
-    is-array-buffer "^3.0.4"
-
 array-differ@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
@@ -3056,33 +1989,6 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.reduce@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz#6aadc2f995af29cb887eb866d981dc85ab6f7dc7"
-  integrity sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-array-method-boxes-properly "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    is-string "^1.0.7"
-
-arraybuffer.prototype.slice@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
-  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.2.1"
-    get-intrinsic "^1.2.3"
-    is-array-buffer "^3.0.4"
-    is-shared-array-buffer "^1.0.2"
-
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -3115,13 +2021,6 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-available-typed-arrays@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
-  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
-  dependencies:
-    possible-typed-array-names "^1.0.0"
-
 axios@^0.21.2:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
@@ -3138,24 +2037,6 @@ axios@^1.0.0:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-babel-core@7.0.0-bridge.0:
-  version "7.0.0-bridge.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
-  integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
-
-babel-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
-  integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
-  dependencies:
-    "@jest/transform" "^28.1.3"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^28.1.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
 babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -3180,16 +2061,6 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
-  integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.1.14"
-    "@types/babel__traverse" "^7.0.6"
-
 babel-plugin-jest-hoist@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
@@ -3200,30 +2071,6 @@ babel-plugin-jest-hoist@^29.6.3:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
-  dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
-
-babel-plugin-polyfill-corejs3@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
-  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    core-js-compat "^3.21.0"
-
-babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
@@ -3242,14 +2089,6 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
-  integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
-  dependencies:
-    babel-plugin-jest-hoist "^28.1.3"
-    babel-preset-current-node-syntax "^1.0.0"
-
 babel-preset-jest@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
@@ -3258,22 +2097,6 @@ babel-preset-jest@^29.6.3:
     babel-plugin-jest-hoist "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
 
-babel-watch@^7.0.0:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/babel-watch/-/babel-watch-7.8.1.tgz#3be4016d61bfefae9522c116ef9ba209088e6498"
-  integrity sha512-TnAlLAaorqMruh3BaTiXbbuv/b8iHqqvlljaWkCCJQLRsVFn7nUKO+38+DGxEaFvlj/IgIlQlx+DMirxSHiC4g==
-  dependencies:
-    chalk "^4.1.0"
-    chokidar "^3.4.3"
-    commander "^6.2.0"
-    debug "^4.3.1"
-    lodash.debounce "^4.0.8"
-    lodash.isregexp "^4.0.1"
-    lodash.isstring "^4.0.1"
-    signal-exit "^4.0.2"
-    source-map-support "^0.5.19"
-    string-argv "^0.3.2"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -3304,11 +2127,6 @@ bin-links@^4.0.1:
     read-cmd-shim "^4.0.0"
     write-file-atomic "^5.0.0"
 
-binary-extensions@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
-  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
-
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -3343,7 +2161,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -3355,7 +2173,7 @@ brorand@^1.1.0:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
-browserslist@^4.22.2, browserslist@^4.23.0:
+browserslist@^4.22.2:
   version "4.23.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
   integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
@@ -3451,17 +2269,6 @@ cacache@^17.0.0, cacache@^17.0.4:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
-call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
-
 call-me-maybe@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
@@ -3562,21 +2369,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^3.4.0, chokidar@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -3672,7 +2464,7 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clone-deep@4.0.1, clone-deep@^4.0.1:
+clone-deep@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
   integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
@@ -3757,26 +2549,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
-commander@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
 common-ancestor-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
   integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
 
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
 compare-func@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
@@ -3895,11 +2672,6 @@ conventional-recommended-bump@6.1.0:
     meow "^8.0.0"
     q "^1.5.1"
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
@@ -3918,18 +2690,6 @@ copyfiles@^2.4.1:
     untildify "^4.0.0"
     yargs "^16.1.0"
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.37.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73"
-  integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA==
-  dependencies:
-    browserslist "^4.23.0"
-
-core-js@^3.30.2:
-  version "3.37.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb"
-  integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==
-
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -3972,14 +2732,7 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-env@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
-  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
-  dependencies:
-    cross-spawn "^7.0.1"
-
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -4011,33 +2764,6 @@ dargs@7.0.0, dargs@^7.0.0:
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
   integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
 
-data-view-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
-  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
-  dependencies:
-    call-bind "^1.0.6"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.1"
-
-data-view-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
-  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.1"
-
-data-view-byte-offset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
-  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
-  dependencies:
-    call-bind "^1.0.6"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.1"
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -4100,7 +2826,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-data-property@^1.0.1, define-data-property@^1.1.4:
+define-data-property@^1.0.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
   integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
@@ -4114,7 +2840,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.1.3:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -4184,11 +2910,6 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-diff-sequences@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
-  integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
-
 diff-sequences@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
@@ -4267,11 +2988,6 @@ elliptic@^6.5.4:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
-emittery@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
-  integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
-
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
@@ -4330,63 +3046,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
-  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    arraybuffer.prototype.slice "^1.0.3"
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    data-view-buffer "^1.0.1"
-    data-view-byte-length "^1.0.1"
-    data-view-byte-offset "^1.0.0"
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    es-set-tostringtag "^2.0.3"
-    es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.4"
-    get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.0.3"
-    has-symbols "^1.0.3"
-    hasown "^2.0.2"
-    internal-slot "^1.0.7"
-    is-array-buffer "^3.0.4"
-    is-callable "^1.2.7"
-    is-data-view "^1.0.1"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.3"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.13"
-    is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
-    object-keys "^1.1.1"
-    object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
-    safe-array-concat "^1.1.2"
-    safe-regex-test "^1.0.3"
-    string.prototype.trim "^1.2.9"
-    string.prototype.trimend "^1.0.8"
-    string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.2"
-    typed-array-byte-length "^1.0.1"
-    typed-array-byte-offset "^1.0.2"
-    typed-array-length "^1.0.6"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.15"
-
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
@@ -4394,36 +3053,11 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-errors@^1.2.1, es-errors@^1.3.0:
+es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-object-atoms@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
-  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
-  dependencies:
-    es-errors "^1.3.0"
-
-es-set-tostringtag@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
-  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
   version "0.10.64"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
@@ -4486,23 +3120,11 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^8.5.0:
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
-  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
-
 eslint-config-prettier@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
   integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
 
-eslint-plugin-prettier@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
-  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
-  dependencies:
-    prettier-linter-helpers "^1.0.0"
-
 eslint-plugin-simple-import-sort@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
@@ -4520,15 +3142,7 @@ eslint-rule-composer@^0.3.0:
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
-eslint-scope@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.1.1, eslint-scope@^7.2.2:
+eslint-scope@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
@@ -4536,68 +3150,11 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
 eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@8.21.0:
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef"
-  integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==
-  dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.10.4"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.3"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
-    globby "^11.1.0"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
 eslint@^8.56.0:
   version "8.57.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
@@ -4652,7 +3209,7 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^9.3.3, espree@^9.4.0, espree@^9.6.0, espree@^9.6.1:
+espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -4666,7 +3223,7 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0, esquery@^1.4.2:
+esquery@^1.4.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -4680,11 +3237,6 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -4743,17 +3295,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
-expect@^28.0.0, expect@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
-  integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
-  dependencies:
-    "@jest/expect-utils" "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-
 expect@^29.0.0, expect@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
@@ -4800,11 +3341,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-diff@^1.1.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
-  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
-
 fast-glob@3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
@@ -4891,15 +3427,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-cache-dir@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
 find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -4915,13 +3442,6 @@ find-up@^2.0.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -4954,13 +3474,6 @@ follow-redirects@^1.14.0, follow-redirects@^1.15.6:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
 foreground-child@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
@@ -5016,17 +3529,12 @@ fs-minipass@^3.0.0:
   dependencies:
     minipass "^7.0.3"
 
-fs-readdir-recursive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
-  integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -5036,26 +3544,6 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
-  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    functions-have-names "^1.2.3"
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
-functions-have-names@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
 fuzzy@0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
@@ -5099,7 +3587,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
   integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
@@ -5145,15 +3633,6 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
-  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
-  dependencies:
-    call-bind "^1.0.5"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-
 git-raw-commits@^2.0.8:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
@@ -5203,14 +3682,14 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@5.1.2, glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1, glob-parent@^6.0.2:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -5269,7 +3748,7 @@ glob@^10.0.0, glob@^10.2.2:
     minipass "^7.0.4"
     path-scurry "^1.10.2"
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -5296,14 +3775,14 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0, globals@^13.19.0:
+globals@^13.19.0:
   version "13.24.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
   integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.1, globalthis@^1.0.3:
+globalthis@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
@@ -5350,11 +3829,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -5384,11 +3858,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5399,30 +3868,23 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
+has-property-descriptors@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
   integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
   dependencies:
     es-define-property "^1.0.0"
 
-has-proto@^1.0.1, has-proto@^1.0.3:
+has-proto@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
   integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
 
-has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
-  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
-  dependencies:
-    has-symbols "^1.0.3"
-
 has-unicode@2.0.1, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -5436,7 +3898,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
+hasown@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -5452,13 +3914,6 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -5569,7 +4024,7 @@ ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5744,15 +4199,6 @@ inquirerer@0.1.3:
     inquirer "^6.0.0"
     inquirer-autocomplete-prompt "^0.11.1"
 
-internal-slot@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
-  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
-  dependencies:
-    es-errors "^1.3.0"
-    hasown "^2.0.0"
-    side-channel "^1.0.4"
-
 interpret@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
@@ -5766,46 +4212,11 @@ ip-address@^9.0.5:
     jsbn "1.1.0"
     sprintf-js "^1.1.3"
 
-is-array-buffer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
-  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
 is-ci@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -5820,20 +4231,6 @@ is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
   dependencies:
     hasown "^2.0.0"
 
-is-data-view@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
-  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
-  dependencies:
-    is-typed-array "^1.1.13"
-
-is-date-object@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
@@ -5859,7 +4256,7 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -5876,18 +4273,6 @@ is-lambda@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
   integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
-is-negative-zero@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
-  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
-
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -5940,21 +4325,6 @@ is-promise@^2.2.2:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
-  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
-  dependencies:
-    call-bind "^1.0.7"
-
 is-ssh@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
@@ -5972,20 +4342,6 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
 is-text-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
@@ -5993,25 +4349,11 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
-  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
-  dependencies:
-    which-typed-array "^1.1.14"
-
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
-  dependencies:
-    call-bind "^1.0.2"
-
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -6024,11 +4366,6 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -6054,7 +4391,7 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
   integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
-istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
+istanbul-lib-instrument@^5.0.4:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
   integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
@@ -6121,14 +4458,6 @@ jake@^10.8.5:
     filelist "^1.0.4"
     minimatch "^3.1.2"
 
-jest-changed-files@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831"
-  integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==
-  dependencies:
-    execa "^5.0.0"
-    p-limit "^3.1.0"
-
 jest-changed-files@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
@@ -6138,31 +4467,6 @@ jest-changed-files@^29.7.0:
     jest-util "^29.7.0"
     p-limit "^3.1.0"
 
-jest-circus@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4"
-  integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    dedent "^0.7.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    p-limit "^3.1.0"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
 jest-circus@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
@@ -6189,24 +4493,6 @@ jest-circus@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-cli@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2"
-  integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==
-  dependencies:
-    "@jest/core" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    import-local "^3.0.2"
-    jest-config "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    prompts "^2.0.1"
-    yargs "^17.3.1"
-
 jest-cli@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
@@ -6224,34 +4510,6 @@ jest-cli@^29.7.0:
     jest-validate "^29.7.0"
     yargs "^17.3.1"
 
-jest-config@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60"
-  integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    babel-jest "^28.1.3"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-circus "^28.1.3"
-    jest-environment-node "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    micromatch "^4.0.4"
-    parse-json "^5.2.0"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    strip-json-comments "^3.1.1"
-
 jest-config@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
@@ -6280,16 +4538,6 @@ jest-config@^29.7.0:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
-  integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^28.1.1"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
 jest-diff@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
@@ -6300,30 +4548,12 @@ jest-diff@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-docblock@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8"
-  integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==
-  dependencies:
-    detect-newline "^3.0.0"
-
 jest-docblock@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
   integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
   dependencies:
-    detect-newline "^3.0.0"
-
-jest-each@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81"
-  integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    jest-util "^28.1.3"
-    pretty-format "^28.1.3"
+    detect-newline "^3.0.0"
 
 jest-each@^29.7.0:
   version "29.7.0"
@@ -6336,18 +4566,6 @@ jest-each@^29.7.0:
     jest-util "^29.7.0"
     pretty-format "^29.7.0"
 
-jest-environment-node@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5"
-  integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
-
 jest-environment-node@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
@@ -6360,35 +4578,11 @@ jest-environment-node@^29.7.0:
     jest-mock "^29.7.0"
     jest-util "^29.7.0"
 
-jest-get-type@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
-  integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
-
 jest-get-type@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
   integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
-jest-haste-map@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
-  integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/graceful-fs" "^4.1.3"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    micromatch "^4.0.4"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.2"
-
 jest-haste-map@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
@@ -6413,14 +4607,6 @@ jest-in-case@^1.0.2:
   resolved "https://registry.yarnpkg.com/jest-in-case/-/jest-in-case-1.0.2.tgz#56744b5af33222bd0abab70cf919f1d170ab75cc"
   integrity sha512-2DE6Gdwnh5jkCYTePWoQinF+zne3lCADibXoYJEt8PS84JaRug0CyAOrEgzMxbzln3YcSY2PBeru7ct4tbflYA==
 
-jest-leak-detector@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d"
-  integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==
-  dependencies:
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
 jest-leak-detector@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
@@ -6429,16 +4615,6 @@ jest-leak-detector@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-matcher-utils@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
-  integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
 jest-matcher-utils@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
@@ -6449,21 +4625,6 @@ jest-matcher-utils@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-message-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
-  integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^28.1.3"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
 jest-message-util@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
@@ -6479,14 +4640,6 @@ jest-message-util@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da"
-  integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-
 jest-mock@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
@@ -6501,24 +4654,11 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
-jest-regex-util@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
-  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
-
 jest-regex-util@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
   integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
 
-jest-resolve-dependencies@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66"
-  integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==
-  dependencies:
-    jest-regex-util "^28.0.2"
-    jest-snapshot "^28.1.3"
-
 jest-resolve-dependencies@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
@@ -6527,21 +4667,6 @@ jest-resolve-dependencies@^29.7.0:
     jest-regex-util "^29.6.3"
     jest-snapshot "^29.7.0"
 
-jest-resolve@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8"
-  integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==
-  dependencies:
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    resolve "^1.20.0"
-    resolve.exports "^1.1.0"
-    slash "^3.0.0"
-
 jest-resolve@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
@@ -6557,33 +4682,6 @@ jest-resolve@^29.7.0:
     resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1"
-  integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/environment" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.10.2"
-    graceful-fs "^4.2.9"
-    jest-docblock "^28.1.1"
-    jest-environment-node "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-leak-detector "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-resolve "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-util "^28.1.3"
-    jest-watcher "^28.1.3"
-    jest-worker "^28.1.3"
-    p-limit "^3.1.0"
-    source-map-support "0.5.13"
-
 jest-runner@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
@@ -6611,34 +4709,6 @@ jest-runner@^29.7.0:
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f"
-  integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/globals" "^28.1.3"
-    "@jest/source-map" "^28.1.2"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-
 jest-runtime@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
@@ -6667,35 +4737,6 @@ jest-runtime@^29.7.0:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"
-  integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@babel/generator" "^7.7.2"
-    "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/babel__traverse" "^7.0.6"
-    "@types/prettier" "^2.1.5"
-    babel-preset-current-node-syntax "^1.0.0"
-    chalk "^4.0.0"
-    expect "^28.1.3"
-    graceful-fs "^4.2.9"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-haste-map "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    natural-compare "^1.4.0"
-    pretty-format "^28.1.3"
-    semver "^7.3.5"
-
 jest-snapshot@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
@@ -6722,18 +4763,6 @@ jest-snapshot@^29.7.0:
     pretty-format "^29.7.0"
     semver "^7.5.3"
 
-jest-util@^28.0.0, jest-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
-  integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
 jest-util@^29.0.0, jest-util@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
@@ -6746,18 +4775,6 @@ jest-util@^29.0.0, jest-util@^29.7.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df"
-  integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    leven "^3.1.0"
-    pretty-format "^28.1.3"
-
 jest-validate@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
@@ -6770,20 +4787,6 @@ jest-validate@^29.7.0:
     leven "^3.1.0"
     pretty-format "^29.7.0"
 
-jest-watcher@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
-  integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
-  dependencies:
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    emittery "^0.10.2"
-    jest-util "^28.1.3"
-    string-length "^4.0.1"
-
 jest-watcher@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
@@ -6798,15 +4801,6 @@ jest-watcher@^29.7.0:
     jest-util "^29.7.0"
     string-length "^4.0.1"
 
-jest-worker@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
-  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
 jest-worker@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
@@ -6817,16 +4811,6 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b"
-  integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==
-  dependencies:
-    "@jest/core" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    import-local "^3.0.2"
-    jest-cli "^28.1.3"
-
 jest@^29.6.2:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
@@ -6867,11 +4851,6 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
-
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -6912,7 +4891,7 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^2.2.1, json5@^2.2.2, json5@^2.2.3:
+json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -7132,14 +5111,6 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -7154,26 +5125,11 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
-lodash.isregexp@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz#e13e647b30cd559752a04cd912086faf7da1c30b"
-  integrity sha512-rw9+95tYcUa9nQ1FgdtKvO+hReLGNqnNMHfLq8SwK5Mo6D0R0tIsnRHGHaTHSKeYBaLCJ1JvXWdz4UmpPZ2bag==
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
-
 lodash.memoize@4.x:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -7240,7 +5196,7 @@ make-dir@3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-dir@^2.0.0, make-dir@^2.1.0:
+make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -7679,14 +5635,6 @@ node-addon-api@^3.2.1:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
-node-environment-flags@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
 node-fetch@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -7795,7 +5743,7 @@ normalize-package-data@^5.0.0:
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
+normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -8014,39 +5962,11 @@ object-assign@^4.0.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
-
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
-  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
-  dependencies:
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923"
-  integrity sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==
-  dependencies:
-    array.prototype.reduce "^1.0.6"
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-object-atoms "^1.0.0"
-    gopd "^1.0.1"
-    safe-array-concat "^1.1.2"
-
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -8077,7 +5997,7 @@ open@^8.4.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-optionator@^0.9.1, optionator@^0.9.3:
+optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
   integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
@@ -8121,7 +6041,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -8142,13 +6062,6 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -8316,11 +6229,6 @@ parse-package-name@1.0.0:
   resolved "https://registry.yarnpkg.com/parse-package-name/-/parse-package-name-1.0.0.tgz#1a108757e4ffc6889d5e78bcc4932a97c097a5a7"
   integrity sha512-kBeTUtcj+SkyfaW4+KBe0HtsloBJ/mKTPoxpVdA57GZiPerREsUWJOhVj9anXweFiJkm5y8FG1sxFZkZ0SN6wg==
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
-
 parse-path@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b"
@@ -8385,7 +6293,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -8410,18 +6318,11 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pirates@^4.0.4, pirates@^4.0.6:
+pirates@^4.0.4:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
   integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
 pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -8429,11 +6330,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-possible-typed-array-names@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
-  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
-
 postcss-selector-parser@^6.0.10:
   version "6.0.16"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
@@ -8447,14 +6343,7 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
-  dependencies:
-    fast-diff "^1.1.2"
-
-prettier@^2.6.2, prettier@^2.7.1:
+prettier@^2.6.2:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
@@ -8473,16 +6362,6 @@ pretty-format@29.4.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-format@^28.0.0, pretty-format@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
-  integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    ansi-regex "^5.0.1"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
 pretty-format@^29.0.0, pretty-format@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
@@ -8764,13 +6643,6 @@ readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
 readonly-date@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/readonly-date/-/readonly-date-1.0.0.tgz#5af785464d8c7d7c40b9d738cbde8c646f97dcd9"
@@ -8799,69 +6671,11 @@ redent@^4.0.0:
     indent-string "^5.0.0"
     strip-indent "^4.0.0"
 
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
-  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@^0.13.7:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-regenerator-transform@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
-  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
-regexp.prototype.flags@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
-  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
-  dependencies:
-    call-bind "^1.0.6"
-    define-properties "^1.2.1"
-    es-errors "^1.3.0"
-    set-function-name "^2.0.1"
-
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
-  dependencies:
-    "@babel/regjsgen" "^0.8.0"
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
-  dependencies:
-    jsesc "~0.5.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -8884,17 +6698,12 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve.exports@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
-  integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
-
 resolve.exports@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
   integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.20.0:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -8929,7 +6738,7 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@3.0.2, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -8988,16 +6797,6 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
-safe-array-concat@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
-  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
-  dependencies:
-    call-bind "^1.0.7"
-    get-intrinsic "^1.2.4"
-    has-symbols "^1.0.3"
-    isarray "^2.0.5"
-
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9008,21 +6807,12 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex-test@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
-  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
-  dependencies:
-    call-bind "^1.0.6"
-    es-errors "^1.3.0"
-    is-regex "^1.1.4"
-
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -9041,45 +6831,23 @@ semver@7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
+semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
-set-function-length@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-
-set-function-name@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
-  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.2"
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -9108,22 +6876,12 @@ shelljs@0.8.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-side-channel@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
-  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    object-inspect "^1.13.1"
-
 signal-exit@3.0.7, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.0.1, signal-exit@^4.0.2:
+signal-exit@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
@@ -9149,11 +6907,6 @@ slash@3.0.0, slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
@@ -9196,14 +6949,6 @@ source-map-support@0.5.13:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.19:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -9280,11 +7025,6 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-string-argv@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
-  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
-
 string-length@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -9319,34 +7059,6 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.trim@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
-  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.0"
-    es-object-atoms "^1.0.0"
-
-string.prototype.trimend@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
-  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
-string.prototype.trimstart@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
-  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -9430,7 +7142,7 @@ strip-indent@^4.0.0:
   dependencies:
     min-indent "^1.0.1"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -9456,7 +7168,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -9470,14 +7182,6 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
-  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -9555,14 +7259,6 @@ tempy@1.0.0:
     type-fest "^0.16.0"
     unique-string "^2.0.0"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -9678,20 +7374,6 @@ ts-api-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-ts-jest@^28.0.7:
-  version "28.0.8"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
-  integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==
-  dependencies:
-    bs-logger "0.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^28.0.0"
-    json5 "^2.2.1"
-    lodash.memoize "4.x"
-    make-error "1.x"
-    semver "7.x"
-    yargs-parser "^21.0.1"
-
 ts-jest@^29.1.1:
   version "29.1.2"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09"
@@ -9810,56 +7492,12 @@ type@^2.7.2:
   resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
   integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
 
-typed-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
-  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    is-typed-array "^1.1.13"
-
-typed-array-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
-  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
-  dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-
-typed-array-byte-offset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
-  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-
-typed-array-length@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
-  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
-  dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-    possible-typed-array-names "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-"typescript@^3 || ^4", typescript@^4.7.4:
+"typescript@^3 || ^4":
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
@@ -9874,44 +7512,11 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
-  dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
-
 undici-types@~5.26.4:
   version "5.26.5"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-unicode-canonical-property-names-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
-  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-
-unicode-match-property-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
-  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^2.0.0"
-    unicode-property-aliases-ecmascript "^2.0.0"
-
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
-
-unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
-
 unique-filename@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
@@ -10009,11 +7614,6 @@ v8-compile-cache@2.3.0:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-compile-cache@^2.0.3:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
-  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
-
 v8-to-istanbul@^9.0.1:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
@@ -10023,13 +7623,6 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^2.0.0"
 
-v8flags@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -10091,28 +7684,6 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-typed-array@^1.1.14, which-typed-array@^1.1.15:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
-  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.2"
-
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -10188,7 +7759,7 @@ write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^4.0.1, write-file-atomic@^4.0.2:
+write-file-atomic@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==

From 1a9cef1ace35d76cc1c75e84615fd30faa78ee5b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:31:24 -0700
Subject: [PATCH 190/287] snaps

---
 .../__snapshots__/bundler.test.ts.snap        | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/packages/ts-codegen/__tests__/__snapshots__/bundler.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/bundler.test.ts.snap
index cdd0a17a..99667129 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/bundler.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/bundler.test.ts.snap
@@ -3,61 +3,71 @@
 exports[`recursiveModuleBundle osmo 1`] = `
 "export namespace osmosis {
   export namespace claim {
-    export const v1beta1 = { ..._177,
+    export const v1beta1 = {
+      ..._177,
       ..._178,
       ..._179,
       ..._180
     };
   }
   export namespace epochs {
-    export const v1beta1 = { ..._181,
+    export const v1beta1 = {
+      ..._181,
       ..._182
     };
   }
   export namespace gamm {
-    export const v1beta1 = { ..._183,
+    export const v1beta1 = {
+      ..._183,
       ..._184,
       ..._185,
       ..._186,
       ..._187
     };
   }
-  export const incentives = { ..._188,
+  export const incentives = {
+    ..._188,
     ..._189,
     ..._190,
     ..._191,
     ..._192
   };
-  export const lockup = { ..._193,
+  export const lockup = {
+    ..._193,
     ..._194,
     ..._195,
     ..._196
   };
   export namespace mint {
-    export const v1beta1 = { ..._197,
+    export const v1beta1 = {
+      ..._197,
       ..._198,
       ..._199
     };
   }
   export namespace poolincentives {
-    export const v1beta1 = { ..._200,
+    export const v1beta1 = {
+      ..._200,
       ..._201,
       ..._202,
       ..._203
     };
   }
   export namespace store {
-    export const v1beta1 = { ..._204
+    export const v1beta1 = {
+      ..._204
     };
   }
-  export const superfluid = { ..._205,
+  export const superfluid = {
+    ..._205,
     ..._206,
     ..._207,
     ..._208,
     ..._209
   };
   export namespace txfees {
-    export const v1beta1 = { ..._210,
+    export const v1beta1 = {
+      ..._210,
       ..._211,
       ..._212,
       ..._213
@@ -67,37 +77,46 @@ exports[`recursiveModuleBundle osmo 1`] = `
 `;
 
 exports[`recursiveModuleBundle root 1`] = `
-"export const osmosis = { ..._0
+"export const osmosis = {
+  ..._0
 };
-export const tendermint = { ..._0
+export const tendermint = {
+  ..._0
 };"
 `;
 
 exports[`recursiveModuleBundle single 1`] = `
-"export const ics23 = { ..._0
+"export const ics23 = {
+  ..._0
 };"
 `;
 
 exports[`recursiveModuleBundle tendermint 1`] = `
 "export namespace tendermint {
-  export const abci = { ..._223
+  export const abci = {
+    ..._223
   };
-  export const crypto = { ..._224,
+  export const crypto = {
+    ..._224,
     ..._225
   };
   export namespace libs {
-    export const bits = { ..._226
+    export const bits = {
+      ..._226
     };
   }
-  export const p2p = { ..._227
+  export const p2p = {
+    ..._227
   };
-  export const types = { ..._228,
+  export const types = {
+    ..._228,
     ..._229,
     ..._230,
     ..._231,
     ..._232
   };
-  export const version = { ..._233
+  export const version = {
+    ..._233
   };
 }"
 `;

From 03fcc8fbff51ee1171075c4a72ddb568d0e68b41 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:33:04 -0700
Subject: [PATCH 191/287] readme

---
 README.md                     |   2 +-
 packages/ts-codegen/README.md | 203 +++++++++++++++++-----------------
 packages/types/README.md      | 131 +---------------------
 3 files changed, 107 insertions(+), 229 deletions(-)

diff --git a/README.md b/README.md
index 793c665a..043f1142 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,7 @@ Generate pure message objects with the proper `utf8` encoding and `typeUrl` conf
 
 Generate raw message jsons for use in your application with the `message-builder` command.
 
-[see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
 
 #### Message Builder Options
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 53237030..043f1142 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -18,7 +18,7 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
 
 
 ```
-npm install -g @cosmwasm/ts-codegen
+npm install @cosmwasm/ts-codegen
 ```
 
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
@@ -28,7 +28,6 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
   - [Table of contents](#table-of-contents)
-- [QuickStart](#quickstart)
 - [Usage](#usage)
     - [Programmatic Usage](#programmatic-usage)
     - [Types](#types)
@@ -47,35 +46,9 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Exporting Schemas](#exporting-schemas)
 - [Developing](#developing)
 - [Related](#related)
-## Quickstart
-
-Clone your project and `cd` into your contracts folder
-
-```sh
-git clone https://github.com/public-awesome/launchpad.git
-cd launchpad/contracts/sg721-base/
-```
-
-Run `cosmwasm-ts-codegen` to generate your code.
-
-```sh
-cosmwasm-ts-codegen generate \
-          --plugin client \
-          --schema ./schema \
-          --out ./ts \
-          --name SG721 \
-          --no-bundle
-```
-
-The output will be in the folder specified by `--out`, enjoy!
 
 ## Usage
 
-You can get started quickly using our `cli` by globally installing via npm:
-
-```
-npm install -g @cosmwasm/ts-codegen
-```
 ### Programmatic Usage
 
 For production usage, we recommend setting up a build script that uses the main entry point:
@@ -137,7 +110,7 @@ codegen({
 
 Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
 
-[see example output code](https://gist.github.com/pyramation/107d4e8e30dc5eb3ffc07bc3000f4dd0)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
 
 #### Types Options
 
@@ -151,7 +124,7 @@ Typescript types and interfaces are generated in separate files so they can be i
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
 
-[see example output code](https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts )
 
 #### Client Options
 
@@ -161,20 +134,12 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 | `client.execExtendsQuery`               | execute should extend query message clients          |
 | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
 
-#### Client via CLI
 
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
- ```
 ### React Query
 
 Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
 
-[see example output code](https://gist.github.com/pyramation/70aef28fd3af0ee164f7711704d3dfc0)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
 
 #### React Query Options
 
@@ -189,50 +154,11 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
 
-#### React Query via CLI
-
-Here is an example without optional client, using v3 for `react-query`, without mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --version v3 \
-    --no-optionalClient \
-    --no-mutations
-```
-
-Example with optional client, using v4, with mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --optionalClient \
-    --version v4 \
-    --mutations
-```
-
 ### Recoil
 
 Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
 
-[see example output code](https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731)
-
-#### Recoil via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin recoil \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
 
 #### Recoil Options
 
@@ -244,17 +170,8 @@ cosmwasm-ts-codegen generate \
 
 Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
 
-[see example output code](https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4)
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 
-#### Message Composer via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin message-composer \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
 #### Message Composer Options
 
 | option                         | description                                                         |
@@ -265,17 +182,8 @@ cosmwasm-ts-codegen generate \
 
 Generate raw message jsons for use in your application with the `message-builder` command.
 
-[see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
-
-#### Message Builder via CLI
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
 
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin message-builder \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
 #### Message Builder Options
 
 | option                   | description                        |
@@ -426,6 +334,32 @@ Without using shorthand constructor:
 
 ### CLI Usage and Examples
 
+You can get started quickly using our `cli` by globally installing via npm:
+
+```
+npm install @cosmwasm/ts-codegen
+```
+
+Clone your project and `cd` into your contracts folder
+
+```sh
+git clone https://github.com/public-awesome/launchpad.git
+cd launchpad/contracts/whitelists/
+```
+
+Run `cosmwasm-ts-codegen` to generate your code.
+
+```sh
+cosmwasm-ts-codegen generate \
+          --plugin client \
+          --schema ./schema \
+          --out ./ts \
+          --name Whitelist \
+          --no-bundle
+```
+
+The output will be in the folder specified by `--out`, enjoy!
+
 #### Interactive prompt
 
 The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
@@ -506,6 +440,77 @@ cosmwasm-ts-codegen generate \
           --name SG721
 ```
 
+#### Client via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+
+#### React Query via CLI
+
+Here is an example without optional client, using v3 for `react-query`, without mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --version v3 \
+    --no-optionalClient \
+    --no-mutations
+```
+
+Example with optional client, using v4, with mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --optionalClient \
+    --version v4 \
+    --mutations
+```
+
+#### Recoil via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin recoil \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Composer via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-composer \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Builder via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-builder \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+
 ### Advanced Usage
 
 for lower-level access, you can import the various plugins directly:
diff --git a/packages/types/README.md b/packages/types/README.md
index 1f1bafac..8abd88e5 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -1,133 +1,6 @@
-# wasm-ast-types
+# @cosmology/ts-codegen-types
 
-## working with ASTs
-
-### 1 edit the fixture
-
-edit `./scripts/fixture.ts`, for example:
-
-```js
-// ./scripts/fixture.ts
-export interface InstantiateMsg {
-    admin?: string | null;
-    members: Member[];
-}
-```
-
-### 2 run AST generator
-
-```
-yarn test:ast
-```
-
-### 3 look at the JSON produced
-
-```
-code ./scripts/test-output.json
-```
-
-We use the npm module `ast-stringify` to strip out unneccesary props, and generate a JSON for reference.
-
-You will see a `File` and `Program`... only concern yourself with the `body[]`:
-
-```json
-{
-  "type": "File",
-  "errors": [],
-  "program": {
-    "type": "Program",
-    "sourceType": "module",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "ExportNamedDeclaration",
-        "exportKind": "type",
-        "specifiers": [],
-        "source": null,
-        "declaration": {
-          "type": "TSInterfaceDeclaration",
-          "id": {
-            "type": "Identifier",
-            "name": "InstantiateMsg"
-          },
-          "body": {
-            "type": "TSInterfaceBody",
-            "body": [
-              {
-                "type": "TSPropertySignature",
-                "key": {
-                  "type": "Identifier",
-                  "name": "admin"
-                },
-                "computed": false,
-                "optional": true,
-                "typeAnnotation": {
-                  "type": "TSTypeAnnotation",
-                  "typeAnnotation": {
-                    "type": "TSUnionType",
-                    "types": [
-                      {
-                        "type": "TSStringKeyword"
-                      },
-                      {
-                        "type": "TSNullKeyword"
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "type": "TSPropertySignature",
-                "key": {
-                  "type": "Identifier",
-                  "name": "members"
-                },
-                "computed": false,
-                "typeAnnotation": {
-                  "type": "TSTypeAnnotation",
-                  "typeAnnotation": {
-                    "type": "TSArrayType",
-                    "elementType": {
-                      "type": "TSTypeReference",
-                      "typeName": {
-                        "type": "Identifier",
-                        "name": "Member"
-                      }
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        }
-      }
-    ],
-    "directives": []
-  },
-  "comments": []
-}
-```
-
-### 4 code with `@babel/types` using the JSON as a reference
-
-NOTE: 4 continued ideally you should be writing a test with your generator!
-
-```js
-import * as t from '@babel/types';
-
-export const createNewGenerator = () => {
-    return t.exportNamedDeclaration(
-        t.tsInterfaceDeclaration(
-            t.identifier('InstantiateMsg'),
-            null,
-            [],
-            t.tsInterfaceBody([
-                // ... more code ...
-            ])
-        )
-    );
-};
-```
+Types for [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen)
 
 ## Related
 

From 5495e7cbd3d62573751e32ca6b6e0e54493b42d8 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:34:54 -0700
Subject: [PATCH 192/287] pkg

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c9d0d74e..1aee228c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "clean": "lerna run clean",
     "build": "lerna run build",
-    "symlink": "symlink-workspace --logLevel info",
+    "symlink": "symlink-workspace --logLevel error",
     "postinstall": "yarn symlink"
   },
   "devDependencies": {

From f584b91783521be1dd42f0392dfbd73020321862 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:35:02 -0700
Subject: [PATCH 193/287] chore(release): publish

 - wasm-ast-types@1.1.0
 - @cosmwasm/ts-codegen@1.1.0
 - @cosmology/ts-codegen-types@1.1.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 35a68cd6..11103599 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.0.0...wasm-ast-types@1.1.0) (2024-04-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [1.0.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.4...wasm-ast-types@1.0.0) (2024-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index ab3296d0..fdb80ffa 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/types": "7.18.10",
-    "@cosmology/ts-codegen-types": "^1.0.0",
+    "@cosmology/ts-codegen-types": "^1.1.0",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index a55d2c0d..f2ce6108 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.0.0...@cosmwasm/ts-codegen@1.1.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.0.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@0.35.7...@cosmwasm/ts-codegen@1.0.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 1a9875aa..96bd0a33 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@babel/types": "7.18.10",
-    "@cosmology/ts-codegen-types": "^1.0.0",
+    "@cosmology/ts-codegen-types": "^1.1.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
@@ -55,7 +55,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.0.0"
+    "wasm-ast-types": "^1.1.0"
   },
   "keywords": [
     "cosmwasm",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 1631255d..04ac14ea 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmology/ts-codegen-types@1.0.0...@cosmology/ts-codegen-types@1.1.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmology/ts-codegen-types
+
+
+
+
+
 # 1.0.0 (2024-04-17)
 
 **Note:** Version bump only for package @cosmology/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index 9d692626..4f8f8798 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmology/ts-codegen-types",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",

From f16bf628ad4f916d893737f0b13fe7c628181d0f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:42:26 -0700
Subject: [PATCH 194/287] pkg

---
 .../src/generators/create-helpers.ts          | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index e0209926..80c9c76f 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -1,6 +1,6 @@
 import { join, dirname, basename, extname } from "path";
+import { readFileSync, existsSync } from "fs";
 import { sync as mkdirp } from "mkdirp";
-import pkg from "../../package.json";
 import { writeContentToFile } from "../utils/files";
 import { BuilderFile, TSBuilderInput } from "../builder";
 import {
@@ -10,6 +10,39 @@ import {
 } from "../helpers";
 import { BuilderContext } from "wasm-ast-types";
 
+// need to search due to the dist/ folder and src/, etc. 
+function findPackageJson(currentDir: string) {
+  const filePath = join(currentDir, 'package.json');
+
+  // Check if package.json exists in the current directory
+  if (existsSync(filePath)) {
+    return filePath;
+  }
+
+  // Get the parent directory
+  const parentDir = dirname(currentDir);
+
+  // If reached the root directory, package.json is not found
+  if (parentDir === currentDir) {
+    throw new Error('package.json not found in any parent directory');
+  }
+
+  // Recursively look in the parent directory
+  return findPackageJson(parentDir);
+}
+
+function readAndParsePackageJson() {
+  // Start searching from the current directory
+  const pkgPath = findPackageJson(__dirname);
+
+  // Read and parse the package.json
+  const str = readFileSync(pkgPath, 'utf8');
+  const pkg = JSON.parse(str);
+  return pkg;
+}
+
+const pkg = readAndParsePackageJson();
+
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
 const header = `/**
 * This file and any referenced files were automatically generated by ${pkg.name}@${version}

From e105783253da5352163be0bb2fc4ac65b027fa94 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:42:37 -0700
Subject: [PATCH 195/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.2.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index f2ce6108..bf9978a5 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.1.0...@cosmwasm/ts-codegen@1.2.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.0.0...@cosmwasm/ts-codegen@1.1.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 96bd0a33..167b9110 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 7682c76857788cc417df9694b977dc317eda0ea4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:45:57 -0700
Subject: [PATCH 196/287] pkg

---
 .../src/generators/create-helpers.ts          | 33 +------------------
 packages/ts-codegen/src/utils/header.ts       |  5 ++-
 packages/ts-codegen/src/utils/package.ts      | 33 +++++++++++++++++++
 3 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 packages/ts-codegen/src/utils/package.ts

diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index 80c9c76f..c88fb4f8 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -1,7 +1,7 @@
 import { join, dirname, basename, extname } from "path";
-import { readFileSync, existsSync } from "fs";
 import { sync as mkdirp } from "mkdirp";
 import { writeContentToFile } from "../utils/files";
+import { readAndParsePackageJson } from "../utils/package";
 import { BuilderFile, TSBuilderInput } from "../builder";
 import {
   contractContextBase,
@@ -10,37 +10,6 @@ import {
 } from "../helpers";
 import { BuilderContext } from "wasm-ast-types";
 
-// need to search due to the dist/ folder and src/, etc. 
-function findPackageJson(currentDir: string) {
-  const filePath = join(currentDir, 'package.json');
-
-  // Check if package.json exists in the current directory
-  if (existsSync(filePath)) {
-    return filePath;
-  }
-
-  // Get the parent directory
-  const parentDir = dirname(currentDir);
-
-  // If reached the root directory, package.json is not found
-  if (parentDir === currentDir) {
-    throw new Error('package.json not found in any parent directory');
-  }
-
-  // Recursively look in the parent directory
-  return findPackageJson(parentDir);
-}
-
-function readAndParsePackageJson() {
-  // Start searching from the current directory
-  const pkgPath = findPackageJson(__dirname);
-
-  // Read and parse the package.json
-  const str = readFileSync(pkgPath, 'utf8');
-  const pkg = JSON.parse(str);
-  return pkg;
-}
-
 const pkg = readAndParsePackageJson();
 
 const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
diff --git a/packages/ts-codegen/src/utils/header.ts b/packages/ts-codegen/src/utils/header.ts
index 623948fc..cfac708f 100644
--- a/packages/ts-codegen/src/utils/header.ts
+++ b/packages/ts-codegen/src/utils/header.ts
@@ -1,4 +1,7 @@
-import pkg from '../../package.json';
+import { readAndParsePackageJson } from "./package";
+
+const pkg = readAndParsePackageJson();
+
 const version = process.env.NODE_ENV === 'test' ? 'latest' : pkg.version;
 export const header = `/**
 * This file was automatically generated by ${pkg.name}@${version}.
diff --git a/packages/ts-codegen/src/utils/package.ts b/packages/ts-codegen/src/utils/package.ts
new file mode 100644
index 00000000..8aa55e11
--- /dev/null
+++ b/packages/ts-codegen/src/utils/package.ts
@@ -0,0 +1,33 @@
+import { join, dirname, basename, extname } from "path";
+import { readFileSync, existsSync } from "fs";
+
+// need to search due to the dist/ folder and src/, etc. 
+function findPackageJson(currentDir: string) {
+  const filePath = join(currentDir, 'package.json');
+
+  // Check if package.json exists in the current directory
+  if (existsSync(filePath)) {
+    return filePath;
+  }
+
+  // Get the parent directory
+  const parentDir = dirname(currentDir);
+
+  // If reached the root directory, package.json is not found
+  if (parentDir === currentDir) {
+    throw new Error('package.json not found in any parent directory');
+  }
+
+  // Recursively look in the parent directory
+  return findPackageJson(parentDir);
+}
+
+export function readAndParsePackageJson() {
+  // Start searching from the current directory
+  const pkgPath = findPackageJson(__dirname);
+
+  // Read and parse the package.json
+  const str = readFileSync(pkgPath, 'utf8');
+  const pkg = JSON.parse(str);
+  return pkg;
+}
\ No newline at end of file

From f7230f9ef06a3fe5a7e3f64302abc1f726c7bf33 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 00:46:11 -0700
Subject: [PATCH 197/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.3.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index bf9978a5..7a58a02b 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.2.0...@cosmwasm/ts-codegen@1.3.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.2.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.1.0...@cosmwasm/ts-codegen@1.2.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 167b9110..25c4e350 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 812ce3c538a0708f5e4c6205185a79e43760a49e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:10:24 -0700
Subject: [PATCH 198/287] pkg

---
 README.md                                     |  4 ++--
 packages/ast/package.json                     |  2 +-
 packages/ts-codegen/README.md                 |  4 ++--
 packages/ts-codegen/__tests__/builder.test.ts |  4 ++--
 packages/ts-codegen/package.json              |  4 +++-
 packages/ts-codegen/src/builder/builder.ts    |  2 +-
 .../src/generators/create-helpers.ts          |  2 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |  2 +-
 packages/ts-codegen/src/plugins/provider.ts   |  2 +-
 yarn.lock                                     | 19 +++++--------------
 10 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 043f1142..1432c1b2 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ codegen({
     messageBuilder: {
       enabled: false
     },
-    useContractsHooks: {
+    useContractHooks: {
       enabled: false
     }
   }
@@ -195,7 +195,7 @@ Generate raw message jsons for use in your application with the `message-builder
 
 | option                           | description                             |
 | -------------------------------- | --------------------------------------- |
-| `useContractsHooks.enabled`      | enable the `useContracts` plugin        |
+| `useContractHooks.enabled`      | enable the `useContracts` plugin        |
 
 #### Use Contracts Provider Usage
 
diff --git a/packages/ast/package.json b/packages/ast/package.json
index fdb80ffa..da562c13 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -33,7 +33,7 @@
     "url": "https://github.com/cosmwasm/ts-codegen/issues"
   },
   "dependencies": {
-    "@babel/types": "7.18.10",
+    "@babel/types": "7.24.0",
     "@cosmology/ts-codegen-types": "^1.1.0",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 043f1142..1432c1b2 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -98,7 +98,7 @@ codegen({
     messageBuilder: {
       enabled: false
     },
-    useContractsHooks: {
+    useContractHooks: {
       enabled: false
     }
   }
@@ -195,7 +195,7 @@ Generate raw message jsons for use in your application with the `message-builder
 
 | option                           | description                             |
 | -------------------------------- | --------------------------------------- |
-| `useContractsHooks.enabled`      | enable the `useContracts` plugin        |
+| `useContractHooks.enabled`      | enable the `useContracts` plugin        |
 
 #### Use Contracts Provider Usage
 
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index cd34be26..7db9824e 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -118,7 +118,7 @@ it('builder default', async () => {
             messageBuilder: {
                 enabled: true
             },
-            useContractsHooks: {
+            useContractHooks: {
                 enabled: true,
             }
         }
@@ -206,7 +206,7 @@ it('builder set bundler path', async () => {
             messageComposer: {
                 enabled: true
             },
-            useContractsHooks: {
+            useContractHooks: {
                 enabled: true,
             }
         }
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 25c4e350..78c76dbf 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -38,7 +38,9 @@
     "ast-stringify": "0.1.0"
   },
   "dependencies": {
-    "@babel/types": "7.18.10",
+    "@babel/generator": "7.24.4",
+    "@babel/traverse": "7.24.1",
+    "@babel/types": "7.24.0",
     "@cosmology/ts-codegen-types": "^1.1.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index bddcb521..8bb83bf5 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -59,7 +59,7 @@ export type TSBuilderOptions = {
      * Default: true
      */
     useShorthandCtor?: boolean;
-    useContractsHooks?: UseContractsOptions;
+    useContractHooks?: UseContractsOptions;
 } & RenderOptions;
 
 export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index c88fb4f8..83a30ec4 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -46,7 +46,7 @@ export const createHelpers = (
   const files: BuilderFile[] = [];
 
   if (
-    input.options?.useContractsHooks?.enabled &&
+    input.options?.useContractHooks?.enabled &&
     Object.keys(builderContext.providers)?.length
   ) {
     const useShorthandCtor = input.options?.useShorthandCtor;
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index c99fa255..733a20c9 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -36,7 +36,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
       body: any[];
     }[]
   > {
-    if (!this.option?.useContractsHooks?.enabled) {
+    if (!this.option?.useContractHooks?.enabled) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index f9daca0c..cf56f6c9 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -39,7 +39,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body: any[];
     }[]
   > {
-    if (!this.option?.useContractsHooks?.enabled) {
+    if (!this.option?.useContractHooks?.enabled) {
       return;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 1cd56560..c8db8802 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -49,7 +49,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
+"@babel/generator@7.24.4", "@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
   integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
@@ -127,12 +127,12 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.18.10", "@babel/helper-string-parser@^7.23.4":
+"@babel/helper-string-parser@^7.23.4":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
   integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.20":
+"@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
@@ -280,7 +280,7 @@
     "@babel/parser" "^7.24.0"
     "@babel/types" "^7.24.0"
 
-"@babel/traverse@^7.24.1":
+"@babel/traverse@7.24.1", "@babel/traverse@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
   integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
@@ -296,16 +296,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
-  integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3":
+"@babel/types@7.24.0", "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
   integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==

From 8765a19d3cc72296ac528f9ec12f215e6017e34e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:10:38 -0700
Subject: [PATCH 199/287] chore(release): publish

 - wasm-ast-types@1.2.0
 - @cosmwasm/ts-codegen@1.4.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 11103599..dc5136ed 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.1.0...wasm-ast-types@1.2.0) (2024-04-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.0.0...wasm-ast-types@1.1.0) (2024-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index da562c13..ccbb013a 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 7a58a02b..8cb49948 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.4.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.3.0...@cosmwasm/ts-codegen@1.4.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.2.0...@cosmwasm/ts-codegen@1.3.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 78c76dbf..d4cdaa8d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -57,7 +57,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.1.0"
+    "wasm-ast-types": "^1.2.0"
   },
   "keywords": [
     "cosmwasm",

From 9c7dbf8d251df4fbe909b427cbbe826e0a12e3c3 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:12:25 -0700
Subject: [PATCH 200/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1432c1b2..f87148c2 100644
--- a/README.md
+++ b/README.md
@@ -344,7 +344,7 @@ Clone your project and `cd` into your contracts folder
 
 ```sh
 git clone https://github.com/public-awesome/launchpad.git
-cd launchpad/contracts/whitelists/
+cd launchpad/contracts/whitelists/whitelist
 ```
 
 Run `cosmwasm-ts-codegen` to generate your code.
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 1432c1b2..f87148c2 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -344,7 +344,7 @@ Clone your project and `cd` into your contracts folder
 
 ```sh
 git clone https://github.com/public-awesome/launchpad.git
-cd launchpad/contracts/whitelists/
+cd launchpad/contracts/whitelists/whitelist
 ```
 
 Run `cosmwasm-ts-codegen` to generate your code.

From d8c3043ed7655b205faca52eb17c346ca0369f3c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:12:29 -0700
Subject: [PATCH 201/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.4.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 8cb49948..dd9f4c7a 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.4.0...@cosmwasm/ts-codegen@1.4.1) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.4.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.3.0...@cosmwasm/ts-codegen@1.4.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index d4cdaa8d..2e95f93b 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 1c9bfacbd715b14ce848c85b202cff11a76799d3 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:14:28 -0700
Subject: [PATCH 202/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f87148c2..00149a1a 100644
--- a/README.md
+++ b/README.md
@@ -343,7 +343,7 @@ npm install @cosmwasm/ts-codegen
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone https://github.com/public-awesome/launchpad.git
+git clone https://github.com/cosmology-tech/launchpad.git
 cd launchpad/contracts/whitelists/whitelist
 ```
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index f87148c2..00149a1a 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -343,7 +343,7 @@ npm install @cosmwasm/ts-codegen
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone https://github.com/public-awesome/launchpad.git
+git clone https://github.com/cosmology-tech/launchpad.git
 cd launchpad/contracts/whitelists/whitelist
 ```
 

From 80e57b615481898fdec9af3b199c4617f22dc767 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:14:34 -0700
Subject: [PATCH 203/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.5.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index dd9f4c7a..058b81ed 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.5.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.4.1...@cosmwasm/ts-codegen@1.5.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [1.4.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.4.0...@cosmwasm/ts-codegen@1.4.1) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 2e95f93b..e5236208 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 919e9dde8a2c7dfe2e483aef66d89918afdc15ba Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:20:57 -0700
Subject: [PATCH 204/287] add useContractHooks to top-level options

---
 packages/ast/src/context/context.ts        | 61 ++--------------------
 packages/ast/src/types/context.ts          | 24 +++++++++
 packages/ast/src/types/index.ts            |  2 +
 packages/ast/src/types/plugins.ts          | 35 +++++++++++++
 packages/ts-codegen/src/builder/builder.ts |  5 --
 5 files changed, 66 insertions(+), 61 deletions(-)
 create mode 100644 packages/ast/src/types/context.ts
 create mode 100644 packages/ast/src/types/index.ts
 create mode 100644 packages/ast/src/types/plugins.ts

diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 263bd4b4..3bc2fc6b 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -1,64 +1,10 @@
 import * as t from '@babel/types';
-import { JSONSchema, IDLObject } from "@cosmology/ts-codegen-types";
+import { JSONSchema } from "@cosmology/ts-codegen-types";
 import { refLookup } from "../utils";
 import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
 import deepmerge from "deepmerge";
 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
-}
-
-export interface TSClientOptions {
-  enabled?: boolean;
-  execExtendsQuery?: boolean;
-  noImplicitOverride?: boolean;
-}
-export interface MessageComposerOptions {
-  enabled?: boolean;
-}
-export interface MessageBuilderOptions {
-  enabled?: boolean;
-}
-export interface RecoilOptions {
-  enabled?: boolean;
-}
-export interface TSTypesOptions {
-  enabled?: boolean;
-  itemsUseTuples?: boolean;
-  // deprecated
-  aliasExecuteMsg?: boolean;
-  aliasEntryPoints?: boolean;
-}
-
-/// END Plugin Types
-export interface ContractInfo {
-  schemas: JSONSchema[];
-  responses?: Record<string, JSONSchema>;
-  idlObject?: Partial<IDLObject>;
-};
-export interface RenderOptions {
-  enabled?: boolean;
-  types?: TSTypesOptions;
-  recoil?: RecoilOptions;
-  messageComposer?: MessageComposerOptions;
-  messageBuilder?: MessageBuilderOptions;
-  client?: TSClientOptions;
-  reactQuery?: ReactQueryOptions;
-}
-
-export interface ProviderInfo {
-  classname: string,
-  filename: string,
-  basename: string,
-}
+import { ContractInfo, ProviderInfo, RenderOptions } from '../types';
 
 export interface IContext {
   refLookup($ref: string): JSONSchema;
@@ -106,6 +52,9 @@ export const defaultOptions: RenderOptions = {
     mutations: false,
     camelize: true,
     queryKeys: false
+  },
+  useContractHooks: {
+    enabled: false
   }
 };
 
diff --git a/packages/ast/src/types/context.ts b/packages/ast/src/types/context.ts
new file mode 100644
index 00000000..bac5bb35
--- /dev/null
+++ b/packages/ast/src/types/context.ts
@@ -0,0 +1,24 @@
+import { IDLObject, JSONSchema } from "@cosmology/ts-codegen-types";
+import { MessageBuilderOptions, MessageComposerOptions, ReactQueryOptions, RecoilOptions, TSClientOptions, TSTypesOptions, UseContractsOptions } from "./plugins";
+
+export interface ContractInfo {
+  schemas: JSONSchema[];
+  responses?: Record<string, JSONSchema>;
+  idlObject?: Partial<IDLObject>;
+};
+export interface RenderOptions {
+  enabled?: boolean;
+  types?: TSTypesOptions;
+  recoil?: RecoilOptions;
+  messageComposer?: MessageComposerOptions;
+  messageBuilder?: MessageBuilderOptions;
+  client?: TSClientOptions;
+  reactQuery?: ReactQueryOptions;
+  useContractHooks?: UseContractsOptions;
+}
+
+export interface ProviderInfo {
+  classname: string,
+  filename: string,
+  basename: string,
+}
diff --git a/packages/ast/src/types/index.ts b/packages/ast/src/types/index.ts
new file mode 100644
index 00000000..2c9bdd15
--- /dev/null
+++ b/packages/ast/src/types/index.ts
@@ -0,0 +1,2 @@
+export * from './plugins';
+export * from './context';
\ No newline at end of file
diff --git a/packages/ast/src/types/plugins.ts b/packages/ast/src/types/plugins.ts
new file mode 100644
index 00000000..f34e4625
--- /dev/null
+++ b/packages/ast/src/types/plugins.ts
@@ -0,0 +1,35 @@
+export interface ReactQueryOptions {
+  enabled?: boolean;
+  optionalClient?: boolean;
+  version?: 'v3' | 'v4';
+  mutations?: boolean;
+  camelize?: boolean;
+  queryKeys?: boolean
+  queryFactory?: boolean
+}
+
+export interface TSClientOptions {
+  enabled?: boolean;
+  execExtendsQuery?: boolean;
+  noImplicitOverride?: boolean;
+}
+export interface MessageComposerOptions {
+  enabled?: boolean;
+}
+export interface MessageBuilderOptions {
+  enabled?: boolean;
+}
+export interface RecoilOptions {
+  enabled?: boolean;
+}
+export interface TSTypesOptions {
+  enabled?: boolean;
+  itemsUseTuples?: boolean;
+  // deprecated
+  aliasExecuteMsg?: boolean;
+  aliasEntryPoints?: boolean;
+}
+
+export interface UseContractsOptions {
+  enabled?: boolean;
+};
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 8bb83bf5..447dba97 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -48,10 +48,6 @@ export interface BundleOptions {
     bundlePath?: string;
 };
 
-export interface UseContractsOptions {
-    enabled?: boolean;
-};
-
 export type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
@@ -59,7 +55,6 @@ export type TSBuilderOptions = {
      * Default: true
      */
     useShorthandCtor?: boolean;
-    useContractHooks?: UseContractsOptions;
 } & RenderOptions;
 
 export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';

From 62595ca473abd10e95daf74e12173e6d91e8072d Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:27:12 -0700
Subject: [PATCH 205/287] types

---
 packages/ast/src/index.ts                     |  1 +
 packages/ast/src/provider/provider.ts         |  2 +-
 packages/ast/src/react-query/react-query.ts   |  3 +-
 packages/ast/test-utils/utils.ts              |  3 +-
 .../__snapshots__/builder.test.ts.snap        | 48 +++++++++++++++++++
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/packages/ast/src/index.ts b/packages/ast/src/index.ts
index 6f029f5f..5e7c41db 100644
--- a/packages/ast/src/index.ts
+++ b/packages/ast/src/index.ts
@@ -6,3 +6,4 @@ export * from './message-composer';
 export * from './react-query';
 export * from './message-builder';
 export * from './provider';
+export * from './types';
diff --git a/packages/ast/src/provider/provider.ts b/packages/ast/src/provider/provider.ts
index 6939e90f..203fcadc 100644
--- a/packages/ast/src/provider/provider.ts
+++ b/packages/ast/src/provider/provider.ts
@@ -1,8 +1,8 @@
 import * as t from "@babel/types";
 import { camel, pascal } from "case";
-import { ProviderInfo } from "../context";
 import { PROVIDER_TYPES } from "../utils/constants";
 import { identifier, tsObjectPattern } from "../utils";
+import { ProviderInfo } from "../types";
 
 export const createProvider = (
   name: string,
diff --git a/packages/ast/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
index c5f38203..8c58b3aa 100644
--- a/packages/ast/src/react-query/react-query.ts
+++ b/packages/ast/src/react-query/react-query.ts
@@ -22,9 +22,10 @@ import {
   getPropertyType,
   getResponseType
 } from '../utils/types';
-import { ReactQueryOptions, RenderContext } from '../context';
+import { RenderContext } from '../context';
 import { ArrowFunctionExpression } from '@babel/types';
 import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
+import { ReactQueryOptions } from '../types';
 
 interface ReactQueryHookQuery {
   context: RenderContext;
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index aa6ad208..5b8a8d77 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -3,7 +3,8 @@ import { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { join } from 'path';
 import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
-import { RenderContext, RenderOptions } from '../src/context';
+import { RenderContext } from '../src/context';
+import { RenderOptions } from 'wasm-ast-types/types';
 
 export const expectCode = (ast: any): void => {
   expect(
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 2eaed3b8..b6ce7442 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -40,6 +40,9 @@ TSBuilder {
       "enabled": true,
       "itemsUseTuples": false,
     },
+    "useContractHooks": {
+      "enabled": false,
+    },
     "useShorthandCtor": true,
   },
   "plugins": [
@@ -79,6 +82,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -119,6 +125,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -159,6 +168,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -199,6 +211,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -239,6 +254,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": {
@@ -281,6 +299,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -321,6 +342,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": {
@@ -373,6 +397,9 @@ TSBuilder {
       "enabled": true,
       "itemsUseTuples": false,
     },
+    "useContractHooks": {
+      "enabled": false,
+    },
     "useShorthandCtor": true,
   },
   "plugins": [
@@ -412,6 +439,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -452,6 +482,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -492,6 +525,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -532,6 +568,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -572,6 +611,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": {
@@ -614,6 +656,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": undefined,
@@ -654,6 +699,9 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
+        "useContractHooks": {
+          "enabled": false,
+        },
         "useShorthandCtor": true,
       },
       "utils": {

From 43cbdf2257bd5a86b5fc1bfa577a78a9f18ec7cd Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:27:19 -0700
Subject: [PATCH 206/287] chore(release): publish

 - wasm-ast-types@1.3.0
 - @cosmwasm/ts-codegen@1.6.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index dc5136ed..37423df7 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.2.0...wasm-ast-types@1.3.0) (2024-04-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [1.2.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.1.0...wasm-ast-types@1.2.0) (2024-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index ccbb013a..9eb1da25 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 058b81ed..b37fea30 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.6.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.5.0...@cosmwasm/ts-codegen@1.6.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.5.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.4.1...@cosmwasm/ts-codegen@1.5.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e5236208..4d94ed82 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -57,7 +57,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.2.0"
+    "wasm-ast-types": "^1.3.0"
   },
   "keywords": [
     "cosmwasm",

From 27aa3193dc6f128dd789fdd07b9cd6a9da4cc7b5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:32:43 -0700
Subject: [PATCH 207/287] examples

---
 README.md                     | 26 --------------------------
 packages/ts-codegen/README.md | 26 --------------------------
 2 files changed, 52 deletions(-)

diff --git a/README.md b/README.md
index 00149a1a..22474762 100644
--- a/README.md
+++ b/README.md
@@ -524,32 +524,6 @@ import {
   generateMessageComposer
 } from '@cosmwasm/ts-codegen';
 ```
-### Example Output
-
-- `cosmwasm-ts-codegen generate --typesOnly`
-
-https://gist.github.com/pyramation/107d4e8e30dc5eb3ffc07bc3000f4dd0
-
-- `cosmwasm-ts-codegen generate --plugin client`
-
-https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817
-
-- `cosmwasm-ts-codegen generate --plugin react-query`
-
-https://gist.github.com/pyramation/70aef28fd3af0ee164f7711704d3dfc0
-
-- `cosmwasm-ts-codegen generate --plugin recoil`
-
-https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
-
-- `cosmwasm-ts-codegen generate --plugin message-composer`
-
-https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
-
-- `cosmwasm-ts-codegen generate --plugin message-builder`
-
-https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
-
 
 ### JSON Schema
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 00149a1a..22474762 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -524,32 +524,6 @@ import {
   generateMessageComposer
 } from '@cosmwasm/ts-codegen';
 ```
-### Example Output
-
-- `cosmwasm-ts-codegen generate --typesOnly`
-
-https://gist.github.com/pyramation/107d4e8e30dc5eb3ffc07bc3000f4dd0
-
-- `cosmwasm-ts-codegen generate --plugin client`
-
-https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817
-
-- `cosmwasm-ts-codegen generate --plugin react-query`
-
-https://gist.github.com/pyramation/70aef28fd3af0ee164f7711704d3dfc0
-
-- `cosmwasm-ts-codegen generate --plugin recoil`
-
-https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
-
-- `cosmwasm-ts-codegen generate --plugin message-composer`
-
-https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
-
-- `cosmwasm-ts-codegen generate --plugin message-builder`
-
-https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
-
 
 ### JSON Schema
 

From 5553a1ce26cc27226dad293fd43b254fbca103d6 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:33:11 -0700
Subject: [PATCH 208/287] readme

---
 README.md                     | 1 -
 packages/ts-codegen/README.md | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 22474762..c43a0e09 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,6 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
-- [Example Output](#example-output)
 - [JSON Schema](#json-schema)
     - [JSON Schema Generation](#json-schema-generation)
     - [Exporting Schemas](#exporting-schemas)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 22474762..c43a0e09 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -40,7 +40,6 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
-- [Example Output](#example-output)
 - [JSON Schema](#json-schema)
     - [JSON Schema Generation](#json-schema-generation)
     - [Exporting Schemas](#exporting-schemas)

From 5548ef6e9bf8b5f85b5b5a1ff79987b4e239d712 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:38:51 -0700
Subject: [PATCH 209/287] readme

---
 README.md                     | 7 +++++++
 packages/ts-codegen/README.md | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/README.md b/README.md
index c43a0e09..0a0ebe27 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,13 @@ Generate raw message jsons for use in your application with the `message-builder
 | -------------------------------- | --------------------------------------- |
 | `useContractHooks.enabled`      | enable the `useContracts` plugin        |
 
+#### Example Output
+
+[Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+[Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+[Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+[Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+
 #### Use Contracts Provider Usage
 
 ```tsx
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index c43a0e09..0a0ebe27 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -196,6 +196,13 @@ Generate raw message jsons for use in your application with the `message-builder
 | -------------------------------- | --------------------------------------- |
 | `useContractHooks.enabled`      | enable the `useContracts` plugin        |
 
+#### Example Output
+
+[Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+[Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+[Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+[Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+
 #### Use Contracts Provider Usage
 
 ```tsx

From 7d792e3147f9a0ab034ce89ac08db0b3fb8eb563 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:40:09 -0700
Subject: [PATCH 210/287] readme

---
 README.md                     | 8 ++++----
 packages/ts-codegen/README.md | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0a0ebe27..70fd5454 100644
--- a/README.md
+++ b/README.md
@@ -198,10 +198,10 @@ Generate raw message jsons for use in your application with the `message-builder
 
 #### Example Output
 
-[Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
-[Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
-[Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
-[Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+- [Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+- [Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+- [Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+- [Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
 
 #### Use Contracts Provider Usage
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 0a0ebe27..70fd5454 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -198,10 +198,10 @@ Generate raw message jsons for use in your application with the `message-builder
 
 #### Example Output
 
-[Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
-[Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
-[Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
-[Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+- [Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+- [Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+- [Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+- [Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
 
 #### Use Contracts Provider Usage
 

From 7f4895fe22e691c2d983a5893f3259f671051c4b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:43:34 -0700
Subject: [PATCH 211/287] hooks

---
 README.md                                     | 10 +++---
 packages/ast/src/context/context.ts           |  2 +-
 packages/ast/src/types/context.ts             |  2 +-
 packages/ts-codegen/README.md                 | 10 +++---
 .../__snapshots__/builder.test.ts.snap        | 32 +++++++++----------
 packages/ts-codegen/__tests__/builder.test.ts |  4 +--
 .../src/generators/create-helpers.ts          |  2 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |  2 +-
 packages/ts-codegen/src/plugins/provider.ts   |  2 +-
 9 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 70fd5454..4dbc55a5 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
     - [Message Builder](#message-builder)
-    - [Use Contracts Hooks](#use-contracts-hooks)
+    - [Use Contract Hooks](#use-contracts-hooks)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
@@ -97,7 +97,7 @@ codegen({
     messageBuilder: {
       enabled: false
     },
-    useContractHooks: {
+    useContractsHook: {
       enabled: false
     }
   }
@@ -190,11 +190,13 @@ Generate raw message jsons for use in your application with the `message-builder
 | `messageBuilder.enabled` | enable the messageBuilder plugin   |
 
 
-### Use Contracts Hooks
+### `useContracts` Hook
+
+Generates `useContracts` hook to easily access contracts, already equipped with a signing client
 
 | option                           | description                             |
 | -------------------------------- | --------------------------------------- |
-| `useContractHooks.enabled`      | enable the `useContracts` plugin        |
+| `useContractsHook.enabled`       | enable the `useContracts` plugin        |
 
 #### Example Output
 
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 3bc2fc6b..6424a22a 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -53,7 +53,7 @@ export const defaultOptions: RenderOptions = {
     camelize: true,
     queryKeys: false
   },
-  useContractHooks: {
+  useContractsHook: {
     enabled: false
   }
 };
diff --git a/packages/ast/src/types/context.ts b/packages/ast/src/types/context.ts
index bac5bb35..f5ee5018 100644
--- a/packages/ast/src/types/context.ts
+++ b/packages/ast/src/types/context.ts
@@ -14,7 +14,7 @@ export interface RenderOptions {
   messageBuilder?: MessageBuilderOptions;
   client?: TSClientOptions;
   reactQuery?: ReactQueryOptions;
-  useContractHooks?: UseContractsOptions;
+  useContractsHook?: UseContractsOptions;
 }
 
 export interface ProviderInfo {
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 70fd5454..4dbc55a5 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -36,7 +36,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
     - [Message Builder](#message-builder)
-    - [Use Contracts Hooks](#use-contracts-hooks)
+    - [Use Contract Hooks](#use-contracts-hooks)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
@@ -97,7 +97,7 @@ codegen({
     messageBuilder: {
       enabled: false
     },
-    useContractHooks: {
+    useContractsHook: {
       enabled: false
     }
   }
@@ -190,11 +190,13 @@ Generate raw message jsons for use in your application with the `message-builder
 | `messageBuilder.enabled` | enable the messageBuilder plugin   |
 
 
-### Use Contracts Hooks
+### `useContracts` Hook
+
+Generates `useContracts` hook to easily access contracts, already equipped with a signing client
 
 | option                           | description                             |
 | -------------------------------- | --------------------------------------- |
-| `useContractHooks.enabled`      | enable the `useContracts` plugin        |
+| `useContractsHook.enabled`       | enable the `useContracts` plugin        |
 
 #### Example Output
 
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index b6ce7442..0e6ced18 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -40,7 +40,7 @@ TSBuilder {
       "enabled": true,
       "itemsUseTuples": false,
     },
-    "useContractHooks": {
+    "useContractsHook": {
       "enabled": false,
     },
     "useShorthandCtor": true,
@@ -82,7 +82,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -125,7 +125,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -168,7 +168,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -211,7 +211,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -254,7 +254,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -299,7 +299,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -342,7 +342,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -397,7 +397,7 @@ TSBuilder {
       "enabled": true,
       "itemsUseTuples": false,
     },
-    "useContractHooks": {
+    "useContractsHook": {
       "enabled": false,
     },
     "useShorthandCtor": true,
@@ -439,7 +439,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -482,7 +482,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -525,7 +525,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -568,7 +568,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -611,7 +611,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -656,7 +656,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
@@ -699,7 +699,7 @@ TSBuilder {
           "enabled": true,
           "itemsUseTuples": false,
         },
-        "useContractHooks": {
+        "useContractsHook": {
           "enabled": false,
         },
         "useShorthandCtor": true,
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index 7db9824e..cbd088f5 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -118,7 +118,7 @@ it('builder default', async () => {
             messageBuilder: {
                 enabled: true
             },
-            useContractHooks: {
+            useContractsHook: {
                 enabled: true,
             }
         }
@@ -206,7 +206,7 @@ it('builder set bundler path', async () => {
             messageComposer: {
                 enabled: true
             },
-            useContractHooks: {
+            useContractsHook: {
                 enabled: true,
             }
         }
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/generators/create-helpers.ts
index 83a30ec4..3f3f0a8e 100644
--- a/packages/ts-codegen/src/generators/create-helpers.ts
+++ b/packages/ts-codegen/src/generators/create-helpers.ts
@@ -46,7 +46,7 @@ export const createHelpers = (
   const files: BuilderFile[] = [];
 
   if (
-    input.options?.useContractHooks?.enabled &&
+    input.options?.useContractsHook?.enabled &&
     Object.keys(builderContext.providers)?.length
   ) {
     const useShorthandCtor = input.options?.useShorthandCtor;
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 733a20c9..2f937826 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -36,7 +36,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
       body: any[];
     }[]
   > {
-    if (!this.option?.useContractHooks?.enabled) {
+    if (!this.option?.useContractsHook?.enabled) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index cf56f6c9..dd6da0d2 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -39,7 +39,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body: any[];
     }[]
   > {
-    if (!this.option?.useContractHooks?.enabled) {
+    if (!this.option?.useContractsHook?.enabled) {
       return;
     }
 

From 88b543457c35e7aea831687c31e4169582093aa8 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:43:42 -0700
Subject: [PATCH 212/287] chore(release): publish

 - wasm-ast-types@1.4.0
 - @cosmwasm/ts-codegen@1.7.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 37423df7..cc7998cb 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.4.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.3.0...wasm-ast-types@1.4.0) (2024-04-17)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.2.0...wasm-ast-types@1.3.0) (2024-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 9eb1da25..b2e3e6ea 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index b37fea30..6612a232 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.7.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.6.0...@cosmwasm/ts-codegen@1.7.0) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.6.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.5.0...@cosmwasm/ts-codegen@1.6.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 4d94ed82..b21e80f8 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -57,7 +57,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.3.0"
+    "wasm-ast-types": "^1.4.0"
   },
   "keywords": [
     "cosmwasm",

From c84db585250ef71a764d0ec9ce21c699dbcbd54b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:44:29 -0700
Subject: [PATCH 213/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4dbc55a5..ff6bca8d 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
     - [Message Builder](#message-builder)
-    - [Use Contract Hooks](#use-contracts-hooks)
+    - [Use Contracts Hook](#use-contracts-hooks-usage)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 4dbc55a5..ff6bca8d 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -36,7 +36,7 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
     - [Recoil](#recoil)
     - [Message Composer](#message-composer)
     - [Message Builder](#message-builder)
-    - [Use Contract Hooks](#use-contracts-hooks)
+    - [Use Contracts Hook](#use-contracts-hooks-usage)
     - [Bundles](#bundles)
     - [CLI Usage and Examples](#cli-usage-and-examples)
     - [Advanced Usage](#advanced-usage)

From 2c659f60a394582089a11bd4f3711f623c64a908 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 17 Apr 2024 02:44:34 -0700
Subject: [PATCH 214/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.7.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 6612a232..55b4cd88 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.7.0...@cosmwasm/ts-codegen@1.7.1) (2024-04-17)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.7.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.6.0...@cosmwasm/ts-codegen@1.7.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index b21e80f8..6967b1cc 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 3e8851e6c1f8b1587c72ba11394817457399e7e1 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 17 Apr 2024 19:27:50 +0800
Subject: [PATCH 215/287] fixed test and remove generators

---
 README.md                                     | 643 +-----------------
 package.json                                  |   1 +
 .../ts-codegen/__tests__/ts-codegen.test.ts   |   7 +-
 packages/ts-codegen/src/index.ts              |   7 -
 packages/ts-codegen/test-utils/index.ts       |  85 +++
 5 files changed, 88 insertions(+), 655 deletions(-)
 mode change 100644 => 120000 README.md
 create mode 100644 packages/ts-codegen/test-utils/index.ts

diff --git a/README.md b/README.md
deleted file mode 100644
index ff6bca8d..00000000
--- a/README.md
+++ /dev/null
@@ -1,642 +0,0 @@
-# @cosmwasm/ts-codegen
-
-Generate TypeScript SDKs for your CosmWasm smart contracts
-
-<p align="center">
-  <img width="120" src="https://user-images.githubusercontent.com/545047/191621556-6f1baa40-15ff-4465-8d80-63b3ff9bc23a.svg">
-</p>
-
-<p align="center" width="100%">
-  <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
-    <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
-  </a>
-   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
-   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
-   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
-   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
-</p>
-
-
-```
-npm install @cosmwasm/ts-codegen
-```
-
-The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
-
-🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
-## Table of contents
-
-- [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
-  - [Table of contents](#table-of-contents)
-- [Usage](#usage)
-    - [Programmatic Usage](#programmatic-usage)
-    - [Types](#types)
-    - [TS Clients](#client)
-    - [React Query](#react-query)
-    - [Recoil](#recoil)
-    - [Message Composer](#message-composer)
-    - [Message Builder](#message-builder)
-    - [Use Contracts Hook](#use-contracts-hooks-usage)
-    - [Bundles](#bundles)
-    - [CLI Usage and Examples](#cli-usage-and-examples)
-    - [Advanced Usage](#advanced-usage)
-- [JSON Schema](#json-schema)
-    - [JSON Schema Generation](#json-schema-generation)
-    - [Exporting Schemas](#exporting-schemas)
-- [Developing](#developing)
-- [Related](#related)
-
-## Usage
-
-### Programmatic Usage
-
-For production usage, we recommend setting up a build script that uses the main entry point:
-
-```ts
-import codegen from '@cosmwasm/ts-codegen';
-
-codegen({
-  contracts: [
-    {
-      name: 'SG721',
-      dir: './path/to/sg721/schema'
-    },
-    {
-      name: 'Minter',
-      dir: './path/to/Minter/schema'
-    }
-  ],
-  outPath: './path/to/code/src/',
-
-  // options are completely optional ;)
-  options: {
-    bundle: {
-      bundleFile: 'index.ts',
-      scope: 'contracts'
-    },
-    types: {
-      enabled: true
-    },
-    client: {
-      enabled: true
-    },
-    reactQuery: {
-      enabled: true,
-      optionalClient: true,
-      version: 'v4',
-      mutations: true,
-      queryKeys: true,
-      queryFactory: true,
-    },
-    recoil: {
-      enabled: false
-    },
-    messageComposer: {
-      enabled: false
-    },
-    messageBuilder: {
-      enabled: false
-    },
-    useContractsHook: {
-      enabled: false
-    }
-  }
-}).then(() => {
-  console.log('✨ all done!');
-});
-```
-#### Types
-
-Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
-
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
-
-#### Types Options
-
-| option                   | description                                          |
-| ------------------------ | ---------------------------------------------------- |
-| `types.enabled`          | enable type generation                               |
-| `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
-| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
-
-### Client
-
-The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
-
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts )
-
-#### Client Options
-
-| option                                  | description                                          |
-| --------------------------------------- | ---------------------------------------------------  |
-| `client.enabled`                        | generate TS client classes for your contracts        |
-| `client.execExtendsQuery`               | execute should extend query message clients          |
-| `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
-
-
-### React Query
-
-Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
-
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
-
-#### React Query Options
-
-| option                      | description                                                                  |
-| --------------------------- | ---------------------------------------------------------------------------- |
-| `reactQuery.enabled`        | enable the react-query plugin                                                |
-| `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
-| `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
-| `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
-| `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
-| `reactQuery.mutations`      | also generate mutations                                                      |
-| `reactQuery.camelize`       | use camelCase style for property names                                       |
-
-
-### Recoil
-
-Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
-
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
-
-#### Recoil Options
-
-| option                         | description                                                         |
-| ------------------------------ | ------------------------------------------------------------------- |
-| `recoil.enabled`               | enable the recoil plugin                                            |
-
-### Message Composer
-
-Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
-
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
-
-#### Message Composer Options
-
-| option                         | description                                                         |
-| ------------------------------ | ------------------------------------------------------------------- |
-| `messageComposer.enabled`      | enable the messageComposer plugin                                   |
-
-### Message Builder
-
-Generate raw message jsons for use in your application with the `message-builder` command.
-
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
-
-#### Message Builder Options
-
-| option                   | description                        |
-|------------------------- | ---------------------------------- |
-| `messageBuilder.enabled` | enable the messageBuilder plugin   |
-
-
-### `useContracts` Hook
-
-Generates `useContracts` hook to easily access contracts, already equipped with a signing client
-
-| option                           | description                             |
-| -------------------------------- | --------------------------------------- |
-| `useContractsHook.enabled`       | enable the `useContracts` plugin        |
-
-#### Example Output
-
-- [Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
-- [Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
-- [Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
-- [Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
-
-#### Use Contracts Provider Usage
-
-```tsx
-import { useChain } from '@cosmos-kit/react';
-import { ContractsProvider } from '../path/to/codegen/contracts-context';
-
-export default function YourComponent() {
-
-  const {
-    address,
-    getCosmWasmClient,
-    getSigningCosmWasmClient
-  } = useChain(chainName);
-
-  return (
-    <ContractsProvider
-      contractsConfig={{
-        address,
-        getCosmWasmClient,
-        getSigningCosmWasmClient,
-      }}
-    >
-        <SomeCoolComponent />
-    </ContractsProvider>
-  )
-};
-```
-
-#### Use Contracts Provider Babel/TSC config
-
-If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
-
-```js
- presets: [
-   '@babel/typescript',
-   '@babel/env',
-   '@babel/preset-react',
- ]
-```
-
-For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
-
-#### Use Contracts Hooks Usage
-
-Once enabled, you can get contracts very simply:
-
-```ts
-const { marketplace } = useContracts();
-```
-
-```ts
-const marketplaceClient = marketplace.signingClient(marketplaceContract);
-await marketplaceClient.updateAskPrice({
-  collection: token.collectionAddr,
-  price: {
-    amount,
-    denom,
-  },
-  tokenId,
-});
-```
-
-### Bundles
-
-The bundler will make a nice package of all your contracts. For example:
-
-```ts
-const {
-  MinterQueryClient,
-  useMinterConfigQuery
-} = contracts.Minter;
-
-const { CwAdminFactoryClient } = contracts.CwAdminFactory;
-```
-#### Bundler Options
-
-| option                | description                                                                      |
-| --------------------- | -------------------------------------------------------------------------------- |
-| `bundle.enabled`      | enable the bundler plugin                                                        |
-| `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
-| `bundle.bundleFile`   | name of the bundle file                                                          |
-
-#### Coding Style
-
-| option                | description                          | default |
-| --------------------- | ------------------------------------ | ------- |
-| `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
-
-Using shorthand constructor (Might not be transpiled correctly with babel):
-
-```ts
-  constructor(
-    protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
-    private TSign?: new (
-      client: SigningCosmWasmClient,
-      sender: string,
-      contractAddress: string
-    ) => TSign,
-    private TQuery?: new (
-      client: CosmWasmClient,
-      contractAddress: string
-    ) => TQuery,
-    private TMsgComposer?: new (
-      sender: string,
-      contractAddress: string
-    ) => TMsgComposer
-  ) {}
-```
-
-Without using shorthand constructor:
-
-```ts
-  address: string | undefined;
-  ...
-  TMsgComposer?: new (
-    sender: string,
-    contractAddress: string
-  ) => TMsgComposer;
-
-  constructor(
-    address: string | undefined,
-    ...
-    TMsgComposer?: new (
-      sender: string,
-      contractAddress: string
-    ) => TMsgComposer
-  ) {
-    this.address = address;
-    ...
-    this.TMsgComposer = TMsgComposer;
-  }
-```
-
-### CLI Usage and Examples
-
-You can get started quickly using our `cli` by globally installing via npm:
-
-```
-npm install @cosmwasm/ts-codegen
-```
-
-Clone your project and `cd` into your contracts folder
-
-```sh
-git clone https://github.com/cosmology-tech/launchpad.git
-cd launchpad/contracts/whitelists/whitelist
-```
-
-Run `cosmwasm-ts-codegen` to generate your code.
-
-```sh
-cosmwasm-ts-codegen generate \
-          --plugin client \
-          --schema ./schema \
-          --out ./ts \
-          --name Whitelist \
-          --no-bundle
-```
-
-The output will be in the folder specified by `--out`, enjoy!
-
-#### Interactive prompt
-
-The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
-
-```sh
-cosmwasm-ts-codegen generate
-? [plugin] which plugins? (Press <space> to select, <a> to toggle all, <i> to invert selection)
-❯◯ client
- ◯ recoil
- ◯ react-query
- ◯ message-composer
- ```
-
-In this example, you can press space bar to select a number of plugins you wish you enable.
-#### Specifying Plugins
-
-Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
- ```
-
-You can specify multiple `--plugin` options using the `generate` command:
-
-```sh
-cosmwasm-ts-codegen generate \
-          --plugin client \
-          --plugin recoil \
-          --schema ./schema \
-          --out ./ts \
-          --name SG721
-```
-
-#### Bypassing the Prompt
-
-All options can be provided so you can bypass the prompt.
-
-For confirm options, you can pass `--no-<name>` to set the value to false. Here is an example without optional client, using v3 for `react-query`, without mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --version v3 \
-    --no-optionalClient \
-    --no-mutations
-```
-
-Example with optional client, using v4, with mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --optionalClient \
-    --version v4 \
-    --mutations
-```
-
-#### Types Only Option
-
-If needed, you can generate only the types with the `typesOnly` option;
-
-```sh
-cosmwasm-ts-codegen generate \
-          --typesOnly \
-          --schema ./schema \
-          --out ./ts \
-          --name SG721
-```
-
-#### Client via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
-
-
-#### React Query via CLI
-
-Here is an example without optional client, using v3 for `react-query`, without mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin client \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --version v3 \
-    --no-optionalClient \
-    --no-mutations
-```
-
-Example with optional client, using v4, with mutations:
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin react-query \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName \
-    --optionalClient \
-    --version v4 \
-    --mutations
-```
-
-#### Recoil via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin recoil \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
-
-#### Message Composer via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin message-composer \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
-
-#### Message Builder via CLI
-
-```sh
-cosmwasm-ts-codegen generate \
-    --plugin message-builder \
-    --schema ./schema \
-    --out ./ts \
-    --name MyContractName
-```
-
-
-### Advanced Usage
-
-for lower-level access, you can import the various plugins directly:
-
-```ts
-import {
-  generateTypes,
-  generateClient,
-  generateReactQuery,
-  generateRecoil,
-  generateMessageComposer
-} from '@cosmwasm/ts-codegen';
-```
-
-### JSON Schema
-
-We generate code from the [JSON Schema](https://json-schema.org/) exported from CosmWasm smart contracts.
-### JSON Schema Generation
-
-Currently you have to have the JSON Schema output. Here is an example to start.
-
-First, get the Rust contracts and run `cargo build`:
-
-```sh
-git clone git@github.com:public-awesome/stargaze-contracts.git
-cd stargaze-contracts
-cargo build
-```
-
-now build the schema with `cargo schema`
-
-```sh
-cd contracts/sg721/
-cargo schema
-```
-### Exporting Schemas
-#### `cosmwasm v1.1` Example
-
-Using the new `write_api` method, you can export schemas:
-
-```rs
-use cosmwasm_schema::write_api;
-
-use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
-
-fn main() {
-    write_api! {
-        instantiate: InstantiateMsg,
-        execute: ExecuteMsg,
-        query: QueryMsg,
-    }
-}
-```
-
-#### `cosmwasm_std` Example
-
-Here is a legacy example:
-
-```rs
-use cosmwasm_std::{Addr, CosmosMsg, Empty};
-
-export_schema_with_title(&schema_for!(MinterData), &out_dir, "MinterResponse");
-export_schema_with_title(&schema_for!(Addr), &out_dir, "StakingResponse");
-export_schema_with_title(&schema_for!(Addr), &out_dir, "DaoResponse");
-export_schema_with_title(
-      &schema_for!(CosmosMsg<Empty>),
-      &out_dir,
-      "CosmosMsg_for_Empty",
-);
-```
-
-## Developing
-
-### Initial setup
-
-```
-yarn
-yarn bootstrap
-```
-
-### Building
-
-```
-yarn build
-```
-
-### Tests
-
-Then `cd` into a package and run the tests
-
-```
-cd ./packages/ast
-yarn test:watch
-```
-
-### Working with ASTs
-
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `wasm-ast-types` package.
-
-## Related
-
-Checkout these related projects:
-
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
-* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
-* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
-* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
-
-## Credits
-
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
-
-
-## Disclaimer
-
-AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
-
-No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
diff --git a/README.md b/README.md
new file mode 120000
index 00000000..e2ae6724
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+packages/ts-codegen/README.md
\ No newline at end of file
diff --git a/package.json b/package.json
index 1aee228c..ffa171b4 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
   "scripts": {
     "clean": "lerna run clean",
     "build": "lerna run build",
+    "test": "lerna run test --scope \"@cosmwasm/ts-codegen\" --scope \"wasm-ast-types\"",
     "symlink": "symlink-workspace --logLevel error",
     "postinstall": "yarn symlink"
   },
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 756af964..77680b5a 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -1,10 +1,5 @@
 import { readSchemas } from '../src/utils';
-import generateTypes from '../src/generators/types';
-import generateClient from '../src/generators/client';
-import generateMessageComposer from '../src/generators/message-composer';
-import generateMessageBuilder from '../src/generators/message-builder';
-import generateReactQuery from '../src/generators/react-query';
-import generateRecoil from '../src/generators/recoil';
+import { generateReactQuery, generateClient, generateMessageComposer, generateMessageBuilder, generateRecoil, generateTypes } from '../test-utils';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
diff --git a/packages/ts-codegen/src/index.ts b/packages/ts-codegen/src/index.ts
index 91e984ef..1a5431cd 100644
--- a/packages/ts-codegen/src/index.ts
+++ b/packages/ts-codegen/src/index.ts
@@ -1,12 +1,5 @@
 import { TSBuilder, TSBuilderInput } from './builder';
 
-export { default as generateTypes } from './generators/types';
-export { default as generateClient } from './generators/client';
-export { default as generateMessageComposer } from './generators/message-composer';
-export { default as generateMessageBuilder } from './generators/message-builder';
-export { default as generateReactQuery } from './generators/react-query';
-export { default as generateRecoil } from './generators/recoil';
-
 export * from './utils';
 export * from './builder';
 export * from './bundler';
diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
new file mode 100644
index 00000000..9d689215
--- /dev/null
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -0,0 +1,85 @@
+import { ContractInfo, ReactQueryOptions, TSTypesOptions } from 'wasm-ast-types';
+import { ReactQueryPlugin } from '../src/plugins/react-query';
+import { TypesPlugin } from '../src/plugins/types';
+import { ClientPlugin } from '../src/plugins/client';
+import { MessageComposerPlugin } from '../src/plugins/message-composer';
+import { RecoilPlugin } from '../src/plugins/recoil';
+import { MessageBuilderPlugin } from '../src/plugins/message-builder';
+
+export async function generateReactQuery(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  opts?: ReactQueryOptions
+) {
+  await new ReactQueryPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+}
+
+export async function generateTypes(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  opts?: TSTypesOptions
+) {
+  await new TypesPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+}
+
+export async function generateClient(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  opts?: TSTypesOptions
+) {
+  await new ClientPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+}
+
+export async function generateMessageComposer(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  opts?: TSTypesOptions
+) {
+  await new MessageComposerPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+}
+
+export async function generateMessageBuilder(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  opts?: TSTypesOptions
+) {
+  await new MessageBuilderPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+}
+
+export async function generateRecoil(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  opts?: TSTypesOptions
+) {
+  await new RecoilPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+}

From 75240d99f53d648b63a9180fa41057cbb2b84124 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Wed, 17 Apr 2024 20:15:23 +0800
Subject: [PATCH 216/287] removed generators fixed README fixed plugin
 lifecycle

---
 packages/ts-codegen/README.md                 |  16 ++-
 .../__snapshots__/builder.test.ts.snap        | 130 ++++++++++++++++++
 packages/ts-codegen/src/builder/builder.ts    |  27 ++--
 packages/ts-codegen/src/generators/client.ts  | 110 ---------------
 .../src/generators/message-builder.ts         |  79 -----------
 .../src/generators/message-composer.ts        |  87 ------------
 .../ts-codegen/src/generators/react-query.ts  | 103 --------------
 packages/ts-codegen/src/generators/recoil.ts  |  92 -------------
 packages/ts-codegen/src/generators/types.ts   |  95 -------------
 .../{generators => helpers}/create-helpers.ts |   0
 packages/ts-codegen/src/plugins/client.ts     |   4 +-
 packages/ts-codegen/src/plugins/index.ts      |   8 +-
 .../src/plugins/message-composer.ts           |   4 +-
 .../ts-codegen/src/plugins/plugin-base.ts     |  13 ++
 .../ts-codegen/src/plugins/provider-bundle.ts |   4 +
 15 files changed, 177 insertions(+), 595 deletions(-)
 delete mode 100644 packages/ts-codegen/src/generators/client.ts
 delete mode 100644 packages/ts-codegen/src/generators/message-builder.ts
 delete mode 100644 packages/ts-codegen/src/generators/message-composer.ts
 delete mode 100644 packages/ts-codegen/src/generators/react-query.ts
 delete mode 100644 packages/ts-codegen/src/generators/recoil.ts
 delete mode 100644 packages/ts-codegen/src/generators/types.ts
 rename packages/ts-codegen/src/{generators => helpers}/create-helpers.ts (100%)

diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index ff6bca8d..d44e934f 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -525,12 +525,18 @@ for lower-level access, you can import the various plugins directly:
 
 ```ts
 import {
-  generateTypes,
-  generateClient,
-  generateReactQuery,
-  generateRecoil,
-  generateMessageComposer
+  TypesPlugin,
+  ReactQueryPlugin,
+  ...
 } from '@cosmwasm/ts-codegen';
+
+// render customized contractInfo into outPath
+await new ReactQueryPlugin(opts ?? {}).render(
+    contractName,
+    contractInfo,
+    outPath
+  );
+
 ```
 
 ### JSON Schema
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 0e6ced18..02515ce2 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -48,6 +48,8 @@ TSBuilder {
   "plugins": [
     TypesPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -91,6 +93,8 @@ TSBuilder {
     },
     ClientPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -134,6 +138,8 @@ TSBuilder {
     },
     MessageComposerPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -177,6 +183,8 @@ TSBuilder {
     },
     ReactQueryPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -220,6 +228,8 @@ TSBuilder {
     },
     RecoilPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -265,6 +275,8 @@ TSBuilder {
     },
     MessageBuilderPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -308,6 +320,8 @@ TSBuilder {
     },
     ContractsContextProviderPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -353,6 +367,57 @@ TSBuilder {
         "IEmptyClient": "__contractContextBase__",
       },
     },
+    ContractsProviderBundlePlugin {
+      "builder": [Circular],
+      "defaultContractName": "contractContextProviders",
+      "lifecycle": "after",
+      "option": {
+        "bundle": {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageBuilder": {
+          "enabled": false,
+        },
+        "messageComposer": {
+          "enabled": false,
+        },
+        "reactQuery": {
+          "camelize": true,
+          "enabled": true,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v4",
+        },
+        "recoil": {
+          "enabled": false,
+        },
+        "types": {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+          "itemsUseTuples": false,
+        },
+        "useContractsHook": {
+          "enabled": false,
+        },
+        "useShorthandCtor": true,
+      },
+      "utils": {
+        "CosmWasmClient": "@cosmjs/cosmwasm-stargate",
+        "IMessageComposerProvider": "__contractContextBase__",
+        "IQueryClientProvider": "__contractContextBase__",
+        "ISigningClientProvider": "__contractContextBase__",
+        "SigningCosmWasmClient": "@cosmjs/cosmwasm-stargate",
+      },
+    },
   ],
 }
 `;
@@ -405,6 +470,8 @@ TSBuilder {
   "plugins": [
     TypesPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -448,6 +515,8 @@ TSBuilder {
     },
     ClientPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -491,6 +560,8 @@ TSBuilder {
     },
     MessageComposerPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -534,6 +605,8 @@ TSBuilder {
     },
     ReactQueryPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -577,6 +650,8 @@ TSBuilder {
     },
     RecoilPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -622,6 +697,8 @@ TSBuilder {
     },
     MessageBuilderPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -665,6 +742,8 @@ TSBuilder {
     },
     ContractsContextProviderPlugin {
       "builder": [Circular],
+      "defaultContractName": undefined,
+      "lifecycle": undefined,
       "option": {
         "bundle": {
           "bundleFile": "bundle.ts",
@@ -710,6 +789,57 @@ TSBuilder {
         "IEmptyClient": "__contractContextBase__",
       },
     },
+    ContractsProviderBundlePlugin {
+      "builder": [Circular],
+      "defaultContractName": "contractContextProviders",
+      "lifecycle": "after",
+      "option": {
+        "bundle": {
+          "bundleFile": "bundle.ts",
+          "enabled": true,
+          "scope": "contracts",
+        },
+        "client": {
+          "enabled": true,
+          "execExtendsQuery": true,
+          "noImplicitOverride": false,
+        },
+        "enabled": true,
+        "messageBuilder": {
+          "enabled": false,
+        },
+        "messageComposer": {
+          "enabled": false,
+        },
+        "reactQuery": {
+          "camelize": true,
+          "enabled": false,
+          "mutations": false,
+          "optionalClient": false,
+          "queryKeys": false,
+          "version": "v4",
+        },
+        "recoil": {
+          "enabled": false,
+        },
+        "types": {
+          "aliasExecuteMsg": false,
+          "enabled": true,
+          "itemsUseTuples": false,
+        },
+        "useContractsHook": {
+          "enabled": false,
+        },
+        "useShorthandCtor": true,
+      },
+      "utils": {
+        "CosmWasmClient": "@cosmjs/cosmwasm-stargate",
+        "IMessageComposerProvider": "__contractContextBase__",
+        "IQueryClientProvider": "__contractContextBase__",
+        "ISigningClientProvider": "__contractContextBase__",
+        "SigningCosmWasmClient": "@cosmjs/cosmwasm-stargate",
+      },
+    },
   ],
 }
 `;
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 447dba97..226032c7 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -22,7 +22,7 @@ import { MessageComposerPlugin } from "../plugins/message-composer";
 import { ClientPlugin } from "../plugins/client";
 import { TypesPlugin } from "../plugins/types";
 import { ContractsContextProviderPlugin } from "../plugins/provider";
-import { createHelpers } from "../generators/create-helpers";
+import { createHelpers } from "../helpers/create-helpers";
 import { ContractsProviderBundlePlugin } from "../plugins/provider-bundle";
 
 const defaultOpts: TSBuilderOptions = {
@@ -107,6 +107,7 @@ export class TSBuilder {
             new RecoilPlugin(this.options),
             new MessageBuilderPlugin(this.options),
             new ContractsContextProviderPlugin(this.options),
+            new ContractsProviderBundlePlugin(this.options)
         );
     }
 
@@ -150,7 +151,7 @@ export class TSBuilder {
     }
 
     private async render(name: string, contractInfo: ContractInfo) {
-        for (const plugin of this.plugins) {
+        for (const plugin of this.plugins.filter(p => !p.lifecycle || p.lifecycle === 'main')) {
             let files = await plugin.render(name, contractInfo, this.outPath);
             if (files && files.length) {
                 this.files.push(...files);
@@ -159,22 +160,14 @@ export class TSBuilder {
     }
 
     private async after() {
-
-        //create useContracts bundle file
-        const contractsProviderBundlePlugin = new ContractsProviderBundlePlugin(this.options);
-        contractsProviderBundlePlugin.setBuilder(this);
-
-        //contractContextProviders.ts
-        const files = await contractsProviderBundlePlugin.render(
-            "contractContextProviders",
-            {
+        for (const plugin of this.plugins.filter(p => p.lifecycle === 'after')) {
+          let files = await plugin.render(plugin.defaultContractName!,
+              {
                 schemas: [],
-            },
-            this.outPath
-        );
-
-        if (files && files.length) {
-            this.files.push(...files);
+              }, this.outPath);
+          if (files && files.length) {
+              this.files.push(...files);
+          }
         }
 
         const helpers = createHelpers({
diff --git a/packages/ts-codegen/src/generators/client.ts b/packages/ts-codegen/src/generators/client.ts
deleted file mode 100644
index ee2073e7..00000000
--- a/packages/ts-codegen/src/generators/client.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { pascal } from "case";
-import { header } from '../utils/header';
-import { join } from "path";
-import { sync as mkdirp } from "mkdirp";
-import * as w from 'wasm-ast-types';
-import * as t from '@babel/types';
-import { writeFileSync } from 'fs';
-import generate from "@babel/generator";
-import { ContractInfo, getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
-import { RenderContext, TSClientOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-
-export default async (
-  name: string,
-  contractInfo: ContractInfo,
-  outPath: string,
-  tsClientOptions?: TSClientOptions
-): Promise<BuilderFile[]> => {
-
-  const { schemas } = contractInfo;
-  const context = new RenderContext(contractInfo, {
-    client: tsClientOptions ?? {}
-  });
-  // const options = context.options.client;
-
-  const localname = pascal(name) + '.client.ts';
-  const TypesFile = pascal(name) + '.types'
-  const QueryMsg = findQueryMsg(schemas);
-  const ExecuteMsg = findExecuteMsg(schemas);
-  const typeHash = await findAndParseTypes(schemas);
-
-  let Client = null;
-  let Instance = null;
-  let QueryClient = null;
-  let ReadOnlyInstance = null;
-
-  const body = [];
-
-  body.push(
-    w.importStmt(Object.keys(typeHash), `./${TypesFile}`)
-  );
-
-  // query messages
-  if (QueryMsg) {
-
-    QueryClient = pascal(`${name}QueryClient`);
-    ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
-
-    body.push(
-      w.createQueryInterface(context, ReadOnlyInstance, QueryMsg)
-    );
-    body.push(
-      w.createQueryClass(context, QueryClient, ReadOnlyInstance, QueryMsg)
-    );
-  }
-
-  // execute messages
-  if (ExecuteMsg) {
-    const children = getMessageProperties(ExecuteMsg);
-    if (children.length > 0) {
-      Client = pascal(`${name}Client`);
-      Instance = pascal(`${name}Interface`);
-
-      body.push(
-        w.createExecuteInterface(
-          context,
-          Instance,
-          context.options.client.execExtendsQuery ? ReadOnlyInstance : null,
-          ExecuteMsg
-        )
-      );
-
-      body.push(
-        w.createExecuteClass(
-          context,
-          Client,
-          Instance,
-          context.options.client.execExtendsQuery ? QueryClient : null,
-          ExecuteMsg
-        )
-      );
-    }
-  }
-
-  if (typeHash.hasOwnProperty('Coin')) {
-    // @ts-ignore
-    delete context.utils.Coin;
-  }
-  const imports = context.getImports();
-  const code = header + generate(
-    // @ts-ignore
-    t.program([
-      ...imports,
-      ...body
-    ])
-  ).code;
-
-  mkdirp(outPath);
-  writeFileSync(join(outPath, localname), code);
-
-  return [
-    {
-      type: 'client',
-      contract: name,
-      localname,
-      filename: join(outPath, localname),
-    }
-  ]
-};
diff --git a/packages/ts-codegen/src/generators/message-builder.ts b/packages/ts-codegen/src/generators/message-builder.ts
deleted file mode 100644
index b8da536c..00000000
--- a/packages/ts-codegen/src/generators/message-builder.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { pascal } from "case";
-import { header } from "../utils/header";
-import { join } from "path";
-import { sync as mkdirp } from "mkdirp";
-import * as w from "wasm-ast-types";
-import * as t from "@babel/types";
-import { writeFileSync } from "fs";
-import generate from "@babel/generator";
-import { ContractInfo, getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
-import { RenderContext, MessageBuilderOptions } from 'wasm-ast-types';
-import { BuilderFile } from "../builder";
-
-export default async (
-  name: string,
-  contractInfo: ContractInfo,
-  outPath: string,
-  messageBuilderOptions?: MessageBuilderOptions
-): Promise<BuilderFile[]> => {
-  const { schemas } = contractInfo;
-  const context = new RenderContext(contractInfo, {
-    messageBuilder: messageBuilderOptions ?? {},
-  });
-
-  const localname = pascal(name) + ".message-builder.ts";
-  const TypesFile = pascal(name) + ".types";
-  const ExecuteMsg = findExecuteMsg(schemas);
-  const typeHash = await findAndParseTypes(schemas);
-
-  const body = [];
-
-  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
-  body.push(w.importStmt(["CamelCasedProperties"], "type-fest"));
-
-  // execute messages
-  if (ExecuteMsg) {
-    const children = getMessageProperties(ExecuteMsg);
-    if (children.length > 0) {
-      const className = pascal(`${name}ExecuteMsgBuilder`);
-
-      body.push(
-        w.createMessageBuilderClass(context, className, ExecuteMsg)
-      );
-    }
-  }
-
-  const QueryMsg = findQueryMsg(schemas);
-  // query messages
-  if (QueryMsg) {
-    const children = getMessageProperties(QueryMsg);
-    if (children.length > 0) {
-      const className = pascal(`${name}QueryMsgBuilder`);
-
-      body.push(
-        w.createMessageBuilderClass(context, className, QueryMsg)
-      );
-    }
-  }
-
-  if (typeHash.hasOwnProperty("Coin")) {
-    // @ts-ignore
-    delete context.utils.Coin;
-  }
-  const imports = context.getImports();
-  // @ts-ignore
-  const code = header + generate(t.program([...imports, ...body])).code;
-
-  mkdirp(outPath);
-  writeFileSync(join(outPath, localname), code);
-
-  return [
-    {
-      type: "message-builder",
-      contract: name,
-      localname,
-      filename: join(outPath, localname),
-    },
-  ];
-};
diff --git a/packages/ts-codegen/src/generators/message-composer.ts b/packages/ts-codegen/src/generators/message-composer.ts
deleted file mode 100644
index e4ab4962..00000000
--- a/packages/ts-codegen/src/generators/message-composer.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { pascal } from "case";
-import { header } from '../utils/header';
-import { join } from "path";
-import { sync as mkdirp } from "mkdirp";
-import * as w from 'wasm-ast-types';
-import * as t from '@babel/types';
-import { writeFileSync } from 'fs';
-import generate from "@babel/generator";
-import { ContractInfo, getMessageProperties } from "wasm-ast-types";
-import { findAndParseTypes, findExecuteMsg } from "../utils";
-import { RenderContext, MessageComposerOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-
-export default async (
-  name: string,
-  contractInfo: ContractInfo,
-  outPath: string,
-  messageComposerOptions?: MessageComposerOptions
-): Promise<BuilderFile[]> => {
-
-  const { schemas } = contractInfo;
-  const context = new RenderContext(contractInfo, {
-    messageComposer: messageComposerOptions ?? {}
-  });
-  // const options = context.options.messageComposer;
-
-  const localname = pascal(name) + '.message-composer.ts';
-  const TypesFile = pascal(name) + '.types';
-  const ExecuteMsg = findExecuteMsg(schemas);
-  const typeHash = await findAndParseTypes(schemas);
-
-  const body = [];
-
-  body.push(
-    w.importStmt(Object.keys(typeHash), `./${TypesFile}`)
-  );
-
-  // execute messages
-  if (ExecuteMsg) {
-    const children = getMessageProperties(ExecuteMsg);
-    if (children.length > 0) {
-      const TheClass = pascal(`${name}MessageComposer`);
-      const Interface = pascal(`${name}Message`);
-
-      body.push(
-        w.createMessageComposerInterface(
-          context,
-          Interface,
-          ExecuteMsg
-        )
-      );
-      body.push(
-        w.createMessageComposerClass(
-          context,
-          TheClass,
-          Interface,
-          ExecuteMsg
-        )
-      );
-    }
-  }
-
-  if (typeHash.hasOwnProperty('Coin')) {
-    // @ts-ignore
-    delete context.utils.Coin;
-  }
-  const imports = context.getImports();
-  const code = header + generate(
-    // @ts-ignore
-    t.program([
-      ...imports,
-      ...body
-    ])
-  ).code;
-
-  mkdirp(outPath);
-  writeFileSync(join(outPath, localname), code);
-
-  return [
-    {
-      type: 'message-composer',
-      contract: name,
-      localname,
-      filename: join(outPath, localname),
-    }
-  ]
-};
diff --git a/packages/ts-codegen/src/generators/react-query.ts b/packages/ts-codegen/src/generators/react-query.ts
deleted file mode 100644
index 42d67da0..00000000
--- a/packages/ts-codegen/src/generators/react-query.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { pascal } from "case";
-import { header } from '../utils/header';
-import { join } from "path";
-import { sync as mkdirp } from "mkdirp";
-import * as w from 'wasm-ast-types';
-import { RenderContext } from 'wasm-ast-types';
-import * as t from '@babel/types';
-import { writeFileSync } from 'fs';
-import generate from "@babel/generator";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
-import { getMessageProperties, ReactQueryOptions, ContractInfo } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-
-export default async (
-  contractName: string,
-  contractInfo: ContractInfo,
-  outPath: string,
-  reactQueryOptions?: ReactQueryOptions
-): Promise<BuilderFile[]> => {
-  const { schemas } = contractInfo;
-  const context = new RenderContext(contractInfo, {
-    reactQuery: reactQueryOptions ?? {}
-  });
-  const options = context.options.reactQuery;
-
-  const localname = pascal(`${contractName}`) + '.react-query.ts';
-  const ContractFile = pascal(`${contractName}`) + '.client';
-  const TypesFile = pascal(`${contractName}`) + '.types';
-
-  const QueryMsg = findQueryMsg(schemas);
-  const ExecuteMsg = findExecuteMsg(schemas);
-  const typeHash = await findAndParseTypes(schemas);
-
-  const ExecuteClient = pascal(`${contractName}Client`);
-  const QueryClient = pascal(`${contractName}QueryClient`);
-
-  const body = [];
-
-  const clientImports = []
-
-  QueryMsg && clientImports.push(QueryClient)
-
-  // check that there are commands within the exec msg
-  const shouldGenerateMutationHooks = ExecuteMsg && options?.version === 'v4' && options?.mutations && getMessageProperties(ExecuteMsg).length > 0
-
-  if (shouldGenerateMutationHooks) {
-    clientImports.push(ExecuteClient)
-  }
-
-  // general contract imports
-  body.push(w.importStmt(Object.keys(typeHash), `./${TypesFile}`));
-
-  // client imports
-  body.push(w.importStmt(clientImports, `./${ContractFile}`));
-
-  // query messages
-  if (QueryMsg) {
-    [].push.apply(body,
-      w.createReactQueryHooks({
-        context,
-        queryMsg: QueryMsg,
-        contractName: contractName,
-        QueryClient
-      })
-    );
-  }
-
-  if (shouldGenerateMutationHooks) {
-    [].push.apply(body,
-      w.createReactQueryMutationHooks({
-        context,
-        execMsg: ExecuteMsg,
-        contractName: contractName,
-        ExecuteClient
-      })
-    );
-  }
-
-  if (typeHash.hasOwnProperty('Coin')) {
-    // @ts-ignore
-    delete context.utils.Coin;
-  }
-  const imports = context.getImports();
-  const code = header + generate(
-    // @ts-ignore
-    t.program([
-      ...imports,
-      ...body
-    ])
-  ).code;
-
-  mkdirp(outPath);
-  writeFileSync(join(outPath, localname), code);
-
-  return [
-    {
-      type: 'react-query',
-      contract: contractName,
-      localname,
-      filename: join(outPath, localname),
-    }
-  ]
-};
diff --git a/packages/ts-codegen/src/generators/recoil.ts b/packages/ts-codegen/src/generators/recoil.ts
deleted file mode 100644
index aae72b0a..00000000
--- a/packages/ts-codegen/src/generators/recoil.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { pascal } from "case";
-import { header } from '../utils/header';
-import { join } from "path";
-import { sync as mkdirp } from "mkdirp";
-import * as w from 'wasm-ast-types';
-import * as t from '@babel/types';
-import { writeFileSync } from 'fs';
-import generate from "@babel/generator";
-import { findAndParseTypes, findQueryMsg } from "../utils";
-import { ContractInfo, RenderContext, RecoilOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-
-export default async (
-  name: string,
-  contractInfo: ContractInfo,
-  outPath: string,
-  recoilOptions?: RecoilOptions
-): Promise<BuilderFile[]> => {
-
-  const { schemas } = contractInfo;
-  const context = new RenderContext(contractInfo, {
-    recoil: recoilOptions ?? {}
-  });
-  const options = context.options.recoil;
-
-  const localname = pascal(name) + '.recoil.ts';
-  const ContractFile = pascal(name) + '.client';
-  const TypesFile = pascal(name) + '.types';
-
-  const QueryMsg = findQueryMsg(schemas);
-  const typeHash = await findAndParseTypes(schemas);
-
-  let QueryClient = null;
-  let ReadOnlyInstance = null;
-
-  const body = [];
-
-  body.push(
-    w.importStmt(['cosmWasmClient'], './chain')
-  );
-
-  body.push(
-    w.importStmt(Object.keys(typeHash), `./${TypesFile}`)
-  );
-
-  // query messages
-  if (QueryMsg) {
-
-    QueryClient = pascal(`${name}QueryClient`);
-    ReadOnlyInstance = pascal(`${name}ReadOnlyInterface`);
-
-    body.push(
-      w.importStmt([QueryClient], `./${ContractFile}`)
-    );
-
-    body.push(w.createRecoilQueryClientType());
-    body.push(w.createRecoilQueryClient(
-      context,
-      name,
-      QueryClient
-    ));
-
-    const selectors = w.createRecoilSelectors(context, name, QueryClient, QueryMsg);
-    body.push(...selectors);
-
-  }
-
-  if (typeHash.hasOwnProperty('Coin')) {
-    // @ts-ignore
-    delete context.utils.Coin;
-  }
-  const imports = context.getImports();
-  const code = header + generate(
-    // @ts-ignore
-    t.program([
-      ...imports,
-      ...body
-    ])
-  ).code;
-
-  mkdirp(outPath);
-  writeFileSync(join(outPath, localname), code);
-
-  return [
-    {
-      type: 'recoil',
-      contract: name,
-      localname,
-      filename: join(outPath, localname),
-    }
-  ]
-};
diff --git a/packages/ts-codegen/src/generators/types.ts b/packages/ts-codegen/src/generators/types.ts
deleted file mode 100644
index 06545336..00000000
--- a/packages/ts-codegen/src/generators/types.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { pascal } from "case";
-import { header } from '../utils/header';
-import { join } from "path";
-import { sync as mkdirp } from "mkdirp";
-import * as t from '@babel/types';
-import { writeFileSync } from 'fs';
-import generate from "@babel/generator";
-import { clean } from "../utils/clean";
-import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
-import { ContractInfo, RenderContext, TSTypesOptions } from "wasm-ast-types";
-import { BuilderFile } from "../builder";
-
-export default async (
-  name: string,
-  contractInfo: ContractInfo,
-  outPath: string,
-  tsTypesOptions?: TSTypesOptions
-): Promise<BuilderFile[]> => {
-
-  const { schemas } = contractInfo;
-  const context = new RenderContext(contractInfo, {
-    types: tsTypesOptions ?? {}
-  });
-  const options = context.options.types;
-
-  const localname = pascal(name) + '.types.ts';
-  const ExecuteMsg = findExecuteMsg(schemas);
-  const typeHash = await findAndParseTypes(schemas);
-
-  const body = [];
-
-  // TYPES
-  Object.values(typeHash).forEach((type: t.Node) => {
-    body.push(
-      clean(type)
-    )
-  });
-
-  // alias the ExecuteMsg (deprecated option)
-  if (options.aliasExecuteMsg && ExecuteMsg) {
-    body.push(
-      t.exportNamedDeclaration(
-        t.tsTypeAliasDeclaration(
-          t.identifier(`${name}ExecuteMsg`),
-          null,
-          t.tsTypeReference(t.identifier('ExecuteMsg'))
-        )
-      )
-    );
-  }
-
-  function addEntryPointAlias(msgName: string) {
-    body.push(
-      t.exportNamedDeclaration(
-        t.tsTypeAliasDeclaration(
-          t.identifier(`${name}${msgName}`),
-          null,
-          t.tsTypeReference(t.identifier(msgName))
-        )
-      )
-    );
-  }
-
-  if (options.aliasEntryPoints) {
-    if (ExecuteMsg) {
-      addEntryPointAlias('ExecuteMsg');
-    }
-    if (findQueryMsg(schemas)) {
-      addEntryPointAlias('QueryMsg');
-    }
-  }
-
-
-  const imports = context.getImports();
-  const code = header + generate(
-    // @ts-ignore
-    t.program([
-      ...imports,
-      ...body
-    ])
-  ).code;
-
-  mkdirp(outPath);
-  const filename = join(outPath, localname);
-  writeFileSync(filename, code);
-
-  return [
-    {
-      type: 'type',
-      contract: name,
-      localname,
-      filename,
-    }
-  ]
-};
diff --git a/packages/ts-codegen/src/generators/create-helpers.ts b/packages/ts-codegen/src/helpers/create-helpers.ts
similarity index 100%
rename from packages/ts-codegen/src/generators/create-helpers.ts
rename to packages/ts-codegen/src/helpers/create-helpers.ts
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 35c3db73..88f616f7 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -11,8 +11,6 @@ import {
 import { BuilderFileType } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
-export const TYPE = "client";
-
 export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
     contract: ContractInfo,
@@ -115,7 +113,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type: TYPE,
+        type:  "client",
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/index.ts b/packages/ts-codegen/src/plugins/index.ts
index 58f95815..d6bdce3c 100644
--- a/packages/ts-codegen/src/plugins/index.ts
+++ b/packages/ts-codegen/src/plugins/index.ts
@@ -1 +1,7 @@
-export * from "./plugin-base"
\ No newline at end of file
+export * from "./plugin-base"
+export * from "./client"
+export * from "./react-query"
+export * from "./recoil"
+export * from "./message-builder"
+export * from "./message-composer"
+export * from "./types"
\ No newline at end of file
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index 277b6045..79becbe5 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -12,8 +12,6 @@ import {
 import { BuilderFileType } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
-export const TYPE = "message-composer";
-
 export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
     contract: ContractInfo,
@@ -80,7 +78,7 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type: TYPE,
+        type: "message-composer",
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 9b1f26a8..1ddc9c7d 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -25,6 +25,13 @@ export interface IBuilderPlugin {
 
   setBuilder(builder: TSBuilder): void;
 
+  /**
+   * prop to indicate to execute the render function in the lifecycle of main process or after
+   */
+  lifecycle?: "main" | "after";
+
+  defaultContractName?: string;
+
   /**
    * render generated cdoe.
    * @param name the name of contract
@@ -47,6 +54,12 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
   builder?: TSBuilder;
   option: TOpt;
   utils: UtilMapping;
+    /**
+   * prop to indicate to execute the render function in the lifecycle of main process or after
+   */
+  lifecycle?: "main" | "after";
+
+  defaultContractName?: string;
 
   constructor(opt: TOpt, builder?: TSBuilder) {
     this.option = opt;
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 2f937826..a41e38c7 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -9,6 +9,10 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
   constructor(opt: TSBuilderOptions) {
     super(opt);
 
+    this.lifecycle = "after";
+
+    this.defaultContractName = "contractContextProviders";
+
     this.utils = {
       CosmWasmClient: "@cosmjs/cosmwasm-stargate",
       SigningCosmWasmClient: "@cosmjs/cosmwasm-stargate",

From 79eed38af62dc31339d9f924f9da9f29b939c3a6 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 18 Apr 2024 12:46:27 +0800
Subject: [PATCH 217/287] finished test

---
 README.md                                     | 628 +++++++++++++++++-
 .../contracts/contractContextBase.ts          |   6 +-
 .../contracts/contracts-context.tsx           |   6 +-
 __output__/builder/bundler_test/index.ts      |   2 +-
 .../builder/default/contractContextBase.ts    |   6 +-
 .../builder/default/contracts-context.tsx     |   6 +-
 __output__/builder/default/index.ts           |   2 +-
 .../CwAdminFactory.message-composer.ts        |   4 +-
 .../CwCodeIdRegistry.message-composer.ts      |   4 +-
 .../CwNamedGroups.message-composer.ts         |   4 +-
 .../CwProposalSingle.message-composer.ts      |   4 +-
 .../AccountsNft.message-composer.ts           |   4 +-
 .../Cw3FixedMultiSig.message-composer.ts      |   4 +-
 .../cw4-group/Cw4Group.message-composer.ts    |   4 +-
 .../cyberpunk/CyberPunk.message-composer.ts   |   4 +-
 .../hackatom/HackAtom.message-composer.ts     |   4 +-
 __output__/minter/Minter.message-composer.ts  |   4 +-
 __output__/sg721/Sg721.message-composer.ts    |   4 +-
 __output__/sg721/Sg721.provider.ts            |  18 +
 __output__/sg721/contractContextProviders.ts  |  22 +
 .../Factory.react-query.ts                    |  38 +-
 .../Factory.react-query.ts                    |  77 +--
 .../factory-query-keys/Factory.react-query.ts | 119 +---
 .../Factory.react-query.ts                    | 163 +----
 .../factory/Factory.message-composer.ts       |   4 +-
 .../vectis/govec/Govec.message-composer.ts    |   4 +-
 .../vectis/proxy/Proxy.message-composer.ts    |   4 +-
 package.json                                  |   1 -
 packages/ast/src/context/context.ts           |   2 +-
 packages/ts-codegen/README.md                 |  21 -
 .../__snapshots__/builder.test.ts.snap        |  60 +-
 .../ts-codegen/__tests__/ts-codegen.test.ts   |  12 +-
 packages/ts-codegen/src/builder/builder.ts    |  39 +-
 .../ts-codegen/src/helpers/create-helpers.ts  |  12 +-
 packages/ts-codegen/src/plugins/client.ts     |   8 +-
 .../ts-codegen/src/plugins/message-builder.ts |   4 +-
 .../src/plugins/message-composer.ts           |   4 +-
 .../ts-codegen/src/plugins/plugin-base.ts     |  44 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |   6 +-
 packages/ts-codegen/src/plugins/provider.ts   |   4 +-
 .../ts-codegen/src/plugins/react-query.ts     |   4 +-
 packages/ts-codegen/src/plugins/recoil.ts     |   4 +-
 packages/ts-codegen/src/plugins/types.ts      |   6 +-
 packages/ts-codegen/src/utils/contracts.ts    |   7 +
 packages/ts-codegen/test-utils/index.ts       | 164 ++++-
 packages/ts-codegen/test-utils/testPlugins.ts |  74 +++
 46 files changed, 1061 insertions(+), 564 deletions(-)
 mode change 120000 => 100644 README.md
 create mode 100644 __output__/sg721/Sg721.provider.ts
 create mode 100644 __output__/sg721/contractContextProviders.ts
 create mode 100644 packages/ts-codegen/src/utils/contracts.ts
 create mode 100644 packages/ts-codegen/test-utils/testPlugins.ts

diff --git a/README.md b/README.md
deleted file mode 120000
index e2ae6724..00000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-packages/ts-codegen/README.md
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..7ce4efc8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,627 @@
+# @cosmwasm/ts-codegen
+
+Generate TypeScript SDKs for your CosmWasm smart contracts
+
+<p align="center">
+  <img width="120" src="https://user-images.githubusercontent.com/545047/191621556-6f1baa40-15ff-4465-8d80-63b3ff9bc23a.svg">
+</p>
+
+<p align="center" width="100%">
+  <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
+    <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
+  </a>
+   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
+   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
+   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
+</p>
+
+
+```
+npm install @cosmwasm/ts-codegen
+```
+
+The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
+
+🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
+## Table of contents
+
+- [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
+  - [Table of contents](#table-of-contents)
+- [Usage](#usage)
+    - [Programmatic Usage](#programmatic-usage)
+    - [Types](#types)
+    - [TS Clients](#client)
+    - [React Query](#react-query)
+    - [Recoil](#recoil)
+    - [Message Composer](#message-composer)
+    - [Message Builder](#message-builder)
+    - [Use Contracts Hook](#use-contracts-hooks-usage)
+    - [Bundles](#bundles)
+    - [CLI Usage and Examples](#cli-usage-and-examples)
+    - [Advanced Usage](#advanced-usage)
+- [JSON Schema](#json-schema)
+    - [JSON Schema Generation](#json-schema-generation)
+    - [Exporting Schemas](#exporting-schemas)
+- [Developing](#developing)
+- [Related](#related)
+
+## Usage
+
+### Programmatic Usage
+
+For production usage, we recommend setting up a build script that uses the main entry point:
+
+```ts
+import codegen from '@cosmwasm/ts-codegen';
+
+codegen({
+  contracts: [
+    {
+      name: 'SG721',
+      dir: './path/to/sg721/schema'
+    },
+    {
+      name: 'Minter',
+      dir: './path/to/Minter/schema'
+    }
+  ],
+  outPath: './path/to/code/src/',
+
+  // options are completely optional ;)
+  options: {
+    bundle: {
+      bundleFile: 'index.ts',
+      scope: 'contracts'
+    },
+    types: {
+      enabled: true
+    },
+    client: {
+      enabled: true
+    },
+    reactQuery: {
+      enabled: true,
+      optionalClient: true,
+      version: 'v4',
+      mutations: true,
+      queryKeys: true,
+      queryFactory: true,
+    },
+    recoil: {
+      enabled: false
+    },
+    messageComposer: {
+      enabled: false
+    },
+    messageBuilder: {
+      enabled: false
+    },
+    useContractsHook: {
+      enabled: false
+    }
+  }
+}).then(() => {
+  console.log('✨ all done!');
+});
+```
+#### Types
+
+Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
+
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
+
+#### Types Options
+
+| option                   | description                                          |
+| ------------------------ | ---------------------------------------------------- |
+| `types.enabled`          | enable type generation                               |
+| `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
+| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
+
+### Client
+
+The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
+
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts )
+
+#### Client Options
+
+| option                                  | description                                          |
+| --------------------------------------- | ---------------------------------------------------  |
+| `client.enabled`                        | generate TS client classes for your contracts        |
+| `client.execExtendsQuery`               | execute should extend query message clients          |
+| `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
+
+
+### React Query
+
+Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
+
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
+
+#### React Query Options
+
+| option                      | description                                                                  |
+| --------------------------- | ---------------------------------------------------------------------------- |
+| `reactQuery.enabled`        | enable the react-query plugin                                                |
+| `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
+| `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+| `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
+| `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
+| `reactQuery.mutations`      | also generate mutations                                                      |
+| `reactQuery.camelize`       | use camelCase style for property names                                       |
+
+
+### Recoil
+
+Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
+
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
+
+#### Recoil Options
+
+| option                         | description                                                         |
+| ------------------------------ | ------------------------------------------------------------------- |
+| `recoil.enabled`               | enable the recoil plugin                                            |
+
+### Message Composer
+
+Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
+
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
+
+#### Message Composer Options
+
+| option                         | description                                                         |
+| ------------------------------ | ------------------------------------------------------------------- |
+| `messageComposer.enabled`      | enable the messageComposer plugin                                   |
+
+### Message Builder
+
+Generate raw message jsons for use in your application with the `message-builder` command.
+
+[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
+
+#### Message Builder Options
+
+| option                   | description                        |
+|------------------------- | ---------------------------------- |
+| `messageBuilder.enabled` | enable the messageBuilder plugin   |
+
+
+### `useContracts` Hook
+
+Generates `useContracts` hook to easily access contracts, already equipped with a signing client
+
+| option                           | description                             |
+| -------------------------------- | --------------------------------------- |
+| `useContractsHook.enabled`       | enable the `useContracts` plugin        |
+
+#### Example Output
+
+- [Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+- [Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+- [Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+- [Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+
+#### Use Contracts Provider Usage
+
+```tsx
+import { useChain } from '@cosmos-kit/react';
+import { ContractsProvider } from '../path/to/codegen/contracts-context';
+
+export default function YourComponent() {
+
+  const {
+    address,
+    getCosmWasmClient,
+    getSigningCosmWasmClient
+  } = useChain(chainName);
+
+  return (
+    <ContractsProvider
+      contractsConfig={{
+        address,
+        getCosmWasmClient,
+        getSigningCosmWasmClient,
+      }}
+    >
+        <SomeCoolComponent />
+    </ContractsProvider>
+  )
+};
+```
+
+#### Use Contracts Provider Babel/TSC config
+
+If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
+
+```js
+ presets: [
+   '@babel/typescript',
+   '@babel/env',
+   '@babel/preset-react',
+ ]
+```
+
+For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
+
+#### Use Contracts Hooks Usage
+
+Once enabled, you can get contracts very simply:
+
+```ts
+const { marketplace } = useContracts();
+```
+
+```ts
+const marketplaceClient = marketplace.signingClient(marketplaceContract);
+await marketplaceClient.updateAskPrice({
+  collection: token.collectionAddr,
+  price: {
+    amount,
+    denom,
+  },
+  tokenId,
+});
+```
+
+### Bundles
+
+The bundler will make a nice package of all your contracts. For example:
+
+```ts
+const {
+  MinterQueryClient,
+  useMinterConfigQuery
+} = contracts.Minter;
+
+const { CwAdminFactoryClient } = contracts.CwAdminFactory;
+```
+#### Bundler Options
+
+| option                | description                                                                      |
+| --------------------- | -------------------------------------------------------------------------------- |
+| `bundle.enabled`      | enable the bundler plugin                                                        |
+| `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
+| `bundle.bundleFile`   | name of the bundle file                                                          |
+
+#### Coding Style
+
+| option                | description                          | default |
+| --------------------- | ------------------------------------ | ------- |
+| `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
+
+Using shorthand constructor (Might not be transpiled correctly with babel):
+
+```ts
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+```
+
+Without using shorthand constructor:
+
+```ts
+  address: string | undefined;
+  ...
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
+  constructor(
+    address: string | undefined,
+    ...
+    TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {
+    this.address = address;
+    ...
+    this.TMsgComposer = TMsgComposer;
+  }
+```
+
+### CLI Usage and Examples
+
+You can get started quickly using our `cli` by globally installing via npm:
+
+```
+npm install @cosmwasm/ts-codegen
+```
+
+Clone your project and `cd` into your contracts folder
+
+```sh
+git clone https://github.com/cosmology-tech/launchpad.git
+cd launchpad/contracts/whitelists/whitelist
+```
+
+Run `cosmwasm-ts-codegen` to generate your code.
+
+```sh
+cosmwasm-ts-codegen generate \
+          --plugin client \
+          --schema ./schema \
+          --out ./ts \
+          --name Whitelist \
+          --no-bundle
+```
+
+The output will be in the folder specified by `--out`, enjoy!
+
+#### Interactive prompt
+
+The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
+
+```sh
+cosmwasm-ts-codegen generate
+? [plugin] which plugins? (Press <space> to select, <a> to toggle all, <i> to invert selection)
+❯◯ client
+ ◯ recoil
+ ◯ react-query
+ ◯ message-composer
+ ```
+
+In this example, you can press space bar to select a number of plugins you wish you enable.
+#### Specifying Plugins
+
+Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+ ```
+
+You can specify multiple `--plugin` options using the `generate` command:
+
+```sh
+cosmwasm-ts-codegen generate \
+          --plugin client \
+          --plugin recoil \
+          --schema ./schema \
+          --out ./ts \
+          --name SG721
+```
+
+#### Bypassing the Prompt
+
+All options can be provided so you can bypass the prompt.
+
+For confirm options, you can pass `--no-<name>` to set the value to false. Here is an example without optional client, using v3 for `react-query`, without mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --version v3 \
+    --no-optionalClient \
+    --no-mutations
+```
+
+Example with optional client, using v4, with mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --optionalClient \
+    --version v4 \
+    --mutations
+```
+
+#### Types Only Option
+
+If needed, you can generate only the types with the `typesOnly` option;
+
+```sh
+cosmwasm-ts-codegen generate \
+          --typesOnly \
+          --schema ./schema \
+          --out ./ts \
+          --name SG721
+```
+
+#### Client via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+
+#### React Query via CLI
+
+Here is an example without optional client, using v3 for `react-query`, without mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --version v3 \
+    --no-optionalClient \
+    --no-mutations
+```
+
+Example with optional client, using v4, with mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --optionalClient \
+    --version v4 \
+    --mutations
+```
+
+#### Recoil via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin recoil \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Composer via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-composer \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Builder via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-builder \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+### JSON Schema
+
+We generate code from the [JSON Schema](https://json-schema.org/) exported from CosmWasm smart contracts.
+### JSON Schema Generation
+
+Currently you have to have the JSON Schema output. Here is an example to start.
+
+First, get the Rust contracts and run `cargo build`:
+
+```sh
+git clone git@github.com:public-awesome/stargaze-contracts.git
+cd stargaze-contracts
+cargo build
+```
+
+now build the schema with `cargo schema`
+
+```sh
+cd contracts/sg721/
+cargo schema
+```
+### Exporting Schemas
+#### `cosmwasm v1.1` Example
+
+Using the new `write_api` method, you can export schemas:
+
+```rs
+use cosmwasm_schema::write_api;
+
+use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}
+```
+
+#### `cosmwasm_std` Example
+
+Here is a legacy example:
+
+```rs
+use cosmwasm_std::{Addr, CosmosMsg, Empty};
+
+export_schema_with_title(&schema_for!(MinterData), &out_dir, "MinterResponse");
+export_schema_with_title(&schema_for!(Addr), &out_dir, "StakingResponse");
+export_schema_with_title(&schema_for!(Addr), &out_dir, "DaoResponse");
+export_schema_with_title(
+      &schema_for!(CosmosMsg<Empty>),
+      &out_dir,
+      "CosmosMsg_for_Empty",
+);
+```
+
+## Developing
+
+### Initial setup
+
+```
+yarn
+yarn bootstrap
+```
+
+### Building
+
+```
+yarn build
+```
+
+### Tests
+
+Then `cd` into a package and run the tests
+
+```
+cd ./packages/ast
+yarn test:watch
+```
+
+### Working with ASTs
+
+See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `wasm-ast-types` package.
+
+## Related
+
+Checkout these related projects:
+
+* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
+* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
+* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
+* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
+* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
+* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
+* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+
+## Credits
+
+🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
+
+
+## Disclaimer
+
+AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
+
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
index 45b6b20a..b69b781b 100644
--- a/__output__/builder/bundler_test/contracts/contractContextBase.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -1,7 +1,7 @@
 /**
-* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
-* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
-* and run the transpile command or yarn proto command to regenerate this bundle.
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
 
diff --git a/__output__/builder/bundler_test/contracts/contracts-context.tsx b/__output__/builder/bundler_test/contracts/contracts-context.tsx
index 74cb9c9f..b50ed508 100644
--- a/__output__/builder/bundler_test/contracts/contracts-context.tsx
+++ b/__output__/builder/bundler_test/contracts/contracts-context.tsx
@@ -1,7 +1,7 @@
 /**
-* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
-* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
-* and run the transpile command or yarn proto command to regenerate this bundle.
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
 
diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
index d55d8a32..c1b4905a 100644
--- a/__output__/builder/bundler_test/index.ts
+++ b/__output__/builder/bundler_test/index.ts
@@ -79,7 +79,7 @@ export namespace smart {
       ..._111,
       ..._112
     };
-    export const contractContextProviders = {
+    export const undefined = {
       ..._113
     };
     export const contractContextBase = {
diff --git a/__output__/builder/default/contractContextBase.ts b/__output__/builder/default/contractContextBase.ts
index a2f5e7af..75594b12 100644
--- a/__output__/builder/default/contractContextBase.ts
+++ b/__output__/builder/default/contractContextBase.ts
@@ -1,7 +1,7 @@
 /**
-* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
-* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
-* and run the transpile command or yarn proto command to regenerate this bundle.
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
 
diff --git a/__output__/builder/default/contracts-context.tsx b/__output__/builder/default/contracts-context.tsx
index 74cb9c9f..b50ed508 100644
--- a/__output__/builder/default/contracts-context.tsx
+++ b/__output__/builder/default/contracts-context.tsx
@@ -1,7 +1,7 @@
 /**
-* This file and any referenced files were automatically generated by @cosmwasm/ts-codegen@latest
-* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
-* and run the transpile command or yarn proto command to regenerate this bundle.
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
 
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index ef0f3c6e..7af98ed4 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -89,7 +89,7 @@ export namespace smart {
       ..._48,
       ..._49
     };
-    export const contractContextProviders = {
+    export const undefined = {
       ..._50
     };
     export const contractContextBase = {
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index ef8311ee..b0de6f1a 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
-export interface CwAdminFactoryMessage {
+export interface CwAdminFactoryMsg {
   contractAddress: string;
   sender: string;
   instantiateContractWithSelfAdmin: ({
@@ -22,7 +22,7 @@ export interface CwAdminFactoryMessage {
     label: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage {
+export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index ba91d227..d5747de7 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
-export interface CwCodeIdRegistryMessage {
+export interface CwCodeIdRegistryMsg {
   contractAddress: string;
   sender: string;
   receive: ({
@@ -58,7 +58,7 @@ export interface CwCodeIdRegistryMessage {
     paymentInfo?: PaymentInfo;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage {
+export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index 52b9f471..e500e833 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types";
-export interface CwNamedGroupsMessage {
+export interface CwNamedGroupsMsg {
   contractAddress: string;
   sender: string;
   update: ({
@@ -32,7 +32,7 @@ export interface CwNamedGroupsMessage {
     owner: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage {
+export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index 1c44cfbf..dadd7372 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types";
-export interface CwProposalSingleMessage {
+export interface CwProposalSingleMsg {
   contractAddress: string;
   sender: string;
   propose: ({
@@ -75,7 +75,7 @@ export interface CwProposalSingleMessage {
     address: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CwProposalSingleMessageComposer implements CwProposalSingleMessage {
+export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index fa57f3ac..6f525cfe 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
-export interface AccountsNftMessage {
+export interface AccountsNftMsg {
   contractAddress: string;
   sender: string;
   proposeNewOwner: ({
@@ -73,7 +73,7 @@ export interface AccountsNftMessage {
     tokenId: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class AccountsNftMessageComposer implements AccountsNftMessage {
+export class AccountsNftMsgComposer implements AccountsNftMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index c7484e9f..2279fda6 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
-export interface Cw3FixedMultiSigMessage {
+export interface Cw3FixedMultiSigMsg {
   contractAddress: string;
   sender: string;
   propose: ({
@@ -40,7 +40,7 @@ export interface Cw3FixedMultiSigMessage {
     proposalId: number;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage {
+export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index 2345afa9..ea39265a 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
-export interface Cw4GroupMessage {
+export interface Cw4GroupMsg {
   contractAddress: string;
   sender: string;
   updateAdmin: ({
@@ -35,7 +35,7 @@ export interface Cw4GroupMessage {
     addr: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class Cw4GroupMessageComposer implements Cw4GroupMessage {
+export class Cw4GroupMsgComposer implements Cw4GroupMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index c8537bb4..5aecadaf 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
-export interface CyberPunkMessage {
+export interface CyberPunkMsg {
   contractAddress: string;
   sender: string;
   argon2: ({
@@ -21,7 +21,7 @@ export interface CyberPunkMessage {
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   mirrorEnv: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class CyberPunkMessageComposer implements CyberPunkMessage {
+export class CyberPunkMsgComposer implements CyberPunkMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index 3bcafb96..b3754700 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
-export interface HackAtomMessage {
+export interface HackAtomMsg {
   contractAddress: string;
   sender: string;
   release: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
@@ -24,7 +24,7 @@ export interface HackAtomMessage {
   panic: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
   userErrorsInApiCalls: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class HackAtomMessageComposer implements HackAtomMessage {
+export class HackAtomMsgComposer implements HackAtomMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 670ef93c..84cbf7bc 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
-export interface MinterMessage {
+export interface MinterMsg {
   contractAddress: string;
   sender: string;
   mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
@@ -37,7 +37,7 @@ export interface MinterMessage {
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
   withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class MinterMessageComposer implements MinterMessage {
+export class MinterMsgComposer implements MinterMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index 8cfa79d1..fbbdc071 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -9,7 +9,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
-export interface Sg721Message {
+export interface Sg721Msg {
   contractAddress: string;
   sender: string;
   transferNft: ({
@@ -73,7 +73,7 @@ export interface Sg721Message {
     tokenId: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class Sg721MessageComposer implements Sg721Message {
+export class Sg721MsgComposer implements Sg721Msg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/sg721/Sg721.provider.ts b/__output__/sg721/Sg721.provider.ts
new file mode 100644
index 00000000..6da8bcd4
--- /dev/null
+++ b/__output__/sg721/Sg721.provider.ts
@@ -0,0 +1,18 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { ContractBase, IContractConstructor } from "./contractContextBase";
+import { Sg721Client, Sg721QueryClient } from "./Sg721.client";
+import { Sg721MsgComposer } from "./Sg721.message-composer";
+export class Sg721 extends ContractBase<Sg721Client, Sg721QueryClient, Sg721MsgComposer> {
+  constructor({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  }: IContractConstructor) {
+    super(address, cosmWasmClient, signingCosmWasmClient, Sg721Client, Sg721QueryClient, Sg721MsgComposer);
+  }
+}
\ No newline at end of file
diff --git a/__output__/sg721/contractContextProviders.ts b/__output__/sg721/contractContextProviders.ts
new file mode 100644
index 00000000..58948411
--- /dev/null
+++ b/__output__/sg721/contractContextProviders.ts
@@ -0,0 +1,22 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
+import { Sg721QueryClient } from "./Sg721.client";
+import { Sg721Client } from "./Sg721.client";
+import { Sg721MsgComposer } from "./Sg721.message-composer";
+import { Sg721 } from "./Sg721.provider";
+export interface IContractsContext {
+  sg721: IQueryClientProvider<Sg721QueryClient> & ISigningClientProvider<Sg721Client> & IMessageComposerProvider<Sg721MsgComposer>;
+}
+export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+  sg721: new Sg721({
+    address,
+    cosmWasmClient,
+    signingCosmWasmClient
+  })
+});
\ No newline at end of file
diff --git a/__output__/vectis/factory-optional-client/Factory.react-query.ts b/__output__/vectis/factory-optional-client/Factory.react-query.ts
index 918a5c63..0bbeba10 100644
--- a/__output__/vectis/factory-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-optional-client/Factory.react-query.ts
@@ -8,7 +8,7 @@ import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
-  client: FactoryQueryClient | undefined;
+  client: FactoryQueryClient;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
@@ -18,30 +18,21 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
 export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
 export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
 export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
@@ -53,12 +44,9 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   args,
   options
 }: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
-  }) : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  }), options);
 }
 export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
@@ -72,14 +60,11 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   args,
   options
 }: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
-  }) : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  }), options);
 }
 export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
@@ -92,11 +77,8 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   args,
   options
 }: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  }), options);
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
index fc93c6b6..0bbeba10 100644
--- a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
@@ -7,47 +7,8 @@
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export const factoryQueryKeys = {
-  contract: ([{
-    contract: "factory"
-  }] as const),
-  address: (contractAddress: string | undefined) => ([{
-    ...factoryQueryKeys.contract[0],
-    address: contractAddress
-  }] as const),
-  wallets: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "wallets",
-    args
-  }] as const),
-  walletsOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "wallets_of",
-    args
-  }] as const),
-  codeId: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "code_id",
-    args
-  }] as const),
-  fee: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "fee",
-    args
-  }] as const),
-  govecAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "govec_addr",
-    args
-  }] as const),
-  adminAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "admin_addr",
-    args
-  }] as const)
-};
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
-  client: FactoryQueryClient | undefined;
+  client: FactoryQueryClient;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
@@ -57,30 +18,21 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client?.contractAddress), () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
 export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client?.contractAddress), () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
 export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client?.contractAddress), () => client ? client.fee() : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
 export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
@@ -92,12 +44,9 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   args,
   options
 }: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client?.contractAddress, args), () => client ? client.codeId({
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
-  }) : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  }), options);
 }
 export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
@@ -111,14 +60,11 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   args,
   options
 }: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client?.contractAddress, args), () => client ? client.walletsOf({
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
-  }) : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  }), options);
 }
 export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
@@ -131,11 +77,8 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   args,
   options
 }: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client?.contractAddress, args), () => client ? client.wallets({
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
-  }) : Promise.reject(new Error("Invalid client")), {
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  });
+  }), options);
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index 220f0ab8..0bbeba10 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -7,113 +7,6 @@
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
-export const factoryQueryKeys = {
-  contract: ([{
-    contract: "factory"
-  }] as const),
-  address: (contractAddress: string) => ([{
-    ...factoryQueryKeys.contract[0],
-    address: contractAddress
-  }] as const),
-  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "wallets",
-    args
-  }] as const),
-  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "wallets_of",
-    args
-  }] as const),
-  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "code_id",
-    args
-  }] as const),
-  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "fee",
-    args
-  }] as const),
-  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "govec_addr",
-    args
-  }] as const),
-  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{
-    ...factoryQueryKeys.address(contractAddress)[0],
-    method: "admin_addr",
-    args
-  }] as const)
-};
-export const factoryQueries = {
-  wallets: <TData = WalletsResponse,>({
-    client,
-    args,
-    options
-  }: FactoryWalletsQuery<TData>): UseQueryOptions<WalletsResponse, Error, TData> => ({
-    queryKey: factoryQueryKeys.wallets(client?.contractAddress, args),
-    queryFn: () => client.wallets({
-      limit: args.limit,
-      startAfter: args.startAfter
-    }),
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  }),
-  walletsOf: <TData = WalletsOfResponse,>({
-    client,
-    args,
-    options
-  }: FactoryWalletsOfQuery<TData>): UseQueryOptions<WalletsOfResponse, Error, TData> => ({
-    queryKey: factoryQueryKeys.walletsOf(client?.contractAddress, args),
-    queryFn: () => client.walletsOf({
-      limit: args.limit,
-      startAfter: args.startAfter,
-      user: args.user
-    }),
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  }),
-  codeId: <TData = CodeIdResponse,>({
-    client,
-    args,
-    options
-  }: FactoryCodeIdQuery<TData>): UseQueryOptions<CodeIdResponse, Error, TData> => ({
-    queryKey: factoryQueryKeys.codeId(client?.contractAddress, args),
-    queryFn: () => client.codeId({
-      ty: args.ty
-    }),
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  }),
-  fee: <TData = FeeResponse,>({
-    client,
-    options
-  }: FactoryFeeQuery<TData>): UseQueryOptions<FeeResponse, Error, TData> => ({
-    queryKey: factoryQueryKeys.fee(client?.contractAddress),
-    queryFn: () => client.fee(),
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  }),
-  govecAddr: <TData = GovecAddrResponse,>({
-    client,
-    options
-  }: FactoryGovecAddrQuery<TData>): UseQueryOptions<GovecAddrResponse, Error, TData> => ({
-    queryKey: factoryQueryKeys.govecAddr(client?.contractAddress),
-    queryFn: () => client.govecAddr(),
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  }),
-  adminAddr: <TData = AdminAddrResponse,>({
-    client,
-    options
-  }: FactoryAdminAddrQuery<TData>): UseQueryOptions<AdminAddrResponse, Error, TData> => ({
-    queryKey: factoryQueryKeys.adminAddr(client?.contractAddress),
-    queryFn: () => client.adminAddr(),
-    ...options,
-    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
-  })
-};
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
@@ -125,21 +18,21 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client.contractAddress), () => client.adminAddr(), options);
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
 }
 export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client.contractAddress), () => client.govecAddr(), options);
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
 }
 export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client.contractAddress), () => client.fee(), options);
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
 }
 export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
@@ -151,7 +44,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   args,
   options
 }: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client.contractAddress, args), () => client.codeId({
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
     ty: args.ty
   }), options);
 }
@@ -167,7 +60,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   args,
   options
 }: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client.contractAddress, args), () => client.walletsOf({
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
@@ -184,7 +77,7 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   args,
   options
 }: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client.contractAddress, args), () => client.wallets({
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 93a6f935..0bbeba10 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -4,11 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
-import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { FactoryQueryClient, FactoryClient } from "./Factory.client";
+import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
@@ -83,161 +81,4 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
-}
-export interface FactoryUpdateAdminMutation {
-  client: FactoryClient;
-  msg: {
-    addr: string;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateAdminMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateAdminMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.updateAdmin(msg, fee, memo, funds), options);
-}
-export interface FactoryUpdateGovecAddrMutation {
-  client: FactoryClient;
-  msg: {
-    addr: string;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.updateGovecAddr(msg, fee, memo, funds), options);
-}
-export interface FactoryUpdateWalletFeeMutation {
-  client: FactoryClient;
-  msg: {
-    newFee: Coin;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.updateWalletFee(msg, fee, memo, funds), options);
-}
-export interface FactoryUpdateCodeIdMutation {
-  client: FactoryClient;
-  msg: {
-    newCodeId: number;
-    ty: CodeIdType;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateCodeIdMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateCodeIdMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.updateCodeId(msg, fee, memo, funds), options);
-}
-export interface FactoryMigrateWalletMutation {
-  client: FactoryClient;
-  msg: {
-    migrationMsg: ProxyMigrationTxMsg;
-    walletAddress: WalletAddr;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryMigrateWalletMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryMigrateWalletMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.migrateWallet(msg, fee, memo, funds), options);
-}
-export interface FactoryUpdateProxyUserMutation {
-  client: FactoryClient;
-  msg: {
-    newUser: Addr;
-    oldUser: Addr;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateProxyUserMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateProxyUserMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.updateProxyUser(msg, fee, memo, funds), options);
-}
-export interface FactoryCreateWalletMutation {
-  client: FactoryClient;
-  msg: {
-    createWalletMsg: CreateWalletMsg;
-  };
-  args?: {
-    fee?: number | StdFee | "auto";
-    memo?: string;
-    funds?: Coin[];
-  };
-}
-export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryCreateWalletMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryCreateWalletMutation>(({
-    client,
-    msg,
-    args: {
-      fee,
-      memo,
-      funds
-    } = {}
-  }) => client.createWallet(msg, fee, memo, funds), options);
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index ef38fb4c..c326c30c 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-export interface FactoryMessage {
+export interface FactoryMsg {
   contractAddress: string;
   sender: string;
   createWallet: ({
@@ -53,7 +53,7 @@ export interface FactoryMessage {
     addr: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class FactoryMessageComposer implements FactoryMessage {
+export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index 579faa6b..a9ddbdd8 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types";
-export interface GovecMessage {
+export interface GovecMsg {
   contractAddress: string;
   sender: string;
   execute: ({
@@ -50,7 +50,7 @@ export interface GovecMessage {
     newLabel: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class GovecMessageComposer implements GovecMessage {
+export class GovecMsgComposer implements GovecMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index 69486527..32685132 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -8,7 +8,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types";
-export interface ProxyMessage {
+export interface ProxyMsg {
   contractAddress: string;
   sender: string;
   execute: ({
@@ -50,7 +50,7 @@ export interface ProxyMessage {
     newLabel: string;
   }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
 }
-export class ProxyMessageComposer implements ProxyMessage {
+export class ProxyMsgComposer implements ProxyMsg {
   sender: string;
   contractAddress: string;
   constructor(sender: string, contractAddress: string) {
diff --git a/package.json b/package.json
index ffa171b4..1aee228c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,6 @@
   "scripts": {
     "clean": "lerna run clean",
     "build": "lerna run build",
-    "test": "lerna run test --scope \"@cosmwasm/ts-codegen\" --scope \"wasm-ast-types\"",
     "symlink": "symlink-workspace --logLevel error",
     "postinstall": "yarn symlink"
   },
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 6424a22a..f4400405 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -123,7 +123,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     this.contract = contract;
     this.schema = getDefinitionSchema(contract.schemas);
     this.options = this.mergeDefaultOpt(options);
-    this.builderContext = builderContext;
+    this.builderContext = builderContext ?? new BuilderContext();
   }
   /**
    * merge options and default options
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index d44e934f..7ce4efc8 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -518,27 +518,6 @@ cosmwasm-ts-codegen generate \
     --name MyContractName
 ```
 
-
-### Advanced Usage
-
-for lower-level access, you can import the various plugins directly:
-
-```ts
-import {
-  TypesPlugin,
-  ReactQueryPlugin,
-  ...
-} from '@cosmwasm/ts-codegen';
-
-// render customized contractInfo into outPath
-await new ReactQueryPlugin(opts ?? {}).render(
-    contractName,
-    contractInfo,
-    outPath
-  );
-
-```
-
 ### JSON Schema
 
 We generate code from the [JSON Schema](https://json-schema.org/) exported from CosmWasm smart contracts.
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 02515ce2..5d15369b 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -49,8 +49,8 @@ TSBuilder {
     TypesPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -94,8 +94,8 @@ TSBuilder {
     ClientPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -139,8 +139,8 @@ TSBuilder {
     MessageComposerPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -184,8 +184,8 @@ TSBuilder {
     ReactQueryPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -229,8 +229,8 @@ TSBuilder {
     RecoilPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -276,8 +276,8 @@ TSBuilder {
     MessageBuilderPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -321,8 +321,8 @@ TSBuilder {
     ContractsContextProviderPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -371,7 +371,7 @@ TSBuilder {
       "builder": [Circular],
       "defaultContractName": "contractContextProviders",
       "lifecycle": "after",
-      "option": {
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -471,8 +471,8 @@ TSBuilder {
     TypesPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -516,8 +516,8 @@ TSBuilder {
     ClientPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -561,8 +561,8 @@ TSBuilder {
     MessageComposerPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -606,8 +606,8 @@ TSBuilder {
     ReactQueryPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -651,8 +651,8 @@ TSBuilder {
     RecoilPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -698,8 +698,8 @@ TSBuilder {
     MessageBuilderPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -743,8 +743,8 @@ TSBuilder {
     ContractsContextProviderPlugin {
       "builder": [Circular],
       "defaultContractName": undefined,
-      "lifecycle": undefined,
-      "option": {
+      "lifecycle": "main",
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
@@ -793,7 +793,7 @@ TSBuilder {
       "builder": [Circular],
       "defaultContractName": "contractContextProviders",
       "lifecycle": "after",
-      "option": {
+      "options": {
         "bundle": {
           "bundleFile": "bundle.ts",
           "enabled": true,
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 77680b5a..b5241347 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -1,5 +1,7 @@
+import { BuilderContext } from 'wasm-ast-types';
+import { TSBuilder } from '../src';
 import { readSchemas } from '../src/utils';
-import { generateReactQuery, generateClient, generateMessageComposer, generateMessageBuilder, generateRecoil, generateTypes } from '../test-utils';
+import { generateReactQuery, generateClient, generateMessageComposer, generateMessageBuilder, generateRecoil, generateTypes, generateContractHooks } from '../test-utils';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
@@ -122,12 +124,16 @@ it('sg721', async () => {
     const contractInfo = await readSchemas({
         schemaDir
     });
+
+    const builderContext = new BuilderContext();
+
     await generateTypes('Sg721', contractInfo, out);
-    await generateClient('Sg721', contractInfo, out);
-    await generateMessageComposer('Sg721', contractInfo, out);
+    await generateClient('Sg721', contractInfo, out, builderContext);
+    await generateMessageComposer('Sg721', contractInfo, out, builderContext);
     await generateMessageBuilder('Sg721', contractInfo, out);
     await generateRecoil('Sg721', contractInfo, out);
     await generateReactQuery('Sg721', contractInfo, out);
+    await generateContractHooks('Sg721', contractInfo, out, builderContext);
 })
 
 it('cw-named-groups', async () => {
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 226032c7..7635b4c9 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -24,6 +24,7 @@ import { TypesPlugin } from "../plugins/types";
 import { ContractsContextProviderPlugin } from "../plugins/provider";
 import { createHelpers } from "../helpers/create-helpers";
 import { ContractsProviderBundlePlugin } from "../plugins/provider-bundle";
+import { createDefaultContractInfo } from "../utils/contracts";
 
 const defaultOpts: TSBuilderOptions = {
     bundle: {
@@ -146,29 +147,35 @@ export class TSBuilder {
             });
 
             //lifecycle and plugins.
-            await this.render(contract.name, contractInfo);
+            await this.render('main', contract.name, contractInfo);
         }
     }
 
-    private async render(name: string, contractInfo: ContractInfo) {
-        for (const plugin of this.plugins.filter(p => !p.lifecycle || p.lifecycle === 'main')) {
-            let files = await plugin.render(name, contractInfo, this.outPath);
-            if (files && files.length) {
-                this.files.push(...files);
-            }
+    private async render(
+      lifecycle?: string,
+      name?: string,
+      contractInfo?: ContractInfo
+    ) {
+      const plugins = lifecycle
+        ? this.plugins.filter((p) =>
+            p.lifecycle === lifecycle
+          )
+        : this.plugins;
+
+      for (const plugin of plugins) {
+        let files = await plugin.render(
+          this.outPath,
+          name,
+          contractInfo ?? createDefaultContractInfo()
+        );
+        if (files && files.length) {
+          this.files.push(...files);
         }
+      }
     }
 
     private async after() {
-        for (const plugin of this.plugins.filter(p => p.lifecycle === 'after')) {
-          let files = await plugin.render(plugin.defaultContractName!,
-              {
-                schemas: [],
-              }, this.outPath);
-          if (files && files.length) {
-              this.files.push(...files);
-          }
-        }
+        await this.render('after');
 
         const helpers = createHelpers({
             outPath: this.outPath,
diff --git a/packages/ts-codegen/src/helpers/create-helpers.ts b/packages/ts-codegen/src/helpers/create-helpers.ts
index 3f3f0a8e..92436596 100644
--- a/packages/ts-codegen/src/helpers/create-helpers.ts
+++ b/packages/ts-codegen/src/helpers/create-helpers.ts
@@ -1,7 +1,6 @@
 import { join, dirname, basename, extname } from "path";
 import { sync as mkdirp } from "mkdirp";
 import { writeContentToFile } from "../utils/files";
-import { readAndParsePackageJson } from "../utils/package";
 import { BuilderFile, TSBuilderInput } from "../builder";
 import {
   contractContextBase,
@@ -9,16 +8,7 @@ import {
   contractsContextTSX,
 } from "../helpers";
 import { BuilderContext } from "wasm-ast-types";
-
-const pkg = readAndParsePackageJson();
-
-const version = process.env.NODE_ENV === "test" ? "latest" : pkg.version;
-const header = `/**
-* This file and any referenced files were automatically generated by ${pkg.name}@${version}
-* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
-* and run the transpile command or yarn proto command to regenerate this bundle.
-*/
-\n`;
+import { header } from "../utils/header";
 
 const write = (
   outPath: string,
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 88f616f7..9f8a9a4b 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -16,7 +16,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -30,7 +30,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.client;
+    const { enabled } = this.options.client;
 
     if (!enabled) {
       return;
@@ -82,7 +82,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
           w.createExecuteInterface(
             context,
             Instance,
-            this.option.client.execExtendsQuery ? ReadOnlyInstance : null,
+            this.options.client.execExtendsQuery ? ReadOnlyInstance : null,
             ExecuteMsg
           )
         );
@@ -92,7 +92,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
             context,
             Client,
             Instance,
-            this.option.client.execExtendsQuery ? QueryClient : null,
+            this.options.client.execExtendsQuery ? QueryClient : null,
             ExecuteMsg
           )
         );
diff --git a/packages/ts-codegen/src/plugins/message-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
index a043d921..4ab83310 100644
--- a/packages/ts-codegen/src/plugins/message-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -16,7 +16,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -30,7 +30,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.messageBuilder;
+    const { enabled } = this.options.messageBuilder;
 
     if (!enabled) {
       return;
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index 79becbe5..db412f11 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -17,7 +17,7 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -31,7 +31,7 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.messageComposer;
+    const { enabled } = this.options.messageComposer;
 
     if (!enabled) {
       return;
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 1ddc9c7d..55948906 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -2,15 +2,15 @@ import { sync as mkdirp } from "mkdirp";
 import { join } from "path";
 import { writeFileSync } from "fs";
 import { header } from "../utils/header";
-import { ContractInfo, UtilMapping, IContext } from "wasm-ast-types";
+import { ContractInfo, UtilMapping, IContext, defaultOptions } from "wasm-ast-types";
 import generate from "@babel/generator";
 import * as t from "@babel/types";
 import {
   BuilderFile,
   BuilderFileType,
   TSBuilder,
-  TSBuilderOptions,
 } from "../builder";
+import deepmerge from "deepmerge";
 
 /**
  * IBuilderPlugin is a common plugin that render generated code.
@@ -28,7 +28,7 @@ export interface IBuilderPlugin {
   /**
    * prop to indicate to execute the render function in the lifecycle of main process or after
    */
-  lifecycle?: "main" | "after";
+  readonly lifecycle: "main" | "after";
 
   defaultContractName?: string;
 
@@ -40,9 +40,9 @@ export interface IBuilderPlugin {
    * @returns info of generated files.
    */
   render(
-    name: string,
-    contractInfo: ContractInfo,
-    outPath: string
+    outPath: string,
+    name?: string,
+    contractInfo?: ContractInfo,
   ): Promise<BuilderFile[]>;
 }
 
@@ -52,18 +52,19 @@ export interface IBuilderPlugin {
 export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
   implements IBuilderPlugin {
   builder?: TSBuilder;
-  option: TOpt;
+  options: TOpt;
   utils: UtilMapping;
-    /**
+  /**
    * prop to indicate to execute the render function in the lifecycle of main process or after
    */
-  lifecycle?: "main" | "after";
+  lifecycle: "main" | "after";
 
   defaultContractName?: string;
 
-  constructor(opt: TOpt, builder?: TSBuilder) {
-    this.option = opt;
+  constructor(opts?: TOpt, builder?: TSBuilder) {
+    this.options = opts;
     this.builder = builder;
+    this.lifecycle = "main";
   }
 
   setBuilder(builder: TSBuilder): void {
@@ -71,17 +72,21 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
   }
 
   async render(
-    name: string,
-    contractInfo: ContractInfo,
-    outPath: string
+    outPath: string,
+    name?: string,
+    contractInfo?: ContractInfo,
   ): Promise<BuilderFile[]> {
-    const { enabled } = this.option;
+    if(!this.options){
+      this.options = this.getDefaultOptions(this.options);
+    }
+
+    const { enabled } = this.options;
 
     if (!enabled) {
       return;
     }
 
-    const context = this.initContext(contractInfo, this.option);
+    const context = this.initContext(contractInfo, this.options);
 
     const results = await this.doRender(name, context);
 
@@ -131,4 +136,11 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
       body: any[];
     }[]
   >;
+
+  /**
+   * get default options
+   */
+  getDefaultOptions(opts: TOpt): any {
+    return deepmerge(defaultOptions, opts ?? {});
+  }
 }
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index a41e38c7..a7ee1ed1 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -6,7 +6,7 @@ import { BuilderPluginBase } from "./plugin-base";
 import { GetLocalBaseNameByContractName } from "./provider";
 
 export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOptions> {
-  constructor(opt: TSBuilderOptions) {
+  constructor(opt?: TSBuilderOptions) {
     super(opt);
 
     this.lifecycle = "after";
@@ -26,7 +26,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
     contract: ContractInfo,
     options?: TSBuilderOptions
   ): RenderContextBase<TSBuilderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -40,7 +40,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
       body: any[];
     }[]
   > {
-    if (!this.option?.useContractsHook?.enabled) {
+    if (!this.options?.useContractsHook?.enabled) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index dd6da0d2..023527d2 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -25,7 +25,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     contract: ContractInfo,
     options?: TSBuilderOptions
   ): RenderContextBase<TSBuilderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -39,7 +39,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       body: any[];
     }[]
   > {
-    if (!this.option?.useContractsHook?.enabled) {
+    if (!this.options?.useContractsHook?.enabled) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
index 1e7de832..160e1c82 100644
--- a/packages/ts-codegen/src/plugins/react-query.ts
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -16,7 +16,7 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -30,7 +30,7 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const options = this.option.reactQuery;
+    const options = this.options.reactQuery;
 
     const { enabled } = options;
 
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index c081618d..9ebb65d1 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -20,7 +20,7 @@ export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -34,7 +34,7 @@ export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.recoil;
+    const { enabled } = this.options.recoil;
 
     if (!enabled) {
       return;
diff --git a/packages/ts-codegen/src/plugins/types.ts b/packages/ts-codegen/src/plugins/types.ts
index f904c70e..231a9ceb 100644
--- a/packages/ts-codegen/src/plugins/types.ts
+++ b/packages/ts-codegen/src/plugins/types.ts
@@ -16,7 +16,7 @@ export class TypesPlugin extends BuilderPluginBase<RenderOptions> {
     contract: ContractInfo,
     options?: RenderOptions
   ): RenderContextBase<RenderOptions> {
-    return new RenderContext(contract, options, this.builder.builderContext);
+    return new RenderContext(contract, options, this.builder?.builderContext);
   }
 
   async doRender(
@@ -30,14 +30,14 @@ export class TypesPlugin extends BuilderPluginBase<RenderOptions> {
       body: any[];
     }[]
   > {
-    const { enabled } = this.option.types;
+    const { enabled } = this.options.types;
 
     if (!enabled) {
       return;
     }
 
     const { schemas } = context.contract;
-    const options = this.option.types;
+    const options = this.options.types;
 
     const localname = pascal(name) + '.types.ts';
     const ExecuteMsg = findExecuteMsg(schemas);
diff --git a/packages/ts-codegen/src/utils/contracts.ts b/packages/ts-codegen/src/utils/contracts.ts
new file mode 100644
index 00000000..6bbf3d63
--- /dev/null
+++ b/packages/ts-codegen/src/utils/contracts.ts
@@ -0,0 +1,7 @@
+import { ContractInfo } from "wasm-ast-types";
+
+export const createDefaultContractInfo = (): ContractInfo => {
+  return {
+    schemas: [],
+  };
+};
diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
index 9d689215..f3f3df8b 100644
--- a/packages/ts-codegen/test-utils/index.ts
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -1,10 +1,60 @@
-import { ContractInfo, ReactQueryOptions, TSTypesOptions } from 'wasm-ast-types';
-import { ReactQueryPlugin } from '../src/plugins/react-query';
-import { TypesPlugin } from '../src/plugins/types';
-import { ClientPlugin } from '../src/plugins/client';
-import { MessageComposerPlugin } from '../src/plugins/message-composer';
-import { RecoilPlugin } from '../src/plugins/recoil';
-import { MessageBuilderPlugin } from '../src/plugins/message-builder';
+import {
+  BuilderContext,
+  ContractInfo,
+  ReactQueryOptions,
+  RenderOptions,
+  TSTypesOptions,
+} from "wasm-ast-types";
+import { ReactQueryPlugin } from "../src/plugins/react-query";
+import { TypesPlugin } from "../src/plugins/types";
+import { ClientPlugin } from "../src/plugins/client";
+import { MessageComposerPlugin } from "../src/plugins/message-composer";
+import { RecoilPlugin } from "../src/plugins/recoil";
+import { MessageBuilderPlugin } from "../src/plugins/message-builder";
+import { ContractsContextProviderPlugin } from "../src/plugins/provider";
+import { ContractsProviderBundlePlugin } from "../src/plugins/provider-bundle";
+import { TSBuilderOptions } from "../src/builder";
+import { createDefaultContractInfo } from "../src/utils/contracts";
+import {
+  TestContractsContextProviderPlugin,
+  TestClientPlugin,
+  TestMessageComposerPlugin,
+  TestContractsProviderBundlePlugin,
+} from "./testPlugins";
+
+export const testDefaultOptions: RenderOptions = {
+  enabled: true,
+  types: {
+    enabled: true,
+    itemsUseTuples: false,
+    aliasExecuteMsg: false,
+  },
+  client: {
+    enabled: true,
+    execExtendsQuery: true,
+    noImplicitOverride: false,
+  },
+  recoil: {
+    enabled: true,
+  },
+  messageComposer: {
+    enabled: true,
+  },
+  messageBuilder: {
+    enabled: true,
+  },
+  reactQuery: {
+    enabled: true,
+    optionalClient: false,
+    version: "v4",
+    mutations: false,
+    camelize: true,
+    queryKeys: false,
+  },
+  useContractsHook: {
+    enabled: true,
+  },
+};
 
 export async function generateReactQuery(
   contractName: string,
@@ -12,10 +62,13 @@ export async function generateReactQuery(
   outPath: string,
   opts?: ReactQueryOptions
 ) {
-  await new ReactQueryPlugin(opts ?? {}).render(
+  const options = opts
+    ? { ...testDefaultOptions, ...opts }
+    : testDefaultOptions;
+  await new ReactQueryPlugin(options).render(
+    outPath,
     contractName,
-    contractInfo,
-    outPath
+    contractInfo
   );
 }
 
@@ -25,10 +78,10 @@ export async function generateTypes(
   outPath: string,
   opts?: TSTypesOptions
 ) {
-  await new TypesPlugin(opts ?? {}).render(
+  await new TypesPlugin(opts ?? testDefaultOptions).render(
+    outPath,
     contractName,
-    contractInfo,
-    outPath
+    contractInfo
   );
 }
 
@@ -36,38 +89,54 @@ export async function generateClient(
   contractName: string,
   contractInfo: ContractInfo,
   outPath: string,
-  opts?: TSTypesOptions
+  builderContext?: BuilderContext,
+  opts?: RenderOptions
 ) {
-  await new ClientPlugin(opts ?? {}).render(
-    contractName,
-    contractInfo,
-    outPath
-  );
+  if (builderContext) {
+    await new TestClientPlugin(
+      opts ?? testDefaultOptions,
+      builderContext
+    ).render(outPath, contractName, contractInfo);
+  } else {
+    await new ClientPlugin(opts ?? testDefaultOptions).render(
+      outPath,
+      contractName,
+      contractInfo
+    );
+  }
 }
 
 export async function generateMessageComposer(
   contractName: string,
   contractInfo: ContractInfo,
   outPath: string,
-  opts?: TSTypesOptions
+  builderContext?: BuilderContext,
+  opts?: RenderOptions
 ) {
-  await new MessageComposerPlugin(opts ?? {}).render(
-    contractName,
-    contractInfo,
-    outPath
-  );
+  if (builderContext) {
+    await new TestMessageComposerPlugin(
+      opts ?? testDefaultOptions,
+      builderContext
+    ).render(outPath, contractName, contractInfo);
+  } else {
+    await new MessageComposerPlugin(opts ?? testDefaultOptions).render(
+      outPath,
+      contractName,
+      contractInfo
+    );
+  }
 }
 
 export async function generateMessageBuilder(
   contractName: string,
   contractInfo: ContractInfo,
   outPath: string,
-  opts?: TSTypesOptions
+  opts?: RenderOptions
 ) {
-  await new MessageBuilderPlugin(opts ?? {}).render(
+  await new MessageBuilderPlugin(opts ?? testDefaultOptions).render(
+    outPath,
     contractName,
-    contractInfo,
-    outPath
+    contractInfo
   );
 }
 
@@ -75,11 +144,40 @@ export async function generateRecoil(
   contractName: string,
   contractInfo: ContractInfo,
   outPath: string,
-  opts?: TSTypesOptions
+  opts?: RenderOptions
 ) {
-  await new RecoilPlugin(opts ?? {}).render(
+  await new RecoilPlugin(opts ?? testDefaultOptions).render(
+    outPath,
     contractName,
-    contractInfo,
-    outPath
+    contractInfo
   );
 }
+
+export async function generateContractHooks(
+  contractName: string,
+  contractInfo: ContractInfo,
+  outPath: string,
+  builderContext?: BuilderContext
+) {
+  await new TestContractsContextProviderPlugin(
+    {
+      enabled: true,
+      useShorthandCtor: true,
+      useContractsHook: {
+        enabled: true,
+      },
+    },
+    builderContext
+  ).render(outPath, contractName, contractInfo);
+
+  await new TestContractsProviderBundlePlugin(
+    {
+      enabled: true,
+      useShorthandCtor: true,
+      useContractsHook: {
+        enabled: true,
+      },
+    },
+    builderContext
+  ).render(outPath, undefined, contractInfo ?? createDefaultContractInfo());
+}
diff --git a/packages/ts-codegen/test-utils/testPlugins.ts b/packages/ts-codegen/test-utils/testPlugins.ts
new file mode 100644
index 00000000..13c35382
--- /dev/null
+++ b/packages/ts-codegen/test-utils/testPlugins.ts
@@ -0,0 +1,74 @@
+import {
+  BuilderContext,
+  ContractInfo,
+  RenderContext,
+  RenderContextBase,
+  RenderOptions,
+} from "wasm-ast-types";
+import { ClientPlugin, MessageComposerPlugin, TSBuilderOptions } from "../src";
+import { ContractsContextProviderPlugin } from "../src/plugins/provider";
+import { ContractsProviderBundlePlugin } from "../src/plugins/provider-bundle";
+
+export class TestClientPlugin extends ClientPlugin {
+  builderContext: BuilderContext;
+
+  constructor(opts: RenderOptions, builderContext: BuilderContext) {
+    super(opts);
+    this.builderContext = builderContext;
+  }
+
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options, this.builderContext);
+  }
+}
+
+export class TestMessageComposerPlugin extends MessageComposerPlugin {
+  builderContext: BuilderContext;
+
+  constructor(opts: RenderOptions, builderContext: BuilderContext) {
+    super(opts);
+    this.builderContext = builderContext;
+  }
+
+  initContext(
+    contract: ContractInfo,
+    options?: RenderOptions
+  ): RenderContextBase<RenderOptions> {
+    return new RenderContext(contract, options, this.builderContext);
+  }
+}
+
+export class TestContractsContextProviderPlugin extends ContractsContextProviderPlugin {
+  builderContext: BuilderContext;
+
+  constructor(opts: TSBuilderOptions, builderContext: BuilderContext) {
+    super(opts);
+    this.builderContext = builderContext;
+  }
+
+  initContext(
+    contract: ContractInfo,
+    options?: TSBuilderOptions
+  ): RenderContextBase<TSBuilderOptions> {
+    return new RenderContext(contract, options, this.builderContext);
+  }
+}
+
+export class TestContractsProviderBundlePlugin extends ContractsProviderBundlePlugin {
+  builderContext: BuilderContext;
+
+  constructor(opts: TSBuilderOptions, builderContext: BuilderContext) {
+    super(opts);
+    this.builderContext = builderContext;
+  }
+
+  initContext(
+    contract: ContractInfo,
+    options?: TSBuilderOptions
+  ): RenderContextBase<TSBuilderOptions> {
+    return new RenderContext(contract, options, this.builderContext);
+  }
+}

From 7644ef5912c4f5062b2ff18ae6f439c14b3e95f8 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 18 Apr 2024 13:08:29 +0800
Subject: [PATCH 218/287] fix lerna

---
 package.json                | 3 ++-
 packages/types/package.json | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1aee228c..652788db 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
   "private": true,
   "scripts": {
     "clean": "lerna run clean",
-    "build": "lerna run build",
+    "build": "lerna run build --stream",
+    "test": "lerna run test --stream",
     "symlink": "symlink-workspace --logLevel error",
     "postinstall": "yarn symlink"
   },
diff --git a/packages/types/package.json b/packages/types/package.json
index 4f8f8798..b032e857 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -17,8 +17,8 @@
     "clean": "del dist/**",
     "prepare": "npm run build",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "test": "jest",
-    "test:watch": "jest --watch"
+    "test": "jest --passWithNoTests",
+    "test:watch": "jest --watch --passWithNoTests"
   },
   "repository": {
     "type": "git",

From 5a4a0687433e8a1d2436f69e095a04f654c1bfc8 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 18 Apr 2024 21:15:57 +0800
Subject: [PATCH 219/287] fixed react query tests alias cosmwasm-ts-codegen cmd

---
 .../Factory.react-query.ts                    |  38 ++--
 .../Factory.react-query.ts                    |  77 +++++++--
 .../factory-query-keys/Factory.react-query.ts | 119 ++++++++++++-
 .../Factory.react-query.ts                    | 163 +++++++++++++++++-
 packages/ts-codegen/README.md                 |  26 +--
 packages/ts-codegen/package.json              |   3 +-
 packages/ts-codegen/test-utils/index.ts       |   4 +-
 7 files changed, 387 insertions(+), 43 deletions(-)

diff --git a/__output__/vectis/factory-optional-client/Factory.react-query.ts b/__output__/vectis/factory-optional-client/Factory.react-query.ts
index 0bbeba10..918a5c63 100644
--- a/__output__/vectis/factory-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-optional-client/Factory.react-query.ts
@@ -8,7 +8,7 @@ import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
-  client: FactoryQueryClient;
+  client: FactoryQueryClient | undefined;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
@@ -18,21 +18,30 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client?.contractAddress], () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client?.contractAddress], () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
+  return useQuery<FeeResponse, Error, TData>(["factoryFee", client?.contractAddress], () => client ? client.fee() : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
@@ -44,9 +53,12 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   args,
   options
 }: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client?.contractAddress, JSON.stringify(args)], () => client ? client.codeId({
     ty: args.ty
-  }), options);
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
@@ -60,11 +72,14 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   args,
   options
 }: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client?.contractAddress, JSON.stringify(args)], () => client ? client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
-  }), options);
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
@@ -77,8 +92,11 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   args,
   options
 }: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client?.contractAddress, JSON.stringify(args)], () => client ? client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
-  }), options);
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
index 0bbeba10..fc93c6b6 100644
--- a/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys-optional-client/Factory.react-query.ts
@@ -7,8 +7,47 @@
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
+export const factoryQueryKeys = {
+  contract: ([{
+    contract: "factory"
+  }] as const),
+  address: (contractAddress: string | undefined) => ([{
+    ...factoryQueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  wallets: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets",
+    args
+  }] as const),
+  walletsOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets_of",
+    args
+  }] as const),
+  codeId: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "code_id",
+    args
+  }] as const),
+  fee: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "fee",
+    args
+  }] as const),
+  govecAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "govec_addr",
+    args
+  }] as const),
+  adminAddr: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "admin_addr",
+    args
+  }] as const)
+};
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
-  client: FactoryQueryClient;
+  client: FactoryQueryClient | undefined;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
     initialData?: undefined;
   };
@@ -18,21 +57,30 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client?.contractAddress), () => client ? client.adminAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client?.contractAddress), () => client ? client.govecAddr() : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client?.contractAddress), () => client ? client.fee() : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
@@ -44,9 +92,12 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   args,
   options
 }: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client?.contractAddress, args), () => client ? client.codeId({
     ty: args.ty
-  }), options);
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryWalletsOfQuery<TData> extends FactoryReactQuery<WalletsOfResponse, TData> {
   args: {
@@ -60,11 +111,14 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   args,
   options
 }: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client?.contractAddress, args), () => client ? client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
-  }), options);
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
 export interface FactoryWalletsQuery<TData> extends FactoryReactQuery<WalletsResponse, TData> {
   args: {
@@ -77,8 +131,11 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   args,
   options
 }: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client?.contractAddress, args), () => client ? client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
-  }), options);
+  }) : Promise.reject(new Error("Invalid client")), {
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  });
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory-query-keys/Factory.react-query.ts b/__output__/vectis/factory-query-keys/Factory.react-query.ts
index 0bbeba10..220f0ab8 100644
--- a/__output__/vectis/factory-query-keys/Factory.react-query.ts
+++ b/__output__/vectis/factory-query-keys/Factory.react-query.ts
@@ -7,6 +7,113 @@
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient } from "./Factory.client";
+export const factoryQueryKeys = {
+  contract: ([{
+    contract: "factory"
+  }] as const),
+  address: (contractAddress: string) => ([{
+    ...factoryQueryKeys.contract[0],
+    address: contractAddress
+  }] as const),
+  wallets: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets",
+    args
+  }] as const),
+  walletsOf: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "wallets_of",
+    args
+  }] as const),
+  codeId: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "code_id",
+    args
+  }] as const),
+  fee: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "fee",
+    args
+  }] as const),
+  govecAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "govec_addr",
+    args
+  }] as const),
+  adminAddr: (contractAddress: string, args?: Record<string, unknown>) => ([{
+    ...factoryQueryKeys.address(contractAddress)[0],
+    method: "admin_addr",
+    args
+  }] as const)
+};
+export const factoryQueries = {
+  wallets: <TData = WalletsResponse,>({
+    client,
+    args,
+    options
+  }: FactoryWalletsQuery<TData>): UseQueryOptions<WalletsResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.wallets(client?.contractAddress, args),
+    queryFn: () => client.wallets({
+      limit: args.limit,
+      startAfter: args.startAfter
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  walletsOf: <TData = WalletsOfResponse,>({
+    client,
+    args,
+    options
+  }: FactoryWalletsOfQuery<TData>): UseQueryOptions<WalletsOfResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.walletsOf(client?.contractAddress, args),
+    queryFn: () => client.walletsOf({
+      limit: args.limit,
+      startAfter: args.startAfter,
+      user: args.user
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  codeId: <TData = CodeIdResponse,>({
+    client,
+    args,
+    options
+  }: FactoryCodeIdQuery<TData>): UseQueryOptions<CodeIdResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.codeId(client?.contractAddress, args),
+    queryFn: () => client.codeId({
+      ty: args.ty
+    }),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  fee: <TData = FeeResponse,>({
+    client,
+    options
+  }: FactoryFeeQuery<TData>): UseQueryOptions<FeeResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.fee(client?.contractAddress),
+    queryFn: () => client.fee(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  govecAddr: <TData = GovecAddrResponse,>({
+    client,
+    options
+  }: FactoryGovecAddrQuery<TData>): UseQueryOptions<GovecAddrResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.govecAddr(client?.contractAddress),
+    queryFn: () => client.govecAddr(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  }),
+  adminAddr: <TData = AdminAddrResponse,>({
+    client,
+    options
+  }: FactoryAdminAddrQuery<TData>): UseQueryOptions<AdminAddrResponse, Error, TData> => ({
+    queryKey: factoryQueryKeys.adminAddr(client?.contractAddress),
+    queryFn: () => client.adminAddr(),
+    ...options,
+    enabled: !!client && (options?.enabled != undefined ? options.enabled : true)
+  })
+};
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
@@ -18,21 +125,21 @@ export function useFactoryAdminAddrQuery<TData = AdminAddrResponse>({
   client,
   options
 }: FactoryAdminAddrQuery<TData>) {
-  return useQuery<AdminAddrResponse, Error, TData>(["factoryAdminAddr", client.contractAddress], () => client.adminAddr(), options);
+  return useQuery<AdminAddrResponse, Error, TData>(factoryQueryKeys.adminAddr(client.contractAddress), () => client.adminAddr(), options);
 }
 export interface FactoryGovecAddrQuery<TData> extends FactoryReactQuery<GovecAddrResponse, TData> {}
 export function useFactoryGovecAddrQuery<TData = GovecAddrResponse>({
   client,
   options
 }: FactoryGovecAddrQuery<TData>) {
-  return useQuery<GovecAddrResponse, Error, TData>(["factoryGovecAddr", client.contractAddress], () => client.govecAddr(), options);
+  return useQuery<GovecAddrResponse, Error, TData>(factoryQueryKeys.govecAddr(client.contractAddress), () => client.govecAddr(), options);
 }
 export interface FactoryFeeQuery<TData> extends FactoryReactQuery<FeeResponse, TData> {}
 export function useFactoryFeeQuery<TData = FeeResponse>({
   client,
   options
 }: FactoryFeeQuery<TData>) {
-  return useQuery<FeeResponse, Error, TData>(["factoryFee", client.contractAddress], () => client.fee(), options);
+  return useQuery<FeeResponse, Error, TData>(factoryQueryKeys.fee(client.contractAddress), () => client.fee(), options);
 }
 export interface FactoryCodeIdQuery<TData> extends FactoryReactQuery<CodeIdResponse, TData> {
   args: {
@@ -44,7 +151,7 @@ export function useFactoryCodeIdQuery<TData = CodeIdResponse>({
   args,
   options
 }: FactoryCodeIdQuery<TData>) {
-  return useQuery<CodeIdResponse, Error, TData>(["factoryCodeId", client.contractAddress, JSON.stringify(args)], () => client.codeId({
+  return useQuery<CodeIdResponse, Error, TData>(factoryQueryKeys.codeId(client.contractAddress, args), () => client.codeId({
     ty: args.ty
   }), options);
 }
@@ -60,7 +167,7 @@ export function useFactoryWalletsOfQuery<TData = WalletsOfResponse>({
   args,
   options
 }: FactoryWalletsOfQuery<TData>) {
-  return useQuery<WalletsOfResponse, Error, TData>(["factoryWalletsOf", client.contractAddress, JSON.stringify(args)], () => client.walletsOf({
+  return useQuery<WalletsOfResponse, Error, TData>(factoryQueryKeys.walletsOf(client.contractAddress, args), () => client.walletsOf({
     limit: args.limit,
     startAfter: args.startAfter,
     user: args.user
@@ -77,7 +184,7 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
   args,
   options
 }: FactoryWalletsQuery<TData>) {
-  return useQuery<WalletsResponse, Error, TData>(["factoryWallets", client.contractAddress, JSON.stringify(args)], () => client.wallets({
+  return useQuery<WalletsResponse, Error, TData>(factoryQueryKeys.wallets(client.contractAddress, args), () => client.wallets({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 0bbeba10..93a6f935 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -4,9 +4,11 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { UseQueryOptions, useQuery } from "@tanstack/react-query";
+import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
+import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { StdFee } from "@cosmjs/amino";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
-import { FactoryQueryClient } from "./Factory.client";
+import { FactoryQueryClient, FactoryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
   client: FactoryQueryClient;
   options?: Omit<UseQueryOptions<TResponse, Error, TData>, "'queryKey' | 'queryFn' | 'initialData'"> & {
@@ -81,4 +83,161 @@ export function useFactoryWalletsQuery<TData = WalletsResponse>({
     limit: args.limit,
     startAfter: args.startAfter
   }), options);
+}
+export interface FactoryUpdateAdminMutation {
+  client: FactoryClient;
+  msg: {
+    addr: string;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateAdminMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryUpdateAdminMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.updateAdmin(msg, fee, memo, funds), options);
+}
+export interface FactoryUpdateGovecAddrMutation {
+  client: FactoryClient;
+  msg: {
+    addr: string;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.updateGovecAddr(msg, fee, memo, funds), options);
+}
+export interface FactoryUpdateWalletFeeMutation {
+  client: FactoryClient;
+  msg: {
+    newFee: Coin;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.updateWalletFee(msg, fee, memo, funds), options);
+}
+export interface FactoryUpdateCodeIdMutation {
+  client: FactoryClient;
+  msg: {
+    newCodeId: number;
+    ty: CodeIdType;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateCodeIdMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryUpdateCodeIdMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.updateCodeId(msg, fee, memo, funds), options);
+}
+export interface FactoryMigrateWalletMutation {
+  client: FactoryClient;
+  msg: {
+    migrationMsg: ProxyMigrationTxMsg;
+    walletAddress: WalletAddr;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryMigrateWalletMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryMigrateWalletMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.migrateWallet(msg, fee, memo, funds), options);
+}
+export interface FactoryUpdateProxyUserMutation {
+  client: FactoryClient;
+  msg: {
+    newUser: Addr;
+    oldUser: Addr;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateProxyUserMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryUpdateProxyUserMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.updateProxyUser(msg, fee, memo, funds), options);
+}
+export interface FactoryCreateWalletMutation {
+  client: FactoryClient;
+  msg: {
+    createWalletMsg: CreateWalletMsg;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
+}
+export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryCreateWalletMutation>, "mutationFn">) {
+  return useMutation<ExecuteResult, Error, FactoryCreateWalletMutation>(({
+    client,
+    msg,
+    args: {
+      fee,
+      memo,
+      funds
+    } = {}
+  }) => client.createWallet(msg, fee, memo, funds), options);
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 7ce4efc8..60ca2b81 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -355,10 +355,10 @@ git clone https://github.com/cosmology-tech/launchpad.git
 cd launchpad/contracts/whitelists/whitelist
 ```
 
-Run `cosmwasm-ts-codegen` to generate your code.
+Run `ts-codegen` or `cosmwasm-ts-codegen` to generate your code.
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
           --plugin client \
           --schema ./schema \
           --out ./ts \
@@ -387,7 +387,7 @@ In this example, you can press space bar to select a number of plugins you wish
 Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client
     --schema ./schema \
     --out ./ts \
@@ -397,7 +397,7 @@ cosmwasm-ts-codegen generate \
 You can specify multiple `--plugin` options using the `generate` command:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
           --plugin client \
           --plugin recoil \
           --schema ./schema \
@@ -412,7 +412,7 @@ All options can be provided so you can bypass the prompt.
 For confirm options, you can pass `--no-<name>` to set the value to false. Here is an example without optional client, using v3 for `react-query`, without mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client \
     --plugin react-query \
     --schema ./schema \
@@ -426,7 +426,7 @@ cosmwasm-ts-codegen generate \
 Example with optional client, using v4, with mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin react-query \
     --schema ./schema \
     --out ./ts \
@@ -441,7 +441,7 @@ cosmwasm-ts-codegen generate \
 If needed, you can generate only the types with the `typesOnly` option;
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
           --typesOnly \
           --schema ./schema \
           --out ./ts \
@@ -451,7 +451,7 @@ cosmwasm-ts-codegen generate \
 #### Client via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client
     --schema ./schema \
     --out ./ts \
@@ -464,7 +464,7 @@ cosmwasm-ts-codegen generate \
 Here is an example without optional client, using v3 for `react-query`, without mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client \
     --plugin react-query \
     --schema ./schema \
@@ -478,7 +478,7 @@ cosmwasm-ts-codegen generate \
 Example with optional client, using v4, with mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin react-query \
     --schema ./schema \
     --out ./ts \
@@ -491,7 +491,7 @@ cosmwasm-ts-codegen generate \
 #### Recoil via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin recoil \
     --schema ./schema \
     --out ./ts \
@@ -501,7 +501,7 @@ cosmwasm-ts-codegen generate \
 #### Message Composer via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin message-composer \
     --schema ./schema \
     --out ./ts \
@@ -511,7 +511,7 @@ cosmwasm-ts-codegen generate \
 #### Message Builder via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin message-builder \
     --schema ./schema \
     --out ./ts \
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 6967b1cc..761336c6 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -13,7 +13,8 @@
     "directory": "dist"
   },
   "bin": {
-    "cosmwasm-ts-codegen": "ts-codegen.js"
+    "cosmwasm-ts-codegen": "ts-codegen.js",
+    "ts-codegen": "ts-codegen.js"
   },
   "scripts": {
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
index f3f3df8b..ea7fcb42 100644
--- a/packages/ts-codegen/test-utils/index.ts
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -21,6 +21,7 @@ import {
   TestMessageComposerPlugin,
   TestContractsProviderBundlePlugin,
 } from "./testPlugins";
+import deepmerge from "deepmerge";
 
 export const testDefaultOptions: RenderOptions = {
   enabled: true,
@@ -63,8 +64,9 @@ export async function generateReactQuery(
   opts?: ReactQueryOptions
 ) {
   const options = opts
-    ? { ...testDefaultOptions, ...opts }
+    ? deepmerge(testDefaultOptions, { reactQuery: opts })
     : testDefaultOptions;
+
   await new ReactQueryPlugin(options).render(
     outPath,
     contractName,

From 07de209465533adb4d776c8fcfdd1ea329c6ed5a Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 18 Apr 2024 21:16:43 +0800
Subject: [PATCH 220/287] sync readme

---
 README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 7ce4efc8..60ca2b81 100644
--- a/README.md
+++ b/README.md
@@ -355,10 +355,10 @@ git clone https://github.com/cosmology-tech/launchpad.git
 cd launchpad/contracts/whitelists/whitelist
 ```
 
-Run `cosmwasm-ts-codegen` to generate your code.
+Run `ts-codegen` or `cosmwasm-ts-codegen` to generate your code.
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
           --plugin client \
           --schema ./schema \
           --out ./ts \
@@ -387,7 +387,7 @@ In this example, you can press space bar to select a number of plugins you wish
 Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client
     --schema ./schema \
     --out ./ts \
@@ -397,7 +397,7 @@ cosmwasm-ts-codegen generate \
 You can specify multiple `--plugin` options using the `generate` command:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
           --plugin client \
           --plugin recoil \
           --schema ./schema \
@@ -412,7 +412,7 @@ All options can be provided so you can bypass the prompt.
 For confirm options, you can pass `--no-<name>` to set the value to false. Here is an example without optional client, using v3 for `react-query`, without mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client \
     --plugin react-query \
     --schema ./schema \
@@ -426,7 +426,7 @@ cosmwasm-ts-codegen generate \
 Example with optional client, using v4, with mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin react-query \
     --schema ./schema \
     --out ./ts \
@@ -441,7 +441,7 @@ cosmwasm-ts-codegen generate \
 If needed, you can generate only the types with the `typesOnly` option;
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
           --typesOnly \
           --schema ./schema \
           --out ./ts \
@@ -451,7 +451,7 @@ cosmwasm-ts-codegen generate \
 #### Client via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client
     --schema ./schema \
     --out ./ts \
@@ -464,7 +464,7 @@ cosmwasm-ts-codegen generate \
 Here is an example without optional client, using v3 for `react-query`, without mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin client \
     --plugin react-query \
     --schema ./schema \
@@ -478,7 +478,7 @@ cosmwasm-ts-codegen generate \
 Example with optional client, using v4, with mutations:
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin react-query \
     --schema ./schema \
     --out ./ts \
@@ -491,7 +491,7 @@ cosmwasm-ts-codegen generate \
 #### Recoil via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin recoil \
     --schema ./schema \
     --out ./ts \
@@ -501,7 +501,7 @@ cosmwasm-ts-codegen generate \
 #### Message Composer via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin message-composer \
     --schema ./schema \
     --out ./ts \
@@ -511,7 +511,7 @@ cosmwasm-ts-codegen generate \
 #### Message Builder via CLI
 
 ```sh
-cosmwasm-ts-codegen generate \
+ts-codegen generate \
     --plugin message-builder \
     --schema ./schema \
     --out ./ts \

From bc87656f7788296bed3096346eacac5c69cc5463 Mon Sep 17 00:00:00 2001
From: Zetazzz <zetazz@163.com>
Date: Thu, 18 Apr 2024 21:29:47 +0800
Subject: [PATCH 221/287] fix test option arg

---
 packages/ts-codegen/test-utils/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
index ea7fcb42..3b7853ed 100644
--- a/packages/ts-codegen/test-utils/index.ts
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -78,7 +78,7 @@ export async function generateTypes(
   contractName: string,
   contractInfo: ContractInfo,
   outPath: string,
-  opts?: TSTypesOptions
+  opts?: RenderOptions
 ) {
   await new TypesPlugin(opts ?? testDefaultOptions).render(
     outPath,

From fa841ef169b04dd982a3615326777d1f9a9a3420 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:27:30 -0700
Subject: [PATCH 222/287] chore(release): publish

 - wasm-ast-types@1.4.1
 - @cosmwasm/ts-codegen@1.7.2
 - @cosmology/ts-codegen-types@1.1.1
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index cc7998cb..5be9296d 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.4.0...wasm-ast-types@1.4.1) (2024-04-19)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 # [1.4.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.3.0...wasm-ast-types@1.4.0) (2024-04-17)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index b2e3e6ea..2f12f2c0 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmology/ts-codegen-types": "^1.1.0",
+    "@cosmology/ts-codegen-types": "^1.1.1",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 55b4cd88..77fcae46 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.7.1...@cosmwasm/ts-codegen@1.7.2) (2024-04-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [1.7.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.7.0...@cosmwasm/ts-codegen@1.7.1) (2024-04-17)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 761336c6..0774b3c9 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -42,7 +42,7 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmology/ts-codegen-types": "^1.1.0",
+    "@cosmology/ts-codegen-types": "^1.1.1",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
@@ -58,7 +58,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.4.0"
+    "wasm-ast-types": "^1.4.1"
   },
   "keywords": [
     "cosmwasm",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 04ac14ea..2811fde5 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmology/ts-codegen-types@1.1.0...@cosmology/ts-codegen-types@1.1.1) (2024-04-19)
+
+**Note:** Version bump only for package @cosmology/ts-codegen-types
+
+
+
+
+
 # [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmology/ts-codegen-types@1.0.0...@cosmology/ts-codegen-types@1.1.0) (2024-04-17)
 
 **Note:** Version bump only for package @cosmology/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index b032e857..7683c27d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmology/ts-codegen-types",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",

From ac2cea676c7e3a0413120722718c2165f4da8d05 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:31:43 -0700
Subject: [PATCH 223/287] types

---
 .../__tests__/client/ts-client.account-nfts.test.ts    |  2 +-
 .../ast/__tests__/client/ts-client.issue-101.test.ts   |  2 +-
 .../ast/__tests__/client/ts-client.issue-71.test.ts    |  2 +-
 .../ast/__tests__/client/ts-client.issue-98.test.ts    |  2 +-
 packages/ast/__tests__/client/ts-client.issues.test.ts |  2 +-
 packages/ast/__tests__/client/ts-client.vectis.test.ts |  2 +-
 packages/ast/__tests__/recoil/recoil.test.ts           |  2 +-
 packages/ast/package.json                              |  2 +-
 packages/ast/src/client/client.ts                      |  2 +-
 packages/ast/src/context/context.ts                    |  2 +-
 packages/ast/src/message-builder/message-builder.ts    |  2 +-
 packages/ast/src/message-composer/message-composer.ts  |  2 +-
 packages/ast/src/react-query/react-query.ts            |  2 +-
 packages/ast/src/recoil/recoil.ts                      |  2 +-
 packages/ast/src/types/context.ts                      |  2 +-
 packages/ast/src/utils/babel.ts                        |  4 ++--
 packages/ast/src/utils/ref.ts                          |  2 +-
 packages/ast/src/utils/types.ts                        |  2 +-
 packages/ast/test-utils/utils.ts                       |  2 +-
 packages/ts-codegen/package.json                       |  2 +-
 packages/ts-codegen/src/cli.ts                         |  2 +-
 packages/ts-codegen/src/commands/create-boilerplate.ts |  2 +-
 packages/ts-codegen/src/commands/generate.ts           |  2 +-
 packages/ts-codegen/src/commands/install.ts            |  2 +-
 packages/ts-codegen/src/utils/schemas.ts               |  2 +-
 packages/types/CHANGELOG.md                            | 10 +++++-----
 packages/types/README.md                               |  4 ++--
 packages/types/package.json                            |  2 +-
 28 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
index 2c8249cd..6406ee71 100644
--- a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
+++ b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
@@ -5,7 +5,7 @@ import {
   createTypeInterface
 } from '../../src';
 import { expectCode, makeContext } from '../../test-utils';
-import { JSONSchema } from '@cosmology/ts-codegen-types';
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 
 import nftIdlVersionData from '../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-101.test.ts b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
index 3f43382c..caa8179d 100644
--- a/packages/ast/__tests__/client/ts-client.issue-101.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
@@ -1,4 +1,4 @@
-import { ExecuteMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
 import { createExecuteClass, createExecuteInterface } from '../../src';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-71.test.ts b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
index 99dd2e28..1a24b7db 100644
--- a/packages/ast/__tests__/client/ts-client.issue-71.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
@@ -7,7 +7,7 @@ import {
 } from '../../src'
 import { expectCode } from '../../test-utils';
 import cases from 'jest-in-case';
-import { ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 
 const contracts = globLegacyContracts('issues/71');
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-98.test.ts b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
index 86acb3b7..e235e2cc 100644
--- a/packages/ast/__tests__/client/ts-client.issue-98.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
@@ -1,4 +1,4 @@
-import { ExecuteMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
 import {
     createQueryClass,
     createExecuteClass,
diff --git a/packages/ast/__tests__/client/ts-client.issues.test.ts b/packages/ast/__tests__/client/ts-client.issues.test.ts
index 854c481d..f99d9a8a 100644
--- a/packages/ast/__tests__/client/ts-client.issues.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issues.test.ts
@@ -1,4 +1,4 @@
-import { ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import {
     createQueryClass,
     createExecuteClass,
diff --git a/packages/ast/__tests__/client/ts-client.vectis.test.ts b/packages/ast/__tests__/client/ts-client.vectis.test.ts
index af42914e..9ab23d4e 100644
--- a/packages/ast/__tests__/client/ts-client.vectis.test.ts
+++ b/packages/ast/__tests__/client/ts-client.vectis.test.ts
@@ -4,7 +4,7 @@ import {
   makeContext,
 } from '../../test-utils';
 
-import { ExecuteMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
 
 import {
   createExecuteClass,
diff --git a/packages/ast/__tests__/recoil/recoil.test.ts b/packages/ast/__tests__/recoil/recoil.test.ts
index 430c1750..d8418a1f 100644
--- a/packages/ast/__tests__/recoil/recoil.test.ts
+++ b/packages/ast/__tests__/recoil/recoil.test.ts
@@ -6,7 +6,7 @@ import {
   createRecoilSelectors
 } from '../../src/recoil/recoil';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
-import { QueryMsg } from '@cosmology/ts-codegen-types';
+import { QueryMsg } from '@cosmwasm/ts-codegen-types';
 
 const globbed = globLegacyContracts('basic').find(c => c.name === '/query_msg.json');
 const queryMsg = globbed.content as QueryMsg;
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 2f12f2c0..979f9131 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmology/ts-codegen-types": "^1.1.1",
+    "@cosmwasm/ts-codegen-types": "^1.1.1",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index d95654d0..2a757cf8 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -13,7 +13,7 @@ import {
   getTypeOrRef
 } from '../utils';
 
-import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 
 import {
   createTypedObjectParams,
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index f4400405..3a363f56 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { JSONSchema } from "@cosmology/ts-codegen-types";
+import { JSONSchema } from "@cosmwasm/ts-codegen-types";
 import { refLookup } from "../utils";
 import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
 import deepmerge from "deepmerge";
diff --git a/packages/ast/src/message-builder/message-builder.ts b/packages/ast/src/message-builder/message-builder.ts
index 30758a10..111a9185 100644
--- a/packages/ast/src/message-builder/message-builder.ts
+++ b/packages/ast/src/message-builder/message-builder.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
 import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
-import { ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { createTypedObjectParams } from '../utils/types';
 import { RenderContext } from '../context';
 import { getWasmMethodArgs } from '../client/client';
diff --git a/packages/ast/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
index 5ff36814..4f93b0aa 100644
--- a/packages/ast/src/message-composer/message-composer.ts
+++ b/packages/ast/src/message-composer/message-composer.ts
@@ -10,7 +10,7 @@ import {
   OPTIONAL_FUNDS_PARAM,
   typedIdentifier
 } from '../utils';
-import { ExecuteMsg, JSONSchema } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, JSONSchema } from '@cosmwasm/ts-codegen-types';
 import { createTypedObjectParams } from '../utils/types';
 import { RenderContext } from '../context';
 import { getWasmMethodArgs } from '../client/client';
diff --git a/packages/ast/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
index 8c58b3aa..64d22a6f 100644
--- a/packages/ast/src/react-query/react-query.ts
+++ b/packages/ast/src/react-query/react-query.ts
@@ -1,7 +1,7 @@
 import type { Expression } from '@babel/types';
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { JSONSchema, ExecuteMsg, QueryMsg } from '@cosmology/ts-codegen-types';
+import { JSONSchema, ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import {
   callExpression,
   createTypedObjectParams,
diff --git a/packages/ast/src/recoil/recoil.ts b/packages/ast/src/recoil/recoil.ts
index 5148214e..0211ed73 100644
--- a/packages/ast/src/recoil/recoil.ts
+++ b/packages/ast/src/recoil/recoil.ts
@@ -5,7 +5,7 @@ import {
   getMessageProperties,
   getResponseType
 } from '../utils';
-import { JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
+import { JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { RenderContext } from '../context';
 
 export const createRecoilSelector = (
diff --git a/packages/ast/src/types/context.ts b/packages/ast/src/types/context.ts
index f5ee5018..005f8d5f 100644
--- a/packages/ast/src/types/context.ts
+++ b/packages/ast/src/types/context.ts
@@ -1,4 +1,4 @@
-import { IDLObject, JSONSchema } from "@cosmology/ts-codegen-types";
+import { IDLObject, JSONSchema } from "@cosmwasm/ts-codegen-types";
 import { MessageBuilderOptions, MessageComposerOptions, ReactQueryOptions, RecoilOptions, TSClientOptions, TSTypesOptions, UseContractsOptions } from "./plugins";
 
 export interface ContractInfo {
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index e61e547f..d45b7e1f 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -1,9 +1,9 @@
 import * as t from '@babel/types';
 import { snake } from "case";
-import { Field } from '@cosmology/ts-codegen-types';
+import { Field } from '@cosmwasm/ts-codegen-types';
 import { TSTypeAnnotation, TSExpressionWithTypeArguments, Noop, TypeAnnotation } from '@babel/types';
 import { refLookup } from './ref';
-import { JSONSchema } from '@cosmology/ts-codegen-types';
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 
 // t.TSPropertySignature - kind?
 export const propertySignature = (
diff --git a/packages/ast/src/utils/ref.ts b/packages/ast/src/utils/ref.ts
index 1a6e8587..7d97d1d0 100644
--- a/packages/ast/src/utils/ref.ts
+++ b/packages/ast/src/utils/ref.ts
@@ -1,4 +1,4 @@
-import { JSONSchema } from "@cosmology/ts-codegen-types";
+import { JSONSchema } from "@cosmwasm/ts-codegen-types";
 
 export const refLookup = ($ref: string, schema: JSONSchema): JSONSchema => {
   const refName = $ref.replace('#/definitions/', '')
diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index 932cad42..dac971bf 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -2,7 +2,7 @@ import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { propertySignature } from './babel';
 import { RenderContext } from '../context';
-import { JSONSchema } from '@cosmology/ts-codegen-types';
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 
 export function getResponseType(
   context: RenderContext,
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index 5b8a8d77..4b8ac937 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -2,7 +2,7 @@ import generate from '@babel/generator';
 import { sync as glob } from 'glob';
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { RenderContext } from '../src/context';
 import { RenderOptions } from 'wasm-ast-types/types';
 
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 0774b3c9..aee9e11a 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -42,7 +42,7 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmology/ts-codegen-types": "^1.1.1",
+    "@cosmwasm/ts-codegen-types": "^1.1.1",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
diff --git a/packages/ts-codegen/src/cli.ts b/packages/ts-codegen/src/cli.ts
index c13f8c21..8c3e72bc 100644
--- a/packages/ts-codegen/src/cli.ts
+++ b/packages/ts-codegen/src/cli.ts
@@ -1,6 +1,6 @@
 import { prompt } from './utils/prompt';
 import { Commands as commands } from './cmds';
-import { MinimistArgs } from '@cosmology/ts-codegen-types';
+import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 
 const question = [
   {
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index a0da86c2..138d039b 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -1,7 +1,7 @@
 import * as shell from 'shelljs';
 import { prompt } from '../utils/prompt';
 import dargs from 'dargs';
-import { MinimistArgs } from '@cosmology/ts-codegen-types';
+import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index 1d78731a..fb9a2bdc 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -2,7 +2,7 @@
 import { prompt } from '../utils/prompt';
 import codegen from '../index';
 import { TSBuilderOptions } from '../builder';
-import { MinimistArgs } from '@cosmology/ts-codegen-types';
+import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 
 export default async (argv: MinimistArgs) => {
     const questions = [
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index d16053e7..be618a9f 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -7,7 +7,7 @@ import { prompt } from '../utils/prompt';
 import { parse } from 'parse-package-name';
 import { tmpdir } from 'os';
 import { readFileSync, writeFileSync } from 'fs';
-import { MinimistArgs } from '@cosmology/ts-codegen-types';
+import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 
 const TMPDIR = tmpdir();
 const rnd = () =>
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 6781aa2c..58b80ba5 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -4,7 +4,7 @@ import { cleanse } from './cleanse';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
 import { ContractInfo } from 'wasm-ast-types';
-import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmology/ts-codegen-types';
+import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 interface ReadSchemaOpts {
     schemaDir: string;
     clean?: boolean;
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 2811fde5..40934d53 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,17 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.1.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmology/ts-codegen-types@1.1.0...@cosmology/ts-codegen-types@1.1.1) (2024-04-19)
+## [1.1.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.1.0...@cosmwasm/ts-codegen-types@1.1.1) (2024-04-19)
 
-**Note:** Version bump only for package @cosmology/ts-codegen-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
 
 
 
 
 
-# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmology/ts-codegen-types@1.0.0...@cosmology/ts-codegen-types@1.1.0) (2024-04-17)
+# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.0.0...@cosmwasm/ts-codegen-types@1.1.0) (2024-04-17)
 
-**Note:** Version bump only for package @cosmology/ts-codegen-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
 
 
 
@@ -21,4 +21,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # 1.0.0 (2024-04-17)
 
-**Note:** Version bump only for package @cosmology/ts-codegen-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
diff --git a/packages/types/README.md b/packages/types/README.md
index 8abd88e5..d2587b76 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -1,4 +1,4 @@
-# @cosmology/ts-codegen-types
+# @cosmwasm/ts-codegen-types
 
 Types for [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen)
 
@@ -23,4 +23,4 @@ Checkout these related projects:
 
 AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
 
-No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
\ No newline at end of file
diff --git a/packages/types/package.json b/packages/types/package.json
index 7683c27d..0208004d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cosmology/ts-codegen-types",
+  "name": "@cosmwasm/ts-codegen-types",
   "version": "1.1.1",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",

From d63f67e0ee4e6494545751a2579e4d17a755bb66 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:42:30 -0700
Subject: [PATCH 224/287] chore(release): publish

 - wasm-ast-types@1.5.0
 - @cosmwasm/ts-codegen@1.8.0
 - @cosmwasm/ts-codegen-types@1.2.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 5be9296d..99334801 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.5.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.4.1...wasm-ast-types@1.5.0) (2024-04-19)
+
+**Note:** Version bump only for package wasm-ast-types
+
+
+
+
+
 ## [1.4.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.4.0...wasm-ast-types@1.4.1) (2024-04-19)
 
 **Note:** Version bump only for package wasm-ast-types
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 979f9131..15d6c1b7 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-types": "^1.1.1",
+    "@cosmwasm/ts-codegen-types": "^1.2.0",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 77fcae46..a25c38f7 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.8.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.7.2...@cosmwasm/ts-codegen@1.8.0) (2024-04-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [1.7.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.7.1...@cosmwasm/ts-codegen@1.7.2) (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index aee9e11a..beb70d0b 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -42,7 +42,7 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-types": "^1.1.1",
+    "@cosmwasm/ts-codegen-types": "^1.2.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
@@ -58,7 +58,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.4.1"
+    "wasm-ast-types": "^1.5.0"
   },
   "keywords": [
     "cosmwasm",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 40934d53..6edf2c0f 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.2.0 (2024-04-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
+
+
+
+
+
 ## [1.1.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.1.0...@cosmwasm/ts-codegen-types@1.1.1) (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index 0208004d..34d560ff 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-types",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",

From 1edab62f36bbb6944b4945b9c77d35a02298a1e9 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:45:32 -0700
Subject: [PATCH 225/287] ast

---
 README.md                                     |   2 +-
 packages/ast/CHANGELOG.md                     | 320 +++++++++---------
 packages/ast/package.json                     |   2 +-
 packages/ast/test-utils/utils.ts              |   2 +-
 packages/ts-codegen/README.md                 |   2 +-
 .../ts-codegen/__tests__/ts-codegen.test.ts   |   2 +-
 packages/ts-codegen/package.json              |   2 +-
 packages/ts-codegen/src/builder/builder.ts    |  38 +--
 .../ts-codegen/src/helpers/create-helpers.ts  |   2 +-
 packages/ts-codegen/src/plugins/client.ts     |   6 +-
 .../ts-codegen/src/plugins/message-builder.ts |   4 +-
 .../src/plugins/message-composer.ts           |   4 +-
 .../ts-codegen/src/plugins/plugin-base.ts     |   4 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |   4 +-
 packages/ts-codegen/src/plugins/provider.ts   |   4 +-
 .../ts-codegen/src/plugins/react-query.ts     |   4 +-
 packages/ts-codegen/src/plugins/recoil.ts     |   4 +-
 packages/ts-codegen/src/plugins/types.ts      |   2 +-
 packages/ts-codegen/src/utils/contracts.ts    |   2 +-
 packages/ts-codegen/src/utils/schemas.ts      |   2 +-
 packages/ts-codegen/test-utils/index.ts       |   2 +-
 packages/ts-codegen/test-utils/testPlugins.ts |   2 +-
 22 files changed, 208 insertions(+), 208 deletions(-)

diff --git a/README.md b/README.md
index 60ca2b81..c76eb153 100644
--- a/README.md
+++ b/README.md
@@ -601,7 +601,7 @@ yarn test:watch
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `wasm-ast-types` package.
+See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
 
 ## Related
 
diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 99334801..1a0554d9 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,633 +3,633 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.5.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.4.1...wasm-ast-types@1.5.0) (2024-04-19)
+# [1.5.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.4.1...@cosmwasm/ts-codegen-ast@1.5.0) (2024-04-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [1.4.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.4.0...wasm-ast-types@1.4.1) (2024-04-19)
+## [1.4.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.4.0...@cosmwasm/ts-codegen-ast@1.4.1) (2024-04-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [1.4.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.3.0...wasm-ast-types@1.4.0) (2024-04-17)
+# [1.4.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.3.0...@cosmwasm/ts-codegen-ast@1.4.0) (2024-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.2.0...wasm-ast-types@1.3.0) (2024-04-17)
+# [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.2.0...@cosmwasm/ts-codegen-ast@1.3.0) (2024-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [1.2.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.1.0...wasm-ast-types@1.2.0) (2024-04-17)
+# [1.2.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.1.0...@cosmwasm/ts-codegen-ast@1.2.0) (2024-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@1.0.0...wasm-ast-types@1.1.0) (2024-04-17)
+# [1.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.0.0...@cosmwasm/ts-codegen-ast@1.1.0) (2024-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [1.0.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.4...wasm-ast-types@1.0.0) (2024-04-17)
+# [1.0.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.26.4...@cosmwasm/ts-codegen-ast@1.0.0) (2024-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.26.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.3...wasm-ast-types@0.26.4) (2024-01-19)
+## [0.26.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.26.3...@cosmwasm/ts-codegen-ast@0.26.4) (2024-01-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.26.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.2...wasm-ast-types@0.26.3) (2024-01-19)
+## [0.26.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.26.2...@cosmwasm/ts-codegen-ast@0.26.3) (2024-01-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.26.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.1...wasm-ast-types@0.26.2) (2023-08-11)
+## [0.26.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.26.1...@cosmwasm/ts-codegen-ast@0.26.2) (2023-08-11)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.26.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.26.0...wasm-ast-types@0.26.1) (2023-08-09)
+## [0.26.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.26.0...@cosmwasm/ts-codegen-ast@0.26.1) (2023-08-09)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.26.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.25.0...wasm-ast-types@0.26.0) (2023-08-09)
+# [0.26.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.25.0...@cosmwasm/ts-codegen-ast@0.26.0) (2023-08-09)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.25.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.24.0...wasm-ast-types@0.25.0) (2023-07-28)
+# [0.25.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.24.0...@cosmwasm/ts-codegen-ast@0.25.0) (2023-07-28)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.24.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.23.1...wasm-ast-types@0.24.0) (2023-07-14)
+# [0.24.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.23.1...@cosmwasm/ts-codegen-ast@0.24.0) (2023-07-14)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.23.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.23.0...wasm-ast-types@0.23.1) (2023-06-07)
+## [0.23.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.23.0...@cosmwasm/ts-codegen-ast@0.23.1) (2023-06-07)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.23.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.22.0...wasm-ast-types@0.23.0) (2023-05-24)
+# [0.23.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.22.0...@cosmwasm/ts-codegen-ast@0.23.0) (2023-05-24)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.22.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.21.0...wasm-ast-types@0.22.0) (2023-05-24)
+# [0.22.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.21.0...@cosmwasm/ts-codegen-ast@0.22.0) (2023-05-24)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.21.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.20.0...wasm-ast-types@0.21.0) (2023-05-17)
+# [0.21.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.20.0...@cosmwasm/ts-codegen-ast@0.21.0) (2023-05-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.20.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.19.0...wasm-ast-types@0.20.0) (2023-04-17)
+# [0.20.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.19.0...@cosmwasm/ts-codegen-ast@0.20.0) (2023-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.19.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.18.2...wasm-ast-types@0.19.0) (2023-04-10)
+# [0.19.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.18.2...@cosmwasm/ts-codegen-ast@0.19.0) (2023-04-10)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.18.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.18.1...wasm-ast-types@0.18.2) (2023-03-02)
+## [0.18.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.18.1...@cosmwasm/ts-codegen-ast@0.18.2) (2023-03-02)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.18.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.18.0...wasm-ast-types@0.18.1) (2023-03-02)
+## [0.18.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.18.0...@cosmwasm/ts-codegen-ast@0.18.1) (2023-03-02)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.18.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.17.0...wasm-ast-types@0.18.0) (2023-02-26)
+# [0.18.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.17.0...@cosmwasm/ts-codegen-ast@0.18.0) (2023-02-26)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.17.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.16.0...wasm-ast-types@0.17.0) (2022-12-02)
+# [0.17.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.16.0...@cosmwasm/ts-codegen-ast@0.17.0) (2022-12-02)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.16.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.15.0...wasm-ast-types@0.16.0) (2022-11-25)
+# [0.16.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.15.0...@cosmwasm/ts-codegen-ast@0.16.0) (2022-11-25)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.15.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.14.0...wasm-ast-types@0.15.0) (2022-11-09)
+# [0.15.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.14.0...@cosmwasm/ts-codegen-ast@0.15.0) (2022-11-09)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.14.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.13.0...wasm-ast-types@0.14.0) (2022-10-26)
+# [0.14.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.13.0...@cosmwasm/ts-codegen-ast@0.14.0) (2022-10-26)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.13.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.12.0...wasm-ast-types@0.13.0) (2022-10-11)
+# [0.13.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.12.0...@cosmwasm/ts-codegen-ast@0.13.0) (2022-10-11)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.12.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.3...wasm-ast-types@0.12.0) (2022-10-11)
+# [0.12.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.11.3...@cosmwasm/ts-codegen-ast@0.12.0) (2022-10-11)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.11.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.2...wasm-ast-types@0.11.3) (2022-09-14)
+## [0.11.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.11.2...@cosmwasm/ts-codegen-ast@0.11.3) (2022-09-14)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.11.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.1...wasm-ast-types@0.11.2) (2022-09-14)
+## [0.11.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.11.1...@cosmwasm/ts-codegen-ast@0.11.2) (2022-09-14)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.11.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.11.0...wasm-ast-types@0.11.1) (2022-09-13)
+## [0.11.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.11.0...@cosmwasm/ts-codegen-ast@0.11.1) (2022-09-13)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.11.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.10.0...wasm-ast-types@0.11.0) (2022-09-13)
+# [0.11.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.10.0...@cosmwasm/ts-codegen-ast@0.11.0) (2022-09-13)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.10.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.9.0...wasm-ast-types@0.10.0) (2022-09-13)
+# [0.10.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.9.0...@cosmwasm/ts-codegen-ast@0.10.0) (2022-09-13)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.9.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.8.2...wasm-ast-types@0.9.0) (2022-08-23)
+# [0.9.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.8.2...@cosmwasm/ts-codegen-ast@0.9.0) (2022-08-23)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.8.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.8.1...wasm-ast-types@0.8.2) (2022-08-22)
+## [0.8.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.8.1...@cosmwasm/ts-codegen-ast@0.8.2) (2022-08-22)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.8.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.8.0...wasm-ast-types@0.8.1) (2022-08-13)
+## [0.8.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.8.0...@cosmwasm/ts-codegen-ast@0.8.1) (2022-08-13)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.8.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.7.2...wasm-ast-types@0.8.0) (2022-08-09)
+# [0.8.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.7.2...@cosmwasm/ts-codegen-ast@0.8.0) (2022-08-09)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.7.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.7.1...wasm-ast-types@0.7.2) (2022-08-09)
+## [0.7.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.7.1...@cosmwasm/ts-codegen-ast@0.7.2) (2022-08-09)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.7.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.7.0...wasm-ast-types@0.7.1) (2022-08-09)
+## [0.7.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.7.0...@cosmwasm/ts-codegen-ast@0.7.1) (2022-08-09)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.7.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.6.2...wasm-ast-types@0.7.0) (2022-08-08)
+# [0.7.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.6.2...@cosmwasm/ts-codegen-ast@0.7.0) (2022-08-08)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.6.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.6.1...wasm-ast-types@0.6.2) (2022-08-08)
+## [0.6.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.6.1...@cosmwasm/ts-codegen-ast@0.6.2) (2022-08-08)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.6.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.6.0...wasm-ast-types@0.6.1) (2022-08-07)
+## [0.6.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.6.0...@cosmwasm/ts-codegen-ast@0.6.1) (2022-08-07)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.6.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.5.1...wasm-ast-types@0.6.0) (2022-08-07)
+# [0.6.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.5.1...@cosmwasm/ts-codegen-ast@0.6.0) (2022-08-07)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.5.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.5.0...wasm-ast-types@0.5.1) (2022-08-06)
+## [0.5.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.5.0...@cosmwasm/ts-codegen-ast@0.5.1) (2022-08-06)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.5.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.3...wasm-ast-types@0.5.0) (2022-08-05)
+# [0.5.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.4.3...@cosmwasm/ts-codegen-ast@0.5.0) (2022-08-05)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.4.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.2...wasm-ast-types@0.4.3) (2022-08-04)
+## [0.4.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.4.2...@cosmwasm/ts-codegen-ast@0.4.3) (2022-08-04)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.4.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.1...wasm-ast-types@0.4.2) (2022-08-04)
+## [0.4.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.4.1...@cosmwasm/ts-codegen-ast@0.4.2) (2022-08-04)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.4.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.4.0...wasm-ast-types@0.4.1) (2022-08-01)
+## [0.4.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.4.0...@cosmwasm/ts-codegen-ast@0.4.1) (2022-08-01)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.4.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.7...wasm-ast-types@0.4.0) (2022-08-01)
+# [0.4.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.7...@cosmwasm/ts-codegen-ast@0.4.0) (2022-08-01)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.7](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.6...wasm-ast-types@0.3.7) (2022-07-15)
+## [0.3.7](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.6...@cosmwasm/ts-codegen-ast@0.3.7) (2022-07-15)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.6](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.5...wasm-ast-types@0.3.6) (2022-07-15)
+## [0.3.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.5...@cosmwasm/ts-codegen-ast@0.3.6) (2022-07-15)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.5](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.4...wasm-ast-types@0.3.5) (2022-06-25)
+## [0.3.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.4...@cosmwasm/ts-codegen-ast@0.3.5) (2022-06-25)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.3...wasm-ast-types@0.3.4) (2022-06-22)
+## [0.3.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.3...@cosmwasm/ts-codegen-ast@0.3.4) (2022-06-22)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.2...wasm-ast-types@0.3.3) (2022-06-17)
+## [0.3.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.2...@cosmwasm/ts-codegen-ast@0.3.3) (2022-06-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.1...wasm-ast-types@0.3.2) (2022-06-17)
+## [0.3.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.1...@cosmwasm/ts-codegen-ast@0.3.2) (2022-06-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.3.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.3.0...wasm-ast-types@0.3.1) (2022-06-17)
+## [0.3.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.3.0...@cosmwasm/ts-codegen-ast@0.3.1) (2022-06-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.3.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.6...wasm-ast-types@0.3.0) (2022-06-16)
+# [0.3.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.6...@cosmwasm/ts-codegen-ast@0.3.0) (2022-06-16)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.2.6](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.5...wasm-ast-types@0.2.6) (2022-06-14)
+## [0.2.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.5...@cosmwasm/ts-codegen-ast@0.2.6) (2022-06-14)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.2.5](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.4...wasm-ast-types@0.2.5) (2022-05-25)
+## [0.2.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.4...@cosmwasm/ts-codegen-ast@0.2.5) (2022-05-25)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.2.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.3...wasm-ast-types@0.2.4) (2022-05-04)
+## [0.2.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.3...@cosmwasm/ts-codegen-ast@0.2.4) (2022-05-04)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.2.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.2...wasm-ast-types@0.2.3) (2022-05-04)
+## [0.2.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.2...@cosmwasm/ts-codegen-ast@0.2.3) (2022-05-04)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.2.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.1...wasm-ast-types@0.2.2) (2022-04-30)
+## [0.2.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.1...@cosmwasm/ts-codegen-ast@0.2.2) (2022-04-30)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.2.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.2.0...wasm-ast-types@0.2.1) (2022-04-30)
+## [0.2.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.2.0...@cosmwasm/ts-codegen-ast@0.2.1) (2022-04-30)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.2.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.4...wasm-ast-types@0.2.0) (2022-04-25)
+# [0.2.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.1.4...@cosmwasm/ts-codegen-ast@0.2.0) (2022-04-25)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.1.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.3...wasm-ast-types@0.1.4) (2022-04-20)
+## [0.1.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.1.3...@cosmwasm/ts-codegen-ast@0.1.4) (2022-04-20)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.1.3](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.2...wasm-ast-types@0.1.3) (2022-04-19)
+## [0.1.3](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.1.2...@cosmwasm/ts-codegen-ast@0.1.3) (2022-04-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.1.2](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.1...wasm-ast-types@0.1.2) (2022-04-19)
+## [0.1.2](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.1.1...@cosmwasm/ts-codegen-ast@0.1.2) (2022-04-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.1.1](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.1.0...wasm-ast-types@0.1.1) (2022-04-19)
+## [0.1.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.1.0...@cosmwasm/ts-codegen-ast@0.1.1) (2022-04-19)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-# [0.1.0](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.12...wasm-ast-types@0.1.0) (2022-04-17)
+# [0.1.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.12...@cosmwasm/ts-codegen-ast@0.1.0) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.12](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.11...wasm-ast-types@0.0.12) (2022-04-17)
+## [0.0.12](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.11...@cosmwasm/ts-codegen-ast@0.0.12) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.11](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.10...wasm-ast-types@0.0.11) (2022-04-17)
+## [0.0.11](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.10...@cosmwasm/ts-codegen-ast@0.0.11) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.10](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.9...wasm-ast-types@0.0.10) (2022-04-17)
+## [0.0.10](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.9...@cosmwasm/ts-codegen-ast@0.0.10) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.9](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.8...wasm-ast-types@0.0.9) (2022-04-17)
+## [0.0.9](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.8...@cosmwasm/ts-codegen-ast@0.0.9) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.8](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.7...wasm-ast-types@0.0.8) (2022-04-17)
+## [0.0.8](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.7...@cosmwasm/ts-codegen-ast@0.0.8) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.7](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.6...wasm-ast-types@0.0.7) (2022-04-17)
+## [0.0.7](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.6...@cosmwasm/ts-codegen-ast@0.0.7) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.6](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.5...wasm-ast-types@0.0.6) (2022-04-17)
+## [0.0.6](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.5...@cosmwasm/ts-codegen-ast@0.0.6) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.5](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.4...wasm-ast-types@0.0.5) (2022-04-17)
+## [0.0.5](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.4...@cosmwasm/ts-codegen-ast@0.0.5) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
 
 
-## [0.0.4](https://github.com/cosmwasm/ts-codegen/compare/wasm-ast-types@0.0.3...wasm-ast-types@0.0.4) (2022-04-17)
+## [0.0.4](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@0.0.3...@cosmwasm/ts-codegen-ast@0.0.4) (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
@@ -637,7 +637,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## 0.0.3 (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
 
 
 
@@ -645,4 +645,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## 0.0.2 (2022-04-17)
 
-**Note:** Version bump only for package wasm-ast-types
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 15d6c1b7..209eddc2 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "wasm-ast-types",
+  "name": "@cosmwasm/ts-codegen-ast",
   "version": "1.5.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index 4b8ac937..c1e0c177 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -4,7 +4,7 @@ import { readFileSync } from 'fs';
 import { join } from 'path';
 import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { RenderContext } from '../src/context';
-import { RenderOptions } from 'wasm-ast-types/types';
+import { RenderOptions } from '@cosmwasm/ts-codegen-ast/types';
 
 export const expectCode = (ast: any): void => {
   expect(
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 60ca2b81..c76eb153 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -601,7 +601,7 @@ yarn test:watch
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `wasm-ast-types` package.
+See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
 
 ## Related
 
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index b5241347..13822ce0 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -1,4 +1,4 @@
-import { BuilderContext } from 'wasm-ast-types';
+import { BuilderContext } from '@cosmwasm/ts-codegen-ast';
 import { TSBuilder } from '../src';
 import { readSchemas } from '../src/utils';
 import { generateReactQuery, generateClient, generateMessageComposer, generateMessageBuilder, generateRecoil, generateTypes, generateContractHooks } from '../test-utils';
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index beb70d0b..226aa8b6 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -58,7 +58,7 @@
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
-    "wasm-ast-types": "^1.5.0"
+    "@cosmwasm/ts-codegen-ast": "^1.5.0"
   },
   "keywords": [
     "cosmwasm",
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 7635b4c9..b8e3ed2a 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,4 +1,4 @@
-import { RenderOptions, defaultOptions, ContractInfo, BuilderContext } from "wasm-ast-types";
+import { RenderOptions, defaultOptions, ContractInfo, BuilderContext } from "@cosmwasm/ts-codegen-ast";
 
 import { header } from '../utils/header';
 import { join } from "path";
@@ -152,26 +152,26 @@ export class TSBuilder {
     }
 
     private async render(
-      lifecycle?: string,
-      name?: string,
-      contractInfo?: ContractInfo
+        lifecycle?: string,
+        name?: string,
+        contractInfo?: ContractInfo
     ) {
-      const plugins = lifecycle
-        ? this.plugins.filter((p) =>
-            p.lifecycle === lifecycle
-          )
-        : this.plugins;
-
-      for (const plugin of plugins) {
-        let files = await plugin.render(
-          this.outPath,
-          name,
-          contractInfo ?? createDefaultContractInfo()
-        );
-        if (files && files.length) {
-          this.files.push(...files);
+        const plugins = lifecycle
+            ? this.plugins.filter((p) =>
+                p.lifecycle === lifecycle
+            )
+            : this.plugins;
+
+        for (const plugin of plugins) {
+            let files = await plugin.render(
+                this.outPath,
+                name,
+                contractInfo ?? createDefaultContractInfo()
+            );
+            if (files && files.length) {
+                this.files.push(...files);
+            }
         }
-      }
     }
 
     private async after() {
diff --git a/packages/ts-codegen/src/helpers/create-helpers.ts b/packages/ts-codegen/src/helpers/create-helpers.ts
index 92436596..759771d8 100644
--- a/packages/ts-codegen/src/helpers/create-helpers.ts
+++ b/packages/ts-codegen/src/helpers/create-helpers.ts
@@ -7,7 +7,7 @@ import {
   contractContextBaseShortHandCtor,
   contractsContextTSX,
 } from "../helpers";
-import { BuilderContext } from "wasm-ast-types";
+import { BuilderContext } from "@cosmwasm/ts-codegen-ast";
 import { header } from "../utils/header";
 
 const write = (
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 9f8a9a4b..6f0db069 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -1,5 +1,5 @@
 import { pascal } from "case";
-import * as w from "wasm-ast-types";
+import * as w from "@cosmwasm/ts-codegen-ast";
 import { findExecuteMsg, findAndParseTypes, findQueryMsg } from "../utils";
 import {
   RenderContext,
@@ -7,7 +7,7 @@ import {
   RenderContextBase,
   getMessageProperties,
   RenderOptions,
-} from "wasm-ast-types";
+} from "@cosmwasm/ts-codegen-ast";
 import { BuilderFileType } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
@@ -113,7 +113,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
 
     return [
       {
-        type:  "client",
+        type: "client",
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/message-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
index 4ab83310..30f7632c 100644
--- a/packages/ts-codegen/src/plugins/message-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -1,5 +1,5 @@
 import { pascal } from 'case';
-import * as w from 'wasm-ast-types';
+import * as w from '@cosmwasm/ts-codegen-ast';
 import { findAndParseTypes, findQueryMsg, findExecuteMsg } from '../utils';
 import {
   getMessageProperties,
@@ -7,7 +7,7 @@ import {
   RenderContextBase,
   ContractInfo,
   RenderOptions
-} from 'wasm-ast-types';
+} from '@cosmwasm/ts-codegen-ast';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index db412f11..c7a3f072 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -1,5 +1,5 @@
 import { pascal } from "case";
-import * as w from "wasm-ast-types";
+import * as w from "@cosmwasm/ts-codegen-ast";
 import { findAndParseTypes, findExecuteMsg } from "../utils";
 import {
   MessageComposerOptions,
@@ -8,7 +8,7 @@ import {
   RenderContextBase,
   RenderContext,
   RenderOptions,
-} from "wasm-ast-types";
+} from "@cosmwasm/ts-codegen-ast";
 import { BuilderFileType } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 55948906..758f95c4 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -2,7 +2,7 @@ import { sync as mkdirp } from "mkdirp";
 import { join } from "path";
 import { writeFileSync } from "fs";
 import { header } from "../utils/header";
-import { ContractInfo, UtilMapping, IContext, defaultOptions } from "wasm-ast-types";
+import { ContractInfo, UtilMapping, IContext, defaultOptions } from "@cosmwasm/ts-codegen-ast";
 import generate from "@babel/generator";
 import * as t from "@babel/types";
 import {
@@ -76,7 +76,7 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
     name?: string,
     contractInfo?: ContractInfo,
   ): Promise<BuilderFile[]> {
-    if(!this.options){
+    if (!this.options) {
       this.options = this.getDefaultOptions(this.options);
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index a7ee1ed1..5fec4c3d 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -1,6 +1,6 @@
 import { pascal } from "case";
-import * as w from "wasm-ast-types";
-import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
+import * as w from "@cosmwasm/ts-codegen-ast";
+import { ContractInfo, RenderContextBase, RenderContext } from "@cosmwasm/ts-codegen-ast";
 import { BuilderFileType, TSBuilderOptions } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 import { GetLocalBaseNameByContractName } from "./provider";
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index 023527d2..9419c4e9 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -1,6 +1,6 @@
 import { pascal } from "case";
-import * as w from "wasm-ast-types";
-import { ContractInfo, RenderContextBase, RenderContext } from "wasm-ast-types";
+import * as w from "@cosmwasm/ts-codegen-ast";
+import { ContractInfo, RenderContextBase, RenderContext } from "@cosmwasm/ts-codegen-ast";
 import { BuilderFileType, TSBuilderOptions } from "../builder";
 import { BuilderPluginBase } from "./plugin-base";
 
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
index 160e1c82..1815d342 100644
--- a/packages/ts-codegen/src/plugins/react-query.ts
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -1,5 +1,5 @@
 import { pascal } from 'case';
-import * as w from 'wasm-ast-types';
+import * as w from '@cosmwasm/ts-codegen-ast';
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import {
   getMessageProperties,
@@ -7,7 +7,7 @@ import {
   RenderOptions,
   RenderContextBase,
   RenderContext
-} from 'wasm-ast-types';
+} from '@cosmwasm/ts-codegen-ast';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index 9ebb65d1..c2eb347b 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -1,5 +1,5 @@
 import { pascal } from 'case';
-import * as w from 'wasm-ast-types';
+import * as w from '@cosmwasm/ts-codegen-ast';
 import { findAndParseTypes, findQueryMsg } from '../utils';
 import {
   ContractInfo,
@@ -7,7 +7,7 @@ import {
   RenderContextBase,
   UtilMapping,
   RenderOptions
-} from 'wasm-ast-types';
+} from '@cosmwasm/ts-codegen-ast';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 import { JSONSchema } from '@pyramation/json-schema-to-typescript';
diff --git a/packages/ts-codegen/src/plugins/types.ts b/packages/ts-codegen/src/plugins/types.ts
index 231a9ceb..86836341 100644
--- a/packages/ts-codegen/src/plugins/types.ts
+++ b/packages/ts-codegen/src/plugins/types.ts
@@ -7,7 +7,7 @@ import {
   RenderContext,
   RenderContextBase,
   RenderOptions
-} from 'wasm-ast-types';
+} from '@cosmwasm/ts-codegen-ast';
 import { BuilderFileType } from '../builder';
 import { BuilderPluginBase } from './plugin-base';
 
diff --git a/packages/ts-codegen/src/utils/contracts.ts b/packages/ts-codegen/src/utils/contracts.ts
index 6bbf3d63..51fbb245 100644
--- a/packages/ts-codegen/src/utils/contracts.ts
+++ b/packages/ts-codegen/src/utils/contracts.ts
@@ -1,4 +1,4 @@
-import { ContractInfo } from "wasm-ast-types";
+import { ContractInfo } from "@cosmwasm/ts-codegen-ast";
 
 export const createDefaultContractInfo = (): ContractInfo => {
   return {
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 58b80ba5..237172c7 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -3,7 +3,7 @@ import { readFileSync } from 'fs';
 import { cleanse } from './cleanse';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
-import { ContractInfo } from 'wasm-ast-types';
+import { ContractInfo } from '@cosmwasm/ts-codegen-ast';
 import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 interface ReadSchemaOpts {
     schemaDir: string;
diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
index 3b7853ed..a91fa369 100644
--- a/packages/ts-codegen/test-utils/index.ts
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -4,7 +4,7 @@ import {
   ReactQueryOptions,
   RenderOptions,
   TSTypesOptions,
-} from "wasm-ast-types";
+} from "@cosmwasm/ts-codegen-ast";
 import { ReactQueryPlugin } from "../src/plugins/react-query";
 import { TypesPlugin } from "../src/plugins/types";
 import { ClientPlugin } from "../src/plugins/client";
diff --git a/packages/ts-codegen/test-utils/testPlugins.ts b/packages/ts-codegen/test-utils/testPlugins.ts
index 13c35382..3ddff983 100644
--- a/packages/ts-codegen/test-utils/testPlugins.ts
+++ b/packages/ts-codegen/test-utils/testPlugins.ts
@@ -4,7 +4,7 @@ import {
   RenderContext,
   RenderContextBase,
   RenderOptions,
-} from "wasm-ast-types";
+} from "@cosmwasm/ts-codegen-ast";
 import { ClientPlugin, MessageComposerPlugin, TSBuilderOptions } from "../src";
 import { ContractsContextProviderPlugin } from "../src/plugins/provider";
 import { ContractsProviderBundlePlugin } from "../src/plugins/provider-bundle";

From 7c8ccc3f6066feecc46d3cb16148cd4ae057213f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:45:39 -0700
Subject: [PATCH 226/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.5.1
 - @cosmwasm/ts-codegen@1.8.1
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 1a0554d9..a6736695 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.5.1 (2024-04-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 # [1.5.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.4.1...@cosmwasm/ts-codegen-ast@1.5.0) (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 209eddc2..5b7c0af7 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index a25c38f7..ce33b948 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.8.0...@cosmwasm/ts-codegen@1.8.1) (2024-04-19)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.8.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.7.2...@cosmwasm/ts-codegen@1.8.0) (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 226aa8b6..cbd788de 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -42,6 +42,7 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
+    "@cosmwasm/ts-codegen-ast": "^1.5.1",
     "@cosmwasm/ts-codegen-types": "^1.2.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
@@ -57,8 +58,7 @@
     "nested-obj": "0.0.1",
     "parse-package-name": "1.0.0",
     "rimraf": "3.0.2",
-    "shelljs": "0.8.5",
-    "@cosmwasm/ts-codegen-ast": "^1.5.0"
+    "shelljs": "0.8.5"
   },
   "keywords": [
     "cosmwasm",

From 362a6a54389fc2f8dfb98fb7c0d7a7615751e6b4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:46:15 -0700
Subject: [PATCH 227/287] ast

---
 .github/workflows/run-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index cd9d9c60..d8f0fa7c 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -29,5 +29,5 @@ jobs:
       - name: Test @cosmwasm/ts-codegen
         run: cd packages/ts-codegen && yarn test
       
-      - name: Test ast
+      - name: Test @cosmwasm/ts-codegen-ast
         run: cd ./packages/ast && yarn test
\ No newline at end of file

From 78d409aedf769281b8009e84e511832df11dfd6f Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 18 Apr 2024 23:51:50 -0700
Subject: [PATCH 228/287] readme

---
 README.md                     | 2 +-
 packages/ts-codegen/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c76eb153..435b06ab 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ npm install @cosmwasm/ts-codegen
 
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
 
-🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
+🎥 [Checkout our video playlist](https://cosmology.zone/learn/ts-codegen) to learn how to use `ts-codegen`!
 ## Table of contents
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index c76eb153..435b06ab 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -23,7 +23,7 @@ npm install @cosmwasm/ts-codegen
 
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
 
-🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
+🎥 [Checkout our video playlist](https://cosmology.zone/learn/ts-codegen) to learn how to use `ts-codegen`!
 ## Table of contents
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)

From f77731e7a600bd35b031e2a945e8ae85ed51afc2 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Apr 2024 01:16:56 -0700
Subject: [PATCH 229/287] upgrade stargate

---
 packages/ts-codegen/package.json |   2 +-
 yarn.lock                        | 232 +++++++++++++++----------------
 2 files changed, 110 insertions(+), 124 deletions(-)

diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index cbd788de..5ff11c6d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -35,7 +35,7 @@
     "url": "https://github.com/cosmwasm/ts-codegen/issues"
   },
   "devDependencies": {
-    "@cosmjs/cosmwasm-stargate": "0.30.1",
+    "@cosmjs/cosmwasm-stargate": "0.32.3",
     "ast-stringify": "0.1.0"
   },
   "dependencies": {
diff --git a/yarn.lock b/yarn.lock
index c8db8802..c75743c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -318,138 +318,134 @@
     "@noble/hashes" "^1.0.0"
     protobufjs "^6.8.8"
 
-"@cosmjs/amino@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.30.1.tgz#7c18c14627361ba6c88e3495700ceea1f76baace"
-  integrity sha512-yNHnzmvAlkETDYIpeCTdVqgvrdt1qgkOXwuRVi8s27UKI5hfqyE9fJ/fuunXE6ZZPnKkjIecDznmuUOMrMvw4w==
-  dependencies:
-    "@cosmjs/crypto" "^0.30.1"
-    "@cosmjs/encoding" "^0.30.1"
-    "@cosmjs/math" "^0.30.1"
-    "@cosmjs/utils" "^0.30.1"
-
-"@cosmjs/cosmwasm-stargate@0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.30.1.tgz#6f9ca310f75433a3e30d683bc6aa24eadb345d79"
-  integrity sha512-W/6SLUCJAJGBN+sJLXouLZikVgmqDd9LCdlMzQaxczcCHTWeJAmRvOiZGSZaSy3shw/JN1qc6g6PKpvTVgj10A==
-  dependencies:
-    "@cosmjs/amino" "^0.30.1"
-    "@cosmjs/crypto" "^0.30.1"
-    "@cosmjs/encoding" "^0.30.1"
-    "@cosmjs/math" "^0.30.1"
-    "@cosmjs/proto-signing" "^0.30.1"
-    "@cosmjs/stargate" "^0.30.1"
-    "@cosmjs/tendermint-rpc" "^0.30.1"
-    "@cosmjs/utils" "^0.30.1"
-    cosmjs-types "^0.7.1"
-    long "^4.0.0"
+"@cosmjs/amino@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.3.tgz#b81d4a2b8d61568431a1afcd871e1344a19d97ff"
+  integrity sha512-G4zXl+dJbqrz1sSJ56H/25l5NJEk/pAPIr8piAHgbXYw88OdAOlpA26PQvk2IbSN/rRgVbvlLTNgX2tzz1dyUA==
+  dependencies:
+    "@cosmjs/crypto" "^0.32.3"
+    "@cosmjs/encoding" "^0.32.3"
+    "@cosmjs/math" "^0.32.3"
+    "@cosmjs/utils" "^0.32.3"
+
+"@cosmjs/cosmwasm-stargate@0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.32.3.tgz#26a110a6bb0c15fdeef647e3433bd9553a1acd5f"
+  integrity sha512-pqkt+QsLIPNMTRh9m+igJgIpzXXgn1BxmxfAb9zlC23kvsuzY/12un9M7iAdim1NwKXDFeYw46xC2YkprwQp+g==
+  dependencies:
+    "@cosmjs/amino" "^0.32.3"
+    "@cosmjs/crypto" "^0.32.3"
+    "@cosmjs/encoding" "^0.32.3"
+    "@cosmjs/math" "^0.32.3"
+    "@cosmjs/proto-signing" "^0.32.3"
+    "@cosmjs/stargate" "^0.32.3"
+    "@cosmjs/tendermint-rpc" "^0.32.3"
+    "@cosmjs/utils" "^0.32.3"
+    cosmjs-types "^0.9.0"
     pako "^2.0.2"
 
-"@cosmjs/crypto@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.30.1.tgz#21e94d5ca8f8ded16eee1389d2639cb5c43c3eb5"
-  integrity sha512-rAljUlake3MSXs9xAm87mu34GfBLN0h/1uPPV6jEwClWjNkAMotzjC0ab9MARy5FFAvYHL3lWb57bhkbt2GtzQ==
+"@cosmjs/crypto@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.3.tgz#787f8e659709678722068ee1ddf379f65051a25e"
+  integrity sha512-niQOWJHUtlJm2GG4F00yGT7sGPKxfUwz+2qQ30uO/E3p58gOusTcH2qjiJNVxb8vScYJhFYFqpm/OA/mVqoUGQ==
   dependencies:
-    "@cosmjs/encoding" "^0.30.1"
-    "@cosmjs/math" "^0.30.1"
-    "@cosmjs/utils" "^0.30.1"
+    "@cosmjs/encoding" "^0.32.3"
+    "@cosmjs/math" "^0.32.3"
+    "@cosmjs/utils" "^0.32.3"
     "@noble/hashes" "^1"
     bn.js "^5.2.0"
     elliptic "^6.5.4"
-    libsodium-wrappers "^0.7.6"
+    libsodium-wrappers-sumo "^0.7.11"
 
-"@cosmjs/encoding@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058"
-  integrity sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ==
+"@cosmjs/encoding@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.3.tgz#e245ff511fe4a0df7ba427b5187aab69e3468e5b"
+  integrity sha512-p4KF7hhv8jBQX3MkB3Defuhz/W0l3PwWVYU2vkVuBJ13bJcXyhU9nJjiMkaIv+XP+W2QgRceqNNgFUC5chNR7w==
   dependencies:
     base64-js "^1.3.0"
     bech32 "^1.1.4"
     readonly-date "^1.0.0"
 
-"@cosmjs/json-rpc@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.30.1.tgz#16f21305fc167598c8a23a45549b85106b2372bc"
-  integrity sha512-pitfC/2YN9t+kXZCbNuyrZ6M8abnCC2n62m+JtU9vQUfaEtVsgy+1Fk4TRQ175+pIWSdBMFi2wT8FWVEE4RhxQ==
+"@cosmjs/json-rpc@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.3.tgz#ccffdd7f722cecfab6daaa7463843b92f5d25355"
+  integrity sha512-JwFRWZa+Y95KrAG8CuEbPVOSnXO2uMSEBcaAB/FBU3Mo4jQnDoUjXvt3vwtFWxfAytrWCn1I4YDFaOAinnEG/Q==
   dependencies:
-    "@cosmjs/stream" "^0.30.1"
+    "@cosmjs/stream" "^0.32.3"
     xstream "^11.14.0"
 
-"@cosmjs/math@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.30.1.tgz#8b816ef4de5d3afa66cb9fdfb5df2357a7845b8a"
-  integrity sha512-yaoeI23pin9ZiPHIisa6qqLngfnBR/25tSaWpkTm8Cy10MX70UF5oN4+/t1heLaM6SSmRrhk3psRkV4+7mH51Q==
+"@cosmjs/math@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.3.tgz#16e4256f4da507b9352327da12ae64056a2ba6c9"
+  integrity sha512-amumUtZs8hCCnV+lSBaJIiZkGabQm22QGg/IotYrhcmoOEOjt82n7hMNlNXRs7V6WLMidGrGYcswB5zcmp0Meg==
   dependencies:
     bn.js "^5.2.0"
 
-"@cosmjs/proto-signing@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.30.1.tgz#f0dda372488df9cd2677150b89b3e9c72b3cb713"
-  integrity sha512-tXh8pPYXV4aiJVhTKHGyeZekjj+K9s2KKojMB93Gcob2DxUjfKapFYBMJSgfKPuWUPEmyr8Q9km2hplI38ILgQ==
-  dependencies:
-    "@cosmjs/amino" "^0.30.1"
-    "@cosmjs/crypto" "^0.30.1"
-    "@cosmjs/encoding" "^0.30.1"
-    "@cosmjs/math" "^0.30.1"
-    "@cosmjs/utils" "^0.30.1"
-    cosmjs-types "^0.7.1"
-    long "^4.0.0"
+"@cosmjs/proto-signing@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.3.tgz#91ae149b747d18666a6ccc924165b306431f7c0d"
+  integrity sha512-kSZ0ZUY0DwcRT0NcIn2HkadH4NKlwjfZgbLj1ABwh/4l0RgeT84QCscZCu63tJYq3K6auwqTiZSZERwlO4/nbg==
+  dependencies:
+    "@cosmjs/amino" "^0.32.3"
+    "@cosmjs/crypto" "^0.32.3"
+    "@cosmjs/encoding" "^0.32.3"
+    "@cosmjs/math" "^0.32.3"
+    "@cosmjs/utils" "^0.32.3"
+    cosmjs-types "^0.9.0"
 
-"@cosmjs/socket@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.30.1.tgz#00b22f4b5e2ab01f4d82ccdb7b2e59536bfe5ce0"
-  integrity sha512-r6MpDL+9N+qOS/D5VaxnPaMJ3flwQ36G+vPvYJsXArj93BjgyFB7BwWwXCQDzZ+23cfChPUfhbINOenr8N2Kow==
+"@cosmjs/socket@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.3.tgz#fa5c36bf58e87c0ad865d6318ecb0f8d9c89a28a"
+  integrity sha512-F2WwNmaUPdZ4SsH6Uyreq3wQk7jpaEkb3wfOP951f5Jt6HCW/PxbxhKzHkAAf6+Sqks6SPhkbWoE8XaZpjL2KA==
   dependencies:
-    "@cosmjs/stream" "^0.30.1"
+    "@cosmjs/stream" "^0.32.3"
     isomorphic-ws "^4.0.1"
     ws "^7"
     xstream "^11.14.0"
 
-"@cosmjs/stargate@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.30.1.tgz#e1b22e1226cffc6e93914a410755f1f61057ba04"
-  integrity sha512-RdbYKZCGOH8gWebO7r6WvNnQMxHrNXInY/gPHPzMjbQF6UatA6fNM2G2tdgS5j5u7FTqlCI10stNXrknaNdzog==
+"@cosmjs/stargate@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.3.tgz#5a92b222ada960ebecea72cc9f366370763f4b66"
+  integrity sha512-OQWzO9YWKerUinPIxrO1MARbe84XkeXJAW0lyMIjXIEikajuXZ+PwftiKA5yA+8OyditVmHVLtPud6Pjna2s5w==
   dependencies:
     "@confio/ics23" "^0.6.8"
-    "@cosmjs/amino" "^0.30.1"
-    "@cosmjs/encoding" "^0.30.1"
-    "@cosmjs/math" "^0.30.1"
-    "@cosmjs/proto-signing" "^0.30.1"
-    "@cosmjs/stream" "^0.30.1"
-    "@cosmjs/tendermint-rpc" "^0.30.1"
-    "@cosmjs/utils" "^0.30.1"
-    cosmjs-types "^0.7.1"
-    long "^4.0.0"
-    protobufjs "~6.11.3"
+    "@cosmjs/amino" "^0.32.3"
+    "@cosmjs/encoding" "^0.32.3"
+    "@cosmjs/math" "^0.32.3"
+    "@cosmjs/proto-signing" "^0.32.3"
+    "@cosmjs/stream" "^0.32.3"
+    "@cosmjs/tendermint-rpc" "^0.32.3"
+    "@cosmjs/utils" "^0.32.3"
+    cosmjs-types "^0.9.0"
     xstream "^11.14.0"
 
-"@cosmjs/stream@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.30.1.tgz#ba038a2aaf41343696b1e6e759d8e03a9516ec1a"
-  integrity sha512-Fg0pWz1zXQdoxQZpdHRMGvUH5RqS6tPv+j9Eh7Q953UjMlrwZVo0YFLC8OTf/HKVf10E4i0u6aM8D69Q6cNkgQ==
+"@cosmjs/stream@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.3.tgz#7522579aaf18025d322c2f33d6fb7573220395d6"
+  integrity sha512-J2zVWDojkynYifAUcRmVczzmp6STEpyiAARq0rSsviqjreGIfspfuws/8rmkPa6qQBZvpQOBQCm2HyZZwYplIw==
   dependencies:
     xstream "^11.14.0"
 
-"@cosmjs/tendermint-rpc@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.30.1.tgz#c16378892ba1ac63f72803fdf7567eab9d4f0aa0"
-  integrity sha512-Z3nCwhXSbPZJ++v85zHObeUggrEHVfm1u18ZRwXxFE9ZMl5mXTybnwYhczuYOl7KRskgwlB+rID0WYACxj4wdQ==
-  dependencies:
-    "@cosmjs/crypto" "^0.30.1"
-    "@cosmjs/encoding" "^0.30.1"
-    "@cosmjs/json-rpc" "^0.30.1"
-    "@cosmjs/math" "^0.30.1"
-    "@cosmjs/socket" "^0.30.1"
-    "@cosmjs/stream" "^0.30.1"
-    "@cosmjs/utils" "^0.30.1"
-    axios "^0.21.2"
+"@cosmjs/tendermint-rpc@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.3.tgz#f0406b9f0233e588fb924dca8c614972f9038aff"
+  integrity sha512-xeprW+VR9xKGstqZg0H/KBZoUp8/FfFyS9ljIUTLM/UINjP2MhiwncANPS2KScfJVepGufUKk0/phHUeIBSEkw==
+  dependencies:
+    "@cosmjs/crypto" "^0.32.3"
+    "@cosmjs/encoding" "^0.32.3"
+    "@cosmjs/json-rpc" "^0.32.3"
+    "@cosmjs/math" "^0.32.3"
+    "@cosmjs/socket" "^0.32.3"
+    "@cosmjs/stream" "^0.32.3"
+    "@cosmjs/utils" "^0.32.3"
+    axios "^1.6.0"
     readonly-date "^1.0.0"
     xstream "^11.14.0"
 
-"@cosmjs/utils@^0.30.1":
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.30.1.tgz#6d92582341be3c2ec8d82090253cfa4b7f959edb"
-  integrity sha512-KvvX58MGMWh7xA+N+deCfunkA/ZNDvFLw4YbOmX3f/XBIkqrVY7qlotfy2aNb1kgp6h4B6Yc8YawJPDTfvWX7g==
+"@cosmjs/utils@^0.32.3":
+  version "0.32.3"
+  resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.3.tgz#5dcaee6dd7cc846cdc073e9a7a7f63242f5f7e31"
+  integrity sha512-WCZK4yksj2hBDz4w7xFZQTRZQ/RJhBX26uFHmmQFIcNUUVAihrLO+RerqJgk0dZqC42wstM9pEUQGtPmLcIYvg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -2012,14 +2008,7 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-axios@^0.21.2:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^1.0.0:
+axios@^1.0.0, axios@^1.6.0:
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
   integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
@@ -2697,13 +2686,10 @@ cosmiconfig@7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmjs-types@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.7.2.tgz#a757371abd340949c5bd5d49c6f8379ae1ffd7e2"
-  integrity sha512-vf2uLyktjr/XVAgEq0DjMxeAWh1yYREe7AMHDKd7EiHVqxBPCaBS+qEEQUkXbR9ndnckqr1sUG8BQhazh4X5lA==
-  dependencies:
-    long "^4.0.0"
-    protobufjs "~6.11.2"
+cosmjs-types@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.9.0.tgz#c3bc482d28c7dfa25d1445093fdb2d9da1f6cfcc"
+  integrity sha512-MN/yUe6mkJwHnCFfsNPeCfXVhyxHYW6c/xDUzrSbBycYzw++XvWDMJArXp2pLdgD6FQ8DW79vkPjeNKVrXaHeQ==
 
 create-jest@^29.7.0:
   version "29.7.0"
@@ -3460,7 +3446,7 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-follow-redirects@^1.14.0, follow-redirects@^1.15.6:
+follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@@ -5052,17 +5038,17 @@ libnpmpublish@7.1.4:
     sigstore "^1.4.0"
     ssri "^10.0.1"
 
-libsodium-wrappers@^0.7.6:
+libsodium-sumo@^0.7.13:
   version "0.7.13"
-  resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz#83299e06ee1466057ba0e64e532777d2929b90d3"
-  integrity sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==
-  dependencies:
-    libsodium "^0.7.13"
+  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz#533b97d2be44b1277e59c1f9f60805978ac5542d"
+  integrity sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==
 
-libsodium@^0.7.13:
+libsodium-wrappers-sumo@^0.7.11:
   version "0.7.13"
-  resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.13.tgz#230712ec0b7447c57b39489c48a4af01985fb393"
-  integrity sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw==
+  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz#a33aea845a0bb56db067548f04feba28c730ab8e"
+  integrity sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==
+  dependencies:
+    libsodium-sumo "^0.7.13"
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
@@ -6420,7 +6406,7 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
+protobufjs@^6.8.8:
   version "6.11.4"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
   integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==

From f25cc410b30af114b6147e3fc264158b1976e362 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 26 Apr 2024 01:29:04 -0700
Subject: [PATCH 230/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.9.0
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index ce33b948..7a6f4379 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.9.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.8.1...@cosmwasm/ts-codegen@1.9.0) (2024-04-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [1.8.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.8.0...@cosmwasm/ts-codegen@1.8.1) (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 5ff11c6d..f6e927a7 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 882ea53e2b9bd9a47940ce931ac72b5594d0fe52 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 30 Apr 2024 00:27:57 -0700
Subject: [PATCH 231/287] pkg

---
 package.json | 8 ++++----
 yarn.lock    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 652788db..10cec4f1 100644
--- a/package.json
+++ b/package.json
@@ -15,24 +15,24 @@
   "devDependencies": {
     "@types/jest": "^29.5.11",
     "@types/jest-in-case": "^1.0.2",
-    "@types/node": "^20.12.7",
     "@types/mkdirp": "1.0.2",
+    "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
     "copyfiles": "^2.4.1",
     "del-cli": "^5.1.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.0.0",
-    "eslint": "^8.56.0",
     "glob": "8.0.3",
-    "jest-in-case": "^1.0.2",
     "jest": "^29.6.2",
+    "jest-in-case": "^1.0.2",
     "lerna": "^6",
     "mkdirp": "1.0.2",
     "prettier": "^3.0.2",
     "strip-ansi": "^6",
-    "symlink-workspace": "^1.1.0",
+    "symlink-workspace": "^1.9.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.1.6"
diff --git a/yarn.lock b/yarn.lock
index c75743c9..06fb9425 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7169,10 +7169,10 @@ symbol-observable@^2.0.3:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
-symlink-workspace@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/symlink-workspace/-/symlink-workspace-1.1.0.tgz#476811e1fb5a00c529e44c8b37765dbefff77e19"
-  integrity sha512-7kF6g/7bpDRCi7KdJNPnMrXURehpb6Sd5yHePSnHT+8pD2uec5Se3KPHwyUFFK/vEYhgKX6qabtr1Qmrtzjr8g==
+symlink-workspace@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/symlink-workspace/-/symlink-workspace-1.9.0.tgz#df4c5ce48bd55e54580e813126c643a86e29e759"
+  integrity sha512-eKSISj/3r5gLU4NCY5Ir16PLPavHYb2s2DMN7wGheaZAMlUGEuq8qUhlmbBMR8J32Yq9PCtcA+yritgHpwUDfw==
   dependencies:
     chalk "4.1.2"
     glob "8.1.0"

From 3a610211b58885c78bd1cc10a5e6cfc5dfc26a76 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 13:15:20 +0200
Subject: [PATCH 232/287] rimraf

---
 package.json                     | 8 ++++----
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/package.json | 2 +-
 packages/types/package.json      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 10cec4f1..2baf93cc 100644
--- a/package.json
+++ b/package.json
@@ -13,24 +13,24 @@
     "postinstall": "yarn symlink"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.11",
     "@types/jest-in-case": "^1.0.2",
+    "@types/jest": "^29.5.11",
     "@types/mkdirp": "1.0.2",
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
     "copyfiles": "^2.4.1",
-    "del-cli": "^5.1.0",
-    "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.0.0",
+    "eslint": "^8.56.0",
     "glob": "8.0.3",
-    "jest": "^29.6.2",
     "jest-in-case": "^1.0.2",
+    "jest": "^29.6.2",
     "lerna": "^6",
     "mkdirp": "1.0.2",
     "prettier": "^3.0.2",
+    "rimraf": "4.4.1",
     "strip-ansi": "^6",
     "symlink-workspace": "^1.9.0",
     "ts-jest": "^29.1.1",
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 5b7c0af7..f35adea2 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
-    "clean": "del dist/**",
+    "clean": "rimraf dist/**",
     "prepare": "npm run build",
     "codegen": "ts-node ./scripts/build.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index f6e927a7..8a66dd5f 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
-    "clean": "del dist/**",
+    "clean": "rimraf dist/**",
     "prepare": "npm run build",
     "cmds": "ts-node ./scripts/cmds.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
diff --git a/packages/types/package.json b/packages/types/package.json
index 34d560ff..1e0ca268 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
-    "clean": "del dist/**",
+    "clean": "rimraf dist/**",
     "prepare": "npm run build",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "test": "jest --passWithNoTests",

From 2fb9361a7ff24917cb2d31f246ef606b05cd8d81 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 13:15:36 +0200
Subject: [PATCH 233/287] lock

---
 yarn.lock | 192 +++++-------------------------------------------------
 1 file changed, 15 insertions(+), 177 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 06fb9425..87425fa8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1576,7 +1576,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/minimist@^1.2.0", "@types/minimist@^1.2.2":
+"@types/minimist@^1.2.0":
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
@@ -1819,14 +1819,6 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-aggregate-error@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
-  integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==
-  dependencies:
-    clean-stack "^4.0.0"
-    indent-string "^5.0.0"
-
 ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -2268,22 +2260,12 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase-keys@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
-  integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==
-  dependencies:
-    camelcase "^6.3.0"
-    map-obj "^4.1.0"
-    quick-lru "^5.1.1"
-    type-fest "^1.2.1"
-
 camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0, camelcase@^6.3.0:
+camelcase@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -2374,13 +2356,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-clean-stack@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31"
-  integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==
-  dependencies:
-    escape-string-regexp "5.0.0"
-
 cli-color@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.4.tgz#d658080290968816b322248b7306fad2346fb2c8"
@@ -2766,11 +2741,6 @@ decamelize@^1.1.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decamelize@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
-  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
-
 dedent@0.7.0, dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -2826,14 +2796,6 @@ define-properties@^1.1.3:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del-cli@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-5.1.0.tgz#740eca1c7a9eb13043e68d8a361cf0ff9a18d5c8"
-  integrity sha512-xwMeh2acluWeccsfzE7VLsG3yTr7nWikbfw+xhMnpRrF15pGSkw+3/vJZWlGoE4I86UiLRNHicmKt4tkIX9Jtg==
-  dependencies:
-    del "^7.1.0"
-    meow "^10.1.3"
-
 del@^6.0.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
@@ -2848,20 +2810,6 @@ del@^6.0.0:
     rimraf "^3.0.2"
     slash "^3.0.0"
 
-del@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-7.1.0.tgz#0de0044d556b649ff05387f1fa7c885e155fd1b6"
-  integrity sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg==
-  dependencies:
-    globby "^13.1.2"
-    graceful-fs "^4.2.10"
-    is-glob "^4.0.3"
-    is-path-cwd "^3.0.0"
-    is-path-inside "^4.0.0"
-    p-map "^5.5.0"
-    rimraf "^3.0.2"
-    slash "^4.0.0"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -3077,11 +3025,6 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
-escape-string-regexp@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
-  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
-
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -3329,7 +3272,7 @@ fast-glob@3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.9, fast-glob@^3.3.0:
+fast-glob@^3.2.9:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -3778,17 +3721,6 @@ globby@11.1.0, globby@^11.0.1, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^13.1.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
-  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
-  dependencies:
-    dir-glob "^3.0.1"
-    fast-glob "^3.3.0"
-    ignore "^5.2.4"
-    merge2 "^1.4.1"
-    slash "^4.0.0"
-
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -3801,7 +3733,7 @@ graceful-fs@4.2.10:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4027,11 +3959,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indent-string@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
-  integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
-
 infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -4265,21 +4192,11 @@ is-path-cwd@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-3.0.0.tgz#889b41e55c8588b1eb2a96a61d05740a674521c7"
-  integrity sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==
-
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-path-inside@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
-  integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==
-
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -5248,7 +5165,7 @@ map-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
-map-obj@^4.0.0, map-obj@^4.1.0:
+map-obj@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
@@ -5267,24 +5184,6 @@ memoizee@^0.4.15:
     next-tick "^1.1.0"
     timers-ext "^0.1.7"
 
-meow@^10.1.3:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f"
-  integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==
-  dependencies:
-    "@types/minimist" "^1.2.2"
-    camelcase-keys "^7.0.0"
-    decamelize "^5.0.0"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "4.1.0"
-    normalize-package-data "^3.0.2"
-    read-pkg-up "^8.0.0"
-    redent "^4.0.0"
-    trim-newlines "^4.0.2"
-    type-fest "^1.2.2"
-    yargs-parser "^20.2.9"
-
 meow@^8.0.0:
   version "8.1.2"
   resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
@@ -5342,7 +5241,7 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-min-indent@^1.0.0, min-indent@^1.0.1:
+min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
@@ -5690,7 +5589,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+normalize-package-data@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
@@ -6065,13 +5964,6 @@ p-map@4.0.0, p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-map@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715"
-  integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==
-  dependencies:
-    aggregate-error "^4.0.0"
-
 p-pipe@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
@@ -6460,11 +6352,6 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
 react-is@^18.0.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
@@ -6543,15 +6430,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg-up@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670"
-  integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==
-  dependencies:
-    find-up "^5.0.0"
-    read-pkg "^6.0.0"
-    type-fest "^1.0.1"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -6571,16 +6449,6 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-read-pkg@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c"
-  integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^3.0.2"
-    parse-json "^5.2.0"
-    type-fest "^1.0.1"
-
 read@1, read@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -6640,14 +6508,6 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-redent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9"
-  integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==
-  dependencies:
-    indent-string "^5.0.0"
-    strip-indent "^4.0.0"
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -6722,6 +6582,13 @@ rimraf@3.0.2, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@4.4.1, rimraf@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.4.1.tgz#bd33364f67021c5b79e93d7f4fa0568c7c21b755"
+  integrity sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==
+  dependencies:
+    glob "^9.2.0"
+
 rimraf@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.0.tgz#5bda14e410d7e4dd522154891395802ce032c2cb"
@@ -6729,13 +6596,6 @@ rimraf@5.0.0:
   dependencies:
     glob "^10.0.0"
 
-rimraf@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.4.1.tgz#bd33364f67021c5b79e93d7f4fa0568c7c21b755"
-  integrity sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==
-  dependencies:
-    glob "^9.2.0"
-
 run-async@^2.2.0, run-async@^2.3.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -6884,11 +6744,6 @@ slash@3.0.0, slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
 smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
@@ -7112,13 +6967,6 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
-  integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==
-  dependencies:
-    min-indent "^1.0.1"
-
 strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -7341,11 +7189,6 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-trim-newlines@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
-  integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
-
 ts-api-utils@^1.0.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
@@ -7459,11 +7302,6 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
-  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
-
 type@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
@@ -7821,7 +7659,7 @@ yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==

From 3a4710916304cefcc9fa17b283614c95ff3b468a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 14:16:22 +0200
Subject: [PATCH 234/287] linter

---
 .eslintrc.json                                |  13 +-
 package.json                                  |   9 +-
 packages/ast/.eslintrc.js                     |  71 --
 packages/ast/__tests__/babel/babel.test.ts    | 876 +++++++++---------
 .../client/ts-client.account-nfts.test.ts     |   6 +-
 .../ts-client.arrays-item-tuples.test.ts      |   5 +-
 .../client/ts-client.arrays-ref.test.ts       |  54 +-
 .../__tests__/client/ts-client.arrays.test.ts |  72 +-
 .../client/ts-client.cw-named-groups.test.ts  |  54 +-
 .../ts-client.cw-proposal-single.test.ts      |  62 +-
 .../client/ts-client.empty-enums.test.ts      |  28 +-
 .../client/ts-client.issue-101.test.ts        |   1 +
 .../client/ts-client.issue-103.test.ts        | 179 ++--
 .../client/ts-client.issue-71.test.ts         |  63 +-
 .../client/ts-client.issue-98.test.ts         |  58 +-
 .../__tests__/client/ts-client.issues.test.ts |  61 +-
 .../client/ts-client.overrides.test.ts        |  92 +-
 .../__tests__/client/ts-client.sg721.test.ts  |  54 +-
 .../ast/__tests__/client/ts-client.test.ts    |   4 +-
 .../__tests__/client/ts-client.vectis.test.ts |  11 +-
 .../__tests__/client/ts-client.wager.test.ts  |  48 +-
 .../message-composer/message-composer.test.ts |  24 +-
 .../__tests__/react-query/react-query.test.ts |   3 +-
 packages/ast/__tests__/recoil/recoil.test.ts  |   2 +-
 .../ast/__tests__/types/interfaces.test.ts    |   3 +-
 packages/ast/jest.config.js                   |  30 +-
 packages/ast/package.json                     |   1 +
 packages/ast/scripts/test-ast.ts              |   2 +-
 packages/ast/src/client/client.ts             |  17 +-
 packages/ast/src/context/context.ts           |  13 +-
 packages/ast/src/context/imports.ts           |  31 +-
 packages/ast/src/index.ts                     |   8 +-
 .../src/message-builder/message-builder.ts    |   9 +-
 .../src/message-composer/message-composer.ts  |   7 +-
 packages/ast/src/provider/provider.ts         |  85 +-
 packages/ast/src/react-query/react-query.ts   |  12 +-
 packages/ast/src/recoil/recoil.ts             |  37 +-
 packages/ast/src/types/context.ts             |   5 +-
 packages/ast/src/types/index.ts               |   4 +-
 packages/ast/src/utils/babel.ts               | 479 +++++-----
 packages/ast/src/utils/constants.ts           |   7 +-
 packages/ast/src/utils/index.ts               |   4 +-
 packages/ast/src/utils/ref.ts                 |   2 +-
 packages/ast/src/utils/types.ts               |  29 +-
 packages/ast/test-utils/utils.ts              |   7 +-
 packages/ts-codegen/.eslintrc.js              |  71 --
 packages/ts-codegen/__tests__/builder.test.ts | 380 ++++----
 packages/ts-codegen/__tests__/bundler.test.ts | 303 +++---
 packages/ts-codegen/__tests__/cleanse.test.ts |  47 +-
 .../ts-codegen/__tests__/ts-codegen.test.ts   | 400 ++++----
 packages/ts-codegen/jest.config.js            |  30 +-
 packages/ts-codegen/package.json              |   1 +
 packages/ts-codegen/src/builder/builder.ts    | 345 ++++---
 packages/ts-codegen/src/bundler/bundler.ts    | 113 ++-
 packages/ts-codegen/src/cli.ts                |   7 +-
 packages/ts-codegen/src/cmds.ts               |   2 +-
 .../src/commands/create-boilerplate.ts        | 223 ++---
 packages/ts-codegen/src/commands/generate.ts  | 323 +++----
 packages/ts-codegen/src/commands/install.ts   | 179 ++--
 packages/ts-codegen/src/file.ts               |   5 +-
 .../ts-codegen/src/helpers/create-helpers.ts  |  25 +-
 packages/ts-codegen/src/index.ts              |   6 +-
 packages/ts-codegen/src/plugins/client.ts     |  25 +-
 packages/ts-codegen/src/plugins/index.ts      |  14 +-
 .../ts-codegen/src/plugins/message-builder.ts |   7 +-
 .../src/plugins/message-composer.ts           |  26 +-
 .../ts-codegen/src/plugins/plugin-base.ts     |  27 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |  43 +-
 packages/ts-codegen/src/plugins/provider.ts   |  27 +-
 .../ts-codegen/src/plugins/react-query.ts     |  12 +-
 packages/ts-codegen/src/plugins/recoil.ts     |  11 +-
 packages/ts-codegen/src/plugins/types.ts      |   7 +-
 packages/ts-codegen/src/ts-codegen.ts         |   2 +-
 packages/ts-codegen/src/utils/clean.ts        |  76 +-
 packages/ts-codegen/src/utils/cleanse.ts      | 138 +--
 packages/ts-codegen/src/utils/contracts.ts    |   2 +-
 packages/ts-codegen/src/utils/files.ts        |  31 +-
 packages/ts-codegen/src/utils/header.ts       |   2 +-
 packages/ts-codegen/src/utils/package.ts      |   4 +-
 packages/ts-codegen/src/utils/parse.ts        |  62 +-
 packages/ts-codegen/src/utils/schemas.ts      | 151 +--
 packages/ts-codegen/test-utils/index.ts       |  31 +-
 packages/ts-codegen/test-utils/testPlugins.ts |   9 +-
 packages/types/.eslintrc.js                   |  71 --
 packages/types/jest.config.js                 |  30 +-
 packages/types/package.json                   |   1 +
 packages/types/src/idl.ts                     |   2 +-
 packages/types/src/types.ts                   |   4 +-
 yarn.lock                                     | 164 ++--
 89 files changed, 2943 insertions(+), 3138 deletions(-)
 delete mode 100644 packages/ast/.eslintrc.js
 delete mode 100644 packages/ts-codegen/.eslintrc.js
 delete mode 100644 packages/types/.eslintrc.js

diff --git a/.eslintrc.json b/.eslintrc.json
index afb9b718..1b8ad4a3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -16,8 +16,17 @@
     "ecmaVersion": "latest",
     "sourceType": "module"
   },
-  "plugins": ["@typescript-eslint", "simple-import-sort", "unused-imports"],
+  "plugins": [
+    "@typescript-eslint",
+    "simple-import-sort",
+    "unused-imports"
+  ],
   "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
     "simple-import-sort/imports": 1,
     "simple-import-sort/exports": 1,
     "unused-imports/no-unused-imports": 1,
@@ -36,4 +45,4 @@
     "no-implicit-globals": 0,
     "@typescript-eslint/no-unsafe-declaration-merging": 0
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 2baf93cc..20d3ed8d 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "clean": "lerna run clean",
     "build": "lerna run build --stream",
     "test": "lerna run test --stream",
+    "lint": "lerna run lint --parallel",
     "symlink": "symlink-workspace --logLevel error",
     "postinstall": "yarn symlink"
   },
@@ -17,12 +18,12 @@
     "@types/jest": "^29.5.11",
     "@types/mkdirp": "1.0.2",
     "@types/node": "^20.12.7",
-    "@typescript-eslint/eslint-plugin": "^6.18.1",
-    "@typescript-eslint/parser": "^6.18.1",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "copyfiles": "^2.4.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-unused-imports": "^3.0.0",
+    "eslint-plugin-simple-import-sort": "^12.1.0",
+    "eslint-plugin-unused-imports": "^4.0.0",
     "eslint": "^8.56.0",
     "glob": "8.0.3",
     "jest-in-case": "^1.0.2",
diff --git a/packages/ast/.eslintrc.js b/packages/ast/.eslintrc.js
deleted file mode 100644
index 2718e8bc..00000000
--- a/packages/ast/.eslintrc.js
+++ /dev/null
@@ -1,71 +0,0 @@
-module.exports = {
-  plugins: ['prettier'],
-  extends: ['eslint:recommended', 'prettier'],
-  parser: '@babel/eslint-parser',
-  parserOptions: {
-    ecmaVersion: 11,
-    requireConfigFile: false,
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true
-    }
-  },
-  env: {
-    es6: true,
-    browser: true,
-    node: true,
-    jest: true
-  },
-  rules: {
-    'no-debugger': 2,
-    'no-alert': 2,
-    'no-await-in-loop': 0,
-    'no-prototype-builtins': 0,
-    'no-return-assign': ['error', 'except-parens'],
-    'no-restricted-syntax': [
-      2,
-      'ForInStatement',
-      'LabeledStatement',
-      'WithStatement'
-    ],
-    'no-unused-vars': [
-      0,
-      {
-        ignoreSiblings: true,
-        argsIgnorePattern: 'React|res|next|^_'
-      }
-    ],
-    'prefer-const': [
-      'error',
-      {
-        destructuring: 'all'
-      }
-    ],
-    'no-unused-expressions': [
-      2,
-      {
-        allowTaggedTemplates: true
-      }
-    ],
-    'no-console': 1,
-    'comma-dangle': 2,
-    'jsx-quotes': [2, 'prefer-double'],
-    'linebreak-style': ['error', 'unix'],
-    quotes: [
-      2,
-      'single',
-      {
-        avoidEscape: true,
-        allowTemplateLiterals: true
-      }
-    ],
-    'prettier/prettier': [
-      'error',
-      {
-        trailingComma: 'none',
-        singleQuote: true,
-        printWidth: 80
-      }
-    ]
-  }
-};
diff --git a/packages/ast/__tests__/babel/babel.test.ts b/packages/ast/__tests__/babel/babel.test.ts
index 439d98af..7117e1ec 100644
--- a/packages/ast/__tests__/babel/babel.test.ts
+++ b/packages/ast/__tests__/babel/babel.test.ts
@@ -2,482 +2,482 @@ import * as t from '@babel/types';
 
 import { importStmt } from '../../src/utils/babel';
 import {
-    arrowFunctionExpression,
-    bindMethod,
-    classDeclaration,
-    classProperty,
-    promiseTypeAnnotation,
-    typedIdentifier
+  arrowFunctionExpression,
+  bindMethod,
+  classDeclaration,
+  classProperty,
+  promiseTypeAnnotation,
+  typedIdentifier
 } from '../../src/utils/babel';
 import { expectCode } from '../../test-utils';
 
 it('top import', async () => {
-    expectCode(
-        importStmt(
-            ['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'],
-            '@cosmjs/cosmwasm-stargate'
-        )
-    );
+  expectCode(
+    importStmt(
+      ['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'],
+      '@cosmjs/cosmwasm-stargate'
+    )
+  );
 });
 
 it('interfaces', async () => {
-    expectCode(
-        t.program([
-            t.exportNamedDeclaration(
-                t.tsInterfaceDeclaration(
-                    t.identifier('SG721ReadOnlyInstance'),
-                    null,
-                    [],
-                    t.tSInterfaceBody([
-                        t.tSPropertySignature(
-                            t.identifier('contractAddress'),
-                            t.tsTypeAnnotation(t.tsStringKeyword())
-                        ),
-                        // methods
+  expectCode(
+    t.program([
+      t.exportNamedDeclaration(
+        t.tsInterfaceDeclaration(
+          t.identifier('SG721ReadOnlyInstance'),
+          null,
+          [],
+          t.tSInterfaceBody([
+            t.tSPropertySignature(
+              t.identifier('contractAddress'),
+              t.tsTypeAnnotation(t.tsStringKeyword())
+            ),
+            // methods
 
-                        t.tSPropertySignature(
-                            t.identifier('tokens'),
-                            t.tsTypeAnnotation(
-                                t.tsFunctionType(
-                                    null,
-                                    [
-                                        typedIdentifier(
-                                            'owner',
-                                            t.tsTypeAnnotation(t.tsStringKeyword())
-                                        ),
-                                        typedIdentifier(
-                                            'startAfter',
-                                            t.tsTypeAnnotation(t.tsStringKeyword()),
-                                            true
-                                        ),
-                                        typedIdentifier(
-                                            'limit',
-                                            t.tsTypeAnnotation(t.tsStringKeyword()),
-                                            true
-                                        )
-                                    ],
-                                    promiseTypeAnnotation('TokensResponse')
-                                )
-                            )
-                        )
-                    ])
+            t.tSPropertySignature(
+              t.identifier('tokens'),
+              t.tsTypeAnnotation(
+                t.tsFunctionType(
+                  null,
+                  [
+                    typedIdentifier(
+                      'owner',
+                      t.tsTypeAnnotation(t.tsStringKeyword())
+                    ),
+                    typedIdentifier(
+                      'startAfter',
+                      t.tsTypeAnnotation(t.tsStringKeyword()),
+                      true
+                    ),
+                    typedIdentifier(
+                      'limit',
+                      t.tsTypeAnnotation(t.tsStringKeyword()),
+                      true
+                    )
+                  ],
+                  promiseTypeAnnotation('TokensResponse')
                 )
-            ),
+              )
+            )
+          ])
+        )
+      ),
 
-            // extends
+      // extends
 
-            t.exportNamedDeclaration(
-                t.tsInterfaceDeclaration(
-                    t.identifier('SG721Instance'),
-                    null,
-                    [
-                        t.tSExpressionWithTypeArguments(
-                            t.identifier('SG721ReadOnlyInstance')
-                        )
-                    ],
-                    t.tSInterfaceBody([
-                        // contract address
+      t.exportNamedDeclaration(
+        t.tsInterfaceDeclaration(
+          t.identifier('SG721Instance'),
+          null,
+          [
+            t.tSExpressionWithTypeArguments(
+              t.identifier('SG721ReadOnlyInstance')
+            )
+          ],
+          t.tSInterfaceBody([
+            // contract address
 
-                        t.tSPropertySignature(
-                            t.identifier('contractAddress'),
-                            t.tsTypeAnnotation(t.tsStringKeyword())
-                        ),
+            t.tSPropertySignature(
+              t.identifier('contractAddress'),
+              t.tsTypeAnnotation(t.tsStringKeyword())
+            ),
 
-                        // METHOD
-                        t.tSPropertySignature(
-                            t.identifier('mint'),
-                            t.tsTypeAnnotation(
-                                t.tsFunctionType(
-                                    null,
-                                    [
-                                        typedIdentifier(
-                                            'sender',
-                                            t.tsTypeAnnotation(t.tsStringKeyword())
-                                        ),
-                                        typedIdentifier(
-                                            'anotherProp',
-                                            t.tsTypeAnnotation(t.tsStringKeyword())
-                                        ),
-                                        typedIdentifier(
-                                            'prop3',
-                                            t.tsTypeAnnotation(t.tsStringKeyword())
-                                        )
-                                    ],
-                                    promiseTypeAnnotation('ExecuteResult')
-                                )
-                            )
-                        )
-                    ])
+            // METHOD
+            t.tSPropertySignature(
+              t.identifier('mint'),
+              t.tsTypeAnnotation(
+                t.tsFunctionType(
+                  null,
+                  [
+                    typedIdentifier(
+                      'sender',
+                      t.tsTypeAnnotation(t.tsStringKeyword())
+                    ),
+                    typedIdentifier(
+                      'anotherProp',
+                      t.tsTypeAnnotation(t.tsStringKeyword())
+                    ),
+                    typedIdentifier(
+                      'prop3',
+                      t.tsTypeAnnotation(t.tsStringKeyword())
+                    )
+                  ],
+                  promiseTypeAnnotation('ExecuteResult')
                 )
+              )
             )
-        ])
-    );
+          ])
+        )
+      )
+    ])
+  );
 });
 
 it('readonly classes', async () => {
-    expectCode(
-        t.program([
-            t.exportNamedDeclaration(
-                classDeclaration(
-                    'SG721QueryClient',
-                    [
-                        // client
-                        classProperty(
-                            'client',
-                            t.tsTypeAnnotation(
-                                t.tsTypeReference(t.identifier('CosmWasmClient'))
-                            )
-                        ),
+  expectCode(
+    t.program([
+      t.exportNamedDeclaration(
+        classDeclaration(
+          'SG721QueryClient',
+          [
+            // client
+            classProperty(
+              'client',
+              t.tsTypeAnnotation(
+                t.tsTypeReference(t.identifier('CosmWasmClient'))
+              )
+            ),
 
-                        // contractAddress
-                        classProperty(
-                            'contractAddress',
-                            t.tsTypeAnnotation(t.tsStringKeyword())
-                        ),
+            // contractAddress
+            classProperty(
+              'contractAddress',
+              t.tsTypeAnnotation(t.tsStringKeyword())
+            ),
 
-                        // constructor
-                        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')
-                                    )
-                                ),
+            // constructor
+            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
-                                bindMethod('approval'),
-                                bindMethod('otherProp'),
-                                bindMethod('hello'),
-                                bindMethod('mintme')
-                            ])
-                        ),
+                // bindings
+                bindMethod('approval'),
+                bindMethod('otherProp'),
+                bindMethod('hello'),
+                bindMethod('mintme')
+              ])
+            ),
 
-                        // methods:
-                        t.classProperty(
-                            t.identifier('approval'),
-                            arrowFunctionExpression(
-                                [
-                                    // props
-                                    typedIdentifier(
-                                        'owner',
-                                        t.tsTypeAnnotation(t.tsStringKeyword())
-                                    ),
-                                    //
-                                    typedIdentifier(
-                                        'spender',
-                                        t.tsTypeAnnotation(t.tsStringKeyword())
-                                    )
-                                ],
-                                t.blockStatement([
-                                    t.returnStatement(
-                                        t.callExpression(
-                                            t.memberExpression(
-                                                t.memberExpression(
-                                                    t.thisExpression(),
-                                                    t.identifier('client')
-                                                ),
-                                                t.identifier('queryContractSmart')
-                                            ),
-                                            [
-                                                t.memberExpression(
-                                                    t.thisExpression(),
-                                                    t.identifier('contractAddress')
-                                                ),
-                                                t.objectExpression([
-                                                    // props
-                                                    t.objectProperty(
-                                                        t.identifier('owner'),
-                                                        t.identifier('owner'),
-                                                        false,
-                                                        true
-                                                    ),
+            // methods:
+            t.classProperty(
+              t.identifier('approval'),
+              arrowFunctionExpression(
+                [
+                  // props
+                  typedIdentifier(
+                    'owner',
+                    t.tsTypeAnnotation(t.tsStringKeyword())
+                  ),
+                  //
+                  typedIdentifier(
+                    'spender',
+                    t.tsTypeAnnotation(t.tsStringKeyword())
+                  )
+                ],
+                t.blockStatement([
+                  t.returnStatement(
+                    t.callExpression(
+                      t.memberExpression(
+                        t.memberExpression(
+                          t.thisExpression(),
+                          t.identifier('client')
+                        ),
+                        t.identifier('queryContractSmart')
+                      ),
+                      [
+                        t.memberExpression(
+                          t.thisExpression(),
+                          t.identifier('contractAddress')
+                        ),
+                        t.objectExpression([
+                          // props
+                          t.objectProperty(
+                            t.identifier('owner'),
+                            t.identifier('owner'),
+                            false,
+                            true
+                          ),
 
-                                                    t.objectProperty(
-                                                        t.identifier('spender'),
-                                                        t.identifier('spender'),
-                                                        false,
-                                                        true
-                                                    )
-                                                ])
-                                            ]
-                                        )
-                                    )
-                                ]),
-                                t.tsTypeAnnotation(
-                                    t.tsTypeReference(
-                                        t.identifier('Promise'),
-                                        t.tsTypeParameterInstantiation([
-                                            t.tSTypeReference(t.identifier('ApprovalResponse'))
-                                        ])
-                                    )
-                                ),
-                                true
-                            )
-                        )
-                    ],
-                    [
-                        t.tSExpressionWithTypeArguments(
-                            t.identifier('SG721ReadOnlyInstance')
-                        )
-                    ]
-                )
+                          t.objectProperty(
+                            t.identifier('spender'),
+                            t.identifier('spender'),
+                            false,
+                            true
+                          )
+                        ])
+                      ]
+                    )
+                  )
+                ]),
+                t.tsTypeAnnotation(
+                  t.tsTypeReference(
+                    t.identifier('Promise'),
+                    t.tsTypeParameterInstantiation([
+                      t.tSTypeReference(t.identifier('ApprovalResponse'))
+                    ])
+                  )
+                ),
+                true
+              )
+            )
+          ],
+          [
+            t.tSExpressionWithTypeArguments(
+              t.identifier('SG721ReadOnlyInstance')
             )
-        ])
-    );
+          ]
+        )
+      )
+    ])
+  );
 });
 
 it('mutation classes', async () => {
-    expectCode(
-        t.program([
-            t.exportNamedDeclaration(
-                classDeclaration(
-                    'SG721Client',
-                    [
-                        // client
-                        classProperty(
-                            'client',
-                            t.tsTypeAnnotation(
-                                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
-                            )
-                        ),
+  expectCode(
+    t.program([
+      t.exportNamedDeclaration(
+        classDeclaration(
+          'SG721Client',
+          [
+            // client
+            classProperty(
+              'client',
+              t.tsTypeAnnotation(
+                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+              )
+            ),
 
-                        // contractAddress
-                        classProperty(
-                            'contractAddress',
-                            t.tsTypeAnnotation(t.tsStringKeyword())
-                        ),
+            // contractAddress
+            classProperty(
+              'contractAddress',
+              t.tsTypeAnnotation(t.tsStringKeyword())
+            ),
 
-                        // constructor
-                        t.classMethod(
-                            'constructor',
-                            t.identifier('constructor'),
-                            [
-                                typedIdentifier(
-                                    'client',
-                                    t.tsTypeAnnotation(
-                                        t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
-                                    )
-                                ),
-                                typedIdentifier(
-                                    'contractAddress',
-                                    t.tsTypeAnnotation(t.tsStringKeyword())
-                                )
-                            ],
-                            t.blockStatement([
-                                // super()
-                                t.expressionStatement(
-                                    t.callExpression(t.super(), [
-                                        t.identifier('client'),
-                                        t.identifier('contractAddress')
-                                    ])
-                                ),
+            // constructor
+            t.classMethod(
+              'constructor',
+              t.identifier('constructor'),
+              [
+                typedIdentifier(
+                  'client',
+                  t.tsTypeAnnotation(
+                    t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                  )
+                ),
+                typedIdentifier(
+                  'contractAddress',
+                  t.tsTypeAnnotation(t.tsStringKeyword())
+                )
+              ],
+              t.blockStatement([
+                // super()
+                t.expressionStatement(
+                  t.callExpression(t.super(), [
+                    t.identifier('client'),
+                    t.identifier('contractAddress')
+                  ])
+                ),
 
-                                // 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')
-                                    )
-                                ),
+                // 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
-                                bindMethod('approval'),
-                                bindMethod('otherProp'),
-                                bindMethod('hello'),
-                                bindMethod('mintme')
-                            ])
-                        ),
+                // bindings
+                bindMethod('approval'),
+                bindMethod('otherProp'),
+                bindMethod('hello'),
+                bindMethod('mintme')
+              ])
+            ),
 
-                        // methods:
-                        t.classProperty(
-                            t.identifier('mint'),
-                            arrowFunctionExpression(
-                                [
-                                    // props
-                                    typedIdentifier(
-                                        'sender',
-                                        t.tsTypeAnnotation(t.tsStringKeyword())
-                                    ),
-                                    typedIdentifier(
-                                        'tokenId',
-                                        t.tsTypeAnnotation(t.tsStringKeyword())
-                                    ),
-                                    typedIdentifier(
-                                        'owner',
-                                        t.tsTypeAnnotation(t.tsStringKeyword())
-                                    ),
-                                    typedIdentifier(
-                                        'token_uri',
-                                        t.tsTypeAnnotation(t.tsStringKeyword())
-                                    )
-                                ],
-                                t.blockStatement([
-                                    t.returnStatement(
-                                        t.awaitExpression(
-                                            t.callExpression(
-                                                t.memberExpression(
-                                                    t.memberExpression(
-                                                        t.thisExpression(),
-                                                        t.identifier('client')
-                                                    ),
-                                                    t.identifier('execute')
-                                                ),
-                                                [
-                                                    t.identifier('sender'),
-                                                    t.memberExpression(
-                                                        t.thisExpression(),
-                                                        t.identifier('contractAddress')
-                                                    ),
-                                                    t.objectExpression([
-                                                        t.objectProperty(
-                                                            t.identifier('mint'),
-                                                            t.objectExpression([
-                                                                t.objectProperty(
-                                                                    t.identifier('token_id'),
-                                                                    t.identifier('tokenId')
-                                                                ),
-                                                                t.objectProperty(
-                                                                    t.identifier('owner'),
-                                                                    t.identifier('owner')
-                                                                ),
-                                                                t.objectProperty(
-                                                                    t.identifier('token_uri'),
-                                                                    t.identifier('token_uri')
-                                                                ),
-                                                                t.objectProperty(
-                                                                    t.identifier('expression'),
-                                                                    t.objectExpression([])
-                                                                )
-                                                            ])
-                                                        )
-                                                    ]),
-                                                    t.stringLiteral('auto')
-                                                ]
-                                            )
-                                        )
-                                    )
-                                ]),
-                                // return type
-                                t.tsTypeAnnotation(
-                                    t.tsTypeReference(
-                                        t.identifier('Promise'),
-                                        t.tsTypeParameterInstantiation([
-                                            t.tSTypeReference(t.identifier('ExecuteResult'))
-                                        ])
-                                    )
+            // methods:
+            t.classProperty(
+              t.identifier('mint'),
+              arrowFunctionExpression(
+                [
+                  // props
+                  typedIdentifier(
+                    'sender',
+                    t.tsTypeAnnotation(t.tsStringKeyword())
+                  ),
+                  typedIdentifier(
+                    'tokenId',
+                    t.tsTypeAnnotation(t.tsStringKeyword())
+                  ),
+                  typedIdentifier(
+                    'owner',
+                    t.tsTypeAnnotation(t.tsStringKeyword())
+                  ),
+                  typedIdentifier(
+                    'token_uri',
+                    t.tsTypeAnnotation(t.tsStringKeyword())
+                  )
+                ],
+                t.blockStatement([
+                  t.returnStatement(
+                    t.awaitExpression(
+                      t.callExpression(
+                        t.memberExpression(
+                          t.memberExpression(
+                            t.thisExpression(),
+                            t.identifier('client')
+                          ),
+                          t.identifier('execute')
+                        ),
+                        [
+                          t.identifier('sender'),
+                          t.memberExpression(
+                            t.thisExpression(),
+                            t.identifier('contractAddress')
+                          ),
+                          t.objectExpression([
+                            t.objectProperty(
+                              t.identifier('mint'),
+                              t.objectExpression([
+                                t.objectProperty(
+                                  t.identifier('token_id'),
+                                  t.identifier('tokenId')
+                                ),
+                                t.objectProperty(
+                                  t.identifier('owner'),
+                                  t.identifier('owner')
                                 ),
-                                true
+                                t.objectProperty(
+                                  t.identifier('token_uri'),
+                                  t.identifier('token_uri')
+                                ),
+                                t.objectProperty(
+                                  t.identifier('expression'),
+                                  t.objectExpression([])
+                                )
+                              ])
                             )
-                        )
-                    ],
-                    [
-                        t.tSExpressionWithTypeArguments(
-                            t.identifier('SG721ReadOnlyInstance')
-                        )
-                    ],
-                    t.identifier('SG721QueryClient')
-                )
+                          ]),
+                          t.stringLiteral('auto')
+                        ]
+                      )
+                    )
+                  )
+                ]),
+                // return type
+                t.tsTypeAnnotation(
+                  t.tsTypeReference(
+                    t.identifier('Promise'),
+                    t.tsTypeParameterInstantiation([
+                      t.tSTypeReference(t.identifier('ExecuteResult'))
+                    ])
+                  )
+                ),
+                true
+              )
+            )
+          ],
+          [
+            t.tSExpressionWithTypeArguments(
+              t.identifier('SG721ReadOnlyInstance')
             )
-        ])
-    );
+          ],
+          t.identifier('SG721QueryClient')
+        )
+      )
+    ])
+  );
 });
 
 it('object parms', () => {
-    const obj = t.objectPattern([
-        t.objectProperty(
-            t.identifier('includeExpired'),
-            t.identifier('includeExpired'),
-            false,
-            true
-        ),
-        t.objectProperty(
-            t.identifier('tokenId'),
-            t.identifier('tokenId'),
-            false,
-            true
-        )
-    ]);
-    obj.typeAnnotation = t.tsTypeAnnotation(
-        t.tsTypeLiteral([
-            t.tsPropertySignature(
-                t.identifier('includeExpired'),
-                t.tsTypeAnnotation(t.tsBooleanKeyword())
+  const obj = t.objectPattern([
+    t.objectProperty(
+      t.identifier('includeExpired'),
+      t.identifier('includeExpired'),
+      false,
+      true
+    ),
+    t.objectProperty(
+      t.identifier('tokenId'),
+      t.identifier('tokenId'),
+      false,
+      true
+    )
+  ]);
+  obj.typeAnnotation = t.tsTypeAnnotation(
+    t.tsTypeLiteral([
+      t.tsPropertySignature(
+        t.identifier('includeExpired'),
+        t.tsTypeAnnotation(t.tsBooleanKeyword())
+      ),
+      t.tsPropertySignature(
+        t.identifier('tokenId'),
+        t.tsTypeAnnotation(t.tsStringKeyword())
+      )
+    ])
+  );
+  expectCode(
+    t.program([
+      t.expressionStatement(
+        t.assignmentExpression(
+          '=',
+          t.identifier('ownerOf'),
+          arrowFunctionExpression(
+            [obj],
+            t.blockStatement(
+              [
+                // body
+              ],
+              []
             ),
-            t.tsPropertySignature(
-                t.identifier('tokenId'),
-                t.tsTypeAnnotation(t.tsStringKeyword())
+            t.tsTypeAnnotation(
+              t.tsTypeReference(
+                t.identifier('Promise'),
+                t.tsTypeParameterInstantiation([
+                  t.tsTypeReference(t.identifier('OwnerOfResponse'))
+                ])
+              )
             )
-        ])
-    );
-    expectCode(
-        t.program([
-            t.expressionStatement(
-                t.assignmentExpression(
-                    '=',
-                    t.identifier('ownerOf'),
-                    arrowFunctionExpression(
-                        [obj],
-                        t.blockStatement(
-                            [
-                                // body
-                            ],
-                            []
-                        ),
-                        t.tsTypeAnnotation(
-                            t.tsTypeReference(
-                                t.identifier('Promise'),
-                                t.tsTypeParameterInstantiation([
-                                    t.tsTypeReference(t.identifier('OwnerOfResponse'))
-                                ])
-                            )
-                        )
-                    )
-                )
-            )
-        ])
-    );
+          )
+        )
+      )
+    ])
+  );
 });
diff --git a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
index 6406ee71..cb411426 100644
--- a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
+++ b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
@@ -1,3 +1,6 @@
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
+
+import nftIdlVersionData from '../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
 import {
   createExecuteClass,
   createExecuteInterface,
@@ -5,9 +8,6 @@ import {
   createTypeInterface
 } from '../../src';
 import { expectCode, makeContext } from '../../test-utils';
-import { JSONSchema } from '@cosmwasm/ts-codegen-types';
-
-import nftIdlVersionData from '../../../../__fixtures__/idl-version/accounts-nft/account-nft.json';
 
 // @ts-ignore
 export const nftIdlVersion: JSONSchema = nftIdlVersionData;
diff --git a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
index ae379a1d..423acb74 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
@@ -1,8 +1,7 @@
 import {
-  createQueryClass,
   createExecuteClass,
-  createExecuteInterface
-} from '../../src'
+  createExecuteInterface,
+  createQueryClass} from '../../src'
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
 const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
diff --git a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
index e96fe9ee..99931b63 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
@@ -1,8 +1,8 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
@@ -11,37 +11,37 @@ const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays-ref.json');
 const ctx = makeContext(queryMsg);
 
 it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        queryMsg
-    ))
+  expectCode(createTypeInterface(
+    ctx,
+    queryMsg
+  ))
 })
 
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        queryMsg
-    ))
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
 });
 
 it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
 
 it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.arrays.test.ts b/packages/ast/__tests__/client/ts-client.arrays.test.ts
index 094cc75b..b67472af 100644
--- a/packages/ast/__tests__/client/ts-client.arrays.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays.test.ts
@@ -1,58 +1,58 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 import { getPropertyType } from '../../src/utils';
+import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
 const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
 const ctx = makeContext(queryMsg);
 
 it('getPropertyType', () => {
-    const ast = getPropertyType(
-        ctx,
-        // @ts-ignore
-        queryMsg.oneOf[0].properties.update_edges,
-        'edges3'
-    );
-    expectCode(ast.type)
-    // printCode(ast.type)
+  const ast = getPropertyType(
+    ctx,
+    // @ts-ignore
+    queryMsg.oneOf[0].properties.update_edges,
+    'edges3'
+  );
+  expectCode(ast.type)
+  // printCode(ast.type)
 })
 
 it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        queryMsg
-    ))
+  expectCode(createTypeInterface(
+    ctx,
+    queryMsg
+  ))
 })
 
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        queryMsg
-    ))
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
 });
 
 it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
 
 it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
index 959313a5..698daf03 100644
--- a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
@@ -1,8 +1,8 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 const execMsg = getMsgExecuteLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
@@ -10,37 +10,37 @@ const queryMsg = getMsgQueryLegacyFixture('daodao/cw-named-groups', '/execute_ms
 const ctx = makeContext(execMsg);
 
 it('execute_msg', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        execMsg
-    ))
+  expectCode(createTypeInterface(
+    ctx,
+    execMsg
+  ))
 })
 
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        queryMsg
-    ))
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
 });
 
 it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
 
 it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
index ac989d48..ae28b246 100644
--- a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
@@ -1,8 +1,8 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
@@ -10,41 +10,41 @@ const execMsg = getMsgExecuteLegacyFixture('daodao/cw-proposal-single', '/execut
 const queryMsg = getMsgQueryLegacyFixture('daodao/cw-proposal-single', '/query_msg.json');
 
 it('execute_msg_for', () => {
-    const ctx = makeContext(execMsg);
-    expectCode(createTypeInterface(
-        ctx,
-        execMsg
-    ))
+  const ctx = makeContext(execMsg);
+  expectCode(createTypeInterface(
+    ctx,
+    execMsg
+  ))
 })
 
 
 it('query classes', () => {
-    const ctx = makeContext(queryMsg);
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        queryMsg
-    ))
+  const ctx = makeContext(queryMsg);
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
 });
 
 it('execute classes array types', () => {
-    const ctx = makeContext(execMsg);
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  const ctx = makeContext(execMsg);
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
 
 it('execute interfaces no extends', () => {
-    const ctx = makeContext(execMsg);
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  const ctx = makeContext(execMsg);
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
index 14d4a697..5de3fd1a 100644
--- a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
+++ b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
@@ -1,6 +1,6 @@
 import {
-    createQueryClass,
-    createQueryInterface
+  createQueryClass,
+  createQueryInterface
 } from '../../src'
 import { expectCode, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
@@ -8,20 +8,20 @@ const queryMsg = getMsgQueryLegacyFixture('daodao/cw-admin-factory', '/query_msg
 const ctx = makeContext(queryMsg);
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        queryMsg
-    ))
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
 });
 
 it('query interface', () => {
-    expectCode(
-        createQueryInterface(
-            ctx,
-            'ReadOnlyInstance',
-            queryMsg
-        )
+  expectCode(
+    createQueryInterface(
+      ctx,
+      'ReadOnlyInstance',
+      queryMsg
     )
+  )
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-101.test.ts b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
index caa8179d..c4e4f916 100644
--- a/packages/ast/__tests__/client/ts-client.issue-101.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
@@ -1,4 +1,5 @@
 import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
+
 import { createExecuteClass, createExecuteInterface } from '../../src';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-103.test.ts b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
index 776ca6f6..3afbea5a 100644
--- a/packages/ast/__tests__/client/ts-client.issue-103.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
@@ -1,10 +1,9 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src';
-
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
 const globbed = globLegacyContracts('issues/103').find(c => c.name === '/schema.json')!;
@@ -19,94 +18,94 @@ const queryCtx = makeContext(queryMessage);
 const executeCtx = makeContext(executeMessage);
 
 describe('query', () => {
-    it('execute_msg_for__empty', () => {
-        expectCode(createTypeInterface(
-            queryCtx,
-            queryMessage
-        ))
-    })
-
-
-    it('query classes', () => {
-        expectCode(createQueryClass(
-            queryCtx,
-            'QueryClient',
-            'ReadOnlyInstance',
-            queryMessage
-        ))
-    });
-
-    it('query classes response', () => {
-        expectCode(createTypeInterface(
-            queryCtx,
-            queryMessage
-        ))
-    });
-
-    it('execute classes array types', () => {
-        expectCode(createExecuteClass(
-            queryCtx,
-            'Client',
-            'Instance',
-            null,
-            queryMessage
-        ))
-    });
-
-    it('execute interfaces no extends', () => {
-        expectCode(createExecuteInterface(
-            queryCtx,
-            'SG721Instance',
-            null,
-            queryMessage
-        ))
-    });
+  it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(
+      queryCtx,
+      queryMessage
+    ))
+  })
+
+
+  it('query classes', () => {
+    expectCode(createQueryClass(
+      queryCtx,
+      'QueryClient',
+      'ReadOnlyInstance',
+      queryMessage
+    ))
+  });
+
+  it('query classes response', () => {
+    expectCode(createTypeInterface(
+      queryCtx,
+      queryMessage
+    ))
+  });
+
+  it('execute classes array types', () => {
+    expectCode(createExecuteClass(
+      queryCtx,
+      'Client',
+      'Instance',
+      null,
+      queryMessage
+    ))
+  });
+
+  it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(
+      queryCtx,
+      'SG721Instance',
+      null,
+      queryMessage
+    ))
+  });
 
 });
 
 describe('execute', () => {
-    it('execute_msg_for__empty', () => {
-        expectCode(createTypeInterface(
-            executeCtx,
-            executeMessage
-        ))
-    })
-
-
-    it('query classes', () => {
-        expectCode(createQueryClass(
-            executeCtx,
-            'QueryClient',
-            'ReadOnlyInstance',
-            executeMessage
-        ))
-    });
-
-    it('query classes response', () => {
-        expectCode(createTypeInterface(
-            executeCtx,
-            // @ts-ignore
-            queryMessage
-        ))
-    });
-
-    it('execute classes array types', () => {
-        expectCode(createExecuteClass(
-            executeCtx,
-            'Client',
-            'Instance',
-            null,
-            executeMessage
-        ))
-    });
-
-    it('execute interfaces no extends', () => {
-        expectCode(createExecuteInterface(
-            executeCtx,
-            'SG721Instance',
-            null,
-            executeMessage
-        ))
-    });
+  it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(
+      executeCtx,
+      executeMessage
+    ))
+  })
+
+
+  it('query classes', () => {
+    expectCode(createQueryClass(
+      executeCtx,
+      'QueryClient',
+      'ReadOnlyInstance',
+      executeMessage
+    ))
+  });
+
+  it('query classes response', () => {
+    expectCode(createTypeInterface(
+      executeCtx,
+      // @ts-ignore
+      queryMessage
+    ))
+  });
+
+  it('execute classes array types', () => {
+    expectCode(createExecuteClass(
+      executeCtx,
+      'Client',
+      'Instance',
+      null,
+      executeMessage
+    ))
+  });
+
+  it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(
+      executeCtx,
+      'SG721Instance',
+      null,
+      executeMessage
+    ))
+  });
 
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-71.test.ts b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
index 1a24b7db..d6fb8fb0 100644
--- a/packages/ast/__tests__/client/ts-client.issue-71.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
@@ -1,52 +1,53 @@
-import { globLegacyContracts, makeContext } from '../../test-utils'
+import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
+import cases from 'jest-in-case';
+
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
+import { globLegacyContracts, makeContext } from '../../test-utils'
 import { expectCode } from '../../test-utils';
-import cases from 'jest-in-case';
-import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 
 const contracts = globLegacyContracts('issues/71');
 
 cases('execute_msg_for__empty', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createTypeInterface(
-        ctx,
-        opts.content
-    ));
+  const ctx = makeContext(opts.content);
+  expectCode(createTypeInterface(
+    ctx,
+    opts.content
+  ));
 }, contracts);
 
 cases('query classes', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
+  const ctx = makeContext(opts.content);
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
         opts.content as QueryMsg
-    ))
+  ))
 }, contracts);
 
 cases('execute class', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
         opts.content as ExecuteMsg
-    ))
+  ))
 }, contracts);
 
 cases('execute interface', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
         opts.content as ExecuteMsg
-    ))
+  ))
 }, contracts);
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-98.test.ts b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
index e235e2cc..d023f699 100644
--- a/packages/ast/__tests__/client/ts-client.issue-98.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
@@ -1,12 +1,12 @@
 import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
+
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src';
-
-import { expectCode, makeContext, globIdlBasedContracts } from '../../test-utils';
+import { expectCode, globIdlBasedContracts,makeContext } from '../../test-utils';
 
 const contract = globIdlBasedContracts('issues/98').find(c => c.name === '/schema.json')!;
 
@@ -14,20 +14,20 @@ const message = contract.content.query
 const ctx = makeContext(message);
 
 it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        message
-    ))
+  expectCode(createTypeInterface(
+    ctx,
+    message
+  ))
 })
 
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        message
-    ))
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    message
+  ))
 });
 
 // it('query classes response', () => {
@@ -38,22 +38,22 @@ it('query classes', () => {
 // });
 
 it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
         // @ts-ignore
         message as ExecuteMsg
-    ))
+  ))
 });
 
 it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        // @ts-ignore
-        message
-    ))
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    // @ts-ignore
+    message
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.issues.test.ts b/packages/ast/__tests__/client/ts-client.issues.test.ts
index f99d9a8a..409e2143 100644
--- a/packages/ast/__tests__/client/ts-client.issues.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issues.test.ts
@@ -1,52 +1,53 @@
 import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
+import cases from 'jest-in-case';
+
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
-import { globLegacyContracts, makeContext, expectCode } from '../../test-utils';
-import cases from 'jest-in-case';
+import { expectCode,globLegacyContracts, makeContext } from '../../test-utils';
 
 const contracts = globLegacyContracts('issues/55');
 
 
 cases('execute_msg_for__empty', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createTypeInterface(
-        ctx,
-        opts.content
-    ));
+  const ctx = makeContext(opts.content);
+  expectCode(createTypeInterface(
+    ctx,
+    opts.content
+  ));
 }, contracts);
 
 cases('query classes', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
+  const ctx = makeContext(opts.content);
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
         opts.content as QueryMsg
-    ))
+  ))
 }, contracts);
 
 cases('execute class', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
         opts.content as ExecuteMsg
-    ))
+  ))
 }, contracts);
 
 cases('execute interface', async opts => {
-    const ctx = makeContext(opts.content);
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
+  const ctx = makeContext(opts.content);
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
         opts.content as ExecuteMsg
-    ))
+  ))
 }, contracts);
 
diff --git a/packages/ast/__tests__/client/ts-client.overrides.test.ts b/packages/ast/__tests__/client/ts-client.overrides.test.ts
index 4de4cf64..6419a4d0 100644
--- a/packages/ast/__tests__/client/ts-client.overrides.test.ts
+++ b/packages/ast/__tests__/client/ts-client.overrides.test.ts
@@ -1,5 +1,5 @@
 import {
-    createExecuteClass
+  createExecuteClass
 } from '../../src'
 import { expectCode, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
 
@@ -7,61 +7,61 @@ const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.jso
 const ctx = makeContext(execMsg);
 
 it('Impl, execExtends, noExtendsClass', () => {
-    ctx.options.client.noImplicitOverride = false;
-    ctx.options.client.execExtendsQuery = true;
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  ctx.options.client.noImplicitOverride = false;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
 
 it('Impl, execExtends, ExtendsClass', () => {
-    ctx.options.client.noImplicitOverride = false;
-    ctx.options.client.execExtendsQuery = true;
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        'ExtendsClassName',
-        execMsg
-    ))
+  ctx.options.client.noImplicitOverride = false;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    'ExtendsClassName',
+    execMsg
+  ))
 });
 
 it('noImpl, execExtends, ExtendsClass', () => {
-    ctx.options.client.noImplicitOverride = true;
-    ctx.options.client.execExtendsQuery = true;
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        'ExtendsClassName',
-        execMsg
-    ))
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    'ExtendsClassName',
+    execMsg
+  ))
 });
 
 it('noImpl, noExecExtends, ExtendsClass', () => {
-    ctx.options.client.noImplicitOverride = true;
-    ctx.options.client.execExtendsQuery = false;
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        'ExtendsClassName',
-        execMsg
-    ))
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = false;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    'ExtendsClassName',
+    execMsg
+  ))
 });
 
 it('noImpl, noExecExtends, noExtendsClass', () => {
-    ctx.options.client.noImplicitOverride = true;
-    ctx.options.client.execExtendsQuery = false;
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = false;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.sg721.test.ts b/packages/ast/__tests__/client/ts-client.sg721.test.ts
index 5674c322..700bb4df 100644
--- a/packages/ast/__tests__/client/ts-client.sg721.test.ts
+++ b/packages/ast/__tests__/client/ts-client.sg721.test.ts
@@ -1,8 +1,8 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createExecuteInterface,
-    createTypeInterface
+  createExecuteClass,
+  createExecuteInterface,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
@@ -11,37 +11,37 @@ const queryMsg = getMsgQueryLegacyFixture('sg721', '/execute_msg_for__empty.json
 const ctx = makeContext(execMsg);
 
 it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-        ctx,
-        execMsg
-    ))
+  expectCode(createTypeInterface(
+    ctx,
+    execMsg
+  ))
 })
 
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        ctx,
-        'SG721QueryClient',
-        'SG721ReadOnlyInstance',
-        queryMsg
-    ))
+  expectCode(createQueryClass(
+    ctx,
+    'SG721QueryClient',
+    'SG721ReadOnlyInstance',
+    queryMsg
+  ))
 });
 
 it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-        ctx,
-        'SG721Client',
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
 
 it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-        ctx,
-        'SG721Instance',
-        null,
-        execMsg
-    ))
+  expectCode(createExecuteInterface(
+    ctx,
+    'SG721Instance',
+    null,
+    execMsg
+  ))
 });
diff --git a/packages/ast/__tests__/client/ts-client.test.ts b/packages/ast/__tests__/client/ts-client.test.ts
index 89d3889e..5ea3a314 100644
--- a/packages/ast/__tests__/client/ts-client.test.ts
+++ b/packages/ast/__tests__/client/ts-client.test.ts
@@ -1,8 +1,8 @@
 import {
-  createQueryClass,
-  createQueryInterface,
   createExecuteClass,
   createExecuteInterface,
+  createQueryClass,
+  createQueryInterface,
   createTypeInterface
 } from '../../src';
 import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
diff --git a/packages/ast/__tests__/client/ts-client.vectis.test.ts b/packages/ast/__tests__/client/ts-client.vectis.test.ts
index 9ab23d4e..ba1e0ec9 100644
--- a/packages/ast/__tests__/client/ts-client.vectis.test.ts
+++ b/packages/ast/__tests__/client/ts-client.vectis.test.ts
@@ -1,9 +1,3 @@
-import {
-  expectCode,
-  getLegacyFixture,
-  makeContext,
-} from '../../test-utils';
-
 import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
 
 import {
@@ -12,6 +6,11 @@ import {
   createQueryClass,
   createTypeInterface
 } from '../../src';
+import {
+  expectCode,
+  getLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
 const vectisCanExecuteRelayResponse = getLegacyFixture('vectis/govec', '/can_execute_relay_response.json');
 const vectisCosmosMsgForEmpty = getLegacyFixture('vectis/govec', '/cosmos_msg_for__empty.json');
diff --git a/packages/ast/__tests__/client/ts-client.wager.test.ts b/packages/ast/__tests__/client/ts-client.wager.test.ts
index db1d3562..802b0bab 100644
--- a/packages/ast/__tests__/client/ts-client.wager.test.ts
+++ b/packages/ast/__tests__/client/ts-client.wager.test.ts
@@ -1,7 +1,7 @@
 import {
-    createQueryClass,
-    createExecuteClass,
-    createTypeInterface
+  createExecuteClass,
+  createQueryClass,
+  createTypeInterface
 } from '../../src'
 import { expectCode, globIdlBasedContracts, makeContext } from '../../test-utils';
 
@@ -12,34 +12,34 @@ const queryCtx = makeContext(wagerJson.query);
 const executeCtx = makeContext(wagerJson.execute);
 
 it('query', () => {
-    expectCode(createTypeInterface(
-        queryCtx,
-        wagerJson.query
-    ))
+  expectCode(createTypeInterface(
+    queryCtx,
+    wagerJson.query
+  ))
 })
 
 it('execute', () => {
-    expectCode(createTypeInterface(
-        executeCtx,
-        wagerJson.execute
-    ))
+  expectCode(createTypeInterface(
+    executeCtx,
+    wagerJson.execute
+  ))
 })
 
 it('query classes', () => {
-    expectCode(createQueryClass(
-        queryCtx,
-        'WagerQueryClient',
-        'WagerReadOnlyInstance',
-        wagerJson.query
-    ))
+  expectCode(createQueryClass(
+    queryCtx,
+    'WagerQueryClient',
+    'WagerReadOnlyInstance',
+    wagerJson.query
+  ))
 });
 
 it('execute classes', () => {
-    expectCode(createExecuteClass(
-        executeCtx,
-        'WagerClient',
-        'WagerInstance',
-        null,
-        wagerJson.execute
-    ))
+  expectCode(createExecuteClass(
+    executeCtx,
+    'WagerClient',
+    'WagerInstance',
+    null,
+    wagerJson.execute
+  ))
 });
diff --git a/packages/ast/__tests__/message-composer/message-composer.test.ts b/packages/ast/__tests__/message-composer/message-composer.test.ts
index 66c3d3e0..570cdee4 100644
--- a/packages/ast/__tests__/message-composer/message-composer.test.ts
+++ b/packages/ast/__tests__/message-composer/message-composer.test.ts
@@ -1,47 +1,47 @@
 import {
   createMessageComposerClass,
   createMessageComposerInterface,
-} from "../../src";
-import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, makeContext } from "../../test-utils";
+} from '../../src';
+import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
 
 const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
 const ownership = getLegacyFixture('basic', '/ownership.json')
 
 
-it("execute classes", () => {
+it('execute classes', () => {
   const ctx = makeContext(execMsg);
   expectCode(
     createMessageComposerClass(
       ctx,
-      "SG721MessageComposer",
-      "SG721Message",
+      'SG721MessageComposer',
+      'SG721Message',
       execMsg
     )
   );
 });
 
-it("createMessageComposerInterface", () => {
+it('createMessageComposerInterface', () => {
   const ctx = makeContext(execMsg);
-  expectCode(createMessageComposerInterface(ctx, "SG721Message", execMsg));
+  expectCode(createMessageComposerInterface(ctx, 'SG721Message', execMsg));
 });
 
-it("ownershipClass", () => {
+it('ownershipClass', () => {
   const ctx = makeContext(ownership);
   expectCode(
     createMessageComposerClass(
       ctx,
-      "OwnershipMessageComposer",
-      "OwnershipMessage",
+      'OwnershipMessageComposer',
+      'OwnershipMessage',
       // @ts-ignore
       ownership
     )
   );
 });
 
-it("ownershipInterface", () => {
+it('ownershipInterface', () => {
   const ownershipCtx = makeContext(ownership);
   expectCode(
     // @ts-ignore
-    createMessageComposerInterface(ownershipCtx, "OwnershipMessage", ownership)
+    createMessageComposerInterface(ownershipCtx, 'OwnershipMessage', ownership)
   );
 });
diff --git a/packages/ast/__tests__/react-query/react-query.test.ts b/packages/ast/__tests__/react-query/react-query.test.ts
index 8a998e1c..8cd8282d 100644
--- a/packages/ast/__tests__/react-query/react-query.test.ts
+++ b/packages/ast/__tests__/react-query/react-query.test.ts
@@ -1,9 +1,10 @@
 import * as t from '@babel/types';
+
 import {
   createReactQueryHooks,
   createReactQueryMutationHooks,
 } from '../../src'
-import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, globLegacyContracts, makeContext } from '../../test-utils';
+import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
 const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json')
 const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
diff --git a/packages/ast/__tests__/recoil/recoil.test.ts b/packages/ast/__tests__/recoil/recoil.test.ts
index d8418a1f..779ae3d3 100644
--- a/packages/ast/__tests__/recoil/recoil.test.ts
+++ b/packages/ast/__tests__/recoil/recoil.test.ts
@@ -1,4 +1,5 @@
 import * as t from '@babel/types';
+import { QueryMsg } from '@cosmwasm/ts-codegen-types';
 
 import {
   createRecoilQueryClient,
@@ -6,7 +7,6 @@ import {
   createRecoilSelectors
 } from '../../src/recoil/recoil';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
-import { QueryMsg } from '@cosmwasm/ts-codegen-types';
 
 const globbed = globLegacyContracts('basic').find(c => c.name === '/query_msg.json');
 const queryMsg = globbed.content as QueryMsg;
diff --git a/packages/ast/__tests__/types/interfaces.test.ts b/packages/ast/__tests__/types/interfaces.test.ts
index bb8eda6c..9328086d 100644
--- a/packages/ast/__tests__/types/interfaces.test.ts
+++ b/packages/ast/__tests__/types/interfaces.test.ts
@@ -1,7 +1,6 @@
-import * as t from '@babel/types';
 
-import { expectCode, getLegacyFixture, makeContext } from '../../test-utils';
 import { createTypeOrInterface } from '../../src';
+import { expectCode, getLegacyFixture, makeContext } from '../../test-utils';
 
 const topLevel = getLegacyFixture('misc/schema', '/arrays-top-level.json');
 const nested = getLegacyFixture('misc/schema', '/arrays-nested.json');
diff --git a/packages/ast/jest.config.js b/packages/ast/jest.config.js
index 0aa3aaa4..057a9420 100644
--- a/packages/ast/jest.config.js
+++ b/packages/ast/jest.config.js
@@ -1,18 +1,18 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-    preset: "ts-jest",
-    testEnvironment: "node",
-    transform: {
-        "^.+\\.tsx?$": [
-            "ts-jest",
-            {
-                babelConfig: false,
-                tsconfig: "tsconfig.json",
-            },
-        ],
-    },
-    transformIgnorePatterns: [`/node_modules/*`],
-    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-    moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-    modulePathIgnorePatterns: ["dist/*"]
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        babelConfig: false,
+        tsconfig: 'tsconfig.json',
+      },
+    ],
+  },
+  transformIgnorePatterns: [`/node_modules/*`],
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  modulePathIgnorePatterns: ['dist/*']
 };
diff --git a/packages/ast/package.json b/packages/ast/package.json
index f35adea2..bd67677a 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -18,6 +18,7 @@
     "prepare": "npm run build",
     "codegen": "ts-node ./scripts/build.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
+    "lint": "eslint . --fix",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:ast": "ts-node scripts/test-ast.ts",
diff --git a/packages/ast/scripts/test-ast.ts b/packages/ast/scripts/test-ast.ts
index 667c3102..52fab414 100644
--- a/packages/ast/scripts/test-ast.ts
+++ b/packages/ast/scripts/test-ast.ts
@@ -1,5 +1,5 @@
-import { stringify } from 'ast-stringify';
 import { parse } from '@babel/parser';
+import { stringify } from 'ast-stringify';
 import { readFileSync, writeFileSync } from 'fs';
 
 const main = async () => {
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 2a757cf8..43cd0cc7 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -1,5 +1,8 @@
 import * as t from '@babel/types';
+import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { camel } from 'case';
+
+import { RenderContext } from '../context';
 import {
   arrowFunctionExpression,
   bindMethod,
@@ -7,22 +10,16 @@ import {
   classProperty,
   FIXED_EXECUTE_PARAMS,
   getMessageProperties,
+  getTypeOrRef,
   OPTIONAL_FUNDS_PARAM,
   promiseTypeAnnotation,
-  typedIdentifier,
-  getTypeOrRef
-} from '../utils';
-
-import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
-
+  typedIdentifier} from '../utils';
+import { identifier, propertySignature } from '../utils/babel';
 import {
   createTypedObjectParams,
   getPropertyType,
-  getResponseType,
-  getType
+  getResponseType
 } from '../utils/types';
-import { RenderContext } from '../context';
-import { identifier, propertySignature } from '../utils/babel';
 
 export const CONSTANT_EXEC_PARAMS = [
   t.assignmentPattern(
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 3a363f56..f2dbb149 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -1,10 +1,11 @@
 import * as t from '@babel/types';
-import { JSONSchema } from "@cosmwasm/ts-codegen-types";
-import { refLookup } from "../utils";
-import { convertUtilsToImportList, getImportStatements, UtilMapping } from "./imports";
-import deepmerge from "deepmerge";
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
+import deepmerge from 'deepmerge';
 import { basename, extname } from 'path'
+
 import { ContractInfo, ProviderInfo, RenderOptions } from '../types';
+import { refLookup } from '../utils';
+import { convertUtilsToImportList, getImportStatements, UtilMapping } from './imports';
 
 export interface IContext {
   refLookup($ref: string): JSONSchema;
@@ -98,7 +99,7 @@ export class BuilderContext {
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-  } {
+    } {
     return this.providers;
   }
 }
@@ -143,7 +144,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-  } {
+    } {
     return this.builderContext.providers;
   }
   getImports(registeredUtils?: UtilMapping, filepath?: string): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] {
diff --git a/packages/ast/src/context/imports.ts b/packages/ast/src/context/imports.ts
index 7044b72c..bf689f8f 100644
--- a/packages/ast/src/context/imports.ts
+++ b/packages/ast/src/context/imports.ts
@@ -1,7 +1,8 @@
 import * as t from '@babel/types';
-import { importAs, importStmt } from "../utils";
+import { dirname, extname,relative } from 'path';
+
+import { importAs, importStmt } from '../utils';
 import { RenderContext } from './context';
-import { relative, dirname, extname } from 'path';
 
 
 export interface ImportObj {
@@ -22,19 +23,19 @@ export type UtilMapping = {
 const makeReactQuerySwitch = (varName: string) => {
   return (context: RenderContext) => {
     switch (context.options.reactQuery.version) {
-      case 'v4':
-        return {
-          type: 'import',
-          path: '@tanstack/react-query',
-          name: varName
-        }
-      case 'v3':
-      default:
-        return {
-          type: 'import',
-          path: 'react-query',
-          name: varName
-        }
+    case 'v4':
+      return {
+        type: 'import',
+        path: '@tanstack/react-query',
+        name: varName
+      }
+    case 'v3':
+    default:
+      return {
+        type: 'import',
+        path: 'react-query',
+        name: varName
+      }
     }
   };
 }
diff --git a/packages/ast/src/index.ts b/packages/ast/src/index.ts
index 5e7c41db..be2f24f7 100644
--- a/packages/ast/src/index.ts
+++ b/packages/ast/src/index.ts
@@ -1,9 +1,9 @@
-export * from './utils';
 export * from './client';
 export * from './context';
-export * from './recoil';
-export * from './message-composer';
-export * from './react-query';
 export * from './message-builder';
+export * from './message-composer';
 export * from './provider';
+export * from './react-query';
+export * from './recoil';
 export * from './types';
+export * from './utils';
diff --git a/packages/ast/src/message-builder/message-builder.ts b/packages/ast/src/message-builder/message-builder.ts
index 111a9185..e3896b1a 100644
--- a/packages/ast/src/message-builder/message-builder.ts
+++ b/packages/ast/src/message-builder/message-builder.ts
@@ -1,11 +1,12 @@
 import * as t from '@babel/types';
+import { Expression } from '@babel/types';
+import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { camel } from 'case';
+
+import { getWasmMethodArgs } from '../client/client';
+import { RenderContext } from '../context';
 import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
-import { ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { createTypedObjectParams } from '../utils/types';
-import { RenderContext } from '../context';
-import { getWasmMethodArgs } from '../client/client';
-import { Expression } from '@babel/types';
 
 export const createMessageBuilderClass = (
   context: RenderContext,
diff --git a/packages/ast/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
index 4f93b0aa..d80a5415 100644
--- a/packages/ast/src/message-composer/message-composer.ts
+++ b/packages/ast/src/message-composer/message-composer.ts
@@ -1,6 +1,10 @@
 import * as t from '@babel/types';
 import { Expression } from '@babel/types';
+import { ExecuteMsg, JSONSchema } from '@cosmwasm/ts-codegen-types';
 import { camel } from 'case';
+
+import { getWasmMethodArgs } from '../client/client';
+import { RenderContext } from '../context';
 import {
   arrowFunctionExpression,
   bindMethod,
@@ -10,10 +14,7 @@ import {
   OPTIONAL_FUNDS_PARAM,
   typedIdentifier
 } from '../utils';
-import { ExecuteMsg, JSONSchema } from '@cosmwasm/ts-codegen-types';
 import { createTypedObjectParams } from '../utils/types';
-import { RenderContext } from '../context';
-import { getWasmMethodArgs } from '../client/client';
 
 const createWasmExecMethodMessageComposer = (
   context: RenderContext,
diff --git a/packages/ast/src/provider/provider.ts b/packages/ast/src/provider/provider.ts
index 203fcadc..13d03bac 100644
--- a/packages/ast/src/provider/provider.ts
+++ b/packages/ast/src/provider/provider.ts
@@ -1,8 +1,9 @@
-import * as t from "@babel/types";
-import { camel, pascal } from "case";
-import { PROVIDER_TYPES } from "../utils/constants";
-import { identifier, tsObjectPattern } from "../utils";
-import { ProviderInfo } from "../types";
+import * as t from '@babel/types';
+import { camel, pascal } from 'case';
+
+import { ProviderInfo } from '../types';
+import { identifier, tsObjectPattern } from '../utils';
+import { PROVIDER_TYPES } from '../utils/constants';
 
 export const createProvider = (
   name: string,
@@ -12,59 +13,59 @@ export const createProvider = (
 ) => {
   const classDeclaration = t.classDeclaration(
     t.identifier(name),
-    t.identifier("ContractBase"),
+    t.identifier('ContractBase'),
     t.classBody([
       t.classMethod(
-        "constructor",
-        t.identifier("constructor"),
+        'constructor',
+        t.identifier('constructor'),
         [
           tsObjectPattern(
             [
               t.objectProperty(
-                t.identifier("address"),
-                t.identifier("address"),
+                t.identifier('address'),
+                t.identifier('address'),
                 false,
                 true
               ),
               t.objectProperty(
-                t.identifier("cosmWasmClient"),
-                t.identifier("cosmWasmClient"),
+                t.identifier('cosmWasmClient'),
+                t.identifier('cosmWasmClient'),
                 false,
                 true
               ),
               t.objectProperty(
-                t.identifier("signingCosmWasmClient"),
-                t.identifier("signingCosmWasmClient"),
+                t.identifier('signingCosmWasmClient'),
+                t.identifier('signingCosmWasmClient'),
                 false,
                 true
               ),
             ],
             t.tsTypeAnnotation(
-              t.tsTypeReference(t.identifier("IContractConstructor"))
+              t.tsTypeReference(t.identifier('IContractConstructor'))
             )
           ),
         ],
         t.blockStatement([
           t.expressionStatement(
             t.callExpression(t.super(), [
-              t.identifier("address"),
-              t.identifier("cosmWasmClient"),
-              t.identifier("signingCosmWasmClient"),
+              t.identifier('address'),
+              t.identifier('cosmWasmClient'),
+              t.identifier('signingCosmWasmClient'),
               t.identifier(
                 providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE]
                   ? providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE].classname
-                  : "undefined"
+                  : 'undefined'
               ),
               t.identifier(
                 providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE]
                   ? providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE].classname
-                  : "undefined"
+                  : 'undefined'
               ),
               t.identifier(
                 providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
                   ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
                     .classname
-                  : "undefined"
+                  : 'undefined'
               ),
             ])
           ),
@@ -78,21 +79,21 @@ export const createProvider = (
       t.identifier(
         providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE]
           ? providerInfos[PROVIDER_TYPES.SIGNING_CLIENT_TYPE].classname
-          : "IEmptyClient"
+          : 'IEmptyClient'
       )
     ),
     t.tsTypeReference(
       t.identifier(
         providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE]
           ? providerInfos[PROVIDER_TYPES.QUERY_CLIENT_TYPE].classname
-          : "IEmptyClient"
+          : 'IEmptyClient'
       )
     ),
     t.tsTypeReference(
       t.identifier(
         providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
           ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE].classname
-          : "IEmptyClient"
+          : 'IEmptyClient'
       )
     ),
   ]);
@@ -117,7 +118,7 @@ export const createIContractsContext = (providerInfos: {
 
   return t.exportNamedDeclaration(
     t.tsInterfaceDeclaration(
-      t.identifier("IContractsContext"),
+      t.identifier('IContractsContext'),
       null,
       null,
       t.tsInterfaceBody(properties)
@@ -127,10 +128,10 @@ export const createIContractsContext = (providerInfos: {
 
 let PROVIDER_MAPPING: Record<string, string> = {};
 
-PROVIDER_MAPPING[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = "ISigningClientProvider";
-PROVIDER_MAPPING[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = "IQueryClientProvider";
+PROVIDER_MAPPING[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = 'ISigningClientProvider';
+PROVIDER_MAPPING[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = 'IQueryClientProvider';
 PROVIDER_MAPPING[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] =
-  "IMessageComposerProvider";
+  'IMessageComposerProvider';
 
 export const createProperty = (
   name: string,
@@ -187,20 +188,20 @@ export const createGettingProviders = (providerInfos: {
         t.newExpression(t.identifier(pascal(key)), [
           t.objectExpression([
             t.objectProperty(
-              t.identifier("address"),
-              t.identifier("address"),
+              t.identifier('address'),
+              t.identifier('address'),
               false,
               true
             ),
             t.objectProperty(
-              t.identifier("cosmWasmClient"),
-              t.identifier("cosmWasmClient"),
+              t.identifier('cosmWasmClient'),
+              t.identifier('cosmWasmClient'),
               false,
               true
             ),
             t.objectProperty(
-              t.identifier("signingCosmWasmClient"),
-              t.identifier("signingCosmWasmClient"),
+              t.identifier('signingCosmWasmClient'),
+              t.identifier('signingCosmWasmClient'),
               false,
               true
             ),
@@ -211,22 +212,22 @@ export const createGettingProviders = (providerInfos: {
   }
 
   return t.exportNamedDeclaration(
-    t.variableDeclaration("const", [
+    t.variableDeclaration('const', [
       t.variableDeclarator(
-        t.identifier("getProviders"),
+        t.identifier('getProviders'),
         t.arrowFunctionExpression(
           [
             identifier(
-              "address?",
-              t.tsTypeAnnotation(t.tsTypeReference(t.identifier("string")))
+              'address?',
+              t.tsTypeAnnotation(t.tsTypeReference(t.identifier('string')))
             ),
             identifier(
-              "cosmWasmClient?",
-              t.tsTypeAnnotation(t.tsTypeReference(t.identifier("CosmWasmClient")))
+              'cosmWasmClient?',
+              t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))
             ),
             identifier(
-              "signingCosmWasmClient?",
-              t.tsTypeAnnotation(t.tsTypeReference(t.identifier("SigningCosmWasmClient")))
+              'signingCosmWasmClient?',
+              t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))
             ),
           ],
           t.objectExpression(properties)
diff --git a/packages/ast/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
index 64d22a6f..f8cdc540 100644
--- a/packages/ast/src/react-query/react-query.ts
+++ b/packages/ast/src/react-query/react-query.ts
@@ -1,7 +1,11 @@
 import type { Expression } from '@babel/types';
 import * as t from '@babel/types';
+import { ArrowFunctionExpression } from '@babel/types';
+import { ExecuteMsg, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { camel, pascal } from 'case';
-import { JSONSchema, ExecuteMsg, QueryMsg } from '@cosmwasm/ts-codegen-types';
+
+import { RenderContext } from '../context';
+import { ReactQueryOptions } from '../types';
 import {
   callExpression,
   createTypedObjectParams,
@@ -11,21 +15,17 @@ import {
   tsObjectPattern,
   tsPropertySignature
 } from '../utils';
-
 import {
   omitTypeReference,
   optionalConditionalExpression,
   propertySignature,
   shorthandProperty
 } from '../utils/babel';
+import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
 import {
   getPropertyType,
   getResponseType
 } from '../utils/types';
-import { RenderContext } from '../context';
-import { ArrowFunctionExpression } from '@babel/types';
-import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
-import { ReactQueryOptions } from '../types';
 
 interface ReactQueryHookQuery {
   context: RenderContext;
diff --git a/packages/ast/src/recoil/recoil.ts b/packages/ast/src/recoil/recoil.ts
index 0211ed73..1d578c3e 100644
--- a/packages/ast/src/recoil/recoil.ts
+++ b/packages/ast/src/recoil/recoil.ts
@@ -1,12 +1,13 @@
 import * as t from '@babel/types';
+import { JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { camel, pascal } from 'case';
+
+import { RenderContext } from '../context';
 import {
   callExpression,
   getMessageProperties,
   getResponseType
 } from '../utils';
-import { JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
-import { RenderContext } from '../context';
 
 export const createRecoilSelector = (
   context: RenderContext,
@@ -179,25 +180,25 @@ export const createRecoilSelectors = (
 };
 
 export const createRecoilQueryClientType = () => ({
-  "type": "TSTypeAliasDeclaration",
-  "id": {
-    "type": "Identifier",
-    "name": "QueryClientParams"
+  'type': 'TSTypeAliasDeclaration',
+  'id': {
+    'type': 'Identifier',
+    'name': 'QueryClientParams'
   },
-  "typeAnnotation": {
-    "type": "TSTypeLiteral",
-    "members": [
+  'typeAnnotation': {
+    'type': 'TSTypeLiteral',
+    'members': [
       {
-        "type": "TSPropertySignature",
-        "key": {
-          "type": "Identifier",
-          "name": "contractAddress"
+        'type': 'TSPropertySignature',
+        'key': {
+          'type': 'Identifier',
+          'name': 'contractAddress'
         },
-        "computed": false,
-        "typeAnnotation": {
-          "type": "TSTypeAnnotation",
-          "typeAnnotation": {
-            "type": "TSStringKeyword"
+        'computed': false,
+        'typeAnnotation': {
+          'type': 'TSTypeAnnotation',
+          'typeAnnotation': {
+            'type': 'TSStringKeyword'
           }
         }
       }
diff --git a/packages/ast/src/types/context.ts b/packages/ast/src/types/context.ts
index 005f8d5f..d0e28e1c 100644
--- a/packages/ast/src/types/context.ts
+++ b/packages/ast/src/types/context.ts
@@ -1,5 +1,6 @@
-import { IDLObject, JSONSchema } from "@cosmwasm/ts-codegen-types";
-import { MessageBuilderOptions, MessageComposerOptions, ReactQueryOptions, RecoilOptions, TSClientOptions, TSTypesOptions, UseContractsOptions } from "./plugins";
+import { IDLObject, JSONSchema } from '@cosmwasm/ts-codegen-types';
+
+import { MessageBuilderOptions, MessageComposerOptions, ReactQueryOptions, RecoilOptions, TSClientOptions, TSTypesOptions, UseContractsOptions } from './plugins';
 
 export interface ContractInfo {
   schemas: JSONSchema[];
diff --git a/packages/ast/src/types/index.ts b/packages/ast/src/types/index.ts
index 2c9bdd15..7fce5bef 100644
--- a/packages/ast/src/types/index.ts
+++ b/packages/ast/src/types/index.ts
@@ -1,2 +1,2 @@
-export * from './plugins';
-export * from './context';
\ No newline at end of file
+export * from './context';
+export * from './plugins';
\ No newline at end of file
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index d45b7e1f..f41d6364 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -1,343 +1,344 @@
 import * as t from '@babel/types';
-import { snake } from "case";
+import { TSExpressionWithTypeArguments, TSTypeAnnotation } from '@babel/types';
 import { Field } from '@cosmwasm/ts-codegen-types';
-import { TSTypeAnnotation, TSExpressionWithTypeArguments, Noop, TypeAnnotation } from '@babel/types';
-import { refLookup } from './ref';
 import { JSONSchema } from '@cosmwasm/ts-codegen-types';
+import { snake } from 'case';
+
+import { refLookup } from './ref';
 
 // t.TSPropertySignature - kind?
 export const propertySignature = (
-    name: string,
-    typeAnnotation: TSTypeAnnotation,
-    optional: boolean = false
+  name: string,
+  typeAnnotation: TSTypeAnnotation,
+  optional: boolean = false
 ): t.TSPropertySignature => {
-    return {
-        type: 'TSPropertySignature',
-        key: t.identifier(name),
-        kind: 'get',
-        typeAnnotation,
-        optional
-    }
+  return {
+    type: 'TSPropertySignature',
+    key: t.identifier(name),
+    kind: 'get',
+    typeAnnotation,
+    optional
+  }
 };
 
 export const identifier = (name: string, typeAnnotation: t.TSTypeAnnotation, optional: boolean = false): t.Identifier => {
-    const type = t.identifier(name);
-    type.typeAnnotation = typeAnnotation;
-    type.optional = optional;
-    return type;
+  const type = t.identifier(name);
+  type.typeAnnotation = typeAnnotation;
+  type.optional = optional;
+  return type;
 };
 
 export const tsTypeOperator = (typeAnnotation: t.TSType, operator: string) => {
-    const obj = t.tsTypeOperator(typeAnnotation);
-    obj.operator = operator;
-    return obj;
+  const obj = t.tsTypeOperator(typeAnnotation);
+  obj.operator = operator;
+  return obj;
 };
 
 export const getMessageProperties = (msg: JSONSchema): JSONSchema[] => {
-    let results: JSONSchema[] = [];
-    let objs: JSONSchema[] = [];
-    if (msg.anyOf) { objs = msg.anyOf; }
-    else if (msg.oneOf) { objs = msg.oneOf; }
-    else if (msg.allOf) { objs = msg.allOf; }
-
-    for (const obj of objs) {
-        if (obj.properties) {
-            results.push(obj);
-        } else {
-            if (obj.$ref) {
-                const ref = refLookup(obj.$ref, msg)
-
-                const refProps = getMessageProperties(ref);
-
-                results = [...results, ...refProps];
-            }
-        }
+  let results: JSONSchema[] = [];
+  let objs: JSONSchema[] = [];
+  if (msg.anyOf) { objs = msg.anyOf; }
+  else if (msg.oneOf) { objs = msg.oneOf; }
+  else if (msg.allOf) { objs = msg.allOf; }
+
+  for (const obj of objs) {
+    if (obj.properties) {
+      results.push(obj);
+    } else {
+      if (obj.$ref) {
+        const ref = refLookup(obj.$ref, msg)
+
+        const refProps = getMessageProperties(ref);
+
+        results = [...results, ...refProps];
+      }
     }
+  }
 
-    return results;
+  return results;
 }
 
 export const tsPropertySignature = (
-    key: t.Expression,
-    typeAnnotation: t.TSTypeAnnotation,
-    optional: boolean
+  key: t.Expression,
+  typeAnnotation: t.TSTypeAnnotation,
+  optional: boolean
 ) => {
-    const obj = t.tsPropertySignature(key, typeAnnotation);
-    obj.optional = optional;
-    return obj
+  const obj = t.tsPropertySignature(key, typeAnnotation);
+  obj.optional = optional;
+  return obj
 };
 
 
 
 export const tsObjectPattern = (
-    properties: (t.RestElement | t.ObjectProperty)[],
-    typeAnnotation: t.TSTypeAnnotation
+  properties: (t.RestElement | t.ObjectProperty)[],
+  typeAnnotation: t.TSTypeAnnotation
 ) => {
-    const obj = t.objectPattern(
-        properties
-    );
-    obj.typeAnnotation = typeAnnotation;
-    return obj;
+  const obj = t.objectPattern(
+    properties
+  );
+  obj.typeAnnotation = typeAnnotation;
+  return obj;
 }
 
 export const callExpression = (
-    callee: t.Expression | t.V8IntrinsicIdentifier,
-    _arguments: (t.Expression | t.SpreadElement | t.ArgumentPlaceholder)[],
-    typeParameters: t.TSTypeParameterInstantiation
+  callee: t.Expression | t.V8IntrinsicIdentifier,
+  _arguments: (t.Expression | t.SpreadElement | t.ArgumentPlaceholder)[],
+  typeParameters: t.TSTypeParameterInstantiation
 ) => {
-    const callExpr = t.callExpression(callee, _arguments);
-    callExpr.typeParameters = typeParameters;
-    return callExpr;
+  const callExpr = t.callExpression(callee, _arguments);
+  callExpr.typeParameters = typeParameters;
+  return callExpr;
 };
 
 export const bindMethod = (name: string) => {
-    return t.expressionStatement(
-        t.assignmentExpression('=', t.memberExpression(
-            t.thisExpression(),
-            t.identifier(name)
+  return t.expressionStatement(
+    t.assignmentExpression('=', t.memberExpression(
+      t.thisExpression(),
+      t.identifier(name)
+    ),
+    t.callExpression(
+      t.memberExpression(
+        t.memberExpression(
+          t.thisExpression(),
+          t.identifier(name)
         ),
-            t.callExpression(
-                t.memberExpression(
-                    t.memberExpression(
-                        t.thisExpression(),
-                        t.identifier(name)
-                    ),
-                    t.identifier('bind')
-                ),
-                [
-                    t.thisExpression()
-                ]
-            )
-        )
+        t.identifier('bind')
+      ),
+      [
+        t.thisExpression()
+      ]
     )
+    )
+  )
 }
 
 export const typedIdentifier = (name: string, typeAnnotation: TSTypeAnnotation, optional: boolean = false) => {
-    const type = t.identifier(name);
-    type.typeAnnotation = typeAnnotation;
-    type.optional = optional;
-    return type;
+  const type = t.identifier(name);
+  type.typeAnnotation = typeAnnotation;
+  type.optional = optional;
+  return type;
 }
 
 export const promiseTypeAnnotation = (name: string): t.TSTypeAnnotation => {
-    return t.tsTypeAnnotation(
-        t.tsTypeReference(
-            t.identifier('Promise'),
-            t.tsTypeParameterInstantiation(
-                [
-                    t.tsTypeReference(t.identifier(name))
-                ]
-            )
-        )
-    );
+  return t.tsTypeAnnotation(
+    t.tsTypeReference(
+      t.identifier('Promise'),
+      t.tsTypeParameterInstantiation(
+        [
+          t.tsTypeReference(t.identifier(name))
+        ]
+      )
+    )
+  );
 }
 
 export const abstractClassDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
-    const declaration = classDeclaration(
-        name,
-        body,
-        implementsExressions,
-        superClass
-    );
-    declaration.abstract = true
-    return declaration;
+  const declaration = classDeclaration(
+    name,
+    body,
+    implementsExressions,
+    superClass
+  );
+  declaration.abstract = true
+  return declaration;
 };
 
 export const classDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
-    const declaration = t.classDeclaration(
-        t.identifier(name),
-        superClass,
-        t.classBody(body)
-    );
-    if (implementsExressions.length) {
-        declaration.implements = implementsExressions;
-    }
-    return declaration;
+  const declaration = t.classDeclaration(
+    t.identifier(name),
+    superClass,
+    t.classBody(body)
+  );
+  if (implementsExressions.length) {
+    declaration.implements = implementsExressions;
+  }
+  return declaration;
 };
 
 
 export const classProperty = (
-    name: string,
-    typeAnnotation: TSTypeAnnotation = null,
-    isReadonly: boolean = false,
-    isStatic: boolean = false,
-    noImplicitOverride: boolean = false
+  name: string,
+  typeAnnotation: TSTypeAnnotation = null,
+  isReadonly: boolean = false,
+  isStatic: boolean = false,
+  noImplicitOverride: boolean = false
 ) => {
-    const prop = t.classProperty(t.identifier(name));
-    if (isReadonly) prop.readonly = true;
-    if (isStatic) prop.static = true;
-    if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
-    if (noImplicitOverride) prop.override = true;
-    return prop;
+  const prop = t.classProperty(t.identifier(name));
+  if (isReadonly) prop.readonly = true;
+  if (isStatic) prop.static = true;
+  if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
+  if (noImplicitOverride) prop.override = true;
+  return prop;
 };
 
 export const arrowFunctionExpression = (
-    params: (t.Identifier | t.Pattern | t.RestElement)[],
-    body: t.BlockStatement,
-    returnType: t.TSTypeAnnotation,
-    isAsync: boolean = false
+  params: (t.Identifier | t.Pattern | t.RestElement)[],
+  body: t.BlockStatement,
+  returnType: t.TSTypeAnnotation,
+  isAsync: boolean = false
 ) => {
-    const func = t.arrowFunctionExpression(params, body, isAsync);
-    if (returnType) func.returnType = returnType;
-    return func;
+  const func = t.arrowFunctionExpression(params, body, isAsync);
+  if (returnType) func.returnType = returnType;
+  return func;
 };
 
 
 export const recursiveNamespace = (names: string[], moduleBlockBody: any): t.ExportNamedDeclaration[] => {
-    if (!names || !names.length) return moduleBlockBody;
-    const name = names.pop();
-    const body = [
-        t.exportNamedDeclaration(
-            t.tsModuleDeclaration(
-                t.identifier(name),
-                t.tsModuleBlock(recursiveNamespace(names, moduleBlockBody))
-            )
-        )
-    ];
-    return body;
+  if (!names || !names.length) return moduleBlockBody;
+  const name = names.pop();
+  const body = [
+    t.exportNamedDeclaration(
+      t.tsModuleDeclaration(
+        t.identifier(name),
+        t.tsModuleBlock(recursiveNamespace(names, moduleBlockBody))
+      )
+    )
+  ];
+  return body;
 };
 
 export const arrayTypeNDimensions = (body: any, n: number): t.TSArrayType => {
-    if (!n) return t.tsArrayType(body);
-    return t.tsArrayType(
-        arrayTypeNDimensions(body, n - 1)
-    );
+  if (!n) return t.tsArrayType(body);
+  return t.tsArrayType(
+    arrayTypeNDimensions(body, n - 1)
+  );
 };
 
 export const FieldTypeAsts = {
-    string: () => {
-        return t.tsStringKeyword()
-    },
-    array: (type: 'string' | 'Duration' | 'Height' | 'Coin' | 'Long'): t.TSArrayType => {
-        const result = FieldTypeAsts[type]();
-        return t.tsArrayType(result)
-    },
-    Duration: () => {
-        return t.tsTypeReference(t.identifier('Duration'))
-    },
-    Height: () => {
-        return t.tsTypeReference(t.identifier('Height'))
-    },
-    Coin: () => {
-        return t.tsTypeReference(t.identifier('Coin'))
-    },
-    Long: () => {
-        return t.tsTypeReference(t.identifier('Long'))
-    }
+  string: () => {
+    return t.tsStringKeyword()
+  },
+  array: (type: 'string' | 'Duration' | 'Height' | 'Coin' | 'Long'): t.TSArrayType => {
+    const result = FieldTypeAsts[type]();
+    return t.tsArrayType(result)
+  },
+  Duration: () => {
+    return t.tsTypeReference(t.identifier('Duration'))
+  },
+  Height: () => {
+    return t.tsTypeReference(t.identifier('Height'))
+  },
+  Coin: () => {
+    return t.tsTypeReference(t.identifier('Coin'))
+  },
+  Long: () => {
+    return t.tsTypeReference(t.identifier('Long'))
+  }
 };
 
 export const shorthandProperty = (prop: string): t.ObjectProperty => {
-    return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
+  return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
 };
 
 export const importStmt = (names: string[], path: string): t.ImportDeclaration => {
-    return t.importDeclaration(
-        names.map(name => t.importSpecifier(t.identifier(name), t.identifier(name))),
-        t.stringLiteral(path));
+  return t.importDeclaration(
+    names.map(name => t.importSpecifier(t.identifier(name), t.identifier(name))),
+    t.stringLiteral(path));
 };
 
 export const importAs = (name: string, importAs: string, importPath: string): t.ImportDeclaration => {
-    return t.importDeclaration(
-        [
-            t.importSpecifier(
-                t.identifier(importAs),
-                t.identifier(name)
-            )
-        ],
-        t.stringLiteral(importPath)
-    )
+  return t.importDeclaration(
+    [
+      t.importSpecifier(
+        t.identifier(importAs),
+        t.identifier(name)
+      )
+    ],
+    t.stringLiteral(importPath)
+  )
 };
 
 export const importAminoMsg = (): t.ImportDeclaration => {
-    return importStmt(['AminoMsg'], '@cosmjs/amino');
+  return importStmt(['AminoMsg'], '@cosmjs/amino');
 };
 
 export const getFieldDimensionality = (field: Field) => {
-    let typeName = field.type;
-    const isArray = typeName.endsWith('[]');
-    let dimensions = 0;
-    if (isArray) {
-        dimensions = typeName.match(/\[\]/g).length - 1;
-        typeName = typeName.replace(/\[\]/g, '');
-    }
-    return {
-        typeName,
-        dimensions,
-        isArray
-    };
+  let typeName = field.type;
+  const isArray = typeName.endsWith('[]');
+  let dimensions = 0;
+  if (isArray) {
+    dimensions = typeName.match(/\[\]/g).length - 1;
+    typeName = typeName.replace(/\[\]/g, '');
+  }
+  return {
+    typeName,
+    dimensions,
+    isArray
+  };
 }
 
 export const memberExpressionOrIdentifier = (names: string[]): t.MemberExpression | t.Identifier => {
-    if (names.length === 1) {
-        return t.identifier(names[0])
-    }
-    if (names.length === 2) {
-        const [b, a] = names;
-        return t.memberExpression(
-            t.identifier(a),
-            t.identifier(b)
-        );
-    }
-    const [name, ...rest] = names;
-
+  if (names.length === 1) {
+    return t.identifier(names[0])
+  }
+  if (names.length === 2) {
+    const [b, a] = names;
     return t.memberExpression(
-        memberExpressionOrIdentifier(rest),
-        t.identifier(name)
-    )
+      t.identifier(a),
+      t.identifier(b)
+    );
+  }
+  const [name, ...rest] = names;
+
+  return t.memberExpression(
+    memberExpressionOrIdentifier(rest),
+    t.identifier(name)
+  )
 };
 
 export const memberExpressionOrIdentifierSnake = (names: string[]): t.MemberExpression | t.Identifier => {
-    if (names.length === 1) {
-        return t.identifier(snake(names[0]))
-    }
-    if (names.length === 2) {
-        const [b, a] = names;
-        return t.memberExpression(
-            t.identifier(snake(a)),
-            t.identifier(snake(b))
-        );
-    }
-    const [name, ...rest] = names;
-
+  if (names.length === 1) {
+    return t.identifier(snake(names[0]))
+  }
+  if (names.length === 2) {
+    const [b, a] = names;
     return t.memberExpression(
-        memberExpressionOrIdentifierSnake(rest),
-        t.identifier(snake(name))
-    )
+      t.identifier(snake(a)),
+      t.identifier(snake(b))
+    );
+  }
+  const [name, ...rest] = names;
+
+  return t.memberExpression(
+    memberExpressionOrIdentifierSnake(rest),
+    t.identifier(snake(name))
+  )
 };
 
 /**
  * If optional, return a conditional, otherwise just the expression
  */
 export const optionalConditionalExpression = (test: t.Expression, expression: t.Expression, alternate: t.Expression, optional: boolean = false): t.Expression => {
-    return optional
-        ? t.conditionalExpression(
-            test,
-            expression,
-            alternate
-        )
-        : expression
+  return optional
+    ? t.conditionalExpression(
+      test,
+      expression,
+      alternate
+    )
+    : expression
 }
 
 export const typeRefOrUnionWithUndefined = (identifier: t.Identifier, optional: boolean = false): t.TSType => {
-    const typeReference = t.tsTypeReference(identifier)
-    return optional
-        ? t.tsUnionType([
-            typeReference,
-            t.tsUndefinedKeyword()
-        ])
-        : typeReference
+  const typeReference = t.tsTypeReference(identifier)
+  return optional
+    ? t.tsUnionType([
+      typeReference,
+      t.tsUndefinedKeyword()
+    ])
+    : typeReference
 }
 
 export const parameterizedTypeReference = (identifier: string, from: t.TSType, omit: string | Array<string>) => {
-    return t.tsTypeReference(
-        t.identifier(identifier),
-        t.tsTypeParameterInstantiation([
-            from,
-            typeof omit === 'string'
-                ? t.tsLiteralType(t.stringLiteral(omit))
-                : t.tsUnionType(omit.map(o => t.tsLiteralType(t.stringLiteral(o))))
-        ])
-    )
+  return t.tsTypeReference(
+    t.identifier(identifier),
+    t.tsTypeParameterInstantiation([
+      from,
+      typeof omit === 'string'
+        ? t.tsLiteralType(t.stringLiteral(omit))
+        : t.tsUnionType(omit.map(o => t.tsLiteralType(t.stringLiteral(o))))
+    ])
+  )
 }
 
 /**
@@ -345,10 +346,10 @@ export const parameterizedTypeReference = (identifier: string, from: t.TSType, o
  * Omit<Cw4UpdateMembersMutation, 'args'>
  */
 export const omitTypeReference = (from: t.TSType, omit: string | Array<string>) => {
-    return parameterizedTypeReference('Omit', from, omit)
+  return parameterizedTypeReference('Omit', from, omit)
 }
 
 
 export const pickTypeReference = (from: t.TSType, pick: string | Array<string>) => {
-    return parameterizedTypeReference('Pick', from, pick)
+  return parameterizedTypeReference('Pick', from, pick)
 }
diff --git a/packages/ast/src/utils/constants.ts b/packages/ast/src/utils/constants.ts
index e4f534fe..6361af48 100644
--- a/packages/ast/src/utils/constants.ts
+++ b/packages/ast/src/utils/constants.ts
@@ -1,6 +1,7 @@
-import { identifier } from './babel';
 import * as t from '@babel/types';
 
+import { identifier } from './babel';
+
 export const OPTIONAL_FUNDS_PARAM = identifier(
   '_funds',
   t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))),
@@ -30,8 +31,8 @@ export const FIXED_EXECUTE_PARAMS = [
 ];
 
 export const PROVIDER_TYPES = {
-  SIGNING_CLIENT_TYPE: "client",
-  QUERY_CLIENT_TYPE: "queryClient",
+  SIGNING_CLIENT_TYPE: 'client',
+  QUERY_CLIENT_TYPE: 'queryClient',
   MESSAGE_COMPOSER_TYPE : 'message-composer',
   PROVIDER_TYPE : 'provider'
 };
diff --git a/packages/ast/src/utils/index.ts b/packages/ast/src/utils/index.ts
index 29c1c58e..2159272b 100644
--- a/packages/ast/src/utils/index.ts
+++ b/packages/ast/src/utils/index.ts
@@ -1,6 +1,6 @@
 export * from './babel';
-export * from './types';
-export * from './ref';
 export { OPTIONAL_FUNDS_PARAM } from './constants';
 export { FIXED_EXECUTE_PARAMS } from './constants';
 export { PROVIDER_TYPES } from './constants';
+export * from './ref';
+export * from './types';
diff --git a/packages/ast/src/utils/ref.ts b/packages/ast/src/utils/ref.ts
index 7d97d1d0..0d615877 100644
--- a/packages/ast/src/utils/ref.ts
+++ b/packages/ast/src/utils/ref.ts
@@ -1,4 +1,4 @@
-import { JSONSchema } from "@cosmwasm/ts-codegen-types";
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 
 export const refLookup = ($ref: string, schema: JSONSchema): JSONSchema => {
   const refName = $ref.replace('#/definitions/', '')
diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index dac971bf..df58d9f2 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -1,8 +1,9 @@
 import * as t from '@babel/types';
+import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 import { camel, pascal } from 'case';
-import { propertySignature } from './babel';
+
 import { RenderContext } from '../context';
-import { JSONSchema } from '@cosmwasm/ts-codegen-types';
+import { propertySignature } from './babel';
 
 export function getResponseType(
   context: RenderContext,
@@ -213,18 +214,18 @@ export const getTypeInfo = (
 
 export const getType = (type: string) => {
   switch (type) {
-    case 'string':
-      return t.tsStringKeyword();
-    case 'boolean':
-      return t.tSBooleanKeyword();
-    case 'integer':
-      return t.tsNumberKeyword();
-    case 'null':
-      return t.tsNullKeyword();
-    case 'number':
-      return t.tsNumberKeyword();
-    default:
-      throw new Error('contact maintainers [unknown type]: ' + type);
+  case 'string':
+    return t.tsStringKeyword();
+  case 'boolean':
+    return t.tSBooleanKeyword();
+  case 'integer':
+    return t.tsNumberKeyword();
+  case 'null':
+    return t.tsNullKeyword();
+  case 'number':
+    return t.tsNumberKeyword();
+  default:
+    throw new Error('contact maintainers [unknown type]: ' + type);
   }
 }
 
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index c1e0c177..07f0ea3f 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -1,10 +1,11 @@
 import generate from '@babel/generator';
-import { sync as glob } from 'glob';
+import { RenderOptions } from '@cosmwasm/ts-codegen-ast/types';
+import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 import { readFileSync } from 'fs';
+import { sync as glob } from 'glob';
 import { join } from 'path';
-import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
+
 import { RenderContext } from '../src/context';
-import { RenderOptions } from '@cosmwasm/ts-codegen-ast/types';
 
 export const expectCode = (ast: any): void => {
   expect(
diff --git a/packages/ts-codegen/.eslintrc.js b/packages/ts-codegen/.eslintrc.js
deleted file mode 100644
index 2718e8bc..00000000
--- a/packages/ts-codegen/.eslintrc.js
+++ /dev/null
@@ -1,71 +0,0 @@
-module.exports = {
-  plugins: ['prettier'],
-  extends: ['eslint:recommended', 'prettier'],
-  parser: '@babel/eslint-parser',
-  parserOptions: {
-    ecmaVersion: 11,
-    requireConfigFile: false,
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true
-    }
-  },
-  env: {
-    es6: true,
-    browser: true,
-    node: true,
-    jest: true
-  },
-  rules: {
-    'no-debugger': 2,
-    'no-alert': 2,
-    'no-await-in-loop': 0,
-    'no-prototype-builtins': 0,
-    'no-return-assign': ['error', 'except-parens'],
-    'no-restricted-syntax': [
-      2,
-      'ForInStatement',
-      'LabeledStatement',
-      'WithStatement'
-    ],
-    'no-unused-vars': [
-      0,
-      {
-        ignoreSiblings: true,
-        argsIgnorePattern: 'React|res|next|^_'
-      }
-    ],
-    'prefer-const': [
-      'error',
-      {
-        destructuring: 'all'
-      }
-    ],
-    'no-unused-expressions': [
-      2,
-      {
-        allowTaggedTemplates: true
-      }
-    ],
-    'no-console': 1,
-    'comma-dangle': 2,
-    'jsx-quotes': [2, 'prefer-double'],
-    'linebreak-style': ['error', 'unix'],
-    quotes: [
-      2,
-      'single',
-      {
-        avoidEscape: true,
-        allowTemplateLiterals: true
-      }
-    ],
-    'prettier/prettier': [
-      'error',
-      {
-        trailingComma: 'none',
-        singleQuote: true,
-        printWidth: 80
-      }
-    ]
-  }
-};
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index cbd088f5..a0ac37b6 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -1,215 +1,215 @@
-import codegen from '../src/index';
 import { TSBuilder } from '../src/builder';
+import codegen from '../src/index';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__/builder';
 
 it('options undefined', async () => {
-    const outPath = OUTPUT_DIR + '/vectis/factory-opt';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const builder = new TSBuilder({
-        contracts: [
-            schemaDir
-        ],
-        outPath,
-        options: undefined
-    });
+  const outPath = OUTPUT_DIR + '/vectis/factory-opt';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const builder = new TSBuilder({
+    contracts: [
+      schemaDir
+    ],
+    outPath,
+    options: undefined
+  });
     // @ts-ignore
-    delete builder.contracts;
-    // @ts-ignore
-    delete builder.outPath;
-    expect(builder).toMatchSnapshot();
+  delete builder.contracts;
+  // @ts-ignore
+  delete builder.outPath;
+  expect(builder).toMatchSnapshot();
 });
 
 it('options tsClient.enabled', async () => {
-    const outPath = OUTPUT_DIR + '/vectis/factory-opt';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const builder = new TSBuilder({
-        contracts: [
-            schemaDir
-        ],
-        outPath,
-        options: {
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true
-            },
-            reactQuery: {
-                enabled: true
-            }
-        }
-    });
-    // @ts-ignore
-    delete builder.contracts;
+  const outPath = OUTPUT_DIR + '/vectis/factory-opt';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const builder = new TSBuilder({
+    contracts: [
+      schemaDir
+    ],
+    outPath,
+    options: {
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true
+      },
+      reactQuery: {
+        enabled: true
+      }
+    }
+  });
     // @ts-ignore
-    delete builder.outPath;
-    expect(builder).toMatchSnapshot();
+  delete builder.contracts;
+  // @ts-ignore
+  delete builder.outPath;
+  expect(builder).toMatchSnapshot();
 });
 
 it('builder invoke', async () => {
-    const outPath = OUTPUT_DIR + '/invoke/';
-    const s = (str: string) => FIXTURE_DIR + str;
-    const builder = new TSBuilder({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true
-            },
-            reactQuery: {
-                enabled: true
-            }
-        }
-    });
-    await builder.build();
+  const outPath = OUTPUT_DIR + '/invoke/';
+  const s = (str: string) => FIXTURE_DIR + str;
+  const builder = new TSBuilder({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true
+      },
+      reactQuery: {
+        enabled: true
+      }
+    }
+  });
+  await builder.build();
 });
 
 it('builder default', async () => {
-    const outPath = OUTPUT_DIR + '/default/';
-    const s = (str: string) => FIXTURE_DIR + str;
-    await codegen({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            bundle: {
-                bundleFile: 'index.ts',
-                scope: 'smart.contracts'
-            },
-            useShorthandCtor: false,
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true,
-                execExtendsQuery: true
-            },
-            reactQuery: {
-                enabled: true
-            },
-            recoil: {
-                enabled: true
-            },
-            messageComposer: {
-                enabled: true
-            },
-            messageBuilder: {
-                enabled: true
-            },
-            useContractsHook: {
-                enabled: true,
-            }
-        }
-    });
+  const outPath = OUTPUT_DIR + '/default/';
+  const s = (str: string) => FIXTURE_DIR + str;
+  await codegen({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      bundle: {
+        bundleFile: 'index.ts',
+        scope: 'smart.contracts'
+      },
+      useShorthandCtor: false,
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true,
+        execExtendsQuery: true
+      },
+      reactQuery: {
+        enabled: true
+      },
+      recoil: {
+        enabled: true
+      },
+      messageComposer: {
+        enabled: true
+      },
+      messageBuilder: {
+        enabled: true
+      },
+      useContractsHook: {
+        enabled: true,
+      }
+    }
+  });
 });
 
 it('builder no extends', async () => {
-    const outPath = OUTPUT_DIR + '/no-extends/';
-    const s = (str: string) => FIXTURE_DIR + str;
-    await codegen({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            bundle: {
-                bundleFile: 'index.ts',
-                scope: 'smart.contracts'
-            },
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true,
-                execExtendsQuery: false
-            },
-            reactQuery: {
-                enabled: true
-            },
-            recoil: {
-                enabled: true
-            },
-            messageComposer: {
-                enabled: true
-            },
-            messageBuilder: {
-                enabled: true
-            }
-        }
-    });
+  const outPath = OUTPUT_DIR + '/no-extends/';
+  const s = (str: string) => FIXTURE_DIR + str;
+  await codegen({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      bundle: {
+        bundleFile: 'index.ts',
+        scope: 'smart.contracts'
+      },
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true,
+        execExtendsQuery: false
+      },
+      reactQuery: {
+        enabled: true
+      },
+      recoil: {
+        enabled: true
+      },
+      messageComposer: {
+        enabled: true
+      },
+      messageBuilder: {
+        enabled: true
+      }
+    }
+  });
 });
 
 it('builder set bundler path', async () => {
-    const outPath = OUTPUT_DIR + '/bundler_test/contracts';
-    const bundlerPath = OUTPUT_DIR + '/bundler_test/';
-    const s = (str: string) => FIXTURE_DIR + str;
-    await codegen({
-        contracts: [
-            s('/vectis/factory'),
-            s('/minter'),
-            s('/daodao/cw-admin-factory'),
-            s('/daodao/cw-code-id-registry'),
-            {
-                name: 'CwSingle',
-                dir: s('/daodao/cw-proposal-single')
-            }
-        ],
-        outPath,
-        options: {
-            bundle: {
-                bundlePath: bundlerPath,
-                bundleFile: 'index.ts',
-                scope: 'smart.contracts'
-            },
-            types: {
-                enabled: true
-            },
-            client: {
-                enabled: true,
-                execExtendsQuery: false
-            },
-            reactQuery: {
-                enabled: true
-            },
-            recoil: {
-                enabled: true
-            },
-            messageComposer: {
-                enabled: true
-            },
-            useContractsHook: {
-                enabled: true,
-            }
-        }
-    });
+  const outPath = OUTPUT_DIR + '/bundler_test/contracts';
+  const bundlerPath = OUTPUT_DIR + '/bundler_test/';
+  const s = (str: string) => FIXTURE_DIR + str;
+  await codegen({
+    contracts: [
+      s('/vectis/factory'),
+      s('/minter'),
+      s('/daodao/cw-admin-factory'),
+      s('/daodao/cw-code-id-registry'),
+      {
+        name: 'CwSingle',
+        dir: s('/daodao/cw-proposal-single')
+      }
+    ],
+    outPath,
+    options: {
+      bundle: {
+        bundlePath: bundlerPath,
+        bundleFile: 'index.ts',
+        scope: 'smart.contracts'
+      },
+      types: {
+        enabled: true
+      },
+      client: {
+        enabled: true,
+        execExtendsQuery: false
+      },
+      reactQuery: {
+        enabled: true
+      },
+      recoil: {
+        enabled: true
+      },
+      messageComposer: {
+        enabled: true
+      },
+      useContractsHook: {
+        enabled: true,
+      }
+    }
+  });
 });
 
diff --git a/packages/ts-codegen/__tests__/bundler.test.ts b/packages/ts-codegen/__tests__/bundler.test.ts
index 6e4913ff..9dd164b7 100644
--- a/packages/ts-codegen/__tests__/bundler.test.ts
+++ b/packages/ts-codegen/__tests__/bundler.test.ts
@@ -1,14 +1,15 @@
 import generate from '@babel/generator';
-import cases from 'jest-in-case'
 import * as t from '@babel/types';
+import cases from 'jest-in-case'
+
 import {
-    BundleData,
-    recursiveModuleBundle
+  BundleData,
+  recursiveModuleBundle
 } from '../src/bundler';
 
 const preview = (ast: any) => {
-    // @ts-ignore
-    return generate(t.program(ast)).code;
+  // @ts-ignore
+  return generate(t.program(ast)).code;
 }
 
 interface JestBundleData {
@@ -17,154 +18,154 @@ interface JestBundleData {
 }
 
 cases(`recursiveModuleBundle`, (opts: JestBundleData) => {
-    expect(preview(recursiveModuleBundle(opts.data))).toMatchSnapshot();
+  expect(preview(recursiveModuleBundle(opts.data))).toMatchSnapshot();
 }, [
-    {
-        name: 'root',
-        data: {
-            osmosis: {
-                __export: true,
-                _0: true
-            },
-            tendermint: {
-                __export: true,
-                _0: true
-            }
-        }
-    },
-    {
-        name: 'single',
-        data: {
-            ics23: {
-                __export: true,
-                _0: true
-            }
-        }
-    },
-    {
-        name: 'tendermint',
-        data: {
-            tendermint: {
-                abci: {
-                    __export: true,
-                    _223: true
-                },
-                crypto: {
-                    __export: true,
-                    _224: true,
-                    _225: true
-                },
-                libs: {
-                    bits: {
-                        __export: true,
-                        _226: true
-                    }
-                },
-                p2p: {
-                    __export: true,
-                    _227: true
-                },
-                types: {
-                    __export: true,
-                    _228: true,
-                    _229: true,
-                    _230: true,
-                    _231: true,
-                    _232: true
-                },
-                version: {
-                    __export: true,
-                    _233: true
-                }
-            }
+  {
+    name: 'root',
+    data: {
+      osmosis: {
+        __export: true,
+        _0: true
+      },
+      tendermint: {
+        __export: true,
+        _0: true
+      }
+    }
+  },
+  {
+    name: 'single',
+    data: {
+      ics23: {
+        __export: true,
+        _0: true
+      }
+    }
+  },
+  {
+    name: 'tendermint',
+    data: {
+      tendermint: {
+        abci: {
+          __export: true,
+          _223: true
+        },
+        crypto: {
+          __export: true,
+          _224: true,
+          _225: true
+        },
+        libs: {
+          bits: {
+            __export: true,
+            _226: true
+          }
+        },
+        p2p: {
+          __export: true,
+          _227: true
+        },
+        types: {
+          __export: true,
+          _228: true,
+          _229: true,
+          _230: true,
+          _231: true,
+          _232: true
+        },
+        version: {
+          __export: true,
+          _233: true
         }
-    },
-    {
-        name: 'osmo',
-        data: {
-            osmosis: {
-                claim: {
-                    v1beta1: {
-                        __export: true,
-                        _177: true,
-                        _178: true,
-                        _179: true,
-                        _180: true
-                    }
-                },
-                epochs: {
-                    v1beta1: {
-                        __export: true,
-                        _181: true,
-                        _182: true
-                    }
-                },
-                gamm: {
-                    v1beta1: {
-                        __export: true,
-                        _183: true,
-                        _184: true,
-                        _185: true,
-                        _186: true,
-                        _187: true
-                    }
-                },
-                incentives: {
-                    __export: true,
-                    _188: true,
-                    _189: true,
-                    _190: true,
-                    _191: true,
-                    _192: true
-                },
-                lockup: {
-                    __export: true,
-                    _193: true,
-                    _194: true,
-                    _195: true,
-                    _196: true
-                },
-                mint: {
-                    v1beta1: {
-                        __export: true,
-                        _197: true,
-                        _198: true,
-                        _199: true
-                    }
-                },
-                poolincentives: {
-                    v1beta1: {
-                        __export: true,
-                        _200: true,
-                        _201: true,
-                        _202: true,
-                        _203: true
-                    }
-                },
-                store: {
-                    v1beta1: {
-                        __export: true,
-                        _204: true
-                    }
-                },
-                superfluid: {
-                    __export: true,
-                    _205: true,
-                    _206: true,
-                    _207: true,
-                    _208: true,
-                    _209: true
-                },
-                txfees: {
-                    v1beta1: {
-                        __export: true,
-                        _210: true,
-                        _211: true,
-                        _212: true,
-                        _213: true
-                    }
-                }
-            }
+      }
+    }
+  },
+  {
+    name: 'osmo',
+    data: {
+      osmosis: {
+        claim: {
+          v1beta1: {
+            __export: true,
+            _177: true,
+            _178: true,
+            _179: true,
+            _180: true
+          }
+        },
+        epochs: {
+          v1beta1: {
+            __export: true,
+            _181: true,
+            _182: true
+          }
+        },
+        gamm: {
+          v1beta1: {
+            __export: true,
+            _183: true,
+            _184: true,
+            _185: true,
+            _186: true,
+            _187: true
+          }
+        },
+        incentives: {
+          __export: true,
+          _188: true,
+          _189: true,
+          _190: true,
+          _191: true,
+          _192: true
+        },
+        lockup: {
+          __export: true,
+          _193: true,
+          _194: true,
+          _195: true,
+          _196: true
+        },
+        mint: {
+          v1beta1: {
+            __export: true,
+            _197: true,
+            _198: true,
+            _199: true
+          }
+        },
+        poolincentives: {
+          v1beta1: {
+            __export: true,
+            _200: true,
+            _201: true,
+            _202: true,
+            _203: true
+          }
+        },
+        store: {
+          v1beta1: {
+            __export: true,
+            _204: true
+          }
+        },
+        superfluid: {
+          __export: true,
+          _205: true,
+          _206: true,
+          _207: true,
+          _208: true,
+          _209: true
+        },
+        txfees: {
+          v1beta1: {
+            __export: true,
+            _210: true,
+            _211: true,
+            _212: true,
+            _213: true
+          }
         }
+      }
     }
+  }
 ])
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/cleanse.test.ts b/packages/ts-codegen/__tests__/cleanse.test.ts
index 6b79b3ab..96ba36e5 100644
--- a/packages/ts-codegen/__tests__/cleanse.test.ts
+++ b/packages/ts-codegen/__tests__/cleanse.test.ts
@@ -1,45 +1,46 @@
-import { readSchemas } from '../src/utils';
-import { sync as mkdirp } from 'mkdirp';
 import { writeFileSync } from 'fs';
+import { sync as mkdirp } from 'mkdirp';
+
+import { readSchemas } from '../src/utils';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
 
 
 it('sg721', async () => {
-    const out = OUTPUT_DIR + '/sg721';
-    const schemaDir = FIXTURE_DIR + '/sg721/';
+  const out = OUTPUT_DIR + '/sg721';
+  const schemaDir = FIXTURE_DIR + '/sg721/';
 
-    const clean = await readSchemas({ schemaDir, clean: true });
-    const orig = await readSchemas({ schemaDir, clean: false });
+  const clean = await readSchemas({ schemaDir, clean: true });
+  const orig = await readSchemas({ schemaDir, clean: false });
 
-    mkdirp(out);
-    writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
-    writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
+  mkdirp(out);
+  writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
+  writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
 
 })
 
 it('daodao/cw-code-id-registry', async () => {
-    const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
-    const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
+  const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
+  const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
 
-    const clean = await readSchemas({ schemaDir, clean: true });
-    const orig = await readSchemas({ schemaDir, clean: false });
+  const clean = await readSchemas({ schemaDir, clean: true });
+  const orig = await readSchemas({ schemaDir, clean: false });
 
-    mkdirp(out);
-    writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
-    writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
+  mkdirp(out);
+  writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
+  writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
 })
 
 it('issues/103', async () => {
-    const out = OUTPUT_DIR + '/issues/103';
-    const schemaDir = FIXTURE_DIR + '/issues/103/';
+  const out = OUTPUT_DIR + '/issues/103';
+  const schemaDir = FIXTURE_DIR + '/issues/103/';
 
-    const clean = await readSchemas({ schemaDir, clean: true });
-    const orig = await readSchemas({ schemaDir, clean: false });
+  const clean = await readSchemas({ schemaDir, clean: true });
+  const orig = await readSchemas({ schemaDir, clean: false });
 
-    mkdirp(out);
-    writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
-    writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
+  mkdirp(out);
+  writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
+  writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
 })
 
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 13822ce0..9f277abe 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -1,267 +1,267 @@
 import { BuilderContext } from '@cosmwasm/ts-codegen-ast';
-import { TSBuilder } from '../src';
+
 import { readSchemas } from '../src/utils';
-import { generateReactQuery, generateClient, generateMessageComposer, generateMessageBuilder, generateRecoil, generateTypes, generateContractHooks } from '../test-utils';
+import { generateClient, generateContractHooks,generateMessageBuilder, generateMessageComposer, generateReactQuery, generateRecoil, generateTypes } from '../test-utils';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
 
 it('optionalClient', async () => {
-    const outopt = OUTPUT_DIR + '/vectis/factory-optional-client';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateReactQuery('Factory', contractInfo, outopt, { optionalClient: true });
+  const outopt = OUTPUT_DIR + '/vectis/factory-optional-client';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { optionalClient: true });
 })
 
 it('v4Query', async () => {
-    const outopt = OUTPUT_DIR + '/vectis/factory-v4-query';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4' });
+  const outopt = OUTPUT_DIR + '/vectis/factory-v4-query';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4' });
 })
 
 it('queryKeys', async () => {
-    const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true });
+  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true });
 })
 
 it('queryFactory', async () => {
-    const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
+  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
 })
 
 
 
 it('queryKeysOptionalClient', async () => {
-    const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, optionalClient: true });
+  const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, optionalClient: true });
 })
 
 it('useMutations', async () => {
-    const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4', mutations: true });
+  const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4', mutations: true });
 })
 
 it('vectis/factory', async () => {
-    const out = OUTPUT_DIR + '/vectis/factory';
-    const schemaDir = FIXTURE_DIR + '/vectis/factory/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('Factory', contractInfo, out);
-    await generateClient('Factory', contractInfo, out);
-    await generateMessageComposer('Factory', contractInfo, out);
-    await generateRecoil('Factory', contractInfo, out);
-    await generateReactQuery('Factory', contractInfo, out);
+  const out = OUTPUT_DIR + '/vectis/factory';
+  const schemaDir = FIXTURE_DIR + '/vectis/factory/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('Factory', contractInfo, out);
+  await generateClient('Factory', contractInfo, out);
+  await generateMessageComposer('Factory', contractInfo, out);
+  await generateRecoil('Factory', contractInfo, out);
+  await generateReactQuery('Factory', contractInfo, out);
 })
 
 it('vectis/govec', async () => {
-    const out = OUTPUT_DIR + '/vectis/govec';
-    const schemaDir = FIXTURE_DIR + '/vectis/govec/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('Govec', contractInfo, out);
-    await generateClient('Govec', contractInfo, out);
-    await generateMessageComposer('Govec', contractInfo, out);
-    await generateRecoil('Govec', contractInfo, out);
-    await generateReactQuery('Govec', contractInfo, out);
+  const out = OUTPUT_DIR + '/vectis/govec';
+  const schemaDir = FIXTURE_DIR + '/vectis/govec/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('Govec', contractInfo, out);
+  await generateClient('Govec', contractInfo, out);
+  await generateMessageComposer('Govec', contractInfo, out);
+  await generateRecoil('Govec', contractInfo, out);
+  await generateReactQuery('Govec', contractInfo, out);
 })
 
 it('vectis/proxy', async () => {
-    const out = OUTPUT_DIR + '/vectis/proxy';
-    const schemaDir = FIXTURE_DIR + '/vectis/proxy/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('Proxy', contractInfo, out);
-    await generateClient('Proxy', contractInfo, out);
-    await generateMessageComposer('Proxy', contractInfo, out);
-    await generateRecoil('Proxy', contractInfo, out);
-    await generateReactQuery('Proxy', contractInfo, out);
+  const out = OUTPUT_DIR + '/vectis/proxy';
+  const schemaDir = FIXTURE_DIR + '/vectis/proxy/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('Proxy', contractInfo, out);
+  await generateClient('Proxy', contractInfo, out);
+  await generateMessageComposer('Proxy', contractInfo, out);
+  await generateRecoil('Proxy', contractInfo, out);
+  await generateReactQuery('Proxy', contractInfo, out);
 })
 
 it('minter', async () => {
-    const out = OUTPUT_DIR + '/minter';
-    const schemaDir = FIXTURE_DIR + '/minter/';
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('Minter', contractInfo, out);
-    await generateClient('Minter', contractInfo, out);
-    await generateMessageComposer('Minter', contractInfo, out);
-    await generateRecoil('Minter', contractInfo, out);
-    await generateReactQuery('Minter', contractInfo, out);
+  const out = OUTPUT_DIR + '/minter';
+  const schemaDir = FIXTURE_DIR + '/minter/';
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('Minter', contractInfo, out);
+  await generateClient('Minter', contractInfo, out);
+  await generateMessageComposer('Minter', contractInfo, out);
+  await generateRecoil('Minter', contractInfo, out);
+  await generateReactQuery('Minter', contractInfo, out);
 })
 
 it('sg721', async () => {
-    const out = OUTPUT_DIR + '/sg721';
-    const schemaDir = FIXTURE_DIR + '/sg721/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-
-    const builderContext = new BuilderContext();
-
-    await generateTypes('Sg721', contractInfo, out);
-    await generateClient('Sg721', contractInfo, out, builderContext);
-    await generateMessageComposer('Sg721', contractInfo, out, builderContext);
-    await generateMessageBuilder('Sg721', contractInfo, out);
-    await generateRecoil('Sg721', contractInfo, out);
-    await generateReactQuery('Sg721', contractInfo, out);
-    await generateContractHooks('Sg721', contractInfo, out, builderContext);
+  const out = OUTPUT_DIR + '/sg721';
+  const schemaDir = FIXTURE_DIR + '/sg721/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+
+  const builderContext = new BuilderContext();
+
+  await generateTypes('Sg721', contractInfo, out);
+  await generateClient('Sg721', contractInfo, out, builderContext);
+  await generateMessageComposer('Sg721', contractInfo, out, builderContext);
+  await generateMessageBuilder('Sg721', contractInfo, out);
+  await generateRecoil('Sg721', contractInfo, out);
+  await generateReactQuery('Sg721', contractInfo, out);
+  await generateContractHooks('Sg721', contractInfo, out, builderContext);
 })
 
 it('cw-named-groups', async () => {
-    const out = OUTPUT_DIR + '/daodao/cw-named-groups';
-    const schemaDir = FIXTURE_DIR + '/daodao/cw-named-groups/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('CwNamedGroups', contractInfo, out);
-    await generateClient('CwNamedGroups', contractInfo, out);
-    await generateMessageComposer('CwNamedGroups', contractInfo, out);
-    await generateRecoil('CwNamedGroups', contractInfo, out);
-    await generateReactQuery('CwNamedGroups', contractInfo, out);
+  const out = OUTPUT_DIR + '/daodao/cw-named-groups';
+  const schemaDir = FIXTURE_DIR + '/daodao/cw-named-groups/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('CwNamedGroups', contractInfo, out);
+  await generateClient('CwNamedGroups', contractInfo, out);
+  await generateMessageComposer('CwNamedGroups', contractInfo, out);
+  await generateRecoil('CwNamedGroups', contractInfo, out);
+  await generateReactQuery('CwNamedGroups', contractInfo, out);
 })
 
 it('cw-proposal-single', async () => {
-    const out = OUTPUT_DIR + '/daodao/cw-proposal-single';
-    const schemaDir = FIXTURE_DIR + '/daodao/cw-proposal-single/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('CwProposalSingle', contractInfo, out);
-    await generateClient('CwProposalSingle', contractInfo, out);
-    await generateMessageComposer('CwProposalSingle', contractInfo, out);
-    await generateRecoil('CwProposalSingle', contractInfo, out);
-    await generateReactQuery('CwProposalSingle', contractInfo, out);
+  const out = OUTPUT_DIR + '/daodao/cw-proposal-single';
+  const schemaDir = FIXTURE_DIR + '/daodao/cw-proposal-single/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('CwProposalSingle', contractInfo, out);
+  await generateClient('CwProposalSingle', contractInfo, out);
+  await generateMessageComposer('CwProposalSingle', contractInfo, out);
+  await generateRecoil('CwProposalSingle', contractInfo, out);
+  await generateReactQuery('CwProposalSingle', contractInfo, out);
 })
 
 it('cw-admin-factory', async () => {
-    const out = OUTPUT_DIR + '/daodao/cw-admin-factory';
-    const schemaDir = FIXTURE_DIR + '/daodao/cw-admin-factory/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('CwAdminFactory', contractInfo, out);
-    await generateClient('CwAdminFactory', contractInfo, out);
-    await generateMessageComposer('CwAdminFactory', contractInfo, out);
-    await generateRecoil('CwAdminFactory', contractInfo, out);
-    await generateReactQuery('CwAdminFactory', contractInfo, out);
+  const out = OUTPUT_DIR + '/daodao/cw-admin-factory';
+  const schemaDir = FIXTURE_DIR + '/daodao/cw-admin-factory/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('CwAdminFactory', contractInfo, out);
+  await generateClient('CwAdminFactory', contractInfo, out);
+  await generateMessageComposer('CwAdminFactory', contractInfo, out);
+  await generateRecoil('CwAdminFactory', contractInfo, out);
+  await generateReactQuery('CwAdminFactory', contractInfo, out);
 })
 
 it('cw-code-id-registry', async () => {
-    const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
-    const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('CwCodeIdRegistry', contractInfo, out);
-    await generateClient('CwCodeIdRegistry', contractInfo, out);
-    await generateMessageComposer('CwCodeIdRegistry', contractInfo, out);
-    await generateRecoil('CwCodeIdRegistry', contractInfo, out);
-    await generateReactQuery('CwCodeIdRegistry', contractInfo, out);
+  const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
+  const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('CwCodeIdRegistry', contractInfo, out);
+  await generateClient('CwCodeIdRegistry', contractInfo, out);
+  await generateMessageComposer('CwCodeIdRegistry', contractInfo, out);
+  await generateRecoil('CwCodeIdRegistry', contractInfo, out);
+  await generateReactQuery('CwCodeIdRegistry', contractInfo, out);
 })
 
 it('idl-version/hackatom', async () => {
-    const out = OUTPUT_DIR + '/idl-version/hackatom';
-    const schemaDir = FIXTURE_DIR + '/idl-version/hackatom/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-    await generateTypes('HackAtom', contractInfo, out);
-    await generateClient('HackAtom', contractInfo, out);
-    await generateMessageComposer('HackAtom', contractInfo, out);
-    await generateRecoil('HackAtom', contractInfo, out);
-    await generateReactQuery('HackAtom', contractInfo, out);
+  const out = OUTPUT_DIR + '/idl-version/hackatom';
+  const schemaDir = FIXTURE_DIR + '/idl-version/hackatom/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+  await generateTypes('HackAtom', contractInfo, out);
+  await generateClient('HackAtom', contractInfo, out);
+  await generateMessageComposer('HackAtom', contractInfo, out);
+  await generateRecoil('HackAtom', contractInfo, out);
+  await generateReactQuery('HackAtom', contractInfo, out);
 })
 
 it('idl-version/cyberpunk', async () => {
-    const out = OUTPUT_DIR + '/idl-version/cyberpunk';
-    const schemaDir = FIXTURE_DIR + '/idl-version/cyberpunk/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-
-    await generateTypes('CyberPunk', contractInfo, out);
-    await generateClient('CyberPunk', contractInfo, out);
-    await generateMessageComposer('CyberPunk', contractInfo, out);
-    await generateRecoil('CyberPunk', contractInfo, out);
-    await generateReactQuery('CyberPunk', contractInfo, out);
+  const out = OUTPUT_DIR + '/idl-version/cyberpunk';
+  const schemaDir = FIXTURE_DIR + '/idl-version/cyberpunk/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+
+  await generateTypes('CyberPunk', contractInfo, out);
+  await generateClient('CyberPunk', contractInfo, out);
+  await generateMessageComposer('CyberPunk', contractInfo, out);
+  await generateRecoil('CyberPunk', contractInfo, out);
+  await generateReactQuery('CyberPunk', contractInfo, out);
 })
 
 it('idl-version/cw4-group', async () => {
-    const out = OUTPUT_DIR + '/idl-version/cw4-group';
-    const schemaDir = FIXTURE_DIR + '/idl-version/cw4-group/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-
-    await generateTypes('Cw4Group', contractInfo, out);
-    await generateClient('Cw4Group', contractInfo, out);
-    await generateMessageComposer('Cw4Group', contractInfo, out);
-    await generateRecoil('Cw4Group', contractInfo, out);
-    await generateReactQuery('Cw4Group', contractInfo, out);
+  const out = OUTPUT_DIR + '/idl-version/cw4-group';
+  const schemaDir = FIXTURE_DIR + '/idl-version/cw4-group/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+
+  await generateTypes('Cw4Group', contractInfo, out);
+  await generateClient('Cw4Group', contractInfo, out);
+  await generateMessageComposer('Cw4Group', contractInfo, out);
+  await generateRecoil('Cw4Group', contractInfo, out);
+  await generateReactQuery('Cw4Group', contractInfo, out);
 })
 
 it('idl-version/cw3-fixed-multisig', async () => {
-    const out = OUTPUT_DIR + '/idl-version/cw3-fixed-multisig';
-    const schemaDir = FIXTURE_DIR + '/idl-version/cw3-fixed-multisig/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-
-    await generateTypes('Cw3FixedMultiSig', contractInfo, out);
-    await generateClient('Cw3FixedMultiSig', contractInfo, out);
-    await generateMessageComposer('Cw3FixedMultiSig', contractInfo, out);
-    await generateRecoil('Cw3FixedMultiSig', contractInfo, out);
-    await generateReactQuery('Cw3FixedMultiSig', contractInfo, out);
+  const out = OUTPUT_DIR + '/idl-version/cw3-fixed-multisig';
+  const schemaDir = FIXTURE_DIR + '/idl-version/cw3-fixed-multisig/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+
+  await generateTypes('Cw3FixedMultiSig', contractInfo, out);
+  await generateClient('Cw3FixedMultiSig', contractInfo, out);
+  await generateMessageComposer('Cw3FixedMultiSig', contractInfo, out);
+  await generateRecoil('Cw3FixedMultiSig', contractInfo, out);
+  await generateReactQuery('Cw3FixedMultiSig', contractInfo, out);
 })
 
 it('idl-version/accounts-nft', async () => {
-    const out = OUTPUT_DIR + '/idl-version/accounts-nft';
-    const schemaDir = FIXTURE_DIR + '/idl-version/accounts-nft/';
-
-    const contractInfo = await readSchemas({
-        schemaDir
-    });
-
-    await generateTypes('AccountsNft', contractInfo, out);
-    await generateClient('AccountsNft', contractInfo, out);
-    await generateMessageComposer('AccountsNft', contractInfo, out);
-    await generateRecoil('AccountsNft', contractInfo, out);
-    await generateReactQuery('AccountsNft', contractInfo, out);
+  const out = OUTPUT_DIR + '/idl-version/accounts-nft';
+  const schemaDir = FIXTURE_DIR + '/idl-version/accounts-nft/';
+
+  const contractInfo = await readSchemas({
+    schemaDir
+  });
+
+  await generateTypes('AccountsNft', contractInfo, out);
+  await generateClient('AccountsNft', contractInfo, out);
+  await generateMessageComposer('AccountsNft', contractInfo, out);
+  await generateRecoil('AccountsNft', contractInfo, out);
+  await generateReactQuery('AccountsNft', contractInfo, out);
 })
diff --git a/packages/ts-codegen/jest.config.js b/packages/ts-codegen/jest.config.js
index 0aa3aaa4..057a9420 100644
--- a/packages/ts-codegen/jest.config.js
+++ b/packages/ts-codegen/jest.config.js
@@ -1,18 +1,18 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-    preset: "ts-jest",
-    testEnvironment: "node",
-    transform: {
-        "^.+\\.tsx?$": [
-            "ts-jest",
-            {
-                babelConfig: false,
-                tsconfig: "tsconfig.json",
-            },
-        ],
-    },
-    transformIgnorePatterns: [`/node_modules/*`],
-    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-    moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-    modulePathIgnorePatterns: ["dist/*"]
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        babelConfig: false,
+        tsconfig: 'tsconfig.json',
+      },
+    ],
+  },
+  transformIgnorePatterns: [`/node_modules/*`],
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  modulePathIgnorePatterns: ['dist/*']
 };
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 8a66dd5f..eb27e9d3 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -22,6 +22,7 @@
     "prepare": "npm run build",
     "cmds": "ts-node ./scripts/cmds.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
+    "lint": "eslint . --fix",
     "test": "jest",
     "test:watch": "jest --watch",
     "dev": "ts-node src/ts-codegen",
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index b8e3ed2a..b9502fb7 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,38 +1,35 @@
-import { RenderOptions, defaultOptions, ContractInfo, BuilderContext } from "@cosmwasm/ts-codegen-ast";
-
-import { header } from '../utils/header';
-import { join } from "path";
+import generate from '@babel/generator';
+import * as t from '@babel/types';
+import { BuilderContext,ContractInfo, defaultOptions, RenderOptions } from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+import deepmerge from 'deepmerge';
 import { writeFileSync } from 'fs';
-import { sync as mkdirp } from "mkdirp";
-
+import { sync as mkdirp } from 'mkdirp';
+import { join } from 'path';
 import { basename } from 'path';
-import { readSchemas } from '../utils';
-import { IBuilderPlugin } from '../plugins';
 
-import deepmerge from 'deepmerge';
-import { pascal } from "case";
-import { createFileBundle, recursiveModuleBundle } from "../bundler";
-
-import generate from '@babel/generator';
-import * as t from '@babel/types';
-import { ReactQueryPlugin } from "../plugins/react-query";
-import { RecoilPlugin } from "../plugins/recoil";
-import { MessageBuilderPlugin } from "../plugins/message-builder";
-import { MessageComposerPlugin } from "../plugins/message-composer";
-import { ClientPlugin } from "../plugins/client";
-import { TypesPlugin } from "../plugins/types";
-import { ContractsContextProviderPlugin } from "../plugins/provider";
-import { createHelpers } from "../helpers/create-helpers";
-import { ContractsProviderBundlePlugin } from "../plugins/provider-bundle";
-import { createDefaultContractInfo } from "../utils/contracts";
+import { createFileBundle, recursiveModuleBundle } from '../bundler';
+import { createHelpers } from '../helpers/create-helpers';
+import { IBuilderPlugin } from '../plugins';
+import { ClientPlugin } from '../plugins/client';
+import { MessageBuilderPlugin } from '../plugins/message-builder';
+import { MessageComposerPlugin } from '../plugins/message-composer';
+import { ContractsContextProviderPlugin } from '../plugins/provider';
+import { ContractsProviderBundlePlugin } from '../plugins/provider-bundle';
+import { ReactQueryPlugin } from '../plugins/react-query';
+import { RecoilPlugin } from '../plugins/recoil';
+import { TypesPlugin } from '../plugins/types';
+import { readSchemas } from '../utils';
+import { createDefaultContractInfo } from '../utils/contracts';
+import { header } from '../utils/header';
 
 const defaultOpts: TSBuilderOptions = {
-    bundle: {
-        enabled: true,
-        scope: 'contracts',
-        bundleFile: 'bundle.ts'
-    },
-    useShorthandCtor: true
+  bundle: {
+    enabled: true,
+    scope: 'contracts',
+    bundleFile: 'bundle.ts'
+  },
+  useShorthandCtor: true
 }
 
 export interface TSBuilderInput {
@@ -76,165 +73,165 @@ export interface ContractFile {
 }
 
 function getContract(contractOpt: ContractFile | string): ContractFile {
-    if (typeof contractOpt === 'string') {
-        const name = basename(contractOpt);
-        const contractName = pascal(name);
-        return {
-            name: contractName,
-            dir: contractOpt
-        }
-    }
+  if (typeof contractOpt === 'string') {
+    const name = basename(contractOpt);
+    const contractName = pascal(name);
     return {
-        name: pascal(contractOpt.name),
-        dir: contractOpt.dir
-    };
+      name: contractName,
+      dir: contractOpt
+    }
+  }
+  return {
+    name: pascal(contractOpt.name),
+    dir: contractOpt.dir
+  };
 }
 
 export class TSBuilder {
-    contracts: Array<ContractFile | string>;
-    outPath: string;
-    options?: TSBuilderOptions;
-    plugins: IBuilderPlugin[] = [];
-    builderContext: BuilderContext = new BuilderContext();
-
-    protected files: BuilderFile[] = [];
-
-    loadDefaultPlugins() {
-        this.plugins.push(
-            new TypesPlugin(this.options),
-            new ClientPlugin(this.options),
-            new MessageComposerPlugin(this.options),
-            new ReactQueryPlugin(this.options),
-            new RecoilPlugin(this.options),
-            new MessageBuilderPlugin(this.options),
-            new ContractsContextProviderPlugin(this.options),
-            new ContractsProviderBundlePlugin(this.options)
-        );
+  contracts: Array<ContractFile | string>;
+  outPath: string;
+  options?: TSBuilderOptions;
+  plugins: IBuilderPlugin[] = [];
+  builderContext: BuilderContext = new BuilderContext();
+
+  protected files: BuilderFile[] = [];
+
+  loadDefaultPlugins() {
+    this.plugins.push(
+      new TypesPlugin(this.options),
+      new ClientPlugin(this.options),
+      new MessageComposerPlugin(this.options),
+      new ReactQueryPlugin(this.options),
+      new RecoilPlugin(this.options),
+      new MessageBuilderPlugin(this.options),
+      new ContractsContextProviderPlugin(this.options),
+      new ContractsProviderBundlePlugin(this.options)
+    );
+  }
+
+  constructor({ contracts, outPath, options, plugins }: TSBuilderInput) {
+    this.contracts = contracts;
+    this.outPath = outPath;
+    this.options = deepmerge(
+      deepmerge(
+        defaultOptions,
+        defaultOpts
+      ),
+      options ?? {}
+    );
+
+    this.loadDefaultPlugins();
+
+    if (plugins && plugins.length) {
+      this.plugins.push(...plugins);
     }
 
-    constructor({ contracts, outPath, options, plugins }: TSBuilderInput) {
-        this.contracts = contracts;
-        this.outPath = outPath;
-        this.options = deepmerge(
-            deepmerge(
-                defaultOptions,
-                defaultOpts
-            ),
-            options ?? {}
-        );
-
-        this.loadDefaultPlugins();
+    this.plugins.forEach(plugin => plugin.setBuilder(this))
+  }
+
+  async build() {
+    await this.process();
+    await this.after();
+  }
+
+  // lifecycle functions
+  private async process() {
+    for (const contractOpt of this.contracts) {
+      const contract = getContract(contractOpt);
+      //resolve contract schema.
+      const contractInfo = await readSchemas({
+        schemaDir: contract.dir
+      });
+
+      //lifecycle and plugins.
+      await this.render('main', contract.name, contractInfo);
+    }
+  }
+
+  private async render(
+    lifecycle?: string,
+    name?: string,
+    contractInfo?: ContractInfo
+  ) {
+    const plugins = lifecycle
+      ? this.plugins.filter((p) =>
+        p.lifecycle === lifecycle
+      )
+      : this.plugins;
+
+    for (const plugin of plugins) {
+      let files = await plugin.render(
+        this.outPath,
+        name,
+        contractInfo ?? createDefaultContractInfo()
+      );
+      if (files && files.length) {
+        this.files.push(...files);
+      }
+    }
+  }
 
-        if (plugins && plugins.length) {
-            this.plugins.push(...plugins);
-        }
+  private async after() {
+    await this.render('after');
 
-        this.plugins.forEach(plugin => plugin.setBuilder(this))
-    }
+    const helpers = createHelpers({
+      outPath: this.outPath,
+      contracts: this.contracts,
+      options: this.options,
+      plugins: this.plugins,
+    }, this.builderContext);
 
-    async build() {
-        await this.process();
-        await this.after();
+    if (helpers && helpers.length) {
+      this.files.push(...helpers);
     }
 
-    // lifecycle functions
-    private async process() {
-        for (const contractOpt of this.contracts) {
-            const contract = getContract(contractOpt);
-            //resolve contract schema.
-            const contractInfo = await readSchemas({
-                schemaDir: contract.dir
-            });
-
-            //lifecycle and plugins.
-            await this.render('main', contract.name, contractInfo);
-        }
+    if (this.options.bundle.enabled) {
+      this.bundle();
     }
-
-    private async render(
-        lifecycle?: string,
-        name?: string,
-        contractInfo?: ContractInfo
-    ) {
-        const plugins = lifecycle
-            ? this.plugins.filter((p) =>
-                p.lifecycle === lifecycle
-            )
-            : this.plugins;
-
-        for (const plugin of plugins) {
-            let files = await plugin.render(
-                this.outPath,
-                name,
-                contractInfo ?? createDefaultContractInfo()
-            );
-            if (files && files.length) {
-                this.files.push(...files);
-            }
-        }
+  }
+
+  async bundle() {
+    const allFiles = this.files;
+
+    const bundleFile = this.options.bundle.bundleFile;
+    const bundlePath = join(
+      this.options?.bundle?.bundlePath ?? this.outPath,
+      bundleFile
+    );
+    const bundleVariables = {};
+    const importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[] = [];
+
+    allFiles.forEach(file => {
+      createFileBundle(
+        `${this.options.bundle.scope}.${file.contract}`,
+        file.filename,
+        bundlePath,
+        importPaths,
+        bundleVariables
+      );
+
+    });
+
+    const ast = recursiveModuleBundle(bundleVariables);
+    const nodes = [
+      ...importPaths,
+      ...ast
+    ];
+    // @ts-ignore
+    let code = generate(t.program(
+      // @ts-ignore
+      nodes
+    )).code;
+
+    if (this.options?.bundle?.bundlePath) {
+      mkdirp(this.options?.bundle?.bundlePath);
     }
 
-    private async after() {
-        await this.render('after');
+    mkdirp(this.outPath);
 
-        const helpers = createHelpers({
-            outPath: this.outPath,
-            contracts: this.contracts,
-            options: this.options,
-            plugins: this.plugins,
-        }, this.builderContext);
+    if (code.trim() === '') code = 'export {};'
 
-        if (helpers && helpers.length) {
-            this.files.push(...helpers);
-        }
+    writeFileSync(bundlePath, header + code);
 
-        if (this.options.bundle.enabled) {
-            this.bundle();
-        }
-    }
-
-    async bundle() {
-        const allFiles = this.files;
-
-        const bundleFile = this.options.bundle.bundleFile;
-        const bundlePath = join(
-            this.options?.bundle?.bundlePath ?? this.outPath,
-            bundleFile
-        );
-        const bundleVariables = {};
-        const importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[] = [];
-
-        allFiles.forEach(file => {
-            createFileBundle(
-                `${this.options.bundle.scope}.${file.contract}`,
-                file.filename,
-                bundlePath,
-                importPaths,
-                bundleVariables
-            );
-
-        });
-
-        const ast = recursiveModuleBundle(bundleVariables);
-        const nodes = [
-            ...importPaths,
-            ...ast
-        ];
-        // @ts-ignore
-        let code = generate(t.program(
-            // @ts-ignore
-            nodes
-        )).code;
-
-        if (this.options?.bundle?.bundlePath) {
-            mkdirp(this.options?.bundle?.bundlePath);
-        }
-
-        mkdirp(this.outPath);
-
-        if (code.trim() === '') code = 'export {};'
-
-        writeFileSync(bundlePath, header + code);
-
-    }
+  }
 }
diff --git a/packages/ts-codegen/src/bundler/bundler.ts b/packages/ts-codegen/src/bundler/bundler.ts
index 711c5062..8a7eccaa 100644
--- a/packages/ts-codegen/src/bundler/bundler.ts
+++ b/packages/ts-codegen/src/bundler/bundler.ts
@@ -1,9 +1,8 @@
 import * as t from '@babel/types';
 import nested from 'nested-obj';
-
 import {
-    relative, dirname, extname
-} from 'path';
+  dirname, extname,
+  relative} from 'path';
 
 export interface BundleData {
     __export?: boolean;
@@ -11,69 +10,69 @@ export interface BundleData {
 }
 
 export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration[] => {
-    return Object.keys(obj).map(key => {
-        const value = obj[key];
-        if (typeof value === 'object' && value && value.__export) {
-            // e.g. abci
-            // 1. create variable for abci
-            // 2. splat ALL _0, parms into abci
-            // 3. export that variable
+  return Object.keys(obj).map(key => {
+    const value = obj[key];
+    if (typeof value === 'object' && value && value.__export) {
+      // e.g. abci
+      // 1. create variable for abci
+      // 2. splat ALL _0, parms into abci
+      // 3. export that variable
 
-            const nmspc = t.variableDeclaration('const',
-                [t.variableDeclarator(
-                    t.identifier(key),
-                    t.objectExpression(
-                        Object.keys(obj[key])
-                            .filter(a => a !== '__export')
-                            .filter(a => a.startsWith('_'))
-                            .map(a => t.spreadElement(t.identifier(a)))
-                    )
-                )]
-            );
+      const nmspc = t.variableDeclaration('const',
+        [t.variableDeclarator(
+          t.identifier(key),
+          t.objectExpression(
+            Object.keys(obj[key])
+              .filter(a => a !== '__export')
+              .filter(a => a.startsWith('_'))
+              .map(a => t.spreadElement(t.identifier(a)))
+          )
+        )]
+      );
 
-            const others = Object.keys(obj[key])
-                .filter(a => a !== '__export')
-                .filter(a => !a.startsWith('_'));
-            if (others.length) {
-                throw new Error('namespace and package not supported, yet.')
-            }
+      const others = Object.keys(obj[key])
+        .filter(a => a !== '__export')
+        .filter(a => !a.startsWith('_'));
+      if (others.length) {
+        throw new Error('namespace and package not supported, yet.')
+      }
 
-            // return nmspc;
-            return t.exportNamedDeclaration(nmspc, []);
-        } else if (typeof value === 'object' && value) {
-            // you can make a namespace for obj[key]
-            // e.g. libs
-            return t.exportNamedDeclaration(
-                t.tsModuleDeclaration(
-                    t.identifier(key),
-                    t.tsModuleBlock(recursiveModuleBundle(obj[key] as BundleData))
-                )
-            )
-        } else {
-            throw new Error('Invalid structure for BundleData');
-        }
-    });
+      // return nmspc;
+      return t.exportNamedDeclaration(nmspc, []);
+    } else if (typeof value === 'object' && value) {
+      // you can make a namespace for obj[key]
+      // e.g. libs
+      return t.exportNamedDeclaration(
+        t.tsModuleDeclaration(
+          t.identifier(key),
+          t.tsModuleBlock(recursiveModuleBundle(obj[key] as BundleData))
+        )
+      )
+    } else {
+      throw new Error('Invalid structure for BundleData');
+    }
+  });
 };
 
 export const importNamespace = (ident: string, path: string) => t.importDeclaration(
-    [
-        t.importNamespaceSpecifier(t.identifier(ident))
-    ],
-    t.stringLiteral(path.replace(extname(path), ''))
+  [
+    t.importNamespaceSpecifier(t.identifier(ident))
+  ],
+  t.stringLiteral(path.replace(extname(path), ''))
 );
 
 let counter = 0;
 export const createFileBundle = (
-    pkg: string,
-    filename: string,
-    bundleFile: string,
-    importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[],
-    bundleVariables: BundleData
+  pkg: string,
+  filename: string,
+  bundleFile: string,
+  importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[],
+  bundleVariables: BundleData
 ) => {
-    let rel = relative(dirname(bundleFile), filename);
-    if (!rel.startsWith('.')) rel = `./${rel}`;
-    const variable = `_${counter++}`;
-    importPaths.push(importNamespace(variable, rel));
-    nested.set(bundleVariables, pkg + '.__export', true);
-    nested.set(bundleVariables, pkg + '.' + variable, true);
+  let rel = relative(dirname(bundleFile), filename);
+  if (!rel.startsWith('.')) rel = `./${rel}`;
+  const variable = `_${counter++}`;
+  importPaths.push(importNamespace(variable, rel));
+  nested.set(bundleVariables, pkg + '.__export', true);
+  nested.set(bundleVariables, pkg + '.' + variable, true);
 }
\ No newline at end of file
diff --git a/packages/ts-codegen/src/cli.ts b/packages/ts-codegen/src/cli.ts
index 8c3e72bc..71be8ec0 100644
--- a/packages/ts-codegen/src/cli.ts
+++ b/packages/ts-codegen/src/cli.ts
@@ -1,7 +1,8 @@
-import { prompt } from './utils/prompt';
-import { Commands as commands } from './cmds';
 import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 
+import { Commands as commands } from './cmds';
+import { prompt } from './utils/prompt';
+
 const question = [
   {
     _: true,
@@ -13,7 +14,7 @@ const question = [
 ];
 
 export const cli = async (argv: MinimistArgs) => {
-  var { cmd } = await prompt(question, argv);
+  let { cmd } = await prompt(question, argv);
   if (typeof commands[cmd] === 'function') {
     await commands[cmd](argv);
   } else {
diff --git a/packages/ts-codegen/src/cmds.ts b/packages/ts-codegen/src/cmds.ts
index d4e90c3b..9630ad7f 100644
--- a/packages/ts-codegen/src/cmds.ts
+++ b/packages/ts-codegen/src/cmds.ts
@@ -7,6 +7,6 @@ Commands['create-boilerplate'] = _create_boilerplate;
 Commands['generate'] = _generate;
 Commands['install'] = _install;
 
-  export { Commands }; 
+export { Commands }; 
 
   
\ No newline at end of file
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 138d039b..94450f47 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -1,135 +1,136 @@
+import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
+import dargs from 'dargs';
 import * as shell from 'shelljs';
+
 import { prompt } from '../utils/prompt';
-import dargs from 'dargs';
-import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
 
 const repo = 'https://github.com/cosmology-tech/ts-codegen-module-boilerplate';
 export default async (argv: MinimistArgs) => {
-    if (!shell.which('git')) {
-        shell.echo('Sorry, this script requires git');
-        return shell.exit(1);
+  if (!shell.which('git')) {
+    shell.echo('Sorry, this script requires git');
+    return shell.exit(1);
+  }
+
+  const { name } = await prompt([
+    {
+      type: 'string',
+      name: 'name',
+      message: 'Enter your new module name',
     }
-
-    const { name } = await prompt([
+  ], argv);
+
+  shell.exec(`git clone ${repo} ${name}`);
+  shell.cd(name);
+
+  const questions = JSON.parse(fs.readFileSync(`.questions.json`));
+
+  const fullname = shell
+    .exec('git config --global user.name', { silent: true })
+    .trim();
+  const email = shell
+    .exec('git config --global user.email', { silent: true })
+    .trim();
+
+  // @__USERNAME__/__MODULENAME__
+  // __PACKAGE_IDENTIFIER__
+  const args = dargs(
+    {
+      _: [],
+      ...argv,
+      __MODULENAME__: name,
+      __USERFULLNAME__: fullname,
+      __USEREMAIL__: email,
+    },
+    { allowCamelCase: true }
+  );
+
+  const results = await prompt(questions, args);
+  let scopedResults;
+
+  const license = await prompt(
+    [
+      {
+        name: '__LICENSE__',
+        message: 'Which license?',
+        choices: ['MIT', 'closed'],
+        type: 'list',
+        required: true,
+      },
+    ],
+    []
+  );
+
+  if (results.__ACCESS__ === 'public') {
+    scopedResults = await prompt(
+      [
         {
-            type: 'string',
-            name: 'name',
-            message: 'Enter your new module name',
-        }
-    ], argv);
-
-    shell.exec(`git clone ${repo} ${name}`);
-    shell.cd(name);
-
-    const questions = JSON.parse(fs.readFileSync(`.questions.json`));
-
-    const fullname = shell
-        .exec('git config --global user.name', { silent: true })
-        .trim();
-    const email = shell
-        .exec('git config --global user.email', { silent: true })
-        .trim();
-
-    // @__USERNAME__/__MODULENAME__
-    // __PACKAGE_IDENTIFIER__
-    const args = dargs(
-        {
-            _: [],
-            ...argv,
-            __MODULENAME__: name,
-            __USERFULLNAME__: fullname,
-            __USEREMAIL__: email,
+          type: 'confirm',
+          name: 'scoped',
+          message: 'use npm scopes?',
+          required: true,
         },
-        { allowCamelCase: true }
+      ],
+      []
     );
+  }
 
-    const results = await prompt(questions, args);
-    let scopedResults;
-
-    const license = await prompt(
-        [
-            {
-                name: '__LICENSE__',
-                message: 'Which license?',
-                choices: ['MIT', 'closed'],
-                type: 'list',
-                required: true,
-            },
-        ],
-        []
-    );
+  const files = []
+    .concat(glob(process.cwd() + '/**/.*'))
+    .concat(glob(process.cwd() + '/**/*'));
 
-    if (results.__ACCESS__ === 'public') {
-        scopedResults = await prompt(
-            [
-                {
-                    type: 'confirm',
-                    name: 'scoped',
-                    message: 'use npm scopes?',
-                    required: true,
-                },
-            ],
-            []
-        );
-    }
+  for (let i = 0; i < files.length; i++) {
+    const templateFile = files[i];
+    if (fs.lstatSync(templateFile).isDirectory()) continue;
 
-    const files = []
-        .concat(glob(process.cwd() + '/**/.*'))
-        .concat(glob(process.cwd() + '/**/*'));
-
-    for (let i = 0; i < files.length; i++) {
-        const templateFile = files[i];
-        if (fs.lstatSync(templateFile).isDirectory()) continue;
-
-        let content = fs.readFileSync(templateFile).toString();
-        if (
-            path.basename(templateFile) === 'LICENSE' &&
+    let content = fs.readFileSync(templateFile).toString();
+    if (
+      path.basename(templateFile) === 'LICENSE' &&
             license.__LICENSE__ === 'closed'
-        ) {
-            content = `Copyright (c) 2023 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
+    ) {
+      content = `Copyright (c) 2023 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
 Unauthorized copying via any medium is strictly prohibited
 Proprietary and confidential`;
-        }
-
-        Object.keys(results).forEach(key => {
-            if (/^__/.test(key)) {
-                content = content.replace(new RegExp(key, 'g'), results[key]);
-            }
-        });
-
-        if (results.__ACCESS__ === 'public') {
-            if (scopedResults.scoped) {
-                content = content.replace(
-                    /__PACKAGE_IDENTIFIER__/g,
-                    `@${results.__USERNAME__}/${results.__MODULENAME__}`
-                );
-            } else {
-                content = content.replace(
-                    /__PACKAGE_IDENTIFIER__/g,
-                    `${results.__MODULENAME__}`
-                );
-            }
-        } else {
-            content = content.replace(
-                /__PACKAGE_IDENTIFIER__/g,
-                `@${results.__USERNAME__}/${results.__MODULENAME__}`
-            );
-        }
-
-        // if (path.basename(templateFile) === 'README.md') {
-        //     content = `# ${results.__MODULENAME__}`;
-        // }
-
-        fs.writeFileSync(templateFile, content);
     }
 
-    shell.rm('-rf', '.git');
-    shell.rm('-rf', '.questions.json');
+    Object.keys(results).forEach(key => {
+      if (/^__/.test(key)) {
+        content = content.replace(new RegExp(key, 'g'), results[key]);
+      }
+    });
+
+    if (results.__ACCESS__ === 'public') {
+      if (scopedResults.scoped) {
+        content = content.replace(
+          /__PACKAGE_IDENTIFIER__/g,
+          `@${results.__USERNAME__}/${results.__MODULENAME__}`
+        );
+      } else {
+        content = content.replace(
+          /__PACKAGE_IDENTIFIER__/g,
+          `${results.__MODULENAME__}`
+        );
+      }
+    } else {
+      content = content.replace(
+        /__PACKAGE_IDENTIFIER__/g,
+        `@${results.__USERNAME__}/${results.__MODULENAME__}`
+      );
+    }
+
+    // if (path.basename(templateFile) === 'README.md') {
+    //     content = `# ${results.__MODULENAME__}`;
+    // }
+
+    fs.writeFileSync(templateFile, content);
+  }
+
+  shell.rm('-rf', '.git');
+  shell.rm('-rf', '.questions.json');
 
-    console.log(`
+  console.log(`
 
        |||
       (o o)
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index fb9a2bdc..c66e378d 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -1,178 +1,179 @@
 // @ts-nocheck
-import { prompt } from '../utils/prompt';
-import codegen from '../index';
-import { TSBuilderOptions } from '../builder';
 import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 
-export default async (argv: MinimistArgs) => {
-    const questions = [
-        {
-            _: true,
-            type: 'path',
-            name: 'schema',
-            message: 'which directory contains the the Rust contracts?',
-            default: './schema'
-        },
-        {
-            _: true,
-            type: 'path',
-            name: 'out',
-            message: 'where is the output directory?',
-            default: './ts'
-        },
-        {
-            _: true,
-            type: 'string',
-            name: 'name',
-            message: 'contract name?'
-        },
-        {
-            type: 'checkbox',
-            name: 'plugin',
-            message: 'which plugins?',
-            choices: [
-                'client',
-                'recoil',
-                'react-query',
-                'message-composer'
-            ]
-        },
-        {
-            type: 'confirm',
-            name: 'bundle',
-            message: 'enable bundle?',
-            default: true
-        }
-    ];
+import { TSBuilderOptions } from '../builder';
+import codegen from '../index';
+import { prompt } from '../utils/prompt';
 
-    if (argv.typesOnly) {
-        argv.plugin = 'types';
+export default async (argv: MinimistArgs) => {
+  const questions = [
+    {
+      _: true,
+      type: 'path',
+      name: 'schema',
+      message: 'which directory contains the the Rust contracts?',
+      default: './schema'
+    },
+    {
+      _: true,
+      type: 'path',
+      name: 'out',
+      message: 'where is the output directory?',
+      default: './ts'
+    },
+    {
+      _: true,
+      type: 'string',
+      name: 'name',
+      message: 'contract name?'
+    },
+    {
+      type: 'checkbox',
+      name: 'plugin',
+      message: 'which plugins?',
+      choices: [
+        'client',
+        'recoil',
+        'react-query',
+        'message-composer'
+      ]
+    },
+    {
+      type: 'confirm',
+      name: 'bundle',
+      message: 'enable bundle?',
+      default: true
     }
+  ];
 
-    let { schema, out, name, plugin, bundle } = await prompt(questions, argv);
-    if (!Array.isArray(plugin)) plugin = [plugin];
+  if (argv.typesOnly) {
+    argv.plugin = 'types';
+  }
 
-    ///////// REACT QUERY
-    const questions2 = [];
-    if (plugin.includes('react-query')) {
-        // @ts-ignore
-        [].push.apply(questions2, [
-            {
-                type: 'confirm',
-                name: 'optionalClient',
-                message: 'optionalClient?',
-                default: false
-            },
-            {
-                type: 'list',
-                name: 'version',
-                message: 'which react-query version?',
-                default: 'v4',
-                choices: ['v3', 'v4']
-            },
-            {
-                type: 'confirm',
-                name: 'queryKeys',
-                message: 'queryKeys?',
-                default: false
-            },
-        ])
-    };
-    const { optionalClient, version, queryKeys } = await prompt(questions2, argv);
-    const questions3 = [];
-    if (version === 'v4') {
-        [].push.apply(questions3, [
-            // currently we only support v4 for useMutation
-            {
-                type: 'confirm',
-                name: 'mutations',
-                message: 'Generate useMutation hooks?',
-                default: false
-            }
+  let { schema, out, name, plugin, bundle } = await prompt(questions, argv);
+  if (!Array.isArray(plugin)) plugin = [plugin];
 
-        ])
-    };
-    const { mutations } = await prompt(questions3, argv);
+  ///////// REACT QUERY
+  const questions2 = [];
+  if (plugin.includes('react-query')) {
+    // @ts-ignore
+    [].push.apply(questions2, [
+      {
+        type: 'confirm',
+        name: 'optionalClient',
+        message: 'optionalClient?',
+        default: false
+      },
+      {
+        type: 'list',
+        name: 'version',
+        message: 'which react-query version?',
+        default: 'v4',
+        choices: ['v3', 'v4']
+      },
+      {
+        type: 'confirm',
+        name: 'queryKeys',
+        message: 'queryKeys?',
+        default: false
+      },
+    ])
+  };
+  const { optionalClient, version, queryKeys } = await prompt(questions2, argv);
+  const questions3 = [];
+  if (version === 'v4') {
+    [].push.apply(questions3, [
+      // currently we only support v4 for useMutation
+      {
+        type: 'confirm',
+        name: 'mutations',
+        message: 'Generate useMutation hooks?',
+        default: false
+      }
 
-    const queryFactoryQuestions = [];
-    if (queryKeys) {
-        [].push.apply(queryFactoryQuestions, [
-            // Only can use queryFactory if queryKeys is enabled
-            {
-                type: 'confirm',
-                name: 'queryFactory',
-                message: 'queryFactory? ',
-                default: false
-            }
-        ])
-    };
-    const { queryFactory } = await prompt(queryFactoryQuestions, argv);
-    ///////// END REACT QUERY
+    ])
+  };
+  const { mutations } = await prompt(questions3, argv);
 
-    ///////// BUNDLE
-    const questions4 = [];
-    if (bundle) {
-        [].push.apply(questions4, [
-            {
-                type: 'string',
-                name: 'bundleFile',
-                message: 'bundleFile?',
-                default: 'index.ts'
-            },
-            {
-                type: 'string',
-                name: 'bundleScope',
-                message: 'bundleScope?',
-                default: 'contracts'
-            }
-        ])
-    };
-    const { bundleFile, bundleScope } = await prompt(questions4, argv);
-    ///////// END BUNDLE
+  const queryFactoryQuestions = [];
+  if (queryKeys) {
+    [].push.apply(queryFactoryQuestions, [
+      // Only can use queryFactory if queryKeys is enabled
+      {
+        type: 'confirm',
+        name: 'queryFactory',
+        message: 'queryFactory? ',
+        default: false
+      }
+    ])
+  };
+  const { queryFactory } = await prompt(queryFactoryQuestions, argv);
+  ///////// END REACT QUERY
 
-    const options: TSBuilderOptions = {
-        types: {
-            enabled: true
-        },
-        client: {
-            enabled:
+  ///////// BUNDLE
+  const questions4 = [];
+  if (bundle) {
+    [].push.apply(questions4, [
+      {
+        type: 'string',
+        name: 'bundleFile',
+        message: 'bundleFile?',
+        default: 'index.ts'
+      },
+      {
+        type: 'string',
+        name: 'bundleScope',
+        message: 'bundleScope?',
+        default: 'contracts'
+      }
+    ])
+  };
+  const { bundleFile, bundleScope } = await prompt(questions4, argv);
+  ///////// END BUNDLE
+
+  const options: TSBuilderOptions = {
+    types: {
+      enabled: true
+    },
+    client: {
+      enabled:
                 plugin.includes('client') ||
                 plugin.includes('recoil') ||
                 plugin.includes('react-query')
-        },
-        reactQuery: {
-            enabled: plugin.includes('react-query'),
-            optionalClient,
-            queryKeys,
-            version,
-            mutations,
-            queryFactory
-        },
-        recoil: {
-            enabled: plugin.includes('recoil'),
-        },
-        messageComposer: {
-            enabled: plugin.includes('message-composer')
-        },
-        messageBuilder: {
+    },
+    reactQuery: {
+      enabled: plugin.includes('react-query'),
+      optionalClient,
+      queryKeys,
+      version,
+      mutations,
+      queryFactory
+    },
+    recoil: {
+      enabled: plugin.includes('recoil'),
+    },
+    messageComposer: {
+      enabled: plugin.includes('message-composer')
+    },
+    messageBuilder: {
 
-            enabled: plugin.includes('message-builder')
-        },
-        bundle: {
-            enabled: bundle,
-            scope: bundleScope,
-            bundleFile
-        }
-    };
+      enabled: plugin.includes('message-builder')
+    },
+    bundle: {
+      enabled: bundle,
+      scope: bundleScope,
+      bundleFile
+    }
+  };
 
-    await codegen({
-        contracts: [
-            {
-                name,
-                dir: schema
-            }
-        ],
-        outPath: out,
-        options
-    })
+  await codegen({
+    contracts: [
+      {
+        name,
+        dir: schema
+      }
+    ],
+    outPath: out,
+    options
+  })
 };
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index be618a9f..e9a77cef 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -1,119 +1,120 @@
-import { resolve, join, dirname, basename, extname } from 'path';
-import { sync as mkdirp } from 'mkdirp';
+import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
+import { readFileSync, writeFileSync } from 'fs';
 import { sync as glob } from 'glob';
+import { sync as mkdirp } from 'mkdirp';
+import { tmpdir } from 'os';
+import { parse } from 'parse-package-name';
+import { basename, dirname, extname,join, resolve } from 'path';
 import { sync as rimraf } from 'rimraf';
 import { exec } from 'shelljs';
+
 import { prompt } from '../utils/prompt';
-import { parse } from 'parse-package-name';
-import { tmpdir } from 'os';
-import { readFileSync, writeFileSync } from 'fs';
-import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 
 const TMPDIR = tmpdir();
 const rnd = () =>
-    Math.random().toString(36).substring(2, 15) +
+  Math.random().toString(36).substring(2, 15) +
     Math.random().toString(36).substring(2, 15);
 
 const getPackages = (names: string[]) => {
-    return names.map(pkg => {
-        const { name, version } = parse(pkg);
-        return `${name}@${version}`
-    }).join(' ');
+  return names.map(pkg => {
+    const { name, version } = parse(pkg);
+    return `${name}@${version}`
+  }).join(' ');
 };
 
 export default async (argv: MinimistArgs) => {
 
-    // don't prompt if we got this...
-    if (argv._.length) {
-        argv.pkg = argv._;
-    }
+  // don't prompt if we got this...
+  if (argv._.length) {
+    argv.pkg = argv._;
+  }
 
-    // current dir/package
-    const cur = process.cwd();
-    let thisPackage;
-    try {
-        thisPackage = JSON.parse(readFileSync(join(cur, 'package.json'), 'utf-8'));
-    } catch (e) {
-        throw new Error('make sure you are inside of a telescope package!');
-    }
+  // current dir/package
+  const cur = process.cwd();
+  let thisPackage;
+  try {
+    thisPackage = JSON.parse(readFileSync(join(cur, 'package.json'), 'utf-8'));
+  } catch (e) {
+    throw new Error('make sure you are inside of a telescope package!');
+  }
 
-    // what are we installing?
-    let { pkg } = await prompt([
-        {
-            type: 'checkbox',
-            name: 'pkg',
-            message:
+  // what are we installing?
+  let { pkg } = await prompt([
+    {
+      type: 'checkbox',
+      name: 'pkg',
+      message:
                 'which chain contracts do you want to support?',
-            choices: [
-                'stargaze-base-factory',
-                'stargaze-base-minter',
-                'stargaze-sg721-base',
-                'stargaze-sg721-metdata-onchain',
-                'stargaze-sg721-nt',
-                'stargaze-splits',
-                'stargaze-vending-factory',
-                'stargaze-vending-minter',
-                'stargaze-whitelist',
-                'wasmswap'
-            ].map(name => {
-                return {
-                    name,
-                    value: `@cosmjson/${name}`
-                }
-            })
+      choices: [
+        'stargaze-base-factory',
+        'stargaze-base-minter',
+        'stargaze-sg721-base',
+        'stargaze-sg721-metdata-onchain',
+        'stargaze-sg721-nt',
+        'stargaze-splits',
+        'stargaze-vending-factory',
+        'stargaze-vending-minter',
+        'stargaze-whitelist',
+        'wasmswap'
+      ].map(name => {
+        return {
+          name,
+          value: `@cosmjson/${name}`
         }
-    ], argv);
+      })
+    }
+  ], argv);
 
-    // install
-    if (!Array.isArray(pkg)) pkg = [pkg];
-    const tmp = join(TMPDIR, rnd());
-    mkdirp(tmp);
-    process.chdir(tmp);
-    exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`);
+  // install
+  if (!Array.isArray(pkg)) pkg = [pkg];
+  const tmp = join(TMPDIR, rnd());
+  mkdirp(tmp);
+  process.chdir(tmp);
+  exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`);
 
-    // protos
-    const pkgs = glob('./smart-contracts/**/package.json');
-    const cmds = pkgs
-        .filter((f) => { return f !== './smart-contracts/package.json' })
-        .map((f) => resolve(join(tmp, f)))
-        .map((conf) => {
-            const extDir = dirname(conf);
-            const dir = extDir.split('node_modules/')[1];
-            const dst = basename(dir);
+  // protos
+  const pkgs = glob('./smart-contracts/**/package.json');
+  const cmds = pkgs
+    .filter((f) => { return f !== './smart-contracts/package.json' })
+    .map((f) => resolve(join(tmp, f)))
+    .map((conf) => {
+      const extDir = dirname(conf);
+      const dir = extDir.split('node_modules/')[1];
+      const dst = basename(dir);
 
-            const files = glob(`${extDir}/**/*`, { nodir: true });
-            files.forEach(f => {
-                if (extname(f) === '.json'
+      const files = glob(`${extDir}/**/*`, { nodir: true });
+      files.forEach(f => {
+        if (extname(f) === '.json'
                     || f === 'package.json'
                     || /license/i.test(f)
                     || /readme/i.test(f)) return;
-                rimraf(f);
-            });
-            return [extDir, resolve(join(cur, 'contracts', dst)), dir];
-        });
+        rimraf(f);
+      });
+      return [extDir, resolve(join(cur, 'contracts', dst)), dir];
+    });
 
-    // move protos 
-    for (const [src, dst, pkg] of cmds) {
-        rimraf(dst);
-        console.log(`installing ${pkg}...`);
-        mkdirp(dirname(dst));
-        exec(`mv ${src} ${dst}`);
-    }
+  // move protos 
+  for (const [src, dst, pkg] of cmds) {
+    rimraf(dst);
+    console.log(`installing ${pkg}...`);
+    mkdirp(dirname(dst));
+    exec(`mv ${src} ${dst}`);
+  }
 
-    // package
-    const packageInfo = JSON.parse(readFileSync('./smart-contracts/package.json', 'utf-8'));
-    const deps = packageInfo.dependencies ?? {};
-    thisPackage.devDependencies = thisPackage.devDependencies ?? {};
-    thisPackage.devDependencies = {
-        ...thisPackage.devDependencies,
-        ...deps
-    };
+  // package
+  const packageInfo = JSON.parse(readFileSync('./smart-contracts/package.json', 'utf-8'));
+  const deps = packageInfo.dependencies ?? {};
+  thisPackage.devDependencies = thisPackage.devDependencies ?? {};
+  thisPackage.devDependencies = {
+    ...thisPackage.devDependencies,
+    ...deps
+  };
 
-    thisPackage.devDependencies = Object.fromEntries(Object.entries(thisPackage.devDependencies).sort());
+  thisPackage.devDependencies = Object.fromEntries(Object.entries(thisPackage.devDependencies).sort());
 
-    writeFileSync(join(cur, 'package.json'), JSON.stringify(thisPackage, null, 2));
+  writeFileSync(join(cur, 'package.json'), JSON.stringify(thisPackage, null, 2));
 
-    // cleanup
-    rimraf(tmp);
-    process.chdir(cur);
+  // cleanup
+  rimraf(tmp);
+  process.chdir(cur);
 };
diff --git a/packages/ts-codegen/src/file.ts b/packages/ts-codegen/src/file.ts
index b1e87bff..24d44f90 100644
--- a/packages/ts-codegen/src/file.ts
+++ b/packages/ts-codegen/src/file.ts
@@ -1,7 +1,8 @@
 #!/usr/bin/env node
-import { prompt } from './utils/prompt';
-import { cli } from './cli';
 import { readFileSync } from 'fs';
+
+import { cli } from './cli';
+import { prompt } from './utils/prompt';
 const argv = require('minimist')(process.argv.slice(2));
 
 const question = [
diff --git a/packages/ts-codegen/src/helpers/create-helpers.ts b/packages/ts-codegen/src/helpers/create-helpers.ts
index 759771d8..ccb92224 100644
--- a/packages/ts-codegen/src/helpers/create-helpers.ts
+++ b/packages/ts-codegen/src/helpers/create-helpers.ts
@@ -1,14 +1,15 @@
-import { join, dirname, basename, extname } from "path";
-import { sync as mkdirp } from "mkdirp";
-import { writeContentToFile } from "../utils/files";
-import { BuilderFile, TSBuilderInput } from "../builder";
+import { BuilderContext } from '@cosmwasm/ts-codegen-ast';
+import { sync as mkdirp } from 'mkdirp';
+import { basename, dirname, extname,join } from 'path';
+
+import { BuilderFile, TSBuilderInput } from '../builder';
 import {
   contractContextBase,
   contractContextBaseShortHandCtor,
   contractsContextTSX,
-} from "../helpers";
-import { BuilderContext } from "@cosmwasm/ts-codegen-ast";
-import { header } from "../utils/header";
+} from '../helpers';
+import { writeContentToFile } from '../utils/files';
+import { header } from '../utils/header';
 
 const write = (
   outPath: string,
@@ -21,8 +22,8 @@ const write = (
   writeContentToFile(outPath, header + content, outFile);
 
   return {
-    type: "plugin",
-    pluginType: "helper",
+    type: 'plugin',
+    pluginType: 'helper',
     contract: varname ?? basename(file, extname(file)),
     localname: file,
     filename: outFile,
@@ -43,7 +44,7 @@ export const createHelpers = (
     files.push(
       write(
         input.outPath,
-        "contractContextBase.ts",
+        'contractContextBase.ts',
         useShorthandCtor
           ? contractContextBaseShortHandCtor
           : contractContextBase
@@ -52,9 +53,9 @@ export const createHelpers = (
     files.push(
       write(
         input.outPath,
-        "contracts-context.tsx",
+        'contracts-context.tsx',
         contractsContextTSX,
-        "contractsContext"
+        'contractsContext'
       )
     );
   }
diff --git a/packages/ts-codegen/src/index.ts b/packages/ts-codegen/src/index.ts
index 1a5431cd..79330fcf 100644
--- a/packages/ts-codegen/src/index.ts
+++ b/packages/ts-codegen/src/index.ts
@@ -1,11 +1,11 @@
 import { TSBuilder, TSBuilderInput } from './builder';
 
-export * from './utils';
 export * from './builder';
 export * from './bundler';
 export * from './plugins';
+export * from './utils';
 
 export default async (input: TSBuilderInput) => {
-    const builder = new TSBuilder(input);
-    await builder.build();
+  const builder = new TSBuilder(input);
+  await builder.build();
 };
\ No newline at end of file
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 6f0db069..9394b30e 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -1,15 +1,16 @@
-import { pascal } from "case";
-import * as w from "@cosmwasm/ts-codegen-ast";
-import { findExecuteMsg, findAndParseTypes, findQueryMsg } from "../utils";
+import * as w from '@cosmwasm/ts-codegen-ast';
 import {
-  RenderContext,
   ContractInfo,
-  RenderContextBase,
   getMessageProperties,
+  RenderContext,
+  RenderContextBase,
   RenderOptions,
-} from "@cosmwasm/ts-codegen-ast";
-import { BuilderFileType } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
+} from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
+import { BuilderFileType } from '../builder';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
+import { BuilderPluginBase } from './plugin-base';
 
 export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
@@ -38,8 +39,8 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
 
     const { schemas } = context.contract;
 
-    const localname = pascal(name) + ".client.ts";
-    const TypesFile = pascal(name) + ".types";
+    const localname = pascal(name) + '.client.ts';
+    const TypesFile = pascal(name) + '.types';
     const QueryMsg = findQueryMsg(schemas);
     const ExecuteMsg = findExecuteMsg(schemas);
     const typeHash = await findAndParseTypes(schemas);
@@ -106,14 +107,14 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
       }
     }
 
-    if (typeHash.hasOwnProperty("Coin")) {
+    if (typeHash.hasOwnProperty('Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
 
     return [
       {
-        type: "client",
+        type: 'client',
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/index.ts b/packages/ts-codegen/src/plugins/index.ts
index d6bdce3c..13b111e6 100644
--- a/packages/ts-codegen/src/plugins/index.ts
+++ b/packages/ts-codegen/src/plugins/index.ts
@@ -1,7 +1,7 @@
-export * from "./plugin-base"
-export * from "./client"
-export * from "./react-query"
-export * from "./recoil"
-export * from "./message-builder"
-export * from "./message-composer"
-export * from "./types"
\ No newline at end of file
+export * from './client'
+export * from './message-builder'
+export * from './message-composer'
+export * from './plugin-base'
+export * from './react-query'
+export * from './recoil'
+export * from './types'
\ No newline at end of file
diff --git a/packages/ts-codegen/src/plugins/message-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
index 30f7632c..1a7df80f 100644
--- a/packages/ts-codegen/src/plugins/message-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -1,14 +1,15 @@
-import { pascal } from 'case';
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { findAndParseTypes, findQueryMsg, findExecuteMsg } from '../utils';
 import {
+  ContractInfo,
   getMessageProperties,
   RenderContext,
   RenderContextBase,
-  ContractInfo,
   RenderOptions
 } from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
 import { BuilderFileType } from '../builder';
+import { findAndParseTypes, findExecuteMsg,findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
 
 export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index c7a3f072..e5dfe09b 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -1,16 +1,16 @@
-import { pascal } from "case";
-import * as w from "@cosmwasm/ts-codegen-ast";
-import { findAndParseTypes, findExecuteMsg } from "../utils";
+import * as w from '@cosmwasm/ts-codegen-ast';
 import {
-  MessageComposerOptions,
-  getMessageProperties,
   ContractInfo,
-  RenderContextBase,
+  getMessageProperties,
   RenderContext,
+  RenderContextBase,
   RenderOptions,
-} from "@cosmwasm/ts-codegen-ast";
-import { BuilderFileType } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
+} from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
+import { BuilderFileType } from '../builder';
+import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { BuilderPluginBase } from './plugin-base';
 
 export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
   initContext(
@@ -39,8 +39,8 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
 
     const { schemas } = context.contract;
 
-    const localname = pascal(name) + ".message-composer.ts";
-    const TypesFile = pascal(name) + ".types";
+    const localname = pascal(name) + '.message-composer.ts';
+    const TypesFile = pascal(name) + '.types';
     const ExecuteMsg = findExecuteMsg(schemas);
     const typeHash = await findAndParseTypes(schemas);
 
@@ -71,14 +71,14 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
       }
     }
 
-    if (typeHash.hasOwnProperty("Coin")) {
+    if (typeHash.hasOwnProperty('Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
 
     return [
       {
-        type: "message-composer",
+        type: 'message-composer',
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 758f95c4..9c800f7c 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -1,16 +1,17 @@
-import { sync as mkdirp } from "mkdirp";
-import { join } from "path";
-import { writeFileSync } from "fs";
-import { header } from "../utils/header";
-import { ContractInfo, UtilMapping, IContext, defaultOptions } from "@cosmwasm/ts-codegen-ast";
-import generate from "@babel/generator";
-import * as t from "@babel/types";
+import generate from '@babel/generator';
+import * as t from '@babel/types';
+import { ContractInfo, defaultOptions,IContext, UtilMapping } from '@cosmwasm/ts-codegen-ast';
+import deepmerge from 'deepmerge';
+import { writeFileSync } from 'fs';
+import { sync as mkdirp } from 'mkdirp';
+import { join } from 'path';
+
 import {
   BuilderFile,
   BuilderFileType,
   TSBuilder,
-} from "../builder";
-import deepmerge from "deepmerge";
+} from '../builder';
+import { header } from '../utils/header';
 
 /**
  * IBuilderPlugin is a common plugin that render generated code.
@@ -28,7 +29,7 @@ export interface IBuilderPlugin {
   /**
    * prop to indicate to execute the render function in the lifecycle of main process or after
    */
-  readonly lifecycle: "main" | "after";
+  readonly lifecycle: 'main' | 'after';
 
   defaultContractName?: string;
 
@@ -50,21 +51,21 @@ export interface IBuilderPlugin {
  * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
  */
 export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
-  implements IBuilderPlugin {
+implements IBuilderPlugin {
   builder?: TSBuilder;
   options: TOpt;
   utils: UtilMapping;
   /**
    * prop to indicate to execute the render function in the lifecycle of main process or after
    */
-  lifecycle: "main" | "after";
+  lifecycle: 'main' | 'after';
 
   defaultContractName?: string;
 
   constructor(opts?: TOpt, builder?: TSBuilder) {
     this.options = opts;
     this.builder = builder;
-    this.lifecycle = "main";
+    this.lifecycle = 'main';
   }
 
   setBuilder(builder: TSBuilder): void {
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 5fec4c3d..51348114 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -1,24 +1,25 @@
-import { pascal } from "case";
-import * as w from "@cosmwasm/ts-codegen-ast";
-import { ContractInfo, RenderContextBase, RenderContext } from "@cosmwasm/ts-codegen-ast";
-import { BuilderFileType, TSBuilderOptions } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
-import { GetLocalBaseNameByContractName } from "./provider";
+import * as w from '@cosmwasm/ts-codegen-ast';
+import { ContractInfo, RenderContext,RenderContextBase } from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
+import { BuilderFileType, TSBuilderOptions } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
+import { GetLocalBaseNameByContractName } from './provider';
 
 export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOptions> {
   constructor(opt?: TSBuilderOptions) {
     super(opt);
 
-    this.lifecycle = "after";
+    this.lifecycle = 'after';
 
-    this.defaultContractName = "contractContextProviders";
+    this.defaultContractName = 'contractContextProviders';
 
     this.utils = {
-      CosmWasmClient: "@cosmjs/cosmwasm-stargate",
-      SigningCosmWasmClient: "@cosmjs/cosmwasm-stargate",
-      IQueryClientProvider: "__contractContextBase__",
-      ISigningClientProvider: "__contractContextBase__",
-      IMessageComposerProvider: "__contractContextBase__",
+      CosmWasmClient: '@cosmjs/cosmwasm-stargate',
+      SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+      IQueryClientProvider: '__contractContextBase__',
+      ISigningClientProvider: '__contractContextBase__',
+      IMessageComposerProvider: '__contractContextBase__',
     };
   }
 
@@ -50,16 +51,16 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
       return;
     }
 
-    const localname = "contractContextProviders.ts";
+    const localname = 'contractContextProviders.ts';
 
     const body = [];
 
-    context.addUtil("CosmWasmClient");
-    context.addUtil("SigningCosmWasmClient");
+    context.addUtil('CosmWasmClient');
+    context.addUtil('SigningCosmWasmClient');
 
-    context.addUtil("IQueryClientProvider");
-    context.addUtil("ISigningClientProvider");
-    context.addUtil("IMessageComposerProvider");
+    context.addUtil('IQueryClientProvider');
+    context.addUtil('ISigningClientProvider');
+    context.addUtil('IMessageComposerProvider');
 
     for (const name in providerInfos) {
       if (Object.prototype.hasOwnProperty.call(providerInfos, name)) {
@@ -92,8 +93,8 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
 
     return [
       {
-        type: "plugin",
-        pluginType: "contractContextProviders",
+        type: 'plugin',
+        pluginType: 'contractContextProviders',
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index 9419c4e9..d5074407 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -1,8 +1,9 @@
-import { pascal } from "case";
-import * as w from "@cosmwasm/ts-codegen-ast";
-import { ContractInfo, RenderContextBase, RenderContext } from "@cosmwasm/ts-codegen-ast";
-import { BuilderFileType, TSBuilderOptions } from "../builder";
-import { BuilderPluginBase } from "./plugin-base";
+import * as w from '@cosmwasm/ts-codegen-ast';
+import { ContractInfo, RenderContext,RenderContextBase } from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
+import { BuilderFileType, TSBuilderOptions } from '../builder';
+import { BuilderPluginBase } from './plugin-base';
 
 export const GetLocalNameByContractName = (name: string) =>
   `${pascal(name)}.provider.ts`;
@@ -15,9 +16,9 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     super(opt);
 
     this.utils = {
-      ContractBase: "__contractContextBase__",
-      IContractConstructor: "__contractContextBase__",
-      IEmptyClient: "__contractContextBase__",
+      ContractBase: '__contractContextBase__',
+      IContractConstructor: '__contractContextBase__',
+      IEmptyClient: '__contractContextBase__',
     };
   }
 
@@ -49,8 +50,8 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
       return;
     }
 
-    context.addUtil("ContractBase");
-    context.addUtil("IContractConstructor");
+    context.addUtil('ContractBase');
+    context.addUtil('IContractConstructor');
 
     const localname = GetLocalNameByContractName(name);
     let needEmptyClientType = false;
@@ -98,15 +99,15 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
     }
 
     if (needEmptyClientType) {
-      context.addUtil("IEmptyClient");
+      context.addUtil('IEmptyClient');
     }
 
     body.push(w.createProvider(name, providerInfo));
 
     return [
       {
-        type: "plugin",
-        pluginType: "provider",
+        type: 'plugin',
+        pluginType: 'provider',
         localname,
         body,
       },
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
index 1815d342..73e617fa 100644
--- a/packages/ts-codegen/src/plugins/react-query.ts
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -1,14 +1,14 @@
-import { pascal } from 'case';
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import {
-  getMessageProperties,
   ContractInfo,
-  RenderOptions,
+  getMessageProperties,
+  RenderContext,
   RenderContextBase,
-  RenderContext
-} from '@cosmwasm/ts-codegen-ast';
+  RenderOptions} from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
 import { BuilderFileType } from '../builder';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
 
 export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index c2eb347b..f1a7046d 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -1,16 +1,15 @@
-import { pascal } from 'case';
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { findAndParseTypes, findQueryMsg } from '../utils';
 import {
   ContractInfo,
   RenderContext,
   RenderContextBase,
-  UtilMapping,
-  RenderOptions
-} from '@cosmwasm/ts-codegen-ast';
+  RenderOptions,
+  UtilMapping} from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
 import { BuilderFileType } from '../builder';
+import { findAndParseTypes, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
-import { JSONSchema } from '@pyramation/json-schema-to-typescript';
 
 export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
   utils: UtilMapping = {
diff --git a/packages/ts-codegen/src/plugins/types.ts b/packages/ts-codegen/src/plugins/types.ts
index 86836341..ce7458a7 100644
--- a/packages/ts-codegen/src/plugins/types.ts
+++ b/packages/ts-codegen/src/plugins/types.ts
@@ -1,14 +1,15 @@
 import * as t from '@babel/types';
-import { clean } from '../utils/clean';
-import { pascal } from 'case';
-import { findExecuteMsg, findAndParseTypes, findQueryMsg } from '../utils';
 import {
   ContractInfo,
   RenderContext,
   RenderContextBase,
   RenderOptions
 } from '@cosmwasm/ts-codegen-ast';
+import { pascal } from 'case';
+
 import { BuilderFileType } from '../builder';
+import { findAndParseTypes, findExecuteMsg } from '../utils';
+import { clean } from '../utils/clean';
 import { BuilderPluginBase } from './plugin-base';
 
 export class TypesPlugin extends BuilderPluginBase<RenderOptions> {
diff --git a/packages/ts-codegen/src/ts-codegen.ts b/packages/ts-codegen/src/ts-codegen.ts
index eb25d5ba..5ddab182 100755
--- a/packages/ts-codegen/src/ts-codegen.ts
+++ b/packages/ts-codegen/src/ts-codegen.ts
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { cli } from './cli';
-var argv = require('minimist')(process.argv.slice(2));
+let argv = require('minimist')(process.argv.slice(2));
 
 (async () => {
   await cli(argv);
diff --git a/packages/ts-codegen/src/utils/clean.ts b/packages/ts-codegen/src/utils/clean.ts
index 8e258cb4..81217f74 100644
--- a/packages/ts-codegen/src/utils/clean.ts
+++ b/packages/ts-codegen/src/utils/clean.ts
@@ -1,47 +1,47 @@
 export const clean = (obj: any): any => {
-    var copy;
-    // Handle the 3 simple types, and null or undefined
-    if (null == obj || 'object' != typeof obj) return obj;
+  let copy;
+  // Handle the 3 simple types, and null or undefined
+  if (null == obj || 'object' != typeof obj) return obj;
 
-    // Handle Date
-    if (obj instanceof Date) {
-        copy = new Date();
-        copy.setTime(obj.getTime());
-        return copy;
-    }
+  // Handle Date
+  if (obj instanceof Date) {
+    copy = new Date();
+    copy.setTime(obj.getTime());
+    return copy;
+  }
 
-    // Handle Array
-    if (obj instanceof Array) {
-        copy = [];
-        for (var i = 0, len = obj.length; i < len; i++) {
-            copy[i] = clean(obj[i]);
-        }
-        return copy;
+  // Handle Array
+  if (obj instanceof Array) {
+    copy = [];
+    for (let i = 0, len = obj.length; i < len; i++) {
+      copy[i] = clean(obj[i]);
     }
+    return copy;
+  }
 
-    // Handle Object
-    if (obj instanceof Object || typeof obj === 'object') {
-        copy = {};
-        for (var attr in obj) {
-            if (obj.hasOwnProperty(attr)) {
-                switch (attr) {
-                    case 'leadingComments':
-                    case 'trailingComments':
-                    case 'loc':
-                    case 'start':
-                    case 'end':
-                        break;
-                    default:
-                        // @ts-ignore
-                        copy[attr] = clean(obj[attr]);
-                }
-            } else {
-                // @ts-ignore
-                copy[attr] = clean(obj[attr]);
-            }
+  // Handle Object
+  if (obj instanceof Object || typeof obj === 'object') {
+    copy = {};
+    for (let attr in obj) {
+      if (obj.hasOwnProperty(attr)) {
+        switch (attr) {
+        case 'leadingComments':
+        case 'trailingComments':
+        case 'loc':
+        case 'start':
+        case 'end':
+          break;
+        default:
+          // @ts-ignore
+          copy[attr] = clean(obj[attr]);
         }
-        return copy;
+      } else {
+        // @ts-ignore
+        copy[attr] = clean(obj[attr]);
+      }
     }
+    return copy;
+  }
 
-    throw new Error("Unable to copy obj! Its type isn't supported.");
+  throw new Error("Unable to copy obj! Its type isn't supported.");
 };
\ No newline at end of file
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index 51a37785..34fff970 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -1,95 +1,95 @@
-import { pascal } from "case";
+import { pascal } from 'case';
 
 const cleanFor = (str: string) => {
-    /*
+  /*
         1. look at first char after _for_
         2. ONLY if you find capitals after, modify it
     */
-    while (/_[a-z]+_[A-Z]/.test(str)) {
-        const m = str.match(/(_[a-z]+_)[A-Z]/);
-        str = str.replace(m[1], pascal(m[1]));
-    }
+  while (/_[a-z]+_[A-Z]/.test(str)) {
+    const m = str.match(/(_[a-z]+_)[A-Z]/);
+    str = str.replace(m[1], pascal(m[1]));
+  }
 
-    return str;
+  return str;
 };
 
 const cleanNullable = (str: string) => {
-    if (/^Nullable_/.test(str)) {
-        str = str.replace(/^Nullable_/, 'Nullable');
-    }
+  if (/^Nullable_/.test(str)) {
+    str = str.replace(/^Nullable_/, 'Nullable');
+  }
 
-    return str;
+  return str;
 };
 
 export const cleanse = (obj: any): any => {
-    var copy;
-    // Handle the 3 simple types, and null or undefined
-    if (null == obj || 'object' != typeof obj) return obj;
+  let copy;
+  // Handle the 3 simple types, and null or undefined
+  if (null == obj || 'object' != typeof obj) return obj;
 
-    // Handle Date
-    if (obj instanceof Date) {
-        copy = new Date();
-        copy.setTime(obj.getTime());
-        return copy;
-    }
+  // Handle Date
+  if (obj instanceof Date) {
+    copy = new Date();
+    copy.setTime(obj.getTime());
+    return copy;
+  }
 
-    // Handle Array
-    if (obj instanceof Array) {
-        copy = [];
-        for (var i = 0, len = obj.length; i < len; i++) {
-            copy[i] = cleanse(obj[i]);
-        }
-        return copy;
+  // Handle Array
+  if (obj instanceof Array) {
+    copy = [];
+    for (let i = 0, len = obj.length; i < len; i++) {
+      copy[i] = cleanse(obj[i]);
     }
+    return copy;
+  }
 
-    // Handle Object
-    if (obj instanceof Object || typeof obj === 'object') {
-        copy = {};
+  // Handle Object
+  if (obj instanceof Object || typeof obj === 'object') {
+    copy = {};
 
-        // https://github.com/CosmWasm/cosmwasm-typescript-gen/issues/27
-        if (Array.isArray(obj.enum) && obj.enum.length === 0) {
-            delete obj.enum;
-            if (!obj.type) {
-                obj.type = 'string';
-            }
-        }
-
-        for (var attr in obj) {
-            if (obj.hasOwnProperty(attr)) {
+    // https://github.com/CosmWasm/cosmwasm-typescript-gen/issues/27
+    if (Array.isArray(obj.enum) && obj.enum.length === 0) {
+      delete obj.enum;
+      if (!obj.type) {
+        obj.type = 'string';
+      }
+    }
 
-                if (/_for_/.test(attr)) {
-                    // @ts-ignore
-                    copy[cleanFor(attr)] = cleanse(obj[attr]);
-                } else if (/^Nullable_/.test(attr)) {
-                    // @ts-ignore
-                    copy[cleanNullable(attr)] = cleanse(obj[attr]);
-                } else {
-                    switch (attr) {
-                        case 'title':
-                        case '$ref':
-                            if (typeof obj[attr] === 'string') {
-                                // @ts-ignore
-                                copy[attr] = cleanse(
-                                    cleanNullable(cleanFor(obj[attr]))
-                                );
-                            } else {
-                                // @ts-ignore
-                                copy[attr] = cleanse(obj[attr]);
-                            }
-                            break;
-                        default:
-                            // @ts-ignore
-                            copy[attr] = cleanse(obj[attr]);
-                    }
-                }
+    for (let attr in obj) {
+      if (obj.hasOwnProperty(attr)) {
 
+        if (/_for_/.test(attr)) {
+          // @ts-ignore
+          copy[cleanFor(attr)] = cleanse(obj[attr]);
+        } else if (/^Nullable_/.test(attr)) {
+          // @ts-ignore
+          copy[cleanNullable(attr)] = cleanse(obj[attr]);
+        } else {
+          switch (attr) {
+          case 'title':
+          case '$ref':
+            if (typeof obj[attr] === 'string') {
+              // @ts-ignore
+              copy[attr] = cleanse(
+                cleanNullable(cleanFor(obj[attr]))
+              );
             } else {
-                // @ts-ignore
-                copy[attr] = cleanse(obj[attr]);
+              // @ts-ignore
+              copy[attr] = cleanse(obj[attr]);
             }
+            break;
+          default:
+            // @ts-ignore
+            copy[attr] = cleanse(obj[attr]);
+          }
         }
-        return copy;
+
+      } else {
+        // @ts-ignore
+        copy[attr] = cleanse(obj[attr]);
+      }
     }
+    return copy;
+  }
 
-    throw new Error("Unable to copy obj! Its type isn't supported.");
+  throw new Error("Unable to copy obj! Its type isn't supported.");
 };
\ No newline at end of file
diff --git a/packages/ts-codegen/src/utils/contracts.ts b/packages/ts-codegen/src/utils/contracts.ts
index 51fbb245..5061a395 100644
--- a/packages/ts-codegen/src/utils/contracts.ts
+++ b/packages/ts-codegen/src/utils/contracts.ts
@@ -1,4 +1,4 @@
-import { ContractInfo } from "@cosmwasm/ts-codegen-ast";
+import { ContractInfo } from '@cosmwasm/ts-codegen-ast';
 
 export const createDefaultContractInfo = (): ContractInfo => {
   return {
diff --git a/packages/ts-codegen/src/utils/files.ts b/packages/ts-codegen/src/utils/files.ts
index adece2bd..dc8ebe40 100644
--- a/packages/ts-codegen/src/utils/files.ts
+++ b/packages/ts-codegen/src/utils/files.ts
@@ -1,11 +1,12 @@
-import * as t from "@babel/types";
-import { parse, ParserPlugin } from "@babel/parser";
-import { sync as mkdirp } from "mkdirp";
-import { writeFileSync } from "fs";
-import { dirname } from "path";
-import generate from "@babel/generator";
-import { unused } from "./unused";
-import traverse from "@babel/traverse";
+import generate from '@babel/generator';
+import { parse, ParserPlugin } from '@babel/parser';
+import traverse from '@babel/traverse';
+import * as t from '@babel/types';
+import { writeFileSync } from 'fs';
+import { sync as mkdirp } from 'mkdirp';
+import { dirname } from 'path';
+
+import { unused } from './unused';
 
 export const writeAstToFile = (
   outPath: string,
@@ -19,9 +20,9 @@ export const writeAstToFile = (
   const content = generate(ast as any).code;
 
   if (removeUnusedImports) {
-    const plugins: ParserPlugin[] = ["typescript"];
+    const plugins: ParserPlugin[] = ['typescript'];
     const newAst = parse(content, {
-      sourceType: "module",
+      sourceType: 'module',
       plugins,
     });
     traverse(newAst as any, unused);
@@ -51,13 +52,13 @@ export const writeContentToFile = (
   isTsDisable = false,
   isEslintDisable = false
 ) => {
-  let esLintPrefix = "";
-  let tsLintPrefix = "";
+  let esLintPrefix = '';
+  let tsLintPrefix = '';
 
-  let nameWithoutPath = filename.replace(outPath, "");
+  let nameWithoutPath = filename.replace(outPath, '');
   // strip off leading slash
-  if (nameWithoutPath.startsWith("/"))
-    nameWithoutPath = nameWithoutPath.replace(/^\//, "");
+  if (nameWithoutPath.startsWith('/'))
+    nameWithoutPath = nameWithoutPath.replace(/^\//, '');
 
   if (isTsDisable) {
     tsLintPrefix = `//@ts-nocheck\n`;
diff --git a/packages/ts-codegen/src/utils/header.ts b/packages/ts-codegen/src/utils/header.ts
index cfac708f..19d2cde8 100644
--- a/packages/ts-codegen/src/utils/header.ts
+++ b/packages/ts-codegen/src/utils/header.ts
@@ -1,4 +1,4 @@
-import { readAndParsePackageJson } from "./package";
+import { readAndParsePackageJson } from './package';
 
 const pkg = readAndParsePackageJson();
 
diff --git a/packages/ts-codegen/src/utils/package.ts b/packages/ts-codegen/src/utils/package.ts
index 8aa55e11..23150c02 100644
--- a/packages/ts-codegen/src/utils/package.ts
+++ b/packages/ts-codegen/src/utils/package.ts
@@ -1,5 +1,5 @@
-import { join, dirname, basename, extname } from "path";
-import { readFileSync, existsSync } from "fs";
+import { existsSync,readFileSync } from 'fs';
+import { dirname,join } from 'path';
 
 // need to search due to the dist/ folder and src/, etc. 
 function findPackageJson(currentDir: string) {
diff --git a/packages/ts-codegen/src/utils/parse.ts b/packages/ts-codegen/src/utils/parse.ts
index 627bcdc3..5bff35dd 100644
--- a/packages/ts-codegen/src/utils/parse.ts
+++ b/packages/ts-codegen/src/utils/parse.ts
@@ -1,45 +1,45 @@
-import babelTraverse from '@babel/traverse';
 import { parse, ParserPlugin } from '@babel/parser';
+import babelTraverse from '@babel/traverse';
 
 export const parser = (codes: string[]) => {
 
-    const hash: Record<string, any> = {};
-    codes.forEach(code => {
+  const hash: Record<string, any> = {};
+  codes.forEach(code => {
 
-        const plugins: ParserPlugin[] = [
-            'typescript',
-        ];
+    const plugins: ParserPlugin[] = [
+      'typescript',
+    ];
 
-        const ast = parse(code, {
-            sourceType: 'module',
-            plugins
-        });
-
-        const visitor = visitorFn({
-            addType(key: string, node: any) {
-                hash[key] = node;
-            }
-        })
-        babelTraverse(ast as any, visitor);
+    const ast = parse(code, {
+      sourceType: 'module',
+      plugins
     });
 
-    return hash;
+    const visitor = visitorFn({
+      addType(key: string, node: any) {
+        hash[key] = node;
+      }
+    })
+    babelTraverse(ast as any, visitor);
+  });
+
+  return hash;
 
 }
 
 const visitorFn = (parser: any) => ({
-    TSTypeAliasDeclaration(path: any) {
-        parser.addType(path.node.id.name, path.parentPath.node);
-        // if (path.node.id.name.endsWith('For_Empty')) {
-        //     const newName = path.node.id.name.replace(/For_Empty$/, '_for_Empty');
-        //     path.parentPath.node.declaration.id.name = newName;
-        //     parser.addType(newName, path.parentPath.node);
-        // } else {
-        //     parser.addType(path.node.id.name, path.parentPath.node);
-        // }
-    },
-    TSInterfaceDeclaration(path: any) {
-        parser.addType(path.node.id.name, path.parentPath.node);
-    }
+  TSTypeAliasDeclaration(path: any) {
+    parser.addType(path.node.id.name, path.parentPath.node);
+    // if (path.node.id.name.endsWith('For_Empty')) {
+    //     const newName = path.node.id.name.replace(/For_Empty$/, '_for_Empty');
+    //     path.parentPath.node.declaration.id.name = newName;
+    //     parser.addType(newName, path.parentPath.node);
+    // } else {
+    //     parser.addType(path.node.id.name, path.parentPath.node);
+    // }
+  },
+  TSInterfaceDeclaration(path: any) {
+    parser.addType(path.node.id.name, path.parentPath.node);
+  }
 });
 
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 237172c7..33ab7961 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -1,104 +1,105 @@
-import { sync as glob } from 'glob';
+import { ContractInfo } from '@cosmwasm/ts-codegen-ast';
+import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
+import { compile } from '@pyramation/json-schema-to-typescript';
 import { readFileSync } from 'fs';
+import { sync as glob } from 'glob';
+
 import { cleanse } from './cleanse';
-import { compile } from '@pyramation/json-schema-to-typescript';
 import { parser } from './parse';
-import { ContractInfo } from '@cosmwasm/ts-codegen-ast';
-import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
 interface ReadSchemaOpts {
     schemaDir: string;
     clean?: boolean;
 };
 
 export const readSchemas = async ({
-    schemaDir, clean = true
+  schemaDir, clean = true
 }: ReadSchemaOpts): Promise<ContractInfo> => {
-    const fn = clean ? cleanse : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
-    const files = glob(schemaDir + '/**/*.json')
-        .filter(file => !file.match(/\/raw\//));
+  const fn = clean ? cleanse : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
+  const files = glob(schemaDir + '/**/*.json')
+    .filter(file => !file.match(/\/raw\//));
 
-    const schemas: JSONSchema[] = files
-        .map(file => JSON.parse(readFileSync(file, 'utf-8')));
+  const schemas: JSONSchema[] = files
+    .map(file => JSON.parse(readFileSync(file, 'utf-8')));
 
-    if (schemas.length > 1) {
-        // legacy
-        // TODO add console.warn here
-        return {
-            schemas: fn(schemas)
-        };
-    }
+  if (schemas.length > 1) {
+    // legacy
+    // TODO add console.warn here
+    return {
+      schemas: fn(schemas)
+    };
+  }
 
-    if (schemas.length === 0) {
-        throw new Error('Error [too few files]: requires one schema file per contract');
-    }
+  if (schemas.length === 0) {
+    throw new Error('Error [too few files]: requires one schema file per contract');
+  }
 
-    if (schemas.length !== 1) {
-        throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
-    }
+  if (schemas.length !== 1) {
+    throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
+  }
 
-    const idlObject: Partial<IDLObject> = schemas[0] as Partial<IDLObject>;
-    const {
-        contract_name,
-        contract_version,
-        idl_version,
-        responses,
-        instantiate,
-        execute,
-        query,
-        migrate,
-        sudo
-    } = idlObject;
+  const idlObject: Partial<IDLObject> = schemas[0] as Partial<IDLObject>;
+  const {
+    contract_name,
+    contract_version,
+    idl_version,
+    responses,
+    instantiate,
+    execute,
+    query,
+    migrate,
+    sudo
+  } = idlObject;
 
-    if (typeof idl_version !== 'string') {
-        // legacy
-        return {
-            schemas: fn(schemas)
-        };
-    }
-
-    // TODO use contract_name, etc.
-    const idl: Partial<IDLObject> = {
-        instantiate,
-        execute,
-        query,
-        migrate,
-        sudo
-    };
+  if (typeof idl_version !== 'string') {
+    // legacy
     return {
-        schemas: [
-            ...Object.values(fn(idl)).filter(Boolean),
-            ...Object.values(fn({ ...responses })).filter(Boolean)
-        ],
-        responses,
-        idlObject
+      schemas: fn(schemas)
     };
+  }
+
+  // TODO use contract_name, etc.
+  const idl: Partial<IDLObject> = {
+    instantiate,
+    execute,
+    query,
+    migrate,
+    sudo
+  };
+  return {
+    schemas: [
+      ...Object.values(fn(idl)).filter(Boolean),
+      ...Object.values(fn({ ...responses })).filter(Boolean)
+    ],
+    responses,
+    idlObject
+  };
 };
 
 export const findQueryMsg = (schemas: JSONSchema[]): QueryMsg => {
-    const queryMsg = schemas.find(schema => schema.title === 'QueryMsg');
-    return queryMsg as QueryMsg;
+  const queryMsg = schemas.find(schema => schema.title === 'QueryMsg');
+  return queryMsg as QueryMsg;
 };
 
 export const findExecuteMsg = (schemas: JSONSchema[]): ExecuteMsg => {
-    const executeMsg = schemas.find(schema =>
-        schema.title.startsWith('ExecuteMsg')
-    );
-    return executeMsg as ExecuteMsg;
+  const executeMsg = schemas.find(schema =>
+    schema.title.startsWith('ExecuteMsg')
+  );
+  return executeMsg as ExecuteMsg;
 };
 
 export const findAndParseTypes = async (schemas: JSONSchema[]) => {
-    const Types = schemas;
-    const allTypes = [];
-    for (const typ in Types) {
-        if (Types[typ].definitions) {
-            for (const key of Object.keys(Types[typ].definitions)) {
-                // set title
-                Types[typ].definitions[key].title = key;
-            }
-        }
-        const result = await compile(Types[typ] as any, Types[typ].title);
-        allTypes.push(result);
+  const Types = schemas;
+  const allTypes = [];
+  for (const typ in Types) {
+    if (Types[typ].definitions) {
+      for (const key of Object.keys(Types[typ].definitions)) {
+        // set title
+        Types[typ].definitions[key].title = key;
+      }
     }
-    const typeHash = parser(allTypes);
-    return typeHash;
+    const result = await compile(Types[typ] as any, Types[typ].title);
+    allTypes.push(result);
+  }
+  const typeHash = parser(allTypes);
+  return typeHash;
 };
diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
index a91fa369..3b22497b 100644
--- a/packages/ts-codegen/test-utils/index.ts
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -3,25 +3,22 @@ import {
   ContractInfo,
   ReactQueryOptions,
   RenderOptions,
-  TSTypesOptions,
-} from "@cosmwasm/ts-codegen-ast";
-import { ReactQueryPlugin } from "../src/plugins/react-query";
-import { TypesPlugin } from "../src/plugins/types";
-import { ClientPlugin } from "../src/plugins/client";
-import { MessageComposerPlugin } from "../src/plugins/message-composer";
-import { RecoilPlugin } from "../src/plugins/recoil";
-import { MessageBuilderPlugin } from "../src/plugins/message-builder";
-import { ContractsContextProviderPlugin } from "../src/plugins/provider";
-import { ContractsProviderBundlePlugin } from "../src/plugins/provider-bundle";
-import { TSBuilderOptions } from "../src/builder";
-import { createDefaultContractInfo } from "../src/utils/contracts";
+} from '@cosmwasm/ts-codegen-ast';
+import deepmerge from 'deepmerge';
+
+import { ClientPlugin } from '../src/plugins/client';
+import { MessageBuilderPlugin } from '../src/plugins/message-builder';
+import { MessageComposerPlugin } from '../src/plugins/message-composer';
+import { ReactQueryPlugin } from '../src/plugins/react-query';
+import { RecoilPlugin } from '../src/plugins/recoil';
+import { TypesPlugin } from '../src/plugins/types';
+import { createDefaultContractInfo } from '../src/utils/contracts';
 import {
-  TestContractsContextProviderPlugin,
   TestClientPlugin,
-  TestMessageComposerPlugin,
+  TestContractsContextProviderPlugin,
   TestContractsProviderBundlePlugin,
-} from "./testPlugins";
-import deepmerge from "deepmerge";
+  TestMessageComposerPlugin,
+} from './testPlugins';
 
 export const testDefaultOptions: RenderOptions = {
   enabled: true,
@@ -47,7 +44,7 @@ export const testDefaultOptions: RenderOptions = {
   reactQuery: {
     enabled: true,
     optionalClient: false,
-    version: "v4",
+    version: 'v4',
     mutations: false,
     camelize: true,
     queryKeys: false,
diff --git a/packages/ts-codegen/test-utils/testPlugins.ts b/packages/ts-codegen/test-utils/testPlugins.ts
index 3ddff983..e6599ae1 100644
--- a/packages/ts-codegen/test-utils/testPlugins.ts
+++ b/packages/ts-codegen/test-utils/testPlugins.ts
@@ -4,10 +4,11 @@ import {
   RenderContext,
   RenderContextBase,
   RenderOptions,
-} from "@cosmwasm/ts-codegen-ast";
-import { ClientPlugin, MessageComposerPlugin, TSBuilderOptions } from "../src";
-import { ContractsContextProviderPlugin } from "../src/plugins/provider";
-import { ContractsProviderBundlePlugin } from "../src/plugins/provider-bundle";
+} from '@cosmwasm/ts-codegen-ast';
+
+import { ClientPlugin, MessageComposerPlugin, TSBuilderOptions } from '../src';
+import { ContractsContextProviderPlugin } from '../src/plugins/provider';
+import { ContractsProviderBundlePlugin } from '../src/plugins/provider-bundle';
 
 export class TestClientPlugin extends ClientPlugin {
   builderContext: BuilderContext;
diff --git a/packages/types/.eslintrc.js b/packages/types/.eslintrc.js
deleted file mode 100644
index 2718e8bc..00000000
--- a/packages/types/.eslintrc.js
+++ /dev/null
@@ -1,71 +0,0 @@
-module.exports = {
-  plugins: ['prettier'],
-  extends: ['eslint:recommended', 'prettier'],
-  parser: '@babel/eslint-parser',
-  parserOptions: {
-    ecmaVersion: 11,
-    requireConfigFile: false,
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true
-    }
-  },
-  env: {
-    es6: true,
-    browser: true,
-    node: true,
-    jest: true
-  },
-  rules: {
-    'no-debugger': 2,
-    'no-alert': 2,
-    'no-await-in-loop': 0,
-    'no-prototype-builtins': 0,
-    'no-return-assign': ['error', 'except-parens'],
-    'no-restricted-syntax': [
-      2,
-      'ForInStatement',
-      'LabeledStatement',
-      'WithStatement'
-    ],
-    'no-unused-vars': [
-      0,
-      {
-        ignoreSiblings: true,
-        argsIgnorePattern: 'React|res|next|^_'
-      }
-    ],
-    'prefer-const': [
-      'error',
-      {
-        destructuring: 'all'
-      }
-    ],
-    'no-unused-expressions': [
-      2,
-      {
-        allowTaggedTemplates: true
-      }
-    ],
-    'no-console': 1,
-    'comma-dangle': 2,
-    'jsx-quotes': [2, 'prefer-double'],
-    'linebreak-style': ['error', 'unix'],
-    quotes: [
-      2,
-      'single',
-      {
-        avoidEscape: true,
-        allowTemplateLiterals: true
-      }
-    ],
-    'prettier/prettier': [
-      'error',
-      {
-        trailingComma: 'none',
-        singleQuote: true,
-        printWidth: 80
-      }
-    ]
-  }
-};
diff --git a/packages/types/jest.config.js b/packages/types/jest.config.js
index 0aa3aaa4..057a9420 100644
--- a/packages/types/jest.config.js
+++ b/packages/types/jest.config.js
@@ -1,18 +1,18 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-    preset: "ts-jest",
-    testEnvironment: "node",
-    transform: {
-        "^.+\\.tsx?$": [
-            "ts-jest",
-            {
-                babelConfig: false,
-                tsconfig: "tsconfig.json",
-            },
-        ],
-    },
-    transformIgnorePatterns: [`/node_modules/*`],
-    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-    moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-    modulePathIgnorePatterns: ["dist/*"]
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        babelConfig: false,
+        tsconfig: 'tsconfig.json',
+      },
+    ],
+  },
+  transformIgnorePatterns: [`/node_modules/*`],
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  modulePathIgnorePatterns: ['dist/*']
 };
diff --git a/packages/types/package.json b/packages/types/package.json
index 1e0ca268..e53c6d92 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -17,6 +17,7 @@
     "clean": "rimraf dist/**",
     "prepare": "npm run build",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
+    "lint": "eslint . --fix",
     "test": "jest --passWithNoTests",
     "test:watch": "jest --watch --passWithNoTests"
   },
diff --git a/packages/types/src/idl.ts b/packages/types/src/idl.ts
index 5c48c3a6..deaa9c87 100644
--- a/packages/types/src/idl.ts
+++ b/packages/types/src/idl.ts
@@ -1,4 +1,4 @@
-import { ExecuteMsg, JSONSchema, QueryMsg } from "./types";
+import { ExecuteMsg, JSONSchema, QueryMsg } from './types';
 
 export interface KeyedSchema {
   [key: string]: JSONSchema;
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
index a2985cfe..f367b7f6 100644
--- a/packages/types/src/types.ts
+++ b/packages/types/src/types.ts
@@ -11,7 +11,7 @@ export interface Interface {
 
 export interface QueryMsg {
   $schema: string;
-  title: "QueryMsg";
+  title: 'QueryMsg';
   oneOf?: any;
   allOf?: any;
   anyOf?: any;
@@ -19,7 +19,7 @@ export interface QueryMsg {
 
 export interface ExecuteMsg {
   $schema: string;
-  title: "ExecuteMsg" | "ExecuteMsg_for_Empty";
+  title: 'ExecuteMsg' | 'ExecuteMsg_for_Empty';
   oneOf?: any;
   allOf?: any;
   anyOf?: any;
diff --git a/yarn.lock b/yarn.lock
index 87425fa8..755dfb0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -461,7 +461,7 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
@@ -1551,7 +1551,7 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.11", "@types/json-schema@^7.0.12":
+"@types/json-schema@^7.0.11":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -1618,11 +1618,6 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/semver@^7.5.0":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
 "@types/shelljs@0.8.15":
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.15.tgz#22c6ab9dfe05cec57d8e6cb1a95ea173aee9fcac"
@@ -1648,91 +1643,86 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^6.18.1":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
-  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
+"@typescript-eslint/eslint-plugin@^7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz#07854a236f107bb45cbf4f62b89474cbea617f50"
+  integrity sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==
   dependencies:
-    "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/type-utils" "6.21.0"
-    "@typescript-eslint/utils" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.10.0"
+    "@typescript-eslint/type-utils" "7.10.0"
+    "@typescript-eslint/utils" "7.10.0"
+    "@typescript-eslint/visitor-keys" "7.10.0"
     graphemer "^1.4.0"
-    ignore "^5.2.4"
+    ignore "^5.3.1"
     natural-compare "^1.4.0"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@^6.18.1":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
-  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
+"@typescript-eslint/parser@^7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.10.0.tgz#e6ac1cba7bc0400a4459e7eb5b23115bd71accfb"
+  integrity sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/scope-manager" "7.10.0"
+    "@typescript-eslint/types" "7.10.0"
+    "@typescript-eslint/typescript-estree" "7.10.0"
+    "@typescript-eslint/visitor-keys" "7.10.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
+"@typescript-eslint/scope-manager@7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.10.0.tgz#054a27b1090199337a39cf755f83d9f2ce26546b"
+  integrity sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.10.0"
+    "@typescript-eslint/visitor-keys" "7.10.0"
 
-"@typescript-eslint/type-utils@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
-  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
+"@typescript-eslint/type-utils@7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.10.0.tgz#8a75accce851d0a331aa9331268ef64e9b300270"
+  integrity sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/utils" "6.21.0"
+    "@typescript-eslint/typescript-estree" "7.10.0"
+    "@typescript-eslint/utils" "7.10.0"
     debug "^4.3.4"
-    ts-api-utils "^1.0.1"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
+"@typescript-eslint/types@7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.10.0.tgz#da92309c97932a3a033762fd5faa8b067de84e3b"
+  integrity sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==
 
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
+"@typescript-eslint/typescript-estree@7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.10.0.tgz#6dcdc5de3149916a6a599fa89dde5c471b88b8bb"
+  integrity sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.10.0"
+    "@typescript-eslint/visitor-keys" "7.10.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+"@typescript-eslint/utils@7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.10.0.tgz#8ee43e5608c9f439524eaaea8de5b358b15c51b3"
+  integrity sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    semver "^7.5.4"
+    "@typescript-eslint/scope-manager" "7.10.0"
+    "@typescript-eslint/types" "7.10.0"
+    "@typescript-eslint/typescript-estree" "7.10.0"
 
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
+"@typescript-eslint/visitor-keys@7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.10.0.tgz#2af2e91e73a75dd6b70b4486c48ae9d38a485a78"
+  integrity sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    eslint-visitor-keys "^3.4.1"
+    "@typescript-eslint/types" "7.10.0"
+    eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
@@ -3045,15 +3035,15 @@ eslint-config-prettier@^9.1.0:
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
   integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
 
-eslint-plugin-simple-import-sort@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
-  integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
+eslint-plugin-simple-import-sort@^12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.0.tgz#8186ad55474d2f5c986a2f1bf70625a981e30d05"
+  integrity sha512-Y2fqAfC11TcG/WP3TrI1Gi3p3nc8XJyEOJYHyEPEGI/UAgNx6akxxlX74p7SbAQdLcgASKhj8M0GKvH3vq/+ig==
 
-eslint-plugin-unused-imports@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.1.0.tgz#db015b569d3774e17a482388c95c17bd303bc602"
-  integrity sha512-9l1YFCzXKkw1qtAru1RWUtG2EVDZY0a0eChKXcL+EZ5jitG7qxdctu4RnvhOJHv4xfmUf7h+JJPINlVpGhZMrw==
+eslint-plugin-unused-imports@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.0.0.tgz#93f3a7ee6088221e4a1d7127866e05d5917a9f65"
+  integrity sha512-mzM+y2B7XYpQryVa1usT+Y/BdNAtAZiXzwpSyDCboFoJN/LZRN67TNvQxKtuTK/Aplya3sLNQforiubzPPaIcQ==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
@@ -3928,7 +3918,7 @@ ignore-walk@^6.0.0:
   dependencies:
     minimatch "^9.0.0"
 
-ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4:
+ignore@^5.0.4, ignore@^5.2.0, ignore@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
@@ -5263,13 +5253,6 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -5298,7 +5281,7 @@ minimatch@^8.0.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0, minimatch@^9.0.1:
+minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.4:
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
   integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
@@ -6680,6 +6663,11 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.6.0:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -7189,7 +7177,7 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-ts-api-utils@^1.0.1:
+ts-api-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==

From 3ebb613033a1985b912c1eb3b9741aeb03829966 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 15:49:31 +0200
Subject: [PATCH 235/287] eslint

---
 .eslintrc.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 1b8ad4a3..77dfe9ff 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -27,6 +27,7 @@
       2
     ],
     "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
+    "quote-props": ["error", "as-needed"],
     "simple-import-sort/imports": 1,
     "simple-import-sort/exports": 1,
     "unused-imports/no-unused-imports": 1,

From db099953230da377ad5b52db08bf12f72939afd5 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 16:30:49 +0200
Subject: [PATCH 236/287] semi-colons (old skool)

---
 .eslintrc.json                                |  1 +
 .../ts-client.arrays-item-tuples.test.ts      |  8 +--
 .../client/ts-client.arrays-ref.test.ts       | 12 ++--
 .../__tests__/client/ts-client.arrays.test.ts | 16 ++---
 .../client/ts-client.cw-named-groups.test.ts  | 12 ++--
 .../ts-client.cw-proposal-single.test.ts      | 12 ++--
 .../client/ts-client.empty-enums.test.ts      |  6 +-
 .../client/ts-client.issue-101.test.ts        |  4 +-
 .../client/ts-client.issue-103.test.ts        | 24 +++----
 .../client/ts-client.issue-71.test.ts         | 10 +--
 .../client/ts-client.issue-98.test.ts         | 12 ++--
 .../__tests__/client/ts-client.issues.test.ts |  8 +--
 .../client/ts-client.overrides.test.ts        | 12 ++--
 .../__tests__/client/ts-client.sg721.test.ts  | 12 ++--
 .../ast/__tests__/client/ts-client.test.ts    | 54 +++++++--------
 .../__tests__/client/ts-client.wager.test.ts  | 14 ++--
 .../message-builder/message-builder.test.ts   | 14 ++--
 .../message-composer/message-composer.test.ts |  4 +-
 .../ast/__tests__/provider/provider.test.ts   |  2 +-
 .../__tests__/react-query/react-query.test.ts | 20 +++---
 packages/ast/src/context/context.ts           |  6 +-
 packages/ast/src/context/imports.ts           | 22 +++----
 .../src/message-builder/message-builder.ts    |  2 +-
 packages/ast/src/recoil/recoil.ts             | 36 +++++-----
 packages/ast/src/utils/babel.ts               | 66 +++++++++----------
 packages/ast/src/utils/ref.ts                 |  4 +-
 packages/ast/src/utils/types.ts               | 30 ++++-----
 packages/ast/test-utils/utils.ts              | 10 +--
 packages/ts-codegen/__tests__/bundler.test.ts |  6 +-
 packages/ts-codegen/__tests__/cleanse.test.ts |  6 +-
 .../ts-codegen/__tests__/ts-codegen.test.ts   | 40 +++++------
 packages/ts-codegen/src/builder/builder.ts    |  8 +--
 packages/ts-codegen/src/bundler/bundler.ts    |  6 +-
 packages/ts-codegen/src/commands/generate.ts  | 10 +--
 packages/ts-codegen/src/commands/install.ts   |  6 +-
 packages/ts-codegen/src/plugins/index.ts      | 14 ++--
 packages/ts-codegen/src/utils/parse.ts        |  4 +-
 packages/ts-codegen/src/utils/unused.ts       | 30 ++++-----
 38 files changed, 282 insertions(+), 281 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 77dfe9ff..734ab0c7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -28,6 +28,7 @@
     ],
     "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
     "quote-props": ["error", "as-needed"],
+    "semi": ["error", "always"],
     "simple-import-sort/imports": 1,
     "simple-import-sort/exports": 1,
     "unused-imports/no-unused-imports": 1,
diff --git a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
index 423acb74..9c60d6c3 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
@@ -1,7 +1,7 @@
 import {
   createExecuteClass,
   createExecuteInterface,
-  createQueryClass} from '../../src'
+  createQueryClass} from '../../src';
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
 const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
@@ -17,7 +17,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -27,7 +27,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -36,5 +36,5 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
index 99931b63..ed996007 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
@@ -3,7 +3,7 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays-ref.json');
@@ -14,8 +14,8 @@ it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(
     ctx,
     queryMsg
-  ))
-})
+  ));
+});
 
 
 it('query classes', () => {
@@ -24,7 +24,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -34,7 +34,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -43,5 +43,5 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.arrays.test.ts b/packages/ast/__tests__/client/ts-client.arrays.test.ts
index b67472af..1827d813 100644
--- a/packages/ast/__tests__/client/ts-client.arrays.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays.test.ts
@@ -3,7 +3,7 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { getPropertyType } from '../../src/utils';
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
@@ -17,16 +17,16 @@ it('getPropertyType', () => {
     queryMsg.oneOf[0].properties.update_edges,
     'edges3'
   );
-  expectCode(ast.type)
+  expectCode(ast.type);
   // printCode(ast.type)
-})
+});
 
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(
     ctx,
     queryMsg
-  ))
-})
+  ));
+});
 
 
 it('query classes', () => {
@@ -35,7 +35,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -45,7 +45,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -54,5 +54,5 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
index 698daf03..a7476c47 100644
--- a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
@@ -3,7 +3,7 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 const execMsg = getMsgExecuteLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
 const queryMsg = getMsgQueryLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
@@ -13,8 +13,8 @@ it('execute_msg', () => {
   expectCode(createTypeInterface(
     ctx,
     execMsg
-  ))
-})
+  ));
+});
 
 
 it('query classes', () => {
@@ -23,7 +23,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -33,7 +33,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -42,5 +42,5 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
index ae28b246..62f4e3b7 100644
--- a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
@@ -3,7 +3,7 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
 const execMsg = getMsgExecuteLegacyFixture('daodao/cw-proposal-single', '/execute_msg.json');
@@ -14,8 +14,8 @@ it('execute_msg_for', () => {
   expectCode(createTypeInterface(
     ctx,
     execMsg
-  ))
-})
+  ));
+});
 
 
 it('query classes', () => {
@@ -25,7 +25,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -36,7 +36,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -46,5 +46,5 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
index 5de3fd1a..6b703788 100644
--- a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
+++ b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
@@ -1,7 +1,7 @@
 import {
   createQueryClass,
   createQueryInterface
-} from '../../src'
+} from '../../src';
 import { expectCode, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
 const queryMsg = getMsgQueryLegacyFixture('daodao/cw-admin-factory', '/query_msg.json');
@@ -13,7 +13,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('query interface', () => {
@@ -23,5 +23,5 @@ it('query interface', () => {
       'ReadOnlyInstance',
       queryMsg
     )
-  )
+  );
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-101.test.ts b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
index c4e4f916..713519f5 100644
--- a/packages/ast/__tests__/client/ts-client.issue-101.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
@@ -13,7 +13,7 @@ it('execute interfaces no extends', () => {
     'OwnershipInstance',
     null,
     ownership as ExecuteMsg
-  ))
+  ));
 });
 
 it('ownership client with tuple', () => {
@@ -24,7 +24,7 @@ it('ownership client with tuple', () => {
     'OwnershipInstance',
     null,
     ownership as ExecuteMsg
-  ))
+  ));
 });
 
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-103.test.ts b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
index 3afbea5a..526aef67 100644
--- a/packages/ast/__tests__/client/ts-client.issue-103.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
@@ -22,8 +22,8 @@ describe('query', () => {
     expectCode(createTypeInterface(
       queryCtx,
       queryMessage
-    ))
-  })
+    ));
+  });
 
 
   it('query classes', () => {
@@ -32,14 +32,14 @@ describe('query', () => {
       'QueryClient',
       'ReadOnlyInstance',
       queryMessage
-    ))
+    ));
   });
 
   it('query classes response', () => {
     expectCode(createTypeInterface(
       queryCtx,
       queryMessage
-    ))
+    ));
   });
 
   it('execute classes array types', () => {
@@ -49,7 +49,7 @@ describe('query', () => {
       'Instance',
       null,
       queryMessage
-    ))
+    ));
   });
 
   it('execute interfaces no extends', () => {
@@ -58,7 +58,7 @@ describe('query', () => {
       'SG721Instance',
       null,
       queryMessage
-    ))
+    ));
   });
 
 });
@@ -68,8 +68,8 @@ describe('execute', () => {
     expectCode(createTypeInterface(
       executeCtx,
       executeMessage
-    ))
-  })
+    ));
+  });
 
 
   it('query classes', () => {
@@ -78,7 +78,7 @@ describe('execute', () => {
       'QueryClient',
       'ReadOnlyInstance',
       executeMessage
-    ))
+    ));
   });
 
   it('query classes response', () => {
@@ -86,7 +86,7 @@ describe('execute', () => {
       executeCtx,
       // @ts-ignore
       queryMessage
-    ))
+    ));
   });
 
   it('execute classes array types', () => {
@@ -96,7 +96,7 @@ describe('execute', () => {
       'Instance',
       null,
       executeMessage
-    ))
+    ));
   });
 
   it('execute interfaces no extends', () => {
@@ -105,7 +105,7 @@ describe('execute', () => {
       'SG721Instance',
       null,
       executeMessage
-    ))
+    ));
   });
 
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-71.test.ts b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
index d6fb8fb0..087d46c6 100644
--- a/packages/ast/__tests__/client/ts-client.issue-71.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
@@ -6,8 +6,8 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
-import { globLegacyContracts, makeContext } from '../../test-utils'
+} from '../../src';
+import { globLegacyContracts, makeContext } from '../../test-utils';
 import { expectCode } from '../../test-utils';
 
 const contracts = globLegacyContracts('issues/71');
@@ -27,7 +27,7 @@ cases('query classes', async opts => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
         opts.content as QueryMsg
-  ))
+  ));
 }, contracts);
 
 cases('execute class', async opts => {
@@ -38,7 +38,7 @@ cases('execute class', async opts => {
     'SG721Instance',
     null,
         opts.content as ExecuteMsg
-  ))
+  ));
 }, contracts);
 
 cases('execute interface', async opts => {
@@ -48,6 +48,6 @@ cases('execute interface', async opts => {
     'SG721Instance',
     null,
         opts.content as ExecuteMsg
-  ))
+  ));
 }, contracts);
 
diff --git a/packages/ast/__tests__/client/ts-client.issue-98.test.ts b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
index d023f699..509ed900 100644
--- a/packages/ast/__tests__/client/ts-client.issue-98.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
@@ -10,15 +10,15 @@ import { expectCode, globIdlBasedContracts,makeContext } from '../../test-utils'
 
 const contract = globIdlBasedContracts('issues/98').find(c => c.name === '/schema.json')!;
 
-const message = contract.content.query
+const message = contract.content.query;
 const ctx = makeContext(message);
 
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(
     ctx,
     message
-  ))
-})
+  ));
+});
 
 
 it('query classes', () => {
@@ -27,7 +27,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     message
-  ))
+  ));
 });
 
 // it('query classes response', () => {
@@ -45,7 +45,7 @@ it('execute classes array types', () => {
     null,
         // @ts-ignore
         message as ExecuteMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -55,5 +55,5 @@ it('execute interfaces no extends', () => {
     null,
     // @ts-ignore
     message
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.issues.test.ts b/packages/ast/__tests__/client/ts-client.issues.test.ts
index 409e2143..d6d58df4 100644
--- a/packages/ast/__tests__/client/ts-client.issues.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issues.test.ts
@@ -6,7 +6,7 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { expectCode,globLegacyContracts, makeContext } from '../../test-utils';
 
 const contracts = globLegacyContracts('issues/55');
@@ -27,7 +27,7 @@ cases('query classes', async opts => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
         opts.content as QueryMsg
-  ))
+  ));
 }, contracts);
 
 cases('execute class', async opts => {
@@ -38,7 +38,7 @@ cases('execute class', async opts => {
     'SG721Instance',
     null,
         opts.content as ExecuteMsg
-  ))
+  ));
 }, contracts);
 
 cases('execute interface', async opts => {
@@ -48,6 +48,6 @@ cases('execute interface', async opts => {
     'SG721Instance',
     null,
         opts.content as ExecuteMsg
-  ))
+  ));
 }, contracts);
 
diff --git a/packages/ast/__tests__/client/ts-client.overrides.test.ts b/packages/ast/__tests__/client/ts-client.overrides.test.ts
index 6419a4d0..6b28f5b4 100644
--- a/packages/ast/__tests__/client/ts-client.overrides.test.ts
+++ b/packages/ast/__tests__/client/ts-client.overrides.test.ts
@@ -1,6 +1,6 @@
 import {
   createExecuteClass
-} from '../../src'
+} from '../../src';
 import { expectCode, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
 
 const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
@@ -15,7 +15,7 @@ it('Impl, execExtends, noExtendsClass', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('Impl, execExtends, ExtendsClass', () => {
@@ -27,7 +27,7 @@ it('Impl, execExtends, ExtendsClass', () => {
     'SG721Instance',
     'ExtendsClassName',
     execMsg
-  ))
+  ));
 });
 
 it('noImpl, execExtends, ExtendsClass', () => {
@@ -39,7 +39,7 @@ it('noImpl, execExtends, ExtendsClass', () => {
     'SG721Instance',
     'ExtendsClassName',
     execMsg
-  ))
+  ));
 });
 
 it('noImpl, noExecExtends, ExtendsClass', () => {
@@ -51,7 +51,7 @@ it('noImpl, noExecExtends, ExtendsClass', () => {
     'SG721Instance',
     'ExtendsClassName',
     execMsg
-  ))
+  ));
 });
 
 it('noImpl, noExecExtends, noExtendsClass', () => {
@@ -63,5 +63,5 @@ it('noImpl, noExecExtends, noExtendsClass', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.sg721.test.ts b/packages/ast/__tests__/client/ts-client.sg721.test.ts
index 700bb4df..41eca6ce 100644
--- a/packages/ast/__tests__/client/ts-client.sg721.test.ts
+++ b/packages/ast/__tests__/client/ts-client.sg721.test.ts
@@ -3,7 +3,7 @@ import {
   createExecuteInterface,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
 const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
@@ -14,8 +14,8 @@ it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(
     ctx,
     execMsg
-  ))
-})
+  ));
+});
 
 
 it('query classes', () => {
@@ -24,7 +24,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsg
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -34,7 +34,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -43,5 +43,5 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     execMsg
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.test.ts b/packages/ast/__tests__/client/ts-client.test.ts
index 5ea3a314..8a5d098a 100644
--- a/packages/ast/__tests__/client/ts-client.test.ts
+++ b/packages/ast/__tests__/client/ts-client.test.ts
@@ -29,7 +29,7 @@ it('approval_response', () => {
   expectCode(createTypeInterface(
     ctx,
     approvalResponseData
-  ))
+  ));
 });
 
 it('all_nft_info_response', () => {
@@ -37,71 +37,71 @@ it('all_nft_info_response', () => {
   expectCode(createTypeInterface(
     ctx,
     allNftInfoResponseData
-  ))
-})
+  ));
+});
 it('approvals_response', () => {
   const ctx = makeContext(approvalsResponseData);
   expectCode(createTypeInterface(
     ctx,
     approvalsResponseData
-  ))
-})
+  ));
+});
 it('collection_info_response', () => {
   const ctx = makeContext(collectionInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
     collectionInfoResponseData
-  ))
-})
+  ));
+});
 it('contract_info_response', () => {
   const ctx = makeContext(contractInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
     contractInfoResponseData
-  ))
-})
+  ));
+});
 it('instantiate_msg', () => {
   const ctx = makeContext(instantiateMsgData);
   expectCode(createTypeInterface(
     ctx,
     instantiateMsgData
-  ))
-})
+  ));
+});
 it('nft_info_response', () => {
   const ctx = makeContext(nftInfoResponseData);
   expectCode(createTypeInterface(
     ctx,
     nftInfoResponseData
-  ))
-})
+  ));
+});
 it('num_tokens_response', () => {
   const ctx = makeContext(numTokensResponseData);
   expectCode(createTypeInterface(
     ctx,
     numTokensResponseData
-  ))
-})
+  ));
+});
 it('operators_response', () => {
   const ctx = makeContext(operatorsResponseData);
   expectCode(createTypeInterface(
     ctx,
     operatorsResponseData
-  ))
-})
+  ));
+});
 it('owner_of_response', () => {
   const ctx = makeContext(ownerOfResponseData);
   expectCode(createTypeInterface(
     ctx,
     ownerOfResponseData
-  ))
-})
+  ));
+});
 it('tokens_response', () => {
   const ctx = makeContext(tokensResponseData);
   expectCode(createTypeInterface(
     ctx,
     tokensResponseData
-  ))
-})
+  ));
+});
 
 it('query classes', () => {
   const ctx = makeContext(queryMsgData);
@@ -110,7 +110,7 @@ it('query classes', () => {
     'SG721QueryClient',
     'SG721ReadOnlyInstance',
     queryMsgData
-  ))
+  ));
 });
 
 it('execute classes', () => {
@@ -121,7 +121,7 @@ it('execute classes', () => {
     'SG721Instance',
     'SG721QueryClient',
     executeMsgData
-  ))
+  ));
 });
 
 it('execute classes no extends', () => {
@@ -132,7 +132,7 @@ it('execute classes no extends', () => {
     'SG721Instance',
     null,
     executeMsgData
-  ))
+  ));
 });
 
 it('execute classes array types', () => {
@@ -143,7 +143,7 @@ it('execute classes array types', () => {
     'SG721Instance',
     null,
     daodaoCwNamedGroupsExecuteMsg
-  ))
+  ));
 });
 
 it('execute interfaces no extends', () => {
@@ -153,7 +153,7 @@ it('execute interfaces no extends', () => {
     'SG721Instance',
     null,
     executeMsgData
-  ))
+  ));
 });
 
 it('query interfaces', () => {
@@ -162,5 +162,5 @@ it('query interfaces', () => {
     ctx,
     'SG721ReadOnlyInstance',
     queryMsgData
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/client/ts-client.wager.test.ts b/packages/ast/__tests__/client/ts-client.wager.test.ts
index 802b0bab..767158bb 100644
--- a/packages/ast/__tests__/client/ts-client.wager.test.ts
+++ b/packages/ast/__tests__/client/ts-client.wager.test.ts
@@ -2,7 +2,7 @@ import {
   createExecuteClass,
   createQueryClass,
   createTypeInterface
-} from '../../src'
+} from '../../src';
 import { expectCode, globIdlBasedContracts, makeContext } from '../../test-utils';
 
 const globbed = globIdlBasedContracts('wager').find(c => c.name === '/cw-wager.json')!;
@@ -15,15 +15,15 @@ it('query', () => {
   expectCode(createTypeInterface(
     queryCtx,
     wagerJson.query
-  ))
-})
+  ));
+});
 
 it('execute', () => {
   expectCode(createTypeInterface(
     executeCtx,
     wagerJson.execute
-  ))
-})
+  ));
+});
 
 it('query classes', () => {
   expectCode(createQueryClass(
@@ -31,7 +31,7 @@ it('query classes', () => {
     'WagerQueryClient',
     'WagerReadOnlyInstance',
     wagerJson.query
-  ))
+  ));
 });
 
 it('execute classes', () => {
@@ -41,5 +41,5 @@ it('execute classes', () => {
     'WagerInstance',
     null,
     wagerJson.execute
-  ))
+  ));
 });
diff --git a/packages/ast/__tests__/message-builder/message-builder.test.ts b/packages/ast/__tests__/message-builder/message-builder.test.ts
index 33f9a980..31fddd16 100644
--- a/packages/ast/__tests__/message-builder/message-builder.test.ts
+++ b/packages/ast/__tests__/message-builder/message-builder.test.ts
@@ -1,26 +1,26 @@
 import {
   createMessageBuilderClass,
-} from '../../src'
+} from '../../src';
 import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
-const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json')
-const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
-const ownership = getLegacyFixture('basic', '/ownership.json')
+const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json');
+const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const ownership = getLegacyFixture('basic', '/ownership.json');
 
 
 it('execute class', () => {
   const ctx = makeContext(execMsg);
-  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', execMsg))
+  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', execMsg));
 });
 
 
 it('query class', () => {
   const ctx = makeContext(queryMsg);
-  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', queryMsg))
+  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', queryMsg));
 });
 
 it('ownership', () => {
   const ctx = makeContext(ownership);
   // @ts-ignore
-  expectCode(createMessageBuilderClass(ctx, 'Ownership', ownership))
+  expectCode(createMessageBuilderClass(ctx, 'Ownership', ownership));
 });
diff --git a/packages/ast/__tests__/message-composer/message-composer.test.ts b/packages/ast/__tests__/message-composer/message-composer.test.ts
index 570cdee4..021736d6 100644
--- a/packages/ast/__tests__/message-composer/message-composer.test.ts
+++ b/packages/ast/__tests__/message-composer/message-composer.test.ts
@@ -4,8 +4,8 @@ import {
 } from '../../src';
 import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
 
-const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
-const ownership = getLegacyFixture('basic', '/ownership.json')
+const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const ownership = getLegacyFixture('basic', '/ownership.json');
 
 
 it('execute classes', () => {
diff --git a/packages/ast/__tests__/provider/provider.test.ts b/packages/ast/__tests__/provider/provider.test.ts
index 3cf5568c..271b641c 100644
--- a/packages/ast/__tests__/provider/provider.test.ts
+++ b/packages/ast/__tests__/provider/provider.test.ts
@@ -56,7 +56,7 @@ it('create IContractsContext', () => {
   const info: any = {
     Whitelist: {},
     Marketplace: {}
-  }
+  };
 
   info['Whitelist'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
     classname: 'WhitelistClient'
diff --git a/packages/ast/__tests__/react-query/react-query.test.ts b/packages/ast/__tests__/react-query/react-query.test.ts
index 8cd8282d..a4ea0ce0 100644
--- a/packages/ast/__tests__/react-query/react-query.test.ts
+++ b/packages/ast/__tests__/react-query/react-query.test.ts
@@ -3,12 +3,12 @@ import * as t from '@babel/types';
 import {
   createReactQueryHooks,
   createReactQueryMutationHooks,
-} from '../../src'
+} from '../../src';
 import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
 
-const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json')
-const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json')
-const ownership = getLegacyFixture('basic', '/ownership.json')
+const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json');
+const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const ownership = getLegacyFixture('basic', '/ownership.json');
 
 
 it('createReactQueryHooks', () => {
@@ -24,7 +24,7 @@ it('createReactQueryHooks', () => {
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
-    )))
+    )));
   expectCode(t.program(
     createReactQueryHooks(
       {
@@ -38,7 +38,7 @@ it('createReactQueryHooks', () => {
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
-    )))
+    )));
   expectCode(t.program(
     createReactQueryHooks(
       {
@@ -51,7 +51,7 @@ it('createReactQueryHooks', () => {
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
-    )))
+    )));
   expectCode(t.program(
     createReactQueryHooks(
       {
@@ -65,7 +65,7 @@ it('createReactQueryHooks', () => {
         contractName: 'Sg721',
         QueryClient: 'Sg721QueryClient'
       }
-    )))
+    )));
   expectCode(
     t.program(
       createReactQueryHooks({
@@ -95,7 +95,7 @@ it('createReactQueryHooks', () => {
         contractName: 'Sg721',
         ExecuteClient: 'Sg721Client',
       }
-    )))
+    )));
 });
 
 it('ownership', () => {
@@ -112,7 +112,7 @@ it('ownership', () => {
         contractName: 'Ownership',
         ExecuteClient: 'OwnershipClient',
       }
-    )))
+    )));
 });
 
 
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index f2dbb149..3e829ffc 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 import deepmerge from 'deepmerge';
-import { basename, extname } from 'path'
+import { basename, extname } from 'path';
 
 import { ContractInfo, ProviderInfo, RenderOptions } from '../types';
 import { refLookup } from '../utils';
@@ -86,7 +86,7 @@ export class BuilderContext {
 
   addProviderInfo(contractName: string, type: string, classname: string, filename: string): void {
     if (!this.providers[contractName]) {
-      this.providers[contractName] = {}
+      this.providers[contractName] = {};
     }
 
     this.providers[contractName][type] = {
@@ -132,7 +132,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
    */
   abstract mergeDefaultOpt(options: TOpt): TOpt;
   refLookup($ref: string): JSONSchema {
-    return refLookup($ref, this.schema)
+    return refLookup($ref, this.schema);
   }
   addUtil(util: string): void {
     this.utils[util] = true;
diff --git a/packages/ast/src/context/imports.ts b/packages/ast/src/context/imports.ts
index bf689f8f..4edd6580 100644
--- a/packages/ast/src/context/imports.ts
+++ b/packages/ast/src/context/imports.ts
@@ -28,17 +28,17 @@ const makeReactQuerySwitch = (varName: string) => {
         type: 'import',
         path: '@tanstack/react-query',
         name: varName
-      }
+      };
     case 'v3':
     default:
       return {
         type: 'import',
         path: 'react-query',
         name: varName
-      }
+      };
     }
   };
-}
+};
 
 export const UTILS = {
   selectorFamily: 'recoil',
@@ -122,7 +122,7 @@ export const getImportStatements = (
       return {
         ...imp,
         path: getRelativePath(filepath, `./${name}`)
-      }
+      };
     }
     return imp;
   });
@@ -142,14 +142,14 @@ export const getImportStatements = (
       m[obj.path].push(obj);
     }
     return m;
-  }, {})
+  }, {});
 
 
   return Object.entries(imports)
     .reduce((m, [importPath, imports]: [string, ImportObj[]]) => {
       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.')
+        if (defaultImports.length > 1) throw new Error('more than one default name NOT allowed.');
         m.push(
           t.importDeclaration(
             [
@@ -159,7 +159,7 @@ export const getImportStatements = (
             ],
             t.stringLiteral(defaultImports[0].path)
           )
-        )
+        );
       }
       const namedImports = imports.filter(a => a.type === 'import' && (!a.importAs || (a.name === a.importAs)));
       if (namedImports.length) {
@@ -172,7 +172,7 @@ export const getImportStatements = (
 
       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.')
+        if (namespaced.length > 1) throw new Error('more than one namespaced name NOT allowed.');
         m.push(
           t.importDeclaration(
             [
@@ -182,10 +182,10 @@ export const getImportStatements = (
             ],
             t.stringLiteral(namespaced[0].path)
           )
-        )
+        );
       }
       return m;
-    }, [])
+    }, []);
 };
 
 export const getRelativePath = (f1: string, f2: string) => {
@@ -193,4 +193,4 @@ export const getRelativePath = (f1: string, f2: string) => {
   let importPath = rel.replace(extname(rel), '');
   if (!/^\./.test(importPath)) importPath = `./${importPath}`;
   return importPath;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/packages/ast/src/message-builder/message-builder.ts b/packages/ast/src/message-builder/message-builder.ts
index e3896b1a..152e85be 100644
--- a/packages/ast/src/message-builder/message-builder.ts
+++ b/packages/ast/src/message-builder/message-builder.ts
@@ -68,7 +68,7 @@ const createStaticExecMethodMessageBuilder = (
   );
 
   // 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 {
diff --git a/packages/ast/src/recoil/recoil.ts b/packages/ast/src/recoil/recoil.ts
index 1d578c3e..49c9c012 100644
--- a/packages/ast/src/recoil/recoil.ts
+++ b/packages/ast/src/recoil/recoil.ts
@@ -151,7 +151,7 @@ export const createRecoilSelector = (
         )
       )]
     )
-  )
+  );
 
 };
 
@@ -180,25 +180,25 @@ export const createRecoilSelectors = (
 };
 
 export const createRecoilQueryClientType = () => ({
-  'type': 'TSTypeAliasDeclaration',
-  'id': {
-    'type': 'Identifier',
-    'name': 'QueryClientParams'
+  type: 'TSTypeAliasDeclaration',
+  id: {
+    type: 'Identifier',
+    name: 'QueryClientParams'
   },
-  'typeAnnotation': {
-    'type': 'TSTypeLiteral',
-    'members': [
+  typeAnnotation: {
+    type: 'TSTypeLiteral',
+    members: [
       {
-        'type': 'TSPropertySignature',
-        'key': {
-          'type': 'Identifier',
-          'name': 'contractAddress'
+        type: 'TSPropertySignature',
+        key: {
+          type: 'Identifier',
+          name: 'contractAddress'
         },
-        'computed': false,
-        'typeAnnotation': {
-          'type': 'TSTypeAnnotation',
-          'typeAnnotation': {
-            'type': 'TSStringKeyword'
+        computed: false,
+        typeAnnotation: {
+          type: 'TSTypeAnnotation',
+          typeAnnotation: {
+            type: 'TSStringKeyword'
           }
         }
       }
@@ -303,6 +303,6 @@ export const createRecoilQueryClient = (
         )
       )]
     )
-  )
+  );
 
 };
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index f41d6364..8e87ff75 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -18,7 +18,7 @@ export const propertySignature = (
     kind: 'get',
     typeAnnotation,
     optional
-  }
+  };
 };
 
 export const identifier = (name: string, typeAnnotation: t.TSTypeAnnotation, optional: boolean = false): t.Identifier => {
@@ -46,7 +46,7 @@ export const getMessageProperties = (msg: JSONSchema): JSONSchema[] => {
       results.push(obj);
     } else {
       if (obj.$ref) {
-        const ref = refLookup(obj.$ref, msg)
+        const ref = refLookup(obj.$ref, msg);
 
         const refProps = getMessageProperties(ref);
 
@@ -56,7 +56,7 @@ export const getMessageProperties = (msg: JSONSchema): JSONSchema[] => {
   }
 
   return results;
-}
+};
 
 export const tsPropertySignature = (
   key: t.Expression,
@@ -65,7 +65,7 @@ export const tsPropertySignature = (
 ) => {
   const obj = t.tsPropertySignature(key, typeAnnotation);
   obj.optional = optional;
-  return obj
+  return obj;
 };
 
 
@@ -79,7 +79,7 @@ export const tsObjectPattern = (
   );
   obj.typeAnnotation = typeAnnotation;
   return obj;
-}
+};
 
 export const callExpression = (
   callee: t.Expression | t.V8IntrinsicIdentifier,
@@ -110,15 +110,15 @@ export const bindMethod = (name: string) => {
       ]
     )
     )
-  )
-}
+  );
+};
 
 export const typedIdentifier = (name: string, typeAnnotation: TSTypeAnnotation, optional: boolean = false) => {
   const type = t.identifier(name);
   type.typeAnnotation = typeAnnotation;
   type.optional = optional;
   return type;
-}
+};
 
 export const promiseTypeAnnotation = (name: string): t.TSTypeAnnotation => {
   return t.tsTypeAnnotation(
@@ -131,7 +131,7 @@ export const promiseTypeAnnotation = (name: string): t.TSTypeAnnotation => {
       )
     )
   );
-}
+};
 
 export const abstractClassDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
   const declaration = classDeclaration(
@@ -140,7 +140,7 @@ export const abstractClassDeclaration = (name: string, body: any[], implementsEx
     implementsExressions,
     superClass
   );
-  declaration.abstract = true
+  declaration.abstract = true;
   return declaration;
 };
 
@@ -207,23 +207,23 @@ export const arrayTypeNDimensions = (body: any, n: number): t.TSArrayType => {
 
 export const FieldTypeAsts = {
   string: () => {
-    return t.tsStringKeyword()
+    return t.tsStringKeyword();
   },
   array: (type: 'string' | 'Duration' | 'Height' | 'Coin' | 'Long'): t.TSArrayType => {
     const result = FieldTypeAsts[type]();
-    return t.tsArrayType(result)
+    return t.tsArrayType(result);
   },
   Duration: () => {
-    return t.tsTypeReference(t.identifier('Duration'))
+    return t.tsTypeReference(t.identifier('Duration'));
   },
   Height: () => {
-    return t.tsTypeReference(t.identifier('Height'))
+    return t.tsTypeReference(t.identifier('Height'));
   },
   Coin: () => {
-    return t.tsTypeReference(t.identifier('Coin'))
+    return t.tsTypeReference(t.identifier('Coin'));
   },
   Long: () => {
-    return t.tsTypeReference(t.identifier('Long'))
+    return t.tsTypeReference(t.identifier('Long'));
   }
 };
 
@@ -246,7 +246,7 @@ export const importAs = (name: string, importAs: string, importPath: string): t.
       )
     ],
     t.stringLiteral(importPath)
-  )
+  );
 };
 
 export const importAminoMsg = (): t.ImportDeclaration => {
@@ -266,11 +266,11 @@ export const getFieldDimensionality = (field: Field) => {
     dimensions,
     isArray
   };
-}
+};
 
 export const memberExpressionOrIdentifier = (names: string[]): t.MemberExpression | t.Identifier => {
   if (names.length === 1) {
-    return t.identifier(names[0])
+    return t.identifier(names[0]);
   }
   if (names.length === 2) {
     const [b, a] = names;
@@ -284,12 +284,12 @@ export const memberExpressionOrIdentifier = (names: string[]): t.MemberExpressio
   return t.memberExpression(
     memberExpressionOrIdentifier(rest),
     t.identifier(name)
-  )
+  );
 };
 
 export const memberExpressionOrIdentifierSnake = (names: string[]): t.MemberExpression | t.Identifier => {
   if (names.length === 1) {
-    return t.identifier(snake(names[0]))
+    return t.identifier(snake(names[0]));
   }
   if (names.length === 2) {
     const [b, a] = names;
@@ -303,7 +303,7 @@ export const memberExpressionOrIdentifierSnake = (names: string[]): t.MemberExpr
   return t.memberExpression(
     memberExpressionOrIdentifierSnake(rest),
     t.identifier(snake(name))
-  )
+  );
 };
 
 /**
@@ -316,18 +316,18 @@ export const optionalConditionalExpression = (test: t.Expression, expression: t.
       expression,
       alternate
     )
-    : expression
-}
+    : expression;
+};
 
 export const typeRefOrUnionWithUndefined = (identifier: t.Identifier, optional: boolean = false): t.TSType => {
-  const typeReference = t.tsTypeReference(identifier)
+  const typeReference = t.tsTypeReference(identifier);
   return optional
     ? t.tsUnionType([
       typeReference,
       t.tsUndefinedKeyword()
     ])
-    : typeReference
-}
+    : typeReference;
+};
 
 export const parameterizedTypeReference = (identifier: string, from: t.TSType, omit: string | Array<string>) => {
   return t.tsTypeReference(
@@ -338,18 +338,18 @@ export const parameterizedTypeReference = (identifier: string, from: t.TSType, o
         ? t.tsLiteralType(t.stringLiteral(omit))
         : t.tsUnionType(omit.map(o => t.tsLiteralType(t.stringLiteral(o))))
     ])
-  )
-}
+  );
+};
 
 /**
  * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....
  * Omit<Cw4UpdateMembersMutation, 'args'>
  */
 export const omitTypeReference = (from: t.TSType, omit: string | Array<string>) => {
-  return parameterizedTypeReference('Omit', from, omit)
-}
+  return parameterizedTypeReference('Omit', from, omit);
+};
 
 
 export const pickTypeReference = (from: t.TSType, pick: string | Array<string>) => {
-  return parameterizedTypeReference('Pick', from, pick)
-}
+  return parameterizedTypeReference('Pick', from, pick);
+};
diff --git a/packages/ast/src/utils/ref.ts b/packages/ast/src/utils/ref.ts
index 0d615877..0c5306e0 100644
--- a/packages/ast/src/utils/ref.ts
+++ b/packages/ast/src/utils/ref.ts
@@ -1,6 +1,6 @@
 import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 
 export const refLookup = ($ref: string, schema: JSONSchema): JSONSchema => {
-  const refName = $ref.replace('#/definitions/', '')
+  const refName = $ref.replace('#/definitions/', '');
   return schema.definitions?.[refName];
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index df58d9f2..58419739 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -23,17 +23,17 @@ const getTypeStrFromRef = ($ref: string): string => {
     return $ref.replace('#/definitions/', '');
   }
   throw new Error('what is $ref: ' + $ref);
-}
+};
 
 export const getTypeFromRef = ($ref: string) => {
-  return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)))
-}
+  return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)));
+};
 
 const getArrayTypeFromRef = ($ref: string) => {
   return t.tsArrayType(
     getTypeFromRef($ref)
   );
-}
+};
 
 
 export const getTypeOrRef = (obj: JSONSchema): t.TSType => {
@@ -83,7 +83,7 @@ const getArrayTypeFromItems = (
         );
       } else {
         // Handle the case where items.items is undefined for array types
-        return t.tsArrayType(t.tsAnyKeyword())
+        return t.tsArrayType(t.tsAnyKeyword());
       }
     }
 
@@ -98,11 +98,11 @@ export const detectType = (type: string | string[]) => {
   let theType = '';
   if (Array.isArray(type)) {
     if (type.length !== 2) {
-      throw new Error('[getType(array length)] case not handled by transpiler. contact maintainers.')
+      throw new Error('[getType(array length)] case not handled by transpiler. contact maintainers.');
     }
     const [nullableType, nullType] = type;
     if (nullType !== 'null') {
-      throw new Error('[getType(null)] case not handled by transpiler. contact maintainers.')
+      throw new Error('[getType(null)] case not handled by transpiler. contact maintainers.');
     }
     theType = nullableType;
     optional = true;
@@ -114,7 +114,7 @@ export const detectType = (type: string | string[]) => {
     type: theType,
     optional
   };
-}
+};
 
 export const getTypeInfo = (
   context: RenderContext,
@@ -227,7 +227,7 @@ export const getType = (type: string) => {
   default:
     throw new Error('contact maintainers [unknown type]: ' + type);
   }
-}
+};
 
 export const getPropertyType = (
   context: RenderContext,
@@ -245,7 +245,7 @@ export const getPropertyType = (
   }
 
   if (typeof info.$ref === 'string') {
-    type = getTypeFromRef(info.$ref)
+    type = getTypeFromRef(info.$ref);
   }
 
   const typeInfo = getTypeInfo(context, info);
@@ -257,7 +257,7 @@ export const getPropertyType = (
   }
 
   if (!type) {
-    throw new Error('cannot find type for ' + JSON.stringify(info))
+    throw new Error('cannot find type for ' + JSON.stringify(info));
   }
 
   if (schema.required?.includes(prop)) {
@@ -389,7 +389,7 @@ export const getParamsTypeAnnotation = (
   const keys = Object.keys(jsonschema.properties ?? {});
 
   if (!keys.length && jsonschema.$ref) {
-    return t.tsTypeAnnotation(getTypeFromRef(jsonschema.$ref))
+    return t.tsTypeAnnotation(getTypeFromRef(jsonschema.$ref));
   }
 
   if (!keys.length) return undefined;
@@ -408,8 +408,8 @@ export const getParamsTypeAnnotation = (
         ...typedParams
       ]
     )
-  )
-}
+  );
+};
 
 export const createTypedObjectParams = (
   context: RenderContext,
@@ -429,7 +429,7 @@ export const createTypedObjectParams = (
         const refName = camel(refType);
         const id = t.identifier(refName);
         id.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(refType)));
-        return id
+        return id;
       } else if (obj) {
         return createTypedObjectParams(
           context,
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index 07f0ea3f..71ce0709 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -11,13 +11,13 @@ export const expectCode = (ast: any): void => {
   expect(
     generate(ast).code
   ).toMatchSnapshot();
-}
+};
 
 export const printCode = (ast: any): void => {
   console.log(
     generate(ast).code
   );
-}
+};
 
 export const makeContext = (
   schema: JSONSchema,
@@ -27,7 +27,7 @@ export const makeContext = (
   return new RenderContext({
     schemas: [schema],
     responses
-  }, options)
+  }, options);
 };
 
 interface GlobContractLegacy {
@@ -50,7 +50,7 @@ export const globIdlBasedContracts = (p: string): GlobContract[] => {
     return {
       name: file.split(join('__fixtures__', p))[1],
       content: JSON.parse(readFileSync(file, 'utf-8'))
-    }
+    };
   });
   globCache[p] = contracts;
   return contracts;
@@ -63,7 +63,7 @@ export const globLegacyContracts = (p: string): GlobContractLegacy[] => {
     return {
       name: file.split(join('__fixtures__', p))[1],
       content: JSON.parse(readFileSync(file, 'utf-8'))
-    }
+    };
   });
   globCache[p] = contracts;
   return contracts;
diff --git a/packages/ts-codegen/__tests__/bundler.test.ts b/packages/ts-codegen/__tests__/bundler.test.ts
index 9dd164b7..bb02e3e5 100644
--- a/packages/ts-codegen/__tests__/bundler.test.ts
+++ b/packages/ts-codegen/__tests__/bundler.test.ts
@@ -1,6 +1,6 @@
 import generate from '@babel/generator';
 import * as t from '@babel/types';
-import cases from 'jest-in-case'
+import cases from 'jest-in-case';
 
 import {
   BundleData,
@@ -10,7 +10,7 @@ import {
 const preview = (ast: any) => {
   // @ts-ignore
   return generate(t.program(ast)).code;
-}
+};
 
 interface JestBundleData {
     name: string;
@@ -168,4 +168,4 @@ cases(`recursiveModuleBundle`, (opts: JestBundleData) => {
       }
     }
   }
-])
\ No newline at end of file
+]);
\ No newline at end of file
diff --git a/packages/ts-codegen/__tests__/cleanse.test.ts b/packages/ts-codegen/__tests__/cleanse.test.ts
index 96ba36e5..f112b774 100644
--- a/packages/ts-codegen/__tests__/cleanse.test.ts
+++ b/packages/ts-codegen/__tests__/cleanse.test.ts
@@ -18,7 +18,7 @@ it('sg721', async () => {
   writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
   writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
 
-})
+});
 
 it('daodao/cw-code-id-registry', async () => {
   const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
@@ -30,7 +30,7 @@ it('daodao/cw-code-id-registry', async () => {
   mkdirp(out);
   writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
   writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
-})
+});
 
 it('issues/103', async () => {
   const out = OUTPUT_DIR + '/issues/103';
@@ -42,5 +42,5 @@ it('issues/103', async () => {
   mkdirp(out);
   writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
   writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
-})
+});
 
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index 9f277abe..c2f6f05c 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -13,7 +13,7 @@ it('optionalClient', async () => {
     schemaDir
   });
   await generateReactQuery('Factory', contractInfo, outopt, { optionalClient: true });
-})
+});
 
 it('v4Query', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-v4-query';
@@ -22,7 +22,7 @@ it('v4Query', async () => {
     schemaDir
   });
   await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4' });
-})
+});
 
 it('queryKeys', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
@@ -31,7 +31,7 @@ it('queryKeys', async () => {
     schemaDir
   });
   await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true });
-})
+});
 
 it('queryFactory', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
@@ -40,7 +40,7 @@ it('queryFactory', async () => {
     schemaDir
   });
   await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
-})
+});
 
 
 
@@ -51,7 +51,7 @@ it('queryKeysOptionalClient', async () => {
     schemaDir
   });
   await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, optionalClient: true });
-})
+});
 
 it('useMutations', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
@@ -60,7 +60,7 @@ it('useMutations', async () => {
     schemaDir
   });
   await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4', mutations: true });
-})
+});
 
 it('vectis/factory', async () => {
   const out = OUTPUT_DIR + '/vectis/factory';
@@ -74,7 +74,7 @@ it('vectis/factory', async () => {
   await generateMessageComposer('Factory', contractInfo, out);
   await generateRecoil('Factory', contractInfo, out);
   await generateReactQuery('Factory', contractInfo, out);
-})
+});
 
 it('vectis/govec', async () => {
   const out = OUTPUT_DIR + '/vectis/govec';
@@ -88,7 +88,7 @@ it('vectis/govec', async () => {
   await generateMessageComposer('Govec', contractInfo, out);
   await generateRecoil('Govec', contractInfo, out);
   await generateReactQuery('Govec', contractInfo, out);
-})
+});
 
 it('vectis/proxy', async () => {
   const out = OUTPUT_DIR + '/vectis/proxy';
@@ -102,7 +102,7 @@ it('vectis/proxy', async () => {
   await generateMessageComposer('Proxy', contractInfo, out);
   await generateRecoil('Proxy', contractInfo, out);
   await generateReactQuery('Proxy', contractInfo, out);
-})
+});
 
 it('minter', async () => {
   const out = OUTPUT_DIR + '/minter';
@@ -115,7 +115,7 @@ it('minter', async () => {
   await generateMessageComposer('Minter', contractInfo, out);
   await generateRecoil('Minter', contractInfo, out);
   await generateReactQuery('Minter', contractInfo, out);
-})
+});
 
 it('sg721', async () => {
   const out = OUTPUT_DIR + '/sg721';
@@ -134,7 +134,7 @@ it('sg721', async () => {
   await generateRecoil('Sg721', contractInfo, out);
   await generateReactQuery('Sg721', contractInfo, out);
   await generateContractHooks('Sg721', contractInfo, out, builderContext);
-})
+});
 
 it('cw-named-groups', async () => {
   const out = OUTPUT_DIR + '/daodao/cw-named-groups';
@@ -148,7 +148,7 @@ it('cw-named-groups', async () => {
   await generateMessageComposer('CwNamedGroups', contractInfo, out);
   await generateRecoil('CwNamedGroups', contractInfo, out);
   await generateReactQuery('CwNamedGroups', contractInfo, out);
-})
+});
 
 it('cw-proposal-single', async () => {
   const out = OUTPUT_DIR + '/daodao/cw-proposal-single';
@@ -162,7 +162,7 @@ it('cw-proposal-single', async () => {
   await generateMessageComposer('CwProposalSingle', contractInfo, out);
   await generateRecoil('CwProposalSingle', contractInfo, out);
   await generateReactQuery('CwProposalSingle', contractInfo, out);
-})
+});
 
 it('cw-admin-factory', async () => {
   const out = OUTPUT_DIR + '/daodao/cw-admin-factory';
@@ -176,7 +176,7 @@ it('cw-admin-factory', async () => {
   await generateMessageComposer('CwAdminFactory', contractInfo, out);
   await generateRecoil('CwAdminFactory', contractInfo, out);
   await generateReactQuery('CwAdminFactory', contractInfo, out);
-})
+});
 
 it('cw-code-id-registry', async () => {
   const out = OUTPUT_DIR + '/daodao/cw-code-id-registry';
@@ -190,7 +190,7 @@ it('cw-code-id-registry', async () => {
   await generateMessageComposer('CwCodeIdRegistry', contractInfo, out);
   await generateRecoil('CwCodeIdRegistry', contractInfo, out);
   await generateReactQuery('CwCodeIdRegistry', contractInfo, out);
-})
+});
 
 it('idl-version/hackatom', async () => {
   const out = OUTPUT_DIR + '/idl-version/hackatom';
@@ -204,7 +204,7 @@ it('idl-version/hackatom', async () => {
   await generateMessageComposer('HackAtom', contractInfo, out);
   await generateRecoil('HackAtom', contractInfo, out);
   await generateReactQuery('HackAtom', contractInfo, out);
-})
+});
 
 it('idl-version/cyberpunk', async () => {
   const out = OUTPUT_DIR + '/idl-version/cyberpunk';
@@ -219,7 +219,7 @@ it('idl-version/cyberpunk', async () => {
   await generateMessageComposer('CyberPunk', contractInfo, out);
   await generateRecoil('CyberPunk', contractInfo, out);
   await generateReactQuery('CyberPunk', contractInfo, out);
-})
+});
 
 it('idl-version/cw4-group', async () => {
   const out = OUTPUT_DIR + '/idl-version/cw4-group';
@@ -234,7 +234,7 @@ it('idl-version/cw4-group', async () => {
   await generateMessageComposer('Cw4Group', contractInfo, out);
   await generateRecoil('Cw4Group', contractInfo, out);
   await generateReactQuery('Cw4Group', contractInfo, out);
-})
+});
 
 it('idl-version/cw3-fixed-multisig', async () => {
   const out = OUTPUT_DIR + '/idl-version/cw3-fixed-multisig';
@@ -249,7 +249,7 @@ it('idl-version/cw3-fixed-multisig', async () => {
   await generateMessageComposer('Cw3FixedMultiSig', contractInfo, out);
   await generateRecoil('Cw3FixedMultiSig', contractInfo, out);
   await generateReactQuery('Cw3FixedMultiSig', contractInfo, out);
-})
+});
 
 it('idl-version/accounts-nft', async () => {
   const out = OUTPUT_DIR + '/idl-version/accounts-nft';
@@ -264,4 +264,4 @@ it('idl-version/accounts-nft', async () => {
   await generateMessageComposer('AccountsNft', contractInfo, out);
   await generateRecoil('AccountsNft', contractInfo, out);
   await generateReactQuery('AccountsNft', contractInfo, out);
-})
+});
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index b9502fb7..32aacbc6 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -30,7 +30,7 @@ const defaultOpts: TSBuilderOptions = {
     bundleFile: 'bundle.ts'
   },
   useShorthandCtor: true
-}
+};
 
 export interface TSBuilderInput {
     contracts: Array<ContractFile | string>;
@@ -79,7 +79,7 @@ function getContract(contractOpt: ContractFile | string): ContractFile {
     return {
       name: contractName,
       dir: contractOpt
-    }
+    };
   }
   return {
     name: pascal(contractOpt.name),
@@ -126,7 +126,7 @@ export class TSBuilder {
       this.plugins.push(...plugins);
     }
 
-    this.plugins.forEach(plugin => plugin.setBuilder(this))
+    this.plugins.forEach(plugin => plugin.setBuilder(this));
   }
 
   async build() {
@@ -229,7 +229,7 @@ export class TSBuilder {
 
     mkdirp(this.outPath);
 
-    if (code.trim() === '') code = 'export {};'
+    if (code.trim() === '') code = 'export {};';
 
     writeFileSync(bundlePath, header + code);
 
diff --git a/packages/ts-codegen/src/bundler/bundler.ts b/packages/ts-codegen/src/bundler/bundler.ts
index 8a7eccaa..20efb89c 100644
--- a/packages/ts-codegen/src/bundler/bundler.ts
+++ b/packages/ts-codegen/src/bundler/bundler.ts
@@ -34,7 +34,7 @@ export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration
         .filter(a => a !== '__export')
         .filter(a => !a.startsWith('_'));
       if (others.length) {
-        throw new Error('namespace and package not supported, yet.')
+        throw new Error('namespace and package not supported, yet.');
       }
 
       // return nmspc;
@@ -47,7 +47,7 @@ export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration
           t.identifier(key),
           t.tsModuleBlock(recursiveModuleBundle(obj[key] as BundleData))
         )
-      )
+      );
     } else {
       throw new Error('Invalid structure for BundleData');
     }
@@ -75,4 +75,4 @@ export const createFileBundle = (
   importPaths.push(importNamespace(variable, rel));
   nested.set(bundleVariables, pkg + '.__export', true);
   nested.set(bundleVariables, pkg + '.' + variable, true);
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index c66e378d..519824d2 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -77,7 +77,7 @@ export default async (argv: MinimistArgs) => {
         message: 'queryKeys?',
         default: false
       },
-    ])
+    ]);
   };
   const { optionalClient, version, queryKeys } = await prompt(questions2, argv);
   const questions3 = [];
@@ -91,7 +91,7 @@ export default async (argv: MinimistArgs) => {
         default: false
       }
 
-    ])
+    ]);
   };
   const { mutations } = await prompt(questions3, argv);
 
@@ -105,7 +105,7 @@ export default async (argv: MinimistArgs) => {
         message: 'queryFactory? ',
         default: false
       }
-    ])
+    ]);
   };
   const { queryFactory } = await prompt(queryFactoryQuestions, argv);
   ///////// END REACT QUERY
@@ -126,7 +126,7 @@ export default async (argv: MinimistArgs) => {
         message: 'bundleScope?',
         default: 'contracts'
       }
-    ])
+    ]);
   };
   const { bundleFile, bundleScope } = await prompt(questions4, argv);
   ///////// END BUNDLE
@@ -175,5 +175,5 @@ export default async (argv: MinimistArgs) => {
     ],
     outPath: out,
     options
-  })
+  });
 };
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index e9a77cef..f14db991 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -18,7 +18,7 @@ const rnd = () =>
 const getPackages = (names: string[]) => {
   return names.map(pkg => {
     const { name, version } = parse(pkg);
-    return `${name}@${version}`
+    return `${name}@${version}`;
   }).join(' ');
 };
 
@@ -60,7 +60,7 @@ export default async (argv: MinimistArgs) => {
         return {
           name,
           value: `@cosmjson/${name}`
-        }
+        };
       })
     }
   ], argv);
@@ -75,7 +75,7 @@ export default async (argv: MinimistArgs) => {
   // protos
   const pkgs = glob('./smart-contracts/**/package.json');
   const cmds = pkgs
-    .filter((f) => { return f !== './smart-contracts/package.json' })
+    .filter((f) => { return f !== './smart-contracts/package.json'; })
     .map((f) => resolve(join(tmp, f)))
     .map((conf) => {
       const extDir = dirname(conf);
diff --git a/packages/ts-codegen/src/plugins/index.ts b/packages/ts-codegen/src/plugins/index.ts
index 13b111e6..815f6f4d 100644
--- a/packages/ts-codegen/src/plugins/index.ts
+++ b/packages/ts-codegen/src/plugins/index.ts
@@ -1,7 +1,7 @@
-export * from './client'
-export * from './message-builder'
-export * from './message-composer'
-export * from './plugin-base'
-export * from './react-query'
-export * from './recoil'
-export * from './types'
\ No newline at end of file
+export * from './client';
+export * from './message-builder';
+export * from './message-composer';
+export * from './plugin-base';
+export * from './react-query';
+export * from './recoil';
+export * from './types';
\ No newline at end of file
diff --git a/packages/ts-codegen/src/utils/parse.ts b/packages/ts-codegen/src/utils/parse.ts
index 5bff35dd..bf42cf27 100644
--- a/packages/ts-codegen/src/utils/parse.ts
+++ b/packages/ts-codegen/src/utils/parse.ts
@@ -19,13 +19,13 @@ export const parser = (codes: string[]) => {
       addType(key: string, node: any) {
         hash[key] = node;
       }
-    })
+    });
     babelTraverse(ast as any, visitor);
   });
 
   return hash;
 
-}
+};
 
 const visitorFn = (parser: any) => ({
   TSTypeAliasDeclaration(path: any) {
diff --git a/packages/ts-codegen/src/utils/unused.ts b/packages/ts-codegen/src/utils/unused.ts
index 4e922a0b..a6bd99ec 100644
--- a/packages/ts-codegen/src/utils/unused.ts
+++ b/packages/ts-codegen/src/utils/unused.ts
@@ -8,45 +8,45 @@ import * as t from '@babel/types';
 export const unused = {
   Program: {
     exit: (path) => {
-      const UnRefBindings = new Map()
+      const UnRefBindings = new Map();
       for (const [name, binding] of Object.entries(path.scope.bindings)) {
-        if (!binding.path.parentPath || binding.kind !== 'module') continue
+        if (!binding.path.parentPath || binding.kind !== 'module') continue;
 
-        const source = binding.path.parentPath.get('source')
-        const importName = source.node.value
+        const source = binding.path.parentPath.get('source');
+        const importName = source.node.value;
         if (
           !t.isStringLiteral(source)
         )
-          continue
+          continue;
 
         const key = `${importName}(${source.node.loc &&
-          source.node.loc.start.line})`
+          source.node.loc.start.line})`;
 
         if (!UnRefBindings.has(key)) {
-          UnRefBindings.set(key, binding)
+          UnRefBindings.set(key, binding);
         }
 
         if (binding.referenced) {
-          UnRefBindings.set(key, null)
+          UnRefBindings.set(key, null);
         } else {
-          const nodeType = binding.path.node.type
+          const nodeType = binding.path.node.type;
           if (nodeType === 'ImportSpecifier') {
-            binding.path.remove()
+            binding.path.remove();
           } else if (nodeType === 'ImportDefaultSpecifier') {
-            binding.path.remove()
+            binding.path.remove();
           } else if (nodeType === 'ImportNamespaceSpecifier') {
-            binding.path.remove()
+            binding.path.remove();
           } else if (binding.path.parentPath) {
-            binding.path.parentPath.remove()
+            binding.path.parentPath.remove();
           }
         }
       }
 
       UnRefBindings.forEach((binding, key) => {
         if (binding && binding.path.parentPath) {
-          binding.path.parentPath.remove()
+          binding.path.parentPath.remove();
         }
-      })
+      });
     }
   }
 };
\ No newline at end of file

From 1d3ea6a376b3143dd531d02c57306a8e2c41edb2 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 17:17:53 +0200
Subject: [PATCH 237/287] eslint

---
 package.json                                           | 6 +++---
 packages/ts-codegen/src/commands/create-boilerplate.ts | 1 +
 packages/ts-codegen/src/file.ts                        | 1 +
 packages/ts-codegen/src/plugins/recoil.ts              | 3 ++-
 packages/ts-codegen/src/ts-codegen.ts                  | 1 +
 packages/ts-codegen/src/utils/prompt.ts                | 8 ++++----
 packages/ts-codegen/src/utils/schemas.ts               | 8 ++++----
 7 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 20d3ed8d..23ac74ab 100644
--- a/package.json
+++ b/package.json
@@ -14,20 +14,20 @@
     "postinstall": "yarn symlink"
   },
   "devDependencies": {
-    "@types/jest-in-case": "^1.0.2",
     "@types/jest": "^29.5.11",
+    "@types/jest-in-case": "^1.0.2",
     "@types/mkdirp": "1.0.2",
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^7.10.0",
     "@typescript-eslint/parser": "^7.10.0",
     "copyfiles": "^2.4.1",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-unused-imports": "^4.0.0",
-    "eslint": "^8.56.0",
     "glob": "8.0.3",
-    "jest-in-case": "^1.0.2",
     "jest": "^29.6.2",
+    "jest-in-case": "^1.0.2",
     "lerna": "^6",
     "mkdirp": "1.0.2",
     "prettier": "^3.0.2",
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 94450f47..25aee8ca 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -3,6 +3,7 @@ import dargs from 'dargs';
 import * as shell from 'shelljs';
 
 import { prompt } from '../utils/prompt';
+
 const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
diff --git a/packages/ts-codegen/src/file.ts b/packages/ts-codegen/src/file.ts
index 24d44f90..8a39f093 100644
--- a/packages/ts-codegen/src/file.ts
+++ b/packages/ts-codegen/src/file.ts
@@ -3,6 +3,7 @@ import { readFileSync } from 'fs';
 
 import { cli } from './cli';
 import { prompt } from './utils/prompt';
+
 const argv = require('minimist')(process.argv.slice(2));
 
 const question = [
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index f1a7046d..11c68ca2 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -4,7 +4,8 @@ import {
   RenderContext,
   RenderContextBase,
   RenderOptions,
-  UtilMapping} from '@cosmwasm/ts-codegen-ast';
+  UtilMapping
+} from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
 import { BuilderFileType } from '../builder';
diff --git a/packages/ts-codegen/src/ts-codegen.ts b/packages/ts-codegen/src/ts-codegen.ts
index 5ddab182..8a3c532c 100755
--- a/packages/ts-codegen/src/ts-codegen.ts
+++ b/packages/ts-codegen/src/ts-codegen.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { cli } from './cli';
+
 let argv = require('minimist')(process.argv.slice(2));
 
 (async () => {
diff --git a/packages/ts-codegen/src/utils/prompt.ts b/packages/ts-codegen/src/utils/prompt.ts
index 3de0db51..8e002be9 100644
--- a/packages/ts-codegen/src/utils/prompt.ts
+++ b/packages/ts-codegen/src/utils/prompt.ts
@@ -3,7 +3,7 @@ import { filter } from 'fuzzy';
 import { prompt as inquirerer } from 'inquirerer';
 
 export const getFuzzySearch = (list) => {
-  return (answers, input) => {
+  return (_answers, input) => {
     input = input || '';
     return new Promise(function (resolve) {
       setTimeout(function () {
@@ -19,8 +19,8 @@ export const getFuzzySearch = (list) => {
 };
 
 export const getFuzzySearchNames = (nameValueItemList) => {
-  const list = nameValueItemList.map(({ name, value }) => name);
-  return (answers, input) => {
+  const list = nameValueItemList.map(({ name, value: _value }) => name);
+  return (_answers, input) => {
     input = input || '';
     return new Promise(function (resolve) {
       setTimeout(function () {
@@ -28,7 +28,7 @@ export const getFuzzySearchNames = (nameValueItemList) => {
         resolve(
           fuzzyResult.map(function (el) {
             return nameValueItemList.find(
-              ({ name, value }) => el.original == name
+              ({ name, value: _value }) => el.original == name
             );
           })
         );
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 33ab7961..0ca000fb 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -7,8 +7,8 @@ import { sync as glob } from 'glob';
 import { cleanse } from './cleanse';
 import { parser } from './parse';
 interface ReadSchemaOpts {
-    schemaDir: string;
-    clean?: boolean;
+  schemaDir: string;
+  clean?: boolean;
 };
 
 export const readSchemas = async ({
@@ -39,8 +39,8 @@ export const readSchemas = async ({
 
   const idlObject: Partial<IDLObject> = schemas[0] as Partial<IDLObject>;
   const {
-    contract_name,
-    contract_version,
+    // contract_name,
+    // contract_version,
     idl_version,
     responses,
     instantiate,

From 4784715eecf71b22f273bd260abcbbfd82f1b140 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Sat, 25 May 2024 17:24:09 +0200
Subject: [PATCH 238/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.6.0
 - @cosmwasm/ts-codegen@1.10.0
 - @cosmwasm/ts-codegen-types@1.3.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index a6736695..180d42b5 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.6.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.5.1...@cosmwasm/ts-codegen-ast@1.6.0) (2024-05-25)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 ## 1.5.1 (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index bd67677a..e95d21bf 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-types": "^1.2.0",
+    "@cosmwasm/ts-codegen-types": "^1.3.0",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 7a6f4379..f77dc5a5 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.10.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.9.0...@cosmwasm/ts-codegen@1.10.0) (2024-05-25)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.9.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.8.1...@cosmwasm/ts-codegen@1.9.0) (2024-04-26)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index eb27e9d3..d0c58a36 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -43,8 +43,8 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.5.1",
-    "@cosmwasm/ts-codegen-types": "^1.2.0",
+    "@cosmwasm/ts-codegen-ast": "^1.6.0",
+    "@cosmwasm/ts-codegen-types": "^1.3.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 6edf2c0f..f8331f71 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.2.0...@cosmwasm/ts-codegen-types@1.3.0) (2024-05-25)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
+
+
+
+
+
 # 1.2.0 (2024-04-19)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index e53c6d92..5275f828 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-types",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",

From b5009bcec8d53d8e9560a623f9aef0b4e13b9c1c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 20 Jun 2024 20:37:49 -0700
Subject: [PATCH 239/287] useDeclareKeyword option

---
 README.md                                     |   1 +
 .../ts-client.declare.test.ts.snap            | 699 ++++++++++++++++++
 .../client/ts-client.declare.test.ts          |  67 ++
 packages/ast/src/client/client.ts             |  14 +-
 packages/ast/src/context/context.ts           |   5 +-
 packages/ast/src/types/plugins.ts             |   1 +
 packages/ast/src/utils/babel.ts               |  24 +-
 packages/ts-codegen/README.md                 |   1 +
 packages/ts-codegen/test-utils/index.ts       |   1 +
 9 files changed, 797 insertions(+), 16 deletions(-)
 create mode 100644 packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
 create mode 100644 packages/ast/__tests__/client/ts-client.declare.test.ts

diff --git a/README.md b/README.md
index 435b06ab..019b7172 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,7 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 | `client.enabled`                        | generate TS client classes for your contracts        |
 | `client.execExtendsQuery`               | execute should extend query message clients          |
 | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
+| `client.useDeclareKeyword`              | use declare keyword for inherited class fields       |
 
 
 ### React Query
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
new file mode 100644
index 00000000..6c1a8bc6
--- /dev/null
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
@@ -0,0 +1,699 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`noDeclare, execExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+}"
+`;
+
+exports[`noDeclare, execExtends, noExtendsClass 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+}"
+`;
+
+exports[`useDeclare, execExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  declare client: SigningCosmWasmClient;
+  sender: string;
+  declare contractAddress: string;
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+}"
+`;
+
+exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+}"
+`;
+
+exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, _funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, _funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, _funds);
+  };
+}"
+`;
diff --git a/packages/ast/__tests__/client/ts-client.declare.test.ts b/packages/ast/__tests__/client/ts-client.declare.test.ts
new file mode 100644
index 00000000..99262cf8
--- /dev/null
+++ b/packages/ast/__tests__/client/ts-client.declare.test.ts
@@ -0,0 +1,67 @@
+import {
+  createExecuteClass
+} from '../../src';
+import { expectCode, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
+
+const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const ctx = makeContext(execMsg);
+
+it('noDeclare, execExtends, noExtendsClass', () => {
+  ctx.options.client.useDeclareKeyword = false;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ));
+});
+
+it('noDeclare, execExtends, ExtendsClass', () => {
+  ctx.options.client.useDeclareKeyword = false;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    'ExtendsClassName',
+    execMsg
+  ));
+});
+
+it('useDeclare, execExtends, ExtendsClass', () => {
+  ctx.options.client.useDeclareKeyword = true;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    'ExtendsClassName',
+    execMsg
+  ));
+});
+
+it('useDeclare, noExecExtends, ExtendsClass', () => {
+  ctx.options.client.useDeclareKeyword = true;
+  ctx.options.client.execExtendsQuery = false;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    'ExtendsClassName',
+    execMsg
+  ));
+});
+
+it('useDeclare, noExecExtends, noExtendsClass', () => {
+  ctx.options.client.useDeclareKeyword = true;
+  ctx.options.client.execExtendsQuery = false;
+  expectCode(createExecuteClass(
+    ctx,
+    'SG721Client',
+    'SG721Instance',
+    null,
+    execMsg
+  ));
+});
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 43cd0cc7..8fe44711 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -13,7 +13,8 @@ import {
   getTypeOrRef,
   OPTIONAL_FUNDS_PARAM,
   promiseTypeAnnotation,
-  typedIdentifier} from '../utils';
+  typedIdentifier
+} from '../utils';
 import { identifier, propertySignature } from '../utils/babel';
 import {
   createTypedObjectParams,
@@ -351,6 +352,11 @@ export const createExecuteClass = (
     extendsClassName &&
     context.options.client.execExtendsQuery;
 
+  const useDeclareKeyword =
+    context.options.client.useDeclareKeyword &&
+    extendsClassName &&
+    context.options.client.execExtendsQuery;
+
   return t.exportNamedDeclaration(
     classDeclaration(
       className,
@@ -363,7 +369,8 @@ export const createExecuteClass = (
           ),
           false,
           false,
-          noImplicitOverride
+          noImplicitOverride,
+          useDeclareKeyword
         ),
 
         // sender
@@ -375,7 +382,8 @@ export const createExecuteClass = (
           t.tsTypeAnnotation(t.tsStringKeyword()),
           false,
           false,
-          noImplicitOverride
+          noImplicitOverride,
+          useDeclareKeyword
         ),
 
         // constructor
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 3e829ffc..555abc4e 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -36,6 +36,7 @@ export const defaultOptions: RenderOptions = {
     enabled: true,
     execExtendsQuery: true,
     noImplicitOverride: false,
+    useDeclareKeyword: false,
   },
   recoil: {
     enabled: false
@@ -99,7 +100,7 @@ export class BuilderContext {
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-    } {
+  } {
     return this.providers;
   }
 }
@@ -144,7 +145,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-    } {
+  } {
     return this.builderContext.providers;
   }
   getImports(registeredUtils?: UtilMapping, filepath?: string): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] {
diff --git a/packages/ast/src/types/plugins.ts b/packages/ast/src/types/plugins.ts
index f34e4625..ae75606c 100644
--- a/packages/ast/src/types/plugins.ts
+++ b/packages/ast/src/types/plugins.ts
@@ -12,6 +12,7 @@ export interface TSClientOptions {
   enabled?: boolean;
   execExtendsQuery?: boolean;
   noImplicitOverride?: boolean;
+  useDeclareKeyword?: boolean;
 }
 export interface MessageComposerOptions {
   enabled?: boolean;
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index 8e87ff75..ac140351 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -97,18 +97,18 @@ export const bindMethod = (name: string) => {
       t.thisExpression(),
       t.identifier(name)
     ),
-    t.callExpression(
-      t.memberExpression(
+      t.callExpression(
         t.memberExpression(
-          t.thisExpression(),
-          t.identifier(name)
+          t.memberExpression(
+            t.thisExpression(),
+            t.identifier(name)
+          ),
+          t.identifier('bind')
         ),
-        t.identifier('bind')
-      ),
-      [
-        t.thisExpression()
-      ]
-    )
+        [
+          t.thisExpression()
+        ]
+      )
     )
   );
 };
@@ -162,13 +162,15 @@ export const classProperty = (
   typeAnnotation: TSTypeAnnotation = null,
   isReadonly: boolean = false,
   isStatic: boolean = false,
-  noImplicitOverride: boolean = false
+  noImplicitOverride: boolean = false,
+  useDeclareKeyword: boolean = false,
 ) => {
   const prop = t.classProperty(t.identifier(name));
   if (isReadonly) prop.readonly = true;
   if (isStatic) prop.static = true;
   if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
   if (noImplicitOverride) prop.override = true;
+  if (useDeclareKeyword) prop.declare = true;
   return prop;
 };
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 435b06ab..019b7172 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -132,6 +132,7 @@ The `client` plugin will generate TS client classes for your contracts. This opt
 | `client.enabled`                        | generate TS client classes for your contracts        |
 | `client.execExtendsQuery`               | execute should extend query message clients          |
 | `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
+| `client.useDeclareKeyword`              | use declare keyword for inherited class fields       |
 
 
 ### React Query
diff --git a/packages/ts-codegen/test-utils/index.ts b/packages/ts-codegen/test-utils/index.ts
index 3b22497b..e9fe52fb 100644
--- a/packages/ts-codegen/test-utils/index.ts
+++ b/packages/ts-codegen/test-utils/index.ts
@@ -31,6 +31,7 @@ export const testDefaultOptions: RenderOptions = {
     enabled: true,
     execExtendsQuery: true,
     noImplicitOverride: false,
+    useDeclareKeyword: false,
   },
   recoil: {
     enabled: true,

From 6c4d0805c9e2881297d5e6234d92f2b3b272210c Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 20 Jun 2024 20:46:14 -0700
Subject: [PATCH 240/287] snap

---
 .../__snapshots__/builder.test.ts.snap         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 5d15369b..517f6db3 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -16,6 +16,7 @@ TSBuilder {
       "enabled": true,
       "execExtendsQuery": true,
       "noImplicitOverride": false,
+      "useDeclareKeyword": false,
     },
     "enabled": true,
     "messageBuilder": {
@@ -60,6 +61,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -105,6 +107,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -150,6 +153,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -195,6 +199,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -240,6 +245,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -287,6 +293,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -332,6 +339,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -381,6 +389,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -438,6 +447,7 @@ TSBuilder {
       "enabled": true,
       "execExtendsQuery": true,
       "noImplicitOverride": false,
+      "useDeclareKeyword": false,
     },
     "enabled": true,
     "messageBuilder": {
@@ -482,6 +492,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -527,6 +538,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -572,6 +584,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -617,6 +630,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -662,6 +676,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -709,6 +724,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -754,6 +770,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {
@@ -803,6 +820,7 @@ TSBuilder {
           "enabled": true,
           "execExtendsQuery": true,
           "noImplicitOverride": false,
+          "useDeclareKeyword": false,
         },
         "enabled": true,
         "messageBuilder": {

From c4c2ac0062b6c5dd95ab901563a8a81dbd4c3d12 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Thu, 20 Jun 2024 20:51:57 -0700
Subject: [PATCH 241/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.7.0
 - @cosmwasm/ts-codegen@1.11.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 180d42b5..c0dac913 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.7.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.6.0...@cosmwasm/ts-codegen-ast@1.7.0) (2024-06-21)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 # [1.6.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.5.1...@cosmwasm/ts-codegen-ast@1.6.0) (2024-05-25)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index e95d21bf..d8d7b726 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index f77dc5a5..4745af13 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.11.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.10.0...@cosmwasm/ts-codegen@1.11.0) (2024-06-21)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.10.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.9.0...@cosmwasm/ts-codegen@1.10.0) (2024-05-25)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index d0c58a36..e1780d66 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -43,7 +43,7 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.6.0",
+    "@cosmwasm/ts-codegen-ast": "^1.7.0",
     "@cosmwasm/ts-codegen-types": "^1.3.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",

From 6288197f0832ccddebc5dff806b3320e83dd0ab4 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 25 Jun 2024 17:51:38 -0700
Subject: [PATCH 242/287] readme

---
 README.md                     | 4 +++-
 packages/ts-codegen/README.md | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 019b7172..64b5768b 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,9 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
-   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
+    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
+    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
+    <br />
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 019b7172..64b5768b 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -10,7 +10,9 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
-   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen"></a>
+    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
+    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
+    <br />
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
    <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
    <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>

From 0b513c19c80c89b10251a2907b26bd75e70cc67e Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Tue, 25 Jun 2024 17:54:13 -0700
Subject: [PATCH 243/287] chore(release): publish

 - @cosmwasm/ts-codegen@1.11.1
---
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 4745af13..fbe0a33f 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.11.0...@cosmwasm/ts-codegen@1.11.1) (2024-06-26)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.11.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.10.0...@cosmwasm/ts-codegen@1.11.0) (2024-06-21)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e1780d66..62e3eaa0 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",

From 3b9b357f76326cf4f5b4b40b1dbad926d99968be Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 28 Jun 2024 02:39:00 -0700
Subject: [PATCH 244/287] readme

---
 README.md                     | 16 ++++++++++------
 packages/ts-codegen/README.md | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 64b5768b..19f38abf 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,16 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
-    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
-    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
-    <br />
-   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
-   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
-   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
+  <a href="https://github.com/cosmology-tech/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
+  </a>
+  <a href="https://github.com/cosmology-tech/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
+  </a>
+  <br />
+  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
+  <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 64b5768b..19f38abf 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -10,12 +10,16 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
-    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
-    <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
-    <br />
-   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
-   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
-   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
+  <a href="https://github.com/cosmology-tech/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
+  </a>
+  <a href="https://github.com/cosmology-tech/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
+  </a>
+  <br />
+  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
+  <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
 

From ba420933486682d8e1b53f22a298807d0d0d9760 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:47:50 +0200
Subject: [PATCH 245/287] Suffix fee, memo, and funds with underscores

---
 __fixtures__/issues/98/out/98.client.ts       |  36 ++--
 .../contracts/CwAdminFactory.client.ts        |   6 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../contracts/CwCodeIdRegistry.client.ts      |  30 ++--
 .../CwCodeIdRegistry.message-composer.ts      |  30 ++--
 .../bundler_test/contracts/CwSingle.client.ts |  54 +++---
 .../contracts/CwSingle.message-composer.ts    |  54 +++---
 .../bundler_test/contracts/Factory.client.ts  |  42 ++---
 .../contracts/Factory.message-composer.ts     |  42 ++---
 .../bundler_test/contracts/Minter.client.ts   |  42 ++---
 .../contracts/Minter.message-composer.ts      |  42 ++---
 .../builder/default/CwAdminFactory.client.ts  |   6 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../default/CwCodeIdRegistry.client.ts        |  30 ++--
 .../CwCodeIdRegistry.message-composer.ts      |  30 ++--
 __output__/builder/default/CwSingle.client.ts |  54 +++---
 .../default/CwSingle.message-composer.ts      |  54 +++---
 __output__/builder/default/Factory.client.ts  |  42 ++---
 .../default/Factory.message-composer.ts       |  42 ++---
 __output__/builder/default/Minter.client.ts   |  42 ++---
 .../default/Minter.message-composer.ts        |  42 ++---
 .../builder/invoke/CwAdminFactory.client.ts   |   6 +-
 .../builder/invoke/CwCodeIdRegistry.client.ts |  30 ++--
 __output__/builder/invoke/CwSingle.client.ts  |  54 +++---
 __output__/builder/invoke/Factory.client.ts   |  42 ++---
 __output__/builder/invoke/Minter.client.ts    |  42 ++---
 .../no-extends/CwAdminFactory.client.ts       |   6 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../no-extends/CwCodeIdRegistry.client.ts     |  30 ++--
 .../CwCodeIdRegistry.message-composer.ts      |  30 ++--
 .../builder/no-extends/CwSingle.client.ts     |  54 +++---
 .../no-extends/CwSingle.message-composer.ts   |  54 +++---
 .../builder/no-extends/Factory.client.ts      |  42 ++---
 .../no-extends/Factory.message-composer.ts    |  42 ++---
 .../builder/no-extends/Minter.client.ts       |  42 ++---
 .../no-extends/Minter.message-composer.ts     |  42 ++---
 .../cw-admin-factory/CwAdminFactory.client.ts |   6 +-
 .../CwAdminFactory.message-composer.ts        |   6 +-
 .../CwCodeIdRegistry.client.ts                |  30 ++--
 .../CwCodeIdRegistry.message-composer.ts      |  30 ++--
 .../cw-named-groups/CwNamedGroups.client.ts   |  18 +-
 .../CwNamedGroups.message-composer.ts         |  18 +-
 .../CwProposalSingle.client.ts                |  54 +++---
 .../CwProposalSingle.message-composer.ts      |  54 +++---
 .../accounts-nft/AccountsNft.client.ts        |  60 +++----
 .../AccountsNft.message-composer.ts           |  60 +++----
 .../Cw3FixedMultiSig.client.ts                |  24 +--
 .../Cw3FixedMultiSig.message-composer.ts      |  24 +--
 .../idl-version/cw4-group/Cw4Group.client.ts  |  24 +--
 .../cw4-group/Cw4Group.message-composer.ts    |  24 +--
 .../idl-version/cyberpunk/CyberPunk.client.ts |  12 +-
 .../cyberpunk/CyberPunk.message-composer.ts   |  12 +-
 .../idl-version/hackatom/HackAtom.client.ts   |  48 +++---
 .../hackatom/HackAtom.message-composer.ts     |  48 +++---
 __output__/minter/Minter.client.ts            |  42 ++---
 __output__/minter/Minter.message-composer.ts  |  42 ++---
 .../sg721-updatable/Sg721Updatable.client.ts  |  90 +++++-----
 .../Sg721Updatable.message-composer.ts        |  90 +++++-----
 __output__/sg721/Sg721.client.ts              |  48 +++---
 __output__/sg721/Sg721.message-composer.ts    |  48 +++---
 __output__/vectis/factory/Factory.client.ts   |  42 ++---
 .../factory/Factory.message-composer.ts       |  42 ++---
 __output__/vectis/govec/Govec.client.ts       |  48 +++---
 .../vectis/govec/Govec.message-composer.ts    |  48 +++---
 __output__/vectis/proxy/Proxy.client.ts       |  48 +++---
 .../vectis/proxy/Proxy.message-composer.ts    |  48 +++---
 .../ts-client.account-nfts.test.ts.snap       |  90 +++++-----
 .../ts-client.arrays-item-tuples.test.ts.snap |   6 +-
 .../ts-client.arrays-ref.test.ts.snap         |  84 ++++-----
 .../ts-client.arrays.test.ts.snap             |   6 +-
 .../ts-client.cw-named-groups.test.ts.snap    |  18 +-
 .../ts-client.cw-proposal-single.test.ts.snap |  54 +++---
 .../ts-client.declare.test.ts.snap            | 160 +++++++++---------
 .../ts-client.issue-101.test.ts.snap          |  12 +-
 .../ts-client.issue-71.test.ts.snap           |  60 +++----
 .../ts-client.issue-98.test.ts.snap           |  18 +-
 .../ts-client.issues.test.ts.snap             | 156 ++++++++---------
 .../ts-client.overrides.test.ts.snap          | 160 +++++++++---------
 .../ts-client.sg721.test.ts.snap              |  48 +++---
 .../__snapshots__/ts-client.test.ts.snap      |  92 +++++-----
 .../ts-client.vectis.test.ts.snap             |  48 +++---
 .../ts-client.wager.test.ts.snap              |  16 +-
 .../message-composer.test.ts.snap             |  60 +++----
 packages/ast/src/client/client.ts             |   6 +-
 packages/ast/src/context/context.ts           |   4 +-
 .../src/message-composer/message-composer.ts  |   2 +-
 packages/ast/src/utils/babel.ts               |  20 +--
 packages/ast/src/utils/constants.ts           |   6 +-
 88 files changed, 1784 insertions(+), 1784 deletions(-)

diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
index 7817e157..3f5b08e1 100644
--- a/__fixtures__/issues/98/out/98.client.ts
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -73,7 +73,7 @@ export interface 98Interface extends 98ReadOnlyInterface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   registerPlugin: ({
     checksum,
     codeId,
@@ -88,12 +88,12 @@ export interface 98Interface extends 98ReadOnlyInterface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   unregisterPlugin: ({
     id
   }: {
     id: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePlugin: ({
     checksum,
     codeId,
@@ -110,17 +110,17 @@ export interface 98Interface extends 98ReadOnlyInterface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateRegistryFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateDaoAddr: ({
     newAddr
   }: {
     newAddr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class 98Client extends 98QueryClient implements 98Interface {
   client: SigningCosmWasmClient;
@@ -144,13 +144,13 @@ export class 98Client extends 98QueryClient implements 98Interface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proxy_install_plugin: {
         id,
         instantiate_msg: instantiateMsg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   registerPlugin = async ({
     checksum,
@@ -166,7 +166,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register_plugin: {
         checksum,
@@ -176,18 +176,18 @@ export class 98Client extends 98QueryClient implements 98Interface {
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   unregisterPlugin = async ({
     id
   }: {
     id: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister_plugin: {
         id
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePlugin = async ({
     checksum,
@@ -205,7 +205,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_plugin: {
         checksum,
@@ -216,28 +216,28 @@ export class 98Client extends 98QueryClient implements 98Interface {
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateRegistryFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_registry_fee: {
         new_fee: newFee
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateDaoAddr = async ({
     newAddr
   }: {
     newAddr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_dao_addr: {
         new_addr: newAddr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
index fb33d959..282d2938 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
@@ -29,7 +29,7 @@ export interface CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -49,13 +49,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index b0de6f1a..22ce8618 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -51,7 +51,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
             label
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
index e3df2f84..9459e635 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -129,21 +129,21 @@ export interface CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -167,14 +167,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   register = async ({
     chainId,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -197,7 +197,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setOwner = async ({
     chainId,
@@ -207,14 +207,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   unregister = async ({
     chainId,
@@ -222,13 +222,13 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     admin,
@@ -236,12 +236,12 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index d5747de7..52549383 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -91,7 +91,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             sender
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             version
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,7 +147,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             owner
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             code_id: codeId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -191,7 +191,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             payment_info: paymentInfo
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
index fbca68aa..39f7008b 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
@@ -174,24 +174,24 @@ export interface CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,27 +208,27 @@ export interface CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -256,14 +256,14 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -271,35 +271,35 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     allowRevoting,
@@ -317,7 +317,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -328,50 +328,50 @@ export class CwSingleClient implements CwSingleInterface {
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index a7afb565..d848ba61 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -112,7 +112,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             title
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -122,7 +122,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             vote
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -142,7 +142,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -153,7 +153,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -161,7 +161,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -172,7 +172,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -192,7 +192,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -209,7 +209,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             threshold
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -228,7 +228,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -236,7 +236,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -247,7 +247,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -255,7 +255,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -266,7 +266,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -274,7 +274,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -285,7 +285,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts
index 1e352243..8b35c489 100644
--- a/__output__/builder/bundler_test/contracts/Factory.client.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.client.ts
@@ -112,43 +112,43 @@ export interface FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -170,12 +170,12 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateProxyUser = async ({
     newUser,
@@ -183,13 +183,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -197,13 +197,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateCodeId = async ({
     newCodeId,
@@ -211,45 +211,45 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index c326c30c..7929f947 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,7 +82,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -104,7 +104,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             old_user: oldUser
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -126,7 +126,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             wallet_address: walletAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -148,7 +148,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             ty
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             new_fee: newFee
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -186,7 +186,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -205,7 +205,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
index 23c2502b..7fd27bb5 100644
--- a/__output__/builder/bundler_test/contracts/Minter.client.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -66,31 +66,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -108,48 +108,48 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintFor = async ({
     recipient,
@@ -157,17 +157,17 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 84cbf7bc..2c37cc00 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -60,7 +60,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -79,11 +79,11 @@ export class MinterMsgComposer implements MinterMsg {
             whitelist
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -111,7 +111,7 @@ export class MinterMsgComposer implements MinterMsg {
             per_address_limit: perAddressLimit
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -130,7 +130,7 @@ export class MinterMsgComposer implements MinterMsg {
             recipient
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -152,11 +152,11 @@ export class MinterMsgComposer implements MinterMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -165,7 +165,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/default/CwAdminFactory.client.ts b/__output__/builder/default/CwAdminFactory.client.ts
index 79d446bd..bfa07d0f 100644
--- a/__output__/builder/default/CwAdminFactory.client.ts
+++ b/__output__/builder/default/CwAdminFactory.client.ts
@@ -29,7 +29,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -50,13 +50,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index b0de6f1a..22ce8618 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -51,7 +51,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
             label
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/default/CwCodeIdRegistry.client.ts b/__output__/builder/default/CwCodeIdRegistry.client.ts
index 18742aa4..13b8be9f 100644
--- a/__output__/builder/default/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.client.ts
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -129,21 +129,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -168,14 +168,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   register = async ({
     chainId,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -198,7 +198,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setOwner = async ({
     chainId,
@@ -208,14 +208,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   unregister = async ({
     chainId,
@@ -223,13 +223,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     admin,
@@ -237,12 +237,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index d5747de7..52549383 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -91,7 +91,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             sender
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             version
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,7 +147,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             owner
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             code_id: codeId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -191,7 +191,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             payment_info: paymentInfo
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/default/CwSingle.client.ts b/__output__/builder/default/CwSingle.client.ts
index c74d6e75..147b50e7 100644
--- a/__output__/builder/default/CwSingle.client.ts
+++ b/__output__/builder/default/CwSingle.client.ts
@@ -174,24 +174,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,27 +208,27 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -257,14 +257,14 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -272,35 +272,35 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     allowRevoting,
@@ -318,7 +318,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -329,50 +329,50 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index a7afb565..d848ba61 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -112,7 +112,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             title
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -122,7 +122,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             vote
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -142,7 +142,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -153,7 +153,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -161,7 +161,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -172,7 +172,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -192,7 +192,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -209,7 +209,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             threshold
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -228,7 +228,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -236,7 +236,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -247,7 +247,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -255,7 +255,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -266,7 +266,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -274,7 +274,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -285,7 +285,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/default/Factory.client.ts b/__output__/builder/default/Factory.client.ts
index 3519112a..e233b754 100644
--- a/__output__/builder/default/Factory.client.ts
+++ b/__output__/builder/default/Factory.client.ts
@@ -112,43 +112,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -171,12 +171,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateProxyUser = async ({
     newUser,
@@ -184,13 +184,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -198,13 +198,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateCodeId = async ({
     newCodeId,
@@ -212,45 +212,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index c326c30c..7929f947 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,7 +82,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -104,7 +104,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             old_user: oldUser
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -126,7 +126,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             wallet_address: walletAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -148,7 +148,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             ty
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             new_fee: newFee
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -186,7 +186,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -205,7 +205,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts
index fd00b521..8ab36b26 100644
--- a/__output__/builder/default/Minter.client.ts
+++ b/__output__/builder/default/Minter.client.ts
@@ -66,31 +66,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -109,48 +109,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintFor = async ({
     recipient,
@@ -158,17 +158,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 84cbf7bc..2c37cc00 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -60,7 +60,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -79,11 +79,11 @@ export class MinterMsgComposer implements MinterMsg {
             whitelist
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -111,7 +111,7 @@ export class MinterMsgComposer implements MinterMsg {
             per_address_limit: perAddressLimit
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -130,7 +130,7 @@ export class MinterMsgComposer implements MinterMsg {
             recipient
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -152,11 +152,11 @@ export class MinterMsgComposer implements MinterMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -165,7 +165,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/invoke/CwAdminFactory.client.ts b/__output__/builder/invoke/CwAdminFactory.client.ts
index 79d446bd..bfa07d0f 100644
--- a/__output__/builder/invoke/CwAdminFactory.client.ts
+++ b/__output__/builder/invoke/CwAdminFactory.client.ts
@@ -29,7 +29,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -50,13 +50,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.client.ts b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
index 18742aa4..13b8be9f 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -129,21 +129,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -168,14 +168,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   register = async ({
     chainId,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -198,7 +198,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setOwner = async ({
     chainId,
@@ -208,14 +208,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   unregister = async ({
     chainId,
@@ -223,13 +223,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     admin,
@@ -237,12 +237,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwSingle.client.ts b/__output__/builder/invoke/CwSingle.client.ts
index c74d6e75..147b50e7 100644
--- a/__output__/builder/invoke/CwSingle.client.ts
+++ b/__output__/builder/invoke/CwSingle.client.ts
@@ -174,24 +174,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,27 +208,27 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -257,14 +257,14 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -272,35 +272,35 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     allowRevoting,
@@ -318,7 +318,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -329,50 +329,50 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/Factory.client.ts b/__output__/builder/invoke/Factory.client.ts
index 3519112a..e233b754 100644
--- a/__output__/builder/invoke/Factory.client.ts
+++ b/__output__/builder/invoke/Factory.client.ts
@@ -112,43 +112,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -171,12 +171,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateProxyUser = async ({
     newUser,
@@ -184,13 +184,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -198,13 +198,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateCodeId = async ({
     newCodeId,
@@ -212,45 +212,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts
index fd00b521..8ab36b26 100644
--- a/__output__/builder/invoke/Minter.client.ts
+++ b/__output__/builder/invoke/Minter.client.ts
@@ -66,31 +66,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -109,48 +109,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintFor = async ({
     recipient,
@@ -158,17 +158,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts
index fb33d959..282d2938 100644
--- a/__output__/builder/no-extends/CwAdminFactory.client.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.client.ts
@@ -29,7 +29,7 @@ export interface CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -49,13 +49,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index b0de6f1a..22ce8618 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -51,7 +51,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
             label
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
index e3df2f84..9459e635 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -129,21 +129,21 @@ export interface CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -167,14 +167,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   register = async ({
     chainId,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -197,7 +197,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setOwner = async ({
     chainId,
@@ -207,14 +207,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   unregister = async ({
     chainId,
@@ -222,13 +222,13 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     admin,
@@ -236,12 +236,12 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index d5747de7..52549383 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -91,7 +91,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             sender
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             version
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,7 +147,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             owner
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             code_id: codeId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -191,7 +191,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             payment_info: paymentInfo
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts
index fbca68aa..39f7008b 100644
--- a/__output__/builder/no-extends/CwSingle.client.ts
+++ b/__output__/builder/no-extends/CwSingle.client.ts
@@ -174,24 +174,24 @@ export interface CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,27 +208,27 @@ export interface CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwSingleClient implements CwSingleInterface {
   client: SigningCosmWasmClient;
@@ -256,14 +256,14 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -271,35 +271,35 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     allowRevoting,
@@ -317,7 +317,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -328,50 +328,50 @@ export class CwSingleClient implements CwSingleInterface {
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index a7afb565..d848ba61 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -112,7 +112,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             title
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -122,7 +122,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             vote
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -142,7 +142,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -153,7 +153,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -161,7 +161,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -172,7 +172,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -192,7 +192,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -209,7 +209,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             threshold
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -228,7 +228,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -236,7 +236,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -247,7 +247,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -255,7 +255,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -266,7 +266,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -274,7 +274,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -285,7 +285,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts
index 1e352243..8b35c489 100644
--- a/__output__/builder/no-extends/Factory.client.ts
+++ b/__output__/builder/no-extends/Factory.client.ts
@@ -112,43 +112,43 @@ export interface FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -170,12 +170,12 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateProxyUser = async ({
     newUser,
@@ -183,13 +183,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -197,13 +197,13 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateCodeId = async ({
     newCodeId,
@@ -211,45 +211,45 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index c326c30c..7929f947 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,7 +82,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -104,7 +104,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             old_user: oldUser
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -126,7 +126,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             wallet_address: walletAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -148,7 +148,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             ty
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             new_fee: newFee
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -186,7 +186,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -205,7 +205,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
index 23c2502b..7fd27bb5 100644
--- a/__output__/builder/no-extends/Minter.client.ts
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -66,31 +66,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -108,48 +108,48 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintFor = async ({
     recipient,
@@ -157,17 +157,17 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 84cbf7bc..2c37cc00 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -60,7 +60,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -79,11 +79,11 @@ export class MinterMsgComposer implements MinterMsg {
             whitelist
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -111,7 +111,7 @@ export class MinterMsgComposer implements MinterMsg {
             per_address_limit: perAddressLimit
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -130,7 +130,7 @@ export class MinterMsgComposer implements MinterMsg {
             recipient
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -152,11 +152,11 @@ export class MinterMsgComposer implements MinterMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -165,7 +165,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
index 79d446bd..bfa07d0f 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
@@ -29,7 +29,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
   client: SigningCosmWasmClient;
@@ -50,13 +50,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
         instantiate_msg: instantiateMsg,
         label
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index b0de6f1a..22ce8618 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -51,7 +51,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
             label
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
index 18742aa4..13b8be9f 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setOwner: ({
     chainId,
     name,
@@ -129,21 +129,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
   client: SigningCosmWasmClient;
@@ -168,14 +168,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   register = async ({
     chainId,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -198,7 +198,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
         name,
         version
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setOwner = async ({
     chainId,
@@ -208,14 +208,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
         name,
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   unregister = async ({
     chainId,
@@ -223,13 +223,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
         code_id: codeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     admin,
@@ -237,12 +237,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
         payment_info: paymentInfo
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index d5747de7..52549383 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -91,7 +91,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             sender
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             version
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,7 +147,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             owner
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             code_id: codeId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -191,7 +191,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
             payment_info: paymentInfo
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
index ade530c1..662806c1 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
@@ -112,17 +112,17 @@ export interface CwNamedGroupsInterface extends CwNamedGroupsReadOnlyInterface {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwNamedGroupsInterface {
   client: SigningCosmWasmClient;
@@ -145,35 +145,35 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
         addresses_to_remove: addressesToRemove,
         group
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeGroup = async ({
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateOwner = async ({
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index e500e833..e5636426 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -20,17 +20,17 @@ export interface CwNamedGroupsMsg {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
   sender: string;
@@ -50,7 +50,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -63,7 +63,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
             group
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -71,7 +71,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
     group
   }: {
     group: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,7 +82,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
             group
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -90,7 +90,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
     owner
   }: {
     owner: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -101,7 +101,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
             owner
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
index 154e018c..0f7b1098 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
@@ -174,24 +174,24 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,27 +208,27 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CwProposalSingleClient extends CwProposalSingleQueryClient implements CwProposalSingleInterface {
   client: SigningCosmWasmClient;
@@ -257,14 +257,14 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -272,35 +272,35 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     allowRevoting,
@@ -318,7 +318,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -329,50 +329,50 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index dadd7372..ccf5cb16 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -19,24 +19,24 @@ export interface CwProposalSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwProposalSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -112,7 +112,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             title
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -122,7 +122,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             vote
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -142,7 +142,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -153,7 +153,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -161,7 +161,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -172,7 +172,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -192,7 +192,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -209,7 +209,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             threshold
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -217,7 +217,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -228,7 +228,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -236,7 +236,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -247,7 +247,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -255,7 +255,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -266,7 +266,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -274,7 +274,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -285,7 +285,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
             address
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index fab4fc8e..81b22a63 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -295,20 +295,20 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     newOwner
   }: {
     newOwner: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  acceptOwnership: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  acceptOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     user
   }: {
     user: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -317,7 +317,7 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -326,31 +326,31 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class AccountsNftClient extends AccountsNftQueryClient implements AccountsNftInterface {
   client: SigningCosmWasmClient;
@@ -376,28 +376,28 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     newOwner
   }: {
     newOwner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         new_owner: newOwner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       accept_ownership: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     user
   }: {
     user: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         user
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   transferNft = async ({
     recipient,
@@ -405,13 +405,13 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -421,14 +421,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -438,14 +438,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -453,13 +453,13 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -467,34 +467,34 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index 6f525cfe..a0c07119 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -16,20 +16,20 @@ export interface AccountsNftMsg {
     newOwner
   }: {
     newOwner: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  acceptOwnership: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  acceptOwnership: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     user
   }: {
     user: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -38,7 +38,7 @@ export interface AccountsNftMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -47,31 +47,31 @@ export interface AccountsNftMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class AccountsNftMsgComposer implements AccountsNftMsg {
   sender: string;
@@ -94,7 +94,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     newOwner
   }: {
     newOwner: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -105,11 +105,11 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             new_owner: newOwner
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  acceptOwnership = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  acceptOwnership = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -118,7 +118,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
         msg: toUtf8(JSON.stringify({
           accept_ownership: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -126,7 +126,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     user
   }: {
     user: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -137,7 +137,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             user
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -147,7 +147,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -159,7 +159,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -171,7 +171,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -184,7 +184,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -196,7 +196,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -209,7 +209,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -219,7 +219,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -231,7 +231,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -241,7 +241,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -253,7 +253,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -261,7 +261,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -272,7 +272,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -280,7 +280,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -291,7 +291,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
index 7fbfc8c0..d8bd08db 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
@@ -187,24 +187,24 @@ export interface Cw3FixedMultiSigInterface extends Cw3FixedMultiSigReadOnlyInter
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigInterface {
   client: SigningCosmWasmClient;
@@ -230,7 +230,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -238,7 +238,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -246,34 +246,34 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index 2279fda6..9c68ea31 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -21,24 +21,24 @@ export interface Cw3FixedMultiSigMsg {
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
   sender: string;
@@ -61,7 +61,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -75,7 +75,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
             title
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -85,7 +85,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -97,7 +97,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
             vote
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -105,7 +105,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -116,7 +116,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -124,7 +124,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
     proposalId
   }: {
     proposalId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -135,7 +135,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
             proposal_id: proposalId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts
index 00a7fd20..60dfbb23 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.client.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts
@@ -90,24 +90,24 @@ export interface Cw4GroupInterface extends Cw4GroupReadOnlyInterface {
     admin
   }: {
     admin?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateMembers: ({
     add,
     remove
   }: {
     add: Member[];
     remove: string[];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addHook: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeHook: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInterface {
   client: SigningCosmWasmClient;
@@ -127,12 +127,12 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     admin
   }: {
     admin?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         admin
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateMembers = async ({
     add,
@@ -140,34 +140,34 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
   }: {
     add: Member[];
     remove: string[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_members: {
         add,
         remove
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addHook = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_hook: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeHook = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_hook: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index ea39265a..8ade1bfe 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -16,24 +16,24 @@ export interface Cw4GroupMsg {
     admin
   }: {
     admin?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateMembers: ({
     add,
     remove
   }: {
     add: Member[];
     remove: string[];
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addHook: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeHook: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Cw4GroupMsgComposer implements Cw4GroupMsg {
   sender: string;
@@ -50,7 +50,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
     admin
   }: {
     admin?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -61,7 +61,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
             admin
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -71,7 +71,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
   }: {
     add: Member[];
     remove: string[];
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -83,7 +83,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
             remove
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -91,7 +91,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -102,7 +102,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -110,7 +110,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -121,7 +121,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
index 29a05fce..c19416a8 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -34,8 +34,8 @@ export interface CyberPunkInterface extends CyberPunkReadOnlyInterface {
   }: {
     memCost: number;
     timeCost: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  mirrorEnv: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  mirrorEnv: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkInterface {
   client: SigningCosmWasmClient;
@@ -55,17 +55,17 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
   }: {
     memCost: number;
     timeCost: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       argon2: {
         mem_cost: memCost,
         time_cost: timeCost
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mirror_env: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index 5aecadaf..2e1953a9 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -18,8 +18,8 @@ export interface CyberPunkMsg {
   }: {
     memCost: number;
     timeCost: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  mirrorEnv: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  mirrorEnv: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class CyberPunkMsgComposer implements CyberPunkMsg {
   sender: string;
@@ -36,7 +36,7 @@ export class CyberPunkMsgComposer implements CyberPunkMsg {
   }: {
     memCost: number;
     timeCost: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -48,11 +48,11 @@ export class CyberPunkMsgComposer implements CyberPunkMsg {
             time_cost: timeCost
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  mirrorEnv = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mirrorEnv = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -61,7 +61,7 @@ export class CyberPunkMsgComposer implements CyberPunkMsg {
         msg: toUtf8(JSON.stringify({
           mirror_env: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
index 76b3ebf6..40a5738d 100644
--- a/__output__/idl-version/hackatom/HackAtom.client.ts
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -74,18 +74,18 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
 export interface HackAtomInterface extends HackAtomReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  release: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  cpuLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  storageLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  memoryLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  messageLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  release: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  cpuLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  storageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  memoryLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  messageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   allocateLargeMemory: ({
     pages
   }: {
     pages: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  panic: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  userErrorsInApiCalls: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  panic: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  userErrorsInApiCalls: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class HackAtomClient extends HackAtomQueryClient implements HackAtomInterface {
   client: SigningCosmWasmClient;
@@ -105,50 +105,50 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-  release = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  release = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       release: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cpu_loop: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       storage_loop: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       memory_loop: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       message_loop: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   allocateLargeMemory = async ({
     pages
   }: {
     pages: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allocate_large_memory: {
         pages
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       panic: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       user_errors_in_api_calls: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index b3754700..1758460a 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -11,18 +11,18 @@ import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coi
 export interface HackAtomMsg {
   contractAddress: string;
   sender: string;
-  release: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  cpuLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  storageLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  memoryLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  messageLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  release: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  cpuLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  storageLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  memoryLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  messageLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   allocateLargeMemory: ({
     pages
   }: {
     pages: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  panic: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  userErrorsInApiCalls: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  panic: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  userErrorsInApiCalls: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class HackAtomMsgComposer implements HackAtomMsg {
   sender: string;
@@ -39,7 +39,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-  release = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  release = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -48,11 +48,11 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           release: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  cpuLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  cpuLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -61,11 +61,11 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           cpu_loop: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  storageLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  storageLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -74,11 +74,11 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           storage_loop: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  memoryLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  memoryLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -87,11 +87,11 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           memory_loop: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  messageLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  messageLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -100,7 +100,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           message_loop: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -108,7 +108,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
     pages
   }: {
     pages: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -119,11 +119,11 @@ export class HackAtomMsgComposer implements HackAtomMsg {
             pages
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  panic = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  panic = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -132,11 +132,11 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           panic: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  userErrorsInApiCalls = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  userErrorsInApiCalls = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -145,7 +145,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
         msg: toUtf8(JSON.stringify({
           user_errors_in_api_calls: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts
index fd00b521..8ab36b26 100644
--- a/__output__/minter/Minter.client.ts
+++ b/__output__/minter/Minter.client.ts
@@ -66,31 +66,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
   client: SigningCosmWasmClient;
@@ -109,48 +109,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setWhitelist = async ({
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePerAddressLimit = async ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintTo = async ({
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mintFor = async ({
     recipient,
@@ -158,17 +158,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 84cbf7bc..2c37cc00 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -11,31 +11,31 @@ import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, Execute
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -60,7 +60,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           mint: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -79,11 +79,11 @@ export class MinterMsgComposer implements MinterMsg {
             whitelist
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           update_start_time: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -111,7 +111,7 @@ export class MinterMsgComposer implements MinterMsg {
             per_address_limit: perAddressLimit
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -130,7 +130,7 @@ export class MinterMsgComposer implements MinterMsg {
             recipient
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -152,11 +152,11 @@ export class MinterMsgComposer implements MinterMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -165,7 +165,7 @@ export class MinterMsgComposer implements MinterMsg {
         msg: toUtf8(JSON.stringify({
           withdraw: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/sg721-updatable/Sg721Updatable.client.ts b/__output__/sg721-updatable/Sg721Updatable.client.ts
index 1cee0d5b..d21d1ff9 100644
--- a/__output__/sg721-updatable/Sg721Updatable.client.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.client.ts
@@ -240,22 +240,22 @@ export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterfac
 export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  freezeTokenMetadata: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  freezeTokenMetadata: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateTokenMetadata: ({
     tokenId,
     tokenUri
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  enableUpdatable: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  enableUpdatable: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -264,7 +264,7 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -273,38 +273,38 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateCollectionInfo: ({
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateTradingStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  freezeCollectionInfo: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateTradingStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  freezeCollectionInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -315,12 +315,12 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   extension: ({
     msg
   }: {
     msg: Empty;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements Sg721UpdatableInterface {
   client: SigningCosmWasmClient;
@@ -347,10 +347,10 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-  freezeTokenMetadata = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  freezeTokenMetadata = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_token_metadata: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateTokenMetadata = async ({
     tokenId,
@@ -358,18 +358,18 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_token_metadata: {
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  enableUpdatable = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  enableUpdatable = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       enable_updatable: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   transferNft = async ({
     recipient,
@@ -377,13 +377,13 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -393,14 +393,14 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -410,14 +410,14 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -425,13 +425,13 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -439,56 +439,56 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateCollectionInfo = async ({
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_collection_info: {
         collection_info: collectionInfo
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateTradingStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateTradingStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_trading_start_time: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  freezeCollectionInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  freezeCollectionInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_collection_info: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -500,7 +500,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -508,17 +508,17 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   extension = async ({
     msg
   }: {
     msg: Empty;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       extension: {
         msg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
index fbf817fe..5cee4c38 100644
--- a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
@@ -12,22 +12,22 @@ import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, App
 export interface Sg721UpdatableMsg {
   contractAddress: string;
   sender: string;
-  freezeTokenMetadata: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  freezeTokenMetadata: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateTokenMetadata: ({
     tokenId,
     tokenUri
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  enableUpdatable: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  enableUpdatable: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -36,7 +36,7 @@ export interface Sg721UpdatableMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -45,38 +45,38 @@ export interface Sg721UpdatableMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCollectionInfo: ({
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateTradingStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  freezeCollectionInfo: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateTradingStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  freezeCollectionInfo: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     extension,
     owner,
@@ -87,12 +87,12 @@ export interface Sg721UpdatableMsg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   extension: ({
     msg
   }: {
     msg: Empty;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   sender: string;
@@ -116,7 +116,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-  freezeTokenMetadata = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  freezeTokenMetadata = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -125,7 +125,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
         msg: toUtf8(JSON.stringify({
           freeze_token_metadata: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -135,7 +135,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,11 +147,11 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_uri: tokenUri
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  enableUpdatable = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  enableUpdatable = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -160,7 +160,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
         msg: toUtf8(JSON.stringify({
           enable_updatable: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -170,7 +170,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -182,7 +182,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -194,7 +194,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -207,7 +207,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -219,7 +219,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -232,7 +232,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -242,7 +242,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -254,7 +254,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -264,7 +264,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -276,7 +276,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -284,7 +284,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -295,7 +295,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -303,7 +303,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -314,7 +314,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -322,7 +322,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -333,11 +333,11 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             collection_info: collectionInfo
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  updateTradingStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateTradingStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -346,11 +346,11 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
         msg: toUtf8(JSON.stringify({
           update_trading_start_time: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  freezeCollectionInfo = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  freezeCollectionInfo = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -359,7 +359,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
         msg: toUtf8(JSON.stringify({
           freeze_collection_info: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -373,7 +373,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -387,7 +387,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             token_uri: tokenUri
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -395,7 +395,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     msg
   }: {
     msg: Empty;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -406,7 +406,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
             msg
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/sg721/Sg721.client.ts b/__output__/sg721/Sg721.client.ts
index a71b1eca..bff2bc1f 100644
--- a/__output__/sg721/Sg721.client.ts
+++ b/__output__/sg721/Sg721.client.ts
@@ -246,7 +246,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -255,7 +255,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -264,26 +264,26 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -294,12 +294,12 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   client: SigningCosmWasmClient;
@@ -325,13 +325,13 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -341,14 +341,14 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -358,14 +358,14 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -373,13 +373,13 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -387,24 +387,24 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -416,7 +416,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -424,17 +424,17 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index fbbdc071..b024522d 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -18,7 +18,7 @@ export interface Sg721Msg {
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -27,7 +27,7 @@ export interface Sg721Msg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -36,26 +36,26 @@ export interface Sg721Msg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     extension,
     owner,
@@ -66,12 +66,12 @@ export interface Sg721Msg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class Sg721MsgComposer implements Sg721Msg {
   sender: string;
@@ -94,7 +94,7 @@ export class Sg721MsgComposer implements Sg721Msg {
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -106,7 +106,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -118,7 +118,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -131,7 +131,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -143,7 +143,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -166,7 +166,7 @@ export class Sg721MsgComposer implements Sg721Msg {
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -178,7 +178,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -188,7 +188,7 @@ export class Sg721MsgComposer implements Sg721Msg {
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -200,7 +200,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -208,7 +208,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -219,7 +219,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -233,7 +233,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -247,7 +247,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             token_uri: tokenUri
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -255,7 +255,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -266,7 +266,7 @@ export class Sg721MsgComposer implements Sg721Msg {
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/vectis/factory/Factory.client.ts b/__output__/vectis/factory/Factory.client.ts
index 3519112a..e233b754 100644
--- a/__output__/vectis/factory/Factory.client.ts
+++ b/__output__/vectis/factory/Factory.client.ts
@@ -112,43 +112,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
   client: SigningCosmWasmClient;
@@ -171,12 +171,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateProxyUser = async ({
     newUser,
@@ -184,13 +184,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
         old_user: oldUser
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   migrateWallet = async ({
     migrationMsg,
@@ -198,13 +198,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
         wallet_address: walletAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateCodeId = async ({
     newCodeId,
@@ -212,45 +212,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
         ty
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateWalletFee = async ({
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGovecAddr = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateAdmin = async ({
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index c326c30c..7929f947 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -82,7 +82,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             create_wallet_msg: createWalletMsg
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -104,7 +104,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             old_user: oldUser
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -126,7 +126,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             wallet_address: walletAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -148,7 +148,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             ty
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -167,7 +167,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             new_fee: newFee
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -186,7 +186,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -205,7 +205,7 @@ export class FactoryMsgComposer implements FactoryMsg {
             addr
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/vectis/govec/Govec.client.ts b/__output__/vectis/govec/Govec.client.ts
index 47431fc8..610da988 100644
--- a/__output__/vectis/govec/Govec.client.ts
+++ b/__output__/vectis/govec/Govec.client.ts
@@ -49,40 +49,40 @@ export interface GovecInterface extends GovecReadOnlyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class GovecClient extends GovecQueryClient implements GovecInterface {
   client: SigningCosmWasmClient;
@@ -106,61 +106,61 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   relay = async ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   rotateUserKey = async ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addRelayer = async ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeRelayer = async ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGuardians = async ({
     guardians,
@@ -168,23 +168,23 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
         new_multisig_code_id: newMultisigCodeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateLabel = async ({
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index a9ddbdd8..783cfa59 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -15,40 +15,40 @@ export interface GovecMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  revertFreezeStatus: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  revertFreezeStatus: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class GovecMsgComposer implements GovecMsg {
   sender: string;
@@ -69,7 +69,7 @@ export class GovecMsgComposer implements GovecMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -80,11 +80,11 @@ export class GovecMsgComposer implements GovecMsg {
             msgs
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  revertFreezeStatus = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  revertFreezeStatus = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -93,7 +93,7 @@ export class GovecMsgComposer implements GovecMsg {
         msg: toUtf8(JSON.stringify({
           revert_freeze_status: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -101,7 +101,7 @@ export class GovecMsgComposer implements GovecMsg {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -112,7 +112,7 @@ export class GovecMsgComposer implements GovecMsg {
             transaction
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -120,7 +120,7 @@ export class GovecMsgComposer implements GovecMsg {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -131,7 +131,7 @@ export class GovecMsgComposer implements GovecMsg {
             new_user_address: newUserAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -139,7 +139,7 @@ export class GovecMsgComposer implements GovecMsg {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -150,7 +150,7 @@ export class GovecMsgComposer implements GovecMsg {
             new_relayer_address: newRelayerAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -158,7 +158,7 @@ export class GovecMsgComposer implements GovecMsg {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class GovecMsgComposer implements GovecMsg {
             relayer_address: relayerAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -179,7 +179,7 @@ export class GovecMsgComposer implements GovecMsg {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -191,7 +191,7 @@ export class GovecMsgComposer implements GovecMsg {
             new_multisig_code_id: newMultisigCodeId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -199,7 +199,7 @@ export class GovecMsgComposer implements GovecMsg {
     newLabel
   }: {
     newLabel: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -210,7 +210,7 @@ export class GovecMsgComposer implements GovecMsg {
             new_label: newLabel
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/__output__/vectis/proxy/Proxy.client.ts b/__output__/vectis/proxy/Proxy.client.ts
index 19998e28..7a9304db 100644
--- a/__output__/vectis/proxy/Proxy.client.ts
+++ b/__output__/vectis/proxy/Proxy.client.ts
@@ -49,40 +49,40 @@ export interface ProxyInterface extends ProxyReadOnlyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }
 export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   client: SigningCosmWasmClient;
@@ -106,61 +106,61 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   relay = async ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   rotateUserKey = async ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addRelayer = async ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeRelayer = async ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGuardians = async ({
     guardians,
@@ -168,23 +168,23 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
         new_multisig_code_id: newMultisigCodeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateLabel = async ({
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }
\ No newline at end of file
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index 32685132..ec983ca1 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -15,40 +15,40 @@ export interface ProxyMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  revertFreezeStatus: (_funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  revertFreezeStatus: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }
 export class ProxyMsgComposer implements ProxyMsg {
   sender: string;
@@ -69,7 +69,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -80,11 +80,11 @@ export class ProxyMsgComposer implements ProxyMsg {
             msgs
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  revertFreezeStatus = (_funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  revertFreezeStatus = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -93,7 +93,7 @@ export class ProxyMsgComposer implements ProxyMsg {
         msg: toUtf8(JSON.stringify({
           revert_freeze_status: {}
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -101,7 +101,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -112,7 +112,7 @@ export class ProxyMsgComposer implements ProxyMsg {
             transaction
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -120,7 +120,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -131,7 +131,7 @@ export class ProxyMsgComposer implements ProxyMsg {
             new_user_address: newUserAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -139,7 +139,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -150,7 +150,7 @@ export class ProxyMsgComposer implements ProxyMsg {
             new_relayer_address: newRelayerAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -158,7 +158,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -169,7 +169,7 @@ export class ProxyMsgComposer implements ProxyMsg {
             relayer_address: relayerAddress
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -179,7 +179,7 @@ export class ProxyMsgComposer implements ProxyMsg {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -191,7 +191,7 @@ export class ProxyMsgComposer implements ProxyMsg {
             new_multisig_code_id: newMultisigCodeId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -199,7 +199,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     newLabel
   }: {
     newLabel: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -210,7 +210,7 @@ export class ProxyMsgComposer implements ProxyMsg {
             new_label: newLabel
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
index 6b626799..c4bd7b16 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
@@ -25,10 +25,10 @@ exports[`execute classes array types 1`] = `
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-  proposedNewOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  proposedNewOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proposed_new_owner: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   allowedVaults = async ({
     limit,
@@ -36,13 +36,13 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allowed_vaults: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   allDebtShares = async ({
     limit,
@@ -50,18 +50,18 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  allPreviousOwners = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  allPreviousOwners = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_previous_owners: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   ownerOf = async ({
     includeExpired,
@@ -69,13 +69,13 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       owner_of: {
         include_expired: includeExpired,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approval = async ({
     includeExpired,
@@ -85,14 +85,14 @@ exports[`execute classes array types 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approval: {
         include_expired: includeExpired,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approvals = async ({
     includeExpired,
@@ -100,13 +100,13 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approvals: {
         include_expired: includeExpired,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   allOperators = async ({
     includeExpired,
@@ -118,7 +118,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_operators: {
         include_expired: includeExpired,
@@ -126,28 +126,28 @@ exports[`execute classes array types 1`] = `
         owner,
         start_after: startAfter
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  numTokens = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  numTokens = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       num_tokens: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  contractInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  contractInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       contract_info: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   nftInfo = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       nft_info: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   allNftInfo = async ({
     includeExpired,
@@ -155,13 +155,13 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_nft_info: {
         include_expired: includeExpired,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   tokens = async ({
     limit,
@@ -171,14 +171,14 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       tokens: {
         limit,
         owner,
         start_after: startAfter
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   allTokens = async ({
     limit,
@@ -186,18 +186,18 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_tokens: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  minter = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  minter = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       minter: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -206,29 +206,29 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  proposedNewOwner: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  proposedNewOwner: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   allowedVaults: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   allDebtShares: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  allPreviousOwners: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  allPreviousOwners: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   ownerOf: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approval: ({
     includeExpired,
     spender,
@@ -237,14 +237,14 @@ exports[`execute interfaces no extends 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approvals: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   allOperators: ({
     includeExpired,
     limit,
@@ -255,21 +255,21 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  numTokens: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  contractInfo: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  numTokens: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  contractInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   nftInfo: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   allNftInfo: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   tokens: ({
     limit,
     owner,
@@ -278,15 +278,15 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   allTokens: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  minter: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  minter: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
index f910883e..31376d22 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
@@ -32,7 +32,7 @@ exports[`execute classes array types 1`] = `
         nested,
         supernested
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -53,7 +53,7 @@ exports[`execute interfaces no extends 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
index 990790e4..09d9d683 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
@@ -30,13 +30,13 @@ exports[`execute classes array types 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
         creditor
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   editEdge = async ({
     amount,
@@ -46,36 +46,36 @@ exports[`execute classes array types 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
         creditor,
         edge_id: edgeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeEdge = async ({
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createGraph = async ({
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createGraphSimplified = async ({
     graph,
@@ -83,13 +83,13 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   editGraphSimplified = async ({
     graph,
@@ -97,89 +97,89 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateEdges = async ({
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   findSavingsInAGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   saveNetworkToFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createGraphFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   applySetOffFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -194,7 +194,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   editEdge: ({
     amount,
     creditor,
@@ -203,63 +203,63 @@ exports[`execute interfaces no extends 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  findSavings: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  reset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
index f9532ee9..6316ad61 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
@@ -32,7 +32,7 @@ exports[`execute classes array types 1`] = `
         nested,
         supernested
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -53,7 +53,7 @@ exports[`execute interfaces no extends 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
index 659ba662..38181b04 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
@@ -21,36 +21,36 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
         addresses_to_remove: addressesToRemove,
         group
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeGroup = async ({
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateOwner = async ({
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -67,17 +67,17 @@ exports[`execute interfaces no extends 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
index 701f2c97..06ed0e82 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
@@ -27,14 +27,14 @@ exports[`execute classes array types 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
         msgs,
         title
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   vote = async ({
     proposalId,
@@ -42,35 +42,35 @@ exports[`execute classes array types 1`] = `
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
         vote
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   execute = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   close = async ({
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     allowRevoting,
@@ -88,7 +88,7 @@ exports[`execute classes array types 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -99,51 +99,51 @@ exports[`execute classes array types 1`] = `
         only_members_execute: onlyMembersExecute,
         threshold
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeProposalHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeVoteHook = async ({
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -160,24 +160,24 @@ exports[`execute interfaces no extends 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -194,27 +194,27 @@ exports[`execute interfaces no extends 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
index 6c1a8bc6..c841678f 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
@@ -25,13 +25,13 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -41,14 +41,14 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -58,14 +58,14 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -73,13 +73,13 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -87,24 +87,24 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -116,7 +116,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -124,18 +124,18 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -164,13 +164,13 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -180,14 +180,14 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -197,14 +197,14 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -212,13 +212,13 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -226,24 +226,24 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -255,7 +255,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -263,18 +263,18 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -304,13 +304,13 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -320,14 +320,14 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -337,14 +337,14 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -352,13 +352,13 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -366,24 +366,24 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -395,7 +395,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -403,18 +403,18 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -444,13 +444,13 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -460,14 +460,14 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -477,14 +477,14 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -492,13 +492,13 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -506,24 +506,24 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -535,7 +535,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -543,18 +543,18 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -583,13 +583,13 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -599,14 +599,14 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -616,14 +616,14 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -631,13 +631,13 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -645,24 +645,24 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -674,7 +674,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -682,18 +682,18 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
index 15e95ef0..8e376dd4 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
@@ -8,8 +8,8 @@ exports[`execute interfaces no extends 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  updateOwnership: (action: Action, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  updateOwnership: (action: Action, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -29,17 +29,17 @@ exports[`ownership client with tuple 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_factory: {
         new_factory: newFactory
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  updateOwnership = async (action: Action, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  updateOwnership = async (action: Action, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_ownership: action
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
index 67429f9f..0869a963 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -28,14 +28,14 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
         msg,
         sender
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateConfig = async ({
     feeCollector,
@@ -45,14 +45,14 @@ exports[`execute class /execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         fee_collector: feeCollector,
         generator_address: generatorAddress,
         lp_token_code_id: lpTokenCodeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updatePoolConfig = async ({
     isDisabled,
@@ -62,25 +62,25 @@ exports[`execute class /execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_pool_config: {
         is_disabled: isDisabled,
         new_fee_info: newFeeInfo,
         pool_type: poolType
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addToRegistery = async ({
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_to_registery: {
         new_pool_config: newPoolConfig
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createPoolInstance = async ({
     assetInfos,
@@ -94,7 +94,7 @@ exports[`execute class /execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_pool_instance: {
         asset_infos: assetInfos,
@@ -103,7 +103,7 @@ exports[`execute class /execute_msg.json 1`] = `
         lp_token_symbol: lpTokenSymbol,
         pool_type: poolType
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   joinPool = async ({
     assets,
@@ -119,7 +119,7 @@ exports[`execute class /execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       join_pool: {
         assets,
@@ -129,7 +129,7 @@ exports[`execute class /execute_msg.json 1`] = `
         recipient,
         slippage_tolerance: slippageTolerance
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   swap = async ({
     recipient,
@@ -137,13 +137,13 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       swap: {
         recipient,
         swap_request: swapRequest
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   proposeNewOwner = async ({
     expiresIn,
@@ -151,23 +151,23 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     expiresIn: number;
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         expires_in: expiresIn,
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  dropOwnershipProposal = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  dropOwnershipProposal = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       drop_ownership_proposal: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  claimOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  claimOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       claim_ownership: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -184,7 +184,7 @@ exports[`execute interface /execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateConfig: ({
     feeCollector,
     generatorAddress,
@@ -193,7 +193,7 @@ exports[`execute interface /execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updatePoolConfig: ({
     isDisabled,
     newFeeInfo,
@@ -202,12 +202,12 @@ exports[`execute interface /execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addToRegistery: ({
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createPoolInstance: ({
     assetInfos,
     initParams,
@@ -220,7 +220,7 @@ exports[`execute interface /execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   joinPool: ({
     assets,
     autoStake,
@@ -235,23 +235,23 @@ exports[`execute interface /execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   swap: ({
     recipient,
     swapRequest
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   proposeNewOwner: ({
     expiresIn,
     owner
   }: {
     expiresIn: number;
     owner: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  dropOwnershipProposal: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  claimOwnership: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  dropOwnershipProposal: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  claimOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
index f64d0922..0ba2431e 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -13,10 +13,10 @@ exports[`execute classes array types 1`] = `
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-  getConfig = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getConfig = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_config: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getPlugins = async ({
     limit,
@@ -24,24 +24,24 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugins: {
         limit,
         start_after: startAfter
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getPluginById = async ({
     id
   }: {
     id: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugin_by_id: {
         id
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -50,19 +50,19 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getConfig: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getConfig: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getPlugins: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getPluginById: ({
     id
   }: {
     id: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
index 3e85c7fb..e0d5dc7e 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
@@ -69,13 +69,13 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
         creditor
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   editEdge = async ({
     amount,
@@ -85,36 +85,36 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
         creditor,
         edge_id: edgeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeEdge = async ({
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createGraph = async ({
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createGraphSimplified = async ({
     graph,
@@ -122,13 +122,13 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   editGraphSimplified = async ({
     graph,
@@ -136,89 +136,89 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateEdges = async ({
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   findSavingsInAGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   saveNetworkToFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   createGraphFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   applySetOffFromFile = async ({
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -271,113 +271,113 @@ exports[`execute class /query_msg.json 1`] = `
     this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
-  getDenom = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getDenom = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_denom: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  getOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_owner: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  allEdges = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  allEdges = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_edges: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   oneEdge = async ({
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_edge: {
         edge_id: edgeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   oneBatch = async ({
     batchId
   }: {
     batchId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_batch: {
         batch_id: batchId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   oneGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_graph: {
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getEdgesByAddress = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_by_address: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getEdgesAsCounterparty = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_as_counterparty: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getTotalDebtPerAddress = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_per_address: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getTotalCreditPerAddress = async ({
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_credit_per_address: {
         address
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   getTotalDebtByGraph = async ({
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_by_graph: {
         graph_id: graphId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  getTotalDebt = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  getTotalDebt = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -413,7 +413,7 @@ exports[`execute interface /execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   editEdge: ({
     amount,
     creditor,
@@ -422,63 +422,63 @@ exports[`execute interface /execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  findSavings: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  reset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
@@ -500,50 +500,50 @@ exports[`execute interface /query_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getDenom: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  getOwner: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  allEdges: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  getDenom: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  getOwner: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  allEdges: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   oneEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   oneBatch: ({
     batchId
   }: {
     batchId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   oneGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getEdgesByAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getEdgesAsCounterparty: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getTotalDebtPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getTotalCreditPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   getTotalDebtByGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebt: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  getTotalDebt: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
index 56f11aa0..b6b8db72 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
@@ -25,13 +25,13 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -41,14 +41,14 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -58,14 +58,14 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -73,13 +73,13 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -87,24 +87,24 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -116,7 +116,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -124,18 +124,18 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -164,13 +164,13 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -180,14 +180,14 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -197,14 +197,14 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -212,13 +212,13 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -226,24 +226,24 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -255,7 +255,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -263,18 +263,18 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -304,13 +304,13 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -320,14 +320,14 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -337,14 +337,14 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -352,13 +352,13 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -366,24 +366,24 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -395,7 +395,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -403,18 +403,18 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -444,13 +444,13 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -460,14 +460,14 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -477,14 +477,14 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -492,13 +492,13 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -506,24 +506,24 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -535,7 +535,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -543,18 +543,18 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -583,13 +583,13 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -599,14 +599,14 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -616,14 +616,14 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -631,13 +631,13 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -645,24 +645,24 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -674,7 +674,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -682,18 +682,18 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
index d04d3f90..39313e14 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
@@ -24,13 +24,13 @@ exports[`execute classes array types 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -40,14 +40,14 @@ exports[`execute classes array types 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -57,14 +57,14 @@ exports[`execute classes array types 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -72,13 +72,13 @@ exports[`execute classes array types 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -86,24 +86,24 @@ exports[`execute classes array types 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -115,7 +115,7 @@ exports[`execute classes array types 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -123,18 +123,18 @@ exports[`execute classes array types 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -149,7 +149,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -158,7 +158,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -167,26 +167,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -197,12 +197,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
index 0fa38069..1e01084d 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
@@ -61,13 +61,13 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -77,14 +77,14 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -94,14 +94,14 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -109,13 +109,13 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -123,24 +123,24 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -152,7 +152,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -160,18 +160,18 @@ exports[`execute classes 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -197,36 +197,36 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
         addresses_to_remove: addressesToRemove,
         group
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeGroup = async ({
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateOwner = async ({
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -255,13 +255,13 @@ exports[`execute classes no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   sendNft = async ({
     contract,
@@ -271,14 +271,14 @@ exports[`execute classes no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
         msg,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approve = async ({
     expires,
@@ -288,14 +288,14 @@ exports[`execute classes no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revoke = async ({
     spender,
@@ -303,13 +303,13 @@ exports[`execute classes no extends 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   approveAll = async ({
     expires,
@@ -317,24 +317,24 @@ exports[`execute classes no extends 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   revokeAll = async ({
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   mint = async ({
     extension,
@@ -346,7 +346,7 @@ exports[`execute classes no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -354,18 +354,18 @@ exports[`execute classes no extends 1`] = `
         token_id: tokenId,
         token_uri: tokenUri
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   burn = async ({
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -380,7 +380,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   sendNft: ({
     contract,
     msg,
@@ -389,7 +389,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approve: ({
     expires,
     spender,
@@ -398,26 +398,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   mint: ({
     extension,
     owner,
@@ -428,12 +428,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
index 800b5ba5..77c93b08 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
@@ -30,61 +30,61 @@ exports[`execute classes array types 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   relay = async ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   rotateUserKey = async ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   addRelayer = async ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   removeRelayer = async ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateGuardians = async ({
     guardians,
@@ -92,24 +92,24 @@ exports[`execute classes array types 1`] = `
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
         new_multisig_code_id: newMultisigCodeId
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   updateLabel = async ({
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
@@ -122,40 +122,40 @@ exports[`execute interfaces no extends 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
 }"
 `;
 
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
index 3bd71164..f37c91c8 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
@@ -20,12 +20,12 @@ exports[`execute classes 1`] = `
     params
   }: {
     params: ParamInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         params
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   setWinner = async ({
     currentPrices,
@@ -35,14 +35,14 @@ exports[`execute classes 1`] = `
     currentPrices: number[][];
     prevPrices: number[][];
     wagerKey: Addr[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
         current_prices: currentPrices,
         prev_prices: prevPrices,
         wager_key: wagerKey
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   wager = async ({
     againstCurrencies,
@@ -54,7 +54,7 @@ exports[`execute classes 1`] = `
     currency: Currency;
     expiry: number;
     token: Addr[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       wager: {
         against_currencies: againstCurrencies,
@@ -62,18 +62,18 @@ exports[`execute classes 1`] = `
         expiry,
         token
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
   cancel = async ({
     token
   }: {
     token: Addr[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cancel: {
         token
       }
-    }, fee, memo, _funds);
+    }, fee_, memo_, funds_);
   };
 }"
 `;
diff --git a/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
index 974d5993..1707104a 100644
--- a/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
+++ b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
@@ -10,7 +10,7 @@ exports[`createMessageComposerInterface 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -19,7 +19,7 @@ exports[`createMessageComposerInterface 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approve: ({
     expires,
     spender,
@@ -28,26 +28,26 @@ exports[`createMessageComposerInterface 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   mint: ({
     extension,
     owner,
@@ -58,12 +58,12 @@ exports[`createMessageComposerInterface 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }"
 `;
 
@@ -89,7 +89,7 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -101,7 +101,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -113,7 +113,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -126,7 +126,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -138,7 +138,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -151,7 +151,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -161,7 +161,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -173,7 +173,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -183,7 +183,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -195,7 +195,7 @@ exports[`execute classes 1`] = `
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -203,7 +203,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -214,7 +214,7 @@ exports[`execute classes 1`] = `
             operator
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -228,7 +228,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -242,7 +242,7 @@ exports[`execute classes 1`] = `
             token_uri: tokenUri
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -250,7 +250,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -261,7 +261,7 @@ exports[`execute classes 1`] = `
             token_id: tokenId
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -282,7 +282,7 @@ exports[`ownershipClass 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -293,11 +293,11 @@ exports[`ownershipClass 1`] = `
             new_factory: newFactory
           }
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
-  updateOwnership = (action: Action, _funds?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateOwnership = (action: Action, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -306,7 +306,7 @@ exports[`ownershipClass 1`] = `
         msg: toUtf8(JSON.stringify({
           update_ownership: action
         })),
-        funds: _funds
+        funds: funds_
       })
     };
   };
@@ -321,7 +321,7 @@ exports[`ownershipInterface 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateOwnership: (action: Action, _funds?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  updateOwnership: (action: Action, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
 }"
 `;
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 8fe44711..16dc1a0b 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -266,9 +266,9 @@ export const createWasmExecMethod = (
                 t.objectExpression([
                   t.objectProperty(msgAction, msgActionValue)
                 ]),
-                t.identifier('fee'),
-                t.identifier('memo'),
-                t.identifier('_funds')
+                t.identifier('fee_'),
+                t.identifier('memo_'),
+                t.identifier('funds_')
               ]
             )
           )
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 555abc4e..7f927f7c 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -100,7 +100,7 @@ export class BuilderContext {
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-  } {
+    } {
     return this.providers;
   }
 }
@@ -145,7 +145,7 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-  } {
+    } {
     return this.builderContext.providers;
   }
   getImports(registeredUtils?: UtilMapping, filepath?: string): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] {
diff --git a/packages/ast/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
index d80a5415..21b750f6 100644
--- a/packages/ast/src/message-composer/message-composer.ts
+++ b/packages/ast/src/message-composer/message-composer.ts
@@ -107,7 +107,7 @@ const createWasmExecMethodMessageComposer = (
                     ),
                     t.objectProperty(
                       t.identifier('funds'),
-                      t.identifier('_funds')
+                      t.identifier('funds_')
                     )
                   ])
                 ]
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index ac140351..852aba63 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -97,18 +97,18 @@ export const bindMethod = (name: string) => {
       t.thisExpression(),
       t.identifier(name)
     ),
-      t.callExpression(
+    t.callExpression(
+      t.memberExpression(
         t.memberExpression(
-          t.memberExpression(
-            t.thisExpression(),
-            t.identifier(name)
-          ),
-          t.identifier('bind')
+          t.thisExpression(),
+          t.identifier(name)
         ),
-        [
-          t.thisExpression()
-        ]
-      )
+        t.identifier('bind')
+      ),
+      [
+        t.thisExpression()
+      ]
+    )
     )
   );
 };
diff --git a/packages/ast/src/utils/constants.ts b/packages/ast/src/utils/constants.ts
index 6361af48..eda1a120 100644
--- a/packages/ast/src/utils/constants.ts
+++ b/packages/ast/src/utils/constants.ts
@@ -3,12 +3,12 @@ import * as t from '@babel/types';
 import { identifier } from './babel';
 
 export const OPTIONAL_FUNDS_PARAM = identifier(
-  '_funds',
+  'funds_',
   t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))),
   true
 );
 export const OPTIONAL_FEE_PARAM = identifier(
-  'fee',
+  'fee_',
   t.tsTypeAnnotation(
     t.tsUnionType([
       t.tsNumberKeyword(),
@@ -19,7 +19,7 @@ export const OPTIONAL_FEE_PARAM = identifier(
   true
 );
 export const OPTIONAL_MEMO_PARAM = identifier(
-  'memo',
+  'memo_',
   t.tsTypeAnnotation(t.tsStringKeyword()),
   true
 );

From df0b3589e5966dcb62eb1f63d399a9b0567f9279 Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:53:56 +0200
Subject: [PATCH 246/287] Ensure client fee is underscored

---
 .../ts-client.account-nfts.test.ts.snap       | 30 +++----
 .../ts-client.arrays-item-tuples.test.ts.snap |  2 +-
 .../ts-client.arrays-ref.test.ts.snap         | 28 +++----
 .../ts-client.arrays.test.ts.snap             |  2 +-
 .../ts-client.cw-named-groups.test.ts.snap    |  6 +-
 .../ts-client.cw-proposal-single.test.ts.snap | 18 ++---
 .../ts-client.declare.test.ts.snap            | 80 +++++++++----------
 .../ts-client.issue-101.test.ts.snap          |  4 +-
 .../ts-client.issue-71.test.ts.snap           | 20 ++---
 .../ts-client.issue-98.test.ts.snap           |  6 +-
 .../ts-client.issues.test.ts.snap             | 52 ++++++------
 .../ts-client.overrides.test.ts.snap          | 80 +++++++++----------
 .../ts-client.sg721.test.ts.snap              | 16 ++--
 .../__snapshots__/ts-client.test.ts.snap      | 38 ++++-----
 .../ts-client.vectis.test.ts.snap             | 16 ++--
 .../ts-client.wager.test.ts.snap              |  8 +-
 packages/ast/src/client/client.ts             |  3 +-
 17 files changed, 205 insertions(+), 204 deletions(-)

diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
index c4bd7b16..ca6ad11d 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
@@ -25,7 +25,7 @@ exports[`execute classes array types 1`] = `
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-  proposedNewOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  proposedNewOwner = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proposed_new_owner: {}
     }, fee_, memo_, funds_);
@@ -36,7 +36,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allowed_vaults: {
         limit,
@@ -50,7 +50,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
         limit,
@@ -58,7 +58,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  allPreviousOwners = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  allPreviousOwners = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_previous_owners: {}
     }, fee_, memo_, funds_);
@@ -69,7 +69,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       owner_of: {
         include_expired: includeExpired,
@@ -85,7 +85,7 @@ exports[`execute classes array types 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approval: {
         include_expired: includeExpired,
@@ -100,7 +100,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approvals: {
         include_expired: includeExpired,
@@ -118,7 +118,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_operators: {
         include_expired: includeExpired,
@@ -128,12 +128,12 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  numTokens = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  numTokens = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       num_tokens: {}
     }, fee_, memo_, funds_);
   };
-  contractInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  contractInfo = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       contract_info: {}
     }, fee_, memo_, funds_);
@@ -142,7 +142,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       nft_info: {
         token_id: tokenId
@@ -155,7 +155,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_nft_info: {
         include_expired: includeExpired,
@@ -171,7 +171,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       tokens: {
         limit,
@@ -186,7 +186,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_tokens: {
         limit,
@@ -194,7 +194,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  minter = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  minter = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       minter: {}
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
index 31376d22..2cfda9ff 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
index 09d9d683..9b8cfd12 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
@@ -30,7 +30,7 @@ exports[`execute classes array types 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -46,7 +46,7 @@ exports[`execute classes array types 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -59,7 +59,7 @@ exports[`execute classes array types 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -70,7 +70,7 @@ exports[`execute classes array types 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -83,7 +83,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -97,7 +97,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -109,7 +109,7 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -120,14 +120,14 @@ exports[`execute classes array types 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee_, memo_, funds_);
   };
-  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee_, memo_, funds_);
@@ -136,14 +136,14 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee_, memo_, funds_);
@@ -152,7 +152,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -163,7 +163,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -174,7 +174,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
index 6316ad61..137a260e 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
index 38181b04..17284b21 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
@@ -21,7 +21,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -34,7 +34,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -45,7 +45,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
index 06ed0e82..f507d44c 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
@@ -27,7 +27,7 @@ exports[`execute classes array types 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -42,7 +42,7 @@ exports[`execute classes array types 1`] = `
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -54,7 +54,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -65,7 +65,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -88,7 +88,7 @@ exports[`execute classes array types 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -105,7 +105,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -116,7 +116,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -127,7 +127,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -138,7 +138,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
index c841678f..9167c877 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
@@ -25,7 +25,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -41,7 +41,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -58,7 +58,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -73,7 +73,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -87,7 +87,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -99,7 +99,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -116,7 +116,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -130,7 +130,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -164,7 +164,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -180,7 +180,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -197,7 +197,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -212,7 +212,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -226,7 +226,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -238,7 +238,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -255,7 +255,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -269,7 +269,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -304,7 +304,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -320,7 +320,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -337,7 +337,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -352,7 +352,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -366,7 +366,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -378,7 +378,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -395,7 +395,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,7 +409,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -444,7 +444,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -460,7 +460,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -477,7 +477,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -492,7 +492,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -506,7 +506,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -518,7 +518,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -535,7 +535,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -549,7 +549,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -583,7 +583,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -599,7 +599,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -616,7 +616,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -631,7 +631,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -645,7 +645,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -657,7 +657,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -674,7 +674,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -688,7 +688,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
index 8e376dd4..7b9946db 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
@@ -29,14 +29,14 @@ exports[`ownership client with tuple 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_factory: {
         new_factory: newFactory
       }
     }, fee_, memo_, funds_);
   };
-  updateOwnership = async (action: Action, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateOwnership = async (action: Action, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_ownership: action
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
index 0869a963..17af22fd 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -28,7 +28,7 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -45,7 +45,7 @@ exports[`execute class /execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         fee_collector: feeCollector,
@@ -62,7 +62,7 @@ exports[`execute class /execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_pool_config: {
         is_disabled: isDisabled,
@@ -75,7 +75,7 @@ exports[`execute class /execute_msg.json 1`] = `
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_to_registery: {
         new_pool_config: newPoolConfig
@@ -94,7 +94,7 @@ exports[`execute class /execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_pool_instance: {
         asset_infos: assetInfos,
@@ -119,7 +119,7 @@ exports[`execute class /execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       join_pool: {
         assets,
@@ -137,7 +137,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       swap: {
         recipient,
@@ -151,7 +151,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     expiresIn: number;
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         expires_in: expiresIn,
@@ -159,12 +159,12 @@ exports[`execute class /execute_msg.json 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  dropOwnershipProposal = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  dropOwnershipProposal = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       drop_ownership_proposal: {}
     }, fee_, memo_, funds_);
   };
-  claimOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  claimOwnership = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       claim_ownership: {}
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
index 0ba2431e..3b9b94c0 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -13,7 +13,7 @@ exports[`execute classes array types 1`] = `
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-  getConfig = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getConfig = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_config: {}
     }, fee_, memo_, funds_);
@@ -24,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugins: {
         limit,
@@ -36,7 +36,7 @@ exports[`execute classes array types 1`] = `
     id
   }: {
     id: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugin_by_id: {
         id
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
index e0d5dc7e..c1925cc5 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
@@ -69,7 +69,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -85,7 +85,7 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -98,7 +98,7 @@ exports[`execute class /execute_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -109,7 +109,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -122,7 +122,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -136,7 +136,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -148,7 +148,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -159,14 +159,14 @@ exports[`execute class /execute_msg.json 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee_, memo_, funds_);
   };
-  findSavings = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee_, memo_, funds_);
@@ -175,14 +175,14 @@ exports[`execute class /execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  reset = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee_, memo_, funds_);
@@ -191,7 +191,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -202,7 +202,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -213,7 +213,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
@@ -271,17 +271,17 @@ exports[`execute class /query_msg.json 1`] = `
     this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
-  getDenom = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getDenom = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_denom: {}
     }, fee_, memo_, funds_);
   };
-  getOwner = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getOwner = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_owner: {}
     }, fee_, memo_, funds_);
   };
-  allEdges = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  allEdges = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_edges: {}
     }, fee_, memo_, funds_);
@@ -290,7 +290,7 @@ exports[`execute class /query_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_edge: {
         edge_id: edgeId
@@ -301,7 +301,7 @@ exports[`execute class /query_msg.json 1`] = `
     batchId
   }: {
     batchId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_batch: {
         batch_id: batchId
@@ -312,7 +312,7 @@ exports[`execute class /query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_graph: {
         graph_id: graphId
@@ -323,7 +323,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_by_address: {
         address
@@ -334,7 +334,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_as_counterparty: {
         address
@@ -345,7 +345,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_per_address: {
         address
@@ -356,7 +356,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_credit_per_address: {
         address
@@ -367,14 +367,14 @@ exports[`execute class /query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_by_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  getTotalDebt = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getTotalDebt = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt: {}
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
index b6b8db72..70ec5042 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
@@ -25,7 +25,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -41,7 +41,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -58,7 +58,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -73,7 +73,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -87,7 +87,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -99,7 +99,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -116,7 +116,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -130,7 +130,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -164,7 +164,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -180,7 +180,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -197,7 +197,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -212,7 +212,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -226,7 +226,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -238,7 +238,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -255,7 +255,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -269,7 +269,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -304,7 +304,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -320,7 +320,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -337,7 +337,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -352,7 +352,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -366,7 +366,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -378,7 +378,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -395,7 +395,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,7 +409,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -444,7 +444,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -460,7 +460,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -477,7 +477,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -492,7 +492,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -506,7 +506,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -518,7 +518,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -535,7 +535,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -549,7 +549,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -583,7 +583,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -599,7 +599,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -616,7 +616,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -631,7 +631,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -645,7 +645,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -657,7 +657,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -674,7 +674,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -688,7 +688,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
index 39313e14..623027da 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
@@ -24,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -40,7 +40,7 @@ exports[`execute classes array types 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -57,7 +57,7 @@ exports[`execute classes array types 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -72,7 +72,7 @@ exports[`execute classes array types 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -86,7 +86,7 @@ exports[`execute classes array types 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -98,7 +98,7 @@ exports[`execute classes array types 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -115,7 +115,7 @@ exports[`execute classes array types 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -129,7 +129,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
index 1e01084d..4f550432 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
@@ -61,7 +61,7 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -77,7 +77,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -94,7 +94,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -109,7 +109,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -123,7 +123,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -135,7 +135,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -152,7 +152,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -166,7 +166,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -197,7 +197,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -210,7 +210,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -221,7 +221,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
@@ -255,7 +255,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -271,7 +271,7 @@ exports[`execute classes no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -288,7 +288,7 @@ exports[`execute classes no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -303,7 +303,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -317,7 +317,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -329,7 +329,7 @@ exports[`execute classes no extends 1`] = `
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -346,7 +346,7 @@ exports[`execute classes no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -360,7 +360,7 @@ exports[`execute classes no extends 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
index 77c93b08..17bd63b3 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
@@ -30,14 +30,14 @@ exports[`execute classes array types 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -46,7 +46,7 @@ exports[`execute classes array types 1`] = `
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -57,7 +57,7 @@ exports[`execute classes array types 1`] = `
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -68,7 +68,7 @@ exports[`execute classes array types 1`] = `
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -79,7 +79,7 @@ exports[`execute classes array types 1`] = `
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -92,7 +92,7 @@ exports[`execute classes array types 1`] = `
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -104,7 +104,7 @@ exports[`execute classes array types 1`] = `
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
index f37c91c8..d10c5d5c 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
@@ -20,7 +20,7 @@ exports[`execute classes 1`] = `
     params
   }: {
     params: ParamInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         params
@@ -35,7 +35,7 @@ exports[`execute classes 1`] = `
     currentPrices: number[][];
     prevPrices: number[][];
     wagerKey: Addr[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
         current_prices: currentPrices,
@@ -54,7 +54,7 @@ exports[`execute classes 1`] = `
     currency: Currency;
     expiry: number;
     token: Addr[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       wager: {
         against_currencies: againstCurrencies,
@@ -68,7 +68,7 @@ exports[`execute classes 1`] = `
     token
   }: {
     token: Addr[][];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cancel: {
         token
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 16dc1a0b..406bb57b 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -21,11 +21,12 @@ import {
   getPropertyType,
   getResponseType
 } from '../utils/types';
+import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from "../utils/constants";
 
 export const CONSTANT_EXEC_PARAMS = [
   t.assignmentPattern(
     identifier(
-      'fee',
+      'fee_',
       t.tsTypeAnnotation(
         t.tsUnionType([
           t.tSNumberKeyword(),

From 08521bda799189a24061610ee579de63a67135ee Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:55:21 +0200
Subject: [PATCH 247/287] Use optional memo

---
 .../ts-client.account-nfts.test.ts.snap       | 30 +++----
 .../ts-client.arrays-item-tuples.test.ts.snap |  2 +-
 .../ts-client.arrays-ref.test.ts.snap         | 28 +++----
 .../ts-client.arrays.test.ts.snap             |  2 +-
 .../ts-client.cw-named-groups.test.ts.snap    |  6 +-
 .../ts-client.cw-proposal-single.test.ts.snap | 18 ++---
 .../ts-client.declare.test.ts.snap            | 80 +++++++++----------
 .../ts-client.issue-101.test.ts.snap          |  4 +-
 .../ts-client.issue-71.test.ts.snap           | 20 ++---
 .../ts-client.issue-98.test.ts.snap           |  6 +-
 .../ts-client.issues.test.ts.snap             | 52 ++++++------
 .../ts-client.overrides.test.ts.snap          | 80 +++++++++----------
 .../ts-client.sg721.test.ts.snap              | 16 ++--
 .../__snapshots__/ts-client.test.ts.snap      | 38 ++++-----
 .../ts-client.vectis.test.ts.snap             | 16 ++--
 .../ts-client.wager.test.ts.snap              |  8 +-
 packages/ast/src/client/client.ts             |  2 +-
 17 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
index ca6ad11d..b4a36f11 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
@@ -25,7 +25,7 @@ exports[`execute classes array types 1`] = `
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-  proposedNewOwner = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  proposedNewOwner = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proposed_new_owner: {}
     }, fee_, memo_, funds_);
@@ -36,7 +36,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allowed_vaults: {
         limit,
@@ -50,7 +50,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
         limit,
@@ -58,7 +58,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  allPreviousOwners = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  allPreviousOwners = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_previous_owners: {}
     }, fee_, memo_, funds_);
@@ -69,7 +69,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       owner_of: {
         include_expired: includeExpired,
@@ -85,7 +85,7 @@ exports[`execute classes array types 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approval: {
         include_expired: includeExpired,
@@ -100,7 +100,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approvals: {
         include_expired: includeExpired,
@@ -118,7 +118,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_operators: {
         include_expired: includeExpired,
@@ -128,12 +128,12 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  numTokens = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  numTokens = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       num_tokens: {}
     }, fee_, memo_, funds_);
   };
-  contractInfo = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  contractInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       contract_info: {}
     }, fee_, memo_, funds_);
@@ -142,7 +142,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       nft_info: {
         token_id: tokenId
@@ -155,7 +155,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_nft_info: {
         include_expired: includeExpired,
@@ -171,7 +171,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       tokens: {
         limit,
@@ -186,7 +186,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_tokens: {
         limit,
@@ -194,7 +194,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  minter = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  minter = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       minter: {}
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
index 2cfda9ff..cf42041a 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
index 9b8cfd12..7a2f67f1 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
@@ -30,7 +30,7 @@ exports[`execute classes array types 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -46,7 +46,7 @@ exports[`execute classes array types 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -59,7 +59,7 @@ exports[`execute classes array types 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -70,7 +70,7 @@ exports[`execute classes array types 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -83,7 +83,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -97,7 +97,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -109,7 +109,7 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -120,14 +120,14 @@ exports[`execute classes array types 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee_, memo_, funds_);
   };
-  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee_, memo_, funds_);
@@ -136,14 +136,14 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  reset = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee_, memo_, funds_);
@@ -152,7 +152,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -163,7 +163,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -174,7 +174,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
index 137a260e..1d09dfc0 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
index 17284b21..a0feec9b 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
@@ -21,7 +21,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -34,7 +34,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -45,7 +45,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
index f507d44c..ce732cdd 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
@@ -27,7 +27,7 @@ exports[`execute classes array types 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -42,7 +42,7 @@ exports[`execute classes array types 1`] = `
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -54,7 +54,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -65,7 +65,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -88,7 +88,7 @@ exports[`execute classes array types 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -105,7 +105,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -116,7 +116,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -127,7 +127,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -138,7 +138,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
index 9167c877..46a8ff22 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
@@ -25,7 +25,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -41,7 +41,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -58,7 +58,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -73,7 +73,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -87,7 +87,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -99,7 +99,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -116,7 +116,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -130,7 +130,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -164,7 +164,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -180,7 +180,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -197,7 +197,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -212,7 +212,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -226,7 +226,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -238,7 +238,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -255,7 +255,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -269,7 +269,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -304,7 +304,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -320,7 +320,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -337,7 +337,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -352,7 +352,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -366,7 +366,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -378,7 +378,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -395,7 +395,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,7 +409,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -444,7 +444,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -460,7 +460,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -477,7 +477,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -492,7 +492,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -506,7 +506,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -518,7 +518,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -535,7 +535,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -549,7 +549,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -583,7 +583,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -599,7 +599,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -616,7 +616,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -631,7 +631,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -645,7 +645,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -657,7 +657,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -674,7 +674,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -688,7 +688,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
index 7b9946db..17b77dd3 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
@@ -29,14 +29,14 @@ exports[`ownership client with tuple 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_factory: {
         new_factory: newFactory
       }
     }, fee_, memo_, funds_);
   };
-  updateOwnership = async (action: Action, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateOwnership = async (action: Action, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_ownership: action
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
index 17af22fd..b4f43503 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -28,7 +28,7 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -45,7 +45,7 @@ exports[`execute class /execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         fee_collector: feeCollector,
@@ -62,7 +62,7 @@ exports[`execute class /execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_pool_config: {
         is_disabled: isDisabled,
@@ -75,7 +75,7 @@ exports[`execute class /execute_msg.json 1`] = `
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_to_registery: {
         new_pool_config: newPoolConfig
@@ -94,7 +94,7 @@ exports[`execute class /execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_pool_instance: {
         asset_infos: assetInfos,
@@ -119,7 +119,7 @@ exports[`execute class /execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       join_pool: {
         assets,
@@ -137,7 +137,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       swap: {
         recipient,
@@ -151,7 +151,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     expiresIn: number;
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         expires_in: expiresIn,
@@ -159,12 +159,12 @@ exports[`execute class /execute_msg.json 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  dropOwnershipProposal = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  dropOwnershipProposal = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       drop_ownership_proposal: {}
     }, fee_, memo_, funds_);
   };
-  claimOwnership = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  claimOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       claim_ownership: {}
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
index 3b9b94c0..145bc3fe 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -13,7 +13,7 @@ exports[`execute classes array types 1`] = `
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-  getConfig = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getConfig = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_config: {}
     }, fee_, memo_, funds_);
@@ -24,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugins: {
         limit,
@@ -36,7 +36,7 @@ exports[`execute classes array types 1`] = `
     id
   }: {
     id: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugin_by_id: {
         id
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
index c1925cc5..5921cea1 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
@@ -69,7 +69,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -85,7 +85,7 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -98,7 +98,7 @@ exports[`execute class /execute_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -109,7 +109,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -122,7 +122,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -136,7 +136,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -148,7 +148,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -159,14 +159,14 @@ exports[`execute class /execute_msg.json 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee_, memo_, funds_);
   };
-  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee_, memo_, funds_);
@@ -175,14 +175,14 @@ exports[`execute class /execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  reset = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee_, memo_, funds_);
@@ -191,7 +191,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -202,7 +202,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -213,7 +213,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
@@ -271,17 +271,17 @@ exports[`execute class /query_msg.json 1`] = `
     this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
-  getDenom = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getDenom = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_denom: {}
     }, fee_, memo_, funds_);
   };
-  getOwner = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getOwner = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_owner: {}
     }, fee_, memo_, funds_);
   };
-  allEdges = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  allEdges = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_edges: {}
     }, fee_, memo_, funds_);
@@ -290,7 +290,7 @@ exports[`execute class /query_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_edge: {
         edge_id: edgeId
@@ -301,7 +301,7 @@ exports[`execute class /query_msg.json 1`] = `
     batchId
   }: {
     batchId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_batch: {
         batch_id: batchId
@@ -312,7 +312,7 @@ exports[`execute class /query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_graph: {
         graph_id: graphId
@@ -323,7 +323,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_by_address: {
         address
@@ -334,7 +334,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_as_counterparty: {
         address
@@ -345,7 +345,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_per_address: {
         address
@@ -356,7 +356,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_credit_per_address: {
         address
@@ -367,14 +367,14 @@ exports[`execute class /query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_by_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  getTotalDebt = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getTotalDebt = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt: {}
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
index 70ec5042..f257838c 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
@@ -25,7 +25,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -41,7 +41,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -58,7 +58,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -73,7 +73,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -87,7 +87,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -99,7 +99,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -116,7 +116,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -130,7 +130,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -164,7 +164,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -180,7 +180,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -197,7 +197,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -212,7 +212,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -226,7 +226,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -238,7 +238,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -255,7 +255,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -269,7 +269,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -304,7 +304,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -320,7 +320,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -337,7 +337,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -352,7 +352,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -366,7 +366,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -378,7 +378,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -395,7 +395,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,7 +409,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -444,7 +444,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -460,7 +460,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -477,7 +477,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -492,7 +492,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -506,7 +506,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -518,7 +518,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -535,7 +535,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -549,7 +549,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -583,7 +583,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -599,7 +599,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -616,7 +616,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -631,7 +631,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -645,7 +645,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -657,7 +657,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -674,7 +674,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -688,7 +688,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
index 623027da..aa3287ee 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
@@ -24,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -40,7 +40,7 @@ exports[`execute classes array types 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -57,7 +57,7 @@ exports[`execute classes array types 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -72,7 +72,7 @@ exports[`execute classes array types 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -86,7 +86,7 @@ exports[`execute classes array types 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -98,7 +98,7 @@ exports[`execute classes array types 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -115,7 +115,7 @@ exports[`execute classes array types 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -129,7 +129,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
index 4f550432..8627a35d 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
@@ -61,7 +61,7 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -77,7 +77,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -94,7 +94,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -109,7 +109,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -123,7 +123,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -135,7 +135,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -152,7 +152,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -166,7 +166,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -197,7 +197,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -210,7 +210,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -221,7 +221,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
@@ -255,7 +255,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -271,7 +271,7 @@ exports[`execute classes no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -288,7 +288,7 @@ exports[`execute classes no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -303,7 +303,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -317,7 +317,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -329,7 +329,7 @@ exports[`execute classes no extends 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -346,7 +346,7 @@ exports[`execute classes no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -360,7 +360,7 @@ exports[`execute classes no extends 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
index 17bd63b3..51c69a9f 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
@@ -30,14 +30,14 @@ exports[`execute classes array types 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -46,7 +46,7 @@ exports[`execute classes array types 1`] = `
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -57,7 +57,7 @@ exports[`execute classes array types 1`] = `
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -68,7 +68,7 @@ exports[`execute classes array types 1`] = `
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -79,7 +79,7 @@ exports[`execute classes array types 1`] = `
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -92,7 +92,7 @@ exports[`execute classes array types 1`] = `
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -104,7 +104,7 @@ exports[`execute classes array types 1`] = `
     newLabel
   }: {
     newLabel: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
index d10c5d5c..89679054 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
@@ -20,7 +20,7 @@ exports[`execute classes 1`] = `
     params
   }: {
     params: ParamInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         params
@@ -35,7 +35,7 @@ exports[`execute classes 1`] = `
     currentPrices: number[][];
     prevPrices: number[][];
     wagerKey: Addr[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
         current_prices: currentPrices,
@@ -54,7 +54,7 @@ exports[`execute classes 1`] = `
     currency: Currency;
     expiry: number;
     token: Addr[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       wager: {
         against_currencies: againstCurrencies,
@@ -68,7 +68,7 @@ exports[`execute classes 1`] = `
     token
   }: {
     token: Addr[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cancel: {
         token
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 406bb57b..f2df5419 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -38,7 +38,7 @@ export const CONSTANT_EXEC_PARAMS = [
     ),
     t.stringLiteral('auto')
   ),
-  identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true),
+  OPTIONAL_MEMO_PARAM,
   OPTIONAL_FUNDS_PARAM
 ];
 

From c7805cfeb6541312a2ce83e4c7fdf57470a5ee3a Mon Sep 17 00:00:00 2001
From: adairrr <32375605+adairrr@users.noreply.github.com>
Date: Thu, 15 Aug 2024 19:01:16 +0200
Subject: [PATCH 248/287] Updated tests

---
 __fixtures__/issues/98/out/98.client.ts       | 12 ++++----
 .../contracts/CwAdminFactory.client.ts        |  2 +-
 .../contracts/CwCodeIdRegistry.client.ts      | 10 +++----
 .../bundler_test/contracts/CwSingle.client.ts | 18 +++++------
 .../bundler_test/contracts/Factory.client.ts  | 14 ++++-----
 .../bundler_test/contracts/Minter.client.ts   | 14 ++++-----
 .../builder/default/CwAdminFactory.client.ts  |  2 +-
 .../default/CwCodeIdRegistry.client.ts        | 10 +++----
 __output__/builder/default/CwSingle.client.ts | 18 +++++------
 __output__/builder/default/Factory.client.ts  | 14 ++++-----
 __output__/builder/default/Minter.client.ts   | 14 ++++-----
 .../builder/invoke/CwAdminFactory.client.ts   |  2 +-
 .../builder/invoke/CwCodeIdRegistry.client.ts | 10 +++----
 __output__/builder/invoke/CwSingle.client.ts  | 18 +++++------
 __output__/builder/invoke/Factory.client.ts   | 14 ++++-----
 __output__/builder/invoke/Minter.client.ts    | 14 ++++-----
 .../no-extends/CwAdminFactory.client.ts       |  2 +-
 .../no-extends/CwCodeIdRegistry.client.ts     | 10 +++----
 .../builder/no-extends/CwSingle.client.ts     | 18 +++++------
 .../builder/no-extends/Factory.client.ts      | 14 ++++-----
 .../builder/no-extends/Minter.client.ts       | 14 ++++-----
 .../cw-admin-factory/CwAdminFactory.client.ts |  2 +-
 .../CwCodeIdRegistry.client.ts                | 10 +++----
 .../cw-named-groups/CwNamedGroups.client.ts   |  6 ++--
 .../CwProposalSingle.client.ts                | 18 +++++------
 .../accounts-nft/AccountsNft.client.ts        | 20 ++++++-------
 .../Cw3FixedMultiSig.client.ts                |  8 ++---
 .../idl-version/cw4-group/Cw4Group.client.ts  |  8 ++---
 .../idl-version/cyberpunk/CyberPunk.client.ts |  4 +--
 .../idl-version/hackatom/HackAtom.client.ts   | 16 +++++-----
 __output__/minter/Minter.client.ts            | 14 ++++-----
 .../sg721-updatable/Sg721Updatable.client.ts  | 30 +++++++++----------
 __output__/sg721/Sg721.client.ts              | 16 +++++-----
 __output__/vectis/factory/Factory.client.ts   | 14 ++++-----
 __output__/vectis/govec/Govec.client.ts       | 16 +++++-----
 __output__/vectis/proxy/Proxy.client.ts       | 16 +++++-----
 packages/ast/src/client/client.ts             |  2 +-
 37 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
index 3f5b08e1..77d95750 100644
--- a/__fixtures__/issues/98/out/98.client.ts
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -144,7 +144,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proxy_install_plugin: {
         id,
@@ -166,7 +166,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register_plugin: {
         checksum,
@@ -182,7 +182,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     id
   }: {
     id: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister_plugin: {
         id
@@ -205,7 +205,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_plugin: {
         checksum,
@@ -222,7 +222,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_registry_fee: {
         new_fee: newFee
@@ -233,7 +233,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     newAddr
   }: {
     newAddr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_dao_addr: {
         new_addr: newAddr
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
index 282d2938..b5fa7ddd 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
@@ -49,7 +49,7 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
index 9459e635..7023ff59 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
@@ -167,7 +167,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -207,7 +207,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -222,7 +222,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -236,7 +236,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
index 39f7008b..7c4c65f8 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
@@ -256,7 +256,7 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -271,7 +271,7 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -283,7 +283,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -294,7 +294,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -317,7 +317,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -334,7 +334,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -345,7 +345,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -356,7 +356,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -367,7 +367,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts
index 8b35c489..0cb3b137 100644
--- a/__output__/builder/bundler_test/contracts/Factory.client.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.client.ts
@@ -170,7 +170,7 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -183,7 +183,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -197,7 +197,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -211,7 +211,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -223,7 +223,7 @@ export class FactoryClient implements FactoryInterface {
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -234,7 +234,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -245,7 +245,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
index 7fd27bb5..0ed33b4e 100644
--- a/__output__/builder/bundler_test/contracts/Minter.client.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -108,7 +108,7 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -117,14 +117,14 @@ export class MinterClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -133,7 +133,7 @@ export class MinterClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -144,7 +144,7 @@ export class MinterClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -157,7 +157,7 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -165,7 +165,7 @@ export class MinterClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/default/CwAdminFactory.client.ts b/__output__/builder/default/CwAdminFactory.client.ts
index bfa07d0f..64c66aee 100644
--- a/__output__/builder/default/CwAdminFactory.client.ts
+++ b/__output__/builder/default/CwAdminFactory.client.ts
@@ -50,7 +50,7 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/default/CwCodeIdRegistry.client.ts b/__output__/builder/default/CwCodeIdRegistry.client.ts
index 13b8be9f..59e6ff67 100644
--- a/__output__/builder/default/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.client.ts
@@ -168,7 +168,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -208,7 +208,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -223,7 +223,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -237,7 +237,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/default/CwSingle.client.ts b/__output__/builder/default/CwSingle.client.ts
index 147b50e7..1e4a6868 100644
--- a/__output__/builder/default/CwSingle.client.ts
+++ b/__output__/builder/default/CwSingle.client.ts
@@ -257,7 +257,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -272,7 +272,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -284,7 +284,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -295,7 +295,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -318,7 +318,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -335,7 +335,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -346,7 +346,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -357,7 +357,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -368,7 +368,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/default/Factory.client.ts b/__output__/builder/default/Factory.client.ts
index e233b754..3fda4056 100644
--- a/__output__/builder/default/Factory.client.ts
+++ b/__output__/builder/default/Factory.client.ts
@@ -171,7 +171,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -184,7 +184,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -198,7 +198,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -212,7 +212,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -224,7 +224,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -235,7 +235,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -246,7 +246,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts
index 8ab36b26..f57503a3 100644
--- a/__output__/builder/default/Minter.client.ts
+++ b/__output__/builder/default/Minter.client.ts
@@ -109,7 +109,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -118,14 +118,14 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -134,7 +134,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -145,7 +145,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -158,7 +158,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -166,7 +166,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/invoke/CwAdminFactory.client.ts b/__output__/builder/invoke/CwAdminFactory.client.ts
index bfa07d0f..64c66aee 100644
--- a/__output__/builder/invoke/CwAdminFactory.client.ts
+++ b/__output__/builder/invoke/CwAdminFactory.client.ts
@@ -50,7 +50,7 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.client.ts b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
index 13b8be9f..59e6ff67 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
@@ -168,7 +168,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -208,7 +208,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -223,7 +223,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -237,7 +237,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/invoke/CwSingle.client.ts b/__output__/builder/invoke/CwSingle.client.ts
index 147b50e7..1e4a6868 100644
--- a/__output__/builder/invoke/CwSingle.client.ts
+++ b/__output__/builder/invoke/CwSingle.client.ts
@@ -257,7 +257,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -272,7 +272,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -284,7 +284,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -295,7 +295,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -318,7 +318,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -335,7 +335,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -346,7 +346,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -357,7 +357,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -368,7 +368,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/invoke/Factory.client.ts b/__output__/builder/invoke/Factory.client.ts
index e233b754..3fda4056 100644
--- a/__output__/builder/invoke/Factory.client.ts
+++ b/__output__/builder/invoke/Factory.client.ts
@@ -171,7 +171,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -184,7 +184,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -198,7 +198,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -212,7 +212,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -224,7 +224,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -235,7 +235,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -246,7 +246,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts
index 8ab36b26..f57503a3 100644
--- a/__output__/builder/invoke/Minter.client.ts
+++ b/__output__/builder/invoke/Minter.client.ts
@@ -109,7 +109,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -118,14 +118,14 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -134,7 +134,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -145,7 +145,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -158,7 +158,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -166,7 +166,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts
index 282d2938..b5fa7ddd 100644
--- a/__output__/builder/no-extends/CwAdminFactory.client.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.client.ts
@@ -49,7 +49,7 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
index 9459e635..7023ff59 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
@@ -167,7 +167,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -207,7 +207,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -222,7 +222,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -236,7 +236,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts
index 39f7008b..7c4c65f8 100644
--- a/__output__/builder/no-extends/CwSingle.client.ts
+++ b/__output__/builder/no-extends/CwSingle.client.ts
@@ -256,7 +256,7 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -271,7 +271,7 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -283,7 +283,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -294,7 +294,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -317,7 +317,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -334,7 +334,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -345,7 +345,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -356,7 +356,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -367,7 +367,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts
index 8b35c489..0cb3b137 100644
--- a/__output__/builder/no-extends/Factory.client.ts
+++ b/__output__/builder/no-extends/Factory.client.ts
@@ -170,7 +170,7 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -183,7 +183,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -197,7 +197,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -211,7 +211,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -223,7 +223,7 @@ export class FactoryClient implements FactoryInterface {
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -234,7 +234,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -245,7 +245,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
index 7fd27bb5..0ed33b4e 100644
--- a/__output__/builder/no-extends/Minter.client.ts
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -108,7 +108,7 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -117,14 +117,14 @@ export class MinterClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -133,7 +133,7 @@ export class MinterClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -144,7 +144,7 @@ export class MinterClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -157,7 +157,7 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -165,7 +165,7 @@ export class MinterClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
index bfa07d0f..64c66aee 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
@@ -50,7 +50,7 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
index 13b8be9f..59e6ff67 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
@@ -168,7 +168,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -208,7 +208,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -223,7 +223,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -237,7 +237,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
index 662806c1..6b61ee81 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
@@ -145,7 +145,7 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -158,7 +158,7 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     group
   }: {
     group: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -169,7 +169,7 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     owner
   }: {
     owner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
index 0f7b1098..6970026d 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
@@ -257,7 +257,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -272,7 +272,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -284,7 +284,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -295,7 +295,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -318,7 +318,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -335,7 +335,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -346,7 +346,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -357,7 +357,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -368,7 +368,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 81b22a63..5ca96aae 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -376,14 +376,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     newOwner
   }: {
     newOwner: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         new_owner: newOwner
       }
     }, fee_, memo_, funds_);
   };
-  acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  acceptOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       accept_ownership: {}
     }, fee_, memo_, funds_);
@@ -392,7 +392,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     user
   }: {
     user: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         user
@@ -405,7 +405,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -421,7 +421,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -438,7 +438,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -453,7 +453,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -467,7 +467,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -479,7 +479,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -490,7 +490,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
index d8bd08db..d544c0d9 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
@@ -230,7 +230,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -246,7 +246,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -258,7 +258,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -269,7 +269,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts
index 60dfbb23..0769f36b 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.client.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts
@@ -127,7 +127,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     admin
   }: {
     admin?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         admin
@@ -140,7 +140,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
   }: {
     add: Member[];
     remove: string[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_members: {
         add,
@@ -152,7 +152,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_hook: {
         addr
@@ -163,7 +163,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_hook: {
         addr
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
index c19416a8..cc996b06 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -55,7 +55,7 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
   }: {
     memCost: number;
     timeCost: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       argon2: {
         mem_cost: memCost,
@@ -63,7 +63,7 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
       }
     }, fee_, memo_, funds_);
   };
-  mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mirrorEnv = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mirror_env: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
index 40a5738d..ac52ec1c 100644
--- a/__output__/idl-version/hackatom/HackAtom.client.ts
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -105,27 +105,27 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-  release = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  release = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       release: {}
     }, fee_, memo_, funds_);
   };
-  cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  cpuLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cpu_loop: {}
     }, fee_, memo_, funds_);
   };
-  storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  storageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       storage_loop: {}
     }, fee_, memo_, funds_);
   };
-  memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  memoryLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       memory_loop: {}
     }, fee_, memo_, funds_);
   };
-  messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  messageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       message_loop: {}
     }, fee_, memo_, funds_);
@@ -134,19 +134,19 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     pages
   }: {
     pages: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allocate_large_memory: {
         pages
       }
     }, fee_, memo_, funds_);
   };
-  panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  panic = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       panic: {}
     }, fee_, memo_, funds_);
   };
-  userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  userErrorsInApiCalls = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       user_errors_in_api_calls: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts
index 8ab36b26..f57503a3 100644
--- a/__output__/minter/Minter.client.ts
+++ b/__output__/minter/Minter.client.ts
@@ -109,7 +109,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -118,14 +118,14 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -134,7 +134,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -145,7 +145,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -158,7 +158,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -166,7 +166,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/sg721-updatable/Sg721Updatable.client.ts b/__output__/sg721-updatable/Sg721Updatable.client.ts
index d21d1ff9..ce499bf7 100644
--- a/__output__/sg721-updatable/Sg721Updatable.client.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.client.ts
@@ -347,7 +347,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-  freezeTokenMetadata = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  freezeTokenMetadata = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_token_metadata: {}
     }, fee_, memo_, funds_);
@@ -358,7 +358,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_token_metadata: {
         token_id: tokenId,
@@ -366,7 +366,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
       }
     }, fee_, memo_, funds_);
   };
-  enableUpdatable = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  enableUpdatable = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       enable_updatable: {}
     }, fee_, memo_, funds_);
@@ -377,7 +377,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -393,7 +393,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -410,7 +410,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -425,7 +425,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -439,7 +439,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -451,7 +451,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -462,7 +462,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -473,19 +473,19 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_collection_info: {
         collection_info: collectionInfo
       }
     }, fee_, memo_, funds_);
   };
-  updateTradingStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateTradingStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_trading_start_time: {}
     }, fee_, memo_, funds_);
   };
-  freezeCollectionInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  freezeCollectionInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_collection_info: {}
     }, fee_, memo_, funds_);
@@ -500,7 +500,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -514,7 +514,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     msg
   }: {
     msg: Empty;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       extension: {
         msg
diff --git a/__output__/sg721/Sg721.client.ts b/__output__/sg721/Sg721.client.ts
index bff2bc1f..868bbca4 100644
--- a/__output__/sg721/Sg721.client.ts
+++ b/__output__/sg721/Sg721.client.ts
@@ -325,7 +325,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -341,7 +341,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -358,7 +358,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -373,7 +373,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     spender: string;
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -387,7 +387,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -399,7 +399,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     operator
   }: {
     operator: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -416,7 +416,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -430,7 +430,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     tokenId
   }: {
     tokenId: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/__output__/vectis/factory/Factory.client.ts b/__output__/vectis/factory/Factory.client.ts
index e233b754..3fda4056 100644
--- a/__output__/vectis/factory/Factory.client.ts
+++ b/__output__/vectis/factory/Factory.client.ts
@@ -171,7 +171,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -184,7 +184,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -198,7 +198,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -212,7 +212,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -224,7 +224,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     newFee
   }: {
     newFee: Coin;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -235,7 +235,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -246,7 +246,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/vectis/govec/Govec.client.ts b/__output__/vectis/govec/Govec.client.ts
index 610da988..33128fb8 100644
--- a/__output__/vectis/govec/Govec.client.ts
+++ b/__output__/vectis/govec/Govec.client.ts
@@ -106,14 +106,14 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -122,7 +122,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -133,7 +133,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -144,7 +144,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -155,7 +155,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -168,7 +168,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -180,7 +180,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
diff --git a/__output__/vectis/proxy/Proxy.client.ts b/__output__/vectis/proxy/Proxy.client.ts
index 7a9304db..300dbb8c 100644
--- a/__output__/vectis/proxy/Proxy.client.ts
+++ b/__output__/vectis/proxy/Proxy.client.ts
@@ -106,14 +106,14 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -122,7 +122,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -133,7 +133,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -144,7 +144,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -155,7 +155,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -168,7 +168,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -180,7 +180,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     newLabel
   }: {
     newLabel: string;
-  }, fee: number | StdFee | "auto" = "auto", memo?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index f2df5419..a659ded9 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -21,7 +21,7 @@ import {
   getPropertyType,
   getResponseType
 } from '../utils/types';
-import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from "../utils/constants";
+import { OPTIONAL_MEMO_PARAM } from "../utils/constants";
 
 export const CONSTANT_EXEC_PARAMS = [
   t.assignmentPattern(

From d3a87b509ffaf897f356d592b1a306e6612c289a Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Fri, 20 Dec 2024 17:07:43 -0800
Subject: [PATCH 249/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.8.0
 - @cosmwasm/ts-codegen@1.12.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 2 +-
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index c0dac913..3c3af326 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.8.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.7.0...@cosmwasm/ts-codegen-ast@1.8.0) (2024-12-21)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 # [1.7.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.6.0...@cosmwasm/ts-codegen-ast@1.7.0) (2024-06-21)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index d8d7b726..56150a89 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index fbe0a33f..3d62e99d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.12.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.11.1...@cosmwasm/ts-codegen@1.12.0) (2024-12-21)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [1.11.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.11.0...@cosmwasm/ts-codegen@1.11.1) (2024-06-26)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 62e3eaa0..2d67c3ff 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -43,7 +43,7 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.7.0",
+    "@cosmwasm/ts-codegen-ast": "^1.8.0",
     "@cosmwasm/ts-codegen-types": "^1.3.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",

From 9bd021c9cef7c321245abcf1a16f0a0dee483268 Mon Sep 17 00:00:00 2001
From: grandfather <iotas.echoes-6o@icloud.com>
Date: Sat, 18 Jan 2025 16:06:26 +0100
Subject: [PATCH 250/287] typo fix README.md

---
 packages/ast/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ast/README.md b/packages/ast/README.md
index a7b6404b..d4d4ad14 100644
--- a/packages/ast/README.md
+++ b/packages/ast/README.md
@@ -26,7 +26,7 @@ yarn test:ast
 code ./scripts/test-output.json
 ```
 
-We use the npm module `ast-stringify` to strip out unneccesary props, and generate a JSON for reference.
+We use the npm module `ast-stringify` to strip out unnecessary props, and generate a JSON for reference.
 
 You will see a `File` and `Program`... only concern yourself with the `body[]`:
 

From 4280349b36d21e28e09610fb7bd22da51d8374c0 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 27 Jan 2025 17:02:11 -0800
Subject: [PATCH 251/287] readme

---
 README.md                     | 29 ++++++++++++++++-------------
 packages/ast/README.md        | 29 ++++++++++++++++-------------
 packages/ts-codegen/README.md | 29 ++++++++++++++++-------------
 packages/types/README.md      | 31 +++++++++++++++++--------------
 4 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 19f38abf..d024d369 100644
--- a/README.md
+++ b/README.md
@@ -610,22 +610,25 @@ yarn test:watch
 
 See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
 
-## Related
-
-Checkout these related projects:
-
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
-* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
-* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
-* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+## Interchain JavaScript Stack 
+
+A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
+
+| Category              | Tools                                                                                                                  | Description                                                                                           |
+|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
+| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
+| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
+| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
+| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
+| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
+| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
+| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
-
+🛠 Built by Hyperweb (formerly Cosmology) — if you like our tools, please checkout and contribute to [our github ⚛️](https://github.com/hyperweb-io)
 
 ## Disclaimer
 
diff --git a/packages/ast/README.md b/packages/ast/README.md
index a7b6404b..f0615c1d 100644
--- a/packages/ast/README.md
+++ b/packages/ast/README.md
@@ -129,22 +129,25 @@ export const createNewGenerator = () => {
 };
 ```
 
-## Related
-
-Checkout these related projects:
-
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
-* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
-* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
-* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+## Interchain JavaScript Stack 
+
+A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
+
+| Category              | Tools                                                                                                                  | Description                                                                                           |
+|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
+| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
+| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
+| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
+| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
+| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
+| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
+| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
-
+🛠 Built by Hyperweb (formerly Cosmology) — if you like our tools, please checkout and contribute to [our github ⚛️](https://github.com/hyperweb-io)
 
 ## Disclaimer
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index 19f38abf..d024d369 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -610,22 +610,25 @@ yarn test:watch
 
 See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
 
-## Related
-
-Checkout these related projects:
-
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
-* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
-* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
-* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+## Interchain JavaScript Stack 
+
+A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
+
+| Category              | Tools                                                                                                                  | Description                                                                                           |
+|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
+| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
+| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
+| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
+| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
+| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
+| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
+| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
-
+🛠 Built by Hyperweb (formerly Cosmology) — if you like our tools, please checkout and contribute to [our github ⚛️](https://github.com/hyperweb-io)
 
 ## Disclaimer
 
diff --git a/packages/types/README.md b/packages/types/README.md
index d2587b76..57978cd5 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -2,25 +2,28 @@
 
 Types for [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen)
 
-## Related
-
-Checkout these related projects:
-
-* [@cosmology/telescope](https://github.com/cosmology-tech/telescope) Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.
-* [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen) Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.
-* [chain-registry](https://github.com/cosmology-tech/chain-registry) Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application.
-* [cosmos-kit](https://github.com/cosmology-tech/cosmos-kit) Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.
-* [create-cosmos-app](https://github.com/cosmology-tech/create-cosmos-app) Set up a modern Cosmos app by running one command.
-* [interchain-ui](https://github.com/cosmology-tech/interchain-ui) The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.
-* [starship](https://github.com/cosmology-tech/starship) Unified Testing and Development for the Interchain.
+## Interchain JavaScript Stack 
+
+A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
+
+| Category              | Tools                                                                                                                  | Description                                                                                           |
+|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
+| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
+| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
+| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
+| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
+| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
+| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
+| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
 
 ## Credits
 
-🛠 Built by Cosmology — if you like our tools, please consider delegating to [our validator ⚛️](https://cosmology.zone/validator)
-
+🛠 Built by Hyperweb (formerly Cosmology) — if you like our tools, please checkout and contribute to [our github ⚛️](https://github.com/hyperweb-io)
 
 ## Disclaimer
 
 AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
 
-No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
\ No newline at end of file
+No developer or entity involved in creating this software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the code, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.

From 98014174b9776ac32ffbab64e62bb88fb5e815d1 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 27 Jan 2025 17:03:00 -0800
Subject: [PATCH 252/287] repo

---
 README.md                                              | 10 +++++-----
 packages/ts-codegen/README.md                          | 10 +++++-----
 packages/ts-codegen/src/commands/create-boilerplate.ts |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index d024d369..b152da64 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,11 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
-  <a href="https://github.com/cosmology-tech/lib-count">
-  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
+  <a href="https://github.com/hyperweb-io/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
   </a>
-  <a href="https://github.com/cosmology-tech/lib-count">
-  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
+  <a href="https://github.com/hyperweb-io/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
   </a>
   <br />
   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
@@ -358,7 +358,7 @@ npm install @cosmwasm/ts-codegen
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone https://github.com/cosmology-tech/launchpad.git
+git clone https://github.com/hyperweb-io/launchpad.git
 cd launchpad/contracts/whitelists/whitelist
 ```
 
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index d024d369..b152da64 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -10,11 +10,11 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
     <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
-  <a href="https://github.com/cosmology-tech/lib-count">
-  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
+  <a href="https://github.com/hyperweb-io/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
   </a>
-  <a href="https://github.com/cosmology-tech/lib-count">
-  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcosmology-tech%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
+  <a href="https://github.com/hyperweb-io/lib-count">
+  <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
   </a>
   <br />
   <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
@@ -358,7 +358,7 @@ npm install @cosmwasm/ts-codegen
 Clone your project and `cd` into your contracts folder
 
 ```sh
-git clone https://github.com/cosmology-tech/launchpad.git
+git clone https://github.com/hyperweb-io/launchpad.git
 cd launchpad/contracts/whitelists/whitelist
 ```
 
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 25aee8ca..c9a23b21 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -8,7 +8,7 @@ const glob = require('glob').sync;
 const fs = require('fs');
 const path = require('path');
 
-const repo = 'https://github.com/cosmology-tech/ts-codegen-module-boilerplate';
+const repo = 'https://github.com/hyperweb-io/ts-codegen-module-boilerplate';
 export default async (argv: MinimistArgs) => {
   if (!shell.which('git')) {
     shell.echo('Sorry, this script requires git');

From be8802a215dbc75df9af75dba2f6ac17c04d6938 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Mon, 27 Jan 2025 17:04:12 -0800
Subject: [PATCH 253/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.8.1
 - @cosmwasm/ts-codegen@1.12.1
 - @cosmwasm/ts-codegen-types@1.3.1
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 3c3af326..6c03be81 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.8.0...@cosmwasm/ts-codegen-ast@1.8.1) (2025-01-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 # [1.8.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.7.0...@cosmwasm/ts-codegen-ast@1.8.0) (2024-12-21)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 56150a89..28d074dc 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-types": "^1.3.0",
+    "@cosmwasm/ts-codegen-types": "^1.3.1",
     "ast-stringify": "0.1.0",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 3d62e99d..2cc043c3 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.12.0...@cosmwasm/ts-codegen@1.12.1) (2025-01-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.12.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.11.1...@cosmwasm/ts-codegen@1.12.0) (2024-12-21)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 2d67c3ff..e80ec591 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -43,8 +43,8 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.8.0",
-    "@cosmwasm/ts-codegen-types": "^1.3.0",
+    "@cosmwasm/ts-codegen-ast": "^1.8.1",
+    "@cosmwasm/ts-codegen-types": "^1.3.1",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index f8331f71..fc979435 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.3.0...@cosmwasm/ts-codegen-types@1.3.1) (2025-01-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
+
+
+
+
+
 # [1.3.0](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.2.0...@cosmwasm/ts-codegen-types@1.3.0) (2024-05-25)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index 5275f828..b7d2b108 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-types",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",

From 74a55859962ec967b602f8c5b1f43d12f64b104a Mon Sep 17 00:00:00 2001
From: Anmol1696 <anmol1696@gmail.com>
Date: Mon, 19 May 2025 16:14:02 +0530
Subject: [PATCH 254/287] add docs from docs repo to product repo, add
 gh-action to sync repos

---
 .github/workflows/docs.yaml |  52 +++
 docs/_meta.json             |   4 +
 docs/developing/_meta.json  |   4 +
 docs/developing/ast.mdx     | 128 +++++++
 docs/developing/index.mdx   |  27 ++
 docs/index.mdx              | 688 ++++++++++++++++++++++++++++++++++++
 6 files changed, 903 insertions(+)
 create mode 100644 .github/workflows/docs.yaml
 create mode 100644 docs/_meta.json
 create mode 100644 docs/developing/_meta.json
 create mode 100644 docs/developing/ast.mdx
 create mode 100644 docs/developing/index.mdx
 create mode 100644 docs/index.mdx

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
new file mode 100644
index 00000000..87586de3
--- /dev/null
+++ b/.github/workflows/docs.yaml
@@ -0,0 +1,52 @@
+name: Docs
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "docs/**"
+      - ".github/workflows/docs.yaml"
+
+env:
+  # Repository specific variables
+  REPO_NAME: ts-codegen
+  DOCS_DEST_PATH: pages/ts-codegen
+
+jobs:
+  docs-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          enable-global-cache: true
+
+      - name: Clone docs repository
+        run: git clone https://x-access-token:${{ secrets.GH_HYPERWEB_PAT }}@github.com/hyperweb-io/docs.hyperweb.io.git external-docs
+
+      - name: Sync the docs and build
+        run: |
+          rsync -av --delete ./docs/ ./external-docs/${{ env.DOCS_DEST_PATH }}/
+          cd external-docs
+          yarn install
+          yarn export
+
+      - name: Git push
+        run: |
+          cd external-docs
+          git config user.name 'GitHub Action'
+          git config user.email 'action@github.com'
+          git add .
+          if git diff --cached --quiet; then
+              echo "No changes to commit."
+          else
+              git commit -m "Automated: Update ${{ env.REPO_NAME }} documentation"
+              git push
+          fi
+
diff --git a/docs/_meta.json b/docs/_meta.json
new file mode 100644
index 00000000..86dc2c11
--- /dev/null
+++ b/docs/_meta.json
@@ -0,0 +1,4 @@
+{
+  "index": "Introduction",
+  "developing": "Developing"
+}
diff --git a/docs/developing/_meta.json b/docs/developing/_meta.json
new file mode 100644
index 00000000..27c4a299
--- /dev/null
+++ b/docs/developing/_meta.json
@@ -0,0 +1,4 @@
+{
+  "index": "Developing Ts Codegen",
+  "ast": "Working with ASTs"
+}
\ No newline at end of file
diff --git a/docs/developing/ast.mdx b/docs/developing/ast.mdx
new file mode 100644
index 00000000..7b0fe204
--- /dev/null
+++ b/docs/developing/ast.mdx
@@ -0,0 +1,128 @@
+## Working with ASTs
+
+### 1 edit the fixture
+
+edit `./scripts/fixture.ts`, for example:
+
+```js
+// ./scripts/fixture.ts
+export interface InstantiateMsg {
+    admin?: string | null;
+    members: Member[];
+}
+```
+
+### 2 run AST generator
+
+```
+yarn test:ast
+```
+
+### 3 look at the JSON produced
+
+```
+code ./scripts/test-output.json
+```
+
+We use the npm module `ast-stringify` to strip out unneccesary props, and generate a JSON for reference.
+
+You will see a `File` and `Program`... only concern yourself with the `body[]`:
+
+```json
+{
+  "type": "File",
+  "errors": [],
+  "program": {
+    "type": "Program",
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "exportKind": "type",
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "TSInterfaceDeclaration",
+          "id": {
+            "type": "Identifier",
+            "name": "InstantiateMsg"
+          },
+          "body": {
+            "type": "TSInterfaceBody",
+            "body": [
+              {
+                "type": "TSPropertySignature",
+                "key": {
+                  "type": "Identifier",
+                  "name": "admin"
+                },
+                "computed": false,
+                "optional": true,
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSUnionType",
+                    "types": [
+                      {
+                        "type": "TSStringKeyword"
+                      },
+                      {
+                        "type": "TSNullKeyword"
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "TSPropertySignature",
+                "key": {
+                  "type": "Identifier",
+                  "name": "members"
+                },
+                "computed": false,
+                "typeAnnotation": {
+                  "type": "TSTypeAnnotation",
+                  "typeAnnotation": {
+                    "type": "TSArrayType",
+                    "elementType": {
+                      "type": "TSTypeReference",
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "Member"
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": []
+}
+```
+
+### 4 code with `@babel/types` using the JSON as a reference
+
+NOTE: 4 continued ideally you should be writing a test with your generator!
+
+```js
+import * as t from '@babel/types';
+
+export const createNewGenerator = () => {
+    return t.exportNamedDeclaration(
+        t.tsInterfaceDeclaration(
+            t.identifier('InstantiateMsg'),
+            null,
+            [],
+            t.tsInterfaceBody([
+                // ... more code ...
+            ])
+        )
+    );
+};
+```
diff --git a/docs/developing/index.mdx b/docs/developing/index.mdx
new file mode 100644
index 00000000..6bb0f025
--- /dev/null
+++ b/docs/developing/index.mdx
@@ -0,0 +1,27 @@
+# Developing
+
+## Initial setup
+
+```
+yarn
+yarn bootstrap
+```
+
+## Building
+
+```
+yarn build
+```
+
+## Tests
+
+Then `cd` into a package and run the tests
+
+```
+cd ./packages/wasm-ast-types
+yarn test:watch
+```
+
+## Working with ASTs
+
+See the [docs](/ts-codegen/developing/ast) in the `wasm-ast-types` package.
diff --git a/docs/index.mdx b/docs/index.mdx
new file mode 100644
index 00000000..cfbebb87
--- /dev/null
+++ b/docs/index.mdx
@@ -0,0 +1,688 @@
+import { DownloadButton } from '../../components/download-button';
+
+# @cosmwasm/ts-codegen
+
+Generate TypeScript SDKs for your CosmWasm smart contracts
+
+<p align="center">
+  <img
+    width="120"
+    src="https://user-images.githubusercontent.com/545047/191621556-6f1baa40-15ff-4465-8d80-63b3ff9bc23a.svg"
+  />
+</p>
+
+<div
+  width="100%"
+  style={{
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center",
+    paddingTop: "12px",
+    paddingBottom: "12px",
+  }}
+>
+  <a
+    style={{ paddingRight: "4px" }}
+    href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml"
+  >
+    <img
+      height="20"
+      src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg"
+    />
+  </a>
+  <a
+    style={{ paddingRight: "4px" }}
+    href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"
+  >
+    <img height="20" src="https://img.shields.io/npm/dt/@cosmwasm/ts-codegen" />
+  </a>
+  <a
+    style={{ paddingRight: "4px" }}
+    href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"
+  >
+    <img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg" />
+  </a>
+  <a
+    style={{ paddingRight: "4px" }}
+    href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"
+  >
+    <img
+      height="20"
+      src="https://img.shields.io/badge/license-Apache-blue.svg"
+    />
+  </a>
+  <a
+    style={{ paddingRight: "4px" }}
+    href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"
+  > 
+    <img
+      height="20"
+      src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"
+    />
+  </a>
+</div>
+
+```
+npm install -g @cosmwasm/ts-codegen
+```
+
+The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
+
+🎥 [Checkout our video playlist](https://www.youtube.com/watch?v=D_A5V2PfNLA&list=PL-lMkVv7GZwz1KO3jANwr5W4MoziruXwK) to learn how to use `ts-codegen`!
+
+<DownloadButton href='/llms/ts-codegen.txt' fileName="ts-codegen-llms.txt" />
+
+## Table of contents
+
+- [@cosmwasm/ts-codegen](https://www.npmjs.com/package/@cosmwasm/ts-codegen)
+  - [Table of contents](#table-of-contents)
+- [QuickStart](#quickstart)
+- [Usage](#usage)
+  - [Programmatic Usage](#programmatic-usage)
+  - [Types](#types)
+  - [TS Clients](#client)
+  - [React Query](#react-query)
+  - [Recoil](#recoil)
+  - [Message Composer](#message-composer)
+  - [Message Builder](#message-builder)
+  - [Use Contracts Hooks](#use-contracts-hooks)
+  - [Bundles](#bundles)
+  - [CLI Usage and Examples](#cli-usage-and-examples)
+  - [Advanced Usage](#advanced-usage)
+- [Example Output](#example-output)
+- [JSON Schema](#json-schema)
+  - [JSON Schema Generation](#json-schema-generation)
+  - [Exporting Schemas](#exporting-schemas)
+- [Developing](#developing)
+- [Related](#related)
+
+## Quickstart
+
+Clone your project and `cd` into your contracts folder
+
+```sh
+git clone https://github.com/public-awesome/launchpad.git
+cd launchpad/contracts/sg721-base/
+```
+
+Run `cosmwasm-ts-codegen` to generate your code.
+
+```sh
+cosmwasm-ts-codegen generate \
+          --plugin client \
+          --schema ./schema \
+          --out ./ts \
+          --name SG721 \
+          --no-bundle
+```
+
+The output will be in the folder specified by `--out`, enjoy!
+
+## Usage
+
+You can get started quickly using our `cli` by globally installing via npm:
+
+```
+npm install -g @cosmwasm/ts-codegen
+```
+
+### Programmatic Usage
+
+For production usage, we recommend setting up a build script that uses the main entry point:
+
+```ts
+import codegen from "@cosmwasm/ts-codegen";
+
+codegen({
+  contracts: [
+    {
+      name: "SG721",
+      dir: "./path/to/sg721/schema",
+    },
+    {
+      name: "Minter",
+      dir: "./path/to/Minter/schema",
+    },
+  ],
+  outPath: "./path/to/code/src/",
+
+  // options are completely optional ;)
+  options: {
+    bundle: {
+      bundleFile: "index.ts",
+      scope: "contracts",
+    },
+    types: {
+      enabled: true,
+    },
+    client: {
+      enabled: true,
+    },
+    reactQuery: {
+      enabled: true,
+      optionalClient: true,
+      version: "v4",
+      mutations: true,
+      queryKeys: true,
+      queryFactory: true,
+    },
+    recoil: {
+      enabled: false,
+    },
+    messageComposer: {
+      enabled: false,
+    },
+    messageBuilder: {
+      enabled: false,
+    },
+    useContractsHooks: {
+      enabled: false,
+    },
+  },
+}).then(() => {
+  console.log("✨ all done!");
+});
+```
+
+#### Types
+
+Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
+
+[see example output code](https://gist.github.com/pyramation/107d4e8e30dc5eb3ffc07bc3000f4dd0)
+
+#### Types Options
+
+| option                   | description                                                           |
+| ------------------------ | --------------------------------------------------------------------- |
+| `types.enabled`          | enable type generation                                                |
+| `types.aliasExecuteMsg`  | generate a type alias based on the contract name                      |
+| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name |
+
+### Client
+
+The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
+
+[see example output code](https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817)
+
+#### Client Options
+
+| option                      | description                                          |
+| --------------------------- | ---------------------------------------------------- |
+| `client.enabled`            | generate TS client classes for your contracts        |
+| `client.execExtendsQuery`   | execute should extend query message clients          |
+| `client.noImplicitOverride` | should match your tsconfig noImplicitOverride option |
+
+#### Client via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+### React Query
+
+Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
+
+[see example output code](https://gist.github.com/pyramation/70aef28fd3af0ee164f7711704d3dfc0)
+
+#### React Query Options
+
+| option                      | description                                                                  |
+| --------------------------- | ---------------------------------------------------------------------------- |
+| `reactQuery.enabled`        | enable the react-query plugin                                                |
+| `reactQuery.optionalClient` | allows contract client to be undefined as the component renders              |
+| `reactQuery.queryKeys`      | generates a const queryKeys object for use with invalidations and set values |
+| `reactQuery.queryFactory`   | generates a const queryFactory object for useQueries and prefetchQueries use |
+| `reactQuery.version`        | `v4` uses `@tanstack/react-query` and `v3` uses `react-query`                |
+| `reactQuery.mutations`      | also generate mutations                                                      |
+| `reactQuery.camelize`       | use camelCase style for property names                                       |
+
+#### React Query via CLI
+
+Here is an example without optional client, using v3 for `react-query`, without mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --version v3 \
+    --no-optionalClient \
+    --no-mutations
+```
+
+Example with optional client, using v4, with mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --optionalClient \
+    --version v4 \
+    --mutations
+```
+
+### Recoil
+
+Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
+
+[see example output code](https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731)
+
+#### Recoil via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin recoil \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Recoil Options
+
+| option           | description              |
+| ---------------- | ------------------------ |
+| `recoil.enabled` | enable the recoil plugin |
+
+### Message Composer
+
+Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
+
+[see example output code](https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4)
+
+#### Message Composer via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-composer \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Composer Options
+
+| option                    | description                       |
+| ------------------------- | --------------------------------- |
+| `messageComposer.enabled` | enable the messageComposer plugin |
+
+### Message Builder
+
+Generate raw message jsons for use in your application with the `message-builder` command.
+
+[see example output code](https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26)
+
+#### Message Builder via CLI
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin message-builder \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+#### Message Builder Options
+
+| option                   | description                      |
+| ------------------------ | -------------------------------- |
+| `messageBuilder.enabled` | enable the messageBuilder plugin |
+
+### Use Contracts Hooks
+
+| option                      | description                      |
+| --------------------------- | -------------------------------- |
+| `useContractsHooks.enabled` | enable the `useContracts` plugin |
+
+#### Use Contracts Provider Usage
+
+```tsx
+import { useChain } from "@cosmos-kit/react";
+import { ContractsProvider } from "../path/to/codegen/contracts-context";
+
+export default function YourComponent() {
+  const { address, getCosmWasmClient, getSigningCosmWasmClient } =
+    useChain(chainName);
+
+  return (
+    <ContractsProvider
+      contractsConfig={{
+        address,
+        getCosmWasmClient,
+        getSigningCosmWasmClient,
+      }}
+    >
+      <SomeCoolComponent />
+    </ContractsProvider>
+  );
+}
+```
+
+#### Use Contracts Provider Babel/TSC config
+
+If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
+
+```js
+presets: ["@babel/typescript", "@babel/env", "@babel/preset-react"];
+```
+
+For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
+
+#### Use Contracts Hooks Usage
+
+Once enabled, you can get contracts very simply:
+
+```ts
+const { marketplace } = useContracts();
+```
+
+```ts
+const marketplaceClient = marketplace.signingClient(marketplaceContract);
+await marketplaceClient.updateAskPrice({
+  collection: token.collectionAddr,
+  price: {
+    amount,
+    denom,
+  },
+  tokenId,
+});
+```
+
+### Bundles
+
+The bundler will make a nice package of all your contracts. For example:
+
+```ts
+const { MinterQueryClient, useMinterConfigQuery } = contracts.Minter;
+
+const { CwAdminFactoryClient } = contracts.CwAdminFactory;
+```
+
+#### Bundler Options
+
+| option              | description                                                                      |
+| ------------------- | -------------------------------------------------------------------------------- |
+| `bundle.enabled`    | enable the bundler plugin                                                        |
+| `bundle.scope`      | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
+| `bundle.bundleFile` | name of the bundle file                                                          |
+
+#### Coding Style
+
+| option             | description                         | default |
+| ------------------ | ----------------------------------- | ------- |
+| `useShorthandCtor` | Enable using shorthand constructor. | true    |
+
+Using shorthand constructor (Might not be transpiled correctly with babel):
+
+```ts
+  constructor(
+    protected address: string | undefined,
+    protected cosmWasmClient: CosmWasmClient | undefined,
+    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    private TSign?: new (
+      client: SigningCosmWasmClient,
+      sender: string,
+      contractAddress: string
+    ) => TSign,
+    private TQuery?: new (
+      client: CosmWasmClient,
+      contractAddress: string
+    ) => TQuery,
+    private TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {}
+```
+
+Without using shorthand constructor:
+
+```ts
+  address: string | undefined;
+  ...
+  TMsgComposer?: new (
+    sender: string,
+    contractAddress: string
+  ) => TMsgComposer;
+
+  constructor(
+    address: string | undefined,
+    ...
+    TMsgComposer?: new (
+      sender: string,
+      contractAddress: string
+    ) => TMsgComposer
+  ) {
+    this.address = address;
+    ...
+    this.TMsgComposer = TMsgComposer;
+  }
+```
+
+### CLI Usage and Examples
+
+#### Interactive prompt
+
+The CLI is interactive, and if you don't specify an option, it will interactively prompt you.
+
+```sh
+cosmwasm-ts-codegen generate
+? [plugin] which plugins? (Press <space> to select, <a> to toggle all, <i> to invert selection)
+❯◯ client
+ ◯ recoil
+ ◯ react-query
+ ◯ message-composer
+```
+
+In this example, you can press space bar to select a number of plugins you wish you enable.
+
+#### Specifying Plugins
+
+Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName
+```
+
+You can specify multiple `--plugin` options using the `generate` command:
+
+```sh
+cosmwasm-ts-codegen generate \
+          --plugin client \
+          --plugin recoil \
+          --schema ./schema \
+          --out ./ts \
+          --name SG721
+```
+
+#### Bypassing the Prompt
+
+All options can be provided so you can bypass the prompt.
+
+For confirm options, you can pass `--no-<name>` to set the value to false. Here is an example without optional client, using v3 for `react-query`, without mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin client \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --version v3 \
+    --no-optionalClient \
+    --no-mutations
+```
+
+Example with optional client, using v4, with mutations:
+
+```sh
+cosmwasm-ts-codegen generate \
+    --plugin react-query \
+    --schema ./schema \
+    --out ./ts \
+    --name MyContractName \
+    --optionalClient \
+    --version v4 \
+    --mutations
+```
+
+#### Types Only Option
+
+If needed, you can generate only the types with the `typesOnly` option;
+
+```sh
+cosmwasm-ts-codegen generate \
+          --typesOnly \
+          --schema ./schema \
+          --out ./ts \
+          --name SG721
+```
+
+### Advanced Usage
+
+for lower-level access, you can import the various plugins directly:
+
+```ts
+import {
+  generateTypes,
+  generateClient,
+  generateReactQuery,
+  generateRecoil,
+  generateMessageComposer,
+} from "@cosmwasm/ts-codegen";
+```
+
+### Example Output
+
+- `cosmwasm-ts-codegen generate --typesOnly`
+
+https://gist.github.com/pyramation/107d4e8e30dc5eb3ffc07bc3000f4dd0
+
+- `cosmwasm-ts-codegen generate --plugin client`
+
+https://gist.github.com/pyramation/30508678b7563e286f06ccc5ac384817
+
+- `cosmwasm-ts-codegen generate --plugin react-query`
+
+https://gist.github.com/pyramation/70aef28fd3af0ee164f7711704d3dfc0
+
+- `cosmwasm-ts-codegen generate --plugin recoil`
+
+https://gist.github.com/pyramation/a9520ccf131177b1841e02a97d7d3731
+
+- `cosmwasm-ts-codegen generate --plugin message-composer`
+
+https://gist.github.com/pyramation/43320e8b952751a0bd5a77dbc5b601f4
+
+- `cosmwasm-ts-codegen generate --plugin message-builder`
+
+https://gist.github.com/adairrr/b394e62beb9856b0351883f776650f26
+
+### JSON Schema
+
+We generate code from the [JSON Schema](https://json-schema.org/) exported from CosmWasm smart contracts.
+
+### JSON Schema Generation
+
+Currently you have to have the JSON Schema output. Here is an example to start.
+
+First, get the Rust contracts and run `cargo build`:
+
+```sh
+git clone git@github.com:public-awesome/stargaze-contracts.git
+cd stargaze-contracts
+cargo build
+```
+
+now build the schema with `cargo schema`
+
+```sh
+cd contracts/sg721/
+cargo schema
+```
+
+### Exporting Schemas
+
+#### `cosmwasm v1.1` Example
+
+Using the new `write_api` method, you can export schemas:
+
+```rs
+use cosmwasm_schema::write_api;
+
+use cw4_group::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}
+```
+
+#### `cosmwasm_std` Example
+
+Here is a legacy example:
+
+```rs
+use cosmwasm_std::{Addr, CosmosMsg, Empty};
+
+export_schema_with_title(&schema_for!(MinterData), &out_dir, "MinterResponse");
+export_schema_with_title(&schema_for!(Addr), &out_dir, "StakingResponse");
+export_schema_with_title(&schema_for!(Addr), &out_dir, "DaoResponse");
+export_schema_with_title(
+      &schema_for!(CosmosMsg<Empty>),
+      &out_dir,
+      "CosmosMsg_for_Empty",
+);
+```
+
+## Developing
+
+### Initial setup
+
+```
+yarn
+yarn bootstrap
+```
+
+### Building
+
+```
+yarn build
+```
+
+### Tests
+
+Then `cd` into a package and run the tests
+
+```
+cd ./packages/wasm-ast-types
+yarn test:watch
+```
+
+### Working with ASTs
+
+See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `ast` package.
+
+## Related
+
+Checkout these related projects:
+
+- [@cosmology/telescope](https://github.com/hyperweb-io/telescope) a "babel for the Cosmos", Telescope is a TypeScript Transpiler for Cosmos Protobufs.
+- [chain-registry](https://github.com/hyperweb-io/chain-registry) an npm module for the official Cosmos chain-registry.
+- [cosmos-kit](https://github.com/hyperweb-io/cosmos-kit) A wallet connector for the Cosmos ⚛️
+- [create-cosmos-app](https://github.com/hyperweb-io/create-cosmos-app) set up a modern Cosmos app by running one command.
+- [starship](https://github.com/hyperweb-io/starship) a k8s-based unified development environment for Cosmos Ecosystem
\ No newline at end of file

From cd8edc145efc9c1861ca613d34e0c370c87cf552 Mon Sep 17 00:00:00 2001
From: Anmol <anmol1696@gmail.com>
Date: Mon, 19 May 2025 17:47:57 +0530
Subject: [PATCH 255/287] Update docs/developing/ast.mdx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 docs/developing/ast.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/ast.mdx b/docs/developing/ast.mdx
index 7b0fe204..94877182 100644
--- a/docs/developing/ast.mdx
+++ b/docs/developing/ast.mdx
@@ -24,7 +24,7 @@ yarn test:ast
 code ./scripts/test-output.json
 ```
 
-We use the npm module `ast-stringify` to strip out unneccesary props, and generate a JSON for reference.
+We use the npm module `ast-stringify` to strip out unnecessary props, and generate a JSON for reference.
 
 You will see a `File` and `Program`... only concern yourself with the `body[]`:
 

From 75da9e282ec86a458dd0ec7c07cf3c35f30e6d1b Mon Sep 17 00:00:00 2001
From: Anmol <anmol1696@gmail.com>
Date: Mon, 19 May 2025 17:48:14 +0530
Subject: [PATCH 256/287] Update docs/developing/_meta.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 docs/developing/_meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing/_meta.json b/docs/developing/_meta.json
index 27c4a299..d2d2c18e 100644
--- a/docs/developing/_meta.json
+++ b/docs/developing/_meta.json
@@ -1,4 +1,4 @@
 {
-  "index": "Developing Ts Codegen",
+  "index": "Developing",
   "ast": "Working with ASTs"
 }
\ No newline at end of file

From e36fa83c461e7c4502b22f0b8127e9eb75727e12 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:24:02 +0200
Subject: [PATCH 257/287] Add .eslintignore

---
 .eslintignore                     | 2 ++
 packages/ast/.eslintignore        | 1 +
 packages/ts-codegen/.eslintignore | 1 +
 packages/types/.eslintignore      | 1 +
 4 files changed, 5 insertions(+)
 create mode 100644 .eslintignore
 create mode 120000 packages/ast/.eslintignore
 create mode 120000 packages/ts-codegen/.eslintignore
 create mode 120000 packages/types/.eslintignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..b9470778
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,2 @@
+node_modules/
+dist/
diff --git a/packages/ast/.eslintignore b/packages/ast/.eslintignore
new file mode 120000
index 00000000..86039baf
--- /dev/null
+++ b/packages/ast/.eslintignore
@@ -0,0 +1 @@
+../../.eslintignore
\ No newline at end of file
diff --git a/packages/ts-codegen/.eslintignore b/packages/ts-codegen/.eslintignore
new file mode 120000
index 00000000..86039baf
--- /dev/null
+++ b/packages/ts-codegen/.eslintignore
@@ -0,0 +1 @@
+../../.eslintignore
\ No newline at end of file
diff --git a/packages/types/.eslintignore b/packages/types/.eslintignore
new file mode 120000
index 00000000..86039baf
--- /dev/null
+++ b/packages/types/.eslintignore
@@ -0,0 +1 @@
+../../.eslintignore
\ No newline at end of file

From e6c74de43bc4f069899f466ce57305152d2c5d5f Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:24:52 +0200
Subject: [PATCH 258/287] Make yarn lint work

---
 packages/ast/src/client/client.ts             |   2 +-
 packages/ast/src/context/imports.ts           | 124 ++++++------
 packages/ast/src/utils/types.ts               | 191 +++++++++---------
 packages/ts-codegen/src/plugins/client.ts     |   2 +-
 .../ts-codegen/src/plugins/message-builder.ts |  10 +-
 .../src/plugins/message-composer.ts           |   2 +-
 .../ts-codegen/src/plugins/react-query.ts     |  13 +-
 packages/ts-codegen/src/plugins/recoil.ts     |  15 +-
 packages/ts-codegen/src/utils/clean.ts        |   4 +-
 packages/ts-codegen/src/utils/cleanse.ts      |  10 +-
 10 files changed, 185 insertions(+), 188 deletions(-)

diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index a659ded9..8be5baf7 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -16,12 +16,12 @@ import {
   typedIdentifier
 } from '../utils';
 import { identifier, propertySignature } from '../utils/babel';
+import { OPTIONAL_MEMO_PARAM } from '../utils/constants';
 import {
   createTypedObjectParams,
   getPropertyType,
   getResponseType
 } from '../utils/types';
-import { OPTIONAL_MEMO_PARAM } from "../utils/constants";
 
 export const CONSTANT_EXEC_PARAMS = [
   t.assignmentPattern(
diff --git a/packages/ast/src/context/imports.ts b/packages/ast/src/context/imports.ts
index 4edd6580..6104a381 100644
--- a/packages/ast/src/context/imports.ts
+++ b/packages/ast/src/context/imports.ts
@@ -1,10 +1,9 @@
 import * as t from '@babel/types';
-import { dirname, extname,relative } from 'path';
+import { dirname, extname, relative } from 'path';
 
 import { importAs, importStmt } from '../utils';
 import { RenderContext } from './context';
 
-
 export interface ImportObj {
   type: 'import' | 'default' | 'namespace';
   name: string;
@@ -12,12 +11,11 @@ export interface ImportObj {
   importAs?: string;
 }
 
-export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export type GetUtilFn = <TContext = RenderContext>(
+  ...args: any[]
+) => (context: TContext) => ImportObj;
 export type UtilMapping = {
-  [key: string]:
-  | ImportObj
-  | string
-  | GetUtilFn
+  [key: string]: ImportObj | string | GetUtilFn;
 };
 
 const makeReactQuerySwitch = (varName: string) => {
@@ -27,14 +25,14 @@ const makeReactQuerySwitch = (varName: string) => {
       return {
         type: 'import',
         path: '@tanstack/react-query',
-        name: varName
+        name: varName,
       };
     case 'v3':
     default:
       return {
         type: 'import',
         path: 'react-query',
-        name: varName
+        name: varName,
       };
     }
   };
@@ -55,13 +53,10 @@ export const UTILS = {
   useQuery: makeReactQuerySwitch('useQuery'),
   UseQueryOptions: makeReactQuerySwitch('UseQueryOptions'),
   useMutation: makeReactQuerySwitch('useMutation'),
-  UseMutationOptions: makeReactQuerySwitch('UseMutationOptions')
-
+  UseMutationOptions: makeReactQuerySwitch('UseMutationOptions'),
 };
 
-export const UTIL_HELPERS = [
-  '__contractContextBase__',
-];
+export const UTIL_HELPERS = ['__contractContextBase__'];
 
 export const convertUtilsToImportList = (
   context: RenderContext,
@@ -94,12 +89,12 @@ export const convertUtil = (
   util: string,
   registeredUtils: any
 ): ImportObj => {
-  if (!registeredUtils.hasOwnProperty(util)) return null;
+  if (!Object.prototype.hasOwnProperty.call(registeredUtils, util)) return null;
   if (typeof registeredUtils[util] === 'string') {
     return {
       type: 'import',
       path: registeredUtils[util],
-      name: util
+      name: util,
     };
   } else if (typeof registeredUtils[util] === 'function') {
     return registeredUtils[util](context);
@@ -108,84 +103,95 @@ export const convertUtil = (
   }
 };
 
-
 // __helpers__
 export const getImportStatements = (
   list: ImportObj[],
   filepath?: string
-): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] => {
-
+): (
+  | t.ImportNamespaceSpecifier
+  | t.ImportDeclaration
+  | t.ImportDefaultSpecifier
+)[] => {
   // swap helpers with helpers file...
-  const modifiedImports = list.map(imp => {
+  const modifiedImports = list.map((imp) => {
     if (filepath && UTIL_HELPERS.includes(imp.path)) {
       const name = imp.path.replace(/__/g, '');
       return {
         ...imp,
-        path: getRelativePath(filepath, `./${name}`)
+        path: getRelativePath(filepath, `./${name}`),
       };
     }
     return imp;
   });
 
-  const imports = modifiedImports.reduce((m: Record<string, ImportObj[]>, obj) => {
-    m[obj.path] = m[obj.path] || [];
-    const exists = m[obj.path].find((el: ImportObj) =>
-      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;
-  }, {});
+  const imports = modifiedImports.reduce(
+    (m: Record<string, ImportObj[]>, obj) => {
+      m[obj.path] = m[obj.path] || [];
+      const exists = m[obj.path].find(
+        (el: ImportObj) =>
+          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]: [string, ImportObj[]]) => {
-      const defaultImports = imports.filter(a => a.type === 'default');
+  return Object.entries(imports).reduce(
+    (m, [importPath, imports]: [string, ImportObj[]]) => {
+      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.');
+        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.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)));
+      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));
+        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 => {
+      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');
+      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.');
+        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.importNamespaceSpecifier(t.identifier(namespaced[0].name))],
             t.stringLiteral(namespaced[0].path)
           )
         );
       }
       return m;
-    }, []);
+    },
+    []
+  );
 };
 
 export const getRelativePath = (f1: string, f2: string) => {
@@ -193,4 +199,4 @@ export const getRelativePath = (f1: string, f2: string) => {
   let importPath = rel.replace(extname(rel), '');
   if (!/^\./.test(importPath)) importPath = `./${importPath}`;
   return importPath;
-};
\ No newline at end of file
+};
diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index 58419739..ec7db6d9 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -11,12 +11,11 @@ export function getResponseType(
 ) {
   const methodName = camel(underscoreName);
   return pascal(
-    context.contract?.responses?.[underscoreName]?.title
-    ??
-    // after v1.1 is adopted, we can deprecate this and require the above response
-    `${methodName}Response`
+    context.contract?.responses?.[underscoreName]?.title ??
+      // after v1.1 is adopted, we can deprecate this and require the above response
+      `${methodName}Response`
   );
-};
+}
 
 const getTypeStrFromRef = ($ref: string): string => {
   if ($ref?.startsWith('#/definitions/')) {
@@ -30,12 +29,9 @@ export const getTypeFromRef = ($ref: string) => {
 };
 
 const getArrayTypeFromRef = ($ref: string) => {
-  return t.tsArrayType(
-    getTypeFromRef($ref)
-  );
+  return t.tsArrayType(getTypeFromRef($ref));
 };
 
-
 export const getTypeOrRef = (obj: JSONSchema): t.TSType => {
   if (obj.$ref) {
     return getTypeFromRef(obj.$ref);
@@ -43,10 +39,12 @@ export const getTypeOrRef = (obj: JSONSchema): t.TSType => {
     return getType(obj.type);
   } else if (Array.isArray(obj.type)) {
     // Handle array of types by creating a union type
-    const types = obj.type.map(t => getType(t));
+    const types = obj.type.map((t) => getType(t));
     return t.tsUnionType(types);
   } else {
-    throw new Error('Type definition not supported or missing: ' + JSON.stringify(obj));
+    throw new Error(
+      'Type definition not supported or missing: ' + JSON.stringify(obj)
+    );
   }
 };
 
@@ -65,31 +63,25 @@ const getArrayTypeFromItems = (
     if (items.length > 0 && items[0].type === 'array') {
       return getArrayTypeFromItems(context, items[0]);
     }
-    return items.length > 0 ? t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0]))) : t.tsArrayType(t.tsArrayType(t.tsAnyKeyword()));
+    return items.length > 0
+      ? t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])))
+      : t.tsArrayType(t.tsArrayType(t.tsAnyKeyword()));
     // }
   } else {
     const detect = detectType(items.type);
 
     if (detect.type === 'array') {
       if (Array.isArray(items.items)) {
-        return t.tsArrayType(
-          t.tsArrayType(
-            getTypeOrRef(items.items[0])
-          )
-        );
+        return t.tsArrayType(t.tsArrayType(getTypeOrRef(items.items[0])));
       } else if (items.items) {
-        return t.tsArrayType(
-          getArrayTypeFromItems(context, items.items)
-        );
+        return t.tsArrayType(getArrayTypeFromItems(context, items.items));
       } else {
         // Handle the case where items.items is undefined for array types
         return t.tsArrayType(t.tsAnyKeyword());
       }
     }
 
-    return t.tsArrayType(
-      getType(detect.type)
-    );
+    return t.tsArrayType(getType(detect.type));
   }
 };
 
@@ -98,11 +90,15 @@ export const detectType = (type: string | string[]) => {
   let theType = '';
   if (Array.isArray(type)) {
     if (type.length !== 2) {
-      throw new Error('[getType(array length)] case not handled by transpiler. contact maintainers.');
+      throw new Error(
+        '[getType(array length)] case not handled by transpiler. contact maintainers.'
+      );
     }
     const [nullableType, nullType] = type;
     if (nullType !== 'null') {
-      throw new Error('[getType(null)] case not handled by transpiler. contact maintainers.');
+      throw new Error(
+        '[getType(null)] case not handled by transpiler. contact maintainers.'
+      );
     }
     theType = nullableType;
     optional = true;
@@ -112,14 +108,11 @@ export const detectType = (type: string | string[]) => {
 
   return {
     type: theType,
-    optional
+    optional,
   };
 };
 
-export const getTypeInfo = (
-  context: RenderContext,
-  info: JSONSchema
-) => {
+export const getTypeInfo = (context: RenderContext, info: JSONSchema) => {
   let type = undefined;
   let optional = undefined;
 
@@ -130,13 +123,17 @@ export const getTypeInfo = (
     }
     const [nullableType, nullType] = info.anyOf;
     if (nullType?.type !== 'null') {
-      throw new Error('[nullableType.type]: case not handled by transpiler. contact maintainers.');
+      throw new Error(
+        '[nullableType.type]: case not handled by transpiler. contact maintainers.'
+      );
     }
     if (!nullableType?.$ref) {
       if (nullableType.title) {
         type = t.tsTypeReference(t.identifier(nullableType.title));
       } else {
-        throw new Error('[nullableType.title] case not handled by transpiler. contact maintainers.');
+        throw new Error(
+          '[nullableType.title] case not handled by transpiler. contact maintainers.'
+        );
       }
     } else {
       type = getTypeFromRef(nullableType.$ref);
@@ -149,18 +146,24 @@ export const getTypeInfo = (
         if (info.items.$ref) {
           type = getArrayTypeFromRef(info.items.$ref);
         } else if (info.items.title) {
-          type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
+          type = t.tsArrayType(
+            t.tsTypeReference(t.identifier(info.items.title))
+          );
         } else if (info.items.type) {
           type = getArrayTypeFromItems(context, info.items);
         } else {
-          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+          throw new Error(
+            '[info.items] case not handled by transpiler. contact maintainers.'
+          );
         }
         // type = getArrayTypeFromItems(context, info.items);
       } else {
         if (Array.isArray(info.items)) {
           type = getArrayTypeFromItems(context, info.items);
         } else {
-          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+          throw new Error(
+            '[info.items] case not handled by transpiler. contact maintainers.'
+          );
         }
       }
     } else {
@@ -171,14 +174,24 @@ export const getTypeInfo = (
   } else if (Array.isArray(info.type)) {
     // Handle multiple types, typically nullable types
     if (info.type.length !== 2) {
-      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
+      throw new Error(
+        'please report this to maintainers (field type): ' +
+          JSON.stringify(info, null, 2)
+      );
     }
     const [nullableType, nullType] = info.type;
     if (nullType !== 'null') {
-      throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
+      throw new Error(
+        'please report this to maintainers (field type): ' +
+          JSON.stringify(info, null, 2)
+      );
     }
 
-    if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
+    if (
+      nullableType === 'array' &&
+      typeof info.items === 'object' &&
+      !Array.isArray(info.items)
+    ) {
       if (info.items.type) {
         const detect = detectType(info.items.type);
         if (detect.type === 'array') {
@@ -189,10 +202,10 @@ export const getTypeInfo = (
         optional = detect.optional;
       } else if (info.items.$ref) {
         type = getArrayTypeFromRef(info.items.$ref);
-      } else if (info.items.type) {
-        type = getArrayTypeFromItems(context, info.items);
       } else {
-        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        throw new Error(
+          '[info.items] case not handled by transpiler. contact maintainers.'
+        );
       }
     } else {
       const detect = detectType(nullableType);
@@ -204,11 +217,11 @@ export const getTypeInfo = (
       }
     }
 
-    optional = true;  // Ensure optional is set for nullable types
+    optional = true; // Ensure optional is set for nullable types
   }
   return {
     type,
-    optional
+    optional,
   };
 };
 
@@ -267,7 +280,6 @@ export const getPropertyType = (
   return { type, optional };
 };
 
-
 export function getPropertySignatureFromProp(
   context: RenderContext,
   jsonschema: JSONSchema,
@@ -289,11 +301,13 @@ export function getPropertySignatureFromProp(
 
   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;
-    }).filter(a => typeof a === 'string');
+    const unionTypes = jsonschema.properties[prop].allOf
+      .map((el) => {
+        if (el.title) return el.title;
+        if (el.$ref) return getTypeStrFromRef(el.$ref);
+        return el.type;
+      })
+      .filter((a) => typeof a === 'string');
     // ONLY SUPPORT string types for now!
     // e.g. NOT supporting nullable types or type: string[] yet
 
@@ -304,9 +318,7 @@ export function getPropertySignatureFromProp(
       return propertySignature(
         camelize ? camel(prop) : prop,
         t.tsTypeAnnotation(
-          t.tsTypeReference(
-            t.identifier(uniqUnionTypes[0] as string)
-          )
+          t.tsTypeReference(t.identifier(uniqUnionTypes[0] as string))
         ),
         isOptional
       );
@@ -315,10 +327,8 @@ export function getPropertySignatureFromProp(
         camelize ? camel(prop) : prop,
         t.tsTypeAnnotation(
           t.tsUnionType(
-            uniqUnionTypes.map(typ =>
-              t.tsTypeReference(
-                t.identifier(typ as string)
-              )
+            uniqUnionTypes.map((typ) =>
+              t.tsTypeReference(t.identifier(typ as string))
             )
           )
         ),
@@ -327,11 +337,13 @@ export function getPropertySignatureFromProp(
     }
   } 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;
-    }).filter(a => typeof a === 'string');
+    const unionTypes = jsonschema.properties[prop].oneOf
+      .map((el) => {
+        if (el.title) return el.title;
+        if (el.$ref) return getTypeStrFromRef(el.$ref);
+        return el.type;
+      })
+      .filter((a) => typeof a === 'string');
     // ONLY SUPPORT string types for now!
     // e.g. NOT supporting nullable types or type: string[] yet
 
@@ -340,9 +352,7 @@ export function getPropertySignatureFromProp(
       return propertySignature(
         camelize ? camel(prop) : prop,
         t.tsTypeAnnotation(
-          t.tsTypeReference(
-            t.identifier(uniqUnionTypes[0] as string)
-          )
+          t.tsTypeReference(t.identifier(uniqUnionTypes[0] as string))
         ),
         isOptional
       );
@@ -351,17 +361,14 @@ export function getPropertySignatureFromProp(
         camelize ? camel(prop) : prop,
         t.tsTypeAnnotation(
           t.tsUnionType(
-            uniqUnionTypes.map(typ =>
-              t.tsTypeReference(
-                t.identifier(typ as string)
-              )
+            uniqUnionTypes.map((typ) =>
+              t.tsTypeReference(t.identifier(typ as string))
             )
           )
         ),
         isOptional
       );
     }
-
   }
 
   try {
@@ -374,9 +381,7 @@ export function getPropertySignatureFromProp(
   const { type, optional } = getPropertyType(context, jsonschema, prop);
   return propertySignature(
     camelize ? camel(prop) : prop,
-    t.tsTypeAnnotation(
-      type
-    ),
+    t.tsTypeAnnotation(type),
     optional
   );
 }
@@ -394,19 +399,14 @@ export const getParamsTypeAnnotation = (
 
   if (!keys.length) return undefined;
 
-  const typedParams = keys.map(prop => getPropertySignatureFromProp(
-    context,
-    jsonschema,
-    prop,
-    camelize
-  ));
+  const typedParams = keys.map((prop) =>
+    getPropertySignatureFromProp(context, jsonschema, prop, camelize)
+  );
 
   return t.tsTypeAnnotation(
     t.tsTypeLiteral(
       // @ts-ignore:next-line
-      [
-        ...typedParams
-      ]
+      [...typedParams]
     )
   );
 };
@@ -415,8 +415,7 @@ export const createTypedObjectParams = (
   context: RenderContext,
   jsonschema: JSONSchema,
   camelize: boolean = true
-): (t.Identifier | t.Pattern | t.RestElement) => {
-
+): t.Identifier | t.Pattern | t.RestElement => {
   const keys = Object.keys(jsonschema.properties ?? {});
   if (!keys.length) {
     // is there a ref?
@@ -428,14 +427,12 @@ export const createTypedObjectParams = (
         const refType = jsonschema.$ref.split('/').pop();
         const refName = camel(refType);
         const id = t.identifier(refName);
-        id.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(refType)));
+        id.typeAnnotation = t.tsTypeAnnotation(
+          t.tsTypeReference(t.identifier(refType))
+        );
         return id;
       } else if (obj) {
-        return createTypedObjectParams(
-          context,
-          obj,
-          camelize
-        );
+        return createTypedObjectParams(context, obj, camelize);
       }
     }
 
@@ -443,7 +440,7 @@ export const createTypedObjectParams = (
     return;
   }
 
-  const params = keys.map(prop => {
+  const params = keys.map((prop) => {
     return t.objectProperty(
       camelize ? t.identifier(camel(prop)) : t.identifier(prop),
       camelize ? t.identifier(camel(prop)) : t.identifier(prop),
@@ -452,17 +449,9 @@ export const createTypedObjectParams = (
     );
   });
 
-  const obj = t.objectPattern(
-    [
-      ...params
-    ]
-  );
+  const obj = t.objectPattern([...params]);
 
-  obj.typeAnnotation = getParamsTypeAnnotation(
-    context,
-    jsonschema,
-    camelize
-  );
+  obj.typeAnnotation = getParamsTypeAnnotation(context, jsonschema, camelize);
 
   return obj;
-};
\ No newline at end of file
+};
diff --git a/packages/ts-codegen/src/plugins/client.ts b/packages/ts-codegen/src/plugins/client.ts
index 9394b30e..3c1d178b 100644
--- a/packages/ts-codegen/src/plugins/client.ts
+++ b/packages/ts-codegen/src/plugins/client.ts
@@ -107,7 +107,7 @@ export class ClientPlugin extends BuilderPluginBase<RenderOptions> {
       }
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
diff --git a/packages/ts-codegen/src/plugins/message-builder.ts b/packages/ts-codegen/src/plugins/message-builder.ts
index 1a7df80f..74e0a4a0 100644
--- a/packages/ts-codegen/src/plugins/message-builder.ts
+++ b/packages/ts-codegen/src/plugins/message-builder.ts
@@ -4,12 +4,12 @@ import {
   getMessageProperties,
   RenderContext,
   RenderContextBase,
-  RenderOptions
+  RenderOptions,
 } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
 import { BuilderFileType } from '../builder';
-import { findAndParseTypes, findExecuteMsg,findQueryMsg } from '../utils';
+import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
 
 export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
@@ -70,7 +70,7 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       }
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
@@ -79,8 +79,8 @@ export class MessageBuilderPlugin extends BuilderPluginBase<RenderOptions> {
       {
         type: 'message-builder',
         localname,
-        body
-      }
+        body,
+      },
     ];
   }
 }
diff --git a/packages/ts-codegen/src/plugins/message-composer.ts b/packages/ts-codegen/src/plugins/message-composer.ts
index e5dfe09b..880448da 100644
--- a/packages/ts-codegen/src/plugins/message-composer.ts
+++ b/packages/ts-codegen/src/plugins/message-composer.ts
@@ -71,7 +71,7 @@ export class MessageComposerPlugin extends BuilderPluginBase<RenderOptions> {
       }
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
index 73e617fa..d476fbe5 100644
--- a/packages/ts-codegen/src/plugins/react-query.ts
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -4,7 +4,8 @@ import {
   getMessageProperties,
   RenderContext,
   RenderContextBase,
-  RenderOptions} from '@cosmwasm/ts-codegen-ast';
+  RenderOptions,
+} from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
 import { BuilderFileType } from '../builder';
@@ -82,7 +83,7 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
           context,
           queryMsg: QueryMsg,
           contractName: name,
-          QueryClient
+          QueryClient,
         })
       );
     }
@@ -94,12 +95,12 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
           context,
           execMsg: ExecuteMsg,
           contractName: name,
-          ExecuteClient
+          ExecuteClient,
         })
       );
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
@@ -108,8 +109,8 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
       {
         type: 'react-query',
         localname,
-        body
-      }
+        body,
+      },
     ];
   }
 }
diff --git a/packages/ts-codegen/src/plugins/recoil.ts b/packages/ts-codegen/src/plugins/recoil.ts
index 11c68ca2..be26b25b 100644
--- a/packages/ts-codegen/src/plugins/recoil.ts
+++ b/packages/ts-codegen/src/plugins/recoil.ts
@@ -4,7 +4,7 @@ import {
   RenderContext,
   RenderContextBase,
   RenderOptions,
-  UtilMapping
+  UtilMapping,
 } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
@@ -68,12 +68,17 @@ export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
       body.push(w.createRecoilQueryClientType());
       body.push(w.createRecoilQueryClient(context, name, QueryClient));
 
-      const selectors = w.createRecoilSelectors(context, name, QueryClient, QueryMsg);
+      const selectors = w.createRecoilSelectors(
+        context,
+        name,
+        QueryClient,
+        QueryMsg
+      );
 
       body.push(...selectors);
     }
 
-    if (typeHash.hasOwnProperty('Coin')) {
+    if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
       // @ts-ignore
       delete context.utils.Coin;
     }
@@ -82,8 +87,8 @@ export class RecoilPlugin extends BuilderPluginBase<RenderOptions> {
       {
         type: 'recoil',
         localname,
-        body
-      }
+        body,
+      },
     ];
   }
 }
diff --git a/packages/ts-codegen/src/utils/clean.ts b/packages/ts-codegen/src/utils/clean.ts
index 81217f74..62ea9931 100644
--- a/packages/ts-codegen/src/utils/clean.ts
+++ b/packages/ts-codegen/src/utils/clean.ts
@@ -23,7 +23,7 @@ export const clean = (obj: any): any => {
   if (obj instanceof Object || typeof obj === 'object') {
     copy = {};
     for (let attr in obj) {
-      if (obj.hasOwnProperty(attr)) {
+      if (Object.prototype.hasOwnProperty.call(obj, attr)) {
         switch (attr) {
         case 'leadingComments':
         case 'trailingComments':
@@ -44,4 +44,4 @@ export const clean = (obj: any): any => {
   }
 
   throw new Error("Unable to copy obj! Its type isn't supported.");
-};
\ No newline at end of file
+};
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index 34fff970..af6e2d6a 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -55,8 +55,7 @@ export const cleanse = (obj: any): any => {
     }
 
     for (let attr in obj) {
-      if (obj.hasOwnProperty(attr)) {
-
+      if (Object.prototype.hasOwnProperty.call(obj, attr)) {
         if (/_for_/.test(attr)) {
           // @ts-ignore
           copy[cleanFor(attr)] = cleanse(obj[attr]);
@@ -69,9 +68,7 @@ export const cleanse = (obj: any): any => {
           case '$ref':
             if (typeof obj[attr] === 'string') {
               // @ts-ignore
-              copy[attr] = cleanse(
-                cleanNullable(cleanFor(obj[attr]))
-              );
+              copy[attr] = cleanse(cleanNullable(cleanFor(obj[attr])));
             } else {
               // @ts-ignore
               copy[attr] = cleanse(obj[attr]);
@@ -82,7 +79,6 @@ export const cleanse = (obj: any): any => {
             copy[attr] = cleanse(obj[attr]);
           }
         }
-
       } else {
         // @ts-ignore
         copy[attr] = cleanse(obj[attr]);
@@ -92,4 +88,4 @@ export const cleanse = (obj: any): any => {
   }
 
   throw new Error("Unable to copy obj! Its type isn't supported.");
-};
\ No newline at end of file
+};

From 1c05b241bde693879832433d0925739a372b9875 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:35:45 +0200
Subject: [PATCH 259/287] Adapt prettier config to eslint rules

---
 .prettierrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index f0eb61e0..0a725205 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -2,5 +2,5 @@
   "trailingComma": "es5",
   "tabWidth": 2,
   "semi": true,
-  "singleQuote": false
+  "singleQuote": true
 }

From 51a519c57058aa9fcddcc557c3177c4f7506170e Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:36:07 +0200
Subject: [PATCH 260/287] Add yarn format

---
 package.json                     | 1 +
 packages/ast/package.json        | 1 +
 packages/ts-codegen/package.json | 1 +
 packages/types/package.json      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 23ac74ab..03f2b9fb 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "build": "lerna run build --stream",
     "test": "lerna run test --stream",
     "lint": "lerna run lint --parallel",
+    "format": "lerna run format --parallel",
     "symlink": "symlink-workspace --logLevel error",
     "postinstall": "yarn symlink"
   },
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 28d074dc..a93ef7d7 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -19,6 +19,7 @@
     "codegen": "ts-node ./scripts/build.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "lint": "eslint . --fix",
+    "format": "prettier --write --log-level warn \"./**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:ast": "ts-node scripts/test-ast.ts",
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e80ec591..45827a61 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -23,6 +23,7 @@
     "cmds": "ts-node ./scripts/cmds.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "lint": "eslint . --fix",
+    "format": "prettier --write --log-level warn \"./**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
     "dev": "ts-node src/ts-codegen",
diff --git a/packages/types/package.json b/packages/types/package.json
index b7d2b108..c410102c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -18,6 +18,7 @@
     "prepare": "npm run build",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "lint": "eslint . --fix",
+    "format": "prettier --write --log-level warn \"./**/*.ts\"",
     "test": "jest --passWithNoTests",
     "test:watch": "jest --watch --passWithNoTests"
   },

From ec442ead5d23b432e3e00fea8e293294a2e736b9 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:37:12 +0200
Subject: [PATCH 261/287] Format codebase

---
 packages/ast/__tests__/babel/babel.test.ts    |  66 ++--
 .../client/ts-client.account-nfts.test.ts     |   2 +-
 .../ts-client.arrays-item-tuples.test.ts      |  40 +-
 .../client/ts-client.arrays-ref.test.ts       |  41 +-
 .../__tests__/client/ts-client.arrays.test.ts |  41 +-
 .../client/ts-client.cw-named-groups.test.ts  |  51 ++-
 .../ts-client.cw-proposal-single.test.ts      |  51 ++-
 .../client/ts-client.declare.test.ts          |  81 ++--
 .../client/ts-client.empty-enums.test.ts      |  31 +-
 .../client/ts-client.issue-101.test.ts        |  36 +-
 .../client/ts-client.issue-103.test.ts        | 104 ++---
 .../client/ts-client.issue-71.test.ts         |  86 +++--
 .../client/ts-client.issue-98.test.ts         |  61 +--
 .../__tests__/client/ts-client.issues.test.ts |  89 +++--
 .../client/ts-client.overrides.test.ts        |  81 ++--
 .../__tests__/client/ts-client.sg721.test.ts  |  51 ++-
 .../ast/__tests__/client/ts-client.test.ts    | 198 +++++-----
 .../__tests__/client/ts-client.vectis.test.ts |  33 +-
 .../__tests__/client/ts-client.wager.test.ts  |  52 +--
 .../message-builder/message-builder.test.ts   |  17 +-
 .../message-composer/message-composer.test.ts |  13 +-
 .../ast/__tests__/provider/provider.test.ts   |  33 +-
 .../__tests__/react-query/react-query.test.ts | 118 +++---
 packages/ast/__tests__/recoil/recoil.test.ts  |  10 +-
 .../ast/__tests__/types/interfaces.test.ts    |  18 +-
 packages/ast/scripts/test-ast.ts              |   4 +-
 packages/ast/src/client/client.ts             | 115 +++---
 packages/ast/src/client/index.ts              |   2 +-
 packages/ast/src/context/context.ts           |  86 +++--
 packages/ast/src/context/imports.ts           |  26 +-
 packages/ast/src/context/index.ts             |   2 +-
 .../src/message-builder/message-builder.ts    |  39 +-
 packages/ast/src/message-composer/index.ts    |   2 +-
 .../src/message-composer/message-composer.ts  |  71 ++--
 packages/ast/src/provider/index.ts            |   2 +-
 packages/ast/src/provider/provider.ts         |  10 +-
 packages/ast/src/react-query/index.ts         |   2 +-
 packages/ast/src/react-query/react-query.ts   | 239 ++++++------
 packages/ast/src/recoil/index.ts              |   2 +-
 packages/ast/src/recoil/recoil.ts             | 359 +++++++-----------
 packages/ast/src/types/context.ts             |  18 +-
 packages/ast/src/types/index.ts               |   2 +-
 packages/ast/src/types/plugins.ts             |   6 +-
 packages/ast/src/utils/babel.ts               | 180 +++++----
 packages/ast/src/utils/constants.ts           |   8 +-
 packages/ast/src/utils/ref.ts                 |   2 +-
 packages/ast/src/utils/types.ts               |  24 +-
 packages/ast/test-utils/utils.ts              |  52 +--
 packages/ts-codegen/__tests__/builder.test.ts | 103 +++--
 packages/ts-codegen/__tests__/bundler.test.ts | 287 +++++++-------
 packages/ts-codegen/__tests__/cleanse.test.ts |   3 -
 .../__tests__/ts-codegen.issue-98.test.ts     |  16 +-
 ...ts-codegen.issue-long-exe-msg-name.test.ts |  12 +-
 .../ts-codegen/__tests__/ts-codegen.test.ts   |  75 ++--
 packages/ts-codegen/scripts/cmds.ts           |  12 +-
 packages/ts-codegen/src/builder/builder.ts    | 129 ++++---
 packages/ts-codegen/src/builder/index.ts      |   2 +-
 packages/ts-codegen/src/bundler/bundler.ts    |  51 +--
 packages/ts-codegen/src/bundler/index.ts      |   2 +-
 packages/ts-codegen/src/cli.ts                |   4 +-
 packages/ts-codegen/src/cmds.ts               |   5 +-
 .../src/commands/create-boilerplate.ts        |  23 +-
 packages/ts-codegen/src/commands/generate.ts  |  71 ++--
 packages/ts-codegen/src/commands/install.ts   | 105 ++---
 packages/ts-codegen/src/file.ts               |   4 +-
 .../ts-codegen/src/helpers/create-helpers.ts  |   2 +-
 packages/ts-codegen/src/helpers/index.ts      |   2 +-
 packages/ts-codegen/src/index.ts              |   2 +-
 packages/ts-codegen/src/plugins/index.ts      |   2 +-
 .../ts-codegen/src/plugins/plugin-base.ts     |  23 +-
 .../ts-codegen/src/plugins/provider-bundle.ts |  13 +-
 packages/ts-codegen/src/plugins/provider.ts   |   6 +-
 packages/ts-codegen/src/plugins/types.ts      |   6 +-
 packages/ts-codegen/src/utils/clean.ts        |  18 +-
 packages/ts-codegen/src/utils/cleanse.ts      |  22 +-
 packages/ts-codegen/src/utils/index.ts        |   2 +-
 packages/ts-codegen/src/utils/package.ts      |   8 +-
 packages/ts-codegen/src/utils/parse.ts        |  16 +-
 packages/ts-codegen/src/utils/prompt.ts       |   4 +-
 packages/ts-codegen/src/utils/schemas.ts      |  50 ++-
 packages/ts-codegen/src/utils/unused.ts       |  16 +-
 packages/types/src/idl.ts                     |   2 +-
 packages/types/src/types.ts                   |  34 +-
 83 files changed, 1946 insertions(+), 1843 deletions(-)

diff --git a/packages/ast/__tests__/babel/babel.test.ts b/packages/ast/__tests__/babel/babel.test.ts
index 7117e1ec..d60c3fbc 100644
--- a/packages/ast/__tests__/babel/babel.test.ts
+++ b/packages/ast/__tests__/babel/babel.test.ts
@@ -7,7 +7,7 @@ import {
   classDeclaration,
   classProperty,
   promiseTypeAnnotation,
-  typedIdentifier
+  typedIdentifier,
 } from '../../src/utils/babel';
 import { expectCode } from '../../test-utils';
 
@@ -54,12 +54,12 @@ it('interfaces', async () => {
                       'limit',
                       t.tsTypeAnnotation(t.tsStringKeyword()),
                       true
-                    )
+                    ),
                   ],
                   promiseTypeAnnotation('TokensResponse')
                 )
               )
-            )
+            ),
           ])
         )
       ),
@@ -73,7 +73,7 @@ it('interfaces', async () => {
           [
             t.tSExpressionWithTypeArguments(
               t.identifier('SG721ReadOnlyInstance')
-            )
+            ),
           ],
           t.tSInterfaceBody([
             // contract address
@@ -101,15 +101,15 @@ it('interfaces', async () => {
                     typedIdentifier(
                       'prop3',
                       t.tsTypeAnnotation(t.tsStringKeyword())
-                    )
+                    ),
                   ],
                   promiseTypeAnnotation('ExecuteResult')
                 )
               )
-            )
+            ),
           ])
         )
-      )
+      ),
     ])
   );
 });
@@ -149,7 +149,7 @@ it('readonly classes', async () => {
                 typedIdentifier(
                   'contractAddress',
                   t.tsTypeAnnotation(t.tsStringKeyword())
-                )
+                ),
               ],
               t.blockStatement([
                 // client/contract set
@@ -178,7 +178,7 @@ it('readonly classes', async () => {
                 bindMethod('approval'),
                 bindMethod('otherProp'),
                 bindMethod('hello'),
-                bindMethod('mintme')
+                bindMethod('mintme'),
               ])
             ),
 
@@ -196,7 +196,7 @@ it('readonly classes', async () => {
                   typedIdentifier(
                     'spender',
                     t.tsTypeAnnotation(t.tsStringKeyword())
-                  )
+                  ),
                 ],
                 t.blockStatement([
                   t.returnStatement(
@@ -227,31 +227,31 @@ it('readonly classes', async () => {
                             t.identifier('spender'),
                             false,
                             true
-                          )
-                        ])
+                          ),
+                        ]),
                       ]
                     )
-                  )
+                  ),
                 ]),
                 t.tsTypeAnnotation(
                   t.tsTypeReference(
                     t.identifier('Promise'),
                     t.tsTypeParameterInstantiation([
-                      t.tSTypeReference(t.identifier('ApprovalResponse'))
+                      t.tSTypeReference(t.identifier('ApprovalResponse')),
                     ])
                   )
                 ),
                 true
               )
-            )
+            ),
           ],
           [
             t.tSExpressionWithTypeArguments(
               t.identifier('SG721ReadOnlyInstance')
-            )
+            ),
           ]
         )
-      )
+      ),
     ])
   );
 });
@@ -291,14 +291,14 @@ it('mutation classes', async () => {
                 typedIdentifier(
                   'contractAddress',
                   t.tsTypeAnnotation(t.tsStringKeyword())
-                )
+                ),
               ],
               t.blockStatement([
                 // super()
                 t.expressionStatement(
                   t.callExpression(t.super(), [
                     t.identifier('client'),
-                    t.identifier('contractAddress')
+                    t.identifier('contractAddress'),
                   ])
                 ),
 
@@ -328,7 +328,7 @@ it('mutation classes', async () => {
                 bindMethod('approval'),
                 bindMethod('otherProp'),
                 bindMethod('hello'),
-                bindMethod('mintme')
+                bindMethod('mintme'),
               ])
             ),
 
@@ -353,7 +353,7 @@ it('mutation classes', async () => {
                   typedIdentifier(
                     'token_uri',
                     t.tsTypeAnnotation(t.tsStringKeyword())
-                  )
+                  ),
                 ],
                 t.blockStatement([
                   t.returnStatement(
@@ -391,37 +391,37 @@ it('mutation classes', async () => {
                                 t.objectProperty(
                                   t.identifier('expression'),
                                   t.objectExpression([])
-                                )
+                                ),
                               ])
-                            )
+                            ),
                           ]),
-                          t.stringLiteral('auto')
+                          t.stringLiteral('auto'),
                         ]
                       )
                     )
-                  )
+                  ),
                 ]),
                 // return type
                 t.tsTypeAnnotation(
                   t.tsTypeReference(
                     t.identifier('Promise'),
                     t.tsTypeParameterInstantiation([
-                      t.tSTypeReference(t.identifier('ExecuteResult'))
+                      t.tSTypeReference(t.identifier('ExecuteResult')),
                     ])
                   )
                 ),
                 true
               )
-            )
+            ),
           ],
           [
             t.tSExpressionWithTypeArguments(
               t.identifier('SG721ReadOnlyInstance')
-            )
+            ),
           ],
           t.identifier('SG721QueryClient')
         )
-      )
+      ),
     ])
   );
 });
@@ -439,7 +439,7 @@ it('object parms', () => {
       t.identifier('tokenId'),
       false,
       true
-    )
+    ),
   ]);
   obj.typeAnnotation = t.tsTypeAnnotation(
     t.tsTypeLiteral([
@@ -450,7 +450,7 @@ it('object parms', () => {
       t.tsPropertySignature(
         t.identifier('tokenId'),
         t.tsTypeAnnotation(t.tsStringKeyword())
-      )
+      ),
     ])
   );
   expectCode(
@@ -471,13 +471,13 @@ it('object parms', () => {
               t.tsTypeReference(
                 t.identifier('Promise'),
                 t.tsTypeParameterInstantiation([
-                  t.tsTypeReference(t.identifier('OwnerOfResponse'))
+                  t.tsTypeReference(t.identifier('OwnerOfResponse')),
                 ])
               )
             )
           )
         )
-      )
+      ),
     ])
   );
 });
diff --git a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
index cb411426..aec60e76 100644
--- a/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
+++ b/packages/ast/__tests__/client/ts-client.account-nfts.test.ts
@@ -5,7 +5,7 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
 import { expectCode, makeContext } from '../../test-utils';
 
diff --git a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
index 9c60d6c3..5a768d0d 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-item-tuples.test.ts
@@ -1,40 +1,34 @@
 import {
   createExecuteClass,
   createExecuteInterface,
-  createQueryClass} from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+  createQueryClass,
+} from '../../src';
+import {
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
 const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
 const ctx = makeContext(queryMsg, {
   types: {
-    itemsUseTuples: true
-  }
+    itemsUseTuples: true,
+  },
 });
 
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('execute classes array types', () => {
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('execute interfaces no extends', () => {
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
index ed996007..7387fd0b 100644
--- a/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays-ref.test.ts
@@ -2,46 +2,35 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays-ref.json');
 const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays-ref.json');
 const ctx = makeContext(queryMsg);
 
 it('execute_msg_for__empty', () => {
-  expectCode(createTypeInterface(
-    ctx,
-    queryMsg
-  ));
+  expectCode(createTypeInterface(ctx, queryMsg));
 });
 
-
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('execute classes array types', () => {
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('execute interfaces no extends', () => {
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.arrays.test.ts b/packages/ast/__tests__/client/ts-client.arrays.test.ts
index 1827d813..8fbaf2c1 100644
--- a/packages/ast/__tests__/client/ts-client.arrays.test.ts
+++ b/packages/ast/__tests__/client/ts-client.arrays.test.ts
@@ -2,10 +2,15 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
 import { getPropertyType } from '../../src/utils';
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 const queryMsg = getMsgQueryLegacyFixture('misc/schema', '/arrays.json');
 const execMsg = getMsgExecuteLegacyFixture('misc/schema', '/arrays.json');
 const ctx = makeContext(queryMsg);
@@ -22,37 +27,21 @@ it('getPropertyType', () => {
 });
 
 it('execute_msg_for__empty', () => {
-  expectCode(createTypeInterface(
-    ctx,
-    queryMsg
-  ));
+  expectCode(createTypeInterface(ctx, queryMsg));
 });
 
-
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('execute classes array types', () => {
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('execute interfaces no extends', () => {
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
index a7476c47..18265842 100644
--- a/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-named-groups.test.ts
@@ -2,45 +2,40 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
-const execMsg = getMsgExecuteLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
-const queryMsg = getMsgQueryLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
+import {
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
+const execMsg = getMsgExecuteLegacyFixture(
+  'daodao/cw-named-groups',
+  '/execute_msg.json'
+);
+const queryMsg = getMsgQueryLegacyFixture(
+  'daodao/cw-named-groups',
+  '/execute_msg.json'
+);
 const ctx = makeContext(execMsg);
 
 it('execute_msg', () => {
-  expectCode(createTypeInterface(
-    ctx,
-    execMsg
-  ));
+  expectCode(createTypeInterface(ctx, execMsg));
 });
 
-
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('execute classes array types', () => {
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('execute interfaces no extends', () => {
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
index 62f4e3b7..b8b4761a 100644
--- a/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
+++ b/packages/ast/__tests__/client/ts-client.cw-proposal-single.test.ts
@@ -2,49 +2,44 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const execMsg = getMsgExecuteLegacyFixture('daodao/cw-proposal-single', '/execute_msg.json');
-const queryMsg = getMsgQueryLegacyFixture('daodao/cw-proposal-single', '/query_msg.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'daodao/cw-proposal-single',
+  '/execute_msg.json'
+);
+const queryMsg = getMsgQueryLegacyFixture(
+  'daodao/cw-proposal-single',
+  '/query_msg.json'
+);
 
 it('execute_msg_for', () => {
   const ctx = makeContext(execMsg);
-  expectCode(createTypeInterface(
-    ctx,
-    execMsg
-  ));
+  expectCode(createTypeInterface(ctx, execMsg));
 });
 
-
 it('query classes', () => {
   const ctx = makeContext(queryMsg);
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('execute classes array types', () => {
   const ctx = makeContext(execMsg);
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('execute interfaces no extends', () => {
   const ctx = makeContext(execMsg);
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.declare.test.ts b/packages/ast/__tests__/client/ts-client.declare.test.ts
index 99262cf8..124528f3 100644
--- a/packages/ast/__tests__/client/ts-client.declare.test.ts
+++ b/packages/ast/__tests__/client/ts-client.declare.test.ts
@@ -1,67 +1,70 @@
+import { createExecuteClass } from '../../src';
 import {
-  createExecuteClass
-} from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'sg721',
+  '/execute_msg_for__empty.json'
+);
 const ctx = makeContext(execMsg);
 
 it('noDeclare, execExtends, noExtendsClass', () => {
   ctx.options.client.useDeclareKeyword = false;
   ctx.options.client.execExtendsQuery = true;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('noDeclare, execExtends, ExtendsClass', () => {
   ctx.options.client.useDeclareKeyword = false;
   ctx.options.client.execExtendsQuery = true;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'ExtendsClassName',
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'ExtendsClassName',
+      execMsg
+    )
+  );
 });
 
 it('useDeclare, execExtends, ExtendsClass', () => {
   ctx.options.client.useDeclareKeyword = true;
   ctx.options.client.execExtendsQuery = true;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'ExtendsClassName',
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'ExtendsClassName',
+      execMsg
+    )
+  );
 });
 
 it('useDeclare, noExecExtends, ExtendsClass', () => {
   ctx.options.client.useDeclareKeyword = true;
   ctx.options.client.execExtendsQuery = false;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'ExtendsClassName',
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'ExtendsClassName',
+      execMsg
+    )
+  );
 });
 
 it('useDeclare, noExecExtends, noExtendsClass', () => {
   ctx.options.client.useDeclareKeyword = true;
   ctx.options.client.execExtendsQuery = false;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
diff --git a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
index 6b703788..faa14ba7 100644
--- a/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
+++ b/packages/ast/__tests__/client/ts-client.empty-enums.test.ts
@@ -1,27 +1,22 @@
+import { createQueryClass, createQueryInterface } from '../../src';
 import {
-  createQueryClass,
-  createQueryInterface
-} from '../../src';
-import { expectCode, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+  expectCode,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const queryMsg = getMsgQueryLegacyFixture('daodao/cw-admin-factory', '/query_msg.json');
+const queryMsg = getMsgQueryLegacyFixture(
+  'daodao/cw-admin-factory',
+  '/query_msg.json'
+);
 const ctx = makeContext(queryMsg);
 
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('query interface', () => {
-  expectCode(
-    createQueryInterface(
-      ctx,
-      'ReadOnlyInstance',
-      queryMsg
-    )
-  );
+  expectCode(createQueryInterface(ctx, 'ReadOnlyInstance', queryMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-101.test.ts b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
index 713519f5..1f4498b1 100644
--- a/packages/ast/__tests__/client/ts-client.issue-101.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-101.test.ts
@@ -3,28 +3,32 @@ import { ExecuteMsg } from '@cosmwasm/ts-codegen-types';
 import { createExecuteClass, createExecuteInterface } from '../../src';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
-const contract = globLegacyContracts('basic').find(c => c.name === '/ownership.json')!;
+const contract = globLegacyContracts('basic').find(
+  (c) => c.name === '/ownership.json'
+)!;
 const ownership = contract.content;
 
 it('execute interfaces no extends', () => {
   const ctx = makeContext(ownership);
-  expectCode(createExecuteInterface(
-    ctx,
-    'OwnershipInstance',
-    null,
-    ownership as ExecuteMsg
-  ));
+  expectCode(
+    createExecuteInterface(
+      ctx,
+      'OwnershipInstance',
+      null,
+      ownership as ExecuteMsg
+    )
+  );
 });
 
 it('ownership client with tuple', () => {
   const ctx = makeContext(ownership);
-  expectCode(createExecuteClass(
-    ctx,
-    'OwnershipClient',
-    'OwnershipInstance',
-    null,
-    ownership as ExecuteMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'OwnershipClient',
+      'OwnershipInstance',
+      null,
+      ownership as ExecuteMsg
+    )
+  );
 });
-
-
diff --git a/packages/ast/__tests__/client/ts-client.issue-103.test.ts b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
index 526aef67..59c943f1 100644
--- a/packages/ast/__tests__/client/ts-client.issue-103.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-103.test.ts
@@ -2,14 +2,15 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
-const globbed = globLegacyContracts('issues/103').find(c => c.name === '/schema.json')!;
+const globbed = globLegacyContracts('issues/103').find(
+  (c) => c.name === '/schema.json'
+)!;
 const contract = globbed.content;
 
-
 // @ts-ignore
 const queryMessage = contract.query;
 // @ts-ignore
@@ -19,93 +20,72 @@ const executeCtx = makeContext(executeMessage);
 
 describe('query', () => {
   it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-      queryCtx,
-      queryMessage
-    ));
+    expectCode(createTypeInterface(queryCtx, queryMessage));
   });
 
-
   it('query classes', () => {
-    expectCode(createQueryClass(
-      queryCtx,
-      'QueryClient',
-      'ReadOnlyInstance',
-      queryMessage
-    ));
+    expectCode(
+      createQueryClass(
+        queryCtx,
+        'QueryClient',
+        'ReadOnlyInstance',
+        queryMessage
+      )
+    );
   });
 
   it('query classes response', () => {
-    expectCode(createTypeInterface(
-      queryCtx,
-      queryMessage
-    ));
+    expectCode(createTypeInterface(queryCtx, queryMessage));
   });
 
   it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-      queryCtx,
-      'Client',
-      'Instance',
-      null,
-      queryMessage
-    ));
+    expectCode(
+      createExecuteClass(queryCtx, 'Client', 'Instance', null, queryMessage)
+    );
   });
 
   it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-      queryCtx,
-      'SG721Instance',
-      null,
-      queryMessage
-    ));
+    expectCode(
+      createExecuteInterface(queryCtx, 'SG721Instance', null, queryMessage)
+    );
   });
-
 });
 
 describe('execute', () => {
   it('execute_msg_for__empty', () => {
-    expectCode(createTypeInterface(
-      executeCtx,
-      executeMessage
-    ));
+    expectCode(createTypeInterface(executeCtx, executeMessage));
   });
 
-
   it('query classes', () => {
-    expectCode(createQueryClass(
-      executeCtx,
-      'QueryClient',
-      'ReadOnlyInstance',
-      executeMessage
-    ));
+    expectCode(
+      createQueryClass(
+        executeCtx,
+        'QueryClient',
+        'ReadOnlyInstance',
+        executeMessage
+      )
+    );
   });
 
   it('query classes response', () => {
-    expectCode(createTypeInterface(
-      executeCtx,
-      // @ts-ignore
-      queryMessage
-    ));
+    expectCode(
+      createTypeInterface(
+        executeCtx,
+        // @ts-ignore
+        queryMessage
+      )
+    );
   });
 
   it('execute classes array types', () => {
-    expectCode(createExecuteClass(
-      executeCtx,
-      'Client',
-      'Instance',
-      null,
-      executeMessage
-    ));
+    expectCode(
+      createExecuteClass(executeCtx, 'Client', 'Instance', null, executeMessage)
+    );
   });
 
   it('execute interfaces no extends', () => {
-    expectCode(createExecuteInterface(
-      executeCtx,
-      'SG721Instance',
-      null,
-      executeMessage
-    ));
+    expectCode(
+      createExecuteInterface(executeCtx, 'SG721Instance', null, executeMessage)
+    );
   });
-
 });
diff --git a/packages/ast/__tests__/client/ts-client.issue-71.test.ts b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
index 087d46c6..e43a16e2 100644
--- a/packages/ast/__tests__/client/ts-client.issue-71.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-71.test.ts
@@ -5,49 +5,67 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
 import { globLegacyContracts, makeContext } from '../../test-utils';
 import { expectCode } from '../../test-utils';
 
 const contracts = globLegacyContracts('issues/71');
 
-cases('execute_msg_for__empty', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createTypeInterface(
-    ctx,
-    opts.content
-  ));
-}, contracts);
+cases(
+  'execute_msg_for__empty',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(createTypeInterface(ctx, opts.content));
+  },
+  contracts
+);
 
-cases('query classes', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
+cases(
+  'query classes',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(
+      createQueryClass(
+        ctx,
+        'SG721QueryClient',
+        'SG721ReadOnlyInstance',
         opts.content as QueryMsg
-  ));
-}, contracts);
+      )
+    );
+  },
+  contracts
+);
 
-cases('execute class', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
+cases(
+  'execute class',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(
+      createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
         opts.content as ExecuteMsg
-  ));
-}, contracts);
+      )
+    );
+  },
+  contracts
+);
 
-cases('execute interface', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
+cases(
+  'execute interface',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(
+      createExecuteInterface(
+        ctx,
+        'SG721Instance',
+        null,
         opts.content as ExecuteMsg
-  ));
-}, contracts);
-
+      )
+    );
+  },
+  contracts
+);
diff --git a/packages/ast/__tests__/client/ts-client.issue-98.test.ts b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
index 509ed900..25b5dbc2 100644
--- a/packages/ast/__tests__/client/ts-client.issue-98.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issue-98.test.ts
@@ -4,30 +4,29 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, globIdlBasedContracts,makeContext } from '../../test-utils';
+import {
+  expectCode,
+  globIdlBasedContracts,
+  makeContext,
+} from '../../test-utils';
 
-const contract = globIdlBasedContracts('issues/98').find(c => c.name === '/schema.json')!;
+const contract = globIdlBasedContracts('issues/98').find(
+  (c) => c.name === '/schema.json'
+)!;
 
 const message = contract.content.query;
 const ctx = makeContext(message);
 
 it('execute_msg_for__empty', () => {
-  expectCode(createTypeInterface(
-    ctx,
-    message
-  ));
+  expectCode(createTypeInterface(ctx, message));
 });
 
-
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    message
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message)
+  );
 });
 
 // it('query classes response', () => {
@@ -38,22 +37,26 @@ it('query classes', () => {
 // });
 
 it('execute classes array types', () => {
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-        // @ts-ignore
-        message as ExecuteMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      null,
+      // @ts-ignore
+      message as ExecuteMsg
+    )
+  );
 });
 
 it('execute interfaces no extends', () => {
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    // @ts-ignore
-    message
-  ));
+  expectCode(
+    createExecuteInterface(
+      ctx,
+      'SG721Instance',
+      null,
+      // @ts-ignore
+      message
+    )
+  );
 });
diff --git a/packages/ast/__tests__/client/ts-client.issues.test.ts b/packages/ast/__tests__/client/ts-client.issues.test.ts
index d6d58df4..973e4fb9 100644
--- a/packages/ast/__tests__/client/ts-client.issues.test.ts
+++ b/packages/ast/__tests__/client/ts-client.issues.test.ts
@@ -5,49 +5,66 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode,globLegacyContracts, makeContext } from '../../test-utils';
+import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
 const contracts = globLegacyContracts('issues/55');
 
+cases(
+  'execute_msg_for__empty',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(createTypeInterface(ctx, opts.content));
+  },
+  contracts
+);
 
-cases('execute_msg_for__empty', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createTypeInterface(
-    ctx,
-    opts.content
-  ));
-}, contracts);
-
-cases('query classes', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
+cases(
+  'query classes',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(
+      createQueryClass(
+        ctx,
+        'SG721QueryClient',
+        'SG721ReadOnlyInstance',
         opts.content as QueryMsg
-  ));
-}, contracts);
+      )
+    );
+  },
+  contracts
+);
 
-cases('execute class', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
+cases(
+  'execute class',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(
+      createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
         opts.content as ExecuteMsg
-  ));
-}, contracts);
+      )
+    );
+  },
+  contracts
+);
 
-cases('execute interface', async opts => {
-  const ctx = makeContext(opts.content);
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
+cases(
+  'execute interface',
+  async (opts) => {
+    const ctx = makeContext(opts.content);
+    expectCode(
+      createExecuteInterface(
+        ctx,
+        'SG721Instance',
+        null,
         opts.content as ExecuteMsg
-  ));
-}, contracts);
-
+      )
+    );
+  },
+  contracts
+);
diff --git a/packages/ast/__tests__/client/ts-client.overrides.test.ts b/packages/ast/__tests__/client/ts-client.overrides.test.ts
index 6b28f5b4..dcbfaad5 100644
--- a/packages/ast/__tests__/client/ts-client.overrides.test.ts
+++ b/packages/ast/__tests__/client/ts-client.overrides.test.ts
@@ -1,67 +1,70 @@
+import { createExecuteClass } from '../../src';
 import {
-  createExecuteClass
-} from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'sg721',
+  '/execute_msg_for__empty.json'
+);
 const ctx = makeContext(execMsg);
 
 it('Impl, execExtends, noExtendsClass', () => {
   ctx.options.client.noImplicitOverride = false;
   ctx.options.client.execExtendsQuery = true;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('Impl, execExtends, ExtendsClass', () => {
   ctx.options.client.noImplicitOverride = false;
   ctx.options.client.execExtendsQuery = true;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'ExtendsClassName',
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'ExtendsClassName',
+      execMsg
+    )
+  );
 });
 
 it('noImpl, execExtends, ExtendsClass', () => {
   ctx.options.client.noImplicitOverride = true;
   ctx.options.client.execExtendsQuery = true;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'ExtendsClassName',
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'ExtendsClassName',
+      execMsg
+    )
+  );
 });
 
 it('noImpl, noExecExtends, ExtendsClass', () => {
   ctx.options.client.noImplicitOverride = true;
   ctx.options.client.execExtendsQuery = false;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'ExtendsClassName',
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'ExtendsClassName',
+      execMsg
+    )
+  );
 });
 
 it('noImpl, noExecExtends, noExtendsClass', () => {
   ctx.options.client.noImplicitOverride = true;
   ctx.options.client.execExtendsQuery = false;
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
diff --git a/packages/ast/__tests__/client/ts-client.sg721.test.ts b/packages/ast/__tests__/client/ts-client.sg721.test.ts
index 41eca6ce..01ba6870 100644
--- a/packages/ast/__tests__/client/ts-client.sg721.test.ts
+++ b/packages/ast/__tests__/client/ts-client.sg721.test.ts
@@ -2,46 +2,41 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const execMsg = getMsgExecuteLegacyFixture('sg721', '/execute_msg_for__empty.json');
-const queryMsg = getMsgQueryLegacyFixture('sg721', '/execute_msg_for__empty.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'sg721',
+  '/execute_msg_for__empty.json'
+);
+const queryMsg = getMsgQueryLegacyFixture(
+  'sg721',
+  '/execute_msg_for__empty.json'
+);
 const ctx = makeContext(execMsg);
 
 it('execute_msg_for__empty', () => {
-  expectCode(createTypeInterface(
-    ctx,
-    execMsg
-  ));
+  expectCode(createTypeInterface(ctx, execMsg));
 });
 
-
 it('query classes', () => {
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsg
-  ));
+  expectCode(
+    createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', queryMsg)
+  );
 });
 
 it('execute classes array types', () => {
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(
+    createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execMsg)
+  );
 });
 
 it('execute interfaces no extends', () => {
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    execMsg
-  ));
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execMsg));
 });
diff --git a/packages/ast/__tests__/client/ts-client.test.ts b/packages/ast/__tests__/client/ts-client.test.ts
index 8a5d098a..779e393d 100644
--- a/packages/ast/__tests__/client/ts-client.test.ts
+++ b/packages/ast/__tests__/client/ts-client.test.ts
@@ -3,164 +3,170 @@ import {
   createExecuteInterface,
   createQueryClass,
   createQueryInterface,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getLegacyFixture,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const daodaoCwNamedGroupsExecuteMsg = getMsgExecuteLegacyFixture('daodao/cw-named-groups', '/execute_msg.json');
+const daodaoCwNamedGroupsExecuteMsg = getMsgExecuteLegacyFixture(
+  'daodao/cw-named-groups',
+  '/execute_msg.json'
+);
 
 const queryMsgData = getMsgQueryLegacyFixture('basic', '/query_msg.json');
-const executeMsgData = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
-const approvalResponseData = getLegacyFixture('basic', '/approval_response.json');
-const allNftInfoResponseData = getLegacyFixture('basic', '/all_nft_info_response.json');
-const approvalsResponseData = getLegacyFixture('basic', '/approvals_response.json');
-const collectionInfoResponseData = getLegacyFixture('basic', '/collection_info_response.json');
-const contractInfoResponseData = getLegacyFixture('basic', '/contract_info_response.json');
+const executeMsgData = getMsgExecuteLegacyFixture(
+  'basic',
+  '/execute_msg_for__empty.json'
+);
+const approvalResponseData = getLegacyFixture(
+  'basic',
+  '/approval_response.json'
+);
+const allNftInfoResponseData = getLegacyFixture(
+  'basic',
+  '/all_nft_info_response.json'
+);
+const approvalsResponseData = getLegacyFixture(
+  'basic',
+  '/approvals_response.json'
+);
+const collectionInfoResponseData = getLegacyFixture(
+  'basic',
+  '/collection_info_response.json'
+);
+const contractInfoResponseData = getLegacyFixture(
+  'basic',
+  '/contract_info_response.json'
+);
 const instantiateMsgData = getLegacyFixture('basic', '/instantiate_msg.json');
-const nftInfoResponseData = getLegacyFixture('basic', '/nft_info_response.json');
-const numTokensResponseData = getLegacyFixture('basic', '/num_tokens_response.json');
-const operatorsResponseData = getLegacyFixture('basic', '/operators_response.json');
-const ownerOfResponseData = getLegacyFixture('basic', '/owner_of_response.json');
+const nftInfoResponseData = getLegacyFixture(
+  'basic',
+  '/nft_info_response.json'
+);
+const numTokensResponseData = getLegacyFixture(
+  'basic',
+  '/num_tokens_response.json'
+);
+const operatorsResponseData = getLegacyFixture(
+  'basic',
+  '/operators_response.json'
+);
+const ownerOfResponseData = getLegacyFixture(
+  'basic',
+  '/owner_of_response.json'
+);
 const tokensResponseData = getLegacyFixture('basic', '/tokens_response.json');
 
-
 it('approval_response', () => {
   const ctx = makeContext(approvalResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    approvalResponseData
-  ));
+  expectCode(createTypeInterface(ctx, approvalResponseData));
 });
 
 it('all_nft_info_response', () => {
   const ctx = makeContext(allNftInfoResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    allNftInfoResponseData
-  ));
+  expectCode(createTypeInterface(ctx, allNftInfoResponseData));
 });
 it('approvals_response', () => {
   const ctx = makeContext(approvalsResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    approvalsResponseData
-  ));
+  expectCode(createTypeInterface(ctx, approvalsResponseData));
 });
 it('collection_info_response', () => {
   const ctx = makeContext(collectionInfoResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    collectionInfoResponseData
-  ));
+  expectCode(createTypeInterface(ctx, collectionInfoResponseData));
 });
 it('contract_info_response', () => {
   const ctx = makeContext(contractInfoResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    contractInfoResponseData
-  ));
+  expectCode(createTypeInterface(ctx, contractInfoResponseData));
 });
 it('instantiate_msg', () => {
   const ctx = makeContext(instantiateMsgData);
-  expectCode(createTypeInterface(
-    ctx,
-    instantiateMsgData
-  ));
+  expectCode(createTypeInterface(ctx, instantiateMsgData));
 });
 it('nft_info_response', () => {
   const ctx = makeContext(nftInfoResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    nftInfoResponseData
-  ));
+  expectCode(createTypeInterface(ctx, nftInfoResponseData));
 });
 it('num_tokens_response', () => {
   const ctx = makeContext(numTokensResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    numTokensResponseData
-  ));
+  expectCode(createTypeInterface(ctx, numTokensResponseData));
 });
 it('operators_response', () => {
   const ctx = makeContext(operatorsResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    operatorsResponseData
-  ));
+  expectCode(createTypeInterface(ctx, operatorsResponseData));
 });
 it('owner_of_response', () => {
   const ctx = makeContext(ownerOfResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    ownerOfResponseData
-  ));
+  expectCode(createTypeInterface(ctx, ownerOfResponseData));
 });
 it('tokens_response', () => {
   const ctx = makeContext(tokensResponseData);
-  expectCode(createTypeInterface(
-    ctx,
-    tokensResponseData
-  ));
+  expectCode(createTypeInterface(ctx, tokensResponseData));
 });
 
 it('query classes', () => {
   const ctx = makeContext(queryMsgData);
-  expectCode(createQueryClass(
-    ctx,
-    'SG721QueryClient',
-    'SG721ReadOnlyInstance',
-    queryMsgData
-  ));
+  expectCode(
+    createQueryClass(
+      ctx,
+      'SG721QueryClient',
+      'SG721ReadOnlyInstance',
+      queryMsgData
+    )
+  );
 });
 
 it('execute classes', () => {
   const ctx = makeContext(executeMsgData);
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    'SG721QueryClient',
-    executeMsgData
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      'SG721QueryClient',
+      executeMsgData
+    )
+  );
 });
 
 it('execute classes no extends', () => {
   const ctx = makeContext(executeMsgData);
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    executeMsgData
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      null,
+      executeMsgData
+    )
+  );
 });
 
 it('execute classes array types', () => {
   const ctx = makeContext(daodaoCwNamedGroupsExecuteMsg);
-  expectCode(createExecuteClass(
-    ctx,
-    'SG721Client',
-    'SG721Instance',
-    null,
-    daodaoCwNamedGroupsExecuteMsg
-  ));
+  expectCode(
+    createExecuteClass(
+      ctx,
+      'SG721Client',
+      'SG721Instance',
+      null,
+      daodaoCwNamedGroupsExecuteMsg
+    )
+  );
 });
 
 it('execute interfaces no extends', () => {
   const ctx = makeContext(executeMsgData);
-  expectCode(createExecuteInterface(
-    ctx,
-    'SG721Instance',
-    null,
-    executeMsgData
-  ));
+  expectCode(
+    createExecuteInterface(ctx, 'SG721Instance', null, executeMsgData)
+  );
 });
 
 it('query interfaces', () => {
   const ctx = makeContext(queryMsgData);
-  expectCode(createQueryInterface(
-    ctx,
-    'SG721ReadOnlyInstance',
-    queryMsgData
-  ));
+  expectCode(createQueryInterface(ctx, 'SG721ReadOnlyInstance', queryMsgData));
 });
diff --git a/packages/ast/__tests__/client/ts-client.vectis.test.ts b/packages/ast/__tests__/client/ts-client.vectis.test.ts
index ba1e0ec9..619e2de2 100644
--- a/packages/ast/__tests__/client/ts-client.vectis.test.ts
+++ b/packages/ast/__tests__/client/ts-client.vectis.test.ts
@@ -4,19 +4,30 @@ import {
   createExecuteClass,
   createExecuteInterface,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import {
-  expectCode,
-  getLegacyFixture,
-  makeContext,
-} from '../../test-utils';
+import { expectCode, getLegacyFixture, makeContext } from '../../test-utils';
 
-const vectisCanExecuteRelayResponse = getLegacyFixture('vectis/govec', '/can_execute_relay_response.json');
-const vectisCosmosMsgForEmpty = getLegacyFixture('vectis/govec', '/cosmos_msg_for__empty.json');
-const vectisExecuteMsgForEmpty = getLegacyFixture('vectis/govec', '/execute_msg_for__empty.json');
-const vectisInfoResponse = getLegacyFixture('vectis/govec', '/info_response.json');
-const vectisRelayTransaction = getLegacyFixture('vectis/govec', '/relay_transaction.json');
+const vectisCanExecuteRelayResponse = getLegacyFixture(
+  'vectis/govec',
+  '/can_execute_relay_response.json'
+);
+const vectisCosmosMsgForEmpty = getLegacyFixture(
+  'vectis/govec',
+  '/cosmos_msg_for__empty.json'
+);
+const vectisExecuteMsgForEmpty = getLegacyFixture(
+  'vectis/govec',
+  '/execute_msg_for__empty.json'
+);
+const vectisInfoResponse = getLegacyFixture(
+  'vectis/govec',
+  '/info_response.json'
+);
+const vectisRelayTransaction = getLegacyFixture(
+  'vectis/govec',
+  '/relay_transaction.json'
+);
 
 it('cosmos_msg_for__empty', () => {
   const ctx = makeContext(vectisCosmosMsgForEmpty);
diff --git a/packages/ast/__tests__/client/ts-client.wager.test.ts b/packages/ast/__tests__/client/ts-client.wager.test.ts
index 767158bb..47430e99 100644
--- a/packages/ast/__tests__/client/ts-client.wager.test.ts
+++ b/packages/ast/__tests__/client/ts-client.wager.test.ts
@@ -1,45 +1,49 @@
 import {
   createExecuteClass,
   createQueryClass,
-  createTypeInterface
+  createTypeInterface,
 } from '../../src';
-import { expectCode, globIdlBasedContracts, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  globIdlBasedContracts,
+  makeContext,
+} from '../../test-utils';
 
-const globbed = globIdlBasedContracts('wager').find(c => c.name === '/cw-wager.json')!;
+const globbed = globIdlBasedContracts('wager').find(
+  (c) => c.name === '/cw-wager.json'
+)!;
 const wagerJson = globbed.content;
 
 const queryCtx = makeContext(wagerJson.query);
 const executeCtx = makeContext(wagerJson.execute);
 
 it('query', () => {
-  expectCode(createTypeInterface(
-    queryCtx,
-    wagerJson.query
-  ));
+  expectCode(createTypeInterface(queryCtx, wagerJson.query));
 });
 
 it('execute', () => {
-  expectCode(createTypeInterface(
-    executeCtx,
-    wagerJson.execute
-  ));
+  expectCode(createTypeInterface(executeCtx, wagerJson.execute));
 });
 
 it('query classes', () => {
-  expectCode(createQueryClass(
-    queryCtx,
-    'WagerQueryClient',
-    'WagerReadOnlyInstance',
-    wagerJson.query
-  ));
+  expectCode(
+    createQueryClass(
+      queryCtx,
+      'WagerQueryClient',
+      'WagerReadOnlyInstance',
+      wagerJson.query
+    )
+  );
 });
 
 it('execute classes', () => {
-  expectCode(createExecuteClass(
-    executeCtx,
-    'WagerClient',
-    'WagerInstance',
-    null,
-    wagerJson.execute
-  ));
+  expectCode(
+    createExecuteClass(
+      executeCtx,
+      'WagerClient',
+      'WagerInstance',
+      null,
+      wagerJson.execute
+    )
+  );
 });
diff --git a/packages/ast/__tests__/message-builder/message-builder.test.ts b/packages/ast/__tests__/message-builder/message-builder.test.ts
index 31fddd16..501f7b33 100644
--- a/packages/ast/__tests__/message-builder/message-builder.test.ts
+++ b/packages/ast/__tests__/message-builder/message-builder.test.ts
@@ -1,19 +1,24 @@
+import { createMessageBuilderClass } from '../../src';
 import {
-  createMessageBuilderClass,
-} from '../../src';
-import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+  expectCode,
+  getLegacyFixture,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
 const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json');
-const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'basic',
+  '/execute_msg_for__empty.json'
+);
 const ownership = getLegacyFixture('basic', '/ownership.json');
 
-
 it('execute class', () => {
   const ctx = makeContext(execMsg);
   expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', execMsg));
 });
 
-
 it('query class', () => {
   const ctx = makeContext(queryMsg);
   expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', queryMsg));
diff --git a/packages/ast/__tests__/message-composer/message-composer.test.ts b/packages/ast/__tests__/message-composer/message-composer.test.ts
index 021736d6..911954f2 100644
--- a/packages/ast/__tests__/message-composer/message-composer.test.ts
+++ b/packages/ast/__tests__/message-composer/message-composer.test.ts
@@ -2,12 +2,19 @@ import {
   createMessageComposerClass,
   createMessageComposerInterface,
 } from '../../src';
-import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getLegacyFixture,
+  getMsgExecuteLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
-const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'basic',
+  '/execute_msg_for__empty.json'
+);
 const ownership = getLegacyFixture('basic', '/ownership.json');
 
-
 it('execute classes', () => {
   const ctx = makeContext(execMsg);
   expectCode(
diff --git a/packages/ast/__tests__/provider/provider.test.ts b/packages/ast/__tests__/provider/provider.test.ts
index 271b641c..d67ce713 100644
--- a/packages/ast/__tests__/provider/provider.test.ts
+++ b/packages/ast/__tests__/provider/provider.test.ts
@@ -1,36 +1,35 @@
 import {
   createGettingProviders,
   createIContractsContext,
-  createProvider
+  createProvider,
 } from '../../src/provider/provider';
 import { PROVIDER_TYPES } from '../../src/utils/constants';
 import { expectCode } from '../../test-utils';
 
-
 // Use 'typeof PROVIDER_TYPES[keyof typeof PROVIDER_TYPES]' to extract the values of PROVIDER_TYPES.
-type ProviderTypes = typeof PROVIDER_TYPES[keyof typeof PROVIDER_TYPES];
+type ProviderTypes = (typeof PROVIDER_TYPES)[keyof typeof PROVIDER_TYPES];
 interface TestProviderInfo {
   classname: string;
 }
 
 // Use the values from PROVIDER_TYPES as the keys for TestProviderInfos
 type ProviderInfos = {
-  [key in ProviderTypes]: TestProviderInfo
+  [key in ProviderTypes]: TestProviderInfo;
 };
 
 it('execute class', () => {
   const info: ProviderInfos = {} as ProviderInfos;
 
   info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: 'WhitelistClient'
+    classname: 'WhitelistClient',
   };
 
   info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: 'WhitelistQueryClient'
+    classname: 'WhitelistQueryClient',
   };
 
   info[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] = {
-    classname: 'WhitelistMessageComposer'
+    classname: 'WhitelistMessageComposer',
   };
 
   // @ts-ignore
@@ -41,11 +40,11 @@ it('execute class without message composer', () => {
   const info: ProviderInfos = {};
 
   info[PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: 'WhitelistClient'
+    classname: 'WhitelistClient',
   };
 
   info[PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: 'WhitelistQueryClient'
+    classname: 'WhitelistQueryClient',
   };
 
   // @ts-ignore
@@ -55,19 +54,19 @@ it('execute class without message composer', () => {
 it('create IContractsContext', () => {
   const info: any = {
     Whitelist: {},
-    Marketplace: {}
+    Marketplace: {},
   };
 
   info['Whitelist'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: 'WhitelistClient'
+    classname: 'WhitelistClient',
   };
 
   info['Whitelist'][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: 'WhitelistQueryClient'
+    classname: 'WhitelistQueryClient',
   };
 
   info['Marketplace'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: 'MarketplaceClient'
+    classname: 'MarketplaceClient',
   };
 
   expectCode(createIContractsContext(info));
@@ -76,19 +75,19 @@ it('create IContractsContext', () => {
 it('create getProviders', () => {
   const info: any = {
     Whitelist: {},
-    Marketplace: {}
+    Marketplace: {},
   };
 
   info['Whitelist'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: 'WhitelistClient'
+    classname: 'WhitelistClient',
   };
 
   info['Whitelist'][PROVIDER_TYPES.QUERY_CLIENT_TYPE] = {
-    classname: 'WhitelistQueryClient'
+    classname: 'WhitelistQueryClient',
   };
 
   info['Marketplace'][PROVIDER_TYPES.SIGNING_CLIENT_TYPE] = {
-    classname: 'MarketplaceClient'
+    classname: 'MarketplaceClient',
   };
 
   expectCode(createGettingProviders(info));
diff --git a/packages/ast/__tests__/react-query/react-query.test.ts b/packages/ast/__tests__/react-query/react-query.test.ts
index a4ea0ce0..050b0c69 100644
--- a/packages/ast/__tests__/react-query/react-query.test.ts
+++ b/packages/ast/__tests__/react-query/react-query.test.ts
@@ -4,68 +4,80 @@ import {
   createReactQueryHooks,
   createReactQueryMutationHooks,
 } from '../../src';
-import { expectCode, getLegacyFixture, getMsgExecuteLegacyFixture, getMsgQueryLegacyFixture, makeContext } from '../../test-utils';
+import {
+  expectCode,
+  getLegacyFixture,
+  getMsgExecuteLegacyFixture,
+  getMsgQueryLegacyFixture,
+  makeContext,
+} from '../../test-utils';
 
 const queryMsg = getMsgQueryLegacyFixture('basic', '/query_msg.json');
-const execMsg = getMsgExecuteLegacyFixture('basic', '/execute_msg_for__empty.json');
+const execMsg = getMsgExecuteLegacyFixture(
+  'basic',
+  '/execute_msg_for__empty.json'
+);
 const ownership = getLegacyFixture('basic', '/ownership.json');
 
-
 it('createReactQueryHooks', () => {
-  expectCode(t.program(
-    createReactQueryHooks(
-      {
+  expectCode(
+    t.program(
+      createReactQueryHooks({
         context: makeContext(queryMsg, {
           reactQuery: {
             version: 'v3',
-          }
+          },
         }),
         queryMsg: queryMsg,
         contractName: 'Sg721',
-        QueryClient: 'Sg721QueryClient'
-      }
-    )));
-  expectCode(t.program(
-    createReactQueryHooks(
-      {
+        QueryClient: 'Sg721QueryClient',
+      })
+    )
+  );
+  expectCode(
+    t.program(
+      createReactQueryHooks({
         context: makeContext(queryMsg, {
           reactQuery: {
             version: 'v3',
-            optionalClient: true
-          }
+            optionalClient: true,
+          },
         }),
         queryMsg: queryMsg,
         contractName: 'Sg721',
-        QueryClient: 'Sg721QueryClient'
-      }
-    )));
-  expectCode(t.program(
-    createReactQueryHooks(
-      {
+        QueryClient: 'Sg721QueryClient',
+      })
+    )
+  );
+  expectCode(
+    t.program(
+      createReactQueryHooks({
         context: makeContext(queryMsg, {
           reactQuery: {
-            version: 'v4'
-          }
+            version: 'v4',
+          },
         }),
         queryMsg: queryMsg,
         contractName: 'Sg721',
-        QueryClient: 'Sg721QueryClient'
-      }
-    )));
-  expectCode(t.program(
-    createReactQueryHooks(
-      {
+        QueryClient: 'Sg721QueryClient',
+      })
+    )
+  );
+  expectCode(
+    t.program(
+      createReactQueryHooks({
         context: makeContext(queryMsg, {
           reactQuery: {
             optionalClient: true,
-            version: 'v4'
-          }
+            version: 'v4',
+          },
         }),
         queryMsg: queryMsg,
         contractName: 'Sg721',
-        QueryClient: 'Sg721QueryClient'
-      }
-    )));
+        QueryClient: 'Sg721QueryClient',
+      })
+    )
+  );
   expectCode(
     t.program(
       createReactQueryHooks({
@@ -74,45 +86,45 @@ it('createReactQueryHooks', () => {
             optionalClient: true,
             version: 'v4',
             queryKeys: true,
-            queryFactory: true
-          }
+            queryFactory: true,
+          },
         }),
         queryMsg: queryMsg,
         contractName: 'Sg721',
-        QueryClient: 'Sg721QueryClient'
+        QueryClient: 'Sg721QueryClient',
       })
     )
   );
-  expectCode(t.program(
-    createReactQueryMutationHooks(
-      {
+  expectCode(
+    t.program(
+      createReactQueryMutationHooks({
         context: makeContext(execMsg, {
           reactQuery: {
-            version: 'v3'
-          }
+            version: 'v3',
+          },
         }),
         execMsg: execMsg,
         contractName: 'Sg721',
         ExecuteClient: 'Sg721Client',
-      }
-    )));
+      })
+    )
+  );
 });
 
 it('ownership', () => {
-  expectCode(t.program(
-    createReactQueryMutationHooks(
-      {
+  expectCode(
+    t.program(
+      createReactQueryMutationHooks({
         context: makeContext(ownership, {
           reactQuery: {
-            version: 'v3'
-          }
+            version: 'v3',
+          },
         }),
         // @ts-ignore
         execMsg: ownership,
         contractName: 'Ownership',
         ExecuteClient: 'OwnershipClient',
-      }
-    )));
+      })
+    )
+  );
 });
-
-
diff --git a/packages/ast/__tests__/recoil/recoil.test.ts b/packages/ast/__tests__/recoil/recoil.test.ts
index 779ae3d3..3bde3683 100644
--- a/packages/ast/__tests__/recoil/recoil.test.ts
+++ b/packages/ast/__tests__/recoil/recoil.test.ts
@@ -4,11 +4,13 @@ import { QueryMsg } from '@cosmwasm/ts-codegen-types';
 import {
   createRecoilQueryClient,
   createRecoilSelector,
-  createRecoilSelectors
+  createRecoilSelectors,
 } from '../../src/recoil/recoil';
 import { expectCode, globLegacyContracts, makeContext } from '../../test-utils';
 
-const globbed = globLegacyContracts('basic').find(c => c.name === '/query_msg.json');
+const globbed = globLegacyContracts('basic').find(
+  (c) => c.name === '/query_msg.json'
+);
 const queryMsg = globbed.content as QueryMsg;
 const ctx = makeContext(queryMsg);
 
@@ -26,9 +28,7 @@ it('selector', () => {
 
 it('selectors', () => {
   expectCode(
-    t.program(
-      createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', queryMsg)
-    )
+    t.program(createRecoilSelectors(ctx, 'SG721', 'SG721QueryClient', queryMsg))
   );
 });
 
diff --git a/packages/ast/__tests__/types/interfaces.test.ts b/packages/ast/__tests__/types/interfaces.test.ts
index 9328086d..bca86298 100644
--- a/packages/ast/__tests__/types/interfaces.test.ts
+++ b/packages/ast/__tests__/types/interfaces.test.ts
@@ -1,31 +1,23 @@
-
 import { createTypeOrInterface } from '../../src';
 import { expectCode, getLegacyFixture, makeContext } from '../../test-utils';
 
 const topLevel = getLegacyFixture('misc/schema', '/arrays-top-level.json');
 const nested = getLegacyFixture('misc/schema', '/arrays-nested.json');
 
-
 it('top level', async () => {
-  expectCode(
-    createTypeOrInterface(makeContext(topLevel), 'Type', topLevel)
-  );
+  expectCode(createTypeOrInterface(makeContext(topLevel), 'Type', topLevel));
 });
 
 it('nested', async () => {
   const ctx = makeContext(nested);
-  expectCode(
-    createTypeOrInterface(ctx, 'Type', nested)
-  );
+  expectCode(createTypeOrInterface(ctx, 'Type', nested));
 });
 
 it('nested ctx', async () => {
   const ctx = makeContext(nested, {
     types: {
-      itemsUseTuples: true
-    }
+      itemsUseTuples: true,
+    },
   });
-  expectCode(
-    createTypeOrInterface(ctx, 'Type', nested)
-  );
+  expectCode(createTypeOrInterface(ctx, 'Type', nested));
 });
diff --git a/packages/ast/scripts/test-ast.ts b/packages/ast/scripts/test-ast.ts
index 52fab414..837250b6 100644
--- a/packages/ast/scripts/test-ast.ts
+++ b/packages/ast/scripts/test-ast.ts
@@ -10,13 +10,13 @@ const main = async () => {
     'asyncGenerators',
     'decorators-legacy',
     'typescript',
-    'dynamicImport'
+    'dynamicImport',
   ];
 
   const ast = parse(readFileSync(__dirname + '/fixture.ts', 'utf-8'), {
     sourceType: 'module',
     // @ts-ignore
-    plugins
+    plugins,
   });
 
   writeFileSync(__dirname + '/test-output.json', stringify(ast, null, 2));
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 8be5baf7..59dad222 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -13,14 +13,14 @@ import {
   getTypeOrRef,
   OPTIONAL_FUNDS_PARAM,
   promiseTypeAnnotation,
-  typedIdentifier
+  typedIdentifier,
 } from '../utils';
 import { identifier, propertySignature } from '../utils/babel';
 import { OPTIONAL_MEMO_PARAM } from '../utils/constants';
 import {
   createTypedObjectParams,
   getPropertyType,
-  getResponseType
+  getResponseType,
 } from '../utils/types';
 
 export const CONSTANT_EXEC_PARAMS = [
@@ -31,7 +31,7 @@ export const CONSTANT_EXEC_PARAMS = [
         t.tsUnionType([
           t.tSNumberKeyword(),
           t.tsTypeReference(t.identifier('StdFee')),
-          t.tsLiteralType(t.stringLiteral('auto'))
+          t.tsLiteralType(t.stringLiteral('auto')),
         ])
       ),
       false
@@ -39,7 +39,7 @@ export const CONSTANT_EXEC_PARAMS = [
     t.stringLiteral('auto')
   ),
   OPTIONAL_MEMO_PARAM,
-  OPTIONAL_FUNDS_PARAM
+  OPTIONAL_FUNDS_PARAM,
 ];
 
 export const createWasmQueryMethod = (
@@ -83,16 +83,16 @@ export const createWasmQueryMethod = (
                 t.thisExpression(),
                 t.identifier('contractAddress')
               ),
-              t.objectExpression([t.objectProperty(msgAction, msgActionValue)])
+              t.objectExpression([t.objectProperty(msgAction, msgActionValue)]),
             ]
           )
-        )
+        ),
       ]),
       t.tsTypeAnnotation(
         t.tsTypeReference(
           t.identifier('Promise'),
           t.tsTypeParameterInstantiation([
-            t.tSTypeReference(t.identifier(responseType))
+            t.tSTypeReference(t.identifier(responseType)),
           ])
         )
       ),
@@ -149,7 +149,7 @@ export const createQueryClass = (
             typedIdentifier(
               'contractAddress',
               t.tsTypeAnnotation(t.tsStringKeyword())
-            )
+            ),
           ],
           t.blockStatement([
             // client/contract set
@@ -171,11 +171,11 @@ export const createQueryClass = (
               )
             ),
 
-            ...bindings
+            ...bindings,
           ])
         ),
 
-        ...methods
+        ...methods,
       ],
       [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]
     )
@@ -245,10 +245,10 @@ export const createWasmExecMethod = (
     arrowFunctionExpression(
       param
         ? [
-          // props
-          param,
-          ...CONSTANT_EXEC_PARAMS
-        ]
+            // props
+            param,
+            ...CONSTANT_EXEC_PARAMS,
+          ]
         : CONSTANT_EXEC_PARAMS,
       t.blockStatement([
         t.returnStatement(
@@ -265,22 +265,22 @@ export const createWasmExecMethod = (
                   t.identifier('contractAddress')
                 ),
                 t.objectExpression([
-                  t.objectProperty(msgAction, msgActionValue)
+                  t.objectProperty(msgAction, msgActionValue),
                 ]),
                 t.identifier('fee_'),
                 t.identifier('memo_'),
-                t.identifier('funds_')
+                t.identifier('funds_'),
               ]
             )
           )
-        )
+        ),
       ]),
       // return type
       t.tsTypeAnnotation(
         t.tsTypeReference(
           t.identifier('Promise'),
           t.tsTypeParameterInstantiation([
-            t.tSTypeReference(t.identifier('ExecuteResult'))
+            t.tSTypeReference(t.identifier('ExecuteResult')),
           ])
         )
       ),
@@ -316,37 +316,42 @@ export const createExecuteClass = (
       t.expressionStatement(
         t.callExpression(t.super(), [
           t.identifier('client'),
-          t.identifier('contractAddress')
+          t.identifier('contractAddress'),
         ])
       )
     );
   }
 
-  blockStmt.push(...[
-    // 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('sender')),
-        t.identifier('sender')
-      )
-    ),
-    t.expressionStatement(
-      t.assignmentExpression(
-        '=',
-        t.memberExpression(t.thisExpression(), t.identifier('contractAddress')),
-        t.identifier('contractAddress')
-      )
-    ),
-    ...bindings
-  ]);
+  blockStmt.push(
+    ...[
+      // 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('sender')),
+          t.identifier('sender')
+        )
+      ),
+      t.expressionStatement(
+        t.assignmentExpression(
+          '=',
+          t.memberExpression(
+            t.thisExpression(),
+            t.identifier('contractAddress')
+          ),
+          t.identifier('contractAddress')
+        )
+      ),
+      ...bindings,
+    ]
+  );
 
   const noImplicitOverride =
     context.options.client.noImplicitOverride &&
@@ -402,11 +407,11 @@ export const createExecuteClass = (
             typedIdentifier(
               'contractAddress',
               t.tsTypeAnnotation(t.tsStringKeyword())
-            )
+            ),
           ],
           t.blockStatement(blockStmt)
         ),
-        ...methods
+        ...methods,
       ],
       [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))],
       extendsClassName ? t.identifier(extendsClassName) : null
@@ -453,7 +458,7 @@ export const createExecuteInterface = (
           t.tsTypeAnnotation(t.tsStringKeyword())
         ),
 
-        ...methods
+        ...methods,
       ])
     )
   );
@@ -470,7 +475,7 @@ export const createPropertyFunctionWithObjectParams = (
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [obj] : []
+    parameters: obj ? [obj] : [],
   };
 
   return t.tSPropertySignature(
@@ -495,7 +500,7 @@ export const createPropertyFunctionWithObjectParamsForExec = (
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
+    parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS,
   };
 
   return t.tSPropertySignature(
@@ -534,7 +539,7 @@ export const createQueryInterface = (
           t.identifier('contractAddress'),
           t.tsTypeAnnotation(t.tsStringKeyword())
         ),
-        ...methods
+        ...methods,
       ])
     )
   );
@@ -564,11 +569,7 @@ export const createTypeOrInterface = (
     // Use getTypeOrRef to handle string, array of strings, or $ref
     const typeAnnotation = getTypeOrRef(jsonschema);
     return t.exportNamedDeclaration(
-      t.tsTypeAliasDeclaration(
-        t.identifier(Type),
-        null,
-        typeAnnotation
-      )
+      t.tsTypeAliasDeclaration(t.identifier(Type), null, typeAnnotation)
     );
   }
   // Handle object type schemas
@@ -582,9 +583,7 @@ export const createTypeOrInterface = (
       t.identifier(Type),
       null,
       [],
-      t.tsInterfaceBody(
-        [...props]
-      )
+      t.tsInterfaceBody([...props])
     )
   );
 };
diff --git a/packages/ast/src/client/index.ts b/packages/ast/src/client/index.ts
index 5c6a6381..4f1cce44 100644
--- a/packages/ast/src/client/index.ts
+++ b/packages/ast/src/client/index.ts
@@ -1 +1 @@
-export * from './client';
\ No newline at end of file
+export * from './client';
diff --git a/packages/ast/src/context/context.ts b/packages/ast/src/context/context.ts
index 7f927f7c..dce5496f 100644
--- a/packages/ast/src/context/context.ts
+++ b/packages/ast/src/context/context.ts
@@ -5,19 +5,35 @@ import { basename, extname } from 'path';
 
 import { ContractInfo, ProviderInfo, RenderOptions } from '../types';
 import { refLookup } from '../utils';
-import { convertUtilsToImportList, getImportStatements, UtilMapping } from './imports';
+import {
+  convertUtilsToImportList,
+  getImportStatements,
+  UtilMapping,
+} from './imports';
 
 export interface IContext {
   refLookup($ref: string): JSONSchema;
   addUtil(util: string): void;
-  getImports(registeredUtils?: UtilMapping, filepath?: string): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[];
+  getImports(
+    registeredUtils?: UtilMapping,
+    filepath?: string
+  ): (
+    | t.ImportNamespaceSpecifier
+    | t.ImportDeclaration
+    | t.ImportDefaultSpecifier
+  )[];
 }
 
 export interface IRenderContext<TOpt = RenderOptions> extends IContext {
   contract: ContractInfo;
   options: TOpt;
 
-  addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
+  addProviderInfo(
+    contractName: string,
+    type: string,
+    classname: string,
+    filename: string
+  ): void;
   getProviderInfos(): {
     [key: string]: {
       [key: string]: ProviderInfo;
@@ -30,7 +46,7 @@ export const defaultOptions: RenderOptions = {
   types: {
     enabled: true,
     itemsUseTuples: false,
-    aliasExecuteMsg: false
+    aliasExecuteMsg: false,
   },
   client: {
     enabled: true,
@@ -39,10 +55,10 @@ export const defaultOptions: RenderOptions = {
     useDeclareKeyword: false,
   },
   recoil: {
-    enabled: false
+    enabled: false,
   },
   messageComposer: {
-    enabled: false
+    enabled: false,
   },
   messageBuilder: {
     enabled: false,
@@ -53,25 +69,25 @@ export const defaultOptions: RenderOptions = {
     version: 'v4',
     mutations: false,
     camelize: true,
-    queryKeys: false
+    queryKeys: false,
   },
   useContractsHook: {
-    enabled: false
-  }
+    enabled: false,
+  },
 };
 
 export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
   const aggregateSchema = {
     definitions: {
       //
-    }
+    },
   };
 
-  schemas.forEach(schema => {
+  schemas.forEach((schema) => {
     schema.definitions = schema.definitions || {};
     aggregateSchema.definitions = {
       ...aggregateSchema.definitions,
-      ...schema.definitions
+      ...schema.definitions,
     };
   });
 
@@ -85,7 +101,12 @@ export class BuilderContext {
     };
   } = {};
 
-  addProviderInfo(contractName: string, type: string, classname: string, filename: string): void {
+  addProviderInfo(
+    contractName: string,
+    type: string,
+    classname: string,
+    filename: string
+  ): void {
     if (!this.providers[contractName]) {
       this.providers[contractName] = {};
     }
@@ -93,14 +114,14 @@ export class BuilderContext {
     this.providers[contractName][type] = {
       classname,
       filename,
-      basename: basename(filename, extname(filename))
+      basename: basename(filename, extname(filename)),
     };
   }
   getProviderInfos(): {
     [key: string]: {
       [key: string]: ProviderInfo;
     };
-    } {
+  } {
     return this.providers;
   }
 }
@@ -110,7 +131,9 @@ export class BuilderContext {
  * only mergeDefaultOpt needs to implementing for combine options and default options.
  * @param TOpt option type
  */
-export abstract class RenderContextBase<TOpt = RenderOptions> implements IRenderContext<TOpt> {
+export abstract class RenderContextBase<TOpt = RenderOptions>
+  implements IRenderContext<TOpt>
+{
   builderContext: BuilderContext;
   contract: ContractInfo;
   utils: Record<string, boolean> = {};
@@ -138,23 +161,36 @@ export abstract class RenderContextBase<TOpt = RenderOptions> implements IRender
   addUtil(util: string): void {
     this.utils[util] = true;
   }
-  addProviderInfo(contractName: string, type: string, classname: string, filename: string): void {
-    this.builderContext.addProviderInfo(contractName, type, classname, filename);
+  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): (t.ImportNamespaceSpecifier | t.ImportDeclaration | t.ImportDefaultSpecifier)[] {
+  getImports(
+    registeredUtils?: UtilMapping,
+    filepath?: string
+  ): (
+    | t.ImportNamespaceSpecifier
+    | t.ImportDeclaration
+    | t.ImportDefaultSpecifier
+  )[] {
     return getImportStatements(
-      convertUtilsToImportList(
-        this,
-        Object.keys(this.utils),
-        registeredUtils,
-      ),
+      convertUtilsToImportList(this, Object.keys(this.utils), registeredUtils),
       filepath
     );
   }
diff --git a/packages/ast/src/context/imports.ts b/packages/ast/src/context/imports.ts
index 6104a381..3459c391 100644
--- a/packages/ast/src/context/imports.ts
+++ b/packages/ast/src/context/imports.ts
@@ -21,19 +21,19 @@ export type UtilMapping = {
 const makeReactQuerySwitch = (varName: string) => {
   return (context: RenderContext) => {
     switch (context.options.reactQuery.version) {
-    case 'v4':
-      return {
-        type: 'import',
-        path: '@tanstack/react-query',
-        name: varName,
-      };
-    case 'v3':
-    default:
-      return {
-        type: 'import',
-        path: 'react-query',
-        name: varName,
-      };
+      case 'v4':
+        return {
+          type: 'import',
+          path: '@tanstack/react-query',
+          name: varName,
+        };
+      case 'v3':
+      default:
+        return {
+          type: 'import',
+          path: 'react-query',
+          name: varName,
+        };
     }
   };
 };
diff --git a/packages/ast/src/context/index.ts b/packages/ast/src/context/index.ts
index 49ca3de6..6a003172 100644
--- a/packages/ast/src/context/index.ts
+++ b/packages/ast/src/context/index.ts
@@ -1,2 +1,2 @@
 export * from './context';
-export * from './imports';
\ No newline at end of file
+export * from './imports';
diff --git a/packages/ast/src/message-builder/message-builder.ts b/packages/ast/src/message-builder/message-builder.ts
index 152e85be..2fbd3f19 100644
--- a/packages/ast/src/message-builder/message-builder.ts
+++ b/packages/ast/src/message-builder/message-builder.ts
@@ -5,7 +5,11 @@ import { camel } from 'case';
 
 import { getWasmMethodArgs } from '../client/client';
 import { RenderContext } from '../context';
-import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
+import {
+  abstractClassDeclaration,
+  arrowFunctionExpression,
+  getMessageProperties,
+} from '../utils';
 import { createTypedObjectParams } from '../utils/types';
 
 export const createMessageBuilderClass = (
@@ -33,19 +37,20 @@ function createExtractTypeAnnotation(underscoreName: string, msgTitle: string) {
       t.identifier('CamelCasedProperties'),
       t.tsTypeParameterInstantiation([
         t.tsIndexedAccessType(
-          t.tsTypeReference(t.identifier('Extract'),
+          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))
-        )
+        ),
       ])
     )
   );
@@ -72,10 +77,12 @@ const createStaticExecMethodMessageBuilder = (
   if (param?.type === 'Identifier') {
     actionValue = t.identifier(param.name);
   } else {
-    actionValue = t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const')));
+    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
   if (
@@ -83,7 +90,10 @@ const createStaticExecMethodMessageBuilder = (
     param.typeAnnotation.type === 'TSTypeAnnotation' &&
     param.typeAnnotation.typeAnnotation.type === 'TSTypeLiteral'
   ) {
-    param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+    param.typeAnnotation = createExtractTypeAnnotation(
+      underscoreName,
+      msgTitle
+    );
   }
 
   return t.classProperty(
@@ -92,20 +102,17 @@ const createStaticExecMethodMessageBuilder = (
       // params
       param
         ? [
-          // props
-          param
-        ]
+            // props
+            param,
+          ]
         : [],
       // body
       t.blockStatement([
         t.returnStatement(
           t.objectExpression([
-            t.objectProperty(
-              t.identifier(underscoreName),
-              actionValue
-            )
+            t.objectProperty(t.identifier(underscoreName), actionValue),
           ])
-        )
+        ),
       ]),
       // return type
       t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))),
diff --git a/packages/ast/src/message-composer/index.ts b/packages/ast/src/message-composer/index.ts
index d3c9f7e9..cd64f6f4 100644
--- a/packages/ast/src/message-composer/index.ts
+++ b/packages/ast/src/message-composer/index.ts
@@ -1 +1 @@
-export * from './message-composer';
\ No newline at end of file
+export * from './message-composer';
diff --git a/packages/ast/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
index 21b750f6..6e63fe95 100644
--- a/packages/ast/src/message-composer/message-composer.ts
+++ b/packages/ast/src/message-composer/message-composer.ts
@@ -12,7 +12,7 @@ import {
   classProperty,
   getMessageProperties,
   OPTIONAL_FUNDS_PARAM,
-  typedIdentifier
+  typedIdentifier,
 } from '../utils';
 import { createTypedObjectParams } from '../utils/types';
 
@@ -51,10 +51,10 @@ const createWasmExecMethodMessageComposer = (
     arrowFunctionExpression(
       param
         ? [
-          // props
-          param,
-          ...constantParams
-        ]
+            // props
+            param,
+            ...constantParams,
+          ]
         : constantParams,
       t.blockStatement([
         t.returnStatement(
@@ -99,22 +99,22 @@ const createWasmExecMethodMessageComposer = (
                               t.objectProperty(
                                 t.identifier(underscoreName),
                                 actionValue
-                              )
-                            ])
+                              ),
+                            ]),
                           ]
-                        )
+                        ),
                       ])
                     ),
                     t.objectProperty(
                       t.identifier('funds'),
                       t.identifier('funds_')
-                    )
-                  ])
+                    ),
+                  ]),
                 ]
               )
-            )
+            ),
           ])
-        )
+        ),
       ]),
       // return type
       t.tsTypeAnnotation(
@@ -143,23 +143,28 @@ export const createMessageComposerClass = (
 
   const blockStmt = [];
 
-  blockStmt.push(...[
-    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
-  ]);
+  blockStmt.push(
+    ...[
+      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(
@@ -183,11 +188,11 @@ export const createMessageComposerClass = (
             typedIdentifier(
               'contractAddress',
               t.tsTypeAnnotation(t.tsStringKeyword())
-            )
+            ),
           ],
           t.blockStatement(blockStmt)
         ),
-        ...methods
+        ...methods,
       ],
       [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))],
       null
@@ -231,7 +236,7 @@ export const createMessageComposerInterface = (
           t.tsTypeAnnotation(t.tsStringKeyword())
         ),
 
-        ...methods
+        ...methods,
       ])
     )
   );
@@ -250,7 +255,7 @@ const createPropertyFunctionWithObjectParamsForMessageComposer = (
     typeAnnotation: t.tsTypeAnnotation(
       t.tsTypeReference(t.identifier(responseType))
     ),
-    parameters: obj ? [obj, ...fixedParams] : fixedParams
+    parameters: obj ? [obj, ...fixedParams] : fixedParams,
   };
 
   return t.tSPropertySignature(
diff --git a/packages/ast/src/provider/index.ts b/packages/ast/src/provider/index.ts
index 0a8c7e17..03be03e5 100644
--- a/packages/ast/src/provider/index.ts
+++ b/packages/ast/src/provider/index.ts
@@ -1 +1 @@
-export * from './provider';
\ No newline at end of file
+export * from './provider';
diff --git a/packages/ast/src/provider/provider.ts b/packages/ast/src/provider/provider.ts
index 13d03bac..91c51b71 100644
--- a/packages/ast/src/provider/provider.ts
+++ b/packages/ast/src/provider/provider.ts
@@ -64,7 +64,7 @@ export const createProvider = (
               t.identifier(
                 providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
                   ? providerInfos[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE]
-                    .classname
+                      .classname
                   : 'undefined'
               ),
             ])
@@ -223,11 +223,15 @@ export const createGettingProviders = (providerInfos: {
             ),
             identifier(
               'cosmWasmClient?',
-              t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))
+              t.tsTypeAnnotation(
+                t.tsTypeReference(t.identifier('CosmWasmClient'))
+              )
             ),
             identifier(
               'signingCosmWasmClient?',
-              t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))
+              t.tsTypeAnnotation(
+                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+              )
             ),
           ],
           t.objectExpression(properties)
diff --git a/packages/ast/src/react-query/index.ts b/packages/ast/src/react-query/index.ts
index 0dd2cb57..82818ecb 100644
--- a/packages/ast/src/react-query/index.ts
+++ b/packages/ast/src/react-query/index.ts
@@ -1 +1 @@
-export * from './react-query';
\ No newline at end of file
+export * from './react-query';
diff --git a/packages/ast/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
index f8cdc540..cd6588a5 100644
--- a/packages/ast/src/react-query/react-query.ts
+++ b/packages/ast/src/react-query/react-query.ts
@@ -13,19 +13,16 @@ import {
   identifier,
   OPTIONAL_FUNDS_PARAM,
   tsObjectPattern,
-  tsPropertySignature
+  tsPropertySignature,
 } from '../utils';
 import {
   omitTypeReference,
   optionalConditionalExpression,
   propertySignature,
-  shorthandProperty
+  shorthandProperty,
 } from '../utils/babel';
 import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
-import {
-  getPropertyType,
-  getResponseType
-} from '../utils/types';
+import { getPropertyType, getResponseType } from '../utils/types';
 
 interface ReactQueryHookQuery {
   context: RenderContext;
@@ -60,7 +57,7 @@ export const createReactQueryHooks = ({
   context,
   queryMsg,
   contractName,
-  QueryClient
+  QueryClient,
 }: ReactQueryHooks) => {
   const options = context.options.reactQuery;
 
@@ -78,7 +75,7 @@ export const createReactQueryHooks = ({
         context,
         queryKeysName,
         camelContractName: camel(contractName),
-        underscoreNames
+        underscoreNames,
       })
     );
   }
@@ -108,7 +105,7 @@ export const createReactQueryHooks = ({
         hookName,
         responseType,
         getterKey,
-        jsonschema
+        jsonschema,
       };
     }
   );
@@ -120,7 +117,7 @@ export const createReactQueryHooks = ({
         context,
         queryFactoryName,
         queryKeysName,
-        queryMsgs
+        queryMsgs,
       })
     );
   }
@@ -129,7 +126,7 @@ export const createReactQueryHooks = ({
     createReactQueryHookGenericInterface({
       context,
       QueryClient,
-      genericQueryInterfaceName
+      genericQueryInterfaceName,
     })
   );
 
@@ -143,7 +140,7 @@ export const createReactQueryHooks = ({
           hookName,
           responseType,
           getterKey,
-          jsonschema
+          jsonschema,
         }
       ) => {
         return [
@@ -153,7 +150,7 @@ export const createReactQueryHooks = ({
             responseType,
             queryInterfaceName: genericQueryInterfaceName,
             QueryClient,
-            jsonschema
+            jsonschema,
           }),
           createReactQueryHook({
             context,
@@ -163,9 +160,9 @@ export const createReactQueryHooks = ({
             queryKeysName,
             responseType,
             hookKeyName: getterKey,
-            jsonschema
+            jsonschema,
           }),
-          ...m
+          ...m,
         ];
       },
       []
@@ -190,8 +187,8 @@ function buildQueryFn(
             t.identifier(camel(prop)),
             t.memberExpression(t.identifier('args'), t.identifier(camel(prop)))
           );
-        })
-      ])
+        }),
+      ]),
     ];
   }
 
@@ -199,8 +196,8 @@ function buildQueryFn(
     t.memberExpression(t.identifier('Promise'), t.identifier('reject')),
     [
       t.newExpression(t.identifier('Error'), [
-        t.stringLiteral('Invalid client')
-      ])
+        t.stringLiteral('Invalid client'),
+      ]),
     ]
   );
 
@@ -245,36 +242,36 @@ const ENABLED_QUERY_OPTION = t.objectProperty(
 function buildQueryOptions(options: ReactQueryOptions) {
   return options.optionalClient
     ? t.objectExpression([
-      t.spreadElement(t.identifier('options')),
-      t.objectProperty(
-        t.identifier('enabled'),
-        t.logicalExpression(
-          '&&',
-          t.unaryExpression(
-            '!',
-            t.unaryExpression('!', t.identifier('client'))
-          ),
-          t.conditionalExpression(
-            // explicitly check for undefined
-            t.binaryExpression(
-              '!=',
-              t.optionalMemberExpression(
+        t.spreadElement(t.identifier('options')),
+        t.objectProperty(
+          t.identifier('enabled'),
+          t.logicalExpression(
+            '&&',
+            t.unaryExpression(
+              '!',
+              t.unaryExpression('!', t.identifier('client'))
+            ),
+            t.conditionalExpression(
+              // explicitly check for undefined
+              t.binaryExpression(
+                '!=',
+                t.optionalMemberExpression(
+                  t.identifier('options'),
+                  t.identifier('enabled'),
+                  false,
+                  true
+                ),
+                t.identifier('undefined')
+              ),
+              t.memberExpression(
                 t.identifier('options'),
-                t.identifier('enabled'),
-                false,
-                true
+                t.identifier('enabled')
               ),
-              t.identifier('undefined')
-            ),
-            t.memberExpression(
-              t.identifier('options'),
-              t.identifier('enabled')
-            ),
-            t.booleanLiteral(true)
+              t.booleanLiteral(true)
+            )
           )
-        )
-      )
-    ])
+        ),
+      ])
     : t.identifier('options');
 }
 
@@ -286,7 +283,7 @@ export const createReactQueryHook = ({
   hookKeyName,
   queryKeysName,
   methodName,
-  jsonschema
+  jsonschema,
 }: ReactQueryHookQuery) => {
   context.addUtil('useQuery');
   context.addUtil('UseQueryOptions');
@@ -313,17 +310,17 @@ export const createReactQueryHook = ({
               false,
               true
             );
-          })
+          }),
         ],
         t.tsTypeAnnotation(
           t.tsTypeReference(
             t.identifier(hookParamsTypeName),
             t.tsTypeParameterInstantiation([
-              t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
+              t.tsTypeReference(t.identifier(selectResponseGenericTypeName)),
             ])
           )
         )
-      )
+      ),
     ],
     t.blockStatement([
       t.returnStatement(
@@ -335,18 +332,18 @@ export const createReactQueryHook = ({
               queryKeysName,
               methodName,
               props,
-              options
+              options,
             }),
             buildQueryFn(methodName, jsonschema, options),
-            buildQueryOptions(options)
+            buildQueryOptions(options),
           ],
           t.tsTypeParameterInstantiation([
             t.tsTypeReference(t.identifier(responseType)),
             t.tsTypeReference(t.identifier('Error')),
-            t.tsTypeReference(t.identifier(selectResponseGenericTypeName))
+            t.tsTypeReference(t.identifier(selectResponseGenericTypeName)),
           ])
         )
-      )
+      ),
     ])
   );
 
@@ -356,7 +353,7 @@ export const createReactQueryHook = ({
       undefined,
       t.tSTypeReference(t.identifier(responseType)),
       selectResponseGenericTypeName
-    )
+    ),
   ]);
 
   return t.exportNamedDeclaration(queryFunctionDeclaration);
@@ -392,7 +389,7 @@ export const createReactQueryMutationArgsInterface = ({
   ExecuteClient,
   mutationHookParamsTypeName,
   useMutationTypeParameter,
-  jsonschema
+  jsonschema,
 }: ReactQueryMutationHookInterface) => {
   const typedUseMutationOptions = t.tsTypeReference(
     t.identifier('UseMutationOptions'),
@@ -404,7 +401,7 @@ export const createReactQueryMutationArgsInterface = ({
       t.identifier('client'),
       t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))),
       false
-    )
+    ),
   ];
 
   const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation;
@@ -427,9 +424,21 @@ export const createReactQueryMutationArgsInterface = ({
     t.tsTypeAnnotation(
       // @ts-ignore:next-line
       t.tsTypeLiteral([
-        propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation as t.TSTypeAnnotation, true),
-        propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation as t.TSTypeAnnotation, true),
-        propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation as t.TSTypeAnnotation, true)
+        propertySignature(
+          'fee',
+          OPTIONAL_FEE_PARAM.typeAnnotation as t.TSTypeAnnotation,
+          true
+        ),
+        propertySignature(
+          'memo',
+          OPTIONAL_MEMO_PARAM.typeAnnotation as t.TSTypeAnnotation,
+          true
+        ),
+        propertySignature(
+          'funds',
+          OPTIONAL_FUNDS_PARAM.typeAnnotation as t.TSTypeAnnotation,
+          true
+        ),
       ])
     )
   );
@@ -459,7 +468,7 @@ export const createReactQueryMutationHooks = ({
   context,
   execMsg,
   contractName,
-  ExecuteClient
+  ExecuteClient,
 }: ReactQueryMutationHooks) => {
   // merge the user options with the defaults
   return getMessageProperties(execMsg).reduce((m, schema) => {
@@ -493,7 +502,7 @@ export const createReactQueryMutationHooks = ({
         mutationHookParamsTypeName,
         ExecuteClient,
         jsonschema,
-        useMutationTypeParameter
+        useMutationTypeParameter,
       }),
       createReactQueryMutationHook({
         context,
@@ -501,9 +510,9 @@ export const createReactQueryMutationHooks = ({
         mutationHookName,
         mutationHookParamsTypeName,
         hasMsg,
-        useMutationTypeParameter
+        useMutationTypeParameter,
       }),
-      ...m
+      ...m,
     ];
   }, []);
 };
@@ -523,7 +532,7 @@ const generateMutationTypeParameter = (
     // Error
     t.tsTypeReference(t.identifier('Error')),
     // Variables
-    t.tsTypeReference(t.identifier(mutationHookParamsTypeName))
+    t.tsTypeReference(t.identifier(mutationHookParamsTypeName)),
   ]);
 };
 
@@ -553,7 +562,7 @@ export const createReactQueryMutationHook = ({
   mutationHookParamsTypeName,
   execMethodName,
   useMutationTypeParameter,
-  hasMsg
+  hasMsg,
 }: ReactQueryMutationHook) => {
   context.addUtil('useMutation');
   context.addUtil('UseMutationOptions');
@@ -567,7 +576,7 @@ export const createReactQueryMutationHook = ({
         t.objectPattern([
           shorthandProperty('fee'),
           shorthandProperty('memo'),
-          shorthandProperty('funds')
+          shorthandProperty('funds'),
         ]),
         t.objectExpression([])
       )
@@ -590,7 +599,7 @@ export const createReactQueryMutationHook = ({
             )
           ),
           true
-        )
+        ),
       ],
       t.blockStatement([
         t.returnStatement(
@@ -607,16 +616,16 @@ export const createReactQueryMutationHook = ({
                   (hasMsg ? [t.identifier('msg')] : []).concat([
                     t.identifier('fee'),
                     t.identifier('memo'),
-                    t.identifier('funds')
+                    t.identifier('funds'),
                   ])
                 ),
                 false // not async
               ),
-              t.identifier('options')
+              t.identifier('options'),
             ],
             useMutationTypeParameter
           )
-        )
+        ),
       ])
     )
   );
@@ -626,7 +635,7 @@ function createReactQueryKeys({
   context,
   queryKeysName,
   camelContractName,
-  underscoreNames
+  underscoreNames,
 }: {
   context: RenderContext;
   queryKeysName: string;
@@ -655,8 +664,8 @@ function createReactQueryKeys({
                   t.objectProperty(
                     t.identifier('contract'),
                     t.stringLiteral(camelContractName)
-                  )
-                ])
+                  ),
+                ]),
               ]),
               t.tSTypeReference(t.identifier('const'))
             )
@@ -683,8 +692,8 @@ function createReactQueryKeys({
                     t.objectProperty(
                       t.identifier('address'),
                       t.identifier('contractAddress')
-                    )
-                  ])
+                    ),
+                  ]),
                 ]),
                 t.tSTypeReference(t.identifier('const'))
               )
@@ -706,12 +715,12 @@ function createReactQueryKeys({
                         t.identifier('Record'),
                         t.tsTypeParameterInstantiation([
                           t.tsStringKeyword(),
-                          t.tsUnknownKeyword()
+                          t.tsUnknownKeyword(),
                         ])
                       )
                     ),
                     true // optional
-                  )
+                  ),
                 ],
                 t.tSAsExpression(
                   t.arrayExpression([
@@ -736,16 +745,16 @@ function createReactQueryKeys({
                         t.stringLiteral(underscoreMethodName)
                       ),
                       // args
-                      shorthandProperty('args')
-                    ])
+                      shorthandProperty('args'),
+                    ]),
                   ]),
                   t.tSTypeReference(t.identifier('const'))
                 )
               )
             )
-          )
+          ),
         ])
-      )
+      ),
     ])
   );
 }
@@ -754,7 +763,7 @@ function createReactQueryFactory({
   context,
   queryFactoryName,
   queryKeysName,
-  queryMsgs
+  queryMsgs,
 }: {
   context: RenderContext;
   queryFactoryName: string;
@@ -779,7 +788,7 @@ function createReactQueryFactory({
                     [
                       shorthandProperty('client'),
                       ...(hasArgs ? [shorthandProperty('args')] : []),
-                      shorthandProperty('options')
+                      shorthandProperty('options'),
                     ],
                     t.tsTypeAnnotation(
                       t.tsTypeReference(
@@ -787,11 +796,11 @@ function createReactQueryFactory({
                         t.tsTypeParameterInstantiation([
                           t.tsTypeReference(
                             t.identifier(GENERIC_SELECT_RESPONSE_NAME)
-                          )
+                          ),
                         ])
                       )
                     )
-                  )
+                  ),
                 ],
                 t.objectExpression([
                   // 1: queryKey
@@ -809,7 +818,7 @@ function createReactQueryFactory({
                           false,
                           true
                         ),
-                        ...(hasArgs ? [t.identifier('args')] : [])
+                        ...(hasArgs ? [t.identifier('args')] : []),
                       ]
                     )
                   ),
@@ -821,7 +830,7 @@ function createReactQueryFactory({
                   // 3: spread options
                   t.spreadElement(t.identifier('options')),
                   // 4. enabled
-                  ENABLED_QUERY_OPTION
+                  ENABLED_QUERY_OPTION,
                 ])
               );
 
@@ -831,7 +840,7 @@ function createReactQueryFactory({
                     undefined,
                     t.tsTypeReference(t.identifier(responseType)),
                     GENERIC_SELECT_RESPONSE_NAME
-                  )
+                  ),
                 ]);
 
               methodQueryOptionsFn.returnType = t.tsTypeAnnotation(
@@ -842,7 +851,7 @@ function createReactQueryFactory({
                     t.tsTypeReference(t.identifier('Error')),
                     t.tsTypeReference(
                       t.identifier(GENERIC_SELECT_RESPONSE_NAME)
-                    )
+                    ),
                   ])
                 )
               );
@@ -853,9 +862,9 @@ function createReactQueryFactory({
                 methodQueryOptionsFn
               );
             }
-          )
+          ),
         ])
-      )
+      ),
     ])
   );
 }
@@ -871,7 +880,7 @@ const GENERIC_SELECT_RESPONSE_NAME = 'TData';
 function createReactQueryHookGenericInterface({
   context,
   QueryClient,
-  genericQueryInterfaceName
+  genericQueryInterfaceName,
 }: ReactQueryHookGenericInterface) {
   const options = context.options.reactQuery;
   const genericResponseTypeName = 'TResponse';
@@ -884,7 +893,7 @@ function createReactQueryHookGenericInterface({
     t.tsTypeParameterInstantiation([
       t.tsTypeReference(t.identifier(genericResponseTypeName)),
       t.tsTypeReference(t.identifier('Error')),
-      t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
+      t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME)),
     ])
   );
 
@@ -894,9 +903,9 @@ function createReactQueryHookGenericInterface({
       t.tsTypeAnnotation(
         options.optionalClient
           ? t.tsUnionType([
-            t.tsTypeReference(t.identifier(QueryClient)),
-            t.tsUndefinedKeyword()
-          ])
+              t.tsTypeReference(t.identifier(QueryClient)),
+              t.tsUndefinedKeyword(),
+            ])
           : t.tsTypeReference(t.identifier(QueryClient))
       ),
       false
@@ -906,21 +915,21 @@ function createReactQueryHookGenericInterface({
       t.tsTypeAnnotation(
         options.version === 'v4'
           ? t.tSIntersectionType([
-            omitTypeReference(
-              typedUseQueryOptions,
-              "'queryKey' | 'queryFn' | 'initialData'"
-            ),
-            t.tSTypeLiteral([
-              t.tsPropertySignature(
-                t.identifier('initialData?'),
-                t.tsTypeAnnotation(t.tsUndefinedKeyword())
-              )
+              omitTypeReference(
+                typedUseQueryOptions,
+                "'queryKey' | 'queryFn' | 'initialData'"
+              ),
+              t.tSTypeLiteral([
+                t.tsPropertySignature(
+                  t.identifier('initialData?'),
+                  t.tsTypeAnnotation(t.tsUndefinedKeyword())
+                ),
+              ]),
             ])
-          ])
           : typedUseQueryOptions
       ),
       true
-    )
+    ),
   ];
 
   return t.exportNamedDeclaration(
@@ -934,7 +943,7 @@ function createReactQueryHookGenericInterface({
           undefined,
           t.tSTypeReference(t.identifier(genericResponseTypeName)),
           GENERIC_SELECT_RESPONSE_NAME
-        )
+        ),
       ]),
       [],
       t.tSInterfaceBody(body)
@@ -957,7 +966,7 @@ export const createReactQueryHookInterface = ({
   hookParamsTypeName,
   queryInterfaceName,
   responseType,
-  jsonschema
+  jsonschema,
 }: ReactQueryHookQueryInterface) => {
   // merge the user options with the defaults
   const options = context.options.reactQuery;
@@ -981,7 +990,7 @@ export const createReactQueryHookInterface = ({
     t.tsInterfaceDeclaration(
       t.identifier(hookParamsTypeName),
       t.tsTypeParameterDeclaration([
-        t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME)
+        t.tSTypeParameter(undefined, undefined, GENERIC_SELECT_RESPONSE_NAME),
       ]),
       [
         t.tSExpressionWithTypeArguments(
@@ -990,9 +999,9 @@ export const createReactQueryHookInterface = ({
             // 1: response
             t.tsTypeReference(t.identifier(responseType)),
             // 2: select generic
-            t.tSTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
+            t.tSTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME)),
           ])
-        )
+        ),
       ],
       t.tsInterfaceBody(body)
     )
@@ -1026,7 +1035,7 @@ const generateUseQueryQueryKey = ({
   queryKeysName,
   methodName,
   props,
-  options
+  options,
 }: GenerateUseQueryQueryKeyParams): t.ArrayExpression | t.CallExpression => {
   const { optionalClient, queryKeys } = options;
 
@@ -1055,7 +1064,7 @@ const generateUseQueryQueryKey = ({
 
   const queryKey: Array<Expression> = [
     t.stringLiteral(hookKeyName),
-    contractAddressExpression
+    contractAddressExpression,
   ];
 
   if (hasArgs) {
diff --git a/packages/ast/src/recoil/index.ts b/packages/ast/src/recoil/index.ts
index d3d8f4df..6a1d327f 100644
--- a/packages/ast/src/recoil/index.ts
+++ b/packages/ast/src/recoil/index.ts
@@ -1 +1 @@
-export * from './recoil';
\ No newline at end of file
+export * from './recoil';
diff --git a/packages/ast/src/recoil/recoil.ts b/packages/ast/src/recoil/recoil.ts
index 49c9c012..bcd5d5da 100644
--- a/packages/ast/src/recoil/recoil.ts
+++ b/packages/ast/src/recoil/recoil.ts
@@ -6,7 +6,7 @@ import { RenderContext } from '../context';
 import {
   callExpression,
   getMessageProperties,
-  getResponseType
+  getResponseType,
 } from '../utils';
 
 export const createRecoilSelector = (
@@ -16,143 +16,100 @@ export const createRecoilSelector = (
   methodName: string,
   responseType: string
 ) => {
-
   context.addUtil('selectorFamily');
 
   const selectorName = camel(`${methodName}Selector`);
   const getterKey = camel(`${keyPrefix}${pascal(methodName)}`);
 
   return t.exportNamedDeclaration(
-    t.variableDeclaration(
-      'const',
-      [t.variableDeclarator(
+    t.variableDeclaration('const', [
+      t.variableDeclarator(
         t.identifier(selectorName),
         callExpression(
           t.identifier('selectorFamily'),
           [
-            t.objectExpression(
-              [
-                t.objectProperty(
-                  t.identifier('key'),
-                  t.stringLiteral(getterKey)
-                ),
-                t.objectProperty(
-                  t.identifier('get'),
+            t.objectExpression([
+              t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)),
+              t.objectProperty(
+                t.identifier('get'),
+                t.arrowFunctionExpression(
+                  [
+                    t.objectPattern([
+                      t.objectProperty(
+                        t.identifier('params'),
+                        t.identifier('params'),
+                        false,
+                        true
+                      ),
+                      t.restElement(t.identifier('queryClientParams')),
+                    ]),
+                  ],
                   t.arrowFunctionExpression(
                     [
-                      t.objectPattern(
-                        [
-                          t.objectProperty(
-                            t.identifier('params'),
-                            t.identifier('params'),
-                            false,
-                            true
-                          ),
-                          t.restElement(
-                            t.identifier('queryClientParams')
-                          )
-                        ]
-                      )
+                      t.objectPattern([
+                        t.objectProperty(
+                          t.identifier('get'),
+                          t.identifier('get'),
+                          false,
+                          true
+                        ),
+                      ]),
                     ],
-                    t.arrowFunctionExpression(
-                      [
-                        t.objectPattern(
-                          [
-                            t.objectProperty(
-                              t.identifier('get'),
-                              t.identifier('get'),
-                              false,
-                              true
-                            )
-                          ]
-                        )
-                      ],
-                      t.blockStatement(
-                        [
-                          t.variableDeclaration('const',
-                            [
-                              t.variableDeclarator(
-                                t.identifier('client'),
-                                t.callExpression(
-                                  t.identifier('get'),
-                                  [
-                                    t.callExpression(
-                                      t.identifier('queryClient'),
-                                      [
-                                        t.identifier('queryClientParams')
-                                      ]
-                                    )
-                                  ]
-                                )
-                              )
+                    t.blockStatement([
+                      t.variableDeclaration('const', [
+                        t.variableDeclarator(
+                          t.identifier('client'),
+                          t.callExpression(t.identifier('get'), [
+                            t.callExpression(t.identifier('queryClient'), [
+                              t.identifier('queryClientParams'),
                             ]),
-                          t.returnStatement(
-                            t.awaitExpression(
-                              t.callExpression(
-                                t.memberExpression(
-                                  t.identifier('client'),
-                                  t.identifier(methodName)
-                                ),
-                                [
-                                  t.spreadElement(
-                                    t.identifier('params')
-                                  )
-                                ]
-                              )
-                            )
+                          ])
+                        ),
+                      ]),
+                      t.returnStatement(
+                        t.awaitExpression(
+                          t.callExpression(
+                            t.memberExpression(
+                              t.identifier('client'),
+                              t.identifier(methodName)
+                            ),
+                            [t.spreadElement(t.identifier('params'))]
                           )
-                        ]
+                        )
                       ),
-                      true
-                    )
+                    ]),
+                    true
                   )
                 )
-              ]
-            )
-          ],
-          t.tsTypeParameterInstantiation(
-            [
-              t.tsTypeReference(
-                t.identifier(responseType)
               ),
-              t.tsIntersectionType(
-                [
-                  t.tsTypeReference(
-                    t.identifier('QueryClientParams')
-                  ),
-                  t.tsTypeLiteral(
-                    [
-                      t.tsPropertySignature(
-                        t.identifier('params'),
-                        t.tsTypeAnnotation(
-                          t.tsTypeReference(
-                            t.identifier('Parameters'),
-                            t.tsTypeParameterInstantiation(
-                              [
-                                t.tsIndexedAccessType(
-                                  t.tsTypeReference(
-                                    t.identifier(QueryClient)
-                                  ),
-                                  t.tsLiteralType(
-                                    t.stringLiteral(methodName)
-                                  )
-                                )
-                              ]
-                            )
-                          )
-                        )
-                      )
-                    ]
+            ]),
+          ],
+          t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier(responseType)),
+            t.tsIntersectionType([
+              t.tsTypeReference(t.identifier('QueryClientParams')),
+              t.tsTypeLiteral([
+                t.tsPropertySignature(
+                  t.identifier('params'),
+                  t.tsTypeAnnotation(
+                    t.tsTypeReference(
+                      t.identifier('Parameters'),
+                      t.tsTypeParameterInstantiation([
+                        t.tsIndexedAccessType(
+                          t.tsTypeReference(t.identifier(QueryClient)),
+                          t.tsLiteralType(t.stringLiteral(methodName))
+                        ),
+                      ])
+                    )
                   )
-                ]
-              )
-            ]
-          )
+                ),
+              ]),
+            ]),
+          ])
         )
-      )]
-    )
+      ),
+    ])
   );
-
 };
 
 export const createRecoilSelectors = (
@@ -161,29 +118,26 @@ export const createRecoilSelectors = (
   QueryClient: string,
   queryMsg: QueryMsg
 ): t.ExportNamedDeclaration[] => {
-  return getMessageProperties(queryMsg)
-    .map((schema: JSONSchema) => {
-
-      const underscoreName = Object.keys(schema.properties)[0];
-      const methodName = camel(underscoreName);
-      const responseType = getResponseType(context, underscoreName);
-
-      return createRecoilSelector(
-        context,
-        keyPrefix,
-        QueryClient,
-        methodName,
-        responseType
-      );
-
-    });
+  return getMessageProperties(queryMsg).map((schema: JSONSchema) => {
+    const underscoreName = Object.keys(schema.properties)[0];
+    const methodName = camel(underscoreName);
+    const responseType = getResponseType(context, underscoreName);
+
+    return createRecoilSelector(
+      context,
+      keyPrefix,
+      QueryClient,
+      methodName,
+      responseType
+    );
+  });
 };
 
 export const createRecoilQueryClientType = () => ({
   type: 'TSTypeAliasDeclaration',
   id: {
     type: 'Identifier',
-    name: 'QueryClientParams'
+    name: 'QueryClientParams',
   },
   typeAnnotation: {
     type: 'TSTypeLiteral',
@@ -192,18 +146,18 @@ export const createRecoilQueryClientType = () => ({
         type: 'TSPropertySignature',
         key: {
           type: 'Identifier',
-          name: 'contractAddress'
+          name: 'contractAddress',
         },
         computed: false,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
           typeAnnotation: {
-            type: 'TSStringKeyword'
-          }
-        }
-      }
-    ]
-  }
+            type: 'TSStringKeyword',
+          },
+        },
+      },
+    ],
+  },
 });
 
 export const createRecoilQueryClient = (
@@ -211,98 +165,71 @@ export const createRecoilQueryClient = (
   keyPrefix: string,
   QueryClient: string
 ) => {
-
   context.addUtil('selectorFamily');
 
   const getterKey = camel(`${keyPrefix}${'QueryClient'}`);
 
   return t.exportNamedDeclaration(
-    t.variableDeclaration(
-      'const',
-      [t.variableDeclarator(
+    t.variableDeclaration('const', [
+      t.variableDeclarator(
         t.identifier('queryClient'),
         callExpression(
           t.identifier('selectorFamily'),
           [
-            t.objectExpression(
-              [
-                t.objectProperty(
-                  t.identifier('key'),
-                  t.stringLiteral(getterKey)
-                ),
-                t.objectProperty(
-                  t.identifier('get'),
+            t.objectExpression([
+              t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)),
+              t.objectProperty(
+                t.identifier('get'),
+                t.arrowFunctionExpression(
+                  [
+                    t.objectPattern([
+                      t.objectProperty(
+                        t.identifier('contractAddress'),
+                        t.identifier('contractAddress'),
+                        false,
+                        true
+                      ),
+                    ]),
+                  ],
                   t.arrowFunctionExpression(
                     [
-                      t.objectPattern(
-                        [
-                          t.objectProperty(
-                            t.identifier('contractAddress'),
-                            t.identifier('contractAddress'),
-                            false,
-                            true
-                          )
-                        ]
-                      )
+                      t.objectPattern([
+                        t.objectProperty(
+                          t.identifier('get'),
+                          t.identifier('get'),
+                          false,
+                          true
+                        ),
+                      ]),
                     ],
-                    t.arrowFunctionExpression(
-                      [
-                        t.objectPattern(
-                          [
-                            t.objectProperty(
-                              t.identifier('get'),
-                              t.identifier('get'),
-                              false,
-                              true
-                            )
-                          ]
-                        )
-                      ],
-                      t.blockStatement(
-                        [
-                          t.variableDeclaration('const',
-                            [
-                              t.variableDeclarator(
-                                t.identifier('client'),
-                                t.callExpression(
-                                  t.identifier('get'),
-                                  [
-                                    t.identifier('cosmWasmClient')
-                                  ]
-                                )
-                              )
-                            ]),
-                          t.returnStatement(
-                            t.newExpression(
-                              t.identifier(QueryClient),
-                              [
-                                t.identifier('client'),
-                                t.identifier('contractAddress')
-                              ]
-                            )
-                          )
-                        ]
+                    t.blockStatement([
+                      t.variableDeclaration('const', [
+                        t.variableDeclarator(
+                          t.identifier('client'),
+                          t.callExpression(t.identifier('get'), [
+                            t.identifier('cosmWasmClient'),
+                          ])
+                        ),
+                      ]),
+                      t.returnStatement(
+                        t.newExpression(t.identifier(QueryClient), [
+                          t.identifier('client'),
+                          t.identifier('contractAddress'),
+                        ])
                       ),
-                      false
-                    )
+                    ]),
+                    false
                   )
                 )
-              ]
-            )
-          ],
-          t.tsTypeParameterInstantiation(
-            [
-              t.tsTypeReference(
-                t.identifier(QueryClient)
               ),
-              t.tsTypeReference(
-                t.identifier('QueryClientParams')
-              )
-            ]
-          )
+            ]),
+          ],
+          t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier(QueryClient)),
+            t.tsTypeReference(t.identifier('QueryClientParams')),
+          ])
         )
-      )]
-    )
+      ),
+    ])
   );
-
 };
diff --git a/packages/ast/src/types/context.ts b/packages/ast/src/types/context.ts
index d0e28e1c..9f397ebb 100644
--- a/packages/ast/src/types/context.ts
+++ b/packages/ast/src/types/context.ts
@@ -1,12 +1,20 @@
 import { IDLObject, JSONSchema } from '@cosmwasm/ts-codegen-types';
 
-import { MessageBuilderOptions, MessageComposerOptions, ReactQueryOptions, RecoilOptions, TSClientOptions, TSTypesOptions, UseContractsOptions } from './plugins';
+import {
+  MessageBuilderOptions,
+  MessageComposerOptions,
+  ReactQueryOptions,
+  RecoilOptions,
+  TSClientOptions,
+  TSTypesOptions,
+  UseContractsOptions,
+} from './plugins';
 
 export interface ContractInfo {
   schemas: JSONSchema[];
   responses?: Record<string, JSONSchema>;
   idlObject?: Partial<IDLObject>;
-};
+}
 export interface RenderOptions {
   enabled?: boolean;
   types?: TSTypesOptions;
@@ -19,7 +27,7 @@ export interface RenderOptions {
 }
 
 export interface ProviderInfo {
-  classname: string,
-  filename: string,
-  basename: string,
+  classname: string;
+  filename: string;
+  basename: string;
 }
diff --git a/packages/ast/src/types/index.ts b/packages/ast/src/types/index.ts
index 7fce5bef..9be80aed 100644
--- a/packages/ast/src/types/index.ts
+++ b/packages/ast/src/types/index.ts
@@ -1,2 +1,2 @@
 export * from './context';
-export * from './plugins';
\ No newline at end of file
+export * from './plugins';
diff --git a/packages/ast/src/types/plugins.ts b/packages/ast/src/types/plugins.ts
index ae75606c..c3bafed7 100644
--- a/packages/ast/src/types/plugins.ts
+++ b/packages/ast/src/types/plugins.ts
@@ -4,8 +4,8 @@ export interface ReactQueryOptions {
   version?: 'v3' | 'v4';
   mutations?: boolean;
   camelize?: boolean;
-  queryKeys?: boolean
-  queryFactory?: boolean
+  queryKeys?: boolean;
+  queryFactory?: boolean;
 }
 
 export interface TSClientOptions {
@@ -33,4 +33,4 @@ export interface TSTypesOptions {
 
 export interface UseContractsOptions {
   enabled?: boolean;
-};
+}
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index 852aba63..097eadbe 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -17,11 +17,15 @@ export const propertySignature = (
     key: t.identifier(name),
     kind: 'get',
     typeAnnotation,
-    optional
+    optional,
   };
 };
 
-export const identifier = (name: string, typeAnnotation: t.TSTypeAnnotation, optional: boolean = false): t.Identifier => {
+export const identifier = (
+  name: string,
+  typeAnnotation: t.TSTypeAnnotation,
+  optional: boolean = false
+): t.Identifier => {
   const type = t.identifier(name);
   type.typeAnnotation = typeAnnotation;
   type.optional = optional;
@@ -37,9 +41,13 @@ export const tsTypeOperator = (typeAnnotation: t.TSType, operator: string) => {
 export const getMessageProperties = (msg: JSONSchema): JSONSchema[] => {
   let results: JSONSchema[] = [];
   let objs: JSONSchema[] = [];
-  if (msg.anyOf) { objs = msg.anyOf; }
-  else if (msg.oneOf) { objs = msg.oneOf; }
-  else if (msg.allOf) { objs = msg.allOf; }
+  if (msg.anyOf) {
+    objs = msg.anyOf;
+  } else if (msg.oneOf) {
+    objs = msg.oneOf;
+  } else if (msg.allOf) {
+    objs = msg.allOf;
+  }
 
   for (const obj of objs) {
     if (obj.properties) {
@@ -68,15 +76,11 @@ export const tsPropertySignature = (
   return obj;
 };
 
-
-
 export const tsObjectPattern = (
   properties: (t.RestElement | t.ObjectProperty)[],
   typeAnnotation: t.TSTypeAnnotation
 ) => {
-  const obj = t.objectPattern(
-    properties
-  );
+  const obj = t.objectPattern(properties);
   obj.typeAnnotation = typeAnnotation;
   return obj;
 };
@@ -93,27 +97,25 @@ export const callExpression = (
 
 export const bindMethod = (name: string) => {
   return t.expressionStatement(
-    t.assignmentExpression('=', t.memberExpression(
-      t.thisExpression(),
-      t.identifier(name)
-    ),
-    t.callExpression(
-      t.memberExpression(
+    t.assignmentExpression(
+      '=',
+      t.memberExpression(t.thisExpression(), t.identifier(name)),
+      t.callExpression(
         t.memberExpression(
-          t.thisExpression(),
-          t.identifier(name)
+          t.memberExpression(t.thisExpression(), t.identifier(name)),
+          t.identifier('bind')
         ),
-        t.identifier('bind')
-      ),
-      [
-        t.thisExpression()
-      ]
-    )
+        [t.thisExpression()]
+      )
     )
   );
 };
 
-export const typedIdentifier = (name: string, typeAnnotation: TSTypeAnnotation, optional: boolean = false) => {
+export const typedIdentifier = (
+  name: string,
+  typeAnnotation: TSTypeAnnotation,
+  optional: boolean = false
+) => {
   const type = t.identifier(name);
   type.typeAnnotation = typeAnnotation;
   type.optional = optional;
@@ -124,16 +126,17 @@ export const promiseTypeAnnotation = (name: string): t.TSTypeAnnotation => {
   return t.tsTypeAnnotation(
     t.tsTypeReference(
       t.identifier('Promise'),
-      t.tsTypeParameterInstantiation(
-        [
-          t.tsTypeReference(t.identifier(name))
-        ]
-      )
+      t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(name))])
     )
   );
 };
 
-export const abstractClassDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
+export const abstractClassDeclaration = (
+  name: string,
+  body: any[],
+  implementsExressions: TSExpressionWithTypeArguments[] = [],
+  superClass: t.Identifier = null
+) => {
   const declaration = classDeclaration(
     name,
     body,
@@ -144,7 +147,12 @@ export const abstractClassDeclaration = (name: string, body: any[], implementsEx
   return declaration;
 };
 
-export const classDeclaration = (name: string, body: any[], implementsExressions: TSExpressionWithTypeArguments[] = [], superClass: t.Identifier = null) => {
+export const classDeclaration = (
+  name: string,
+  body: any[],
+  implementsExressions: TSExpressionWithTypeArguments[] = [],
+  superClass: t.Identifier = null
+) => {
   const declaration = t.classDeclaration(
     t.identifier(name),
     superClass,
@@ -156,14 +164,13 @@ export const classDeclaration = (name: string, body: any[], implementsExressions
   return declaration;
 };
 
-
 export const classProperty = (
   name: string,
   typeAnnotation: TSTypeAnnotation = null,
   isReadonly: boolean = false,
   isStatic: boolean = false,
   noImplicitOverride: boolean = false,
-  useDeclareKeyword: boolean = false,
+  useDeclareKeyword: boolean = false
 ) => {
   const prop = t.classProperty(t.identifier(name));
   if (isReadonly) prop.readonly = true;
@@ -185,8 +192,10 @@ export const arrowFunctionExpression = (
   return func;
 };
 
-
-export const recursiveNamespace = (names: string[], moduleBlockBody: any): t.ExportNamedDeclaration[] => {
+export const recursiveNamespace = (
+  names: string[],
+  moduleBlockBody: any
+): t.ExportNamedDeclaration[] => {
   if (!names || !names.length) return moduleBlockBody;
   const name = names.pop();
   const body = [
@@ -195,23 +204,23 @@ export const recursiveNamespace = (names: string[], moduleBlockBody: any): t.Exp
         t.identifier(name),
         t.tsModuleBlock(recursiveNamespace(names, moduleBlockBody))
       )
-    )
+    ),
   ];
   return body;
 };
 
 export const arrayTypeNDimensions = (body: any, n: number): t.TSArrayType => {
   if (!n) return t.tsArrayType(body);
-  return t.tsArrayType(
-    arrayTypeNDimensions(body, n - 1)
-  );
+  return t.tsArrayType(arrayTypeNDimensions(body, n - 1));
 };
 
 export const FieldTypeAsts = {
   string: () => {
     return t.tsStringKeyword();
   },
-  array: (type: 'string' | 'Duration' | 'Height' | 'Coin' | 'Long'): t.TSArrayType => {
+  array: (
+    type: 'string' | 'Duration' | 'Height' | 'Coin' | 'Long'
+  ): t.TSArrayType => {
     const result = FieldTypeAsts[type]();
     return t.tsArrayType(result);
   },
@@ -226,27 +235,32 @@ export const FieldTypeAsts = {
   },
   Long: () => {
     return t.tsTypeReference(t.identifier('Long'));
-  }
+  },
 };
 
 export const shorthandProperty = (prop: string): t.ObjectProperty => {
   return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
 };
 
-export const importStmt = (names: string[], path: string): t.ImportDeclaration => {
+export const importStmt = (
+  names: string[],
+  path: string
+): t.ImportDeclaration => {
   return t.importDeclaration(
-    names.map(name => t.importSpecifier(t.identifier(name), t.identifier(name))),
-    t.stringLiteral(path));
+    names.map((name) =>
+      t.importSpecifier(t.identifier(name), t.identifier(name))
+    ),
+    t.stringLiteral(path)
+  );
 };
 
-export const importAs = (name: string, importAs: string, importPath: string): t.ImportDeclaration => {
+export const importAs = (
+  name: string,
+  importAs: string,
+  importPath: string
+): t.ImportDeclaration => {
   return t.importDeclaration(
-    [
-      t.importSpecifier(
-        t.identifier(importAs),
-        t.identifier(name)
-      )
-    ],
+    [t.importSpecifier(t.identifier(importAs), t.identifier(name))],
     t.stringLiteral(importPath)
   );
 };
@@ -266,20 +280,19 @@ export const getFieldDimensionality = (field: Field) => {
   return {
     typeName,
     dimensions,
-    isArray
+    isArray,
   };
 };
 
-export const memberExpressionOrIdentifier = (names: string[]): t.MemberExpression | t.Identifier => {
+export const memberExpressionOrIdentifier = (
+  names: string[]
+): t.MemberExpression | t.Identifier => {
   if (names.length === 1) {
     return t.identifier(names[0]);
   }
   if (names.length === 2) {
     const [b, a] = names;
-    return t.memberExpression(
-      t.identifier(a),
-      t.identifier(b)
-    );
+    return t.memberExpression(t.identifier(a), t.identifier(b));
   }
   const [name, ...rest] = names;
 
@@ -289,16 +302,15 @@ export const memberExpressionOrIdentifier = (names: string[]): t.MemberExpressio
   );
 };
 
-export const memberExpressionOrIdentifierSnake = (names: string[]): t.MemberExpression | t.Identifier => {
+export const memberExpressionOrIdentifierSnake = (
+  names: string[]
+): t.MemberExpression | t.Identifier => {
   if (names.length === 1) {
     return t.identifier(snake(names[0]));
   }
   if (names.length === 2) {
     const [b, a] = names;
-    return t.memberExpression(
-      t.identifier(snake(a)),
-      t.identifier(snake(b))
-    );
+    return t.memberExpression(t.identifier(snake(a)), t.identifier(snake(b)));
   }
   const [name, ...rest] = names;
 
@@ -311,34 +323,39 @@ export const memberExpressionOrIdentifierSnake = (names: string[]): t.MemberExpr
 /**
  * If optional, return a conditional, otherwise just the expression
  */
-export const optionalConditionalExpression = (test: t.Expression, expression: t.Expression, alternate: t.Expression, optional: boolean = false): t.Expression => {
+export const optionalConditionalExpression = (
+  test: t.Expression,
+  expression: t.Expression,
+  alternate: t.Expression,
+  optional: boolean = false
+): t.Expression => {
   return optional
-    ? t.conditionalExpression(
-      test,
-      expression,
-      alternate
-    )
+    ? t.conditionalExpression(test, expression, alternate)
     : expression;
 };
 
-export const typeRefOrUnionWithUndefined = (identifier: t.Identifier, optional: boolean = false): t.TSType => {
+export const typeRefOrUnionWithUndefined = (
+  identifier: t.Identifier,
+  optional: boolean = false
+): t.TSType => {
   const typeReference = t.tsTypeReference(identifier);
   return optional
-    ? t.tsUnionType([
-      typeReference,
-      t.tsUndefinedKeyword()
-    ])
+    ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()])
     : typeReference;
 };
 
-export const parameterizedTypeReference = (identifier: string, from: t.TSType, omit: string | Array<string>) => {
+export const parameterizedTypeReference = (
+  identifier: string,
+  from: t.TSType,
+  omit: string | Array<string>
+) => {
   return t.tsTypeReference(
     t.identifier(identifier),
     t.tsTypeParameterInstantiation([
       from,
       typeof omit === 'string'
         ? t.tsLiteralType(t.stringLiteral(omit))
-        : t.tsUnionType(omit.map(o => t.tsLiteralType(t.stringLiteral(o))))
+        : t.tsUnionType(omit.map((o) => t.tsLiteralType(t.stringLiteral(o)))),
     ])
   );
 };
@@ -347,11 +364,16 @@ export const parameterizedTypeReference = (identifier: string, from: t.TSType, o
  * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....
  * Omit<Cw4UpdateMembersMutation, 'args'>
  */
-export const omitTypeReference = (from: t.TSType, omit: string | Array<string>) => {
+export const omitTypeReference = (
+  from: t.TSType,
+  omit: string | Array<string>
+) => {
   return parameterizedTypeReference('Omit', from, omit);
 };
 
-
-export const pickTypeReference = (from: t.TSType, pick: string | Array<string>) => {
+export const pickTypeReference = (
+  from: t.TSType,
+  pick: string | Array<string>
+) => {
   return parameterizedTypeReference('Pick', from, pick);
 };
diff --git a/packages/ast/src/utils/constants.ts b/packages/ast/src/utils/constants.ts
index eda1a120..ae428d21 100644
--- a/packages/ast/src/utils/constants.ts
+++ b/packages/ast/src/utils/constants.ts
@@ -13,7 +13,7 @@ export const OPTIONAL_FEE_PARAM = identifier(
     t.tsUnionType([
       t.tsNumberKeyword(),
       t.tsTypeReference(t.identifier('StdFee')),
-      t.tsLiteralType(t.stringLiteral('auto'))
+      t.tsLiteralType(t.stringLiteral('auto')),
     ])
   ),
   true
@@ -27,12 +27,12 @@ export const OPTIONAL_MEMO_PARAM = identifier(
 export const FIXED_EXECUTE_PARAMS = [
   OPTIONAL_FEE_PARAM,
   OPTIONAL_MEMO_PARAM,
-  OPTIONAL_FUNDS_PARAM
+  OPTIONAL_FUNDS_PARAM,
 ];
 
 export const PROVIDER_TYPES = {
   SIGNING_CLIENT_TYPE: 'client',
   QUERY_CLIENT_TYPE: 'queryClient',
-  MESSAGE_COMPOSER_TYPE : 'message-composer',
-  PROVIDER_TYPE : 'provider'
+  MESSAGE_COMPOSER_TYPE: 'message-composer',
+  PROVIDER_TYPE: 'provider',
 };
diff --git a/packages/ast/src/utils/ref.ts b/packages/ast/src/utils/ref.ts
index 0c5306e0..42579151 100644
--- a/packages/ast/src/utils/ref.ts
+++ b/packages/ast/src/utils/ref.ts
@@ -3,4 +3,4 @@ import { JSONSchema } from '@cosmwasm/ts-codegen-types';
 export const refLookup = ($ref: string, schema: JSONSchema): JSONSchema => {
   const refName = $ref.replace('#/definitions/', '');
   return schema.definitions?.[refName];
-};
\ No newline at end of file
+};
diff --git a/packages/ast/src/utils/types.ts b/packages/ast/src/utils/types.ts
index ec7db6d9..f6203a0b 100644
--- a/packages/ast/src/utils/types.ts
+++ b/packages/ast/src/utils/types.ts
@@ -227,18 +227,18 @@ export const getTypeInfo = (context: RenderContext, info: JSONSchema) => {
 
 export const getType = (type: string) => {
   switch (type) {
-  case 'string':
-    return t.tsStringKeyword();
-  case 'boolean':
-    return t.tSBooleanKeyword();
-  case 'integer':
-    return t.tsNumberKeyword();
-  case 'null':
-    return t.tsNullKeyword();
-  case 'number':
-    return t.tsNumberKeyword();
-  default:
-    throw new Error('contact maintainers [unknown type]: ' + type);
+    case 'string':
+      return t.tsStringKeyword();
+    case 'boolean':
+      return t.tSBooleanKeyword();
+    case 'integer':
+      return t.tsNumberKeyword();
+    case 'null':
+      return t.tsNullKeyword();
+    case 'number':
+      return t.tsNumberKeyword();
+    default:
+      throw new Error('contact maintainers [unknown type]: ' + type);
   }
 };
 
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index 71ce0709..f16ad2a3 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -1,6 +1,11 @@
 import generate from '@babel/generator';
 import { RenderOptions } from '@cosmwasm/ts-codegen-ast/types';
-import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
+import {
+  ExecuteMsg,
+  IDLObject,
+  JSONSchema,
+  QueryMsg,
+} from '@cosmwasm/ts-codegen-types';
 import { readFileSync } from 'fs';
 import { sync as glob } from 'glob';
 import { join } from 'path';
@@ -8,15 +13,11 @@ import { join } from 'path';
 import { RenderContext } from '../src/context';
 
 export const expectCode = (ast: any): void => {
-  expect(
-    generate(ast).code
-  ).toMatchSnapshot();
+  expect(generate(ast).code).toMatchSnapshot();
 };
 
 export const printCode = (ast: any): void => {
-  console.log(
-    generate(ast).code
-  );
+  console.log(generate(ast).code);
 };
 
 export const makeContext = (
@@ -24,10 +25,13 @@ export const makeContext = (
   options?: RenderOptions,
   responses?: Record<string, JSONSchema>
 ) => {
-  return new RenderContext({
-    schemas: [schema],
-    responses
-  }, options);
+  return new RenderContext(
+    {
+      schemas: [schema],
+      responses,
+    },
+    options
+  );
 };
 
 interface GlobContractLegacy {
@@ -46,12 +50,14 @@ const globCache: Record<string, GlobContractLegacy[] | GlobContract[]> = {};
 export const globIdlBasedContracts = (p: string): GlobContract[] => {
   if (globCache[p]) return globCache[p] as GlobContract[];
   // @ts-ignore
-  const contracts: GlobContract[] = glob(join(fixtureDir, p, '/*.json')).map(file => {
-    return {
-      name: file.split(join('__fixtures__', p))[1],
-      content: JSON.parse(readFileSync(file, 'utf-8'))
-    };
-  });
+  const contracts: GlobContract[] = glob(join(fixtureDir, p, '/*.json')).map(
+    (file) => {
+      return {
+        name: file.split(join('__fixtures__', p))[1],
+        content: JSON.parse(readFileSync(file, 'utf-8')),
+      };
+    }
+  );
   globCache[p] = contracts;
   return contracts;
 };
@@ -59,10 +65,12 @@ export const globIdlBasedContracts = (p: string): GlobContract[] => {
 export const globLegacyContracts = (p: string): GlobContractLegacy[] => {
   if (globCache[p]) return globCache[p] as GlobContractLegacy[];
   // @ts-ignore
-  const contracts: GlobContractLegacy[] = glob(join(fixtureDir, p, '/*.json')).map(file => {
+  const contracts: GlobContractLegacy[] = glob(
+    join(fixtureDir, p, '/*.json')
+  ).map((file) => {
     return {
       name: file.split(join('__fixtures__', p))[1],
-      content: JSON.parse(readFileSync(file, 'utf-8'))
+      content: JSON.parse(readFileSync(file, 'utf-8')),
     };
   });
   globCache[p] = contracts;
@@ -74,7 +82,7 @@ export const getMsgExecuteLegacyFixture = (
   name: `/${string}.json`
 ): ExecuteMsg => {
   const contracts = globLegacyContracts(p);
-  const contract = contracts.find(a => a.name === name);
+  const contract = contracts.find((a) => a.name === name);
   return contract.content as ExecuteMsg;
 };
 
@@ -83,7 +91,7 @@ export const getMsgQueryLegacyFixture = (
   name: `/${string}.json`
 ): QueryMsg => {
   const contracts = globLegacyContracts(p);
-  const contract = contracts.find(a => a.name === name);
+  const contract = contracts.find((a) => a.name === name);
   return contract.content as QueryMsg;
 };
 
@@ -92,6 +100,6 @@ export const getLegacyFixture = (
   name: `/${string}.json`
 ): JSONSchema => {
   const contracts = globLegacyContracts(p);
-  const contract = contracts.find(a => a.name === name);
+  const contract = contracts.find((a) => a.name === name);
   return contract.content as JSONSchema;
 };
diff --git a/packages/ts-codegen/__tests__/builder.test.ts b/packages/ts-codegen/__tests__/builder.test.ts
index a0ac37b6..bf9b3020 100644
--- a/packages/ts-codegen/__tests__/builder.test.ts
+++ b/packages/ts-codegen/__tests__/builder.test.ts
@@ -8,13 +8,11 @@ it('options undefined', async () => {
   const outPath = OUTPUT_DIR + '/vectis/factory-opt';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const builder = new TSBuilder({
-    contracts: [
-      schemaDir
-    ],
+    contracts: [schemaDir],
     outPath,
-    options: undefined
+    options: undefined,
   });
-    // @ts-ignore
+  // @ts-ignore
   delete builder.contracts;
   // @ts-ignore
   delete builder.outPath;
@@ -25,23 +23,21 @@ it('options tsClient.enabled', async () => {
   const outPath = OUTPUT_DIR + '/vectis/factory-opt';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const builder = new TSBuilder({
-    contracts: [
-      schemaDir
-    ],
+    contracts: [schemaDir],
     outPath,
     options: {
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
-        enabled: true
+        enabled: true,
       },
       reactQuery: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   });
-    // @ts-ignore
+  // @ts-ignore
   delete builder.contracts;
   // @ts-ignore
   delete builder.outPath;
@@ -59,21 +55,21 @@ it('builder invoke', async () => {
       s('/daodao/cw-code-id-registry'),
       {
         name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
+        dir: s('/daodao/cw-proposal-single'),
+      },
     ],
     outPath,
     options: {
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
-        enabled: true
+        enabled: true,
       },
       reactQuery: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   });
   await builder.build();
 });
@@ -89,39 +85,39 @@ it('builder default', async () => {
       s('/daodao/cw-code-id-registry'),
       {
         name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
+        dir: s('/daodao/cw-proposal-single'),
+      },
     ],
     outPath,
     options: {
       bundle: {
         bundleFile: 'index.ts',
-        scope: 'smart.contracts'
+        scope: 'smart.contracts',
       },
       useShorthandCtor: false,
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
         enabled: true,
-        execExtendsQuery: true
+        execExtendsQuery: true,
       },
       reactQuery: {
-        enabled: true
+        enabled: true,
       },
       recoil: {
-        enabled: true
+        enabled: true,
       },
       messageComposer: {
-        enabled: true
+        enabled: true,
       },
       messageBuilder: {
-        enabled: true
+        enabled: true,
       },
       useContractsHook: {
         enabled: true,
-      }
-    }
+      },
+    },
   });
 });
 
@@ -136,35 +132,35 @@ it('builder no extends', async () => {
       s('/daodao/cw-code-id-registry'),
       {
         name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
+        dir: s('/daodao/cw-proposal-single'),
+      },
     ],
     outPath,
     options: {
       bundle: {
         bundleFile: 'index.ts',
-        scope: 'smart.contracts'
+        scope: 'smart.contracts',
       },
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
         enabled: true,
-        execExtendsQuery: false
+        execExtendsQuery: false,
       },
       reactQuery: {
-        enabled: true
+        enabled: true,
       },
       recoil: {
-        enabled: true
+        enabled: true,
       },
       messageComposer: {
-        enabled: true
+        enabled: true,
       },
       messageBuilder: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   });
 });
 
@@ -180,36 +176,35 @@ it('builder set bundler path', async () => {
       s('/daodao/cw-code-id-registry'),
       {
         name: 'CwSingle',
-        dir: s('/daodao/cw-proposal-single')
-      }
+        dir: s('/daodao/cw-proposal-single'),
+      },
     ],
     outPath,
     options: {
       bundle: {
         bundlePath: bundlerPath,
         bundleFile: 'index.ts',
-        scope: 'smart.contracts'
+        scope: 'smart.contracts',
       },
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
         enabled: true,
-        execExtendsQuery: false
+        execExtendsQuery: false,
       },
       reactQuery: {
-        enabled: true
+        enabled: true,
       },
       recoil: {
-        enabled: true
+        enabled: true,
       },
       messageComposer: {
-        enabled: true
+        enabled: true,
       },
       useContractsHook: {
         enabled: true,
-      }
-    }
+      },
+    },
   });
 });
-
diff --git a/packages/ts-codegen/__tests__/bundler.test.ts b/packages/ts-codegen/__tests__/bundler.test.ts
index bb02e3e5..f499c5ed 100644
--- a/packages/ts-codegen/__tests__/bundler.test.ts
+++ b/packages/ts-codegen/__tests__/bundler.test.ts
@@ -2,10 +2,7 @@ import generate from '@babel/generator';
 import * as t from '@babel/types';
 import cases from 'jest-in-case';
 
-import {
-  BundleData,
-  recursiveModuleBundle
-} from '../src/bundler';
+import { BundleData, recursiveModuleBundle } from '../src/bundler';
 
 const preview = (ast: any) => {
   // @ts-ignore
@@ -13,159 +10,163 @@ const preview = (ast: any) => {
 };
 
 interface JestBundleData {
-    name: string;
-    data: BundleData
+  name: string;
+  data: BundleData;
 }
 
-cases(`recursiveModuleBundle`, (opts: JestBundleData) => {
-  expect(preview(recursiveModuleBundle(opts.data))).toMatchSnapshot();
-}, [
-  {
-    name: 'root',
-    data: {
-      osmosis: {
-        __export: true,
-        _0: true
-      },
-      tendermint: {
-        __export: true,
-        _0: true
-      }
-    }
-  },
-  {
-    name: 'single',
-    data: {
-      ics23: {
-        __export: true,
-        _0: true
-      }
-    }
+cases(
+  `recursiveModuleBundle`,
+  (opts: JestBundleData) => {
+    expect(preview(recursiveModuleBundle(opts.data))).toMatchSnapshot();
   },
-  {
-    name: 'tendermint',
-    data: {
-      tendermint: {
-        abci: {
+  [
+    {
+      name: 'root',
+      data: {
+        osmosis: {
           __export: true,
-          _223: true
+          _0: true,
         },
-        crypto: {
+        tendermint: {
           __export: true,
-          _224: true,
-          _225: true
-        },
-        libs: {
-          bits: {
-            __export: true,
-            _226: true
-          }
+          _0: true,
         },
-        p2p: {
-          __export: true,
-          _227: true
-        },
-        types: {
+      },
+    },
+    {
+      name: 'single',
+      data: {
+        ics23: {
           __export: true,
-          _228: true,
-          _229: true,
-          _230: true,
-          _231: true,
-          _232: true
+          _0: true,
         },
-        version: {
-          __export: true,
-          _233: true
-        }
-      }
-    }
-  },
-  {
-    name: 'osmo',
-    data: {
-      osmosis: {
-        claim: {
-          v1beta1: {
+      },
+    },
+    {
+      name: 'tendermint',
+      data: {
+        tendermint: {
+          abci: {
             __export: true,
-            _177: true,
-            _178: true,
-            _179: true,
-            _180: true
-          }
-        },
-        epochs: {
-          v1beta1: {
+            _223: true,
+          },
+          crypto: {
             __export: true,
-            _181: true,
-            _182: true
-          }
-        },
-        gamm: {
-          v1beta1: {
+            _224: true,
+            _225: true,
+          },
+          libs: {
+            bits: {
+              __export: true,
+              _226: true,
+            },
+          },
+          p2p: {
             __export: true,
-            _183: true,
-            _184: true,
-            _185: true,
-            _186: true,
-            _187: true
-          }
-        },
-        incentives: {
-          __export: true,
-          _188: true,
-          _189: true,
-          _190: true,
-          _191: true,
-          _192: true
-        },
-        lockup: {
-          __export: true,
-          _193: true,
-          _194: true,
-          _195: true,
-          _196: true
-        },
-        mint: {
-          v1beta1: {
+            _227: true,
+          },
+          types: {
             __export: true,
-            _197: true,
-            _198: true,
-            _199: true
-          }
-        },
-        poolincentives: {
-          v1beta1: {
+            _228: true,
+            _229: true,
+            _230: true,
+            _231: true,
+            _232: true,
+          },
+          version: {
             __export: true,
-            _200: true,
-            _201: true,
-            _202: true,
-            _203: true
-          }
+            _233: true,
+          },
         },
-        store: {
-          v1beta1: {
+      },
+    },
+    {
+      name: 'osmo',
+      data: {
+        osmosis: {
+          claim: {
+            v1beta1: {
+              __export: true,
+              _177: true,
+              _178: true,
+              _179: true,
+              _180: true,
+            },
+          },
+          epochs: {
+            v1beta1: {
+              __export: true,
+              _181: true,
+              _182: true,
+            },
+          },
+          gamm: {
+            v1beta1: {
+              __export: true,
+              _183: true,
+              _184: true,
+              _185: true,
+              _186: true,
+              _187: true,
+            },
+          },
+          incentives: {
             __export: true,
-            _204: true
-          }
-        },
-        superfluid: {
-          __export: true,
-          _205: true,
-          _206: true,
-          _207: true,
-          _208: true,
-          _209: true
-        },
-        txfees: {
-          v1beta1: {
+            _188: true,
+            _189: true,
+            _190: true,
+            _191: true,
+            _192: true,
+          },
+          lockup: {
             __export: true,
-            _210: true,
-            _211: true,
-            _212: true,
-            _213: true
-          }
-        }
-      }
-    }
-  }
-]);
\ No newline at end of file
+            _193: true,
+            _194: true,
+            _195: true,
+            _196: true,
+          },
+          mint: {
+            v1beta1: {
+              __export: true,
+              _197: true,
+              _198: true,
+              _199: true,
+            },
+          },
+          poolincentives: {
+            v1beta1: {
+              __export: true,
+              _200: true,
+              _201: true,
+              _202: true,
+              _203: true,
+            },
+          },
+          store: {
+            v1beta1: {
+              __export: true,
+              _204: true,
+            },
+          },
+          superfluid: {
+            __export: true,
+            _205: true,
+            _206: true,
+            _207: true,
+            _208: true,
+            _209: true,
+          },
+          txfees: {
+            v1beta1: {
+              __export: true,
+              _210: true,
+              _211: true,
+              _212: true,
+              _213: true,
+            },
+          },
+        },
+      },
+    },
+  ]
+);
diff --git a/packages/ts-codegen/__tests__/cleanse.test.ts b/packages/ts-codegen/__tests__/cleanse.test.ts
index f112b774..f3980c2f 100644
--- a/packages/ts-codegen/__tests__/cleanse.test.ts
+++ b/packages/ts-codegen/__tests__/cleanse.test.ts
@@ -6,7 +6,6 @@ import { readSchemas } from '../src/utils';
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
 
-
 it('sg721', async () => {
   const out = OUTPUT_DIR + '/sg721';
   const schemaDir = FIXTURE_DIR + '/sg721/';
@@ -17,7 +16,6 @@ it('sg721', async () => {
   mkdirp(out);
   writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
   writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
-
 });
 
 it('daodao/cw-code-id-registry', async () => {
@@ -43,4 +41,3 @@ it('issues/103', async () => {
   writeFileSync(out + '/orig.json', JSON.stringify(orig, null, 2));
   writeFileSync(out + '/clean.json', JSON.stringify(clean, null, 2));
 });
-
diff --git a/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts b/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
index 5fdddbd6..b35839b1 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.issue-98.test.ts
@@ -7,21 +7,19 @@ it('issue-98', async () => {
   const schemaDir = FIXTURE_DIR + '/issues/98/';
 
   const builder = new TSBuilder({
-    contracts: [
-      schemaDir
-    ],
+    contracts: [schemaDir],
     outPath,
     options: {
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
-        enabled: true
+        enabled: true,
       },
       reactQuery: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   });
   await builder.build();
-});
\ No newline at end of file
+});
diff --git a/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts b/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
index a4270283..7b2af568 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.issue-long-exe-msg-name.test.ts
@@ -12,18 +12,18 @@ it('issue-long-exe-msg-name', async () => {
     outPath,
     options: {
       messageComposer: {
-        enabled: true
+        enabled: true,
       },
       types: {
-        enabled: true
+        enabled: true,
       },
       client: {
-        enabled: true
+        enabled: true,
       },
       reactQuery: {
-        enabled: true
-      }
-    }
+        enabled: true,
+      },
+    },
   });
   await builder.build();
 });
diff --git a/packages/ts-codegen/__tests__/ts-codegen.test.ts b/packages/ts-codegen/__tests__/ts-codegen.test.ts
index c2f6f05c..656a6b30 100644
--- a/packages/ts-codegen/__tests__/ts-codegen.test.ts
+++ b/packages/ts-codegen/__tests__/ts-codegen.test.ts
@@ -1,7 +1,15 @@
 import { BuilderContext } from '@cosmwasm/ts-codegen-ast';
 
 import { readSchemas } from '../src/utils';
-import { generateClient, generateContractHooks,generateMessageBuilder, generateMessageComposer, generateReactQuery, generateRecoil, generateTypes } from '../test-utils';
+import {
+  generateClient,
+  generateContractHooks,
+  generateMessageBuilder,
+  generateMessageComposer,
+  generateReactQuery,
+  generateRecoil,
+  generateTypes,
+} from '../test-utils';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
@@ -10,16 +18,18 @@ it('optionalClient', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-optional-client';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, {
+    optionalClient: true,
   });
-  await generateReactQuery('Factory', contractInfo, outopt, { optionalClient: true });
 });
 
 it('v4Query', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-v4-query';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4' });
 });
@@ -28,38 +38,47 @@ it('queryKeys', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, {
+    queryKeys: true,
   });
-  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true });
 });
 
 it('queryFactory', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-query-keys';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, {
+    queryKeys: true,
+    queryFactory: true,
   });
-  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, queryFactory: true });
 });
 
-
-
 it('queryKeysOptionalClient', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-query-keys-optional-client';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, {
+    queryKeys: true,
+    optionalClient: true,
   });
-  await generateReactQuery('Factory', contractInfo, outopt, { queryKeys: true, optionalClient: true });
 });
 
 it('useMutations', async () => {
   const outopt = OUTPUT_DIR + '/vectis/factory-w-mutations';
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
+  });
+  await generateReactQuery('Factory', contractInfo, outopt, {
+    version: 'v4',
+    mutations: true,
   });
-  await generateReactQuery('Factory', contractInfo, outopt, { version: 'v4', mutations: true });
 });
 
 it('vectis/factory', async () => {
@@ -67,7 +86,7 @@ it('vectis/factory', async () => {
   const schemaDir = FIXTURE_DIR + '/vectis/factory/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('Factory', contractInfo, out);
   await generateClient('Factory', contractInfo, out);
@@ -81,7 +100,7 @@ it('vectis/govec', async () => {
   const schemaDir = FIXTURE_DIR + '/vectis/govec/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('Govec', contractInfo, out);
   await generateClient('Govec', contractInfo, out);
@@ -95,7 +114,7 @@ it('vectis/proxy', async () => {
   const schemaDir = FIXTURE_DIR + '/vectis/proxy/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('Proxy', contractInfo, out);
   await generateClient('Proxy', contractInfo, out);
@@ -108,7 +127,7 @@ it('minter', async () => {
   const out = OUTPUT_DIR + '/minter';
   const schemaDir = FIXTURE_DIR + '/minter/';
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('Minter', contractInfo, out);
   await generateClient('Minter', contractInfo, out);
@@ -122,7 +141,7 @@ it('sg721', async () => {
   const schemaDir = FIXTURE_DIR + '/sg721/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
 
   const builderContext = new BuilderContext();
@@ -141,7 +160,7 @@ it('cw-named-groups', async () => {
   const schemaDir = FIXTURE_DIR + '/daodao/cw-named-groups/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('CwNamedGroups', contractInfo, out);
   await generateClient('CwNamedGroups', contractInfo, out);
@@ -155,7 +174,7 @@ it('cw-proposal-single', async () => {
   const schemaDir = FIXTURE_DIR + '/daodao/cw-proposal-single/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('CwProposalSingle', contractInfo, out);
   await generateClient('CwProposalSingle', contractInfo, out);
@@ -169,7 +188,7 @@ it('cw-admin-factory', async () => {
   const schemaDir = FIXTURE_DIR + '/daodao/cw-admin-factory/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('CwAdminFactory', contractInfo, out);
   await generateClient('CwAdminFactory', contractInfo, out);
@@ -183,7 +202,7 @@ it('cw-code-id-registry', async () => {
   const schemaDir = FIXTURE_DIR + '/daodao/cw-code-id-registry/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('CwCodeIdRegistry', contractInfo, out);
   await generateClient('CwCodeIdRegistry', contractInfo, out);
@@ -197,7 +216,7 @@ it('idl-version/hackatom', async () => {
   const schemaDir = FIXTURE_DIR + '/idl-version/hackatom/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
   await generateTypes('HackAtom', contractInfo, out);
   await generateClient('HackAtom', contractInfo, out);
@@ -211,7 +230,7 @@ it('idl-version/cyberpunk', async () => {
   const schemaDir = FIXTURE_DIR + '/idl-version/cyberpunk/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
 
   await generateTypes('CyberPunk', contractInfo, out);
@@ -226,7 +245,7 @@ it('idl-version/cw4-group', async () => {
   const schemaDir = FIXTURE_DIR + '/idl-version/cw4-group/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
 
   await generateTypes('Cw4Group', contractInfo, out);
@@ -241,7 +260,7 @@ it('idl-version/cw3-fixed-multisig', async () => {
   const schemaDir = FIXTURE_DIR + '/idl-version/cw3-fixed-multisig/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
 
   await generateTypes('Cw3FixedMultiSig', contractInfo, out);
@@ -256,7 +275,7 @@ it('idl-version/accounts-nft', async () => {
   const schemaDir = FIXTURE_DIR + '/idl-version/accounts-nft/';
 
   const contractInfo = await readSchemas({
-    schemaDir
+    schemaDir,
   });
 
   await generateTypes('AccountsNft', contractInfo, out);
diff --git a/packages/ts-codegen/scripts/cmds.ts b/packages/ts-codegen/scripts/cmds.ts
index baf611fa..28dc2316 100644
--- a/packages/ts-codegen/scripts/cmds.ts
+++ b/packages/ts-codegen/scripts/cmds.ts
@@ -8,7 +8,7 @@ interface PathObj {
   name: string;
   param: string;
   safe: string;
-  path: string
+  path: string;
 }
 const paths: PathObj[] = glob(`${srcDir}/**.[j|t]s`).map((file: string) => {
   const [, name] = file.match(/\/(.*)\.[j|t]s$/);
@@ -19,7 +19,7 @@ const paths: PathObj[] = glob(`${srcDir}/**.[j|t]s`).map((file: string) => {
     path: file
       .replace(srcDir, './commands')
       .replace(/\.js$/, '')
-      .replace(/\.ts$/, '')
+      .replace(/\.ts$/, ''),
   };
 });
 
@@ -33,10 +33,10 @@ const out = `
 ${imports}
 const Commands: any = {};
 ${paths
-    .map((a) => {
-      return `Commands['${a.param}'] = _${a.safe};`;
-    })
-    .join('\n')}
+  .map((a) => {
+    return `Commands['${a.param}'] = _${a.safe};`;
+  })
+  .join('\n')}
 
   export { Commands }; 
 
diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index 32aacbc6..d8c7597d 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -1,6 +1,11 @@
 import generate from '@babel/generator';
 import * as t from '@babel/types';
-import { BuilderContext,ContractInfo, defaultOptions, RenderOptions } from '@cosmwasm/ts-codegen-ast';
+import {
+  BuilderContext,
+  ContractInfo,
+  defaultOptions,
+  RenderOptions,
+} from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import deepmerge from 'deepmerge';
 import { writeFileSync } from 'fs';
@@ -27,49 +32,56 @@ const defaultOpts: TSBuilderOptions = {
   bundle: {
     enabled: true,
     scope: 'contracts',
-    bundleFile: 'bundle.ts'
+    bundleFile: 'bundle.ts',
   },
-  useShorthandCtor: true
+  useShorthandCtor: true,
 };
 
 export interface TSBuilderInput {
-    contracts: Array<ContractFile | string>;
-    outPath: string;
-    options?: TSBuilderOptions;
-    plugins?: IBuilderPlugin[];
-};
+  contracts: Array<ContractFile | string>;
+  outPath: string;
+  options?: TSBuilderOptions;
+  plugins?: IBuilderPlugin[];
+}
 
 export interface BundleOptions {
-    enabled?: boolean;
-    scope?: string;
-    bundleFile?: string;
-    bundlePath?: string;
-};
+  enabled?: boolean;
+  scope?: string;
+  bundleFile?: string;
+  bundlePath?: string;
+}
 
 export type TSBuilderOptions = {
-    bundle?: BundleOptions;
-    /**
-     * Enable using shorthand constructor.
-     * Default: true
-     */
-    useShorthandCtor?: boolean;
+  bundle?: BundleOptions;
+  /**
+   * Enable using shorthand constructor.
+   * Default: true
+   */
+  useShorthandCtor?: boolean;
 } & RenderOptions;
 
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
+export type BuilderFileType =
+  | 'type'
+  | 'client'
+  | 'recoil'
+  | 'react-query'
+  | 'message-composer'
+  | 'message-builder'
+  | 'plugin';
 
 export interface BuilderFile {
-    type: BuilderFileType;
-    pluginType?: string;
-    contract: string;
-    //filename only: Factory.client.ts
-    localname: string;
-    //full path: contracts/Factory.client.ts
-    filename: string;
-};
+  type: BuilderFileType;
+  pluginType?: string;
+  contract: string;
+  //filename only: Factory.client.ts
+  localname: string;
+  //full path: contracts/Factory.client.ts
+  filename: string;
+}
 
 export interface ContractFile {
-    name: string;
-    dir: string;
+  name: string;
+  dir: string;
 }
 
 function getContract(contractOpt: ContractFile | string): ContractFile {
@@ -78,12 +90,12 @@ function getContract(contractOpt: ContractFile | string): ContractFile {
     const contractName = pascal(name);
     return {
       name: contractName,
-      dir: contractOpt
+      dir: contractOpt,
     };
   }
   return {
     name: pascal(contractOpt.name),
-    dir: contractOpt.dir
+    dir: contractOpt.dir,
   };
 }
 
@@ -113,10 +125,7 @@ export class TSBuilder {
     this.contracts = contracts;
     this.outPath = outPath;
     this.options = deepmerge(
-      deepmerge(
-        defaultOptions,
-        defaultOpts
-      ),
+      deepmerge(defaultOptions, defaultOpts),
       options ?? {}
     );
 
@@ -126,7 +135,7 @@ export class TSBuilder {
       this.plugins.push(...plugins);
     }
 
-    this.plugins.forEach(plugin => plugin.setBuilder(this));
+    this.plugins.forEach((plugin) => plugin.setBuilder(this));
   }
 
   async build() {
@@ -140,7 +149,7 @@ export class TSBuilder {
       const contract = getContract(contractOpt);
       //resolve contract schema.
       const contractInfo = await readSchemas({
-        schemaDir: contract.dir
+        schemaDir: contract.dir,
       });
 
       //lifecycle and plugins.
@@ -154,9 +163,7 @@ export class TSBuilder {
     contractInfo?: ContractInfo
   ) {
     const plugins = lifecycle
-      ? this.plugins.filter((p) =>
-        p.lifecycle === lifecycle
-      )
+      ? this.plugins.filter((p) => p.lifecycle === lifecycle)
       : this.plugins;
 
     for (const plugin of plugins) {
@@ -174,12 +181,15 @@ export class TSBuilder {
   private async after() {
     await this.render('after');
 
-    const helpers = createHelpers({
-      outPath: this.outPath,
-      contracts: this.contracts,
-      options: this.options,
-      plugins: this.plugins,
-    }, this.builderContext);
+    const helpers = createHelpers(
+      {
+        outPath: this.outPath,
+        contracts: this.contracts,
+        options: this.options,
+        plugins: this.plugins,
+      },
+      this.builderContext
+    );
 
     if (helpers && helpers.length) {
       this.files.push(...helpers);
@@ -199,9 +209,13 @@ export class TSBuilder {
       bundleFile
     );
     const bundleVariables = {};
-    const importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[] = [];
+    const importPaths: (
+      | t.ImportDeclaration
+      | t.ImportDefaultSpecifier
+      | t.ImportNamespaceSpecifier
+    )[] = [];
 
-    allFiles.forEach(file => {
+    allFiles.forEach((file) => {
       createFileBundle(
         `${this.options.bundle.scope}.${file.contract}`,
         file.filename,
@@ -209,19 +223,17 @@ export class TSBuilder {
         importPaths,
         bundleVariables
       );
-
     });
 
     const ast = recursiveModuleBundle(bundleVariables);
-    const nodes = [
-      ...importPaths,
-      ...ast
-    ];
+    const nodes = [...importPaths, ...ast];
     // @ts-ignore
-    let code = generate(t.program(
-      // @ts-ignore
-      nodes
-    )).code;
+    let code = generate(
+      t.program(
+        // @ts-ignore
+        nodes
+      )
+    ).code;
 
     if (this.options?.bundle?.bundlePath) {
       mkdirp(this.options?.bundle?.bundlePath);
@@ -232,6 +244,5 @@ export class TSBuilder {
     if (code.trim() === '') code = 'export {};';
 
     writeFileSync(bundlePath, header + code);
-
   }
 }
diff --git a/packages/ts-codegen/src/builder/index.ts b/packages/ts-codegen/src/builder/index.ts
index 813cccec..ecea700b 100644
--- a/packages/ts-codegen/src/builder/index.ts
+++ b/packages/ts-codegen/src/builder/index.ts
@@ -1 +1 @@
-export * from './builder';
\ No newline at end of file
+export * from './builder';
diff --git a/packages/ts-codegen/src/bundler/bundler.ts b/packages/ts-codegen/src/bundler/bundler.ts
index 20efb89c..91358be6 100644
--- a/packages/ts-codegen/src/bundler/bundler.ts
+++ b/packages/ts-codegen/src/bundler/bundler.ts
@@ -1,16 +1,16 @@
 import * as t from '@babel/types';
 import nested from 'nested-obj';
-import {
-  dirname, extname,
-  relative} from 'path';
+import { dirname, extname, relative } from 'path';
 
 export interface BundleData {
-    __export?: boolean;
-    [key: string]: boolean | BundleData;
+  __export?: boolean;
+  [key: string]: boolean | BundleData;
 }
 
-export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration[] => {
-  return Object.keys(obj).map(key => {
+export const recursiveModuleBundle = (
+  obj: BundleData
+): t.ExportNamedDeclaration[] => {
+  return Object.keys(obj).map((key) => {
     const value = obj[key];
     if (typeof value === 'object' && value && value.__export) {
       // e.g. abci
@@ -18,21 +18,21 @@ export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration
       // 2. splat ALL _0, parms into abci
       // 3. export that variable
 
-      const nmspc = t.variableDeclaration('const',
-        [t.variableDeclarator(
+      const nmspc = t.variableDeclaration('const', [
+        t.variableDeclarator(
           t.identifier(key),
           t.objectExpression(
             Object.keys(obj[key])
-              .filter(a => a !== '__export')
-              .filter(a => a.startsWith('_'))
-              .map(a => t.spreadElement(t.identifier(a)))
+              .filter((a) => a !== '__export')
+              .filter((a) => a.startsWith('_'))
+              .map((a) => t.spreadElement(t.identifier(a)))
           )
-        )]
-      );
+        ),
+      ]);
 
       const others = Object.keys(obj[key])
-        .filter(a => a !== '__export')
-        .filter(a => !a.startsWith('_'));
+        .filter((a) => a !== '__export')
+        .filter((a) => !a.startsWith('_'));
       if (others.length) {
         throw new Error('namespace and package not supported, yet.');
       }
@@ -54,19 +54,22 @@ export const recursiveModuleBundle = (obj: BundleData): t.ExportNamedDeclaration
   });
 };
 
-export const importNamespace = (ident: string, path: string) => t.importDeclaration(
-  [
-    t.importNamespaceSpecifier(t.identifier(ident))
-  ],
-  t.stringLiteral(path.replace(extname(path), ''))
-);
+export const importNamespace = (ident: string, path: string) =>
+  t.importDeclaration(
+    [t.importNamespaceSpecifier(t.identifier(ident))],
+    t.stringLiteral(path.replace(extname(path), ''))
+  );
 
 let counter = 0;
 export const createFileBundle = (
   pkg: string,
   filename: string,
   bundleFile: string,
-  importPaths: (t.ImportDeclaration | t.ImportDefaultSpecifier | t.ImportNamespaceSpecifier)[],
+  importPaths: (
+    | t.ImportDeclaration
+    | t.ImportDefaultSpecifier
+    | t.ImportNamespaceSpecifier
+  )[],
   bundleVariables: BundleData
 ) => {
   let rel = relative(dirname(bundleFile), filename);
@@ -75,4 +78,4 @@ export const createFileBundle = (
   importPaths.push(importNamespace(variable, rel));
   nested.set(bundleVariables, pkg + '.__export', true);
   nested.set(bundleVariables, pkg + '.' + variable, true);
-};
\ No newline at end of file
+};
diff --git a/packages/ts-codegen/src/bundler/index.ts b/packages/ts-codegen/src/bundler/index.ts
index 6061e08b..86bd4845 100644
--- a/packages/ts-codegen/src/bundler/index.ts
+++ b/packages/ts-codegen/src/bundler/index.ts
@@ -1 +1 @@
-export * from './bundler';
\ No newline at end of file
+export * from './bundler';
diff --git a/packages/ts-codegen/src/cli.ts b/packages/ts-codegen/src/cli.ts
index 71be8ec0..61e2d0a1 100644
--- a/packages/ts-codegen/src/cli.ts
+++ b/packages/ts-codegen/src/cli.ts
@@ -9,8 +9,8 @@ const question = [
     type: 'fuzzy',
     name: 'cmd',
     message: 'what do you want to do?',
-    choices: Object.keys(commands)
-  }
+    choices: Object.keys(commands),
+  },
 ];
 
 export const cli = async (argv: MinimistArgs) => {
diff --git a/packages/ts-codegen/src/cmds.ts b/packages/ts-codegen/src/cmds.ts
index 9630ad7f..3e3c332a 100644
--- a/packages/ts-codegen/src/cmds.ts
+++ b/packages/ts-codegen/src/cmds.ts
@@ -1,4 +1,3 @@
-
 import _create_boilerplate from './commands/create-boilerplate';
 import _generate from './commands/generate';
 import _install from './commands/install';
@@ -7,6 +6,4 @@ Commands['create-boilerplate'] = _create_boilerplate;
 Commands['generate'] = _generate;
 Commands['install'] = _install;
 
-export { Commands }; 
-
-  
\ No newline at end of file
+export { Commands };
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index c9a23b21..5cf68e94 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -15,13 +15,16 @@ export default async (argv: MinimistArgs) => {
     return shell.exit(1);
   }
 
-  const { name } = await prompt([
-    {
-      type: 'string',
-      name: 'name',
-      message: 'Enter your new module name',
-    }
-  ], argv);
+  const { name } = await prompt(
+    [
+      {
+        type: 'string',
+        name: 'name',
+        message: 'Enter your new module name',
+      },
+    ],
+    argv
+  );
 
   shell.exec(`git clone ${repo} ${name}`);
   shell.cd(name);
@@ -89,14 +92,14 @@ export default async (argv: MinimistArgs) => {
     let content = fs.readFileSync(templateFile).toString();
     if (
       path.basename(templateFile) === 'LICENSE' &&
-            license.__LICENSE__ === 'closed'
+      license.__LICENSE__ === 'closed'
     ) {
       content = `Copyright (c) 2023 __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
 Unauthorized copying via any medium is strictly prohibited
 Proprietary and confidential`;
     }
 
-    Object.keys(results).forEach(key => {
+    Object.keys(results).forEach((key) => {
       if (/^__/.test(key)) {
         content = content.replace(new RegExp(key, 'g'), results[key]);
       }
@@ -139,4 +142,4 @@ Proprietary and confidential`;
 
   ✨ Great work!
   `);
-};
\ No newline at end of file
+};
diff --git a/packages/ts-codegen/src/commands/generate.ts b/packages/ts-codegen/src/commands/generate.ts
index 519824d2..fe1b1695 100644
--- a/packages/ts-codegen/src/commands/generate.ts
+++ b/packages/ts-codegen/src/commands/generate.ts
@@ -12,38 +12,33 @@ export default async (argv: MinimistArgs) => {
       type: 'path',
       name: 'schema',
       message: 'which directory contains the the Rust contracts?',
-      default: './schema'
+      default: './schema',
     },
     {
       _: true,
       type: 'path',
       name: 'out',
       message: 'where is the output directory?',
-      default: './ts'
+      default: './ts',
     },
     {
       _: true,
       type: 'string',
       name: 'name',
-      message: 'contract name?'
+      message: 'contract name?',
     },
     {
       type: 'checkbox',
       name: 'plugin',
       message: 'which plugins?',
-      choices: [
-        'client',
-        'recoil',
-        'react-query',
-        'message-composer'
-      ]
+      choices: ['client', 'recoil', 'react-query', 'message-composer'],
     },
     {
       type: 'confirm',
       name: 'bundle',
       message: 'enable bundle?',
-      default: true
-    }
+      default: true,
+    },
   ];
 
   if (argv.typesOnly) {
@@ -62,23 +57,23 @@ export default async (argv: MinimistArgs) => {
         type: 'confirm',
         name: 'optionalClient',
         message: 'optionalClient?',
-        default: false
+        default: false,
       },
       {
         type: 'list',
         name: 'version',
         message: 'which react-query version?',
         default: 'v4',
-        choices: ['v3', 'v4']
+        choices: ['v3', 'v4'],
       },
       {
         type: 'confirm',
         name: 'queryKeys',
         message: 'queryKeys?',
-        default: false
+        default: false,
       },
     ]);
-  };
+  }
   const { optionalClient, version, queryKeys } = await prompt(questions2, argv);
   const questions3 = [];
   if (version === 'v4') {
@@ -88,11 +83,10 @@ export default async (argv: MinimistArgs) => {
         type: 'confirm',
         name: 'mutations',
         message: 'Generate useMutation hooks?',
-        default: false
-      }
-
+        default: false,
+      },
     ]);
-  };
+  }
   const { mutations } = await prompt(questions3, argv);
 
   const queryFactoryQuestions = [];
@@ -103,10 +97,10 @@ export default async (argv: MinimistArgs) => {
         type: 'confirm',
         name: 'queryFactory',
         message: 'queryFactory? ',
-        default: false
-      }
+        default: false,
+      },
     ]);
-  };
+  }
   const { queryFactory } = await prompt(queryFactoryQuestions, argv);
   ///////// END REACT QUERY
 
@@ -118,28 +112,28 @@ export default async (argv: MinimistArgs) => {
         type: 'string',
         name: 'bundleFile',
         message: 'bundleFile?',
-        default: 'index.ts'
+        default: 'index.ts',
       },
       {
         type: 'string',
         name: 'bundleScope',
         message: 'bundleScope?',
-        default: 'contracts'
-      }
+        default: 'contracts',
+      },
     ]);
-  };
+  }
   const { bundleFile, bundleScope } = await prompt(questions4, argv);
   ///////// END BUNDLE
 
   const options: TSBuilderOptions = {
     types: {
-      enabled: true
+      enabled: true,
     },
     client: {
       enabled:
-                plugin.includes('client') ||
-                plugin.includes('recoil') ||
-                plugin.includes('react-query')
+        plugin.includes('client') ||
+        plugin.includes('recoil') ||
+        plugin.includes('react-query'),
     },
     reactQuery: {
       enabled: plugin.includes('react-query'),
@@ -147,33 +141,32 @@ export default async (argv: MinimistArgs) => {
       queryKeys,
       version,
       mutations,
-      queryFactory
+      queryFactory,
     },
     recoil: {
       enabled: plugin.includes('recoil'),
     },
     messageComposer: {
-      enabled: plugin.includes('message-composer')
+      enabled: plugin.includes('message-composer'),
     },
     messageBuilder: {
-
-      enabled: plugin.includes('message-builder')
+      enabled: plugin.includes('message-builder'),
     },
     bundle: {
       enabled: bundle,
       scope: bundleScope,
-      bundleFile
-    }
+      bundleFile,
+    },
   };
 
   await codegen({
     contracts: [
       {
         name,
-        dir: schema
-      }
+        dir: schema,
+      },
     ],
     outPath: out,
-    options
+    options,
   });
 };
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index f14db991..5f32a181 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -4,7 +4,7 @@ import { sync as glob } from 'glob';
 import { sync as mkdirp } from 'mkdirp';
 import { tmpdir } from 'os';
 import { parse } from 'parse-package-name';
-import { basename, dirname, extname,join, resolve } from 'path';
+import { basename, dirname, extname, join, resolve } from 'path';
 import { sync as rimraf } from 'rimraf';
 import { exec } from 'shelljs';
 
@@ -13,17 +13,18 @@ import { prompt } from '../utils/prompt';
 const TMPDIR = tmpdir();
 const rnd = () =>
   Math.random().toString(36).substring(2, 15) +
-    Math.random().toString(36).substring(2, 15);
+  Math.random().toString(36).substring(2, 15);
 
 const getPackages = (names: string[]) => {
-  return names.map(pkg => {
-    const { name, version } = parse(pkg);
-    return `${name}@${version}`;
-  }).join(' ');
+  return names
+    .map((pkg) => {
+      const { name, version } = parse(pkg);
+      return `${name}@${version}`;
+    })
+    .join(' ');
 };
 
 export default async (argv: MinimistArgs) => {
-
   // don't prompt if we got this...
   if (argv._.length) {
     argv.pkg = argv._;
@@ -39,43 +40,49 @@ export default async (argv: MinimistArgs) => {
   }
 
   // what are we installing?
-  let { pkg } = await prompt([
-    {
-      type: 'checkbox',
-      name: 'pkg',
-      message:
-                'which chain contracts do you want to support?',
-      choices: [
-        'stargaze-base-factory',
-        'stargaze-base-minter',
-        'stargaze-sg721-base',
-        'stargaze-sg721-metdata-onchain',
-        'stargaze-sg721-nt',
-        'stargaze-splits',
-        'stargaze-vending-factory',
-        'stargaze-vending-minter',
-        'stargaze-whitelist',
-        'wasmswap'
-      ].map(name => {
-        return {
-          name,
-          value: `@cosmjson/${name}`
-        };
-      })
-    }
-  ], argv);
+  let { pkg } = await prompt(
+    [
+      {
+        type: 'checkbox',
+        name: 'pkg',
+        message: 'which chain contracts do you want to support?',
+        choices: [
+          'stargaze-base-factory',
+          'stargaze-base-minter',
+          'stargaze-sg721-base',
+          'stargaze-sg721-metdata-onchain',
+          'stargaze-sg721-nt',
+          'stargaze-splits',
+          'stargaze-vending-factory',
+          'stargaze-vending-minter',
+          'stargaze-whitelist',
+          'wasmswap',
+        ].map((name) => {
+          return {
+            name,
+            value: `@cosmjson/${name}`,
+          };
+        }),
+      },
+    ],
+    argv
+  );
 
   // install
   if (!Array.isArray(pkg)) pkg = [pkg];
   const tmp = join(TMPDIR, rnd());
   mkdirp(tmp);
   process.chdir(tmp);
-  exec(`npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`);
+  exec(
+    `npm install ${getPackages(pkg)} --production --prefix ./smart-contracts`
+  );
 
   // protos
   const pkgs = glob('./smart-contracts/**/package.json');
   const cmds = pkgs
-    .filter((f) => { return f !== './smart-contracts/package.json'; })
+    .filter((f) => {
+      return f !== './smart-contracts/package.json';
+    })
     .map((f) => resolve(join(tmp, f)))
     .map((conf) => {
       const extDir = dirname(conf);
@@ -83,17 +90,20 @@ export default async (argv: MinimistArgs) => {
       const dst = basename(dir);
 
       const files = glob(`${extDir}/**/*`, { nodir: true });
-      files.forEach(f => {
-        if (extname(f) === '.json'
-                    || f === 'package.json'
-                    || /license/i.test(f)
-                    || /readme/i.test(f)) return;
+      files.forEach((f) => {
+        if (
+          extname(f) === '.json' ||
+          f === 'package.json' ||
+          /license/i.test(f) ||
+          /readme/i.test(f)
+        )
+          return;
         rimraf(f);
       });
       return [extDir, resolve(join(cur, 'contracts', dst)), dir];
     });
 
-  // move protos 
+  // move protos
   for (const [src, dst, pkg] of cmds) {
     rimraf(dst);
     console.log(`installing ${pkg}...`);
@@ -102,17 +112,24 @@ export default async (argv: MinimistArgs) => {
   }
 
   // package
-  const packageInfo = JSON.parse(readFileSync('./smart-contracts/package.json', 'utf-8'));
+  const packageInfo = JSON.parse(
+    readFileSync('./smart-contracts/package.json', 'utf-8')
+  );
   const deps = packageInfo.dependencies ?? {};
   thisPackage.devDependencies = thisPackage.devDependencies ?? {};
   thisPackage.devDependencies = {
     ...thisPackage.devDependencies,
-    ...deps
+    ...deps,
   };
 
-  thisPackage.devDependencies = Object.fromEntries(Object.entries(thisPackage.devDependencies).sort());
+  thisPackage.devDependencies = Object.fromEntries(
+    Object.entries(thisPackage.devDependencies).sort()
+  );
 
-  writeFileSync(join(cur, 'package.json'), JSON.stringify(thisPackage, null, 2));
+  writeFileSync(
+    join(cur, 'package.json'),
+    JSON.stringify(thisPackage, null, 2)
+  );
 
   // cleanup
   rimraf(tmp);
diff --git a/packages/ts-codegen/src/file.ts b/packages/ts-codegen/src/file.ts
index 8a39f093..559d1860 100644
--- a/packages/ts-codegen/src/file.ts
+++ b/packages/ts-codegen/src/file.ts
@@ -11,8 +11,8 @@ const question = [
     _: true,
     type: 'string',
     name: 'file',
-    message: 'file'
-  }
+    message: 'file',
+  },
 ];
 
 (async () => {
diff --git a/packages/ts-codegen/src/helpers/create-helpers.ts b/packages/ts-codegen/src/helpers/create-helpers.ts
index ccb92224..1e7e9fe8 100644
--- a/packages/ts-codegen/src/helpers/create-helpers.ts
+++ b/packages/ts-codegen/src/helpers/create-helpers.ts
@@ -1,6 +1,6 @@
 import { BuilderContext } from '@cosmwasm/ts-codegen-ast';
 import { sync as mkdirp } from 'mkdirp';
-import { basename, dirname, extname,join } from 'path';
+import { basename, dirname, extname, join } from 'path';
 
 import { BuilderFile, TSBuilderInput } from '../builder';
 import {
diff --git a/packages/ts-codegen/src/helpers/index.ts b/packages/ts-codegen/src/helpers/index.ts
index ab8e74c9..de7142d8 100644
--- a/packages/ts-codegen/src/helpers/index.ts
+++ b/packages/ts-codegen/src/helpers/index.ts
@@ -1,3 +1,3 @@
 export * from './contractContextBase';
 export * from './contractContextBaseShortHandCtor';
-export * from './contractsContextTSX';
\ No newline at end of file
+export * from './contractsContextTSX';
diff --git a/packages/ts-codegen/src/index.ts b/packages/ts-codegen/src/index.ts
index 79330fcf..e6c6db59 100644
--- a/packages/ts-codegen/src/index.ts
+++ b/packages/ts-codegen/src/index.ts
@@ -8,4 +8,4 @@ export * from './utils';
 export default async (input: TSBuilderInput) => {
   const builder = new TSBuilder(input);
   await builder.build();
-};
\ No newline at end of file
+};
diff --git a/packages/ts-codegen/src/plugins/index.ts b/packages/ts-codegen/src/plugins/index.ts
index 815f6f4d..99efdc4c 100644
--- a/packages/ts-codegen/src/plugins/index.ts
+++ b/packages/ts-codegen/src/plugins/index.ts
@@ -4,4 +4,4 @@ export * from './message-composer';
 export * from './plugin-base';
 export * from './react-query';
 export * from './recoil';
-export * from './types';
\ No newline at end of file
+export * from './types';
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 9c800f7c..34582bcb 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -1,16 +1,17 @@
 import generate from '@babel/generator';
 import * as t from '@babel/types';
-import { ContractInfo, defaultOptions,IContext, UtilMapping } from '@cosmwasm/ts-codegen-ast';
+import {
+  ContractInfo,
+  defaultOptions,
+  IContext,
+  UtilMapping,
+} from '@cosmwasm/ts-codegen-ast';
 import deepmerge from 'deepmerge';
 import { writeFileSync } from 'fs';
 import { sync as mkdirp } from 'mkdirp';
 import { join } from 'path';
 
-import {
-  BuilderFile,
-  BuilderFileType,
-  TSBuilder,
-} from '../builder';
+import { BuilderFile, BuilderFileType, TSBuilder } from '../builder';
 import { header } from '../utils/header';
 
 /**
@@ -43,7 +44,7 @@ export interface IBuilderPlugin {
   render(
     outPath: string,
     name?: string,
-    contractInfo?: ContractInfo,
+    contractInfo?: ContractInfo
   ): Promise<BuilderFile[]>;
 }
 
@@ -51,7 +52,8 @@ export interface IBuilderPlugin {
  * BuilderPluginBase enable ts-codegen users implement their own plugins by only implement a few functions.
  */
 export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
-implements IBuilderPlugin {
+  implements IBuilderPlugin
+{
   builder?: TSBuilder;
   options: TOpt;
   utils: UtilMapping;
@@ -75,7 +77,7 @@ implements IBuilderPlugin {
   async render(
     outPath: string,
     name?: string,
-    contractInfo?: ContractInfo,
+    contractInfo?: ContractInfo
   ): Promise<BuilderFile[]> {
     if (!this.options) {
       this.options = this.getDefaultOptions(this.options);
@@ -98,7 +100,8 @@ implements IBuilderPlugin {
     return results.map((result) => {
       const imports = context.getImports(this.utils, result.localname);
       // @ts-ignore
-      const code = header + generate(t.program([...imports, ...result.body])).code;
+      const code =
+        header + generate(t.program([...imports, ...result.body])).code;
 
       mkdirp(outPath);
       const filename = join(outPath, result.localname);
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 51348114..00f5c127 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -1,5 +1,9 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { ContractInfo, RenderContext,RenderContextBase } from '@cosmwasm/ts-codegen-ast';
+import {
+  ContractInfo,
+  RenderContext,
+  RenderContextBase,
+} from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
 import { BuilderFileType, TSBuilderOptions } from '../builder';
@@ -70,12 +74,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
           if (Object.prototype.hasOwnProperty.call(providerInfo, key)) {
             const info = providerInfo[key];
 
-            body.push(
-              w.importStmt(
-                [info.classname],
-                `./${info.basename}`
-              )
-            );
+            body.push(w.importStmt([info.classname], `./${info.basename}`));
           }
         }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index d5074407..c793e5e4 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -1,5 +1,9 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { ContractInfo, RenderContext,RenderContextBase } from '@cosmwasm/ts-codegen-ast';
+import {
+  ContractInfo,
+  RenderContext,
+  RenderContextBase,
+} from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
 import { BuilderFileType, TSBuilderOptions } from '../builder';
diff --git a/packages/ts-codegen/src/plugins/types.ts b/packages/ts-codegen/src/plugins/types.ts
index ce7458a7..da8c9a17 100644
--- a/packages/ts-codegen/src/plugins/types.ts
+++ b/packages/ts-codegen/src/plugins/types.ts
@@ -3,7 +3,7 @@ import {
   ContractInfo,
   RenderContext,
   RenderContextBase,
-  RenderOptions
+  RenderOptions,
 } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 
@@ -68,8 +68,8 @@ export class TypesPlugin extends BuilderPluginBase<RenderOptions> {
       {
         type: 'type',
         localname,
-        body
-      }
+        body,
+      },
     ];
   }
 }
diff --git a/packages/ts-codegen/src/utils/clean.ts b/packages/ts-codegen/src/utils/clean.ts
index 62ea9931..6eabd9d2 100644
--- a/packages/ts-codegen/src/utils/clean.ts
+++ b/packages/ts-codegen/src/utils/clean.ts
@@ -25,15 +25,15 @@ export const clean = (obj: any): any => {
     for (let attr in obj) {
       if (Object.prototype.hasOwnProperty.call(obj, attr)) {
         switch (attr) {
-        case 'leadingComments':
-        case 'trailingComments':
-        case 'loc':
-        case 'start':
-        case 'end':
-          break;
-        default:
-          // @ts-ignore
-          copy[attr] = clean(obj[attr]);
+          case 'leadingComments':
+          case 'trailingComments':
+          case 'loc':
+          case 'start':
+          case 'end':
+            break;
+          default:
+            // @ts-ignore
+            copy[attr] = clean(obj[attr]);
         }
       } else {
         // @ts-ignore
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index af6e2d6a..9ae2bd75 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -64,19 +64,19 @@ export const cleanse = (obj: any): any => {
           copy[cleanNullable(attr)] = cleanse(obj[attr]);
         } else {
           switch (attr) {
-          case 'title':
-          case '$ref':
-            if (typeof obj[attr] === 'string') {
-              // @ts-ignore
-              copy[attr] = cleanse(cleanNullable(cleanFor(obj[attr])));
-            } else {
+            case 'title':
+            case '$ref':
+              if (typeof obj[attr] === 'string') {
+                // @ts-ignore
+                copy[attr] = cleanse(cleanNullable(cleanFor(obj[attr])));
+              } else {
+                // @ts-ignore
+                copy[attr] = cleanse(obj[attr]);
+              }
+              break;
+            default:
               // @ts-ignore
               copy[attr] = cleanse(obj[attr]);
-            }
-            break;
-          default:
-            // @ts-ignore
-            copy[attr] = cleanse(obj[attr]);
           }
         }
       } else {
diff --git a/packages/ts-codegen/src/utils/index.ts b/packages/ts-codegen/src/utils/index.ts
index 27156028..e84d06c3 100644
--- a/packages/ts-codegen/src/utils/index.ts
+++ b/packages/ts-codegen/src/utils/index.ts
@@ -1 +1 @@
-export * from './schemas';
\ No newline at end of file
+export * from './schemas';
diff --git a/packages/ts-codegen/src/utils/package.ts b/packages/ts-codegen/src/utils/package.ts
index 23150c02..7ea2ef99 100644
--- a/packages/ts-codegen/src/utils/package.ts
+++ b/packages/ts-codegen/src/utils/package.ts
@@ -1,7 +1,7 @@
-import { existsSync,readFileSync } from 'fs';
-import { dirname,join } from 'path';
+import { existsSync, readFileSync } from 'fs';
+import { dirname, join } from 'path';
 
-// need to search due to the dist/ folder and src/, etc. 
+// need to search due to the dist/ folder and src/, etc.
 function findPackageJson(currentDir: string) {
   const filePath = join(currentDir, 'package.json');
 
@@ -30,4 +30,4 @@ export function readAndParsePackageJson() {
   const str = readFileSync(pkgPath, 'utf8');
   const pkg = JSON.parse(str);
   return pkg;
-}
\ No newline at end of file
+}
diff --git a/packages/ts-codegen/src/utils/parse.ts b/packages/ts-codegen/src/utils/parse.ts
index bf42cf27..03ab4bea 100644
--- a/packages/ts-codegen/src/utils/parse.ts
+++ b/packages/ts-codegen/src/utils/parse.ts
@@ -2,29 +2,24 @@ import { parse, ParserPlugin } from '@babel/parser';
 import babelTraverse from '@babel/traverse';
 
 export const parser = (codes: string[]) => {
-
   const hash: Record<string, any> = {};
-  codes.forEach(code => {
-
-    const plugins: ParserPlugin[] = [
-      'typescript',
-    ];
+  codes.forEach((code) => {
+    const plugins: ParserPlugin[] = ['typescript'];
 
     const ast = parse(code, {
       sourceType: 'module',
-      plugins
+      plugins,
     });
 
     const visitor = visitorFn({
       addType(key: string, node: any) {
         hash[key] = node;
-      }
+      },
     });
     babelTraverse(ast as any, visitor);
   });
 
   return hash;
-
 };
 
 const visitorFn = (parser: any) => ({
@@ -40,6 +35,5 @@ const visitorFn = (parser: any) => ({
   },
   TSInterfaceDeclaration(path: any) {
     parser.addType(path.node.id.name, path.parentPath.node);
-  }
+  },
 });
-
diff --git a/packages/ts-codegen/src/utils/prompt.ts b/packages/ts-codegen/src/utils/prompt.ts
index 8e002be9..8bb262fe 100644
--- a/packages/ts-codegen/src/utils/prompt.ts
+++ b/packages/ts-codegen/src/utils/prompt.ts
@@ -44,7 +44,7 @@ const transform = (questions) => {
       return {
         ...q,
         type: 'autocomplete',
-        source: getFuzzySearch(choices)
+        source: getFuzzySearch(choices),
       };
     } else if (q.type === 'fuzzy:objects') {
       const choices = q.choices;
@@ -52,7 +52,7 @@ const transform = (questions) => {
       return {
         ...q,
         type: 'autocomplete',
-        source: getFuzzySearchNames(choices)
+        source: getFuzzySearchNames(choices),
       };
     } else {
       return q;
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 0ca000fb..25e55e03 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -1,5 +1,10 @@
 import { ContractInfo } from '@cosmwasm/ts-codegen-ast';
-import { ExecuteMsg, IDLObject, JSONSchema, QueryMsg } from '@cosmwasm/ts-codegen-types';
+import {
+  ExecuteMsg,
+  IDLObject,
+  JSONSchema,
+  QueryMsg,
+} from '@cosmwasm/ts-codegen-types';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { readFileSync } from 'fs';
 import { sync as glob } from 'glob';
@@ -9,32 +14,41 @@ import { parser } from './parse';
 interface ReadSchemaOpts {
   schemaDir: string;
   clean?: boolean;
-};
+}
 
 export const readSchemas = async ({
-  schemaDir, clean = true
+  schemaDir,
+  clean = true,
 }: ReadSchemaOpts): Promise<ContractInfo> => {
-  const fn = clean ? cleanse : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
-  const files = glob(schemaDir + '/**/*.json')
-    .filter(file => !file.match(/\/raw\//));
+  const fn = clean
+    ? cleanse
+    : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
+  const files = glob(schemaDir + '/**/*.json').filter(
+    (file) => !file.match(/\/raw\//)
+  );
 
-  const schemas: JSONSchema[] = files
-    .map(file => JSON.parse(readFileSync(file, 'utf-8')));
+  const schemas: JSONSchema[] = files.map((file) =>
+    JSON.parse(readFileSync(file, 'utf-8'))
+  );
 
   if (schemas.length > 1) {
     // legacy
     // TODO add console.warn here
     return {
-      schemas: fn(schemas)
+      schemas: fn(schemas),
     };
   }
 
   if (schemas.length === 0) {
-    throw new Error('Error [too few files]: requires one schema file per contract');
+    throw new Error(
+      'Error [too few files]: requires one schema file per contract'
+    );
   }
 
   if (schemas.length !== 1) {
-    throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
+    throw new Error(
+      'Error [too many files]: CosmWasm v1.1 schemas supports one file'
+    );
   }
 
   const idlObject: Partial<IDLObject> = schemas[0] as Partial<IDLObject>;
@@ -47,13 +61,13 @@ export const readSchemas = async ({
     execute,
     query,
     migrate,
-    sudo
+    sudo,
   } = idlObject;
 
   if (typeof idl_version !== 'string') {
     // legacy
     return {
-      schemas: fn(schemas)
+      schemas: fn(schemas),
     };
   }
 
@@ -63,25 +77,25 @@ export const readSchemas = async ({
     execute,
     query,
     migrate,
-    sudo
+    sudo,
   };
   return {
     schemas: [
       ...Object.values(fn(idl)).filter(Boolean),
-      ...Object.values(fn({ ...responses })).filter(Boolean)
+      ...Object.values(fn({ ...responses })).filter(Boolean),
     ],
     responses,
-    idlObject
+    idlObject,
   };
 };
 
 export const findQueryMsg = (schemas: JSONSchema[]): QueryMsg => {
-  const queryMsg = schemas.find(schema => schema.title === 'QueryMsg');
+  const queryMsg = schemas.find((schema) => schema.title === 'QueryMsg');
   return queryMsg as QueryMsg;
 };
 
 export const findExecuteMsg = (schemas: JSONSchema[]): ExecuteMsg => {
-  const executeMsg = schemas.find(schema =>
+  const executeMsg = schemas.find((schema) =>
     schema.title.startsWith('ExecuteMsg')
   );
   return executeMsg as ExecuteMsg;
diff --git a/packages/ts-codegen/src/utils/unused.ts b/packages/ts-codegen/src/utils/unused.ts
index a6bd99ec..9072c127 100644
--- a/packages/ts-codegen/src/utils/unused.ts
+++ b/packages/ts-codegen/src/utils/unused.ts
@@ -14,13 +14,11 @@ export const unused = {
 
         const source = binding.path.parentPath.get('source');
         const importName = source.node.value;
-        if (
-          !t.isStringLiteral(source)
-        )
-          continue;
+        if (!t.isStringLiteral(source)) continue;
 
-        const key = `${importName}(${source.node.loc &&
-          source.node.loc.start.line})`;
+        const key = `${importName}(${
+          source.node.loc && source.node.loc.start.line
+        })`;
 
         if (!UnRefBindings.has(key)) {
           UnRefBindings.set(key, binding);
@@ -47,6 +45,6 @@ export const unused = {
           binding.path.parentPath.remove();
         }
       });
-    }
-  }
-};
\ No newline at end of file
+    },
+  },
+};
diff --git a/packages/types/src/idl.ts b/packages/types/src/idl.ts
index deaa9c87..6f503ed2 100644
--- a/packages/types/src/idl.ts
+++ b/packages/types/src/idl.ts
@@ -13,4 +13,4 @@ export interface IDLObject {
   migrate: JSONSchema;
   sudo: JSONSchema;
   responses: KeyedSchema;
-}
\ No newline at end of file
+}
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
index f367b7f6..2ba12f5a 100644
--- a/packages/types/src/types.ts
+++ b/packages/types/src/types.ts
@@ -1,13 +1,18 @@
-export declare type fieldType = 'Long' | 'Coin' | 'Duration' | 'Height' | string;
+export declare type fieldType =
+  | 'Long'
+  | 'Coin'
+  | 'Duration'
+  | 'Height'
+  | string;
 export interface Field {
   name: string;
   type: fieldType;
   node: any;
-};
+}
 export interface Interface {
   name: string;
-  fields: Field[]
-};
+  fields: Field[];
+}
 
 export interface QueryMsg {
   $schema: string;
@@ -40,16 +45,27 @@ export interface JSONSchema {
   additionalItems?: JSONSchema;
   required?: string[];
   title?: string;
-  type?: string | string[]
+  type?: string | string[];
 }
 
-
 // this is actually what items ends up being most of the time:
 export type JSONSchemaType =
   | { type: 'integer'; format?: 'int32' | 'int64' }
   | { type: 'number'; format?: 'float' | 'double' }
-  | { type: 'string'; format?: 'date-time' | 'email' | 'hostname' | 'ipv4' | 'ipv6' | 'uri' }
+  | {
+      type: 'string';
+      format?: 'date-time' | 'email' | 'hostname' | 'ipv4' | 'ipv6' | 'uri';
+    }
   | { type: 'boolean' }
-  | { type: 'object'; properties?: { [key: string]: JSONSchemaType }; required?: string[] }
-  | { type: 'array'; items?: JSONSchemaType | JSONSchemaType[]; maxItems?: number; minItems?: number }
+  | {
+      type: 'object';
+      properties?: { [key: string]: JSONSchemaType };
+      required?: string[];
+    }
+  | {
+      type: 'array';
+      items?: JSONSchemaType | JSONSchemaType[];
+      maxItems?: number;
+      minItems?: number;
+    }
   | JSONSchemaType[]; // For tuple definitions

From 28b3a9ff8fd299bae833e96927eb7a049a72335e Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:42:01 +0200
Subject: [PATCH 262/287] Upgrade prettier to 3.6.0

---
 package.json |  2 +-
 yarn.lock    | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 03f2b9fb..e79f8301 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "jest-in-case": "^1.0.2",
     "lerna": "^6",
     "mkdirp": "1.0.2",
-    "prettier": "^3.0.2",
+    "prettier": "^3.6.0",
     "rimraf": "4.4.1",
     "strip-ansi": "^6",
     "symlink-workspace": "^1.9.0",
diff --git a/yarn.lock b/yarn.lock
index 755dfb0e..5f834625 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6200,10 +6200,10 @@ prettier@^2.6.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-prettier@^3.0.2:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
-  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+prettier@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.0.tgz#18ec98d62cb0757a5d4eab40253ff3e6d0fc8dea"
+  integrity sha512-ujSB9uXHJKzM/2GBuE0hBOUgC77CN3Bnpqa+g80bkv3T3A93wL/xlzDATHhnhkzifz/UE2SNOvmbTz5hSkDlHw==
 
 pretty-format@29.4.3:
   version "29.4.3"
@@ -6853,7 +6853,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6898,7 +6907,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6926,6 +6935,13 @@ strip-ansi@^5.1.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -7513,7 +7529,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -7531,6 +7547,15 @@ wrap-ansi@^6.0.1:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From de4049b819959b5c15c5ce4c5773de9e6fad769f Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:45:47 +0200
Subject: [PATCH 263/287] Disable indent rule in favour of prettier

---
 .eslintrc.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 734ab0c7..b160b72b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -22,10 +22,7 @@
     "unused-imports"
   ],
   "rules": {
-    "indent": [
-      "error",
-      2
-    ],
+    "indent": "off", // prettier takes care of this (yarn format)
     "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
     "quote-props": ["error", "as-needed"],
     "semi": ["error", "always"],

From 6d78aaa82b286576ad6b2d0ec1d53e0a1b547a4e Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 14:45:57 +0200
Subject: [PATCH 264/287] Upgrade eslint-config-prettier

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e79f8301..a11b5869 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@typescript-eslint/parser": "^7.10.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-unused-imports": "^4.0.0",
     "glob": "8.0.3",
diff --git a/yarn.lock b/yarn.lock
index 5f834625..d0d93d97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3030,10 +3030,10 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
-  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
+eslint-config-prettier@^10.1.5:
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#00c18d7225043b6fbce6a665697377998d453782"
+  integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
 
 eslint-plugin-simple-import-sort@^12.1.0:
   version "12.1.0"

From e1f36ede5850f81b26b3173ff2a8b8de02a16b68 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 24 Jun 2025 15:57:26 +0200
Subject: [PATCH 265/287] Change repo links to hyperweb-io/ts-codegen

---
 README.md                        | 225 +++++++++++++++----------------
 docs/index.mdx                   |  10 +-
 lerna.json                       |   2 +-
 package.json                     |   2 +-
 packages/ast/README.md           |  46 +++----
 packages/ast/package.json        |   6 +-
 packages/ts-codegen/README.md    | 225 +++++++++++++++----------------
 packages/ts-codegen/package.json |   6 +-
 packages/types/README.md         |  26 ++--
 packages/types/package.json      |   6 +-
 10 files changed, 268 insertions(+), 286 deletions(-)

diff --git a/README.md b/README.md
index b152da64..a59212fa 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
 </p>
 
 <p align="center" width="100%">
-  <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
-    <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
+  <a href="https://github.com/hyperweb-io/ts-codegen/actions/workflows/run-tests.yaml">
+    <img height="20" src="https://github.com/hyperweb-io/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
   <a href="https://github.com/hyperweb-io/lib-count">
   <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
@@ -17,12 +17,11 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
   </a>
   <br />
-  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
-  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
+  <a href="https://github.com/hyperweb-io/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+  <a href="https://github.com/hyperweb-io/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
-
 ```
 npm install @cosmwasm/ts-codegen
 ```
@@ -30,25 +29,26 @@ npm install @cosmwasm/ts-codegen
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
 
 🎥 [Checkout our video playlist](https://cosmology.zone/learn/ts-codegen) to learn how to use `ts-codegen`!
+
 ## Table of contents
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
   - [Table of contents](#table-of-contents)
 - [Usage](#usage)
-    - [Programmatic Usage](#programmatic-usage)
-    - [Types](#types)
-    - [TS Clients](#client)
-    - [React Query](#react-query)
-    - [Recoil](#recoil)
-    - [Message Composer](#message-composer)
-    - [Message Builder](#message-builder)
-    - [Use Contracts Hook](#use-contracts-hooks-usage)
-    - [Bundles](#bundles)
-    - [CLI Usage and Examples](#cli-usage-and-examples)
-    - [Advanced Usage](#advanced-usage)
+  - [Programmatic Usage](#programmatic-usage)
+  - [Types](#types)
+  - [TS Clients](#client)
+  - [React Query](#react-query)
+  - [Recoil](#recoil)
+  - [Message Composer](#message-composer)
+  - [Message Builder](#message-builder)
+  - [Use Contracts Hook](#use-contracts-hooks-usage)
+  - [Bundles](#bundles)
+  - [CLI Usage and Examples](#cli-usage-and-examples)
+  - [Advanced Usage](#advanced-usage)
 - [JSON Schema](#json-schema)
-    - [JSON Schema Generation](#json-schema-generation)
-    - [Exporting Schemas](#exporting-schemas)
+  - [JSON Schema Generation](#json-schema-generation)
+  - [Exporting Schemas](#exporting-schemas)
 - [Developing](#developing)
 - [Related](#related)
 
@@ -59,93 +59,93 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 For production usage, we recommend setting up a build script that uses the main entry point:
 
 ```ts
-import codegen from '@cosmwasm/ts-codegen';
+import codegen from "@cosmwasm/ts-codegen";
 
 codegen({
   contracts: [
     {
-      name: 'SG721',
-      dir: './path/to/sg721/schema'
+      name: "SG721",
+      dir: "./path/to/sg721/schema",
     },
     {
-      name: 'Minter',
-      dir: './path/to/Minter/schema'
-    }
+      name: "Minter",
+      dir: "./path/to/Minter/schema",
+    },
   ],
-  outPath: './path/to/code/src/',
+  outPath: "./path/to/code/src/",
 
   // options are completely optional ;)
   options: {
     bundle: {
-      bundleFile: 'index.ts',
-      scope: 'contracts'
+      bundleFile: "index.ts",
+      scope: "contracts",
     },
     types: {
-      enabled: true
+      enabled: true,
     },
     client: {
-      enabled: true
+      enabled: true,
     },
     reactQuery: {
       enabled: true,
       optionalClient: true,
-      version: 'v4',
+      version: "v4",
       mutations: true,
       queryKeys: true,
       queryFactory: true,
     },
     recoil: {
-      enabled: false
+      enabled: false,
     },
     messageComposer: {
-      enabled: false
+      enabled: false,
     },
     messageBuilder: {
-      enabled: false
+      enabled: false,
     },
     useContractsHook: {
-      enabled: false
-    }
-  }
+      enabled: false,
+    },
+  },
 }).then(() => {
-  console.log('✨ all done!');
+  console.log("✨ all done!");
 });
 ```
+
 #### Types
 
 Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
 
 #### Types Options
 
-| option                   | description                                          |
-| ------------------------ | ---------------------------------------------------- |
-| `types.enabled`          | enable type generation                               |
-| `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
-| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
+| option                   | description                                                           |
+| ------------------------ | --------------------------------------------------------------------- |
+| `types.enabled`          | enable type generation                                                |
+| `types.aliasExecuteMsg`  | generate a type alias based on the contract name                      |
+| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name |
 
 ### Client
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts )
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts)
 
 #### Client Options
 
-| option                                  | description                                          |
-| --------------------------------------- | ---------------------------------------------------  |
-| `client.enabled`                        | generate TS client classes for your contracts        |
-| `client.execExtendsQuery`               | execute should extend query message clients          |
-| `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
-| `client.useDeclareKeyword`              | use declare keyword for inherited class fields       |
-
+| option                      | description                                          |
+| --------------------------- | ---------------------------------------------------- |
+| `client.enabled`            | generate TS client classes for your contracts        |
+| `client.execExtendsQuery`   | execute should extend query message clients          |
+| `client.noImplicitOverride` | should match your tsconfig noImplicitOverride option |
+| `client.useDeclareKeyword`  | use declare keyword for inherited class fields       |
 
 ### React Query
 
 Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
 
 #### React Query Options
 
@@ -159,72 +159,66 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 | `reactQuery.mutations`      | also generate mutations                                                      |
 | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
-
 ### Recoil
 
 Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
 
 #### Recoil Options
 
-| option                         | description                                                         |
-| ------------------------------ | ------------------------------------------------------------------- |
-| `recoil.enabled`               | enable the recoil plugin                                            |
+| option           | description              |
+| ---------------- | ------------------------ |
+| `recoil.enabled` | enable the recoil plugin |
 
 ### Message Composer
 
 Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 
 #### Message Composer Options
 
-| option                         | description                                                         |
-| ------------------------------ | ------------------------------------------------------------------- |
-| `messageComposer.enabled`      | enable the messageComposer plugin                                   |
+| option                    | description                       |
+| ------------------------- | --------------------------------- |
+| `messageComposer.enabled` | enable the messageComposer plugin |
 
 ### Message Builder
 
 Generate raw message jsons for use in your application with the `message-builder` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
 
 #### Message Builder Options
 
-| option                   | description                        |
-|------------------------- | ---------------------------------- |
-| `messageBuilder.enabled` | enable the messageBuilder plugin   |
-
+| option                   | description                      |
+| ------------------------ | -------------------------------- |
+| `messageBuilder.enabled` | enable the messageBuilder plugin |
 
 ### `useContracts` Hook
 
 Generates `useContracts` hook to easily access contracts, already equipped with a signing client
 
-| option                           | description                             |
-| -------------------------------- | --------------------------------------- |
-| `useContractsHook.enabled`       | enable the `useContracts` plugin        |
+| option                     | description                      |
+| -------------------------- | -------------------------------- |
+| `useContractsHook.enabled` | enable the `useContracts` plugin |
 
 #### Example Output
 
-- [Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
-- [Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
-- [Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
-- [Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+- [Provider](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+- [Contract Providers](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+- [Contract Context](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+- [Context Base](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
 
 #### Use Contracts Provider Usage
 
 ```tsx
-import { useChain } from '@cosmos-kit/react';
-import { ContractsProvider } from '../path/to/codegen/contracts-context';
+import { useChain } from "@cosmos-kit/react";
+import { ContractsProvider } from "../path/to/codegen/contracts-context";
 
 export default function YourComponent() {
-
-  const {
-    address,
-    getCosmWasmClient,
-    getSigningCosmWasmClient
-  } = useChain(chainName);
+  const { address, getCosmWasmClient, getSigningCosmWasmClient } =
+    useChain(chainName);
 
   return (
     <ContractsProvider
@@ -234,10 +228,10 @@ export default function YourComponent() {
         getSigningCosmWasmClient,
       }}
     >
-        <SomeCoolComponent />
+      <SomeCoolComponent />
     </ContractsProvider>
-  )
-};
+  );
+}
 ```
 
 #### Use Contracts Provider Babel/TSC config
@@ -245,11 +239,7 @@ export default function YourComponent() {
 If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
 
 ```js
- presets: [
-   '@babel/typescript',
-   '@babel/env',
-   '@babel/preset-react',
- ]
+presets: ["@babel/typescript", "@babel/env", "@babel/preset-react"];
 ```
 
 For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
@@ -279,26 +269,24 @@ await marketplaceClient.updateAskPrice({
 The bundler will make a nice package of all your contracts. For example:
 
 ```ts
-const {
-  MinterQueryClient,
-  useMinterConfigQuery
-} = contracts.Minter;
+const { MinterQueryClient, useMinterConfigQuery } = contracts.Minter;
 
 const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 ```
+
 #### Bundler Options
 
-| option                | description                                                                      |
-| --------------------- | -------------------------------------------------------------------------------- |
-| `bundle.enabled`      | enable the bundler plugin                                                        |
-| `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
-| `bundle.bundleFile`   | name of the bundle file                                                          |
+| option              | description                                                                      |
+| ------------------- | -------------------------------------------------------------------------------- |
+| `bundle.enabled`    | enable the bundler plugin                                                        |
+| `bundle.scope`      | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
+| `bundle.bundleFile` | name of the bundle file                                                          |
 
 #### Coding Style
 
-| option                | description                          | default |
-| --------------------- | ------------------------------------ | ------- |
-| `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
+| option             | description                         | default |
+| ------------------ | ----------------------------------- | ------- |
+| `useShorthandCtor` | Enable using shorthand constructor. | true    |
 
 Using shorthand constructor (Might not be transpiled correctly with babel):
 
@@ -386,9 +374,10 @@ cosmwasm-ts-codegen generate
  ◯ recoil
  ◯ react-query
  ◯ message-composer
- ```
+```
 
 In this example, you can press space bar to select a number of plugins you wish you enable.
+
 #### Specifying Plugins
 
 Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
@@ -399,7 +388,7 @@ ts-codegen generate \
     --schema ./schema \
     --out ./ts \
     --name MyContractName
- ```
+```
 
 You can specify multiple `--plugin` options using the `generate` command:
 
@@ -465,7 +454,6 @@ ts-codegen generate \
     --name MyContractName
 ```
 
-
 #### React Query via CLI
 
 Here is an example without optional client, using v3 for `react-query`, without mutations:
@@ -528,6 +516,7 @@ ts-codegen generate \
 ### JSON Schema
 
 We generate code from the [JSON Schema](https://json-schema.org/) exported from CosmWasm smart contracts.
+
 ### JSON Schema Generation
 
 Currently you have to have the JSON Schema output. Here is an example to start.
@@ -546,7 +535,9 @@ now build the schema with `cargo schema`
 cd contracts/sg721/
 cargo schema
 ```
+
 ### Exporting Schemas
+
 #### `cosmwasm v1.1` Example
 
 Using the new `write_api` method, you can export schemas:
@@ -608,23 +599,23 @@ yarn test:watch
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
+See the [docs](https://github.com/hyperweb-io/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
 
-## Interchain JavaScript Stack 
+## Interchain JavaScript Stack
 
 A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
 
-| Category              | Tools                                                                                                                  | Description                                                                                           |
-|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
-| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
-| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
-| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
-| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
-| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
-| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
-| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
-| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
-| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
+| Category                       | Tools                                                                                                                                                                                                     | Description                                                                                                         |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| **Chain Information**          | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**          | [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit)                                                           | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.    |
+| **Signing Clients**            | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs)                                                                            | A single, universal signing interface for any network                                                               |
+| **SDK Clients**                | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                                                                                                                 | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.                                       |
+| **Starter Kits**               | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app)                               | Set up a modern Interchain app by running one command.                                                              |
+| **UI Kits**                    | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                                                                                                         | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.                            |
+| **Testing Frameworks**         | [**Starship**](https://github.com/hyperweb-io/starship)                                                                                                                                                   | Unified Testing and Development for the Interchain.                                                                 |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                                                                                                                             | Build and deploy full-stack blockchain applications with TypeScript                                                 |
+| **CosmWasm Contracts**         | [**CosmWasm TS Codegen**](https://github.com/hyperweb-io/ts-codegen)                                                                                                                                      | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.                                         |
 
 ## Credits
 
diff --git a/docs/index.mdx b/docs/index.mdx
index cfbebb87..c08bb6f0 100644
--- a/docs/index.mdx
+++ b/docs/index.mdx
@@ -23,11 +23,11 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
 >
   <a
     style={{ paddingRight: "4px" }}
-    href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml"
+    href="https://github.com/hyperweb-io/ts-codegen/actions/workflows/run-tests.yaml"
   >
     <img
       height="20"
-      src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg"
+      src="https://github.com/hyperweb-io/ts-codegen/actions/workflows/run-tests.yaml/badge.svg"
     />
   </a>
   <a
@@ -38,13 +38,13 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   </a>
   <a
     style={{ paddingRight: "4px" }}
-    href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"
+    href="https://github.com/hyperweb-io/ts-codegen/blob/main/LICENSE-MIT"
   >
     <img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg" />
   </a>
   <a
     style={{ paddingRight: "4px" }}
-    href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"
+    href="https://github.com/hyperweb-io/ts-codegen/blob/main/LICENSE-Apache"
   >
     <img
       height="20"
@@ -675,7 +675,7 @@ yarn test:watch
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `ast` package.
+See the [docs](https://github.com/hyperweb-io/ts-codegen/blob/main/packages/ast/README.md) in the `ast` package.
 
 ## Related
 
diff --git a/lerna.json b/lerna.json
index 75f2aab3..ec75cf99 100644
--- a/lerna.json
+++ b/lerna.json
@@ -12,7 +12,7 @@
   "registry": "https://registry.npmjs.org",
   "command": {
     "create": {
-      "homepage": "https://github.com/cosmwasm/ts-codegen",
+      "homepage": "https://github.com/hyperweb-io/ts-codegen",
       "license": "SEE LICENSE IN LICENSE",
       "access": "restricted"
     },
diff --git a/package.json b/package.json
index 23ac74ab..6bcee753 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,6 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/cosmwasm/ts-codegen"
+    "url": "https://github.com/hyperweb-io/ts-codegen"
   }
 }
diff --git a/packages/ast/README.md b/packages/ast/README.md
index 01e15eb3..479623b3 100644
--- a/packages/ast/README.md
+++ b/packages/ast/README.md
@@ -113,37 +113,37 @@ You will see a `File` and `Program`... only concern yourself with the `body[]`:
 NOTE: 4 continued ideally you should be writing a test with your generator!
 
 ```js
-import * as t from '@babel/types';
+import * as t from "@babel/types";
 
 export const createNewGenerator = () => {
-    return t.exportNamedDeclaration(
-        t.tsInterfaceDeclaration(
-            t.identifier('InstantiateMsg'),
-            null,
-            [],
-            t.tsInterfaceBody([
-                // ... more code ...
-            ])
-        )
-    );
+  return t.exportNamedDeclaration(
+    t.tsInterfaceDeclaration(
+      t.identifier("InstantiateMsg"),
+      null,
+      [],
+      t.tsInterfaceBody([
+        // ... more code ...
+      ])
+    )
+  );
 };
 ```
 
-## Interchain JavaScript Stack 
+## Interchain JavaScript Stack
 
 A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
 
-| Category              | Tools                                                                                                                  | Description                                                                                           |
-|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
-| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
-| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
-| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
-| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
-| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
-| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
-| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
-| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
-| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
+| Category                       | Tools                                                                                                                                                                                                     | Description                                                                                                         |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| **Chain Information**          | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**          | [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit)                                                           | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.    |
+| **Signing Clients**            | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs)                                                                            | A single, universal signing interface for any network                                                               |
+| **SDK Clients**                | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                                                                                                                 | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.                                       |
+| **Starter Kits**               | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app)                               | Set up a modern Interchain app by running one command.                                                              |
+| **UI Kits**                    | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                                                                                                         | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.                            |
+| **Testing Frameworks**         | [**Starship**](https://github.com/hyperweb-io/starship)                                                                                                                                                   | Unified Testing and Development for the Interchain.                                                                 |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                                                                                                                             | Build and deploy full-stack blockchain applications with TypeScript                                                 |
+| **CosmWasm Contracts**         | [**CosmWasm TS Codegen**](https://github.com/hyperweb-io/ts-codegen)                                                                                                                                      | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.                                         |
 
 ## Credits
 
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 28d074dc..24a9bb36 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -3,7 +3,7 @@
   "version": "1.8.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/ast#readme",
+  "homepage": "https://github.com/hyperweb-io/ts-codegen/tree/master/packages/ast#readme",
   "license": "SEE LICENSE IN LICENSE",
   "main": "index.js",
   "module": "esm/index.js",
@@ -27,11 +27,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/cosmwasm/ts-codegen"
+    "url": "https://github.com/hyperweb-io/ts-codegen"
   },
   "keywords": [],
   "bugs": {
-    "url": "https://github.com/cosmwasm/ts-codegen/issues"
+    "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
   "dependencies": {
     "@babel/types": "7.24.0",
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index b152da64..a59212fa 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -7,8 +7,8 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
 </p>
 
 <p align="center" width="100%">
-  <a href="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml">
-    <img height="20" src="https://github.com/CosmWasm/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
+  <a href="https://github.com/hyperweb-io/ts-codegen/actions/workflows/run-tests.yaml">
+    <img height="20" src="https://github.com/hyperweb-io/ts-codegen/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
   <a href="https://github.com/hyperweb-io/lib-count">
   <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Ftotal.json"/>  
@@ -17,12 +17,11 @@ Generate TypeScript SDKs for your CosmWasm smart contracts
   <img height="20" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fhyperweb-io%2Flib-count%2Fmain%2Foutput%2Fbadges%2Fproducts%2Fcosmwasm%2Fmonthly.json"/>  
   </a>
   <br />
-  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
-  <a href="https://github.com/CosmWasm/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
+  <a href="https://github.com/hyperweb-io/ts-codegen/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
+  <a href="https://github.com/hyperweb-io/ts-codegen/blob/main/LICENSE-Apache"><img height="20" src="https://img.shields.io/badge/license-Apache-blue.svg"></a>
   <a href="https://www.npmjs.com/package/@cosmwasm/ts-codegen"><img height="20" src="https://img.shields.io/github/package-json/v/CosmWasm/ts-codegen?filename=packages%2Fts-codegen%2Fpackage.json"></a>
 </p>
 
-
 ```
 npm install @cosmwasm/ts-codegen
 ```
@@ -30,25 +29,26 @@ npm install @cosmwasm/ts-codegen
 The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-codegen` converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.
 
 🎥 [Checkout our video playlist](https://cosmology.zone/learn/ts-codegen) to learn how to use `ts-codegen`!
+
 ## Table of contents
 
 - [@cosmwasm/ts-codegen](#cosmwasmts-codegen)
   - [Table of contents](#table-of-contents)
 - [Usage](#usage)
-    - [Programmatic Usage](#programmatic-usage)
-    - [Types](#types)
-    - [TS Clients](#client)
-    - [React Query](#react-query)
-    - [Recoil](#recoil)
-    - [Message Composer](#message-composer)
-    - [Message Builder](#message-builder)
-    - [Use Contracts Hook](#use-contracts-hooks-usage)
-    - [Bundles](#bundles)
-    - [CLI Usage and Examples](#cli-usage-and-examples)
-    - [Advanced Usage](#advanced-usage)
+  - [Programmatic Usage](#programmatic-usage)
+  - [Types](#types)
+  - [TS Clients](#client)
+  - [React Query](#react-query)
+  - [Recoil](#recoil)
+  - [Message Composer](#message-composer)
+  - [Message Builder](#message-builder)
+  - [Use Contracts Hook](#use-contracts-hooks-usage)
+  - [Bundles](#bundles)
+  - [CLI Usage and Examples](#cli-usage-and-examples)
+  - [Advanced Usage](#advanced-usage)
 - [JSON Schema](#json-schema)
-    - [JSON Schema Generation](#json-schema-generation)
-    - [Exporting Schemas](#exporting-schemas)
+  - [JSON Schema Generation](#json-schema-generation)
+  - [Exporting Schemas](#exporting-schemas)
 - [Developing](#developing)
 - [Related](#related)
 
@@ -59,93 +59,93 @@ The quickest and easiest way to interact with CosmWasm Contracts. `@cosmwasm/ts-
 For production usage, we recommend setting up a build script that uses the main entry point:
 
 ```ts
-import codegen from '@cosmwasm/ts-codegen';
+import codegen from "@cosmwasm/ts-codegen";
 
 codegen({
   contracts: [
     {
-      name: 'SG721',
-      dir: './path/to/sg721/schema'
+      name: "SG721",
+      dir: "./path/to/sg721/schema",
     },
     {
-      name: 'Minter',
-      dir: './path/to/Minter/schema'
-    }
+      name: "Minter",
+      dir: "./path/to/Minter/schema",
+    },
   ],
-  outPath: './path/to/code/src/',
+  outPath: "./path/to/code/src/",
 
   // options are completely optional ;)
   options: {
     bundle: {
-      bundleFile: 'index.ts',
-      scope: 'contracts'
+      bundleFile: "index.ts",
+      scope: "contracts",
     },
     types: {
-      enabled: true
+      enabled: true,
     },
     client: {
-      enabled: true
+      enabled: true,
     },
     reactQuery: {
       enabled: true,
       optionalClient: true,
-      version: 'v4',
+      version: "v4",
       mutations: true,
       queryKeys: true,
       queryFactory: true,
     },
     recoil: {
-      enabled: false
+      enabled: false,
     },
     messageComposer: {
-      enabled: false
+      enabled: false,
     },
     messageBuilder: {
-      enabled: false
+      enabled: false,
     },
     useContractsHook: {
-      enabled: false
-    }
-  }
+      enabled: false,
+    },
+  },
 }).then(() => {
-  console.log('✨ all done!');
+  console.log("✨ all done!");
 });
 ```
+
 #### Types
 
 Typescript types and interfaces are generated in separate files so they can be imported into various generated plugins.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.types.ts)
 
 #### Types Options
 
-| option                   | description                                          |
-| ------------------------ | ---------------------------------------------------- |
-| `types.enabled`          | enable type generation                               |
-| `types.aliasExecuteMsg`  | generate a type alias based on the contract name     |
-| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name     |
+| option                   | description                                                           |
+| ------------------------ | --------------------------------------------------------------------- |
+| `types.enabled`          | enable type generation                                                |
+| `types.aliasExecuteMsg`  | generate a type alias based on the contract name                      |
+| `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name |
 
 ### Client
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts )
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.client.ts)
 
 #### Client Options
 
-| option                                  | description                                          |
-| --------------------------------------- | ---------------------------------------------------  |
-| `client.enabled`                        | generate TS client classes for your contracts        |
-| `client.execExtendsQuery`               | execute should extend query message clients          |
-| `client.noImplicitOverride`             | should match your tsconfig noImplicitOverride option |
-| `client.useDeclareKeyword`              | use declare keyword for inherited class fields       |
-
+| option                      | description                                          |
+| --------------------------- | ---------------------------------------------------- |
+| `client.enabled`            | generate TS client classes for your contracts        |
+| `client.execExtendsQuery`   | execute should extend query message clients          |
+| `client.noImplicitOverride` | should match your tsconfig noImplicitOverride option |
+| `client.useDeclareKeyword`  | use declare keyword for inherited class fields       |
 
 ### React Query
 
 Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query v4](https://tanstack.com/query/v4/) bindings for your contracts with the `react-query` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.react-query.ts)
 
 #### React Query Options
 
@@ -159,72 +159,66 @@ Generate [react-query v3](https://react-query-v3.tanstack.com/) or [react-query
 | `reactQuery.mutations`      | also generate mutations                                                      |
 | `reactQuery.camelize`       | use camelCase style for property names                                       |
 
-
 ### Recoil
 
 Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `recoil` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.recoil.ts)
 
 #### Recoil Options
 
-| option                         | description                                                         |
-| ------------------------------ | ------------------------------------------------------------------- |
-| `recoil.enabled`               | enable the recoil plugin                                            |
+| option           | description              |
+| ---------------- | ------------------------ |
+| `recoil.enabled` | enable the recoil plugin |
 
 ### Message Composer
 
 Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 
 #### Message Composer Options
 
-| option                         | description                                                         |
-| ------------------------------ | ------------------------------------------------------------------- |
-| `messageComposer.enabled`      | enable the messageComposer plugin                                   |
+| option                    | description                       |
+| ------------------------- | --------------------------------- |
+| `messageComposer.enabled` | enable the messageComposer plugin |
 
 ### Message Builder
 
 Generate raw message jsons for use in your application with the `message-builder` command.
 
-[see example output code](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
+[see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-builder.ts)
 
 #### Message Builder Options
 
-| option                   | description                        |
-|------------------------- | ---------------------------------- |
-| `messageBuilder.enabled` | enable the messageBuilder plugin   |
-
+| option                   | description                      |
+| ------------------------ | -------------------------------- |
+| `messageBuilder.enabled` | enable the messageBuilder plugin |
 
 ### `useContracts` Hook
 
 Generates `useContracts` hook to easily access contracts, already equipped with a signing client
 
-| option                           | description                             |
-| -------------------------------- | --------------------------------------- |
-| `useContractsHook.enabled`       | enable the `useContracts` plugin        |
+| option                     | description                      |
+| -------------------------- | -------------------------------- |
+| `useContractsHook.enabled` | enable the `useContracts` plugin |
 
 #### Example Output
 
-- [Provider](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
-- [Contract Providers](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
-- [Contract Context](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
-- [Context Base](https://github.com/CosmWasm/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
+- [Provider](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/Factory.provider.ts)
+- [Contract Providers](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextProviders.ts)
+- [Contract Context](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contracts-context.tsx)
+- [Context Base](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/builder/bundler_test/contracts/contractContextBase.ts)
 
 #### Use Contracts Provider Usage
 
 ```tsx
-import { useChain } from '@cosmos-kit/react';
-import { ContractsProvider } from '../path/to/codegen/contracts-context';
+import { useChain } from "@cosmos-kit/react";
+import { ContractsProvider } from "../path/to/codegen/contracts-context";
 
 export default function YourComponent() {
-
-  const {
-    address,
-    getCosmWasmClient,
-    getSigningCosmWasmClient
-  } = useChain(chainName);
+  const { address, getCosmWasmClient, getSigningCosmWasmClient } =
+    useChain(chainName);
 
   return (
     <ContractsProvider
@@ -234,10 +228,10 @@ export default function YourComponent() {
         getSigningCosmWasmClient,
       }}
     >
-        <SomeCoolComponent />
+      <SomeCoolComponent />
     </ContractsProvider>
-  )
-};
+  );
+}
 ```
 
 #### Use Contracts Provider Babel/TSC config
@@ -245,11 +239,7 @@ export default function YourComponent() {
 If you're using Babel, please make sure include `'@babel/preset-react'` in devDeps and presets in `.babelrc.js`:
 
 ```js
- presets: [
-   '@babel/typescript',
-   '@babel/env',
-   '@babel/preset-react',
- ]
+presets: ["@babel/typescript", "@babel/env", "@babel/preset-react"];
 ```
 
 For `tsc`, you should set the `jsx` option to `'react'` in your `tsconfig.json`.
@@ -279,26 +269,24 @@ await marketplaceClient.updateAskPrice({
 The bundler will make a nice package of all your contracts. For example:
 
 ```ts
-const {
-  MinterQueryClient,
-  useMinterConfigQuery
-} = contracts.Minter;
+const { MinterQueryClient, useMinterConfigQuery } = contracts.Minter;
 
 const { CwAdminFactoryClient } = contracts.CwAdminFactory;
 ```
+
 #### Bundler Options
 
-| option                | description                                                                      |
-| --------------------- | -------------------------------------------------------------------------------- |
-| `bundle.enabled`      | enable the bundler plugin                                                        |
-| `bundle.scope`        | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
-| `bundle.bundleFile`   | name of the bundle file                                                          |
+| option              | description                                                                      |
+| ------------------- | -------------------------------------------------------------------------------- |
+| `bundle.enabled`    | enable the bundler plugin                                                        |
+| `bundle.scope`      | name of the scope, defaults to `contracts` (you can use `.` to make more scopes) |
+| `bundle.bundleFile` | name of the bundle file                                                          |
 
 #### Coding Style
 
-| option                | description                          | default |
-| --------------------- | ------------------------------------ | ------- |
-| `useShorthandCtor`    |  Enable using shorthand constructor. | true    |
+| option             | description                         | default |
+| ------------------ | ----------------------------------- | ------- |
+| `useShorthandCtor` | Enable using shorthand constructor. | true    |
 
 Using shorthand constructor (Might not be transpiled correctly with babel):
 
@@ -386,9 +374,10 @@ cosmwasm-ts-codegen generate
  ◯ recoil
  ◯ react-query
  ◯ message-composer
- ```
+```
 
 In this example, you can press space bar to select a number of plugins you wish you enable.
+
 #### Specifying Plugins
 
 Additionally, it will also show you the name of the field (in this case `plugin`) so you can specify the parameter (for example when using CI/CD) on the comand line. Here is an exampl with `--plugin` set to `client` via CLI:
@@ -399,7 +388,7 @@ ts-codegen generate \
     --schema ./schema \
     --out ./ts \
     --name MyContractName
- ```
+```
 
 You can specify multiple `--plugin` options using the `generate` command:
 
@@ -465,7 +454,6 @@ ts-codegen generate \
     --name MyContractName
 ```
 
-
 #### React Query via CLI
 
 Here is an example without optional client, using v3 for `react-query`, without mutations:
@@ -528,6 +516,7 @@ ts-codegen generate \
 ### JSON Schema
 
 We generate code from the [JSON Schema](https://json-schema.org/) exported from CosmWasm smart contracts.
+
 ### JSON Schema Generation
 
 Currently you have to have the JSON Schema output. Here is an example to start.
@@ -546,7 +535,9 @@ now build the schema with `cargo schema`
 cd contracts/sg721/
 cargo schema
 ```
+
 ### Exporting Schemas
+
 #### `cosmwasm v1.1` Example
 
 Using the new `write_api` method, you can export schemas:
@@ -608,23 +599,23 @@ yarn test:watch
 
 ### Working with ASTs
 
-See the [docs](https://github.com/CosmWasm/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
+See the [docs](https://github.com/hyperweb-io/ts-codegen/blob/main/packages/ast/README.md) in the `@cosmwasm/ts-codegen-ast` package.
 
-## Interchain JavaScript Stack 
+## Interchain JavaScript Stack
 
 A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
 
-| Category              | Tools                                                                                                                  | Description                                                                                           |
-|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
-| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
-| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
-| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
-| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
-| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
-| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
-| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
-| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
-| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
+| Category                       | Tools                                                                                                                                                                                                     | Description                                                                                                         |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| **Chain Information**          | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**          | [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit)                                                           | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.    |
+| **Signing Clients**            | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs)                                                                            | A single, universal signing interface for any network                                                               |
+| **SDK Clients**                | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                                                                                                                 | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.                                       |
+| **Starter Kits**               | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app)                               | Set up a modern Interchain app by running one command.                                                              |
+| **UI Kits**                    | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                                                                                                         | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.                            |
+| **Testing Frameworks**         | [**Starship**](https://github.com/hyperweb-io/starship)                                                                                                                                                   | Unified Testing and Development for the Interchain.                                                                 |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                                                                                                                             | Build and deploy full-stack blockchain applications with TypeScript                                                 |
+| **CosmWasm Contracts**         | [**CosmWasm TS Codegen**](https://github.com/hyperweb-io/ts-codegen)                                                                                                                                      | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.                                         |
 
 ## Credits
 
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e80ec591..7a4d26da 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -3,7 +3,7 @@
   "version": "1.12.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/cosmwasm/ts-codegen",
+  "homepage": "https://github.com/hyperweb-io/ts-codegen",
   "license": "SEE LICENSE IN LICENSE",
   "main": "index.js",
   "module": "esm/index.js",
@@ -30,10 +30,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/cosmwasm/ts-codegen"
+    "url": "https://github.com/hyperweb-io/ts-codegen"
   },
   "bugs": {
-    "url": "https://github.com/cosmwasm/ts-codegen/issues"
+    "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
   "devDependencies": {
     "@cosmjs/cosmwasm-stargate": "0.32.3",
diff --git a/packages/types/README.md b/packages/types/README.md
index 57978cd5..e0646087 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -1,22 +1,22 @@
 # @cosmwasm/ts-codegen-types
 
-Types for [@cosmwasm/ts-codegen](https://github.com/CosmWasm/ts-codegen)
+Types for [@cosmwasm/ts-codegen](https://github.com/hyperweb-io/ts-codegen)
 
-## Interchain JavaScript Stack 
+## Interchain JavaScript Stack
 
 A unified toolkit for building applications and smart contracts in the Interchain ecosystem ⚛️
 
-| Category              | Tools                                                                                                                  | Description                                                                                           |
-|----------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
-| **Chain Information**   | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
-| **Wallet Connectors**| [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit) | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface. |
-| **Signing Clients**          | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs) | A single, universal signing interface for any network |
-| **SDK Clients**              | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                          | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules. |
-| **Starter Kits**     | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app) | Set up a modern Interchain app by running one command. |
-| **UI Kits**          | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                   | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit. |
-| **Testing Frameworks**          | [**Starship**](https://github.com/hyperweb-io/starship)                                                             | Unified Testing and Development for the Interchain. |
-| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                              | Build and deploy full-stack blockchain applications with TypeScript |
-| **CosmWasm Contracts** | [**CosmWasm TS Codegen**](https://github.com/CosmWasm/ts-codegen)                                                   | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes. |
+| Category                       | Tools                                                                                                                                                                                                     | Description                                                                                                         |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| **Chain Information**          | [**Chain Registry**](https://github.com/hyperweb-io/chain-registry), [**Utils**](https://www.npmjs.com/package/@chain-registry/utils), [**Client**](https://www.npmjs.com/package/@chain-registry/client) | Everything from token symbols, logos, and IBC denominations for all assets you want to support in your application. |
+| **Wallet Connectors**          | [**Interchain Kit**](https://github.com/hyperweb-io/interchain-kit)<sup>beta</sup>, [**Cosmos Kit**](https://github.com/hyperweb-io/cosmos-kit)                                                           | Experience the convenience of connecting with a variety of web3 wallets through a single, streamlined interface.    |
+| **Signing Clients**            | [**InterchainJS**](https://github.com/hyperweb-io/interchainjs)<sup>beta</sup>, [**CosmJS**](https://github.com/cosmos/cosmjs)                                                                            | A single, universal signing interface for any network                                                               |
+| **SDK Clients**                | [**Telescope**](https://github.com/hyperweb-io/telescope)                                                                                                                                                 | Your Frontend Companion for Building with TypeScript with Cosmos SDK Modules.                                       |
+| **Starter Kits**               | [**Create Interchain App**](https://github.com/hyperweb-io/create-interchain-app)<sup>beta</sup>, [**Create Cosmos App**](https://github.com/hyperweb-io/create-cosmos-app)                               | Set up a modern Interchain app by running one command.                                                              |
+| **UI Kits**                    | [**Interchain UI**](https://github.com/hyperweb-io/interchain-ui)                                                                                                                                         | The Interchain Design System, empowering developers with a flexible, easy-to-use UI kit.                            |
+| **Testing Frameworks**         | [**Starship**](https://github.com/hyperweb-io/starship)                                                                                                                                                   | Unified Testing and Development for the Interchain.                                                                 |
+| **TypeScript Smart Contracts** | [**Create Hyperweb App**](https://github.com/hyperweb-io/create-hyperweb-app)                                                                                                                             | Build and deploy full-stack blockchain applications with TypeScript                                                 |
+| **CosmWasm Contracts**         | [**CosmWasm TS Codegen**](https://github.com/hyperweb-io/ts-codegen)                                                                                                                                      | Convert your CosmWasm smart contracts into dev-friendly TypeScript classes.                                         |
 
 ## Credits
 
diff --git a/packages/types/package.json b/packages/types/package.json
index b7d2b108..e376f5ae 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -3,7 +3,7 @@
   "version": "1.3.1",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/cosmwasm/ts-codegen/tree/master/packages/types#readme",
+  "homepage": "https://github.com/hyperweb-io/ts-codegen/tree/master/packages/types#readme",
   "license": "SEE LICENSE IN LICENSE",
   "main": "index.js",
   "module": "esm/index.js",
@@ -23,10 +23,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/cosmwasm/ts-codegen"
+    "url": "https://github.com/hyperweb-io/ts-codegen"
   },
   "keywords": [],
   "bugs": {
-    "url": "https://github.com/cosmwasm/ts-codegen/issues"
+    "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   }
 }

From 941dfbd6cee448fb878c63e011c9134ee789a8b1 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 11:33:28 +0200
Subject: [PATCH 266/287] Upgrade glob to v10

---
 package.json                                  |  2 +-
 packages/ast/test-utils/utils.ts              |  2 +-
 packages/ts-codegen/package.json              |  2 +-
 packages/ts-codegen/scripts/cmds.ts           |  2 +-
 .../src/commands/create-boilerplate.ts        |  2 +-
 packages/ts-codegen/src/commands/install.ts   |  2 +-
 packages/ts-codegen/src/utils/schemas.ts      |  2 +-
 yarn.lock                                     | 50 +++++++++++++++----
 8 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 7ec5c4c4..ed3b6e34 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-unused-imports": "^4.0.0",
-    "glob": "8.0.3",
+    "glob": "^10",
     "jest": "^29.6.2",
     "jest-in-case": "^1.0.2",
     "lerna": "^6",
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index f16ad2a3..f6d5202c 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -7,7 +7,7 @@ import {
   QueryMsg,
 } from '@cosmwasm/ts-codegen-types';
 import { readFileSync } from 'fs';
-import { sync as glob } from 'glob';
+import { globSync as glob } from 'glob';
 import { join } from 'path';
 
 import { RenderContext } from '../src/context';
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 33b18ca1..9f5fe0e0 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -53,7 +53,7 @@
     "dargs": "7.0.0",
     "deepmerge": "4.2.2",
     "fuzzy": "0.1.3",
-    "glob": "8.0.3",
+    "glob": "^10",
     "inquirerer": "0.1.3",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
diff --git a/packages/ts-codegen/scripts/cmds.ts b/packages/ts-codegen/scripts/cmds.ts
index 28dc2316..e26c38b4 100644
--- a/packages/ts-codegen/scripts/cmds.ts
+++ b/packages/ts-codegen/scripts/cmds.ts
@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const glob = require('glob').sync;
+const { globSync: glob } = require('glob');
 const Case = require('case');
 const srcDir = path.resolve(`${__dirname}/../src/commands`);
 
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 5cf68e94..7381a709 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -4,7 +4,7 @@ import * as shell from 'shelljs';
 
 import { prompt } from '../utils/prompt';
 
-const glob = require('glob').sync;
+const { globSync: glob } = require('glob');
 const fs = require('fs');
 const path = require('path');
 
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index 5f32a181..70987dfe 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -1,6 +1,6 @@
 import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 import { readFileSync, writeFileSync } from 'fs';
-import { sync as glob } from 'glob';
+import { globSync as glob } from 'glob';
 import { sync as mkdirp } from 'mkdirp';
 import { tmpdir } from 'os';
 import { parse } from 'parse-package-name';
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 25e55e03..28e15a68 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -7,7 +7,7 @@ import {
 } from '@cosmwasm/ts-codegen-types';
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { readFileSync } from 'fs';
-import { sync as glob } from 'glob';
+import { globSync as glob } from 'glob';
 
 import { cleanse } from './cleanse';
 import { parser } from './parse';
diff --git a/yarn.lock b/yarn.lock
index d0d93d97..afe92b26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3625,17 +3625,6 @@ glob@7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 glob@8.1.0, glob@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
@@ -3647,6 +3636,18 @@ glob@8.1.0, glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+glob@^10:
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
 glob@^10.0.0, glob@^10.2.2:
   version "10.3.12"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
@@ -4332,6 +4333,15 @@ jackspeak@^2.3.6:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.7"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
@@ -5387,6 +5397,11 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
   integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
+minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
+
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -5989,6 +6004,11 @@ p-waterfall@2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
+package-json-from-dist@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
+
 pacote@15.1.1:
   version "15.1.1"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348"
@@ -6128,6 +6148,14 @@ path-scurry@^1.10.2, path-scurry@^1.6.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"

From 3d92765d6405d259af41ac5229e7d3cf656c6335 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 11:43:04 +0200
Subject: [PATCH 267/287] Ignore __fixtures__/ and __output__/ for prettier

---
 .prettierignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..1dcd66b2
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+__fixtures__/
+__output__/

From 7b9b90fd51967a7e81c91bcf9387a1af370cad39 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 11:46:16 +0200
Subject: [PATCH 268/287] Add autofix.ci CI job

---
 .github/workflows/autofix.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/autofix.yml

diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
new file mode 100644
index 00000000..171da622
--- /dev/null
+++ b/.github/workflows/autofix.yml
@@ -0,0 +1,27 @@
+name: autofix.ci # needed to securely identify the workflow
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache --check-cache
+
+      - name: Format
+        run: yarn format
+
+      # See https://autofix.ci/
+      - uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27

From adf349c64f0a8dcc1fe023b564d036aba7c6edbc Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 11:48:31 +0200
Subject: [PATCH 269/287] Add lint job to CI

---
 .github/workflows/lint.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..3f46afdc
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,30 @@
+
+name: Lint
+
+on:
+  pull_request:
+  push:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache --check-cache
+
+      - name: Build
+        run: yarn build
+
+      - name: Lint
+        run: yarn lint

From 82a03bd887c8c0efe8eb531a8f732b53f79d10bc Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 11:52:35 +0200
Subject: [PATCH 270/287] Upgrade deps

---
 yarn.lock | 1713 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 961 insertions(+), 752 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index afe92b26..b69aa0b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
 "@ampproject/remapping@^2.2.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
@@ -15,41 +10,42 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
-  version "7.24.2"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
-  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
+  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
   dependencies:
-    "@babel/highlight" "^7.24.2"
-    picocolors "^1.0.0"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    js-tokens "^4.0.0"
+    picocolors "^1.1.1"
 
-"@babel/compat-data@^7.23.5":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
-  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
+"@babel/compat-data@^7.27.2":
+  version "7.27.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.5.tgz#7d0658ec1a8420fc866d1df1b03bea0e79934c82"
+  integrity sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==
 
 "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
-  integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==
+  version "7.27.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.4.tgz#cc1fc55d0ce140a1828d1dd2a2eba285adbfb3ce"
+  integrity sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.24.2"
-    "@babel/generator" "^7.24.4"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.24.4"
-    "@babel/parser" "^7.24.4"
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-module-transforms" "^7.27.3"
+    "@babel/helpers" "^7.27.4"
+    "@babel/parser" "^7.27.4"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.27.4"
+    "@babel/types" "^7.27.3"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@7.24.4", "@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
+"@babel/generator@7.24.4":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
   integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
@@ -59,112 +55,108 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+"@babel/generator@^7.24.1", "@babel/generator@^7.27.3", "@babel/generator@^7.7.2":
+  version "7.27.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.5.tgz#3eb01866b345ba261b04911020cbe22dd4be8c8c"
+  integrity sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==
+  dependencies:
+    "@babel/parser" "^7.27.5"
+    "@babel/types" "^7.27.3"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
+
+"@babel/helper-compilation-targets@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
+  integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
   dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
+    "@babel/compat-data" "^7.27.2"
+    "@babel/helper-validator-option" "^7.27.1"
+    browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
 "@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
+  dependencies:
+    "@babel/types" "^7.24.7"
 
 "@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
 "@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
+  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-module-imports@^7.22.15":
-  version "7.24.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
-  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
+"@babel/helper-module-imports@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
+  integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==
   dependencies:
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-transforms@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
+  integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/traverse" "^7.27.3"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
-
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
-  dependencies:
-    "@babel/types" "^7.22.5"
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.27.1", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
+  integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
 
 "@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
-  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
+"@babel/helper-string-parser@^7.23.4", "@babel/helper-string-parser@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
+  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
+  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
 
-"@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+"@babel/helper-validator-option@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
+  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
-"@babel/helpers@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
-  integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
+"@babel/helpers@^7.27.4":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.6.tgz#6456fed15b2cb669d2d1fabe84b66b34991d812c"
+  integrity sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==
   dependencies:
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.6"
 
-"@babel/highlight@^7.24.2":
-  version "7.24.2"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
-  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.1", "@babel/parser@^7.27.2", "@babel/parser@^7.27.4", "@babel/parser@^7.27.5":
+  version "7.27.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.5.tgz#ed22f871f110aa285a6fd934a0efed621d118826"
+  integrity sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
-  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
+    "@babel/types" "^7.27.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -180,14 +172,28 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-import-meta@^7.8.3":
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-import-attributes@^7.24.7":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz#34c017d54496f9b11b61474e7ea3dfd5563ffe07"
+  integrity sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
@@ -202,13 +208,13 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.7.2":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
-  integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
+  integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -222,7 +228,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
@@ -250,7 +256,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
@@ -258,29 +271,27 @@
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844"
-  integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz#5147d29066a793450f220c63fa3a9431b7e6dd18"
+  integrity sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/runtime@^7.11.2":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
-  integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
-  dependencies:
-    regenerator-runtime "^0.14.0"
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6"
+  integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
 
-"@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
-  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
+"@babel/template@^7.24.7", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
 
-"@babel/traverse@7.24.1", "@babel/traverse@^7.24.1":
+"@babel/traverse@7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
   integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
@@ -296,7 +307,20 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@7.24.0", "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3":
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.27.4":
+  version "7.27.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.4.tgz#b0045ac7023c8472c3d35effd7cc9ebd638da6ea"
+  integrity sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/parser" "^7.27.4"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/types@7.24.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
   integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
@@ -305,6 +329,14 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.27.6", "@babel/types@^7.3.3":
+  version "7.27.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.6.tgz#a434ca7add514d4e646c80f7375c0aa2befc5535"
+  integrity sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -318,15 +350,15 @@
     "@noble/hashes" "^1.0.0"
     protobufjs "^6.8.8"
 
-"@cosmjs/amino@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.3.tgz#b81d4a2b8d61568431a1afcd871e1344a19d97ff"
-  integrity sha512-G4zXl+dJbqrz1sSJ56H/25l5NJEk/pAPIr8piAHgbXYw88OdAOlpA26PQvk2IbSN/rRgVbvlLTNgX2tzz1dyUA==
+"@cosmjs/amino@^0.32.3", "@cosmjs/amino@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.4.tgz#3908946c0394e6d431694c8992c5147079a1c860"
+  integrity sha512-zKYOt6hPy8obIFtLie/xtygCkH9ZROiQ12UHfKsOkWaZfPQUvVbtgmu6R4Kn1tFLI/SRkw7eqhaogmW/3NYu/Q==
   dependencies:
-    "@cosmjs/crypto" "^0.32.3"
-    "@cosmjs/encoding" "^0.32.3"
-    "@cosmjs/math" "^0.32.3"
-    "@cosmjs/utils" "^0.32.3"
+    "@cosmjs/crypto" "^0.32.4"
+    "@cosmjs/encoding" "^0.32.4"
+    "@cosmjs/math" "^0.32.4"
+    "@cosmjs/utils" "^0.32.4"
 
 "@cosmjs/cosmwasm-stargate@0.32.3":
   version "0.32.3"
@@ -344,108 +376,108 @@
     cosmjs-types "^0.9.0"
     pako "^2.0.2"
 
-"@cosmjs/crypto@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.3.tgz#787f8e659709678722068ee1ddf379f65051a25e"
-  integrity sha512-niQOWJHUtlJm2GG4F00yGT7sGPKxfUwz+2qQ30uO/E3p58gOusTcH2qjiJNVxb8vScYJhFYFqpm/OA/mVqoUGQ==
+"@cosmjs/crypto@^0.32.3", "@cosmjs/crypto@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.4.tgz#5d29633b661eaf092ddb3e7ea6299cfd6f4507a2"
+  integrity sha512-zicjGU051LF1V9v7bp8p7ovq+VyC91xlaHdsFOTo2oVry3KQikp8L/81RkXmUIT8FxMwdx1T7DmFwVQikcSDIw==
   dependencies:
-    "@cosmjs/encoding" "^0.32.3"
-    "@cosmjs/math" "^0.32.3"
-    "@cosmjs/utils" "^0.32.3"
+    "@cosmjs/encoding" "^0.32.4"
+    "@cosmjs/math" "^0.32.4"
+    "@cosmjs/utils" "^0.32.4"
     "@noble/hashes" "^1"
     bn.js "^5.2.0"
     elliptic "^6.5.4"
     libsodium-wrappers-sumo "^0.7.11"
 
-"@cosmjs/encoding@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.3.tgz#e245ff511fe4a0df7ba427b5187aab69e3468e5b"
-  integrity sha512-p4KF7hhv8jBQX3MkB3Defuhz/W0l3PwWVYU2vkVuBJ13bJcXyhU9nJjiMkaIv+XP+W2QgRceqNNgFUC5chNR7w==
+"@cosmjs/encoding@^0.32.3", "@cosmjs/encoding@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.4.tgz#646e0e809f7f4f1414d8fa991fb0ffe6c633aede"
+  integrity sha512-tjvaEy6ZGxJchiizzTn7HVRiyTg1i4CObRRaTRPknm5EalE13SV+TCHq38gIDfyUeden4fCuaBVEdBR5+ti7Hw==
   dependencies:
     base64-js "^1.3.0"
     bech32 "^1.1.4"
     readonly-date "^1.0.0"
 
-"@cosmjs/json-rpc@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.3.tgz#ccffdd7f722cecfab6daaa7463843b92f5d25355"
-  integrity sha512-JwFRWZa+Y95KrAG8CuEbPVOSnXO2uMSEBcaAB/FBU3Mo4jQnDoUjXvt3vwtFWxfAytrWCn1I4YDFaOAinnEG/Q==
+"@cosmjs/json-rpc@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.4.tgz#be91eb89ea78bd5dc02d0a9fa184dd6790790f0b"
+  integrity sha512-/jt4mBl7nYzfJ2J/VJ+r19c92mUKF0Lt0JxM3MXEJl7wlwW5haHAWtzRujHkyYMXOwIR+gBqT2S0vntXVBRyhQ==
   dependencies:
-    "@cosmjs/stream" "^0.32.3"
+    "@cosmjs/stream" "^0.32.4"
     xstream "^11.14.0"
 
-"@cosmjs/math@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.3.tgz#16e4256f4da507b9352327da12ae64056a2ba6c9"
-  integrity sha512-amumUtZs8hCCnV+lSBaJIiZkGabQm22QGg/IotYrhcmoOEOjt82n7hMNlNXRs7V6WLMidGrGYcswB5zcmp0Meg==
+"@cosmjs/math@^0.32.3", "@cosmjs/math@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.4.tgz#87ac9eadc06696e30a30bdb562a495974bfd0a1a"
+  integrity sha512-++dqq2TJkoB8zsPVYCvrt88oJWsy1vMOuSOKcdlnXuOA/ASheTJuYy4+oZlTQ3Fr8eALDLGGPhJI02W2HyAQaw==
   dependencies:
     bn.js "^5.2.0"
 
-"@cosmjs/proto-signing@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.3.tgz#91ae149b747d18666a6ccc924165b306431f7c0d"
-  integrity sha512-kSZ0ZUY0DwcRT0NcIn2HkadH4NKlwjfZgbLj1ABwh/4l0RgeT84QCscZCu63tJYq3K6auwqTiZSZERwlO4/nbg==
+"@cosmjs/proto-signing@^0.32.3", "@cosmjs/proto-signing@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.4.tgz#5a06e087c6d677439c8c9b25b5223d5e72c4cd93"
+  integrity sha512-QdyQDbezvdRI4xxSlyM1rSVBO2st5sqtbEIl3IX03uJ7YiZIQHyv6vaHVf1V4mapusCqguiHJzm4N4gsFdLBbQ==
   dependencies:
-    "@cosmjs/amino" "^0.32.3"
-    "@cosmjs/crypto" "^0.32.3"
-    "@cosmjs/encoding" "^0.32.3"
-    "@cosmjs/math" "^0.32.3"
-    "@cosmjs/utils" "^0.32.3"
+    "@cosmjs/amino" "^0.32.4"
+    "@cosmjs/crypto" "^0.32.4"
+    "@cosmjs/encoding" "^0.32.4"
+    "@cosmjs/math" "^0.32.4"
+    "@cosmjs/utils" "^0.32.4"
     cosmjs-types "^0.9.0"
 
-"@cosmjs/socket@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.3.tgz#fa5c36bf58e87c0ad865d6318ecb0f8d9c89a28a"
-  integrity sha512-F2WwNmaUPdZ4SsH6Uyreq3wQk7jpaEkb3wfOP951f5Jt6HCW/PxbxhKzHkAAf6+Sqks6SPhkbWoE8XaZpjL2KA==
+"@cosmjs/socket@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.4.tgz#86ab6adf3a442314774c0810b7a7cfcddf4f2082"
+  integrity sha512-davcyYziBhkzfXQTu1l5NrpDYv0K9GekZCC9apBRvL1dvMc9F/ygM7iemHjUA+z8tJkxKxrt/YPjJ6XNHzLrkw==
   dependencies:
-    "@cosmjs/stream" "^0.32.3"
+    "@cosmjs/stream" "^0.32.4"
     isomorphic-ws "^4.0.1"
     ws "^7"
     xstream "^11.14.0"
 
 "@cosmjs/stargate@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.3.tgz#5a92b222ada960ebecea72cc9f366370763f4b66"
-  integrity sha512-OQWzO9YWKerUinPIxrO1MARbe84XkeXJAW0lyMIjXIEikajuXZ+PwftiKA5yA+8OyditVmHVLtPud6Pjna2s5w==
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.4.tgz#bd0e4d3bf613b629addbf5f875d3d3b50f640af1"
+  integrity sha512-usj08LxBSsPRq9sbpCeVdyLx2guEcOHfJS9mHGCLCXpdAPEIEQEtWLDpEUc0LEhWOx6+k/ChXTc5NpFkdrtGUQ==
   dependencies:
     "@confio/ics23" "^0.6.8"
-    "@cosmjs/amino" "^0.32.3"
-    "@cosmjs/encoding" "^0.32.3"
-    "@cosmjs/math" "^0.32.3"
-    "@cosmjs/proto-signing" "^0.32.3"
-    "@cosmjs/stream" "^0.32.3"
-    "@cosmjs/tendermint-rpc" "^0.32.3"
-    "@cosmjs/utils" "^0.32.3"
+    "@cosmjs/amino" "^0.32.4"
+    "@cosmjs/encoding" "^0.32.4"
+    "@cosmjs/math" "^0.32.4"
+    "@cosmjs/proto-signing" "^0.32.4"
+    "@cosmjs/stream" "^0.32.4"
+    "@cosmjs/tendermint-rpc" "^0.32.4"
+    "@cosmjs/utils" "^0.32.4"
     cosmjs-types "^0.9.0"
     xstream "^11.14.0"
 
-"@cosmjs/stream@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.3.tgz#7522579aaf18025d322c2f33d6fb7573220395d6"
-  integrity sha512-J2zVWDojkynYifAUcRmVczzmp6STEpyiAARq0rSsviqjreGIfspfuws/8rmkPa6qQBZvpQOBQCm2HyZZwYplIw==
+"@cosmjs/stream@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.4.tgz#83e1f2285807467c56d9ea0e1113f79d9fa63802"
+  integrity sha512-Gih++NYHEiP+oyD4jNEUxU9antoC0pFSg+33Hpp0JlHwH0wXhtD3OOKnzSfDB7OIoEbrzLJUpEjOgpCp5Z+W3A==
   dependencies:
     xstream "^11.14.0"
 
-"@cosmjs/tendermint-rpc@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.3.tgz#f0406b9f0233e588fb924dca8c614972f9038aff"
-  integrity sha512-xeprW+VR9xKGstqZg0H/KBZoUp8/FfFyS9ljIUTLM/UINjP2MhiwncANPS2KScfJVepGufUKk0/phHUeIBSEkw==
-  dependencies:
-    "@cosmjs/crypto" "^0.32.3"
-    "@cosmjs/encoding" "^0.32.3"
-    "@cosmjs/json-rpc" "^0.32.3"
-    "@cosmjs/math" "^0.32.3"
-    "@cosmjs/socket" "^0.32.3"
-    "@cosmjs/stream" "^0.32.3"
-    "@cosmjs/utils" "^0.32.3"
+"@cosmjs/tendermint-rpc@^0.32.3", "@cosmjs/tendermint-rpc@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.4.tgz#b36f9ec657498e42c97e21bb7368798ef6279752"
+  integrity sha512-MWvUUno+4bCb/LmlMIErLypXxy7ckUuzEmpufYYYd9wgbdCXaTaO08SZzyFM5PI8UJ/0S2AmUrgWhldlbxO8mw==
+  dependencies:
+    "@cosmjs/crypto" "^0.32.4"
+    "@cosmjs/encoding" "^0.32.4"
+    "@cosmjs/json-rpc" "^0.32.4"
+    "@cosmjs/math" "^0.32.4"
+    "@cosmjs/socket" "^0.32.4"
+    "@cosmjs/stream" "^0.32.4"
+    "@cosmjs/utils" "^0.32.4"
     axios "^1.6.0"
     readonly-date "^1.0.0"
     xstream "^11.14.0"
 
-"@cosmjs/utils@^0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.3.tgz#5dcaee6dd7cc846cdc073e9a7a7f63242f5f7e31"
-  integrity sha512-WCZK4yksj2hBDz4w7xFZQTRZQ/RJhBX26uFHmmQFIcNUUVAihrLO+RerqJgk0dZqC42wstM9pEUQGtPmLcIYvg==
+"@cosmjs/utils@^0.32.3", "@cosmjs/utils@^0.32.4":
+  version "0.32.4"
+  resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.4.tgz#a9a717c9fd7b1984d9cefdd0ef6c6f254060c671"
+  integrity sha512-D1Yc+Zy8oL/hkUkFUL/bwxvuDBzRGpc4cF7/SkdhxX4iHpSLgdOuTt1mhCh9+kl6NQREy9t7SYZ6xeW5gFe60w==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -455,16 +487,16 @@
     "@jridgewell/trace-mapping" "0.3.9"
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz#607084630c6c033992a082de6e6fbc1a8b52175a"
+  integrity sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==
   dependencies:
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.3"
 
 "@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
-  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
 "@eslint/eslintrc@^2.1.4":
   version "2.1.4"
@@ -481,22 +513,22 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@8.57.1":
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
+  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
+    "@humanwhocodes/object-schema" "^2.0.3"
     debug "^4.3.1"
     minimatch "^3.0.5"
 
@@ -505,7 +537,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
+"@humanwhocodes/object-schema@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
@@ -594,6 +626,11 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/diff-sequences@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz#0ededeae4d071f5c8ffe3678d15f3a1be09156be"
+  integrity sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==
+
 "@jest/environment@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
@@ -604,6 +641,13 @@
     "@types/node" "*"
     jest-mock "^29.7.0"
 
+"@jest/expect-utils@30.0.3":
+  version "30.0.3"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.0.3.tgz#2a9fb40110c8a13ae464da41f877df90d2e6bc3b"
+  integrity sha512-SMtBvf2sfX2agcT0dA9pXwcUrKvOSDqBY4e4iRfT+Hya33XzV35YVg+98YQFErVGA/VR1Gto5Y2+A6G9LSQ3Yg==
+  dependencies:
+    "@jest/get-type" "30.0.1"
+
 "@jest/expect-utils@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
@@ -631,6 +675,11 @@
     jest-mock "^29.7.0"
     jest-util "^29.7.0"
 
+"@jest/get-type@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.0.1.tgz#0d32f1bbfba511948ad247ab01b9007724fc9f52"
+  integrity sha512-AyYdemXCptSRFirI5EPazNxyPwAL0jXt3zceFjaj8NFiKP9pOi0bfXonf6qkf82z2t3QWPeLCWWw4stPBzctLw==
+
 "@jest/globals@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
@@ -641,6 +690,14 @@
     "@jest/types" "^29.6.3"
     jest-mock "^29.7.0"
 
+"@jest/pattern@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.0.1.tgz#d5304147f49a052900b4b853dedb111d080e199f"
+  integrity sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==
+  dependencies:
+    "@types/node" "*"
+    jest-regex-util "30.0.1"
+
 "@jest/reporters@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
@@ -671,6 +728,13 @@
     strip-ansi "^6.0.0"
     v8-to-istanbul "^9.0.1"
 
+"@jest/schemas@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.0.1.tgz#27c00d707d480ece0c19126af97081a1af3bc46e"
+  integrity sha512-+g/1TKjFuGrf1Hh0QPCv0gISwBxJ+MQSNXmG9zjHy7BmFhtoJ9fdNhWJp3qUKRi93AOZHXtdxZgJ1vAtz6z65w==
+  dependencies:
+    "@sinclair/typebox" "^0.34.0"
+
 "@jest/schemas@^29.4.3", "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -728,6 +792,19 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
+"@jest/types@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.0.1.tgz#a46df6a99a416fa685740ac4264b9f9cd7da1598"
+  integrity sha512-HGwoYRVF0QSKJu1ZQX0o5ZrUrrhj0aOOFA8hXrumD7SIzjouevhawbTjmXdwOmURdGluU9DM/XvGm3NyFoiQjw==
+  dependencies:
+    "@jest/pattern" "30.0.1"
+    "@jest/schemas" "30.0.1"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    "@types/istanbul-reports" "^3.0.4"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.33"
+    chalk "^4.1.2"
+
 "@jest/types@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
@@ -741,9 +818,9 @@
     chalk "^4.0.0"
 
 "@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
-  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142"
+  integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==
   dependencies:
     "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -760,9 +837,9 @@
   integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
@@ -882,9 +959,9 @@
     yargs "16.2.0"
 
 "@noble/hashes@^1", "@noble/hashes@^1.0.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
-  integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a"
+  integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -955,9 +1032,9 @@
     semver "^7.3.5"
 
 "@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
+  integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
   dependencies:
     semver "^7.3.5"
 
@@ -976,9 +1053,9 @@
     which "^3.0.0"
 
 "@npmcli/installed-package-contents@^2.0.0", "@npmcli/installed-package-contents@^2.0.1":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33"
-  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz#63048e5f6e40947a3a88dcbcb4fd9b76fdd37c17"
+  integrity sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==
   dependencies:
     npm-bundled "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
@@ -1408,6 +1485,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
+"@sinclair/typebox@^0.34.0":
+  version "0.34.37"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.37.tgz#f331e4db64ff8195e9e3d8449343c85aaa237d6e"
+  integrity sha512-2TRuQVgQYfy+EzHRTIvkhv2ADEouJ2xNS/Vq+W5EuuewBdOrvATvljZTxHWZSTYr2sTjTHpGvucaGAt67S2akw==
+
 "@sinonjs/commons@^3.0.0":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
@@ -1472,9 +1554,9 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
-  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
+  version "7.27.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.27.0.tgz#b5819294c51179957afaec341442f9341e4108a9"
+  integrity sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==
   dependencies:
     "@babel/types" "^7.0.0"
 
@@ -1487,9 +1569,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd"
-  integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.7.tgz#968cdc2366ec3da159f61166428ee40f370e56c2"
+  integrity sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==
   dependencies:
     "@babel/types" "^7.20.7"
 
@@ -1516,7 +1598,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
   integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
@@ -1528,7 +1610,7 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^3.0.0":
+"@types/istanbul-reports@^3.0.0", "@types/istanbul-reports@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
   integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
@@ -1543,10 +1625,18 @@
     "@types/jest" "*"
     "@types/node" "*"
 
-"@types/jest@*", "@types/jest@^29.5.11":
-  version "29.5.12"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
-  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
+"@types/jest@*":
+  version "30.0.0"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-30.0.0.tgz#5e85ae568006712e4ad66f25433e9bdac8801f1d"
+  integrity sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==
+  dependencies:
+    expect "^30.0.0"
+    pretty-format "^30.0.0"
+
+"@types/jest@^29.5.11":
+  version "29.5.14"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5"
+  integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
@@ -1557,9 +1647,9 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/lodash@^4.14.182":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
-  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
+  version "4.17.18"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.18.tgz#4710e7db5b3857103764bf7b7b666414e6141baf"
+  integrity sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==
 
 "@types/long@^4.0.1":
   version "4.0.2"
@@ -1588,12 +1678,19 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@>=13.7.0", "@types/node@^20.12.7":
-  version "20.12.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
-  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "24.0.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.4.tgz#dbae889912bda33a7f57669fb8587c1a56bc0c1f"
+  integrity sha512-ulyqAkrhnuNq9pB76DRBTkcS6YsmDALy6Ua63V8OhrOBgbcYt6IOdzpw5P1+dyRIyMerzLkeYWBeOXPpA9GMAA==
   dependencies:
-    undici-types "~5.26.4"
+    undici-types "~7.8.0"
+
+"@types/node@^20.12.7":
+  version "20.19.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.1.tgz#cef8bc04aaae86824b5bbe2570769358592bcc59"
+  integrity sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==
+  dependencies:
+    undici-types "~6.21.0"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.4"
@@ -1626,7 +1723,7 @@
     "@types/glob" "~7.2.0"
     "@types/node" "*"
 
-"@types/stack-utils@^2.0.0":
+"@types/stack-utils@^2.0.0", "@types/stack-utils@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
@@ -1636,69 +1733,69 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
-"@types/yargs@^17.0.8":
-  version "17.0.32"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
-  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
+"@types/yargs@^17.0.33", "@types/yargs@^17.0.8":
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
+  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz#07854a236f107bb45cbf4f62b89474cbea617f50"
-  integrity sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
+  integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.10.0"
-    "@typescript-eslint/type-utils" "7.10.0"
-    "@typescript-eslint/utils" "7.10.0"
-    "@typescript-eslint/visitor-keys" "7.10.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/type-utils" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
 "@typescript-eslint/parser@^7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.10.0.tgz#e6ac1cba7bc0400a4459e7eb5b23115bd71accfb"
-  integrity sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==
-  dependencies:
-    "@typescript-eslint/scope-manager" "7.10.0"
-    "@typescript-eslint/types" "7.10.0"
-    "@typescript-eslint/typescript-estree" "7.10.0"
-    "@typescript-eslint/visitor-keys" "7.10.0"
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
+  integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.10.0.tgz#054a27b1090199337a39cf755f83d9f2ce26546b"
-  integrity sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==
+"@typescript-eslint/scope-manager@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
+  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
   dependencies:
-    "@typescript-eslint/types" "7.10.0"
-    "@typescript-eslint/visitor-keys" "7.10.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
 
-"@typescript-eslint/type-utils@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.10.0.tgz#8a75accce851d0a331aa9331268ef64e9b300270"
-  integrity sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==
+"@typescript-eslint/type-utils@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
+  integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.10.0"
-    "@typescript-eslint/utils" "7.10.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.10.0.tgz#da92309c97932a3a033762fd5faa8b067de84e3b"
-  integrity sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==
+"@typescript-eslint/types@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
+  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
 
-"@typescript-eslint/typescript-estree@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.10.0.tgz#6dcdc5de3149916a6a599fa89dde5c471b88b8bb"
-  integrity sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==
+"@typescript-eslint/typescript-estree@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
+  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
   dependencies:
-    "@typescript-eslint/types" "7.10.0"
-    "@typescript-eslint/visitor-keys" "7.10.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -1706,28 +1803,28 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.10.0.tgz#8ee43e5608c9f439524eaaea8de5b358b15c51b3"
-  integrity sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==
+"@typescript-eslint/utils@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
+  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.10.0"
-    "@typescript-eslint/types" "7.10.0"
-    "@typescript-eslint/typescript-estree" "7.10.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
 
-"@typescript-eslint/visitor-keys@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.10.0.tgz#2af2e91e73a75dd6b70b4486c48ae9d38a485a78"
-  integrity sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==
+"@typescript-eslint/visitor-keys@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
+  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
   dependencies:
-    "@typescript-eslint/types" "7.10.0"
+    "@typescript-eslint/types" "7.18.0"
     eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
 
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
@@ -1773,14 +1870,16 @@ acorn-jsx@^5.3.2:
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.1.1:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
-  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7"
+  integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==
+  dependencies:
+    acorn "^8.11.0"
 
-acorn@^8.4.1, acorn@^8.9.0:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+acorn@^8.11.0, acorn@^8.4.1, acorn@^8.9.0:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -1795,9 +1894,9 @@ agent-base@6, agent-base@^6.0.2:
     debug "4"
 
 agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a"
+  integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==
   dependencies:
     humanize-ms "^1.2.1"
 
@@ -1862,9 +1961,9 @@ ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
+  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -1885,7 +1984,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
+ansi-styles@^5.0.0, ansi-styles@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
@@ -1976,9 +2075,9 @@ ast-stringify@0.1.0:
     "@babel/runtime" "^7.11.2"
 
 async@^3.2.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1991,9 +2090,9 @@ at-least-node@^1.0.0:
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
 axios@^1.0.0, axios@^1.6.0:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
-  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54"
+  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -2034,22 +2133,25 @@ babel-plugin-jest-hoist@^29.6.3:
     "@types/babel__traverse" "^7.0.6"
 
 babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
-  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
+  integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-import-meta" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-import-attributes" "^7.24.7"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
 babel-preset-jest@^29.6.3:
   version "29.6.3"
@@ -2080,9 +2182,9 @@ before-after-hook@^2.2.0:
   integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
 bin-links@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.3.tgz#9e4a3c5900830aee3d7f52178b65e01dcdde64a5"
-  integrity sha512-obsRaULtJurnfox/MDwgq6Yo9kzbv1CPTk/1/s7Z/61Lezc8IKkFCOXNeVLXz0456WRzBQmSsDWlai2tIhBsfA==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.4.tgz#c3565832b8e287c85f109a02a17027d152a58a63"
+  integrity sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==
   dependencies:
     cmd-shim "^6.0.0"
     npm-normalize-package-bin "^3.0.0"
@@ -2099,53 +2201,53 @@ bl@^4.0.3, bl@^4.1.0:
     readable-stream "^3.4.0"
 
 bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.2.tgz#3d8fed6796c24e177737f7cc5172ee04ef39ec99"
+  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
 
 bn.js@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
-  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.2.tgz#82c09f9ebbb17107cd72cb7fd39bd1f9d0aaa566"
+  integrity sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
-browserslist@^4.22.2:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+browserslist@^4.24.0:
+  version "4.25.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.1.tgz#ba9e8e6f298a1d86f829c9b975e07948967bb111"
+  integrity sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==
   dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    caniuse-lite "^1.0.30001726"
+    electron-to-chromium "^1.5.173"
+    node-releases "^2.0.19"
+    update-browserslist-db "^1.1.3"
 
-bs-logger@0.x:
+bs-logger@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
@@ -2231,6 +2333,14 @@ cacache@^17.0.0, cacache@^17.0.4:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
 call-me-maybe@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
@@ -2260,10 +2370,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001587:
-  version "1.0.30001610"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz#2f44ed6e21d359e914271ae35b68903632628ccf"
-  integrity sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==
+caniuse-lite@^1.0.30001726:
+  version "1.0.30001726"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz#a15bd87d5a4bf01f6b6f70ae7c97fdfd28b5ae47"
+  integrity sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==
 
 case@1.6.3:
   version "1.6.3"
@@ -2278,7 +2388,7 @@ chalk@4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2336,10 +2446,15 @@ ci-info@^3.2.0, ci-info@^3.6.1:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
+ci-info@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.2.0.tgz#cbd21386152ebfe1d56f280a3b5feccbd96764c7"
+  integrity sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==
+
 cjs-module-lexer@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
-  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz#0f79731eb8cfe1ec72acd4066efac9d61991b00d"
+  integrity sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==
 
 clean-stack@^2.0.0:
   version "2.2.0"
@@ -2431,9 +2546,9 @@ cmd-shim@5.0.0:
     mkdirp-infer-owner "^2.0.0"
 
 cmd-shim@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.2.tgz#435fd9e5c95340e61715e19f90209ed6fcd9e0a4"
-  integrity sha512-+FFYbB0YLaAkhkcrjkyNLYDiOsFSfRjwjY19LXk/psmMx1z00xlCv7hhQoTGXXIKi+YXHL/iiFo8NqMVQX9nOw==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.3.tgz#c491e9656594ba17ac83c4bd931590a9d6e26033"
+  integrity sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==
 
 co@^4.6.0:
   version "4.6.0"
@@ -2674,10 +2789,10 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -2712,11 +2827,11 @@ dateformat@^3.0.0:
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 decamelize-keys@^1.1.0:
   version "1.1.1"
@@ -2737,9 +2852,9 @@ dedent@0.7.0, dedent@^0.7.0:
   integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
 dedent@^1.0.0:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a"
-  integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.6.0.tgz#79d52d6389b1ffa67d2bcef59ba51847a9d503b2"
+  integrity sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==
 
 deep-is@^0.1.3:
   version "0.1.4"
@@ -2777,7 +2892,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3:
+define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -2868,6 +2983,15 @@ dotenv@~10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 duplexer@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -2878,22 +3002,22 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ejs@^3.1.7:
+ejs@^3.1.10, ejs@^3.1.7:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
   integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.668:
-  version "1.4.737"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz#3a774a58e04980741f65d440f5fdf57af18b6dde"
-  integrity sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw==
+electron-to-chromium@^1.5.173:
+  version "1.5.173"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.173.tgz#1aeba57204fe19425921a29946ef543653f5e896"
+  integrity sha512-2bFhXP2zqSfQHugjqJIDFVwa+qIxyNApenmXTp9EjaKtdPrES5Qcn9/aSFy/NaP2E+fWG/zxKu/LBvY36p5VNQ==
 
 elliptic@^6.5.4:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.5.tgz#c715e09f78b6923977610d4c2346d6ce22e6dded"
-  integrity sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06"
+  integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"
@@ -2926,9 +3050,9 @@ encoding@^0.1.13:
     iconv-lite "^0.6.2"
 
 end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
   dependencies:
     once "^1.4.0"
 
@@ -2945,9 +3069,9 @@ env-paths@^2.2.0:
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.4:
-  version "7.12.0"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.12.0.tgz#b56723b39c2053d67ea5714f026d05d4f5cc7acd"
-  integrity sha512-Iw9rQJBGpJRd3rwXm9ft/JiGoAZmLxxJZELYDQoPRZ4USVhkKtIcNBPw6U+/K2mBpaqM25JSV6Yl4Az9vO2wJg==
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.14.0.tgz#26dac5db54418f2a4c1159153a0b2ae980838aae"
+  integrity sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==
 
 err-code@^2.0.2:
   version "2.0.3"
@@ -2961,19 +3085,34 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
+es-define-property@^1.0.0, es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
 
 es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2:
   version "0.10.64"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
   integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
@@ -3010,10 +3149,10 @@ es6-weak-map@^2.0.3:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
-escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+escalade@^3.1.1, escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
@@ -3036,21 +3175,14 @@ eslint-config-prettier@^10.1.5:
   integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
 
 eslint-plugin-simple-import-sort@^12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.0.tgz#8186ad55474d2f5c986a2f1bf70625a981e30d05"
-  integrity sha512-Y2fqAfC11TcG/WP3TrI1Gi3p3nc8XJyEOJYHyEPEGI/UAgNx6akxxlX74p7SbAQdLcgASKhj8M0GKvH3vq/+ig==
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz#e64bfdaf91c5b98a298619aa634a9f7aa43b709e"
+  integrity sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==
 
 eslint-plugin-unused-imports@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.0.0.tgz#93f3a7ee6088221e4a1d7127866e05d5917a9f65"
-  integrity sha512-mzM+y2B7XYpQryVa1usT+Y/BdNAtAZiXzwpSyDCboFoJN/LZRN67TNvQxKtuTK/Aplya3sLNQforiubzPPaIcQ==
-  dependencies:
-    eslint-rule-composer "^0.3.0"
-
-eslint-rule-composer@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
-  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz#62ddc7446ccbf9aa7b6f1f0b00a980423cda2738"
+  integrity sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==
 
 eslint-scope@^7.2.2:
   version "7.2.2"
@@ -3060,21 +3192,21 @@ eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@^8.56.0:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
+  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint/js" "8.57.1"
+    "@humanwhocodes/config-array" "^0.13.0"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"
@@ -3134,9 +3266,9 @@ esprima@^4.0.0:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -3216,10 +3348,22 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
+expect@^30.0.0:
+  version "30.0.3"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.0.3.tgz#8bf31a67514f78c5e4ac8d67774192ab95d5ec25"
+  integrity sha512-HXg6NvK35/cSYZCUKAtmlgCFyqKM4frEPbzrav5hRqb0GMz0E0lS5hfzYjSaiaE5ysnp/qI2aeZkeyeIAOeXzQ==
+  dependencies:
+    "@jest/expect-utils" "30.0.3"
+    "@jest/get-type" "30.0.1"
+    jest-matcher-utils "30.0.3"
+    jest-message-util "30.0.2"
+    jest-mock "30.0.2"
+    jest-util "30.0.2"
+
 exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91"
+  integrity sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==
 
 ext@^1.7.0:
   version "1.7.0"
@@ -3263,15 +3407,15 @@ fast-glob@3.2.7:
     micromatch "^4.0.4"
 
 fast-glob@^3.2.9:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
+  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
     glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.4"
+    micromatch "^4.0.8"
 
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
@@ -3284,9 +3428,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
-  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
+  integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==
   dependencies:
     reusify "^1.0.4"
 
@@ -3330,10 +3474,10 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -3375,30 +3519,32 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.2.9:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
-  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
+  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
 
 follow-redirects@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
 foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
+  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
 form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.3.tgz#608b1b3f3e28be0fccf5901fc85fb3641e5cf0ae"
+  integrity sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.12"
 
 fs-constants@^1.0.0:
@@ -3417,9 +3563,9 @@ fs-extra@9.1.0, fs-extra@^9.1.0:
     universalify "^2.0.0"
 
 fs-extra@^11.1.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  version "11.3.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.0.tgz#0daced136bbaf65a555a326719af931adc7a314d"
+  integrity sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -3474,9 +3620,9 @@ gauge@^4.0.3:
     wide-align "^1.1.5"
 
 gauge@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.1.tgz#1efc801b8ff076b86ef3e9a7a280a975df572112"
-  integrity sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.2.tgz#7ab44c11181da9766333f10db8cd1e4b17fd6c46"
+  integrity sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
     color-support "^1.1.3"
@@ -3497,16 +3643,21 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+get-intrinsic@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
   dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
     es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
     function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
 
 get-package-type@^0.1.0:
   version "0.1.0"
@@ -3528,6 +3679,14 @@ get-port@5.1.1:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
 get-stdin@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
@@ -3636,7 +3795,7 @@ glob@8.1.0, glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^10:
+glob@^10, glob@^10.0.0, glob@^10.2.2:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -3648,17 +3807,6 @@ glob@^10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^10.0.0, glob@^10.2.2:
-  version "10.3.12"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
-  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^2.3.6"
-    minimatch "^9.0.1"
-    minipass "^7.0.4"
-    path-scurry "^1.10.2"
-
 glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -3694,11 +3842,12 @@ globals@^13.19.0:
     type-fest "^0.20.2"
 
 globalthis@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
-    define-properties "^1.1.3"
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
 
 globby@11.1.0, globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
@@ -3712,19 +3861,17 @@ globby@11.1.0, globby@^11.0.1, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
+gopd@^1.0.1, gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
 
 graceful-fs@4.2.10:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -3775,15 +3922,17 @@ has-property-descriptors@^1.0.0:
   dependencies:
     es-define-property "^1.0.0"
 
-has-proto@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
-  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
 
-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
 
 has-unicode@2.0.1, has-unicode@^2.0.1:
   version "2.0.1"
@@ -3798,7 +3947,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hasown@^2.0.0:
+hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -3841,9 +3990,9 @@ hosted-git-info@^5.0.0:
     lru-cache "^7.5.1"
 
 hosted-git-info@^6.0.0, hosted-git-info@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
-  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.3.tgz#2ee1a14a097a1236bddf8672c35b613c46c55946"
+  integrity sha512-HVJyzUrLIL1c0QmviVh5E8VGyUS7xCFPS6yydaVd1UegW+ibV/CohqTH9MkOLDp5o+rb82DMo77PTuc9F/8GKw==
   dependencies:
     lru-cache "^7.5.1"
 
@@ -3853,9 +4002,9 @@ html-escaper@^2.0.0:
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
+  integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
 
 http-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -3913,29 +4062,29 @@ ignore-walk@^5.0.1:
     minimatch "^5.0.1"
 
 ignore-walk@^6.0.0:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
-  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.5.tgz#ef8d61eab7da169078723d1f82833b36e200b0dd"
+  integrity sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==
   dependencies:
     minimatch "^9.0.0"
 
 ignore@^5.0.4, ignore@^5.2.0, ignore@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
-  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
 import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
+  integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
   dependencies:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
@@ -4119,12 +4268,12 @@ is-ci@2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+is-core-module@^2.16.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
+  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
   dependencies:
-    hasown "^2.0.0"
+    hasown "^2.0.2"
 
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
@@ -4211,9 +4360,9 @@ is-promise@^2.2.2:
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
 is-ssh@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
-  integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.1.tgz#76de1cdbe8f92a8b905d1a172b6bc09704c20396"
+  integrity sha512-JNeu1wQsHjyHgn9NcWTaXq6zWSR6hqE0++zhfZlkFBbScNkyvxCdeV8sRkSBaeLKxmbpR21brail63ACNxJ0Tg==
   dependencies:
     protocols "^2.0.1"
 
@@ -4288,9 +4437,9 @@ istanbul-lib-instrument@^5.0.4:
     semver "^6.3.0"
 
 istanbul-lib-instrument@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz#91655936cf7380e4e473383081e38478b69993b1"
-  integrity sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
+  integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
   dependencies:
     "@babel/core" "^7.23.9"
     "@babel/parser" "^7.23.9"
@@ -4324,15 +4473,6 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jackspeak@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
 jackspeak@^3.1.2:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
@@ -4343,9 +4483,9 @@ jackspeak@^3.1.2:
     "@pkgjs/parseargs" "^0.11.0"
 
 jake@^10.8.5:
-  version "10.8.7"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
-  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
+  integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==
   dependencies:
     async "^3.2.3"
     chalk "^4.0.2"
@@ -4432,6 +4572,16 @@ jest-config@^29.7.0:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
+jest-diff@30.0.3:
+  version "30.0.3"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.0.3.tgz#50ac056b90fe9151d6266b18a27adeb064c30235"
+  integrity sha512-Q1TAV0cUcBTic57SVnk/mug0/ASyAqtSIOkr7RAlxx97llRYsM74+E8N5WdGJUlwCKwgxPAkVjKh653h1+HA9A==
+  dependencies:
+    "@jest/diff-sequences" "30.0.1"
+    "@jest/get-type" "30.0.1"
+    chalk "^4.1.2"
+    pretty-format "30.0.2"
+
 jest-diff@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
@@ -4509,6 +4659,16 @@ jest-leak-detector@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
+jest-matcher-utils@30.0.3:
+  version "30.0.3"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.0.3.tgz#e07e4776bade71a3a7948a9bf8aeede311c5013a"
+  integrity sha512-hMpVFGFOhYmIIRGJ0HgM9htC5qUiJ00famcc9sRFchJJiLZbbVKrAztcgE6VnXLRxA3XZ0bvNA7hQWh3oHXo/A==
+  dependencies:
+    "@jest/get-type" "30.0.1"
+    chalk "^4.1.2"
+    jest-diff "30.0.3"
+    pretty-format "30.0.2"
+
 jest-matcher-utils@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
@@ -4519,6 +4679,21 @@ jest-matcher-utils@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
+jest-message-util@30.0.2:
+  version "30.0.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.0.2.tgz#9dfdc37570d172f0ffdc42a0318036ff4008837f"
+  integrity sha512-vXywcxmr0SsKXF/bAD7t7nMamRvPuJkras00gqYeB1V0WllxZrbZ0paRr3XqpFU2sYYjD0qAaG2fRyn/CGZ0aw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@jest/types" "30.0.1"
+    "@types/stack-utils" "^2.0.3"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    micromatch "^4.0.8"
+    pretty-format "30.0.2"
+    slash "^3.0.0"
+    stack-utils "^2.0.6"
+
 jest-message-util@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
@@ -4534,6 +4709,15 @@ jest-message-util@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-mock@30.0.2:
+  version "30.0.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.0.2.tgz#5e4245f25f6f9532714906cab10a2b9e39eb2183"
+  integrity sha512-PnZOHmqup/9cT/y+pXIVbbi8ID6U1XHRmbvR7MvUy4SLqhCbwpkmXhLbsWbGewHrV5x/1bF7YDjs+x24/QSvFA==
+  dependencies:
+    "@jest/types" "30.0.1"
+    "@types/node" "*"
+    jest-util "30.0.2"
+
 jest-mock@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
@@ -4548,6 +4732,11 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
+jest-regex-util@30.0.1:
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
+  integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
+
 jest-regex-util@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
@@ -4657,7 +4846,19 @@ jest-snapshot@^29.7.0:
     pretty-format "^29.7.0"
     semver "^7.5.3"
 
-jest-util@^29.0.0, jest-util@^29.7.0:
+jest-util@30.0.2:
+  version "30.0.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.0.2.tgz#1bd8411f81e6f5e2ca8b31bb2534ebcd7cbac065"
+  integrity sha512-8IyqfKS4MqprBuUpZNlFB5l+WFehc8bfCe1HSZFHzft2mOuND8Cvi9r1musli+u6F3TqanCZ/Ik4H4pXUolZIg==
+  dependencies:
+    "@jest/types" "30.0.1"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    graceful-fs "^4.2.11"
+    picomatch "^4.0.2"
+
+jest-util@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
   integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
@@ -4745,6 +4946,11 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -4761,9 +4967,9 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-parse-even-better-errors@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
-  integrity sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
+  integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -4955,17 +5161,17 @@ libnpmpublish@7.1.4:
     sigstore "^1.4.0"
     ssri "^10.0.1"
 
-libsodium-sumo@^0.7.13:
-  version "0.7.13"
-  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz#533b97d2be44b1277e59c1f9f60805978ac5542d"
-  integrity sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==
+libsodium-sumo@^0.7.15:
+  version "0.7.15"
+  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.15.tgz#91c1d863fe3fbce6d6b9db1aadaa622733a1d007"
+  integrity sha512-5tPmqPmq8T8Nikpm1Nqj0hBHvsLFCXvdhBFV7SGOitQPZAA6jso8XoL0r4L7vmfKXr486fiQInvErHtEvizFMw==
 
 libsodium-wrappers-sumo@^0.7.11:
-  version "0.7.13"
-  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz#a33aea845a0bb56db067548f04feba28c730ab8e"
-  integrity sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==
+  version "0.7.15"
+  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.15.tgz#0ef2a99b4b17e8385aa7e6850593660dbaf5fb40"
+  integrity sha512-aSWY8wKDZh5TC7rMvEdTHoyppVq/1dTSAeAR7H6pzd6QRT3vQWcT5pGwCotLcpPEOLXX6VvqihSPkpEhYAjANA==
   dependencies:
-    libsodium-sumo "^0.7.13"
+    libsodium-sumo "^0.7.15"
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
@@ -5024,7 +5230,7 @@ lodash.ismatch@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
-lodash.memoize@4.x:
+lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
@@ -5053,9 +5259,9 @@ long@^4.0.0:
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
 lru-cache@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
-  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -5105,7 +5311,7 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@1.x, make-error@^1.1.1:
+make-error@^1.1.1, make-error@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -5170,13 +5376,18 @@ map-obj@^4.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
 memoizee@^0.4.15:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
-  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
+  version "0.4.17"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.17.tgz#942a5f8acee281fa6fb9c620bddc57e3b7382949"
+  integrity sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==
   dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.53"
+    d "^1.0.2"
+    es5-ext "^0.10.64"
     es6-weak-map "^2.0.3"
     event-emitter "^0.3.5"
     is-promise "^2.2.2"
@@ -5211,12 +5422,12 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+micromatch@^4.0.4, micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0:
@@ -5291,10 +5502,10 @@ minimatch@^8.0.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.4:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
-  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+minimatch@^9.0.0, minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -5336,9 +5547,9 @@ minipass-fetch@^2.0.3:
     encoding "^0.1.13"
 
 minipass-fetch@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
-  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
+  integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==
   dependencies:
     minipass "^7.0.3"
     minipass-sized "^1.0.3"
@@ -5354,9 +5565,9 @@ minipass-flush@^1.0.5:
     minipass "^3.0.0"
 
 minipass-json-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
-  integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz#5121616c77a11c406c3ffa77509e0b77bb267ec3"
+  integrity sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==
   dependencies:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
@@ -5392,12 +5603,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3, minipass@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
-
-minipass@^7.1.2:
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3, minipass@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
@@ -5439,12 +5645,7 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.0.0:
+ms@^2.0.0, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5485,9 +5686,9 @@ natural-compare@^1.4.0:
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
+  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
 
 neo-async@^2.6.2:
   version "2.6.2"
@@ -5499,7 +5700,7 @@ nested-obj@0.0.1:
   resolved "https://registry.yarnpkg.com/nested-obj/-/nested-obj-0.0.1.tgz#efe1da127c3d00826fa10ec25673e0f9ec1224fd"
   integrity sha512-kB1WKTng+IePQhZVs1UXtFaHBx4QEM5a0XKGAzYfCKvdx5DhNjCytNDWMUGpNNpHLotln+tiwcA52kWCIgGq1Q==
 
-next-tick@1, next-tick@^1.1.0:
+next-tick@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
@@ -5524,9 +5725,9 @@ node-fetch@^2.6.7:
     whatwg-url "^5.0.0"
 
 node-gyp-build@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
-  integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
+  integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
 
 node-gyp@^9.0.0:
   version "9.4.1"
@@ -5550,10 +5751,10 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+node-releases@^2.0.19:
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
+  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
 
 noms@0.0.0:
   version "0.0.0"
@@ -5571,9 +5772,9 @@ nopt@^6.0.0:
     abbrev "^1.0.0"
 
 nopt@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
-  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
+  integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
   dependencies:
     abbrev "^2.0.0"
 
@@ -5630,9 +5831,9 @@ npm-bundled@^1.1.2:
     npm-normalize-package-bin "^1.0.1"
 
 npm-bundled@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
-  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.1.tgz#cca73e15560237696254b10170d8f86dad62da25"
+  integrity sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==
   dependencies:
     npm-normalize-package-bin "^3.0.0"
 
@@ -5872,16 +6073,16 @@ open@^8.4.0:
     is-wsl "^2.2.0"
 
 optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 ora@^5.4.1:
   version "5.4.1"
@@ -6102,9 +6303,9 @@ parse-package-name@1.0.0:
   integrity sha512-kBeTUtcj+SkyfaW4+KBe0HtsloBJ/mKTPoxpVdA57GZiPerREsUWJOhVj9anXweFiJkm5y8FG1sxFZkZ0SN6wg==
 
 parse-path@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b"
-  integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.1.0.tgz#41fb513cb122831807a4c7b29c8727947a09d8c6"
+  integrity sha512-EuCycjZtfPcjWk7KTksnJ5xPMvWGA/6i4zrLYhRG0hGvC3GPU/jGUj3Cy+ZR0v30duV3e23R95T1lE2+lsndSw==
   dependencies:
     protocols "^2.0.0"
 
@@ -6140,15 +6341,7 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.2, path-scurry@^1.6.1:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
-  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
-  dependencies:
-    lru-cache "^10.2.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-path-scurry@^1.11.1:
+path-scurry@^1.11.1, path-scurry@^1.6.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
   integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
@@ -6168,16 +6361,21 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+picomatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
+  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+
 pify@5.0.0, pify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
@@ -6199,9 +6397,9 @@ pify@^4.0.1:
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
 pirates@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
-  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
+  integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
 
 pkg-dir@^4.2.0:
   version "4.2.0"
@@ -6211,9 +6409,9 @@ pkg-dir@^4.2.0:
     find-up "^4.0.0"
 
 postcss-selector-parser@^6.0.10:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
-  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+  integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -6229,9 +6427,9 @@ prettier@^2.6.2:
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 prettier@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.0.tgz#18ec98d62cb0757a5d4eab40253ff3e6d0fc8dea"
-  integrity sha512-ujSB9uXHJKzM/2GBuE0hBOUgC77CN3Bnpqa+g80bkv3T3A93wL/xlzDATHhnhkzifz/UE2SNOvmbTz5hSkDlHw==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.1.tgz#cc3bce21c09a477b1e987b76ce9663925d86ae44"
+  integrity sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==
 
 pretty-format@29.4.3:
   version "29.4.3"
@@ -6242,6 +6440,15 @@ pretty-format@29.4.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@30.0.2, pretty-format@^30.0.0:
+  version "30.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.0.2.tgz#54717b6aa2b4357a2e6d83868e10a2ea8dd647c7"
+  integrity sha512-yC5/EBSOrTtqhCKfLHqoUIAXVRZnukHPwWBJWR7h84Q3Be1DRQZLncwcfLoPA5RPQ65qfiCMqgYwdUuQ//eVpg==
+  dependencies:
+    "@jest/schemas" "30.0.1"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
 pretty-format@^29.0.0, pretty-format@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
@@ -6329,9 +6536,9 @@ protobufjs@^6.8.8:
     long "^4.0.0"
 
 protocols@^2.0.0, protocols@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
-  integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.2.tgz#822e8fcdcb3df5356538b3e91bfd890b067fd0a4"
+  integrity sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==
 
 proxy-from-env@^1.1.0:
   version "1.1.0"
@@ -6363,10 +6570,10 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+react-is@^18.0.0, react-is@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 read-cmd-shim@3.0.0:
   version "3.0.0"
@@ -6519,11 +6726,6 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6547,16 +6749,16 @@ resolve-from@^4.0.0:
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve.exports@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
-  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f"
+  integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==
 
 resolve@^1.1.6, resolve@^1.10.0, resolve@^1.20.0:
-  version "1.22.8"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
-  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  version "1.22.10"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
+  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
   dependencies:
-    is-core-module "^2.13.0"
+    is-core-module "^2.16.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -6582,9 +6784,9 @@ retry@^0.12.0:
   integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
+  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
 
 rimraf@3.0.2, rimraf@^3.0.2:
   version "3.0.2"
@@ -6639,9 +6841,9 @@ rxjs@^6.4.0:
     tslib "^1.9.0"
 
 rxjs@^7.5.5:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  version "7.8.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
+  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
   dependencies:
     tslib "^2.1.0"
 
@@ -6684,17 +6886,10 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.6.0:
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
-  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.7.2:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -6775,9 +6970,9 @@ socks-proxy-agent@^7.0.0:
     socks "^2.6.2"
 
 socks@^2.6.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
-  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.5.tgz#bfe18f5ead1efc93f5ec90c79fa8bdccbcee2e64"
+  integrity sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==
   dependencies:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
@@ -6824,9 +7019,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
-  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
+  version "3.0.21"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3"
+  integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==
 
 split2@^3.0.0:
   version "3.2.2"
@@ -6860,13 +7055,13 @@ ssri@9.0.1, ssri@^9.0.0:
     minipass "^3.1.1"
 
 ssri@^10.0.0, ssri@^10.0.1:
-  version "10.0.5"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
-  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
+  integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
   dependencies:
     minipass "^7.0.3"
 
-stack-utils@^2.0.3:
+stack-utils@^2.0.3, stack-utils@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
@@ -7050,9 +7245,9 @@ symbol-observable@^2.0.3:
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
 symlink-workspace@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/symlink-workspace/-/symlink-workspace-1.9.0.tgz#df4c5ce48bd55e54580e813126c643a86e29e759"
-  integrity sha512-eKSISj/3r5gLU4NCY5Ir16PLPavHYb2s2DMN7wGheaZAMlUGEuq8qUhlmbBMR8J32Yq9PCtcA+yritgHpwUDfw==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/symlink-workspace/-/symlink-workspace-1.11.0.tgz#d130e930ec573a1ac807caf206132c71cfe91467"
+  integrity sha512-oD4M6Ir8aBp9ySKrmQ2DzkipDMQ5OYhl8xusVtgo2mqa5Ti1oS6TDa/rrDaNy4Vb4z18bge817SkIXZZzT03sg==
   dependencies:
     chalk "4.1.2"
     glob "8.1.0"
@@ -7170,12 +7365,12 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 timers-ext@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
-  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.8.tgz#b4e442f10b7624a29dd2aa42c295e257150cf16c"
+  integrity sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==
   dependencies:
-    es5-ext "~0.10.46"
-    next-tick "1"
+    es5-ext "^0.10.64"
+    next-tick "^1.1.0"
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -7222,23 +7417,24 @@ trim-newlines@^3.0.0:
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 ts-api-utils@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
-  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
+  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
 
 ts-jest@^29.1.1:
-  version "29.1.2"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09"
-  integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.4.0.tgz#bef0ee98d94c83670af7462a1617bf2367a83740"
+  integrity sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==
   dependencies:
-    bs-logger "0.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^29.0.0"
+    bs-logger "^0.2.6"
+    ejs "^3.1.10"
+    fast-json-stable-stringify "^2.1.0"
     json5 "^2.2.3"
-    lodash.memoize "4.x"
-    make-error "1.x"
-    semver "^7.5.3"
-    yargs-parser "^21.0.1"
+    lodash.memoize "^4.1.2"
+    make-error "^1.3.6"
+    semver "^7.7.2"
+    type-fest "^4.41.0"
+    yargs-parser "^21.1.1"
 
 ts-node@^10.9.2:
   version "10.9.2"
@@ -7274,9 +7470,9 @@ tslib@^1.9.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
 tuf-js@^1.1.7:
   version "1.1.7"
@@ -7334,10 +7530,15 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type-fest@^4.41.0:
+  version "4.41.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.41.0.tgz#6ae1c8e5731273c2bf1f58ad39cbae2c91a46c58"
+  integrity sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==
+
 type@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
-  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
+  integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
 
 typedarray@^0.0.6:
   version "0.0.6"
@@ -7350,19 +7551,24 @@ typedarray@^0.0.6:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 typescript@^5.1.6:
-  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
-  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+  version "5.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
+  integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
 
 uglify-js@^3.1.4:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+  version "3.19.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f"
+  integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==
 
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+undici-types@~6.21.0:
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
+  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
+
+undici-types@~7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"
+  integrity sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==
 
 unique-filename@^2.0.0:
   version "2.0.1"
@@ -7419,13 +7625,13 @@ upath@2.0.1, upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+update-browserslist-db@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
+  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -7462,9 +7668,9 @@ v8-compile-cache@2.3.0:
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^9.0.1:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
-  integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
+  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
@@ -7493,11 +7699,9 @@ validate-npm-package-name@^3.0.0:
     builtins "^1.0.3"
 
 validate-npm-package-name@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
-  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
-  dependencies:
-    builtins "^5.0.0"
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
+  integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
 
 walk-up-path@^1.0.0:
   version "1.0.0"
@@ -7552,6 +7756,11 @@ wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -7653,9 +7862,9 @@ write-pkg@4.0.0:
     write-json-file "^3.2.0"
 
 ws@^7:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 xstream@^11.14.0:
   version "11.14.0"
@@ -7695,7 +7904,7 @@ yargs-parser@20.2.4:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
+yargs-parser@21.1.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==

From 970fd406cb1603b64e986c0ebdfcd43e27ee1571 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 12:04:42 +0200
Subject: [PATCH 271/287] Update code to make // @ts-ignore work

---
 packages/ts-codegen/src/builder/builder.ts     | 7 +------
 packages/ts-codegen/src/plugins/plugin-base.ts | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/ts-codegen/src/builder/builder.ts b/packages/ts-codegen/src/builder/builder.ts
index d8c7597d..73c5657c 100644
--- a/packages/ts-codegen/src/builder/builder.ts
+++ b/packages/ts-codegen/src/builder/builder.ts
@@ -228,12 +228,7 @@ export class TSBuilder {
     const ast = recursiveModuleBundle(bundleVariables);
     const nodes = [...importPaths, ...ast];
     // @ts-ignore
-    let code = generate(
-      t.program(
-        // @ts-ignore
-        nodes
-      )
-    ).code;
+    let code = generate(t.program(nodes)).code;
 
     if (this.options?.bundle?.bundlePath) {
       mkdirp(this.options?.bundle?.bundlePath);
diff --git a/packages/ts-codegen/src/plugins/plugin-base.ts b/packages/ts-codegen/src/plugins/plugin-base.ts
index 34582bcb..29849ef7 100644
--- a/packages/ts-codegen/src/plugins/plugin-base.ts
+++ b/packages/ts-codegen/src/plugins/plugin-base.ts
@@ -99,9 +99,9 @@ export abstract class BuilderPluginBase<TOpt extends { enabled?: boolean }>
 
     return results.map((result) => {
       const imports = context.getImports(this.utils, result.localname);
+      const nodes = [...imports, ...result.body];
       // @ts-ignore
-      const code =
-        header + generate(t.program([...imports, ...result.body])).code;
+      const code = header + generate(t.program(nodes)).code;
 
       mkdirp(outPath);
       const filename = join(outPath, result.localname);

From fd035a4060cc05db58056873ec39f6222077dc21 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 12:04:49 +0200
Subject: [PATCH 272/287] Update snapshots

---
 .../message-builder.test.ts.snap              | 76 +++++++++----------
 .../__snapshots__/react-query.test.ts.snap    | 56 +++++++-------
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap b/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
index b9daf0fd..6a20d623 100644
--- a/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
+++ b/packages/ast/__tests__/message-builder/__snapshots__/message-builder.test.ts.snap
@@ -9,10 +9,10 @@ exports[`execute class 1`] = `
     transfer_nft: unknown;
   }>["transfer_nft"]>): ExecuteMsg_for_Empty => {
     return {
-      transfer_nft: ({
+      transfer_nft: {
         recipient,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static sendNft = ({
@@ -23,11 +23,11 @@ exports[`execute class 1`] = `
     send_nft: unknown;
   }>["send_nft"]>): ExecuteMsg_for_Empty => {
     return {
-      send_nft: ({
+      send_nft: {
         contract,
         msg,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static approve = ({
@@ -38,11 +38,11 @@ exports[`execute class 1`] = `
     approve: unknown;
   }>["approve"]>): ExecuteMsg_for_Empty => {
     return {
-      approve: ({
+      approve: {
         expires,
         spender,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static revoke = ({
@@ -52,10 +52,10 @@ exports[`execute class 1`] = `
     revoke: unknown;
   }>["revoke"]>): ExecuteMsg_for_Empty => {
     return {
-      revoke: ({
+      revoke: {
         spender,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static approveAll = ({
@@ -65,10 +65,10 @@ exports[`execute class 1`] = `
     approve_all: unknown;
   }>["approve_all"]>): ExecuteMsg_for_Empty => {
     return {
-      approve_all: ({
+      approve_all: {
         expires,
         operator
-      } as const)
+      } as const
     };
   };
   static revokeAll = ({
@@ -77,9 +77,9 @@ exports[`execute class 1`] = `
     revoke_all: unknown;
   }>["revoke_all"]>): ExecuteMsg_for_Empty => {
     return {
-      revoke_all: ({
+      revoke_all: {
         operator
-      } as const)
+      } as const
     };
   };
   static mint = ({
@@ -91,12 +91,12 @@ exports[`execute class 1`] = `
     mint: unknown;
   }>["mint"]>): ExecuteMsg_for_Empty => {
     return {
-      mint: ({
+      mint: {
         extension,
         owner,
         token_id: tokenId,
         token_uri: tokenUri
-      } as const)
+      } as const
     };
   };
   static burn = ({
@@ -105,9 +105,9 @@ exports[`execute class 1`] = `
     burn: unknown;
   }>["burn"]>): ExecuteMsg_for_Empty => {
     return {
-      burn: ({
+      burn: {
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
 }"
@@ -121,9 +121,9 @@ exports[`ownership 1`] = `
     set_factory: unknown;
   }>["set_factory"]>): ExecuteMsg => {
     return {
-      set_factory: ({
+      set_factory: {
         new_factory: newFactory
-      } as const)
+      } as const
     };
   };
   static updateOwnership = (action: Action): ExecuteMsg => {
@@ -143,10 +143,10 @@ exports[`query class 1`] = `
     owner_of: unknown;
   }>["owner_of"]>): QueryMsg => {
     return {
-      owner_of: ({
+      owner_of: {
         include_expired: includeExpired,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static approval = ({
@@ -157,11 +157,11 @@ exports[`query class 1`] = `
     approval: unknown;
   }>["approval"]>): QueryMsg => {
     return {
-      approval: ({
+      approval: {
         include_expired: includeExpired,
         spender,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static approvals = ({
@@ -171,10 +171,10 @@ exports[`query class 1`] = `
     approvals: unknown;
   }>["approvals"]>): QueryMsg => {
     return {
-      approvals: ({
+      approvals: {
         include_expired: includeExpired,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static allOperators = ({
@@ -186,22 +186,22 @@ exports[`query class 1`] = `
     all_operators: unknown;
   }>["all_operators"]>): QueryMsg => {
     return {
-      all_operators: ({
+      all_operators: {
         include_expired: includeExpired,
         limit,
         owner,
         start_after: startAfter
-      } as const)
+      } as const
     };
   };
   static numTokens = (): QueryMsg => {
     return {
-      num_tokens: ({} as const)
+      num_tokens: {} as const
     };
   };
   static contractInfo = (): QueryMsg => {
     return {
-      contract_info: ({} as const)
+      contract_info: {} as const
     };
   };
   static nftInfo = ({
@@ -210,9 +210,9 @@ exports[`query class 1`] = `
     nft_info: unknown;
   }>["nft_info"]>): QueryMsg => {
     return {
-      nft_info: ({
+      nft_info: {
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static allNftInfo = ({
@@ -222,10 +222,10 @@ exports[`query class 1`] = `
     all_nft_info: unknown;
   }>["all_nft_info"]>): QueryMsg => {
     return {
-      all_nft_info: ({
+      all_nft_info: {
         include_expired: includeExpired,
         token_id: tokenId
-      } as const)
+      } as const
     };
   };
   static tokens = ({
@@ -236,11 +236,11 @@ exports[`query class 1`] = `
     tokens: unknown;
   }>["tokens"]>): QueryMsg => {
     return {
-      tokens: ({
+      tokens: {
         limit,
         owner,
         start_after: startAfter
-      } as const)
+      } as const
     };
   };
   static allTokens = ({
@@ -250,20 +250,20 @@ exports[`query class 1`] = `
     all_tokens: unknown;
   }>["all_tokens"]>): QueryMsg => {
     return {
-      all_tokens: ({
+      all_tokens: {
         limit,
         start_after: startAfter
-      } as const)
+      } as const
     };
   };
   static minter = (): QueryMsg => {
     return {
-      minter: ({} as const)
+      minter: {} as const
     };
   };
   static collectionInfo = (): QueryMsg => {
     return {
-      collection_info: ({} as const)
+      collection_info: {} as const
     };
   };
 }"
diff --git a/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
index d327a9fb..533964cd 100644
--- a/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
+++ b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
@@ -754,73 +754,73 @@ export function useSg721OwnerOfQuery<TData = OwnerOfResponse>({
 
 exports[`createReactQueryHooks 5`] = `
 "export const sg721QueryKeys = {
-  contract: ([{
+  contract: [{
     contract: "sg721"
-  }] as const),
-  address: (contractAddress: string | undefined) => ([{
+  }] as const,
+  address: (contractAddress: string | undefined) => [{
     ...sg721QueryKeys.contract[0],
     address: contractAddress
-  }] as const),
-  ownerOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  ownerOf: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "owner_of",
     args
-  }] as const),
-  approval: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  approval: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "approval",
     args
-  }] as const),
-  approvals: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  approvals: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "approvals",
     args
-  }] as const),
-  allOperators: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  allOperators: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "all_operators",
     args
-  }] as const),
-  numTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  numTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "num_tokens",
     args
-  }] as const),
-  contractInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  contractInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "contract_info",
     args
-  }] as const),
-  nftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  nftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "nft_info",
     args
-  }] as const),
-  allNftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  allNftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "all_nft_info",
     args
-  }] as const),
-  tokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  tokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "tokens",
     args
-  }] as const),
-  allTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  allTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "all_tokens",
     args
-  }] as const),
-  minter: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  minter: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "minter",
     args
-  }] as const),
-  collectionInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => ([{
+  }] as const,
+  collectionInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) => [{
     ...sg721QueryKeys.address(contractAddress)[0],
     method: "collection_info",
     args
-  }] as const)
+  }] as const
 };
 export const sg721Queries = {
   ownerOf: <TData = OwnerOfResponse,>({

From 807b019ec0de2e67c6aa75aae73dff852b8fd4e2 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 12:14:59 +0200
Subject: [PATCH 273/287] Sort everything that comes through glob

---
 .../bundler_test/contracts/Minter.client.ts   |  2 +-
 .../contracts/Minter.message-composer.ts      |  2 +-
 .../contracts/Minter.react-query.ts           |  2 +-
 .../bundler_test/contracts/Minter.recoil.ts   |  2 +-
 .../bundler_test/contracts/Minter.types.ts    | 16 +++++------
 __output__/builder/default/Minter.client.ts   |  2 +-
 .../builder/default/Minter.message-builder.ts |  2 +-
 .../default/Minter.message-composer.ts        |  2 +-
 .../builder/default/Minter.react-query.ts     |  2 +-
 __output__/builder/default/Minter.recoil.ts   |  2 +-
 __output__/builder/default/Minter.types.ts    | 16 +++++------
 __output__/builder/invoke/Minter.client.ts    |  2 +-
 .../builder/invoke/Minter.react-query.ts      |  2 +-
 __output__/builder/invoke/Minter.types.ts     | 16 +++++------
 .../builder/no-extends/Minter.client.ts       |  2 +-
 .../no-extends/Minter.message-builder.ts      |  2 +-
 .../no-extends/Minter.message-composer.ts     |  2 +-
 .../builder/no-extends/Minter.react-query.ts  |  2 +-
 .../builder/no-extends/Minter.recoil.ts       |  2 +-
 __output__/builder/no-extends/Minter.types.ts | 16 +++++------
 __output__/minter/Minter.client.ts            |  2 +-
 __output__/minter/Minter.message-composer.ts  |  2 +-
 __output__/minter/Minter.react-query.ts       |  2 +-
 __output__/minter/Minter.recoil.ts            |  2 +-
 __output__/minter/Minter.types.ts             | 16 +++++------
 packages/ast/test-utils/utils.ts              | 24 ++++++++---------
 packages/ts-codegen/scripts/cmds.ts           | 27 ++++++++++---------
 .../src/commands/create-boilerplate.ts        |  3 ++-
 packages/ts-codegen/src/commands/install.ts   |  4 +--
 packages/ts-codegen/src/utils/schemas.ts      |  6 ++---
 30 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
index 0ed33b4e..bc909514 100644
--- a/__output__/builder/bundler_test/contracts/Minter.client.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
   config: () => Promise<ConfigResponse>;
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 2c37cc00..96c264bb 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -7,7 +7,7 @@
 import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
diff --git a/__output__/builder/bundler_test/contracts/Minter.react-query.ts b/__output__/builder/bundler_test/contracts/Minter.react-query.ts
index f66f79e3..2c3af982 100644
--- a/__output__/builder/bundler_test/contracts/Minter.react-query.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
diff --git a/__output__/builder/bundler_test/contracts/Minter.recoil.ts b/__output__/builder/bundler_test/contracts/Minter.recoil.ts
index 826fb57c..21cc7188 100644
--- a/__output__/builder/bundler_test/contracts/Minter.recoil.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 type QueryClientParams = {
   contractAddress: string;
diff --git a/__output__/builder/bundler_test/contracts/Minter.types.ts b/__output__/builder/bundler_test/contracts/Minter.types.ts
index 55999b8d..248770f6 100644
--- a/__output__/builder/bundler_test/contracts/Minter.types.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.types.ts
@@ -4,19 +4,19 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
+export type Addr = string;
 export type Timestamp = Uint64;
 export type Uint64 = string;
 export type Uint128 = string;
-export interface ConfigResponse {
-  admin: string;
+export interface Config {
+  admin: Addr;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
-  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: string | null;
+  whitelist?: Addr | null;
   [k: string]: unknown;
 }
 export interface Coin {
@@ -24,16 +24,16 @@ export interface Coin {
   denom: string;
   [k: string]: unknown;
 }
-export type Addr = string;
-export interface Config {
-  admin: Addr;
+export interface ConfigResponse {
+  admin: string;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
+  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: Addr | null;
+  whitelist?: string | null;
   [k: string]: unknown;
 }
 export type ExecuteMsg = {
diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts
index f57503a3..8945b0d4 100644
--- a/__output__/builder/default/Minter.client.ts
+++ b/__output__/builder/default/Minter.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
   config: () => Promise<ConfigResponse>;
diff --git a/__output__/builder/default/Minter.message-builder.ts b/__output__/builder/default/Minter.message-builder.ts
index 897f3fa8..e9fa222a 100644
--- a/__output__/builder/default/Minter.message-builder.ts
+++ b/__output__/builder/default/Minter.message-builder.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
 export abstract class MinterExecuteMsgBuilder {
   static mint = (): ExecuteMsg => {
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 2c37cc00..96c264bb 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -7,7 +7,7 @@
 import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
diff --git a/__output__/builder/default/Minter.react-query.ts b/__output__/builder/default/Minter.react-query.ts
index f66f79e3..2c3af982 100644
--- a/__output__/builder/default/Minter.react-query.ts
+++ b/__output__/builder/default/Minter.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
diff --git a/__output__/builder/default/Minter.recoil.ts b/__output__/builder/default/Minter.recoil.ts
index 826fb57c..21cc7188 100644
--- a/__output__/builder/default/Minter.recoil.ts
+++ b/__output__/builder/default/Minter.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 type QueryClientParams = {
   contractAddress: string;
diff --git a/__output__/builder/default/Minter.types.ts b/__output__/builder/default/Minter.types.ts
index 55999b8d..248770f6 100644
--- a/__output__/builder/default/Minter.types.ts
+++ b/__output__/builder/default/Minter.types.ts
@@ -4,19 +4,19 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
+export type Addr = string;
 export type Timestamp = Uint64;
 export type Uint64 = string;
 export type Uint128 = string;
-export interface ConfigResponse {
-  admin: string;
+export interface Config {
+  admin: Addr;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
-  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: string | null;
+  whitelist?: Addr | null;
   [k: string]: unknown;
 }
 export interface Coin {
@@ -24,16 +24,16 @@ export interface Coin {
   denom: string;
   [k: string]: unknown;
 }
-export type Addr = string;
-export interface Config {
-  admin: Addr;
+export interface ConfigResponse {
+  admin: string;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
+  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: Addr | null;
+  whitelist?: string | null;
   [k: string]: unknown;
 }
 export type ExecuteMsg = {
diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts
index f57503a3..8945b0d4 100644
--- a/__output__/builder/invoke/Minter.client.ts
+++ b/__output__/builder/invoke/Minter.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
   config: () => Promise<ConfigResponse>;
diff --git a/__output__/builder/invoke/Minter.react-query.ts b/__output__/builder/invoke/Minter.react-query.ts
index f66f79e3..2c3af982 100644
--- a/__output__/builder/invoke/Minter.react-query.ts
+++ b/__output__/builder/invoke/Minter.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
diff --git a/__output__/builder/invoke/Minter.types.ts b/__output__/builder/invoke/Minter.types.ts
index 55999b8d..248770f6 100644
--- a/__output__/builder/invoke/Minter.types.ts
+++ b/__output__/builder/invoke/Minter.types.ts
@@ -4,19 +4,19 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
+export type Addr = string;
 export type Timestamp = Uint64;
 export type Uint64 = string;
 export type Uint128 = string;
-export interface ConfigResponse {
-  admin: string;
+export interface Config {
+  admin: Addr;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
-  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: string | null;
+  whitelist?: Addr | null;
   [k: string]: unknown;
 }
 export interface Coin {
@@ -24,16 +24,16 @@ export interface Coin {
   denom: string;
   [k: string]: unknown;
 }
-export type Addr = string;
-export interface Config {
-  admin: Addr;
+export interface ConfigResponse {
+  admin: string;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
+  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: Addr | null;
+  whitelist?: string | null;
   [k: string]: unknown;
 }
 export type ExecuteMsg = {
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
index 0ed33b4e..bc909514 100644
--- a/__output__/builder/no-extends/Minter.client.ts
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
   config: () => Promise<ConfigResponse>;
diff --git a/__output__/builder/no-extends/Minter.message-builder.ts b/__output__/builder/no-extends/Minter.message-builder.ts
index 897f3fa8..e9fa222a 100644
--- a/__output__/builder/no-extends/Minter.message-builder.ts
+++ b/__output__/builder/no-extends/Minter.message-builder.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { CamelCasedProperties } from "type-fest";
 export abstract class MinterExecuteMsgBuilder {
   static mint = (): ExecuteMsg => {
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 2c37cc00..96c264bb 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -7,7 +7,7 @@
 import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
diff --git a/__output__/builder/no-extends/Minter.react-query.ts b/__output__/builder/no-extends/Minter.react-query.ts
index f66f79e3..2c3af982 100644
--- a/__output__/builder/no-extends/Minter.react-query.ts
+++ b/__output__/builder/no-extends/Minter.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
diff --git a/__output__/builder/no-extends/Minter.recoil.ts b/__output__/builder/no-extends/Minter.recoil.ts
index 826fb57c..21cc7188 100644
--- a/__output__/builder/no-extends/Minter.recoil.ts
+++ b/__output__/builder/no-extends/Minter.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 type QueryClientParams = {
   contractAddress: string;
diff --git a/__output__/builder/no-extends/Minter.types.ts b/__output__/builder/no-extends/Minter.types.ts
index 55999b8d..248770f6 100644
--- a/__output__/builder/no-extends/Minter.types.ts
+++ b/__output__/builder/no-extends/Minter.types.ts
@@ -4,19 +4,19 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
+export type Addr = string;
 export type Timestamp = Uint64;
 export type Uint64 = string;
 export type Uint128 = string;
-export interface ConfigResponse {
-  admin: string;
+export interface Config {
+  admin: Addr;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
-  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: string | null;
+  whitelist?: Addr | null;
   [k: string]: unknown;
 }
 export interface Coin {
@@ -24,16 +24,16 @@ export interface Coin {
   denom: string;
   [k: string]: unknown;
 }
-export type Addr = string;
-export interface Config {
-  admin: Addr;
+export interface ConfigResponse {
+  admin: string;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
+  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: Addr | null;
+  whitelist?: string | null;
   [k: string]: unknown;
 }
 export type ExecuteMsg = {
diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts
index f57503a3..8945b0d4 100644
--- a/__output__/minter/Minter.client.ts
+++ b/__output__/minter/Minter.client.ts
@@ -6,7 +6,7 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { StdFee } from "@cosmjs/amino";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
   config: () => Promise<ConfigResponse>;
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 2c37cc00..96c264bb 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -7,7 +7,7 @@
 import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
 import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { toUtf8 } from "@cosmjs/encoding";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
diff --git a/__output__/minter/Minter.react-query.ts b/__output__/minter/Minter.react-query.ts
index f66f79e3..2c3af982 100644
--- a/__output__/minter/Minter.react-query.ts
+++ b/__output__/minter/Minter.react-query.ts
@@ -5,7 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 export interface MinterReactQuery<TResponse, TData = TResponse> {
   client: MinterQueryClient;
diff --git a/__output__/minter/Minter.recoil.ts b/__output__/minter/Minter.recoil.ts
index 826fb57c..21cc7188 100644
--- a/__output__/minter/Minter.recoil.ts
+++ b/__output__/minter/Minter.recoil.ts
@@ -6,7 +6,7 @@
 
 import { selectorFamily } from "recoil";
 import { cosmWasmClient } from "./chain";
-import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
+import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 import { MinterQueryClient } from "./Minter.client";
 type QueryClientParams = {
   contractAddress: string;
diff --git a/__output__/minter/Minter.types.ts b/__output__/minter/Minter.types.ts
index 55999b8d..248770f6 100644
--- a/__output__/minter/Minter.types.ts
+++ b/__output__/minter/Minter.types.ts
@@ -4,19 +4,19 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
+export type Addr = string;
 export type Timestamp = Uint64;
 export type Uint64 = string;
 export type Uint128 = string;
-export interface ConfigResponse {
-  admin: string;
+export interface Config {
+  admin: Addr;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
-  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: string | null;
+  whitelist?: Addr | null;
   [k: string]: unknown;
 }
 export interface Coin {
@@ -24,16 +24,16 @@ export interface Coin {
   denom: string;
   [k: string]: unknown;
 }
-export type Addr = string;
-export interface Config {
-  admin: Addr;
+export interface ConfigResponse {
+  admin: string;
   base_token_uri: string;
   num_tokens: number;
   per_address_limit: number;
+  sg721_address: string;
   sg721_code_id: number;
   start_time: Timestamp;
   unit_price: Coin;
-  whitelist?: Addr | null;
+  whitelist?: string | null;
   [k: string]: unknown;
 }
 export type ExecuteMsg = {
diff --git a/packages/ast/test-utils/utils.ts b/packages/ast/test-utils/utils.ts
index f6d5202c..a92bcfcf 100644
--- a/packages/ast/test-utils/utils.ts
+++ b/packages/ast/test-utils/utils.ts
@@ -50,14 +50,14 @@ const globCache: Record<string, GlobContractLegacy[] | GlobContract[]> = {};
 export const globIdlBasedContracts = (p: string): GlobContract[] => {
   if (globCache[p]) return globCache[p] as GlobContract[];
   // @ts-ignore
-  const contracts: GlobContract[] = glob(join(fixtureDir, p, '/*.json')).map(
-    (file) => {
+  const contracts: GlobContract[] = glob(join(fixtureDir, p, '/*.json'))
+    .sort()
+    .map((file) => {
       return {
         name: file.split(join('__fixtures__', p))[1],
         content: JSON.parse(readFileSync(file, 'utf-8')),
       };
-    }
-  );
+    });
   globCache[p] = contracts;
   return contracts;
 };
@@ -65,14 +65,14 @@ export const globIdlBasedContracts = (p: string): GlobContract[] => {
 export const globLegacyContracts = (p: string): GlobContractLegacy[] => {
   if (globCache[p]) return globCache[p] as GlobContractLegacy[];
   // @ts-ignore
-  const contracts: GlobContractLegacy[] = glob(
-    join(fixtureDir, p, '/*.json')
-  ).map((file) => {
-    return {
-      name: file.split(join('__fixtures__', p))[1],
-      content: JSON.parse(readFileSync(file, 'utf-8')),
-    };
-  });
+  const contracts: GlobContractLegacy[] = glob(join(fixtureDir, p, '/*.json'))
+    .sort()
+    .map((file) => {
+      return {
+        name: file.split(join('__fixtures__', p))[1],
+        content: JSON.parse(readFileSync(file, 'utf-8')),
+      };
+    });
   globCache[p] = contracts;
   return contracts;
 };
diff --git a/packages/ts-codegen/scripts/cmds.ts b/packages/ts-codegen/scripts/cmds.ts
index e26c38b4..e0839e69 100644
--- a/packages/ts-codegen/scripts/cmds.ts
+++ b/packages/ts-codegen/scripts/cmds.ts
@@ -10,19 +10,20 @@ interface PathObj {
   safe: string;
   path: string;
 }
-const paths: PathObj[] = glob(`${srcDir}/**.[j|t]s`).map((file: string) => {
-  const [, name] = file.match(/\/(.*)\.[j|t]s$/);
-  return {
-    name: path.basename(name),
-    param: Case.kebab(path.basename(name)),
-    safe: Case.snake(path.basename(name)),
-    path: file
-      .replace(srcDir, './commands')
-      .replace(/\.js$/, '')
-      .replace(/\.ts$/, ''),
-  };
-});
-
+const paths: PathObj[] = glob(`${srcDir}/**.[j|t]s`)
+  .sort()
+  .map((file: string) => {
+    const [, name] = file.match(/\/(.*)\.[j|t]s$/);
+    return {
+      name: path.basename(name),
+      param: Case.kebab(path.basename(name)),
+      safe: Case.snake(path.basename(name)),
+      path: file
+        .replace(srcDir, './commands')
+        .replace(/\.js$/, '')
+        .replace(/\.ts$/, ''),
+    };
+  });
 const imports = paths
   .map((f) => {
     return [`import _${f.safe} from '${f.path}';`];
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 7381a709..a5f4e678 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -83,7 +83,8 @@ export default async (argv: MinimistArgs) => {
 
   const files = []
     .concat(glob(process.cwd() + '/**/.*'))
-    .concat(glob(process.cwd() + '/**/*'));
+    .concat(glob(process.cwd() + '/**/*'))
+    .sort();
 
   for (let i = 0; i < files.length; i++) {
     const templateFile = files[i];
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index 70987dfe..79c95efb 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -78,7 +78,7 @@ export default async (argv: MinimistArgs) => {
   );
 
   // protos
-  const pkgs = glob('./smart-contracts/**/package.json');
+  const pkgs = glob('./smart-contracts/**/package.json').sort();
   const cmds = pkgs
     .filter((f) => {
       return f !== './smart-contracts/package.json';
@@ -89,7 +89,7 @@ export default async (argv: MinimistArgs) => {
       const dir = extDir.split('node_modules/')[1];
       const dst = basename(dir);
 
-      const files = glob(`${extDir}/**/*`, { nodir: true });
+      const files = glob(`${extDir}/**/*`, { nodir: true }).sort();
       files.forEach((f) => {
         if (
           extname(f) === '.json' ||
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 28e15a68..4a5af51a 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -23,9 +23,9 @@ export const readSchemas = async ({
   const fn = clean
     ? cleanse
     : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
-  const files = glob(schemaDir + '/**/*.json').filter(
-    (file) => !file.match(/\/raw\//)
-  );
+  const files = glob(schemaDir + '/**/*.json')
+    .filter((file) => !file.match(/\/raw\//))
+    .sort();
 
   const schemas: JSONSchema[] = files.map((file) =>
     JSON.parse(readFileSync(file, 'utf-8'))

From 03e64086c7124ed4da5974a40e1c13305823afb4 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 15:21:10 +0200
Subject: [PATCH 274/287] Pull out findSchemaFiles, test and add CosmWasm 3
 support

---
 .../cw_schema/hackatom.json                   | 272 ++++++++++++++
 .../cw_schema/raw/execute.json                |  70 ++++
 .../cw_schema/raw/instantiate.json            |  22 ++
 .../cw_schema/raw/migrate.json                |  20 +
 .../cw_schema/raw/query.json                  |  40 ++
 .../cw_schema/raw/response_to_get_int.json    |  21 ++
 .../cw_schema/raw/response_to_recurse.json    |  21 ++
 .../cw_schema/raw/response_to_verifier.json   |  19 +
 .../cw_schema/raw/sudo.json                   |  52 +++
 __fixtures__/cosmwasm3-hackatom/hackatom.json | 352 ++++++++++++++++++
 .../cosmwasm3-hackatom/raw/execute.json       | 136 +++++++
 .../cosmwasm3-hackatom/raw/instantiate.json   |  18 +
 .../cosmwasm3-hackatom/raw/migrate.json       |  15 +
 .../cosmwasm3-hackatom/raw/query.json         |  64 ++++
 .../raw/response_to_get_int.json              |  16 +
 .../raw/response_to_recurse.json              |  25 ++
 .../raw/response_to_verifier.json             |  14 +
 __fixtures__/cosmwasm3-hackatom/raw/sudo.json |  57 +++
 packages/ts-codegen/__tests__/schemas.test.ts |  23 ++
 packages/ts-codegen/src/utils/schemas.ts      |  15 +-
 20 files changed, 1269 insertions(+), 3 deletions(-)
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/hackatom.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/execute.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/instantiate.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/migrate.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/query.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_get_int.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_recurse.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_verifier.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/cw_schema/raw/sudo.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/hackatom.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/execute.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/instantiate.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/migrate.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/query.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/response_to_get_int.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/response_to_recurse.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/response_to_verifier.json
 create mode 100644 __fixtures__/cosmwasm3-hackatom/raw/sudo.json
 create mode 100644 packages/ts-codegen/__tests__/schemas.test.ts

diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/hackatom.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/hackatom.json
new file mode 100644
index 00000000..8af0a7dd
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/hackatom.json
@@ -0,0 +1,272 @@
+{
+  "contract_name": "hackatom",
+  "contract_version": "0.0.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "type": "v1",
+    "root": 0,
+    "definitions": [
+      {
+        "name": "hackatom_msg_InstantiateMsg",
+        "type": "struct",
+        "properties": {
+          "beneficiary": {
+            "value": 1
+          },
+          "verifier": {
+            "value": 1
+          }
+        }
+      },
+      {
+        "name": "String",
+        "type": "string"
+      }
+    ]
+  },
+  "execute": {
+    "type": "v1",
+    "root": 0,
+    "definitions": [
+      {
+        "name": "hackatom_msg_ExecuteMsg",
+        "type": "enum",
+        "cases": {
+          "allocate_large_memory": {
+            "description": "Allocate large amounts of memory without consuming much gas",
+            "type": "named",
+            "properties": {
+              "pages": {
+                "value": 2
+              }
+            }
+          },
+          "cpu_loop": {
+            "description": "Infinite loop to burn cpu cycles (only run when metering is enabled)",
+            "type": "named",
+            "properties": {}
+          },
+          "memory_loop": {
+            "description": "Infinite loop reading and writing memory",
+            "type": "named",
+            "properties": {}
+          },
+          "message_loop": {
+            "description": "Infinite loop sending message to itself",
+            "type": "named",
+            "properties": {}
+          },
+          "panic": {
+            "description": "Trigger a panic to ensure framework handles gracefully",
+            "type": "named",
+            "properties": {}
+          },
+          "release": {
+            "description": "Releasing all funds of the given denom in the contract to the beneficiary.\nThis is the only \"proper\" action of this demo contract.",
+            "type": "named",
+            "properties": {
+              "denom": {
+                "value": 1
+              }
+            }
+          },
+          "storage_loop": {
+            "description": "Infinite loop making storage calls (to test when their limit hits)",
+            "type": "named",
+            "properties": {}
+          },
+          "user_errors_in_api_calls": {
+            "description": "Starting with CosmWasm 0.10, some API calls return user errors back to the contract.\nThis triggers such user errors, ensuring the transaction does not fail in the backend.",
+            "type": "named",
+            "properties": {}
+          }
+        }
+      },
+      {
+        "name": "String",
+        "type": "string"
+      },
+      {
+        "name": "u32",
+        "type": "integer",
+        "precision": 32,
+        "signed": false
+      }
+    ]
+  },
+  "query": {
+    "type": "v1",
+    "root": 0,
+    "definitions": [
+      {
+        "name": "hackatom_msg_QueryMsg",
+        "type": "enum",
+        "cases": {
+          "get_int": {
+            "description": "GetInt returns a hardcoded u32 value",
+            "type": "named",
+            "properties": {}
+          },
+          "recurse": {
+            "description": "Recurse will execute a query into itself up to depth-times and return\nEach step of the recursion may perform some extra work to test gas metering\n(`work` rounds of sha256 on contract).\nNow that we have Env, we can auto-calculate the address to recurse into",
+            "type": "named",
+            "properties": {
+              "depth": {
+                "value": 1
+              },
+              "work": {
+                "value": 1
+              }
+            }
+          },
+          "verifier": {
+            "description": "returns a human-readable representation of the verifier\nuse to ensure query path works in integration tests",
+            "type": "named",
+            "properties": {}
+          }
+        }
+      },
+      {
+        "name": "u32",
+        "type": "integer",
+        "precision": 32,
+        "signed": false
+      }
+    ]
+  },
+  "migrate": {
+    "type": "v1",
+    "root": 0,
+    "definitions": [
+      {
+        "name": "hackatom_msg_MigrateMsg",
+        "description": "MigrateMsg allows a privileged contract administrator to run\na migration on the contract. In this (demo) case it is just migrating\nfrom one hackatom code to the same code, but taking advantage of the\nmigration step to set a new validator.\n\nNote that the contract doesn't enforce permissions here, this is done\nby blockchain logic (in the future by blockchain governance)",
+        "type": "struct",
+        "properties": {
+          "verifier": {
+            "value": 1
+          }
+        }
+      },
+      {
+        "name": "String",
+        "type": "string"
+      }
+    ]
+  },
+  "sudo": {
+    "type": "v1",
+    "root": 0,
+    "definitions": [
+      {
+        "name": "hackatom_msg_SudoMsg",
+        "description": "SudoMsg is only exposed for internal Cosmos SDK modules to call.\nThis is showing how we can expose \"admin\" functionality than can not be called by\nexternal users or contracts, but only trusted (native/Go) code in the blockchain",
+        "type": "enum",
+        "cases": {
+          "steal_funds": {
+            "type": "named",
+            "properties": {
+              "amount": {
+                "value": 4
+              },
+              "recipient": {
+                "value": 1
+              }
+            }
+          }
+        }
+      },
+      {
+        "name": "String",
+        "type": "string"
+      },
+      {
+        "name": "cosmwasm_std_coin_Coin",
+        "type": "struct",
+        "properties": {
+          "amount": {
+            "value": 3
+          },
+          "denom": {
+            "value": 1
+          }
+        }
+      },
+      {
+        "name": "cosmwasm_std_math_uint256_Uint256",
+        "description": "An implementation of u256 that is using strings for JSON encoding/decoding,\nsuch that the full u256 range can be used for clients that convert JSON numbers to floats,\nlike JavaScript and jq.\n\n# Examples\n\nUse `new` to create instances out of u128, `from` for other primitive uint types\nor `from_be_bytes` to provide big endian bytes:\n\n```\n# use cosmwasm_std::Uint256;\nlet a = Uint256::new(258u128);\nlet b = Uint256::from(258u16);\nlet c = Uint256::from_be_bytes([\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8, 2u8,\n]);\nassert_eq!(a, b);\nassert_eq!(a, c);\n```",
+        "type": "integer",
+        "precision": 256,
+        "signed": false
+      },
+      {
+        "name": "alloc::vec::Vec<cosmwasm_std::coin::Coin>",
+        "type": "array",
+        "items": 2
+      }
+    ]
+  },
+  "responses": {
+    "get_int": {
+      "type": "v1",
+      "root": 0,
+      "definitions": [
+        {
+          "name": "hackatom_msg_IntResponse",
+          "type": "struct",
+          "properties": {
+            "int": {
+              "value": 1
+            }
+          }
+        },
+        {
+          "name": "u32",
+          "type": "integer",
+          "precision": 32,
+          "signed": false
+        }
+      ]
+    },
+    "recurse": {
+      "type": "v1",
+      "root": 0,
+      "definitions": [
+        {
+          "name": "hackatom_msg_RecurseResponse",
+          "type": "struct",
+          "properties": {
+            "hashed": {
+              "description": "hashed is the result of running sha256 \"work+1\" times on the contract's human address",
+              "value": 1
+            }
+          }
+        },
+        {
+          "name": "cosmwasm_std_binary_Binary",
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization\nwith serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>.\nSee also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+          "type": "binary"
+        }
+      ]
+    },
+    "verifier": {
+      "type": "v1",
+      "root": 0,
+      "definitions": [
+        {
+          "name": "hackatom_msg_VerifierResponse",
+          "type": "struct",
+          "properties": {
+            "verifier": {
+              "value": 1
+            }
+          }
+        },
+        {
+          "name": "String",
+          "type": "string"
+        }
+      ]
+    }
+  }
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/execute.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/execute.json
new file mode 100644
index 00000000..e780a614
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/execute.json
@@ -0,0 +1,70 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_ExecuteMsg",
+      "type": "enum",
+      "cases": {
+        "allocate_large_memory": {
+          "description": "Allocate large amounts of memory without consuming much gas",
+          "type": "named",
+          "properties": {
+            "pages": {
+              "value": 2
+            }
+          }
+        },
+        "cpu_loop": {
+          "description": "Infinite loop to burn cpu cycles (only run when metering is enabled)",
+          "type": "named",
+          "properties": {}
+        },
+        "memory_loop": {
+          "description": "Infinite loop reading and writing memory",
+          "type": "named",
+          "properties": {}
+        },
+        "message_loop": {
+          "description": "Infinite loop sending message to itself",
+          "type": "named",
+          "properties": {}
+        },
+        "panic": {
+          "description": "Trigger a panic to ensure framework handles gracefully",
+          "type": "named",
+          "properties": {}
+        },
+        "release": {
+          "description": "Releasing all funds of the given denom in the contract to the beneficiary.\nThis is the only \"proper\" action of this demo contract.",
+          "type": "named",
+          "properties": {
+            "denom": {
+              "value": 1
+            }
+          }
+        },
+        "storage_loop": {
+          "description": "Infinite loop making storage calls (to test when their limit hits)",
+          "type": "named",
+          "properties": {}
+        },
+        "user_errors_in_api_calls": {
+          "description": "Starting with CosmWasm 0.10, some API calls return user errors back to the contract.\nThis triggers such user errors, ensuring the transaction does not fail in the backend.",
+          "type": "named",
+          "properties": {}
+        }
+      }
+    },
+    {
+      "name": "String",
+      "type": "string"
+    },
+    {
+      "name": "u32",
+      "type": "integer",
+      "precision": 32,
+      "signed": false
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/instantiate.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/instantiate.json
new file mode 100644
index 00000000..17e197e1
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/instantiate.json
@@ -0,0 +1,22 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_InstantiateMsg",
+      "type": "struct",
+      "properties": {
+        "beneficiary": {
+          "value": 1
+        },
+        "verifier": {
+          "value": 1
+        }
+      }
+    },
+    {
+      "name": "String",
+      "type": "string"
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/migrate.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/migrate.json
new file mode 100644
index 00000000..4af9d670
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/migrate.json
@@ -0,0 +1,20 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_MigrateMsg",
+      "description": "MigrateMsg allows a privileged contract administrator to run\na migration on the contract. In this (demo) case it is just migrating\nfrom one hackatom code to the same code, but taking advantage of the\nmigration step to set a new validator.\n\nNote that the contract doesn't enforce permissions here, this is done\nby blockchain logic (in the future by blockchain governance)",
+      "type": "struct",
+      "properties": {
+        "verifier": {
+          "value": 1
+        }
+      }
+    },
+    {
+      "name": "String",
+      "type": "string"
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/query.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/query.json
new file mode 100644
index 00000000..223992cd
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/query.json
@@ -0,0 +1,40 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_QueryMsg",
+      "type": "enum",
+      "cases": {
+        "get_int": {
+          "description": "GetInt returns a hardcoded u32 value",
+          "type": "named",
+          "properties": {}
+        },
+        "recurse": {
+          "description": "Recurse will execute a query into itself up to depth-times and return\nEach step of the recursion may perform some extra work to test gas metering\n(`work` rounds of sha256 on contract).\nNow that we have Env, we can auto-calculate the address to recurse into",
+          "type": "named",
+          "properties": {
+            "depth": {
+              "value": 1
+            },
+            "work": {
+              "value": 1
+            }
+          }
+        },
+        "verifier": {
+          "description": "returns a human-readable representation of the verifier\nuse to ensure query path works in integration tests",
+          "type": "named",
+          "properties": {}
+        }
+      }
+    },
+    {
+      "name": "u32",
+      "type": "integer",
+      "precision": 32,
+      "signed": false
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_get_int.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_get_int.json
new file mode 100644
index 00000000..9d623647
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_get_int.json
@@ -0,0 +1,21 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_IntResponse",
+      "type": "struct",
+      "properties": {
+        "int": {
+          "value": 1
+        }
+      }
+    },
+    {
+      "name": "u32",
+      "type": "integer",
+      "precision": 32,
+      "signed": false
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_recurse.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_recurse.json
new file mode 100644
index 00000000..e4a426b0
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_recurse.json
@@ -0,0 +1,21 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_RecurseResponse",
+      "type": "struct",
+      "properties": {
+        "hashed": {
+          "description": "hashed is the result of running sha256 \"work+1\" times on the contract's human address",
+          "value": 1
+        }
+      }
+    },
+    {
+      "name": "cosmwasm_std_binary_Binary",
+      "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization\nwith serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>.\nSee also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+      "type": "binary"
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_verifier.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_verifier.json
new file mode 100644
index 00000000..e6d15cc2
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/response_to_verifier.json
@@ -0,0 +1,19 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_VerifierResponse",
+      "type": "struct",
+      "properties": {
+        "verifier": {
+          "value": 1
+        }
+      }
+    },
+    {
+      "name": "String",
+      "type": "string"
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/sudo.json b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/sudo.json
new file mode 100644
index 00000000..648844ea
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/cw_schema/raw/sudo.json
@@ -0,0 +1,52 @@
+{
+  "type": "v1",
+  "root": 0,
+  "definitions": [
+    {
+      "name": "hackatom_msg_SudoMsg",
+      "description": "SudoMsg is only exposed for internal Cosmos SDK modules to call.\nThis is showing how we can expose \"admin\" functionality than can not be called by\nexternal users or contracts, but only trusted (native/Go) code in the blockchain",
+      "type": "enum",
+      "cases": {
+        "steal_funds": {
+          "type": "named",
+          "properties": {
+            "amount": {
+              "value": 4
+            },
+            "recipient": {
+              "value": 1
+            }
+          }
+        }
+      }
+    },
+    {
+      "name": "String",
+      "type": "string"
+    },
+    {
+      "name": "cosmwasm_std_coin_Coin",
+      "type": "struct",
+      "properties": {
+        "amount": {
+          "value": 3
+        },
+        "denom": {
+          "value": 1
+        }
+      }
+    },
+    {
+      "name": "cosmwasm_std_math_uint256_Uint256",
+      "description": "An implementation of u256 that is using strings for JSON encoding/decoding,\nsuch that the full u256 range can be used for clients that convert JSON numbers to floats,\nlike JavaScript and jq.\n\n# Examples\n\nUse `new` to create instances out of u128, `from` for other primitive uint types\nor `from_be_bytes` to provide big endian bytes:\n\n```\n# use cosmwasm_std::Uint256;\nlet a = Uint256::new(258u128);\nlet b = Uint256::from(258u16);\nlet c = Uint256::from_be_bytes([\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,\n0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8, 2u8,\n]);\nassert_eq!(a, b);\nassert_eq!(a, c);\n```",
+      "type": "integer",
+      "precision": 256,
+      "signed": false
+    },
+    {
+      "name": "alloc::vec::Vec<cosmwasm_std::coin::Coin>",
+      "type": "array",
+      "items": 2
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/hackatom.json b/__fixtures__/cosmwasm3-hackatom/hackatom.json
new file mode 100644
index 00000000..feeee3e9
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/hackatom.json
@@ -0,0 +1,352 @@
+{
+  "contract_name": "hackatom",
+  "contract_version": "0.0.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "beneficiary",
+      "verifier"
+    ],
+    "properties": {
+      "beneficiary": {
+        "type": "string"
+      },
+      "verifier": {
+        "type": "string"
+      }
+    },
+    "additionalProperties": false
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "description": "Releasing all funds of the given denom in the contract to the beneficiary. This is the only \"proper\" action of this demo contract.",
+        "type": "object",
+        "required": [
+          "release"
+        ],
+        "properties": {
+          "release": {
+            "type": "object",
+            "required": [
+              "denom"
+            ],
+            "properties": {
+              "denom": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop to burn cpu cycles (only run when metering is enabled)",
+        "type": "object",
+        "required": [
+          "cpu_loop"
+        ],
+        "properties": {
+          "cpu_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop making storage calls (to test when their limit hits)",
+        "type": "object",
+        "required": [
+          "storage_loop"
+        ],
+        "properties": {
+          "storage_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop reading and writing memory",
+        "type": "object",
+        "required": [
+          "memory_loop"
+        ],
+        "properties": {
+          "memory_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Infinite loop sending message to itself",
+        "type": "object",
+        "required": [
+          "message_loop"
+        ],
+        "properties": {
+          "message_loop": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Allocate large amounts of memory without consuming much gas",
+        "type": "object",
+        "required": [
+          "allocate_large_memory"
+        ],
+        "properties": {
+          "allocate_large_memory": {
+            "type": "object",
+            "required": [
+              "pages"
+            ],
+            "properties": {
+              "pages": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Trigger a panic to ensure framework handles gracefully",
+        "type": "object",
+        "required": [
+          "panic"
+        ],
+        "properties": {
+          "panic": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Starting with CosmWasm 0.10, some API calls return user errors back to the contract. This triggers such user errors, ensuring the transaction does not fail in the backend.",
+        "type": "object",
+        "required": [
+          "user_errors_in_api_calls"
+        ],
+        "properties": {
+          "user_errors_in_api_calls": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "description": "returns a human-readable representation of the verifier use to ensure query path works in integration tests",
+        "type": "object",
+        "required": [
+          "verifier"
+        ],
+        "properties": {
+          "verifier": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "Recurse will execute a query into itself up to depth-times and return Each step of the recursion may perform some extra work to test gas metering (`work` rounds of sha256 on contract). Now that we have Env, we can auto-calculate the address to recurse into",
+        "type": "object",
+        "required": [
+          "recurse"
+        ],
+        "properties": {
+          "recurse": {
+            "type": "object",
+            "required": [
+              "depth",
+              "work"
+            ],
+            "properties": {
+              "depth": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "work": {
+                "type": "integer",
+                "format": "uint32",
+                "minimum": 0.0
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "GetInt returns a hardcoded u32 value",
+        "type": "object",
+        "required": [
+          "get_int"
+        ],
+        "properties": {
+          "get_int": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "MigrateMsg",
+    "description": "MigrateMsg allows a privileged contract administrator to run a migration on the contract. In this (demo) case it is just migrating from one hackatom code to the same code, but taking advantage of the migration step to set a new validator.\n\nNote that the contract doesn't enforce permissions here, this is done by blockchain logic (in the future by blockchain governance)",
+    "type": "object",
+    "required": [
+      "verifier"
+    ],
+    "properties": {
+      "verifier": {
+        "type": "string"
+      }
+    },
+    "additionalProperties": false
+  },
+  "sudo": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "SudoMsg",
+    "description": "SudoMsg is only exposed for internal Cosmos SDK modules to call. This is showing how we can expose \"admin\" functionality than can not be called by external users or contracts, but only trusted (native/Go) code in the blockchain",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "steal_funds"
+        ],
+        "properties": {
+          "steal_funds": {
+            "type": "object",
+            "required": [
+              "amount",
+              "recipient"
+            ],
+            "properties": {
+              "amount": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/Coin"
+                }
+              },
+              "recipient": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint256"
+          },
+          "denom": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Uint256": {
+        "description": "An implementation of u256 that is using strings for JSON encoding/decoding, such that the full u256 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `new` to create instances out of u128, `from` for other primitive uint types or `from_be_bytes` to provide big endian bytes:\n\n``` # use cosmwasm_std::Uint256; let a = Uint256::new(258u128); let b = Uint256::from(258u16); let c = Uint256::from_be_bytes([ 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8, 2u8, ]); assert_eq!(a, b); assert_eq!(a, c); ```",
+        "type": "string"
+      }
+    }
+  },
+  "responses": {
+    "get_int": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "IntResponse",
+      "type": "object",
+      "required": [
+        "int"
+      ],
+      "properties": {
+        "int": {
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0.0
+        }
+      },
+      "additionalProperties": false
+    },
+    "recurse": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "RecurseResponse",
+      "type": "object",
+      "required": [
+        "hashed"
+      ],
+      "properties": {
+        "hashed": {
+          "description": "hashed is the result of running sha256 \"work+1\" times on the contract's human address",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Binary"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Binary": {
+          "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+          "type": "string"
+        }
+      }
+    },
+    "verifier": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VerifierResponse",
+      "type": "object",
+      "required": [
+        "verifier"
+      ],
+      "properties": {
+        "verifier": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/execute.json b/__fixtures__/cosmwasm3-hackatom/raw/execute.json
new file mode 100644
index 00000000..c018dc23
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/execute.json
@@ -0,0 +1,136 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ExecuteMsg",
+  "oneOf": [
+    {
+      "description": "Releasing all funds of the given denom in the contract to the beneficiary. This is the only \"proper\" action of this demo contract.",
+      "type": "object",
+      "required": [
+        "release"
+      ],
+      "properties": {
+        "release": {
+          "type": "object",
+          "required": [
+            "denom"
+          ],
+          "properties": {
+            "denom": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Infinite loop to burn cpu cycles (only run when metering is enabled)",
+      "type": "object",
+      "required": [
+        "cpu_loop"
+      ],
+      "properties": {
+        "cpu_loop": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Infinite loop making storage calls (to test when their limit hits)",
+      "type": "object",
+      "required": [
+        "storage_loop"
+      ],
+      "properties": {
+        "storage_loop": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Infinite loop reading and writing memory",
+      "type": "object",
+      "required": [
+        "memory_loop"
+      ],
+      "properties": {
+        "memory_loop": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Infinite loop sending message to itself",
+      "type": "object",
+      "required": [
+        "message_loop"
+      ],
+      "properties": {
+        "message_loop": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Allocate large amounts of memory without consuming much gas",
+      "type": "object",
+      "required": [
+        "allocate_large_memory"
+      ],
+      "properties": {
+        "allocate_large_memory": {
+          "type": "object",
+          "required": [
+            "pages"
+          ],
+          "properties": {
+            "pages": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Trigger a panic to ensure framework handles gracefully",
+      "type": "object",
+      "required": [
+        "panic"
+      ],
+      "properties": {
+        "panic": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Starting with CosmWasm 0.10, some API calls return user errors back to the contract. This triggers such user errors, ensuring the transaction does not fail in the backend.",
+      "type": "object",
+      "required": [
+        "user_errors_in_api_calls"
+      ],
+      "properties": {
+        "user_errors_in_api_calls": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/instantiate.json b/__fixtures__/cosmwasm3-hackatom/raw/instantiate.json
new file mode 100644
index 00000000..8639103d
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/instantiate.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "InstantiateMsg",
+  "type": "object",
+  "required": [
+    "beneficiary",
+    "verifier"
+  ],
+  "properties": {
+    "beneficiary": {
+      "type": "string"
+    },
+    "verifier": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/migrate.json b/__fixtures__/cosmwasm3-hackatom/raw/migrate.json
new file mode 100644
index 00000000..2696e3ac
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/migrate.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "MigrateMsg",
+  "description": "MigrateMsg allows a privileged contract administrator to run a migration on the contract. In this (demo) case it is just migrating from one hackatom code to the same code, but taking advantage of the migration step to set a new validator.\n\nNote that the contract doesn't enforce permissions here, this is done by blockchain logic (in the future by blockchain governance)",
+  "type": "object",
+  "required": [
+    "verifier"
+  ],
+  "properties": {
+    "verifier": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/query.json b/__fixtures__/cosmwasm3-hackatom/raw/query.json
new file mode 100644
index 00000000..a00ee6ae
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/query.json
@@ -0,0 +1,64 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "QueryMsg",
+  "oneOf": [
+    {
+      "description": "returns a human-readable representation of the verifier use to ensure query path works in integration tests",
+      "type": "object",
+      "required": [
+        "verifier"
+      ],
+      "properties": {
+        "verifier": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "Recurse will execute a query into itself up to depth-times and return Each step of the recursion may perform some extra work to test gas metering (`work` rounds of sha256 on contract). Now that we have Env, we can auto-calculate the address to recurse into",
+      "type": "object",
+      "required": [
+        "recurse"
+      ],
+      "properties": {
+        "recurse": {
+          "type": "object",
+          "required": [
+            "depth",
+            "work"
+          ],
+          "properties": {
+            "depth": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "work": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "GetInt returns a hardcoded u32 value",
+      "type": "object",
+      "required": [
+        "get_int"
+      ],
+      "properties": {
+        "get_int": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/response_to_get_int.json b/__fixtures__/cosmwasm3-hackatom/raw/response_to_get_int.json
new file mode 100644
index 00000000..018fd695
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/response_to_get_int.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "IntResponse",
+  "type": "object",
+  "required": [
+    "int"
+  ],
+  "properties": {
+    "int": {
+      "type": "integer",
+      "format": "uint32",
+      "minimum": 0.0
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/response_to_recurse.json b/__fixtures__/cosmwasm3-hackatom/raw/response_to_recurse.json
new file mode 100644
index 00000000..3d50847e
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/response_to_recurse.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "RecurseResponse",
+  "type": "object",
+  "required": [
+    "hashed"
+  ],
+  "properties": {
+    "hashed": {
+      "description": "hashed is the result of running sha256 \"work+1\" times on the contract's human address",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Binary"
+        }
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Binary": {
+      "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
+      "type": "string"
+    }
+  }
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/response_to_verifier.json b/__fixtures__/cosmwasm3-hackatom/raw/response_to_verifier.json
new file mode 100644
index 00000000..fb04c86d
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/response_to_verifier.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "VerifierResponse",
+  "type": "object",
+  "required": [
+    "verifier"
+  ],
+  "properties": {
+    "verifier": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/__fixtures__/cosmwasm3-hackatom/raw/sudo.json b/__fixtures__/cosmwasm3-hackatom/raw/sudo.json
new file mode 100644
index 00000000..a57dc6c7
--- /dev/null
+++ b/__fixtures__/cosmwasm3-hackatom/raw/sudo.json
@@ -0,0 +1,57 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "SudoMsg",
+  "description": "SudoMsg is only exposed for internal Cosmos SDK modules to call. This is showing how we can expose \"admin\" functionality than can not be called by external users or contracts, but only trusted (native/Go) code in the blockchain",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "steal_funds"
+      ],
+      "properties": {
+        "steal_funds": {
+          "type": "object",
+          "required": [
+            "amount",
+            "recipient"
+          ],
+          "properties": {
+            "amount": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Coin"
+              }
+            },
+            "recipient": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ],
+  "definitions": {
+    "Coin": {
+      "type": "object",
+      "required": [
+        "amount",
+        "denom"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint256"
+        },
+        "denom": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Uint256": {
+      "description": "An implementation of u256 that is using strings for JSON encoding/decoding, such that the full u256 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `new` to create instances out of u128, `from` for other primitive uint types or `from_be_bytes` to provide big endian bytes:\n\n``` # use cosmwasm_std::Uint256; let a = Uint256::new(258u128); let b = Uint256::from(258u16); let c = Uint256::from_be_bytes([ 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8, 2u8, ]); assert_eq!(a, b); assert_eq!(a, c); ```",
+      "type": "string"
+    }
+  }
+}
diff --git a/packages/ts-codegen/__tests__/schemas.test.ts b/packages/ts-codegen/__tests__/schemas.test.ts
new file mode 100644
index 00000000..39d82475
--- /dev/null
+++ b/packages/ts-codegen/__tests__/schemas.test.ts
@@ -0,0 +1,23 @@
+import { findSchemaFiles } from '../src/utils';
+
+const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
+
+describe('findSchemaFiles', () => {
+  it('works for CosmWasm 3', async () => {
+    const schemaDir = FIXTURE_DIR + '/cosmwasm3-hackatom/';
+    const paths = await findSchemaFiles(schemaDir);
+    expect(paths.length).toEqual(1);
+    expect(paths[0]).toMatch(/cosmwasm3-hackatom\/hackatom\.json$/);
+  });
+
+  it('works for pre-IDL file collection', async () => {
+    const schemaDir = FIXTURE_DIR + '/minter/';
+    const paths = await findSchemaFiles(schemaDir);
+    expect(paths.length).toEqual(5);
+    expect(paths[0]).toMatch(/minter\/config\.json$/);
+    expect(paths[1]).toMatch(/minter\/config_response\.json$/);
+    expect(paths[2]).toMatch(/minter\/execute_msg\.json$/);
+    expect(paths[3]).toMatch(/minter\/instantiate_msg\.json$/);
+    expect(paths[4]).toMatch(/minter\/query_msg\.json$/);
+  });
+});
diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 4a5af51a..937cda02 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -16,6 +16,17 @@ interface ReadSchemaOpts {
   clean?: boolean;
 }
 
+/**
+ * Takes a schema directory and returns a list of relevant file paths
+ */
+export const findSchemaFiles = async (schemaDir: string): Promise<string[]> => {
+  const files = glob(schemaDir + '/**/*.json')
+    .filter((file) => !file.includes('/raw/')) // raw JSON Schema files that are also included in the main <contract_name>.json
+    .filter((file) => !file.includes('/cw_schema/')) // sub-folder for the new schema format for CosmWasm 3+
+    .sort();
+  return files;
+};
+
 export const readSchemas = async ({
   schemaDir,
   clean = true,
@@ -23,9 +34,7 @@ export const readSchemas = async ({
   const fn = clean
     ? cleanse
     : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
-  const files = glob(schemaDir + '/**/*.json')
-    .filter((file) => !file.match(/\/raw\//))
-    .sort();
+  const files = await findSchemaFiles(schemaDir);
 
   const schemas: JSONSchema[] = files.map((file) =>
     JSON.parse(readFileSync(file, 'utf-8'))

From 697dbe570e6bbd686e5b39b80488e748a68b4d57 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 25 Jun 2025 16:16:04 +0200
Subject: [PATCH 275/287] Improve type-safety in readSchemas and warn for
 legacy schemas

---
 packages/ts-codegen/src/utils/schemas.ts | 25 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/ts-codegen/src/utils/schemas.ts b/packages/ts-codegen/src/utils/schemas.ts
index 937cda02..e3066f55 100644
--- a/packages/ts-codegen/src/utils/schemas.ts
+++ b/packages/ts-codegen/src/utils/schemas.ts
@@ -34,33 +34,37 @@ export const readSchemas = async ({
   const fn = clean
     ? cleanse
     : (schema: JSONSchema[] | Partial<IDLObject>) => schema;
-  const files = await findSchemaFiles(schemaDir);
 
-  const schemas: JSONSchema[] = files.map((file) =>
-    JSON.parse(readFileSync(file, 'utf-8'))
+  const files = (await findSchemaFiles(schemaDir)).map((path) =>
+    readFileSync(path, 'utf-8')
   );
 
-  if (schemas.length > 1) {
+  if (files.length > 1) {
     // legacy
     // TODO add console.warn here
+    console.warn(
+      'Found a multiple schema files. This mode will be removed in the next major version. Please migrate the schemas that contain a single <contract_name>.json IDL file (CosmWasm 1.1+).'
+    );
+
+    const schemas: JSONSchema[] = files.map((file) => JSON.parse(file));
     return {
       schemas: fn(schemas),
     };
   }
 
-  if (schemas.length === 0) {
+  if (files.length === 0) {
     throw new Error(
       'Error [too few files]: requires one schema file per contract'
     );
   }
 
-  if (schemas.length !== 1) {
+  if (files.length !== 1) {
     throw new Error(
       'Error [too many files]: CosmWasm v1.1 schemas supports one file'
     );
   }
 
-  const idlObject: Partial<IDLObject> = schemas[0] as Partial<IDLObject>;
+  const idlObject: Partial<IDLObject> = JSON.parse(files[0]);
   const {
     // contract_name,
     // contract_version,
@@ -75,8 +79,13 @@ export const readSchemas = async ({
 
   if (typeof idl_version !== 'string') {
     // legacy
+    // fall back to a single JSON Schema file
+    console.warn(
+      'Found a single schema file with missing idl_version. This mode will be removed in the next major version. Please migrate the schemas that contain a single <contract_name>.json IDL file (CosmWasm 1.1+).'
+    );
+    const schema: JSONSchema = JSON.parse(files[0]);
     return {
-      schemas: fn(schemas),
+      schemas: fn([schema]),
     };
   }
 

From cbad9bb1a1c39eafb8699b196c33e18bc014a96e Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 08:50:51 +0200
Subject: [PATCH 276/287] Refactor and test cleanFor

---
 packages/ts-codegen/__tests__/cleanse.test.ts | 12 ++++++++++++
 packages/ts-codegen/src/utils/cleanse.ts      | 15 +++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/ts-codegen/__tests__/cleanse.test.ts b/packages/ts-codegen/__tests__/cleanse.test.ts
index f3980c2f..a4ee10c2 100644
--- a/packages/ts-codegen/__tests__/cleanse.test.ts
+++ b/packages/ts-codegen/__tests__/cleanse.test.ts
@@ -2,10 +2,22 @@ import { writeFileSync } from 'fs';
 import { sync as mkdirp } from 'mkdirp';
 
 import { readSchemas } from '../src/utils';
+import { cleanFor } from '../src/utils/cleanse';
 
 const FIXTURE_DIR = __dirname + '/../../../__fixtures__';
 const OUTPUT_DIR = __dirname + '/../../../__output__';
 
+describe('cleanFor', () => {
+  it('works', () => {
+    expect(cleanFor('NftInfoResponse_for_Empty')).toEqual(
+      'NftInfoResponseForEmpty'
+    );
+    expect(cleanFor('UpdateCollectionInfoMsg_for_RoyaltyInfoResponse')).toEqual(
+      'UpdateCollectionInfoMsgForRoyaltyInfoResponse'
+    );
+  });
+});
+
 it('sg721', async () => {
   const out = OUTPUT_DIR + '/sg721';
   const schemaDir = FIXTURE_DIR + '/sg721/';
diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index 9ae2bd75..a724d330 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -1,13 +1,20 @@
 import { pascal } from 'case';
 
-const cleanFor = (str: string) => {
+export const cleanFor = (str: string) => {
   /*
         1. look at first char after _for_
         2. ONLY if you find capitals after, modify it
     */
-  while (/_[a-z]+_[A-Z]/.test(str)) {
-    const m = str.match(/(_[a-z]+_)[A-Z]/);
-    str = str.replace(m[1], pascal(m[1]));
+
+  // When we upgrade to eslint v9, we can remove this exception and
+  // rely on allExceptWhileTrue (https://eslint.org/docs/latest/rules/no-constant-condition)
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const match = str.match(/(_[a-z]+_)[A-Z]/);
+    if (!match) break;
+    // this replace is unsafe as it replaces the same text but maybe
+    // in a different location than the match
+    str = str.replace(match[1], pascal(match[1]));
   }
 
   return str;

From 35d83527db866264792c6b9e9cdc50dab6e93e96 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 08:55:32 +0200
Subject: [PATCH 277/287] Upgrade ast-stringify to get the types

---
 packages/ast/package.json        |  2 +-
 packages/ts-codegen/package.json |  3 +--
 yarn.lock                        | 15 ++++-----------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/ast/package.json b/packages/ast/package.json
index 87654793..98ec0602 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@babel/types": "7.24.0",
     "@cosmwasm/ts-codegen-types": "^1.3.1",
-    "ast-stringify": "0.1.0",
+    "ast-stringify": "0.2.1",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   }
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 9f5fe0e0..b8d62921 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -37,8 +37,7 @@
     "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
   "devDependencies": {
-    "@cosmjs/cosmwasm-stargate": "0.32.3",
-    "ast-stringify": "0.1.0"
+    "@cosmjs/cosmwasm-stargate": "0.32.3"
   },
   "dependencies": {
     "@babel/generator": "7.24.4",
diff --git a/yarn.lock b/yarn.lock
index b69aa0b0..9a78f6ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -277,11 +277,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/runtime@^7.11.2":
-  version "7.27.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6"
-  integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
-
 "@babel/template@^7.24.7", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
@@ -2067,12 +2062,10 @@ arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-ast-stringify@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ast-stringify/-/ast-stringify-0.1.0.tgz#5c6439fbfb4513dcc26c7d34464ccd084ed91cb7"
-  integrity sha512-J1PgFYV3RG6r37+M6ySZJH406hR82okwGvFM9hLXpOvdx4WC4GEW8/qiw6pi1hKTrqcRvoHP8a7mp87egYr6iA==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
+ast-stringify@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ast-stringify/-/ast-stringify-0.2.1.tgz#5a90823699f51e338da4da039219aefc092398a3"
+  integrity sha512-wS/5cTSysM/IL1NVAwI2/xhFDI08UEw4PpLsbpDfc1KEPc2ABo94pjvB5p/tIF+Qu7oFOdxx8TdlGhyu4ZOb3A==
 
 async@^3.2.3:
   version "3.2.6"

From eedc0ff46139bdc9d9f17c23763b58e541283894 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 09:22:04 +0200
Subject: [PATCH 278/287] Replace ts-node with tsx

---
 package.json                     |   2 +-
 packages/ast/package.json        |   8 +-
 packages/ts-codegen/package.json |   6 +-
 yarn.lock                        | 270 +++++++++++++++++++++----------
 4 files changed, 189 insertions(+), 97 deletions(-)

diff --git a/package.json b/package.json
index ed3b6e34..9ec65ca5 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "strip-ansi": "^6",
     "symlink-workspace": "^1.9.0",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.20.3",
     "typescript": "^5.1.6"
   },
   "workspaces": [
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 98ec0602..2d9da41b 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -16,15 +16,15 @@
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
     "clean": "rimraf dist/**",
     "prepare": "npm run build",
-    "codegen": "ts-node ./scripts/build.ts",
+    "codegen": "tsx ./scripts/build.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "lint": "eslint . --fix",
     "format": "prettier --write --log-level warn \"./**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
-    "test:ast": "ts-node scripts/test-ast.ts",
-    "dev": "ts-node src/ts-codegen",
-    "file": "ts-node src/file"
+    "test:ast": "tsx scripts/test-ast.ts",
+    "dev": "tsx src/ts-codegen",
+    "file": "tsx src/file"
   },
   "repository": {
     "type": "git",
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index b8d62921..e38b86c0 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -20,14 +20,14 @@
     "copy": "copyfiles -f LICENSE-Apache LICENSE-MIT README.md package.json dist",
     "clean": "rimraf dist/**",
     "prepare": "npm run build",
-    "cmds": "ts-node ./scripts/cmds.ts",
+    "cmds": "tsx ./scripts/cmds.ts",
     "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
     "lint": "eslint . --fix",
     "format": "prettier --write --log-level warn \"./**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
-    "dev": "ts-node src/ts-codegen",
-    "file": "ts-node src/file"
+    "dev": "tsx src/ts-codegen",
+    "file": "tsx src/file"
   },
   "repository": {
     "type": "git",
diff --git a/yarn.lock b/yarn.lock
index 9a78f6ac..ef1c3a7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -474,12 +474,130 @@
   resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.4.tgz#a9a717c9fd7b1984d9cefdd0ef6c6f254060c671"
   integrity sha512-D1Yc+Zy8oL/hkUkFUL/bwxvuDBzRGpc4cF7/SkdhxX4iHpSLgdOuTt1mhCh9+kl6NQREy9t7SYZ6xeW5gFe60w==
 
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
+"@esbuild/aix-ppc64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz#4e0f91776c2b340e75558f60552195f6fad09f18"
+  integrity sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==
+
+"@esbuild/android-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz#bc766407f1718923f6b8079c8c61bf86ac3a6a4f"
+  integrity sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==
+
+"@esbuild/android-arm@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.5.tgz#4290d6d3407bae3883ad2cded1081a234473ce26"
+  integrity sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==
+
+"@esbuild/android-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.5.tgz#40c11d9cbca4f2406548c8a9895d321bc3b35eff"
+  integrity sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==
+
+"@esbuild/darwin-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz#49d8bf8b1df95f759ac81eb1d0736018006d7e34"
+  integrity sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==
+
+"@esbuild/darwin-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz#e27a5d92a14886ef1d492fd50fc61a2d4d87e418"
+  integrity sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==
+
+"@esbuild/freebsd-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz#97cede59d638840ca104e605cdb9f1b118ba0b1c"
+  integrity sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==
+
+"@esbuild/freebsd-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz#71c77812042a1a8190c3d581e140d15b876b9c6f"
+  integrity sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==
+
+"@esbuild/linux-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz#f7b7c8f97eff8ffd2e47f6c67eb5c9765f2181b8"
+  integrity sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==
+
+"@esbuild/linux-arm@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz#2a0be71b6cd8201fa559aea45598dffabc05d911"
+  integrity sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==
+
+"@esbuild/linux-ia32@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz#763414463cd9ea6fa1f96555d2762f9f84c61783"
+  integrity sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==
+
+"@esbuild/linux-loong64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz#428cf2213ff786a502a52c96cf29d1fcf1eb8506"
+  integrity sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==
+
+"@esbuild/linux-mips64el@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz#5cbcc7fd841b4cd53358afd33527cd394e325d96"
+  integrity sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==
+
+"@esbuild/linux-ppc64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz#0d954ab39ce4f5e50f00c4f8c4fd38f976c13ad9"
+  integrity sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==
+
+"@esbuild/linux-riscv64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz#0e7dd30730505abd8088321e8497e94b547bfb1e"
+  integrity sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==
+
+"@esbuild/linux-s390x@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz#5669af81327a398a336d7e40e320b5bbd6e6e72d"
+  integrity sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==
+
+"@esbuild/linux-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz#b2357dd153aa49038967ddc1ffd90c68a9d2a0d4"
+  integrity sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==
+
+"@esbuild/netbsd-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz#53b4dfb8fe1cee93777c9e366893bd3daa6ba63d"
+  integrity sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==
+
+"@esbuild/netbsd-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz#a0206f6314ce7dc8713b7732703d0f58de1d1e79"
+  integrity sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==
+
+"@esbuild/openbsd-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz#2a796c87c44e8de78001d808c77d948a21ec22fd"
+  integrity sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==
+
+"@esbuild/openbsd-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz#28d0cd8909b7fa3953af998f2b2ed34f576728f0"
+  integrity sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==
+
+"@esbuild/sunos-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz#a28164f5b997e8247d407e36c90d3fd5ddbe0dc5"
+  integrity sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==
+
+"@esbuild/win32-arm64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz#6eadbead38e8bd12f633a5190e45eff80e24007e"
+  integrity sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==
+
+"@esbuild/win32-ia32@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz#bab6288005482f9ed2adb9ded7e88eba9a62cc0d"
+  integrity sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==
+
+"@esbuild/win32-x64@0.25.5":
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz#7fc114af5f6563f19f73324b5d5ff36ece0803d1"
+  integrity sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.7.0"
@@ -821,7 +939,7 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+"@jridgewell/resolve-uri@^3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
@@ -836,14 +954,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
   integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
@@ -1504,26 +1614,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@tsconfig/node10@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
-  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
 "@tufjs/canonical-json@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
@@ -1864,14 +1954,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.1.1:
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7"
-  integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==
-  dependencies:
-    acorn "^8.11.0"
-
-acorn@^8.11.0, acorn@^8.4.1, acorn@^8.9.0:
+acorn@^8.9.0:
   version "8.15.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
@@ -2020,11 +2103,6 @@ are-we-there-yet@^4.0.0:
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz#aed25dd0eae514660d49ac2b2366b175c614785a"
   integrity sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2777,11 +2855,6 @@ create-jest@^29.7.0:
     jest-util "^29.7.0"
     prompts "^2.0.1"
 
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
 cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
@@ -2938,11 +3011,6 @@ diff-sequences@^29.6.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
   integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -3142,6 +3210,37 @@ es6-weak-map@^2.0.3:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+esbuild@~0.25.0:
+  version "0.25.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.5.tgz#71075054993fdfae76c66586f9b9c1f8d7edd430"
+  integrity sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.25.5"
+    "@esbuild/android-arm" "0.25.5"
+    "@esbuild/android-arm64" "0.25.5"
+    "@esbuild/android-x64" "0.25.5"
+    "@esbuild/darwin-arm64" "0.25.5"
+    "@esbuild/darwin-x64" "0.25.5"
+    "@esbuild/freebsd-arm64" "0.25.5"
+    "@esbuild/freebsd-x64" "0.25.5"
+    "@esbuild/linux-arm" "0.25.5"
+    "@esbuild/linux-arm64" "0.25.5"
+    "@esbuild/linux-ia32" "0.25.5"
+    "@esbuild/linux-loong64" "0.25.5"
+    "@esbuild/linux-mips64el" "0.25.5"
+    "@esbuild/linux-ppc64" "0.25.5"
+    "@esbuild/linux-riscv64" "0.25.5"
+    "@esbuild/linux-s390x" "0.25.5"
+    "@esbuild/linux-x64" "0.25.5"
+    "@esbuild/netbsd-arm64" "0.25.5"
+    "@esbuild/netbsd-x64" "0.25.5"
+    "@esbuild/openbsd-arm64" "0.25.5"
+    "@esbuild/openbsd-x64" "0.25.5"
+    "@esbuild/sunos-x64" "0.25.5"
+    "@esbuild/win32-arm64" "0.25.5"
+    "@esbuild/win32-ia32" "0.25.5"
+    "@esbuild/win32-x64" "0.25.5"
+
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
@@ -3583,7 +3682,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2:
+fsevents@^2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -3695,6 +3794,13 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-tsconfig@^4.7.5:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.1.tgz#d34c1c01f47d65a606c37aa7a177bc3e56ab4b2e"
+  integrity sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
 git-raw-commits@^2.0.8:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
@@ -5304,7 +5410,7 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@^1.1.1, make-error@^1.3.6:
+make-error@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -6741,6 +6847,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
 resolve.exports@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f"
@@ -7429,25 +7540,6 @@ ts-jest@^29.1.1:
     type-fest "^4.41.0"
     yargs-parser "^21.1.1"
 
-ts-node@^10.9.2:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
-  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
 tsconfig-paths@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
@@ -7467,6 +7559,16 @@ tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
+tsx@^4.20.3:
+  version "4.20.3"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.20.3.tgz#f913e4911d59ad177c1bcee19d1035ef8dd6e2fb"
+  integrity sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==
+  dependencies:
+    esbuild "~0.25.0"
+    get-tsconfig "^4.7.5"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
 tuf-js@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
@@ -7650,11 +7752,6 @@ uuid@8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 v8-compile-cache@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -7933,11 +8030,6 @@ yargs@^17.3.1, yargs@^17.6.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From 5a3cd65a7cd03fb024113370f97d33d834524f08 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 10:24:10 +0200
Subject: [PATCH 279/287] Upgrade eslint to version 9

---
 .eslintignore                     |   2 -
 .eslintrc.json                    |  47 ------
 eslint.config.mjs                 |  68 +++++++++
 package.json                      |   3 +-
 packages/ast/.eslintignore        |   1 -
 packages/ts-codegen/.eslintignore |   1 -
 packages/types/.eslintignore      |   1 -
 yarn.lock                         | 245 +++++++++++++++++-------------
 8 files changed, 211 insertions(+), 157 deletions(-)
 delete mode 100644 .eslintignore
 delete mode 100644 .eslintrc.json
 create mode 100644 eslint.config.mjs
 delete mode 120000 packages/ast/.eslintignore
 delete mode 120000 packages/ts-codegen/.eslintignore
 delete mode 120000 packages/types/.eslintignore

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index b9470778..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-dist/
diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index b160b72b..00000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2021": true,
-    "node": true,
-    "jest": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
-  "overrides": [],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  },
-  "plugins": [
-    "@typescript-eslint",
-    "simple-import-sort",
-    "unused-imports"
-  ],
-  "rules": {
-    "indent": "off", // prettier takes care of this (yarn format)
-    "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
-    "quote-props": ["error", "as-needed"],
-    "semi": ["error", "always"],
-    "simple-import-sort/imports": 1,
-    "simple-import-sort/exports": 1,
-    "unused-imports/no-unused-imports": 1,
-    "@typescript-eslint/no-unused-vars": [
-      1,
-      {
-        "argsIgnorePattern": "React|res|next|^_"
-      }
-    ],
-    "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-var-requires": 0,
-    "no-console": 0,
-    "@typescript-eslint/ban-ts-comment": 0,
-    "prefer-const": 0,
-    "no-case-declarations": 0,
-    "no-implicit-globals": 0,
-    "@typescript-eslint/no-unsafe-declaration-merging": 0
-  }
-}
\ No newline at end of file
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..bb45ad8d
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,68 @@
+import { defineConfig, globalIgnores } from "eslint/config";
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import simpleImportSort from "eslint-plugin-simple-import-sort";
+import unusedImports from "eslint-plugin-unused-imports";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default defineConfig([globalIgnores(["**/node_modules/", "**/dist/"]), {
+    extends: compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"),
+
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+        "simple-import-sort": simpleImportSort,
+        "unused-imports": unusedImports,
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+            ...globals.jest,
+        },
+
+        parser: tsParser,
+        ecmaVersion: "latest",
+        sourceType: "module",
+    },
+
+    rules: {
+        indent: "off",
+
+        quotes: ["error", "single", {
+            avoidEscape: true,
+            allowTemplateLiterals: true,
+        }],
+
+        "quote-props": ["error", "as-needed"],
+        semi: ["error", "always"],
+        "simple-import-sort/imports": 1,
+        "simple-import-sort/exports": 1,
+        "unused-imports/no-unused-imports": 1,
+
+        "@typescript-eslint/no-unused-vars": [1, {
+            argsIgnorePattern: "React|res|next|^_",
+        }],
+
+        "@typescript-eslint/no-explicit-any": 0,
+        "@typescript-eslint/no-var-requires": 0,
+        "no-console": 0,
+        "@typescript-eslint/ban-ts-comment": 0,
+        "prefer-const": 0,
+        "no-case-declarations": 0,
+        "no-implicit-globals": 0,
+        "@typescript-eslint/no-unsafe-declaration-merging": 0,
+    },
+}]);
\ No newline at end of file
diff --git a/package.json b/package.json
index 9ec65ca5..3d706805 100644
--- a/package.json
+++ b/package.json
@@ -22,11 +22,12 @@
     "@typescript-eslint/eslint-plugin": "^7.10.0",
     "@typescript-eslint/parser": "^7.10.0",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.56.0",
+    "eslint": "^9.30.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-unused-imports": "^4.0.0",
     "glob": "^10",
+    "globals": "^16.2.0",
     "jest": "^29.6.2",
     "jest-in-case": "^1.0.2",
     "lerna": "^6",
diff --git a/packages/ast/.eslintignore b/packages/ast/.eslintignore
deleted file mode 120000
index 86039baf..00000000
--- a/packages/ast/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-../../.eslintignore
\ No newline at end of file
diff --git a/packages/ts-codegen/.eslintignore b/packages/ts-codegen/.eslintignore
deleted file mode 120000
index 86039baf..00000000
--- a/packages/ts-codegen/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-../../.eslintignore
\ No newline at end of file
diff --git a/packages/types/.eslintignore b/packages/types/.eslintignore
deleted file mode 120000
index 86039baf..00000000
--- a/packages/types/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-../../.eslintignore
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index ef1c3a7e..666634f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -606,54 +606,104 @@
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.12.1":
   version "4.12.1"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
   integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/config-array@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.0.tgz#abdbcbd16b124c638081766392a4d6b509f72636"
+  integrity sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==
+  dependencies:
+    "@eslint/object-schema" "^2.1.6"
+    debug "^4.3.1"
+    minimatch "^3.1.2"
+
+"@eslint/config-helpers@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.3.0.tgz#3e09a90dfb87e0005c7694791e58e97077271286"
+  integrity sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==
+
+"@eslint/core@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.14.0.tgz#326289380968eaf7e96f364e1e4cf8f3adf2d003"
+  integrity sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/core@^0.15.1":
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.15.1.tgz#d530d44209cbfe2f82ef86d6ba08760196dd3b60"
+  integrity sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/eslintrc@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.1.tgz#e55f7f1dd400600dd066dbba349c4c0bac916964"
+  integrity sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
-  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
+"@eslint/js@9.30.0":
+  version "9.30.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.30.0.tgz#c396fa450d5505dd9b7b8846b33f0491aebd9a2d"
+  integrity sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==
+
+"@eslint/object-schema@^2.1.6":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.6.tgz#58369ab5b5b3ca117880c0f6c0b0f32f6950f24f"
+  integrity sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==
+
+"@eslint/plugin-kit@^0.3.1":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz#32926b59bd407d58d817941e48b2a7049359b1fd"
+  integrity sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==
+  dependencies:
+    "@eslint/core" "^0.15.1"
+    levn "^0.4.1"
 
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
-  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+"@humanfs/core@^0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
+  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+
+"@humanfs/node@^0.16.6":
+  version "0.16.6"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
+  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.3"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
+    "@humanfs/core" "^0.19.1"
+    "@humanwhocodes/retry" "^0.3.0"
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
+  integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
+
+"@humanwhocodes/retry@^0.4.2":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
+  integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
 
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
@@ -1081,7 +1131,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+"@nodelib/fs.walk@^1.2.3":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1660,6 +1710,11 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
+"@types/estree@^1.0.6":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
+  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
+
 "@types/glob@*":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
@@ -1726,7 +1781,7 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.11":
+"@types/json-schema@^7.0.11", "@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -1906,11 +1961,6 @@
     "@typescript-eslint/types" "7.18.0"
     eslint-visitor-keys "^3.4.3"
 
-"@ungap/structured-clone@^1.2.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
-  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
-
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -1954,7 +2004,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
+acorn@^8.15.0:
   version "8.15.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
@@ -2855,7 +2905,7 @@ create-jest@^29.7.0:
     jest-util "^29.7.0"
     prompts "^2.0.1"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+cross-spawn@^7.0.3, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -3018,13 +3068,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 dot-prop@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
@@ -3276,62 +3319,64 @@ eslint-plugin-unused-imports@^4.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz#62ddc7446ccbf9aa7b6f1f0b00a980423cda2738"
   integrity sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
+  integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.56.0:
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
-  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
+eslint@^9.30.0:
+  version "9.30.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.30.0.tgz#fb0c655f5e28fc1b2f4050c28efa1876d78034fc"
+  integrity sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.1"
-    "@humanwhocodes/config-array" "^0.13.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.21.0"
+    "@eslint/config-helpers" "^0.3.0"
+    "@eslint/core" "^0.14.0"
+    "@eslint/eslintrc" "^3.3.1"
+    "@eslint/js" "9.30.0"
+    "@eslint/plugin-kit" "^0.3.1"
+    "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
+    "@humanwhocodes/retry" "^0.4.2"
+    "@types/estree" "^1.0.6"
+    "@types/json-schema" "^7.0.15"
     ajv "^6.12.4"
     chalk "^4.0.0"
-    cross-spawn "^7.0.2"
+    cross-spawn "^7.0.6"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
+    eslint-scope "^8.4.0"
+    eslint-visitor-keys "^4.2.1"
+    espree "^10.4.0"
+    esquery "^1.5.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
 
 esniff@^2.0.1:
   version "2.0.1"
@@ -3343,21 +3388,21 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1, espree@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.15.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.2.1"
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.2:
+esquery@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
   integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
@@ -3547,12 +3592,12 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 file-url@3.0.0:
   version "3.0.0"
@@ -3596,14 +3641,13 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flat@^5.0.2:
   version "5.0.2"
@@ -3933,12 +3977,15 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
+
+globals@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-16.2.0.tgz#19efcd1ddde2bd5efce128e5c2e441df1abc6f7c"
+  integrity sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==
 
 globalthis@^1.0.1:
   version "1.0.4"
@@ -4431,7 +4478,7 @@ is-path-cwd@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-inside@^3.0.2, is-path-inside@^3.0.3:
+is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -5124,7 +5171,7 @@ just-diff@^6.0.0:
   resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285"
   integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==
 
-keyv@^4.5.3:
+keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -5573,7 +5620,7 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -7429,11 +7476,6 @@ text-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
 thenify-all@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
@@ -7600,11 +7642,6 @@ type-fest@^0.18.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
 type-fest@^0.21.3:
   version "0.21.3"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"

From 700047b947945f8f41440197cc1a670d1a7e8729 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 10:24:22 +0200
Subject: [PATCH 280/287] Remove obsolete comment

---
 packages/ts-codegen/src/utils/cleanse.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/ts-codegen/src/utils/cleanse.ts b/packages/ts-codegen/src/utils/cleanse.ts
index a724d330..1fb3d50a 100644
--- a/packages/ts-codegen/src/utils/cleanse.ts
+++ b/packages/ts-codegen/src/utils/cleanse.ts
@@ -6,9 +6,6 @@ export const cleanFor = (str: string) => {
         2. ONLY if you find capitals after, modify it
     */
 
-  // When we upgrade to eslint v9, we can remove this exception and
-  // rely on allExceptWhileTrue (https://eslint.org/docs/latest/rules/no-constant-condition)
-  // eslint-disable-next-line no-constant-condition
   while (true) {
     const match = str.match(/(_[a-z]+_)[A-Z]/);
     if (!match) break;

From 5a8361b2e352389945c16bdf172c40e291ddf2e3 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 10:32:52 +0200
Subject: [PATCH 281/287] Upgrade @typescript-eslint/*

---
 package.json                                  |   4 +-
 packages/ts-codegen/scripts/cmds.ts           |  19 +--
 .../src/commands/create-boilerplate.ts        |   7 +-
 packages/ts-codegen/src/commands/install.ts   |   2 +-
 packages/ts-codegen/src/file.ts               |   3 +-
 .../ts-codegen/src/plugins/react-query.ts     |   2 +-
 packages/ts-codegen/src/ts-codegen.ts         |   4 +-
 yarn.lock                                     | 153 ++++++++++--------
 8 files changed, 109 insertions(+), 85 deletions(-)

diff --git a/package.json b/package.json
index 3d706805..dcce768e 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
     "@types/jest-in-case": "^1.0.2",
     "@types/mkdirp": "1.0.2",
     "@types/node": "^20.12.7",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "^7.10.0",
+    "@typescript-eslint/eslint-plugin": "^8.35.0",
+    "@typescript-eslint/parser": "^8.35.0",
     "copyfiles": "^2.4.1",
     "eslint": "^9.30.0",
     "eslint-config-prettier": "^10.1.5",
diff --git a/packages/ts-codegen/scripts/cmds.ts b/packages/ts-codegen/scripts/cmds.ts
index e0839e69..f5cb2bf0 100644
--- a/packages/ts-codegen/scripts/cmds.ts
+++ b/packages/ts-codegen/scripts/cmds.ts
@@ -1,8 +1,9 @@
-const fs = require('fs');
-const path = require('path');
-const { globSync: glob } = require('glob');
-const Case = require('case');
-const srcDir = path.resolve(`${__dirname}/../src/commands`);
+import { kebab, snake } from 'case';
+import { writeFileSync } from 'fs';
+import { globSync as glob } from 'glob';
+import { basename, resolve } from 'path';
+
+const srcDir = resolve(`${__dirname}/../src/commands`);
 
 interface PathObj {
   name: string;
@@ -15,9 +16,9 @@ const paths: PathObj[] = glob(`${srcDir}/**.[j|t]s`)
   .map((file: string) => {
     const [, name] = file.match(/\/(.*)\.[j|t]s$/);
     return {
-      name: path.basename(name),
-      param: Case.kebab(path.basename(name)),
-      safe: Case.snake(path.basename(name)),
+      name: basename(name),
+      param: kebab(basename(name)),
+      safe: snake(basename(name)),
       path: file
         .replace(srcDir, './commands')
         .replace(/\.js$/, '')
@@ -43,4 +44,4 @@ ${paths
 
   `;
 
-fs.writeFileSync(`${__dirname}/../src/cmds.ts`, out);
+writeFileSync(`${__dirname}/../src/cmds.ts`, out);
diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index a5f4e678..112f90c9 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -1,13 +1,12 @@
 import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 import dargs from 'dargs';
+import * as fs from 'fs';
+import { globSync as glob } from 'glob';
+import * as path from 'path';
 import * as shell from 'shelljs';
 
 import { prompt } from '../utils/prompt';
 
-const { globSync: glob } = require('glob');
-const fs = require('fs');
-const path = require('path');
-
 const repo = 'https://github.com/hyperweb-io/ts-codegen-module-boilerplate';
 export default async (argv: MinimistArgs) => {
   if (!shell.which('git')) {
diff --git a/packages/ts-codegen/src/commands/install.ts b/packages/ts-codegen/src/commands/install.ts
index 79c95efb..c4f08d7d 100644
--- a/packages/ts-codegen/src/commands/install.ts
+++ b/packages/ts-codegen/src/commands/install.ts
@@ -35,7 +35,7 @@ export default async (argv: MinimistArgs) => {
   let thisPackage;
   try {
     thisPackage = JSON.parse(readFileSync(join(cur, 'package.json'), 'utf-8'));
-  } catch (e) {
+  } catch {
     throw new Error('make sure you are inside of a telescope package!');
   }
 
diff --git a/packages/ts-codegen/src/file.ts b/packages/ts-codegen/src/file.ts
index 559d1860..b8d4b9e7 100644
--- a/packages/ts-codegen/src/file.ts
+++ b/packages/ts-codegen/src/file.ts
@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 import { readFileSync } from 'fs';
+import minimist from 'minimist';
 
 import { cli } from './cli';
 import { prompt } from './utils/prompt';
 
-const argv = require('minimist')(process.argv.slice(2));
+const argv = minimist(process.argv.slice(2));
 
 const question = [
   {
diff --git a/packages/ts-codegen/src/plugins/react-query.ts b/packages/ts-codegen/src/plugins/react-query.ts
index d476fbe5..97e3f463 100644
--- a/packages/ts-codegen/src/plugins/react-query.ts
+++ b/packages/ts-codegen/src/plugins/react-query.ts
@@ -56,7 +56,7 @@ export class ReactQueryPlugin extends BuilderPluginBase<RenderOptions> {
 
     const clientImports = [];
 
-    QueryMsg && clientImports.push(QueryClient);
+    if (QueryMsg) clientImports.push(QueryClient);
 
     // check that there are commands within the exec msg
     const shouldGenerateMutationHooks =
diff --git a/packages/ts-codegen/src/ts-codegen.ts b/packages/ts-codegen/src/ts-codegen.ts
index 8a3c532c..a5603b12 100755
--- a/packages/ts-codegen/src/ts-codegen.ts
+++ b/packages/ts-codegen/src/ts-codegen.ts
@@ -1,7 +1,9 @@
 #!/usr/bin/env node
+import minimist from 'minimist';
+
 import { cli } from './cli';
 
-let argv = require('minimist')(process.argv.slice(2));
+let argv = minimist(process.argv.slice(2));
 
 (async () => {
   await cli(argv);
diff --git a/yarn.lock b/yarn.lock
index 666634f4..1d20b8a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -599,7 +599,7 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz#7fc114af5f6563f19f73324b5d5ff36ece0803d1"
   integrity sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==
 
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.7.0":
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz#607084630c6c033992a082de6e6fbc1a8b52175a"
   integrity sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==
@@ -1880,86 +1880,102 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^7.10.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
-  integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
+"@typescript-eslint/eslint-plugin@^8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz#515170100ff867445fe0a17ce05c14fc5fd9ca63"
+  integrity sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/type-utils" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
+    "@typescript-eslint/scope-manager" "8.35.0"
+    "@typescript-eslint/type-utils" "8.35.0"
+    "@typescript-eslint/utils" "8.35.0"
+    "@typescript-eslint/visitor-keys" "8.35.0"
     graphemer "^1.4.0"
-    ignore "^5.3.1"
+    ignore "^7.0.0"
     natural-compare "^1.4.0"
-    ts-api-utils "^1.3.0"
+    ts-api-utils "^2.1.0"
 
-"@typescript-eslint/parser@^7.10.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
-  integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
+"@typescript-eslint/parser@^8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.35.0.tgz#20a0e17778a329a6072722f5ac418d4376b767d2"
+  integrity sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
+    "@typescript-eslint/scope-manager" "8.35.0"
+    "@typescript-eslint/types" "8.35.0"
+    "@typescript-eslint/typescript-estree" "8.35.0"
+    "@typescript-eslint/visitor-keys" "8.35.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
-  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
+"@typescript-eslint/project-service@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.35.0.tgz#00bd77e6845fbdb5684c6ab2d8a400a58dcfb07b"
+  integrity sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==
   dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
+    "@typescript-eslint/tsconfig-utils" "^8.35.0"
+    "@typescript-eslint/types" "^8.35.0"
+    debug "^4.3.4"
 
-"@typescript-eslint/type-utils@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
-  integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==
+"@typescript-eslint/scope-manager@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz#8ccb2ab63383544fab98fc4b542d8d141259ff4f"
+  integrity sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
-    debug "^4.3.4"
-    ts-api-utils "^1.3.0"
+    "@typescript-eslint/types" "8.35.0"
+    "@typescript-eslint/visitor-keys" "8.35.0"
 
-"@typescript-eslint/types@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
-  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
+"@typescript-eslint/tsconfig-utils@8.35.0", "@typescript-eslint/tsconfig-utils@^8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz#6e05aeb999999e31d562ceb4fe144f3cbfbd670e"
+  integrity sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==
 
-"@typescript-eslint/typescript-estree@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
-  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
+"@typescript-eslint/type-utils@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz#0201eae9d83ffcc3451ef8c94f53ecfbf2319ecc"
+  integrity sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==
   dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
+    "@typescript-eslint/typescript-estree" "8.35.0"
+    "@typescript-eslint/utils" "8.35.0"
     debug "^4.3.4"
-    globby "^11.1.0"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/types@8.35.0", "@typescript-eslint/types@^8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.35.0.tgz#e60d062907930e30008d796de5c4170f02618a93"
+  integrity sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==
+
+"@typescript-eslint/typescript-estree@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz#86141e6c55b75bc1eaecc0781bd39704de14e52a"
+  integrity sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==
+  dependencies:
+    "@typescript-eslint/project-service" "8.35.0"
+    "@typescript-eslint/tsconfig-utils" "8.35.0"
+    "@typescript-eslint/types" "8.35.0"
+    "@typescript-eslint/visitor-keys" "8.35.0"
+    debug "^4.3.4"
+    fast-glob "^3.3.2"
     is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
-    ts-api-utils "^1.3.0"
+    ts-api-utils "^2.1.0"
 
-"@typescript-eslint/utils@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
-  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
+"@typescript-eslint/utils@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.35.0.tgz#aaf0afab5ab51ea2f1897002907eacd9834606d5"
+  integrity sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@eslint-community/eslint-utils" "^4.7.0"
+    "@typescript-eslint/scope-manager" "8.35.0"
+    "@typescript-eslint/types" "8.35.0"
+    "@typescript-eslint/typescript-estree" "8.35.0"
 
-"@typescript-eslint/visitor-keys@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
-  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
+"@typescript-eslint/visitor-keys@8.35.0":
+  version "8.35.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz#93e905e7f1e94d26a79771d1b1eb0024cb159dbf"
+  integrity sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==
   dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    eslint-visitor-keys "^3.4.3"
+    "@typescript-eslint/types" "8.35.0"
+    eslint-visitor-keys "^4.2.1"
 
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
@@ -3543,7 +3559,7 @@ fast-glob@3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.9:
+fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
   integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
@@ -3995,7 +4011,7 @@ globalthis@^1.0.1:
     define-properties "^1.2.1"
     gopd "^1.0.1"
 
-globby@11.1.0, globby@^11.0.1, globby@^11.1.0:
+globby@11.1.0, globby@^11.0.1:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -4214,11 +4230,16 @@ ignore-walk@^6.0.0:
   dependencies:
     minimatch "^9.0.0"
 
-ignore@^5.0.4, ignore@^5.2.0, ignore@^5.3.1:
+ignore@^5.0.4, ignore@^5.2.0:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
+ignore@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9"
+  integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==
+
 import-fresh@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
@@ -7562,10 +7583,10 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-ts-api-utils@^1.3.0:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
-  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
+ts-api-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
+  integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
 
 ts-jest@^29.1.1:
   version "29.4.0"

From dabe0576a5081ea11b94eb62d7388c5d79faff94 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 30 Jun 2025 10:36:12 +0200
Subject: [PATCH 282/287] Fix reading string from file

---
 packages/ts-codegen/src/commands/create-boilerplate.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ts-codegen/src/commands/create-boilerplate.ts b/packages/ts-codegen/src/commands/create-boilerplate.ts
index 112f90c9..cec4fb2d 100644
--- a/packages/ts-codegen/src/commands/create-boilerplate.ts
+++ b/packages/ts-codegen/src/commands/create-boilerplate.ts
@@ -1,6 +1,6 @@
 import { MinimistArgs } from '@cosmwasm/ts-codegen-types';
 import dargs from 'dargs';
-import * as fs from 'fs';
+import { lstatSync, readFileSync, writeFileSync } from 'fs';
 import { globSync as glob } from 'glob';
 import * as path from 'path';
 import * as shell from 'shelljs';
@@ -28,7 +28,7 @@ export default async (argv: MinimistArgs) => {
   shell.exec(`git clone ${repo} ${name}`);
   shell.cd(name);
 
-  const questions = JSON.parse(fs.readFileSync(`.questions.json`));
+  const questions = JSON.parse(readFileSync(`.questions.json`, 'utf-8'));
 
   const fullname = shell
     .exec('git config --global user.name', { silent: true })
@@ -87,9 +87,9 @@ export default async (argv: MinimistArgs) => {
 
   for (let i = 0; i < files.length; i++) {
     const templateFile = files[i];
-    if (fs.lstatSync(templateFile).isDirectory()) continue;
+    if (lstatSync(templateFile).isDirectory()) continue;
 
-    let content = fs.readFileSync(templateFile).toString();
+    let content = readFileSync(templateFile, 'utf-8');
     if (
       path.basename(templateFile) === 'LICENSE' &&
       license.__LICENSE__ === 'closed'
@@ -128,7 +128,7 @@ Proprietary and confidential`;
     //     content = `# ${results.__MODULENAME__}`;
     // }
 
-    fs.writeFileSync(templateFile, content);
+    writeFileSync(templateFile, content);
   }
 
   shell.rm('-rf', '.git');

From bbc6af3d780a810a8bdb8d905ef5413f1ab08d4b Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 2 Jul 2025 12:03:46 -0700
Subject: [PATCH 283/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.9.0
 - @cosmwasm/ts-codegen@1.13.0
 - @cosmwasm/ts-codegen-types@1.4.0
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 6c03be81..042d7c9b 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.9.0](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.8.1...@cosmwasm/ts-codegen-ast@1.9.0) (2025-07-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 ## [1.8.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.8.0...@cosmwasm/ts-codegen-ast@1.8.1) (2025-01-28)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 2d9da41b..d6172ff7 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen/tree/master/packages/ast#readme",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-types": "^1.3.1",
+    "@cosmwasm/ts-codegen-types": "^1.4.0",
     "ast-stringify": "0.2.1",
     "case": "1.6.3",
     "deepmerge": "4.2.2"
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 2cc043c3..9faaf11d 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.13.0](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen@1.12.1...@cosmwasm/ts-codegen@1.13.0) (2025-07-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 ## [1.12.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen@1.12.0...@cosmwasm/ts-codegen@1.12.1) (2025-01-28)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index e38b86c0..4131528d 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen",
@@ -43,8 +43,8 @@
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.8.1",
-    "@cosmwasm/ts-codegen-types": "^1.3.1",
+    "@cosmwasm/ts-codegen-ast": "^1.9.0",
+    "@cosmwasm/ts-codegen-types": "^1.4.0",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index fc979435..acf95168 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.4.0](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.3.1...@cosmwasm/ts-codegen-types@1.4.0) (2025-07-02)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
+
+
+
+
+
 ## [1.3.1](https://github.com/cosmwasm/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.3.0...@cosmwasm/ts-codegen-types@1.3.1) (2025-01-28)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index 27b2c985..11ecda26 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-types",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen/tree/master/packages/types#readme",

From 652c036edf2202ece1ea65376979b18965e595d1 Mon Sep 17 00:00:00 2001
From: Gefei Hou <gefeihou@Gefeidebijibendiannao.local>
Date: Sat, 23 Aug 2025 02:30:51 -0700
Subject: [PATCH 284/287] Interchainjs Migration

---
 README.md                                     |   40 +-
 __fixtures__/issues/98/out/98.client.ts       |   36 +-
 __fixtures__/issues/98/out/baseClient.ts      |  189 ++
 __fixtures__/issues/98/out/bundle.ts          |    4 +
 .../contracts/CwAdminFactory.client.ts        |   16 +-
 .../CwAdminFactory.message-composer.ts        |   12 +-
 .../contracts/CwCodeIdRegistry.client.ts      |   32 +-
 .../CwCodeIdRegistry.message-composer.ts      |   28 +-
 .../bundler_test/contracts/CwSingle.client.ts |   48 +-
 .../contracts/CwSingle.message-composer.ts    |   42 +-
 .../bundler_test/contracts/Factory.client.ts  |   40 +-
 .../contracts/Factory.message-composer.ts     |   34 +-
 .../bundler_test/contracts/Minter.client.ts   |   40 +-
 .../contracts/Minter.message-composer.ts      |   34 +-
 .../bundler_test/contracts/baseClient.ts      |  189 ++
 .../contracts/contractContextBase.ts          |   20 +-
 .../contracts/contractContextProviders.ts     |    4 +-
 .../contracts/contracts-context.tsx           |   14 +-
 __output__/builder/bundler_test/index.ts      |  116 +-
 .../builder/default/CwAdminFactory.client.ts  |   16 +-
 .../CwAdminFactory.message-composer.ts        |   12 +-
 .../default/CwCodeIdRegistry.client.ts        |   32 +-
 .../CwCodeIdRegistry.message-composer.ts      |   28 +-
 __output__/builder/default/CwSingle.client.ts |   48 +-
 .../default/CwSingle.message-composer.ts      |   42 +-
 __output__/builder/default/Factory.client.ts  |   40 +-
 .../default/Factory.message-composer.ts       |   34 +-
 __output__/builder/default/Minter.client.ts   |   40 +-
 .../default/Minter.message-composer.ts        |   34 +-
 __output__/builder/default/baseClient.ts      |  189 ++
 .../builder/default/contractContextBase.ts    |   28 +-
 .../default/contractContextProviders.ts       |    4 +-
 .../builder/default/contracts-context.tsx     |   14 +-
 __output__/builder/default/index.ts           |  106 +-
 .../builder/invoke/CwAdminFactory.client.ts   |   16 +-
 .../builder/invoke/CwCodeIdRegistry.client.ts |   32 +-
 __output__/builder/invoke/CwSingle.client.ts  |   48 +-
 __output__/builder/invoke/Factory.client.ts   |   40 +-
 __output__/builder/invoke/Minter.client.ts    |   40 +-
 __output__/builder/invoke/baseClient.ts       |  189 ++
 __output__/builder/invoke/bundle.ts           |    4 +
 .../no-extends/CwAdminFactory.client.ts       |   16 +-
 .../CwAdminFactory.message-composer.ts        |   12 +-
 .../no-extends/CwCodeIdRegistry.client.ts     |   32 +-
 .../CwCodeIdRegistry.message-composer.ts      |   28 +-
 .../builder/no-extends/CwSingle.client.ts     |   48 +-
 .../no-extends/CwSingle.message-composer.ts   |   42 +-
 .../builder/no-extends/Factory.client.ts      |   40 +-
 .../no-extends/Factory.message-composer.ts    |   34 +-
 .../builder/no-extends/Minter.client.ts       |   40 +-
 .../no-extends/Minter.message-composer.ts     |   34 +-
 __output__/builder/no-extends/baseClient.ts   |  189 ++
 __output__/builder/no-extends/index.ts        |   94 +-
 .../cw-admin-factory/CwAdminFactory.client.ts |   16 +-
 .../CwAdminFactory.message-composer.ts        |   12 +-
 .../CwCodeIdRegistry.client.ts                |   32 +-
 .../CwCodeIdRegistry.message-composer.ts      |   28 +-
 .../cw-named-groups/CwNamedGroups.client.ts   |   24 +-
 .../CwNamedGroups.message-composer.ts         |   20 +-
 .../CwProposalSingle.client.ts                |   48 +-
 .../CwProposalSingle.message-composer.ts      |   42 +-
 .../accounts-nft/AccountsNft.client.ts        |   52 +-
 .../AccountsNft.message-composer.ts           |   48 +-
 .../Cw3FixedMultiSig.client.ts                |   28 +-
 .../Cw3FixedMultiSig.message-composer.ts      |   22 +-
 .../idl-version/cw4-group/Cw4Group.client.ts  |   28 +-
 .../cw4-group/Cw4Group.message-composer.ts    |   24 +-
 .../idl-version/cyberpunk/CyberPunk.client.ts |   20 +-
 .../cyberpunk/CyberPunk.message-composer.ts   |   16 +-
 .../idl-version/hackatom/HackAtom.client.ts   |   44 +-
 .../hackatom/HackAtom.message-composer.ts     |   38 +-
 __output__/minter/Minter.client.ts            |   40 +-
 __output__/minter/Minter.message-composer.ts  |   34 +-
 .../sg721-updatable/Sg721Updatable.client.ts  |   72 +-
 .../Sg721Updatable.message-composer.ts        |   68 +-
 __output__/sg721-updatable/baseClient.ts      |  189 ++
 __output__/sg721-updatable/bundle.ts          |    4 +
 __output__/sg721/Sg721.client.ts              |   44 +-
 __output__/sg721/Sg721.message-composer.ts    |   40 +-
 __output__/sg721/contractContextProviders.ts  |    4 +-
 .../Factory.react-query.ts                    |   31 +-
 __output__/vectis/factory/Factory.client.ts   |   40 +-
 .../factory/Factory.message-composer.ts       |   34 +-
 __output__/vectis/govec/Govec.client.ts       |   44 +-
 .../vectis/govec/Govec.message-composer.ts    |   38 +-
 __output__/vectis/proxy/Proxy.client.ts       |   44 +-
 .../vectis/proxy/Proxy.message-composer.ts    |   38 +-
 docs/developing/_meta.json                    |    3 +-
 docs/developing/migration-from-cosmjs.mdx     |  214 ++
 package.json                                  |    3 +-
 .../ts-client.account-nfts.test.ts.snap       |   68 +-
 .../ts-client.arrays-item-tuples.test.ts.snap |   12 +-
 .../ts-client.arrays-ref.test.ts.snap         |   64 +-
 .../ts-client.arrays.test.ts.snap             |   12 +-
 .../ts-client.cw-named-groups.test.ts.snap    |   20 +-
 .../ts-client.cw-proposal-single.test.ts.snap |   44 +-
 .../ts-client.declare.test.ts.snap            |  100 +-
 .../ts-client.empty-enums.test.ts.snap        |    4 +-
 .../ts-client.issue-101.test.ts.snap          |   12 +-
 .../ts-client.issue-103.test.ts.snap          |   16 +-
 .../ts-client.issue-71.test.ts.snap           |   48 +-
 .../ts-client.issue-98.test.ts.snap           |   20 +-
 .../ts-client.issues.test.ts.snap             |  160 +-
 .../ts-client.overrides.test.ts.snap          |  100 +-
 .../ts-client.sg721.test.ts.snap              |   40 +-
 .../__snapshots__/ts-client.test.ts.snap      |   70 +-
 .../ts-client.vectis.test.ts.snap             |   44 +-
 .../ts-client.wager.test.ts.snap              |   16 +-
 .../message-composer.test.ts.snap             |   40 +-
 .../__snapshots__/provider.test.ts.snap       |    2 +-
 .../__snapshots__/react-query.test.ts.snap    |   40 +-
 packages/ast/package.json                     |    3 +-
 packages/ast/src/client/client.ts             |   18 +-
 packages/ast/src/context/imports.ts           |   24 +-
 .../src/message-composer/message-composer.ts  |    8 +-
 packages/ast/src/provider/provider.ts         |    4 +-
 packages/ast/src/react-query/react-query.ts   |    8 +-
 packages/ast/src/utils/babel.ts               |    2 +-
 packages/ts-codegen/README.md                 |   40 +-
 .../__snapshots__/builder.test.ts.snap        |   12 +-
 packages/ts-codegen/package.json              |   15 +-
 packages/ts-codegen/src/helpers/baseClient.ts |  184 ++
 .../src/helpers/contractContextBase.ts        |   28 +-
 .../contractContextBaseShortHandCtor.ts       |   20 +-
 .../src/helpers/contractsContextTSX.ts        |   14 +-
 .../ts-codegen/src/helpers/create-helpers.ts  |    4 +
 packages/ts-codegen/src/helpers/index.ts      |    1 +
 .../ts-codegen/src/plugins/provider-bundle.ts |   12 +-
 packages/types/package.json                   |    3 +
 yarn.lock                                     | 1781 ++++++++++-------
 130 files changed, 4605 insertions(+), 2617 deletions(-)
 create mode 100644 __fixtures__/issues/98/out/baseClient.ts
 create mode 100644 __output__/builder/bundler_test/contracts/baseClient.ts
 create mode 100644 __output__/builder/default/baseClient.ts
 create mode 100644 __output__/builder/invoke/baseClient.ts
 create mode 100644 __output__/builder/no-extends/baseClient.ts
 create mode 100644 __output__/sg721-updatable/baseClient.ts
 create mode 100644 docs/developing/migration-from-cosmjs.mdx
 create mode 100644 packages/ts-codegen/src/helpers/baseClient.ts

diff --git a/README.md b/README.md
index a59212fa..de480ad5 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,44 @@ Typescript types and interfaces are generated in separate files so they can be i
 | `types.aliasExecuteMsg`  | generate a type alias based on the contract name                      |
 | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name |
 
+### BaseClient
+The `baseClient.ts` will be generated as dependency for most files. It includes the base client for interchainjs.
+
+#### Gas Configuration
+
+The generated client provides flexible gas fee configuration options to handle different blockchain networks and fee settings.
+
+##### Default Gas Settings
+
+By default, the client uses a gas limit of `200000` for all transactions. You can customize this behavior through the `setDefaultGasAmount`.
+
+##### ChainConfig Options
+
+The `ChainConfig` interface supports two approaches for gas configuration:
+
+1. Chain Registry Integration (Recommended)
+
+When you provide chain information, the client automatically fetches gas prices from the chain registry:
+
+```typescript
+import { useChain } from '@interchain-kit/react';
+
+const { chain } = useChain('osmosistestnet');
+const chainConfig: ChainConfig = { chain: chain };
+```
+
+2. Manual Gas Price Configuration
+You can explicitly set gas prices for more control:
+
+```typescript
+const chainConfig: ChainConfig = {
+  gasPrice: {
+    denom: 'uosmo',
+    amount: '0.025'
+  }
+};
+```
+
 ### Client
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
@@ -173,7 +211,7 @@ Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `r
 
 ### Message Composer
 
-Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
+Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `interchainjs` with the `message-composer` command.
 
 [see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 
diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts
index 77d95750..7ca8a907 100644
--- a/__fixtures__/issues/98/out/98.client.ts
+++ b/__fixtures__/issues/98/out/98.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Uint128, InstantiateMsg, Coin, ExecuteMsg, InstallableExecMsg, Binary, ExecMsg, QueryMsg, InstallableQueryMsg, QueryMsg1, ConfigResponse, NullablePlugin, CanonicalAddr, Plugin, PluginsResponse } from "./98.types";
 export interface 98ReadOnlyInterface {
   contractAddress: string;
@@ -24,9 +24,9 @@ export interface 98ReadOnlyInterface {
   }) => Promise<NullablePlugin>;
 }
 export class 98QueryClient implements 98ReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.getConfig = this.getConfig.bind(this);
@@ -73,7 +73,7 @@ export interface 98Interface extends 98ReadOnlyInterface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   registerPlugin: ({
     checksum,
     codeId,
@@ -88,12 +88,12 @@ export interface 98Interface extends 98ReadOnlyInterface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   unregisterPlugin: ({
     id
   }: {
     id: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePlugin: ({
     checksum,
     codeId,
@@ -110,23 +110,23 @@ export interface 98Interface extends 98ReadOnlyInterface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateRegistryFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateDaoAddr: ({
     newAddr
   }: {
     newAddr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class 98Client extends 98QueryClient implements 98Interface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -144,7 +144,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
   }: {
     id: number;
     instantiateMsg: Binary;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proxy_install_plugin: {
         id,
@@ -166,7 +166,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash: string;
     name: string;
     version: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register_plugin: {
         checksum,
@@ -182,7 +182,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     id
   }: {
     id: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister_plugin: {
         id
@@ -205,7 +205,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     ipfsHash?: string;
     name?: string;
     version?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_plugin: {
         checksum,
@@ -222,7 +222,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     newFee
   }: {
     newFee: Coin;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_registry_fee: {
         new_fee: newFee
@@ -233,7 +233,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
     newAddr
   }: {
     newAddr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_dao_addr: {
         new_addr: newAddr
diff --git a/__fixtures__/issues/98/out/baseClient.ts b/__fixtures__/issues/98/out/baseClient.ts
new file mode 100644
index 00000000..6a1cd78b
--- /dev/null
+++ b/__fixtures__/issues/98/out/baseClient.ts
@@ -0,0 +1,189 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
diff --git a/__fixtures__/issues/98/out/bundle.ts b/__fixtures__/issues/98/out/bundle.ts
index d66bc6b2..7a7a0184 100644
--- a/__fixtures__/issues/98/out/bundle.ts
+++ b/__fixtures__/issues/98/out/bundle.ts
@@ -7,10 +7,14 @@
 import * as _0 from "./98.types";
 import * as _1 from "./98.client";
 import * as _2 from "./98.react-query";
+import * as _3 from "./baseClient";
 export namespace contracts {
   export const 98 = {
     ..._0,
     ..._1,
     ..._2
   };
+  export const baseClient = {
+    ..._3
+  };
 }
\ No newline at end of file
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
index b5fa7ddd..a930acb1 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts
@@ -4,16 +4,16 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
 }
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -29,13 +29,13 @@ export interface CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwAdminFactoryClient implements CwAdminFactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -49,7 +49,7 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
index 22ce8618..3ae6418d 100644
--- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
index 7023ff59..04803527 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface CwCodeIdRegistryReadOnlyInterface {
   }) => Promise<ListRegistrationsResponse>;
 }
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setOwner: ({
     chainId,
     name,
@@ -129,27 +129,27 @@ export interface CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -167,7 +167,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -207,7 +207,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -222,7 +222,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -236,7 +236,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
index 52549383..454b0c1d 100644
--- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
index 7c4c65f8..b40cd696 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.client.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleReadOnlyInterface {
   contractAddress: string;
@@ -51,9 +51,9 @@ export interface CwSingleReadOnlyInterface {
   info: () => Promise<InfoResponse>;
 }
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -174,24 +174,24 @@ export interface CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,33 +208,33 @@ export interface CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwSingleClient implements CwSingleInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -256,7 +256,7 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -271,7 +271,7 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -283,7 +283,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -294,7 +294,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -317,7 +317,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -334,7 +334,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -345,7 +345,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -356,7 +356,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -367,7 +367,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
index d848ba61..a1918731 100644
--- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleMsg {
   contractAddress: string;
@@ -19,24 +19,24 @@ export interface CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -142,7 +142,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -161,7 +161,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -192,7 +192,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -236,7 +236,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -255,7 +255,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -274,7 +274,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts
index 0cb3b137..382df7fc 100644
--- a/__output__/builder/bundler_test/contracts/Factory.client.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface FactoryReadOnlyInterface {
   adminAddr: () => Promise<AdminAddrResponse>;
 }
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.wallets = this.wallets.bind(this);
@@ -112,49 +112,49 @@ export interface FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class FactoryClient implements FactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -170,7 +170,7 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -183,7 +183,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -197,7 +197,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -211,7 +211,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -223,7 +223,7 @@ export class FactoryClient implements FactoryInterface {
     newFee
   }: {
     newFee: Coin;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -234,7 +234,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -245,7 +245,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
index 7929f947..88112d8d 100644
--- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryMsg {
   contractAddress: string;
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts
index bc909514..3d1ed2f5 100644
--- a/__output__/builder/bundler_test/contracts/Minter.client.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
@@ -20,9 +20,9 @@ export interface MinterReadOnlyInterface {
   }) => Promise<MintCountResponse>;
 }
 export class MinterQueryClient implements MinterReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -66,37 +66,37 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class MinterClient implements MinterInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -108,7 +108,7 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -117,14 +117,14 @@ export class MinterClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -133,7 +133,7 @@ export class MinterClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -144,7 +144,7 @@ export class MinterClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -157,7 +157,7 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -165,7 +165,7 @@ export class MinterClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
index 96c264bb..6e8a0d29 100644
--- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
+++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts
@@ -4,38 +4,38 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => EncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  updateStartTime: (funds_?: Coin[]) => EncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  withdraw: (funds_?: Coin[]) => EncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -83,7 +83,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/bundler_test/contracts/baseClient.ts b/__output__/builder/bundler_test/contracts/baseClient.ts
new file mode 100644
index 00000000..6a1cd78b
--- /dev/null
+++ b/__output__/builder/bundler_test/contracts/baseClient.ts
@@ -0,0 +1,189 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
diff --git a/__output__/builder/bundler_test/contracts/contractContextBase.ts b/__output__/builder/bundler_test/contracts/contractContextBase.ts
index b69b781b..df8c53d7 100644
--- a/__output__/builder/bundler_test/contracts/contractContextBase.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextBase.ts
@@ -6,14 +6,16 @@
 
 
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -55,15 +57,15 @@ export class ContractBase<
 > {
   constructor(
     protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    protected cosmWasmClient: ICosmWasmClient | undefined,
+    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     private TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     private TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     private TMsgComposer?: new (
diff --git a/__output__/builder/bundler_test/contracts/contractContextProviders.ts b/__output__/builder/bundler_test/contracts/contractContextProviders.ts
index ca57a66e..7500aa4f 100644
--- a/__output__/builder/bundler_test/contracts/contractContextProviders.ts
+++ b/__output__/builder/bundler_test/contracts/contractContextProviders.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { ICosmWasmClient, ISigningCosmWasmClient, getCosmWasmClient, getSigningCosmWasmClient } from "./baseClient";
 import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
 import { FactoryQueryClient } from "./Factory.client";
 import { FactoryClient } from "./Factory.client";
@@ -33,7 +33,7 @@ export interface IContractsContext {
   cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMsgComposer>;
   cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMsgComposer>;
 }
-export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+export const getProviders = (address?: string, cosmWasmClient?: ICosmWasmClient, signingCosmWasmClient?: ISigningCosmWasmClient) => ({
   factory: new Factory({
     address,
     cosmWasmClient,
diff --git a/__output__/builder/bundler_test/contracts/contracts-context.tsx b/__output__/builder/bundler_test/contracts/contracts-context.tsx
index b50ed508..b57f633d 100644
--- a/__output__/builder/bundler_test/contracts/contracts-context.tsx
+++ b/__output__/builder/bundler_test/contracts/contracts-context.tsx
@@ -7,16 +7,16 @@
 
 import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+} from './baseClient';
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
 export interface ContractsConfig {
   address: string | undefined;
-  getCosmWasmClient: () => Promise<CosmWasmClient>;
-  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+  getCosmWasmClient: () => Promise<ICosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;
 }
 
 const ContractsContext = React.createContext<IContractsContext | null>(null);
@@ -28,9 +28,9 @@ export const ContractsProvider = ({
   children: React.ReactNode;
   contractsConfig: ContractsConfig;
 }) => {
-  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();
   const [signingCosmWasmClient, setSigningCosmWasmClient] =
-    useState<SigningCosmWasmClient>();
+    useState<ISigningCosmWasmClient>();
 
   const { address, getCosmWasmClient, getSigningCosmWasmClient } =
     contractsConfig;
diff --git a/__output__/builder/bundler_test/index.ts b/__output__/builder/bundler_test/index.ts
index c1b4905a..424e3ab1 100644
--- a/__output__/builder/bundler_test/index.ts
+++ b/__output__/builder/bundler_test/index.ts
@@ -4,89 +4,93 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import * as _83 from "./contracts/Factory.types";
-import * as _84 from "./contracts/Factory.client";
-import * as _85 from "./contracts/Factory.message-composer";
-import * as _86 from "./contracts/Factory.react-query";
-import * as _87 from "./contracts/Factory.recoil";
-import * as _88 from "./contracts/Factory.provider";
-import * as _89 from "./contracts/Minter.types";
-import * as _90 from "./contracts/Minter.client";
-import * as _91 from "./contracts/Minter.message-composer";
-import * as _92 from "./contracts/Minter.react-query";
-import * as _93 from "./contracts/Minter.recoil";
-import * as _94 from "./contracts/Minter.provider";
-import * as _95 from "./contracts/CwAdminFactory.types";
-import * as _96 from "./contracts/CwAdminFactory.client";
-import * as _97 from "./contracts/CwAdminFactory.message-composer";
-import * as _98 from "./contracts/CwAdminFactory.react-query";
-import * as _99 from "./contracts/CwAdminFactory.recoil";
-import * as _100 from "./contracts/CwAdminFactory.provider";
-import * as _101 from "./contracts/CwCodeIdRegistry.types";
-import * as _102 from "./contracts/CwCodeIdRegistry.client";
-import * as _103 from "./contracts/CwCodeIdRegistry.message-composer";
-import * as _104 from "./contracts/CwCodeIdRegistry.react-query";
-import * as _105 from "./contracts/CwCodeIdRegistry.recoil";
-import * as _106 from "./contracts/CwCodeIdRegistry.provider";
-import * as _107 from "./contracts/CwSingle.types";
-import * as _108 from "./contracts/CwSingle.client";
-import * as _109 from "./contracts/CwSingle.message-composer";
-import * as _110 from "./contracts/CwSingle.react-query";
-import * as _111 from "./contracts/CwSingle.recoil";
-import * as _112 from "./contracts/CwSingle.provider";
-import * as _113 from "./contracts/contractContextProviders";
-import * as _114 from "./contracts/contractContextBase";
-import * as _115 from "./contracts/contracts-context";
+import * as _86 from "./contracts/Factory.types";
+import * as _87 from "./contracts/Factory.client";
+import * as _88 from "./contracts/Factory.message-composer";
+import * as _89 from "./contracts/Factory.react-query";
+import * as _90 from "./contracts/Factory.recoil";
+import * as _91 from "./contracts/Factory.provider";
+import * as _92 from "./contracts/Minter.types";
+import * as _93 from "./contracts/Minter.client";
+import * as _94 from "./contracts/Minter.message-composer";
+import * as _95 from "./contracts/Minter.react-query";
+import * as _96 from "./contracts/Minter.recoil";
+import * as _97 from "./contracts/Minter.provider";
+import * as _98 from "./contracts/CwAdminFactory.types";
+import * as _99 from "./contracts/CwAdminFactory.client";
+import * as _100 from "./contracts/CwAdminFactory.message-composer";
+import * as _101 from "./contracts/CwAdminFactory.react-query";
+import * as _102 from "./contracts/CwAdminFactory.recoil";
+import * as _103 from "./contracts/CwAdminFactory.provider";
+import * as _104 from "./contracts/CwCodeIdRegistry.types";
+import * as _105 from "./contracts/CwCodeIdRegistry.client";
+import * as _106 from "./contracts/CwCodeIdRegistry.message-composer";
+import * as _107 from "./contracts/CwCodeIdRegistry.react-query";
+import * as _108 from "./contracts/CwCodeIdRegistry.recoil";
+import * as _109 from "./contracts/CwCodeIdRegistry.provider";
+import * as _110 from "./contracts/CwSingle.types";
+import * as _111 from "./contracts/CwSingle.client";
+import * as _112 from "./contracts/CwSingle.message-composer";
+import * as _113 from "./contracts/CwSingle.react-query";
+import * as _114 from "./contracts/CwSingle.recoil";
+import * as _115 from "./contracts/CwSingle.provider";
+import * as _116 from "./contracts/contractContextProviders";
+import * as _117 from "./contracts/baseClient";
+import * as _118 from "./contracts/contractContextBase";
+import * as _119 from "./contracts/contracts-context";
 export namespace smart {
   export namespace contracts {
     export const Factory = {
-      ..._83,
-      ..._84,
-      ..._85,
       ..._86,
       ..._87,
-      ..._88
-    };
-    export const Minter = {
+      ..._88,
       ..._89,
       ..._90,
-      ..._91,
+      ..._91
+    };
+    export const Minter = {
       ..._92,
       ..._93,
-      ..._94
-    };
-    export const CwAdminFactory = {
+      ..._94,
       ..._95,
       ..._96,
-      ..._97,
+      ..._97
+    };
+    export const CwAdminFactory = {
       ..._98,
       ..._99,
-      ..._100
-    };
-    export const CwCodeIdRegistry = {
+      ..._100,
       ..._101,
       ..._102,
-      ..._103,
+      ..._103
+    };
+    export const CwCodeIdRegistry = {
       ..._104,
       ..._105,
-      ..._106
-    };
-    export const CwSingle = {
+      ..._106,
       ..._107,
       ..._108,
-      ..._109,
+      ..._109
+    };
+    export const CwSingle = {
       ..._110,
       ..._111,
-      ..._112
+      ..._112,
+      ..._113,
+      ..._114,
+      ..._115
     };
     export const undefined = {
-      ..._113
+      ..._116
+    };
+    export const baseClient = {
+      ..._117
     };
     export const contractContextBase = {
-      ..._114
+      ..._118
     };
     export const contractsContext = {
-      ..._115
+      ..._119
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/default/CwAdminFactory.client.ts b/__output__/builder/default/CwAdminFactory.client.ts
index 64c66aee..7444cead 100644
--- a/__output__/builder/default/CwAdminFactory.client.ts
+++ b/__output__/builder/default/CwAdminFactory.client.ts
@@ -4,16 +4,16 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
 }
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -29,13 +29,13 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -50,7 +50,7 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts
index 22ce8618..3ae6418d 100644
--- a/__output__/builder/default/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/default/CwAdminFactory.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/default/CwCodeIdRegistry.client.ts b/__output__/builder/default/CwCodeIdRegistry.client.ts
index 59e6ff67..c18ea61f 100644
--- a/__output__/builder/default/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface CwCodeIdRegistryReadOnlyInterface {
   }) => Promise<ListRegistrationsResponse>;
 }
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setOwner: ({
     chainId,
     name,
@@ -129,27 +129,27 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -168,7 +168,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -208,7 +208,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -223,7 +223,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -237,7 +237,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
index 52549383..454b0c1d 100644
--- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/default/CwSingle.client.ts b/__output__/builder/default/CwSingle.client.ts
index 1e4a6868..e295f8a4 100644
--- a/__output__/builder/default/CwSingle.client.ts
+++ b/__output__/builder/default/CwSingle.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleReadOnlyInterface {
   contractAddress: string;
@@ -51,9 +51,9 @@ export interface CwSingleReadOnlyInterface {
   info: () => Promise<InfoResponse>;
 }
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -174,24 +174,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,33 +208,33 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -257,7 +257,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -272,7 +272,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -284,7 +284,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -295,7 +295,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -318,7 +318,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -335,7 +335,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -346,7 +346,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -357,7 +357,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -368,7 +368,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts
index d848ba61..a1918731 100644
--- a/__output__/builder/default/CwSingle.message-composer.ts
+++ b/__output__/builder/default/CwSingle.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleMsg {
   contractAddress: string;
@@ -19,24 +19,24 @@ export interface CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -142,7 +142,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -161,7 +161,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -192,7 +192,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -236,7 +236,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -255,7 +255,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -274,7 +274,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/default/Factory.client.ts b/__output__/builder/default/Factory.client.ts
index 3fda4056..df9e7d78 100644
--- a/__output__/builder/default/Factory.client.ts
+++ b/__output__/builder/default/Factory.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface FactoryReadOnlyInterface {
   adminAddr: () => Promise<AdminAddrResponse>;
 }
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.wallets = this.wallets.bind(this);
@@ -112,49 +112,49 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -171,7 +171,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -184,7 +184,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -198,7 +198,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -212,7 +212,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -224,7 +224,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     newFee
   }: {
     newFee: Coin;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -235,7 +235,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -246,7 +246,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts
index 7929f947..88112d8d 100644
--- a/__output__/builder/default/Factory.message-composer.ts
+++ b/__output__/builder/default/Factory.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryMsg {
   contractAddress: string;
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts
index 8945b0d4..b6608ee1 100644
--- a/__output__/builder/default/Minter.client.ts
+++ b/__output__/builder/default/Minter.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
@@ -20,9 +20,9 @@ export interface MinterReadOnlyInterface {
   }) => Promise<MintCountResponse>;
 }
 export class MinterQueryClient implements MinterReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -66,37 +66,37 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -109,7 +109,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -118,14 +118,14 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -134,7 +134,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -145,7 +145,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -158,7 +158,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -166,7 +166,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts
index 96c264bb..6e8a0d29 100644
--- a/__output__/builder/default/Minter.message-composer.ts
+++ b/__output__/builder/default/Minter.message-composer.ts
@@ -4,38 +4,38 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => EncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  updateStartTime: (funds_?: Coin[]) => EncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  withdraw: (funds_?: Coin[]) => EncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -83,7 +83,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/default/baseClient.ts b/__output__/builder/default/baseClient.ts
new file mode 100644
index 00000000..6a1cd78b
--- /dev/null
+++ b/__output__/builder/default/baseClient.ts
@@ -0,0 +1,189 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
diff --git a/__output__/builder/default/contractContextBase.ts b/__output__/builder/default/contractContextBase.ts
index 75594b12..eabceab5 100644
--- a/__output__/builder/default/contractContextBase.ts
+++ b/__output__/builder/default/contractContextBase.ts
@@ -6,14 +6,16 @@
 
 
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -55,15 +57,15 @@ export class ContractBase<
 > {
 
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
   TSign?: new (
-    client: SigningCosmWasmClient,
+    client: ISigningCosmWasmClient,
     sender: string,
     contractAddress: string
   ) => TSign;
   TQuery?: new (
-    client: CosmWasmClient,
+    client: ICosmWasmClient,
     contractAddress: string
   ) => TQuery;
   TMsgComposer?: new (
@@ -73,15 +75,15 @@ export class ContractBase<
 
   constructor(
     address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    cosmWasmClient: ICosmWasmClient | undefined,
+    signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     TMsgComposer?: new (
diff --git a/__output__/builder/default/contractContextProviders.ts b/__output__/builder/default/contractContextProviders.ts
index ca57a66e..7500aa4f 100644
--- a/__output__/builder/default/contractContextProviders.ts
+++ b/__output__/builder/default/contractContextProviders.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { ICosmWasmClient, ISigningCosmWasmClient, getCosmWasmClient, getSigningCosmWasmClient } from "./baseClient";
 import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
 import { FactoryQueryClient } from "./Factory.client";
 import { FactoryClient } from "./Factory.client";
@@ -33,7 +33,7 @@ export interface IContractsContext {
   cwCodeIdRegistry: IQueryClientProvider<CwCodeIdRegistryQueryClient> & ISigningClientProvider<CwCodeIdRegistryClient> & IMessageComposerProvider<CwCodeIdRegistryMsgComposer>;
   cwSingle: IQueryClientProvider<CwSingleQueryClient> & ISigningClientProvider<CwSingleClient> & IMessageComposerProvider<CwSingleMsgComposer>;
 }
-export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+export const getProviders = (address?: string, cosmWasmClient?: ICosmWasmClient, signingCosmWasmClient?: ISigningCosmWasmClient) => ({
   factory: new Factory({
     address,
     cosmWasmClient,
diff --git a/__output__/builder/default/contracts-context.tsx b/__output__/builder/default/contracts-context.tsx
index b50ed508..b57f633d 100644
--- a/__output__/builder/default/contracts-context.tsx
+++ b/__output__/builder/default/contracts-context.tsx
@@ -7,16 +7,16 @@
 
 import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+} from './baseClient';
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
 export interface ContractsConfig {
   address: string | undefined;
-  getCosmWasmClient: () => Promise<CosmWasmClient>;
-  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+  getCosmWasmClient: () => Promise<ICosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;
 }
 
 const ContractsContext = React.createContext<IContractsContext | null>(null);
@@ -28,9 +28,9 @@ export const ContractsProvider = ({
   children: React.ReactNode;
   contractsConfig: ContractsConfig;
 }) => {
-  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();
   const [signingCosmWasmClient, setSigningCosmWasmClient] =
-    useState<SigningCosmWasmClient>();
+    useState<ISigningCosmWasmClient>();
 
   const { address, getCosmWasmClient, getSigningCosmWasmClient } =
     contractsConfig;
diff --git a/__output__/builder/default/index.ts b/__output__/builder/default/index.ts
index 7af98ed4..62fd8b27 100644
--- a/__output__/builder/default/index.ts
+++ b/__output__/builder/default/index.ts
@@ -4,99 +4,103 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import * as _15 from "./Factory.types";
-import * as _16 from "./Factory.client";
-import * as _17 from "./Factory.message-composer";
-import * as _18 from "./Factory.react-query";
-import * as _19 from "./Factory.recoil";
-import * as _20 from "./Factory.message-builder";
-import * as _21 from "./Factory.provider";
-import * as _22 from "./Minter.types";
-import * as _23 from "./Minter.client";
-import * as _24 from "./Minter.message-composer";
-import * as _25 from "./Minter.react-query";
-import * as _26 from "./Minter.recoil";
-import * as _27 from "./Minter.message-builder";
-import * as _28 from "./Minter.provider";
-import * as _29 from "./CwAdminFactory.types";
-import * as _30 from "./CwAdminFactory.client";
-import * as _31 from "./CwAdminFactory.message-composer";
-import * as _32 from "./CwAdminFactory.react-query";
-import * as _33 from "./CwAdminFactory.recoil";
-import * as _34 from "./CwAdminFactory.message-builder";
-import * as _35 from "./CwAdminFactory.provider";
-import * as _36 from "./CwCodeIdRegistry.types";
-import * as _37 from "./CwCodeIdRegistry.client";
-import * as _38 from "./CwCodeIdRegistry.message-composer";
-import * as _39 from "./CwCodeIdRegistry.react-query";
-import * as _40 from "./CwCodeIdRegistry.recoil";
-import * as _41 from "./CwCodeIdRegistry.message-builder";
-import * as _42 from "./CwCodeIdRegistry.provider";
-import * as _43 from "./CwSingle.types";
-import * as _44 from "./CwSingle.client";
-import * as _45 from "./CwSingle.message-composer";
-import * as _46 from "./CwSingle.react-query";
-import * as _47 from "./CwSingle.recoil";
-import * as _48 from "./CwSingle.message-builder";
-import * as _49 from "./CwSingle.provider";
-import * as _50 from "./contractContextProviders";
-import * as _51 from "./contractContextBase";
-import * as _52 from "./contracts-context";
+import * as _16 from "./Factory.types";
+import * as _17 from "./Factory.client";
+import * as _18 from "./Factory.message-composer";
+import * as _19 from "./Factory.react-query";
+import * as _20 from "./Factory.recoil";
+import * as _21 from "./Factory.message-builder";
+import * as _22 from "./Factory.provider";
+import * as _23 from "./Minter.types";
+import * as _24 from "./Minter.client";
+import * as _25 from "./Minter.message-composer";
+import * as _26 from "./Minter.react-query";
+import * as _27 from "./Minter.recoil";
+import * as _28 from "./Minter.message-builder";
+import * as _29 from "./Minter.provider";
+import * as _30 from "./CwAdminFactory.types";
+import * as _31 from "./CwAdminFactory.client";
+import * as _32 from "./CwAdminFactory.message-composer";
+import * as _33 from "./CwAdminFactory.react-query";
+import * as _34 from "./CwAdminFactory.recoil";
+import * as _35 from "./CwAdminFactory.message-builder";
+import * as _36 from "./CwAdminFactory.provider";
+import * as _37 from "./CwCodeIdRegistry.types";
+import * as _38 from "./CwCodeIdRegistry.client";
+import * as _39 from "./CwCodeIdRegistry.message-composer";
+import * as _40 from "./CwCodeIdRegistry.react-query";
+import * as _41 from "./CwCodeIdRegistry.recoil";
+import * as _42 from "./CwCodeIdRegistry.message-builder";
+import * as _43 from "./CwCodeIdRegistry.provider";
+import * as _44 from "./CwSingle.types";
+import * as _45 from "./CwSingle.client";
+import * as _46 from "./CwSingle.message-composer";
+import * as _47 from "./CwSingle.react-query";
+import * as _48 from "./CwSingle.recoil";
+import * as _49 from "./CwSingle.message-builder";
+import * as _50 from "./CwSingle.provider";
+import * as _51 from "./contractContextProviders";
+import * as _52 from "./baseClient";
+import * as _53 from "./contractContextBase";
+import * as _54 from "./contracts-context";
 export namespace smart {
   export namespace contracts {
     export const Factory = {
-      ..._15,
       ..._16,
       ..._17,
       ..._18,
       ..._19,
       ..._20,
-      ..._21
+      ..._21,
+      ..._22
     };
     export const Minter = {
-      ..._22,
       ..._23,
       ..._24,
       ..._25,
       ..._26,
       ..._27,
-      ..._28
+      ..._28,
+      ..._29
     };
     export const CwAdminFactory = {
-      ..._29,
       ..._30,
       ..._31,
       ..._32,
       ..._33,
       ..._34,
-      ..._35
+      ..._35,
+      ..._36
     };
     export const CwCodeIdRegistry = {
-      ..._36,
       ..._37,
       ..._38,
       ..._39,
       ..._40,
       ..._41,
-      ..._42
+      ..._42,
+      ..._43
     };
     export const CwSingle = {
-      ..._43,
       ..._44,
       ..._45,
       ..._46,
       ..._47,
       ..._48,
-      ..._49
+      ..._49,
+      ..._50
     };
     export const undefined = {
-      ..._50
+      ..._51
+    };
+    export const baseClient = {
+      ..._52
     };
     export const contractContextBase = {
-      ..._51
+      ..._53
     };
     export const contractsContext = {
-      ..._52
+      ..._54
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/builder/invoke/CwAdminFactory.client.ts b/__output__/builder/invoke/CwAdminFactory.client.ts
index 64c66aee..7444cead 100644
--- a/__output__/builder/invoke/CwAdminFactory.client.ts
+++ b/__output__/builder/invoke/CwAdminFactory.client.ts
@@ -4,16 +4,16 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
 }
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -29,13 +29,13 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -50,7 +50,7 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/invoke/CwCodeIdRegistry.client.ts b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
index 59e6ff67..c18ea61f 100644
--- a/__output__/builder/invoke/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/invoke/CwCodeIdRegistry.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface CwCodeIdRegistryReadOnlyInterface {
   }) => Promise<ListRegistrationsResponse>;
 }
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setOwner: ({
     chainId,
     name,
@@ -129,27 +129,27 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -168,7 +168,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -208,7 +208,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -223,7 +223,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -237,7 +237,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/invoke/CwSingle.client.ts b/__output__/builder/invoke/CwSingle.client.ts
index 1e4a6868..e295f8a4 100644
--- a/__output__/builder/invoke/CwSingle.client.ts
+++ b/__output__/builder/invoke/CwSingle.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleReadOnlyInterface {
   contractAddress: string;
@@ -51,9 +51,9 @@ export interface CwSingleReadOnlyInterface {
   info: () => Promise<InfoResponse>;
 }
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -174,24 +174,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,33 +208,33 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -257,7 +257,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -272,7 +272,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -284,7 +284,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -295,7 +295,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -318,7 +318,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -335,7 +335,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -346,7 +346,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -357,7 +357,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -368,7 +368,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/invoke/Factory.client.ts b/__output__/builder/invoke/Factory.client.ts
index 3fda4056..df9e7d78 100644
--- a/__output__/builder/invoke/Factory.client.ts
+++ b/__output__/builder/invoke/Factory.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface FactoryReadOnlyInterface {
   adminAddr: () => Promise<AdminAddrResponse>;
 }
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.wallets = this.wallets.bind(this);
@@ -112,49 +112,49 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -171,7 +171,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -184,7 +184,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -198,7 +198,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -212,7 +212,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -224,7 +224,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     newFee
   }: {
     newFee: Coin;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -235,7 +235,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -246,7 +246,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts
index 8945b0d4..b6608ee1 100644
--- a/__output__/builder/invoke/Minter.client.ts
+++ b/__output__/builder/invoke/Minter.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
@@ -20,9 +20,9 @@ export interface MinterReadOnlyInterface {
   }) => Promise<MintCountResponse>;
 }
 export class MinterQueryClient implements MinterReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -66,37 +66,37 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -109,7 +109,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -118,14 +118,14 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -134,7 +134,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -145,7 +145,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -158,7 +158,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -166,7 +166,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/invoke/baseClient.ts b/__output__/builder/invoke/baseClient.ts
new file mode 100644
index 00000000..6a1cd78b
--- /dev/null
+++ b/__output__/builder/invoke/baseClient.ts
@@ -0,0 +1,189 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
diff --git a/__output__/builder/invoke/bundle.ts b/__output__/builder/invoke/bundle.ts
index e2473ca0..59ffdf50 100644
--- a/__output__/builder/invoke/bundle.ts
+++ b/__output__/builder/invoke/bundle.ts
@@ -19,6 +19,7 @@ import * as _11 from "./CwCodeIdRegistry.react-query";
 import * as _12 from "./CwSingle.types";
 import * as _13 from "./CwSingle.client";
 import * as _14 from "./CwSingle.react-query";
+import * as _15 from "./baseClient";
 export namespace contracts {
   export const Factory = {
     ..._0,
@@ -45,4 +46,7 @@ export namespace contracts {
     ..._13,
     ..._14
   };
+  export const baseClient = {
+    ..._15
+  };
 }
\ No newline at end of file
diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts
index b5fa7ddd..a930acb1 100644
--- a/__output__/builder/no-extends/CwAdminFactory.client.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.client.ts
@@ -4,16 +4,16 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
 }
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -29,13 +29,13 @@ export interface CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwAdminFactoryClient implements CwAdminFactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -49,7 +49,7 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
index 22ce8618..3ae6418d 100644
--- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
+++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
index 7023ff59..04803527 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface CwCodeIdRegistryReadOnlyInterface {
   }) => Promise<ListRegistrationsResponse>;
 }
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setOwner: ({
     chainId,
     name,
@@ -129,27 +129,27 @@ export interface CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -167,7 +167,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -188,7 +188,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     codeId: number;
     name: string;
     version: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -207,7 +207,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -222,7 +222,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     chainId: string;
     codeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -236,7 +236,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
index 52549383..454b0c1d 100644
--- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts
index 7c4c65f8..b40cd696 100644
--- a/__output__/builder/no-extends/CwSingle.client.ts
+++ b/__output__/builder/no-extends/CwSingle.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleReadOnlyInterface {
   contractAddress: string;
@@ -51,9 +51,9 @@ export interface CwSingleReadOnlyInterface {
   info: () => Promise<InfoResponse>;
 }
 export class CwSingleQueryClient implements CwSingleReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -174,24 +174,24 @@ export interface CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,33 +208,33 @@ export interface CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwSingleClient implements CwSingleInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -256,7 +256,7 @@ export class CwSingleClient implements CwSingleInterface {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -271,7 +271,7 @@ export class CwSingleClient implements CwSingleInterface {
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -283,7 +283,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -294,7 +294,7 @@ export class CwSingleClient implements CwSingleInterface {
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -317,7 +317,7 @@ export class CwSingleClient implements CwSingleInterface {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -334,7 +334,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -345,7 +345,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -356,7 +356,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -367,7 +367,7 @@ export class CwSingleClient implements CwSingleInterface {
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts
index d848ba61..a1918731 100644
--- a/__output__/builder/no-extends/CwSingle.message-composer.ts
+++ b/__output__/builder/no-extends/CwSingle.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types";
 export interface CwSingleMsg {
   contractAddress: string;
@@ -19,24 +19,24 @@ export interface CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwSingleMsgComposer implements CwSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -142,7 +142,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -161,7 +161,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -192,7 +192,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -236,7 +236,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -255,7 +255,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -274,7 +274,7 @@ export class CwSingleMsgComposer implements CwSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts
index 0cb3b137..382df7fc 100644
--- a/__output__/builder/no-extends/Factory.client.ts
+++ b/__output__/builder/no-extends/Factory.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface FactoryReadOnlyInterface {
   adminAddr: () => Promise<AdminAddrResponse>;
 }
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.wallets = this.wallets.bind(this);
@@ -112,49 +112,49 @@ export interface FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class FactoryClient implements FactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -170,7 +170,7 @@ export class FactoryClient implements FactoryInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -183,7 +183,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -197,7 +197,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -211,7 +211,7 @@ export class FactoryClient implements FactoryInterface {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -223,7 +223,7 @@ export class FactoryClient implements FactoryInterface {
     newFee
   }: {
     newFee: Coin;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -234,7 +234,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -245,7 +245,7 @@ export class FactoryClient implements FactoryInterface {
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts
index 7929f947..88112d8d 100644
--- a/__output__/builder/no-extends/Factory.message-composer.ts
+++ b/__output__/builder/no-extends/Factory.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryMsg {
   contractAddress: string;
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts
index bc909514..3d1ed2f5 100644
--- a/__output__/builder/no-extends/Minter.client.ts
+++ b/__output__/builder/no-extends/Minter.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
@@ -20,9 +20,9 @@ export interface MinterReadOnlyInterface {
   }) => Promise<MintCountResponse>;
 }
 export class MinterQueryClient implements MinterReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -66,37 +66,37 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class MinterClient implements MinterInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -108,7 +108,7 @@ export class MinterClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -117,14 +117,14 @@ export class MinterClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -133,7 +133,7 @@ export class MinterClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -144,7 +144,7 @@ export class MinterClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -157,7 +157,7 @@ export class MinterClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -165,7 +165,7 @@ export class MinterClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts
index 96c264bb..6e8a0d29 100644
--- a/__output__/builder/no-extends/Minter.message-composer.ts
+++ b/__output__/builder/no-extends/Minter.message-composer.ts
@@ -4,38 +4,38 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => EncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  updateStartTime: (funds_?: Coin[]) => EncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  withdraw: (funds_?: Coin[]) => EncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -83,7 +83,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/builder/no-extends/baseClient.ts b/__output__/builder/no-extends/baseClient.ts
new file mode 100644
index 00000000..6a1cd78b
--- /dev/null
+++ b/__output__/builder/no-extends/baseClient.ts
@@ -0,0 +1,189 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
diff --git a/__output__/builder/no-extends/index.ts b/__output__/builder/no-extends/index.ts
index 411acd2a..4d610ecd 100644
--- a/__output__/builder/no-extends/index.ts
+++ b/__output__/builder/no-extends/index.ts
@@ -4,77 +4,81 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import * as _53 from "./Factory.types";
-import * as _54 from "./Factory.client";
-import * as _55 from "./Factory.message-composer";
-import * as _56 from "./Factory.react-query";
-import * as _57 from "./Factory.recoil";
-import * as _58 from "./Factory.message-builder";
-import * as _59 from "./Minter.types";
-import * as _60 from "./Minter.client";
-import * as _61 from "./Minter.message-composer";
-import * as _62 from "./Minter.react-query";
-import * as _63 from "./Minter.recoil";
-import * as _64 from "./Minter.message-builder";
-import * as _65 from "./CwAdminFactory.types";
-import * as _66 from "./CwAdminFactory.client";
-import * as _67 from "./CwAdminFactory.message-composer";
-import * as _68 from "./CwAdminFactory.react-query";
-import * as _69 from "./CwAdminFactory.recoil";
-import * as _70 from "./CwAdminFactory.message-builder";
-import * as _71 from "./CwCodeIdRegistry.types";
-import * as _72 from "./CwCodeIdRegistry.client";
-import * as _73 from "./CwCodeIdRegistry.message-composer";
-import * as _74 from "./CwCodeIdRegistry.react-query";
-import * as _75 from "./CwCodeIdRegistry.recoil";
-import * as _76 from "./CwCodeIdRegistry.message-builder";
-import * as _77 from "./CwSingle.types";
-import * as _78 from "./CwSingle.client";
-import * as _79 from "./CwSingle.message-composer";
-import * as _80 from "./CwSingle.react-query";
-import * as _81 from "./CwSingle.recoil";
-import * as _82 from "./CwSingle.message-builder";
+import * as _55 from "./Factory.types";
+import * as _56 from "./Factory.client";
+import * as _57 from "./Factory.message-composer";
+import * as _58 from "./Factory.react-query";
+import * as _59 from "./Factory.recoil";
+import * as _60 from "./Factory.message-builder";
+import * as _61 from "./Minter.types";
+import * as _62 from "./Minter.client";
+import * as _63 from "./Minter.message-composer";
+import * as _64 from "./Minter.react-query";
+import * as _65 from "./Minter.recoil";
+import * as _66 from "./Minter.message-builder";
+import * as _67 from "./CwAdminFactory.types";
+import * as _68 from "./CwAdminFactory.client";
+import * as _69 from "./CwAdminFactory.message-composer";
+import * as _70 from "./CwAdminFactory.react-query";
+import * as _71 from "./CwAdminFactory.recoil";
+import * as _72 from "./CwAdminFactory.message-builder";
+import * as _73 from "./CwCodeIdRegistry.types";
+import * as _74 from "./CwCodeIdRegistry.client";
+import * as _75 from "./CwCodeIdRegistry.message-composer";
+import * as _76 from "./CwCodeIdRegistry.react-query";
+import * as _77 from "./CwCodeIdRegistry.recoil";
+import * as _78 from "./CwCodeIdRegistry.message-builder";
+import * as _79 from "./CwSingle.types";
+import * as _80 from "./CwSingle.client";
+import * as _81 from "./CwSingle.message-composer";
+import * as _82 from "./CwSingle.react-query";
+import * as _83 from "./CwSingle.recoil";
+import * as _84 from "./CwSingle.message-builder";
+import * as _85 from "./baseClient";
 export namespace smart {
   export namespace contracts {
     export const Factory = {
-      ..._53,
-      ..._54,
       ..._55,
       ..._56,
       ..._57,
-      ..._58
+      ..._58,
+      ..._59,
+      ..._60
     };
     export const Minter = {
-      ..._59,
-      ..._60,
       ..._61,
       ..._62,
       ..._63,
-      ..._64
+      ..._64,
+      ..._65,
+      ..._66
     };
     export const CwAdminFactory = {
-      ..._65,
-      ..._66,
       ..._67,
       ..._68,
       ..._69,
-      ..._70
+      ..._70,
+      ..._71,
+      ..._72
     };
     export const CwCodeIdRegistry = {
-      ..._71,
-      ..._72,
       ..._73,
       ..._74,
       ..._75,
-      ..._76
+      ..._76,
+      ..._77,
+      ..._78
     };
     export const CwSingle = {
-      ..._77,
-      ..._78,
       ..._79,
       ..._80,
       ..._81,
-      ..._82
+      ..._82,
+      ..._83,
+      ..._84
+    };
+    export const baseClient = {
+      ..._85
     };
   }
 }
\ No newline at end of file
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
index 64c66aee..7444cead 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts
@@ -4,16 +4,16 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryReadOnlyInterface {
   contractAddress: string;
 }
 export class CwAdminFactoryQueryClient implements CwAdminFactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -29,13 +29,13 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -50,7 +50,7 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       instantiate_contract_with_self_admin: {
         code_id: codeId,
diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
index 22ce8618..3ae6418d 100644
--- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
+++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types";
 export interface CwAdminFactoryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
   sender: string;
@@ -38,7 +38,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg {
     codeId: number;
     instantiateMsg: Binary;
     label: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
index 59e6ff67..c18ea61f 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface CwCodeIdRegistryReadOnlyInterface {
   }) => Promise<ListRegistrationsResponse>;
 }
 export class CwCodeIdRegistryQueryClient implements CwCodeIdRegistryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -107,7 +107,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   register: ({
     chainId,
     checksum,
@@ -120,7 +120,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     codeId: number;
     name: string;
     version: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setOwner: ({
     chainId,
     name,
@@ -129,27 +129,27 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -168,7 +168,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -189,7 +189,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     codeId: number;
     name: string;
     version: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       register: {
         chain_id: chainId,
@@ -208,7 +208,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
     chainId: string;
     name: string;
     owner?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_owner: {
         chain_id: chainId,
@@ -223,7 +223,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     chainId: string;
     codeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       unregister: {
         chain_id: chainId,
@@ -237,7 +237,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         admin,
diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
index 52549383..454b0c1d 100644
--- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
+++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types";
 export interface CwCodeIdRegistryMsg {
   contractAddress: string;
@@ -20,7 +20,7 @@ export interface CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   register: ({
     chainId,
     checksum,
@@ -33,7 +33,7 @@ export interface CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   setOwner: ({
     chainId,
     name,
@@ -42,21 +42,21 @@ export interface CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   unregister: ({
     chainId,
     codeId
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     admin,
     paymentInfo
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   sender: string;
@@ -78,7 +78,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -107,7 +107,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     codeId: number;
     name: string;
     version: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -134,7 +134,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
     chainId: string;
     name: string;
     owner?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -157,7 +157,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     chainId: string;
     codeId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -179,7 +179,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg {
   }: {
     admin?: string;
     paymentInfo?: PaymentInfo;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
index 6b61ee81..ea6ce36e 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types";
 export interface CwNamedGroupsReadOnlyInterface {
   contractAddress: string;
@@ -37,9 +37,9 @@ export interface CwNamedGroupsReadOnlyInterface {
   }) => Promise<IsAddressInGroupResponse>;
 }
 export class CwNamedGroupsQueryClient implements CwNamedGroupsReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.dump = this.dump.bind(this);
@@ -112,23 +112,23 @@ export interface CwNamedGroupsInterface extends CwNamedGroupsReadOnlyInterface {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwNamedGroupsInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -145,7 +145,7 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -158,7 +158,7 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     group
   }: {
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -169,7 +169,7 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN
     owner
   }: {
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
index e5636426..12e7583e 100644
--- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
+++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types";
 export interface CwNamedGroupsMsg {
   contractAddress: string;
@@ -20,17 +20,17 @@ export interface CwNamedGroupsMsg {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
   sender: string;
@@ -50,7 +50,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -71,7 +71,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
     group
   }: {
     group: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -90,7 +90,7 @@ export class CwNamedGroupsMsgComposer implements CwNamedGroupsMsg {
     owner
   }: {
     owner: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
index 6970026d..4cf85731 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types";
 export interface CwProposalSingleReadOnlyInterface {
   contractAddress: string;
@@ -51,9 +51,9 @@ export interface CwProposalSingleReadOnlyInterface {
   info: () => Promise<InfoResponse>;
 }
 export class CwProposalSingleQueryClient implements CwProposalSingleReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -174,24 +174,24 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -208,33 +208,33 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CwProposalSingleClient extends CwProposalSingleQueryClient implements CwProposalSingleInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -257,7 +257,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -272,7 +272,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -284,7 +284,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -295,7 +295,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -318,7 +318,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -335,7 +335,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -346,7 +346,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -357,7 +357,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -368,7 +368,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
index ccf5cb16..61654b33 100644
--- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
+++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types";
 export interface CwProposalSingleMsg {
   contractAddress: string;
@@ -19,24 +19,24 @@ export interface CwProposalSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -53,27 +53,27 @@ export interface CwProposalSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
   sender: string;
@@ -99,7 +99,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     description: string;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -122,7 +122,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -142,7 +142,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -161,7 +161,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -192,7 +192,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -217,7 +217,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -236,7 +236,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -255,7 +255,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -274,7 +274,7 @@ export class CwProposalSingleMsgComposer implements CwProposalSingleMsg {
     address
   }: {
     address: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
index 5ca96aae..85600f9a 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 export interface AccountsNftReadOnlyInterface {
   contractAddress: string;
@@ -92,9 +92,9 @@ export interface AccountsNftReadOnlyInterface {
   minter: () => Promise<MinterResponse>;
 }
 export class AccountsNftQueryClient implements AccountsNftReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
@@ -295,20 +295,20 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     newOwner
   }: {
     newOwner: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  acceptOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  acceptOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mint: ({
     user
   }: {
     user: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   sendNft: ({
     contract,
     msg,
@@ -317,7 +317,7 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approve: ({
     expires,
     spender,
@@ -326,37 +326,37 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class AccountsNftClient extends AccountsNftQueryClient implements AccountsNftInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -376,14 +376,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     newOwner
   }: {
     newOwner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         new_owner: newOwner
       }
     }, fee_, memo_, funds_);
   };
-  acceptOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  acceptOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       accept_ownership: {}
     }, fee_, memo_, funds_);
@@ -392,7 +392,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     user
   }: {
     user: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         user
@@ -405,7 +405,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -421,7 +421,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -438,7 +438,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -453,7 +453,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -467,7 +467,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -479,7 +479,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -490,7 +490,7 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
index a0c07119..e1d08bbe 100644
--- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
+++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types";
 export interface AccountsNftMsg {
   contractAddress: string;
@@ -16,20 +16,20 @@ export interface AccountsNftMsg {
     newOwner
   }: {
     newOwner: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  acceptOwnership: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  acceptOwnership: (funds_?: Coin[]) => EncodeObject;
   mint: ({
     user
   }: {
     user: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -38,7 +38,7 @@ export interface AccountsNftMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approve: ({
     expires,
     spender,
@@ -47,31 +47,31 @@ export interface AccountsNftMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class AccountsNftMsgComposer implements AccountsNftMsg {
   sender: string;
@@ -94,7 +94,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     newOwner
   }: {
     newOwner: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -109,7 +109,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
       })
     };
   };
-  acceptOwnership = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  acceptOwnership = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -126,7 +126,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     user
   }: {
     user: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -147,7 +147,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -171,7 +171,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -196,7 +196,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -219,7 +219,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -241,7 +241,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -261,7 +261,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -280,7 +280,7 @@ export class AccountsNftMsgComposer implements AccountsNftMsg {
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
index d544c0d9..aa0614b5 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
 export interface Cw3FixedMultiSigReadOnlyInterface {
   contractAddress: string;
@@ -59,9 +59,9 @@ export interface Cw3FixedMultiSigReadOnlyInterface {
   }) => Promise<VoterListResponse>;
 }
 export class Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.threshold = this.threshold.bind(this);
@@ -187,30 +187,30 @@ export interface Cw3FixedMultiSigInterface extends Cw3FixedMultiSigReadOnlyInter
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -230,7 +230,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -246,7 +246,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -258,7 +258,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -269,7 +269,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
index 9c68ea31..aa7c7eb3 100644
--- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
+++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types";
 export interface Cw3FixedMultiSigMsg {
   contractAddress: string;
@@ -21,24 +21,24 @@ export interface Cw3FixedMultiSigMsg {
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
   sender: string;
@@ -61,7 +61,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
     latest?: Expiration;
     msgs: CosmosMsgForEmpty[];
     title: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -85,7 +85,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
   }: {
     proposalId: number;
     vote: Vote;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -105,7 +105,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -124,7 +124,7 @@ export class Cw3FixedMultiSigMsgComposer implements Cw3FixedMultiSigMsg {
     proposalId
   }: {
     proposalId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts
index 0769f36b..0043a972 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.client.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
 export interface Cw4GroupReadOnlyInterface {
   contractAddress: string;
@@ -28,9 +28,9 @@ export interface Cw4GroupReadOnlyInterface {
   hooks: () => Promise<HooksResponse>;
 }
 export class Cw4GroupQueryClient implements Cw4GroupReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.admin = this.admin.bind(this);
@@ -90,30 +90,30 @@ export interface Cw4GroupInterface extends Cw4GroupReadOnlyInterface {
     admin
   }: {
     admin?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateMembers: ({
     add,
     remove
   }: {
     add: Member[];
     remove: string[];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addHook: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeHook: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -127,7 +127,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     admin
   }: {
     admin?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         admin
@@ -140,7 +140,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
   }: {
     add: Member[];
     remove: string[];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_members: {
         add,
@@ -152,7 +152,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_hook: {
         addr
@@ -163,7 +163,7 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_hook: {
         addr
diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
index 8ade1bfe..b7d92ab5 100644
--- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
+++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
 export interface Cw4GroupMsg {
   contractAddress: string;
@@ -16,24 +16,24 @@ export interface Cw4GroupMsg {
     admin
   }: {
     admin?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateMembers: ({
     add,
     remove
   }: {
     add: Member[];
     remove: string[];
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addHook: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeHook: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class Cw4GroupMsgComposer implements Cw4GroupMsg {
   sender: string;
@@ -50,7 +50,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
     admin
   }: {
     admin?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -71,7 +71,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
   }: {
     add: Member[];
     remove: string[];
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -91,7 +91,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -110,7 +110,7 @@ export class Cw4GroupMsgComposer implements Cw4GroupMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
index cc996b06..e96fed02 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts
@@ -4,17 +4,17 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 export interface CyberPunkReadOnlyInterface {
   contractAddress: string;
   mirrorEnv: () => Promise<Env>;
 }
 export class CyberPunkQueryClient implements CyberPunkReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.mirrorEnv = this.mirrorEnv.bind(this);
@@ -34,14 +34,14 @@ export interface CyberPunkInterface extends CyberPunkReadOnlyInterface {
   }: {
     memCost: number;
     timeCost: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  mirrorEnv: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  mirrorEnv: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -55,7 +55,7 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
   }: {
     memCost: number;
     timeCost: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       argon2: {
         mem_cost: memCost,
@@ -63,7 +63,7 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn
       }
     }, fee_, memo_, funds_);
   };
-  mirrorEnv = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mirrorEnv = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mirror_env: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
index 2e1953a9..eead78d0 100644
--- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
+++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types";
 export interface CyberPunkMsg {
   contractAddress: string;
@@ -18,8 +18,8 @@ export interface CyberPunkMsg {
   }: {
     memCost: number;
     timeCost: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  mirrorEnv: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  mirrorEnv: (funds_?: Coin[]) => EncodeObject;
 }
 export class CyberPunkMsgComposer implements CyberPunkMsg {
   sender: string;
@@ -36,7 +36,7 @@ export class CyberPunkMsgComposer implements CyberPunkMsg {
   }: {
     memCost: number;
     timeCost: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -52,7 +52,7 @@ export class CyberPunkMsgComposer implements CyberPunkMsg {
       })
     };
   };
-  mirrorEnv = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  mirrorEnv = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts
index ac52ec1c..7f0b4214 100644
--- a/__output__/idl-version/hackatom/HackAtom.client.ts
+++ b/__output__/idl-version/hackatom/HackAtom.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 export interface HackAtomReadOnlyInterface {
   contractAddress: string;
@@ -25,9 +25,9 @@ export interface HackAtomReadOnlyInterface {
   getInt: () => Promise<IntResponse>;
 }
 export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.verifier = this.verifier.bind(this);
@@ -74,24 +74,24 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface {
 export interface HackAtomInterface extends HackAtomReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  release: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  cpuLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  storageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  memoryLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  messageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  release: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  cpuLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  storageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  memoryLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  messageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   allocateLargeMemory: ({
     pages
   }: {
     pages: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  panic: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  userErrorsInApiCalls: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  panic: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  userErrorsInApiCalls: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class HackAtomClient extends HackAtomQueryClient implements HackAtomInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -105,27 +105,27 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-  release = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  release = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       release: {}
     }, fee_, memo_, funds_);
   };
-  cpuLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  cpuLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cpu_loop: {}
     }, fee_, memo_, funds_);
   };
-  storageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  storageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       storage_loop: {}
     }, fee_, memo_, funds_);
   };
-  memoryLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  memoryLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       memory_loop: {}
     }, fee_, memo_, funds_);
   };
-  messageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  messageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       message_loop: {}
     }, fee_, memo_, funds_);
@@ -134,19 +134,19 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter
     pages
   }: {
     pages: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allocate_large_memory: {
         pages
       }
     }, fee_, memo_, funds_);
   };
-  panic = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  panic = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       panic: {}
     }, fee_, memo_, funds_);
   };
-  userErrorsInApiCalls = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  userErrorsInApiCalls = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       user_errors_in_api_calls: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
index 1758460a..8be02c9e 100644
--- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts
+++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts
@@ -4,25 +4,25 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types";
 export interface HackAtomMsg {
   contractAddress: string;
   sender: string;
-  release: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  cpuLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  storageLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  memoryLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  messageLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  release: (funds_?: Coin[]) => EncodeObject;
+  cpuLoop: (funds_?: Coin[]) => EncodeObject;
+  storageLoop: (funds_?: Coin[]) => EncodeObject;
+  memoryLoop: (funds_?: Coin[]) => EncodeObject;
+  messageLoop: (funds_?: Coin[]) => EncodeObject;
   allocateLargeMemory: ({
     pages
   }: {
     pages: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  panic: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  userErrorsInApiCalls: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  panic: (funds_?: Coin[]) => EncodeObject;
+  userErrorsInApiCalls: (funds_?: Coin[]) => EncodeObject;
 }
 export class HackAtomMsgComposer implements HackAtomMsg {
   sender: string;
@@ -39,7 +39,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
     this.panic = this.panic.bind(this);
     this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this);
   }
-  release = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  release = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -52,7 +52,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
       })
     };
   };
-  cpuLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  cpuLoop = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -65,7 +65,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
       })
     };
   };
-  storageLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  storageLoop = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -78,7 +78,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
       })
     };
   };
-  memoryLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  memoryLoop = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -91,7 +91,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
       })
     };
   };
-  messageLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  messageLoop = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -108,7 +108,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
     pages
   }: {
     pages: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -123,7 +123,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
       })
     };
   };
-  panic = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  panic = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class HackAtomMsgComposer implements HackAtomMsg {
       })
     };
   };
-  userErrorsInApiCalls = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  userErrorsInApiCalls = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts
index 8945b0d4..b6608ee1 100644
--- a/__output__/minter/Minter.client.ts
+++ b/__output__/minter/Minter.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterReadOnlyInterface {
   contractAddress: string;
@@ -20,9 +20,9 @@ export interface MinterReadOnlyInterface {
   }) => Promise<MintCountResponse>;
 }
 export class MinterQueryClient implements MinterReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
@@ -66,37 +66,37 @@ export class MinterQueryClient implements MinterReadOnlyInterface {
 export interface MinterInterface extends MinterReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class MinterClient extends MinterQueryClient implements MinterInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -109,7 +109,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {}
     }, fee_, memo_, funds_);
@@ -118,14 +118,14 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     whitelist
   }: {
     whitelist: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_whitelist: {
         whitelist
       }
     }, fee_, memo_, funds_);
   };
-  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_start_time: {}
     }, fee_, memo_, funds_);
@@ -134,7 +134,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_per_address_limit: {
         per_address_limit: perAddressLimit
@@ -145,7 +145,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
     recipient
   }: {
     recipient: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_to: {
         recipient
@@ -158,7 +158,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
   }: {
     recipient: string;
     tokenId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint_for: {
         recipient,
@@ -166,7 +166,7 @@ export class MinterClient extends MinterQueryClient implements MinterInterface {
       }
     }, fee_, memo_, funds_);
   };
-  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       withdraw: {}
     }, fee_, memo_, funds_);
diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts
index 96c264bb..6e8a0d29 100644
--- a/__output__/minter/Minter.message-composer.ts
+++ b/__output__/minter/Minter.message-composer.ts
@@ -4,38 +4,38 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Addr, Timestamp, Uint64, Uint128, Config, Coin, ConfigResponse, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types";
 export interface MinterMsg {
   contractAddress: string;
   sender: string;
-  mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  mint: (funds_?: Coin[]) => EncodeObject;
   setWhitelist: ({
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  updateStartTime: (funds_?: Coin[]) => EncodeObject;
   updatePerAddressLimit: ({
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintTo: ({
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mintFor: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  withdraw: (funds_?: Coin[]) => EncodeObject;
 }
 export class MinterMsgComposer implements MinterMsg {
   sender: string;
@@ -51,7 +51,7 @@ export class MinterMsgComposer implements MinterMsg {
     this.mintFor = this.mintFor.bind(this);
     this.withdraw = this.withdraw.bind(this);
   }
-  mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  mint = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -68,7 +68,7 @@ export class MinterMsgComposer implements MinterMsg {
     whitelist
   }: {
     whitelist: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -83,7 +83,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateStartTime = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -100,7 +100,7 @@ export class MinterMsgComposer implements MinterMsg {
     perAddressLimit
   }: {
     perAddressLimit: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -119,7 +119,7 @@ export class MinterMsgComposer implements MinterMsg {
     recipient
   }: {
     recipient: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -140,7 +140,7 @@ export class MinterMsgComposer implements MinterMsg {
   }: {
     recipient: string;
     tokenId: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class MinterMsgComposer implements MinterMsg {
       })
     };
   };
-  withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  withdraw = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/sg721-updatable/Sg721Updatable.client.ts b/__output__/sg721-updatable/Sg721Updatable.client.ts
index ce499bf7..e9250558 100644
--- a/__output__/sg721-updatable/Sg721Updatable.client.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
 export interface Sg721UpdatableReadOnlyInterface {
   contractAddress: string;
@@ -77,9 +77,9 @@ export interface Sg721UpdatableReadOnlyInterface {
   collectionInfo: () => Promise<CollectionInfoResponse>;
 }
 export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.ownerOf = this.ownerOf.bind(this);
@@ -240,22 +240,22 @@ export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterfac
 export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface {
   contractAddress: string;
   sender: string;
-  freezeTokenMetadata: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  freezeTokenMetadata: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateTokenMetadata: ({
     tokenId,
     tokenUri
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  enableUpdatable: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  enableUpdatable: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   sendNft: ({
     contract,
     msg,
@@ -264,7 +264,7 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approve: ({
     expires,
     spender,
@@ -273,38 +273,38 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateCollectionInfo: ({
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateTradingStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  freezeCollectionInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateTradingStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  freezeCollectionInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mint: ({
     extension,
     owner,
@@ -315,18 +315,18 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   extension: ({
     msg
   }: {
     msg: Empty;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements Sg721UpdatableInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -347,7 +347,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-  freezeTokenMetadata = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  freezeTokenMetadata = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_token_metadata: {}
     }, fee_, memo_, funds_);
@@ -358,7 +358,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_token_metadata: {
         token_id: tokenId,
@@ -366,7 +366,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
       }
     }, fee_, memo_, funds_);
   };
-  enableUpdatable = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  enableUpdatable = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       enable_updatable: {}
     }, fee_, memo_, funds_);
@@ -377,7 +377,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -393,7 +393,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -410,7 +410,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -425,7 +425,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -439,7 +439,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -451,7 +451,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -462,7 +462,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -473,19 +473,19 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_collection_info: {
         collection_info: collectionInfo
       }
     }, fee_, memo_, funds_);
   };
-  updateTradingStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateTradingStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_trading_start_time: {}
     }, fee_, memo_, funds_);
   };
-  freezeCollectionInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  freezeCollectionInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       freeze_collection_info: {}
     }, fee_, memo_, funds_);
@@ -500,7 +500,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -514,7 +514,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S
     msg
   }: {
     msg: Empty;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       extension: {
         msg
diff --git a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
index 5cee4c38..fc13763b 100644
--- a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
+++ b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts
@@ -4,30 +4,30 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types";
 export interface Sg721UpdatableMsg {
   contractAddress: string;
   sender: string;
-  freezeTokenMetadata: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  freezeTokenMetadata: (funds_?: Coin[]) => EncodeObject;
   updateTokenMetadata: ({
     tokenId,
     tokenUri
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  enableUpdatable: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  enableUpdatable: (funds_?: Coin[]) => EncodeObject;
   transferNft: ({
     recipient,
     tokenId
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -36,7 +36,7 @@ export interface Sg721UpdatableMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approve: ({
     expires,
     spender,
@@ -45,38 +45,38 @@ export interface Sg721UpdatableMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateCollectionInfo: ({
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateTradingStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  freezeCollectionInfo: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  updateTradingStartTime: (funds_?: Coin[]) => EncodeObject;
+  freezeCollectionInfo: (funds_?: Coin[]) => EncodeObject;
   mint: ({
     extension,
     owner,
@@ -87,12 +87,12 @@ export interface Sg721UpdatableMsg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   extension: ({
     msg
   }: {
     msg: Empty;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   sender: string;
@@ -116,7 +116,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     this.mint = this.mint.bind(this);
     this.extension = this.extension.bind(this);
   }
-  freezeTokenMetadata = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  freezeTokenMetadata = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -135,7 +135,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -151,7 +151,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
       })
     };
   };
-  enableUpdatable = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  enableUpdatable = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -170,7 +170,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -194,7 +194,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -219,7 +219,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -242,7 +242,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -264,7 +264,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -284,7 +284,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -303,7 +303,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -322,7 +322,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     collectionInfo
   }: {
     collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -337,7 +337,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
       })
     };
   };
-  updateTradingStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateTradingStartTime = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -350,7 +350,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
       })
     };
   };
-  freezeCollectionInfo = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  freezeCollectionInfo = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -373,7 +373,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -395,7 +395,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg {
     msg
   }: {
     msg: Empty;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/sg721-updatable/baseClient.ts b/__output__/sg721-updatable/baseClient.ts
new file mode 100644
index 00000000..6a1cd78b
--- /dev/null
+++ b/__output__/sg721-updatable/baseClient.ts
@@ -0,0 +1,189 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@latest.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+
+
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
diff --git a/__output__/sg721-updatable/bundle.ts b/__output__/sg721-updatable/bundle.ts
index 68f5eb80..60644e3b 100644
--- a/__output__/sg721-updatable/bundle.ts
+++ b/__output__/sg721-updatable/bundle.ts
@@ -8,6 +8,7 @@ import * as _0 from "./Sg721Updatable.types";
 import * as _1 from "./Sg721Updatable.client";
 import * as _2 from "./Sg721Updatable.message-composer";
 import * as _3 from "./Sg721Updatable.react-query";
+import * as _4 from "./baseClient";
 export namespace contracts {
   export const Sg721Updatable = {
     ..._0,
@@ -15,4 +16,7 @@ export namespace contracts {
     ..._2,
     ..._3
   };
+  export const baseClient = {
+    ..._4
+  };
 }
\ No newline at end of file
diff --git a/__output__/sg721/Sg721.client.ts b/__output__/sg721/Sg721.client.ts
index 868bbca4..3ced7a18 100644
--- a/__output__/sg721/Sg721.client.ts
+++ b/__output__/sg721/Sg721.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { Coin, StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { Coin, StdFee } from "@interchainjs/types";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
 export interface Sg721ReadOnlyInterface {
   contractAddress: string;
@@ -77,9 +77,9 @@ export interface Sg721ReadOnlyInterface {
   collectionInfo: () => Promise<CollectionInfoResponse>;
 }
 export class Sg721QueryClient implements Sg721ReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.ownerOf = this.ownerOf.bind(this);
@@ -246,7 +246,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   sendNft: ({
     contract,
     msg,
@@ -255,7 +255,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approve: ({
     expires,
     spender,
@@ -264,26 +264,26 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mint: ({
     extension,
     owner,
@@ -294,18 +294,18 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -325,7 +325,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -341,7 +341,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -358,7 +358,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -373,7 +373,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -387,7 +387,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -399,7 +399,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -416,7 +416,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -430,7 +430,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface {
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts
index b024522d..256a39d4 100644
--- a/__output__/sg721/Sg721.message-composer.ts
+++ b/__output__/sg721/Sg721.message-composer.ts
@@ -4,10 +4,10 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { Coin } from "@cosmjs/amino";
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { Coin } from "@interchainjs/types";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types";
 export interface Sg721Msg {
   contractAddress: string;
@@ -18,7 +18,7 @@ export interface Sg721Msg {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -27,7 +27,7 @@ export interface Sg721Msg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approve: ({
     expires,
     spender,
@@ -36,26 +36,26 @@ export interface Sg721Msg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mint: ({
     extension,
     owner,
@@ -66,12 +66,12 @@ export interface Sg721Msg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class Sg721MsgComposer implements Sg721Msg {
   sender: string;
@@ -94,7 +94,7 @@ export class Sg721MsgComposer implements Sg721Msg {
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -118,7 +118,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -143,7 +143,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -166,7 +166,7 @@ export class Sg721MsgComposer implements Sg721Msg {
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -188,7 +188,7 @@ export class Sg721MsgComposer implements Sg721Msg {
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -208,7 +208,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -233,7 +233,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -255,7 +255,7 @@ export class Sg721MsgComposer implements Sg721Msg {
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/sg721/contractContextProviders.ts b/__output__/sg721/contractContextProviders.ts
index 58948411..ecba4d61 100644
--- a/__output__/sg721/contractContextProviders.ts
+++ b/__output__/sg721/contractContextProviders.ts
@@ -4,7 +4,7 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { ICosmWasmClient, ISigningCosmWasmClient, getCosmWasmClient, getSigningCosmWasmClient } from "./baseClient";
 import { IQueryClientProvider, ISigningClientProvider, IMessageComposerProvider } from "./contractContextBase";
 import { Sg721QueryClient } from "./Sg721.client";
 import { Sg721Client } from "./Sg721.client";
@@ -13,7 +13,7 @@ import { Sg721 } from "./Sg721.provider";
 export interface IContractsContext {
   sg721: IQueryClientProvider<Sg721QueryClient> & ISigningClientProvider<Sg721Client> & IMessageComposerProvider<Sg721MsgComposer>;
 }
-export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+export const getProviders = (address?: string, cosmWasmClient?: ICosmWasmClient, signingCosmWasmClient?: ISigningCosmWasmClient) => ({
   sg721: new Sg721({
     address,
     cosmWasmClient,
diff --git a/__output__/vectis/factory-w-mutations/Factory.react-query.ts b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
index 93a6f935..7b76dc9e 100644
--- a/__output__/vectis/factory-w-mutations/Factory.react-query.ts
+++ b/__output__/vectis/factory-w-mutations/Factory.react-query.ts
@@ -5,8 +5,7 @@
 */
 
 import { UseQueryOptions, useQuery, useMutation, UseMutationOptions } from "@tanstack/react-query";
-import { ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { StdFee } from "@interchainjs/types";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 import { FactoryQueryClient, FactoryClient } from "./Factory.client";
 export interface FactoryReactQuery<TResponse, TData = TResponse> {
@@ -95,8 +94,8 @@ export interface FactoryUpdateAdminMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateAdminMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateAdminMutation>(({
+export function useFactoryUpdateAdminMutation(options?: Omit<UseMutationOptions<any, Error, FactoryUpdateAdminMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryUpdateAdminMutation>(({
     client,
     msg,
     args: {
@@ -117,8 +116,8 @@ export interface FactoryUpdateGovecAddrMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateGovecAddrMutation>(({
+export function useFactoryUpdateGovecAddrMutation(options?: Omit<UseMutationOptions<any, Error, FactoryUpdateGovecAddrMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryUpdateGovecAddrMutation>(({
     client,
     msg,
     args: {
@@ -139,8 +138,8 @@ export interface FactoryUpdateWalletFeeMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateWalletFeeMutation>(({
+export function useFactoryUpdateWalletFeeMutation(options?: Omit<UseMutationOptions<any, Error, FactoryUpdateWalletFeeMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryUpdateWalletFeeMutation>(({
     client,
     msg,
     args: {
@@ -162,8 +161,8 @@ export interface FactoryUpdateCodeIdMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateCodeIdMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateCodeIdMutation>(({
+export function useFactoryUpdateCodeIdMutation(options?: Omit<UseMutationOptions<any, Error, FactoryUpdateCodeIdMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryUpdateCodeIdMutation>(({
     client,
     msg,
     args: {
@@ -185,8 +184,8 @@ export interface FactoryMigrateWalletMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryMigrateWalletMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryMigrateWalletMutation>(({
+export function useFactoryMigrateWalletMutation(options?: Omit<UseMutationOptions<any, Error, FactoryMigrateWalletMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryMigrateWalletMutation>(({
     client,
     msg,
     args: {
@@ -208,8 +207,8 @@ export interface FactoryUpdateProxyUserMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryUpdateProxyUserMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryUpdateProxyUserMutation>(({
+export function useFactoryUpdateProxyUserMutation(options?: Omit<UseMutationOptions<any, Error, FactoryUpdateProxyUserMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryUpdateProxyUserMutation>(({
     client,
     msg,
     args: {
@@ -230,8 +229,8 @@ export interface FactoryCreateWalletMutation {
     funds?: Coin[];
   };
 }
-export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, FactoryCreateWalletMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, FactoryCreateWalletMutation>(({
+export function useFactoryCreateWalletMutation(options?: Omit<UseMutationOptions<any, Error, FactoryCreateWalletMutation>, "mutationFn">) {
+  return useMutation<any, Error, FactoryCreateWalletMutation>(({
     client,
     msg,
     args: {
diff --git a/__output__/vectis/factory/Factory.client.ts b/__output__/vectis/factory/Factory.client.ts
index 3fda4056..df9e7d78 100644
--- a/__output__/vectis/factory/Factory.client.ts
+++ b/__output__/vectis/factory/Factory.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryReadOnlyInterface {
   contractAddress: string;
@@ -35,9 +35,9 @@ export interface FactoryReadOnlyInterface {
   adminAddr: () => Promise<AdminAddrResponse>;
 }
 export class FactoryQueryClient implements FactoryReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.wallets = this.wallets.bind(this);
@@ -112,49 +112,49 @@ export interface FactoryInterface extends FactoryReadOnlyInterface {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class FactoryClient extends FactoryQueryClient implements FactoryInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -171,7 +171,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_wallet: {
         create_wallet_msg: createWalletMsg
@@ -184,7 +184,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_proxy_user: {
         new_user: newUser,
@@ -198,7 +198,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       migrate_wallet: {
         migration_msg: migrationMsg,
@@ -212,7 +212,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_code_id: {
         new_code_id: newCodeId,
@@ -224,7 +224,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     newFee
   }: {
     newFee: Coin;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_wallet_fee: {
         new_fee: newFee
@@ -235,7 +235,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_govec_addr: {
         addr
@@ -246,7 +246,7 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac
     addr
   }: {
     addr: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_admin: {
         addr
diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts
index 7929f947..88112d8d 100644
--- a/__output__/vectis/factory/Factory.message-composer.ts
+++ b/__output__/vectis/factory/Factory.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types";
 export interface FactoryMsg {
   contractAddress: string;
@@ -15,43 +15,43 @@ export interface FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateProxyUser: ({
     newUser,
     oldUser
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   migrateWallet: ({
     migrationMsg,
     walletAddress
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateCodeId: ({
     newCodeId,
     ty
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateWalletFee: ({
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateGovecAddr: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateAdmin: ({
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class FactoryMsgComposer implements FactoryMsg {
   sender: string;
@@ -71,7 +71,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     createWalletMsg
   }: {
     createWalletMsg: CreateWalletMsg;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -92,7 +92,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newUser: Addr;
     oldUser: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -114,7 +114,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     migrationMsg: ProxyMigrationTxMsg;
     walletAddress: WalletAddr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -136,7 +136,7 @@ export class FactoryMsgComposer implements FactoryMsg {
   }: {
     newCodeId: number;
     ty: CodeIdType;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -156,7 +156,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     newFee
   }: {
     newFee: Coin;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -194,7 +194,7 @@ export class FactoryMsgComposer implements FactoryMsg {
     addr
   }: {
     addr: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/vectis/govec/Govec.client.ts b/__output__/vectis/govec/Govec.client.ts
index 33128fb8..74130609 100644
--- a/__output__/vectis/govec/Govec.client.ts
+++ b/__output__/vectis/govec/Govec.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types";
 export interface GovecReadOnlyInterface {
   contractAddress: string;
@@ -17,9 +17,9 @@ export interface GovecReadOnlyInterface {
   }) => Promise<CanExecuteRelayResponse>;
 }
 export class GovecQueryClient implements GovecReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.info = this.info.bind(this);
@@ -49,46 +49,46 @@ export interface GovecInterface extends GovecReadOnlyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class GovecClient extends GovecQueryClient implements GovecInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -106,14 +106,14 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -122,7 +122,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -133,7 +133,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -144,7 +144,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -155,7 +155,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -168,7 +168,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -180,7 +180,7 @@ export class GovecClient extends GovecQueryClient implements GovecInterface {
     newLabel
   }: {
     newLabel: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts
index 783cfa59..c3441bd8 100644
--- a/__output__/vectis/govec/Govec.message-composer.ts
+++ b/__output__/vectis/govec/Govec.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types";
 export interface GovecMsg {
   contractAddress: string;
@@ -15,40 +15,40 @@ export interface GovecMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  revertFreezeStatus: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  revertFreezeStatus: (funds_?: Coin[]) => EncodeObject;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class GovecMsgComposer implements GovecMsg {
   sender: string;
@@ -69,7 +69,7 @@ export class GovecMsgComposer implements GovecMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class GovecMsgComposer implements GovecMsg {
       })
     };
   };
-  revertFreezeStatus = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  revertFreezeStatus = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -101,7 +101,7 @@ export class GovecMsgComposer implements GovecMsg {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -120,7 +120,7 @@ export class GovecMsgComposer implements GovecMsg {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -139,7 +139,7 @@ export class GovecMsgComposer implements GovecMsg {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -158,7 +158,7 @@ export class GovecMsgComposer implements GovecMsg {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -179,7 +179,7 @@ export class GovecMsgComposer implements GovecMsg {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -199,7 +199,7 @@ export class GovecMsgComposer implements GovecMsg {
     newLabel
   }: {
     newLabel: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/__output__/vectis/proxy/Proxy.client.ts b/__output__/vectis/proxy/Proxy.client.ts
index 300dbb8c..3f102897 100644
--- a/__output__/vectis/proxy/Proxy.client.ts
+++ b/__output__/vectis/proxy/Proxy.client.ts
@@ -4,8 +4,8 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
-import { StdFee } from "@cosmjs/amino";
+import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
+import { StdFee } from "@interchainjs/types";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types";
 export interface ProxyReadOnlyInterface {
   contractAddress: string;
@@ -17,9 +17,9 @@ export interface ProxyReadOnlyInterface {
   }) => Promise<CanExecuteRelayResponse>;
 }
 export class ProxyQueryClient implements ProxyReadOnlyInterface {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.info = this.info.bind(this);
@@ -49,46 +49,46 @@ export interface ProxyInterface extends ProxyReadOnlyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }
 export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -106,14 +106,14 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -122,7 +122,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -133,7 +133,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -144,7 +144,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -155,7 +155,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -168,7 +168,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -180,7 +180,7 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface {
     newLabel
   }: {
     newLabel: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts
index ec983ca1..5be37ec3 100644
--- a/__output__/vectis/proxy/Proxy.message-composer.ts
+++ b/__output__/vectis/proxy/Proxy.message-composer.ts
@@ -4,9 +4,9 @@
 * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
 */
 
-import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate";
-import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx";
-import { toUtf8 } from "@cosmjs/encoding";
+import { EncodeObject } from "@interchainjs/cosmos-types";
+import { MsgExecuteContract } from "interchainjs/cosmwasm/wasm/v1/tx";
+import { toUtf8 } from "@interchainjs/encoding";
 import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types";
 export interface ProxyMsg {
   contractAddress: string;
@@ -15,40 +15,40 @@ export interface ProxyMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  revertFreezeStatus: (funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  revertFreezeStatus: (funds_?: Coin[]) => EncodeObject;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }
 export class ProxyMsgComposer implements ProxyMsg {
   sender: string;
@@ -69,7 +69,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     msgs
   }: {
     msgs: CosmosMsgForEmpty[];
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -84,7 +84,7 @@ export class ProxyMsgComposer implements ProxyMsg {
       })
     };
   };
-  revertFreezeStatus = (funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  revertFreezeStatus = (funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -101,7 +101,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     transaction
   }: {
     transaction: RelayTransaction;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -120,7 +120,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     newUserAddress
   }: {
     newUserAddress: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -139,7 +139,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -158,7 +158,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -179,7 +179,7 @@ export class ProxyMsgComposer implements ProxyMsg {
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -199,7 +199,7 @@ export class ProxyMsgComposer implements ProxyMsg {
     newLabel
   }: {
     newLabel: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
diff --git a/docs/developing/_meta.json b/docs/developing/_meta.json
index d2d2c18e..0eff33de 100644
--- a/docs/developing/_meta.json
+++ b/docs/developing/_meta.json
@@ -1,4 +1,5 @@
 {
   "index": "Developing",
-  "ast": "Working with ASTs"
+  "ast": "Working with ASTs",
+  "migration-from-cosmjs": "Migration from CosmJS"
 }
\ No newline at end of file
diff --git a/docs/developing/migration-from-cosmjs.mdx b/docs/developing/migration-from-cosmjs.mdx
new file mode 100644
index 00000000..125ca214
--- /dev/null
+++ b/docs/developing/migration-from-cosmjs.mdx
@@ -0,0 +1,214 @@
+# Migration from CosmJS to InterchainJS
+
+This guide covers the migration from CosmJS to InterchainJS in ts-codegen generated clients. The migration introduces new client architecture with improved gas fee handling and better type safety.
+
+## Overview
+
+With the latest version of ts-codegen, we've migrated from CosmJS to InterchainJS as the underlying blockchain interaction library.
+
+## Key Changes
+
+### Deprecated CosmJS Clients
+
+The following CosmJS clients are now deprecated:
+
+```typescript
+// ❌ Deprecated - CosmJS clients
+import { CosmWasmClient, SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+```
+
+### New InterchainJS Base Client
+
+All generated contracts now use a new `baseClient.ts` file that provides InterchainJS-based clients:
+
+```typescript
+// ✅ New - InterchainJS clients
+import { 
+  getCosmWasmClient, 
+  getSigningCosmWasmClient,
+  ICosmWasmClient,
+  ISigningCosmWasmClient 
+} from './baseClient';
+```
+
+## Client Migration
+
+**Before (CosmJS):**
+```typescript
+import { CosmWasmClient, SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+
+// For queries
+const client = await CosmWasmClient.connect('https://rpc.cosmos.network');
+const result = await client.queryContractSmart(contractAddress, {
+  // your query object
+});
+
+// For transactions  
+const signingClient = await SigningCosmWasmClient.connectWithSigner(
+  'https://rpc.cosmos.network',
+  signer
+);
+const executeResult = await signingClient.execute(
+  sender,
+  contractAddress,
+  msg,
+  "auto"
+);
+```
+
+**After (InterchainJS):**
+```typescript
+import { getCosmWasmClient, getSigningCosmWasmClient } from './baseClient';
+
+//For queries
+const client = getCosmWasmClient('https://rpc.cosmos.network');
+const result = await client.queryContractSmart(contractAddress, {
+  // your query object
+});
+
+//For transactions
+const { data: signingClient } = useCustomSigningClient({ signerType: 'direct' });
+const signingClient = getSigningCosmWasmClient(signingClient);
+const executeResult = await client.execute(
+  address,
+  contractAddress,
+  JSON.parse(executeMsg),
+  'auto', // fee
+  'Test execution from chain-template', // memo
+  [], // funds
+  { chain } // chainConfig
+);
+
+```
+
+Example of useCustomSigningClient:
+```typescript
+import { DirectSigner, createCosmosQueryClient } from '@interchainjs/cosmos';
+import { useQuery } from '@tanstack/react-query';
+import { useChain } from '@interchain-kit/react';
+
+import { useChainStore } from '@/contexts';
+
+import { useRpcEndpoint } from './useRpcEndpoint';
+
+export const useCustomSigningClient = ({
+  signerType = 'direct',
+}: {
+  signerType?: 'direct' | 'amino';
+} = {}) => {
+  const { selectedChain } = useChainStore();
+  const { chain } = useChain(selectedChain);
+  const { data: rpcEndpoint } = useRpcEndpoint(selectedChain);
+
+  const chainId = chain.chainId || '';
+
+  return useQuery({
+    queryKey: ['useCustomSigningClient', signerType, chainId],
+    queryFn: async () => {
+      const offlineSignerAmino = (window as any).keplr.getOfflineSignerOnlyAmino(chainId);
+      const offlineSignerDirect = (window as any).keplr.getOfflineSigner(chainId);
+
+      // Create query client for signer configuration
+      const rpcUrl = typeof rpcEndpoint === 'string' ? rpcEndpoint : rpcEndpoint!.url;
+      const queryClient = await createCosmosQueryClient(rpcUrl);
+
+      const baseSignerConfig = {
+        queryClient: queryClient,
+        chainId: chainId,
+        addressPrefix: chain.bech32Prefix || 'cosmos'
+      };
+
+      const client = new DirectSigner(
+        signerType === 'amino' ? offlineSignerAmino : offlineSignerDirect,
+        baseSignerConfig
+      );
+      return client;
+    },
+    enabled: !!rpcEndpoint && !!chainId,
+  });
+};
+```
+
+## Gas Fee Management
+
+One of the major improvements is the new gas fee handling system that integrates with the chain registry.
+
+### Automatic Gas Calculation
+
+The new system automatically calculates gas fees based on chain registry data:
+
+```typescript
+import { ChainConfig, getAutoGasFee } from './baseClient';
+
+// Using chain registry data
+const chainConfig: ChainConfig = {
+  chain: cosmosChain, // From @chain-registry/v2-types
+};
+
+// Gas fee is automatically calculated
+const result = await contractClient.execute(
+  sender,
+  { transfer: { recipient, amount } },
+  'auto', // Automatic gas calculation
+  undefined, // memo
+  [], // funds
+  chainConfig // Chain configuration for gas calculation
+);
+```
+
+### Manual Gas Price Configuration
+
+You can also specify custom gas prices:
+
+```typescript
+const chainConfig: ChainConfig = {
+  gasPrice: {
+    denom: 'uatom',
+    amount: '0.025'
+  }
+};
+
+const result = await contractClient.execute(
+  sender,
+  executeMsg,
+  'auto',
+  undefined,
+  [],
+  chainConfig
+);
+```
+
+### Default Gas Amount Configuration
+
+You can configure the default gas amount globally:
+
+```typescript
+import { setDefaultGasAmount, getDefaultGasAmount } from './baseClient';
+
+// Set default gas amount (default is '200000')
+setDefaultGasAmount('300000');
+
+// Get current default
+const currentDefault = getDefaultGasAmount();
+```
+
+### Manual Fee Specification
+
+For precise control, you can still specify exact fees:
+
+```typescript
+import { StdFee } from '@interchainjs/types';
+
+const fee: StdFee = {
+  amount: [{ denom: 'uatom', amount: '5000' }],
+  gas: '200000'
+};
+
+const result = await contractClient.execute(
+  sender,
+  executeMsg,
+  fee // Exact fee specification
+);
+```
+
+For more detailed information about InterchainJS, visit the [InterchainJS documentation](https://github.com/hyperweb-io/interchainjs).
\ No newline at end of file
diff --git a/package.json b/package.json
index dcce768e..f567ec86 100644
--- a/package.json
+++ b/package.json
@@ -46,5 +46,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/hyperweb-io/ts-codegen"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
index b4a36f11..79ff750f 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.account-nfts.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -25,7 +25,7 @@ exports[`execute classes array types 1`] = `
     this.allTokens = this.allTokens.bind(this);
     this.minter = this.minter.bind(this);
   }
-  proposedNewOwner = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  proposedNewOwner = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       proposed_new_owner: {}
     }, fee_, memo_, funds_);
@@ -36,7 +36,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       allowed_vaults: {
         limit,
@@ -50,7 +50,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_debt_shares: {
         limit,
@@ -58,7 +58,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  allPreviousOwners = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  allPreviousOwners = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_previous_owners: {}
     }, fee_, memo_, funds_);
@@ -69,7 +69,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       owner_of: {
         include_expired: includeExpired,
@@ -85,7 +85,7 @@ exports[`execute classes array types 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approval: {
         include_expired: includeExpired,
@@ -100,7 +100,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approvals: {
         include_expired: includeExpired,
@@ -118,7 +118,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_operators: {
         include_expired: includeExpired,
@@ -128,12 +128,12 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  numTokens = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  numTokens = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       num_tokens: {}
     }, fee_, memo_, funds_);
   };
-  contractInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  contractInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       contract_info: {}
     }, fee_, memo_, funds_);
@@ -142,7 +142,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       nft_info: {
         token_id: tokenId
@@ -155,7 +155,7 @@ exports[`execute classes array types 1`] = `
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_nft_info: {
         include_expired: includeExpired,
@@ -171,7 +171,7 @@ exports[`execute classes array types 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       tokens: {
         limit,
@@ -186,7 +186,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_tokens: {
         limit,
@@ -194,7 +194,7 @@ exports[`execute classes array types 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  minter = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  minter = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       minter: {}
     }, fee_, memo_, funds_);
@@ -206,29 +206,29 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  proposedNewOwner: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  proposedNewOwner: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   allowedVaults: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: VaultBase_for_String;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   allDebtShares: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string[][];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  allPreviousOwners: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  allPreviousOwners: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   ownerOf: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approval: ({
     includeExpired,
     spender,
@@ -237,14 +237,14 @@ exports[`execute interfaces no extends 1`] = `
     includeExpired?: boolean;
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approvals: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   allOperators: ({
     includeExpired,
     limit,
@@ -255,21 +255,21 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  numTokens: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  contractInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  numTokens: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  contractInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   nftInfo: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   allNftInfo: ({
     includeExpired,
     tokenId
   }: {
     includeExpired?: boolean;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   tokens: ({
     limit,
     owner,
@@ -278,15 +278,15 @@ exports[`execute interfaces no extends 1`] = `
     limit?: number;
     owner: string;
     startAfter?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   allTokens: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  minter: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  minter: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -294,9 +294,9 @@ exports[`execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.proposedNewOwner = this.proposedNewOwner.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
index cf42041a..8bca517e 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-item-tuples.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
@@ -53,15 +53,15 @@ exports[`execute interfaces no extends 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.updateEdges = this.updateEdges.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
index 7a2f67f1..2b9c691e 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays-ref.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -30,7 +30,7 @@ exports[`execute classes array types 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -46,7 +46,7 @@ exports[`execute classes array types 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -59,7 +59,7 @@ exports[`execute classes array types 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -70,7 +70,7 @@ exports[`execute classes array types 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -83,7 +83,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -97,7 +97,7 @@ exports[`execute classes array types 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -109,7 +109,7 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -120,14 +120,14 @@ exports[`execute classes array types 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee_, memo_, funds_);
   };
-  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee_, memo_, funds_);
@@ -136,14 +136,14 @@ exports[`execute classes array types 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  reset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee_, memo_, funds_);
@@ -152,7 +152,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -163,7 +163,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -174,7 +174,7 @@ exports[`execute classes array types 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
@@ -194,7 +194,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   editEdge: ({
     amount,
     creditor,
@@ -203,63 +203,63 @@ exports[`execute interfaces no extends 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  findSavings: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  reset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -267,9 +267,9 @@ exports[`execute_msg_for__empty 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.createEdge = this.createEdge.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
index 1d09dfc0..256dada9 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.arrays.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -23,7 +23,7 @@ exports[`execute classes array types 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges3,
@@ -53,7 +53,7 @@ exports[`execute interfaces no extends 1`] = `
     edges: number[][];
     nested: number[][][];
     supernested: string[][][][][][];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -63,9 +63,9 @@ exports[`getPropertyType 1`] = `"number[][][]"`;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.updateEdges = this.updateEdges.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
index a0feec9b..197c97d1 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-named-groups.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -21,7 +21,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -34,7 +34,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -45,7 +45,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
@@ -67,17 +67,17 @@ exports[`execute interfaces no extends 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeGroup: ({
     group
   }: {
     group: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateOwner: ({
     owner
   }: {
     owner: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -85,9 +85,9 @@ exports[`execute_msg 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.update = this.update.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
index ce732cdd..b50d1ac0 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.cw-proposal-single.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -27,7 +27,7 @@ exports[`execute classes array types 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose: {
         description,
@@ -42,7 +42,7 @@ exports[`execute classes array types 1`] = `
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       vote: {
         proposal_id: proposalId,
@@ -54,7 +54,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         proposal_id: proposalId
@@ -65,7 +65,7 @@ exports[`execute classes array types 1`] = `
     proposalId
   }: {
     proposalId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       close: {
         proposal_id: proposalId
@@ -88,7 +88,7 @@ exports[`execute classes array types 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         allow_revoting: allowRevoting,
@@ -105,7 +105,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_proposal_hook: {
         address
@@ -116,7 +116,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_proposal_hook: {
         address
@@ -127,7 +127,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_vote_hook: {
         address
@@ -138,7 +138,7 @@ exports[`execute classes array types 1`] = `
     address
   }: {
     address: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_vote_hook: {
         address
@@ -160,24 +160,24 @@ exports[`execute interfaces no extends 1`] = `
     description: string;
     msgs: CosmosMsg_for_Empty[];
     title: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   vote: ({
     proposalId,
     vote
   }: {
     proposalId: number;
     vote: Vote;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   execute: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   close: ({
     proposalId
   }: {
     proposalId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     allowRevoting,
     dao,
@@ -194,27 +194,27 @@ exports[`execute interfaces no extends 1`] = `
     minVotingPeriod?: Duration;
     onlyMembersExecute: boolean;
     threshold: Threshold;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeProposalHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeVoteHook: ({
     address
   }: {
     address: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -222,9 +222,9 @@ exports[`execute_msg_for 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.config = this.config.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
index 46a8ff22..7a77ee4c 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.declare.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`noDeclare, execExtends, ExtendsClass 1`] = `
 "export class SG721Client extends ExtendsClassName implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -25,7 +25,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -41,7 +41,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -58,7 +58,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -73,7 +73,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -87,7 +87,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -99,7 +99,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -116,7 +116,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -130,7 +130,7 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -142,10 +142,10 @@ exports[`noDeclare, execExtends, ExtendsClass 1`] = `
 
 exports[`noDeclare, execExtends, noExtendsClass 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -164,7 +164,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -180,7 +180,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -197,7 +197,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -212,7 +212,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -226,7 +226,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -238,7 +238,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -255,7 +255,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -269,7 +269,7 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -281,10 +281,10 @@ exports[`noDeclare, execExtends, noExtendsClass 1`] = `
 
 exports[`useDeclare, execExtends, ExtendsClass 1`] = `
 "export class SG721Client extends ExtendsClassName implements SG721Instance {
-  declare client: SigningCosmWasmClient;
+  declare client: ISigningCosmWasmClient;
   sender: string;
   declare contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -304,7 +304,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -320,7 +320,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -337,7 +337,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -352,7 +352,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -366,7 +366,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -378,7 +378,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -395,7 +395,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,7 +409,7 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -421,10 +421,10 @@ exports[`useDeclare, execExtends, ExtendsClass 1`] = `
 
 exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
 "export class SG721Client extends ExtendsClassName implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -444,7 +444,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -460,7 +460,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -477,7 +477,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -492,7 +492,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -506,7 +506,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -518,7 +518,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -535,7 +535,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -549,7 +549,7 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -561,10 +561,10 @@ exports[`useDeclare, noExecExtends, ExtendsClass 1`] = `
 
 exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -583,7 +583,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -599,7 +599,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -616,7 +616,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -631,7 +631,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -645,7 +645,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -657,7 +657,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -674,7 +674,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -688,7 +688,7 @@ exports[`useDeclare, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap
index 9eb8ebee..2f01ac87 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.empty-enums.test.ts.snap
@@ -2,9 +2,9 @@
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
index 17b77dd3..0dfbe858 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-101.test.ts.snap
@@ -8,17 +8,17 @@ exports[`execute interfaces no extends 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  updateOwnership: (action: Action, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  updateOwnership: (action: Action, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
 exports[`ownership client with tuple 1`] = `
 "export class OwnershipClient implements OwnershipInstance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -29,14 +29,14 @@ exports[`ownership client with tuple 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_factory: {
         new_factory: newFactory
       }
     }, fee_, memo_, funds_);
   };
-  updateOwnership = async (action: Action, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  updateOwnership = async (action: Action, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_ownership: action
     }, fee_, memo_, funds_);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
index 3e03cdbc..520583ba 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-103.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute execute classes array types 1`] = `
 "export class Client implements Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -24,9 +24,9 @@ exports[`execute execute_msg_for__empty 1`] = `"export type ExecuteMsg = Execute
 
 exports[`execute query classes 1`] = `
 "export class QueryClient implements ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -37,10 +37,10 @@ exports[`execute query classes response 1`] = `"export type QueryMsg = QueryMsg;
 
 exports[`query execute classes array types 1`] = `
 "export class Client implements Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -59,9 +59,9 @@ exports[`query execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`
 
 exports[`query query classes 1`] = `
 "export class QueryClient implements ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
index b4f43503..b2182833 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-71.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute class /execute_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -28,7 +28,7 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       receive: {
         amount,
@@ -45,7 +45,7 @@ exports[`execute class /execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         fee_collector: feeCollector,
@@ -62,7 +62,7 @@ exports[`execute class /execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_pool_config: {
         is_disabled: isDisabled,
@@ -75,7 +75,7 @@ exports[`execute class /execute_msg.json 1`] = `
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_to_registery: {
         new_pool_config: newPoolConfig
@@ -94,7 +94,7 @@ exports[`execute class /execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_pool_instance: {
         asset_infos: assetInfos,
@@ -119,7 +119,7 @@ exports[`execute class /execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       join_pool: {
         assets,
@@ -137,7 +137,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       swap: {
         recipient,
@@ -151,7 +151,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     expiresIn: number;
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       propose_new_owner: {
         expires_in: expiresIn,
@@ -159,12 +159,12 @@ exports[`execute class /execute_msg.json 1`] = `
       }
     }, fee_, memo_, funds_);
   };
-  dropOwnershipProposal = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  dropOwnershipProposal = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       drop_ownership_proposal: {}
     }, fee_, memo_, funds_);
   };
-  claimOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  claimOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       claim_ownership: {}
     }, fee_, memo_, funds_);
@@ -184,7 +184,7 @@ exports[`execute interface /execute_msg.json 1`] = `
     amount: Uint128;
     msg: Binary;
     sender: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateConfig: ({
     feeCollector,
     generatorAddress,
@@ -193,7 +193,7 @@ exports[`execute interface /execute_msg.json 1`] = `
     feeCollector?: string;
     generatorAddress?: string;
     lpTokenCodeId?: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updatePoolConfig: ({
     isDisabled,
     newFeeInfo,
@@ -202,12 +202,12 @@ exports[`execute interface /execute_msg.json 1`] = `
     isDisabled?: boolean;
     newFeeInfo?: FeeInfo;
     poolType: PoolType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addToRegistery: ({
     newPoolConfig
   }: {
     newPoolConfig: PoolConfig;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createPoolInstance: ({
     assetInfos,
     initParams,
@@ -220,7 +220,7 @@ exports[`execute interface /execute_msg.json 1`] = `
     lpTokenName?: string;
     lpTokenSymbol?: string;
     poolType: PoolType;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   joinPool: ({
     assets,
     autoStake,
@@ -235,23 +235,23 @@ exports[`execute interface /execute_msg.json 1`] = `
     poolId: Uint128;
     recipient?: string;
     slippageTolerance?: Decimal;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   swap: ({
     recipient,
     swapRequest
   }: {
     recipient?: string;
     swapRequest: SingleSwapRequest;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   proposeNewOwner: ({
     expiresIn,
     owner
   }: {
     expiresIn: number;
     owner: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  dropOwnershipProposal: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  claimOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  dropOwnershipProposal: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  claimOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -259,9 +259,9 @@ exports[`execute_msg_for__empty /execute_msg.json 1`] = `"export type ExecuteMsg
 
 exports[`query classes /execute_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.receive = this.receive.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
index 145bc3fe..8e9f7ea4 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issue-98.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -13,7 +13,7 @@ exports[`execute classes array types 1`] = `
     this.getPlugins = this.getPlugins.bind(this);
     this.getPluginById = this.getPluginById.bind(this);
   }
-  getConfig = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getConfig = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_config: {}
     }, fee_, memo_, funds_);
@@ -24,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugins: {
         limit,
@@ -36,7 +36,7 @@ exports[`execute classes array types 1`] = `
     id
   }: {
     id: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_plugin_by_id: {
         id
@@ -50,19 +50,19 @@ exports[`execute interfaces no extends 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getConfig: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  getConfig: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getPlugins: ({
     limit,
     startAfter
   }: {
     limit?: number;
     startAfter?: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getPluginById: ({
     id
   }: {
     id: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -70,9 +70,9 @@ exports[`execute_msg_for__empty 1`] = `"export type QueryMsg = QueryMsg;"`;
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.getConfig = this.getConfig.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
index 5921cea1..15e5dd53 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.issues.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute class /batch.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -15,10 +15,10 @@ exports[`execute class /batch.json 1`] = `
 
 exports[`execute class /denom_response.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -28,10 +28,10 @@ exports[`execute class /denom_response.json 1`] = `
 
 exports[`execute class /edge.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -41,10 +41,10 @@ exports[`execute class /edge.json 1`] = `
 
 exports[`execute class /execute_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -69,7 +69,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_edge: {
         amount,
@@ -85,7 +85,7 @@ exports[`execute class /execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_edge: {
         amount,
@@ -98,7 +98,7 @@ exports[`execute class /execute_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_edge: {
         edge_id: edgeId
@@ -109,7 +109,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graph
   }: {
     graph: Edge[];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph: {
         graph
@@ -122,7 +122,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_simplified: {
         graph,
@@ -136,7 +136,7 @@ exports[`execute class /execute_msg.json 1`] = `
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       edit_graph_simplified: {
         graph,
@@ -148,7 +148,7 @@ exports[`execute class /execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_graph: {
         graph_id: graphId
@@ -159,14 +159,14 @@ exports[`execute class /execute_msg.json 1`] = `
     edges
   }: {
     edges: number[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_edges: {
         edges
       }
     }, fee_, memo_, funds_);
   };
-  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  findSavings = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings: {}
     }, fee_, memo_, funds_);
@@ -175,14 +175,14 @@ exports[`execute class /execute_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       find_savings_in_a_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  reset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  reset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       reset: {}
     }, fee_, memo_, funds_);
@@ -191,7 +191,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       save_network_to_file: {
         filepath
@@ -202,7 +202,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       create_graph_from_file: {
         filepath
@@ -213,7 +213,7 @@ exports[`execute class /execute_msg.json 1`] = `
     filepath
   }: {
     filepath: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       apply_set_off_from_file: {
         filepath
@@ -225,10 +225,10 @@ exports[`execute class /execute_msg.json 1`] = `
 
 exports[`execute class /instantiate_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -238,10 +238,10 @@ exports[`execute class /instantiate_msg.json 1`] = `
 
 exports[`execute class /network.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -251,10 +251,10 @@ exports[`execute class /network.json 1`] = `
 
 exports[`execute class /query_msg.json 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -271,17 +271,17 @@ exports[`execute class /query_msg.json 1`] = `
     this.getTotalDebtByGraph = this.getTotalDebtByGraph.bind(this);
     this.getTotalDebt = this.getTotalDebt.bind(this);
   }
-  getDenom = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getDenom = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_denom: {}
     }, fee_, memo_, funds_);
   };
-  getOwner = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getOwner = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_owner: {}
     }, fee_, memo_, funds_);
   };
-  allEdges = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  allEdges = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       all_edges: {}
     }, fee_, memo_, funds_);
@@ -290,7 +290,7 @@ exports[`execute class /query_msg.json 1`] = `
     edgeId
   }: {
     edgeId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_edge: {
         edge_id: edgeId
@@ -301,7 +301,7 @@ exports[`execute class /query_msg.json 1`] = `
     batchId
   }: {
     batchId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_batch: {
         batch_id: batchId
@@ -312,7 +312,7 @@ exports[`execute class /query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       one_graph: {
         graph_id: graphId
@@ -323,7 +323,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_by_address: {
         address
@@ -334,7 +334,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_edges_as_counterparty: {
         address
@@ -345,7 +345,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_per_address: {
         address
@@ -356,7 +356,7 @@ exports[`execute class /query_msg.json 1`] = `
     address
   }: {
     address: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_credit_per_address: {
         address
@@ -367,14 +367,14 @@ exports[`execute class /query_msg.json 1`] = `
     graphId
   }: {
     graphId: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt_by_graph: {
         graph_id: graphId
       }
     }, fee_, memo_, funds_);
   };
-  getTotalDebt = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  getTotalDebt = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       get_total_debt: {}
     }, fee_, memo_, funds_);
@@ -413,7 +413,7 @@ exports[`execute interface /execute_msg.json 1`] = `
   }: {
     amount: number;
     creditor: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   editEdge: ({
     amount,
     creditor,
@@ -422,63 +422,63 @@ exports[`execute interface /execute_msg.json 1`] = `
     amount: number;
     creditor: Addr;
     edgeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createGraph: ({
     graph
   }: {
     graph: Edge[];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   editGraphSimplified: ({
     graph,
     graphId
   }: {
     graph: Addr[][];
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateEdges: ({
     edges
   }: {
     edges: number[][];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  findSavings: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  findSavings: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   findSavingsInAGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  reset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  reset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   saveNetworkToFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   createGraphFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   applySetOffFromFile: ({
     filepath
   }: {
     filepath: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -500,50 +500,50 @@ exports[`execute interface /query_msg.json 1`] = `
 "export interface SG721Instance {
   contractAddress: string;
   sender: string;
-  getDenom: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  getOwner: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  allEdges: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  getDenom: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  getOwner: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  allEdges: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   oneEdge: ({
     edgeId
   }: {
     edgeId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   oneBatch: ({
     batchId
   }: {
     batchId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   oneGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getEdgesByAddress: ({
     address
   }: {
     address: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getEdgesAsCounterparty: ({
     address
   }: {
     address: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getTotalDebtPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getTotalCreditPerAddress: ({
     address
   }: {
     address: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   getTotalDebtByGraph: ({
     graphId
   }: {
     graphId: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  getTotalDebt: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  getTotalDebt: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -589,9 +589,9 @@ exports[`execute_msg_for__empty /query_msg.json 1`] = `"export type QueryMsg = Q
 
 exports[`query classes /batch.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -600,9 +600,9 @@ exports[`query classes /batch.json 1`] = `
 
 exports[`query classes /denom_response.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -611,9 +611,9 @@ exports[`query classes /denom_response.json 1`] = `
 
 exports[`query classes /edge.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -622,9 +622,9 @@ exports[`query classes /edge.json 1`] = `
 
 exports[`query classes /execute_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.createEdge = this.createEdge.bind(this);
@@ -804,9 +804,9 @@ exports[`query classes /execute_msg.json 1`] = `
 
 exports[`query classes /instantiate_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -815,9 +815,9 @@ exports[`query classes /instantiate_msg.json 1`] = `
 
 exports[`query classes /network.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
   }
@@ -826,9 +826,9 @@ exports[`query classes /network.json 1`] = `
 
 exports[`query classes /query_msg.json 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.getDenom = this.getDenom.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
index f257838c..893ba631 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.overrides.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`Impl, execExtends, ExtendsClass 1`] = `
 "export class SG721Client extends ExtendsClassName implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -25,7 +25,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -41,7 +41,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -58,7 +58,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -73,7 +73,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -87,7 +87,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -99,7 +99,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -116,7 +116,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -130,7 +130,7 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -142,10 +142,10 @@ exports[`Impl, execExtends, ExtendsClass 1`] = `
 
 exports[`Impl, execExtends, noExtendsClass 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -164,7 +164,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -180,7 +180,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -197,7 +197,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -212,7 +212,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -226,7 +226,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -238,7 +238,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -255,7 +255,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -269,7 +269,7 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -281,10 +281,10 @@ exports[`Impl, execExtends, noExtendsClass 1`] = `
 
 exports[`noImpl, execExtends, ExtendsClass 1`] = `
 "export class SG721Client extends ExtendsClassName implements SG721Instance {
-  override client: SigningCosmWasmClient;
+  override client: ISigningCosmWasmClient;
   sender: string;
   override contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -304,7 +304,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -320,7 +320,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -337,7 +337,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -352,7 +352,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -366,7 +366,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -378,7 +378,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -395,7 +395,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -409,7 +409,7 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -421,10 +421,10 @@ exports[`noImpl, execExtends, ExtendsClass 1`] = `
 
 exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
 "export class SG721Client extends ExtendsClassName implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -444,7 +444,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -460,7 +460,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -477,7 +477,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -492,7 +492,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -506,7 +506,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -518,7 +518,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -535,7 +535,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -549,7 +549,7 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -561,10 +561,10 @@ exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
 
 exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -583,7 +583,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -599,7 +599,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -616,7 +616,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -631,7 +631,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -645,7 +645,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -657,7 +657,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -674,7 +674,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -688,7 +688,7 @@ exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
index aa3287ee..e0fff6ca 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.sg721.test.ts.snap
@@ -2,10 +2,10 @@
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -24,7 +24,7 @@ exports[`execute classes array types 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -40,7 +40,7 @@ exports[`execute classes array types 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -57,7 +57,7 @@ exports[`execute classes array types 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -72,7 +72,7 @@ exports[`execute classes array types 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -86,7 +86,7 @@ exports[`execute classes array types 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -98,7 +98,7 @@ exports[`execute classes array types 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -115,7 +115,7 @@ exports[`execute classes array types 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -129,7 +129,7 @@ exports[`execute classes array types 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -149,7 +149,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   sendNft: ({
     contract,
     msg,
@@ -158,7 +158,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approve: ({
     expires,
     spender,
@@ -167,26 +167,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mint: ({
     extension,
     owner,
@@ -197,12 +197,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -210,9 +210,9 @@ exports[`execute_msg_for__empty 1`] = `"export type ExecuteMsg_for_Empty = Execu
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.transferNft = this.transferNft.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
index 8627a35d..5b0a3811 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.test.ts.snap
@@ -38,10 +38,10 @@ exports[`contract_info_response 1`] = `
 
 exports[`execute classes 1`] = `
 "export class SG721Client extends SG721QueryClient implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress);
     this.client = client;
     this.sender = sender;
@@ -61,7 +61,7 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -77,7 +77,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -94,7 +94,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -109,7 +109,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -123,7 +123,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -135,7 +135,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -152,7 +152,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -166,7 +166,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -178,10 +178,10 @@ exports[`execute classes 1`] = `
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -197,7 +197,7 @@ exports[`execute classes array types 1`] = `
     addressesToAdd?: string[];
     addressesToRemove?: string[];
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update: {
         addresses_to_add: addressesToAdd,
@@ -210,7 +210,7 @@ exports[`execute classes array types 1`] = `
     group
   }: {
     group: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_group: {
         group
@@ -221,7 +221,7 @@ exports[`execute classes array types 1`] = `
     owner
   }: {
     owner: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_owner: {
         owner
@@ -233,10 +233,10 @@ exports[`execute classes array types 1`] = `
 
 exports[`execute classes no extends 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -255,7 +255,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       transfer_nft: {
         recipient,
@@ -271,7 +271,7 @@ exports[`execute classes no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       send_nft: {
         contract,
@@ -288,7 +288,7 @@ exports[`execute classes no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve: {
         expires,
@@ -303,7 +303,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke: {
         spender,
@@ -317,7 +317,7 @@ exports[`execute classes no extends 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       approve_all: {
         expires,
@@ -329,7 +329,7 @@ exports[`execute classes no extends 1`] = `
     operator
   }: {
     operator: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revoke_all: {
         operator
@@ -346,7 +346,7 @@ exports[`execute classes no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       mint: {
         extension,
@@ -360,7 +360,7 @@ exports[`execute classes no extends 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       burn: {
         token_id: tokenId
@@ -380,7 +380,7 @@ exports[`execute interfaces no extends 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   sendNft: ({
     contract,
     msg,
@@ -389,7 +389,7 @@ exports[`execute interfaces no extends 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approve: ({
     expires,
     spender,
@@ -398,26 +398,26 @@ exports[`execute interfaces no extends 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   mint: ({
     extension,
     owner,
@@ -428,12 +428,12 @@ exports[`execute interfaces no extends 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -474,9 +474,9 @@ exports[`owner_of_response 1`] = `
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.ownerOf = this.ownerOf.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
index 51c69a9f..9c491656 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.vectis.test.ts.snap
@@ -10,10 +10,10 @@ exports[`cosmos_msg_for__empty 1`] = `"export type CosmosMsg_for_Empty = CosmosM
 
 exports[`execute classes array types 1`] = `
 "export class SG721Client implements SG721Instance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -30,14 +30,14 @@ exports[`execute classes array types 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       execute: {
         msgs
       }
     }, fee_, memo_, funds_);
   };
-  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       revert_freeze_status: {}
     }, fee_, memo_, funds_);
@@ -46,7 +46,7 @@ exports[`execute classes array types 1`] = `
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       relay: {
         transaction
@@ -57,7 +57,7 @@ exports[`execute classes array types 1`] = `
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       rotate_user_key: {
         new_user_address: newUserAddress
@@ -68,7 +68,7 @@ exports[`execute classes array types 1`] = `
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       add_relayer: {
         new_relayer_address: newRelayerAddress
@@ -79,7 +79,7 @@ exports[`execute classes array types 1`] = `
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       remove_relayer: {
         relayer_address: relayerAddress
@@ -92,7 +92,7 @@ exports[`execute classes array types 1`] = `
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_guardians: {
         guardians,
@@ -104,7 +104,7 @@ exports[`execute classes array types 1`] = `
     newLabel
   }: {
     newLabel: string;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_label: {
         new_label: newLabel
@@ -122,40 +122,40 @@ exports[`execute interfaces no extends 1`] = `
     msgs
   }: {
     msgs: CosmosMsg_for_Empty[];
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
-  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
+  revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   relay: ({
     transaction
   }: {
     transaction: RelayTransaction;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   rotateUserKey: ({
     newUserAddress
   }: {
     newUserAddress: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   addRelayer: ({
     newRelayerAddress
   }: {
     newRelayerAddress: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   removeRelayer: ({
     relayerAddress
   }: {
     relayerAddress: Addr;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateGuardians: ({
     guardians,
     newMultisigCodeId
   }: {
     guardians: Guardians;
     newMultisigCodeId?: number;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
   updateLabel: ({
     newLabel
   }: {
     newLabel: string;
-  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
+  }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
 }"
 `;
 
@@ -178,9 +178,9 @@ exports[`info_response 1`] = `
 
 exports[`query classes 1`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.bank = this.bank.bind(this);
@@ -219,9 +219,9 @@ exports[`query classes 1`] = `
 
 exports[`query classes 2`] = `
 "export class SG721QueryClient implements SG721ReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.execute = this.execute.bind(this);
diff --git a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
index 89679054..f022d693 100644
--- a/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
+++ b/packages/ast/__tests__/client/__snapshots__/ts-client.wager.test.ts.snap
@@ -4,10 +4,10 @@ exports[`execute 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
 
 exports[`execute classes 1`] = `
 "export class WagerClient implements WagerInstance {
-  client: SigningCosmWasmClient;
+  client: ISigningCosmWasmClient;
   sender: string;
   contractAddress: string;
-  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+  constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -20,7 +20,7 @@ exports[`execute classes 1`] = `
     params
   }: {
     params: ParamInfo;
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       update_config: {
         params
@@ -35,7 +35,7 @@ exports[`execute classes 1`] = `
     currentPrices: number[][];
     prevPrices: number[][];
     wagerKey: Addr[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       set_winner: {
         current_prices: currentPrices,
@@ -54,7 +54,7 @@ exports[`execute classes 1`] = `
     currency: Currency;
     expiry: number;
     token: Addr[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       wager: {
         against_currencies: againstCurrencies,
@@ -68,7 +68,7 @@ exports[`execute classes 1`] = `
     token
   }: {
     token: Addr[][];
-  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
+  }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
     return await this.client.execute(this.sender, this.contractAddress, {
       cancel: {
         token
@@ -82,9 +82,9 @@ exports[`query 1`] = `"export type QueryMsg = QueryMsg;"`;
 
 exports[`query classes 1`] = `
 "export class WagerQueryClient implements WagerReadOnlyInstance {
-  client: CosmWasmClient;
+  client: ICosmWasmClient;
   contractAddress: string;
-  constructor(client: CosmWasmClient, contractAddress: string) {
+  constructor(client: ICosmWasmClient, contractAddress: string) {
     this.client = client;
     this.contractAddress = contractAddress;
     this.wagers = this.wagers.bind(this);
diff --git a/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
index 1707104a..27834354 100644
--- a/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
+++ b/packages/ast/__tests__/message-composer/__snapshots__/message-composer.test.ts.snap
@@ -10,7 +10,7 @@ exports[`createMessageComposerInterface 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   sendNft: ({
     contract,
     msg,
@@ -19,7 +19,7 @@ exports[`createMessageComposerInterface 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approve: ({
     expires,
     spender,
@@ -28,26 +28,26 @@ exports[`createMessageComposerInterface 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revoke: ({
     spender,
     tokenId
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   approveAll: ({
     expires,
     operator
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   revokeAll: ({
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   mint: ({
     extension,
     owner,
@@ -58,12 +58,12 @@ exports[`createMessageComposerInterface 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
   burn: ({
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
 }"
 `;
 
@@ -89,7 +89,7 @@ exports[`execute classes 1`] = `
   }: {
     recipient: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -113,7 +113,7 @@ exports[`execute classes 1`] = `
     contract: string;
     msg: Binary;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -138,7 +138,7 @@ exports[`execute classes 1`] = `
     expires?: Expiration;
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -161,7 +161,7 @@ exports[`execute classes 1`] = `
   }: {
     spender: string;
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -183,7 +183,7 @@ exports[`execute classes 1`] = `
   }: {
     expires?: Expiration;
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -203,7 +203,7 @@ exports[`execute classes 1`] = `
     operator
   }: {
     operator: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -228,7 +228,7 @@ exports[`execute classes 1`] = `
     owner: string;
     tokenId: string;
     tokenUri?: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -250,7 +250,7 @@ exports[`execute classes 1`] = `
     tokenId
   }: {
     tokenId: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -282,7 +282,7 @@ exports[`ownershipClass 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  }, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -297,7 +297,7 @@ exports[`ownershipClass 1`] = `
       })
     };
   };
-  updateOwnership = (action: Action, funds_?: Coin[]): MsgExecuteContractEncodeObject => {
+  updateOwnership = (action: Action, funds_?: Coin[]): EncodeObject => {
     return {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: MsgExecuteContract.fromPartial({
@@ -321,7 +321,7 @@ exports[`ownershipInterface 1`] = `
     newFactory
   }: {
     newFactory: string;
-  }, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
-  updateOwnership: (action: Action, funds_?: Coin[]) => MsgExecuteContractEncodeObject;
+  }, funds_?: Coin[]) => EncodeObject;
+  updateOwnership: (action: Action, funds_?: Coin[]) => EncodeObject;
 }"
 `;
diff --git a/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap b/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
index 3fb0645c..4ccd5266 100644
--- a/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
+++ b/packages/ast/__tests__/provider/__snapshots__/provider.test.ts.snap
@@ -8,7 +8,7 @@ exports[`create IContractsContext 1`] = `
 `;
 
 exports[`create getProviders 1`] = `
-"export const getProviders = (address?: string, cosmWasmClient?: CosmWasmClient, signingCosmWasmClient?: SigningCosmWasmClient) => ({
+"export const getProviders = (address?: string, cosmWasmClient?: ICosmWasmClient, signingCosmWasmClient?: ISigningCosmWasmClient) => ({
   whitelist: new Whitelist({
     address,
     cosmWasmClient,
diff --git a/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
index 533964cd..60828d56 100644
--- a/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
+++ b/packages/ast/__tests__/react-query/__snapshots__/react-query.test.ts.snap
@@ -1185,8 +1185,8 @@ exports[`createReactQueryHooks 6`] = `
     funds?: Coin[];
   };
 }
-export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721BurnMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721BurnMutation>(({
+export function useSg721BurnMutation(options?: Omit<UseMutationOptions<any, Error, Sg721BurnMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721BurnMutation>(({
     client,
     msg,
     args: {
@@ -1210,8 +1210,8 @@ export interface Sg721MintMutation {
     funds?: Coin[];
   };
 }
-export function useSg721MintMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721MintMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721MintMutation>(({
+export function useSg721MintMutation(options?: Omit<UseMutationOptions<any, Error, Sg721MintMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721MintMutation>(({
     client,
     msg,
     args: {
@@ -1232,8 +1232,8 @@ export interface Sg721RevokeAllMutation {
     funds?: Coin[];
   };
 }
-export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeAllMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721RevokeAllMutation>(({
+export function useSg721RevokeAllMutation(options?: Omit<UseMutationOptions<any, Error, Sg721RevokeAllMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721RevokeAllMutation>(({
     client,
     msg,
     args: {
@@ -1255,8 +1255,8 @@ export interface Sg721ApproveAllMutation {
     funds?: Coin[];
   };
 }
-export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveAllMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721ApproveAllMutation>(({
+export function useSg721ApproveAllMutation(options?: Omit<UseMutationOptions<any, Error, Sg721ApproveAllMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721ApproveAllMutation>(({
     client,
     msg,
     args: {
@@ -1278,8 +1278,8 @@ export interface Sg721RevokeMutation {
     funds?: Coin[];
   };
 }
-export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721RevokeMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721RevokeMutation>(({
+export function useSg721RevokeMutation(options?: Omit<UseMutationOptions<any, Error, Sg721RevokeMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721RevokeMutation>(({
     client,
     msg,
     args: {
@@ -1302,8 +1302,8 @@ export interface Sg721ApproveMutation {
     funds?: Coin[];
   };
 }
-export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721ApproveMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721ApproveMutation>(({
+export function useSg721ApproveMutation(options?: Omit<UseMutationOptions<any, Error, Sg721ApproveMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721ApproveMutation>(({
     client,
     msg,
     args: {
@@ -1326,8 +1326,8 @@ export interface Sg721SendNftMutation {
     funds?: Coin[];
   };
 }
-export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721SendNftMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721SendNftMutation>(({
+export function useSg721SendNftMutation(options?: Omit<UseMutationOptions<any, Error, Sg721SendNftMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721SendNftMutation>(({
     client,
     msg,
     args: {
@@ -1349,8 +1349,8 @@ export interface Sg721TransferNftMutation {
     funds?: Coin[];
   };
 }
-export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, Sg721TransferNftMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, Sg721TransferNftMutation>(({
+export function useSg721TransferNftMutation(options?: Omit<UseMutationOptions<any, Error, Sg721TransferNftMutation>, "mutationFn">) {
+  return useMutation<any, Error, Sg721TransferNftMutation>(({
     client,
     msg,
     args: {
@@ -1372,8 +1372,8 @@ exports[`ownership 1`] = `
     funds?: Coin[];
   };
 }
-export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, OwnershipUpdateOwnershipMutation>(({
+export function useOwnershipUpdateOwnershipMutation(options?: Omit<UseMutationOptions<any, Error, OwnershipUpdateOwnershipMutation>, "mutationFn">) {
+  return useMutation<any, Error, OwnershipUpdateOwnershipMutation>(({
     client,
     msg,
     args: {
@@ -1394,8 +1394,8 @@ export interface OwnershipSetFactoryMutation {
     funds?: Coin[];
   };
 }
-export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<ExecuteResult, Error, OwnershipSetFactoryMutation>, "mutationFn">) {
-  return useMutation<ExecuteResult, Error, OwnershipSetFactoryMutation>(({
+export function useOwnershipSetFactoryMutation(options?: Omit<UseMutationOptions<any, Error, OwnershipSetFactoryMutation>, "mutationFn">) {
+  return useMutation<any, Error, OwnershipSetFactoryMutation>(({
     client,
     msg,
     args: {
diff --git a/packages/ast/package.json b/packages/ast/package.json
index d6172ff7..e7d5c059 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -39,6 +39,7 @@
     "@cosmwasm/ts-codegen-types": "^1.4.0",
     "ast-stringify": "0.2.1",
     "case": "1.6.3",
-    "deepmerge": "4.2.2"
+    "deepmerge": "4.2.2",
+    "minimatch": "^10.0.3"
   }
 }
diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 59dad222..908dff30 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -107,7 +107,7 @@ export const createQueryClass = (
   implementsClassName: string,
   queryMsg: QueryMsg
 ) => {
-  context.addUtil('CosmWasmClient');
+  context.addUtil('ICosmWasmClient');
 
   const propertyNames = getMessageProperties(queryMsg)
     .map((method) => Object.keys(method.properties)?.[0])
@@ -126,7 +126,7 @@ export const createQueryClass = (
         // client
         classProperty(
           'client',
-          t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))
+          t.tsTypeAnnotation(t.tsTypeReference(t.identifier('ICosmWasmClient')))
         ),
 
         // contractAddress
@@ -143,7 +143,7 @@ export const createQueryClass = (
             typedIdentifier(
               'client',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('CosmWasmClient'))
+                t.tsTypeReference(t.identifier('ICosmWasmClient'))
               )
             ),
             typedIdentifier(
@@ -218,7 +218,7 @@ export const createWasmExecMethod = (
   context: RenderContext,
   jsonschema: JSONSchema
 ) => {
-  context.addUtil('ExecuteResult');
+
   context.addUtil('StdFee');
   context.addUtil('Coin');
 
@@ -280,7 +280,7 @@ export const createWasmExecMethod = (
         t.tsTypeReference(
           t.identifier('Promise'),
           t.tsTypeParameterInstantiation([
-            t.tSTypeReference(t.identifier('ExecuteResult')),
+            t.tSTypeReference(t.identifier('any')),
           ])
         )
       ),
@@ -296,7 +296,7 @@ export const createExecuteClass = (
   extendsClassName: string | null,
   execMsg: ExecuteMsg
 ) => {
-  context.addUtil('SigningCosmWasmClient');
+  context.addUtil('ISigningCosmWasmClient');
 
   const propertyNames = getMessageProperties(execMsg)
     .map((method) => Object.keys(method.properties)?.[0])
@@ -371,7 +371,7 @@ export const createExecuteClass = (
         classProperty(
           'client',
           t.tsTypeAnnotation(
-            t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+            t.tsTypeReference(t.identifier('ISigningCosmWasmClient'))
           ),
           false,
           false,
@@ -400,7 +400,7 @@ export const createExecuteClass = (
             typedIdentifier(
               'client',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                t.tsTypeReference(t.identifier('ISigningCosmWasmClient'))
               )
             ),
             typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
@@ -431,7 +431,7 @@ export const createExecuteInterface = (
     return createPropertyFunctionWithObjectParamsForExec(
       context,
       methodName,
-      'ExecuteResult',
+      'any',
       jsonschema.properties[underscoreName]
     );
   });
diff --git a/packages/ast/src/context/imports.ts b/packages/ast/src/context/imports.ts
index 3459c391..d2994e0f 100644
--- a/packages/ast/src/context/imports.ts
+++ b/packages/ast/src/context/imports.ts
@@ -3,7 +3,6 @@ import { dirname, extname, relative } from 'path';
 
 import { importAs, importStmt } from '../utils';
 import { RenderContext } from './context';
-
 export interface ImportObj {
   type: 'import' | 'default' | 'namespace';
   name: string;
@@ -40,14 +39,19 @@ const makeReactQuerySwitch = (varName: string) => {
 
 export const UTILS = {
   selectorFamily: 'recoil',
-  MsgExecuteContract: 'cosmjs-types/cosmwasm/wasm/v1/tx',
-  MsgExecuteContractEncodeObject: '@cosmjs/cosmwasm-stargate',
-  Coin: '@cosmjs/amino',
-  toUtf8: '@cosmjs/encoding',
-  StdFee: '@cosmjs/amino',
-  CosmWasmClient: '@cosmjs/cosmwasm-stargate',
-  ExecuteResult: '@cosmjs/cosmwasm-stargate',
-  SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+  MsgExecuteContract: 'interchainjs/cosmwasm/wasm/v1/tx',
+  EncodeObject: '@interchainjs/cosmos-types',
+  Coin: '@interchainjs/types',
+  toUtf8: '@interchainjs/encoding',
+  StdFee: '@interchainjs/types',
+  ICosmWasmClient: '__baseClient__',
+
+  ISigningCosmWasmClient: '__baseClient__',
+  getCosmWasmClient: '__baseClient__',
+  getSigningCosmWasmClient: '__baseClient__',
+  IQueryClientProvider: '__contractContextBase__',
+  ISigningClientProvider: '__contractContextBase__',
+  IMessageComposerProvider: '__contractContextBase__',
 
   // react-query
   useQuery: makeReactQuerySwitch('useQuery'),
@@ -56,7 +60,7 @@ export const UTILS = {
   UseMutationOptions: makeReactQuerySwitch('UseMutationOptions'),
 };
 
-export const UTIL_HELPERS = ['__contractContextBase__'];
+export const UTIL_HELPERS = ['__contractContextBase__', '__baseClient__'];
 
 export const convertUtilsToImportList = (
   context: RenderContext,
diff --git a/packages/ast/src/message-composer/message-composer.ts b/packages/ast/src/message-composer/message-composer.ts
index 6e63fe95..bcf7ffbf 100644
--- a/packages/ast/src/message-composer/message-composer.ts
+++ b/packages/ast/src/message-composer/message-composer.ts
@@ -21,7 +21,7 @@ const createWasmExecMethodMessageComposer = (
   jsonschema: any
 ) => {
   context.addUtil('Coin');
-  context.addUtil('MsgExecuteContractEncodeObject');
+  context.addUtil('EncodeObject');
   context.addUtil('MsgExecuteContract');
   context.addUtil('toUtf8');
 
@@ -117,9 +117,7 @@ const createWasmExecMethodMessageComposer = (
         ),
       ]),
       // return type
-      t.tsTypeAnnotation(
-        t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))
-      ),
+      t.tsTypeAnnotation(t.tsTypeReference(t.identifier('EncodeObject'))),
       false
     )
   );
@@ -211,7 +209,7 @@ export const createMessageComposerInterface = (
     return createPropertyFunctionWithObjectParamsForMessageComposer(
       context,
       methodName,
-      'MsgExecuteContractEncodeObject',
+      'EncodeObject',
       jsonschema.properties[underscoreName]
     );
   });
diff --git a/packages/ast/src/provider/provider.ts b/packages/ast/src/provider/provider.ts
index 91c51b71..43425b99 100644
--- a/packages/ast/src/provider/provider.ts
+++ b/packages/ast/src/provider/provider.ts
@@ -224,13 +224,13 @@ export const createGettingProviders = (providerInfos: {
             identifier(
               'cosmWasmClient?',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('CosmWasmClient'))
+                t.tsTypeReference(t.identifier('ICosmWasmClient'))
               )
             ),
             identifier(
               'signingCosmWasmClient?',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                t.tsTypeReference(t.identifier('ISigningCosmWasmClient'))
               )
             ),
           ],
diff --git a/packages/ast/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
index cd6588a5..7b00d057 100644
--- a/packages/ast/src/react-query/react-query.ts
+++ b/packages/ast/src/react-query/react-query.ts
@@ -490,7 +490,7 @@ export const createReactQueryMutationHooks = ({
     // TODO: there should be a better way to do this
     const hasMsg = !!(Object.keys(properties)?.length || jsonschema?.$ref);
 
-    // <ExecuteResult, Error, Cw4UpdateMembersMutation>
+    // <any, Error, Cw4UpdateMembersMutation>
     const useMutationTypeParameter = generateMutationTypeParameter(
       context,
       mutationHookParamsTypeName
@@ -524,11 +524,11 @@ const generateMutationTypeParameter = (
   context: RenderContext,
   mutationHookParamsTypeName: string
 ) => {
-  context.addUtil('ExecuteResult');
+
 
   return t.tsTypeParameterInstantiation([
     // Data
-    t.tSTypeReference(t.identifier('ExecuteResult')),
+    t.tSTypeReference(t.identifier('any')),
     // Error
     t.tsTypeReference(t.identifier('Error')),
     // Variables
@@ -550,7 +550,7 @@ interface ReactQueryMutationHook {
  * Example:
 ```
 export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateMembersMutation, 'args'>) =>
-  useMutation<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>(
+  useMutation<DeliverTxResponse, Error, Pick<Cw4UpdateMembersMutation, 'args'>>(
     ({ args }) => client.updateMembers(args),
     options
   )
diff --git a/packages/ast/src/utils/babel.ts b/packages/ast/src/utils/babel.ts
index 097eadbe..053b95fb 100644
--- a/packages/ast/src/utils/babel.ts
+++ b/packages/ast/src/utils/babel.ts
@@ -266,7 +266,7 @@ export const importAs = (
 };
 
 export const importAminoMsg = (): t.ImportDeclaration => {
-  return importStmt(['AminoMsg'], '@cosmjs/amino');
+  return importStmt(['AminoMsg'], '@interchainjs/amino');
 };
 
 export const getFieldDimensionality = (field: Field) => {
diff --git a/packages/ts-codegen/README.md b/packages/ts-codegen/README.md
index a59212fa..de480ad5 100644
--- a/packages/ts-codegen/README.md
+++ b/packages/ts-codegen/README.md
@@ -126,6 +126,44 @@ Typescript types and interfaces are generated in separate files so they can be i
 | `types.aliasExecuteMsg`  | generate a type alias based on the contract name                      |
 | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name |
 
+### BaseClient
+The `baseClient.ts` will be generated as dependency for most files. It includes the base client for interchainjs.
+
+#### Gas Configuration
+
+The generated client provides flexible gas fee configuration options to handle different blockchain networks and fee settings.
+
+##### Default Gas Settings
+
+By default, the client uses a gas limit of `200000` for all transactions. You can customize this behavior through the `setDefaultGasAmount`.
+
+##### ChainConfig Options
+
+The `ChainConfig` interface supports two approaches for gas configuration:
+
+1. Chain Registry Integration (Recommended)
+
+When you provide chain information, the client automatically fetches gas prices from the chain registry:
+
+```typescript
+import { useChain } from '@interchain-kit/react';
+
+const { chain } = useChain('osmosistestnet');
+const chainConfig: ChainConfig = { chain: chain };
+```
+
+2. Manual Gas Price Configuration
+You can explicitly set gas prices for more control:
+
+```typescript
+const chainConfig: ChainConfig = {
+  gasPrice: {
+    denom: 'uosmo',
+    amount: '0.025'
+  }
+};
+```
+
 ### Client
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
@@ -173,7 +211,7 @@ Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `r
 
 ### Message Composer
 
-Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
+Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `interchainjs` with the `message-composer` command.
 
 [see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 
diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
index 517f6db3..1c213f22 100644
--- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
+++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap
@@ -420,11 +420,13 @@ TSBuilder {
         "useShorthandCtor": true,
       },
       "utils": {
-        "CosmWasmClient": "@cosmjs/cosmwasm-stargate",
+        "ICosmWasmClient": "__baseClient__",
         "IMessageComposerProvider": "__contractContextBase__",
         "IQueryClientProvider": "__contractContextBase__",
         "ISigningClientProvider": "__contractContextBase__",
-        "SigningCosmWasmClient": "@cosmjs/cosmwasm-stargate",
+        "ISigningCosmWasmClient": "__baseClient__",
+        "getCosmWasmClient": "__baseClient__",
+        "getSigningCosmWasmClient": "__baseClient__",
       },
     },
   ],
@@ -851,11 +853,13 @@ TSBuilder {
         "useShorthandCtor": true,
       },
       "utils": {
-        "CosmWasmClient": "@cosmjs/cosmwasm-stargate",
+        "ICosmWasmClient": "__baseClient__",
         "IMessageComposerProvider": "__contractContextBase__",
         "IQueryClientProvider": "__contractContextBase__",
         "ISigningClientProvider": "__contractContextBase__",
-        "SigningCosmWasmClient": "@cosmjs/cosmwasm-stargate",
+        "ISigningCosmWasmClient": "__baseClient__",
+        "getCosmWasmClient": "__baseClient__",
+        "getSigningCosmWasmClient": "__baseClient__",
       },
     },
   ],
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 4131528d..789b5887 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -36,15 +36,18 @@
   "bugs": {
     "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
-  "devDependencies": {
-    "@cosmjs/cosmwasm-stargate": "0.32.3"
-  },
   "dependencies": {
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.9.0",
-    "@cosmwasm/ts-codegen-types": "^1.4.0",
+    "@chain-registry/types": "^0.17.1",
+    "@chain-registry/utils": "^1.51.71",
+    "@chain-registry/v2": "^1.71.229",
+    "@cosmwasm/ts-codegen-ast": "^1.8.1",
+    "@cosmwasm/ts-codegen-types": "^1.3.1",
+    "@interchainjs/amino": "1.17.1",
+    "@interchainjs/cosmos": "1.17.1",
+    "@interchainjs/types": "1.17.1",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
@@ -54,6 +57,8 @@
     "fuzzy": "0.1.3",
     "glob": "^10",
     "inquirerer": "0.1.3",
+    "interchainjs": "1.17.1",
+    "minimatch": "^10.0.3",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "nested-obj": "0.0.1",
diff --git a/packages/ts-codegen/src/helpers/baseClient.ts b/packages/ts-codegen/src/helpers/baseClient.ts
new file mode 100644
index 00000000..4de79940
--- /dev/null
+++ b/packages/ts-codegen/src/helpers/baseClient.ts
@@ -0,0 +1,184 @@
+export const baseClient = `
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
+`;
diff --git a/packages/ts-codegen/src/helpers/contractContextBase.ts b/packages/ts-codegen/src/helpers/contractContextBase.ts
index 8a575845..09e7ce03 100644
--- a/packages/ts-codegen/src/helpers/contractContextBase.ts
+++ b/packages/ts-codegen/src/helpers/contractContextBase.ts
@@ -1,13 +1,15 @@
 export const contractContextBase = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -49,15 +51,15 @@ export class ContractBase<
 > {
 
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
   TSign?: new (
-    client: SigningCosmWasmClient,
+    client: ISigningCosmWasmClient,
     sender: string,
     contractAddress: string
   ) => TSign;
   TQuery?: new (
-    client: CosmWasmClient,
+    client: ICosmWasmClient,
     contractAddress: string
   ) => TQuery;
   TMsgComposer?: new (
@@ -67,15 +69,15 @@ export class ContractBase<
 
   constructor(
     address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    cosmWasmClient: ICosmWasmClient | undefined,
+    signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     TMsgComposer?: new (
diff --git a/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts b/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts
index 844aeadc..56efad2f 100644
--- a/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts
+++ b/packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts
@@ -1,13 +1,15 @@
 export const contractContextBaseShortHandCtor = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -49,15 +51,15 @@ export class ContractBase<
 > {
   constructor(
     protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    protected cosmWasmClient: ICosmWasmClient | undefined,
+    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     private TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     private TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     private TMsgComposer?: new (
diff --git a/packages/ts-codegen/src/helpers/contractsContextTSX.ts b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
index a247f243..ed405681 100644
--- a/packages/ts-codegen/src/helpers/contractsContextTSX.ts
+++ b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
@@ -1,16 +1,16 @@
 export const contractsContextTSX = `
 import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+} from './baseClient';
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
 export interface ContractsConfig {
   address: string | undefined;
-  getCosmWasmClient: () => Promise<CosmWasmClient>;
-  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+  getCosmWasmClient: () => Promise<ICosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;
 }
 
 const ContractsContext = React.createContext<IContractsContext | null>(null);
@@ -22,9 +22,9 @@ export const ContractsProvider = ({
   children: React.ReactNode;
   contractsConfig: ContractsConfig;
 }) => {
-  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();
   const [signingCosmWasmClient, setSigningCosmWasmClient] =
-    useState<SigningCosmWasmClient>();
+    useState<ISigningCosmWasmClient>();
 
   const { address, getCosmWasmClient, getSigningCosmWasmClient } =
     contractsConfig;
diff --git a/packages/ts-codegen/src/helpers/create-helpers.ts b/packages/ts-codegen/src/helpers/create-helpers.ts
index 1e7e9fe8..4db9e8db 100644
--- a/packages/ts-codegen/src/helpers/create-helpers.ts
+++ b/packages/ts-codegen/src/helpers/create-helpers.ts
@@ -7,6 +7,7 @@ import {
   contractContextBase,
   contractContextBaseShortHandCtor,
   contractsContextTSX,
+  baseClient,
 } from '../helpers';
 import { writeContentToFile } from '../utils/files';
 import { header } from '../utils/header';
@@ -36,6 +37,9 @@ export const createHelpers = (
 ): BuilderFile[] => {
   const files: BuilderFile[] = [];
 
+  // Always generate baseClient.ts since InterchainJS interfaces are needed by all clients
+  files.push(write(input.outPath, 'baseClient.ts', baseClient));
+
   if (
     input.options?.useContractsHook?.enabled &&
     Object.keys(builderContext.providers)?.length
diff --git a/packages/ts-codegen/src/helpers/index.ts b/packages/ts-codegen/src/helpers/index.ts
index de7142d8..87878c72 100644
--- a/packages/ts-codegen/src/helpers/index.ts
+++ b/packages/ts-codegen/src/helpers/index.ts
@@ -1,3 +1,4 @@
 export * from './contractContextBase';
 export * from './contractContextBaseShortHandCtor';
+export * from './baseClient';
 export * from './contractsContextTSX';
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 00f5c127..ac80e75b 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -19,8 +19,10 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
     this.defaultContractName = 'contractContextProviders';
 
     this.utils = {
-      CosmWasmClient: '@cosmjs/cosmwasm-stargate',
-      SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+      ICosmWasmClient: '__baseClient__',
+      ISigningCosmWasmClient: '__baseClient__',
+      getCosmWasmClient: '__baseClient__',
+      getSigningCosmWasmClient: '__baseClient__',
       IQueryClientProvider: '__contractContextBase__',
       ISigningClientProvider: '__contractContextBase__',
       IMessageComposerProvider: '__contractContextBase__',
@@ -59,8 +61,10 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
 
     const body = [];
 
-    context.addUtil('CosmWasmClient');
-    context.addUtil('SigningCosmWasmClient');
+    context.addUtil('ICosmWasmClient');
+    context.addUtil('ISigningCosmWasmClient');
+    context.addUtil('getCosmWasmClient');
+    context.addUtil('getSigningCosmWasmClient');
 
     context.addUtil('IQueryClientProvider');
     context.addUtil('ISigningClientProvider');
diff --git a/packages/types/package.json b/packages/types/package.json
index 11ecda26..c1085b93 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -29,5 +29,8 @@
   "keywords": [],
   "bugs": {
     "url": "https://github.com/hyperweb-io/ts-codegen/issues"
+  },
+  "dependencies": {
+    "minimatch": "^10.0.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 1d20b8a1..c8427f2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,25 +20,25 @@
     picocolors "^1.1.1"
 
 "@babel/compat-data@^7.27.2":
-  version "7.27.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.5.tgz#7d0658ec1a8420fc866d1df1b03bea0e79934c82"
-  integrity sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.0.tgz#9fc6fd58c2a6a15243cd13983224968392070790"
+  integrity sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==
 
 "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
-  version "7.27.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.4.tgz#cc1fc55d0ce140a1828d1dd2a2eba285adbfb3ce"
-  integrity sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.0.tgz#55dad808d5bf3445a108eefc88ea3fdf034749a4"
+  integrity sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.27.3"
+    "@babel/generator" "^7.28.0"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-module-transforms" "^7.27.3"
-    "@babel/helpers" "^7.27.4"
-    "@babel/parser" "^7.27.4"
+    "@babel/helpers" "^7.27.6"
+    "@babel/parser" "^7.28.0"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.27.4"
-    "@babel/types" "^7.27.3"
+    "@babel/traverse" "^7.28.0"
+    "@babel/types" "^7.28.0"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -55,15 +55,15 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.24.1", "@babel/generator@^7.27.3", "@babel/generator@^7.7.2":
-  version "7.27.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.5.tgz#3eb01866b345ba261b04911020cbe22dd4be8c8c"
-  integrity sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==
+"@babel/generator@^7.24.1", "@babel/generator@^7.28.0", "@babel/generator@^7.7.2":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.0.tgz#9cc2f7bd6eb054d77dc66c2664148a0c5118acd2"
+  integrity sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==
   dependencies:
-    "@babel/parser" "^7.27.5"
-    "@babel/types" "^7.27.3"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
+    "@babel/parser" "^7.28.0"
+    "@babel/types" "^7.28.0"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
 "@babel/helper-compilation-targets@^7.27.2":
@@ -92,6 +92,11 @@
     "@babel/template" "^7.24.7"
     "@babel/types" "^7.24.7"
 
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
@@ -143,20 +148,20 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
   integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
-"@babel/helpers@^7.27.4":
-  version "7.27.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.6.tgz#6456fed15b2cb669d2d1fabe84b66b34991d812c"
-  integrity sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==
+"@babel/helpers@^7.27.6":
+  version "7.28.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.2.tgz#80f0918fecbfebea9af856c419763230040ee850"
+  integrity sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==
   dependencies:
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.6"
+    "@babel/types" "^7.28.2"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.1", "@babel/parser@^7.27.2", "@babel/parser@^7.27.4", "@babel/parser@^7.27.5":
-  version "7.27.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.5.tgz#ed22f871f110aa285a6fd934a0efed621d118826"
-  integrity sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.1", "@babel/parser@^7.27.2", "@babel/parser@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.0.tgz#979829fbab51a29e13901e5a80713dbcb840825e"
+  integrity sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==
   dependencies:
-    "@babel/types" "^7.27.3"
+    "@babel/types" "^7.28.0"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -277,6 +282,11 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
+"@babel/runtime@^7.21.0":
+  version "7.28.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.2.tgz#2ae5a9d51cc583bd1f5673b3bb70d6d819682473"
+  integrity sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==
+
 "@babel/template@^7.24.7", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
@@ -302,18 +312,18 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.27.4":
-  version "7.27.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.4.tgz#b0045ac7023c8472c3d35effd7cc9ebd638da6ea"
-  integrity sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
+  integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.27.3"
-    "@babel/parser" "^7.27.4"
+    "@babel/generator" "^7.28.0"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.0"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.3"
+    "@babel/types" "^7.28.0"
     debug "^4.3.1"
-    globals "^11.1.0"
 
 "@babel/types@7.24.0":
   version "7.24.0"
@@ -324,10 +334,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.27.6", "@babel/types@^7.3.3":
-  version "7.27.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.6.tgz#a434ca7add514d4e646c80f7375c0aa2befc5535"
-  integrity sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.28.0", "@babel/types@^7.28.2", "@babel/types@^7.3.3":
+  version "7.28.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.2.tgz#da9db0856a9a88e0a13b019881d7513588cf712b"
+  integrity sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
@@ -337,267 +347,168 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@confio/ics23@^0.6.8":
-  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/@confio/ics23/-/ics23-0.6.8.tgz#2a6b4f1f2b7b20a35d9a0745bb5a446e72930b3d"
-  integrity sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==
-  dependencies:
-    "@noble/hashes" "^1.0.0"
-    protobufjs "^6.8.8"
-
-"@cosmjs/amino@^0.32.3", "@cosmjs/amino@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.4.tgz#3908946c0394e6d431694c8992c5147079a1c860"
-  integrity sha512-zKYOt6hPy8obIFtLie/xtygCkH9ZROiQ12UHfKsOkWaZfPQUvVbtgmu6R4Kn1tFLI/SRkw7eqhaogmW/3NYu/Q==
-  dependencies:
-    "@cosmjs/crypto" "^0.32.4"
-    "@cosmjs/encoding" "^0.32.4"
-    "@cosmjs/math" "^0.32.4"
-    "@cosmjs/utils" "^0.32.4"
-
-"@cosmjs/cosmwasm-stargate@0.32.3":
-  version "0.32.3"
-  resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.32.3.tgz#26a110a6bb0c15fdeef647e3433bd9553a1acd5f"
-  integrity sha512-pqkt+QsLIPNMTRh9m+igJgIpzXXgn1BxmxfAb9zlC23kvsuzY/12un9M7iAdim1NwKXDFeYw46xC2YkprwQp+g==
-  dependencies:
-    "@cosmjs/amino" "^0.32.3"
-    "@cosmjs/crypto" "^0.32.3"
-    "@cosmjs/encoding" "^0.32.3"
-    "@cosmjs/math" "^0.32.3"
-    "@cosmjs/proto-signing" "^0.32.3"
-    "@cosmjs/stargate" "^0.32.3"
-    "@cosmjs/tendermint-rpc" "^0.32.3"
-    "@cosmjs/utils" "^0.32.3"
-    cosmjs-types "^0.9.0"
-    pako "^2.0.2"
-
-"@cosmjs/crypto@^0.32.3", "@cosmjs/crypto@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.4.tgz#5d29633b661eaf092ddb3e7ea6299cfd6f4507a2"
-  integrity sha512-zicjGU051LF1V9v7bp8p7ovq+VyC91xlaHdsFOTo2oVry3KQikp8L/81RkXmUIT8FxMwdx1T7DmFwVQikcSDIw==
-  dependencies:
-    "@cosmjs/encoding" "^0.32.4"
-    "@cosmjs/math" "^0.32.4"
-    "@cosmjs/utils" "^0.32.4"
-    "@noble/hashes" "^1"
-    bn.js "^5.2.0"
-    elliptic "^6.5.4"
-    libsodium-wrappers-sumo "^0.7.11"
-
-"@cosmjs/encoding@^0.32.3", "@cosmjs/encoding@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.4.tgz#646e0e809f7f4f1414d8fa991fb0ffe6c633aede"
-  integrity sha512-tjvaEy6ZGxJchiizzTn7HVRiyTg1i4CObRRaTRPknm5EalE13SV+TCHq38gIDfyUeden4fCuaBVEdBR5+ti7Hw==
-  dependencies:
-    base64-js "^1.3.0"
-    bech32 "^1.1.4"
-    readonly-date "^1.0.0"
-
-"@cosmjs/json-rpc@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.4.tgz#be91eb89ea78bd5dc02d0a9fa184dd6790790f0b"
-  integrity sha512-/jt4mBl7nYzfJ2J/VJ+r19c92mUKF0Lt0JxM3MXEJl7wlwW5haHAWtzRujHkyYMXOwIR+gBqT2S0vntXVBRyhQ==
-  dependencies:
-    "@cosmjs/stream" "^0.32.4"
-    xstream "^11.14.0"
-
-"@cosmjs/math@^0.32.3", "@cosmjs/math@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.4.tgz#87ac9eadc06696e30a30bdb562a495974bfd0a1a"
-  integrity sha512-++dqq2TJkoB8zsPVYCvrt88oJWsy1vMOuSOKcdlnXuOA/ASheTJuYy4+oZlTQ3Fr8eALDLGGPhJI02W2HyAQaw==
-  dependencies:
-    bn.js "^5.2.0"
-
-"@cosmjs/proto-signing@^0.32.3", "@cosmjs/proto-signing@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.4.tgz#5a06e087c6d677439c8c9b25b5223d5e72c4cd93"
-  integrity sha512-QdyQDbezvdRI4xxSlyM1rSVBO2st5sqtbEIl3IX03uJ7YiZIQHyv6vaHVf1V4mapusCqguiHJzm4N4gsFdLBbQ==
-  dependencies:
-    "@cosmjs/amino" "^0.32.4"
-    "@cosmjs/crypto" "^0.32.4"
-    "@cosmjs/encoding" "^0.32.4"
-    "@cosmjs/math" "^0.32.4"
-    "@cosmjs/utils" "^0.32.4"
-    cosmjs-types "^0.9.0"
-
-"@cosmjs/socket@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.4.tgz#86ab6adf3a442314774c0810b7a7cfcddf4f2082"
-  integrity sha512-davcyYziBhkzfXQTu1l5NrpDYv0K9GekZCC9apBRvL1dvMc9F/ygM7iemHjUA+z8tJkxKxrt/YPjJ6XNHzLrkw==
-  dependencies:
-    "@cosmjs/stream" "^0.32.4"
-    isomorphic-ws "^4.0.1"
-    ws "^7"
-    xstream "^11.14.0"
-
-"@cosmjs/stargate@^0.32.3":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.4.tgz#bd0e4d3bf613b629addbf5f875d3d3b50f640af1"
-  integrity sha512-usj08LxBSsPRq9sbpCeVdyLx2guEcOHfJS9mHGCLCXpdAPEIEQEtWLDpEUc0LEhWOx6+k/ChXTc5NpFkdrtGUQ==
-  dependencies:
-    "@confio/ics23" "^0.6.8"
-    "@cosmjs/amino" "^0.32.4"
-    "@cosmjs/encoding" "^0.32.4"
-    "@cosmjs/math" "^0.32.4"
-    "@cosmjs/proto-signing" "^0.32.4"
-    "@cosmjs/stream" "^0.32.4"
-    "@cosmjs/tendermint-rpc" "^0.32.4"
-    "@cosmjs/utils" "^0.32.4"
-    cosmjs-types "^0.9.0"
-    xstream "^11.14.0"
-
-"@cosmjs/stream@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.4.tgz#83e1f2285807467c56d9ea0e1113f79d9fa63802"
-  integrity sha512-Gih++NYHEiP+oyD4jNEUxU9antoC0pFSg+33Hpp0JlHwH0wXhtD3OOKnzSfDB7OIoEbrzLJUpEjOgpCp5Z+W3A==
-  dependencies:
-    xstream "^11.14.0"
-
-"@cosmjs/tendermint-rpc@^0.32.3", "@cosmjs/tendermint-rpc@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.4.tgz#b36f9ec657498e42c97e21bb7368798ef6279752"
-  integrity sha512-MWvUUno+4bCb/LmlMIErLypXxy7ckUuzEmpufYYYd9wgbdCXaTaO08SZzyFM5PI8UJ/0S2AmUrgWhldlbxO8mw==
-  dependencies:
-    "@cosmjs/crypto" "^0.32.4"
-    "@cosmjs/encoding" "^0.32.4"
-    "@cosmjs/json-rpc" "^0.32.4"
-    "@cosmjs/math" "^0.32.4"
-    "@cosmjs/socket" "^0.32.4"
-    "@cosmjs/stream" "^0.32.4"
-    "@cosmjs/utils" "^0.32.4"
-    axios "^1.6.0"
-    readonly-date "^1.0.0"
-    xstream "^11.14.0"
-
-"@cosmjs/utils@^0.32.3", "@cosmjs/utils@^0.32.4":
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.4.tgz#a9a717c9fd7b1984d9cefdd0ef6c6f254060c671"
-  integrity sha512-D1Yc+Zy8oL/hkUkFUL/bwxvuDBzRGpc4cF7/SkdhxX4iHpSLgdOuTt1mhCh9+kl6NQREy9t7SYZ6xeW5gFe60w==
-
-"@esbuild/aix-ppc64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz#4e0f91776c2b340e75558f60552195f6fad09f18"
-  integrity sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==
-
-"@esbuild/android-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz#bc766407f1718923f6b8079c8c61bf86ac3a6a4f"
-  integrity sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==
-
-"@esbuild/android-arm@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.5.tgz#4290d6d3407bae3883ad2cded1081a234473ce26"
-  integrity sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==
-
-"@esbuild/android-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.5.tgz#40c11d9cbca4f2406548c8a9895d321bc3b35eff"
-  integrity sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==
-
-"@esbuild/darwin-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz#49d8bf8b1df95f759ac81eb1d0736018006d7e34"
-  integrity sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==
-
-"@esbuild/darwin-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz#e27a5d92a14886ef1d492fd50fc61a2d4d87e418"
-  integrity sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==
-
-"@esbuild/freebsd-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz#97cede59d638840ca104e605cdb9f1b118ba0b1c"
-  integrity sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==
-
-"@esbuild/freebsd-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz#71c77812042a1a8190c3d581e140d15b876b9c6f"
-  integrity sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==
-
-"@esbuild/linux-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz#f7b7c8f97eff8ffd2e47f6c67eb5c9765f2181b8"
-  integrity sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==
-
-"@esbuild/linux-arm@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz#2a0be71b6cd8201fa559aea45598dffabc05d911"
-  integrity sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==
-
-"@esbuild/linux-ia32@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz#763414463cd9ea6fa1f96555d2762f9f84c61783"
-  integrity sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==
-
-"@esbuild/linux-loong64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz#428cf2213ff786a502a52c96cf29d1fcf1eb8506"
-  integrity sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==
-
-"@esbuild/linux-mips64el@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz#5cbcc7fd841b4cd53358afd33527cd394e325d96"
-  integrity sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==
-
-"@esbuild/linux-ppc64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz#0d954ab39ce4f5e50f00c4f8c4fd38f976c13ad9"
-  integrity sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==
-
-"@esbuild/linux-riscv64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz#0e7dd30730505abd8088321e8497e94b547bfb1e"
-  integrity sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==
-
-"@esbuild/linux-s390x@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz#5669af81327a398a336d7e40e320b5bbd6e6e72d"
-  integrity sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==
-
-"@esbuild/linux-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz#b2357dd153aa49038967ddc1ffd90c68a9d2a0d4"
-  integrity sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==
-
-"@esbuild/netbsd-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz#53b4dfb8fe1cee93777c9e366893bd3daa6ba63d"
-  integrity sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==
-
-"@esbuild/netbsd-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz#a0206f6314ce7dc8713b7732703d0f58de1d1e79"
-  integrity sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==
-
-"@esbuild/openbsd-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz#2a796c87c44e8de78001d808c77d948a21ec22fd"
-  integrity sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==
-
-"@esbuild/openbsd-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz#28d0cd8909b7fa3953af998f2b2ed34f576728f0"
-  integrity sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==
-
-"@esbuild/sunos-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz#a28164f5b997e8247d407e36c90d3fd5ddbe0dc5"
-  integrity sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==
-
-"@esbuild/win32-arm64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz#6eadbead38e8bd12f633a5190e45eff80e24007e"
-  integrity sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==
-
-"@esbuild/win32-ia32@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz#bab6288005482f9ed2adb9ded7e88eba9a62cc0d"
-  integrity sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==
-
-"@esbuild/win32-x64@0.25.5":
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz#7fc114af5f6563f19f73324b5d5ff36ece0803d1"
-  integrity sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==
+"@chain-registry/types@^0.17.1":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@chain-registry/types/-/types-0.17.1.tgz#0ac7bda6178d3917834578627f232a247fe5def8"
+  integrity sha512-O0CgrtJgIlqXvZm1CqDZe/7jZz068O/uuCIoyDXCegFHK03rdHacKcDGwEIUuI0MNUf8YV3jdE4xHQMSAX+79w==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
+
+"@chain-registry/types@^0.50.188":
+  version "0.50.188"
+  resolved "https://registry.yarnpkg.com/@chain-registry/types/-/types-0.50.188.tgz#c453e55a3d4c882d2dd2f9a2abecdada39a4f1a6"
+  integrity sha512-IK2MpVi6u0RzYWEg+2q2/1MlhQNSfwOd+cdyIdIo8nFjyTzlhd/9d+x3QOqQBgMhvtEVwCDIDQDoZ7AEgr8+MQ==
+
+"@chain-registry/utils@^1.51.71":
+  version "1.51.188"
+  resolved "https://registry.yarnpkg.com/@chain-registry/utils/-/utils-1.51.188.tgz#de08fc76997f799a8f4a9250938ae715bc12c40f"
+  integrity sha512-Pr6Yinyua3w27qsQJ4Kw8v6C5W4+TKnrthYUdd/uFMrrs9va9PHr6jyMNR22R/TWREcxVZ+wQSOlFIYSGrpsJA==
+  dependencies:
+    "@chain-registry/types" "^0.50.188"
+    bignumber.js "9.1.2"
+    sha.js "^2.4.11"
+
+"@chain-registry/v2-types@^0.53.146":
+  version "0.53.146"
+  resolved "https://registry.yarnpkg.com/@chain-registry/v2-types/-/v2-types-0.53.146.tgz#b8865f588d8fc19c30f76eacbf0593e73821c88e"
+  integrity sha512-GnqdNnEJ+ZTAc/0S9fQbwL5GpIvF3LZ/P3o6qh6EyITSiRA1Y55FXs59eSddltpPX5EgyWDwNpJjY+Q5uYlAkA==
+
+"@chain-registry/v2@^1.71.229":
+  version "1.71.237"
+  resolved "https://registry.yarnpkg.com/@chain-registry/v2/-/v2-1.71.237.tgz#2ff01b4b667c82f1edad5b17a22108156acba941"
+  integrity sha512-c10uXxFz1+51VR0szeB1phn482O03uJiSQ+mZXpeq7IBtU2Hst6Vj1Ttjbx+nlxekhoSGG1jZ0JQ1ewXWYQ6IA==
+  dependencies:
+    "@chain-registry/v2-types" "^0.53.146"
+
+"@esbuild/aix-ppc64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz#a1414903bb38027382f85f03dda6065056757727"
+  integrity sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==
+
+"@esbuild/android-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz#c859994089e9767224269884061f89dae6fb51c6"
+  integrity sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==
+
+"@esbuild/android-arm@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.8.tgz#96a8f2ca91c6cd29ea90b1af79d83761c8ba0059"
+  integrity sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==
+
+"@esbuild/android-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.8.tgz#a3a626c4fec4a024a9fa8c7679c39996e92916f0"
+  integrity sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==
+
+"@esbuild/darwin-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz#a5e1252ca2983d566af1c0ea39aded65736fc66d"
+  integrity sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==
+
+"@esbuild/darwin-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz#5271b0df2bb12ce8df886704bfdd1c7cc01385d2"
+  integrity sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==
+
+"@esbuild/freebsd-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz#d0a0e7fdf19733b8bb1566b81df1aa0bb7e46ada"
+  integrity sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==
+
+"@esbuild/freebsd-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz#2de8b2e0899d08f1cb1ef3128e159616e7e85343"
+  integrity sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==
+
+"@esbuild/linux-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz#a4209efadc0c2975716458484a4e90c237c48ae9"
+  integrity sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==
+
+"@esbuild/linux-arm@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz#ccd9e291c24cd8d9142d819d463e2e7200d25b19"
+  integrity sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==
+
+"@esbuild/linux-ia32@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz#006ad1536d0c2b28fb3a1cf0b53bcb85aaf92c4d"
+  integrity sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==
+
+"@esbuild/linux-loong64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz#127b3fbfb2c2e08b1397e985932f718f09a8f5c4"
+  integrity sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==
+
+"@esbuild/linux-mips64el@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz#837d1449517791e3fa7d82675a2d06d9f56cb340"
+  integrity sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==
+
+"@esbuild/linux-ppc64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz#aa2e3bd93ab8df084212f1895ca4b03c42d9e0fe"
+  integrity sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==
+
+"@esbuild/linux-riscv64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz#a340620e31093fef72767dd28ab04214b3442083"
+  integrity sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==
+
+"@esbuild/linux-s390x@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz#ddfed266c8c13f5efb3105a0cd47f6dcd0e79e71"
+  integrity sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==
+
+"@esbuild/linux-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz#9a4f78c75c051e8c060183ebb39a269ba936a2ac"
+  integrity sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==
+
+"@esbuild/netbsd-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz#902c80e1d678047926387230bc037e63e00697d0"
+  integrity sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==
+
+"@esbuild/netbsd-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz#2d9eb4692add2681ff05a14ce99de54fbed7079c"
+  integrity sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==
+
+"@esbuild/openbsd-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz#89c3b998c6de739db38ab7fb71a8a76b3fa84a45"
+  integrity sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==
+
+"@esbuild/openbsd-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz#2f01615cf472b0e48c077045cfd96b5c149365cc"
+  integrity sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==
+
+"@esbuild/openharmony-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz#a201f720cd2c3ebf9a6033fcc3feb069a54b509a"
+  integrity sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==
+
+"@esbuild/sunos-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz#07046c977985a3334667f19e6ab3a01a80862afb"
+  integrity sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==
+
+"@esbuild/win32-arm64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz#4a5470caf0d16127c05d4833d4934213c69392d1"
+  integrity sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==
+
+"@esbuild/win32-ia32@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz#3de3e8470b7b328d99dbc3e9ec1eace207e5bbc4"
+  integrity sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==
+
+"@esbuild/win32-x64@0.25.8":
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz#610d7ea539d2fcdbe39237b5cc175eb2c4451f9c"
+  integrity sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.7.0":
   version "4.7.0"
@@ -625,14 +536,7 @@
   resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.3.0.tgz#3e09a90dfb87e0005c7694791e58e97077271286"
   integrity sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==
 
-"@eslint/core@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.14.0.tgz#326289380968eaf7e96f364e1e4cf8f3adf2d003"
-  integrity sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==
-  dependencies:
-    "@types/json-schema" "^7.0.15"
-
-"@eslint/core@^0.15.1":
+"@eslint/core@^0.15.0", "@eslint/core@^0.15.1":
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.15.1.tgz#d530d44209cbfe2f82ef86d6ba08760196dd3b60"
   integrity sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==
@@ -654,24 +558,186 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.30.0":
-  version "9.30.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.30.0.tgz#c396fa450d5505dd9b7b8846b33f0491aebd9a2d"
-  integrity sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==
+"@eslint/js@9.32.0":
+  version "9.32.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.32.0.tgz#a02916f58bd587ea276876cb051b579a3d75d091"
+  integrity sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==
 
 "@eslint/object-schema@^2.1.6":
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.6.tgz#58369ab5b5b3ca117880c0f6c0b0f32f6950f24f"
   integrity sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==
 
-"@eslint/plugin-kit@^0.3.1":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz#32926b59bd407d58d817941e48b2a7049359b1fd"
-  integrity sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==
+"@eslint/plugin-kit@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz#c6b9f165e94bf4d9fdd493f1c028a94aaf5fc1cc"
+  integrity sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==
   dependencies:
     "@eslint/core" "^0.15.1"
     levn "^0.4.1"
 
+"@ethersproject/abstract-provider@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.8.0.tgz#7581f9be601afa1d02b95d26b9d9840926a35b0c"
+  integrity sha512-wC9SFcmh4UK0oKuLJQItoQdzS/qZ51EJegK6EmAWlh+OptpQ/npECOR3QqECd8iGHC0RJb4WKbVdSfif4ammrg==
+  dependencies:
+    "@ethersproject/bignumber" "^5.8.0"
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/networks" "^5.8.0"
+    "@ethersproject/properties" "^5.8.0"
+    "@ethersproject/transactions" "^5.8.0"
+    "@ethersproject/web" "^5.8.0"
+
+"@ethersproject/abstract-signer@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.8.0.tgz#8d7417e95e4094c1797a9762e6789c7356db0754"
+  integrity sha512-N0XhZTswXcmIZQdYtUnd79VJzvEwXQw6PK0dTl9VoYrEBxxCPXqS0Eod7q5TNKRxe1/5WUMuR0u0nqTF/avdCA==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.8.0"
+    "@ethersproject/bignumber" "^5.8.0"
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/properties" "^5.8.0"
+
+"@ethersproject/address@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.8.0.tgz#3007a2c352eee566ad745dca1dbbebdb50a6a983"
+  integrity sha512-GhH/abcC46LJwshoN+uBNoKVFPxUuZm6dA257z0vZkKmU1+t8xTn8oK7B9qrj8W2rFRMch4gbJl6PmVxjxBEBA==
+  dependencies:
+    "@ethersproject/bignumber" "^5.8.0"
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/keccak256" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/rlp" "^5.8.0"
+
+"@ethersproject/base64@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.8.0.tgz#61c669c648f6e6aad002c228465d52ac93ee83eb"
+  integrity sha512-lN0oIwfkYj9LbPx4xEkie6rAMJtySbpOAFXSDVQaBnAzYfB4X2Qr+FXJGxMoc3Bxp2Sm8OwvzMrywxyw0gLjIQ==
+  dependencies:
+    "@ethersproject/bytes" "^5.8.0"
+
+"@ethersproject/bignumber@^5.7.0", "@ethersproject/bignumber@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.8.0.tgz#c381d178f9eeb370923d389284efa19f69efa5d7"
+  integrity sha512-ZyaT24bHaSeJon2tGPKIiHszWjD/54Sz8t57Toch475lCLljC6MgPmxk7Gtzz+ddNN5LuHea9qhAe0x3D+uYPA==
+  dependencies:
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    bn.js "^5.2.1"
+
+"@ethersproject/bytes@^5.7.0", "@ethersproject/bytes@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.8.0.tgz#9074820e1cac7507a34372cadeb035461463be34"
+  integrity sha512-vTkeohgJVCPVHu5c25XWaWQOZ4v+DkGoC42/TS2ond+PARCxTJvgTFUNDZovyQ/uAQ4EcpqqowKydcdmRKjg7A==
+  dependencies:
+    "@ethersproject/logger" "^5.8.0"
+
+"@ethersproject/constants@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.8.0.tgz#12f31c2f4317b113a4c19de94e50933648c90704"
+  integrity sha512-wigX4lrf5Vu+axVTIvNsuL6YrV4O5AXl5ubcURKMEME5TnWBouUh0CDTWxZ2GpnRn1kcCgE7l8O5+VbV9QTTcg==
+  dependencies:
+    "@ethersproject/bignumber" "^5.8.0"
+
+"@ethersproject/hash@^5.7.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.8.0.tgz#b8893d4629b7f8462a90102572f8cd65a0192b4c"
+  integrity sha512-ac/lBcTbEWW/VGJij0CNSw/wPcw9bSRgCB0AIBz8CvED/jfvDoV9hsIIiWfvWmFEi8RcXtlNwp2jv6ozWOsooA==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.8.0"
+    "@ethersproject/address" "^5.8.0"
+    "@ethersproject/base64" "^5.8.0"
+    "@ethersproject/bignumber" "^5.8.0"
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/keccak256" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/properties" "^5.8.0"
+    "@ethersproject/strings" "^5.8.0"
+
+"@ethersproject/keccak256@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.8.0.tgz#d2123a379567faf2d75d2aaea074ffd4df349e6a"
+  integrity sha512-A1pkKLZSz8pDaQ1ftutZoaN46I6+jvuqugx5KYNeQOPqq+JZ0Txm7dlWesCHB5cndJSu5vP2VKptKf7cksERng==
+  dependencies:
+    "@ethersproject/bytes" "^5.8.0"
+    js-sha3 "0.8.0"
+
+"@ethersproject/logger@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.8.0.tgz#f0232968a4f87d29623a0481690a2732662713d6"
+  integrity sha512-Qe6knGmY+zPPWTC+wQrpitodgBfH7XoceCGL5bJVejmH+yCS3R8jJm8iiWuvWbG76RUmyEG53oqv6GMVWqunjA==
+
+"@ethersproject/networks@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.8.0.tgz#8b4517a3139380cba9fb00b63ffad0a979671fde"
+  integrity sha512-egPJh3aPVAzbHwq8DD7Po53J4OUSsA1MjQp8Vf/OZPav5rlmWUaFLiq8cvQiGK0Z5K6LYzm29+VA/p4RL1FzNg==
+  dependencies:
+    "@ethersproject/logger" "^5.8.0"
+
+"@ethersproject/properties@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.8.0.tgz#405a8affb6311a49a91dabd96aeeae24f477020e"
+  integrity sha512-PYuiEoQ+FMaZZNGrStmN7+lWjlsoufGIHdww7454FIaGdbe/p5rnaCXTr5MtBYl3NkeoVhHZuyzChPeGeKIpQw==
+  dependencies:
+    "@ethersproject/logger" "^5.8.0"
+
+"@ethersproject/rlp@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.8.0.tgz#5a0d49f61bc53e051532a5179472779141451de5"
+  integrity sha512-LqZgAznqDbiEunaUvykH2JAoXTT9NV0Atqk8rQN9nx9SEgThA/WMx5DnW8a9FOufo//6FZOCHZ+XiClzgbqV9Q==
+  dependencies:
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+
+"@ethersproject/signing-key@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.8.0.tgz#9797e02c717b68239c6349394ea85febf8893119"
+  integrity sha512-LrPW2ZxoigFi6U6aVkFN/fa9Yx/+4AtIUe4/HACTvKJdhm0eeb107EVCIQcrLZkxaSIgc/eCrX8Q1GtbH+9n3w==
+  dependencies:
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/properties" "^5.8.0"
+    bn.js "^5.2.1"
+    elliptic "6.6.1"
+    hash.js "1.1.7"
+
+"@ethersproject/strings@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.8.0.tgz#ad79fafbf0bd272d9765603215ac74fd7953908f"
+  integrity sha512-qWEAk0MAvl0LszjdfnZ2uC8xbR2wdv4cDabyHiBh3Cldq/T8dPH3V4BbBsAYJUeonwD+8afVXld274Ls+Y1xXg==
+  dependencies:
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/constants" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+
+"@ethersproject/transactions@^5.7.0", "@ethersproject/transactions@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.8.0.tgz#1e518822403abc99def5a043d1c6f6fe0007e46b"
+  integrity sha512-UglxSDjByHG0TuU17bDfCemZ3AnKO2vYrL5/2n2oXvKzvb7Cz+W9gOWXKARjp2URVwcWlQlPOEQyAviKwT4AHg==
+  dependencies:
+    "@ethersproject/address" "^5.8.0"
+    "@ethersproject/bignumber" "^5.8.0"
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/constants" "^5.8.0"
+    "@ethersproject/keccak256" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/properties" "^5.8.0"
+    "@ethersproject/rlp" "^5.8.0"
+    "@ethersproject/signing-key" "^5.8.0"
+
+"@ethersproject/web@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.8.0.tgz#3e54badc0013b7a801463a7008a87988efce8a37"
+  integrity sha512-j7+Ksi/9KfGviws6Qtf9Q7KCqRhpwrYKQPs+JBA/rKVFF/yaWLHJEH3zfVP2plVu+eys0d2DlFmhoQJayFewcw==
+  dependencies:
+    "@ethersproject/base64" "^5.8.0"
+    "@ethersproject/bytes" "^5.8.0"
+    "@ethersproject/logger" "^5.8.0"
+    "@ethersproject/properties" "^5.8.0"
+    "@ethersproject/strings" "^5.8.0"
+
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
@@ -710,6 +776,148 @@
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
+"@interchainjs/amino@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/amino/-/amino-1.17.1.tgz#b8a4375a59dce16c4d3abc4d14260f443a2ad0dd"
+  integrity sha512-MYEye+V4O7tITc/YofgGbiLT0kdXuK0BvuIYMFfq5+Tybq9tgFu/PYQ6CL3nyD6+S5H/rbgz9sUH31sPj7XaZg==
+  dependencies:
+    "@interchainjs/crypto" "1.17.1"
+    "@interchainjs/encoding" "1.17.1"
+    "@interchainjs/math" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+
+"@interchainjs/auth@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/auth/-/auth-1.17.1.tgz#1082116095f2cef8830239195d99eecaff397dd0"
+  integrity sha512-4khXhRti537vqsSzSPfCwtarFBNvXkc8ISYFvqY43I2j0m0FbzZhNqjrXQn+xnihnjsF9ec/SqckVKdXX2DHFg==
+  dependencies:
+    "@interchainjs/crypto" "1.17.1"
+    "@interchainjs/types" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+    "@noble/curves" "^1.1.0"
+    "@noble/hashes" "^1.3.1"
+    "@scure/bip32" "^1.0.10"
+    bech32 "^2.0.0"
+    elliptic "^6.5.4"
+    libsodium-wrappers-sumo "^0.7.11"
+
+"@interchainjs/cosmos-types@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/cosmos-types/-/cosmos-types-1.17.1.tgz#abe6cd7311cfbe68ea70878ba8723b959884d8e4"
+  integrity sha512-GU3dfQ2IHTVvClgctjY0RAdErwcG6fQskBh4Iqm6BDpcgpto2+nzES/DoLslx8ds9vBCujjx5zGFwr90fgScHw==
+  dependencies:
+    "@interchainjs/math" "1.17.1"
+    "@interchainjs/types" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+
+"@interchainjs/cosmos@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/cosmos/-/cosmos-1.17.1.tgz#f21d706d9b5c4ca0476686f5ec69ae4aaf254d70"
+  integrity sha512-Wzjv5VxaiZUD+sY2ErMv6QCTdrmV+Mus1VFHrMZo3T4gex6Z8fOOV1IaesN5+w44XM4YkF8CX+zSCerfqV6Dvg==
+  dependencies:
+    "@interchainjs/auth" "1.17.1"
+    "@interchainjs/cosmos-types" "1.17.1"
+    "@interchainjs/crypto" "1.17.1"
+    "@interchainjs/encoding" "1.17.1"
+    "@interchainjs/types" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+    "@noble/curves" "^1.1.0"
+    "@noble/hashes" "^1.3.1"
+    bech32 "^1.1.4"
+    bignumber.js "^9.1.0"
+    bip39 "^3.1.0"
+    decimal.js "^10.4.3"
+    deepmerge "4.2.2"
+    ws "^8.14.0"
+
+"@interchainjs/crypto@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/crypto/-/crypto-1.17.1.tgz#afae0b71eb1ca6e14db96f4b760b3e380afa4bff"
+  integrity sha512-vrKtsRq4YX6pUukD73CbLLOD6tgwHb05GMOVhK0S8lGULiSoW8f76LvhOUgX13v5MSWiBzdSiAaVsAfTvkJePw==
+  dependencies:
+    "@interchainjs/encoding" "1.17.1"
+    "@interchainjs/math" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+    "@noble/hashes" "^1"
+    bn.js "^5.2.0"
+    elliptic "^6.5.4"
+    libsodium-wrappers-sumo "^0.7.11"
+
+"@interchainjs/encoding@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/encoding/-/encoding-1.17.1.tgz#761c62caae8b9c9e4ac7874354ca2467a172c6f3"
+  integrity sha512-ALRsvzEtSAHBiBw2z+i9bp9ICGpMN8L6cqS0AIpx+B4mFnuFp0TYi4m7CerklcDeV78ld+G6Xf5PbbQUGI0/hA==
+  dependencies:
+    "@interchainjs/math" "1.17.1"
+    base64-js "^1.3.0"
+    bech32 "^1.1.4"
+    readonly-date "^1.0.0"
+
+"@interchainjs/ethereum@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/ethereum/-/ethereum-1.17.1.tgz#2b558e7ca5a2b15238c7a21160426304195f46f5"
+  integrity sha512-EOjB3Q8OusoCk5/zg0PlWJUoepKEOjm18DNEeAxUPmG5wDw8CIAp7wkUHF6lfGkE7ZFedwy74Uinc1eZZSDh1g==
+  dependencies:
+    "@ethersproject/bignumber" "^5.7.0"
+    "@ethersproject/bytes" "^5.7.0"
+    "@ethersproject/hash" "^5.7.0"
+    "@ethersproject/transactions" "^5.7.0"
+    "@interchainjs/auth" "1.17.1"
+    "@interchainjs/types" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+    "@noble/curves" "^1.1.0"
+    "@noble/hashes" "^1.3.1"
+    bip39 "^3.1.0"
+    deepmerge "4.2.2"
+    ethereum-cryptography "^3.1.0"
+    rlp "^3.0.0"
+
+"@interchainjs/math@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/math/-/math-1.17.1.tgz#98d13822cfb3ded3534138e956ea3bc94a453c5c"
+  integrity sha512-4eOj6m95Iy3iNuhqf9F9iLBlV1U2G5L6CqjpROvn9fiO3H8DInXermZFP1CjFXley1Nrd8QfbV7OSkyfa0u8tA==
+  dependencies:
+    bn.js "^5.2.0"
+
+"@interchainjs/pubkey@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/pubkey/-/pubkey-1.17.1.tgz#51bce8500aac5894665c9252366e0e4990d8bc72"
+  integrity sha512-hdfXFsZSVSg6tPzgd3Htw40dSY/nXTVJLrbZt6cKe6BGRiuPSQmOkka6AZn0Ze5Y4ULYfUMxpipFQc0ukfsd1A==
+  dependencies:
+    "@interchainjs/amino" "1.17.1"
+    "@interchainjs/cosmos-types" "1.17.1"
+    "@interchainjs/encoding" "1.17.1"
+    "@interchainjs/math" "1.17.1"
+    "@interchainjs/types" "1.17.1"
+
+"@interchainjs/types@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/types/-/types-1.17.1.tgz#3ef539dea69c9bbf2fbf96ab588f81fceea455cc"
+  integrity sha512-EPKa0nFPjYFpgO+a5WUBXrkHbbBeYHyBv8DG55yTFuvvn4Yd6uH86ygQIR9NsEAMgKQSiTD+yQcVj/4fbC/EQg==
+  dependencies:
+    decimal.js "^10.4.3"
+
+"@interchainjs/utils@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@interchainjs/utils/-/utils-1.17.1.tgz#19d86cda572b789bca421a394b020a3df5cae220"
+  integrity sha512-46W53v0tRMHiThvF8IZbURqAJsCxNwdxMdKFlL1pDwqAUHxgFzM6IfxemijbNCQd2ST9EYKe9c5zmnxEsHioig==
+  dependencies:
+    "@interchainjs/types" "1.17.1"
+    bech32 "^2.0.0"
+    decimal.js "^10.4.3"
+
+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -804,10 +1012,10 @@
     "@types/node" "*"
     jest-mock "^29.7.0"
 
-"@jest/expect-utils@30.0.3":
-  version "30.0.3"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.0.3.tgz#2a9fb40110c8a13ae464da41f877df90d2e6bc3b"
-  integrity sha512-SMtBvf2sfX2agcT0dA9pXwcUrKvOSDqBY4e4iRfT+Hya33XzV35YVg+98YQFErVGA/VR1Gto5Y2+A6G9LSQ3Yg==
+"@jest/expect-utils@30.0.5":
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.0.5.tgz#9d42e4b8bc80367db30abc6c42b2cb14073f66fc"
+  integrity sha512-F3lmTT7CXWYywoVUGTCmom0vXq3HTTkaZyTAzIy+bXSBizB7o5qzlC9VCtq0arOa8GqmNsbg/cE9C6HLn7Szew==
   dependencies:
     "@jest/get-type" "30.0.1"
 
@@ -891,10 +1099,10 @@
     strip-ansi "^6.0.0"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@30.0.1":
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.0.1.tgz#27c00d707d480ece0c19126af97081a1af3bc46e"
-  integrity sha512-+g/1TKjFuGrf1Hh0QPCv0gISwBxJ+MQSNXmG9zjHy7BmFhtoJ9fdNhWJp3qUKRi93AOZHXtdxZgJ1vAtz6z65w==
+"@jest/schemas@30.0.5":
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.0.5.tgz#7bdf69fc5a368a5abdb49fd91036c55225846473"
+  integrity sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==
   dependencies:
     "@sinclair/typebox" "^0.34.0"
 
@@ -955,13 +1163,13 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
-"@jest/types@30.0.1":
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.0.1.tgz#a46df6a99a416fa685740ac4264b9f9cd7da1598"
-  integrity sha512-HGwoYRVF0QSKJu1ZQX0o5ZrUrrhj0aOOFA8hXrumD7SIzjouevhawbTjmXdwOmURdGluU9DM/XvGm3NyFoiQjw==
+"@jest/types@30.0.5":
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.0.5.tgz#29a33a4c036e3904f1cfd94f6fe77f89d2e1cc05"
+  integrity sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==
   dependencies:
     "@jest/pattern" "30.0.1"
-    "@jest/schemas" "30.0.1"
+    "@jest/schemas" "30.0.5"
     "@types/istanbul-lib-coverage" "^2.0.6"
     "@types/istanbul-reports" "^3.0.4"
     "@types/node" "*"
@@ -980,13 +1188,12 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142"
-  integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==
+"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz#2234ce26c62889f03db3d7fea43c1932ab3e927b"
+  integrity sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==
   dependencies:
-    "@jridgewell/set-array" "^1.2.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/sourcemap-codec" "^1.5.0"
     "@jridgewell/trace-mapping" "^0.3.24"
 
 "@jridgewell/resolve-uri@^3.1.0":
@@ -994,20 +1201,15 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
-  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
-
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
-  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz#7358043433b2e5da569aa02cbc4c121da3af27d7"
+  integrity sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz#a58d31eaadaf92c6695680b2e1d464a9b8fbf7fc"
+  integrity sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -1113,7 +1315,26 @@
     write-pkg "4.0.0"
     yargs "16.2.0"
 
-"@noble/hashes@^1", "@noble/hashes@^1.0.0":
+"@noble/ciphers@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc"
+  integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==
+
+"@noble/curves@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.0.tgz#13e0ca8be4a0ce66c113693a94514e5599f40cfc"
+  integrity sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg==
+  dependencies:
+    "@noble/hashes" "1.8.0"
+
+"@noble/curves@^1.1.0", "@noble/curves@~1.9.0":
+  version "1.9.6"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.6.tgz#b45ebedca85bb75782f6be7e7f120f0c423c99e0"
+  integrity sha512-GIKz/j99FRthB8icyJQA51E8Uk5hXmdyThjgQXRKiv9h0zeRlzSCLIzFw6K1LotZ3XuB7yzlf76qk7uBmTdFqA==
+  dependencies:
+    "@noble/hashes" "1.8.0"
+
+"@noble/hashes@1.8.0", "@noble/hashes@^1", "@noble/hashes@^1.2.0", "@noble/hashes@^1.3.1", "@noble/hashes@~1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a"
   integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==
@@ -1524,59 +1745,6 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
-  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
-
-"@protobufjs/base64@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
-  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
-
-"@protobufjs/codegen@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
-  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
-
-"@protobufjs/eventemitter@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
-  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
-
-"@protobufjs/fetch@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
-  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.1"
-    "@protobufjs/inquire" "^1.1.0"
-
-"@protobufjs/float@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
-  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
-
-"@protobufjs/inquire@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
-  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
-
-"@protobufjs/path@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
-  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
-
-"@protobufjs/pool@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
-  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
-
-"@protobufjs/utf8@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
-  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
-
 "@pyramation/json-schema-ref-parser@9.0.6":
   version "9.0.6"
   resolved "https://registry.yarnpkg.com/@pyramation/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#556e416ce7dcc15a3c1afd04d6a059e03ed09aeb"
@@ -1606,6 +1774,28 @@
     mz "^2.7.0"
     prettier "^2.6.2"
 
+"@scure/base@~1.2.5":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.2.6.tgz#ca917184b8231394dd8847509c67a0be522e59f6"
+  integrity sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==
+
+"@scure/bip32@1.7.0", "@scure/bip32@^1.0.10":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.7.0.tgz#b8683bab172369f988f1589640e53c4606984219"
+  integrity sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==
+  dependencies:
+    "@noble/curves" "~1.9.0"
+    "@noble/hashes" "~1.8.0"
+    "@scure/base" "~1.2.5"
+
+"@scure/bip39@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.6.0.tgz#475970ace440d7be87a6086cbee77cb8f1a684f9"
+  integrity sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==
+  dependencies:
+    "@noble/hashes" "~1.8.0"
+    "@scure/base" "~1.2.5"
+
 "@sigstore/bundle@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
@@ -1641,9 +1831,9 @@
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
 "@sinclair/typebox@^0.34.0":
-  version "0.34.37"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.37.tgz#f331e4db64ff8195e9e3d8449343c85aaa237d6e"
-  integrity sha512-2TRuQVgQYfy+EzHRTIvkhv2ADEouJ2xNS/Vq+W5EuuewBdOrvATvljZTxHWZSTYr2sTjTHpGvucaGAt67S2akw==
+  version "0.34.38"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.38.tgz#2365df7c23406a4d79413a766567bfbca708b49d"
+  integrity sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==
 
 "@sinonjs/commons@^3.0.0":
   version "3.0.1"
@@ -1704,11 +1894,11 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.7.tgz#968cdc2366ec3da159f61166428ee40f370e56c2"
-  integrity sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.28.0.tgz#07d713d6cce0d265c9849db0cbe62d3f61f36f74"
+  integrity sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==
   dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.28.2"
 
 "@types/estree@^1.0.6":
   version "1.0.8"
@@ -1716,12 +1906,11 @@
   integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
 
 "@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-9.0.0.tgz#7b942fafe09c55671912b34f04e8e4676faf32b1"
+  integrity sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==
   dependencies:
-    "@types/minimatch" "^5.1.2"
-    "@types/node" "*"
+    glob "*"
 
 "@types/glob@^7.1.3", "@types/glob@~7.2.0":
   version "7.2.0"
@@ -1787,19 +1976,16 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/lodash@^4.14.182":
-  version "4.17.18"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.18.tgz#4710e7db5b3857103764bf7b7b666414e6141baf"
-  integrity sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.20.tgz#1ca77361d7363432d29f5e55950d9ec1e1c6ea93"
+  integrity sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==
 
-"@types/long@^4.0.1":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
-
-"@types/minimatch@*", "@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+"@types/minimatch@*":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-6.0.0.tgz#4d207b1cc941367bdcd195a3a781a7e4fc3b1e03"
+  integrity sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA==
+  dependencies:
+    minimatch "*"
 
 "@types/minimatch@^3.0.3":
   version "3.0.5"
@@ -1818,17 +2004,17 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "24.0.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.4.tgz#dbae889912bda33a7f57669fb8587c1a56bc0c1f"
-  integrity sha512-ulyqAkrhnuNq9pB76DRBTkcS6YsmDALy6Ua63V8OhrOBgbcYt6IOdzpw5P1+dyRIyMerzLkeYWBeOXPpA9GMAA==
+"@types/node@*":
+  version "24.2.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.2.0.tgz#cde712f88c5190006d6b069232582ecd1f94a760"
+  integrity sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==
   dependencies:
-    undici-types "~7.8.0"
+    undici-types "~7.10.0"
 
 "@types/node@^20.12.7":
-  version "20.19.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.1.tgz#cef8bc04aaae86824b5bbe2570769358592bcc59"
-  integrity sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==
+  version "20.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.9.tgz#ca9a58193fec361cc6e859d88b52261853f1f0d3"
+  integrity sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1881,77 +2067,78 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz#515170100ff867445fe0a17ce05c14fc5fd9ca63"
-  integrity sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz#c9afec1866ee1a6ea3d768b5f8e92201efbbba06"
+  integrity sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.35.0"
-    "@typescript-eslint/type-utils" "8.35.0"
-    "@typescript-eslint/utils" "8.35.0"
-    "@typescript-eslint/visitor-keys" "8.35.0"
+    "@typescript-eslint/scope-manager" "8.39.0"
+    "@typescript-eslint/type-utils" "8.39.0"
+    "@typescript-eslint/utils" "8.39.0"
+    "@typescript-eslint/visitor-keys" "8.39.0"
     graphemer "^1.4.0"
     ignore "^7.0.0"
     natural-compare "^1.4.0"
     ts-api-utils "^2.1.0"
 
 "@typescript-eslint/parser@^8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.35.0.tgz#20a0e17778a329a6072722f5ac418d4376b767d2"
-  integrity sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "8.35.0"
-    "@typescript-eslint/types" "8.35.0"
-    "@typescript-eslint/typescript-estree" "8.35.0"
-    "@typescript-eslint/visitor-keys" "8.35.0"
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.39.0.tgz#c4b895d7a47f4cd5ee6ee77ea30e61d58b802008"
+  integrity sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "8.39.0"
+    "@typescript-eslint/types" "8.39.0"
+    "@typescript-eslint/typescript-estree" "8.39.0"
+    "@typescript-eslint/visitor-keys" "8.39.0"
     debug "^4.3.4"
 
-"@typescript-eslint/project-service@8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.35.0.tgz#00bd77e6845fbdb5684c6ab2d8a400a58dcfb07b"
-  integrity sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==
+"@typescript-eslint/project-service@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.39.0.tgz#71cb29c3f8139f99a905b8705127bffc2ae84759"
+  integrity sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.35.0"
-    "@typescript-eslint/types" "^8.35.0"
+    "@typescript-eslint/tsconfig-utils" "^8.39.0"
+    "@typescript-eslint/types" "^8.39.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz#8ccb2ab63383544fab98fc4b542d8d141259ff4f"
-  integrity sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==
+"@typescript-eslint/scope-manager@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz#ba4bf6d8257bbc172c298febf16bc22df4856570"
+  integrity sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==
   dependencies:
-    "@typescript-eslint/types" "8.35.0"
-    "@typescript-eslint/visitor-keys" "8.35.0"
+    "@typescript-eslint/types" "8.39.0"
+    "@typescript-eslint/visitor-keys" "8.39.0"
 
-"@typescript-eslint/tsconfig-utils@8.35.0", "@typescript-eslint/tsconfig-utils@^8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz#6e05aeb999999e31d562ceb4fe144f3cbfbd670e"
-  integrity sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==
+"@typescript-eslint/tsconfig-utils@8.39.0", "@typescript-eslint/tsconfig-utils@^8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz#b2e87fef41a3067c570533b722f6af47be213f13"
+  integrity sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==
 
-"@typescript-eslint/type-utils@8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz#0201eae9d83ffcc3451ef8c94f53ecfbf2319ecc"
-  integrity sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==
+"@typescript-eslint/type-utils@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz#310ec781ae5e7bb0f5940bfd652573587f22786b"
+  integrity sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.35.0"
-    "@typescript-eslint/utils" "8.35.0"
+    "@typescript-eslint/types" "8.39.0"
+    "@typescript-eslint/typescript-estree" "8.39.0"
+    "@typescript-eslint/utils" "8.39.0"
     debug "^4.3.4"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/types@8.35.0", "@typescript-eslint/types@^8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.35.0.tgz#e60d062907930e30008d796de5c4170f02618a93"
-  integrity sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==
+"@typescript-eslint/types@8.39.0", "@typescript-eslint/types@^8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.39.0.tgz#80f010b7169d434a91cd0529d70a528dbc9c99c6"
+  integrity sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==
 
-"@typescript-eslint/typescript-estree@8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz#86141e6c55b75bc1eaecc0781bd39704de14e52a"
-  integrity sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==
+"@typescript-eslint/typescript-estree@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz#b9477a5c47a0feceffe91adf553ad9a3cd4cb3d6"
+  integrity sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==
   dependencies:
-    "@typescript-eslint/project-service" "8.35.0"
-    "@typescript-eslint/tsconfig-utils" "8.35.0"
-    "@typescript-eslint/types" "8.35.0"
-    "@typescript-eslint/visitor-keys" "8.35.0"
+    "@typescript-eslint/project-service" "8.39.0"
+    "@typescript-eslint/tsconfig-utils" "8.39.0"
+    "@typescript-eslint/types" "8.39.0"
+    "@typescript-eslint/visitor-keys" "8.39.0"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
@@ -1959,22 +2146,22 @@
     semver "^7.6.0"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/utils@8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.35.0.tgz#aaf0afab5ab51ea2f1897002907eacd9834606d5"
-  integrity sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==
+"@typescript-eslint/utils@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.39.0.tgz#dfea42f3c7ec85f9f3e994ff0bba8f3b2f09e220"
+  integrity sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.7.0"
-    "@typescript-eslint/scope-manager" "8.35.0"
-    "@typescript-eslint/types" "8.35.0"
-    "@typescript-eslint/typescript-estree" "8.35.0"
+    "@typescript-eslint/scope-manager" "8.39.0"
+    "@typescript-eslint/types" "8.39.0"
+    "@typescript-eslint/typescript-estree" "8.39.0"
 
-"@typescript-eslint/visitor-keys@8.35.0":
-  version "8.35.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz#93e905e7f1e94d26a79771d1b1eb0024cb159dbf"
-  integrity sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==
+"@typescript-eslint/visitor-keys@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz#5d619a6e810cdd3fd1913632719cbccab08bf875"
+  integrity sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==
   dependencies:
-    "@typescript-eslint/types" "8.35.0"
+    "@typescript-eslint/types" "8.39.0"
     eslint-visitor-keys "^4.2.1"
 
 "@yarnpkg/lockfile@^1.1.0":
@@ -2152,9 +2339,9 @@ anymatch@^3.0.3:
     picomatch "^2.0.4"
 
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.1.0.tgz#75500a190313d95c64e871e7e4284c6ac219f0b1"
+  integrity sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==
 
 are-we-there-yet@^3.0.0:
   version "3.0.1"
@@ -2211,7 +2398,7 @@ ast-stringify@0.2.1:
   resolved "https://registry.yarnpkg.com/ast-stringify/-/ast-stringify-0.2.1.tgz#5a90823699f51e338da4da039219aefc092398a3"
   integrity sha512-wS/5cTSysM/IL1NVAwI2/xhFDI08UEw4PpLsbpDfc1KEPc2ABo94pjvB5p/tIF+Qu7oFOdxx8TdlGhyu4ZOb3A==
 
-async@^3.2.3:
+async@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
   integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
@@ -2226,13 +2413,20 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-axios@^1.0.0, axios@^1.6.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54"
-  integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
+axios@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
+  integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
   dependencies:
     follow-redirects "^1.15.6"
-    form-data "^4.0.0"
+    form-data "^4.0.4"
     proxy-from-env "^1.1.0"
 
 babel-jest@^29.7.0:
@@ -2270,9 +2464,9 @@ babel-plugin-jest-hoist@^29.6.3:
     "@types/babel__traverse" "^7.0.6"
 
 babel-preset-current-node-syntax@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
-  integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
+  integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -2313,11 +2507,26 @@ bech32@^1.1.4:
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
+bech32@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bech32/-/bech32-2.0.0.tgz#078d3686535075c8c79709f054b1b226a133b355"
+  integrity sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==
+
 before-after-hook@^2.2.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
   integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
+bignumber.js@9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
+  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
+
+bignumber.js@^9.1.0:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.1.tgz#759c5aaddf2ffdc4f154f7b493e1c8770f88c4d7"
+  integrity sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==
+
 bin-links@^4.0.1:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.4.tgz#c3565832b8e287c85f109a02a17027d152a58a63"
@@ -2328,6 +2537,13 @@ bin-links@^4.0.1:
     read-cmd-shim "^4.0.0"
     write-file-atomic "^5.0.0"
 
+bip39@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.1.0.tgz#c55a418deaf48826a6ceb34ac55b3ee1577e18a3"
+  integrity sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==
+  dependencies:
+    "@noble/hashes" "^1.2.0"
+
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -2342,7 +2558,7 @@ bn.js@^4.11.9:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.2.tgz#3d8fed6796c24e177737f7cc5172ee04ef39ec99"
   integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
 
-bn.js@^5.2.0:
+bn.js@^5.2.0, bn.js@^5.2.1:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.2.tgz#82c09f9ebbb17107cd72cb7fd39bd1f9d0aaa566"
   integrity sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==
@@ -2470,7 +2686,7 @@ cacache@^17.0.0, cacache@^17.0.4:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
   integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
@@ -2478,6 +2694,24 @@ call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
+call-bind@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+  dependencies:
+    call-bind-apply-helpers "^1.0.0"
+    es-define-property "^1.0.0"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.2"
+
+call-bound@^1.0.3, call-bound@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
+  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    get-intrinsic "^1.3.0"
+
 call-me-maybe@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
@@ -2508,9 +2742,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001726:
-  version "1.0.30001726"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz#a15bd87d5a4bf01f6b6f70ae7c97fdfd28b5ae47"
-  integrity sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==
+  version "1.0.30001731"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz#277c07416ea4613ec564e5b0ffb47e7b60f32e2f"
+  integrity sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==
 
 case@1.6.3:
   version "1.6.3"
@@ -2525,7 +2759,7 @@ chalk@4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2584,9 +2818,9 @@ ci-info@^3.2.0, ci-info@^3.6.1:
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 ci-info@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.2.0.tgz#cbd21386152ebfe1d56f280a3b5feccbd96764c7"
-  integrity sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.0.tgz#c39b1013f8fdbd28cd78e62318357d02da160cd7"
+  integrity sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==
 
 cjs-module-lexer@^1.0.0:
   version "1.4.3"
@@ -2903,11 +3137,6 @@ cosmiconfig@7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmjs-types@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.9.0.tgz#c3bc482d28c7dfa25d1445093fdb2d9da1f6cfcc"
-  integrity sha512-MN/yUe6mkJwHnCFfsNPeCfXVhyxHYW6c/xDUzrSbBycYzw++XvWDMJArXp2pLdgD6FQ8DW79vkPjeNKVrXaHeQ==
-
 create-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
@@ -2978,6 +3207,11 @@ decamelize@^1.1.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
+decimal.js@^10.4.3:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
+  integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
+
 dedent@0.7.0, dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -3010,7 +3244,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-data-property@^1.0.1:
+define-data-property@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
   integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
@@ -3024,15 +3258,6 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
-  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
-  dependencies:
-    define-data-property "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
 del@^6.0.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
@@ -3122,7 +3347,7 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ejs@^3.1.10, ejs@^3.1.7:
+ejs@^3.1.7:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
   integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
@@ -3130,11 +3355,11 @@ ejs@^3.1.10, ejs@^3.1.7:
     jake "^10.8.5"
 
 electron-to-chromium@^1.5.173:
-  version "1.5.173"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.173.tgz#1aeba57204fe19425921a29946ef543653f5e896"
-  integrity sha512-2bFhXP2zqSfQHugjqJIDFVwa+qIxyNApenmXTp9EjaKtdPrES5Qcn9/aSFy/NaP2E+fWG/zxKu/LBvY36p5VNQ==
+  version "1.5.196"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.196.tgz#bb9bfe456d03328f3aaf6d2723e052e70396c376"
+  integrity sha512-FnnXV0dXANe7YNtKl/Af1raw+sBBUPuwcNEWfLOJyumXBvfQEBsnc0Gn+yEnVscq4x3makTtrlf4TjAo7lcXTQ==
 
-elliptic@^6.5.4:
+elliptic@6.6.1, elliptic@^6.5.4:
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06"
   integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==
@@ -3270,35 +3495,36 @@ es6-weak-map@^2.0.3:
     es6-symbol "^3.1.1"
 
 esbuild@~0.25.0:
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.5.tgz#71075054993fdfae76c66586f9b9c1f8d7edd430"
-  integrity sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==
+  version "0.25.8"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.8.tgz#482d42198b427c9c2f3a81b63d7663aecb1dda07"
+  integrity sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.25.5"
-    "@esbuild/android-arm" "0.25.5"
-    "@esbuild/android-arm64" "0.25.5"
-    "@esbuild/android-x64" "0.25.5"
-    "@esbuild/darwin-arm64" "0.25.5"
-    "@esbuild/darwin-x64" "0.25.5"
-    "@esbuild/freebsd-arm64" "0.25.5"
-    "@esbuild/freebsd-x64" "0.25.5"
-    "@esbuild/linux-arm" "0.25.5"
-    "@esbuild/linux-arm64" "0.25.5"
-    "@esbuild/linux-ia32" "0.25.5"
-    "@esbuild/linux-loong64" "0.25.5"
-    "@esbuild/linux-mips64el" "0.25.5"
-    "@esbuild/linux-ppc64" "0.25.5"
-    "@esbuild/linux-riscv64" "0.25.5"
-    "@esbuild/linux-s390x" "0.25.5"
-    "@esbuild/linux-x64" "0.25.5"
-    "@esbuild/netbsd-arm64" "0.25.5"
-    "@esbuild/netbsd-x64" "0.25.5"
-    "@esbuild/openbsd-arm64" "0.25.5"
-    "@esbuild/openbsd-x64" "0.25.5"
-    "@esbuild/sunos-x64" "0.25.5"
-    "@esbuild/win32-arm64" "0.25.5"
-    "@esbuild/win32-ia32" "0.25.5"
-    "@esbuild/win32-x64" "0.25.5"
+    "@esbuild/aix-ppc64" "0.25.8"
+    "@esbuild/android-arm" "0.25.8"
+    "@esbuild/android-arm64" "0.25.8"
+    "@esbuild/android-x64" "0.25.8"
+    "@esbuild/darwin-arm64" "0.25.8"
+    "@esbuild/darwin-x64" "0.25.8"
+    "@esbuild/freebsd-arm64" "0.25.8"
+    "@esbuild/freebsd-x64" "0.25.8"
+    "@esbuild/linux-arm" "0.25.8"
+    "@esbuild/linux-arm64" "0.25.8"
+    "@esbuild/linux-ia32" "0.25.8"
+    "@esbuild/linux-loong64" "0.25.8"
+    "@esbuild/linux-mips64el" "0.25.8"
+    "@esbuild/linux-ppc64" "0.25.8"
+    "@esbuild/linux-riscv64" "0.25.8"
+    "@esbuild/linux-s390x" "0.25.8"
+    "@esbuild/linux-x64" "0.25.8"
+    "@esbuild/netbsd-arm64" "0.25.8"
+    "@esbuild/netbsd-x64" "0.25.8"
+    "@esbuild/openbsd-arm64" "0.25.8"
+    "@esbuild/openbsd-x64" "0.25.8"
+    "@esbuild/openharmony-arm64" "0.25.8"
+    "@esbuild/sunos-x64" "0.25.8"
+    "@esbuild/win32-arm64" "0.25.8"
+    "@esbuild/win32-ia32" "0.25.8"
+    "@esbuild/win32-x64" "0.25.8"
 
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
@@ -3321,9 +3547,9 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-prettier@^10.1.5:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#00c18d7225043b6fbce6a665697377998d453782"
-  integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
+  version "10.1.8"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz#15734ce4af8c2778cc32f0b01b37b0b5cd1ecb97"
+  integrity sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==
 
 eslint-plugin-simple-import-sort@^12.1.0:
   version "12.1.1"
@@ -3354,18 +3580,18 @@ eslint-visitor-keys@^4.2.1:
   integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
 
 eslint@^9.30.0:
-  version "9.30.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.30.0.tgz#fb0c655f5e28fc1b2f4050c28efa1876d78034fc"
-  integrity sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==
+  version "9.32.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.32.0.tgz#4ea28df4a8dbc454e1251e0f3aed4bcf4ce50a47"
+  integrity sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"
     "@eslint/config-array" "^0.21.0"
     "@eslint/config-helpers" "^0.3.0"
-    "@eslint/core" "^0.14.0"
+    "@eslint/core" "^0.15.0"
     "@eslint/eslintrc" "^3.3.1"
-    "@eslint/js" "9.30.0"
-    "@eslint/plugin-kit" "^0.3.1"
+    "@eslint/js" "9.32.0"
+    "@eslint/plugin-kit" "^0.3.4"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.4.2"
@@ -3442,6 +3668,17 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+ethereum-cryptography@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-3.2.0.tgz#42a04b57834bf536e552b50a70b9ee5057c71dc6"
+  integrity sha512-Urr5YVsalH+Jo0sYkTkv1MyI9bLYZwW8BENZCeE1QYaTHETEYx0Nv/SVsWkSqpYrzweg6d8KMY1wTjH/1m/BIg==
+  dependencies:
+    "@noble/ciphers" "1.3.0"
+    "@noble/curves" "1.9.0"
+    "@noble/hashes" "1.8.0"
+    "@scure/bip32" "1.7.0"
+    "@scure/bip39" "1.6.0"
+
 event-emitter@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
@@ -3502,16 +3739,16 @@ expect@^29.0.0, expect@^29.7.0:
     jest-util "^29.7.0"
 
 expect@^30.0.0:
-  version "30.0.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-30.0.3.tgz#8bf31a67514f78c5e4ac8d67774192ab95d5ec25"
-  integrity sha512-HXg6NvK35/cSYZCUKAtmlgCFyqKM4frEPbzrav5hRqb0GMz0E0lS5hfzYjSaiaE5ysnp/qI2aeZkeyeIAOeXzQ==
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.0.5.tgz#c23bf193c5e422a742bfd2990ad990811de41a5a"
+  integrity sha512-P0te2pt+hHI5qLJkIR+iMvS+lYUZml8rKKsohVHAGY+uClp9XVbdyYNJOIjSRpHVp8s8YqxJCiHUkSYZGr8rtQ==
   dependencies:
-    "@jest/expect-utils" "30.0.3"
+    "@jest/expect-utils" "30.0.5"
     "@jest/get-type" "30.0.1"
-    jest-matcher-utils "30.0.3"
-    jest-message-util "30.0.2"
-    jest-mock "30.0.2"
-    jest-util "30.0.2"
+    jest-matcher-utils "30.0.5"
+    jest-message-util "30.0.5"
+    jest-mock "30.0.5"
+    jest-util "30.0.5"
 
 exponential-backoff@^3.1.1:
   version "3.1.2"
@@ -3676,11 +3913,18 @@ flatted@^3.2.9:
   integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
 
 follow-redirects@^1.15.6:
-  version "1.15.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
-  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
+  version "1.15.11"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
+  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
 
-foreground-child@^3.1.0:
+for-each@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
+  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
+  dependencies:
+    is-callable "^1.2.7"
+
+foreground-child@^3.1.0, foreground-child@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
   integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
@@ -3688,10 +3932,10 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
-form-data@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.3.tgz#608b1b3f3e28be0fccf5901fc85fb3641e5cf0ae"
-  integrity sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==
+form-data@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -3715,9 +3959,9 @@ fs-extra@9.1.0, fs-extra@^9.1.0:
     universalify "^2.0.0"
 
 fs-extra@^11.1.0:
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.0.tgz#0daced136bbaf65a555a326719af931adc7a314d"
-  integrity sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==
+  version "11.3.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.1.tgz#ba7a1f97a85f94c6db2e52ff69570db3671d5a74"
+  integrity sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -3795,7 +4039,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.2.6:
+get-intrinsic@^1.2.4, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
   integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
@@ -3931,6 +4175,18 @@ glob-promise@^4.2.2:
   dependencies:
     "@types/glob" "^7.1.3"
 
+glob@*:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.3.tgz#9d8087e6d72ddb3c4707b1d2778f80ea3eaefcd6"
+  integrity sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==
+  dependencies:
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.0.3"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^2.0.0"
+
 glob@7.1.4:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -3999,17 +4255,9 @@ globals@^14.0.0:
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
 globals@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-16.2.0.tgz#19efcd1ddde2bd5efce128e5c2e441df1abc6f7c"
-  integrity sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==
-
-globalthis@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
-  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
-  dependencies:
-    define-properties "^1.2.1"
-    gopd "^1.0.1"
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-16.3.0.tgz#66118e765ddaf9e2d880f7e17658543f93f1f667"
+  integrity sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==
 
 globby@11.1.0, globby@^11.0.1:
   version "11.1.0"
@@ -4043,7 +4291,7 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-handlebars@^4.7.7:
+handlebars@^4.7.7, handlebars@^4.7.8:
   version "4.7.8"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
   integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==
@@ -4077,7 +4325,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0:
+has-property-descriptors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
   integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
@@ -4101,7 +4349,7 @@ has-unicode@2.0.1, has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
-hash.js@^1.0.0, hash.js@^1.0.3:
+hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
@@ -4410,6 +4658,23 @@ inquirerer@0.1.3:
     inquirer "^6.0.0"
     inquirer-autocomplete-prompt "^0.11.1"
 
+interchainjs@1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/interchainjs/-/interchainjs-1.17.1.tgz#f1d3b2d7be481b007241e8c1dfc58a13cbbdba11"
+  integrity sha512-7i22pCVrW+5EKmC16NFoR0lvI0DQ7DQlOLynRY4WeMN5Kc0Y/hZ5M3TzbcE3NXbtv82ygxJYwNIlrL24+xpXpA==
+  dependencies:
+    "@interchainjs/cosmos" "1.17.1"
+    "@interchainjs/cosmos-types" "1.17.1"
+    "@interchainjs/crypto" "1.17.1"
+    "@interchainjs/encoding" "1.17.1"
+    "@interchainjs/ethereum" "1.17.1"
+    "@interchainjs/math" "1.17.1"
+    "@interchainjs/pubkey" "1.17.1"
+    "@interchainjs/types" "1.17.1"
+    "@interchainjs/utils" "1.17.1"
+    "@noble/hashes" "^1.3.1"
+    decimal.js "^10.4.3"
+
 interpret@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
@@ -4428,6 +4693,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
+is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
 is-ci@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -4550,6 +4820,13 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
+is-typed-array@^1.1.14:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
+  dependencies:
+    which-typed-array "^1.1.16"
+
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
@@ -4567,6 +4844,11 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -4582,11 +4864,6 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-isomorphic-ws@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
-  integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
@@ -4649,15 +4926,21 @@ jackspeak@^3.1.2:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.1.tgz#96876030f450502047fc7e8c7fcf8ce8124e43ae"
+  integrity sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+
 jake@^10.8.5:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
-  integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==
+  version "10.9.4"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.4.tgz#d626da108c63d5cfb00ab5c25fadc7e0084af8e6"
+  integrity sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==
   dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
+    async "^3.2.6"
     filelist "^1.0.4"
-    minimatch "^3.1.2"
+    picocolors "^1.1.1"
 
 jest-changed-files@^29.7.0:
   version "29.7.0"
@@ -4739,15 +5022,15 @@ jest-config@^29.7.0:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@30.0.3:
-  version "30.0.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.0.3.tgz#50ac056b90fe9151d6266b18a27adeb064c30235"
-  integrity sha512-Q1TAV0cUcBTic57SVnk/mug0/ASyAqtSIOkr7RAlxx97llRYsM74+E8N5WdGJUlwCKwgxPAkVjKh653h1+HA9A==
+jest-diff@30.0.5:
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.0.5.tgz#b40f81e0c0d13e5b81c4d62b0d0dfa6a524ee0fd"
+  integrity sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==
   dependencies:
     "@jest/diff-sequences" "30.0.1"
     "@jest/get-type" "30.0.1"
     chalk "^4.1.2"
-    pretty-format "30.0.2"
+    pretty-format "30.0.5"
 
 jest-diff@^29.7.0:
   version "29.7.0"
@@ -4826,15 +5109,15 @@ jest-leak-detector@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-matcher-utils@30.0.3:
-  version "30.0.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.0.3.tgz#e07e4776bade71a3a7948a9bf8aeede311c5013a"
-  integrity sha512-hMpVFGFOhYmIIRGJ0HgM9htC5qUiJ00famcc9sRFchJJiLZbbVKrAztcgE6VnXLRxA3XZ0bvNA7hQWh3oHXo/A==
+jest-matcher-utils@30.0.5:
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.0.5.tgz#dff3334be58faea4a5e1becc228656fbbfc2467d"
+  integrity sha512-uQgGWt7GOrRLP1P7IwNWwK1WAQbq+m//ZY0yXygyfWp0rJlksMSLQAA4wYQC3b6wl3zfnchyTx+k3HZ5aPtCbQ==
   dependencies:
     "@jest/get-type" "30.0.1"
     chalk "^4.1.2"
-    jest-diff "30.0.3"
-    pretty-format "30.0.2"
+    jest-diff "30.0.5"
+    pretty-format "30.0.5"
 
 jest-matcher-utils@^29.7.0:
   version "29.7.0"
@@ -4846,18 +5129,18 @@ jest-matcher-utils@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-message-util@30.0.2:
-  version "30.0.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.0.2.tgz#9dfdc37570d172f0ffdc42a0318036ff4008837f"
-  integrity sha512-vXywcxmr0SsKXF/bAD7t7nMamRvPuJkras00gqYeB1V0WllxZrbZ0paRr3XqpFU2sYYjD0qAaG2fRyn/CGZ0aw==
+jest-message-util@30.0.5:
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.0.5.tgz#dd12ffec91dd3fa6a59cbd538a513d8e239e070c"
+  integrity sha512-NAiDOhsK3V7RU0Aa/HnrQo+E4JlbarbmI3q6Pi4KcxicdtjV82gcIUrejOtczChtVQR4kddu1E1EJlW6EN9IyA==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@jest/types" "30.0.1"
+    "@jest/types" "30.0.5"
     "@types/stack-utils" "^2.0.3"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     micromatch "^4.0.8"
-    pretty-format "30.0.2"
+    pretty-format "30.0.5"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
@@ -4876,14 +5159,14 @@ jest-message-util@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@30.0.2:
-  version "30.0.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.0.2.tgz#5e4245f25f6f9532714906cab10a2b9e39eb2183"
-  integrity sha512-PnZOHmqup/9cT/y+pXIVbbi8ID6U1XHRmbvR7MvUy4SLqhCbwpkmXhLbsWbGewHrV5x/1bF7YDjs+x24/QSvFA==
+jest-mock@30.0.5:
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.0.5.tgz#ef437e89212560dd395198115550085038570bdd"
+  integrity sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==
   dependencies:
-    "@jest/types" "30.0.1"
+    "@jest/types" "30.0.5"
     "@types/node" "*"
-    jest-util "30.0.2"
+    jest-util "30.0.5"
 
 jest-mock@^29.7.0:
   version "29.7.0"
@@ -5013,12 +5296,12 @@ jest-snapshot@^29.7.0:
     pretty-format "^29.7.0"
     semver "^7.5.3"
 
-jest-util@30.0.2:
-  version "30.0.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.0.2.tgz#1bd8411f81e6f5e2ca8b31bb2534ebcd7cbac065"
-  integrity sha512-8IyqfKS4MqprBuUpZNlFB5l+WFehc8bfCe1HSZFHzft2mOuND8Cvi9r1musli+u6F3TqanCZ/Ik4H4pXUolZIg==
+jest-util@30.0.5:
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.0.5.tgz#035d380c660ad5f1748dff71c4105338e05f8669"
+  integrity sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==
   dependencies:
-    "@jest/types" "30.0.1"
+    "@jest/types" "30.0.5"
     "@types/node" "*"
     chalk "^4.1.2"
     ci-info "^4.2.0"
@@ -5083,6 +5366,11 @@ jest@^29.6.2:
     import-local "^3.0.2"
     jest-cli "^29.7.0"
 
+js-sha3@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
+  integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -5420,16 +5708,16 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-long@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
-  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
-
 lru-cache@^10.2.0:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
+lru-cache@^11.0.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.1.0.tgz#afafb060607108132dbc1cf8ae661afb69486117"
+  integrity sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5634,6 +5922,13 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
+minimatch@*, minimatch@^10.0.3:
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa"
+  integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==
+  dependencies:
+    "@isaacs/brace-expansion" "^5.0.0"
+
 minimatch@3.0.5:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
@@ -6204,11 +6499,6 @@ object-assign@^4.0.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -6425,11 +6715,6 @@ pacote@^15.0.0, pacote@^15.0.8:
     ssri "^10.0.0"
     tar "^6.1.11"
 
-pako@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
-  integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
-
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -6516,6 +6801,14 @@ path-scurry@^1.11.1, path-scurry@^1.6.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
+path-scurry@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.0.tgz#9f052289f23ad8bf9397a2a0425e7b8615c58580"
+  integrity sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==
+  dependencies:
+    lru-cache "^11.0.0"
+    minipass "^7.1.2"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6539,9 +6832,9 @@ picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 picomatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
-  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
+  integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
 
 pify@5.0.0, pify@^5.0.0:
   version "5.0.0"
@@ -6575,6 +6868,11 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+possible-typed-array-names@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
+  integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
+
 postcss-selector-parser@^6.0.10:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
@@ -6594,9 +6892,9 @@ prettier@^2.6.2:
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 prettier@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.1.tgz#cc3bce21c09a477b1e987b76ce9663925d86ae44"
-  integrity sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
+  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
 
 pretty-format@29.4.3:
   version "29.4.3"
@@ -6607,12 +6905,12 @@ pretty-format@29.4.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-format@30.0.2, pretty-format@^30.0.0:
-  version "30.0.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.0.2.tgz#54717b6aa2b4357a2e6d83868e10a2ea8dd647c7"
-  integrity sha512-yC5/EBSOrTtqhCKfLHqoUIAXVRZnukHPwWBJWR7h84Q3Be1DRQZLncwcfLoPA5RPQ65qfiCMqgYwdUuQ//eVpg==
+pretty-format@30.0.5, pretty-format@^30.0.0:
+  version "30.0.5"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.0.5.tgz#e001649d472800396c1209684483e18a4d250360"
+  integrity sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==
   dependencies:
-    "@jest/schemas" "30.0.1"
+    "@jest/schemas" "30.0.5"
     ansi-styles "^5.2.0"
     react-is "^18.3.1"
 
@@ -6683,25 +6981,6 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protobufjs@^6.8.8:
-  version "6.11.4"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
-  integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
-    "@types/node" ">=13.7.0"
-    long "^4.0.0"
-
 protocols@^2.0.0, protocols@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.2.tgz#822e8fcdcb3df5356538b3e91bfd890b067fd0a4"
@@ -6981,6 +7260,11 @@ rimraf@5.0.0:
   dependencies:
     glob "^10.0.0"
 
+rlp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rlp/-/rlp-3.0.0.tgz#5a60725ca4314a3a165feecca1836e4f2c1e2343"
+  integrity sha512-PD6U2PGk6Vq2spfgiWZdomLvRGDreBLxi5jv5M8EpRo3pU6VEm31KO+HFxE18Q3vgqfDrQ9pZA3FP95rkijNKw==
+
 run-async@^2.2.0, run-async@^2.3.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -7019,16 +7303,16 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
+safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -7068,6 +7352,27 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
+sha.js@^2.4.11:
+  version "2.4.12"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
+  integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
+  dependencies:
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.0"
+
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -7142,9 +7447,9 @@ socks-proxy-agent@^7.0.0:
     socks "^2.6.2"
 
 socks@^2.6.2:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.5.tgz#bfe18f5ead1efc93f5ec90c79fa8bdccbcee2e64"
-  integrity sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==
+  version "2.8.6"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.6.tgz#e335486a2552f34f932f0c27d8dbb93f2be867aa"
+  integrity sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==
   dependencies:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
@@ -7411,11 +7716,6 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-symbol-observable@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
-  integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
-
 symlink-workspace@^1.9.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/symlink-workspace/-/symlink-workspace-1.11.0.tgz#d130e930ec573a1ac807caf206132c71cfe91467"
@@ -7556,6 +7856,15 @@ tmpl@1.0.5:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
+to-buffer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
+  integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
+  dependencies:
+    isarray "^2.0.5"
+    safe-buffer "^5.2.1"
+    typed-array-buffer "^1.0.3"
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -7589,13 +7898,13 @@ ts-api-utils@^2.1.0:
   integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
 
 ts-jest@^29.1.1:
-  version "29.4.0"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.4.0.tgz#bef0ee98d94c83670af7462a1617bf2367a83740"
-  integrity sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==
+  version "29.4.1"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.4.1.tgz#42d33beb74657751d315efb9a871fe99e3b9b519"
+  integrity sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==
   dependencies:
     bs-logger "^0.2.6"
-    ejs "^3.1.10"
     fast-json-stable-stringify "^2.1.0"
+    handlebars "^4.7.8"
     json5 "^2.2.3"
     lodash.memoize "^4.1.2"
     make-error "^1.3.6"
@@ -7693,6 +8002,15 @@ type@^2.7.2:
   resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
   integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
 
+typed-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.14"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -7704,9 +8022,9 @@ typedarray@^0.0.6:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 typescript@^5.1.6:
-  version "5.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
-  integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
+  version "5.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
+  integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
 
 uglify-js@^3.1.4:
   version "3.19.3"
@@ -7718,10 +8036,10 @@ undici-types@~6.21.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
   integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
 
-undici-types@~7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"
-  integrity sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==
+undici-types@~7.10.0:
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.10.0.tgz#4ac2e058ce56b462b056e629cc6a02393d3ff350"
+  integrity sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==
 
 unique-filename@^2.0.0:
   version "2.0.1"
@@ -7883,6 +8201,19 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
+which-typed-array@^1.1.16:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
+  integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    for-each "^0.3.5"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -8009,18 +8340,10 @@ write-pkg@4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@^7:
-  version "7.5.10"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
-  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
-
-xstream@^11.14.0:
-  version "11.14.0"
-  resolved "https://registry.yarnpkg.com/xstream/-/xstream-11.14.0.tgz#2c071d26b18310523b6877e86b4e54df068a9ae5"
-  integrity sha512-1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==
-  dependencies:
-    globalthis "^1.0.1"
-    symbol-observable "^2.0.3"
+ws@^8.14.0:
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
 
 xtend@~4.0.1:
   version "4.0.2"

From 87ad6e795ee3e5c4b1318cca1e522d3dfbc4756e Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 23 Aug 2025 09:31:42 +0000
Subject: [PATCH 285/287] [autofix.ci] apply automated fixes

---
 packages/ast/src/client/client.ts           | 1 -
 packages/ast/src/react-query/react-query.ts | 2 --
 2 files changed, 3 deletions(-)

diff --git a/packages/ast/src/client/client.ts b/packages/ast/src/client/client.ts
index 908dff30..f877cf73 100644
--- a/packages/ast/src/client/client.ts
+++ b/packages/ast/src/client/client.ts
@@ -218,7 +218,6 @@ export const createWasmExecMethod = (
   context: RenderContext,
   jsonschema: JSONSchema
 ) => {
-
   context.addUtil('StdFee');
   context.addUtil('Coin');
 
diff --git a/packages/ast/src/react-query/react-query.ts b/packages/ast/src/react-query/react-query.ts
index 7b00d057..1a9e62d5 100644
--- a/packages/ast/src/react-query/react-query.ts
+++ b/packages/ast/src/react-query/react-query.ts
@@ -524,8 +524,6 @@ const generateMutationTypeParameter = (
   context: RenderContext,
   mutationHookParamsTypeName: string
 ) => {
-
-
   return t.tsTypeParameterInstantiation([
     // Data
     t.tSTypeReference(t.identifier('any')),

From 472007b2c11c211f16e18d4653350bf7a8e16901 Mon Sep 17 00:00:00 2001
From: Dan Lynch <pyramation@gmail.com>
Date: Wed, 27 Aug 2025 19:54:01 -0700
Subject: [PATCH 286/287] chore(release): publish

 - @cosmwasm/ts-codegen-ast@1.9.1
 - @cosmwasm/ts-codegen@1.13.1
 - @cosmwasm/ts-codegen-types@1.4.1
---
 packages/ast/CHANGELOG.md        | 8 ++++++++
 packages/ast/package.json        | 4 ++--
 packages/ts-codegen/CHANGELOG.md | 8 ++++++++
 packages/ts-codegen/package.json | 6 +++---
 packages/types/CHANGELOG.md      | 8 ++++++++
 packages/types/package.json      | 2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
index 042d7c9b..f9d627ef 100644
--- a/packages/ast/CHANGELOG.md
+++ b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.1](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.9.0...@cosmwasm/ts-codegen-ast@1.9.1) (2025-08-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-ast
+
+
+
+
+
 # [1.9.0](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen-ast@1.8.1...@cosmwasm/ts-codegen-ast@1.9.0) (2025-07-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-ast
diff --git a/packages/ast/package.json b/packages/ast/package.json
index e7d5c059..4ff46221 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-ast",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen/tree/master/packages/ast#readme",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-types": "^1.4.0",
+    "@cosmwasm/ts-codegen-types": "^1.4.1",
     "ast-stringify": "0.2.1",
     "case": "1.6.3",
     "deepmerge": "4.2.2",
diff --git a/packages/ts-codegen/CHANGELOG.md b/packages/ts-codegen/CHANGELOG.md
index 9faaf11d..f2efb5a8 100644
--- a/packages/ts-codegen/CHANGELOG.md
+++ b/packages/ts-codegen/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.1](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen@1.13.0...@cosmwasm/ts-codegen@1.13.1) (2025-08-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen
+
+
+
+
+
 # [1.13.0](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen@1.12.1...@cosmwasm/ts-codegen@1.13.0) (2025-07-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen
diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json
index 789b5887..7f089198 100644
--- a/packages/ts-codegen/package.json
+++ b/packages/ts-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen",
@@ -43,8 +43,8 @@
     "@chain-registry/types": "^0.17.1",
     "@chain-registry/utils": "^1.51.71",
     "@chain-registry/v2": "^1.71.229",
-    "@cosmwasm/ts-codegen-ast": "^1.8.1",
-    "@cosmwasm/ts-codegen-types": "^1.3.1",
+    "@cosmwasm/ts-codegen-ast": "^1.9.1",
+    "@cosmwasm/ts-codegen-types": "^1.4.1",
     "@interchainjs/amino": "1.17.1",
     "@interchainjs/cosmos": "1.17.1",
     "@interchainjs/types": "1.17.1",
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index acf95168..5bdb7c8f 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.1](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.4.0...@cosmwasm/ts-codegen-types@1.4.1) (2025-08-28)
+
+**Note:** Version bump only for package @cosmwasm/ts-codegen-types
+
+
+
+
+
 # [1.4.0](https://github.com/hyperweb-io/ts-codegen/compare/@cosmwasm/ts-codegen-types@1.3.1...@cosmwasm/ts-codegen-types@1.4.0) (2025-07-02)
 
 **Note:** Version bump only for package @cosmwasm/ts-codegen-types
diff --git a/packages/types/package.json b/packages/types/package.json
index c1085b93..1833a615 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen-types",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "CosmWasm TSCodegen Types",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen/tree/master/packages/types#readme",

From 2baaaf26474c222244f63a43441f2c117e22140b Mon Sep 17 00:00:00 2001
From: Gefei Hou <gefeihou@Gefeidebijibendiannao.local>
Date: Wed, 10 Sep 2025 23:29:24 -0700
Subject: [PATCH 287/287] baseClient update

---
 __fixtures__/issues/98/out/baseClient.ts          | 15 +++++++++++++--
 .../builder/bundler_test/contracts/baseClient.ts  | 15 +++++++++++++--
 __output__/builder/default/baseClient.ts          | 15 +++++++++++++--
 __output__/builder/invoke/baseClient.ts           | 15 +++++++++++++--
 __output__/builder/no-extends/baseClient.ts       | 15 +++++++++++++--
 __output__/sg721-updatable/baseClient.ts          | 15 +++++++++++++--
 packages/ts-codegen/src/helpers/baseClient.ts     | 15 +++++++++++++--
 7 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/__fixtures__/issues/98/out/baseClient.ts b/__fixtures__/issues/98/out/baseClient.ts
index 6a1cd78b..3ddf43b2 100644
--- a/__fixtures__/issues/98/out/baseClient.ts
+++ b/__fixtures__/issues/98/out/baseClient.ts
@@ -103,7 +103,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -143,8 +143,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string, 
diff --git a/__output__/builder/bundler_test/contracts/baseClient.ts b/__output__/builder/bundler_test/contracts/baseClient.ts
index 6a1cd78b..3ddf43b2 100644
--- a/__output__/builder/bundler_test/contracts/baseClient.ts
+++ b/__output__/builder/bundler_test/contracts/baseClient.ts
@@ -103,7 +103,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -143,8 +143,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string, 
diff --git a/__output__/builder/default/baseClient.ts b/__output__/builder/default/baseClient.ts
index 6a1cd78b..3ddf43b2 100644
--- a/__output__/builder/default/baseClient.ts
+++ b/__output__/builder/default/baseClient.ts
@@ -103,7 +103,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -143,8 +143,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string, 
diff --git a/__output__/builder/invoke/baseClient.ts b/__output__/builder/invoke/baseClient.ts
index 6a1cd78b..3ddf43b2 100644
--- a/__output__/builder/invoke/baseClient.ts
+++ b/__output__/builder/invoke/baseClient.ts
@@ -103,7 +103,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -143,8 +143,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string, 
diff --git a/__output__/builder/no-extends/baseClient.ts b/__output__/builder/no-extends/baseClient.ts
index 6a1cd78b..3ddf43b2 100644
--- a/__output__/builder/no-extends/baseClient.ts
+++ b/__output__/builder/no-extends/baseClient.ts
@@ -103,7 +103,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -143,8 +143,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string, 
diff --git a/__output__/sg721-updatable/baseClient.ts b/__output__/sg721-updatable/baseClient.ts
index 6a1cd78b..3ddf43b2 100644
--- a/__output__/sg721-updatable/baseClient.ts
+++ b/__output__/sg721-updatable/baseClient.ts
@@ -103,7 +103,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -143,8 +143,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string, 
diff --git a/packages/ts-codegen/src/helpers/baseClient.ts b/packages/ts-codegen/src/helpers/baseClient.ts
index 4de79940..03d122f7 100644
--- a/packages/ts-codegen/src/helpers/baseClient.ts
+++ b/packages/ts-codegen/src/helpers/baseClient.ts
@@ -97,7 +97,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(
     sender: string, 
     contractAddress: string, 
@@ -137,8 +137,19 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
   };
 }
 
-export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
   return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      if (!rpcEndpoint) {
+        throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
+      }
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      return fromUint8Array(response.data);
+    },
     execute: async (
       sender: string, 
       contractAddress: string,